From e83b40e7f588155226a5583e68adb5bfe720b13e Mon Sep 17 00:00:00 2001 From: Haiyi Zhong Date: Wed, 27 Mar 2024 15:16:02 -0400 Subject: [PATCH] rename module to auxiliary --- app/app.go | 16 +- docs/proto/proto-docs.md | 408 +++++++++--------- .../{batch => auxiliary}/v1beta1/events.proto | 4 +- .../v1beta1/genesis.proto | 4 +- .../v1beta1/service.proto | 8 +- .../{batch => auxiliary}/v1beta1/tx.proto | 4 +- utils/events/event_imports_test.go | 2 +- x/ante/batch.go | 6 +- x/ante/batch_test.go | 10 +- x/{batch => auxiliary}/keeper/msg_server.go | 2 +- .../keeper/msg_server_test.go | 6 +- x/{batch => auxiliary}/module.go | 8 +- x/{batch => auxiliary}/types/codec.go | 0 x/{batch => auxiliary}/types/errors.go | 4 +- x/{batch => auxiliary}/types/events.pb.go | 44 +- x/{batch => auxiliary}/types/genesis.pb.go | 34 +- x/{batch => auxiliary}/types/key.go | 2 +- x/{batch => auxiliary}/types/msg_batch.go | 0 x/{batch => auxiliary}/types/service.pb.go | 51 +-- x/{batch => auxiliary}/types/service.pb.gw.go | 4 +- x/{batch => auxiliary}/types/tx.pb.go | 82 ++-- 21 files changed, 351 insertions(+), 348 deletions(-) rename proto/axelar/{batch => auxiliary}/v1beta1/events.proto (60%) rename proto/axelar/{batch => auxiliary}/v1beta1/genesis.proto (60%) rename proto/axelar/{batch => auxiliary}/v1beta1/service.proto (61%) rename proto/axelar/{batch => auxiliary}/v1beta1/tx.proto (87%) rename x/{batch => auxiliary}/keeper/msg_server.go (96%) rename x/{batch => auxiliary}/keeper/msg_server_test.go (96%) rename x/{batch => auxiliary}/module.go (94%) rename x/{batch => auxiliary}/types/codec.go (100%) rename x/{batch => auxiliary}/types/errors.go (59%) rename x/{batch => auxiliary}/types/events.pb.go (80%) rename x/{batch => auxiliary}/types/genesis.pb.go (80%) rename x/{batch => auxiliary}/types/key.go (83%) rename x/{batch => auxiliary}/types/msg_batch.go (100%) rename x/{batch => auxiliary}/types/service.pb.go (62%) rename x/{batch => auxiliary}/types/service.pb.gw.go (97%) rename x/{batch => auxiliary}/types/tx.pb.go (85%) diff --git a/app/app.go b/app/app.go index 7cd209612..e0979eed2 100644 --- a/app/app.go +++ b/app/app.go @@ -100,13 +100,13 @@ import ( axelarParams "github.com/axelarnetwork/axelar-core/app/params" "github.com/axelarnetwork/axelar-core/x/ante" + "github.com/axelarnetwork/axelar-core/x/auxiliary" + auxiliarytypes "github.com/axelarnetwork/axelar-core/x/auxiliary/types" "github.com/axelarnetwork/axelar-core/x/axelarnet" axelarnetclient "github.com/axelarnetwork/axelar-core/x/axelarnet/client" axelarnetKeeper "github.com/axelarnetwork/axelar-core/x/axelarnet/keeper" axelarnetTypes "github.com/axelarnetwork/axelar-core/x/axelarnet/types" axelarbankkeeper "github.com/axelarnetwork/axelar-core/x/bank/keeper" - "github.com/axelarnetwork/axelar-core/x/batch" - batchtypes "github.com/axelarnetwork/axelar-core/x/batch/types" "github.com/axelarnetwork/axelar-core/x/evm" evmKeeper "github.com/axelarnetwork/axelar-core/x/evm/keeper" evmTypes "github.com/axelarnetwork/axelar-core/x/evm/types" @@ -659,7 +659,7 @@ func initAppModules(keepers *KeeperCache, bApp *bam.BaseApp, encodingConfig axel bApp.Router(), ), permission.NewAppModule(*getKeeper[permissionKeeper.Keeper](keepers)), - batch.NewAppModule(encodingConfig.Codec, bApp.MsgServiceRouter()), + auxiliary.NewAppModule(encodingConfig.Codec, bApp.MsgServiceRouter()), ) return appModules @@ -794,7 +794,7 @@ func orderMigrations() []string { permissionTypes.ModuleName, snapTypes.ModuleName, axelarnetTypes.ModuleName, - batchtypes.ModuleName, + auxiliarytypes.ModuleName, ) return migrationOrder } @@ -845,7 +845,7 @@ func orderBeginBlockers() []string { snapTypes.ModuleName, axelarnetTypes.ModuleName, voteTypes.ModuleName, - batchtypes.ModuleName, + auxiliarytypes.ModuleName, ) return beginBlockerOrder } @@ -891,7 +891,7 @@ func orderEndBlockers() []string { axelarnetTypes.ModuleName, permissionTypes.ModuleName, voteTypes.ModuleName, - batchtypes.ModuleName, + auxiliarytypes.ModuleName, ) return endBlockerOrder } @@ -940,7 +940,7 @@ func orderModulesForGenesis() []string { axelarnetTypes.ModuleName, rewardTypes.ModuleName, permissionTypes.ModuleName, - batchtypes.ModuleName, + auxiliarytypes.ModuleName, ) return genesisOrder } @@ -1111,7 +1111,7 @@ func GetModuleBasics() module.BasicManager { axelarnet.AppModuleBasic{}, reward.AppModuleBasic{}, permission.AppModuleBasic{}, - batch.AppModuleBasic{}, + auxiliary.AppModuleBasic{}, } if IsWasmEnabled() { diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md index cc03aaebe..fbee606e1 100644 --- a/docs/proto/proto-docs.md +++ b/docs/proto/proto-docs.md @@ -4,6 +4,25 @@ ## Table of Contents +- [axelar/auxiliary/v1beta1/events.proto](#axelar/auxiliary/v1beta1/events.proto) + - [BatchedMessageFailed](#axelar.auxiliary.v1beta1.BatchedMessageFailed) + +- [axelar/auxiliary/v1beta1/genesis.proto](#axelar/auxiliary/v1beta1/genesis.proto) + - [GenesisState](#axelar.auxiliary.v1beta1.GenesisState) + +- [axelar/permission/exported/v1beta1/types.proto](#axelar/permission/exported/v1beta1/types.proto) + - [Role](#axelar.permission.exported.v1beta1.Role) + + - [File-level Extensions](#axelar/permission/exported/v1beta1/types.proto-extensions) + +- [axelar/auxiliary/v1beta1/tx.proto](#axelar/auxiliary/v1beta1/tx.proto) + - [BatchRequest](#axelar.auxiliary.v1beta1.BatchRequest) + - [BatchResponse](#axelar.auxiliary.v1beta1.BatchResponse) + - [BatchResponse.Response](#axelar.auxiliary.v1beta1.BatchResponse.Response) + +- [axelar/auxiliary/v1beta1/service.proto](#axelar/auxiliary/v1beta1/service.proto) + - [MsgService](#axelar.auxiliary.v1beta1.MsgService) + - [axelar/axelarnet/v1beta1/events.proto](#axelar/axelarnet/v1beta1/events.proto) - [AxelarTransferCompleted](#axelar.axelarnet.v1beta1.AxelarTransferCompleted) - [ContractCallSubmitted](#axelar.axelarnet.v1beta1.ContractCallSubmitted) @@ -122,11 +141,6 @@ - [PendingIBCTransferCountResponse](#axelar.axelarnet.v1beta1.PendingIBCTransferCountResponse) - [PendingIBCTransferCountResponse.TransfersByChainEntry](#axelar.axelarnet.v1beta1.PendingIBCTransferCountResponse.TransfersByChainEntry) -- [axelar/permission/exported/v1beta1/types.proto](#axelar/permission/exported/v1beta1/types.proto) - - [Role](#axelar.permission.exported.v1beta1.Role) - - - [File-level Extensions](#axelar/permission/exported/v1beta1/types.proto-extensions) - - [axelar/axelarnet/v1beta1/tx.proto](#axelar/axelarnet/v1beta1/tx.proto) - [AddCosmosBasedChainRequest](#axelar.axelarnet.v1beta1.AddCosmosBasedChainRequest) - [AddCosmosBasedChainResponse](#axelar.axelarnet.v1beta1.AddCosmosBasedChainResponse) @@ -155,20 +169,6 @@ - [MsgService](#axelar.axelarnet.v1beta1.MsgService) - [QueryService](#axelar.axelarnet.v1beta1.QueryService) -- [axelar/batch/v1beta1/events.proto](#axelar/batch/v1beta1/events.proto) - - [BatchedMessageFailed](#axelar.batch.v1beta1.BatchedMessageFailed) - -- [axelar/batch/v1beta1/genesis.proto](#axelar/batch/v1beta1/genesis.proto) - - [GenesisState](#axelar.batch.v1beta1.GenesisState) - -- [axelar/batch/v1beta1/tx.proto](#axelar/batch/v1beta1/tx.proto) - - [BatchRequest](#axelar.batch.v1beta1.BatchRequest) - - [BatchResponse](#axelar.batch.v1beta1.BatchResponse) - - [BatchResponse.Response](#axelar.batch.v1beta1.BatchResponse.Response) - -- [axelar/batch/v1beta1/service.proto](#axelar/batch/v1beta1/service.proto) - - [MsgService](#axelar.batch.v1beta1.MsgService) - - [axelar/snapshot/exported/v1beta1/types.proto](#axelar/snapshot/exported/v1beta1/types.proto) - [Participant](#axelar.snapshot.exported.v1beta1.Participant) - [Snapshot](#axelar.snapshot.exported.v1beta1.Snapshot) @@ -605,6 +605,191 @@ + +

Top

+ +## axelar/auxiliary/v1beta1/events.proto + + + + + +### BatchedMessageFailed + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `index` | [int32](#int32) | | | +| `error` | [string](#string) | | | + + + + + + + + + + + + + + + + +

Top

+ +## axelar/auxiliary/v1beta1/genesis.proto + + + + + +### GenesisState +GenesisState represents the genesis state + + + + + + + + + + + + + + + + +

Top

+ +## axelar/permission/exported/v1beta1/types.proto + + + + + + + +### Role + + +| Name | Number | Description | +| ---- | ------ | ----------- | +| ROLE_UNSPECIFIED | 0 | | +| ROLE_UNRESTRICTED | 1 | | +| ROLE_CHAIN_MANAGEMENT | 2 | | +| ROLE_ACCESS_CONTROL | 3 | | + + + + + + + +### File-level Extensions +| Extension | Type | Base | Number | Description | +| --------- | ---- | ---- | ------ | ----------- | +| `permission_role` | Role | .google.protobuf.MessageOptions | 50000 | 50000-99999 reserved for use withing individual organizations | + + + + + + + + +

Top

+ +## axelar/auxiliary/v1beta1/tx.proto + + + + + +### BatchRequest + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `sender` | [bytes](#bytes) | | | +| `messages` | [google.protobuf.Any](#google.protobuf.Any) | repeated | | + + + + + + + + +### BatchResponse + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `responses` | [BatchResponse.Response](#axelar.auxiliary.v1beta1.BatchResponse.Response) | repeated | | + + + + + + + + +### BatchResponse.Response + + + +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `result` | [cosmos.base.abci.v1beta1.Result](#cosmos.base.abci.v1beta1.Result) | | | +| `err` | [string](#string) | | | + + + + + + + + + + + + + + + + +

Top

+ +## axelar/auxiliary/v1beta1/service.proto + + + + + + + + + + + +### MsgService +Msg defines the nexus Msg service. + +| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | +| ----------- | ------------ | ------------- | ------------| ------- | -------- | +| `Batch` | [BatchRequest](#axelar.auxiliary.v1beta1.BatchRequest) | [BatchResponse](#axelar.auxiliary.v1beta1.BatchResponse) | | POST|/axelar/auxiliary/batch| + + + + +

Top

@@ -2258,44 +2443,6 @@ ParamsRequest represents a message that queries the params - -

Top

- -## axelar/permission/exported/v1beta1/types.proto - - - - - - - -### Role - - -| Name | Number | Description | -| ---- | ------ | ----------- | -| ROLE_UNSPECIFIED | 0 | | -| ROLE_UNRESTRICTED | 1 | | -| ROLE_CHAIN_MANAGEMENT | 2 | | -| ROLE_ACCESS_CONTROL | 3 | | - - - - - - - -### File-level Extensions -| Extension | Type | Base | Number | Description | -| --------- | ---- | ---- | ------ | ----------- | -| `permission_role` | Role | .google.protobuf.MessageOptions | 50000 | 50000-99999 reserved for use withing individual organizations | - - - - - - -

Top

@@ -2673,153 +2820,6 @@ QueryService defines the gRPC querier service. - -

Top

- -## axelar/batch/v1beta1/events.proto - - - - - -### BatchedMessageFailed - - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `index` | [int32](#int32) | | | -| `error` | [string](#string) | | | - - - - - - - - - - - - - - - - -

Top

- -## axelar/batch/v1beta1/genesis.proto - - - - - -### GenesisState -GenesisState represents the genesis state - - - - - - - - - - - - - - - - -

Top

- -## axelar/batch/v1beta1/tx.proto - - - - - -### BatchRequest - - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `sender` | [bytes](#bytes) | | | -| `messages` | [google.protobuf.Any](#google.protobuf.Any) | repeated | | - - - - - - - - -### BatchResponse - - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `responses` | [BatchResponse.Response](#axelar.batch.v1beta1.BatchResponse.Response) | repeated | | - - - - - - - - -### BatchResponse.Response - - - -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `result` | [cosmos.base.abci.v1beta1.Result](#cosmos.base.abci.v1beta1.Result) | | | -| `err` | [string](#string) | | | - - - - - - - - - - - - - - - - -

Top

- -## axelar/batch/v1beta1/service.proto - - - - - - - - - - - -### MsgService -Msg defines the nexus Msg service. - -| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | -| ----------- | ------------ | ------------- | ------------| ------- | -------- | -| `Batch` | [BatchRequest](#axelar.batch.v1beta1.BatchRequest) | [BatchResponse](#axelar.batch.v1beta1.BatchResponse) | | POST|/axelar/batch/batch| - - - - -

Top

diff --git a/proto/axelar/batch/v1beta1/events.proto b/proto/axelar/auxiliary/v1beta1/events.proto similarity index 60% rename from proto/axelar/batch/v1beta1/events.proto rename to proto/axelar/auxiliary/v1beta1/events.proto index 737496d15..90956b702 100644 --- a/proto/axelar/batch/v1beta1/events.proto +++ b/proto/axelar/auxiliary/v1beta1/events.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package axelar.batch.v1beta1; +package axelar.auxiliary.v1beta1; -option go_package = "github.com/axelarnetwork/axelar-core/x/batch/types"; +option go_package = "github.com/axelarnetwork/axelar-core/x/auxiliary/types"; option (gogoproto.messagename_all) = true; import "gogoproto/gogo.proto"; diff --git a/proto/axelar/batch/v1beta1/genesis.proto b/proto/axelar/auxiliary/v1beta1/genesis.proto similarity index 60% rename from proto/axelar/batch/v1beta1/genesis.proto rename to proto/axelar/auxiliary/v1beta1/genesis.proto index 865a8e994..0d766e10f 100644 --- a/proto/axelar/batch/v1beta1/genesis.proto +++ b/proto/axelar/auxiliary/v1beta1/genesis.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package axelar.batch.v1beta1; +package axelar.auxiliary.v1beta1; -option go_package = "github.com/axelarnetwork/axelar-core/x/batch/types"; +option go_package = "github.com/axelarnetwork/axelar-core/x/auxiliary/types"; import "gogoproto/gogo.proto"; diff --git a/proto/axelar/batch/v1beta1/service.proto b/proto/axelar/auxiliary/v1beta1/service.proto similarity index 61% rename from proto/axelar/batch/v1beta1/service.proto rename to proto/axelar/auxiliary/v1beta1/service.proto index 6d20db6a5..6d2a08e9b 100644 --- a/proto/axelar/batch/v1beta1/service.proto +++ b/proto/axelar/auxiliary/v1beta1/service.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package axelar.batch.v1beta1; +package axelar.auxiliary.v1beta1; -option go_package = "github.com/axelarnetwork/axelar-core/x/batch/types"; +option go_package = "github.com/axelarnetwork/axelar-core/x/auxiliary/types"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -import "axelar/batch/v1beta1/tx.proto"; +import "axelar/auxiliary/v1beta1/tx.proto"; option (gogoproto.goproto_registration) = true; @@ -13,7 +13,7 @@ option (gogoproto.goproto_registration) = true; service MsgService { rpc Batch(BatchRequest) returns (BatchResponse) { option (google.api.http) = { - post : "/axelar/batch/batch" + post : "/axelar/auxiliary/batch" body : "*" }; } diff --git a/proto/axelar/batch/v1beta1/tx.proto b/proto/axelar/auxiliary/v1beta1/tx.proto similarity index 87% rename from proto/axelar/batch/v1beta1/tx.proto rename to proto/axelar/auxiliary/v1beta1/tx.proto index dd612bf5c..065016da4 100644 --- a/proto/axelar/batch/v1beta1/tx.proto +++ b/proto/axelar/auxiliary/v1beta1/tx.proto @@ -1,5 +1,5 @@ syntax = "proto3"; -package axelar.batch.v1beta1; +package axelar.auxiliary.v1beta1; import "google/protobuf/any.proto"; import "gogoproto/gogo.proto"; @@ -8,7 +8,7 @@ import "axelar/permission/exported/v1beta1/types.proto"; import "cosmos/base/abci/v1beta1/abci.proto"; import "cosmos_proto/cosmos.proto"; -option go_package = "github.com/axelarnetwork/axelar-core/x/batch/types"; +option go_package = "github.com/axelarnetwork/axelar-core/x/auxiliary/types"; message BatchRequest { option (permission.exported.v1beta1.permission_role) = ROLE_UNRESTRICTED; diff --git a/utils/events/event_imports_test.go b/utils/events/event_imports_test.go index 4e2ddecc1..646e60920 100644 --- a/utils/events/event_imports_test.go +++ b/utils/events/event_imports_test.go @@ -3,8 +3,8 @@ package events_test // add types packages for all modules here import ( _ "github.com/axelarnetwork/axelar-core/x/ante/types" + _ "github.com/axelarnetwork/axelar-core/x/auxiliary/types" _ "github.com/axelarnetwork/axelar-core/x/axelarnet/types" - _ "github.com/axelarnetwork/axelar-core/x/batch/types" _ "github.com/axelarnetwork/axelar-core/x/evm/types" _ "github.com/axelarnetwork/axelar-core/x/multisig/types" _ "github.com/axelarnetwork/axelar-core/x/nexus/types" diff --git a/x/ante/batch.go b/x/ante/batch.go index 49084a76d..a4853dcc1 100644 --- a/x/ante/batch.go +++ b/x/ante/batch.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - batchtypes "github.com/axelarnetwork/axelar-core/x/batch/types" + auxiliarytypes "github.com/axelarnetwork/axelar-core/x/auxiliary/types" ) // txWithUnwrappedMsgs implements the FeeTx interface @@ -60,12 +60,12 @@ func unpackMsgs(msgs []sdk.Msg) ([]sdk.Msg, error) { idx := 0 for i, msg := range msgs { - if batchReq, ok := msg.(*batchtypes.BatchRequest); ok { + if batchReq, ok := msg.(*auxiliarytypes.BatchRequest); ok { // Bulk append messages, including the current batch request unpackedMsgs = append(unpackedMsgs, msgs[idx:i+1]...) innerMsgs := batchReq.UnwrapMessages() - if batchtypes.AnyBatch(innerMsgs) { + if auxiliarytypes.AnyBatch(innerMsgs) { return []sdk.Msg{}, sdkerrors.Wrap(sdkerrors.ErrInvalidRequest, "nested batch requests are not allowed") } unpackedMsgs = append(unpackedMsgs, innerMsgs...) diff --git a/x/ante/batch_test.go b/x/ante/batch_test.go index bdb0667a5..8701078e9 100644 --- a/x/ante/batch_test.go +++ b/x/ante/batch_test.go @@ -10,7 +10,7 @@ import ( "github.com/axelarnetwork/axelar-core/testutils/rand" "github.com/axelarnetwork/axelar-core/x/ante" "github.com/axelarnetwork/axelar-core/x/ante/types/mock" - batchtypes "github.com/axelarnetwork/axelar-core/x/batch/types" + auxiliarytypes "github.com/axelarnetwork/axelar-core/x/auxiliary/types" evmTypes "github.com/axelarnetwork/axelar-core/x/evm/types" nexus "github.com/axelarnetwork/axelar-core/x/nexus/exported" vote "github.com/axelarnetwork/axelar-core/x/vote/exported" @@ -22,7 +22,7 @@ func TestBatch(t *testing.T) { var ( handler sdk.AnteDecorator tx *mock.FeeTxMock - batchMsg *batchtypes.BatchRequest + batchMsg *auxiliarytypes.BatchRequest unwrappedMsgs []sdk.Msg ) @@ -35,10 +35,10 @@ func TestBatch(t *testing.T) { givenBatchAnteHandler. When("a BatchRequest contains nested batch message", func() { - req := batchtypes.NewBatchRequest(sender, []sdk.Msg{ + req := auxiliarytypes.NewBatchRequest(sender, []sdk.Msg{ votetypes.NewVoteRequest(sender, vote.PollID(rand.PosI64()), evmTypes.NewVoteEvents(nexus.ChainName(rand.NormalizedStr(3)))), }) - batchMsg = batchtypes.NewBatchRequest(sender, []sdk.Msg{req}) + batchMsg = auxiliarytypes.NewBatchRequest(sender, []sdk.Msg{req}) }). Then("ante handler should return an error", func(t *testing.T) { tx = &mock.FeeTxMock{ @@ -79,7 +79,7 @@ func TestBatch(t *testing.T) { givenBatchAnteHandler. When("a Batch Request is valid", func() { - batchMsg = batchtypes.NewBatchRequest(sender, []sdk.Msg{ + batchMsg = auxiliarytypes.NewBatchRequest(sender, []sdk.Msg{ votetypes.NewVoteRequest(sender, vote.PollID(rand.PosI64()), evmTypes.NewVoteEvents(nexus.ChainName(rand.NormalizedStr(3)))), votetypes.NewVoteRequest(sender, vote.PollID(rand.PosI64()), evmTypes.NewVoteEvents(nexus.ChainName(rand.NormalizedStr(3)))), }) diff --git a/x/batch/keeper/msg_server.go b/x/auxiliary/keeper/msg_server.go similarity index 96% rename from x/batch/keeper/msg_server.go rename to x/auxiliary/keeper/msg_server.go index 896728736..4ef1b2237 100644 --- a/x/batch/keeper/msg_server.go +++ b/x/auxiliary/keeper/msg_server.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/axelarnetwork/axelar-core/utils/events" - "github.com/axelarnetwork/axelar-core/x/batch/types" + "github.com/axelarnetwork/axelar-core/x/auxiliary/types" ) var _ types.MsgServiceServer = msgServer{} diff --git a/x/batch/keeper/msg_server_test.go b/x/auxiliary/keeper/msg_server_test.go similarity index 96% rename from x/batch/keeper/msg_server_test.go rename to x/auxiliary/keeper/msg_server_test.go index 12cd576ce..0e0892e6b 100644 --- a/x/batch/keeper/msg_server_test.go +++ b/x/auxiliary/keeper/msg_server_test.go @@ -14,8 +14,8 @@ import ( "github.com/axelarnetwork/axelar-core/testutils/fake" "github.com/axelarnetwork/axelar-core/testutils/rand" rand2 "github.com/axelarnetwork/axelar-core/testutils/rand" - "github.com/axelarnetwork/axelar-core/x/batch/keeper" - "github.com/axelarnetwork/axelar-core/x/batch/types" + "github.com/axelarnetwork/axelar-core/x/auxiliary/keeper" + "github.com/axelarnetwork/axelar-core/x/auxiliary/types" evmTypes "github.com/axelarnetwork/axelar-core/x/evm/types" nexus "github.com/axelarnetwork/axelar-core/x/nexus/exported" vote "github.com/axelarnetwork/axelar-core/x/vote/exported" @@ -36,7 +36,7 @@ func TestBatching(t *testing.T) { innerMessages []sdk.Msg ) - givenMsgServer := Given("a Batch msg server", func() { + givenMsgServer := Given("an Auxiliary msg server", func() { ctx = rand2.Context(fake.NewMultiStore()) msgServiceRouter = bam.NewMsgServiceRouter() diff --git a/x/batch/module.go b/x/auxiliary/module.go similarity index 94% rename from x/batch/module.go rename to x/auxiliary/module.go index be9549b68..eaf5cb29a 100644 --- a/x/batch/module.go +++ b/x/auxiliary/module.go @@ -1,4 +1,4 @@ -package batch +package auxiliary import ( "encoding/json" @@ -17,8 +17,8 @@ import ( "github.com/tendermint/tendermint/libs/log" "github.com/axelarnetwork/axelar-core/utils/grpc" - "github.com/axelarnetwork/axelar-core/x/batch/keeper" - "github.com/axelarnetwork/axelar-core/x/batch/types" + "github.com/axelarnetwork/axelar-core/x/auxiliary/keeper" + "github.com/axelarnetwork/axelar-core/x/auxiliary/types" ) var ( @@ -119,7 +119,7 @@ func (am AppModule) RegisterServices(cfg module.Configurator) { return ctx.Logger().With("module", fmt.Sprintf("x/%s", types.ModuleName)) } - types.RegisterMsgServiceServer(grpc.ServerWithSDKErrors{Server: cfg.MsgServer(), Err: types.ErrBatch, Logger: logger}, keeper.NewMsgServer(am.cdc, am.router)) + types.RegisterMsgServiceServer(grpc.ServerWithSDKErrors{Server: cfg.MsgServer(), Err: types.ErrAuxiliary, Logger: logger}, keeper.NewMsgServer(am.cdc, am.router)) } // BeginBlock executes all state transitions this module requires at the beginning of each new block diff --git a/x/batch/types/codec.go b/x/auxiliary/types/codec.go similarity index 100% rename from x/batch/types/codec.go rename to x/auxiliary/types/codec.go diff --git a/x/batch/types/errors.go b/x/auxiliary/types/errors.go similarity index 59% rename from x/batch/types/errors.go rename to x/auxiliary/types/errors.go index a85185448..81fa69879 100644 --- a/x/batch/types/errors.go +++ b/x/auxiliary/types/errors.go @@ -7,6 +7,6 @@ import ( // module errors var ( // Code 1 is a reserved code for internal errors and should not be used for anything else - _ = sdkerrors.Register(ModuleName, 1, "internal error") - ErrBatch = sdkerrors.Register(ModuleName, 2, "batch module error") + _ = sdkerrors.Register(ModuleName, 1, "internal error") + ErrAuxiliary = sdkerrors.Register(ModuleName, 2, "auxiliary module error") ) diff --git a/x/batch/types/events.pb.go b/x/auxiliary/types/events.pb.go similarity index 80% rename from x/batch/types/events.pb.go rename to x/auxiliary/types/events.pb.go index 1ec8dfbde..5eeee42ca 100644 --- a/x/batch/types/events.pb.go +++ b/x/auxiliary/types/events.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: axelar/batch/v1beta1/events.proto +// source: axelar/auxiliary/v1beta1/events.proto package types @@ -32,7 +32,7 @@ func (m *BatchedMessageFailed) Reset() { *m = BatchedMessageFailed{} } func (m *BatchedMessageFailed) String() string { return proto.CompactTextString(m) } func (*BatchedMessageFailed) ProtoMessage() {} func (*BatchedMessageFailed) Descriptor() ([]byte, []int) { - return fileDescriptor_beac6735752ff859, []int{0} + return fileDescriptor_6aaa22e2bb7d82c4, []int{0} } func (m *BatchedMessageFailed) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -76,30 +76,32 @@ func (m *BatchedMessageFailed) GetError() string { } func (*BatchedMessageFailed) XXX_MessageName() string { - return "axelar.batch.v1beta1.BatchedMessageFailed" + return "axelar.auxiliary.v1beta1.BatchedMessageFailed" } func init() { - proto.RegisterType((*BatchedMessageFailed)(nil), "axelar.batch.v1beta1.BatchedMessageFailed") + proto.RegisterType((*BatchedMessageFailed)(nil), "axelar.auxiliary.v1beta1.BatchedMessageFailed") } -func init() { proto.RegisterFile("axelar/batch/v1beta1/events.proto", fileDescriptor_beac6735752ff859) } +func init() { + proto.RegisterFile("axelar/auxiliary/v1beta1/events.proto", fileDescriptor_6aaa22e2bb7d82c4) +} -var fileDescriptor_beac6735752ff859 = []byte{ - // 210 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x2c, 0xcf, 0x31, 0x4e, 0x87, 0x30, - 0x14, 0xc7, 0x71, 0x6a, 0xf2, 0x37, 0x91, 0x91, 0x74, 0x20, 0x0e, 0x0d, 0x3a, 0xb1, 0xd8, 0x06, - 0xbd, 0x01, 0x83, 0x9b, 0x89, 0x61, 0x74, 0x6b, 0xe1, 0xa5, 0x10, 0x91, 0x47, 0xda, 0x8a, 0x78, - 0x0b, 0x8f, 0xc5, 0xc8, 0xe8, 0x68, 0xe8, 0x45, 0x0c, 0x94, 0xad, 0xdf, 0xe6, 0x33, 0xfc, 0x5e, - 0x7c, 0x27, 0x67, 0xe8, 0xa5, 0x11, 0x4a, 0xba, 0xba, 0x15, 0x53, 0xa1, 0xc0, 0xc9, 0x42, 0xc0, - 0x04, 0x83, 0xb3, 0x7c, 0x34, 0xe8, 0x30, 0xa1, 0x81, 0xf0, 0x83, 0xf0, 0x93, 0xdc, 0x52, 0x8d, - 0x1a, 0x0f, 0x20, 0xf6, 0x57, 0xb0, 0xf7, 0x65, 0x4c, 0xcb, 0x9d, 0x41, 0xf3, 0x02, 0xd6, 0x4a, - 0x0d, 0xcf, 0xb2, 0xeb, 0xa1, 0x49, 0x68, 0x7c, 0xe9, 0x86, 0x06, 0xe6, 0x94, 0x64, 0x24, 0xbf, - 0x54, 0x21, 0xf6, 0x5f, 0x30, 0x06, 0x4d, 0x7a, 0x95, 0x91, 0xfc, 0xa6, 0x0a, 0x51, 0xbe, 0x2e, - 0x1b, 0x23, 0xeb, 0xc6, 0xc8, 0xdf, 0xc6, 0xc8, 0x8f, 0x67, 0xd1, 0xe2, 0x19, 0x59, 0x3d, 0x8b, - 0x7e, 0x3d, 0x8b, 0xde, 0x1e, 0x75, 0xe7, 0xda, 0x4f, 0xc5, 0x6b, 0xfc, 0x10, 0x61, 0xd8, 0x00, - 0xee, 0x0b, 0xcd, 0xfb, 0x59, 0x0f, 0x35, 0x1a, 0x10, 0xf3, 0x79, 0x90, 0xfb, 0x1e, 0xc1, 0xaa, - 0xeb, 0x63, 0xdc, 0xd3, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x16, 0x5a, 0x15, 0xa8, 0xed, 0x00, - 0x00, 0x00, +var fileDescriptor_6aaa22e2bb7d82c4 = []byte{ + // 219 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4d, 0xac, 0x48, 0xcd, + 0x49, 0x2c, 0xd2, 0x4f, 0x2c, 0xad, 0xc8, 0xcc, 0xc9, 0x4c, 0x2c, 0xaa, 0xd4, 0x2f, 0x33, 0x4c, + 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x2d, 0x4b, 0xcd, 0x2b, 0x29, 0xd6, 0x2b, 0x28, 0xca, 0x2f, + 0xc9, 0x17, 0x92, 0x80, 0x28, 0xd3, 0x83, 0x2b, 0xd3, 0x83, 0x2a, 0x93, 0x12, 0x49, 0xcf, 0x4f, + 0xcf, 0x07, 0x2b, 0xd2, 0x07, 0xb1, 0x20, 0xea, 0x95, 0x9c, 0xb8, 0x44, 0x9c, 0x12, 0x4b, 0x92, + 0x33, 0x52, 0x53, 0x7c, 0x53, 0x8b, 0x8b, 0x13, 0xd3, 0x53, 0xdd, 0x12, 0x33, 0x73, 0x52, 0x53, + 0x84, 0x44, 0xb8, 0x58, 0x33, 0xf3, 0x52, 0x52, 0x2b, 0x24, 0x18, 0x15, 0x18, 0x35, 0x58, 0x83, + 0x20, 0x1c, 0x90, 0x68, 0x6a, 0x51, 0x51, 0x7e, 0x91, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x67, 0x10, + 0x84, 0xe3, 0x14, 0x72, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, + 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe2, 0xb1, 0x1c, 0xe3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, + 0x31, 0x44, 0x99, 0xa5, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x1c, + 0x97, 0x97, 0x5a, 0x52, 0x9e, 0x5f, 0x94, 0x0d, 0xe5, 0xe9, 0x26, 0xe7, 0x17, 0xa5, 0xea, 0x57, + 0x20, 0x79, 0xac, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x40, 0x63, 0x40, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x6b, 0xdf, 0xe2, 0xd3, 0xf9, 0x00, 0x00, 0x00, } func (m *BatchedMessageFailed) Marshal() (dAtA []byte, err error) { diff --git a/x/batch/types/genesis.pb.go b/x/auxiliary/types/genesis.pb.go similarity index 80% rename from x/batch/types/genesis.pb.go rename to x/auxiliary/types/genesis.pb.go index 06851eb9e..00e284129 100644 --- a/x/batch/types/genesis.pb.go +++ b/x/auxiliary/types/genesis.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: axelar/batch/v1beta1/genesis.proto +// source: axelar/auxiliary/v1beta1/genesis.proto package types @@ -31,7 +31,7 @@ func (m *GenesisState) Reset() { *m = GenesisState{} } func (m *GenesisState) String() string { return proto.CompactTextString(m) } func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { - return fileDescriptor_f4959c0d1483eefc, []int{0} + return fileDescriptor_8b2375ee1af05d34, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -61,26 +61,26 @@ func (m *GenesisState) XXX_DiscardUnknown() { var xxx_messageInfo_GenesisState proto.InternalMessageInfo func init() { - proto.RegisterType((*GenesisState)(nil), "axelar.batch.v1beta1.GenesisState") + proto.RegisterType((*GenesisState)(nil), "axelar.auxiliary.v1beta1.GenesisState") } func init() { - proto.RegisterFile("axelar/batch/v1beta1/genesis.proto", fileDescriptor_f4959c0d1483eefc) + proto.RegisterFile("axelar/auxiliary/v1beta1/genesis.proto", fileDescriptor_8b2375ee1af05d34) } -var fileDescriptor_f4959c0d1483eefc = []byte{ - // 170 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4a, 0xac, 0x48, 0xcd, - 0x49, 0x2c, 0xd2, 0x4f, 0x4a, 0x2c, 0x49, 0xce, 0xd0, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, - 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, - 0x81, 0xa8, 0xd1, 0x03, 0xab, 0xd1, 0x83, 0xaa, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, - 0xd0, 0x07, 0xb1, 0x20, 0x6a, 0x95, 0xf8, 0xb8, 0x78, 0xdc, 0x21, 0x9a, 0x83, 0x4b, 0x12, 0x4b, - 0x52, 0x9d, 0x02, 0x4e, 0x3c, 0x94, 0x63, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, - 0x07, 0x8f, 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, - 0x86, 0x28, 0xa3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x88, 0x25, - 0x79, 0xa9, 0x25, 0xe5, 0xf9, 0x45, 0xd9, 0x50, 0x9e, 0x6e, 0x72, 0x7e, 0x51, 0xaa, 0x7e, 0x05, - 0xd4, 0x75, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x8b, 0x8c, 0x01, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xf0, 0x4c, 0x5e, 0x8d, 0xba, 0x00, 0x00, 0x00, +var fileDescriptor_8b2375ee1af05d34 = []byte{ + // 174 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4b, 0xac, 0x48, 0xcd, + 0x49, 0x2c, 0xd2, 0x4f, 0x2c, 0xad, 0xc8, 0xcc, 0xc9, 0x4c, 0x2c, 0xaa, 0xd4, 0x2f, 0x33, 0x4c, + 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, + 0x2f, 0xc9, 0x17, 0x92, 0x80, 0xa8, 0xd3, 0x83, 0xab, 0xd3, 0x83, 0xaa, 0x93, 0x12, 0x49, 0xcf, + 0x4f, 0xcf, 0x07, 0x2b, 0xd2, 0x07, 0xb1, 0x20, 0xea, 0x95, 0xf8, 0xb8, 0x78, 0xdc, 0x21, 0x06, + 0x04, 0x97, 0x24, 0x96, 0xa4, 0x3a, 0x85, 0x9c, 0x78, 0x28, 0xc7, 0x70, 0xe2, 0x91, 0x1c, 0xe3, + 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, + 0xc3, 0x8d, 0xc7, 0x72, 0x0c, 0x51, 0x66, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, + 0xb9, 0xfa, 0x10, 0x8b, 0xf2, 0x52, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0xa1, 0x3c, 0xdd, 0xe4, 0xfc, + 0xa2, 0x54, 0xfd, 0x0a, 0x24, 0x57, 0x96, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x2d, 0x33, + 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x48, 0x1b, 0xfb, 0x45, 0xc6, 0x00, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/batch/types/key.go b/x/auxiliary/types/key.go similarity index 83% rename from x/batch/types/key.go rename to x/auxiliary/types/key.go index ba9df2b5c..9ff500a63 100644 --- a/x/batch/types/key.go +++ b/x/auxiliary/types/key.go @@ -2,7 +2,7 @@ package types const ( // ModuleName is the name of the module - ModuleName = "batch" + ModuleName = "auxiliary" // RouterKey to be used for routing msgs RouterKey = ModuleName diff --git a/x/batch/types/msg_batch.go b/x/auxiliary/types/msg_batch.go similarity index 100% rename from x/batch/types/msg_batch.go rename to x/auxiliary/types/msg_batch.go diff --git a/x/batch/types/service.pb.go b/x/auxiliary/types/service.pb.go similarity index 62% rename from x/batch/types/service.pb.go rename to x/auxiliary/types/service.pb.go index 2cf1c03c5..75d96006e 100644 --- a/x/batch/types/service.pb.go +++ b/x/auxiliary/types/service.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: axelar/batch/v1beta1/service.proto +// source: axelar/auxiliary/v1beta1/service.proto package types @@ -30,30 +30,31 @@ var _ = math.Inf const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func init() { - proto.RegisterFile("axelar/batch/v1beta1/service.proto", fileDescriptor_e975f7fcfcfed769) + proto.RegisterFile("axelar/auxiliary/v1beta1/service.proto", fileDescriptor_ef1f36cff3796c12) } func init() { - golang_proto.RegisterFile("axelar/batch/v1beta1/service.proto", fileDescriptor_e975f7fcfcfed769) + golang_proto.RegisterFile("axelar/auxiliary/v1beta1/service.proto", fileDescriptor_ef1f36cff3796c12) } -var fileDescriptor_e975f7fcfcfed769 = []byte{ - // 251 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4a, 0xac, 0x48, 0xcd, - 0x49, 0x2c, 0xd2, 0x4f, 0x4a, 0x2c, 0x49, 0xce, 0xd0, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, - 0xd4, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, - 0x81, 0xa8, 0xd1, 0x03, 0xab, 0xd1, 0x83, 0xaa, 0x91, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, - 0xd0, 0x07, 0xb1, 0x20, 0x6a, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, 0x52, 0xf5, 0x13, 0x0b, - 0x32, 0xf5, 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, 0x8a, 0xa1, 0xb2, 0xb2, - 0x58, 0x6d, 0x2b, 0xa9, 0x80, 0x48, 0x1b, 0xd5, 0x71, 0x71, 0xf9, 0x16, 0xa7, 0x07, 0x43, 0x2c, - 0x17, 0x2a, 0xe0, 0x62, 0x75, 0x02, 0xa9, 0x13, 0x52, 0xd2, 0xc3, 0xe6, 0x00, 0x3d, 0xb0, 0x64, - 0x50, 0x6a, 0x61, 0x69, 0x6a, 0x71, 0x89, 0x94, 0x32, 0x5e, 0x35, 0xc5, 0x05, 0xf9, 0x79, 0xc5, - 0xa9, 0x4a, 0x72, 0x4d, 0x97, 0x9f, 0x4c, 0x66, 0x92, 0x50, 0x12, 0xd6, 0x47, 0x71, 0x07, 0x98, - 0xb4, 0x62, 0xd4, 0x72, 0x0a, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, 0x8f, - 0xe4, 0x18, 0x27, 0x3c, 0x96, 0x63, 0x38, 0xf0, 0x58, 0x8e, 0xf1, 0xc2, 0x63, 0x39, 0x86, 0x1b, - 0x8f, 0xe5, 0x18, 0xa2, 0x8c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xa1, - 0xfa, 0xf3, 0x52, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0xa1, 0x3c, 0xdd, 0xe4, 0xfc, 0xa2, 0x54, 0xfd, - 0x0a, 0xa8, 0xa1, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x8f, 0x19, 0x03, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x5d, 0x39, 0x3f, 0x85, 0x67, 0x01, 0x00, 0x00, +var fileDescriptor_ef1f36cff3796c12 = []byte{ + // 260 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4b, 0xac, 0x48, 0xcd, + 0x49, 0x2c, 0xd2, 0x4f, 0x2c, 0xad, 0xc8, 0xcc, 0xc9, 0x4c, 0x2c, 0xaa, 0xd4, 0x2f, 0x33, 0x4c, + 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, + 0x2f, 0xc9, 0x17, 0x92, 0x80, 0xa8, 0xd3, 0x83, 0xab, 0xd3, 0x83, 0xaa, 0x93, 0x12, 0x49, 0xcf, + 0x4f, 0xcf, 0x07, 0x2b, 0xd2, 0x07, 0xb1, 0x20, 0xea, 0xa5, 0x64, 0xd2, 0xf3, 0xf3, 0xd3, 0x73, + 0x52, 0xf5, 0x13, 0x0b, 0x32, 0xf5, 0x13, 0xf3, 0xf2, 0xf2, 0x4b, 0x12, 0x4b, 0x32, 0xf3, 0xf3, + 0x8a, 0xa1, 0xb2, 0x8a, 0x38, 0x6d, 0x2d, 0xa9, 0x80, 0x28, 0x31, 0xea, 0x62, 0xe4, 0xe2, 0xf2, + 0x2d, 0x4e, 0x0f, 0x86, 0xb8, 0x42, 0xa8, 0x86, 0x8b, 0xd5, 0x29, 0xb1, 0x24, 0x39, 0x43, 0x48, + 0x4d, 0x0f, 0x97, 0x4b, 0xf4, 0xc0, 0x0a, 0x82, 0x52, 0x0b, 0x4b, 0x53, 0x8b, 0x4b, 0xa4, 0xd4, + 0x09, 0xaa, 0x2b, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x55, 0x52, 0x6a, 0xba, 0xfc, 0x64, 0x32, 0x93, + 0x8c, 0x92, 0xb8, 0x3e, 0x86, 0xa3, 0x92, 0x40, 0x0a, 0xad, 0x18, 0xb5, 0x9c, 0x42, 0x4e, 0x3c, + 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x0e, + 0x3c, 0x96, 0x63, 0xbc, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xb3, 0xf4, 0xcc, + 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xa8, 0x19, 0x79, 0xa9, 0x25, 0xe5, 0xf9, 0x45, + 0xd9, 0x50, 0x9e, 0x6e, 0x72, 0x7e, 0x51, 0xaa, 0x7e, 0x05, 0x92, 0xc1, 0x25, 0x95, 0x05, 0xa9, + 0xc5, 0x49, 0x6c, 0x60, 0x9f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe9, 0x03, 0x3e, 0xeb, + 0x84, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -81,7 +82,7 @@ func NewMsgServiceClient(cc grpc1.ClientConn) MsgServiceClient { func (c *msgServiceClient) Batch(ctx context.Context, in *BatchRequest, opts ...grpc.CallOption) (*BatchResponse, error) { out := new(BatchResponse) - err := c.cc.Invoke(ctx, "/axelar.batch.v1beta1.MsgService/Batch", in, out, opts...) + err := c.cc.Invoke(ctx, "/axelar.auxiliary.v1beta1.MsgService/Batch", in, out, opts...) if err != nil { return nil, err } @@ -115,7 +116,7 @@ func _MsgService_Batch_Handler(srv interface{}, ctx context.Context, dec func(in } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/axelar.batch.v1beta1.MsgService/Batch", + FullMethod: "/axelar.auxiliary.v1beta1.MsgService/Batch", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(MsgServiceServer).Batch(ctx, req.(*BatchRequest)) @@ -124,7 +125,7 @@ func _MsgService_Batch_Handler(srv interface{}, ctx context.Context, dec func(in } var _MsgService_serviceDesc = grpc.ServiceDesc{ - ServiceName: "axelar.batch.v1beta1.MsgService", + ServiceName: "axelar.auxiliary.v1beta1.MsgService", HandlerType: (*MsgServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -133,5 +134,5 @@ var _MsgService_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "axelar/batch/v1beta1/service.proto", + Metadata: "axelar/auxiliary/v1beta1/service.proto", } diff --git a/x/batch/types/service.pb.gw.go b/x/auxiliary/types/service.pb.gw.go similarity index 97% rename from x/batch/types/service.pb.gw.go rename to x/auxiliary/types/service.pb.gw.go index 6c8ce6c07..e85fa393c 100644 --- a/x/batch/types/service.pb.gw.go +++ b/x/auxiliary/types/service.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: axelar/batch/v1beta1/service.proto +// source: axelar/auxiliary/v1beta1/service.proto /* Package types is a reverse proxy. @@ -156,7 +156,7 @@ func RegisterMsgServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, } var ( - pattern_MsgService_Batch_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 1}, []string{"axelar", "batch"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_MsgService_Batch_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"axelar", "auxiliary", "batch"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/x/batch/types/tx.pb.go b/x/auxiliary/types/tx.pb.go similarity index 85% rename from x/batch/types/tx.pb.go rename to x/auxiliary/types/tx.pb.go index 48f82b72e..43accbaf1 100644 --- a/x/batch/types/tx.pb.go +++ b/x/auxiliary/types/tx.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: axelar/batch/v1beta1/tx.proto +// source: axelar/auxiliary/v1beta1/tx.proto package types @@ -37,7 +37,7 @@ func (m *BatchRequest) Reset() { *m = BatchRequest{} } func (m *BatchRequest) String() string { return proto.CompactTextString(m) } func (*BatchRequest) ProtoMessage() {} func (*BatchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_522581f076863086, []int{0} + return fileDescriptor_01625732e3fafaff, []int{0} } func (m *BatchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -88,7 +88,7 @@ func (m *BatchResponse) Reset() { *m = BatchResponse{} } func (m *BatchResponse) String() string { return proto.CompactTextString(m) } func (*BatchResponse) ProtoMessage() {} func (*BatchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_522581f076863086, []int{1} + return fileDescriptor_01625732e3fafaff, []int{1} } func (m *BatchResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -135,7 +135,7 @@ func (m *BatchResponse_Response) Reset() { *m = BatchResponse_Response{} func (m *BatchResponse_Response) String() string { return proto.CompactTextString(m) } func (*BatchResponse_Response) ProtoMessage() {} func (*BatchResponse_Response) Descriptor() ([]byte, []int) { - return fileDescriptor_522581f076863086, []int{1, 0} + return fileDescriptor_01625732e3fafaff, []int{1, 0} } func (m *BatchResponse_Response) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -210,43 +210,43 @@ func (*BatchResponse_Response) XXX_OneofWrappers() []interface{} { } func init() { - proto.RegisterType((*BatchRequest)(nil), "axelar.batch.v1beta1.BatchRequest") - proto.RegisterType((*BatchResponse)(nil), "axelar.batch.v1beta1.BatchResponse") - proto.RegisterType((*BatchResponse_Response)(nil), "axelar.batch.v1beta1.BatchResponse.Response") -} - -func init() { proto.RegisterFile("axelar/batch/v1beta1/tx.proto", fileDescriptor_522581f076863086) } - -var fileDescriptor_522581f076863086 = []byte{ - // 434 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xf6, 0x35, 0x25, 0x6a, 0xaf, 0x65, 0xb1, 0x22, 0xe1, 0x46, 0xc2, 0x89, 0xca, 0x92, 0x81, - 0xdc, 0x29, 0x61, 0xeb, 0x16, 0x4f, 0x45, 0x02, 0x09, 0x3c, 0xb2, 0xa0, 0xb3, 0xfd, 0x70, 0xa3, - 0xc6, 0x3e, 0x73, 0xef, 0x0c, 0xce, 0xc6, 0x4f, 0xe0, 0xb7, 0x20, 0xf8, 0x07, 0x0c, 0x15, 0x53, - 0x47, 0xa6, 0x0a, 0x25, 0xff, 0x82, 0x09, 0xf9, 0xee, 0x9c, 0x06, 0xa9, 0x93, 0xdf, 0xf3, 0xfb, - 0xde, 0xf7, 0x7d, 0xf7, 0xdd, 0xd1, 0xa7, 0xa2, 0x81, 0x95, 0x50, 0x3c, 0x11, 0x3a, 0xbd, 0xe2, - 0x9f, 0x66, 0x09, 0x68, 0x31, 0xe3, 0xba, 0x61, 0x95, 0x92, 0x5a, 0xfa, 0x03, 0x3b, 0x66, 0x66, - 0xcc, 0xdc, 0x78, 0x78, 0x96, 0x4b, 0x99, 0xaf, 0x80, 0x1b, 0x4c, 0x52, 0x7f, 0xe0, 0xa2, 0x5c, - 0xdb, 0x85, 0xe1, 0x20, 0x97, 0xb9, 0x34, 0x25, 0x6f, 0x2b, 0xf7, 0x97, 0x39, 0x95, 0x0a, 0x54, - 0xb1, 0x44, 0x5c, 0xca, 0x92, 0x43, 0x53, 0x49, 0xa5, 0x21, 0xbb, 0xd7, 0x5c, 0x57, 0x80, 0x0e, - 0xff, 0x2c, 0x95, 0x58, 0x48, 0xe4, 0x89, 0x40, 0xe0, 0x22, 0x49, 0x97, 0x3b, 0x54, 0xdb, 0x38, - 0xd0, 0x99, 0x05, 0xbd, 0xb7, 0x6a, 0xb6, 0xb1, 0xa3, 0xf3, 0x6f, 0x84, 0x9e, 0x46, 0xad, 0xe5, - 0x18, 0x3e, 0xd6, 0x80, 0xda, 0x7f, 0x49, 0xfb, 0x08, 0x65, 0x06, 0x2a, 0x20, 0x63, 0x32, 0x39, - 0x8d, 0x66, 0x7f, 0xef, 0x46, 0xd3, 0x7c, 0xa9, 0xaf, 0xea, 0x84, 0xa5, 0xb2, 0x70, 0xdb, 0xee, - 0x33, 0xc5, 0xec, 0xda, 0xd9, 0x59, 0xa4, 0xe9, 0x22, 0xcb, 0x14, 0x20, 0xc6, 0x8e, 0xc0, 0x7f, - 0x4b, 0x8f, 0x0a, 0x40, 0x14, 0x39, 0x60, 0x70, 0x30, 0xee, 0x4d, 0x4e, 0xe6, 0x03, 0x66, 0xf3, - 0x60, 0x5d, 0x1e, 0x6c, 0x51, 0xae, 0xa3, 0xd1, 0xcd, 0xdd, 0xc8, 0xfb, 0xf5, 0x7d, 0xfa, 0xc4, - 0x39, 0x6b, 0xcf, 0xd2, 0x25, 0xc8, 0x5e, 0x63, 0x1e, 0xef, 0x68, 0x2e, 0x0e, 0xbf, 0xfc, 0x08, - 0xc8, 0xf9, 0x4f, 0x42, 0x1f, 0x3b, 0xd3, 0x58, 0xc9, 0x12, 0xc1, 0x7f, 0x43, 0x8f, 0x95, 0xab, - 0x31, 0x20, 0x46, 0xeb, 0x39, 0x7b, 0xe8, 0x46, 0xd8, 0x7f, 0x7b, 0xac, 0x2b, 0xa2, 0xc3, 0xd6, - 0x43, 0x7c, 0x4f, 0x32, 0x14, 0xf4, 0x68, 0xc7, 0x7e, 0x41, 0xfb, 0x0a, 0xb0, 0x5e, 0x69, 0x93, - 0xc9, 0xc9, 0x7c, 0xcc, 0xf6, 0x9d, 0x9a, 0xa0, 0x3b, 0xfa, 0xd8, 0xe0, 0x2e, 0xbd, 0xd8, 0x6d, - 0xf8, 0x3e, 0xed, 0x81, 0x52, 0xc1, 0xc1, 0x98, 0x4c, 0x8e, 0x2f, 0xbd, 0xb8, 0x6d, 0xa2, 0x47, - 0xb4, 0xa7, 0x00, 0xa3, 0x57, 0x37, 0x9b, 0x90, 0xdc, 0x6e, 0x42, 0xf2, 0x67, 0x13, 0x92, 0xaf, - 0xdb, 0xd0, 0xbb, 0xdd, 0x86, 0xde, 0xef, 0x6d, 0xe8, 0xbd, 0x9b, 0xef, 0x05, 0x6e, 0x4f, 0x51, - 0x82, 0xfe, 0x2c, 0xd5, 0xb5, 0xeb, 0xa6, 0xa9, 0x54, 0xc0, 0x1b, 0xf7, 0x16, 0xcd, 0x05, 0x24, - 0x7d, 0x93, 0xe9, 0x8b, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x66, 0x64, 0x80, 0xf4, 0xa8, 0x02, - 0x00, 0x00, + proto.RegisterType((*BatchRequest)(nil), "axelar.auxiliary.v1beta1.BatchRequest") + proto.RegisterType((*BatchResponse)(nil), "axelar.auxiliary.v1beta1.BatchResponse") + proto.RegisterType((*BatchResponse_Response)(nil), "axelar.auxiliary.v1beta1.BatchResponse.Response") +} + +func init() { proto.RegisterFile("axelar/auxiliary/v1beta1/tx.proto", fileDescriptor_01625732e3fafaff) } + +var fileDescriptor_01625732e3fafaff = []byte{ + // 438 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xc7, 0x7d, 0x4d, 0x89, 0xda, 0x6b, 0x59, 0xac, 0x4a, 0xb8, 0x19, 0x9c, 0x50, 0x96, 0x2c, + 0xb9, 0x23, 0x45, 0x62, 0xe8, 0x16, 0x4f, 0x65, 0x40, 0x02, 0x8b, 0x89, 0x05, 0x9d, 0xed, 0x87, + 0x6b, 0x35, 0xf1, 0x99, 0x7b, 0x67, 0x70, 0x36, 0x3e, 0x02, 0x9f, 0x05, 0xc1, 0x77, 0x88, 0x98, + 0x3a, 0x32, 0x55, 0x28, 0xf9, 0x16, 0x4c, 0xc8, 0x77, 0x17, 0x27, 0x0c, 0x9d, 0xfc, 0x9e, 0xfd, + 0x7b, 0xef, 0xff, 0xbf, 0xff, 0x99, 0x3e, 0x15, 0x0d, 0xcc, 0x85, 0xe2, 0xa2, 0x6e, 0x8a, 0x79, + 0x21, 0xd4, 0x92, 0x7f, 0x9e, 0x26, 0xa0, 0xc5, 0x94, 0xeb, 0x86, 0x55, 0x4a, 0x6a, 0xe9, 0x07, + 0x16, 0x61, 0x1d, 0xc2, 0x1c, 0x32, 0x38, 0xcf, 0xa5, 0xcc, 0xe7, 0xc0, 0x0d, 0x97, 0xd4, 0x1f, + 0xb9, 0x28, 0x97, 0x76, 0x68, 0x70, 0x96, 0xcb, 0x5c, 0x9a, 0x92, 0xb7, 0x95, 0x7b, 0xcb, 0x9c, + 0x5a, 0x05, 0x6a, 0x51, 0x20, 0x16, 0xb2, 0xe4, 0xd0, 0x54, 0x52, 0x69, 0xc8, 0x76, 0xba, 0xcb, + 0x0a, 0xd0, 0xf1, 0xcf, 0x52, 0x89, 0x0b, 0x89, 0x3c, 0x11, 0x08, 0x5c, 0x24, 0x69, 0xd1, 0x51, + 0x6d, 0xe3, 0xa0, 0x73, 0x0b, 0x7d, 0xb0, 0x6a, 0xb6, 0xb1, 0x9f, 0x2e, 0xbe, 0x13, 0x7a, 0x1a, + 0x09, 0x9d, 0xde, 0xc4, 0xf0, 0xa9, 0x06, 0xd4, 0xfe, 0x2b, 0xda, 0x47, 0x28, 0x33, 0x50, 0x01, + 0x19, 0x91, 0xf1, 0x69, 0x34, 0xfd, 0x7b, 0x3f, 0x9c, 0xe4, 0x85, 0xbe, 0xa9, 0x13, 0x96, 0xca, + 0x85, 0x9b, 0x76, 0x8f, 0x09, 0x66, 0xb7, 0xce, 0xce, 0x2c, 0x4d, 0x67, 0x59, 0xa6, 0x00, 0x31, + 0x76, 0x0b, 0xfc, 0xb7, 0xf4, 0x68, 0x01, 0x88, 0x22, 0x07, 0x0c, 0x0e, 0x46, 0xbd, 0xf1, 0xc9, + 0xe5, 0x19, 0xb3, 0x79, 0xb0, 0x6d, 0x1e, 0x6c, 0x56, 0x2e, 0xa3, 0xe1, 0xea, 0x7e, 0xe8, 0xfd, + 0xfa, 0x31, 0x79, 0xe2, 0x9c, 0xb5, 0x67, 0xd9, 0x26, 0xc8, 0x5e, 0x63, 0x1e, 0x77, 0x6b, 0xae, + 0x0e, 0xbf, 0xfe, 0x0c, 0xc8, 0xc5, 0x8a, 0xd0, 0xc7, 0xce, 0x34, 0x56, 0xb2, 0x44, 0xf0, 0xdf, + 0xd1, 0x63, 0xe5, 0x6a, 0x0c, 0x88, 0xd1, 0x7a, 0xce, 0x1e, 0xba, 0x15, 0xf6, 0xdf, 0x2c, 0xdb, + 0x16, 0xd1, 0x61, 0xeb, 0x23, 0xde, 0x2d, 0x1a, 0x08, 0x7a, 0xd4, 0x29, 0x5c, 0xd1, 0xbe, 0x02, + 0xac, 0xe7, 0xda, 0xe4, 0x72, 0x72, 0x39, 0x62, 0xfb, 0x6e, 0x4d, 0xd8, 0xdb, 0xf5, 0xb1, 0xe1, + 0xae, 0xbd, 0xd8, 0x4d, 0xf8, 0x3e, 0xed, 0x81, 0x52, 0xc1, 0xc1, 0x88, 0x8c, 0x8f, 0xaf, 0xbd, + 0xb8, 0x6d, 0xa2, 0x47, 0xb4, 0xa7, 0x00, 0xa3, 0x37, 0xab, 0x75, 0x48, 0xee, 0xd6, 0x21, 0xf9, + 0xb3, 0x0e, 0xc9, 0xb7, 0x4d, 0xe8, 0xdd, 0x6d, 0x42, 0xef, 0xf7, 0x26, 0xf4, 0xde, 0xbf, 0xdc, + 0x0b, 0xdd, 0x9e, 0xa4, 0x04, 0xfd, 0x45, 0xaa, 0x5b, 0xd7, 0x4d, 0x52, 0xa9, 0x80, 0x37, 0x7b, + 0xff, 0xa5, 0xb9, 0x88, 0xa4, 0x6f, 0xb2, 0x7d, 0xf1, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x31, + 0x05, 0x60, 0xb8, 0x02, 0x00, 0x00, } func (m *BatchRequest) Marshal() (dAtA []byte, err error) {