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

refactor(multisig)!: move from triggers to custom instructions #5217

Merged
merged 31 commits into from
Nov 18, 2024
Merged

refactor(multisig)!: move from triggers to custom instructions #5217

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
e37bb4d
refactor!: move multisig logics to custom instructions
s8sato Nov 1, 2024
00ec667
fix: don't continue to grant a role on failing to register the role
s8sato Nov 2, 2024
a4ac5b0
docs: fix doc test
s8sato Nov 2, 2024
657d3ad
chore: remove `CanRegisterAnyTrigger` `CanUnregisterAnyTrigger` permi…
s8sato Nov 2, 2024
b158c59
refactor: don't branch into `visit` and `execute` until leaf instruct…
s8sato Nov 3, 2024
4eedd61
refactor: clone and drop executor instance on recursive execution
s8sato Nov 3, 2024
da8e7fb
fix: don't just execute arbitrary approved instructions
s8sato Nov 4, 2024
f54bd6e
fix: propagate executor verdict
s8sato Nov 4, 2024
d75e932
review: address up to `#issuecomment-2453963837`
s8sato Nov 5, 2024
0e8f7e6
docs: Update readmes (#5219)
outoftardis Nov 5, 2024
3c1888d
review: rename to `visit_custom_instructions`
s8sato Nov 6, 2024
bc1d497
review: move to `{iroha_executor::default, iroha_executor_data_model}…
s8sato Nov 6, 2024
bdd2a09
review: minor updates since `#pullrequestreview-2414675315`
s8sato Nov 6, 2024
255782e
review: submit a new account with metadata filled
s8sato Nov 6, 2024
b0208cc
Revert "review: submit a new account with metadata filled"
s8sato Nov 6, 2024
e95f743
Merge branch 'main' into refactor/4930/custom_instructions
s8sato Nov 6, 2024
45b24d9
fix: prevent a double grant to the registrant who is also a signatory
s8sato Nov 6, 2024
e0a96f4
review: minor updates since `#pullrequestreview-2418103555`
s8sato Nov 7, 2024
183ff26
review: nonzero `quorum` and `transaction_ttl_ms`
s8sato Nov 7, 2024
70d51d0
review: replace `host.submit` with `executor.visit_*`
s8sato Nov 7, 2024
814b23b
review: minor updates since `#issuecomment-2463859606`
s8sato Nov 8, 2024
f54d3d9
review: exclude custom instructions from schema `types!`
s8sato Nov 8, 2024
bd20861
review: dedup and delegate `MultisigRegister` validation to execution
s8sato Nov 8, 2024
17287d3
review: dedup and delegate `MultisigPropose` validation to execution
s8sato Nov 11, 2024
d1a167c
Revert "review: dedup and delegate `MultisigPropose` validation to ex…
s8sato Nov 11, 2024
e41ba88
review: dedup and delegate `MultisigApprove` validation to execution
s8sato Nov 11, 2024
35b3865
Merge branch 'main' into refactor/4930/custom_instructions-wip
s8sato Nov 11, 2024
0bb6250
review: minor updates since `issuecomment-2468473163`
s8sato Nov 15, 2024
2522e18
review: `visit_grant_account_role` in `visit_register_role`
s8sato Nov 15, 2024
11800b6
Revert "review: `visit_grant_account_role` in `visit_register_role`"
s8sato Nov 15, 2024
6eac0f6
Merge branch 'main' into refactor/4930/custom_instructions
s8sato Nov 15, 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
14 changes: 1 addition & 13 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 0 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ iroha_smart_contract_utils = { version = "=2.0.0-rc.1.0", path = "crates/iroha_s
iroha_executor = { version = "=2.0.0-rc.1.0", path = "crates/iroha_executor" }

iroha_data_model = { version = "=2.0.0-rc.1.0", path = "crates/iroha_data_model", default-features = false }
iroha_multisig_data_model = { version = "=2.0.0-rc.1.0", path = "data_model/libs/iroha_multisig_data_model" }
iroha_executor_data_model = { version = "=2.0.0-rc.1.0", path = "crates/iroha_executor_data_model" }

iroha_test_network = { version = "=2.0.0-rc.1.0", path = "crates/iroha_test_network" }
Expand Down Expand Up @@ -199,7 +198,6 @@ clippy.wildcard_dependencies = "deny"
resolver = "2"
members = [
"crates/*",
"data_model/libs/*",
"data_model/samples/*"
mversic marked this conversation as resolved.
Show resolved Hide resolved
]

Expand Down
3 changes: 1 addition & 2 deletions crates/iroha/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ iroha_torii_const = { workspace = true }
iroha_version = { workspace = true }

iroha_data_model = { workspace = true, features = ["http"] }
iroha_multisig_data_model = { workspace = true }
iroha_executor_data_model = { workspace = true }

attohttpc = { version = "0.28.0", default-features = false }
eyre = { workspace = true }
Expand Down Expand Up @@ -88,7 +88,6 @@ iroha_test_network = { workspace = true }

mint_rose_trigger_data_model = { path = "../../data_model/samples/mint_rose_trigger_data_model" }
executor_custom_data_model = { path = "../../data_model/samples/executor_custom_data_model" }
iroha_executor_data_model = { workspace = true }

tokio = { workspace = true, features = ["rt-multi-thread"] }
reqwest = { version = "0.12.7", features = ["json"] }
Expand Down
2 changes: 1 addition & 1 deletion crates/iroha/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ mod secrecy;

pub use iroha_crypto as crypto;
pub use iroha_data_model as data_model;
pub use iroha_multisig_data_model as multisig_data_model;
pub use iroha_executor_data_model as executor_data_model;
s8sato marked this conversation as resolved.
Show resolved Hide resolved
Loading
Loading