Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes to make it work #2

Merged
merged 13 commits into from
Jul 17, 2023
Merged

Minor fixes to make it work #2

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
65ab020
fix build
clangenb Jul 12, 2023
539cce5
add .gitignore
clangenb Jul 12, 2023
a6fe87d
add Cargo.lock
clangenb Jul 12, 2023
1fe9200
Downgrade clap to match major version with integritee-cli
clangenb Jul 12, 2023
32f9f67
extracted a function to create the pay_as_bid_cmd
clangenb Jul 12, 2023
1c69adb
successfully created a new account
clangenb Jul 12, 2023
fd086ce
revert adjustment of local worker, and update the git submodule
clangenb Jul 12, 2023
adb933e
update BESTenergy submodule
clangenb Jul 12, 2023
4f0ed31
add key_store to gitignore
clangenb Jul 12, 2023
f135714
fix whitespace error in the git submodule
clangenb Jul 12, 2023
7206d6f
add comment
clangenb Jul 12, 2023
17089ee
change trusted commands to direct.
clangenb Jul 12, 2023
1f64c22
add more comments
clangenb Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@

# build outputs
**/target/**

# virtual env
venv/**

# user data
my_keystore/**
1 change: 1 addition & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[submodule "shared/BEST-Energy"]
path = shared/BEST-Energy
url = [email protected]:olisystems/BEST-Energy.git
branch = cl/oli-pycli
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a simple hotfix branch, where I made some stuff public.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it recommended to update main with this fixing branch or rather keep this branch updated with ongoing changes? Both client-dependency-fixing-branch and the current worker main branch should be able to work together despite changes regarding the fixes right?

[submodule "shared/incubator-teaclave-sgx-sdk"]
path = shared/incubator-teaclave-sgx-sdk
url = [email protected]:Interstellar-Network/incubator-teaclave-sgx-sdk.git
Expand Down
Loading