don't use rpc call if network is provided

zeus-fyi · Jul 21, 2023 · c412000 · c412000
1 parent c5f738e
commit c412000
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 12 deletions.
diff --git a/client/deploy_contracts.go b/client/deploy_contracts.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"math/big"
 	"os"
+	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
@@ -126,10 +127,18 @@ func (w *Web3Actions) GetSignedTxToDeploySmartContract(ctx context.Context, payl
 		log.Ctx(ctx).Err(err).Msg("Web3Actions: Transfer: SetGasPriceAndLimit")
 		return nil, err
 	}
-	chainID, err := w.C.ChainID(ctx)
-	if err != nil {
-		log.Ctx(ctx).Err(err).Msg("CallFunctionWithData: GetChainID")
-		return nil, fmt.Errorf("couldn't get chain ID: %v", err)
+	var chainID *big.Int
+	switch strings.ToLower(w.Network) {
+	case "mainnet":
+		chainID = new(big.Int).SetInt64(1)
+	case "goerli":
+		chainID = new(big.Int).SetInt64(5)
+	default:
+		chainID, err = w.C.ChainID(ctx)
+		if err != nil {
+			log.Ctx(ctx).Err(err).Msg("CallFunctionWithData: GetChainID")
+			return nil, fmt.Errorf("couldn't get chain ID: %v", err)
+		}
 	}
 	publicKeyECDSA := w.EcdsaPublicKey()
 	fromAddress := crypto.PubkeyToAddress(*publicKeyECDSA)

diff --git a/client/prep_signed_txs.go b/client/prep_signed_txs.go
@@ -3,6 +3,8 @@ package web3_actions
 import (
 	"context"
 	"fmt"
+	"math/big"
+	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -17,10 +19,18 @@ func (w *Web3Actions) GetSignedSendTx(ctx context.Context, params SendEtherPaylo
 		log.Ctx(ctx).Err(err).Msg("Send: GetNonce")
 		return nil, err
 	}
-	chainID, err := w.C.ChainID(ctx)
-	if err != nil {
-		log.Ctx(ctx).Err(err).Msg("Send: GetChainID")
-		return nil, fmt.Errorf("couldn't get chain ID: %v", err)
+	var chainID *big.Int
+	switch strings.ToLower(w.Network) {
+	case "mainnet":
+		chainID = new(big.Int).SetInt64(1)
+	case "goerli":
+		chainID = new(big.Int).SetInt64(5)
+	default:
+		chainID, err = w.C.ChainID(ctx)
+		if err != nil {
+			log.Ctx(ctx).Err(err).Msg("CallFunctionWithData: GetChainID")
+			return nil, fmt.Errorf("couldn't get chain ID: %v", err)
+		}
 	}
 	scAddr := common.HexToAddress(params.ToAddress.Hex())
 	payload := &SendContractTxPayload{

diff --git a/client/prep_smart_contract_signed_txs.go b/client/prep_smart_contract_signed_txs.go
@@ -3,6 +3,8 @@ package web3_actions
 import (
 	"context"
 	"fmt"
+	"math/big"
+	"strings"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
@@ -28,10 +30,18 @@ func (w *Web3Actions) GetSignedTxToCallFunctionWithData(ctx context.Context, pay
 		log.Ctx(ctx).Err(err).Msg("Send: SuggestAndSetGasPriceAndLimitForTx")
 		return nil, err
 	}
-	chainID, err := w.C.ChainID(ctx)
-	if err != nil {
-		log.Ctx(ctx).Err(err).Msg("CallFunctionWithData: GetChainID")
-		return nil, fmt.Errorf("couldn't get chain ID: %v", err)
+	var chainID *big.Int
+	switch strings.ToLower(w.Network) {
+	case "mainnet":
+		chainID = new(big.Int).SetInt64(1)
+	case "goerli":
+		chainID = new(big.Int).SetInt64(5)
+	default:
+		chainID, err = w.C.ChainID(ctx)
+		if err != nil {
+			log.Ctx(ctx).Err(err).Msg("CallFunctionWithData: GetChainID")
+			return nil, fmt.Errorf("couldn't get chain ID: %v", err)
+		}
 	}
 	publicKeyECDSA := w.EcdsaPublicKey()
 	fromAddress := crypto.PubkeyToAddress(*publicKeyECDSA)