From 4f8f5696493ddb948519a59d5a06140320444315 Mon Sep 17 00:00:00 2001 From: John Letey Date: Wed, 30 Oct 2024 23:06:19 +0100 Subject: [PATCH] chore: reorganize repo structure (#19) --- Makefile | 4 +- x/forwarding/ante.go => ante.go | 2 +- .../module/v1/module.pulsar.go | 41 ++++--- .../forwarding => }/v1/account.pulsar.go | 0 .../forwarding => }/v1/events.pulsar.go | 0 .../forwarding => }/v1/genesis.pulsar.go | 0 .../forwarding => }/v1/packet.pulsar.go | 0 api/{noble/forwarding => }/v1/query.pulsar.go | 0 .../forwarding => }/v1/query_grpc.pb.go | 0 api/{noble/forwarding => }/v1/tx.pulsar.go | 0 api/{noble/forwarding => }/v1/tx_grpc.pb.go | 0 {x/forwarding/client => client}/cli/query.go | 2 +- {x/forwarding/client => client}/cli/tx.go | 2 +- chains.yaml => e2e/chains.yaml | 0 e2e/forwarding_test.go | 2 +- x/forwarding/genesis.go => genesis.go | 4 +- {x/forwarding/keeper => keeper}/keeper.go | 2 +- {x/forwarding/keeper => keeper}/migrations.go | 2 +- {x/forwarding/keeper => keeper}/msg_server.go | 2 +- .../keeper => keeper}/query_server.go | 2 +- {x/forwarding/keeper => keeper}/state.go | 2 +- x/forwarding/middleware.go => middleware.go | 4 +- .../migrations => migrations}/v1/state.go | 2 +- x/forwarding/module.go => module.go | 16 +-- proto/generate.sh | 3 + proto/noble/forwarding/module/v1/module.proto | 2 +- proto/noble/forwarding/v1/account.proto | 2 +- proto/noble/forwarding/v1/events.proto | 2 +- proto/noble/forwarding/v1/genesis.proto | 2 +- proto/noble/forwarding/v1/packet.proto | 2 +- proto/noble/forwarding/v1/query.proto | 2 +- proto/noble/forwarding/v1/tx.proto | 2 +- simapp/ante.go | 4 +- simapp/app.go | 4 +- simapp/legacy.go | 2 +- {x/forwarding/spec => spec}/01-state.md | 0 {x/forwarding/spec => spec}/02-messages.md | 0 {x/forwarding/spec => spec}/03-events.md | 0 {x/forwarding/spec => spec}/04-queries.md | 0 {x/forwarding/spec => spec}/05-cli.md | 0 {x/forwarding/types => types}/account.go | 0 {x/forwarding/types => types}/account.pb.go | 48 ++++----- {x/forwarding/types => types}/channel.go | 0 {x/forwarding/types => types}/codec.go | 0 {x/forwarding/types => types}/errors.go | 0 {x/forwarding/types => types}/events.pb.go | 42 ++++---- .../types => types}/expected_keepers.go | 0 {x/forwarding/types => types}/genesis.go | 0 {x/forwarding/types => types}/genesis.pb.go | 12 +-- {x/forwarding/types => types}/keys.go | 0 {x/forwarding/types => types}/packet.pb.go | 38 +++---- {x/forwarding/types => types}/query.pb.go | 102 +++++++++--------- {x/forwarding/types => types}/query.pb.gw.go | 0 {x/forwarding/types => types}/tx.pb.go | 61 ++++++----- 54 files changed, 210 insertions(+), 209 deletions(-) rename x/forwarding/ante.go => ante.go (96%) rename api/{noble/forwarding => }/module/v1/module.pulsar.go (92%) rename api/{noble/forwarding => }/v1/account.pulsar.go (100%) rename api/{noble/forwarding => }/v1/events.pulsar.go (100%) rename api/{noble/forwarding => }/v1/genesis.pulsar.go (100%) rename api/{noble/forwarding => }/v1/packet.pulsar.go (100%) rename api/{noble/forwarding => }/v1/query.pulsar.go (100%) rename api/{noble/forwarding => }/v1/query_grpc.pb.go (100%) rename api/{noble/forwarding => }/v1/tx.pulsar.go (100%) rename api/{noble/forwarding => }/v1/tx_grpc.pb.go (100%) rename {x/forwarding/client => client}/cli/query.go (95%) rename {x/forwarding/client => client}/cli/tx.go (97%) rename chains.yaml => e2e/chains.yaml (100%) rename x/forwarding/genesis.go => genesis.go (87%) rename {x/forwarding/keeper => keeper}/keeper.go (99%) rename {x/forwarding/keeper => keeper}/migrations.go (93%) rename {x/forwarding/keeper => keeper}/msg_server.go (98%) rename {x/forwarding/keeper => keeper}/query_server.go (97%) rename {x/forwarding/keeper => keeper}/state.go (97%) rename x/forwarding/middleware.go => middleware.go (97%) rename {x/forwarding/migrations => migrations}/v1/state.go (95%) rename x/forwarding/module.go => module.go (92%) rename {x/forwarding/spec => spec}/01-state.md (100%) rename {x/forwarding/spec => spec}/02-messages.md (100%) rename {x/forwarding/spec => spec}/03-events.md (100%) rename {x/forwarding/spec => spec}/04-queries.md (100%) rename {x/forwarding/spec => spec}/05-cli.md (100%) rename {x/forwarding/types => types}/account.go (100%) rename {x/forwarding/types => types}/account.pb.go (87%) rename {x/forwarding/types => types}/channel.go (100%) rename {x/forwarding/types => types}/codec.go (100%) rename {x/forwarding/types => types}/errors.go (100%) rename {x/forwarding/types => types}/events.pb.go (92%) rename {x/forwarding/types => types}/expected_keepers.go (100%) rename {x/forwarding/types => types}/genesis.go (100%) rename {x/forwarding/types => types}/genesis.pb.go (98%) rename {x/forwarding/types => types}/keys.go (100%) rename {x/forwarding/types => types}/packet.pb.go (91%) rename {x/forwarding/types => types}/query.pb.go (92%) rename {x/forwarding/types => types}/query.pb.gw.go (100%) rename {x/forwarding/types => types}/tx.pb.go (92%) diff --git a/Makefile b/Makefile index e20e1a6..c4756ae 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ build: @echo "✅ Completed build!" ############################################################################### -### Formatting & Linting ### +### Tooling ### ############################################################################### gofumpt_cmd=mvdan.cc/gofumpt @@ -60,7 +60,7 @@ proto-lint: local-image: @echo "🤖 Building image..." - @heighliner build --chain noble-forwarding-simd --file ./chains.yaml --local 1> /dev/null + @heighliner build --chain noble-forwarding-simd --file e2e/chains.yaml --local 1> /dev/null @echo "✅ Completed build!" test: test-e2e diff --git a/x/forwarding/ante.go b/ante.go similarity index 96% rename from x/forwarding/ante.go rename to ante.go index e73591b..11a255a 100644 --- a/x/forwarding/ante.go +++ b/ante.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/cosmos/cosmos-sdk/x/auth/ante" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/types" ) // SigVerificationGasConsumer is a wrapper around the default provided by the diff --git a/api/noble/forwarding/module/v1/module.pulsar.go b/api/module/v1/module.pulsar.go similarity index 92% rename from api/noble/forwarding/module/v1/module.pulsar.go rename to api/module/v1/module.pulsar.go index 3fdde88..a788ca0 100644 --- a/api/noble/forwarding/module/v1/module.pulsar.go +++ b/api/module/v1/module.pulsar.go @@ -492,30 +492,29 @@ var file_noble_forwarding_module_v1_module_proto_rawDesc = []byte{ 0x2e, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x20, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x62, 0x0a, 0x06, 0x4d, 0x6f, 0x64, 0x75, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x55, 0x0a, 0x06, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x3a, - 0x3a, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x34, 0x0a, 0x32, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x2d, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x27, 0x0a, 0x25, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x62, 0x6c, 0x65, 0x2d, 0x61, 0x73, 0x73, 0x65, 0x74, 0x73, - 0x2f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x78, - 0x2f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x42, 0x87, 0x02, 0x0a, 0x1e, - 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x6f, 0x62, 0x6c, 0x65, 0x2e, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, - 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, - 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x4d, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x62, 0x6c, 0x65, 0x2d, - 0x61, 0x73, 0x73, 0x65, 0x74, 0x73, 0x2f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, - 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6e, 0x6f, 0x62, 0x6c, 0x65, 0x2f, 0x66, - 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, - 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x4e, - 0x46, 0x4d, 0xaa, 0x02, 0x1a, 0x4e, 0x6f, 0x62, 0x6c, 0x65, 0x2e, 0x46, 0x6f, 0x72, 0x77, 0x61, - 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, - 0x02, 0x1a, 0x4e, 0x6f, 0x62, 0x6c, 0x65, 0x5c, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, - 0x6e, 0x67, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x26, 0x4e, - 0x6f, 0x62, 0x6c, 0x65, 0x5c, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5c, - 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, - 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1d, 0x4e, 0x6f, 0x62, 0x6c, 0x65, 0x3a, 0x3a, 0x46, - 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, - 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x32, 0x42, 0x87, + 0x02, 0x0a, 0x1e, 0x63, 0x6f, 0x6d, 0x2e, 0x6e, 0x6f, 0x62, 0x6c, 0x65, 0x2e, 0x66, 0x6f, 0x72, + 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, + 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6e, 0x6f, 0x62, + 0x6c, 0x65, 0x2d, 0x61, 0x73, 0x73, 0x65, 0x74, 0x73, 0x2f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, + 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x32, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6e, 0x6f, 0x62, 0x6c, + 0x65, 0x2f, 0x66, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x6d, 0x6f, 0x64, + 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0xa2, + 0x02, 0x03, 0x4e, 0x46, 0x4d, 0xaa, 0x02, 0x1a, 0x4e, 0x6f, 0x62, 0x6c, 0x65, 0x2e, 0x46, 0x6f, + 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, + 0x56, 0x31, 0xca, 0x02, 0x1a, 0x4e, 0x6f, 0x62, 0x6c, 0x65, 0x5c, 0x46, 0x6f, 0x72, 0x77, 0x61, + 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, + 0x02, 0x26, 0x4e, 0x6f, 0x62, 0x6c, 0x65, 0x5c, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, + 0x6e, 0x67, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, + 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1d, 0x4e, 0x6f, 0x62, 0x6c, 0x65, + 0x3a, 0x3a, 0x46, 0x6f, 0x72, 0x77, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x4d, 0x6f, + 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/noble/forwarding/v1/account.pulsar.go b/api/v1/account.pulsar.go similarity index 100% rename from api/noble/forwarding/v1/account.pulsar.go rename to api/v1/account.pulsar.go diff --git a/api/noble/forwarding/v1/events.pulsar.go b/api/v1/events.pulsar.go similarity index 100% rename from api/noble/forwarding/v1/events.pulsar.go rename to api/v1/events.pulsar.go diff --git a/api/noble/forwarding/v1/genesis.pulsar.go b/api/v1/genesis.pulsar.go similarity index 100% rename from api/noble/forwarding/v1/genesis.pulsar.go rename to api/v1/genesis.pulsar.go diff --git a/api/noble/forwarding/v1/packet.pulsar.go b/api/v1/packet.pulsar.go similarity index 100% rename from api/noble/forwarding/v1/packet.pulsar.go rename to api/v1/packet.pulsar.go diff --git a/api/noble/forwarding/v1/query.pulsar.go b/api/v1/query.pulsar.go similarity index 100% rename from api/noble/forwarding/v1/query.pulsar.go rename to api/v1/query.pulsar.go diff --git a/api/noble/forwarding/v1/query_grpc.pb.go b/api/v1/query_grpc.pb.go similarity index 100% rename from api/noble/forwarding/v1/query_grpc.pb.go rename to api/v1/query_grpc.pb.go diff --git a/api/noble/forwarding/v1/tx.pulsar.go b/api/v1/tx.pulsar.go similarity index 100% rename from api/noble/forwarding/v1/tx.pulsar.go rename to api/v1/tx.pulsar.go diff --git a/api/noble/forwarding/v1/tx_grpc.pb.go b/api/v1/tx_grpc.pb.go similarity index 100% rename from api/noble/forwarding/v1/tx_grpc.pb.go rename to api/v1/tx_grpc.pb.go diff --git a/x/forwarding/client/cli/query.go b/client/cli/query.go similarity index 95% rename from x/forwarding/client/cli/query.go rename to client/cli/query.go index caa502b..b96ad22 100644 --- a/x/forwarding/client/cli/query.go +++ b/client/cli/query.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/gogoproto/proto" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/types" "github.com/spf13/cobra" ) diff --git a/x/forwarding/client/cli/tx.go b/client/cli/tx.go similarity index 97% rename from x/forwarding/client/cli/tx.go rename to client/cli/tx.go index d9aced5..cd07453 100644 --- a/x/forwarding/client/cli/tx.go +++ b/client/cli/tx.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/types" "github.com/spf13/cobra" ) diff --git a/chains.yaml b/e2e/chains.yaml similarity index 100% rename from chains.yaml rename to e2e/chains.yaml diff --git a/e2e/forwarding_test.go b/e2e/forwarding_test.go index e205ab1..59bf464 100644 --- a/e2e/forwarding_test.go +++ b/e2e/forwarding_test.go @@ -12,7 +12,7 @@ import ( "github.com/cosmos/gogoproto/jsonpb" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" "github.com/icza/dyno" - forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types" + forwardingtypes "github.com/noble-assets/forwarding/v2/types" "github.com/strangelove-ventures/interchaintest/v8" "github.com/strangelove-ventures/interchaintest/v8/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v8/ibc" diff --git a/x/forwarding/genesis.go b/genesis.go similarity index 87% rename from x/forwarding/genesis.go rename to genesis.go index ddea37f..58f9e72 100644 --- a/x/forwarding/genesis.go +++ b/genesis.go @@ -4,8 +4,8 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/noble-assets/forwarding/v2/x/forwarding/keeper" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/keeper" + "github.com/noble-assets/forwarding/v2/types" ) func InitGenesis(ctx context.Context, k *keeper.Keeper, genesis types.GenesisState) { diff --git a/x/forwarding/keeper/keeper.go b/keeper/keeper.go similarity index 99% rename from x/forwarding/keeper/keeper.go rename to keeper/keeper.go index e7b2bc4..3ff98bf 100644 --- a/x/forwarding/keeper/keeper.go +++ b/keeper/keeper.go @@ -15,7 +15,7 @@ import ( transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v8/modules/core/02-client/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/types" ) type Keeper struct { diff --git a/x/forwarding/keeper/migrations.go b/keeper/migrations.go similarity index 93% rename from x/forwarding/keeper/migrations.go rename to keeper/migrations.go index 774e65d..4bf61b6 100644 --- a/x/forwarding/keeper/migrations.go +++ b/keeper/migrations.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/cosmos/cosmos-sdk/runtime" sdk "github.com/cosmos/cosmos-sdk/types" - v1 "github.com/noble-assets/forwarding/v2/x/forwarding/migrations/v1" + v1 "github.com/noble-assets/forwarding/v2/migrations/v1" ) // Migrator is a struct for handling in-place store migrations. diff --git a/x/forwarding/keeper/msg_server.go b/keeper/msg_server.go similarity index 98% rename from x/forwarding/keeper/msg_server.go rename to keeper/msg_server.go index 9a95a4e..7ab2a40 100644 --- a/x/forwarding/keeper/msg_server.go +++ b/keeper/msg_server.go @@ -10,7 +10,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/forwarding/keeper/query_server.go b/keeper/query_server.go similarity index 97% rename from x/forwarding/keeper/query_server.go rename to keeper/query_server.go index 5e101df..4e8f3ae 100644 --- a/x/forwarding/keeper/query_server.go +++ b/keeper/query_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" errorstypes "github.com/cosmos/cosmos-sdk/types/errors" transfertypes "github.com/cosmos/ibc-go/v8/modules/apps/transfer/types" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/types" ) var _ types.QueryServer = &Keeper{} diff --git a/x/forwarding/keeper/state.go b/keeper/state.go similarity index 97% rename from x/forwarding/keeper/state.go rename to keeper/state.go index 7024742..64bb2d4 100644 --- a/x/forwarding/keeper/state.go +++ b/keeper/state.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/types" ) // PERSISTENT STATE diff --git a/x/forwarding/middleware.go b/middleware.go similarity index 97% rename from x/forwarding/middleware.go rename to middleware.go index 24ccd5b..da7832b 100644 --- a/x/forwarding/middleware.go +++ b/middleware.go @@ -8,8 +8,8 @@ import ( channeltypes "github.com/cosmos/ibc-go/v8/modules/core/04-channel/types" porttypes "github.com/cosmos/ibc-go/v8/modules/core/05-port/types" "github.com/cosmos/ibc-go/v8/modules/core/exported" - "github.com/noble-assets/forwarding/v2/x/forwarding/keeper" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/keeper" + "github.com/noble-assets/forwarding/v2/types" ) var _ porttypes.IBCModule = &Middleware{} diff --git a/x/forwarding/migrations/v1/state.go b/migrations/v1/state.go similarity index 95% rename from x/forwarding/migrations/v1/state.go rename to migrations/v1/state.go index 4d8dc05..0d587a6 100644 --- a/x/forwarding/migrations/v1/state.go +++ b/migrations/v1/state.go @@ -5,7 +5,7 @@ import ( "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2/types" ) // GetAllNumOfAccounts implements adapted legacy store logic from version 1. diff --git a/x/forwarding/module.go b/module.go similarity index 92% rename from x/forwarding/module.go rename to module.go index 7649054..ba1a027 100644 --- a/x/forwarding/module.go +++ b/module.go @@ -21,15 +21,15 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/grpc-ecosystem/grpc-gateway/runtime" - modulev1 "github.com/noble-assets/forwarding/v2/api/noble/forwarding/module/v1" - forwardingv1 "github.com/noble-assets/forwarding/v2/api/noble/forwarding/v1" - "github.com/noble-assets/forwarding/v2/x/forwarding/client/cli" - "github.com/noble-assets/forwarding/v2/x/forwarding/keeper" - "github.com/noble-assets/forwarding/v2/x/forwarding/types" + modulev1 "github.com/noble-assets/forwarding/v2/api/module/v1" + forwardingv1 "github.com/noble-assets/forwarding/v2/api/v1" + "github.com/noble-assets/forwarding/v2/client/cli" + "github.com/noble-assets/forwarding/v2/keeper" + "github.com/noble-assets/forwarding/v2/types" "github.com/spf13/cobra" ) -// ConsensusVersion defines the current x/forwarding module consensus version. +// ConsensusVersion defines the current Forwarding module consensus version. const ConsensusVersion = 2 var ( @@ -122,7 +122,7 @@ func (m AppModule) RegisterServices(cfg module.Configurator) { migrator := keeper.NewMigrator(m.keeper) if err := cfg.RegisterMigration(types.ModuleName, 1, migrator.Migrate1to2); err != nil { - panic(fmt.Sprintf("failed to migrate x/forwarding from version 1 to 2: %v", err)) + panic(fmt.Sprintf("failed to migrate Forwarding from version 1 to 2: %v", err)) } } @@ -242,7 +242,7 @@ type ModuleOutputs struct { func ProvideModule(in ModuleInputs) ModuleOutputs { if in.Config.Authority == "" { - panic("authority for x/forwarding module must be set") + panic("authority for Forwarding module must be set") } authority := authtypes.NewModuleAddressOrBech32Address(in.Config.Authority) diff --git a/proto/generate.sh b/proto/generate.sh index e6bc7b6..e1141d3 100644 --- a/proto/generate.sh +++ b/proto/generate.sh @@ -4,5 +4,8 @@ buf generate --template buf.gen.pulsar.yaml cd .. cp -r github.com/noble-assets/forwarding/v2/* ./ +cp -r api/noble/forwarding/* api/ + rm -rf github.com +rm -rf api/noble rm -rf noble diff --git a/proto/noble/forwarding/module/v1/module.proto b/proto/noble/forwarding/module/v1/module.proto index 95447b2..489c3e0 100644 --- a/proto/noble/forwarding/module/v1/module.proto +++ b/proto/noble/forwarding/module/v1/module.proto @@ -6,7 +6,7 @@ import "cosmos/app/v1alpha1/module.proto"; // Module is the config object of the Forwarding module. message Module { - option (cosmos.app.v1alpha1.module) = {go_import: "github.com/noble-assets/forwarding/v2/x/forwarding"}; + option (cosmos.app.v1alpha1.module) = {go_import: "github.com/noble-assets/forwarding/v2"}; // authority defines the custom module authority. string authority = 1; diff --git a/proto/noble/forwarding/v1/account.proto b/proto/noble/forwarding/v1/account.proto index e13329c..69044ad 100644 --- a/proto/noble/forwarding/v1/account.proto +++ b/proto/noble/forwarding/v1/account.proto @@ -6,7 +6,7 @@ import "cosmos/auth/v1beta1/auth.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types"; +option go_package = "github.com/noble-assets/forwarding/v2/types"; message ForwardingAccount { option (cosmos_proto.implements_interface) = "cosmos.auth.v1beta1.AccountI"; diff --git a/proto/noble/forwarding/v1/events.proto b/proto/noble/forwarding/v1/events.proto index 6e6fd0d..1c4ce0a 100644 --- a/proto/noble/forwarding/v1/events.proto +++ b/proto/noble/forwarding/v1/events.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package noble.forwarding.v1; -option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types"; +option go_package = "github.com/noble-assets/forwarding/v2/types"; // AccountRegistered is emitted whenever a new forwarding account is registered. message AccountRegistered { diff --git a/proto/noble/forwarding/v1/genesis.proto b/proto/noble/forwarding/v1/genesis.proto index f830de4..7ce01df 100644 --- a/proto/noble/forwarding/v1/genesis.proto +++ b/proto/noble/forwarding/v1/genesis.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package noble.forwarding.v1; -option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types"; +option go_package = "github.com/noble-assets/forwarding/v2/types"; message GenesisState { repeated string allowed_denoms = 1; diff --git a/proto/noble/forwarding/v1/packet.proto b/proto/noble/forwarding/v1/packet.proto index 25fdc28..d20a3e7 100644 --- a/proto/noble/forwarding/v1/packet.proto +++ b/proto/noble/forwarding/v1/packet.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package noble.forwarding.v1; -option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types"; +option go_package = "github.com/noble-assets/forwarding/v2/types"; message RegisterAccountData { string recipient = 1; diff --git a/proto/noble/forwarding/v1/query.proto b/proto/noble/forwarding/v1/query.proto index 8bc7810..b2b8951 100644 --- a/proto/noble/forwarding/v1/query.proto +++ b/proto/noble/forwarding/v1/query.proto @@ -9,7 +9,7 @@ import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; -option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types"; +option go_package = "github.com/noble-assets/forwarding/v2/types"; service Query { rpc Denoms(QueryDenoms) returns (QueryDenomsResponse) { diff --git a/proto/noble/forwarding/v1/tx.proto b/proto/noble/forwarding/v1/tx.proto index 0e8479e..0957540 100644 --- a/proto/noble/forwarding/v1/tx.proto +++ b/proto/noble/forwarding/v1/tx.proto @@ -7,7 +7,7 @@ import "cosmos/msg/v1/msg.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/noble-assets/forwarding/v2/x/forwarding/types"; +option go_package = "github.com/noble-assets/forwarding/v2/types"; service Msg { option (cosmos.msg.v1.service) = true; diff --git a/simapp/ante.go b/simapp/ante.go index a7dd793..b524fa3 100644 --- a/simapp/ante.go +++ b/simapp/ante.go @@ -6,8 +6,8 @@ import ( errorstypes "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/x/auth/ante" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/noble-assets/forwarding/v2/x/forwarding" - forwardingtypes "github.com/noble-assets/forwarding/v2/x/forwarding/types" + "github.com/noble-assets/forwarding/v2" + forwardingtypes "github.com/noble-assets/forwarding/v2/types" ) type BankKeeper interface { diff --git a/simapp/app.go b/simapp/app.go index 441da86..52c5c1d 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -27,7 +27,7 @@ import ( _ "github.com/cosmos/cosmos-sdk/x/consensus" _ "github.com/cosmos/cosmos-sdk/x/params" _ "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/noble-assets/forwarding/v2/x/forwarding" + "github.com/noble-assets/forwarding/v2" // Cosmos Modules upgradekeeper "cosmossdk.io/x/upgrade/keeper" @@ -44,7 +44,7 @@ import ( transferkeeper "github.com/cosmos/ibc-go/v8/modules/apps/transfer/keeper" ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" // Custom Modules - forwardingkeeper "github.com/noble-assets/forwarding/v2/x/forwarding/keeper" + forwardingkeeper "github.com/noble-assets/forwarding/v2/keeper" ) var DefaultNodeHome string diff --git a/simapp/legacy.go b/simapp/legacy.go index 04c1e3d..b9fc92f 100644 --- a/simapp/legacy.go +++ b/simapp/legacy.go @@ -15,7 +15,7 @@ import ( ibcexported "github.com/cosmos/ibc-go/v8/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper" "github.com/cosmos/ibc-go/v8/modules/light-clients/07-tendermint" - "github.com/noble-assets/forwarding/v2/x/forwarding" + "github.com/noble-assets/forwarding/v2" ) func (app *SimApp) RegisterLegacyModules() error { diff --git a/x/forwarding/spec/01-state.md b/spec/01-state.md similarity index 100% rename from x/forwarding/spec/01-state.md rename to spec/01-state.md diff --git a/x/forwarding/spec/02-messages.md b/spec/02-messages.md similarity index 100% rename from x/forwarding/spec/02-messages.md rename to spec/02-messages.md diff --git a/x/forwarding/spec/03-events.md b/spec/03-events.md similarity index 100% rename from x/forwarding/spec/03-events.md rename to spec/03-events.md diff --git a/x/forwarding/spec/04-queries.md b/spec/04-queries.md similarity index 100% rename from x/forwarding/spec/04-queries.md rename to spec/04-queries.md diff --git a/x/forwarding/spec/05-cli.md b/spec/05-cli.md similarity index 100% rename from x/forwarding/spec/05-cli.md rename to spec/05-cli.md diff --git a/x/forwarding/types/account.go b/types/account.go similarity index 100% rename from x/forwarding/types/account.go rename to types/account.go diff --git a/x/forwarding/types/account.pb.go b/types/account.pb.go similarity index 87% rename from x/forwarding/types/account.pb.go rename to types/account.pb.go index 9d801b0..05e5329 100644 --- a/x/forwarding/types/account.pb.go +++ b/types/account.pb.go @@ -145,30 +145,30 @@ func init() { func init() { proto.RegisterFile("noble/forwarding/v1/account.proto", fileDescriptor_9d86db85ab0c667b) } var fileDescriptor_9d86db85ab0c667b = []byte{ - // 361 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xc1, 0x4e, 0xf2, 0x40, - 0x10, 0xc7, 0xbb, 0x1f, 0x7c, 0x2a, 0x0b, 0x07, 0xac, 0x1e, 0x2a, 0xc1, 0x52, 0x39, 0x11, 0x13, - 0xba, 0x29, 0x5e, 0x0c, 0x37, 0x38, 0x98, 0x10, 0x2f, 0xa6, 0x47, 0x2f, 0x64, 0x77, 0x59, 0x4a, - 0x43, 0xe9, 0x92, 0xee, 0x16, 0xe5, 0x2d, 0x3c, 0x7a, 0xf4, 0x21, 0x7c, 0x08, 0xe3, 0x89, 0xa3, - 0x27, 0x63, 0xe0, 0x11, 0x7c, 0x01, 0xc3, 0x76, 0xa5, 0x9a, 0x78, 0x9b, 0xdf, 0x7f, 0x66, 0x76, - 0xfe, 0xb3, 0x03, 0xcf, 0x62, 0x4e, 0x22, 0x86, 0xc6, 0x3c, 0xb9, 0xc3, 0xc9, 0x28, 0x8c, 0x03, - 0xb4, 0xf0, 0x10, 0xa6, 0x94, 0xa7, 0xb1, 0x74, 0xe7, 0x09, 0x97, 0xdc, 0x3c, 0x52, 0x25, 0x6e, - 0x5e, 0xe2, 0x2e, 0xbc, 0x9a, 0x4d, 0xb9, 0x98, 0x71, 0x81, 0x70, 0x2a, 0x27, 0x68, 0xe1, 0x11, - 0x26, 0xb1, 0xa7, 0x20, 0x6b, 0xaa, 0x9d, 0x64, 0xf9, 0xa1, 0x22, 0x94, 0x81, 0x4e, 0x1d, 0x07, - 0x3c, 0xe0, 0x99, 0xbe, 0x8d, 0x32, 0xb5, 0xf9, 0x09, 0xe0, 0xe1, 0xd5, 0x6e, 0x44, 0x2f, 0x73, - 0x60, 0x0e, 0x60, 0x85, 0x60, 0xc1, 0x86, 0xda, 0x91, 0x05, 0x1c, 0xd0, 0x2a, 0x77, 0x1c, 0x57, - 0x3f, 0xa8, 0x06, 0xea, 0xe9, 0x6e, 0x1f, 0x0b, 0xa6, 0xfb, 0xfa, 0xc5, 0xd5, 0x7b, 0x03, 0xf8, - 0x65, 0x92, 0x4b, 0xa6, 0x05, 0xf7, 0xe9, 0x04, 0xc7, 0x31, 0x8b, 0xac, 0x7f, 0x0e, 0x68, 0x95, - 0xfc, 0x6f, 0x34, 0xeb, 0xb0, 0x94, 0x30, 0x1a, 0xce, 0x43, 0x16, 0x4b, 0xab, 0xa0, 0x72, 0xb9, - 0x60, 0x9e, 0x42, 0x48, 0x13, 0x86, 0x25, 0x1b, 0x0d, 0xb1, 0xb4, 0x8a, 0x0e, 0x68, 0x15, 0xfc, - 0x92, 0x56, 0x7a, 0xd2, 0xac, 0xc1, 0x83, 0x31, 0x8e, 0x22, 0x82, 0xe9, 0xd4, 0xfa, 0xaf, 0x7a, - 0x77, 0xdc, 0x75, 0x5e, 0x9f, 0xdb, 0xf5, 0xbf, 0xac, 0x6a, 0x4f, 0x83, 0xe6, 0x39, 0xac, 0xe6, - 0x4b, 0xdf, 0xa4, 0xe4, 0x9a, 0x2d, 0xcd, 0x2a, 0x2c, 0x4c, 0xd9, 0x52, 0xad, 0x5a, 0xf1, 0xb7, - 0x61, 0xb7, 0xf8, 0xf8, 0xd4, 0x30, 0xfa, 0xfe, 0xcb, 0xda, 0x06, 0xab, 0xb5, 0x0d, 0x3e, 0xd6, - 0x36, 0x78, 0xd8, 0xd8, 0xc6, 0x6a, 0x63, 0x1b, 0x6f, 0x1b, 0xdb, 0xb8, 0xbd, 0x0c, 0x42, 0x39, - 0x49, 0x89, 0x4b, 0xf9, 0x0c, 0xa9, 0x63, 0xb5, 0xb1, 0x10, 0x4c, 0x8a, 0x5f, 0x67, 0xed, 0xa0, - 0xfb, 0x9f, 0x2c, 0x97, 0x73, 0x26, 0xc8, 0x9e, 0xfa, 0xfc, 0x8b, 0xaf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xe2, 0x4b, 0x5c, 0x0e, 0x07, 0x02, 0x00, 0x00, + // 356 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xcb, 0x4e, 0xc2, 0x40, + 0x14, 0xed, 0x08, 0x3e, 0x18, 0x58, 0x60, 0x75, 0x51, 0x09, 0x96, 0xca, 0x8a, 0x68, 0xe8, 0xa4, + 0xb8, 0x63, 0x07, 0x89, 0x26, 0xc4, 0x8d, 0xe9, 0xd2, 0x0d, 0x99, 0x19, 0x86, 0xd2, 0x50, 0x3a, + 0xa4, 0x33, 0xc5, 0xf0, 0x17, 0x2e, 0x5d, 0xfa, 0x11, 0x7e, 0x84, 0x71, 0xc5, 0xd2, 0x95, 0x31, + 0xf0, 0x09, 0xfe, 0x80, 0x61, 0x3a, 0xd2, 0x98, 0xb8, 0xbb, 0xe7, 0xdc, 0x7b, 0xe6, 0x9c, 0x3b, + 0x17, 0x5e, 0xc4, 0x9c, 0x44, 0x0c, 0x8d, 0x79, 0xf2, 0x88, 0x93, 0x51, 0x18, 0x07, 0x68, 0xe1, + 0x21, 0x4c, 0x29, 0x4f, 0x63, 0xe9, 0xce, 0x13, 0x2e, 0xb9, 0x79, 0xa2, 0x46, 0xdc, 0x7c, 0xc4, + 0x5d, 0x78, 0x35, 0x9b, 0x72, 0x31, 0xe3, 0x02, 0xe1, 0x54, 0x4e, 0xd0, 0xc2, 0x23, 0x4c, 0x62, + 0x4f, 0x81, 0x4c, 0x54, 0x3b, 0xcb, 0xfa, 0x43, 0x85, 0x50, 0x06, 0x74, 0xeb, 0x34, 0xe0, 0x01, + 0xcf, 0xf8, 0x6d, 0x95, 0xb1, 0xcd, 0x6f, 0x00, 0x8f, 0x6f, 0x77, 0x16, 0xbd, 0x2c, 0x81, 0x39, + 0x80, 0x15, 0x82, 0x05, 0x1b, 0xea, 0x44, 0x16, 0x70, 0x40, 0xab, 0xdc, 0x71, 0x5c, 0xfd, 0xa0, + 0x32, 0xd4, 0xee, 0x6e, 0x1f, 0x0b, 0xa6, 0x75, 0xfd, 0xe2, 0xea, 0xb3, 0x01, 0xfc, 0x32, 0xc9, + 0x29, 0xd3, 0x82, 0x87, 0x74, 0x82, 0xe3, 0x98, 0x45, 0xd6, 0x9e, 0x03, 0x5a, 0x25, 0xff, 0x17, + 0x9a, 0x75, 0x58, 0x4a, 0x18, 0x0d, 0xe7, 0x21, 0x8b, 0xa5, 0x55, 0x50, 0xbd, 0x9c, 0x30, 0xcf, + 0x21, 0xa4, 0x09, 0xc3, 0x92, 0x8d, 0x86, 0x58, 0x5a, 0x45, 0x07, 0xb4, 0x0a, 0x7e, 0x49, 0x33, + 0x3d, 0x69, 0xd6, 0xe0, 0xd1, 0x18, 0x47, 0x11, 0xc1, 0x74, 0x6a, 0xed, 0x2b, 0xed, 0x0e, 0x77, + 0x9d, 0xf7, 0xd7, 0x76, 0xfd, 0xbf, 0xa8, 0x3a, 0xd3, 0xa0, 0x79, 0x09, 0xab, 0xf9, 0xd2, 0xf7, + 0x29, 0xb9, 0x63, 0x4b, 0xb3, 0x0a, 0x0b, 0x53, 0xb6, 0x54, 0xab, 0x56, 0xfc, 0x6d, 0xd9, 0x2d, + 0x3e, 0xbf, 0x34, 0x8c, 0xfe, 0xcd, 0xdb, 0xda, 0x06, 0xab, 0xb5, 0x0d, 0xbe, 0xd6, 0x36, 0x78, + 0xda, 0xd8, 0xc6, 0x6a, 0x63, 0x1b, 0x1f, 0x1b, 0xdb, 0x78, 0xb8, 0x0a, 0x42, 0x39, 0x49, 0x89, + 0x4b, 0xf9, 0x0c, 0xa9, 0x63, 0xb5, 0xb1, 0x10, 0x4c, 0x8a, 0x3f, 0x67, 0xed, 0x20, 0xb9, 0x9c, + 0x33, 0x41, 0x0e, 0xd4, 0x7f, 0x5f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x2f, 0xd3, 0x7f, 0x79, + 0xfa, 0x01, 0x00, 0x00, } func (m *ForwardingAccount) Marshal() (dAtA []byte, err error) { diff --git a/x/forwarding/types/channel.go b/types/channel.go similarity index 100% rename from x/forwarding/types/channel.go rename to types/channel.go diff --git a/x/forwarding/types/codec.go b/types/codec.go similarity index 100% rename from x/forwarding/types/codec.go rename to types/codec.go diff --git a/x/forwarding/types/errors.go b/types/errors.go similarity index 100% rename from x/forwarding/types/errors.go rename to types/errors.go diff --git a/x/forwarding/types/events.pb.go b/types/events.pb.go similarity index 92% rename from x/forwarding/types/events.pb.go rename to types/events.pb.go index 41fd45e..6b12d1b 100644 --- a/x/forwarding/types/events.pb.go +++ b/types/events.pb.go @@ -214,27 +214,27 @@ func init() { func init() { proto.RegisterFile("noble/forwarding/v1/events.proto", fileDescriptor_f58759da7cd78060) } var fileDescriptor_f58759da7cd78060 = []byte{ - // 309 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x31, 0x4f, 0x32, 0x31, - 0x18, 0xc7, 0x29, 0xbc, 0x79, 0x95, 0x26, 0x62, 0x3c, 0x07, 0x1b, 0x63, 0x1a, 0x42, 0x62, 0x64, - 0xf1, 0x2e, 0xe8, 0xe2, 0x8a, 0x38, 0x38, 0xdf, 0xe8, 0x62, 0x7a, 0xed, 0xc3, 0xd1, 0x58, 0xda, - 0x4b, 0xdb, 0x3b, 0x74, 0xf4, 0x1b, 0xf8, 0xb1, 0x1c, 0x19, 0x1d, 0x0d, 0x7c, 0x11, 0x43, 0xe1, - 0x44, 0x1c, 0x1c, 0xff, 0xcf, 0xef, 0xd7, 0xfe, 0x9b, 0x3e, 0xb8, 0xab, 0x4d, 0xa6, 0x20, 0x19, - 0x1b, 0x3b, 0x63, 0x56, 0x48, 0x9d, 0x27, 0xd5, 0x20, 0x81, 0x0a, 0xb4, 0x77, 0x71, 0x61, 0x8d, - 0x37, 0xd1, 0x71, 0x30, 0xe2, 0xad, 0x11, 0x57, 0x83, 0xde, 0x2b, 0xc2, 0x47, 0x43, 0xce, 0x4d, - 0xa9, 0x7d, 0x0a, 0xb9, 0x74, 0x1e, 0x2c, 0x88, 0x88, 0xe0, 0x3d, 0x26, 0x84, 0x05, 0xe7, 0x08, - 0xea, 0xa2, 0x7e, 0x3b, 0xad, 0xe3, 0x8a, 0xf0, 0x09, 0xd3, 0x1a, 0x14, 0x69, 0xae, 0xc9, 0x26, - 0x46, 0x67, 0xb8, 0x6d, 0x81, 0xcb, 0x42, 0x82, 0xf6, 0xa4, 0x15, 0xd8, 0x76, 0x10, 0x9d, 0xe2, - 0xfd, 0x31, 0x53, 0x2a, 0x63, 0xfc, 0x89, 0xfc, 0x0b, 0xf0, 0x3b, 0xf7, 0xee, 0x71, 0x67, 0xf3, - 0x84, 0x91, 0x02, 0xf6, 0x77, 0xff, 0x4e, 0x4b, 0xf3, 0x57, 0x4b, 0x4f, 0xe2, 0x93, 0xa1, 0x52, - 0x66, 0x06, 0xe2, 0x0e, 0xb4, 0x99, 0xba, 0x91, 0xd1, 0x63, 0x99, 0x97, 0xab, 0x2b, 0x2f, 0xf0, - 0x61, 0x61, 0xa1, 0x92, 0xa6, 0x74, 0x8f, 0x22, 0x40, 0x82, 0xba, 0xad, 0x7e, 0x3b, 0xed, 0xd4, - 0xe3, 0xf5, 0x91, 0xe8, 0x1c, 0x77, 0x78, 0x69, 0x2d, 0x68, 0x5f, 0x7b, 0xcd, 0xe0, 0x1d, 0x6c, - 0xa6, 0x6b, 0xed, 0x36, 0x7d, 0x5f, 0x50, 0x34, 0x5f, 0x50, 0xf4, 0xb9, 0xa0, 0xe8, 0x6d, 0x49, - 0x1b, 0xf3, 0x25, 0x6d, 0x7c, 0x2c, 0x69, 0xe3, 0xe1, 0x26, 0x97, 0x7e, 0x52, 0x66, 0x31, 0x37, - 0xd3, 0x24, 0x7c, 0xf9, 0x25, 0x73, 0x0e, 0xbc, 0xdb, 0xd9, 0xcd, 0x55, 0xf2, 0xfc, 0x33, 0xfb, - 0x97, 0x02, 0x5c, 0xf6, 0x3f, 0x2c, 0xea, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x1d, 0x2f, 0xc1, - 0xb8, 0xcc, 0x01, 0x00, 0x00, + // 306 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x41, 0x4a, 0x03, 0x31, + 0x14, 0x86, 0x9b, 0x56, 0xd4, 0x06, 0xac, 0x38, 0x2e, 0x0c, 0x22, 0xa1, 0x14, 0xc4, 0x82, 0x38, + 0x43, 0xf5, 0x04, 0xb5, 0x0a, 0xae, 0xbb, 0x74, 0x23, 0x99, 0xe4, 0x75, 0x1a, 0x4c, 0x93, 0x21, + 0xc9, 0x4c, 0x71, 0xe9, 0x0d, 0x3c, 0x96, 0xcb, 0x2e, 0x5d, 0x4a, 0x7b, 0x11, 0x69, 0x3a, 0x63, + 0xa9, 0x0b, 0x97, 0xef, 0xff, 0xbe, 0xe4, 0x0f, 0x79, 0xb8, 0xab, 0x4d, 0xaa, 0x20, 0x99, 0x18, + 0x3b, 0x67, 0x56, 0x48, 0x9d, 0x25, 0xe5, 0x20, 0x81, 0x12, 0xb4, 0x77, 0x71, 0x6e, 0x8d, 0x37, + 0xd1, 0x69, 0x30, 0xe2, 0xad, 0x11, 0x97, 0x83, 0xde, 0x3b, 0xc2, 0x27, 0x43, 0xce, 0x4d, 0xa1, + 0xfd, 0x18, 0x32, 0xe9, 0x3c, 0x58, 0x10, 0x11, 0xc1, 0x07, 0x4c, 0x08, 0x0b, 0xce, 0x11, 0xd4, + 0x45, 0xfd, 0xf6, 0xb8, 0x1e, 0xd7, 0x84, 0x4f, 0x99, 0xd6, 0xa0, 0x48, 0x73, 0x43, 0xaa, 0x31, + 0xba, 0xc0, 0x6d, 0x0b, 0x5c, 0xe6, 0x12, 0xb4, 0x27, 0xad, 0xc0, 0xb6, 0x41, 0x74, 0x8e, 0x0f, + 0x27, 0x4c, 0xa9, 0x94, 0xf1, 0x57, 0xb2, 0x17, 0xe0, 0xef, 0xdc, 0x7b, 0xc2, 0x9d, 0xea, 0x09, + 0x23, 0x05, 0xec, 0xff, 0xfe, 0x9d, 0x96, 0xe6, 0x9f, 0x96, 0x9e, 0xc4, 0x67, 0x43, 0xa5, 0xcc, + 0x1c, 0xc4, 0x03, 0x68, 0x33, 0x73, 0x23, 0xa3, 0x27, 0x32, 0x2b, 0xd6, 0x57, 0x5e, 0xe1, 0xe3, + 0xdc, 0x42, 0x29, 0x4d, 0xe1, 0x5e, 0x44, 0x80, 0x04, 0x75, 0x5b, 0xfd, 0xf6, 0xb8, 0x53, 0xc7, + 0x9b, 0x23, 0xd1, 0x25, 0xee, 0xf0, 0xc2, 0x5a, 0xd0, 0xbe, 0xf6, 0x9a, 0xc1, 0x3b, 0xaa, 0xd2, + 0x8d, 0x76, 0xff, 0xf8, 0xb9, 0xa4, 0x68, 0xb1, 0xa4, 0xe8, 0x7b, 0x49, 0xd1, 0xc7, 0x8a, 0x36, + 0x16, 0x2b, 0xda, 0xf8, 0x5a, 0xd1, 0xc6, 0xf3, 0x75, 0x26, 0xfd, 0xb4, 0x48, 0x63, 0x6e, 0x66, + 0x49, 0xf8, 0xf2, 0x1b, 0xe6, 0x1c, 0x78, 0xb7, 0xb3, 0x9b, 0xdb, 0xc4, 0xbf, 0xe5, 0xe0, 0xd2, + 0xfd, 0xb0, 0x9b, 0xbb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x05, 0x3b, 0x20, 0xbe, 0xbf, 0x01, + 0x00, 0x00, } func (m *AccountRegistered) Marshal() (dAtA []byte, err error) { diff --git a/x/forwarding/types/expected_keepers.go b/types/expected_keepers.go similarity index 100% rename from x/forwarding/types/expected_keepers.go rename to types/expected_keepers.go diff --git a/x/forwarding/types/genesis.go b/types/genesis.go similarity index 100% rename from x/forwarding/types/genesis.go rename to types/genesis.go diff --git a/x/forwarding/types/genesis.pb.go b/types/genesis.pb.go similarity index 98% rename from x/forwarding/types/genesis.pb.go rename to types/genesis.pb.go index 2389e71..1b4e350 100644 --- a/x/forwarding/types/genesis.pb.go +++ b/types/genesis.pb.go @@ -100,7 +100,7 @@ func init() { func init() { proto.RegisterFile("noble/forwarding/v1/genesis.proto", fileDescriptor_672c6f172b8b6a10) } var fileDescriptor_672c6f172b8b6a10 = []byte{ - // 345 bytes of a gzipped FileDescriptorProto + // 342 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xcc, 0xcb, 0x4f, 0xca, 0x49, 0xd5, 0x4f, 0xcb, 0x2f, 0x2a, 0x4f, 0x2c, 0x4a, 0xc9, 0xcc, 0x4b, 0xd7, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x06, @@ -117,12 +117,12 @@ var fileDescriptor_672c6f172b8b6a10 = []byte{ 0x42, 0x02, 0x5c, 0xcc, 0xd9, 0xa9, 0x95, 0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x20, 0xa6, 0x90, 0x08, 0x17, 0x6b, 0x59, 0x62, 0x4e, 0x69, 0xaa, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x4b, 0x10, 0x84, 0x63, 0xc5, 0x64, 0xc1, 0x08, 0x37, 0x01, 0xc5, 0x1b, 0x24, 0x99, 0xe0, 0xc8, 0x25, 0x8c, - 0xc5, 0xa9, 0x84, 0x8c, 0xe0, 0x44, 0x32, 0xc2, 0x29, 0xe8, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, + 0xc5, 0xa9, 0x84, 0x8c, 0xe0, 0x44, 0x32, 0xc2, 0xc9, 0xf5, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, - 0x8f, 0xe5, 0x18, 0xa2, 0x2c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, - 0xc1, 0x21, 0xa6, 0x9b, 0x58, 0x5c, 0x9c, 0x5a, 0x52, 0x8c, 0x92, 0xfc, 0x8c, 0xf4, 0x2b, 0x90, - 0xf9, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0xa4, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, - 0xff, 0xc8, 0xd5, 0x82, 0xfa, 0xaf, 0x02, 0x00, 0x00, + 0x8f, 0xe5, 0x18, 0xa2, 0xb4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, + 0xc1, 0x21, 0xa6, 0x9b, 0x58, 0x5c, 0x9c, 0x5a, 0x52, 0x8c, 0x92, 0xfc, 0x8c, 0xf4, 0x4b, 0x2a, + 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xa9, 0xcf, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xd4, + 0x7d, 0x19, 0xa2, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/forwarding/types/keys.go b/types/keys.go similarity index 100% rename from x/forwarding/types/keys.go rename to types/keys.go diff --git a/x/forwarding/types/packet.pb.go b/types/packet.pb.go similarity index 91% rename from x/forwarding/types/packet.pb.go rename to types/packet.pb.go index 9fc80b5..129f0d1 100644 --- a/x/forwarding/types/packet.pb.go +++ b/types/packet.pb.go @@ -183,25 +183,25 @@ func init() { func init() { proto.RegisterFile("noble/forwarding/v1/packet.proto", fileDescriptor_9a0a2a88e68b1d25) } var fileDescriptor_9a0a2a88e68b1d25 = []byte{ - // 278 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xbd, 0x4e, 0xc3, 0x30, - 0x14, 0x85, 0x63, 0x10, 0x3f, 0x35, 0x9b, 0xbb, 0x44, 0x11, 0xb2, 0xaa, 0x4e, 0x5d, 0x70, 0xd4, - 0xb2, 0xb0, 0xf2, 0x33, 0xb0, 0xb0, 0x64, 0x41, 0xb0, 0x39, 0xe6, 0x26, 0xb5, 0x9a, 0xda, 0x96, - 0xed, 0x16, 0x78, 0x0b, 0x1e, 0x8b, 0xb1, 0x63, 0x47, 0x94, 0xbc, 0x08, 0xc2, 0xfc, 0xa4, 0x88, - 0x20, 0x75, 0x3c, 0xf7, 0x9e, 0x7b, 0xbe, 0x23, 0x5d, 0x3c, 0x50, 0x3a, 0xaf, 0x20, 0x2d, 0xb4, - 0x7d, 0xe4, 0xf6, 0x41, 0xaa, 0x32, 0x5d, 0x8e, 0x53, 0xc3, 0xc5, 0x0c, 0x3c, 0x33, 0x56, 0x7b, - 0x4d, 0xfa, 0xc1, 0xc1, 0x5a, 0x07, 0x5b, 0x8e, 0x87, 0x12, 0xf7, 0x33, 0x28, 0xa5, 0xf3, 0x60, - 0xcf, 0x85, 0xd0, 0x0b, 0xe5, 0xaf, 0xb8, 0xe7, 0xe4, 0x18, 0xf7, 0x2c, 0x08, 0x69, 0x24, 0x28, - 0x1f, 0xa3, 0x01, 0x1a, 0xf5, 0xb2, 0x76, 0x40, 0x62, 0x7c, 0x20, 0xa6, 0x5c, 0x29, 0xa8, 0xe2, - 0x9d, 0xb0, 0xfb, 0x96, 0x24, 0xc1, 0x87, 0x05, 0xaf, 0xaa, 0x9c, 0x8b, 0x59, 0xbc, 0x1b, 0x56, - 0x3f, 0x7a, 0xb8, 0x46, 0x7f, 0x58, 0x37, 0x30, 0xd7, 0xe4, 0x0e, 0xef, 0x85, 0x66, 0x81, 0x73, - 0x34, 0xb9, 0x64, 0x1d, 0x3d, 0x59, 0xc7, 0x21, 0xeb, 0x28, 0x7e, 0x6b, 0xb9, 0x31, 0x60, 0xb3, - 0xcf, 0xc4, 0xa4, 0xc0, 0xc9, 0xff, 0x26, 0x72, 0x8d, 0x71, 0x0b, 0xf9, 0xa2, 0x8f, 0xb6, 0xa1, - 0x7f, 0x84, 0x64, 0x1b, 0xb7, 0x17, 0xd9, 0x6b, 0x4d, 0xd1, 0xaa, 0xa6, 0xe8, 0xad, 0xa6, 0xe8, - 0xa5, 0xa1, 0xd1, 0xaa, 0xa1, 0xd1, 0xba, 0xa1, 0xd1, 0xfd, 0x59, 0x29, 0xfd, 0x74, 0x91, 0x33, - 0xa1, 0xe7, 0x69, 0x48, 0x3e, 0xe1, 0xce, 0x81, 0x77, 0xbf, 0x1e, 0x35, 0x49, 0x9f, 0x36, 0xb5, - 0x7f, 0x36, 0xe0, 0xf2, 0xfd, 0xf0, 0xb5, 0xd3, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x91, 0xb6, - 0xab, 0x97, 0xd9, 0x01, 0x00, 0x00, + // 275 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xcd, 0x4a, 0x03, 0x31, + 0x14, 0x85, 0x1b, 0xc5, 0x9f, 0xc6, 0x5d, 0xba, 0x19, 0x06, 0x09, 0xa5, 0xab, 0x82, 0x98, 0xd0, + 0xfa, 0x04, 0xfe, 0x81, 0x1b, 0x37, 0xb3, 0x11, 0xdd, 0x65, 0xe2, 0x9d, 0x69, 0xe8, 0x34, 0x09, + 0x49, 0x5a, 0xf1, 0x2d, 0x7c, 0x2c, 0x97, 0x5d, 0x76, 0x29, 0x33, 0x2f, 0x22, 0xc6, 0x9f, 0x51, + 0x1c, 0xc1, 0xe5, 0xbd, 0xf7, 0xdc, 0xf3, 0x1d, 0x38, 0x78, 0xa8, 0x4d, 0x5e, 0x01, 0x2f, 0x8c, + 0x7b, 0x10, 0xee, 0x5e, 0xe9, 0x92, 0xaf, 0x26, 0xdc, 0x0a, 0x39, 0x87, 0xc0, 0xac, 0x33, 0xc1, + 0x90, 0x41, 0x54, 0xb0, 0x56, 0xc1, 0x56, 0x93, 0x91, 0xc2, 0x83, 0x0c, 0x4a, 0xe5, 0x03, 0xb8, + 0x53, 0x29, 0xcd, 0x52, 0x87, 0x0b, 0x11, 0x04, 0x39, 0xc4, 0x7d, 0x07, 0x52, 0x59, 0x05, 0x3a, + 0x24, 0x68, 0x88, 0xc6, 0xfd, 0xac, 0x5d, 0x90, 0x04, 0xef, 0xc9, 0x99, 0xd0, 0x1a, 0xaa, 0x64, + 0x2b, 0xde, 0x3e, 0x47, 0x92, 0xe2, 0xfd, 0x42, 0x54, 0x55, 0x2e, 0xe4, 0x3c, 0xd9, 0x8e, 0xa7, + 0xaf, 0x79, 0xb4, 0x41, 0xbf, 0x58, 0xd7, 0xb0, 0x30, 0xe4, 0x16, 0xef, 0xc4, 0x64, 0x91, 0x73, + 0x30, 0x3d, 0x67, 0x1d, 0x39, 0x59, 0xc7, 0x23, 0xeb, 0x08, 0x7e, 0xe3, 0x84, 0xb5, 0xe0, 0xb2, + 0x77, 0xc7, 0xb4, 0xc0, 0xe9, 0xdf, 0x22, 0x72, 0x85, 0x71, 0x0b, 0xf9, 0xa0, 0x8f, 0xff, 0x43, + 0x7f, 0x33, 0xc9, 0xbe, 0xfd, 0x9e, 0x5d, 0x3e, 0xd7, 0x14, 0xad, 0x6b, 0x8a, 0x5e, 0x6a, 0x8a, + 0x9e, 0x1a, 0xda, 0x5b, 0x37, 0xb4, 0xb7, 0x69, 0x68, 0xef, 0xee, 0xa8, 0x54, 0x61, 0xb6, 0xcc, + 0x99, 0x34, 0x0b, 0x1e, 0x9d, 0x8f, 0x85, 0xf7, 0x10, 0xfc, 0x8f, 0xa2, 0xa6, 0x3c, 0x3c, 0x5a, + 0xf0, 0xf9, 0x6e, 0x2c, 0xea, 0xe4, 0x35, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x8b, 0xd8, 0x9a, 0xcc, + 0x01, 0x00, 0x00, } func (m *RegisterAccountData) Marshal() (dAtA []byte, err error) { diff --git a/x/forwarding/types/query.pb.go b/types/query.pb.go similarity index 92% rename from x/forwarding/types/query.pb.go rename to types/query.pb.go index 4359bb8..a39851b 100644 --- a/x/forwarding/types/query.pb.go +++ b/types/query.pb.go @@ -466,59 +466,59 @@ func init() { func init() { proto.RegisterFile("noble/forwarding/v1/query.proto", fileDescriptor_fc601bfb5b0b1c63) } var fileDescriptor_fc601bfb5b0b1c63 = []byte{ - // 822 bytes of a gzipped FileDescriptorProto + // 820 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xbf, 0x6f, 0x23, 0x45, 0x14, 0xf6, 0xfa, 0x47, 0xec, 0x4c, 0x7e, 0xc1, 0x24, 0x85, 0xb3, 0x49, 0x6c, 0xb3, 0x42, 0x60, - 0x22, 0xbc, 0x13, 0x9b, 0x26, 0x44, 0x42, 0x28, 0x0e, 0x44, 0x82, 0x02, 0x84, 0x43, 0x45, 0x63, - 0x8d, 0x77, 0xc7, 0x9b, 0x55, 0xd6, 0x33, 0x66, 0x67, 0xec, 0xc4, 0x8a, 0x42, 0x41, 0x15, 0x51, - 0x21, 0x41, 0x45, 0x43, 0x24, 0x1a, 0x44, 0x95, 0x82, 0x8a, 0x3f, 0x00, 0xa5, 0x8c, 0xa0, 0xa1, - 0xe2, 0x4e, 0xc9, 0x49, 0xb9, 0x3f, 0xe3, 0xb4, 0xb3, 0xb3, 0x6b, 0x5f, 0xce, 0x96, 0x93, 0xea, - 0x1a, 0x7b, 0xde, 0x7b, 0xdf, 0xbc, 0xf7, 0xf9, 0x9b, 0xf7, 0x9e, 0x41, 0x91, 0xb2, 0x96, 0x47, - 0x50, 0x9b, 0xf9, 0xc7, 0xd8, 0xb7, 0x5d, 0xea, 0xa0, 0x7e, 0x15, 0x7d, 0xdb, 0x23, 0xfe, 0xc0, - 0xec, 0xfa, 0x4c, 0x30, 0xb8, 0x2c, 0x01, 0xe6, 0x10, 0x60, 0xf6, 0xab, 0xfa, 0x9b, 0xb8, 0xe3, - 0x52, 0x86, 0xe4, 0x67, 0x88, 0xd3, 0x0b, 0x16, 0xe3, 0x1d, 0xc6, 0x51, 0x0b, 0x73, 0x82, 0xfa, - 0xd5, 0x16, 0x11, 0xb8, 0x8a, 0x2c, 0xe6, 0x52, 0x15, 0x5f, 0x53, 0x71, 0x99, 0xfb, 0x5e, 0x11, - 0x7d, 0x35, 0x0c, 0x36, 0xa5, 0x85, 0x42, 0x43, 0x85, 0x56, 0x1c, 0xe6, 0xb0, 0xd0, 0x1f, 0x9c, - 0x94, 0x77, 0xdd, 0x61, 0xcc, 0xf1, 0x08, 0xc2, 0x5d, 0x17, 0x61, 0x4a, 0x99, 0xc0, 0xc2, 0x65, - 0x54, 0xdd, 0x31, 0x16, 0xc0, 0xdc, 0x57, 0x41, 0xf6, 0x4f, 0x08, 0x65, 0x1d, 0x6e, 0xec, 0x81, - 0xe5, 0x11, 0xb3, 0x41, 0x78, 0x97, 0x51, 0x4e, 0xe0, 0xfb, 0x60, 0x11, 0x7b, 0x1e, 0x3b, 0x26, - 0x76, 0xd3, 0x96, 0x91, 0xbc, 0x56, 0x4a, 0x95, 0x67, 0xeb, 0x99, 0xdf, 0xef, 0x2e, 0x37, 0xb5, - 0xc6, 0x82, 0x0a, 0xaa, 0x24, 0x1e, 0x98, 0x97, 0x49, 0x76, 0x6d, 0xdb, 0x27, 0x9c, 0xc3, 0x3c, - 0xc8, 0x5a, 0x87, 0x98, 0x52, 0xe2, 0xe5, 0xb5, 0x92, 0x56, 0x9e, 0x6d, 0x44, 0x26, 0x5c, 0x07, - 0xb3, 0x3e, 0xb1, 0xdc, 0xae, 0x4b, 0xa8, 0xc8, 0x27, 0x65, 0x6c, 0xe8, 0x80, 0x3a, 0xc8, 0xb5, - 0xb1, 0xe7, 0xb5, 0xb0, 0x75, 0x94, 0x4f, 0xc9, 0x60, 0x6c, 0xef, 0xe4, 0xce, 0x2f, 0x8a, 0x89, - 0xe7, 0x17, 0xc5, 0x84, 0xe1, 0x82, 0x95, 0xd1, 0x6a, 0x31, 0xe7, 0x1a, 0xc8, 0xe2, 0xd0, 0x15, - 0x56, 0xad, 0xe7, 0xff, 0xf9, 0xb3, 0xb2, 0xa2, 0x04, 0x53, 0xe0, 0x03, 0xe1, 0xbb, 0xd4, 0x69, - 0x44, 0x40, 0xb8, 0x01, 0x66, 0xc8, 0x89, 0xcb, 0x05, 0x97, 0x64, 0x72, 0xd1, 0xef, 0x53, 0x4e, - 0x63, 0x1e, 0x00, 0x59, 0xea, 0x40, 0x60, 0xc1, 0x8d, 0xbf, 0x34, 0x00, 0x87, 0x66, 0x5c, 0xf7, - 0x0b, 0x90, 0xe1, 0x81, 0x43, 0x4a, 0x34, 0x57, 0xab, 0x99, 0x63, 0xba, 0xc2, 0x7c, 0xf5, 0x9e, - 0x29, 0xad, 0x4f, 0xa9, 0xf0, 0x07, 0xf5, 0xf4, 0xd5, 0xff, 0xc5, 0x44, 0x23, 0x4c, 0xa3, 0x7f, - 0x0d, 0xc0, 0x30, 0x04, 0xdf, 0x00, 0xa9, 0x23, 0x32, 0x50, 0x3a, 0x06, 0x47, 0xb8, 0x05, 0x32, - 0x7d, 0xec, 0xf5, 0x88, 0xa4, 0x3c, 0x57, 0xd3, 0xc7, 0xd6, 0x0b, 0x4b, 0x85, 0xc0, 0x9d, 0xe4, - 0xb6, 0x66, 0x7c, 0xa8, 0x1e, 0x5a, 0x06, 0xea, 0x83, 0x3d, 0xf5, 0x20, 0x13, 0x9f, 0x6a, 0x44, - 0xf0, 0xf3, 0x24, 0x58, 0x1b, 0x73, 0x37, 0x16, 0xa0, 0x02, 0x96, 0x68, 0xaf, 0xd3, 0x64, 0xed, - 0x26, 0xb6, 0x2c, 0xd6, 0xa3, 0x22, 0x7c, 0x80, 0x74, 0xdc, 0x2d, 0xb4, 0xd7, 0xf9, 0xb2, 0xbd, - 0xab, 0x62, 0x23, 0x70, 0x45, 0x39, 0x14, 0xff, 0x1e, 0x7c, 0x5f, 0xc5, 0xe0, 0x0f, 0x1a, 0x58, - 0x12, 0x4c, 0x60, 0x2f, 0x82, 0x13, 0x3b, 0x9f, 0x92, 0x4a, 0xaf, 0x9a, 0xea, 0x71, 0x83, 0xb9, - 0x32, 0xd5, 0x5c, 0x99, 0x7b, 0xcc, 0xa5, 0xf5, 0xfd, 0x40, 0xd0, 0x3f, 0x9e, 0x14, 0xcb, 0x8e, - 0x2b, 0x0e, 0x7b, 0x2d, 0xd3, 0x62, 0x1d, 0x35, 0x3a, 0xea, 0xab, 0xc2, 0xed, 0x23, 0x24, 0x06, - 0x5d, 0xc2, 0xe5, 0x05, 0xfe, 0xcb, 0xdd, 0xe5, 0xe6, 0xbc, 0x47, 0x1c, 0x6c, 0x0d, 0x9a, 0xc1, - 0x64, 0xf2, 0x90, 0xcb, 0xa2, 0xac, 0xbc, 0x1f, 0x15, 0x36, 0x7e, 0x4e, 0x82, 0x8c, 0x54, 0x01, - 0x96, 0x40, 0xce, 0x3a, 0xc4, 0x2e, 0x6d, 0xba, 0xb6, 0x6a, 0x37, 0x45, 0x3f, 0x2b, 0xdd, 0x9f, - 0xd9, 0xe3, 0x64, 0x49, 0x3e, 0x4e, 0x96, 0xd4, 0x23, 0x65, 0x49, 0xbf, 0x26, 0x59, 0x6a, 0x7f, - 0xa7, 0x41, 0x46, 0x76, 0x08, 0xfc, 0x0e, 0xcc, 0x84, 0x4b, 0x01, 0x96, 0x26, 0xcf, 0x41, 0x88, - 0xd0, 0xcb, 0xd3, 0x10, 0x51, 0x87, 0x19, 0xe5, 0xf3, 0xa0, 0xec, 0xf7, 0xff, 0x3e, 0xfb, 0x29, - 0xb9, 0x01, 0xd7, 0xd0, 0xb8, 0xbd, 0x1c, 0xae, 0x29, 0xf8, 0x9b, 0x06, 0xb2, 0xd1, 0x1a, 0x7a, - 0x6b, 0x72, 0x7e, 0x05, 0xd1, 0xdf, 0x9b, 0x0a, 0x89, 0x39, 0x7c, 0x3e, 0xe4, 0xf0, 0x31, 0xfc, - 0x68, 0x2c, 0x07, 0xb5, 0x55, 0xd0, 0xa9, 0x9a, 0xa1, 0x33, 0x74, 0x1a, 0x2f, 0xb7, 0x33, 0x74, - 0x1a, 0xed, 0xb2, 0x33, 0xd8, 0x8b, 0xba, 0xa8, 0x38, 0x65, 0x59, 0xe8, 0xef, 0x3e, 0x70, 0x9b, - 0x18, 0x86, 0x64, 0xb6, 0x0e, 0xf5, 0xb1, 0xcc, 0xe4, 0x66, 0x81, 0xbf, 0x6a, 0x60, 0xf1, 0xde, - 0xfc, 0x97, 0xa7, 0xe4, 0x8f, 0x91, 0xfa, 0xd6, 0x43, 0x91, 0x31, 0xa5, 0xea, 0x50, 0xb1, 0x77, - 0xe0, 0xdb, 0x93, 0x79, 0x0d, 0xf5, 0xaa, 0x37, 0xae, 0x6e, 0x0a, 0xda, 0xf5, 0x4d, 0x41, 0x7b, - 0x7a, 0x53, 0xd0, 0x7e, 0xbc, 0x2d, 0x24, 0xae, 0x6f, 0x0b, 0x89, 0xff, 0x6e, 0x0b, 0x89, 0x6f, - 0xb6, 0x47, 0x5a, 0x56, 0x66, 0xaa, 0x60, 0xce, 0x89, 0xe0, 0x2f, 0x25, 0xac, 0xa1, 0x93, 0x51, - 0x5b, 0x36, 0x72, 0x6b, 0x46, 0xfe, 0xf1, 0x7d, 0xf0, 0x22, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x57, - 0xbf, 0xb8, 0xcf, 0x07, 0x00, 0x00, + 0x02, 0xde, 0x8d, 0x4d, 0x03, 0x91, 0x10, 0x8a, 0x43, 0x22, 0x41, 0x01, 0xc2, 0xa1, 0xa2, 0xb1, + 0xc6, 0xbb, 0xe3, 0xcd, 0x2a, 0xeb, 0x19, 0xb3, 0x33, 0x76, 0xb0, 0xa2, 0x50, 0x50, 0x45, 0x54, + 0x48, 0x50, 0xd1, 0x10, 0x89, 0x06, 0x51, 0xa5, 0xa0, 0xe2, 0x0f, 0x40, 0x29, 0x23, 0x68, 0xae, + 0xba, 0x3b, 0x25, 0x27, 0xe5, 0xfe, 0x8c, 0xd3, 0xce, 0xcc, 0xae, 0x7d, 0x39, 0x5b, 0x4e, 0xaa, + 0x6b, 0xec, 0x79, 0xef, 0x7d, 0xf3, 0xde, 0xe7, 0x6f, 0xde, 0x7b, 0x06, 0x45, 0x42, 0x5b, 0x3e, + 0xb6, 0xda, 0x34, 0x38, 0x46, 0x81, 0xe3, 0x11, 0xd7, 0xea, 0x57, 0xad, 0xef, 0x7a, 0x38, 0x18, + 0x98, 0xdd, 0x80, 0x72, 0x0a, 0x97, 0x05, 0xc0, 0x1c, 0x02, 0xcc, 0x7e, 0x55, 0x7f, 0x13, 0x75, + 0x3c, 0x42, 0x2d, 0xf1, 0x29, 0x71, 0x7a, 0xc1, 0xa6, 0xac, 0x43, 0x99, 0xd5, 0x42, 0x0c, 0x5b, + 0xfd, 0x6a, 0x0b, 0x73, 0x54, 0xb5, 0x6c, 0xea, 0x11, 0x15, 0x5f, 0x53, 0x71, 0x91, 0xfb, 0x4e, + 0x11, 0x7d, 0x55, 0x06, 0x9b, 0xc2, 0xb2, 0xa4, 0xa1, 0x42, 0x2b, 0x2e, 0x75, 0xa9, 0xf4, 0x87, + 0x27, 0xe5, 0x5d, 0x77, 0x29, 0x75, 0x7d, 0x6c, 0xa1, 0xae, 0x67, 0x21, 0x42, 0x28, 0x47, 0xdc, + 0xa3, 0x44, 0xdd, 0x31, 0x16, 0xc0, 0xdc, 0xd7, 0x61, 0xf6, 0xcf, 0x30, 0xa1, 0x1d, 0x66, 0xec, + 0x82, 0xe5, 0x11, 0xb3, 0x81, 0x59, 0x97, 0x12, 0x86, 0xe1, 0x07, 0x60, 0x11, 0xf9, 0x3e, 0x3d, + 0xc6, 0x4e, 0xd3, 0x11, 0x91, 0xbc, 0x56, 0x4a, 0x95, 0x67, 0xeb, 0x99, 0x3f, 0x6f, 0x2f, 0x36, + 0xb5, 0xc6, 0x82, 0x0a, 0xaa, 0x24, 0x3e, 0x98, 0x17, 0x49, 0x76, 0x1c, 0x27, 0xc0, 0x8c, 0xc1, + 0x3c, 0xc8, 0xda, 0x87, 0x88, 0x10, 0xec, 0xe7, 0xb5, 0x92, 0x56, 0x9e, 0x6d, 0x44, 0x26, 0x5c, + 0x07, 0xb3, 0x01, 0xb6, 0xbd, 0xae, 0x87, 0x09, 0xcf, 0x27, 0x45, 0x6c, 0xe8, 0x80, 0x3a, 0xc8, + 0xb5, 0x91, 0xef, 0xb7, 0x90, 0x7d, 0x94, 0x4f, 0x89, 0x60, 0x6c, 0x6f, 0xe7, 0xce, 0xce, 0x8b, + 0x89, 0xe7, 0xe7, 0xc5, 0x84, 0xe1, 0x81, 0x95, 0xd1, 0x6a, 0x31, 0xe7, 0x1a, 0xc8, 0x22, 0xe9, + 0x92, 0x55, 0xeb, 0xf9, 0xff, 0xfe, 0xae, 0xac, 0x28, 0xc1, 0x14, 0xf8, 0x80, 0x07, 0x1e, 0x71, + 0x1b, 0x11, 0x10, 0x6e, 0x80, 0x19, 0xfc, 0xbd, 0xc7, 0x38, 0x13, 0x64, 0x72, 0xd1, 0xef, 0x53, + 0x4e, 0x63, 0x1e, 0x00, 0x51, 0xea, 0x80, 0x23, 0xce, 0x8c, 0x7f, 0x34, 0x00, 0x87, 0x66, 0x5c, + 0xf7, 0x4b, 0x90, 0x61, 0xa1, 0x43, 0x48, 0x34, 0x57, 0xab, 0x99, 0x63, 0xba, 0xc2, 0x7c, 0xf5, + 0x9e, 0x29, 0xac, 0x3d, 0xc2, 0x83, 0x41, 0x3d, 0x7d, 0xf9, 0xb8, 0x98, 0x68, 0xc8, 0x34, 0xfa, + 0x37, 0x00, 0x0c, 0x43, 0xf0, 0x0d, 0x90, 0x3a, 0xc2, 0x03, 0xa5, 0x63, 0x78, 0x84, 0x5b, 0x20, + 0xd3, 0x47, 0x7e, 0x0f, 0x0b, 0xca, 0x73, 0x35, 0x7d, 0x6c, 0x3d, 0x59, 0x4a, 0x02, 0xb7, 0x93, + 0x1f, 0x69, 0xc6, 0xc7, 0xea, 0xa1, 0x45, 0xa0, 0x3e, 0xd8, 0x55, 0x0f, 0x32, 0xf1, 0xa9, 0x46, + 0x04, 0x3f, 0x4b, 0x82, 0xb5, 0x31, 0x77, 0x63, 0x01, 0x2a, 0x60, 0x89, 0xf4, 0x3a, 0x4d, 0xda, + 0x6e, 0x22, 0xdb, 0xa6, 0x3d, 0xc2, 0xe5, 0x03, 0xa4, 0xe3, 0x6e, 0x21, 0xbd, 0xce, 0x57, 0xed, + 0x1d, 0x15, 0x1b, 0x81, 0x2b, 0xca, 0x52, 0xfc, 0x3b, 0xf0, 0x7d, 0x15, 0x83, 0x3f, 0x69, 0x60, + 0x89, 0x53, 0x8e, 0xfc, 0x08, 0x8e, 0x9d, 0x7c, 0x4a, 0x28, 0xbd, 0x6a, 0xaa, 0xc7, 0x0d, 0xe7, + 0xca, 0x54, 0x73, 0x65, 0xee, 0x52, 0x8f, 0xd4, 0xf7, 0x43, 0x41, 0xff, 0x7a, 0x52, 0x2c, 0xbb, + 0x1e, 0x3f, 0xec, 0xb5, 0x4c, 0x9b, 0x76, 0xd4, 0xe8, 0xa8, 0xaf, 0x0a, 0x73, 0x8e, 0x2c, 0x3e, + 0xe8, 0x62, 0x26, 0x2e, 0xb0, 0xdf, 0x6e, 0x2f, 0x36, 0xe7, 0x7d, 0xec, 0x22, 0x7b, 0xd0, 0x0c, + 0x27, 0x93, 0x49, 0x2e, 0x8b, 0xa2, 0xf2, 0x7e, 0x54, 0xd8, 0xf8, 0x35, 0x09, 0x32, 0x42, 0x05, + 0x58, 0x02, 0x39, 0xfb, 0x10, 0x79, 0xa4, 0xe9, 0x39, 0xaa, 0xdd, 0x14, 0xfd, 0xac, 0x70, 0x7f, + 0xee, 0x8c, 0x93, 0x25, 0xf9, 0x30, 0x59, 0x52, 0x0f, 0x94, 0x25, 0xfd, 0x9a, 0x64, 0xa9, 0xfd, + 0x9b, 0x06, 0x19, 0xd1, 0x21, 0xf0, 0x07, 0x30, 0x23, 0x97, 0x02, 0x2c, 0x4d, 0x9e, 0x03, 0x89, + 0xd0, 0xcb, 0xd3, 0x10, 0x51, 0x87, 0x19, 0xe5, 0xb3, 0xb0, 0xec, 0x8f, 0xff, 0x3f, 0xfb, 0x25, + 0xb9, 0x01, 0xd7, 0xac, 0x71, 0x7b, 0x59, 0xae, 0x29, 0xf8, 0x87, 0x06, 0xb2, 0xd1, 0x1a, 0x7a, + 0x6b, 0x72, 0x7e, 0x05, 0xd1, 0xdf, 0x9b, 0x0a, 0x89, 0x39, 0x7c, 0x31, 0xe4, 0xf0, 0x29, 0xfc, + 0x64, 0x2c, 0x07, 0xb5, 0x55, 0xac, 0x13, 0x35, 0x43, 0xa7, 0xd6, 0x49, 0xbc, 0xdc, 0x4e, 0xad, + 0x93, 0x68, 0x97, 0x9d, 0xc2, 0x5e, 0xd4, 0x45, 0xc5, 0x29, 0xcb, 0x42, 0x7f, 0xf7, 0x9e, 0xdb, + 0xc4, 0x30, 0x04, 0xb3, 0x75, 0xa8, 0x8f, 0x65, 0x26, 0x36, 0x0b, 0xfc, 0x5d, 0x03, 0x8b, 0x77, + 0xe6, 0xbf, 0x3c, 0x25, 0x7f, 0x8c, 0xd4, 0xb7, 0xee, 0x8b, 0x8c, 0x29, 0x55, 0x87, 0x8a, 0xbd, + 0x03, 0xdf, 0x9e, 0xcc, 0x6b, 0xa8, 0x57, 0x7d, 0xef, 0xf2, 0xba, 0xa0, 0x5d, 0x5d, 0x17, 0xb4, + 0xa7, 0xd7, 0x05, 0xed, 0xe7, 0x9b, 0x42, 0xe2, 0xea, 0xa6, 0x90, 0x78, 0x74, 0x53, 0x48, 0x7c, + 0xfb, 0xfe, 0x48, 0xcb, 0x8a, 0x4c, 0x15, 0xc4, 0x18, 0xe6, 0xec, 0xa5, 0x84, 0x35, 0xd9, 0xbb, + 0xad, 0x19, 0xf1, 0x5f, 0xf7, 0xe1, 0x8b, 0x00, 0x00, 0x00, 0xff, 0xff, 0x71, 0xbf, 0x2e, 0x19, + 0xc2, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/forwarding/types/query.pb.gw.go b/types/query.pb.gw.go similarity index 100% rename from x/forwarding/types/query.pb.gw.go rename to types/query.pb.gw.go diff --git a/x/forwarding/types/tx.pb.go b/types/tx.pb.go similarity index 92% rename from x/forwarding/types/tx.pb.go rename to types/tx.pb.go index 6d6418d..47b92b4 100644 --- a/x/forwarding/types/tx.pb.go +++ b/types/tx.pb.go @@ -276,41 +276,40 @@ func init() { func init() { proto.RegisterFile("noble/forwarding/v1/tx.proto", fileDescriptor_e8a8b8337aa6ea1a) } var fileDescriptor_e8a8b8337aa6ea1a = []byte{ - // 529 bytes of a gzipped FileDescriptorProto + // 528 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6f, 0xd3, 0x40, 0x10, 0xb5, 0x13, 0x48, 0x9b, 0x15, 0x52, 0xc1, 0xad, 0xa8, 0x6b, 0x5a, 0x37, 0x58, 0x48, 0x44, - 0x11, 0xf5, 0xb6, 0x01, 0xa4, 0xd2, 0x5b, 0x0a, 0xd7, 0x48, 0xc8, 0xbd, 0x71, 0x41, 0xfe, 0xd8, - 0x6e, 0xad, 0xda, 0xbb, 0x91, 0x67, 0xfb, 0xc1, 0x0d, 0x71, 0x42, 0x9c, 0x38, 0x73, 0xea, 0x4f, + 0x81, 0x7a, 0xdb, 0x00, 0x12, 0xf4, 0x96, 0x02, 0xc7, 0x48, 0xc8, 0xbd, 0x71, 0x41, 0xfe, 0xd8, + 0x6e, 0xad, 0xda, 0xbb, 0x91, 0x67, 0xdb, 0xc2, 0x0d, 0x71, 0x42, 0x9c, 0x38, 0x73, 0xea, 0x4f, 0xc8, 0x81, 0x1f, 0x81, 0x90, 0x90, 0x2a, 0x4e, 0x1c, 0x51, 0x72, 0x08, 0x27, 0x7e, 0x03, 0x8a, 0x3f, 0x52, 0xd7, 0x6e, 0xd4, 0x88, 0x5e, 0x2c, 0xcf, 0xce, 0x9b, 0x79, 0x6f, 0x9e, 0xc7, 0x8b, - 0x56, 0x19, 0x77, 0x02, 0x82, 0xf7, 0x79, 0x74, 0x62, 0x47, 0x9e, 0xcf, 0x28, 0x3e, 0xde, 0xc2, - 0xe2, 0xd4, 0xec, 0x45, 0x5c, 0x70, 0x65, 0x31, 0xce, 0x9a, 0x17, 0x59, 0xf3, 0x78, 0x4b, 0xbb, - 0x67, 0x87, 0x3e, 0xe3, 0x38, 0x7e, 0x26, 0x38, 0x6d, 0xd9, 0xe5, 0x10, 0x72, 0xc0, 0x21, 0xc4, - 0xf5, 0x21, 0xd0, 0x34, 0xb1, 0x92, 0x24, 0xde, 0xc6, 0x11, 0x4e, 0x82, 0x34, 0xb5, 0x44, 0x39, - 0xe5, 0xc9, 0xf9, 0xf8, 0x2d, 0x39, 0x35, 0xfe, 0xca, 0x48, 0xe9, 0x02, 0xb5, 0x08, 0xf5, 0x41, - 0x90, 0xa8, 0xe3, 0xba, 0xfc, 0x88, 0x09, 0x65, 0x13, 0xd5, 0xc0, 0xa7, 0x8c, 0x44, 0xaa, 0xdc, - 0x90, 0x9b, 0xf5, 0x5d, 0xf5, 0xe7, 0xd7, 0x8d, 0xa5, 0xb4, 0x5d, 0xc7, 0xf3, 0x22, 0x02, 0xb0, - 0x27, 0x22, 0x9f, 0x51, 0x2b, 0xc5, 0x29, 0xab, 0xa8, 0x1e, 0x11, 0xd7, 0xef, 0xf9, 0x84, 0x09, - 0xb5, 0x32, 0x2e, 0xb2, 0x2e, 0x0e, 0x14, 0x15, 0xcd, 0xb9, 0x07, 0x36, 0x63, 0x24, 0x50, 0xab, - 0x71, 0x2e, 0x0b, 0x95, 0x67, 0x68, 0x7e, 0xdf, 0x0e, 0x02, 0xc7, 0x76, 0x0f, 0xd5, 0x5b, 0xd7, - 0x70, 0x4d, 0x90, 0x3b, 0xdb, 0x1f, 0xcf, 0xd6, 0xa5, 0x3f, 0x67, 0xeb, 0xd2, 0x87, 0x51, 0xbf, - 0x95, 0x4a, 0xf8, 0x34, 0xea, 0xb7, 0x1a, 0x25, 0x7b, 0x0b, 0x93, 0x19, 0xaf, 0x91, 0x56, 0x9e, - 0xd7, 0x22, 0xd0, 0xe3, 0x0c, 0x88, 0xd2, 0x46, 0x73, 0x76, 0x42, 0x79, 0xed, 0xe0, 0x19, 0xd0, - 0xf8, 0x2e, 0xa3, 0x85, 0x2e, 0xd0, 0x97, 0x01, 0xb1, 0x6f, 0xe0, 0x5f, 0x8e, 0xb9, 0x32, 0x23, - 0xb3, 0xa2, 0xe5, 0xbc, 0x1b, 0xdb, 0x3a, 0x9f, 0x73, 0xe8, 0xf9, 0x14, 0x87, 0xd6, 0x4a, 0x0e, - 0xe5, 0x85, 0x1b, 0x2b, 0x68, 0xb9, 0x30, 0x4b, 0xe6, 0x8d, 0xf1, 0x45, 0x46, 0x8b, 0x5d, 0xa0, - 0x7b, 0x44, 0x74, 0x82, 0x80, 0x9f, 0x10, 0xef, 0x15, 0x61, 0x3c, 0x84, 0xff, 0x98, 0xf5, 0x3e, - 0xaa, 0x79, 0x71, 0xad, 0x5a, 0x69, 0x54, 0x9b, 0x75, 0x2b, 0x8d, 0x76, 0x5e, 0x4c, 0xd1, 0xfc, - 0xb0, 0xa4, 0xb9, 0x28, 0xc2, 0x58, 0x43, 0x0f, 0xae, 0xd0, 0x96, 0x69, 0x6f, 0xff, 0xa8, 0xa0, - 0x6a, 0x17, 0xa8, 0x72, 0x88, 0x16, 0x8a, 0xab, 0xfe, 0xd8, 0xbc, 0xe2, 0xa7, 0x33, 0xcb, 0x3b, - 0xa2, 0xe1, 0x19, 0x81, 0x93, 0x65, 0x72, 0xd0, 0x9d, 0x4b, 0x4b, 0xf1, 0x68, 0x5a, 0x83, 0x3c, - 0x4a, 0x7b, 0x32, 0x0b, 0x6a, 0xc2, 0xc1, 0xd0, 0xdd, 0xd2, 0x07, 0x69, 0x4e, 0xeb, 0x50, 0x44, - 0x6a, 0x9b, 0xb3, 0x22, 0x33, 0x3e, 0xed, 0xf6, 0xfb, 0x51, 0xbf, 0x25, 0xef, 0x5a, 0xdf, 0x06, - 0xba, 0x7c, 0x3e, 0xd0, 0xe5, 0xdf, 0x03, 0x5d, 0xfe, 0x3c, 0xd4, 0xa5, 0xf3, 0xa1, 0x2e, 0xfd, - 0x1a, 0xea, 0xd2, 0x9b, 0x6d, 0xea, 0x8b, 0x83, 0x23, 0xc7, 0x74, 0x79, 0x88, 0xe3, 0xe6, 0x1b, - 0x36, 0x00, 0x11, 0x70, 0xe9, 0xca, 0x6b, 0xe3, 0xd3, 0x7c, 0x2c, 0xde, 0xf5, 0x08, 0x38, 0xb5, - 0xf8, 0x46, 0x7a, 0xfa, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x21, 0xf0, 0x1a, 0x2d, 0x23, 0x05, 0x00, - 0x00, + 0x56, 0x19, 0x77, 0x02, 0x82, 0xf7, 0x78, 0x74, 0x6c, 0x47, 0x9e, 0xcf, 0x28, 0x3e, 0xda, 0xc2, + 0xe2, 0xad, 0xd9, 0x8b, 0xb8, 0xe0, 0xca, 0x62, 0x9c, 0x35, 0xcf, 0xb2, 0xe6, 0xd1, 0x96, 0x76, + 0xcb, 0x0e, 0x7d, 0xc6, 0x71, 0xfc, 0x4c, 0x70, 0xda, 0xb2, 0xcb, 0x21, 0xe4, 0x80, 0x43, 0x88, + 0xeb, 0x43, 0xa0, 0x69, 0x62, 0x25, 0x49, 0xbc, 0x89, 0x23, 0x9c, 0x04, 0x69, 0x6a, 0x89, 0x72, + 0xca, 0x93, 0xf3, 0xf1, 0x5b, 0x72, 0x6a, 0xfc, 0x95, 0x91, 0xd2, 0x05, 0x6a, 0x11, 0xea, 0x83, + 0x20, 0x51, 0xc7, 0x75, 0xf9, 0x21, 0x13, 0xca, 0x26, 0xaa, 0x81, 0x4f, 0x19, 0x89, 0x54, 0xb9, + 0x21, 0x37, 0xeb, 0x3b, 0xea, 0xcf, 0xaf, 0x1b, 0x4b, 0x69, 0xbb, 0x8e, 0xe7, 0x45, 0x04, 0x60, + 0x57, 0x44, 0x3e, 0xa3, 0x56, 0x8a, 0x53, 0x56, 0x51, 0x3d, 0x22, 0xae, 0xdf, 0xf3, 0x09, 0x13, + 0x6a, 0x65, 0x5c, 0x64, 0x9d, 0x1d, 0x28, 0x2a, 0x9a, 0x73, 0xf7, 0x6d, 0xc6, 0x48, 0xa0, 0x56, + 0xe3, 0x5c, 0x16, 0x2a, 0x8f, 0xd1, 0xfc, 0x9e, 0x1d, 0x04, 0x8e, 0xed, 0x1e, 0xa8, 0xd7, 0x2e, + 0xe1, 0x9a, 0x20, 0xb7, 0x9f, 0x7e, 0x3c, 0x59, 0x97, 0xfe, 0x9c, 0xac, 0x4b, 0x1f, 0x46, 0xfd, + 0x56, 0x2a, 0xe1, 0xd3, 0xa8, 0xdf, 0x6a, 0x94, 0xec, 0x2d, 0x4c, 0x66, 0xbc, 0x42, 0x5a, 0x79, + 0x5e, 0x8b, 0x40, 0x8f, 0x33, 0x20, 0x4a, 0x1b, 0xcd, 0xd9, 0x09, 0xe5, 0xa5, 0x83, 0x67, 0x40, + 0xe3, 0xbb, 0x8c, 0x16, 0xba, 0x40, 0x9f, 0x07, 0xc4, 0xbe, 0x82, 0x7f, 0x39, 0xe6, 0xca, 0x8c, + 0xcc, 0x8a, 0x96, 0xf3, 0x6e, 0x6c, 0xeb, 0x7c, 0xce, 0xa1, 0x27, 0x53, 0x1c, 0x5a, 0x2b, 0x39, + 0x94, 0x17, 0x6e, 0xac, 0xa0, 0xe5, 0xc2, 0x2c, 0x99, 0x37, 0xc6, 0x17, 0x19, 0x2d, 0x76, 0x81, + 0xee, 0x12, 0xd1, 0x09, 0x02, 0x7e, 0x4c, 0xbc, 0x17, 0x84, 0xf1, 0x10, 0xfe, 0x63, 0xd6, 0xdb, + 0xa8, 0xe6, 0xc5, 0xb5, 0x6a, 0xa5, 0x51, 0x6d, 0xd6, 0xad, 0x34, 0xda, 0x7e, 0x36, 0x45, 0xf3, + 0xdd, 0x92, 0xe6, 0xa2, 0x08, 0x63, 0x0d, 0xdd, 0xb9, 0x40, 0x5b, 0xa6, 0xbd, 0xfd, 0xa3, 0x82, + 0xaa, 0x5d, 0xa0, 0xca, 0x01, 0x5a, 0x28, 0xae, 0xfa, 0x7d, 0xf3, 0x82, 0x9f, 0xce, 0x2c, 0xef, + 0x88, 0x86, 0x67, 0x04, 0x4e, 0x96, 0xc9, 0x41, 0x37, 0xce, 0x2d, 0xc5, 0xbd, 0x69, 0x0d, 0xf2, + 0x28, 0xed, 0xe1, 0x2c, 0xa8, 0x09, 0x07, 0x43, 0x37, 0x4b, 0x1f, 0xa4, 0x39, 0xad, 0x43, 0x11, + 0xa9, 0x6d, 0xce, 0x8a, 0xcc, 0xf8, 0xb4, 0xeb, 0xef, 0x47, 0xfd, 0x96, 0xbc, 0xf3, 0xf2, 0xdb, + 0x40, 0x97, 0x4f, 0x07, 0xba, 0xfc, 0x7b, 0xa0, 0xcb, 0x9f, 0x87, 0xba, 0x74, 0x3a, 0xd4, 0xa5, + 0x5f, 0x43, 0x5d, 0x7a, 0xfd, 0x80, 0xfa, 0x62, 0xff, 0xd0, 0x31, 0x5d, 0x1e, 0xe2, 0xb8, 0xf9, + 0x86, 0x0d, 0x40, 0x04, 0x9c, 0xbb, 0xf2, 0xda, 0x58, 0xbc, 0xeb, 0x11, 0x70, 0x6a, 0xf1, 0x25, + 0xf4, 0xe8, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb1, 0x0a, 0x03, 0x72, 0x16, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used.