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.

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

feat(dfx-orbit): dfx-orbit version 0.5.0 #370

Merged
merged 128 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
128 commits
Select commit Hold shift + click to select a range
1216364
Fix test issue
Sawchord Jul 31, 2024
d6ee0b4
Update dependencies
Sawchord Aug 2, 2024
6dbd40e
Move logger up a layer
Sawchord Aug 2, 2024
52b9415
WIP refactoring asset upload into multiple smaller methods
Sawchord Aug 2, 2024
9926c6b
WIP factoring out asset functionality into it's own methods
Sawchord Aug 2, 2024
2c9629d
WIP refactoring asset upload
Sawchord Aug 2, 2024
8eb7f74
Remove unused mut
Sawchord Aug 2, 2024
8a953af
Implement check evidence method
Sawchord Aug 2, 2024
84ea59e
Implement request_commit_batch method
Sawchord Aug 2, 2024
c1710c7
WIP improve UX around asset
Sawchord Aug 2, 2024
c2a7737
WIP improving UX around assets
Sawchord Aug 2, 2024
0d54940
WIP UX in assets improvements
Sawchord Aug 5, 2024
ea13a3d
WIP implement asset check
Sawchord Aug 5, 2024
1df44ee
Test asset check
Sawchord Aug 5, 2024
552da41
Update README
Sawchord Aug 5, 2024
fcd6211
Update version and readme
Sawchord Aug 5, 2024
929d4af
Update approval UX
Sawchord Aug 5, 2024
32a8423
Implement a request_prepare_permission method
Sawchord Aug 5, 2024
cbf9848
Functionality to request prepare permission
Sawchord Aug 5, 2024
977d4dc
WIP Implement lookup for sources
Sawchord Aug 6, 2024
834c07c
Test the new functionality
Sawchord Aug 6, 2024
a75ab04
Merge branch 'main' into leon/dfx-orbitv0.2
Sawchord Aug 6, 2024
4d5259d
Settable verbosity levels
Sawchord Aug 7, 2024
25c5e87
Merge branch 'main' into leon/dfx-orbitv0.3
Sawchord Aug 8, 2024
9a3cea2
Settable --station
Sawchord Aug 8, 2024
301f362
WIP improve review UX
Sawchord Aug 9, 2024
acb49eb
Some renaming
Sawchord Aug 9, 2024
8b1aef0
WIP implement display for review list
Sawchord Aug 9, 2024
ff10355
Small improvements to the list arg parsing
Sawchord Aug 13, 2024
f5f0322
Improve review list output
Sawchord Aug 13, 2024
6dce4a2
Updating TODOs
Sawchord Aug 13, 2024
ed5eaff
Bump version
Sawchord Aug 13, 2024
4525d06
Update TODOs, remove unused code
Sawchord Aug 14, 2024
f6fe738
Refactor candid loading
Sawchord Aug 14, 2024
e9c3789
Clippy
Sawchord Aug 14, 2024
40b7471
Add canister lookup functionality
Sawchord Aug 14, 2024
d35f441
Better display functionality
Sawchord Aug 14, 2024
589b288
Implement detailed view for change canister
Sawchord Aug 14, 2024
09dae7e
Filter by external canister by default
Sawchord Aug 15, 2024
3bf0ab9
WIP display for call canister
Sawchord Aug 15, 2024
18e49fd
Display call external cansiter w/o types
Sawchord Aug 15, 2024
58d3199
More UX improvements for the CanisterCall functionality
Sawchord Aug 15, 2024
bbbaf83
Refactor
Sawchord Aug 15, 2024
878310f
Small refactors
Sawchord Aug 15, 2024
068fe55
Merge branch 'main' into leon/dfx-orbitv0.3
Sawchord Aug 16, 2024
59893f1
Refactor asset execution
Sawchord Aug 16, 2024
685dd44
WIP moving to new cli layout
Sawchord Aug 16, 2024
c251054
Flatten arg modules
Sawchord Aug 16, 2024
08745b2
request asset commands are complete
Sawchord Aug 16, 2024
58ad72a
WIP sketch out the verify arguments
Sawchord Aug 16, 2024
237c90b
WIP implement new verify interface
Sawchord Aug 19, 2024
e7ca08c
Use verify
Sawchord Aug 19, 2024
49ce38e
Remove old asset flows
Sawchord Aug 19, 2024
0129c24
Implement verify on canister call
Sawchord Aug 19, 2024
ff9ea05
WIP implement verification of change canister argument
Sawchord Aug 19, 2024
233e3d0
WIP checking update
Sawchord Aug 21, 2024
3996197
Verify command for canister call
Sawchord Aug 22, 2024
f6c78fb
Implement and-approve and or-reject
Sawchord Aug 23, 2024
ea33ad6
Factor out submit into approve and request
Sawchord Aug 23, 2024
6160981
Update some TODOs readme etc
Sawchord Aug 26, 2024
f4151b3
Merge branch 'main' into leon/dfx-orbitv0.4
Sawchord Aug 26, 2024
50baa25
Add goup and user to request
Sawchord Aug 27, 2024
ecc7edc
Improvements around verify
Sawchord Aug 27, 2024
2631cd1
Add CallCanisters request permission
Sawchord Aug 27, 2024
f2f465d
Small UX improvements
Sawchord Aug 29, 2024
4435ee5
Update todos
Sawchord Aug 29, 2024
4ab1881
Display for dfx-me
Sawchord Aug 29, 2024
2f2cfd2
Implement edit station
Sawchord Aug 30, 2024
c79162b
Implement --identity
Sawchord Aug 30, 2024
9d62774
Remove unwraps from dfx-orbit
Sawchord Aug 30, 2024
a177d53
Display for station config
Sawchord Aug 30, 2024
03857e3
Station add no longer requieres --url
Sawchord Aug 30, 2024
7a48233
Bump version
Sawchord Sep 3, 2024
62e38c0
Merge branch 'main' into leon/dfx-orbitv0.4
Sawchord Sep 3, 2024
0d7c25a
Improved the Approved by and rejected by displays
Sawchord Sep 3, 2024
4611a62
Small fix to print warning
Sawchord Sep 3, 2024
f13fa45
Improve display a little bit
Sawchord Sep 3, 2024
bc64151
Some refactoring in display
Sawchord Sep 6, 2024
1af7e24
Implement get_controllers
Sawchord Sep 6, 2024
43e76d9
WIP implement request controller management
Sawchord Sep 6, 2024
d812eb4
Implement update settings reuest and verify
Sawchord Sep 9, 2024
ae34993
Merge branch 'main' into leon/dfx-orbitv0.5
Sawchord Sep 9, 2024
7616003
Testing refactor
Sawchord Sep 9, 2024
cbe9d54
Imrpove testing in canister call to cover more code
Sawchord Sep 9, 2024
562800b
Small inprovement
Sawchord Sep 9, 2024
3fa49d3
Small changes in display of review id
Sawchord Sep 9, 2024
a840eec
Display a tick next to the default station
Sawchord Sep 10, 2024
44c5160
Use sid in the link
Sawchord Sep 10, 2024
2003794
WIP implement quorum results
Sawchord Sep 10, 2024
c85dbb5
WIP displaying the quorum
Sawchord Sep 10, 2024
cf64896
Incorporate feedback
Sawchord Sep 12, 2024
0e19309
Test verification in call canister
Sawchord Sep 12, 2024
fbe5c98
Add optional principal field to RequestAssetPreparePermissionArgs
Sawchord Sep 12, 2024
088414b
WIP implementing grant_permission verifier
Sawchord Sep 12, 2024
6b35472
Finish verify get-prepare-permission
Sawchord Sep 13, 2024
b0a46d7
Refactor dfx orbit integration tests
Sawchord Sep 13, 2024
d9567bf
Refactor dfx-orbit integration tests
Sawchord Sep 13, 2024
e143d1b
WIP improve asset tests
Sawchord Sep 13, 2024
bf9a4f5
WIP making asset integration tests more E2E
Sawchord Sep 13, 2024
377f8be
Refactoring asset storage
Sawchord Sep 13, 2024
16c1ce1
Implement asset verification test
Sawchord Sep 13, 2024
615807f
Bump dfx-orbit version number
Sawchord Sep 18, 2024
9e0409f
Small refactor to improve legibility in dfx-orbit integration tests
Sawchord Sep 18, 2024
b9215f2
WIP revoking prepare permission
Sawchord Sep 18, 2024
aea5d90
WIP implement asset better asset permissions
Sawchord Sep 26, 2024
257a81c
Better implementation of requesting and verifying asset permissions
Sawchord Sep 26, 2024
ad76aa8
WIP implement display for verify commands
Sawchord Sep 27, 2024
909ffd1
Implement more display args functions
Sawchord Sep 27, 2024
79c9b9b
Remove the displays again (not sustainable)
Sawchord Sep 27, 2024
4122779
WIP implement asset commit
Sawchord Sep 27, 2024
4ccf3c9
Implement commit
Sawchord Sep 27, 2024
ea0efa0
Implement delete_batch_input
Sawchord Sep 27, 2024
07dcc59
Change verify CLI to be easier to modify later on
Sawchord Sep 30, 2024
733d67c
Implement cancel commit
Sawchord Sep 30, 2024
b17a926
Set all batch_ids via flag
Sawchord Sep 30, 2024
9440ca9
Update Readme
Sawchord Oct 1, 2024
a8808ad
Merge repro fix
Sawchord Oct 2, 2024
4d6d294
Merge branch 'main' into leon/dfx-orbitv0.5
Sawchord Oct 2, 2024
2b3270d
Clippy fix
Sawchord Oct 2, 2024
e7c2dd8
Return Non-zero output value on error
Sawchord Oct 3, 2024
76aae3e
Fix testing issue
Sawchord Oct 3, 2024
573c958
Update tools/dfx-orbit/README.md
Sawchord Oct 4, 2024
3960181
Update tools/dfx-orbit/README.md
Sawchord Oct 4, 2024
211bbaf
Update tools/dfx-orbit/src/cli/review.rs
Sawchord Oct 4, 2024
6ffbcd8
Update tools/dfx-orbit/README.md
Sawchord Oct 4, 2024
fd3b728
Update tests/integration/src/dfx_orbit/assets.rs
Sawchord Oct 4, 2024
0f1eb1b
Apply suggestions
Sawchord Oct 4, 2024
c267ea2
Merge branch 'main' into leon/dfx-orbitv0.5
Sawchord Oct 4, 2024
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
114 changes: 45 additions & 69 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,19 @@ candid = "0.10.3"
candid_parser = "0.1.3"
canfund = "0.2.0"
cap-std = "3.1.0"
ciborium = "0.2.2"
clap = { version = "4.5.7", features = ["derive"] }
dateparser = "0.2"
dfx-core = { git = "https://github.com/dfinity/sdk.git", tag = "0.22.0" }
dfx-core = { git = "https://github.com/dfinity/sdk.git", rev = "bb5f8b58afa94b1950f5e1a750e0491457ad88d1" }
flate2 = "1.0"
convert_case = "0.6"
futures = "0.3"
getrandom = { version = "0.2", features = ["custom"] }
hex = "0.4"
# The ic-agent matches the one sed by bthe
ic-agent = { git = "https://github.com/dfinity/agent-rs.git", rev = "be929fd7967249c879f48f2f494cbfc5805a7d98" }
ic-asset = { git = "https://github.com/dfinity/sdk.git", rev = "75c080ebae22a70578c06ddf1eda0b18ef091845" }
ic-asset = { git = "https://github.com/dfinity/sdk.git", rev = "bb5f8b58afa94b1950f5e1a750e0491457ad88d1" }
ic-certification = { git = "https://github.com/dfinity/response-verification", rev = "da70db93832f88ecc556ae082612aedec47d3816" }
ic-certified-assets = { git = "https://github.com/dfinity/sdk.git", rev = "75c080ebae22a70578c06ddf1eda0b18ef091845" }
ic-certified-assets = { git = "https://github.com/dfinity/sdk.git", rev = "bb5f8b58afa94b1950f5e1a750e0491457ad88d1" }
ic-http-certification = { git = "https://github.com/dfinity/response-verification", rev = "da70db93832f88ecc556ae082612aedec47d3816" }
ic-representation-independent-hash = { git = "https://github.com/dfinity/response-verification", rev = "da70db93832f88ecc556ae082612aedec47d3816" }
ic-cdk = "0.13.2"
Expand Down
2 changes: 1 addition & 1 deletion core/station/api/src/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub enum RequestStatusCodeDTO {
Failed = 7,
}

#[derive(CandidType, serde::Serialize, Deserialize, Debug, Clone)]
#[derive(CandidType, serde::Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
pub enum RequestApprovalStatusDTO {
Approved,
Rejected,
Expand Down
1 change: 1 addition & 0 deletions tests/integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ flate2 = { workspace = true }
hex = { workspace = true }
orbit-essentials = { path = '../../libs/orbit-essentials', version = '0.0.2-alpha.5' }
ic-cdk = { workspace = true }
ic-certified-assets = { workspace = true }
ic-ledger-types = { workspace = true }
itertools = { workspace = true }
lazy_static = { workspace = true }
Expand Down
Loading
Loading