diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index a58c5dc8..00000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.cache -.dot -**/doc \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 89a43eeb..e75367fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ [submodule "apps/cic-cache"] path = apps/cic-cache url = git@gitlab.com:grassrootseconomics/cic-cache.git -[submodule "apps/cic-meta"] - path = apps/cic-meta - url = git@gitlab.com:grassrootseconomics/cic-meta.git diff --git a/README.md b/README.md index 9faa6739..1c63bd95 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,13 @@ ## Getting started +## Make some keys + +``` +docker build -t bloxie . && docker run -v "$(pwd)/keys:/root/keys" --rm -it -t bloxie account new --chain /root/bloxberg.json --keys-path /root/keys +``` + + ### Prepare the repo This is stuff we need to put in makefile but for now... diff --git a/apps/bloxbergValidatorSetup/.gitignore b/apps/bloxbergValidatorSetup/.gitignore index 320a582e..9c9900fa 100644 --- a/apps/bloxbergValidatorSetup/.gitignore +++ b/apps/bloxbergValidatorSetup/.gitignore @@ -1,3 +1,6 @@ /validator/bloxbergData /validator/bloxberg.log -keys/**/* +keys/* +!keys/Bloxberg +keys/Bloxberg/* +!keys/Bloxberg/UTC--2021-02-10T16-57-35Z--03512a62-5334-20cc-4e44-71156f33cff6 diff --git a/apps/bloxbergValidatorSetup/Dockerfile b/apps/bloxbergValidatorSetup/Dockerfile index d268d0af..b7a3a66a 100644 --- a/apps/bloxbergValidatorSetup/Dockerfile +++ b/apps/bloxbergValidatorSetup/Dockerfile @@ -17,7 +17,7 @@ COPY ./validator/bloxberg.json \ ./validator/validator.toml \ /root/ -COPY ./keys/ /root/keys/ +COPY keys/ /root/keys/ # RUN chown -R parity:parity $HOME/ && \ # chmod -R 775 $HOME/ && \ @@ -25,4 +25,4 @@ COPY ./keys/ /root/keys/ # USER parity ENTRYPOINT [ "parity" ] -CMD [ "--config", "/root/validator.toml", "--keys-path", "/root/keys/" ] +CMD [ "--config", "/root/validator.toml", "--keys-path", "/root/keys/", "--password", "/root/validator.pwd" ] diff --git a/apps/bloxbergValidatorSetup/README.md b/apps/bloxbergValidatorSetup/README.md index 349eec4c..6d7d36c2 100644 --- a/apps/bloxbergValidatorSetup/README.md +++ b/apps/bloxbergValidatorSetup/README.md @@ -4,7 +4,7 @@ The original bloxberg node config was kind of annoying so I am running it more like vanilla parity. This way you can pass command flags directly to parity. ## Make some keys ``` -docker build -t bloxie . && docker run -v ${PWD}/keys:/root/keys --rm -it -t bloxie account new --chain /root/bloxberg.json --keys-path /root/keys +docker build -t bloxie . && docker run -v ${PWD}/keys:/root/keys --rm -it -t bloxie account new --chain /root/bloxberg.json --keys-path /root/keys --password /root/validator.pwd ``` ## Enter the signer address and passwords in the config files diff --git a/apps/bloxbergValidatorSetup/keys/Bloxberg/UTC--2021-02-10T16-57-35Z--03512a62-5334-20cc-4e44-71156f33cff6 b/apps/bloxbergValidatorSetup/keys/Bloxberg/UTC--2021-02-10T16-57-35Z--03512a62-5334-20cc-4e44-71156f33cff6 new file mode 100644 index 00000000..307a7bf3 --- /dev/null +++ b/apps/bloxbergValidatorSetup/keys/Bloxberg/UTC--2021-02-10T16-57-35Z--03512a62-5334-20cc-4e44-71156f33cff6 @@ -0,0 +1 @@ +{"id":"03512a62-5334-20cc-4e44-71156f33cff6","version":3,"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"dc388338c4d4e3203604aeb3d1c6bbfa"},"ciphertext":"8a945775b87089ce94537e011799f3abc1577c5dd1f3fbaebe1cd96dfdfc8b5a","kdf":"pbkdf2","kdfparams":{"c":10240,"dklen":32,"prf":"hmac-sha256","salt":"e8585836540caca01282381f5c1fe128e53b15b40f9d152fbc5a4f82a7967398"},"mac":"a7c7815e84a632ecf6d8f18c981bea73d50cd2e2a855a3e90477fc84ed14f906"},"address":"4f2a5902158c3969b245247f4154971d393301f2","name":"","meta":"{}"} \ No newline at end of file diff --git a/apps/bloxbergValidatorSetup/validator/bloxberg.json b/apps/bloxbergValidatorSetup/validator/bloxberg.json index 5a4414bc..32e58c50 100644 --- a/apps/bloxbergValidatorSetup/validator/bloxberg.json +++ b/apps/bloxbergValidatorSetup/validator/bloxberg.json @@ -7,7 +7,7 @@ "maximumUncleCount": 0, "stepDuration": "5", "validators" : { - "list": ["0x6bd4e51b3730576ddc4049654ef60ed7f7436cb5"] + "list": ["0x4f2a5902158c3969b245247f4154971d393301f2"] } } } diff --git a/apps/bloxbergValidatorSetup/validator/validator.toml b/apps/bloxbergValidatorSetup/validator/validator.toml index e536f519..00437985 100644 --- a/apps/bloxbergValidatorSetup/validator/validator.toml +++ b/apps/bloxbergValidatorSetup/validator/validator.toml @@ -26,7 +26,7 @@ password = ["/root/validator.pwd"] [mining] #CHANGE ENGINE SIGNER TO VALIDATOR ADDRESS -engine_signer = "0x6bd4e51b3730576ddc4049654ef60ed7f7436cb5" +engine_signer = "0x4f2a5902158c3969b245247f4154971d393301f2" reseal_on_txs = "none" force_sealing = true min_gas_price = 1000000 diff --git a/docker-compose.yml b/docker-compose.yml index f0389b14..82ab05e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,7 +39,7 @@ services: - ${DEV_ETH_PORT_WS-8546}:8546 - 30303 volumes: - #- ./keys:/root/keys # stores the signing key locally + - ./apps/bloxbergValidatorSetup/keys:/root/keys # stores the signing key locally - bloxberg-data:/root/.local/share/io.parity.ethereum/ # See contents of /initdb/create_db.sql for app user, password and databases diff --git a/keys/Bloxberg/address_book.json b/keys/Bloxberg/address_book.json new file mode 100644 index 00000000..9e26dfee --- /dev/null +++ b/keys/Bloxberg/address_book.json @@ -0,0 +1 @@ +{} \ No newline at end of file