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

Jump to bottom

refactor!: Remove genesis signing from Iroha #4673

Merged
merged 7 commits into from
Jun 4, 2024
Merged

refactor!: Remove genesis signing from Iroha #4673

merged 7 commits into from
Jun 4, 2024

Conversation

dima74
Copy link
Contributor

@dima74 dima74 commented May 30, 2024 •
edited
Loading

Description

Implementation of #4225 (comment) partially based on #4382.

This PR includes:

  • New kagami genesis sign command to sign and transform genesis.json into genesis.signed.scale (SCALE serialized SignedTransaction)
  • Changes in config:
    • genesis.private_key removed
    • genesis.file renamed to genesis.signed_file
  • Changes in swarm: added signing genesis with kagami before starting peer

Things left for future PRs:

  • Remove --submit-genesis CLI argument and make all peers submit genesis ?
  • Small refactoring - remove/inline GenesisNetwork struct (it always contains only one GenesisTransaction)

Linked issue

Closes #4225
Closes #4382

Benefits

Checklist

  • I've read CONTRIBUTING.md
  • I've used the standard signed-off commit format (or will squash just before merging)
  • All applicable CI checks pass (or I promised to make them pass later)
  • (optional) I've written unit tests for the code changes
  • I replied to all comments after code review, marking all implemented changes with thumbs up

@github-actions GitHub Actions
Copy link

@BAStos525

@github-actions github-actions bot added the config-changes Changes in configuration and start up of the Iroha label May 30, 2024
0x009922
0x009922 requested changes May 31, 2024
View reviewed changes
Copy link
Contributor

@0x009922 0x009922 left a comment

Choose a reason for hiding this comment

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

LGTM, but it seems you also need to update Kagami call in consistency.sh

configs/peer.template.toml Outdated Show resolved Hide resolved
configs/swarm/docker-compose.local.yml Outdated Show resolved Hide resolved
tools/kagami/src/genesis/sign.rs Show resolved Hide resolved
config/src/parameters/actual.rs Outdated Show resolved Hide resolved
@DCNick3 DCNick3 self-assigned this May 31, 2024
s8sato
s8sato reviewed May 31, 2024
View reviewed changes
config/iroha_test_config.toml Outdated Show resolved Hide resolved
configs/swarm/genesis.json Outdated Show resolved Hide resolved
@dima74 dima74 mentioned this pull request May 31, 2024
Closed
@dima74 dima74 force-pushed the diralik/remove-genesis-signing branch from 1e6a90a to 35d5946 Compare May 31, 2024 09:46
@mversic mversic self-assigned this Jun 3, 2024
@dima74 dima74 force-pushed the diralik/remove-genesis-signing branch from 3b36e52 to 9b4908e Compare June 3, 2024 13:31
mversic
mversic previously approved these changes Jun 3, 2024
View reviewed changes
@dima74
refactor!: Remove genesis signing from Iroha
e8d8636 
Signed-off-by: Dmitry Murzin <diralik@yandex.ru>
@dima74
Rename to genesis.signed.scale
4df4876 
Signed-off-by: Dmitry Murzin <diralik@yandex.ru>
@dima74
Review fixes
efa0c51 
Signed-off-by: Dmitry Murzin <diralik@yandex.ru>
@dima74
Fix test_env.py
838ac4f 
Signed-off-by: Dmitry Murzin <diralik@yandex.ru>
@dima74
Fix ChainId
70e7e83 
Signed-off-by: Dmitry Murzin <diralik@yandex.ru>
@dima74
Simplify GenesisTransactionBuilder
18d3dd3 
Signed-off-by: Dmitry Murzin <diralik@yandex.ru>
@dima74
Use env for GENESIS_SIGNED_FILE in swarm
aeb0f90 
Signed-off-by: Dmitry Murzin <diralik@yandex.ru>
@dima74 dima74 force-pushed the diralik/remove-genesis-signing branch from 9b4908e to aeb0f90 Compare June 4, 2024 08:39
@mversic mversic enabled auto-merge (squash) June 4, 2024 09:33
@dima74 dima74 mentioned this pull request Jun 4, 2024
Open
@mversic mversic disabled auto-merge June 4, 2024 09:48
@mversic mversic enabled auto-merge (squash) June 4, 2024 09:48
@mversic mversic disabled auto-merge June 4, 2024 11:32
@nxsaken nxsaken enabled auto-merge (squash) June 4, 2024 11:40
@nxsaken nxsaken disabled auto-merge June 4, 2024 11:41
@nxsaken nxsaken merged commit 730ca75 into hyperledger:main Jun 4, 2024
8 of 9 checks passed
@dima74 dima74 mentioned this pull request Jun 4, 2024
Merged
5 tasks
nxsaken pushed a commit that referenced this pull request Jun 4, 2024
@dima74 @nxsaken
refactor!: Remove genesis signing from Iroha (#4673)
f5e3c49 
* refactor!: Remove genesis signing from Iroha
* Rename to genesis.signed.scale
* Review fixes
* Fix test_env.py
* Fix ChainId
* Simplify GenesisTransactionBuilder
* Use env for GENESIS_SIGNED_FILE in swarm

---------

Signed-off-by: Dmitry Murzin <diralik@yandex.ru>
@dima74 dima74 deleted the diralik/remove-genesis-signing branch June 4, 2024 18:30
@dima74 dima74 mentioned this pull request Jun 5, 2024
Merged
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DCNick3 DCNick3 DCNick3 approved these changes

@mversic mversic mversic approved these changes

@SamHSmith SamHSmith Awaiting requested review from SamHSmith SamHSmith is a code owner

@outoftardis outoftardis Awaiting requested review from outoftardis outoftardis is a code owner

@Erigara Erigara Awaiting requested review from Erigara Erigara is a code owner

@VAmuzing VAmuzing Awaiting requested review from VAmuzing

@0x009922 0x009922 Awaiting requested review from 0x009922 0x009922 is a code owner

@s8sato s8sato Awaiting requested review from s8sato s8sato is a code owner

Assignees

@dima74 dima74

@DCNick3 DCNick3

@0x009922 0x009922

@mversic mversic

Labels
config-changes Changes in configuration and start up of the Iroha
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Remove genesis signing from Iroha
6 participants
@dima74 @DCNick3 @0x009922 @mversic @s8sato @nxsaken