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

fix wrong behavior: submit multisig txn only there are enough signatures #3482

Merged
merged 7 commits into from
Jun 25, 2022
Merged

fix wrong behavior: submit multisig txn only there are enough signatures #3482

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b848bed
fix wrong behavior: submit multisig txn only there are enough signatures
templexxx Jun 23, 2022
eec81f2
cmd/starcoin/cmd/starcoin: eprint multisig singatures filepath in txn…
templexxx Jun 24, 2022
b1c2bf7
cmd/starcoin/cmd/starcoin: add multisig singatures file integration t…
templexxx Jun 24, 2022
d62bc57
cmd/starcoin/cmd/starcoin: refine error handling
templexxx Jun 24, 2022
e24839c
cmd/starcoin/cmd/starcoin: try to fix integration testing (submit wit…
templexxx Jun 24, 2022
8745421
Merge branch 'master' into test.multisig
templexxx Jun 24, 2022
7377a35
cmd/starcoin/cmd/starcoin: fix testing by getting right sign-multi-tx…
templexxx Jun 25, 2022
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: 11 additions & 3 deletions cmd/starcoin/src/cli_state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ impl CliState {
AccountPublicKey::Multi(m) => m.clone(),
};

let _ = self.sign_multisig_txn_to_file_or_submit(
let multisig_txn_path = self.sign_multisig_txn_to_file_or_submit(
sender.address,
multisig_public_key,
None,
Expand All @@ -314,6 +314,11 @@ impl CliState {
blocking,
);

eprintln!(
"multisig-txn: {}",
multisig_txn_path.unwrap().as_path().to_str().unwrap()
templexxx marked this conversation as resolved.
Show resolved Hide resolved
);

Ok(execute_result)
}

Expand Down Expand Up @@ -365,7 +370,10 @@ impl CliState {
merged_signatures.threshold(),
merged_signatures.signatures().len()
);
if !merged_signatures.is_enough() {

let signatures_is_enough = merged_signatures.is_enough();

if !signatures_is_enough {
eprintln!(
"still require {} signatures",
merged_signatures.threshold() as usize - merged_signatures.signatures().len()
Expand All @@ -383,7 +391,7 @@ impl CliState {
SignedUserTransaction::new(partial_signed_txn.into_raw_transaction(), authenticator)
};

if submit {
if submit && signatures_is_enough {
let _ = self.submit_txn(signed_txn, blocking);
return Ok(PathBuf::new());
}
Expand Down