From 02bc23c3706fb4324f6c2109ce3279196c0300cb Mon Sep 17 00:00:00 2001 From: Javier Cortejoso Date: Fri, 1 Feb 2019 17:48:02 +0100 Subject: [PATCH] Fix nodes same network for Spree --- compose-files/nodes/spree_node.yml | 1 + compose-files/secret_store.yml | 10 +- networks/secret-store/config/chain.json | 124 +++++++++++++++++++---- networks/secret-store/config/config.toml | 16 +-- 4 files changed, 119 insertions(+), 32 deletions(-) diff --git a/compose-files/nodes/spree_node.yml b/compose-files/nodes/spree_node.yml index 642df6e..28688d3 100644 --- a/compose-files/nodes/spree_node.yml +++ b/compose-files/nodes/spree_node.yml @@ -13,6 +13,7 @@ services: --jsonrpc-hosts all --jsonrpc-apis all --unsafe-expose + --no-warp --unlock 0x00bd138abd70e2f00903268f3db08f2d25677c9e volumes: - ../networks/spree/config:/home/parity/config diff --git a/compose-files/secret_store.yml b/compose-files/secret_store.yml index 095842d..eea2735 100644 --- a/compose-files/secret_store.yml +++ b/compose-files/secret_store.yml @@ -13,11 +13,11 @@ services: --jsonrpc-interface all --jsonrpc-hosts all --jsonrpc-apis all - --base-path /secret-store/ + --no-warp volumes: - ../networks/secret-store/config/:/etc/parity/secretstore/ - secret-store:/secret-store/ - - ../networks/secret-store/keys/:/secret-store/keys/secretstore/ + - ../networks/secret-store/keys/:/parity_data/keys/spree/ - ${KEEPER_ARTIFACTS_FOLDER}:/contracts ports: - 12000:12000 @@ -42,16 +42,18 @@ services: secret-store-signing-node: image: parity/parity:stable command: - --chain dev + --chain /etc/parity/secretstore/chain.json --light --jsonrpc-interface all --jsonrpc-apis secretstore --jsonrpc-cors all + --no-warp --keys-path /home/parity/.local/keys ports: - 9545:8545 volumes: - - ../networks/secret-store/keys:/home/parity/.local/keys/DevelopmentChain:ro + - ../networks/secret-store/keys:/home/parity/.local/keys/spree:ro + - ../networks/secret-store/config/:/etc/parity/secretstore/ networks: backend: ipv4_address: 172.15.0.18 diff --git a/networks/secret-store/config/chain.json b/networks/secret-store/config/chain.json index 2e0bc84..4affcaf 100644 --- a/networks/secret-store/config/chain.json +++ b/networks/secret-store/config/chain.json @@ -1,32 +1,39 @@ { - "name": "secretstore", + "name": "spree", "engine": { "authorityRound": { "params": { "stepDuration": "1", "validators": { "list": [ - "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e", - "0x00Aa39d30F0D20FF03a22cCfc30B7EfbFca597C2", - "0x002e28950558fbede1a9675cb113f0bd20912019" + "0x00bd138abd70e2f00903268f3db08f2d25677c9e", + "0xf4a2dbd5d67ef3019a7e4b188b92128c86d76bf9", + "0xcdbe5f61fac89e2cfcfa3727805d5cb8bc4f9afd" ] }, "validateScoreTransition": 1000000000, "validateStepTransition": 1500000000, - "maximumUncleCount": 1000000000 + "maximumUncleCount": 1000000000 } } }, "params": { + "gasLimitBoundDivisor": "0x0400", + "accountStartNonce": "0x0", "maximumExtraDataSize": "0x20", "minGasLimit": "0x1388", - "networkID": "0x2325", - "gasLimitBoundDivisor": "0x400", - "eip140Transition": 0, - "eip211Transition": 0, - "eip214Transition": 0, - "eip658Transition": 0 - + "networkID": "0x2324", + "eip140Transition": "0x0", + "eip211Transition": "0x0", + "eip214Transition": "0x0", + "eip658Transition": "0x0", + "wasmActivationTransition": "0x0", + "eip145Transition": "0x0", + "eip1014Transition": "0x0", + "eip1052Transition": "0x0", + "eip1283Transition": "0x0", + "kip4Transition": "0x0", + "kip6Transition": "0x0" }, "genesis": { "seal": { @@ -87,20 +94,95 @@ } } }, - "0x6B0c56d1Ad5144b4d37fa6e27DC9afd5C2435c3B": { - "balance": "0x200000000000000000000000000000000000000000000000" + "0x0000000000000000000000000000000000000005": { + "balance": "1", + "builtin": { + "name": "modexp", + "activate_at": 0, + "pricing": { + "modexp": { + "divisor": 20 + } + } + } }, - "0x0011598De1016A350ad719D23586273804076774": { - "balance": "0x200000000000000000000000000000000000000000000000" + "0x0000000000000000000000000000000000000006": { + "balance": "1", + "builtin": { + "name": "alt_bn128_add", + "activate_at": 0, + "pricing": { + "linear": { + "base": 500, + "word": 0 + } + } + } }, - "0x068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0": { - "balance": "0x200000000000000000000000000000000000000000000000" + "0x0000000000000000000000000000000000000007": { + "balance": "1", + "builtin": { + "name": "alt_bn128_mul", + "activate_at": 0, + "pricing": { + "linear": { + "base": 40000, + "word": 0 + } + } + } }, - "0xa99d43d86a0758d5632313b8fa3972b6088a21bb": { - "balance": "0x200000000000000000000000000000000000000000000000" + "0x0000000000000000000000000000000000000008": { + "balance": "1", + "builtin": { + "name": "alt_bn128_pairing", + "activate_at": 0, + "pricing": { + "alt_bn128_pairing": { + "base": 100000, + "pair": 80000 + } + } + } }, "0x00Bd138aBD70e2F00903268F3Db08f2D25677C9e": { - "balance": "0x200000000000000000000000000000000000000000000000" + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0x068Ed00cF0441e4829D9784fCBe7b9e26D4BD8d0": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xA99D43d86A0758d5632313b8fA3972B6088A21BB": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xe2DD09d719Da89e5a3D0F2549c7E24566e947260": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xBE5449a6A97aD46c8558A3356267Ee5D2731ab5e": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xA78deb2Fa79463945C247991075E2a0e98Ba7A09": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0x02354A1F160A3fd7ac8b02ee91F04104440B28E7": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xe17D2A07EFD5b112F4d675ea2d122ddb145d117B": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xA32C84D2B44C041F3a56afC07a33f8AC5BF1A071": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xFF3fE9eb218EAe9ae1eF9cC6C4db238B770B65CC": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0x529043886F21D9bc1AE0feDb751e34265a246e47": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xe08A1dAe983BC701D05E492DB80e0144f8f4b909": { + "balance": "0x33B2E3C9FD0803CE8000000" + }, + "0xbcE5A3468386C64507D30136685A99cFD5603135": { + "balance": "0x33B2E3C9FD0803CE8000000" } } } diff --git a/networks/secret-store/config/config.toml b/networks/secret-store/config/config.toml index be5cf44..44a9023 100644 --- a/networks/secret-store/config/config.toml +++ b/networks/secret-store/config/config.toml @@ -19,16 +19,18 @@ disable = true [websockets] disable = true -[mining] -engine_signer = "0xa1345ed0b2d1e193aead673e33dac56515af128a" -reseal_on_txs = "none" -usd_per_tx = "0" +#[mining] +#engine_signer = "0xa1345ed0b2d1e193aead673e33dac56515af128a" +#reseal_on_txs = "none" +#usd_per_tx = "0" [network] port = 30303 +discovery = true bootnodes = [ - "enode://16bddd0215f9bb8a9328671b7b1554a7811cf310065fde04248ce4cea92fe2831412894c912e6b9e45019d5011631452055a5c1873f2d6760baa95f51c449787@172.15.0.13:30303", - "enode://bd97feab0fdd069c3fe1f260285053f6a6fa6eaa840bfd6730a1ce6b0b9eccef616bfca7b498fb04c02f5fb9ecd8c40617c32acbdd4b55d306a3f4468b6885f2@172.15.0.12:30303" + "enode://58d05d6cafec4db9d228bc07719ba02e425684b3ce0b98b0906dbdb697a9416a272826e6661c3818ae1827532522d8e933bd562ad9749a7f8f57d774b4dc372d@172.15.0.12:30303", + "enode://957962442471ea27ecdbc7185b992f06841b6385109757c3efb80f04b005ee326fdeca80117629e9258888fb6deb337e88b4c7dabc534d4d7470b613d7d06f6b@172.15.0.13:30303", + "enode://adecdb030a3921885ad9f53d70d5a8e564994ad6e8f1981acf6f67f0a90f95ecde07e5bf975a75757b408d273e5ff68b08ceda4de576eabc2aa75997a418b65f@172.15.0.18:30303" ] [ipfs] @@ -43,7 +45,7 @@ disable = false disable_http = false # This node will expose a Secret Store HTTP API http_interface = "all" # The HTTP API is available locally only http_port = 12001 # The Secret Store HTTP API is available at this port -acl_contract = "none" # Insecure, will be changed later on +acl_contract = "none" server_set_contract = "none" nodes = [ "7cb22f9a17e8880f8009b519b3506fa9d52fe0ff315f68d0dc0be9576f116818be5f3843c3e4e57aecea40bdd14c8539f5714a51d3254c2955d8a9f1ea9723dc@172.15.0.13:12000"