Eth keys command fix (#11)

* make install for the artifact build in runner * Revert "Dzmitryhil/cosmos 0.42.1 (#9)" - eth_keys wrong initialisation * new contract address for the runner
onomyprotocol · Sep 24, 2021 · eeccb77 · eeccb77
1 parent 11fdaf7
commit eeccb77
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 14 deletions.
diff --git a/cmd/onomyd/cmd/eth_keys.go b/cmd/onomyd/cmd/eth_keys.go
@@ -18,9 +18,9 @@ import (
 
 const flagPassphrase = "passphrase"
 
-// AddEthKeysCommands registers a sub-tree of commands to interact with
+// Commands registers a sub-tree of commands to interact with
 // local private key storage.
-func AddEthKeysCommands(defaultNodeHome string) *cobra.Command {
+func Commands(defaultNodeHome string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:   "eth_keys",
 		Short: "Manage your application's ethereum keys",

diff --git a/cmd/onomyd/cmd/root.go b/cmd/onomyd/cmd/root.go
@@ -95,7 +95,6 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		GenTxCmd(onomy.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, onomy.DefaultNodeHome),
 		genutilcli.ValidateGenesisCmd(onomy.ModuleBasics),
 		AddGenesisAccountCmd(onomy.DefaultNodeHome),
-		AddEthKeysCommands(onomy.DefaultNodeHome),
 		tmcli.NewCompletionCmd(rootCmd, true),
 		debug.Cmd(),
 	)
@@ -108,7 +107,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) {
 		queryCommand(),
 		txCommand(),
 		keys.Commands(onomy.DefaultNodeHome),
-		// 		Commands(onomy.DefaultNodeHome),
+		Commands(onomy.DefaultNodeHome),
 	)
 }
 

diff --git a/deploy/single-node-runner-rinkeby/Dockerfile b/deploy/single-node-runner-rinkeby/Dockerfile
@@ -24,9 +24,7 @@ ENV PATH=$PATH:$GOPATH/bin
 
 # build onomyd artifact
 WORKDIR $ONOMY_DIR
-RUN make build
-# copy binary to bin
-RUN cp onomyd /usr/bin/onomyd
+RUN make install
 
 # ------------------ orchestrator ------------------
 
@@ -47,6 +45,7 @@ RUN curl https://get.starport.network/faucet! | bash
 
 # ------------------ run node ------------------
 
+WORKDIR /root/home
 RUN cp -r $ONOMY_DIR/deploy/single-node-runner-rinkeby/scripts scripts
 RUN mkdir onomy
 RUN cp -r $ONOMY_DIR/deploy/single-node-runner-rinkeby/onomy_home onomy/onomy

diff --git a/deploy/single-node-runner-rinkeby/readme.md b/deploy/single-node-runner-rinkeby/readme.md
@@ -46,7 +46,7 @@ This home contains testnet chain settings and genesys file of the chain.
 ***The contract used for the runner***.
 
 ```
-Gravity deployed at Address - 0x3292d20ADa8d5FEC9719613d6624380A594e7B23
+Gravity deployed at Address - 0x8778174A44b74CD75daEeCbC9830D675Cc5C892C
 ```
 
 ## Run
@@ -140,7 +140,7 @@ The ETC20 coins used in that part are FAU. You can substitute "erc20-address" to
     gbt -a onomy client eth-to-cosmos \
             --ethereum-key="e0b21b1d80e53f38734a3ed395796956b50c637916ddbb6cedb096b848053d2d" \
             --ethereum-rpc="http://0.0.0.0:8545" \
-            --gravity-contract-address=0x3292d20ADa8d5FEC9719613d6624380A594e7B23 \
+            --gravity-contract-address=0x8778174A44b74CD75daEeCbC9830D675Cc5C892C \
             --token-contract-address=0xFab46E002BbF0b4509813474841E0716E6730136 \
             --amount=10 \
             --destination=onomy1e6xtwjw9mgmljyrqw6mlw3nrpuz3p79gct73nw
@@ -190,7 +190,7 @@ The ETC20 coins used in that part are FAU. You can substitute "erc20-address" to
   ./gbt -a onomy client eth-to-cosmos \
         --ethereum-key="e0b21b1d80e53f38734a3ed395796956b50c637916ddbb6cedb096b848053d2d" \
         --ethereum-rpc="http://$ETH_HOST:8545" \
-        --gravity-contract-address=0x3292d20ADa8d5FEC9719613d6624380A594e7B23 \
+        --gravity-contract-address=0x8778174A44b74CD75daEeCbC9830D675Cc5C892C \
         --token-contract-address=0xFab46E002BbF0b4509813474841E0716E6730136 \
         --amount=10 \
         --destination=onomy1e6xtwjw9mgmljyrqw6mlw3nrpuz3p79gct73nw

diff --git a/deploy/single-node-runner-rinkeby/scripts/run.sh b/deploy/single-node-runner-rinkeby/scripts/run.sh
@@ -37,7 +37,7 @@ ETH_HOST="0.0.0.0"
 # Eth node rpc port
 ETH_RPC_PORT="8545"
 
-ETH_CONTRACT_ADDRESS=0x3292d20ADa8d5FEC9719613d6624380A594e7B23
+ETH_CONTRACT_ADDRESS=0x8778174A44b74CD75daEeCbC9830D675Cc5C892C
 
 # ------------------ Run onomy ------------------
 
@@ -72,8 +72,8 @@ geth --rinkeby --syncmode "light" \
 GETH_IPC_PATH="/root/.ethereum/rinkeby/geth.ipc"
 GETH_CONSOLE="geth --rinkeby attach ipc:$GETH_IPC_PATH console --exec"
 
-# 600 sec to run light node
-for i in {1..600}; do
+# 600000 sec to run light node
+for i in {1..600000}; do
   sleep 1
   echo "attempt $i to start the eth node"
 
@@ -89,7 +89,7 @@ for i in {1..600}; do
      continue
   fi
 
-  if [ $i -eq 600 ]; then
+  if [ $i -eq 600000 ]; then
      echo "timeout for ethereum light node exceed"
      exit
   fi