feat: distinguish inturn relayer (#353)

* distinguish inturn relayers * fix test
bnb-chain · Oct 30, 2023 · 771bd5d · 771bd5d
1 parent f5f1749
commit 771bd5d
Show file tree

Hide file tree

Showing 24 changed files with 431 additions and 134 deletions.
diff --git a/api/cosmos/oracle/v1/query.pulsar.go b/api/cosmos/oracle/v1/query.pulsar.go
diff --git a/proto/cosmos/oracle/v1/query.proto b/proto/cosmos/oracle/v1/query.proto
@@ -29,8 +29,22 @@ message QueryParamsResponse {
   Params params = 1 [(gogoproto.nullable) = false];
 }
 
+// ClaimSrcChain defines the src chain of a claim
+enum ClaimSrcChain {
+  option (gogoproto.goproto_enum_prefix) = false;
+  // CLAIM_SRC_CHAIN_UNSPECIFIED
+  CLAIM_SRC_CHAIN_UNSPECIFIED = 0;
+  // CLAIM_SRC_CHAIN_BSC defines BSC source chain
+  CLAIM_SRC_CHAIN_BSC = 1;
+  // CLAIM_SRC_CHAIN_OP_BNB defines OPBNB source chain
+  CLAIM_SRC_CHAIN_OP_BNB = 2;
+}
+
 // QueryInturnRelayerRequest is the request type for the Query In-turn relayer RPC method.
-message QueryInturnRelayerRequest {}
+message QueryInturnRelayerRequest {
+  // ClaimSrcChain defines the src chain of a claim
+  ClaimSrcChain claim_src_chain = 1;
+}
 
 // QueryInturnRelayerResponse is the response type for the Query In-turn relayer RPC method.
 message QueryInturnRelayerResponse {

diff --git a/snapshots/types/snapshot.pb.go b/snapshots/types/snapshot.pb.go
diff --git a/tests/e2e/bank/grpc.go b/tests/e2e/bank/grpc.go
@@ -37,9 +37,7 @@ func (s *E2ETestSuite) TestTotalSupplyGRPCHandler() {
 					sdk.NewCoin(fmt.Sprintf("%stoken", val.Moniker), s.cfg.AccountTokens),
 					sdk.NewCoin(s.cfg.BondDenom, s.cfg.StakingTokens.Add(sdk.NewInt(10))),
 				),
-				Pagination: &query.PageResponse{
-					Total: 2,
-				},
+				Pagination: &query.PageResponse{},
 			},
 		},
 		{
@@ -160,7 +158,7 @@ func (s *E2ETestSuite) TestDenomMetadataGRPCHandler() {
 						Display: "eth",
 					},
 				},
-				Pagination: &query.PageResponse{Total: 2},
+				Pagination: &query.PageResponse{},
 			},
 		},
 		{
@@ -244,9 +242,7 @@ func (s *E2ETestSuite) TestBalancesGRPCHandler() {
 					sdk.NewCoin(fmt.Sprintf("%stoken", val.Moniker), s.cfg.AccountTokens),
 					sdk.NewCoin(s.cfg.BondDenom, s.cfg.StakingTokens.Sub(s.cfg.BondedTokens)),
 				),
-				Pagination: &query.PageResponse{
-					Total: 2,
-				},
+				Pagination: &query.PageResponse{},
 			},
 		},
 		{

diff --git a/tests/e2e/bank/suite.go b/tests/e2e/bank/suite.go
@@ -296,7 +296,7 @@ func (s *E2ETestSuite) TestGetCmdQueryDenomsMetadata() {
 						Display: "eth",
 					},
 				},
-				Pagination: &query.PageResponse{Total: 2},
+				Pagination: &query.PageResponse{},
 			},
 		},
 		{

diff --git a/tests/e2e/slashing/grpc.go b/tests/e2e/slashing/grpc.go
@@ -42,9 +42,7 @@ func (s *E2ETestSuite) TestGRPCQueries() {
 						JailedUntil: time.Unix(0, 0),
 					},
 				},
-				Pagination: &query.PageResponse{
-					Total: uint64(1),
-				},
+				Pagination: &query.PageResponse{},
 			},
 		},
 		{

diff --git a/tests/e2e/staking/grpc.go b/tests/e2e/staking/grpc.go
@@ -400,7 +400,7 @@ func (s *E2ETestSuite) TestGRPCQueryDelegatorDelegations() {
 				DelegationResponses: types.DelegationResponses{
 					types.NewDelegationResp(val.Address, val.ValAddress, sdk.NewDecFromInt(cli.DefaultTokens), sdk.NewCoin(sdk.DefaultBondDenom, cli.DefaultTokens)),
 				},
-				Pagination: &query.PageResponse{Total: 1},
+				Pagination: &query.PageResponse{},
 			},
 		},
 		{
@@ -413,7 +413,7 @@ func (s *E2ETestSuite) TestGRPCQueryDelegatorDelegations() {
 			&types.QueryDelegatorDelegationsResponse{},
 			&types.QueryDelegatorDelegationsResponse{
 				DelegationResponses: types.DelegationResponses{},
-				Pagination:          &query.PageResponse{Total: 0},
+				Pagination:          &query.PageResponse{},
 			},
 		},
 	}
@@ -592,7 +592,6 @@ func (s *E2ETestSuite) TestGRPCQueryDelegatorValidators() {
 			} else {
 				s.Require().NoError(err)
 				s.Require().Len(validators.Validators, len(s.network.Validators))
-				s.Require().Equal(int(validators.Pagination.Total), len(s.network.Validators))
 			}
 		})
 	}

diff --git a/testutil/testdata/unknonwnproto.pb.go b/testutil/testdata/unknonwnproto.pb.go
diff --git a/types/query/pagination.pb.go b/types/query/pagination.pb.go
diff --git a/types/tx/signing/signing.pb.go b/types/tx/signing/signing.pb.go
diff --git a/types/tx/tx.pb.go b/types/tx/tx.pb.go
diff --git a/x/distribution/types/distribution.pb.go b/x/distribution/types/distribution.pb.go
diff --git a/x/gashub/types/gashub.pb.go b/x/gashub/types/gashub.pb.go
diff --git a/x/gov/testutil/expected_keepers.go b/x/gov/testutil/expected_keepers.go
@@ -50,4 +50,6 @@ type CrossChainKeeper interface {
 	GetReceiveSequence(ctx sdk.Context, destChainId sdk.ChainID, channelID sdk.ChannelID) uint64
 
 	IsDestChainSupported(chainID sdk.ChainID) bool
+
+	GetDestOpChainID() sdk.ChainID
 }
diff --git a/x/gov/testutil/expected_keepers_mocks.go b/x/gov/testutil/expected_keepers_mocks.go
diff --git a/x/gov/types/v1/gov.pb.go b/x/gov/types/v1/gov.pb.go
diff --git a/x/group/types.pb.go b/x/group/types.pb.go
diff --git a/x/oracle/keeper/grpc_query.go b/x/oracle/keeper/grpc_query.go
@@ -18,5 +18,5 @@ func (k Keeper) InturnRelayer(c context.Context, req *types.QueryInturnRelayerRe
 	}
 	ctx := sdk.UnwrapSDKContext(c)
 	_, relayerInterval := k.GetRelayerParams(ctx)
-	return k.GetInturnRelayer(ctx, relayerInterval)
+	return k.GetInturnRelayer(ctx, relayerInterval, req.ClaimSrcChain)
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -296,7 +296,7 @@ func (s *E2ETestSuite) TestGetCmdQueryDenomsMetadata() { @@
     						Display: "eth",
     					},
     				},
-    				Pagination: &query.PageResponse{Total: 2},
+    				Pagination: &query.PageResponse{},
     			},
     		},
     		{
@@ Expand Down @@