Merge pull request #9 from icon-project/add-gas-limit-option

Add gas limit option

Author: eunsoo-icon

chain/eth2/client/execution.go

@@ -47,7 +47,7 @@ func (c *ExecutionLayer) GetBackend() bind.ContractBackend {
 	return c.client
 }
 
-func (c *ExecutionLayer) NewTransactOpts(k *ecdsa.PrivateKey) (*bind.TransactOpts, error) {
+func (c *ExecutionLayer) NewTransactOpts(k *ecdsa.PrivateKey, gasLimit uint64) (*bind.TransactOpts, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), DefaultTimeout)
 	defer cancel()
 	txo, err := bind.NewKeyedTransactorWithChainID(k, c.chainID)
@@ -63,6 +63,11 @@ func (c *ExecutionLayer) NewTransactOpts(k *ecdsa.PrivateKey) (*bind.TransactOpt
 		rewards.Add(rewards, r[0])
 	}
 	txo.GasTipCap = rewards.Div(rewards, big.NewInt(int64(len(fh.Reward))))
+	if gasLimit != 0 {
+		txo.GasLimit = gasLimit
+	} else {
+		txo.GasLimit = DefaultGasLimit
+	}
 
 	return txo, nil
 }

chain/eth2/sender.go

@@ -84,9 +84,9 @@ func (r *request) Format(f fmt.State, c rune) {
 	switch c {
 	case 'v', 's':
 		if f.Flag('+') {
-			fmt.Fprintf(f, "request{id=%d txHash=%#x txPendingCount=%d)", r.ID(), r.txHash, r.txPendingCount)
+			fmt.Fprintf(f, "request{id=%s txHash=%#x txPendingCount=%d)", r.ID(), r.txHash, r.txPendingCount)
 		} else {
-			fmt.Fprintf(f, "request{%d %#x %d)", r.ID(), r.txHash, r.txPendingCount)
+			fmt.Fprintf(f, "request{%s %#x %d)", r.ID(), r.txHash, r.txPendingCount)
 		}
 	}
 }
@@ -103,6 +103,8 @@ type sender struct {
 	cl  *client.ConsensusLayer
 	el  *client.ExecutionLayer
 	bmc *client.BMCClient
+
+	gasLimit uint64
 }
 
 func newSender(src, dst types.BtpAddress, w types.Wallet, endpoint string, opt map[string]interface{}, l log.Logger) types.Sender {
@@ -118,15 +120,20 @@ func newSender(src, dst types.BtpAddress, w types.Wallet, endpoint string, opt m
 	if err != nil {
 		l.Panicf("fail to connect to %s, %v", endpoint, err)
 	}
-	s.cl, err = client.NewConsensusLayer(opt["consensus_endpoint"].(string), l)
-	if err != nil {
-		l.Panicf("fail to connect to %s, %v", opt["consensus_endpoint"].(string), err)
+	l.Debugf("Sender options %+v", opt)
+	if clEndpoint, ok := opt["consensus_endpoint"].(string); ok {
+		s.cl, err = client.NewConsensusLayer(clEndpoint, l)
+		if err != nil {
+			l.Panicf("fail to connect to %s, %v", clEndpoint, err)
+		}
 	}
 	txUrl, _ := opt["execution_tx_endpoint"].(string)
 	s.bmc, err = client.NewBMCClient(common.HexToAddress(s.dst.ContractAddress()), s.el.GetBackend(), txUrl, l)
 	if err != nil {
 		l.Panicf("fail to connect to BMC %s, %v", s.dst.ContractAddress(), err)
 	}
+	gasLimit, _ := opt["gas_limit"].(float64)
+	s.gasLimit = uint64(gasLimit)
 	return s
 }
 
@@ -154,8 +161,8 @@ func (s *sender) Relay(rm types.RelayMessage) (string, error) {
 }
 
 func (s *sender) relay(rm types.RelayMessage) (*etypes.Transaction, error) {
-	s.l.Debugf("relay src address:%s rm id:%d", s.src.String(), rm.Id())
-	t, err := s.el.NewTransactOpts(s.w.(*wallet.EvmWallet).Skey)
+	s.l.Debugf("relay src address:%s rm id:%s", s.src.String(), rm.Id())
+	t, err := s.el.NewTransactOpts(s.w.(*wallet.EvmWallet).Skey, s.gasLimit)
 	if err != nil {
 		return nil, err
 	}
@@ -243,9 +250,9 @@ func (s *sender) checkRelayResult(to uint64) {
 		if pending {
 			s.l.Debugf("TX %#x is not yet executed.", req.TxHash())
 			if req.IncTxPendingCount() == txPendingMAX {
-				s.l.Debugf("resend rm %d", req.ID())
+				s.l.Debugf("resend rm %s", req.ID())
 				if tx, err := s.relay(req.RelayMessage()); err != nil {
-					s.l.Errorf("fail to resend relay message %d", req.ID())
+					s.l.Errorf("fail to resend relay message %s", req.ID())
 				} else {
 					req.SetTxHash(tx.Hash())
 					req.SetTxPendingCount(0)

e2edemo/relay.sh

@@ -40,24 +40,54 @@ else
 fi
 DST_OPTIONS=$(cat ${CHAIN_CONFIG} | jq -r '.chains.'${DST}'.options // empty')
 
+SRC_NETWORK_NAME=$(echo ${SRC_NETWORK} | cut -d. -f2)
+DST_NETWORK_NAME=$(echo ${DST_NETWORK} | cut -d. -f2)
+# Assume src is always an ICON chain
+if [ $SRC_NETWORK_NAME != icon ]; then
+  echo "Source network is not an ICON-compatible chain: $SRC_NETWORK_NAME"
+  exit 1
+fi
+# Determine src type
 if [ "x$BMV_BRIDGE" = xtrue ]; then
   echo "Using Bridge mode"
+  SRC_TYPE="icon-bridge"
 else
   echo "Using BTPBlock mode"
-  BMV_BRIDGE=false
+  SRC_TYPE="icon-btpblock"
+fi
+# Determine dst type
+if [ $DST_NETWORK_NAME == icon ]; then
+  DST_TYPE="icon-btpblock"
+else
+  DST_TYPE="eth2-v2.0"
 fi
 
+get_config() {
+  if [ $# -gt 5 -a ${#6} -gt 0 ]; then
+    echo '{
+      "address": "'$1'",
+      "endpoint": "'$2'",
+      "key_store": "'$3'",
+      "key_password": "'$4'",
+      "type": "'$5'",
+      "options": '$6'
+    }' | tr -d [:space:]
+  else
+    echo '{
+      "address": "'$1'",
+      "endpoint": "'$2'",
+      "key_store": "'$3'",
+      "key_password": "'$4'",
+      "type": "'$5'"
+    }' | tr -d [:space:]
+  fi
+}
+SRC_CONFIG=$(get_config "$SRC_ADDRESS" "$SRC_ENDPOINT" "$SRC_KEY_STORE" "$SRC_KEY_PASSWORD" "$SRC_TYPE" "$SRC_OPTIONS")
+DST_CONFIG=$(get_config "$DST_ADDRESS" "$DST_ENDPOINT" "$DST_KEY_STORE" "$DST_KEY_PASSWORD" "$DST_TYPE" "$DST_OPTIONS")
+
 ${RELAY_BIN} \
+    --base_dir .relay \
     --direction both \
-    --src.address ${SRC_ADDRESS} \
-    --src.endpoint ${SRC_ENDPOINT} \
-    --src.key_store ${SRC_KEY_STORE} \
-    --src.key_password ${SRC_KEY_PASSWORD} \
-    --src.bridge_mode=${BMV_BRIDGE} \
-    ${SRC_OPTIONS:+--dst.options $SRC_OPTIONS} \
-    --dst.address ${DST_ADDRESS} \
-    --dst.endpoint ${DST_ENDPOINT} \
-    --dst.key_store ${DST_KEY_STORE} \
-    --dst.key_password ${DST_KEY_PASSWORD} \
-    ${DST_OPTIONS:+--dst.options $DST_OPTIONS} \
+    --src_config ${SRC_CONFIG} \
+    --dst_config ${DST_CONFIG} \
     start