cherry-pick 507f860

support ethermint mode with features (#2)

- patch deep_space with ethermint fork
- add a PrivateKey which switch to ethermint when ethermint feature is turn on
- change default hd_path if ethermint feature turn on

change to crypto-org-chain repo
fix test_runner build

orchestrator/Cargo.toml

@@ -38,4 +38,7 @@ gravity_proto = { path = "./gravity_proto" }
 client = { path = "./client" }
 register_delegate_keys = { path = "./register_delegate_keys" }
 gorc = { path = "./gorc" }
-relayer = { path = "./relayer" }
+relayer = { path = "./relayer" }
+
+[patch.crates-io]
+deep_space = { git = "https://github.com/crypto-org-chain/deep_space/", branch = "ethermint" }

orchestrator/client/Cargo.toml

@@ -10,7 +10,7 @@ cosmos_gravity = {path = "../cosmos_gravity"}
 gravity_utils = {path = "../gravity_utils"}
 gravity_proto = {path = "../gravity_proto/"}
 
-deep_space ={git="https://github.com/iqlusioninc/deep_space/", branch="master"}
+deep_space = "2.4.4"
 serde_derive = "1.0"
 clarity = "0.4.11"
 docopt = "1"
@@ -21,4 +21,7 @@ url = "2"
 web30 = "0.15.4"
 env_logger = "0.8"
 openssl-probe = "0.1"
-tokio = "1.4"
+tokio = "1.4"
+
+[features]
+ethermint = ["cosmos_gravity/ethermint"]

orchestrator/client/src/main.rs

@@ -18,12 +18,13 @@ use clarity::Uint256;
 use cosmos_gravity::send::{send_request_batch_tx, send_to_eth};
 use cosmos_gravity::DEFAULT_HD_PATH;
 use deep_space::address::Address as CosmosAddress;
-use deep_space::{coin::Coin, private_key::PrivateKey as CosmosPrivateKey};
+use deep_space::coin::Coin;
 use docopt::Docopt;
 use env_logger::Env;
 use ethereum_gravity::send_to_cosmos::send_to_cosmos;
 use gravity_proto::gravity::DenomToErc20Request;
 use gravity_utils::connection_prep::{check_for_eth, check_for_fee_denom, create_rpc_connections};
+use cosmos_gravity::crypto::PrivateKey as CosmosPrivateKey;
 use std::{process::exit, time::Duration};
 
 const TIMEOUT: Duration = Duration::from_secs(60);