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

[fix] #3038: Re-enable multisigs #3043

Merged
merged 2 commits into from Jan 19, 2023

Conversation

Erigara
Copy link
Contributor

@Erigara Erigara commented Dec 27, 2022

Description of the Change

  • Revert some changes made to Queue and Sumeragi to bring multisignatures back.
  • Turn on tests that works with multisigs.
  • Add second queue for the multisignatures.

We need second queue for multisigns in order to prevent situation when multisig transactions prevent ordinary transactions from being processed.

Issue

Closes #2595, #3038, #3039.

Benefits

Multisignatures are working again.

Possible Drawbacks

More complex queue.

Usage Examples or Tests

Test for multisig functionality on one peer:

cargo test --package iroha_core --lib -- queue::tests::push_multisignature_tx --exact --nocapture

Test for multisig transaction gossiping between multiple peers:

cargo test --package iroha_client --test mod -- integration::multisignature_transaction::multisignature_transactions_should_wait_for_all_signatures --exact --nocapture

@github-actions github-actions bot added the iroha2-dev The re-implementation of a BFT hyperledger in RUST label Dec 27, 2022
@codecov
Copy link

codecov bot commented Dec 27, 2022

Codecov Report

Merging #3043 (b892ca5) into iroha2-dev (a4d5c9f) will increase coverage by 2.13%.
The diff coverage is 67.41%.

@@              Coverage Diff               @@
##           iroha2-dev    #3043      +/-   ##
==============================================
+ Coverage       62.33%   64.47%   +2.13%     
==============================================
  Files             169      171       +2     
  Lines           31218    33030    +1812     
==============================================
+ Hits            19459    21295    +1836     
+ Misses          11759    11735      -24     
Impacted Files Coverage Δ
cli/src/main.rs 1.09% <0.00%> (ø)
cli/src/torii/mod.rs 27.65% <ø> (ø)
cli/src/torii/utils.rs 75.00% <0.00%> (-9.85%) ⬇️
client_cli/src/main.rs 0.24% <0.00%> (-0.01%) ⬇️
config/base/src/lib.rs 91.57% <ø> (+55.21%) ⬆️
config/src/lib.rs 33.33% <ø> (ø)
config/src/logger.rs 70.21% <ø> (ø)
config/src/path.rs 0.00% <0.00%> (ø)
core/src/smartcontracts/isi/block.rs 85.71% <ø> (-3.18%) ⬇️
.../src/smartcontracts/isi/permissions/combinators.rs 45.94% <ø> (ø)
... and 146 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Copy link
Contributor

@QuentinI QuentinI left a comment

Choose a reason for hiding this comment

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

I assume this builds upon #3035, so looked only at the last commit.

Edit: sorry, didn't notice it's a draft, feel free to dismiss if it's not the final product :)

core/src/queue.rs Show resolved Hide resolved
core/src/sumeragi/main_loop.rs Outdated Show resolved Hide resolved
@Erigara Erigara force-pushed the reenable_multisigns branch 4 times, most recently from aeaaa1c to b2b8447 Compare December 30, 2022 13:54
@Erigara Erigara force-pushed the reenable_multisigns branch 2 times, most recently from dce1888 to 02bad70 Compare January 17, 2023 12:01
@Erigara Erigara marked this pull request as ready for review January 17, 2023 12:14
config/iroha_test_config.json Outdated Show resolved Hide resolved
core/src/queue.rs Outdated Show resolved Hide resolved
core/src/queue.rs Outdated Show resolved Hide resolved
core/src/queue.rs Show resolved Hide resolved
core/src/queue.rs Outdated Show resolved Hide resolved
core/src/queue.rs Outdated Show resolved Hide resolved
core/src/queue.rs Outdated Show resolved Hide resolved
core/src/queue.rs Outdated Show resolved Hide resolved
core/src/queue.rs Outdated Show resolved Hide resolved
core/src/queue.rs Outdated Show resolved Hide resolved
@Erigara Erigara self-assigned this Jan 17, 2023
@Erigara Erigara force-pushed the reenable_multisigns branch 2 times, most recently from 6ec9507 to c44abe4 Compare January 17, 2023 15:06
cli/src/torii/routing.rs Show resolved Hide resolved
config/src/queue.rs Show resolved Hide resolved
core/src/queue.rs Show resolved Hide resolved
primitives/src/round_robin_iter.rs Outdated Show resolved Hide resolved
core/src/queue.rs Show resolved Hide resolved
core/src/queue.rs Show resolved Hide resolved
core/src/queue.rs Show resolved Hide resolved
@mversic mversic self-assigned this Jan 18, 2023
@Erigara Erigara force-pushed the reenable_multisigns branch 2 times, most recently from 74ddb00 to 378c764 Compare January 18, 2023 13:23
mversic
mversic previously approved these changes Jan 19, 2023
Signed-off-by: Shanin Roman <shanin1000@yandex.ru>
Signed-off-by: Shanin Roman <shanin1000@yandex.ru>
@Erigara Erigara merged commit 65c97a7 into hyperledger:iroha2-dev Jan 19, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
iroha2-dev The re-implementation of a BFT hyperledger in RUST
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants