Fix Nile and Kovan SS

compose-files/nodes/kovan_node.yml

@@ -13,6 +13,7 @@ services:
       --jsonrpc-hosts all
       --jsonrpc-apis all
       --unsafe-expose
+      --node-key 0xb3244c104fb56d28d3979f6cd14a8b5cf5b109171d293f4454c97c173a9f9374
     volumes:
       - ../networks/kovan/keys:/home/parity/.local/share/io.parity.ethereum/keys/kovan
     ports:

compose-files/nodes/nile_node.yml

@@ -2,6 +2,7 @@ version: '2.1'
 services:
   keeper-node:
     image: parity/parity:stable
+    # entrypoint: tail -f /dev/null
     command:
       --config /home/parity/parity/config/config.toml
       --db-path /home/parity/chains
@@ -15,13 +16,13 @@ services:
       --jsonrpc-apis all
       --unsafe-expose
       --unlock 0x00bd138abd70e2f00903268f3db08f2d25677c9e
+      --node-key 0xb3244c104fb56d28d3979f6cd14a8b5cf5b109171d293f4454c97c173a9f9374
     volumes:
       - ../networks/nile/config:/home/parity/parity/config
       - keeper-node:/home/parity/.local/share/io.parity.ethereum/
+      - ../networks/nile/keys:/home/parity/.local/share/io.parity.ethereum/keys
       - ../networks/nile/authorities/validator0.json:/home/parity/.local/share/io.parity.ethereum/keys/nile/validator.json
-      - ../networks/nile/keys:/home/parity/.local/share/io.parity.ethereum/keys/nile
       - ../networks/nile/authorities/validator0.pwd:/home/parity/parity/validator.pwd
-      - ../networks/nile/node0.network.key:/home/parity/.local/share/io.parity.ethereum/network/key
     ports:
       - 8545:8545
     networks:

compose-files/nodes/spree_node.yml

@@ -15,12 +15,13 @@ services:
       --unsafe-expose
       --no-warp
       --unlock 0x00bd138abd70e2f00903268f3db08f2d25677c9e
+      --node-key 0xb3244c104fb56d28d3979f6cd14a8b5cf5b109171d293f4454c97c173a9f9374
+      # -l jsonrpc,discovery,chain,client,import,secretstore_net,privatetx=trace
     volumes:
       - ../networks/spree/config:/home/parity/config
       - ../networks/spree/authorities/validator0.json:/home/parity/.local/keys/spree/validator.json
       - ../networks/spree/keys:/home/parity/.local/keys/spree
       - ../networks/spree/authorities/validator0.pwd:/home/parity/validator.pwd:ro
-      - ../networks/spree/node0.network.key:/home/parity/.local/share/io.parity.ethereum/network/key:ro
     ports:
       - 8545:8545
     networks:

compose-files/secret_store.yml

@@ -8,16 +8,21 @@ services:
       ACL_CONTRACT_ADDRESS: "${ACL_CONTRACT_ADDRESS}"
       NETWORK: "${KEEPER_NETWORK_NAME}"
     command:
+      --chain /etc/parity/secretstore/chain_${KEEPER_NETWORK_NAME}.json
       --config /etc/parity/secretstore/config.toml
       --jsonrpc-cors all
       --jsonrpc-interface all
       --jsonrpc-hosts all
       --jsonrpc-apis all
       --no-warp
+      --node-key 0x32313aee5977ca63184b696e4cf7b7bfc2745f727dbef82d7a1f6314ad58dcf5
+      --reserved-peers /etc/parity/secretstore/peers_${KEEPER_NETWORK_NAME}.txt
+      -l secretstore_net,secretstore=trace
+      # -l jsonrpc,discovery,chain,client,import,secretstore_net,privatetx=trace
     volumes:
       - ../networks/secret-store/config/:/etc/parity/secretstore/
       - secret-store:/secret-store/
-      - ../networks/secret-store/keys/:/parity_data/keys/spree/
+      - ../networks/secret-store/keys:/parity_data/keys
       - ${KEEPER_ARTIFACTS_FOLDER}:/contracts
     ports:
       - 12000:12000
@@ -42,17 +47,19 @@ services:
   secret-store-signing-node:
     image: parity/parity:stable
     command:
-      --chain /etc/parity/secretstore/chain.json
+      --chain /etc/parity/secretstore/chain_${KEEPER_NETWORK_NAME}.json
       --light
       --jsonrpc-interface all
       --jsonrpc-apis secretstore
       --jsonrpc-cors all
       --no-warp
       --keys-path /home/parity/.local/keys
+      --node-key 0x27881af7f75724e25a9818f6c8e719895c8c9d3512003fc8ad0f47d762a07a79
+      --reserved-peers /etc/parity/secretstore/peers_${KEEPER_NETWORK_NAME}.txt
     ports:
       - 9545:8545
     volumes:
-      - ../networks/secret-store/keys:/home/parity/.local/keys/spree:ro
+      - ../networks/secret-store/keys:/home/parity/.local/keys
       - ../networks/secret-store/config/:/etc/parity/secretstore/
     networks:
       backend:

networks/nile/node0.network.key

@@ -1 +0,0 @@
-b3244c104fb56d28d3979f6cd14a8b5cf5b109171d293f4454c97c173a9f9374

networks/nile/node1.network.key

@@ -1 +0,0 @@
-c07b4807e704dfff975d82fc807a3da7947838379007b49c51f6a04faf4cdea8

networks/nile/node2.network.key

@@ -1 +0,0 @@
-d8bf44e2b69604bde8c84c4b403114f4410dc4f57d80e026b24b8f1af70d5633

networks/secret-store/config/chain_nile.json

@@ -0,0 +1,150 @@
+{
+  "name": "nile",
+  "engine": {
+    "authorityRound": {
+      "params": {
+        "stepDuration": "5",
+        "validators": {
+          "list": [
+            "0xa1345ed0b2d1e193aead673e33dac56515af128a",
+            "0xf4a2dbd5d67ef3019a7e4b188b92128c86d76bf9",
+            "0xcdbe5f61fac89e2cfcfa3727805d5cb8bc4f9afd"
+          ]
+        },
+        "validateScoreTransition": 1000000000,
+        "validateStepTransition": 1500000000,
+        "maximumUncleCount": 1000000000
+      }
+    }
+  },
+  "params": {
+    "maximumExtraDataSize": "0x20",
+    "minGasLimit": "0x1388",
+    "networkID": "0x2323",
+    "gasLimitBoundDivisor": "0x400",
+    "eip140Transition": 0,
+    "eip211Transition": 0,
+    "eip214Transition": 0,
+    "eip658Transition": 0
+  },
+  "genesis": {
+    "seal": {
+      "authorityRound": {
+        "step": "0x0",
+        "signature": "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+      }
+    },
+    "difficulty": "0x20000",
+    "gasLimit": "0x165A0BC00"
+  },
+  "accounts": {
+    "0x0000000000000000000000000000000000000001": {
+      "balance": "1",
+      "builtin": {
+        "name": "ecrecover",
+        "pricing": {
+          "linear": {
+            "base": 3000,
+            "word": 0
+          }
+        }
+      }
+    },
+    "0x0000000000000000000000000000000000000002": {
+      "balance": "1",
+      "builtin": {
+        "name": "sha256",
+        "pricing": {
+          "linear": {
+            "base": 60,
+            "word": 12
+          }
+        }
+      }
+    },
+    "0x0000000000000000000000000000000000000003": {
+      "balance": "1",
+      "builtin": {
+        "name": "ripemd160",
+        "pricing": {
+          "linear": {
+            "base": 600,
+            "word": 120
+          }
+        }
+      }
+    },
+    "0x0000000000000000000000000000000000000004": {
+      "balance": "1",
+      "builtin": {
+        "name": "identity",
+        "pricing": {
+          "linear": {
+            "base": 15,
+            "word": 3
+          }
+        }
+      }
+    },
+    "0xf5d60efcad44babc8d85eb8df57d9e3a5101eb93": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x61f9546cd2bd5e46bdb915ab9c69210c6ee043d2": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x8d968b9bc8fe3b1d233ae6238c771544dd7c8fb2": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x63132a33765fe352187c93e45fac1b9162399e5c": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x95a165da81359c11aafb4490fe6afeb6ee4f7c2e": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x9224dff492427471092d13b36866875d7e0f2dd6": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x9aa9bfa819800a44803dcacc514bb443a2baade6": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x85ef014983c1bad421cc00941c18122066da5860": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xc6fffcb664a60c019a335902112584829a91c0a0": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xdbb63fb51453714f5efed3c2846160018fb3f43c": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x23be64786fe4467635e65aea49f9dd7a0b05d7b5": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x3c80c7163c1e6730f2ba80df707178dcdee44475": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xe49c5f9c8a78884c8ba2aa161b8c41bf21b96751": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xf7f2673e854e7b33a62beec796dec5d61ac9c40a": {
+      "balance": "0x2000000000000000000"
+    },
+    "0xe739ed3643970d106c4b1c51de91b7992400e50c": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x85a7273ff4f4ffce0c708f47ab45249867679bcf": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x4156e7abdfe6e08c16ef2b241661276af57f9ead": {
+      "balance": "0x2000000000000000000"
+    },
+    "0x480b0e0a641ae45521377d4984d085a003934561": {
+      "balance": "0x200000000000000000000000"
+    },
+    "0xb08eb95236499f072b2ae3c91a8f911d6c853b4d": {
+      "balance": "0x200000000000000000000000"
+    },
+    "0x4899f06b5e60140f1885599bf3a562cb25775adc": {
+      "balance": "0x200000000000000000000000"
+    }
+  }
+}

networks/secret-store/config/config.toml

@@ -27,11 +27,6 @@ disable = true
 [network]
 port = 30303
 discovery = true
-bootnodes = [
-  "enode://58d05d6cafec4db9d228bc07719ba02e425684b3ce0b98b0906dbdb697a9416a272826e6661c3818ae1827532522d8e933bd562ad9749a7f8f57d774b4dc372d@172.15.0.12:30303",
-  "enode://957962442471ea27ecdbc7185b992f06841b6385109757c3efb80f04b005ee326fdeca80117629e9258888fb6deb337e88b4c7dabc534d4d7470b613d7d06f6b@172.15.0.13:30303",
-  "enode://adecdb030a3921885ad9f53d70d5a8e564994ad6e8f1981acf6f67f0a90f95ecde07e5bf975a75757b408d273e5ff68b08ceda4de576eabc2aa75997a418b65f@172.15.0.18:30303"
-]
 
 [ipfs]
 enable = false
@@ -45,7 +40,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"
+acl_contract = "6bd5fdc37b9c87ba73dda230e5dc18e9fda71ff9"
 server_set_contract = "none"
 nodes = [
   "7cb22f9a17e8880f8009b519b3506fa9d52fe0ff315f68d0dc0be9576f116818be5f3843c3e4e57aecea40bdd14c8539f5714a51d3254c2955d8a9f1ea9723dc@172.15.0.13:12000"

networks/secret-store/config/peers_nile.txt

@@ -0,0 +1,6 @@
+enode://e90d77ad3065d0767abe08cdd47746c29fae578e8d1c06aacc30da720dd7fd8c8aa0e1e2ca2bb20c4739edff82e5e7405a382cf17af6a4366e2540f72e46e829@18.210.120.241:30303
+enode://204b11794d16f382bab24a7cdde5ec1273b8c6c2b23e64560d7ef1707708158a45300e920607aa413633e45c5eea472c17f474866ce5901515249abfbe9c4e1c@35.171.30.2:30303
+enode://6881fbbf8f2400c05c61b696af7bb2be04ab22ce64d5221906b9c1c67f2bf976b71cd1d98be7743dfc139a7b590fe230212195714e71f2204252caf68f6f94c0@54.163.9.188:30303
+enode://65f9c708cd96fb4c1cfb80451ca8c304ca99660b92445b1da6323c5965332f37d4cf2c17d68ee9b413de6ce87c47c1e0a66e8d05ebe634e7ba559c67d0ec8853@172.15.0.12:30303
+enode://030ba626855043909feec09dfa03b9b186512156ea1dc6225801f014ba49b6b8ca1579287043da69645b8fb40a8685a05bcf35949b7363749bad89611eeebeea@172.15.0.13:30303
+enode://9495e2c34639ae6a8dbabfe7cb038d17be5e65879736b1fb56d0bfeaa01aa25f3802f45e774aae5ef7887bced5ed87a6490da75a1d894f6c7b09e6d6de62970d@172.15.0.18:30303

networks/secret-store/config/peers_spree.txt

@@ -0,0 +1,3 @@
+enode://65f9c708cd96fb4c1cfb80451ca8c304ca99660b92445b1da6323c5965332f37d4cf2c17d68ee9b413de6ce87c47c1e0a66e8d05ebe634e7ba559c67d0ec8853@172.15.0.12:30303
+enode://030ba626855043909feec09dfa03b9b186512156ea1dc6225801f014ba49b6b8ca1579287043da69645b8fb40a8685a05bcf35949b7363749bad89611eeebeea@172.15.0.13:30303
+enode://9495e2c34639ae6a8dbabfe7cb038d17be5e65879736b1fb56d0bfeaa01aa25f3802f45e774aae5ef7887bced5ed87a6490da75a1d894f6c7b09e6d6de62970d@172.15.0.18:30303

networks/secret-store/keys/nile/account1.json

@@ -0,0 +1,22 @@
+{
+  "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "a874e6fe50a5bb088826c45560dc1b7e"
+    },
+    "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c"
+    },
+    "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44"
+  },
+  "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0",
+  "name": "",
+  "meta": "{}"
+}

networks/secret-store/keys/nile/account2.json

@@ -0,0 +1,22 @@
+{
+  "id": "ce455fdd-11fd-5a71-0a31-9d0bec6a605d",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "56b27c187d45aab59377869042b948aa"
+    },
+    "ciphertext": "c774b879793e2e54b85071d929cc7fbb11b47f6bab6e590edf3997fe4373eaf8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "33b3b99e4c6f7f6d7d804555d40c08e4a2acba20e1e46aca712c82c3b9bab749"
+    },
+    "mac": "10ee295ce6b1553887413f0e717ccedc1bddb62572bb9208ec3bd091085990db"
+  },
+  "address": "a99d43d86a0758d5632313b8fa3972b6088a21bb",
+  "name": "",
+  "meta": "{}"
+}

networks/secret-store/keys/nile/address_book.json

@@ -0,0 +1 @@
+{}

networks/secret-store/keys/nile/ss1.json

@@ -0,0 +1,23 @@
+{
+  "id": "cb4f3330-9f0f-cd4d-d554-5aa6442b10be",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "937c23da18782823c3a44b33a48f5422"
+    },
+    "ciphertext": "10573d6899aee16f08ad747d70ffdd3df46a515b1a346f1456fe9ecf4e0771e5",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "838feb11a3e307cf9e5677e061e3fbd322dcb202e96a824d14c9b10d3147d1f1"
+    },
+    "mac": "15ff1a017d21dca4dd2d10064665ea14f9ccab91fd4337c7b00a564bb333fffe"
+  },
+  "address": "a1345ed0b2d1e193aead673e33dac56515af128a",
+  "name": "",
+  "meta": "{}"
+}
+

networks/secret-store/keys/spree/account1.json

@@ -0,0 +1,22 @@
+{
+  "id": "50aa801a-8d66-1402-1fa4-d8987868c2ce",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "a874e6fe50a5bb088826c45560dc1b7e"
+    },
+    "ciphertext": "2383c6aa50c744b6558e77b5dcec6137f647c81f10f71f22a87321fd1306056c",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "eca6ccc9fbb0bdc3a516c7576808ba5031669e6878f3bb95624ddb46449e119c"
+    },
+    "mac": "14e9a33a45ae32f88a0bd5aac14521c1fcf14f56fd55c1a1c080b2f81ddb8d44"
+  },
+  "address": "068ed00cf0441e4829d9784fcbe7b9e26d4bd8d0",
+  "name": "",
+  "meta": "{}"
+}

networks/secret-store/keys/spree/account2.json

@@ -0,0 +1,22 @@
+{
+  "id": "ce455fdd-11fd-5a71-0a31-9d0bec6a605d",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "56b27c187d45aab59377869042b948aa"
+    },
+    "ciphertext": "c774b879793e2e54b85071d929cc7fbb11b47f6bab6e590edf3997fe4373eaf8",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "33b3b99e4c6f7f6d7d804555d40c08e4a2acba20e1e46aca712c82c3b9bab749"
+    },
+    "mac": "10ee295ce6b1553887413f0e717ccedc1bddb62572bb9208ec3bd091085990db"
+  },
+  "address": "a99d43d86a0758d5632313b8fa3972b6088a21bb",
+  "name": "",
+  "meta": "{}"
+}

networks/secret-store/keys/spree/address_book.json

@@ -0,0 +1 @@
+{}

networks/secret-store/keys/spree/ss1.json

@@ -0,0 +1,23 @@
+{
+  "id": "cb4f3330-9f0f-cd4d-d554-5aa6442b10be",
+  "version": 3,
+  "crypto": {
+    "cipher": "aes-128-ctr",
+    "cipherparams": {
+      "iv": "937c23da18782823c3a44b33a48f5422"
+    },
+    "ciphertext": "10573d6899aee16f08ad747d70ffdd3df46a515b1a346f1456fe9ecf4e0771e5",
+    "kdf": "pbkdf2",
+    "kdfparams": {
+      "c": 10240,
+      "dklen": 32,
+      "prf": "hmac-sha256",
+      "salt": "838feb11a3e307cf9e5677e061e3fbd322dcb202e96a824d14c9b10d3147d1f1"
+    },
+    "mac": "15ff1a017d21dca4dd2d10064665ea14f9ccab91fd4337c7b00a564bb333fffe"
+  },
+  "address": "a1345ed0b2d1e193aead673e33dac56515af128a",
+  "name": "",
+  "meta": "{}"
+}
+

networks/spree/config/config.toml

@@ -15,3 +15,12 @@ engine_signer = "0x00bd138abd70e2f00903268f3db08f2d25677c9e"
 reseal_on_txs = "none"
 force_sealing = true
 reseal_min_period = 500
+
+[network]
+port = 30303
+discovery = true
+bootnodes = [
+  "enode://65f9c708cd96fb4c1cfb80451ca8c304ca99660b92445b1da6323c5965332f37d4cf2c17d68ee9b413de6ce87c47c1e0a66e8d05ebe634e7ba559c67d0ec8853@172.15.0.12:30303",
+  "enode://030ba626855043909feec09dfa03b9b186512156ea1dc6225801f014ba49b6b8ca1579287043da69645b8fb40a8685a05bcf35949b7363749bad89611eeebeea@172.15.0.13:30303",
+  "enode://9495e2c34639ae6a8dbabfe7cb038d17be5e65879736b1fb56d0bfeaa01aa25f3802f45e774aae5ef7887bced5ed87a6490da75a1d894f6c7b09e6d6de62970d@172.15.0.18:30303"
+]

networks/spree/node0.network.key

@@ -1 +0,0 @@
-b3244c104fb56d28d3979f6cd14a8b5cf5b109171d293f4454c97c173a9f9374

networks/spree/node1.network.key

@@ -1 +0,0 @@
-c07b4807e704dfff975d82fc807a3da7947838379007b49c51f6a04faf4cdea8

networks/spree/node2.network.key

@@ -1 +0,0 @@
-d8bf44e2b69604bde8c84c4b403114f4410dc4f57d80e026b24b8f1af70d5633