feat(x/crosschain): recover execute claimEvent (#811)

Co-authored-by: fx0x55 <[email protected]>
PundiAI · Nov 18, 2024 · ea214d9 · ea214d9
1 parent 509f4cd
commit ea214d9
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 27 deletions.
diff --git a/contract/bridge_fee_oracle.sol.go b/contract/bridge_fee_oracle.sol.go
diff --git a/contract/icrosschain.sol.go b/contract/icrosschain.sol.go
diff --git a/precompiles/crosschain/execute_claim.go b/precompiles/crosschain/execute_claim.go
@@ -55,10 +55,11 @@ func (m *ExecuteClaimMethod) Run(evm *vm.EVM, contract *vm.Contract) ([]byte, er
 	}
 	stateDB := evm.StateDB.(evmtypes.ExtStateDB)
 	if err = stateDB.ExecuteNativeAction(contract.Address(), nil, func(ctx sdk.Context) error {
-		if err = crosschainKeeper.ExecuteClaim(ctx, args.EventNonce.Uint64()); err != nil {
-			return err
+		preExecuteErr, executeErr := crosschainKeeper.ExecuteClaim(ctx, args.EventNonce.Uint64())
+		if preExecuteErr != nil {
+			return preExecuteErr
 		}
-		data, topic, err := m.NewExecuteClaimEvent(contract.Caller(), args.EventNonce, args.Chain)
+		data, topic, err := m.NewExecuteClaimEvent(contract.Caller(), args.EventNonce, args.Chain, executeErr)
 		if err != nil {
 			return err
 		}
@@ -83,8 +84,12 @@ func NewExecuteClaimABI() ExecuteClaimABI {
 	}
 }
 
-func (m ExecuteClaimABI) NewExecuteClaimEvent(sender common.Address, eventNonce *big.Int, dstChain string) (data []byte, topic []common.Hash, err error) {
-	return evmtypes.PackTopicData(m.Event, []common.Hash{sender.Hash()}, eventNonce, dstChain)
+func (m ExecuteClaimABI) NewExecuteClaimEvent(sender common.Address, eventNonce *big.Int, dstChain string, executeErr error) (data []byte, topic []common.Hash, err error) {
+	errReason := ""
+	if executeErr != nil {
+		errReason = executeErr.Error()
+	}
+	return evmtypes.PackTopicData(m.Event, []common.Hash{sender.Hash()}, eventNonce, dstChain, errReason)
 }
 
 func (m ExecuteClaimABI) PackInput(args fxcontract.ExecuteClaimArgs) ([]byte, error) {

diff --git a/precompiles/crosschain/execute_claim_test.go b/precompiles/crosschain/execute_claim_test.go
@@ -19,7 +19,7 @@ func TestExecuteClaimMethod_ABI(t *testing.T) {
 	methodStr := `function executeClaim(string _chain, uint256 _eventNonce) returns(bool _result)`
 	assert.Equal(t, methodStr, executeClaimABI.Method.String())
 
-	eventStr := `event ExecuteClaimEvent(address indexed _sender, uint256 _eventNonce, string _chain)`
+	eventStr := `event ExecuteClaimEvent(address indexed _sender, uint256 _eventNonce, string _chain, string _errReason)`
 	assert.Equal(t, eventStr, executeClaimABI.Event.String())
 }
 

diff --git a/precompiles/types/expected_keepers.go b/precompiles/types/expected_keepers.go
@@ -27,7 +27,7 @@ type BankKeeper interface {
 }
 
 type CrosschainKeeper interface {
-	ExecuteClaim(ctx sdk.Context, eventNonce uint64) error
+	ExecuteClaim(ctx sdk.Context, eventNonce uint64) (error, error)
 	BridgeCoinSupply(ctx context.Context, token, target string) (sdk.Coin, error)
 	CrosschainBaseCoin(ctx sdk.Context, from sdk.AccAddress, receipt string, amount, fee sdk.Coin, fxTarget *crosschaintypes.FxTarget, memo string, originToken bool) error
 	BridgeCallBaseCoin(ctx sdk.Context, from, refund, to common.Address, coins sdk.Coins, data, memo []byte, quoteId *big.Int, fxTarget *crosschaintypes.FxTarget, originTokenAmount sdkmath.Int) (uint64, error)

diff --git a/solidity/contracts/bridge/ICrosschain.sol b/solidity/contracts/bridge/ICrosschain.sol
@@ -66,6 +66,7 @@ interface ICrosschain is IBridgeCall {
     event ExecuteClaimEvent(
         address indexed _sender,
         uint256 _eventNonce,
-        string _chain
+        string _chain,
+        string _errReason
     );
 }