Skip to content

Commit

Permalink
[fix] #4287: use algorithm in PrivateKey serialized form (#4326)
Browse files Browse the repository at this point in the history
* [rename]: rename `digest` and `digest_function` to `algorithm`

Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com>

* [chore]: "fix" format

Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com>

---------

Signed-off-by: Dmitry Balashov <43530070+0x009922@users.noreply.github.com>
  • Loading branch information
0x009922 committed Feb 27, 2024
1 parent 4de547f commit fe2b301
Show file tree
Hide file tree
Showing 20 changed files with 118 additions and 109 deletions.
2 changes: 1 addition & 1 deletion client/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ mod tests {
[account]
id = "alice@wonderland"
public_key = "ed01207233BFC89DCBD68C19FDE6CE6158225298EC1131B6A130D1AEB454C1AB5183C0"
private_key = { digest_function = "ed25519", payload = "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0" }
private_key = { algorithm = "ed25519", payload = "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0" }

[transaction]
time_to_live = 100_000
Expand Down
4 changes: 2 additions & 2 deletions config/iroha_test_config.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
chain_id = "00000000-0000-0000-0000-000000000000"
public_key = "ed01201C61FAF8FE94E253B93114240394F79A607B7FA55F9E5A41EBEC74B88055768B"
private_key = { digest_function = "ed25519", payload = "282ED9F3CF92811C3818DBC4AE594ED59DC1A2F78E4241E31924E101D6B1FB831C61FAF8FE94E253B93114240394F79A607B7FA55F9E5A41EBEC74B88055768B" }
private_key = { algorithm = "ed25519", payload = "282ED9F3CF92811C3818DBC4AE594ED59DC1A2F78E4241E31924E101D6B1FB831C61FAF8FE94E253B93114240394F79A607B7FA55F9E5A41EBEC74B88055768B" }

[network]
address = "127.0.0.1:1337"

[genesis]
public_key = "ed01204CFFD0EE429B1BDD36B3910EC570852B8BB63F18750341772FB46BC856C5CAAF"
file = "./genesis.json"
private_key = { digest_function = "ed25519", payload = "D748E18CE60CB30DEA3E73C9019B7AF45A8D465E3D71BCC9A5EF99A008205E534CFFD0EE429B1BDD36B3910EC570852B8BB63F18750341772FB46BC856C5CAAF" }
private_key = { algorithm = "ed25519", payload = "D748E18CE60CB30DEA3E73C9019B7AF45A8D465E3D71BCC9A5EF99A008205E534CFFD0EE429B1BDD36B3910EC570852B8BB63F18750341772FB46BC856C5CAAF" }

[torii]
address = "127.0.0.1:8080"
Expand Down
40 changes: 20 additions & 20 deletions config/src/parameters/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -245,12 +245,12 @@ pub(crate) fn private_key_from_env<E: Error>(
env_key_base: impl AsRef<str>,
name_base: impl AsRef<str>,
) -> ParseEnvResult<PrivateKey> {
let digest_env = format!("{}_DIGEST", env_key_base.as_ref());
let digest_name = format!("{}.digest_function", name_base.as_ref());
let alg_env = format!("{}_ALGORITHM", env_key_base.as_ref());
let alg_name = format!("{}.algorithm", name_base.as_ref());
let payload_env = format!("{}_PAYLOAD", env_key_base.as_ref());
let payload_name = format!("{}.payload", name_base.as_ref());

let digest_function = ParseEnvResult::parse_simple(emitter, env, &digest_env, &digest_name);
let algorithm = ParseEnvResult::parse_simple(emitter, env, &alg_env, &alg_name);

// FIXME: errors handling is a mess
let payload = match env
Expand All @@ -266,13 +266,13 @@ pub(crate) fn private_key_from_env<E: Error>(
}
};

match (digest_function, payload) {
(ParseEnvResult::Value(digest_function), ParseEnvResult::Value(payload)) => {
match PrivateKey::from_hex(digest_function, &payload).wrap_err_with(|| {
match (algorithm, payload) {
(ParseEnvResult::Value(algorithm), ParseEnvResult::Value(payload)) => {
match PrivateKey::from_hex(algorithm, &payload).wrap_err_with(|| {
eyre!(
"failed to construct `{}` from `{}` and `{}` environment variables",
name_base.as_ref(),
&digest_env,
&alg_env,
&payload_env
)
}) {
Expand All @@ -285,14 +285,14 @@ pub(crate) fn private_key_from_env<E: Error>(
(ParseEnvResult::None, ParseEnvResult::None) => return ParseEnvResult::None,
(ParseEnvResult::Value(_), ParseEnvResult::None) => emitter.emit(eyre!(
"`{}` env was provided, but `{}` was not",
&digest_env,
&alg_env,
&payload_env
)),
(ParseEnvResult::None, ParseEnvResult::Value(_)) => {
emitter.emit(eyre!(
"`{}` env was provided, but `{}` was not",
&payload_env,
&digest_env
&alg_env
));
}
(ParseEnvResult::Error, _) | (_, ParseEnvResult::Error) => {
Expand Down Expand Up @@ -634,7 +634,7 @@ mod tests {
#[test]
fn parses_private_key_from_env() {
let env = TestEnv::new()
.set("PRIVATE_KEY_DIGEST", "ed25519")
.set("PRIVATE_KEY_ALGORITHM", "ed25519")
.set("PRIVATE_KEY_PAYLOAD", "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb");

let private_key = RootPartial::from_env(&env)
Expand All @@ -649,49 +649,49 @@ mod tests {
}

#[test]
fn fails_to_parse_private_key_in_env_without_digest() {
let env = TestEnv::new().set("PRIVATE_KEY_DIGEST", "ed25519");
fn fails_to_parse_private_key_in_env_without_payload() {
let env = TestEnv::new().set("PRIVATE_KEY_ALGORITHM", "ed25519");
let error =
RootPartial::from_env(&env).expect_err("private key is incomplete, should fail");
let expected = expect_test::expect![
"`PRIVATE_KEY_DIGEST` env was provided, but `PRIVATE_KEY_PAYLOAD` was not"
"`PRIVATE_KEY_ALGORITHM` env was provided, but `PRIVATE_KEY_PAYLOAD` was not"
];
expected.assert_eq(&format!("{error:#}"));
}

#[test]
fn fails_to_parse_private_key_in_env_without_payload() {
fn fails_to_parse_private_key_in_env_without_algorithm() {
let env = TestEnv::new().set("PRIVATE_KEY_PAYLOAD", "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb");
let error =
RootPartial::from_env(&env).expect_err("private key is incomplete, should fail");
let expected = expect_test::expect![
"`PRIVATE_KEY_PAYLOAD` env was provided, but `PRIVATE_KEY_DIGEST` was not"
"`PRIVATE_KEY_PAYLOAD` env was provided, but `PRIVATE_KEY_ALGORITHM` was not"
];
expected.assert_eq(&format!("{error:#}"));
}

#[test]
fn fails_to_parse_private_key_from_env_with_invalid_payload() {
let env = TestEnv::new()
.set("PRIVATE_KEY_DIGEST", "ed25519")
.set("PRIVATE_KEY_ALGORITHM", "ed25519")
.set("PRIVATE_KEY_PAYLOAD", "foo");

let error = RootPartial::from_env(&env).expect_err("input is invalid, should fail");

let expected = expect_test::expect!["failed to construct `iroha.private_key` from `PRIVATE_KEY_DIGEST` and `PRIVATE_KEY_PAYLOAD` environment variables"];
let expected = expect_test::expect!["failed to construct `iroha.private_key` from `PRIVATE_KEY_ALGORITHM` and `PRIVATE_KEY_PAYLOAD` environment variables"];
expected.assert_eq(&format!("{error:#}"));
}

#[test]
fn when_payload_provided_but_digest_is_invalid() {
fn when_payload_provided_but_alg_is_invalid() {
let env = TestEnv::new()
.set("PRIVATE_KEY_DIGEST", "foo")
.set("PRIVATE_KEY_ALGORITHM", "foo")
.set("PRIVATE_KEY_PAYLOAD", "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb");

let error = RootPartial::from_env(&env).expect_err("input is invalid, should fail");

// TODO: print the bad value and supported ones
let expected = expect_test::expect!["failed to parse `iroha.private_key.digest_function` field from `PRIVATE_KEY_DIGEST` env variable"];
let expected = expect_test::expect!["failed to parse `iroha.private_key.algorithm` field from `PRIVATE_KEY_ALGORITHM` env variable"];
expected.assert_eq(&format!("{error:#}"));
}

Expand Down
7 changes: 0 additions & 7 deletions config/test/config.toml

This file was deleted.

4 changes: 2 additions & 2 deletions config/tests/fixtures.rs
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,8 @@ fn multiple_env_parsing_errors() {
let error = RootPartial::from_env(&env).expect_err("the input from env is invalid");

let expected = expect_test::expect![[r#"
`PRIVATE_KEY_PAYLOAD` env was provided, but `PRIVATE_KEY_DIGEST` was not
failed to parse `genesis.private_key.digest_function` field from `GENESIS_PRIVATE_KEY_DIGEST` env variable
`PRIVATE_KEY_PAYLOAD` env was provided, but `PRIVATE_KEY_ALGORITHM` was not
failed to parse `genesis.private_key.algorithm` field from `GENESIS_PRIVATE_KEY_ALGORITHM` env variable
failed to parse `kura.debug.output_new_blocks` field from `KURA_DEBUG_OUTPUT_NEW_BLOCKS` env variable
failed to parse `logger.format` field from `LOG_FORMAT` env variable
failed to parse `torii.address` field from `API_ADDRESS` env variable"#]];
Expand Down
2 changes: 1 addition & 1 deletion config/tests/fixtures/absolute_paths.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ out_file = "/telemetry/file.json"

[genesis]
file = "/oh/my/genesis.json"
private_key = { digest_function = "ed25519", payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb" }
private_key = { algorithm = "ed25519", payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb" }
2 changes: 1 addition & 1 deletion config/tests/fixtures/bad.multiple_bad_envs.env
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PRIVATE_KEY_PAYLOAD=8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb
GENESIS_PRIVATE_KEY_DIGEST=BAD BAD BAD
GENESIS_PRIVATE_KEY_ALGORITHM=BAD BAD BAD
GENESIS_PRIVATE_KEY_PAYLOAD=8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb
API_ADDRESS=BAD BAD BAD
KURA_DEBUG_OUTPUT_NEW_BLOCKS=TrueЪ
Expand Down
2 changes: 1 addition & 1 deletion config/tests/fixtures/base.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
chain_id = "0"
public_key = "ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB"
private_key.digest_function = "ed25519"
private_key.algorithm = "ed25519"
private_key.payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb"

[network]
Expand Down
4 changes: 2 additions & 2 deletions config/tests/fixtures/full.env
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
CHAIN_ID=0-0
PUBLIC_KEY=ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB
PRIVATE_KEY_DIGEST=ed25519
PRIVATE_KEY_ALGORITHM=ed25519
PRIVATE_KEY_PAYLOAD=8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb
P2P_ADDRESS=127.0.0.1:5432
GENESIS_PUBLIC_KEY=ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB
GENESIS_PRIVATE_KEY_DIGEST=ed25519
GENESIS_PRIVATE_KEY_ALGORITHM=ed25519
GENESIS_PRIVATE_KEY_PAYLOAD=8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb
API_ADDRESS=127.0.0.1:8080
KURA_INIT_MODE=strict
Expand Down
4 changes: 2 additions & 2 deletions config/tests/fixtures/full.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

chain_id = "0"
public_key = "ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB"
private_key = { digest_function = "ed25519", payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb" }
private_key = { algorithm = "ed25519", payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb" }

[genesis]
file = "genesis.json"
public_key = "ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB"
private_key = { digest_function = "ed25519", payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb" }
private_key = { algorithm = "ed25519", payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb" }

[network]
address = "localhost:3840"
Expand Down
2 changes: 1 addition & 1 deletion config/tests/fixtures/inconsistent_genesis.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
extends = "base.toml"

[genesis]
private_key.digest_function = "ed25519"
private_key.algorithm = "ed25519"
private_key.payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb"
# should fail without it:
# file = ...
2 changes: 1 addition & 1 deletion config/tests/fixtures/minimal_alone_with_genesis.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ extends = "base.toml"

[genesis]
file = "./empty_ok_genesis.json"
private_key.digest_function = "ed25519"
private_key.algorithm = "ed25519"
private_key.payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb"
2 changes: 1 addition & 1 deletion config/tests/fixtures/minimal_file_and_env.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ extends = "base_trusted_peers.toml"

chain_id = "0"
public_key = "ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB"
private_key.digest_function = "ed25519"
private_key.algorithm = "ed25519"
private_key.payload = "8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb"

[network]
Expand Down
2 changes: 1 addition & 1 deletion configs/swarm/client.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ password = "ilovetea"
[account]
id = "alice@wonderland"
public_key = "ed01207233BFC89DCBD68C19FDE6CE6158225298EC1131B6A130D1AEB454C1AB5183C0"
private_key = { digest_function = "ed25519", payload = "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0" }
private_key = { algorithm = "ed25519", payload = "9ac47abf59b356e0bd7dcbbbb4dec080e302156a48ca907e47cb6aea1d32719e7233bfc89dcbd68c19fde6ce6158225298ec1131b6a130d1aeb454c1ab5183c0" }
10 changes: 5 additions & 5 deletions configs/swarm/docker-compose.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: 8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb
P2P_ADDRESS: 0.0.0.0:1337
API_ADDRESS: 0.0.0.0:8080
GENESIS_PUBLIC_KEY: ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4
GENESIS_PRIVATE_KEY_DIGEST: ed25519
GENESIS_PRIVATE_KEY_ALGORITHM: ed25519
GENESIS_PRIVATE_KEY_PAYLOAD: 82b3bde54aebeca4146257da0de8d59d8e46d5fe34887dcd8072866792fcb3ad4164bf554923ece1fd412d241036d863a6ae430476c898248b8237d77534cfc4
GENESIS_FILE: /config/genesis.json
SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha1:1338","public_key":"ed0120815BBDC9775D28C3633269B25F22D048E2AA2E36017CBE5AD85F15220BEB6F6F"},{"address":"iroha3:1340","public_key":"ed0120A66522370D60B9C09E79ADE2E9BB1EF2E78733A944B999B3A6AEE687CE476D61"},{"address":"iroha2:1339","public_key":"ed0120F417E0371E6ADB32FD66749477402B1AB67F84A8E9B082E997980CC91F327736"}]'
Expand All @@ -37,7 +37,7 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed0120815BBDC9775D28C3633269B25F22D048E2AA2E36017CBE5AD85F15220BEB6F6F
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: c02ffad5e455e7ec620d74de5769681e4d8385906bce5a437eb67452a9efbbc2815bbdc9775d28c3633269b25f22d048e2aa2e36017cbe5ad85f15220beb6f6f
P2P_ADDRESS: 0.0.0.0:1338
API_ADDRESS: 0.0.0.0:8081
Expand All @@ -61,7 +61,7 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed0120F417E0371E6ADB32FD66749477402B1AB67F84A8E9B082E997980CC91F327736
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: 29c5ed1409cb10fd791bc4ff8a6cb5e22a5fae7e36f448ef3ea2988b1319a88bf417e0371e6adb32fd66749477402b1ab67f84a8e9b082e997980cc91f327736
P2P_ADDRESS: 0.0.0.0:1339
API_ADDRESS: 0.0.0.0:8082
Expand All @@ -85,7 +85,7 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed0120A66522370D60B9C09E79ADE2E9BB1EF2E78733A944B999B3A6AEE687CE476D61
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: 5eed4855fad183c451aac39dfc50831607e4cf408c98e2b977f3ce4a2df42ce2a66522370d60b9c09e79ade2e9bb1ef2e78733a944b999b3a6aee687ce476d61
P2P_ADDRESS: 0.0.0.0:1340
API_ADDRESS: 0.0.0.0:8083
Expand Down
4 changes: 2 additions & 2 deletions configs/swarm/docker-compose.single.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: 8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb
P2P_ADDRESS: 0.0.0.0:1337
API_ADDRESS: 0.0.0.0:8080
GENESIS_PUBLIC_KEY: ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4
GENESIS_PRIVATE_KEY_DIGEST: ed25519
GENESIS_PRIVATE_KEY_ALGORITHM: ed25519
GENESIS_PRIVATE_KEY_PAYLOAD: 82b3bde54aebeca4146257da0de8d59d8e46d5fe34887dcd8072866792fcb3ad4164bf554923ece1fd412d241036d863a6ae430476c898248b8237d77534cfc4
GENESIS_FILE: /config/genesis.json
ports:
Expand Down
10 changes: 5 additions & 5 deletions configs/swarm/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed01208BA62848CF767D72E7F7F4B9D2D7BA07FEE33760F79ABE5597A51520E292A0CB
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: 8f4c15e5d664da3f13778801d23d4e89b76e94c1b94b389544168b6cb894f84f8ba62848cf767d72e7f7f4b9d2d7ba07fee33760f79abe5597a51520e292a0cb
P2P_ADDRESS: 0.0.0.0:1337
API_ADDRESS: 0.0.0.0:8080
GENESIS_PUBLIC_KEY: ed01204164BF554923ECE1FD412D241036D863A6AE430476C898248B8237D77534CFC4
GENESIS_PRIVATE_KEY_DIGEST: ed25519
GENESIS_PRIVATE_KEY_ALGORITHM: ed25519
GENESIS_PRIVATE_KEY_PAYLOAD: 82b3bde54aebeca4146257da0de8d59d8e46d5fe34887dcd8072866792fcb3ad4164bf554923ece1fd412d241036d863a6ae430476c898248b8237d77534cfc4
GENESIS_FILE: /config/genesis.json
SUMERAGI_TRUSTED_PEERS: '[{"address":"iroha1:1338","public_key":"ed0120815BBDC9775D28C3633269B25F22D048E2AA2E36017CBE5AD85F15220BEB6F6F"},{"address":"iroha3:1340","public_key":"ed0120A66522370D60B9C09E79ADE2E9BB1EF2E78733A944B999B3A6AEE687CE476D61"},{"address":"iroha2:1339","public_key":"ed0120F417E0371E6ADB32FD66749477402B1AB67F84A8E9B082E997980CC91F327736"}]'
Expand All @@ -37,7 +37,7 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed0120815BBDC9775D28C3633269B25F22D048E2AA2E36017CBE5AD85F15220BEB6F6F
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: c02ffad5e455e7ec620d74de5769681e4d8385906bce5a437eb67452a9efbbc2815bbdc9775d28c3633269b25f22d048e2aa2e36017cbe5ad85f15220beb6f6f
P2P_ADDRESS: 0.0.0.0:1338
API_ADDRESS: 0.0.0.0:8081
Expand All @@ -61,7 +61,7 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed0120F417E0371E6ADB32FD66749477402B1AB67F84A8E9B082E997980CC91F327736
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: 29c5ed1409cb10fd791bc4ff8a6cb5e22a5fae7e36f448ef3ea2988b1319a88bf417e0371e6adb32fd66749477402b1ab67f84a8e9b082e997980cc91f327736
P2P_ADDRESS: 0.0.0.0:1339
API_ADDRESS: 0.0.0.0:8082
Expand All @@ -85,7 +85,7 @@ services:
environment:
CHAIN_ID: 00000000-0000-0000-0000-000000000000
PUBLIC_KEY: ed0120A66522370D60B9C09E79ADE2E9BB1EF2E78733A944B999B3A6AEE687CE476D61
PRIVATE_KEY_DIGEST: ed25519
PRIVATE_KEY_ALGORITHM: ed25519
PRIVATE_KEY_PAYLOAD: 5eed4855fad183c451aac39dfc50831607e4cf408c98e2b977f3ce4a2df42ce2a66522370d60b9c09e79ade2e9bb1ef2e78733a944b999b3a6aee687ce476d61
P2P_ADDRESS: 0.0.0.0:1340
API_ADDRESS: 0.0.0.0:8083
Expand Down
Loading

0 comments on commit fe2b301

Please sign in to comment.