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: Signature order-independence fix for multisig tx #3710

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
12fe0ae
feat: order independent multisig hash modes supported, gating logic a…
fess-v Nov 27, 2023
2a001ae
fix: failing autotests fixes
fess-v Nov 27, 2023
92bbea9
fix: nakamoto autotest fix
fess-v Nov 27, 2023
bd6df03
fix: autotests added for one multisig address and both multisig trans…
fess-v Dec 6, 2023
7da8498
Merge commit `2c1c777b9` into `multisig-order-independence`
jbencin Mar 12, 2024
1076881
Merge commit `e716bb61b` into `multisig-order-independence`
jbencin Mar 12, 2024
fc81647
Merge commit `e71444a` into `multisig-order-independence`
jbencin Mar 12, 2024
5afef38
Merge commit `3e21883` into `multisig-order-independence`
jbencin Mar 12, 2024
d11e073
Merge commit `15e76e5` into `multisig-order-independence`
jbencin Mar 13, 2024
dc247f4
Merge commit `be489b4` into `multisig-order-independence`
jbencin Mar 13, 2024
122c9f6
Merge commit `7c7a527` into `multisig-order-independence`
jbencin Mar 14, 2024
be87938
fix: Unit/integration tests (except `test_epoch_switch_pox_3_contract…
jbencin Mar 14, 2024
3c9b3c4
Merge commit `f8c676073` into `multisig-order-independence`
jbencin Mar 15, 2024
23b44eb
fix: Unit/integration tests (except `test_epoch_switch_pox_3_contract…
jbencin Mar 15, 2024
1cb66b7
Merge commit `577b118` into `multisig-order-independence`
jbencin Mar 18, 2024
957ecd9
Merge commit `cab1a11b5` into `multisig-order-independence`
jbencin Mar 18, 2024
d615a8b
Merge branch `stacks/next` into `multisig-order-independence`
jbencin Mar 18, 2024
8cdd2dd
fix: `stackslib/src/chainstate/coordinator/tests.rs` passes
jbencin Mar 18, 2024
857be7f
Merge pull request #1 from jbencin/multisig-order-independence
fess-v Mar 26, 2024
80a3565
Merge branch 'next' into draft/multisig-order-independence
jbencin Mar 26, 2024
78b05a6
chore: Address PR comments and fix tests
jbencin Mar 26, 2024
988f667
Merge pull request #2 from jbencin/multisig-order-independence
fess-v Mar 27, 2024
c17045d
Merge branch 'next' into draft/multisig-order-independence
jcnelson Apr 3, 2024
7b4794d
chore: Remove `DeserializeWithEpoch` trait
jbencin Apr 4, 2024
0deff44
Merge pull request #3 from jbencin/multisig-order-independence
fess-v Apr 4, 2024
758c58a
fix: remove logic for epoch gating
fess-v Apr 4, 2024
bb66bae
fix: failing autotests fix and transaction.rs test code refactoring
fess-v Apr 4, 2024
aaa37f3
fix: format
fess-v Apr 4, 2024
a995f21
fix: warning
fess-v Apr 5, 2024
0fd0321
Update stackslib/src/net/api/tests/gettenure.rs
fess-v Apr 6, 2024
1cb0dcb
Update stackslib/src/net/api/tests/getblock.rs
fess-v Apr 6, 2024
f7dbfed
Update stackslib/src/net/api/tests/getblock_v3.rs
fess-v Apr 6, 2024
1549a9a
Update stackslib/src/net/codec.rs
fess-v Apr 6, 2024
6c4c50d
Update stackslib/src/net/api/posttransaction.rs
fess-v Apr 6, 2024
551761c
Update stackslib/src/net/api/postblock.rs
fess-v Apr 6, 2024
f84cc68
Update stackslib/src/net/api/getblock.rs
fess-v Apr 6, 2024
a057bc2
Update stackslib/src/net/api/gettenure.rs
fess-v Apr 6, 2024
d644759
Update stackslib/src/chainstate/nakamoto/staging_blocks.rs
fess-v Apr 6, 2024
15cd521
Update stacks-common/src/codec/mod.rs
fess-v Apr 6, 2024
341e17a
Update stackslib/src/blockstack_cli.rs
fess-v Apr 6, 2024
2167f2f
fix: revert messages.rs file
fess-v Apr 6, 2024
ac057ca
fix: redundant import removed
fess-v Apr 6, 2024
c4b0952
Update stackslib/src/net/api/getblock_v3.rs
fess-v Apr 6, 2024
1358151
feat: Allow for more than min number of signers in `OrderIndependentM…
jbencin Apr 9, 2024
2f06d95
Merge pull request #4 from jbencin/multisig-order-independence
fess-v Apr 9, 2024
72507cc
fix: redundant code reverted, quiet parameter removed
fess-v Apr 10, 2024
a91581d
Merge remote-tracking branch 'origin/draft/multisig-order-independenc…
fess-v Apr 10, 2024
8df5b31
fix: supported in epoch added
fess-v Apr 10, 2024
9dfa3c4
fix: TransactionAuth is_supported_in_epoch docstring added, autotest …
fess-v Apr 11, 2024
5d25b5c
test: Add cases in `auth.rs` for num_sigs > required_sigs
jbencin Apr 10, 2024
d981cec
fix: Tests broken by `13581510c` now work. Also, added test to confir…
jbencin Apr 11, 2024
fa95032
Merge pull request #5 from jbencin/multisig-order-independence
fess-v Apr 11, 2024
6bd3a61
chore: Address PR comments from Jude
jbencin Apr 29, 2024
be71ee8
chore: Address PR comments from Jude
jbencin Apr 29, 2024
cfdc8f1
Merge pull request #6 from jbencin/multisig-order-independence
fess-v Apr 30, 2024
f910e6d
fix: Unit tests pass
jbencin Apr 29, 2024
b25eef8
refactor: Pass `Option`s to `verify_block_epoch_validation()`
jbencin Apr 30, 2024
452a400
Merge pull request #7 from jbencin/multisig-order-independence
fess-v Apr 30, 2024
7a49afa
fix: rustdocs added for test functions
fess-v May 1, 2024
3dd4ccb
Merge branch 'develop' of https://github.com/stacks-network/stacks-bl…
fess-v May 1, 2024
679aeac
Merge branch 'develop' into draft/multisig-order-independence
jcnelson May 3, 2024
4a0a966
fix: autotest restored, epoch gating logic removed from `try_mine_tx_…
fess-v May 5, 2024
3c7be76
Merge remote-tracking branch 'origin/draft/multisig-order-independenc…
fess-v May 5, 2024
61ac533
Merge branch 'develop' into draft/multisig-order-independence
fess-v May 5, 2024
6e2b54b
Merge branch 'develop' into draft/multisig-order-independence
jcnelson May 10, 2024
d7865cf
Merge branch 'develop' into draft/multisig-order-independence
fess-v May 11, 2024
2e67fa9
Update stackslib/src/chainstate/stacks/transaction.rs
fess-v May 16, 2024
6766e65
Merge branch 'develop' into draft/multisig-order-independence
jbencin May 16, 2024
9addd7e
fix: validate_transaction_static_epoch function added
fess-v May 16, 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
4 changes: 2 additions & 2 deletions stackslib/src/chainstate/nakamoto/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ lazy_static! {
block_height INTEGER NOT NULL,
-- root hash of the internal, not-consensus-critical MARF that allows us to track chainstate/fork metadata
index_root TEXT NOT NULL,
-- burn header hash corresponding to the consensus hash (NOT guaranteed to be unique, since we can
-- burn header hash corresponding to the consensus hash (NOT guaranteed to be unique, since we can
-- have 2+ blocks per burn block if there's a PoX fork)
burn_header_hash TEXT NOT NULL,
-- height of the burnchain block header that generated this consensus hash
Expand Down Expand Up @@ -188,7 +188,7 @@ lazy_static! {
header_type TEXT NOT NULL,
-- hash of the block
block_hash TEXT NOT NULL,
-- index_block_hash is the hash of the block hash and consensus hash of the burn block that selected it,
-- index_block_hash is the hash of the block hash and consensus hash of the burn block that selected it,
-- and is guaranteed to be globally unique (across all Stacks forks and across all PoX forks).
-- index_block_hash is the block hash fed into the MARF index.
index_block_hash TEXT NOT NULL,
Expand Down
Loading