Merge pull request #1767 from 0chain/fix/alchemy-gas-estimation

Fix: gas estimation alchemy call

Author: dabasov

zcnbridge/bridge.go

@@ -4,11 +4,12 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
-	coreClient "github.com/0chain/gosdk/core/client"
 	"math/big"
 	"strings"
 	"time"
 
+	coreClient "github.com/0chain/gosdk/core/client"
+
 	"github.com/0chain/gosdk/zcnbridge/ethereum/uniswapnetwork"
 	"github.com/0chain/gosdk/zcnbridge/ethereum/uniswaprouter"
 
@@ -998,21 +999,18 @@ func (b *BridgeClient) getProviderType() int {
 }
 
 // estimateTenderlyGasAmount performs gas amount estimation for the given transaction using Tenderly provider.
-func (b *BridgeClient) estimateTenderlyGasAmount(ctx context.Context, from, to string, value int64) (float64, error) {
+func (b *BridgeClient) estimateTenderlyGasAmount(ctx context.Context) (float64, error) {
 	return 8000000, nil
 }
 
 // estimateAlchemyGasAmount performs gas amount estimation for the given transaction using Alchemy provider
-func (b *BridgeClient) estimateAlchemyGasAmount(ctx context.Context, from, to, data string, value int64) (float64, error) {
+func (b *BridgeClient) estimateAlchemyGasAmount(ctx context.Context, to, data string) (float64, error) {
 	client := jsonrpc.NewClient(b.EthereumNodeURL)
 
-	valueHex := ConvertIntToHex(value)
-
-	resp, err := client.Call(ctx, "eth_estimateGas", &AlchemyGasEstimationRequest{
-		From:  from,
-		To:    to,
-		Value: valueHex,
-		Data:  data})
+	resp, err := client.Call(ctx, "eth_estimateGas", []*AlchemyGasEstimationRequest{{
+		To:   to,
+		Data: data,
+	}})
 	if err != nil {
 		return 0, errors.Wrap(err, "gas price estimation failed")
 	}
@@ -1060,9 +1058,9 @@ func (b *BridgeClient) EstimateBurnWZCNGasAmount(ctx context.Context, from, to,
 
 		pack := "0x" + hex.EncodeToString(packRaw)
 
-		return b.estimateAlchemyGasAmount(ctx, from, to, pack, 0)
+		return b.estimateAlchemyGasAmount(ctx, to, pack)
 	case TenderlyProvider:
-		return b.estimateTenderlyGasAmount(ctx, from, to, 0)
+		return b.estimateTenderlyGasAmount(ctx)
 	}
 
 	return 0, errors.New("used json-rpc does not allow to estimate gas amount")
@@ -1103,9 +1101,9 @@ func (b *BridgeClient) EstimateMintWZCNGasAmount(
 
 		pack := "0x" + hex.EncodeToString(packRaw)
 
-		return b.estimateAlchemyGasAmount(ctx, from, to, pack, 0)
+		return b.estimateAlchemyGasAmount(ctx, to, pack)
 	case TenderlyProvider:
-		return b.estimateTenderlyGasAmount(ctx, from, to, 0)
+		return b.estimateTenderlyGasAmount(ctx)
 	}
 
 	return 0, errors.New("used json-rpc does not allow to estimate gas amount")

zcnbridge/bridge_helper.go

@@ -12,10 +12,8 @@ import (
 
 // AlchemyGasEstimationRequest describes request used for Alchemy enhanced JSON-RPC API.
 type AlchemyGasEstimationRequest struct {
-	From  string `json:"from"`
-	To    string `json:"to"`
-	Value string `json:"value"`
-	Data  string `json:"data"`
+	To   string `json:"to"`
+	Data string `json:"data"`
 }
 
 // GasEstimationRequest describes request used for Alchemy enhanced JSON-RPC API.