propose a new tx to cancel the old evm tx that cannot be sent #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

cedricfung merged 54 commits into main from bugfix/eth-valid-tx

Dec 26, 2025

apps/ethereum/account.go

-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
     	if !isGuarded {
-    		_, err := tx.ExecTransaction(ctx, rpc, key)
+    		etx, err := tx.BuildTransaction(ctx, rpc, key)
+    		if err != nil {
+    			return nil, err
+    		}
+    		err = SendAndWaitMined(ctx, rpc, etx)
     		if err != nil {
     			return nil, err
     		}
@@ Expand Down Expand Up @@
     	return &addr, nil
     }
+    func FetchSafeNonce(ctx context.Context, rpc, address string, height int64) (int64, error) {
+    	conn, abi, err := safeInit(rpc, address)
+    	if err != nil {
+    		return 0, err
+    	}
+    	defer conn.Close()
+    	opt := &bind.CallOpts{}
+    	if height > 0 {
+    		opt.BlockNumber = big.NewInt(height)
+    	}
+    	nonce, err := abi.Nonce(opt)
+    	if err != nil {
+    		return 0, err
+    	}
+    	return nonce.Int64(), nil
+    }
     func FetchBalanceFromKey(ctx context.Context, rpc, key string) (*big.Int, error) {
     	addr, err := PrivToAddress(key)
     	if err != nil {
@@ Expand Down @@

apps/ethereum/rpc.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -115,18 +115,24 @@ func RPCGetBlockHeight(rpc string) (int64, error) {
  
    	return int64(height), err

    }

    func RPCGetBlockHash(rpc string, height int64) (string, error) {

    func RPCGetBlockByHeight(rpc string, height int64) (*RPCBlock, error) {

    	h := fmt.Sprintf("0x%x", height)

    	res, err := callEthereumRPCUntilSufficient(rpc, "eth_getBlockByNumber", []any{h, false})

    	if err != nil {

    		return "", err

    		return nil, err

    	}

    	var b *RPCBlock

    	err = json.Unmarshal(res, &b)

    	if err != nil || b == nil {

    		return "", err

    	if err != nil {

    		return nil, err

    	}

    	return b.Hash, err

    	timestamp, err := ethereumNumberToUint64(b.Timestamp)

    	if err != nil {

    		return nil, err

    	}

    	b.Time = time.Unix(int64(timestamp), 0)

    	return b, err

    }

    func RPCGetBlockWithTransactions(rpc string, height int64) (*RPCBlockWithTransactions, error) {

apps/ethereum/transaction.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,9 @@ import ( @@
     	ga "github.com/ethereum/go-ethereum/accounts/abi"
     	"github.com/ethereum/go-ethereum/accounts/abi/bind"
     	"github.com/ethereum/go-ethereum/common"
+    	"github.com/ethereum/go-ethereum/core/types"
     	"github.com/ethereum/go-ethereum/crypto"
+    	"github.com/ethereum/go-ethereum/ethclient"
     	"golang.org/x/crypto/sha3"
     )
@@ Expand Down Expand Up @@
     	}, nil
     }
-    func (tx *SafeTransaction) ValidTransaction(rpc string) (bool, error) {
+    func (tx *SafeTransaction) ValidTransaction(rpc string) error {
     	conn, abi, err := safeInit(rpc, tx.SafeAddress)
     	if err != nil {
-    		return false, err
+    		return err
     	}
     	defer conn.Close()
@@ Expand All @@
     		count += 1
     	}
     	if count < 2 {
-    		return false, fmt.Errorf("SafeTransaction has insufficient signatures")
+    		return fmt.Errorf("SafeTransaction has insufficient signatures")
     	}
-    	return abi.ValidTransaction(
+    	success, err := abi.ValidTransaction(
     		tx.Destination,
     		tx.Value,
     		tx.Data,
@@ Expand All @@
     		tx.RefundReceiver,
     		signature,
     	)
+    	if !success || err != nil {
+    		return fmt.Errorf("ValidTransaction(%s) => %t %v", tx.TxHash, success, err)
+    	}
+    	return nil
     }
-    func (tx *SafeTransaction) ExecTransaction(ctx context.Context, rpc, key string) (string, error) {
+    func (tx *SafeTransaction) BuildTransaction(ctx context.Context, rpc, key string) (*types.Transaction, error) {
     	conn, safeAbi, err := safeInit(rpc, tx.SafeAddress)
     	if err != nil {
-    		return "", err
+    		return nil, err
     	}
     	defer conn.Close()
     	signer := SignerInit(ctx, conn, key, tx.ChainID)
@@ Expand All @@
     		count += 1
     	}
     	if count < 2 {
-    		return "", fmt.Errorf("SafeTransaction has insufficient signatures")
+    		return nil, fmt.Errorf("SafeTransaction has insufficient signatures")
     	}
+    	signer.NoSend = true
     	t, err := safeAbi.ExecTransaction(
     		signer,
     		tx.Destination,
@@ Expand All @@
     		signature,
     	)
     	if err != nil {
-    		return "", err
+    		return nil, err
     	}
-    	_, err = bind.WaitMined(ctx, conn, t)
+    	return t, nil
+    }
+    func SendAndWaitMined(ctx context.Context, rpc string, t *types.Transaction) error {
+    	conn, err := ethclient.Dial(rpc)
     	if err != nil {
-    		return "", err
+    		return err
     	}
-    	return t.Hash().Hex(), nil
+    	defer conn.Close()
+    	err = conn.SendTransaction(ctx, t)
+    	if err != nil {
+    		return err
+    	}
+    	_, err = bind.WaitMined(ctx, conn, t)
+    	return err
     }
     func (tx *SafeTransaction) ExtractOutputs() []*Output {
@@ Expand Down @@

common/request.go

-Original file line number
+Diff line change
@@ Expand Up / @@ -64,13 +64,14 @@ const ( @@
     	ActionEthereumSafeApproveTransaction        = 133
     	ActionEthereumSafeRevokeTransaction         = 134
     	ActionEthereumSafeCloseAccount              = 135
-    	ActionEthereumSafeRefundTransaction         = 136
+    	ActionEthereumSafeRefundTransaction         = 136 // deprecated
     	ActionEthereumSafeCloseAccountByInheritance = 137
     	FlagProposeNormalTransaction   = 0
     	FlagProposeRecoveryTransaction = 1
-    	FlagProposeSetInheritance      = 2
-    	FlagProposeRemoveInheritance   = 3
+    	FlagProposeCancelTransaction   = 2
+    	FlagProposeSetInheritance      = 3
+    	FlagProposeRemoveInheritance   = 4
     )
     type Request struct {
@@ Expand Down @@

keeper/bitcoin.go

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -944,6 +944,9 @@ func (node *Node) processBitcoinSafeApproveTransaction(ctx context.Context, req
  
    }

    func (node *Node) processBitcoinSafeSignatureResponse(ctx context.Context, req *common.Request, safe *store.Safe, tx *store.Transaction, old *store.SignatureRequest) ([]*mtg.Transaction, string) {

    	if tx.TransactionHash != old.TransactionHash {

    		panic(old.TransactionHash)

    	}

    	if req.Role != common.RequestRoleSigner {

    		panic(req.Role)

    	}

    @@ -1021,7 +1024,7 @@ func (node *Node) processBitcoinSafeSignatureResponse(ctx context.Context, req *
  
    	lock := node.finalizePendingSafeInheritanceLock(ctx, tx)

    	logger.Printf("node.finalizePendingSafeInheritanceLock(%s) => %v", tx.RequestId, lock)

    	raw := hex.EncodeToString(spsbt.Marshal())

    	err = node.store.FinishTransactionSignaturesWithRequest(ctx, old.TransactionHash, raw, req, int64(len(msgTx.TxIn)), safe, nil, lock, txs)

    	err = node.store.FinishTransactionSignaturesWithRequest(ctx, tx, raw, req, int64(len(msgTx.TxIn)), safe, nil, lock, txs)

    	logger.Printf("store.FinishTransactionSignaturesWithRequest(%s, %s, %v, %v) => %v", old.TransactionHash, raw, req, lock, err)

    	if err != nil {

    		panic(err)

    @@ -1133,12 +1136,7 @@ func (node *Node) processSafeInheritanceLock(ctx context.Context, req *common.Re
  
    }

    func (node *Node) finalizePendingSafeInheritanceLock(ctx context.Context, tx *store.Transaction) *store.InheritanceLock {

    	txReq, err := node.store.ReadRequest(ctx, tx.RequestId)

    	if err != nil {

    		panic(err)

    	}

    	extra := txReq.ExtraBytes()

    	flag := extra[0]

    	flag, extra := node.getTransactionFlagAndExtra(ctx, tx.RequestId)

    	switch flag {

    	case common.FlagProposeSetInheritance:

    		lock, err := node.store.ReadInheritanceLockByRequestId(ctx, tx.RequestId)

    @@ -1152,7 +1150,7 @@ func (node *Node) finalizePendingSafeInheritanceLock(ctx context.Context, tx *st
  
    		lock.State = common.RequestStateDone

    		return lock

    	case common.FlagProposeRemoveInheritance:

    		lid, err := uuid.FromBytes(extra[1:17])

    		lid, err := uuid.FromBytes(extra[:16])

    		if err != nil || lid.IsNil() {

    			logger.Printf("invalid lock id to remove: %v %v", lid, err)

    			return nil

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

propose a new tx to cancel the old evm tx that cannot be sent #122

Uh oh!

Diff view

Diff view

There are no files selected for viewing

cedricfung Dec 25, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

propose a new tx to cancel the old evm tx that cannot be sent #122

Uh oh!

propose a new tx to cancel the old evm tx that cannot be sent #122

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

cedricfung Dec 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!