feat: add block height in RefundRecord (#273)

Co-authored-by: fx0x55 <80245546+fx0x55@users.noreply.github.com>
FunctionX · Mar 18, 2024 · 70baa99 · 70baa99
1 parent 8db1a93
commit 70baa99
Show file tree

Hide file tree

Showing 5 changed files with 144 additions and 100 deletions.
diff --git a/proto/fx/crosschain/v1/types.proto b/proto/fx/crosschain/v1/types.proto
@@ -120,6 +120,7 @@ message RefundRecord {
   uint64 timeout = 3;
   repeated ERC20Token tokens = 4 [(gogoproto.nullable) = false];
   uint64 oracle_set_nonce = 5;
+  uint64 block = 6;
 }
 
 message SnapshotOracle {

diff --git a/x/crosschain/keeper/bridge_call_refund.go b/x/crosschain/keeper/bridge_call_refund.go
@@ -47,6 +47,7 @@ func (k Keeper) AddRefundRecord(ctx sdk.Context, receiver string, eventNonce uin
 		Timeout:        refundTimeout,
 		OracleSetNonce: oracleSet.Nonce,
 		Tokens:         tokens,
+		Block:          uint64(ctx.BlockHeight()),
 	})
 	return nil
 }

diff --git a/x/crosschain/keeper/grpc_query_test.go b/x/crosschain/keeper/grpc_query_test.go
@@ -2444,6 +2444,7 @@ func (suite *CrossChainGrpcTestSuite) TestKeeper_RefundRecordByNonce() {
 					Timeout:        tmrand.Uint64(),
 					Tokens:         nil,
 					OracleSetNonce: uint64(tmrand.Int63n(10000)),
+					Block:          tmrand.Uint64(),
 				}
 				suite.Keeper().SetRefundRecord(suite.ctx, refundRecord)
 				request = &types.QueryRefundRecordByNonceRequest{
@@ -2494,6 +2495,7 @@ func (suite *CrossChainGrpcTestSuite) TestKeeper_RefundRecordByReceiver() {
 					Timeout:        tmrand.Uint64(),
 					Tokens:         nil,
 					OracleSetNonce: uint64(tmrand.Int63n(10000)),
+					Block:          tmrand.Uint64(),
 				}
 				suite.Keeper().SetRefundRecord(suite.ctx, refundRecord)
 				request = &types.QueryRefundRecordByReceiverRequest{
@@ -2573,6 +2575,7 @@ func (suite *CrossChainGrpcTestSuite) TestKeeper_RefundConfirmByNonce() {
 				Timeout:        tmrand.Uint64(),
 				Tokens:         nil,
 				OracleSetNonce: oracleNonce,
+				Block:          tmrand.Uint64(),
 			}
 			suite.Keeper().SetRefundRecord(suite.ctx, refundRecord)
 
@@ -2646,6 +2649,7 @@ func (suite *CrossChainGrpcTestSuite) TestKeeper_LastPendingRefundRecordByAddr()
 		Timeout:        tmrand.Uint64(),
 		Tokens:         nil,
 		OracleSetNonce: oracleNonce,
+		Block:          tmrand.Uint64(),
 	}
 	suite.Keeper().SetRefundRecord(suite.ctx, refundRecord)
 
@@ -2696,6 +2700,7 @@ func (suite *CrossChainGrpcTestSuite) TestKeeper_LastPendingRefundRecordByAddr()
 					Timeout:        tmrand.Uint64(),
 					Tokens:         nil,
 					OracleSetNonce: oracleNonce,
+					Block:          tmrand.Uint64(),
 				}
 				suite.Keeper().SetRefundRecord(suite.ctx, refundRecordNew)
 				request = &types.QueryLastPendingRefundRecordByAddrRequest{

diff --git a/x/crosschain/keeper/msg_server_test.go b/x/crosschain/keeper/msg_server_test.go
@@ -1239,6 +1239,7 @@ func (suite *KeeperTestSuite) TestConfirmRefund() {
 		Timeout:        tmrand.Uint64(),
 		Tokens:         tokens,
 		OracleSetNonce: oracleSetNonce,
+		Block:          tmrand.Uint64(),
 	}
 	suite.Keeper().SetRefundRecord(suite.ctx, refundRecord)