Skip to content
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.

Sign up for GitHub

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

feat(batch): batch message request #2121

Merged
merged 17 commits into from
Apr 9, 2024
Merged

feat(batch): batch message request #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
c90d5ee
feat(batcher): batch message request
haiyizxx Mar 5, 2024
1003f13
address comments
haiyizxx Mar 15, 2024
1ff535f
impl tx interface for BatchDecorator
haiyizxx Mar 15, 2024
d9cec2a
batch antehandle unwrap message
haiyizxx Mar 19, 2024
77c8d23
batch ante handler test
haiyizxx Mar 19, 2024
dfd5526
address comments
haiyizxx Mar 22, 2024
9f2d198
address comments
haiyizxx Mar 25, 2024
788b20b
bulk append msgs
haiyizxx Mar 25, 2024
edd4185
remove unnecessary check
haiyizxx Mar 25, 2024
fb9b367
reorder
haiyizxx Mar 25, 2024
8bff7ef
extract unpack message
haiyizxx Mar 26, 2024
e83b40e
rename module to auxiliary
haiyizxx Mar 27, 2024
7b41d29
Merge branch 'main' into batcher
fish-sammy Apr 1, 2024
efbe273
address comments
haiyizxx Apr 2, 2024
1983662
address comments
haiyizxx Apr 9, 2024
4406ddd
Merge branch 'main' into batcher
haiyizxx Apr 9, 2024
bbf3cbc
txWithUnwrappedMsgs constructor
haiyizxx Apr 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@ 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"
Expand Down Expand Up @@ -652,6 +654,7 @@ func initAppModules(keepers *KeeperCache, bApp *bam.BaseApp, encodingConfig axel
bApp.Router(),
),
permission.NewAppModule(*GetKeeper[permissionKeeper.Keeper](keepers)),
auxiliary.NewAppModule(encodingConfig.Codec, bApp.MsgServiceRouter()),
)
return appModules
}
Expand Down Expand Up @@ -692,6 +695,10 @@ func InitCustomAnteDecorators(
appOpts servertypes.AppOptions,
) []sdk.AnteDecorator {
var anteDecorators []sdk.AnteDecorator

// unwrap batch messages, must be done before any other custom decorators
anteDecorators = append(anteDecorators, ante.NewBatchDecorator(encodingConfig.Codec))

// enforce wasm limits earlier in the ante handler chain
if IsWasmEnabled() {
wasmConfig := mustReadWasmConfig(appOpts)
Expand Down Expand Up @@ -792,6 +799,7 @@ func orderMigrations() []string {
permissionTypes.ModuleName,
snapTypes.ModuleName,
axelarnetTypes.ModuleName,
auxiliarytypes.ModuleName,
)
return migrationOrder
}
Expand Down Expand Up @@ -842,6 +850,7 @@ func orderBeginBlockers() []string {
snapTypes.ModuleName,
axelarnetTypes.ModuleName,
voteTypes.ModuleName,
auxiliarytypes.ModuleName,
)
return beginBlockerOrder
}
Expand Down Expand Up @@ -887,6 +896,7 @@ func orderEndBlockers() []string {
axelarnetTypes.ModuleName,
permissionTypes.ModuleName,
voteTypes.ModuleName,
auxiliarytypes.ModuleName,
)
return endBlockerOrder
}
Expand Down Expand Up @@ -935,6 +945,7 @@ func orderModulesForGenesis() []string {
axelarnetTypes.ModuleName,
rewardTypes.ModuleName,
permissionTypes.ModuleName,
auxiliarytypes.ModuleName,
)
return genesisOrder
}
Expand Down Expand Up @@ -1105,6 +1116,7 @@ func GetModuleBasics() module.BasicManager {
axelarnet.AppModuleBasic{},
reward.AppModuleBasic{},
permission.AppModuleBasic{},
auxiliary.AppModuleBasic{},
}

if IsWasmEnabled() {
Expand Down
247 changes: 204 additions & 43 deletions docs/proto/proto-docs.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions proto/axelar/auxiliary/v1beta1/events.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
syntax = "proto3";
package axelar.auxiliary.v1beta1;

option go_package = "github.com/axelarnetwork/axelar-core/x/auxiliary/types";
option (gogoproto.messagename_all) = true;

import "gogoproto/gogo.proto";

message BatchedMessageFailed {
int32 index = 1;
string error = 2;
}
11 changes: 11 additions & 0 deletions proto/axelar/auxiliary/v1beta1/genesis.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
syntax = "proto3";
package axelar.auxiliary.v1beta1;

option go_package = "github.com/axelarnetwork/axelar-core/x/auxiliary/types";

import "gogoproto/gogo.proto";

option (gogoproto.goproto_getters_all) = false;

// GenesisState represents the genesis state
message GenesisState {}
20 changes: 20 additions & 0 deletions proto/axelar/auxiliary/v1beta1/service.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
syntax = "proto3";
package axelar.auxiliary.v1beta1;

option go_package = "github.com/axelarnetwork/axelar-core/x/auxiliary/types";

import "gogoproto/gogo.proto";
import "google/api/annotations.proto";
import "axelar/auxiliary/v1beta1/tx.proto";

option (gogoproto.goproto_registration) = true;

// Msg defines the nexus Msg service.
service MsgService {
rpc Batch(BatchRequest) returns (BatchResponse) {
option (google.api.http) = {
post : "/axelar/auxiliary/batch"
body : "*"
};
}
}
Loading
Loading