fix

Author: NullpointerW

cmd.go

@@ -59,7 +59,7 @@ var pa = &cobra.Command{
 }
 
 func init() {
-	tx.Flags().StringVarP(&Endpoint, "endpoint", "edp", "https://ethereum.publicnode.com", "Network rpc endpoint")
+	tx.Flags().StringVarP(&Endpoint, "endpoint", "e", "https://ethereum.publicnode.com", "Network rpc endpoint")
 	ethwt.AddCommand(tx, gen, pa)
 }
 

pkg/tx/transfer.go

@@ -14,7 +14,7 @@ import (
 	"math/big"
 )
 
-func Transfer(pk string, to string, val string, data []byte, ec *ethclient.Client) (txHash string, err error) {
+func Transfer(pk string, to string, val string, data []byte, ec *ethclient.Client) (txHash common.Hash, err error) {
 	privateKeyHex := pk
 	privateKey, err := crypto.HexToECDSA(privateKeyHex)
 	if err != nil {
@@ -39,7 +39,7 @@ func Transfer(pk string, to string, val string, data []byte, ec *ethclient.Clien
 	wei, ok := util.ToWei(val)
 	if !ok {
 		fmt.Println("invalid eth value:", val)
-		return "", err
+		return common.Hash{}, err
 	}
 
 	gasTipCap, err := ec.SuggestGasTipCap(context.Background())
@@ -69,12 +69,12 @@ func Transfer(pk string, to string, val string, data []byte, ec *ethclient.Clien
 
 	estimatedGas, err := ec.EstimateGas(context.Background(), msg)
 	if err != nil {
-		return "", err
+		return common.Hash{}, err
 	}
 	fmt.Println("maxPriorityFeePerGas:", gasTipCap, "GasFeeCap:", maxFeePerGas, "Gas:", estimatedGas)
 	cid, err := ec.ChainID(context.Background())
 	if err != nil {
-		return "", fmt.Errorf("get chainID error:%w", err)
+		return common.Hash{}, fmt.Errorf("get chainID error:%w", err)
 	}
 	tx := &types.DynamicFeeTx{
 		ChainID:   cid,
@@ -92,8 +92,8 @@ func Transfer(pk string, to string, val string, data []byte, ec *ethclient.Clien
 	// 创建交易
 	signedTx, err := types.SignTx(txn, types.NewCancunSigner(tx.ChainID), privateKey)
 	if err != nil {
-		return "", err
+		return common.Hash{}, err
 	}
 	err = ec.SendTransaction(context.Background(), signedTx)
-	return txn.Hash().String(), err
+	return txn.Hash(), err
 }

transfer.go

@@ -1,12 +1,17 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	_tx "github.com/NullpointerW/ethereum-wallet-tool/pkg/tx"
+	"github.com/ethereum/go-ethereum"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"os"
 	"strings"
+	"time"
 )
 
 type TxRecord struct {
@@ -41,11 +46,11 @@ func Transfer(val string) {
 	pk := strings.TrimPrefix(string(pkb), "0x")
 	var txRecords []TxRecord
 	for _, w := range wallets {
-		record, err := transfer(pk, w, val, ec)
-		if err != nil {
-			fmt.Println("transfer err:", err)
-			continue
-		}
+		record := transfer(pk, w, val, ec)
+		//if err != nil {
+		//	fmt.Println("transfer err:", err)
+		//	continue
+		//}
 		fmt.Printf("%#+v\n", record)
 		txRecords = append(txRecords, record)
 	}
@@ -58,16 +63,50 @@ func Transfer(val string) {
 
 }
 
-func transfer(mpk string, w Wallet, val string, ec *ethclient.Client) (TxRecord, error) {
+func transfer(mpk string, w Wallet, val string, ec *ethclient.Client) TxRecord {
 	txHash, err := _tx.Transfer(mpk, w.Address, val, nil, ec)
 	txR := TxRecord{
-		Hash:    txHash,
+		Hash:    txHash.String(),
 		Address: w.Address,
 		PK:      w.PrivateKey,
 		Value:   val,
 	}
 	if err != nil {
 		txR.ErrMsg = err.Error()
+	} else {
+		_, err = waitForTransactionConfirmation(ec, txHash)
+		if err != nil {
+			txR.ErrMsg = err.Error()
+		}
 	}
-	return txR, nil
+	return txR
+}
+func waitForTransactionConfirmation(client *ethclient.Client, txHash common.Hash) (*types.Receipt, error) {
+	var receipt *types.Receipt
+	var err error
+
+	// 设置查询上下文，可以设置超时
+	ctx := context.Background()
+
+	// 设置轮询间隔
+
+	fmt.Println("waiting for tx confirmed")
+	for {
+		receipt, err = client.TransactionReceipt(ctx, txHash)
+		if err != nil {
+			if err == ethereum.NotFound {
+				// 如果收据未找到，继续轮询
+				time.Sleep(time.Second)
+				continue
+			}
+			// 如果发生其他错误，则返回错误
+			return nil, err
+		}
+		// 如果收据不为空，表示交易已被确认
+		if receipt != nil {
+			break
+		}
+	}
+
+	return receipt, nil
 }