feat(dapp-lib): integrated multi-signature server

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "offchain-modules/eth-proof"]
 	path = offchain-modules/eth-proof
 	url = https://github.com/LeonLi000/eth-proof
+[submodule "offchain-modules/sign-server"]
+	path = offchain-modules/sign-server
+	url = https://github.com/LeonLi000/sign-server.git

Makefile

@@ -66,7 +66,7 @@ init-light-client:
 	${FORCE_CLI} init-ckb-light-contract -k 0 -f 500 -c 40000 --wait
 
 init-multi-address:
-	${FORCE_CLI} init-multi-sign-address -k 1 --multi-address  ckt1qyqyph8v9mclls35p6snlaxajeca97tc062sa5gahk ckt1qyqvsv5240xeh85wvnau2eky8pwrhh4jr8ts8vyj37
+	${FORCE_CLI} init-multi-sign-address -k 1 --multi-address  ckt1qyqyph8v9mclls35p6snlaxajeca97tc062sa5gahk ckt1qyqywrwdchjyqeysjegpzw38fvandtktdhrs0zaxl4 ckt1qyq2f0uwf3lk7e0nthfucvxgl3zu36v6zuwq6mlzps --threshold 2 --hosts http://127.0.0.1:3031 http://127.0.0.1:3032 http://127.0.0.1:3033
 
 ckb2eth-relay:
 	pm2 start --name ckb2eth-relay "${FORCE_CLI} ckb-relay -k 1 --per-amount 5"
@@ -126,12 +126,14 @@ local-ci:
 	make close-dev-env
 	rm -rf ~/.force-bridge/eth-rocksdb
 	rm -rf ~/.force-bridge/ckb-rocksdb
+	rm -rf ~/.force-bridge/ckb-rocksdb
 	test -f ~/.force-bridge/config.toml && mv ~/.force-bridge/config.toml ~/.force-bridge/config_bak_`date "+%Y%m%d-%H%M%S"`.toml || echo 'config not exist'
 	cd offchain-modules && cargo build
 	make init-config
 	make integration-ci
 
 github-ci:
+	git submodule update --init
 	rm -rf ~/.force-bridge/eth-rocksdb
 	rm -rf ~/.force-bridge/ckb-rocksdb
 	rm -rf ~/.force-bridge/dapp-lib/eth-rocksdb

eth-contracts/scripts/deploy.js

@@ -57,13 +57,13 @@ async function deploy() {
 
   // deploy ckbChain
   const validators = network_config.ethereum_private_keys
-    .slice(0, 2)
+    .slice(0, 4)
     .map((privateKey) => {
       let publicKey = EthUtil.privateToPublic(Buffer.from(privateKey, 'hex'));
       return '0x' + EthUtil.publicToAddress(publicKey).toString('hex');
     });
   console.error('validator validator: ', validators);
-  const multisigThreshold = 1;
+  const multisigThreshold = 2;
   let eth_network = await provider.getNetwork();
   const chainId = eth_network.chainId;
   console.error('chain id :', chainId);

offchain-modules/cli/src/commands/mod.rs

@@ -93,8 +93,12 @@ pub async fn init_config(args: InitConfigArgs) -> Result<()> {
 }
 
 pub async fn init_multisig_address_handler(args: InitMultiSignAddressArgs) -> Result<()> {
+    if args.multi_address.len() != args.hosts.len() {
+        anyhow::bail!("failed to init multisig address. the length of multi_address and the length of hosts are not equal.")
+    }
     let multi_sign_address = init_multi_sign_address(
         args.multi_address,
+        args.hosts,
         args.require_first_n,
         args.threshold,
         args.config_path,
@@ -433,7 +437,7 @@ pub async fn eth_relay_handler(args: EthRelayArgs) -> Result<()> {
         config_path,
         args.network,
         args.private_key_path,
-        args.multisig_privkeys,
+        // args.multisig_privkeys,
         args.confirm,
         args.delay,
     )?;
@@ -453,8 +457,8 @@ pub async fn ckb_relay_handler(args: CkbRelayArgs) -> Result<()> {
         config_path,
         args.network,
         args.private_key_path,
-        args.mutlisig_privkeys,
         args.gas_price,
+        args.hosts,
         args.confirm,
     )?;