From 78226eb3a5ebef4381899254d1fd125994ca6450 Mon Sep 17 00:00:00 2001 From: "KIm, JinSan" Date: Wed, 17 Mar 2021 16:24:12 +0900 Subject: [PATCH] chore: adopt ostracon, line/tm-db and line/iavl (#93) * chore: adopt ostracon * chore: adopt `line/tm-db` * chore: adopt `line/iavl` * chore: replace `tendermint` to `ostracon` more * fix: typo * chore: rename `third_party/proto/tendermint` to `ostracon` * chore: rename `proto/cosmos/base/tendermint` to `ostracon` * chore: revise proto files * chore: apply `make proto-format` * chore: revise Makefile & protocgen.sh to work with GITHUB_TOKEN * chore: commit the result of proto-gen * fix: build error * fix: handler_test.go rebase error * fix: service_test has a wrong path that has `tendermint` --- Makefile | 6 +- baseapp/abci.go | 8 +- baseapp/abci_test.go | 8 +- baseapp/baseapp.go | 20 +- baseapp/baseapp_test.go | 54 +- baseapp/grpcrouter.go | 2 +- baseapp/grpcrouter_helpers.go | 2 +- baseapp/grpcrouter_test.go | 4 +- baseapp/msg_service_router_test.go | 10 +- baseapp/options.go | 2 +- baseapp/params.go | 8 +- baseapp/params_test.go | 26 +- baseapp/queryrouter_test.go | 2 +- baseapp/test_helpers.go | 6 +- buf.yaml | 4 +- client/broadcast.go | 4 +- client/broadcast_test.go | 16 +- client/cmd.go | 4 +- client/context.go | 2 +- client/flags/flags.go | 8 +- client/grpc/reflection/reflection.pb.go | 53 +- client/grpc/reflection/reflection_test.go | 4 +- client/grpc/tmservice/block.go | 2 +- client/grpc/tmservice/query.pb.go | 238 +-- client/grpc/tmservice/query.pb.gw.go | 14 +- client/grpc/tmservice/service_test.go | 16 +- client/grpc/tmservice/status.go | 2 +- client/grpc_query.go | 2 +- client/keys/add.go | 4 +- client/keys/add_ledger_test.go | 2 +- client/keys/add_test.go | 2 +- client/keys/list.go | 2 +- client/keys/parse.go | 2 +- client/keys/root.go | 2 +- client/keys/show.go | 2 +- client/query.go | 12 +- client/rpc/rpc_test.go | 2 +- client/rpc/status.go | 6 +- client/rpc/validators.go | 8 +- codec/amino.go | 6 +- crypto/armor.go | 6 +- crypto/armor_test.go | 12 +- crypto/codec/amino.go | 2 +- crypto/codec/tm.go | 36 +- crypto/hd/fundraiser_test.go | 2 +- crypto/keyring/keyring.go | 4 +- crypto/keyring/legacy.go | 6 +- crypto/keys/ed25519/ed25519.go | 4 +- crypto/keys/ed25519/ed25519_test.go | 6 +- crypto/keys/ed25519/keys.pb.go | 13 +- crypto/keys/multisig/codec.go | 2 +- crypto/keys/multisig/keys.pb.go | 11 +- crypto/keys/multisig/multisig.go | 4 +- crypto/keys/secp256k1/keys.pb.go | 13 +- crypto/keys/secp256k1/secp256k1.go | 2 +- crypto/keys/secp256k1/secp256k1_cgo.go | 2 +- crypto/keys/secp256k1/secp256k1_nocgo.go | 2 +- crypto/keys/secp256k1/secp256k1_test.go | 22 +- crypto/ledger/ledger_mock.go | 4 +- crypto/types/compact_bit_array_test.go | 4 +- crypto/types/multisig.pb.go | 37 +- crypto/types/types.go | 4 +- .../adr-001-coin-source-tracing.md | 2 +- docs/architecture/adr-032-typed-events.md | 4 +- docs/basics/accounts.md | 2 +- docs/core/proto-docs.md | 468 +++--- docs/ru/intro/intro.md | 2 +- go.mod | 13 +- go.sum | 12 +- proto/cosmos/base/abci/v1beta1/abci.proto | 4 +- .../v1beta1/query.proto | 34 +- proto/cosmos/evidence/v1beta1/query.proto | 2 +- proto/cosmos/mint/v1beta1/mint.proto | 3 +- proto/cosmos/staking/v1beta1/staking.proto | 59 +- .../tendermint/v1/tendermint.proto | 14 +- scripts/protocgen.sh | 5 + server/api/server.go | 20 +- server/cmd/execute.go | 8 +- server/config/toml.go | 4 +- server/export.go | 18 +- server/export_test.go | 30 +- server/logger.go | 6 +- server/mock/app.go | 6 +- server/mock/app_test.go | 8 +- server/mock/helpers.go | 4 +- server/mock/store.go | 2 +- server/mock/store_test.go | 2 +- server/start.go | 48 +- server/test_helpers.go | 2 +- server/tm_cmds.go | 30 +- server/types/app.go | 12 +- server/util.go | 36 +- server/util_test.go | 10 +- simapp/app.go | 18 +- simapp/app_test.go | 6 +- simapp/export.go | 4 +- simapp/genesis_account_test.go | 2 +- simapp/sim_bench_test.go | 4 +- simapp/sim_test.go | 12 +- simapp/simd/cmd/genaccounts_test.go | 2 +- simapp/simd/cmd/root.go | 8 +- simapp/simd/cmd/testnet.go | 24 +- simapp/state.go | 10 +- simapp/test_helpers.go | 26 +- simapp/types.go | 2 +- simapp/utils.go | 4 +- snapshots/helpers_test.go | 2 +- snapshots/store.go | 2 +- snapshots/store_test.go | 2 +- snapshots/types/convert.go | 2 +- snapshots/types/snapshot.pb.go | 37 +- store/cache/cache_test.go | 4 +- store/cachekv/memiterator.go | 2 +- store/cachekv/store.go | 2 +- store/cachekv/store_bench_test.go | 2 +- store/cachekv/store_test.go | 6 +- store/cachemulti/store.go | 2 +- store/dbadapter/store.go | 2 +- store/gaskv/store_test.go | 2 +- store/iavl/store.go | 12 +- store/iavl/store_test.go | 6 +- store/iavl/tree.go | 2 +- store/iavl/tree_test.go | 4 +- store/internal/maps/maps.go | 10 +- store/internal/proofs/convert.go | 2 +- store/internal/proofs/helpers.go | 6 +- store/mem/store.go | 2 +- store/prefix/store_test.go | 6 +- store/rootmulti/proof.go | 2 +- store/rootmulti/proof_test.go | 4 +- store/rootmulti/store.go | 6 +- store/rootmulti/store_test.go | 4 +- store/store.go | 2 +- store/tracekv/store_test.go | 2 +- store/transient/store.go | 2 +- store/types/commit_info.go | 4 +- store/types/commit_info.pb.go | 41 +- store/types/iterator_test.go | 2 +- store/types/proof.go | 10 +- store/types/snapshot.pb.go | 44 +- store/types/store.go | 8 +- store/types/utils_test.go | 2 +- .../tendermint_tendermint_libs_log_DB.go | 4 +- tests/mocks/tendermint_tm_db_DB.go | 4 +- tests/mocks/types_module_module.go | 2 +- testutil/network/network.go | 20 +- testutil/network/util.go | 22 +- testutil/testdata/query.pb.go | 48 +- testutil/testdata/testdata.pb.go | 48 +- testutil/testdata/tx.pb.go | 14 +- testutil/testdata/unknonwnproto.pb.go | 208 +-- .../{tendermint => ostracon}/abci/types.proto | 50 +- .../crypto/keys.proto | 6 +- .../crypto/proof.proto | 4 +- .../proto/ostracon/libs/bits/types.proto | 9 + .../{tendermint => ostracon}/p2p/types.proto | 4 +- third_party/proto/ostracon/types/block.proto | 15 + .../types/evidence.proto | 16 +- .../types/params.proto | 4 +- .../types/types.proto | 34 +- .../types/validator.proto | 10 +- .../version/types.proto | 4 +- .../proto/tendermint/libs/bits/types.proto | 9 - .../proto/tendermint/types/block.proto | 15 - types/abci.go | 2 +- types/abci.pb.go | 120 +- types/coin.pb.go | 12 +- types/context.go | 16 +- types/context_test.go | 30 +- types/errors/abci.go | 2 +- types/events.go | 2 +- types/events_test.go | 2 +- types/kv/kv.pb.go | 13 +- types/module/module.go | 2 +- types/module/module_test.go | 2 +- types/query/pagination.pb.go | 36 +- types/query/pagination_test.go | 6 +- types/queryable.go | 2 +- types/rest/rest.go | 2 +- types/result.go | 10 +- types/result_test.go | 6 +- types/store_test.go | 2 +- types/tx/service.pb.go | 96 +- types/tx/signing/signing.pb.go | 71 +- types/tx/tx.pb.go | 114 +- types/utils.go | 2 +- version/command.go | 2 +- version/version_test.go | 2 +- x/auth/ante/testutil_test.go | 4 +- x/auth/client/cli/cli_test.go | 14 +- x/auth/client/cli/query.go | 4 +- x/auth/client/query.go | 2 +- x/auth/client/testutil/helpers.go | 6 +- x/auth/keeper/integration_test.go | 4 +- x/auth/keeper/keeper.go | 2 +- x/auth/keeper/querier.go | 2 +- x/auth/keeper/querier_test.go | 2 +- x/auth/legacy/legacytx/stdtx_test.go | 6 +- x/auth/legacy/v038/types.go | 6 +- x/auth/legacy/v039/types.go | 4 +- x/auth/module.go | 2 +- x/auth/module_test.go | 6 +- x/auth/signing/verify_test.go | 4 +- x/auth/tx/xauthclient.go | 2 +- x/auth/types/account.go | 2 +- x/auth/types/auth.pb.go | 88 +- x/auth/types/genesis.pb.go | 35 +- x/auth/types/query.pb.go | 54 +- x/auth/vesting/handler_test.go | 4 +- x/auth/vesting/module.go | 2 +- x/auth/vesting/types/tx.pb.go | 68 +- x/auth/vesting/types/vesting.pb.go | 94 +- x/auth/vesting/types/vesting_account_test.go | 32 +- x/bank/app_test.go | 24 +- x/bank/bench_test.go | 12 +- x/bank/client/cli/cli_test.go | 20 +- x/bank/client/testutil/cli_helpers.go | 2 +- x/bank/handler_test.go | 6 +- x/bank/keeper/keeper_test.go | 46 +- x/bank/keeper/querier.go | 2 +- x/bank/keeper/querier_test.go | 2 +- x/bank/keeper/view.go | 2 +- x/bank/module.go | 2 +- x/bank/simulation/operations_test.go | 10 +- x/bank/types/bank.pb.go | 86 +- x/bank/types/genesis.pb.go | 59 +- x/bank/types/query.pb.go | 116 +- x/bank/types/tx.pb.go | 66 +- x/capability/keeper/keeper.go | 2 +- x/capability/keeper/keeper_test.go | 4 +- x/capability/module.go | 2 +- x/capability/spec/README.md | 2 +- x/capability/types/capability.pb.go | 13 +- x/capability/types/genesis.pb.go | 12 +- x/crisis/handler_test.go | 8 +- x/crisis/keeper/keeper.go | 2 +- x/crisis/keeper/keeper_test.go | 12 +- x/crisis/module.go | 2 +- x/crisis/types/genesis.pb.go | 13 +- x/crisis/types/tx.pb.go | 13 +- x/distribution/abci.go | 2 +- x/distribution/client/cli/cli_test.go | 30 +- x/distribution/keeper/allocation.go | 2 +- x/distribution/keeper/allocation_test.go | 10 +- x/distribution/keeper/delegation_test.go | 18 +- x/distribution/keeper/grpc_query_test.go | 4 +- x/distribution/keeper/keeper.go | 2 +- x/distribution/keeper/keeper_test.go | 10 +- x/distribution/keeper/querier.go | 2 +- x/distribution/keeper/querier_test.go | 6 +- x/distribution/module.go | 2 +- x/distribution/module_test.go | 6 +- x/distribution/proposal_handler_test.go | 6 +- x/distribution/simulation/operations_test.go | 14 +- x/distribution/simulation/proposals_test.go | 4 +- x/distribution/types/distribution.pb.go | 194 +-- x/distribution/types/genesis.pb.go | 133 +- x/distribution/types/query.pb.go | 153 +- x/distribution/types/tx.pb.go | 79 +- x/evidence/abci.go | 2 +- x/evidence/exported/evidence.go | 4 +- x/evidence/genesis_test.go | 6 +- x/evidence/handler_test.go | 4 +- x/evidence/keeper/grpc_query_test.go | 4 +- x/evidence/keeper/keeper.go | 6 +- x/evidence/keeper/keeper_test.go | 4 +- x/evidence/keeper/querier.go | 2 +- x/evidence/keeper/querier_test.go | 2 +- x/evidence/legacy/v038/types.go | 8 +- x/evidence/module.go | 2 +- x/evidence/spec/01_concepts.md | 2 +- x/evidence/types/evidence.go | 8 +- x/evidence/types/evidence.pb.go | 46 +- x/evidence/types/evidence_test.go | 2 +- x/evidence/types/genesis.pb.go | 12 +- x/evidence/types/genesis_test.go | 6 +- x/evidence/types/querier.go | 4 +- x/evidence/types/query.pb.go | 66 +- x/evidence/types/tx.pb.go | 13 +- x/genaccounts/legacy/v036/migrate.go | 2 +- x/genaccounts/legacy/v036/migrate_test.go | 2 +- x/genutil/client/cli/collect.go | 4 +- x/genutil/client/cli/gentx.go | 8 +- x/genutil/client/cli/init.go | 14 +- x/genutil/client/cli/init_test.go | 6 +- x/genutil/client/cli/migrate.go | 4 +- x/genutil/client/cli/validate_genesis.go | 6 +- x/genutil/client/testutil/helpers.go | 12 +- x/genutil/collect.go | 8 +- x/genutil/collect_test.go | 4 +- x/genutil/genesis.go | 2 +- x/genutil/gentx.go | 2 +- x/genutil/gentx_test.go | 4 +- x/genutil/module.go | 2 +- x/genutil/types/expected_keepers.go | 2 +- x/genutil/types/genesis.pb.go | 13 +- x/genutil/types/genesis_state.go | 12 +- x/genutil/utils.go | 24 +- x/genutil/utils_test.go | 2 +- x/gov/abci_test.go | 28 +- x/gov/client/cli/cli_test.go | 36 +- x/gov/client/utils/query_test.go | 12 +- x/gov/genesis_test.go | 24 +- x/gov/handler_test.go | 4 +- x/gov/keeper/deposit_test.go | 4 +- x/gov/keeper/keeper.go | 2 +- x/gov/keeper/keeper_test.go | 8 +- x/gov/keeper/proposal_test.go | 10 +- x/gov/keeper/querier.go | 2 +- x/gov/keeper/querier_test.go | 8 +- x/gov/keeper/tally_test.go | 32 +- x/gov/keeper/vote_test.go | 4 +- x/gov/module.go | 2 +- x/gov/module_test.go | 6 +- x/gov/simulation/operations_test.go | 12 +- x/gov/simulation/proposals_test.go | 4 +- x/gov/types/genesis.pb.go | 57 +- x/gov/types/gov.pb.go | 222 +-- x/gov/types/query.pb.go | 120 +- x/gov/types/tx.pb.go | 90 +- x/ibc/applications/transfer/keeper/keeper.go | 8 +- .../transfer/keeper/keeper_test.go | 2 +- .../transfer/keeper/mbt_relay_test.go | 2 +- x/ibc/applications/transfer/module.go | 2 +- .../applications/transfer/types/genesis.pb.go | 12 +- x/ibc/applications/transfer/types/query.pb.go | 65 +- x/ibc/applications/transfer/types/trace.go | 10 +- .../transfer/types/transfer.pb.go | 48 +- x/ibc/applications/transfer/types/tx.pb.go | 64 +- x/ibc/core/02-client/client/utils/utils.go | 6 +- x/ibc/core/02-client/keeper/client_test.go | 14 +- x/ibc/core/02-client/keeper/keeper.go | 4 +- x/ibc/core/02-client/keeper/keeper_test.go | 22 +- x/ibc/core/02-client/types/client.pb.go | 74 +- x/ibc/core/02-client/types/genesis.pb.go | 68 +- x/ibc/core/02-client/types/genesis_test.go | 8 +- x/ibc/core/02-client/types/query.pb.go | 106 +- x/ibc/core/02-client/types/tx.pb.go | 74 +- x/ibc/core/03-connection/keeper/keeper.go | 2 +- .../core/03-connection/types/connection.pb.go | 84 +- x/ibc/core/03-connection/types/genesis.pb.go | 42 +- x/ibc/core/03-connection/types/msgs_test.go | 4 +- x/ibc/core/03-connection/types/query.pb.go | 114 +- x/ibc/core/03-connection/types/tx.pb.go | 118 +- x/ibc/core/04-channel/keeper/keeper.go | 4 +- x/ibc/core/04-channel/types/channel.pb.go | 116 +- x/ibc/core/04-channel/types/genesis.pb.go | 66 +- x/ibc/core/04-channel/types/msgs_test.go | 4 +- x/ibc/core/04-channel/types/query.pb.go | 186 +-- x/ibc/core/04-channel/types/tx.pb.go | 137 +- x/ibc/core/05-port/keeper/keeper.go | 2 +- x/ibc/core/05-port/keeper/keeper_test.go | 4 +- .../core/23-commitment/types/commitment.pb.go | 44 +- .../23-commitment/types/commitment_test.go | 2 +- x/ibc/core/23-commitment/types/merkle.go | 4 +- x/ibc/core/23-commitment/types/merkle_test.go | 2 +- x/ibc/core/23-commitment/types/utils.go | 2 +- x/ibc/core/23-commitment/types/utils_test.go | 4 +- x/ibc/core/client/query.go | 2 +- x/ibc/core/genesis_test.go | 4 +- x/ibc/core/module.go | 2 +- x/ibc/core/types/genesis.pb.go | 43 +- .../06-solomachine/types/solomachine.pb.go | 173 +- .../07-tendermint/client/cli/tx.go | 2 +- .../07-tendermint/types/client_state.go | 2 +- .../07-tendermint/types/consensus_state.go | 8 +- .../07-tendermint/types/fraction.go | 14 +- .../07-tendermint/types/header.go | 6 +- .../07-tendermint/types/header_test.go | 4 +- .../07-tendermint/types/misbehaviour.go | 14 +- .../types/misbehaviour_handle.go | 6 +- .../types/misbehaviour_handle_test.go | 12 +- .../07-tendermint/types/misbehaviour_test.go | 30 +- .../07-tendermint/types/proposal_handle.go | 4 +- .../07-tendermint/types/tendermint.pb.go | 151 +- .../07-tendermint/types/tendermint_test.go | 20 +- .../07-tendermint/types/update.go | 16 +- .../07-tendermint/types/update_test.go | 12 +- .../09-localhost/types/localhost.pb.go | 14 +- .../09-localhost/types/localhost_test.go | 4 +- x/ibc/testing/chain.go | 70 +- x/ibc/testing/chain_test.go | 10 +- x/ibc/testing/coordinator.go | 2 +- x/ibc/testing/mock/mock.go | 2 +- x/ibc/testing/mock/privval.go | 16 +- x/ibc/testing/mock/privval_test.go | 12 +- x/mint/client/cli/cli_test.go | 14 +- x/mint/keeper/grpc_query_test.go | 4 +- x/mint/keeper/integration_test.go | 4 +- x/mint/keeper/keeper.go | 2 +- x/mint/keeper/querier.go | 2 +- x/mint/keeper/querier_test.go | 2 +- x/mint/module.go | 2 +- x/mint/module_test.go | 6 +- x/mint/types/genesis.pb.go | 13 +- x/mint/types/mint.pb.go | 72 +- x/mint/types/query.pb.go | 65 +- x/params/client/cli/cli_test.go | 6 +- x/params/keeper/common_test.go | 8 +- x/params/keeper/consensus_params.go | 8 +- x/params/keeper/keeper.go | 2 +- x/params/keeper/keeper_test.go | 4 +- x/params/keeper/querier.go | 2 +- x/params/module.go | 2 +- x/params/proposal_handler_test.go | 8 +- x/params/simulation/operations_test.go | 4 +- x/params/simulation/proposals_test.go | 4 +- x/params/types/proposal/params.pb.go | 42 +- x/params/types/proposal/query.pb.go | 44 +- x/params/types/subspace_test.go | 8 +- x/simulation/mock_tendermint.go | 12 +- x/simulation/params.go | 10 +- x/simulation/params_test.go | 4 +- x/simulation/simulate.go | 10 +- x/slashing/abci.go | 2 +- x/slashing/abci_test.go | 6 +- x/slashing/app_test.go | 14 +- x/slashing/client/cli/cli_test.go | 10 +- x/slashing/genesis_test.go | 4 +- x/slashing/handler_test.go | 14 +- x/slashing/keeper/grpc_query_test.go | 4 +- x/slashing/keeper/hooks.go | 2 +- x/slashing/keeper/keeper.go | 2 +- x/slashing/keeper/keeper_test.go | 10 +- x/slashing/keeper/querier.go | 2 +- x/slashing/keeper/querier_test.go | 8 +- x/slashing/keeper/signing_info_test.go | 10 +- x/slashing/module.go | 2 +- x/slashing/simulation/operations_test.go | 8 +- x/slashing/types/genesis.pb.go | 56 +- x/slashing/types/query.pb.go | 61 +- x/slashing/types/slashing.pb.go | 113 +- x/slashing/types/tx.pb.go | 13 +- x/staking/abci.go | 2 +- x/staking/app_test.go | 20 +- x/staking/client/cli/cli_test.go | 68 +- x/staking/common_test.go | 4 +- x/staking/genesis.go | 8 +- x/staking/genesis_test.go | 2 +- x/staking/handler_test.go | 12 +- x/staking/keeper/common_test.go | 4 +- x/staking/keeper/historical_info_test.go | 14 +- x/staking/keeper/keeper.go | 2 +- x/staking/keeper/keeper_test.go | 8 +- x/staking/keeper/msg_server.go | 4 +- x/staking/keeper/querier.go | 2 +- x/staking/keeper/querier_test.go | 8 +- x/staking/keeper/slash_test.go | 10 +- x/staking/keeper/val_state_change.go | 2 +- x/staking/keeper/validator_test.go | 6 +- x/staking/module.go | 2 +- x/staking/module_test.go | 6 +- x/staking/simulation/operations_test.go | 16 +- x/staking/teststaking/tm.go | 16 +- x/staking/types/exported.go | 4 +- x/staking/types/genesis.pb.go | 68 +- x/staking/types/historical_info.go | 4 +- x/staking/types/historical_info_test.go | 4 +- x/staking/types/query.pb.go | 166 +- x/staking/types/staking.pb.go | 1467 ++++++++--------- x/staking/types/tx.pb.go | 136 +- x/staking/types/validator.go | 14 +- x/staking/types/validator_test.go | 14 +- x/upgrade/abci.go | 2 +- x/upgrade/abci_test.go | 12 +- x/upgrade/keeper/grpc_query_test.go | 4 +- x/upgrade/keeper/keeper.go | 6 +- x/upgrade/keeper/keeper_test.go | 4 +- x/upgrade/keeper/querier.go | 2 +- x/upgrade/module.go | 2 +- x/upgrade/types/plan_test.go | 6 +- x/upgrade/types/query.pb.go | 64 +- x/upgrade/types/storeloader_test.go | 12 +- x/upgrade/types/upgrade.pb.go | 58 +- 474 files changed, 5499 insertions(+), 5466 deletions(-) rename proto/cosmos/base/{tendermint => ostracon}/v1beta1/query.proto (79%) rename third_party/proto/{tendermint => ostracon}/abci/types.proto (89%) rename third_party/proto/{tendermint => ostracon}/crypto/keys.proto (54%) rename third_party/proto/{tendermint => ostracon}/crypto/proof.proto (88%) create mode 100644 third_party/proto/ostracon/libs/bits/types.proto rename third_party/proto/{tendermint => ostracon}/p2p/types.proto (90%) create mode 100644 third_party/proto/ostracon/types/block.proto rename third_party/proto/{tendermint => ostracon}/types/evidence.proto (72%) rename third_party/proto/{tendermint => ostracon}/types/params.proto (95%) rename third_party/proto/{tendermint => ostracon}/types/types.proto (84%) rename third_party/proto/{tendermint => ostracon}/types/validator.proto (65%) rename third_party/proto/{tendermint => ostracon}/version/types.proto (84%) delete mode 100644 third_party/proto/tendermint/libs/bits/types.proto delete mode 100644 third_party/proto/tendermint/types/block.proto diff --git a/Makefile b/Makefile index e6d1d05a75..367e69cca6 100644 --- a/Makefile +++ b/Makefile @@ -142,13 +142,13 @@ cosmovisor: mocks: $(MOCKS_DIR) mockgen -source=client/account_retriever.go -package mocks -destination tests/mocks/account_retriever.go - mockgen -package mocks -destination tests/mocks/tendermint_tm_db_DB.go github.com/tendermint/tm-db DB + mockgen -package mocks -destination tests/mocks/tendermint_tm_db_DB.go github.com/line/tm-db/v2 DB mockgen -source=types/module/module.go -package mocks -destination tests/mocks/types_module_module.go mockgen -source=types/invariant.go -package mocks -destination tests/mocks/types_invariant.go mockgen -source=types/router.go -package mocks -destination tests/mocks/types_router.go mockgen -source=types/handler.go -package mocks -destination tests/mocks/types_handler.go mockgen -package mocks -destination tests/mocks/grpc_server.go github.com/gogo/protobuf/grpc Server - mockgen -package mocks -destination tests/mocks/tendermint_tendermint_libs_log_DB.go github.com/tendermint/tendermint/libs/log Logger + mockgen -package mocks -destination tests/mocks/tendermint_tendermint_libs_log_DB.go github.com/line/ostracon/libs/log Logger .PHONY: mocks $(MOCKS_DIR): @@ -371,7 +371,7 @@ proto-all: proto-format proto-lint proto-gen proto-gen: @echo "Generating Protobuf files" - $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace tendermintdev/sdk-proto-gen sh ./scripts/protocgen.sh + $(DOCKER) run --rm -e GITHUB_TOKEN=$(GITHUB_TOKEN) -v $(CURDIR):/workspace --workdir /workspace tendermintdev/sdk-proto-gen sh ./scripts/protocgen.sh proto-format: @echo "Formatting Protobuf files" diff --git a/baseapp/abci.go b/baseapp/abci.go index a03885ff06..1a822def09 100644 --- a/baseapp/abci.go +++ b/baseapp/abci.go @@ -11,8 +11,8 @@ import ( "time" "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "google.golang.org/grpc/codes" grpcstatus "google.golang.org/grpc/status" @@ -28,13 +28,13 @@ import ( func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitChain) { // On a new chain, we consider the init chain block height as 0, even though // req.InitialHeight is 1 by default. - initHeader := tmproto.Header{ChainID: req.ChainId, Time: req.Time} + initHeader := ostproto.Header{ChainID: req.ChainId, Time: req.Time} // If req.InitialHeight is > 1, then we set the initial version in the // stores. if req.InitialHeight > 1 { app.initialHeight = req.InitialHeight - initHeader = tmproto.Header{ChainID: req.ChainId, Height: req.InitialHeight, Time: req.Time} + initHeader = ostproto.Header{ChainID: req.ChainId, Height: req.InitialHeight, Time: req.Time} err := app.cms.SetInitialVersion(req.InitialHeight) if err != nil { panic(err) diff --git a/baseapp/abci_test.go b/baseapp/abci_test.go index 111b43a225..7ebd08bb69 100644 --- a/baseapp/abci_test.go +++ b/baseapp/abci_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" + abci "github.com/line/ostracon/abci/types" + ostprototypes "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmprototypes "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" sdk "github.com/line/lbm-sdk/v2/types" ) @@ -106,7 +106,7 @@ func TestGetBlockRentionHeight(t *testing.T) { tc.bapp.SetParamStore(¶mStore{db: dbm.NewMemDB()}) tc.bapp.InitChain(abci.RequestInitChain{ ConsensusParams: &abci.ConsensusParams{ - Evidence: &tmprototypes.EvidenceParams{ + Evidence: &ostprototypes.EvidenceParams{ MaxAgeNumBlocks: tc.maxAgeBlocks, }, }, diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 435926862a..17a715928b 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -7,11 +7,11 @@ import ( "strings" "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/crypto/tmhash" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/codec/types" "github.com/line/lbm-sdk/v2/snapshots" @@ -285,7 +285,7 @@ func (app *BaseApp) init() error { } // needed for the export command which inits from store but never calls initchain - app.setCheckState(tmproto.Header{}) + app.setCheckState(ostproto.Header{}) app.Seal() // make sure the snapshot interval is a multiple of the pruning KeepEvery interval @@ -361,7 +361,7 @@ func (app *BaseApp) IsSealed() bool { return app.sealed } // (i.e. a CacheMultiStore) and a new Context with the same multi-store branch, // provided header, and minimum gas prices set. It is set on InitChain and reset // on Commit. -func (app *BaseApp) setCheckState(header tmproto.Header) { +func (app *BaseApp) setCheckState(header ostproto.Header) { ms := app.cms.CacheMultiStore() app.checkState = &state{ ms: ms, @@ -373,7 +373,7 @@ func (app *BaseApp) setCheckState(header tmproto.Header) { // (i.e. a CacheMultiStore) and a new Context with the same multi-store branch, // and provided header. It is set on InitChain and BeginBlock and set to nil on // Commit. -func (app *BaseApp) setDeliverState(header tmproto.Header) { +func (app *BaseApp) setDeliverState(header ostproto.Header) { ms := app.cms.CacheMultiStore() app.deliverState = &state{ ms: ms, @@ -398,14 +398,14 @@ func (app *BaseApp) GetConsensusParams(ctx sdk.Context) *abci.ConsensusParams { } if app.paramStore.Has(ctx, ParamStoreKeyEvidenceParams) { - var ep tmproto.EvidenceParams + var ep ostproto.EvidenceParams app.paramStore.Get(ctx, ParamStoreKeyEvidenceParams, &ep) cp.Evidence = &ep } if app.paramStore.Has(ctx, ParamStoreKeyValidatorParams) { - var vp tmproto.ValidatorParams + var vp ostproto.ValidatorParams app.paramStore.Get(ctx, ParamStoreKeyValidatorParams, &vp) cp.Validator = &vp diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index 238a11ffee..3301389b10 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -14,12 +14,12 @@ import ( "time" "github.com/gogo/protobuf/jsonpb" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/snapshots" @@ -153,7 +153,7 @@ func setupBaseAppWithSnapshots(t *testing.T, blocks uint, blockTxs int, options r := rand.New(rand.NewSource(3920758213583)) keyCounter := 0 for height := int64(1); height <= int64(blocks); height++ { - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: height}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: height}}) for txNum := 0; txNum < blockTxs; txNum++ { tx := txTest{Msgs: []sdk.Msg{}} for msgNum := 0; msgNum < 100; msgNum++ { @@ -224,13 +224,13 @@ func TestLoadVersion(t *testing.T) { require.Equal(t, emptyCommitID, lastID) // execute a block, collect commit ID - header := tmproto.Header{Height: 1} + header := ostproto.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) res := app.Commit() commitID1 := sdk.CommitID{Version: 1, Hash: res.Data} // execute a block, collect commit ID - header = tmproto.Header{Height: 2} + header = ostproto.Header{Height: 2} app.BeginBlock(abci.RequestBeginBlock{Header: header}) res = app.Commit() commitID2 := sdk.CommitID{Version: 2, Hash: res.Data} @@ -329,7 +329,7 @@ func TestSetLoader(t *testing.T) { require.Nil(t, err) // "execute" one block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: 2}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: 2}}) res := app.Commit() require.NotNil(t, res.Data) @@ -374,7 +374,7 @@ func TestLoadVersionInvalid(t *testing.T) { err = app.LoadVersion(-1) require.Error(t, err) - header := tmproto.Header{Height: 1} + header := ostproto.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) res := app.Commit() commitID1 := sdk.CommitID{Version: 1, Hash: res.Data} @@ -424,7 +424,7 @@ func TestLoadVersionPruning(t *testing.T) { // Commit seven blocks, of which 7 (latest) is kept in addition to 6, 5 // (keep recent) and 3 (keep every). for i := int64(1); i <= 7; i++ { - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: i}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: i}}) res := app.Commit() lastCommitID = sdk.CommitID{Version: i, Hash: res.Data} } @@ -623,7 +623,7 @@ func TestInitChainer(t *testing.T) { require.Equal(t, value, res.Value) // commit and ensure we can still query - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) app.Commit() @@ -661,14 +661,14 @@ func TestBeginBlock_WithInitialHeight(t *testing.T) { require.PanicsWithError(t, "invalid height: 4; expected: 3", func() { app.BeginBlock(abci.RequestBeginBlock{ - Header: tmproto.Header{ + Header: ostproto.Header{ Height: 4, }, }) }) app.BeginBlock(abci.RequestBeginBlock{ - Header: tmproto.Header{ + Header: ostproto.Header{ Height: 3, }, }) @@ -949,7 +949,7 @@ func TestCheckTx(t *testing.T) { require.Equal(t, nTxs, storedCounter) // If a block is committed, CheckTx state should be reset. - header := tmproto.Header{Height: 1} + header := ostproto.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) app.EndBlock(abci.RequestEndBlock{}) app.Commit() @@ -984,7 +984,7 @@ func TestDeliverTx(t *testing.T) { txPerHeight := 5 for blockN := 0; blockN < nBlocks; blockN++ { - header := tmproto.Header{Height: int64(blockN) + 1} + header := ostproto.Header{Height: int64(blockN) + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) for i := 0; i < txPerHeight; i++ { @@ -1038,7 +1038,7 @@ func TestMultiMsgDeliverTx(t *testing.T) { // run a multi-msg tx // with all msgs the same route - header := tmproto.Header{Height: 1} + header := ostproto.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) tx := newTxCounter(0, 0, 1, 2) txBytes, err := codec.MarshalBinaryBare(tx) @@ -1119,7 +1119,7 @@ func TestSimulateTx(t *testing.T) { nBlocks := 3 for blockN := 0; blockN < nBlocks; blockN++ { count := int64(blockN + 1) - header := tmproto.Header{Height: count} + header := ostproto.Header{Height: count} app.BeginBlock(abci.RequestBeginBlock{Header: header}) tx := newTxCounter(count, count) @@ -1174,7 +1174,7 @@ func TestRunInvalidTransaction(t *testing.T) { app := setupBaseApp(t, anteOpt, routerOpt) - header := tmproto.Header{Height: 1} + header := ostproto.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) // transaction with no messages @@ -1302,7 +1302,7 @@ func TestTxGasLimits(t *testing.T) { app := setupBaseApp(t, anteOpt, routerOpt) - header := tmproto.Header{Height: 1} + header := ostproto.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) testCases := []struct { @@ -1416,7 +1416,7 @@ func TestMaxBlockGasLimits(t *testing.T) { tx := tc.tx // reset the block gas - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) // execute the transaction multiple times @@ -1469,7 +1469,7 @@ func TestCustomRunTxPanicHandler(t *testing.T) { app := setupBaseApp(t, anteOpt, routerOpt) - header := tmproto.Header{Height: 1} + header := ostproto.Header{Height: 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) app.AddRunTxRecoveryHandler(func(recoveryObj interface{}) error { @@ -1511,7 +1511,7 @@ func TestBaseAppAnteHandler(t *testing.T) { app.InitChain(abci.RequestInitChain{}) registerTestCodec(cdc) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) // execute a tx that will fail ante handler execution @@ -1619,7 +1619,7 @@ func TestGasConsumptionBadTx(t *testing.T) { app.InitChain(abci.RequestInitChain{}) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) tx := newTxCounter(5, 0) @@ -1684,7 +1684,7 @@ func TestQuery(t *testing.T) { require.Equal(t, 0, len(res.Value)) // query is still empty after a DeliverTx before we commit - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) _, resTx, err = app.Deliver(aminoTxEncoder(), tx) @@ -1710,7 +1710,7 @@ func TestGRPCQuery(t *testing.T) { app := setupBaseApp(t, grpcQueryOpt) app.InitChain(abci.RequestInitChain{}) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) app.Commit() @@ -1767,7 +1767,7 @@ func TestP2PQuery(t *testing.T) { func TestGetMaximumBlockGas(t *testing.T) { app := setupBaseApp(t) app.InitChain(abci.RequestInitChain{}) - ctx := app.NewContext(true, tmproto.Header{}) + ctx := app.NewContext(true, ostproto.Header{}) app.StoreConsensusParams(ctx, &abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: 0}}) require.Equal(t, uint64(0), app.getMaximumBlockGas(ctx)) @@ -1985,7 +1985,7 @@ func TestWithRouter(t *testing.T) { txPerHeight := 5 for blockN := 0; blockN < nBlocks; blockN++ { - header := tmproto.Header{Height: int64(blockN) + 1} + header := ostproto.Header{Height: int64(blockN) + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) for i := 0; i < txPerHeight; i++ { diff --git a/baseapp/grpcrouter.go b/baseapp/grpcrouter.go index fbda146d37..9c9fc9390a 100644 --- a/baseapp/grpcrouter.go +++ b/baseapp/grpcrouter.go @@ -5,7 +5,7 @@ import ( "reflect" gogogrpc "github.com/gogo/protobuf/grpc" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "google.golang.org/grpc" "google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding/proto" diff --git a/baseapp/grpcrouter_helpers.go b/baseapp/grpcrouter_helpers.go index d4110d91b8..ae269ad9be 100644 --- a/baseapp/grpcrouter_helpers.go +++ b/baseapp/grpcrouter_helpers.go @@ -5,7 +5,7 @@ import ( "fmt" gogogrpc "github.com/gogo/protobuf/grpc" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "google.golang.org/grpc" "github.com/line/lbm-sdk/v2/codec/types" diff --git a/baseapp/grpcrouter_test.go b/baseapp/grpcrouter_test.go index 68bfdbf76f..70a28cce63 100644 --- a/baseapp/grpcrouter_test.go +++ b/baseapp/grpcrouter_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" + "github.com/line/ostracon/libs/log" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/codec/types" diff --git a/baseapp/msg_service_router_test.go b/baseapp/msg_service_router_test.go index a4ac1f85f0..b67d5e97bc 100644 --- a/baseapp/msg_service_router_test.go +++ b/baseapp/msg_service_router_test.go @@ -4,11 +4,11 @@ import ( "os" "testing" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/client/tx" @@ -78,7 +78,7 @@ func TestMsgService(t *testing.T) { app.MsgServiceRouter(), testdata.MsgServerImpl{}, ) - _ = app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: 1}}) + _ = app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: 1}}) msg := testdata.NewServiceMsgCreateDog(&testdata.MsgCreateDog{Dog: &testdata.Dog{Name: "Spot"}}) txBuilder := encCfg.TxConfig.NewTxBuilder() diff --git a/baseapp/options.go b/baseapp/options.go index 17b6f9cfc8..5c2dfd8d41 100644 --- a/baseapp/options.go +++ b/baseapp/options.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/codec/types" "github.com/line/lbm-sdk/v2/snapshots" diff --git a/baseapp/params.go b/baseapp/params.go index 4f7ebe93c1..8dd4fa8446 100644 --- a/baseapp/params.go +++ b/baseapp/params.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" sdk "github.com/line/lbm-sdk/v2/types" ) @@ -50,7 +50,7 @@ func ValidateBlockParams(i interface{}) error { // ValidateEvidenceParams defines a stateless validation on EvidenceParams. This // function is called whenever the parameters are updated or stored. func ValidateEvidenceParams(i interface{}) error { - v, ok := i.(tmproto.EvidenceParams) + v, ok := i.(ostproto.EvidenceParams) if !ok { return fmt.Errorf("invalid parameter type: %T", i) } @@ -73,7 +73,7 @@ func ValidateEvidenceParams(i interface{}) error { // ValidateValidatorParams defines a stateless validation on ValidatorParams. This // function is called whenever the parameters are updated or stored. func ValidateValidatorParams(i interface{}) error { - v, ok := i.(tmproto.ValidatorParams) + v, ok := i.(ostproto.ValidatorParams) if !ok { return fmt.Errorf("invalid parameter type: %T", i) } diff --git a/baseapp/params_test.go b/baseapp/params_test.go index 9e8afe54cc..f70c5e9872 100644 --- a/baseapp/params_test.go +++ b/baseapp/params_test.go @@ -3,9 +3,9 @@ package baseapp_test import ( "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" ) @@ -34,13 +34,13 @@ func TestValidateEvidenceParams(t *testing.T) { expectErr bool }{ {nil, true}, - {&tmproto.EvidenceParams{}, true}, - {tmproto.EvidenceParams{}, true}, - {tmproto.EvidenceParams{MaxAgeNumBlocks: -1, MaxAgeDuration: 18004000, MaxBytes: 5000000}, true}, - {tmproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: -1, MaxBytes: 5000000}, true}, - {tmproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: -1}, true}, - {tmproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: 5000000}, false}, - {tmproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: 0}, false}, + {&ostproto.EvidenceParams{}, true}, + {ostproto.EvidenceParams{}, true}, + {ostproto.EvidenceParams{MaxAgeNumBlocks: -1, MaxAgeDuration: 18004000, MaxBytes: 5000000}, true}, + {ostproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: -1, MaxBytes: 5000000}, true}, + {ostproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: -1}, true}, + {ostproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: 5000000}, false}, + {ostproto.EvidenceParams{MaxAgeNumBlocks: 360000, MaxAgeDuration: 18004000, MaxBytes: 0}, false}, } for _, tc := range testCases { @@ -54,10 +54,10 @@ func TestValidateValidatorParams(t *testing.T) { expectErr bool }{ {nil, true}, - {&tmproto.ValidatorParams{}, true}, - {tmproto.ValidatorParams{}, true}, - {tmproto.ValidatorParams{PubKeyTypes: []string{}}, true}, - {tmproto.ValidatorParams{PubKeyTypes: []string{"secp256k1"}}, false}, + {&ostproto.ValidatorParams{}, true}, + {ostproto.ValidatorParams{}, true}, + {ostproto.ValidatorParams{PubKeyTypes: []string{}}, true}, + {ostproto.ValidatorParams{PubKeyTypes: []string{"secp256k1"}}, false}, } for _, tc := range testCases { diff --git a/baseapp/queryrouter_test.go b/baseapp/queryrouter_test.go index 63d58e686f..579b3f5111 100644 --- a/baseapp/queryrouter_test.go +++ b/baseapp/queryrouter_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" sdk "github.com/line/lbm-sdk/v2/types" ) diff --git a/baseapp/test_helpers.go b/baseapp/test_helpers.go index 6d27760e70..afebbfe927 100644 --- a/baseapp/test_helpers.go +++ b/baseapp/test_helpers.go @@ -1,7 +1,7 @@ package baseapp import ( - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" sdk "github.com/line/lbm-sdk/v2/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" @@ -32,7 +32,7 @@ func (app *BaseApp) Deliver(txEncoder sdk.TxEncoder, tx sdk.Tx) (sdk.GasInfo, *s } // Context with current {check, deliver}State of the app used by tests. -func (app *BaseApp) NewContext(isCheckTx bool, header tmproto.Header) sdk.Context { +func (app *BaseApp) NewContext(isCheckTx bool, header ostproto.Header) sdk.Context { if isCheckTx { return sdk.NewContext(app.checkState.ms, header, true, app.logger). WithMinGasPrices(app.minGasPrices) @@ -41,6 +41,6 @@ func (app *BaseApp) NewContext(isCheckTx bool, header tmproto.Header) sdk.Contex return sdk.NewContext(app.deliverState.ms, header, false, app.logger) } -func (app *BaseApp) NewUncachedContext(isCheckTx bool, header tmproto.Header) sdk.Context { +func (app *BaseApp) NewUncachedContext(isCheckTx bool, header ostproto.Header) sdk.Context { return sdk.NewContext(app.cms, header, isCheckTx, app.logger) } diff --git a/buf.yaml b/buf.yaml index 37f716caba..64a7e3cf7c 100644 --- a/buf.yaml +++ b/buf.yaml @@ -18,7 +18,7 @@ lint: - PACKAGE_VERSION_SUFFIX - RPC_REQUEST_STANDARD_NAME ignore: - - tendermint + - ostracon - gogoproto - cosmos_proto - google @@ -27,7 +27,7 @@ breaking: use: - FILE ignore: - - tendermint + - ostracon - gogoproto - cosmos_proto - google diff --git a/client/broadcast.go b/client/broadcast.go index 4b6691e905..23240250b0 100644 --- a/client/broadcast.go +++ b/client/broadcast.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/mempool" + "github.com/line/ostracon/crypto/tmhash" + "github.com/line/ostracon/mempool" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" diff --git a/client/broadcast_test.go b/client/broadcast_test.go index 9931a7b9f7..4cbb65c3a6 100644 --- a/client/broadcast_test.go +++ b/client/broadcast_test.go @@ -5,12 +5,12 @@ import ( "fmt" "testing" + "github.com/line/ostracon/crypto/tmhash" + "github.com/line/ostracon/mempool" + "github.com/line/ostracon/rpc/client/mock" + ctypes "github.com/line/ostracon/rpc/core/types" + osttypes "github.com/line/ostracon/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto/tmhash" - "github.com/tendermint/tendermint/mempool" - "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/client/flags" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" @@ -21,15 +21,15 @@ type MockClient struct { err error } -func (c MockClient) BroadcastTxCommit(ctx context.Context, tx tmtypes.Tx) (*ctypes.ResultBroadcastTxCommit, error) { +func (c MockClient) BroadcastTxCommit(ctx context.Context, tx osttypes.Tx) (*ctypes.ResultBroadcastTxCommit, error) { return nil, c.err } -func (c MockClient) BroadcastTxAsync(ctx context.Context, tx tmtypes.Tx) (*ctypes.ResultBroadcastTx, error) { +func (c MockClient) BroadcastTxAsync(ctx context.Context, tx osttypes.Tx) (*ctypes.ResultBroadcastTx, error) { return nil, c.err } -func (c MockClient) BroadcastTxSync(ctx context.Context, tx tmtypes.Tx) (*ctypes.ResultBroadcastTx, error) { +func (c MockClient) BroadcastTxSync(ctx context.Context, tx osttypes.Tx) (*ctypes.ResultBroadcastTx, error) { return nil, c.err } diff --git a/client/cmd.go b/client/cmd.go index f7cf14a705..7ad76cc2c6 100644 --- a/client/cmd.go +++ b/client/cmd.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" + "github.com/line/ostracon/libs/cli" + rpchttp "github.com/line/ostracon/rpc/client/http" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/tendermint/tendermint/libs/cli" - rpchttp "github.com/tendermint/tendermint/rpc/client/http" "github.com/line/lbm-sdk/v2/client/flags" "github.com/line/lbm-sdk/v2/crypto/keyring" diff --git a/client/context.go b/client/context.go index bb2da71872..865c114339 100644 --- a/client/context.go +++ b/client/context.go @@ -8,8 +8,8 @@ import ( "gopkg.in/yaml.v2" "github.com/gogo/protobuf/proto" + rpcclient "github.com/line/ostracon/rpc/client" "github.com/pkg/errors" - rpcclient "github.com/tendermint/tendermint/rpc/client" "github.com/line/lbm-sdk/v2/codec" codectypes "github.com/line/lbm-sdk/v2/codec/types" diff --git a/client/flags/flags.go b/client/flags/flags.go index d59cd1d2d4..62b5ca18bd 100644 --- a/client/flags/flags.go +++ b/client/flags/flags.go @@ -4,8 +4,8 @@ import ( "fmt" "strconv" + ostcli "github.com/line/ostracon/libs/cli" "github.com/spf13/cobra" - tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/crypto/keyring" ) @@ -39,7 +39,7 @@ const ( // List of CLI flags const ( - FlagHome = tmcli.HomeFlag + FlagHome = ostcli.HomeFlag FlagKeyringDir = "keyring-dir" FlagUseLedger = "ledger" FlagChainID = "chain-id" @@ -84,7 +84,7 @@ var LineBreak = &cobra.Command{Run: func(*cobra.Command, []string) {}} func AddQueryFlagsToCmd(cmd *cobra.Command) { cmd.Flags().String(FlagNode, "tcp://localhost:26657", ": to Tendermint RPC interface for this chain") cmd.Flags().Int64(FlagHeight, 0, "Use a specific height to query state at (this can error if the node is pruning state)") - cmd.Flags().StringP(tmcli.OutputFlag, "o", "text", "Output format (text|json)") + cmd.Flags().StringP(ostcli.OutputFlag, "o", "text", "Output format (text|json)") cmd.MarkFlagRequired(FlagChainID) @@ -101,7 +101,7 @@ func AddTxFlagsToCmd(cmd *cobra.Command) { cmd.Flags().String(FlagMemo, "", "Memo to send along with transaction") cmd.Flags().String(FlagFees, "", "Fees to pay along with transaction; eg: 10uatom") cmd.Flags().String(FlagGasPrices, "", "Gas prices in decimal format to determine the transaction fee (e.g. 0.1uatom)") - cmd.Flags().String(FlagNode, "tcp://localhost:26657", ": to tendermint rpc interface for this chain") + cmd.Flags().String(FlagNode, "tcp://localhost:26657", ": to ostracon rpc interface for this chain") cmd.Flags().Bool(FlagUseLedger, false, "Use a connected Ledger device") cmd.Flags().Float64(FlagGasAdjustment, DefaultGasAdjustment, "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored ") cmd.Flags().StringP(FlagBroadcastMode, "b", BroadcastSync, "Transaction broadcasting mode (sync|async|block)") diff --git a/client/grpc/reflection/reflection.pb.go b/client/grpc/reflection/reflection.pb.go index 66dbef0c71..7cbdd1f84a 100644 --- a/client/grpc/reflection/reflection.pb.go +++ b/client/grpc/reflection/reflection.pb.go @@ -216,32 +216,33 @@ func init() { } var fileDescriptor_d48c054165687f5c = []byte{ - // 395 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4f, 0xce, 0x2f, 0xce, - 0xcd, 0x2f, 0xd6, 0x4f, 0x4a, 0x2c, 0x4e, 0xd5, 0x2f, 0x4a, 0x4d, 0xcb, 0x49, 0x4d, 0x2e, 0xc9, - 0xcc, 0xcf, 0xd3, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0x44, 0x12, 0xd2, 0x2b, 0x28, 0xca, - 0x2f, 0xc9, 0x17, 0x92, 0x83, 0x68, 0xd0, 0x03, 0x69, 0xd0, 0x43, 0x92, 0x85, 0x6a, 0x90, 0x92, - 0x49, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, 0x4f, 0x2c, 0xc8, 0xd4, 0x4f, 0xcc, 0xcb, 0xcb, 0x2f, - 0x49, 0x04, 0x49, 0x17, 0x43, 0x74, 0x2b, 0x49, 0x71, 0x49, 0xf8, 0x64, 0x16, 0x97, 0x38, 0xe6, - 0xe4, 0x78, 0xe6, 0x95, 0xa4, 0x16, 0xa5, 0x25, 0x26, 0xa7, 0x16, 0x07, 0xa5, 0x16, 0x96, 0xa6, - 0x16, 0x97, 0x28, 0xb9, 0x70, 0x49, 0x62, 0x91, 0x2b, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x15, 0x52, - 0xe7, 0xe2, 0xcf, 0x84, 0x89, 0xc6, 0xe7, 0x25, 0xe6, 0xa6, 0x16, 0x4b, 0x30, 0x2a, 0x30, 0x6b, - 0x70, 0x06, 0xf1, 0xc1, 0x85, 0xfd, 0x40, 0xa2, 0x4a, 0xce, 0x5c, 0x52, 0x20, 0x53, 0x3c, 0x73, - 0x0b, 0x72, 0x52, 0x73, 0x53, 0xf3, 0xa0, 0xd6, 0x43, 0xed, 0x10, 0x52, 0xe5, 0xe2, 0x43, 0x35, - 0x46, 0x82, 0x51, 0x81, 0x51, 0x83, 0x33, 0x88, 0x17, 0xc5, 0x14, 0xa5, 0x78, 0x2e, 0x69, 0xac, - 0x86, 0x40, 0x1d, 0xe3, 0xc0, 0x25, 0x93, 0x89, 0x22, 0x15, 0x9f, 0x9b, 0x5a, 0x5c, 0x9c, 0x98, - 0x8e, 0xea, 0x32, 0x29, 0x54, 0x35, 0xbe, 0x10, 0x25, 0x60, 0x57, 0x1a, 0xed, 0x60, 0xe6, 0x12, - 0x0c, 0x82, 0x07, 0x5e, 0x70, 0x6a, 0x51, 0x59, 0x66, 0x72, 0xaa, 0xd0, 0x1e, 0x46, 0x2e, 0x41, - 0x8c, 0x20, 0x10, 0xb2, 0xd0, 0xc3, 0x1f, 0xe4, 0x7a, 0xb8, 0x42, 0x54, 0xca, 0x92, 0x0c, 0x9d, - 0x10, 0x2f, 0x2a, 0x19, 0x35, 0x5d, 0x7e, 0x32, 0x99, 0x49, 0x47, 0x48, 0x8b, 0x50, 0x02, 0xc9, - 0x44, 0x38, 0xf4, 0x31, 0x23, 0x97, 0x30, 0x96, 0x60, 0x13, 0xb2, 0x22, 0xc6, 0x19, 0xd8, 0x23, - 0x4c, 0xca, 0x9a, 0x2c, 0xbd, 0x50, 0x4f, 0x04, 0x83, 0x3d, 0xe1, 0x2b, 0xe4, 0x4d, 0xbc, 0x27, - 0xf4, 0xab, 0x51, 0xd3, 0x47, 0xad, 0x3e, 0x6a, 0x2c, 0x16, 0x3b, 0xf9, 0x9e, 0x78, 0x24, 0xc7, - 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, - 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, 0x71, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, - 0x7e, 0x2e, 0xcc, 0x42, 0x08, 0xa5, 0x5b, 0x9c, 0x92, 0xad, 0x9f, 0x9c, 0x93, 0x99, 0x9a, 0x57, - 0xa2, 0x9f, 0x5e, 0x54, 0x90, 0x8c, 0xe4, 0x84, 0x24, 0x36, 0x70, 0xc6, 0x30, 0x06, 0x04, 0x00, - 0x00, 0xff, 0xff, 0x32, 0x5b, 0x2b, 0x51, 0x89, 0x03, 0x00, 0x00, + // 401 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xbd, 0x6e, 0xdb, 0x30, + 0x18, 0x34, 0x6b, 0xa0, 0x80, 0x09, 0xd4, 0x85, 0xd9, 0xc5, 0x55, 0x0d, 0xc1, 0x10, 0x50, 0xd4, + 0x28, 0x5a, 0x11, 0x76, 0x97, 0xfe, 0x2c, 0xfd, 0x5b, 0x0c, 0xd7, 0x1d, 0xe4, 0xad, 0x8b, 0x41, + 0xa9, 0x9f, 0x55, 0xa2, 0x14, 0xa9, 0x8a, 0xb4, 0x97, 0xa2, 0x4b, 0x9f, 0x20, 0x40, 0x5e, 0x26, + 0x43, 0x1e, 0x20, 0xa3, 0x81, 0x2c, 0x19, 0x03, 0x2b, 0x0f, 0x12, 0xc8, 0x52, 0x1c, 0x0b, 0x51, + 0x12, 0xc3, 0xeb, 0x77, 0xbc, 0xe3, 0xdd, 0xf1, 0x23, 0xa6, 0x81, 0xd2, 0x91, 0xd2, 0xd4, 0x67, + 0x1a, 0x68, 0x02, 0x33, 0x01, 0x81, 0xe1, 0x4a, 0xd2, 0x45, 0xdf, 0x07, 0xc3, 0xfa, 0x5b, 0x23, + 0x37, 0x4e, 0x94, 0x51, 0xc4, 0xce, 0x09, 0x6e, 0x46, 0x70, 0xb7, 0xd0, 0x82, 0x60, 0x75, 0x42, + 0xa5, 0x42, 0x01, 0x94, 0xc5, 0x9c, 0x32, 0x29, 0x95, 0x61, 0x19, 0xac, 0x73, 0xb6, 0x63, 0xe1, + 0xf6, 0x37, 0xae, 0xcd, 0x27, 0x21, 0x86, 0xd2, 0x40, 0x32, 0x63, 0x01, 0x68, 0x0f, 0xfe, 0xcc, + 0x41, 0x1b, 0xe7, 0x2b, 0x7e, 0x5a, 0x81, 0xe9, 0x58, 0x49, 0x0d, 0xe4, 0x05, 0x7e, 0xcc, 0xaf, + 0xa6, 0x53, 0xc9, 0x22, 0xd0, 0x6d, 0xd4, 0xad, 0xf7, 0x1a, 0x5e, 0x73, 0x33, 0xfe, 0x9e, 0x4d, + 0x9d, 0x2f, 0xd8, 0xca, 0x54, 0x86, 0x51, 0x2c, 0x20, 0x02, 0x59, 0x5c, 0x5f, 0xdc, 0x41, 0x9e, + 0xe3, 0x66, 0x59, 0xa6, 0x8d, 0xba, 0xa8, 0xd7, 0xf0, 0x1e, 0x95, 0x54, 0x9c, 0x29, 0x7e, 0x56, + 0x29, 0x52, 0x98, 0xf9, 0x88, 0x3b, 0xbc, 0x04, 0x4d, 0x23, 0xd0, 0x9a, 0x85, 0x65, 0x67, 0x56, + 0xf9, 0xcc, 0x38, 0x3f, 0xb2, 0x76, 0x39, 0x38, 0xaa, 0xe3, 0x96, 0xb7, 0x29, 0x6f, 0x02, 0xc9, + 0x82, 0x07, 0x40, 0x8e, 0x11, 0x6e, 0xdd, 0xa8, 0x80, 0xbc, 0x75, 0xef, 0xae, 0xdc, 0xbd, 0xad, + 0x51, 0xeb, 0xdd, 0x1e, 0xcc, 0x3c, 0xa2, 0x33, 0xf8, 0x7f, 0x7a, 0x71, 0xf8, 0xe0, 0x15, 0x79, + 0x79, 0xdf, 0x82, 0xf0, 0x6b, 0xa3, 0x29, 0xc2, 0x4f, 0x2a, 0x6a, 0x23, 0xef, 0x77, 0xb1, 0x51, + 0xfd, 0x60, 0xd6, 0x87, 0xbd, 0xb8, 0x45, 0x88, 0xc9, 0x3a, 0xc4, 0x98, 0x8c, 0x76, 0x0f, 0x41, + 0xff, 0x96, 0xf7, 0xe3, 0x1f, 0x2d, 0xbf, 0xa2, 0xfe, 0x3c, 0x3a, 0x59, 0xd9, 0x68, 0xb9, 0xb2, + 0xd1, 0xf9, 0xca, 0x46, 0x07, 0xa9, 0x5d, 0x5b, 0xa6, 0x76, 0xed, 0x2c, 0xb5, 0x6b, 0x3f, 0xfa, + 0x21, 0x37, 0xbf, 0xe6, 0xbe, 0x1b, 0xa8, 0x88, 0x0a, 0x2e, 0x81, 0x0a, 0x3f, 0x7a, 0xad, 0x7f, + 0xfe, 0xa6, 0x8b, 0x01, 0x0d, 0x04, 0x07, 0x69, 0x68, 0x98, 0xc4, 0xc1, 0x96, 0x01, 0xff, 0xe1, + 0xfa, 0x5b, 0xbc, 0xb9, 0x0c, 0x00, 0x00, 0xff, 0xff, 0x6c, 0x28, 0x34, 0x1c, 0x87, 0x03, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/client/grpc/reflection/reflection_test.go b/client/grpc/reflection/reflection_test.go index e1edf80184..41ad976039 100644 --- a/client/grpc/reflection/reflection_test.go +++ b/client/grpc/reflection/reflection_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/client/grpc/reflection" @@ -21,7 +21,7 @@ type IntegrationTestSuite struct { func (s *IntegrationTestSuite) SetupSuite() { app := simapp.Setup(false) - sdkCtx := app.BaseApp.NewContext(false, tmproto.Header{}) + sdkCtx := app.BaseApp.NewContext(false, ostproto.Header{}) queryHelper := baseapp.NewQueryServerTestHelper(sdkCtx, app.InterfaceRegistry()) queryClient := reflection.NewReflectionServiceClient(queryHelper) s.queryClient = queryClient diff --git a/client/grpc/tmservice/block.go b/client/grpc/tmservice/block.go index fc9e63df4a..b0b2591ae6 100644 --- a/client/grpc/tmservice/block.go +++ b/client/grpc/tmservice/block.go @@ -3,7 +3,7 @@ package tmservice import ( "context" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/line/ostracon/rpc/core/types" "github.com/line/lbm-sdk/v2/client" ) diff --git a/client/grpc/tmservice/query.pb.go b/client/grpc/tmservice/query.pb.go index e1fb82928e..3d0c72b93a 100644 --- a/client/grpc/tmservice/query.pb.go +++ b/client/grpc/tmservice/query.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: cosmos/base/tendermint/v1beta1/query.proto +// source: cosmos/base/ostracon/v1beta1/query.proto package tmservice @@ -11,8 +11,8 @@ import ( proto "github.com/gogo/protobuf/proto" types "github.com/line/lbm-sdk/v2/codec/types" query "github.com/line/lbm-sdk/v2/types/query" - p2p "github.com/tendermint/tendermint/proto/tendermint/p2p" - types1 "github.com/tendermint/tendermint/proto/tendermint/types" + p2p "github.com/line/ostracon/proto/ostracon/p2p" + types1 "github.com/line/ostracon/proto/ostracon/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -44,7 +44,7 @@ func (m *GetValidatorSetByHeightRequest) Reset() { *m = GetValidatorSetB func (m *GetValidatorSetByHeightRequest) String() string { return proto.CompactTextString(m) } func (*GetValidatorSetByHeightRequest) ProtoMessage() {} func (*GetValidatorSetByHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{0} + return fileDescriptor_59f7f56f2cc1e7e8, []int{0} } func (m *GetValidatorSetByHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -99,7 +99,7 @@ func (m *GetValidatorSetByHeightResponse) Reset() { *m = GetValidatorSet func (m *GetValidatorSetByHeightResponse) String() string { return proto.CompactTextString(m) } func (*GetValidatorSetByHeightResponse) ProtoMessage() {} func (*GetValidatorSetByHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{1} + return fileDescriptor_59f7f56f2cc1e7e8, []int{1} } func (m *GetValidatorSetByHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -159,7 +159,7 @@ func (m *GetLatestValidatorSetRequest) Reset() { *m = GetLatestValidator func (m *GetLatestValidatorSetRequest) String() string { return proto.CompactTextString(m) } func (*GetLatestValidatorSetRequest) ProtoMessage() {} func (*GetLatestValidatorSetRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{2} + return fileDescriptor_59f7f56f2cc1e7e8, []int{2} } func (m *GetLatestValidatorSetRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -207,7 +207,7 @@ func (m *GetLatestValidatorSetResponse) Reset() { *m = GetLatestValidato func (m *GetLatestValidatorSetResponse) String() string { return proto.CompactTextString(m) } func (*GetLatestValidatorSetResponse) ProtoMessage() {} func (*GetLatestValidatorSetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{3} + return fileDescriptor_59f7f56f2cc1e7e8, []int{3} } func (m *GetLatestValidatorSetResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -269,7 +269,7 @@ func (m *Validator) Reset() { *m = Validator{} } func (m *Validator) String() string { return proto.CompactTextString(m) } func (*Validator) ProtoMessage() {} func (*Validator) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{4} + return fileDescriptor_59f7f56f2cc1e7e8, []int{4} } func (m *Validator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -335,7 +335,7 @@ func (m *GetBlockByHeightRequest) Reset() { *m = GetBlockByHeightRequest func (m *GetBlockByHeightRequest) String() string { return proto.CompactTextString(m) } func (*GetBlockByHeightRequest) ProtoMessage() {} func (*GetBlockByHeightRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{5} + return fileDescriptor_59f7f56f2cc1e7e8, []int{5} } func (m *GetBlockByHeightRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -381,7 +381,7 @@ func (m *GetBlockByHeightResponse) Reset() { *m = GetBlockByHeightRespon func (m *GetBlockByHeightResponse) String() string { return proto.CompactTextString(m) } func (*GetBlockByHeightResponse) ProtoMessage() {} func (*GetBlockByHeightResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{6} + return fileDescriptor_59f7f56f2cc1e7e8, []int{6} } func (m *GetBlockByHeightResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -432,7 +432,7 @@ func (m *GetLatestBlockRequest) Reset() { *m = GetLatestBlockRequest{} } func (m *GetLatestBlockRequest) String() string { return proto.CompactTextString(m) } func (*GetLatestBlockRequest) ProtoMessage() {} func (*GetLatestBlockRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{7} + return fileDescriptor_59f7f56f2cc1e7e8, []int{7} } func (m *GetLatestBlockRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -471,7 +471,7 @@ func (m *GetLatestBlockResponse) Reset() { *m = GetLatestBlockResponse{} func (m *GetLatestBlockResponse) String() string { return proto.CompactTextString(m) } func (*GetLatestBlockResponse) ProtoMessage() {} func (*GetLatestBlockResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{8} + return fileDescriptor_59f7f56f2cc1e7e8, []int{8} } func (m *GetLatestBlockResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -522,7 +522,7 @@ func (m *GetSyncingRequest) Reset() { *m = GetSyncingRequest{} } func (m *GetSyncingRequest) String() string { return proto.CompactTextString(m) } func (*GetSyncingRequest) ProtoMessage() {} func (*GetSyncingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{9} + return fileDescriptor_59f7f56f2cc1e7e8, []int{9} } func (m *GetSyncingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -560,7 +560,7 @@ func (m *GetSyncingResponse) Reset() { *m = GetSyncingResponse{} } func (m *GetSyncingResponse) String() string { return proto.CompactTextString(m) } func (*GetSyncingResponse) ProtoMessage() {} func (*GetSyncingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{10} + return fileDescriptor_59f7f56f2cc1e7e8, []int{10} } func (m *GetSyncingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -604,7 +604,7 @@ func (m *GetNodeInfoRequest) Reset() { *m = GetNodeInfoRequest{} } func (m *GetNodeInfoRequest) String() string { return proto.CompactTextString(m) } func (*GetNodeInfoRequest) ProtoMessage() {} func (*GetNodeInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{11} + return fileDescriptor_59f7f56f2cc1e7e8, []int{11} } func (m *GetNodeInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -643,7 +643,7 @@ func (m *GetNodeInfoResponse) Reset() { *m = GetNodeInfoResponse{} } func (m *GetNodeInfoResponse) String() string { return proto.CompactTextString(m) } func (*GetNodeInfoResponse) ProtoMessage() {} func (*GetNodeInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{12} + return fileDescriptor_59f7f56f2cc1e7e8, []int{12} } func (m *GetNodeInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -701,7 +701,7 @@ func (m *VersionInfo) Reset() { *m = VersionInfo{} } func (m *VersionInfo) String() string { return proto.CompactTextString(m) } func (*VersionInfo) ProtoMessage() {} func (*VersionInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{13} + return fileDescriptor_59f7f56f2cc1e7e8, []int{13} } func (m *VersionInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -793,7 +793,7 @@ func (m *Module) Reset() { *m = Module{} } func (m *Module) String() string { return proto.CompactTextString(m) } func (*Module) ProtoMessage() {} func (*Module) Descriptor() ([]byte, []int) { - return fileDescriptor_40c93fb3ef485c5d, []int{14} + return fileDescriptor_59f7f56f2cc1e7e8, []int{14} } func (m *Module) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -844,96 +844,96 @@ func (m *Module) GetSum() string { } func init() { - proto.RegisterType((*GetValidatorSetByHeightRequest)(nil), "cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest") - proto.RegisterType((*GetValidatorSetByHeightResponse)(nil), "cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse") - proto.RegisterType((*GetLatestValidatorSetRequest)(nil), "cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest") - proto.RegisterType((*GetLatestValidatorSetResponse)(nil), "cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse") - proto.RegisterType((*Validator)(nil), "cosmos.base.tendermint.v1beta1.Validator") - proto.RegisterType((*GetBlockByHeightRequest)(nil), "cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest") - proto.RegisterType((*GetBlockByHeightResponse)(nil), "cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse") - proto.RegisterType((*GetLatestBlockRequest)(nil), "cosmos.base.tendermint.v1beta1.GetLatestBlockRequest") - proto.RegisterType((*GetLatestBlockResponse)(nil), "cosmos.base.tendermint.v1beta1.GetLatestBlockResponse") - proto.RegisterType((*GetSyncingRequest)(nil), "cosmos.base.tendermint.v1beta1.GetSyncingRequest") - proto.RegisterType((*GetSyncingResponse)(nil), "cosmos.base.tendermint.v1beta1.GetSyncingResponse") - proto.RegisterType((*GetNodeInfoRequest)(nil), "cosmos.base.tendermint.v1beta1.GetNodeInfoRequest") - proto.RegisterType((*GetNodeInfoResponse)(nil), "cosmos.base.tendermint.v1beta1.GetNodeInfoResponse") - proto.RegisterType((*VersionInfo)(nil), "cosmos.base.tendermint.v1beta1.VersionInfo") - proto.RegisterType((*Module)(nil), "cosmos.base.tendermint.v1beta1.Module") + proto.RegisterType((*GetValidatorSetByHeightRequest)(nil), "cosmos.base.ostracon.v1beta1.GetValidatorSetByHeightRequest") + proto.RegisterType((*GetValidatorSetByHeightResponse)(nil), "cosmos.base.ostracon.v1beta1.GetValidatorSetByHeightResponse") + proto.RegisterType((*GetLatestValidatorSetRequest)(nil), "cosmos.base.ostracon.v1beta1.GetLatestValidatorSetRequest") + proto.RegisterType((*GetLatestValidatorSetResponse)(nil), "cosmos.base.ostracon.v1beta1.GetLatestValidatorSetResponse") + proto.RegisterType((*Validator)(nil), "cosmos.base.ostracon.v1beta1.Validator") + proto.RegisterType((*GetBlockByHeightRequest)(nil), "cosmos.base.ostracon.v1beta1.GetBlockByHeightRequest") + proto.RegisterType((*GetBlockByHeightResponse)(nil), "cosmos.base.ostracon.v1beta1.GetBlockByHeightResponse") + proto.RegisterType((*GetLatestBlockRequest)(nil), "cosmos.base.ostracon.v1beta1.GetLatestBlockRequest") + proto.RegisterType((*GetLatestBlockResponse)(nil), "cosmos.base.ostracon.v1beta1.GetLatestBlockResponse") + proto.RegisterType((*GetSyncingRequest)(nil), "cosmos.base.ostracon.v1beta1.GetSyncingRequest") + proto.RegisterType((*GetSyncingResponse)(nil), "cosmos.base.ostracon.v1beta1.GetSyncingResponse") + proto.RegisterType((*GetNodeInfoRequest)(nil), "cosmos.base.ostracon.v1beta1.GetNodeInfoRequest") + proto.RegisterType((*GetNodeInfoResponse)(nil), "cosmos.base.ostracon.v1beta1.GetNodeInfoResponse") + proto.RegisterType((*VersionInfo)(nil), "cosmos.base.ostracon.v1beta1.VersionInfo") + proto.RegisterType((*Module)(nil), "cosmos.base.ostracon.v1beta1.Module") } func init() { - proto.RegisterFile("cosmos/base/tendermint/v1beta1/query.proto", fileDescriptor_40c93fb3ef485c5d) -} - -var fileDescriptor_40c93fb3ef485c5d = []byte{ - // 1060 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0xdc, 0x44, - 0x14, 0xaf, 0xb3, 0x6d, 0x36, 0x79, 0x8b, 0x20, 0x99, 0x84, 0xc6, 0xb1, 0xd2, 0x6d, 0xf0, 0xa1, - 0x4d, 0x88, 0x62, 0x6b, 0xb7, 0x6d, 0xda, 0x43, 0x29, 0x22, 0x04, 0xd2, 0xa8, 0xa5, 0x8a, 0x1c, - 0xc4, 0x01, 0x21, 0x59, 0xde, 0xf5, 0xc4, 0x19, 0x65, 0xd7, 0x33, 0xf5, 0x8c, 0x83, 0x56, 0xa8, - 0x02, 0x71, 0xe2, 0x88, 0xc4, 0x57, 0xe8, 0x85, 0x2f, 0xc0, 0x11, 0x71, 0xe4, 0x58, 0x81, 0x84, - 0x2a, 0x4e, 0x28, 0xe1, 0x53, 0x70, 0x42, 0x9e, 0x19, 0xef, 0xda, 0x4d, 0xd2, 0xdd, 0xcd, 0x01, - 0x89, 0x93, 0x67, 0xde, 0xbf, 0xf9, 0xfd, 0xde, 0xbc, 0xf7, 0x3c, 0xf0, 0x6e, 0x9b, 0xf2, 0x2e, - 0xe5, 0x6e, 0x2b, 0xe0, 0xd8, 0x15, 0x38, 0x0e, 0x71, 0xd2, 0x25, 0xb1, 0x70, 0x8f, 0x1a, 0x2d, - 0x2c, 0x82, 0x86, 0xfb, 0x34, 0xc5, 0x49, 0xcf, 0x61, 0x09, 0x15, 0x14, 0xd5, 0x95, 0xad, 0x93, - 0xd9, 0x3a, 0x03, 0x5b, 0x47, 0xdb, 0x5a, 0xf3, 0x11, 0x8d, 0xa8, 0x34, 0x75, 0xb3, 0x95, 0xf2, - 0xb2, 0x16, 0x23, 0x4a, 0xa3, 0x0e, 0x76, 0xe5, 0xae, 0x95, 0xee, 0xbb, 0x41, 0xac, 0x03, 0x5a, - 0x4b, 0x5a, 0x15, 0x30, 0xe2, 0x06, 0x71, 0x4c, 0x45, 0x20, 0x08, 0x8d, 0xb9, 0xd6, 0x5a, 0x05, - 0x38, 0xac, 0xc9, 0x5c, 0xd1, 0x63, 0x38, 0xd7, 0x2d, 0x15, 0x74, 0x52, 0xee, 0xb6, 0x3a, 0xb4, - 0x7d, 0x78, 0xae, 0xb6, 0xe8, 0x5b, 0xa2, 0x2c, 0xf9, 0xf5, 0xd9, 0xb2, 0x20, 0x22, 0xb1, 0x04, - 0xa1, 0x6c, 0xed, 0x6f, 0x0c, 0xa8, 0x6f, 0x63, 0xf1, 0x59, 0xd0, 0x21, 0x61, 0x20, 0x68, 0xb2, - 0x87, 0xc5, 0x66, 0xef, 0x21, 0x26, 0xd1, 0x81, 0xf0, 0xf0, 0xd3, 0x14, 0x73, 0x81, 0xae, 0xc2, - 0xe4, 0x81, 0x14, 0x98, 0xc6, 0xb2, 0xb1, 0x52, 0xf1, 0xf4, 0x0e, 0x7d, 0x0c, 0x30, 0x08, 0x67, - 0x4e, 0x2c, 0x1b, 0x2b, 0xb5, 0xe6, 0x0d, 0xa7, 0x98, 0x42, 0x95, 0x5b, 0x7d, 0xb6, 0xb3, 0x1b, - 0x44, 0x58, 0xc7, 0xf4, 0x0a, 0x9e, 0xf6, 0x4b, 0x03, 0xae, 0x9f, 0x0b, 0x81, 0x33, 0x1a, 0x73, - 0x8c, 0xde, 0x81, 0x37, 0x24, 0x7f, 0xbf, 0x84, 0xa4, 0x26, 0x65, 0xca, 0x14, 0xed, 0x00, 0x1c, - 0xe5, 0x21, 0xb8, 0x39, 0xb1, 0x5c, 0x59, 0xa9, 0x35, 0x57, 0x9d, 0xd7, 0xdf, 0xa8, 0xd3, 0x3f, - 0xd4, 0x2b, 0x38, 0xa3, 0xed, 0x12, 0xb3, 0x8a, 0x64, 0x76, 0x73, 0x28, 0x33, 0x05, 0xb5, 0x44, - 0x6d, 0x1f, 0x96, 0xb6, 0xb1, 0x78, 0x1c, 0x08, 0xcc, 0x4b, 0xfc, 0xf2, 0xd4, 0x96, 0x53, 0x68, - 0x5c, 0x38, 0x85, 0x7f, 0x18, 0x70, 0xed, 0x9c, 0x83, 0xfe, 0xdf, 0x09, 0x7c, 0x6e, 0xc0, 0x74, - 0xff, 0x08, 0x64, 0x42, 0x35, 0x08, 0xc3, 0x04, 0x73, 0x2e, 0xf1, 0x4f, 0x7b, 0xf9, 0x16, 0xad, - 0x43, 0x95, 0xa5, 0x2d, 0xff, 0x10, 0xf7, 0x74, 0x21, 0xce, 0x3b, 0xaa, 0xf5, 0x9c, 0xbc, 0x2b, - 0x9d, 0x0f, 0xe2, 0x9e, 0x37, 0xc9, 0xd2, 0xd6, 0x23, 0xdc, 0xcb, 0xb2, 0x71, 0x44, 0x05, 0x89, - 0x23, 0x9f, 0xd1, 0x2f, 0x71, 0x22, 0x11, 0x56, 0xbc, 0x9a, 0x92, 0xed, 0x66, 0x22, 0xb4, 0x06, - 0xb3, 0x2c, 0xa1, 0x8c, 0x72, 0x9c, 0xf8, 0x2c, 0x21, 0x34, 0x21, 0xa2, 0x67, 0x5e, 0x96, 0x76, - 0x33, 0xb9, 0x62, 0x57, 0xcb, 0xed, 0x06, 0x2c, 0x6c, 0x63, 0xb1, 0x99, 0x25, 0x73, 0xc4, 0xee, - 0xb1, 0xbf, 0x06, 0xf3, 0xb4, 0x8b, 0xbe, 0xac, 0xdb, 0x30, 0xa5, 0x2e, 0x8b, 0x84, 0xba, 0x28, - 0x16, 0x8b, 0xb9, 0x57, 0xbd, 0x2e, 0x5d, 0x77, 0xb6, 0xbc, 0xaa, 0x34, 0xdd, 0x09, 0xd1, 0x3a, - 0x5c, 0x91, 0x4b, 0x9d, 0x81, 0x85, 0x73, 0x5c, 0x3c, 0x65, 0x65, 0x2f, 0xc0, 0xdb, 0xfd, 0x92, - 0x51, 0x0a, 0x85, 0xd8, 0x7e, 0x06, 0x57, 0x5f, 0x55, 0xfc, 0x97, 0xb8, 0xe6, 0x60, 0x76, 0x1b, - 0x8b, 0xbd, 0x5e, 0xdc, 0x26, 0x71, 0x94, 0x63, 0x72, 0x00, 0x15, 0x85, 0x1a, 0x8f, 0x09, 0x55, - 0xae, 0x44, 0x12, 0xce, 0x94, 0x97, 0x6f, 0xed, 0x79, 0x69, 0xff, 0x84, 0x86, 0x78, 0x27, 0xde, - 0xa7, 0x79, 0x94, 0x5f, 0x0c, 0x98, 0x2b, 0x89, 0x75, 0x9c, 0x47, 0x30, 0x1b, 0xe2, 0xfd, 0x20, - 0xed, 0x08, 0x3f, 0xa6, 0x21, 0xf6, 0x49, 0xbc, 0x4f, 0x35, 0xc1, 0xeb, 0x45, 0xb4, 0xac, 0xc9, - 0x9c, 0x2d, 0x65, 0xd8, 0x8f, 0xf1, 0x56, 0x58, 0x16, 0xa0, 0x2f, 0x60, 0x2e, 0x60, 0xac, 0x43, - 0xda, 0xb2, 0x82, 0xfd, 0x23, 0x9c, 0xf0, 0xc1, 0x7c, 0x5c, 0x1b, 0xda, 0x4f, 0xca, 0x5c, 0x86, - 0x46, 0x85, 0x38, 0x5a, 0x6e, 0xff, 0x63, 0x40, 0xad, 0x60, 0x83, 0x10, 0x5c, 0x8e, 0x83, 0x2e, - 0xd6, 0xfd, 0x20, 0xd7, 0x68, 0x11, 0xa6, 0x02, 0xc6, 0x7c, 0x29, 0x9f, 0xd0, 0x7d, 0xc2, 0xd8, - 0x93, 0x4c, 0x65, 0x42, 0x35, 0x07, 0x54, 0x51, 0x1a, 0xbd, 0x45, 0xd7, 0x00, 0x22, 0x22, 0xfc, - 0x36, 0xed, 0x76, 0x89, 0x90, 0x85, 0x3e, 0xed, 0x4d, 0x47, 0x44, 0x7c, 0x28, 0x05, 0x99, 0xba, - 0x95, 0x92, 0x4e, 0xe8, 0x8b, 0x20, 0xe2, 0xe6, 0x15, 0xa5, 0x96, 0x92, 0x4f, 0x83, 0x88, 0x4b, - 0x6f, 0xda, 0xe7, 0x3a, 0xa9, 0xbd, 0xa9, 0x46, 0x8a, 0x3e, 0xca, 0xbd, 0x43, 0xcc, 0xb8, 0x59, - 0x95, 0xa3, 0xe5, 0xc6, 0xb0, 0x54, 0x7c, 0x42, 0xc3, 0xb4, 0x83, 0xf5, 0x29, 0x5b, 0x98, 0x71, - 0xfb, 0x21, 0x4c, 0x2a, 0x61, 0x46, 0x9b, 0x05, 0xe2, 0x20, 0xa7, 0x9d, 0xad, 0x8b, 0xdc, 0x26, - 0xca, 0xdc, 0x66, 0xa0, 0xc2, 0xd3, 0xae, 0x66, 0x9c, 0x2d, 0x9b, 0xdf, 0x4d, 0x43, 0x75, 0x0f, - 0x27, 0x47, 0xa4, 0x8d, 0xd1, 0x8f, 0x06, 0xd4, 0x0a, 0x55, 0x81, 0x9a, 0xc3, 0x80, 0x9d, 0xae, - 0x2c, 0xeb, 0xd6, 0x58, 0x3e, 0xaa, 0xec, 0xec, 0xc6, 0xb7, 0xbf, 0xff, 0xfd, 0xc3, 0xc4, 0x1a, - 0x5a, 0x75, 0x87, 0xbc, 0x51, 0xfa, 0x45, 0x89, 0x9e, 0x1b, 0x00, 0x83, 0x46, 0x40, 0x8d, 0x11, - 0x8e, 0x2d, 0x77, 0x92, 0xd5, 0x1c, 0xc7, 0x45, 0x03, 0x75, 0x25, 0xd0, 0x55, 0x74, 0x73, 0x18, - 0x50, 0xdd, 0x7e, 0xe8, 0x27, 0x03, 0xde, 0x2c, 0xcf, 0x10, 0x74, 0x67, 0x84, 0x73, 0x4f, 0x0f, - 0x23, 0x6b, 0x63, 0x5c, 0x37, 0x0d, 0xf9, 0x8e, 0x84, 0xec, 0xa2, 0xf5, 0x61, 0x90, 0xe5, 0xd0, - 0xe1, 0x6e, 0x47, 0xc6, 0x40, 0x3f, 0x1b, 0x30, 0xf3, 0xea, 0x58, 0x46, 0x77, 0x47, 0xc0, 0x70, - 0xd6, 0xec, 0xb7, 0xee, 0x8d, 0xef, 0xa8, 0xe1, 0xdf, 0x95, 0xf0, 0x1b, 0xc8, 0x1d, 0x11, 0xfe, - 0x57, 0xea, 0xaf, 0xf2, 0x0c, 0xfd, 0x66, 0x14, 0xc6, 0x7a, 0xf1, 0x25, 0x80, 0xee, 0x8f, 0x9c, - 0xc9, 0x33, 0x5e, 0x2a, 0xd6, 0x7b, 0x17, 0xf4, 0xd6, 0x7c, 0xee, 0x4b, 0x3e, 0x1b, 0xe8, 0xf6, - 0x30, 0x3e, 0x83, 0x47, 0x04, 0x16, 0xfd, 0x5b, 0xf9, 0xd3, 0x90, 0xff, 0xd7, 0xb3, 0x5e, 0x88, - 0xe8, 0xc1, 0x08, 0xc0, 0x5e, 0xf3, 0xba, 0xb5, 0xde, 0xbf, 0xb0, 0xbf, 0xa6, 0xf6, 0x40, 0x52, - 0xbb, 0x87, 0x36, 0xc6, 0xa3, 0x96, 0xdf, 0xd8, 0xe6, 0xe3, 0x5f, 0x8f, 0xeb, 0xc6, 0x8b, 0xe3, - 0xba, 0xf1, 0xd7, 0x71, 0xdd, 0xf8, 0xfe, 0xa4, 0x7e, 0xe9, 0xc5, 0x49, 0xfd, 0xd2, 0xcb, 0x93, - 0xfa, 0xa5, 0xcf, 0x9b, 0x11, 0x11, 0x07, 0x69, 0xcb, 0x69, 0xd3, 0x6e, 0x1e, 0x5b, 0x7d, 0xd6, - 0x79, 0x78, 0xe8, 0xb6, 0x3b, 0x04, 0xc7, 0xc2, 0x8d, 0x12, 0xd6, 0x76, 0x45, 0x97, 0xab, 0x61, - 0xd6, 0x9a, 0x94, 0xef, 0x9d, 0x5b, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x08, 0x32, 0x9c, 0x36, - 0xf7, 0x0c, 0x00, 0x00, + proto.RegisterFile("cosmos/base/ostracon/v1beta1/query.proto", fileDescriptor_59f7f56f2cc1e7e8) +} + +var fileDescriptor_59f7f56f2cc1e7e8 = []byte{ + // 1065 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0xcf, 0x4f, 0x1b, 0xc7, + 0x17, 0x67, 0x71, 0x82, 0xe1, 0xf9, 0xab, 0x6f, 0x61, 0x20, 0x61, 0x63, 0x81, 0x4b, 0xad, 0xb6, + 0x90, 0x22, 0x76, 0xc0, 0x90, 0x1c, 0xd2, 0xf4, 0x50, 0x82, 0x4a, 0xe8, 0x8f, 0x08, 0x2d, 0x55, + 0x0f, 0xb9, 0x58, 0x63, 0xef, 0xb0, 0x8c, 0x58, 0xef, 0x4c, 0x76, 0xc6, 0xae, 0xac, 0xa8, 0x52, + 0xd5, 0xbf, 0xa0, 0x52, 0xef, 0xbd, 0xb4, 0x7f, 0x40, 0x8f, 0x3d, 0xf4, 0x0f, 0xe8, 0xa1, 0x87, + 0x48, 0x8d, 0xaa, 0x1e, 0x2b, 0xc8, 0x1f, 0xd1, 0x63, 0xb5, 0x33, 0xb3, 0xf6, 0x3a, 0x80, 0x0d, + 0x1c, 0x2a, 0xf5, 0xb6, 0xf3, 0x7e, 0x7e, 0x3e, 0x6f, 0xde, 0x7b, 0x3b, 0xb0, 0xd2, 0xe4, 0xb2, + 0xc5, 0x25, 0x6e, 0x10, 0x49, 0x31, 0x97, 0x2a, 0x21, 0x4d, 0x1e, 0xe3, 0xce, 0x46, 0x83, 0x2a, + 0xb2, 0x81, 0x9f, 0xb5, 0x69, 0xd2, 0xf5, 0x44, 0xc2, 0x15, 0x47, 0x0b, 0xc6, 0xd2, 0x4b, 0x2d, + 0xbd, 0xcc, 0xd2, 0xb3, 0x96, 0xe5, 0xb9, 0x90, 0x87, 0x5c, 0x1b, 0xe2, 0xf4, 0xcb, 0xf8, 0x94, + 0xef, 0x84, 0x9c, 0x87, 0x11, 0xc5, 0xfa, 0xd4, 0x68, 0x1f, 0x62, 0x12, 0xdb, 0x70, 0xe5, 0x05, + 0xab, 0x22, 0x82, 0x61, 0x12, 0xc7, 0x5c, 0x11, 0xc5, 0x78, 0x2c, 0xad, 0xd6, 0xed, 0x41, 0x11, + 0x35, 0x81, 0x55, 0x57, 0xd0, 0x4c, 0x53, 0xee, 0x69, 0xb4, 0x14, 0x37, 0x22, 0xde, 0x3c, 0xbe, + 0x40, 0x97, 0xf7, 0x7b, 0x2f, 0x4f, 0x54, 0xf3, 0xea, 0xb1, 0x14, 0x24, 0x64, 0xb1, 0x4e, 0x6f, + 0x6c, 0xab, 0x5f, 0x3b, 0x50, 0xd9, 0xa5, 0xea, 0x0b, 0x12, 0xb1, 0x80, 0x28, 0x9e, 0x1c, 0x50, + 0xb5, 0xdd, 0x7d, 0x4c, 0x59, 0x78, 0xa4, 0x7c, 0xfa, 0xac, 0x4d, 0xa5, 0x42, 0xb7, 0x61, 0xe2, + 0x48, 0x0b, 0x5c, 0x67, 0xc9, 0x59, 0x29, 0xf8, 0xf6, 0x84, 0x3e, 0x02, 0xe8, 0x87, 0x73, 0xc7, + 0x97, 0x9c, 0x95, 0x52, 0xed, 0x5d, 0x2f, 0x5f, 0x3a, 0x53, 0x53, 0x9b, 0xdb, 0xdb, 0x27, 0x21, + 0xb5, 0x31, 0xfd, 0x9c, 0x67, 0xf5, 0x0f, 0x07, 0xde, 0xbc, 0x10, 0x82, 0x14, 0x3c, 0x96, 0x14, + 0xbd, 0x05, 0xff, 0xd3, 0xec, 0xeb, 0x03, 0x48, 0x4a, 0x5a, 0x66, 0x4c, 0xd1, 0x2e, 0x40, 0x27, + 0x0b, 0x21, 0xdd, 0xf1, 0xa5, 0xc2, 0x4a, 0xa9, 0xb6, 0xec, 0x0d, 0xbb, 0x49, 0xaf, 0x97, 0xd2, + 0xcf, 0xb9, 0xa6, 0x81, 0x72, 0xbc, 0x0a, 0x9a, 0xd7, 0xf2, 0x48, 0x5e, 0x06, 0xe8, 0x00, 0xb1, + 0x43, 0x58, 0xd8, 0xa5, 0xea, 0x53, 0xa2, 0xa8, 0x1c, 0x60, 0x97, 0x15, 0x76, 0xb0, 0x80, 0xce, + 0xb5, 0x0b, 0xf8, 0xd2, 0x81, 0xc5, 0x0b, 0x12, 0xfd, 0x97, 0xcb, 0xf7, 0xa3, 0x03, 0x53, 0xbd, + 0x14, 0xc8, 0x85, 0x22, 0x09, 0x82, 0x84, 0x4a, 0xa9, 0xd1, 0x4f, 0xf9, 0xd9, 0x11, 0xad, 0x41, + 0x51, 0xb4, 0x1b, 0xf5, 0x63, 0xda, 0xb5, 0x4d, 0x38, 0xe7, 0x99, 0x81, 0xf3, 0xb2, 0x59, 0xf4, + 0x3e, 0x8c, 0xbb, 0xfe, 0x84, 0x68, 0x37, 0x3e, 0xa1, 0xdd, 0xb4, 0x16, 0x1d, 0xae, 0x58, 0x1c, + 0xd6, 0x05, 0xff, 0x92, 0x26, 0x1a, 0x61, 0xc1, 0x2f, 0x19, 0xd9, 0x7e, 0x2a, 0x42, 0xab, 0x30, + 0x23, 0x12, 0x2e, 0xb8, 0xa4, 0x49, 0x5d, 0x24, 0x8c, 0x27, 0x4c, 0x75, 0xdd, 0x1b, 0xda, 0x6e, + 0x3a, 0x53, 0xec, 0x5b, 0x79, 0x75, 0x03, 0xe6, 0x77, 0xa9, 0xda, 0x4e, 0x4b, 0x79, 0xc9, 0xc9, + 0xa9, 0x3e, 0x07, 0xf7, 0xac, 0x8b, 0xbd, 0xaa, 0x1a, 0x4c, 0x9a, 0xab, 0x62, 0x81, 0x6d, 0x89, + 0xf9, 0x7e, 0xe5, 0xcd, 0x94, 0x6b, 0xc7, 0xbd, 0x1d, 0xbf, 0xa8, 0x0d, 0xf7, 0x02, 0xb4, 0x0a, + 0x37, 0xf5, 0xa7, 0xe5, 0x7f, 0xeb, 0x5c, 0x07, 0xdf, 0xd8, 0x54, 0xe7, 0xe1, 0x56, 0xaf, 0x59, + 0x8c, 0xc2, 0xa0, 0xad, 0x76, 0xe1, 0xf6, 0xeb, 0x8a, 0x7f, 0x0b, 0xd3, 0x2c, 0xcc, 0xec, 0x52, + 0x75, 0xd0, 0x8d, 0x9b, 0x2c, 0x0e, 0x33, 0x3c, 0x1e, 0xa0, 0xbc, 0xd0, 0x62, 0x71, 0xa1, 0x28, + 0x8d, 0x48, 0x43, 0x99, 0xf4, 0xb3, 0x63, 0x75, 0x4e, 0xdb, 0x3f, 0xe1, 0x01, 0xdd, 0x8b, 0x0f, + 0x79, 0x16, 0xe5, 0x17, 0x07, 0x66, 0x07, 0xc4, 0x36, 0xce, 0x1e, 0xcc, 0x04, 0xf4, 0x90, 0xb4, + 0x23, 0x55, 0x8f, 0x79, 0x40, 0xeb, 0x2c, 0x3e, 0xe4, 0x96, 0xdc, 0x62, 0x1f, 0xab, 0xa8, 0x09, + 0x6f, 0xc7, 0x98, 0xf5, 0x22, 0xbc, 0x11, 0x0c, 0x0a, 0xd0, 0x53, 0x98, 0x25, 0x42, 0x44, 0xac, + 0xa9, 0xfb, 0xb6, 0xde, 0xa1, 0x89, 0xec, 0x6f, 0xc4, 0xbb, 0x23, 0x66, 0xc8, 0x18, 0xeb, 0xc0, + 0x28, 0x17, 0xc5, 0xca, 0xab, 0x7f, 0x3b, 0x50, 0xca, 0xd9, 0x20, 0x04, 0x37, 0x62, 0xd2, 0xa2, + 0x76, 0x06, 0xf4, 0x37, 0xba, 0x03, 0x93, 0x44, 0x88, 0xba, 0x96, 0x8f, 0xdb, 0xd9, 0x10, 0xe2, + 0x49, 0xaa, 0x72, 0xa1, 0x98, 0xc1, 0x29, 0x18, 0x8d, 0x3d, 0xa2, 0x45, 0x80, 0x90, 0xa9, 0x7a, + 0x93, 0xb7, 0x5a, 0x4c, 0xe9, 0xe6, 0x9e, 0xf2, 0xa7, 0x42, 0xa6, 0x1e, 0x69, 0x41, 0xaa, 0x6e, + 0xb4, 0x59, 0x14, 0xd4, 0x15, 0x09, 0xa5, 0x7b, 0xd3, 0xa8, 0xb5, 0xe4, 0x73, 0x12, 0x4a, 0xed, + 0xcd, 0x7b, 0x4c, 0x27, 0xac, 0x37, 0xb7, 0x48, 0xd1, 0xa3, 0xcc, 0x3b, 0xa0, 0x42, 0xba, 0x45, + 0xbd, 0x4c, 0xde, 0x1e, 0x5e, 0x88, 0xcf, 0x78, 0xd0, 0x8e, 0xa8, 0xcd, 0xb1, 0x43, 0x85, 0xac, + 0x3e, 0x86, 0x09, 0x23, 0x4c, 0x49, 0x0b, 0xa2, 0x8e, 0x32, 0xd2, 0xe9, 0x77, 0x9e, 0xd9, 0xf8, + 0x20, 0xb3, 0x69, 0x28, 0xc8, 0x76, 0xcb, 0xf2, 0x4d, 0x3f, 0x6b, 0xaf, 0x26, 0xa1, 0x78, 0x40, + 0x93, 0x0e, 0x6b, 0x52, 0xf4, 0x83, 0x03, 0xa5, 0x5c, 0x3f, 0xa0, 0xf5, 0xe1, 0xb0, 0xce, 0x76, + 0x54, 0x79, 0xe3, 0x0a, 0x1e, 0xa6, 0xd9, 0xaa, 0xf8, 0x9b, 0xdf, 0x5f, 0x7d, 0x37, 0x7e, 0x17, + 0x2d, 0xe3, 0xa1, 0x6f, 0x90, 0x5e, 0x23, 0xa2, 0xef, 0x1d, 0x80, 0x7e, 0xf3, 0x23, 0x3c, 0x32, + 0xe5, 0xe0, 0xec, 0x94, 0xd7, 0x2f, 0xef, 0x60, 0x21, 0xae, 0x69, 0x88, 0xcb, 0xe8, 0x9d, 0xe1, + 0x10, 0xed, 0xb0, 0xa1, 0x9f, 0x1c, 0xf8, 0xff, 0xe0, 0xb6, 0x40, 0x9b, 0x23, 0x73, 0x9e, 0x5d, + 0x3a, 0xe5, 0xad, 0xab, 0x39, 0x59, 0xb0, 0x9b, 0x1a, 0xec, 0x1a, 0x5a, 0x1d, 0x0e, 0x56, 0x2f, + 0x17, 0x89, 0x23, 0x1d, 0x01, 0xfd, 0xec, 0xc0, 0xf4, 0xeb, 0x6b, 0x17, 0xdd, 0x1b, 0x99, 0xff, + 0xbc, 0xcd, 0x5e, 0xbe, 0x7f, 0x55, 0x37, 0x0b, 0xfc, 0x9e, 0x06, 0x8e, 0xd1, 0xda, 0xa5, 0x80, + 0x3f, 0x37, 0xff, 0x8b, 0xaf, 0xd0, 0x6f, 0x4e, 0x6e, 0x69, 0xe7, 0xff, 0xf0, 0xe8, 0xc1, 0x25, + 0xeb, 0x77, 0xce, 0xfb, 0xa3, 0xfc, 0xfe, 0xb5, 0x7c, 0x2d, 0x93, 0x07, 0x9a, 0xc9, 0x16, 0xaa, + 0x0d, 0x67, 0xd2, 0x7f, 0x18, 0x50, 0xd5, 0xbb, 0x89, 0x97, 0x8e, 0xfe, 0x67, 0x9e, 0xf7, 0xe2, + 0x43, 0x0f, 0x47, 0x82, 0x1a, 0xf2, 0x56, 0x2d, 0x7f, 0x70, 0x4d, 0x6f, 0x4b, 0xea, 0xa1, 0x26, + 0x75, 0x1f, 0x6d, 0x5d, 0x85, 0x54, 0x76, 0x4b, 0xdb, 0x1f, 0xff, 0x7a, 0x52, 0x71, 0x5e, 0x9c, + 0x54, 0x9c, 0xbf, 0x4e, 0x2a, 0xce, 0xb7, 0xa7, 0x95, 0xb1, 0x17, 0xa7, 0x95, 0xb1, 0x3f, 0x4f, + 0x2b, 0x63, 0x4f, 0xd7, 0x43, 0xa6, 0x8e, 0xda, 0x0d, 0xaf, 0xc9, 0x5b, 0x38, 0x62, 0x31, 0xc5, + 0x51, 0xa3, 0xb5, 0x26, 0x83, 0x63, 0xdc, 0xa9, 0xe1, 0x66, 0xc4, 0x68, 0xac, 0x70, 0x98, 0x88, + 0x26, 0x56, 0x2d, 0x69, 0xd6, 0x54, 0x63, 0x42, 0xbf, 0x5d, 0x36, 0xff, 0x09, 0x00, 0x00, 0xff, + 0xff, 0xa4, 0xe8, 0xcf, 0xa2, 0xb5, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -972,7 +972,7 @@ func NewServiceClient(cc grpc1.ClientConn) ServiceClient { func (c *serviceClient) GetNodeInfo(ctx context.Context, in *GetNodeInfoRequest, opts ...grpc.CallOption) (*GetNodeInfoResponse, error) { out := new(GetNodeInfoResponse) - err := c.cc.Invoke(ctx, "/cosmos.base.tendermint.v1beta1.Service/GetNodeInfo", in, out, opts...) + err := c.cc.Invoke(ctx, "/cosmos.base.ostracon.v1beta1.Service/GetNodeInfo", in, out, opts...) if err != nil { return nil, err } @@ -981,7 +981,7 @@ func (c *serviceClient) GetNodeInfo(ctx context.Context, in *GetNodeInfoRequest, func (c *serviceClient) GetSyncing(ctx context.Context, in *GetSyncingRequest, opts ...grpc.CallOption) (*GetSyncingResponse, error) { out := new(GetSyncingResponse) - err := c.cc.Invoke(ctx, "/cosmos.base.tendermint.v1beta1.Service/GetSyncing", in, out, opts...) + err := c.cc.Invoke(ctx, "/cosmos.base.ostracon.v1beta1.Service/GetSyncing", in, out, opts...) if err != nil { return nil, err } @@ -990,7 +990,7 @@ func (c *serviceClient) GetSyncing(ctx context.Context, in *GetSyncingRequest, o func (c *serviceClient) GetLatestBlock(ctx context.Context, in *GetLatestBlockRequest, opts ...grpc.CallOption) (*GetLatestBlockResponse, error) { out := new(GetLatestBlockResponse) - err := c.cc.Invoke(ctx, "/cosmos.base.tendermint.v1beta1.Service/GetLatestBlock", in, out, opts...) + err := c.cc.Invoke(ctx, "/cosmos.base.ostracon.v1beta1.Service/GetLatestBlock", in, out, opts...) if err != nil { return nil, err } @@ -999,7 +999,7 @@ func (c *serviceClient) GetLatestBlock(ctx context.Context, in *GetLatestBlockRe func (c *serviceClient) GetBlockByHeight(ctx context.Context, in *GetBlockByHeightRequest, opts ...grpc.CallOption) (*GetBlockByHeightResponse, error) { out := new(GetBlockByHeightResponse) - err := c.cc.Invoke(ctx, "/cosmos.base.tendermint.v1beta1.Service/GetBlockByHeight", in, out, opts...) + err := c.cc.Invoke(ctx, "/cosmos.base.ostracon.v1beta1.Service/GetBlockByHeight", in, out, opts...) if err != nil { return nil, err } @@ -1008,7 +1008,7 @@ func (c *serviceClient) GetBlockByHeight(ctx context.Context, in *GetBlockByHeig func (c *serviceClient) GetLatestValidatorSet(ctx context.Context, in *GetLatestValidatorSetRequest, opts ...grpc.CallOption) (*GetLatestValidatorSetResponse, error) { out := new(GetLatestValidatorSetResponse) - err := c.cc.Invoke(ctx, "/cosmos.base.tendermint.v1beta1.Service/GetLatestValidatorSet", in, out, opts...) + err := c.cc.Invoke(ctx, "/cosmos.base.ostracon.v1beta1.Service/GetLatestValidatorSet", in, out, opts...) if err != nil { return nil, err } @@ -1017,7 +1017,7 @@ func (c *serviceClient) GetLatestValidatorSet(ctx context.Context, in *GetLatest func (c *serviceClient) GetValidatorSetByHeight(ctx context.Context, in *GetValidatorSetByHeightRequest, opts ...grpc.CallOption) (*GetValidatorSetByHeightResponse, error) { out := new(GetValidatorSetByHeightResponse) - err := c.cc.Invoke(ctx, "/cosmos.base.tendermint.v1beta1.Service/GetValidatorSetByHeight", in, out, opts...) + err := c.cc.Invoke(ctx, "/cosmos.base.ostracon.v1beta1.Service/GetValidatorSetByHeight", in, out, opts...) if err != nil { return nil, err } @@ -1077,7 +1077,7 @@ func _Service_GetNodeInfo_Handler(srv interface{}, ctx context.Context, dec func } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmos.base.tendermint.v1beta1.Service/GetNodeInfo", + FullMethod: "/cosmos.base.ostracon.v1beta1.Service/GetNodeInfo", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ServiceServer).GetNodeInfo(ctx, req.(*GetNodeInfoRequest)) @@ -1095,7 +1095,7 @@ func _Service_GetSyncing_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmos.base.tendermint.v1beta1.Service/GetSyncing", + FullMethod: "/cosmos.base.ostracon.v1beta1.Service/GetSyncing", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ServiceServer).GetSyncing(ctx, req.(*GetSyncingRequest)) @@ -1113,7 +1113,7 @@ func _Service_GetLatestBlock_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmos.base.tendermint.v1beta1.Service/GetLatestBlock", + FullMethod: "/cosmos.base.ostracon.v1beta1.Service/GetLatestBlock", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ServiceServer).GetLatestBlock(ctx, req.(*GetLatestBlockRequest)) @@ -1131,7 +1131,7 @@ func _Service_GetBlockByHeight_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmos.base.tendermint.v1beta1.Service/GetBlockByHeight", + FullMethod: "/cosmos.base.ostracon.v1beta1.Service/GetBlockByHeight", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ServiceServer).GetBlockByHeight(ctx, req.(*GetBlockByHeightRequest)) @@ -1149,7 +1149,7 @@ func _Service_GetLatestValidatorSet_Handler(srv interface{}, ctx context.Context } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmos.base.tendermint.v1beta1.Service/GetLatestValidatorSet", + FullMethod: "/cosmos.base.ostracon.v1beta1.Service/GetLatestValidatorSet", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ServiceServer).GetLatestValidatorSet(ctx, req.(*GetLatestValidatorSetRequest)) @@ -1167,7 +1167,7 @@ func _Service_GetValidatorSetByHeight_Handler(srv interface{}, ctx context.Conte } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/cosmos.base.tendermint.v1beta1.Service/GetValidatorSetByHeight", + FullMethod: "/cosmos.base.ostracon.v1beta1.Service/GetValidatorSetByHeight", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(ServiceServer).GetValidatorSetByHeight(ctx, req.(*GetValidatorSetByHeightRequest)) @@ -1176,7 +1176,7 @@ func _Service_GetValidatorSetByHeight_Handler(srv interface{}, ctx context.Conte } var _Service_serviceDesc = grpc.ServiceDesc{ - ServiceName: "cosmos.base.tendermint.v1beta1.Service", + ServiceName: "cosmos.base.ostracon.v1beta1.Service", HandlerType: (*ServiceServer)(nil), Methods: []grpc.MethodDesc{ { @@ -1205,7 +1205,7 @@ var _Service_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "cosmos/base/tendermint/v1beta1/query.proto", + Metadata: "cosmos/base/ostracon/v1beta1/query.proto", } func (m *GetValidatorSetByHeightRequest) Marshal() (dAtA []byte, err error) { diff --git a/client/grpc/tmservice/query.pb.gw.go b/client/grpc/tmservice/query.pb.gw.go index 90135d79b9..6977242ee0 100644 --- a/client/grpc/tmservice/query.pb.gw.go +++ b/client/grpc/tmservice/query.pb.gw.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-grpc-gateway. DO NOT EDIT. -// source: cosmos/base/tendermint/v1beta1/query.proto +// source: cosmos/base/ostracon/v1beta1/query.proto /* Package tmservice is a reverse proxy. @@ -538,17 +538,17 @@ func RegisterServiceHandlerClient(ctx context.Context, mux *runtime.ServeMux, cl } var ( - pattern_Service_GetNodeInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"cosmos", "base", "tendermint", "v1beta1", "node_info"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Service_GetNodeInfo_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"cosmos", "base", "ostracon", "v1beta1", "node_info"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Service_GetSyncing_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"cosmos", "base", "tendermint", "v1beta1", "syncing"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Service_GetSyncing_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4}, []string{"cosmos", "base", "ostracon", "v1beta1", "syncing"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Service_GetLatestBlock_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5}, []string{"cosmos", "base", "tendermint", "v1beta1", "blocks", "latest"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Service_GetLatestBlock_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5}, []string{"cosmos", "base", "ostracon", "v1beta1", "blocks", "latest"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Service_GetBlockByHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"cosmos", "base", "tendermint", "v1beta1", "blocks", "height"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Service_GetBlockByHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"cosmos", "base", "ostracon", "v1beta1", "blocks", "height"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Service_GetLatestValidatorSet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5}, []string{"cosmos", "base", "tendermint", "v1beta1", "validatorsets", "latest"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Service_GetLatestValidatorSet_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 2, 5}, []string{"cosmos", "base", "ostracon", "v1beta1", "validatorsets", "latest"}, "", runtime.AssumeColonVerbOpt(true))) - pattern_Service_GetValidatorSetByHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"cosmos", "base", "tendermint", "v1beta1", "validatorsets", "height"}, "", runtime.AssumeColonVerbOpt(true))) + pattern_Service_GetValidatorSetByHeight_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 2, 3, 2, 4, 1, 0, 4, 1, 5, 5}, []string{"cosmos", "base", "ostracon", "v1beta1", "validatorsets", "height"}, "", runtime.AssumeColonVerbOpt(true))) ) var ( diff --git a/client/grpc/tmservice/service_test.go b/client/grpc/tmservice/service_test.go index 7c594801c0..49d40a09d2 100644 --- a/client/grpc/tmservice/service_test.go +++ b/client/grpc/tmservice/service_test.go @@ -54,7 +54,7 @@ func (s IntegrationTestSuite) TestQueryNodeInfo() { s.Require().NoError(err) s.Require().Equal(res.ApplicationVersion.AppName, version.NewInfo().AppName) - restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/node_info", val.APIAddress)) + restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/ostracon/v1beta1/node_info", val.APIAddress)) s.Require().NoError(err) var getInfoRes tmservice.GetNodeInfoResponse s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(restRes, &getInfoRes)) @@ -67,7 +67,7 @@ func (s IntegrationTestSuite) TestQuerySyncing() { _, err := s.queryClient.GetSyncing(context.Background(), &tmservice.GetSyncingRequest{}) s.Require().NoError(err) - restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/syncing", val.APIAddress)) + restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/ostracon/v1beta1/syncing", val.APIAddress)) s.Require().NoError(err) var syncingRes tmservice.GetSyncingResponse s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(restRes, &syncingRes)) @@ -79,7 +79,7 @@ func (s IntegrationTestSuite) TestQueryLatestBlock() { _, err := s.queryClient.GetLatestBlock(context.Background(), &tmservice.GetLatestBlockRequest{}) s.Require().NoError(err) - restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/blocks/latest", val.APIAddress)) + restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/ostracon/v1beta1/blocks/latest", val.APIAddress)) s.Require().NoError(err) var blockInfoRes tmservice.GetLatestBlockResponse s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(restRes, &blockInfoRes)) @@ -90,7 +90,7 @@ func (s IntegrationTestSuite) TestQueryBlockByHeight() { _, err := s.queryClient.GetBlockByHeight(context.Background(), &tmservice.GetBlockByHeightRequest{Height: 1}) s.Require().NoError(err) - restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/blocks/%d", val.APIAddress, 1)) + restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/ostracon/v1beta1/blocks/%d", val.APIAddress, 1)) s.Require().NoError(err) var blockInfoRes tmservice.GetBlockByHeightResponse s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(restRes, &blockInfoRes)) @@ -117,11 +117,11 @@ func (s IntegrationTestSuite) TestQueryLatestValidatorSet() { s.Require().NoError(err) // rest request without pagination - _, err = rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/latest", val.APIAddress)) + _, err = rest.GetRequest(fmt.Sprintf("%s/cosmos/base/ostracon/v1beta1/validatorsets/latest", val.APIAddress)) s.Require().NoError(err) // rest request with pagination - restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/latest?pagination.offset=%d&pagination.limit=%d", val.APIAddress, 0, 1)) + restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/ostracon/v1beta1/validatorsets/latest?pagination.offset=%d&pagination.limit=%d", val.APIAddress, 0, 1)) s.Require().NoError(err) var validatorSetRes tmservice.GetLatestValidatorSetResponse s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(restRes, &validatorSetRes)) @@ -150,11 +150,11 @@ func (s IntegrationTestSuite) TestQueryValidatorSetByHeight() { s.Require().NoError(err) // no pagination rest - _, err = rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/%d", val.APIAddress, 1)) + _, err = rest.GetRequest(fmt.Sprintf("%s/cosmos/base/ostracon/v1beta1/validatorsets/%d", val.APIAddress, 1)) s.Require().NoError(err) // rest query with pagination - restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/%d?pagination.offset=%d&pagination.limit=%d", val.APIAddress, 1, 0, 1)) + restRes, err := rest.GetRequest(fmt.Sprintf("%s/cosmos/base/ostracon/v1beta1/validatorsets/%d?pagination.offset=%d&pagination.limit=%d", val.APIAddress, 1, 0, 1)) var validatorSetRes tmservice.GetValidatorSetByHeightResponse s.Require().NoError(val.ClientCtx.JSONMarshaler.UnmarshalJSON(restRes, &validatorSetRes)) } diff --git a/client/grpc/tmservice/status.go b/client/grpc/tmservice/status.go index 591b45ad04..e98ff81c41 100644 --- a/client/grpc/tmservice/status.go +++ b/client/grpc/tmservice/status.go @@ -3,7 +3,7 @@ package tmservice import ( "context" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/line/ostracon/rpc/core/types" "github.com/line/lbm-sdk/v2/client" ) diff --git a/client/grpc_query.go b/client/grpc_query.go index 41be4ffb84..4eebbd2076 100644 --- a/client/grpc_query.go +++ b/client/grpc_query.go @@ -7,7 +7,7 @@ import ( "strconv" gogogrpc "github.com/gogo/protobuf/grpc" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "google.golang.org/grpc" "google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding/proto" diff --git a/client/keys/add.go b/client/keys/add.go index 4b4371d3e1..9756f55177 100644 --- a/client/keys/add.go +++ b/client/keys/add.go @@ -8,8 +8,8 @@ import ( "sort" bip39 "github.com/cosmos/go-bip39" + "github.com/line/ostracon/libs/cli" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -247,7 +247,7 @@ func RunAddCmd(cmd *cobra.Command, args []string, kb keyring.Keyring, inBuf *buf } if len(mnemonic) == 0 { - // read entropy seed straight from tmcrypto.Rand and convert to mnemonic + // read entropy seed straight from ostcrypto.Rand and convert to mnemonic entropySeed, err := bip39.NewEntropy(mnemonicEntropySize) if err != nil { return err diff --git a/client/keys/add_ledger_test.go b/client/keys/add_ledger_test.go index eed196503a..8ac6a0aedd 100644 --- a/client/keys/add_ledger_test.go +++ b/client/keys/add_ledger_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/cli" + "github.com/line/ostracon/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" diff --git a/client/keys/add_test.go b/client/keys/add_test.go index e5a91c4429..56f13ed4ba 100644 --- a/client/keys/add_test.go +++ b/client/keys/add_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/cli" + "github.com/line/ostracon/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" diff --git a/client/keys/list.go b/client/keys/list.go index f7144a34eb..4d55011a12 100644 --- a/client/keys/list.go +++ b/client/keys/list.go @@ -1,8 +1,8 @@ package keys import ( + "github.com/line/ostracon/libs/cli" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client" ) diff --git a/client/keys/parse.go b/client/keys/parse.go index 398559e8bb..de5d232242 100644 --- a/client/keys/parse.go +++ b/client/keys/parse.go @@ -8,8 +8,8 @@ import ( "io" "strings" + "github.com/line/ostracon/libs/cli" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/cli" yaml "gopkg.in/yaml.v2" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/client/keys/root.go b/client/keys/root.go index 8d4842de14..8b00032fad 100644 --- a/client/keys/root.go +++ b/client/keys/root.go @@ -1,8 +1,8 @@ package keys import ( + "github.com/line/ostracon/libs/cli" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client/flags" ) diff --git a/client/keys/show.go b/client/keys/show.go index 7b3695af85..d2011dc621 100644 --- a/client/keys/show.go +++ b/client/keys/show.go @@ -4,8 +4,8 @@ import ( "errors" "fmt" + "github.com/line/ostracon/libs/cli" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/crypto/keyring" diff --git a/client/query.go b/client/query.go index f98f266225..8d1c98e5a3 100644 --- a/client/query.go +++ b/client/query.go @@ -7,9 +7,9 @@ import ( "github.com/pkg/errors" - abci "github.com/tendermint/tendermint/abci/types" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - rpcclient "github.com/tendermint/tendermint/rpc/client" + abci "github.com/line/ostracon/abci/types" + ostbytes "github.com/line/ostracon/libs/bytes" + rpcclient "github.com/line/ostracon/rpc/client" "github.com/line/lbm-sdk/v2/store/rootmulti" sdk "github.com/line/lbm-sdk/v2/types" @@ -42,7 +42,7 @@ func (ctx Context) QueryWithData(path string, data []byte) ([]byte, int64, error // QueryStore performs a query to a Tendermint node with the provided key and // store name. It returns the result and height of the query upon success // or an error if the query fails. -func (ctx Context) QueryStore(key tmbytes.HexBytes, storeName string) ([]byte, int64, error) { +func (ctx Context) QueryStore(key ostbytes.HexBytes, storeName string) ([]byte, int64, error) { return ctx.queryStore(key, storeName, "key") } @@ -93,7 +93,7 @@ func (ctx Context) queryABCI(req abci.RequestQuery) (abci.ResponseQuery, error) // query performs a query to a Tendermint node with the provided store name // and path. It returns the result and height of the query upon success // or an error if the query fails. -func (ctx Context) query(path string, key tmbytes.HexBytes) ([]byte, int64, error) { +func (ctx Context) query(path string, key ostbytes.HexBytes) ([]byte, int64, error) { resp, err := ctx.queryABCI(abci.RequestQuery{ Path: path, Data: key, @@ -108,7 +108,7 @@ func (ctx Context) query(path string, key tmbytes.HexBytes) ([]byte, int64, erro // queryStore performs a query to a Tendermint node with the provided a store // name and path. It returns the result and height of the query upon success // or an error if the query fails. -func (ctx Context) queryStore(key tmbytes.HexBytes, storeName, endPath string) ([]byte, int64, error) { +func (ctx Context) queryStore(key ostbytes.HexBytes, storeName, endPath string) ([]byte, int64, error) { path := fmt.Sprintf("/store/%s/%s", storeName, endPath) return ctx.query(path, key) } diff --git a/client/rpc/rpc_test.go b/client/rpc/rpc_test.go index cc34af86b0..b873e2cf60 100644 --- a/client/rpc/rpc_test.go +++ b/client/rpc/rpc_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + ctypes "github.com/line/ostracon/rpc/core/types" "github.com/stretchr/testify/suite" - ctypes "github.com/tendermint/tendermint/rpc/core/types" "github.com/line/lbm-sdk/v2/client/rpc" "github.com/line/lbm-sdk/v2/codec/legacy" diff --git a/client/rpc/status.go b/client/rpc/status.go index b38586fdd7..599922b751 100644 --- a/client/rpc/status.go +++ b/client/rpc/status.go @@ -6,9 +6,9 @@ import ( "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/p2p" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + "github.com/line/ostracon/libs/bytes" + "github.com/line/ostracon/p2p" + ctypes "github.com/line/ostracon/rpc/core/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" diff --git a/client/rpc/validators.go b/client/rpc/validators.go index a6e718384b..be83e1b926 100644 --- a/client/rpc/validators.go +++ b/client/rpc/validators.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" "github.com/spf13/cobra" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -25,8 +25,8 @@ import ( //ValidatorCommand returns the validator set for a given height func ValidatorCommand() *cobra.Command { cmd := &cobra.Command{ - Use: "tendermint-validator-set [height]", - Short: "Get the full tendermint validator set at given height", + Use: "ostracon-validator-set [height]", + Short: "Get the full ostracon validator set at given height", Args: cobra.MaximumNArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientQueryContext(cmd) @@ -102,7 +102,7 @@ func (rvo ResultValidatorsOutput) String() string { return b.String() } -func validatorOutput(validator *tmtypes.Validator) (ValidatorOutput, error) { +func validatorOutput(validator *osttypes.Validator) (ValidatorOutput, error) { pk, err := cryptocodec.FromTmPubKeyInterface(validator.PubKey) if err != nil { return ValidatorOutput{}, err diff --git a/codec/amino.go b/codec/amino.go index 67ff70bb26..2b9b80839e 100644 --- a/codec/amino.go +++ b/codec/amino.go @@ -7,8 +7,8 @@ import ( "fmt" "io" + osttypes "github.com/line/ostracon/types" amino "github.com/tendermint/go-amino" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/codec/types" ) @@ -30,8 +30,8 @@ func NewLegacyAmino() *LegacyAmino { // RegisterEvidences registers Tendermint evidence types with the provided Amino // codec. func RegisterEvidences(cdc *LegacyAmino) { - cdc.Amino.RegisterInterface((*tmtypes.Evidence)(nil), nil) - cdc.Amino.RegisterConcrete(&tmtypes.DuplicateVoteEvidence{}, "tendermint/DuplicateVoteEvidence", nil) + cdc.Amino.RegisterInterface((*osttypes.Evidence)(nil), nil) + cdc.Amino.RegisterConcrete(&osttypes.DuplicateVoteEvidence{}, "tendermint/DuplicateVoteEvidence", nil) } // MarshalJSONIndent provides a utility for indented JSON encoding of an object diff --git a/crypto/armor.go b/crypto/armor.go index 1b5ced1bcc..1c20499ca6 100644 --- a/crypto/armor.go +++ b/crypto/armor.go @@ -4,10 +4,10 @@ import ( "encoding/hex" "fmt" + "github.com/line/ostracon/crypto" + "github.com/line/ostracon/crypto/armor" + "github.com/line/ostracon/crypto/xsalsa20symmetric" "github.com/tendermint/crypto/bcrypt" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/armor" - "github.com/tendermint/tendermint/crypto/xsalsa20symmetric" "github.com/line/lbm-sdk/v2/codec/legacy" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" diff --git a/crypto/armor_test.go b/crypto/armor_test.go index 43c534b968..6596ba0b0d 100644 --- a/crypto/armor_test.go +++ b/crypto/armor_test.go @@ -7,11 +7,11 @@ import ( "io" "testing" + ostcrypto "github.com/line/ostracon/crypto" + "github.com/line/ostracon/crypto/armor" + "github.com/line/ostracon/crypto/xsalsa20symmetric" "github.com/stretchr/testify/require" "github.com/tendermint/crypto/bcrypt" - tmcrypto "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/armor" - "github.com/tendermint/tendermint/crypto/xsalsa20symmetric" "github.com/line/lbm-sdk/v2/codec/legacy" "github.com/line/lbm-sdk/v2/crypto" @@ -47,10 +47,10 @@ func TestArmorUnarmorPrivKey(t *testing.T) { // armor key manually encryptPrivKeyFn := func(privKey cryptotypes.PrivKey, passphrase string) (saltBytes []byte, encBytes []byte) { - saltBytes = tmcrypto.CRandBytes(16) + saltBytes = ostcrypto.CRandBytes(16) key, err := bcrypt.GenerateFromPassword(saltBytes, []byte(passphrase), crypto.BcryptSecurityParameter) require.NoError(t, err) - key = tmcrypto.Sha256(key) // get 32 bytes + key = ostcrypto.Sha256(key) // get 32 bytes privKeyBytes := legacy.Cdc.Amino.MustMarshalBinaryBare(privKey) return saltBytes, xsalsa20symmetric.EncryptSymmetric(privKeyBytes, key) } @@ -162,7 +162,7 @@ func BenchmarkBcryptGenerateFromPassword(b *testing.B) { for securityParam := 9; securityParam < 16; securityParam++ { param := securityParam b.Run(fmt.Sprintf("benchmark-security-param-%d", param), func(b *testing.B) { - saltBytes := tmcrypto.CRandBytes(16) + saltBytes := ostcrypto.CRandBytes(16) b.ResetTimer() for i := 0; i < b.N; i++ { _, err := bcrypt.GenerateFromPassword(saltBytes, passphrase, param) diff --git a/crypto/codec/amino.go b/crypto/codec/amino.go index 73c3f4213d..f04efc3601 100644 --- a/crypto/codec/amino.go +++ b/crypto/codec/amino.go @@ -1,7 +1,7 @@ package codec import ( - "github.com/tendermint/tendermint/crypto/sr25519" + "github.com/line/ostracon/crypto/sr25519" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" diff --git a/crypto/codec/tm.go b/crypto/codec/tm.go index 3f2bf3f60e..b2226c6b03 100644 --- a/crypto/codec/tm.go +++ b/crypto/codec/tm.go @@ -1,9 +1,9 @@ package codec import ( - tmcrypto "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/encoding" - tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + ostcrypto "github.com/line/ostracon/crypto" + "github.com/line/ostracon/crypto/encoding" + ostprotocrypto "github.com/line/ostracon/proto/ostracon/crypto" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" @@ -11,14 +11,14 @@ import ( sdkerrors "github.com/line/lbm-sdk/v2/types/errors" ) -// FromTmProtoPublicKey converts a TM's tmprotocrypto.PublicKey into our own PubKey. -func FromTmProtoPublicKey(protoPk tmprotocrypto.PublicKey) (cryptotypes.PubKey, error) { +// FromTmProtoPublicKey converts a TM's ostprotocrypto.PublicKey into our own PubKey. +func FromTmProtoPublicKey(protoPk ostprotocrypto.PublicKey) (cryptotypes.PubKey, error) { switch protoPk := protoPk.Sum.(type) { - case *tmprotocrypto.PublicKey_Ed25519: + case *ostprotocrypto.PublicKey_Ed25519: return &ed25519.PubKey{ Key: protoPk.Ed25519, }, nil - case *tmprotocrypto.PublicKey_Secp256K1: + case *ostprotocrypto.PublicKey_Secp256K1: return &secp256k1.PubKey{ Key: protoPk.Secp256K1, }, nil @@ -27,28 +27,28 @@ func FromTmProtoPublicKey(protoPk tmprotocrypto.PublicKey) (cryptotypes.PubKey, } } -// ToTmProtoPublicKey converts our own PubKey to TM's tmprotocrypto.PublicKey. -func ToTmProtoPublicKey(pk cryptotypes.PubKey) (tmprotocrypto.PublicKey, error) { +// ToTmProtoPublicKey converts our own PubKey to TM's ostprotocrypto.PublicKey. +func ToTmProtoPublicKey(pk cryptotypes.PubKey) (ostprotocrypto.PublicKey, error) { switch pk := pk.(type) { case *ed25519.PubKey: - return tmprotocrypto.PublicKey{ - Sum: &tmprotocrypto.PublicKey_Ed25519{ + return ostprotocrypto.PublicKey{ + Sum: &ostprotocrypto.PublicKey_Ed25519{ Ed25519: pk.Key, }, }, nil case *secp256k1.PubKey: - return tmprotocrypto.PublicKey{ - Sum: &tmprotocrypto.PublicKey_Secp256K1{ + return ostprotocrypto.PublicKey{ + Sum: &ostprotocrypto.PublicKey_Secp256K1{ Secp256K1: pk.Key, }, }, nil default: - return tmprotocrypto.PublicKey{}, sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "cannot convert %v to Tendermint public key", pk) + return ostprotocrypto.PublicKey{}, sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "cannot convert %v to Tendermint public key", pk) } } -// FromTmPubKeyInterface converts TM's tmcrypto.PubKey to our own PubKey. -func FromTmPubKeyInterface(tmPk tmcrypto.PubKey) (cryptotypes.PubKey, error) { +// FromTmPubKeyInterface converts TM's ostcrypto.PubKey to our own PubKey. +func FromTmPubKeyInterface(tmPk ostcrypto.PubKey) (cryptotypes.PubKey, error) { tmProtoPk, err := encoding.PubKeyToProto(tmPk) if err != nil { return nil, err @@ -57,8 +57,8 @@ func FromTmPubKeyInterface(tmPk tmcrypto.PubKey) (cryptotypes.PubKey, error) { return FromTmProtoPublicKey(tmProtoPk) } -// ToTmPubKeyInterface converts our own PubKey to TM's tmcrypto.PubKey. -func ToTmPubKeyInterface(pk cryptotypes.PubKey) (tmcrypto.PubKey, error) { +// ToTmPubKeyInterface converts our own PubKey to TM's ostcrypto.PubKey. +func ToTmPubKeyInterface(pk cryptotypes.PubKey) (ostcrypto.PubKey, error) { tmProtoPk, err := ToTmProtoPublicKey(pk) if err != nil { return nil, err diff --git a/crypto/hd/fundraiser_test.go b/crypto/hd/fundraiser_test.go index 60c0dd79c3..d529d22f6f 100644 --- a/crypto/hd/fundraiser_test.go +++ b/crypto/hd/fundraiser_test.go @@ -11,7 +11,7 @@ import ( bip39 "github.com/cosmos/go-bip39" - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" "github.com/line/lbm-sdk/v2/crypto/hd" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" diff --git a/crypto/keyring/keyring.go b/crypto/keyring/keyring.go index 1f9172fb29..229313d75b 100644 --- a/crypto/keyring/keyring.go +++ b/crypto/keyring/keyring.go @@ -13,9 +13,9 @@ import ( "github.com/99designs/keyring" bip39 "github.com/cosmos/go-bip39" + ostcrypto "github.com/line/ostracon/crypto" "github.com/pkg/errors" "github.com/tendermint/crypto/bcrypt" - tmcrypto "github.com/tendermint/tendermint/crypto" "github.com/line/lbm-sdk/v2/client/input" "github.com/line/lbm-sdk/v2/codec/legacy" @@ -708,7 +708,7 @@ func newRealPrompt(dir string, buf io.Reader) func(string) (string, error) { continue } - saltBytes := tmcrypto.CRandBytes(16) + saltBytes := ostcrypto.CRandBytes(16) passwordHash, err := bcrypt.GenerateFromPassword(saltBytes, []byte(pass), 2) if err != nil { fmt.Fprintln(os.Stderr, err) diff --git a/crypto/keyring/legacy.go b/crypto/keyring/legacy.go index a5451e6586..476b7e8709 100644 --- a/crypto/keyring/legacy.go +++ b/crypto/keyring/legacy.go @@ -5,9 +5,9 @@ import ( "io" "strings" + ostos "github.com/line/ostracon/libs/os" + dbm "github.com/line/tm-db/v2" "github.com/pkg/errors" - tmos "github.com/tendermint/tendermint/libs/os" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/crypto" "github.com/line/lbm-sdk/v2/crypto/types" @@ -26,7 +26,7 @@ type LegacyKeybase interface { // NewLegacy creates a new instance of a legacy keybase. func NewLegacy(name, dir string, opts ...KeybaseOption) (LegacyKeybase, error) { - if err := tmos.EnsureDir(dir, 0700); err != nil { + if err := ostos.EnsureDir(dir, 0700); err != nil { return nil, fmt.Errorf("failed to create Keybase directory: %s", err) } diff --git a/crypto/keys/ed25519/ed25519.go b/crypto/keys/ed25519/ed25519.go index bd48397334..b6055e52ec 100644 --- a/crypto/keys/ed25519/ed25519.go +++ b/crypto/keys/ed25519/ed25519.go @@ -6,8 +6,8 @@ import ( "fmt" "io" - "github.com/tendermint/tendermint/crypto" - "github.com/tendermint/tendermint/crypto/tmhash" + "github.com/line/ostracon/crypto" + "github.com/line/ostracon/crypto/tmhash" "github.com/line/lbm-sdk/v2/codec" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" diff --git a/crypto/keys/ed25519/ed25519_test.go b/crypto/keys/ed25519/ed25519_test.go index 7b6849f5b4..a3ce5ad73f 100644 --- a/crypto/keys/ed25519/ed25519_test.go +++ b/crypto/keys/ed25519/ed25519_test.go @@ -5,10 +5,10 @@ import ( "encoding/base64" "testing" + "github.com/line/ostracon/crypto" + osted25519 "github.com/line/ostracon/crypto/ed25519" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - tmed25519 "github.com/tendermint/tendermint/crypto/ed25519" "github.com/line/lbm-sdk/v2/codec" ed25519 "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" @@ -179,7 +179,7 @@ func TestMarshalAmino(t *testing.T) { func TestMarshalAmino_BackwardsCompatibility(t *testing.T) { aminoCdc := codec.NewLegacyAmino() // Create Tendermint keys. - tmPrivKey := tmed25519.GenPrivKey() + tmPrivKey := osted25519.GenPrivKey() tmPubKey := tmPrivKey.PubKey() // Create our own keys, with the same private key as Tendermint's. privKey := &ed25519.PrivKey{Key: []byte(tmPrivKey)} diff --git a/crypto/keys/ed25519/keys.pb.go b/crypto/keys/ed25519/keys.pb.go index 35a98cf058..85aa8e1d37 100644 --- a/crypto/keys/ed25519/keys.pb.go +++ b/crypto/keys/ed25519/keys.pb.go @@ -125,7 +125,7 @@ func init() { func init() { proto.RegisterFile("cosmos/crypto/ed25519/keys.proto", fileDescriptor_48fe3336771e732d) } var fileDescriptor_48fe3336771e732d = []byte{ - // 221 bytes of a gzipped FileDescriptorProto + // 228 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0x4f, 0x4d, 0x31, 0x32, 0x35, 0x35, 0xb4, 0xd4, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xa8, @@ -135,11 +135,12 @@ var fileDescriptor_48fe3336771e732d = []byte{ 0x40, 0xb5, 0x42, 0x2f, 0xa0, 0x34, 0x29, 0x27, 0x33, 0xd9, 0x3b, 0xb5, 0x32, 0x08, 0xa4, 0xd0, 0x8a, 0x65, 0xc6, 0x02, 0x79, 0x06, 0x25, 0x2b, 0x2e, 0xf6, 0x80, 0xa2, 0xcc, 0x32, 0x90, 0x01, 0xfa, 0xc8, 0x06, 0xc8, 0xfe, 0xba, 0x27, 0x2f, 0x89, 0x6e, 0x40, 0x51, 0x66, 0x59, 0x62, 0x49, - 0x2a, 0xcc, 0x04, 0x27, 0xaf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, - 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, - 0x48, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0xf9, 0x17, 0x4c, 0xe9, - 0x16, 0xa7, 0x64, 0xc3, 0xbc, 0x0e, 0xf2, 0x32, 0xcc, 0xec, 0x24, 0x36, 0xb0, 0x77, 0x8c, 0x01, - 0x01, 0x00, 0x00, 0xff, 0xff, 0xb0, 0xd8, 0x01, 0xc0, 0x1f, 0x01, 0x00, 0x00, + 0x2a, 0xcc, 0x04, 0x27, 0x8f, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, + 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, + 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcf, 0xc9, 0xcc, 0x4b, 0xd5, + 0xcf, 0x49, 0xca, 0xd5, 0x2d, 0x4e, 0xc9, 0xd6, 0x2f, 0x33, 0x82, 0x79, 0x1c, 0xe4, 0x61, 0x98, + 0xc9, 0x49, 0x6c, 0x60, 0xcf, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x31, 0x27, 0xf2, + 0x1d, 0x01, 0x00, 0x00, } func (m *PubKey) Marshal() (dAtA []byte, err error) { diff --git a/crypto/keys/multisig/codec.go b/crypto/keys/multisig/codec.go index 25a0281785..00e9b98151 100644 --- a/crypto/keys/multisig/codec.go +++ b/crypto/keys/multisig/codec.go @@ -1,7 +1,7 @@ package multisig import ( - "github.com/tendermint/tendermint/crypto/sr25519" + "github.com/line/ostracon/crypto/sr25519" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" diff --git a/crypto/keys/multisig/keys.pb.go b/crypto/keys/multisig/keys.pb.go index 8c817ea0a6..60985794d6 100644 --- a/crypto/keys/multisig/keys.pb.go +++ b/crypto/keys/multisig/keys.pb.go @@ -72,7 +72,7 @@ func init() { func init() { proto.RegisterFile("cosmos/crypto/multisig/keys.proto", fileDescriptor_46b57537e097d47d) } var fileDescriptor_46b57537e097d47d = []byte{ - // 287 bytes of a gzipped FileDescriptorProto + // 294 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0xcf, 0x2d, 0xcd, 0x29, 0xc9, 0x2c, 0xce, 0x4c, 0xd7, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x83, @@ -86,11 +86,12 @@ var fileDescriptor_46b57537e097d47d = []byte{ 0x4a, 0x30, 0x29, 0x30, 0x6b, 0x70, 0x1b, 0x89, 0xe8, 0x41, 0xac, 0xd6, 0x83, 0x59, 0xad, 0xe7, 0x98, 0x57, 0xe9, 0x24, 0xfb, 0xe8, 0x9e, 0x3c, 0x3b, 0xc4, 0xaa, 0xe2, 0x4f, 0xf7, 0xe4, 0xf9, 0x20, 0xc6, 0x16, 0x94, 0x26, 0x81, 0x74, 0x2a, 0x05, 0x71, 0x41, 0xcc, 0x01, 0xc9, 0x5a, 0xb1, - 0x74, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3e, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x07, + 0x74, 0x2c, 0x90, 0x67, 0x70, 0xf2, 0x3c, 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, 0xc3, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0x58, 0xb0, 0x81, - 0x29, 0xdd, 0xe2, 0x94, 0x6c, 0x58, 0x08, 0x82, 0x8c, 0x85, 0x07, 0x63, 0x12, 0x1b, 0xd8, 0x2d, - 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x76, 0x6e, 0xbf, 0x3c, 0x67, 0x01, 0x00, 0x00, + 0x28, 0xfd, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0x9c, 0xcc, 0xbc, + 0x54, 0xfd, 0x9c, 0xa4, 0x5c, 0xdd, 0xe2, 0x94, 0x6c, 0xfd, 0x32, 0x23, 0x58, 0xf8, 0x81, 0x0c, + 0x85, 0x07, 0x62, 0x12, 0x1b, 0xd8, 0x25, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x06, 0xb2, + 0x0e, 0xe9, 0x65, 0x01, 0x00, 0x00, } func (m *LegacyAminoPubKey) Marshal() (dAtA []byte, err error) { diff --git a/crypto/keys/multisig/multisig.go b/crypto/keys/multisig/multisig.go index 01baaa7e31..5140a63f4f 100644 --- a/crypto/keys/multisig/multisig.go +++ b/crypto/keys/multisig/multisig.go @@ -3,7 +3,7 @@ package multisig import ( fmt "fmt" - tmcrypto "github.com/tendermint/tendermint/crypto" + ostcrypto "github.com/line/ostracon/crypto" "github.com/line/lbm-sdk/v2/codec/types" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" @@ -32,7 +32,7 @@ func NewLegacyAminoPubKey(k int, pubKeys []cryptotypes.PubKey) *LegacyAminoPubKe // Address implements cryptotypes.PubKey Address method func (m *LegacyAminoPubKey) Address() cryptotypes.Address { - return tmcrypto.AddressHash(m.Bytes()) + return ostcrypto.AddressHash(m.Bytes()) } // Bytes returns the proto encoded version of the LegacyAminoPubKey diff --git a/crypto/keys/secp256k1/keys.pb.go b/crypto/keys/secp256k1/keys.pb.go index afcbab54b0..59c2307c5d 100644 --- a/crypto/keys/secp256k1/keys.pb.go +++ b/crypto/keys/secp256k1/keys.pb.go @@ -126,7 +126,7 @@ func init() { } var fileDescriptor_e0835e68ebdcb224 = []byte{ - // 185 bytes of a gzipped FileDescriptorProto + // 193 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4a, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2e, 0xaa, 0x2c, 0x28, 0xc9, 0xd7, 0x2f, 0x4e, 0x4d, 0x2e, 0x30, 0x32, 0x35, 0xcb, 0x36, 0xd4, 0xcf, 0x4e, 0xad, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, @@ -134,11 +134,12 @@ var fileDescriptor_e0835e68ebdcb224 = []byte{ 0xd1, 0x07, 0xb1, 0x20, 0xca, 0x95, 0x14, 0xb8, 0xd8, 0x02, 0x4a, 0x93, 0xbc, 0x53, 0x2b, 0x85, 0x04, 0xb8, 0x98, 0xb3, 0x53, 0x2b, 0x25, 0x18, 0x15, 0x18, 0x35, 0x78, 0x82, 0x40, 0x4c, 0x2b, 0x96, 0x19, 0x0b, 0xe4, 0x19, 0x94, 0xa4, 0xb9, 0xd8, 0x03, 0x8a, 0x32, 0xcb, 0xb0, 0x2a, 0x71, - 0xf2, 0x39, 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, 0x98, 0xb3, 0xc1, 0x94, 0x6e, 0x71, 0x4a, 0x36, - 0xcc, 0x07, 0x20, 0x77, 0x23, 0xbc, 0x91, 0xc4, 0x06, 0x76, 0x93, 0x31, 0x20, 0x00, 0x00, 0xff, - 0xff, 0x63, 0x00, 0x68, 0x16, 0xe8, 0x00, 0x00, 0x00, + 0xf2, 0x3a, 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, 0x83, 0xf4, 0xcc, 0x92, + 0x8c, 0xd2, 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0x9c, 0xcc, 0xbc, 0x54, 0xfd, 0x9c, 0xa4, 0x5c, + 0xdd, 0xe2, 0x94, 0x6c, 0xfd, 0x32, 0x23, 0x98, 0xfb, 0x41, 0xae, 0x46, 0x78, 0x22, 0x89, 0x0d, + 0xec, 0x22, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x97, 0x78, 0x4b, 0xe3, 0xe6, 0x00, 0x00, + 0x00, } func (m *PubKey) Marshal() (dAtA []byte, err error) { diff --git a/crypto/keys/secp256k1/secp256k1.go b/crypto/keys/secp256k1/secp256k1.go index ecaba5aa03..07ed22c636 100644 --- a/crypto/keys/secp256k1/secp256k1.go +++ b/crypto/keys/secp256k1/secp256k1.go @@ -9,7 +9,7 @@ import ( "math/big" secp256k1 "github.com/btcsuite/btcd/btcec" - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" "golang.org/x/crypto/ripemd160" // nolint: staticcheck // necessary for Bitcoin address format "github.com/line/lbm-sdk/v2/codec" diff --git a/crypto/keys/secp256k1/secp256k1_cgo.go b/crypto/keys/secp256k1/secp256k1_cgo.go index 357754bb7f..d0df532f34 100644 --- a/crypto/keys/secp256k1/secp256k1_cgo.go +++ b/crypto/keys/secp256k1/secp256k1_cgo.go @@ -3,7 +3,7 @@ package secp256k1 import ( - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1/internal/secp256k1" ) diff --git a/crypto/keys/secp256k1/secp256k1_nocgo.go b/crypto/keys/secp256k1/secp256k1_nocgo.go index 2d605447f4..da5b57ea64 100644 --- a/crypto/keys/secp256k1/secp256k1_nocgo.go +++ b/crypto/keys/secp256k1/secp256k1_nocgo.go @@ -7,7 +7,7 @@ import ( secp256k1 "github.com/btcsuite/btcd/btcec" - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" ) // used to reject malleable signatures diff --git a/crypto/keys/secp256k1/secp256k1_test.go b/crypto/keys/secp256k1/secp256k1_test.go index df238c915f..42297173b5 100644 --- a/crypto/keys/secp256k1/secp256k1_test.go +++ b/crypto/keys/secp256k1/secp256k1_test.go @@ -9,10 +9,10 @@ import ( btcSecp256k1 "github.com/btcsuite/btcd/btcec" "github.com/btcsuite/btcutil/base58" + "github.com/line/ostracon/crypto" + ostsecp256k1 "github.com/line/ostracon/crypto/secp256k1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" - tmsecp256k1 "github.com/tendermint/tendermint/crypto/secp256k1" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" @@ -272,39 +272,39 @@ func TestMarshalAmino(t *testing.T) { func TestMarshalAmino_BackwardsCompatibility(t *testing.T) { aminoCdc := codec.NewLegacyAmino() // Create Tendermint keys. - tmPrivKey := tmsecp256k1.GenPrivKey() - tmPubKey := tmPrivKey.PubKey() + ostPrivKey := ostsecp256k1.GenPrivKey() + ostPubKey := ostPrivKey.PubKey() // Create our own keys, with the same private key as Tendermint's. - privKey := &secp256k1.PrivKey{Key: []byte(tmPrivKey)} + privKey := &secp256k1.PrivKey{Key: []byte(ostPrivKey)} pubKey := privKey.PubKey().(*secp256k1.PubKey) testCases := []struct { desc string - tmKey interface{} + ostKey interface{} ourKey interface{} marshalFn func(o interface{}) ([]byte, error) }{ { "secp256k1 private key, binary", - tmPrivKey, + ostPrivKey, privKey, aminoCdc.MarshalBinaryBare, }, { "secp256k1 private key, JSON", - tmPrivKey, + ostPrivKey, privKey, aminoCdc.MarshalJSON, }, { "secp256k1 public key, binary", - tmPubKey, + ostPubKey, pubKey, aminoCdc.MarshalBinaryBare, }, { "secp256k1 public key, JSON", - tmPubKey, + ostPubKey, pubKey, aminoCdc.MarshalJSON, }, @@ -313,7 +313,7 @@ func TestMarshalAmino_BackwardsCompatibility(t *testing.T) { for _, tc := range testCases { t.Run(tc.desc, func(t *testing.T) { // Make sure Amino encoding override is not breaking backwards compatibility. - bz1, err := tc.marshalFn(tc.tmKey) + bz1, err := tc.marshalFn(tc.ostKey) require.NoError(t, err) bz2, err := tc.marshalFn(tc.ourKey) require.NoError(t, err) diff --git a/crypto/ledger/ledger_mock.go b/crypto/ledger/ledger_mock.go index 5c8af242a1..0a3bb21814 100644 --- a/crypto/ledger/ledger_mock.go +++ b/crypto/ledger/ledger_mock.go @@ -8,8 +8,8 @@ import ( "github.com/btcsuite/btcd/btcec" "github.com/pkg/errors" + "github.com/line/ostracon/crypto" secp256k1 "github.com/tendermint/btcd/btcec" - "github.com/tendermint/tendermint/crypto" "github.com/cosmos/go-bip39" @@ -80,7 +80,7 @@ func (mock LedgerSECP256K1Mock) GetAddressPubKeySECP256K1(derivationPath []uint3 compressedPublicKey := make([]byte, csecp256k1.PubKeySize) copy(compressedPublicKey, cmp.SerializeCompressed()) - // Generate the bech32 addr using existing tmcrypto/etc. + // Generate the bech32 addr using existing ostcrypto/etc. pub := &csecp256k1.PubKey{Key: compressedPublicKey} addr := sdk.AccAddress(pub.Address()).String() return pk, addr, err diff --git a/crypto/types/compact_bit_array_test.go b/crypto/types/compact_bit_array_test.go index 44408e43ae..2648ba7de7 100644 --- a/crypto/types/compact_bit_array_test.go +++ b/crypto/types/compact_bit_array_test.go @@ -8,12 +8,12 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - tmrand "github.com/tendermint/tendermint/libs/rand" + ostrand "github.com/line/ostracon/libs/rand" ) func randCompactBitArray(bits int) (*CompactBitArray, []byte) { numBytes := (bits + 7) / 8 - src := tmrand.Bytes((bits + 7) / 8) + src := ostrand.Bytes((bits + 7) / 8) bA := NewCompactBitArray(bits) for i := 0; i < numBytes-1; i++ { diff --git a/crypto/types/multisig.pb.go b/crypto/types/multisig.pb.go index b9c907ade0..5cafd344d6 100644 --- a/crypto/types/multisig.pb.go +++ b/crypto/types/multisig.pb.go @@ -136,24 +136,25 @@ func init() { } var fileDescriptor_1177bdf7025769be = []byte{ - // 269 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0x31, 0x4f, 0x83, 0x50, - 0x14, 0x85, 0x79, 0x5a, 0x1d, 0x5e, 0xaa, 0x8d, 0xa4, 0x03, 0x71, 0x78, 0x25, 0x9d, 0xd0, 0xa4, - 0x90, 0xc6, 0xc4, 0xa1, 0x9b, 0x74, 0x76, 0xa1, 0x93, 0x2e, 0x0d, 0xd0, 0x17, 0x7c, 0xb1, 0x78, - 0xc9, 0xbb, 0x17, 0x23, 0xff, 0xc2, 0xd1, 0x51, 0xff, 0x8d, 0x23, 0xa3, 0xa3, 0x81, 0x3f, 0x62, - 0xfa, 0x90, 0xa6, 0xd3, 0xbd, 0xe7, 0x9c, 0xef, 0x0e, 0xf7, 0xf0, 0x59, 0x0a, 0x98, 0x03, 0x06, - 0xa9, 0xae, 0x0a, 0x82, 0x20, 0x2f, 0xb7, 0xa4, 0x50, 0x65, 0xc1, 0xeb, 0x3c, 0x91, 0x14, 0xcf, - 0xf7, 0x86, 0x5f, 0x68, 0x20, 0xb0, 0x45, 0x87, 0xfb, 0x1d, 0xee, 0xef, 0xd3, 0x7f, 0xfc, 0x72, - 0x9c, 0x41, 0x06, 0x06, 0x0d, 0x76, 0x5b, 0x77, 0x35, 0xbd, 0xe5, 0xe7, 0xf7, 0x3b, 0x72, 0xa5, - 0xb2, 0x97, 0x98, 0x4a, 0x2d, 0x6d, 0xc1, 0x39, 0xf6, 0x02, 0x1d, 0xe6, 0x1e, 0x7b, 0xc3, 0xe8, - 0xc0, 0x59, 0x0c, 0xea, 0xaf, 0x09, 0x9b, 0x3e, 0xf0, 0xd1, 0x12, 0xf2, 0x22, 0x4e, 0x29, 0x54, - 0x74, 0xa7, 0x75, 0x5c, 0xd9, 0xd7, 0xfc, 0x42, 0xbe, 0x91, 0x8e, 0xd7, 0x89, 0x22, 0x5c, 0x23, - 0x81, 0x96, 0x1b, 0x87, 0xb9, 0xcc, 0x3b, 0x8b, 0x46, 0x26, 0x08, 0x15, 0xe1, 0xca, 0xd8, 0xf6, - 0x98, 0x9f, 0xc8, 0xad, 0xcc, 0xd1, 0x39, 0x72, 0x99, 0x37, 0x8c, 0x3a, 0xb1, 0x18, 0x7c, 0x7c, - 0x4e, 0xac, 0x70, 0xf9, 0xdd, 0x08, 0x56, 0x37, 0x82, 0xfd, 0x36, 0x82, 0xbd, 0xb7, 0xc2, 0xaa, - 0x5b, 0x61, 0xfd, 0xb4, 0xc2, 0x7a, 0xbc, 0xca, 0x14, 0x3d, 0x95, 0x89, 0x9f, 0x42, 0x1e, 0xf4, - 0xe5, 0x98, 0x31, 0xc3, 0xcd, 0x73, 0xdf, 0x13, 0x55, 0x85, 0xc4, 0xe4, 0xd4, 0xbc, 0x77, 0xf3, - 0x17, 0x00, 0x00, 0xff, 0xff, 0xba, 0x52, 0xb5, 0x1f, 0x45, 0x01, 0x00, 0x00, + // 274 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, + 0x10, 0x86, 0x63, 0x28, 0x0c, 0x56, 0xa1, 0x22, 0xea, 0x50, 0x31, 0xb8, 0x51, 0x17, 0x22, 0xa4, + 0xc6, 0x2a, 0x48, 0x0c, 0xdd, 0x1a, 0x66, 0x96, 0x74, 0x82, 0xa5, 0x4a, 0x52, 0xcb, 0x58, 0xc4, + 0x75, 0xe4, 0xbb, 0x54, 0xe4, 0x2d, 0x18, 0x19, 0xe1, 0x6d, 0x18, 0x33, 0x32, 0xa2, 0xe4, 0x45, + 0x50, 0x13, 0x5a, 0xb1, 0xdd, 0xff, 0xfd, 0xdf, 0x0d, 0x77, 0x74, 0x9a, 0x1a, 0xd0, 0x06, 0x78, + 0x6a, 0xcb, 0x1c, 0x0d, 0xd7, 0x45, 0x86, 0x0a, 0x94, 0xe4, 0xdb, 0x59, 0x22, 0x30, 0x9e, 0x1d, + 0x40, 0x90, 0x5b, 0x83, 0xc6, 0x65, 0x9d, 0x1e, 0x74, 0x7a, 0x70, 0x68, 0xff, 0xf4, 0xcb, 0xa1, + 0x34, 0xd2, 0xb4, 0x2a, 0xdf, 0x4d, 0xdd, 0xd6, 0xe4, 0x8e, 0x9e, 0x3f, 0xec, 0xcc, 0xa5, 0x92, + 0x9b, 0x18, 0x0b, 0x2b, 0x5c, 0x46, 0x29, 0xec, 0x03, 0x8c, 0x88, 0x77, 0xec, 0xf7, 0xa3, 0x7f, + 0x64, 0xde, 0xab, 0x3e, 0xc7, 0x64, 0xf2, 0x48, 0x07, 0xf7, 0x46, 0xe7, 0x71, 0x8a, 0xa1, 0xc2, + 0x85, 0xb5, 0x71, 0xe9, 0x5e, 0xd3, 0x0b, 0xf1, 0x8a, 0x36, 0x5e, 0x25, 0x0a, 0x61, 0x05, 0x68, + 0xac, 0x58, 0x8f, 0x88, 0x47, 0xfc, 0xb3, 0x68, 0xd0, 0x16, 0xa1, 0x42, 0x58, 0xb6, 0xd8, 0x1d, + 0xd2, 0x13, 0x91, 0x09, 0x0d, 0xa3, 0x23, 0x8f, 0xf8, 0xfd, 0xa8, 0x0b, 0xf3, 0xde, 0xfb, 0xc7, + 0xd8, 0x09, 0x17, 0x5f, 0x35, 0x23, 0x55, 0xcd, 0xc8, 0x4f, 0xcd, 0xc8, 0x5b, 0xc3, 0x9c, 0xaa, + 0x61, 0xce, 0x77, 0xc3, 0x9c, 0xa7, 0x2b, 0xa9, 0xf0, 0xb9, 0x48, 0x82, 0xd4, 0x68, 0x9e, 0xa9, + 0x8d, 0xe0, 0x59, 0xa2, 0xa7, 0xb0, 0x7e, 0xe1, 0xdb, 0x9b, 0xfd, 0x97, 0xb0, 0xcc, 0x05, 0x24, + 0xa7, 0xed, 0x71, 0xb7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x42, 0xb7, 0xd7, 0x43, 0x01, + 0x00, 0x00, } func (m *MultiSignature) Marshal() (dAtA []byte, err error) { diff --git a/crypto/types/types.go b/crypto/types/types.go index a19ecf5632..4e8eacaf9b 100644 --- a/crypto/types/types.go +++ b/crypto/types/types.go @@ -2,7 +2,7 @@ package types import ( proto "github.com/gogo/protobuf/proto" - tmcrypto "github.com/tendermint/tendermint/crypto" + ostcrypto "github.com/line/ostracon/crypto" ) // PubKey defines a public key and extends proto.Message. @@ -39,5 +39,5 @@ type PrivKey interface { } type ( - Address = tmcrypto.Address + Address = ostcrypto.Address ) diff --git a/docs/architecture/adr-001-coin-source-tracing.md b/docs/architecture/adr-001-coin-source-tracing.md index be3ff23865..1d4267c30d 100644 --- a/docs/architecture/adr-001-coin-source-tracing.md +++ b/docs/architecture/adr-001-coin-source-tracing.md @@ -137,7 +137,7 @@ The `IBCDenom` function constructs the `Coin` denomination used when creating th // Hash returns the hex bytes of the SHA256 hash of the DenomTrace fields using the following formula: // // hash = sha256(tracePath + "/" + baseDenom) -func (dt DenomTrace) Hash() tmbytes.HexBytes { +func (dt DenomTrace) Hash() ostbytes.HexBytes { return tmhash.Sum(dt.Path + "/" + dt.BaseDenom) } diff --git a/docs/architecture/adr-032-typed-events.md b/docs/architecture/adr-032-typed-events.md index 33758900d4..30d798c2a9 100644 --- a/docs/architecture/adr-032-typed-events.md +++ b/docs/architecture/adr-032-typed-events.md @@ -261,8 +261,8 @@ func TxEmitter(ctx context.Context, cliCtx client.Context, ehs ...EventHandler) return group.Wait() } -// PublishChainTxEvents events using tmclient. Waits on context shutdown signals to exit. -func PublishChainTxEvents(ctx context.Context, client tmclient.EventsClient, bus pubsub.Bus, mb module.BasicManager) (err error) { +// PublishChainTxEvents events using ostclient. Waits on context shutdown signals to exit. +func PublishChainTxEvents(ctx context.Context, client ostclient.EventsClient, bus pubsub.Bus, mb module.BasicManager) (err error) { // Subscribe to transaction events txch, err := client.Subscribe(ctx, "txevents", "tm.event='Tx'", 100) if err != nil { diff --git a/docs/basics/accounts.md b/docs/basics/accounts.md index 3b50c7a145..2268ff5736 100644 --- a/docs/basics/accounts.md +++ b/docs/basics/accounts.md @@ -68,7 +68,7 @@ The default implementation of `Keyring` comes from the third-party [`99designs/k A few notes on the `Keyring` methods: -- `Sign(uid string, payload []byte) ([]byte, tmcrypto.PubKey, error)` strictly deals with the signature of the `payload` bytes. Some preliminary work should be done beforehand to prepare and encode the transaction into a canonical `[]byte` form. Protobuf being not deterministic, it has been decided in [ADR-020](../architecture/adr-020-protobuf-transaction-encoding.md) that the canonical `payload` to sign is the `SignDoc` struct, deterministically encoded using [ADR-027](adr-027-deterministic-protobuf-serialization.md). Note that signature verification is not implemented in the SDK by default, it is deferred to the [`anteHandler`](../core/baseapp.md#antehandler). +- `Sign(uid string, payload []byte) ([]byte, ostcrypto.PubKey, error)` strictly deals with the signature of the `payload` bytes. Some preliminary work should be done beforehand to prepare and encode the transaction into a canonical `[]byte` form. Protobuf being not deterministic, it has been decided in [ADR-020](../architecture/adr-020-protobuf-transaction-encoding.md) that the canonical `payload` to sign is the `SignDoc` struct, deterministically encoded using [ADR-027](adr-027-deterministic-protobuf-serialization.md). Note that signature verification is not implemented in the SDK by default, it is deferred to the [`anteHandler`](../core/baseapp.md#antehandler). +++ https://github.com/cosmos/cosmos-sdk/blob/v0.40.0-rc3/proto/cosmos/tx/v1beta1/tx.proto#L47-L64 - `NewAccount(uid, mnemonic, bip39Passwd, hdPath string, algo SignatureAlgo) (Info, error)` creates a new account based on the [`bip44 path`](https://github.com/bitcoin/bips/blob/master/bip-0044.mediawiki) and persists it on disk (note that the `PrivKey` is [encrypted with a passphrase before being persisted](https://github.com/cosmos/cosmos-sdk/blob/v0.40.0-rc3/crypto/armor.go), it is **never stored unencrypted**). In the context of this method, the `account` and `address` parameters refer to the segment of the BIP44 derivation path (e.g. `0`, `1`, `2`, ...) used to derive the `PrivKey` and `PubKey` from the mnemonic (note that given the same mnemonic and `account`, the same `PrivKey` will be generated, and given the same `account` and `address`, the same `PubKey` and `Address` will be generated). Finally, note that the `NewAccount` method derives keys and addresses using the algorithm specified in the last argument `algo`. Currently, the SDK supports two public key algorithms: diff --git a/docs/core/proto-docs.md b/docs/core/proto-docs.md index 44d55a8064..65a0fc2e40 100644 --- a/docs/core/proto-docs.md +++ b/docs/core/proto-docs.md @@ -85,6 +85,25 @@ - [Pair](#cosmos.base.kv.v1beta1.Pair) - [Pairs](#cosmos.base.kv.v1beta1.Pairs) +- [cosmos/base/ostracon/v1beta1/query.proto](#cosmos/base/ostracon/v1beta1/query.proto) + - [GetBlockByHeightRequest](#cosmos.base.ostracon.v1beta1.GetBlockByHeightRequest) + - [GetBlockByHeightResponse](#cosmos.base.ostracon.v1beta1.GetBlockByHeightResponse) + - [GetLatestBlockRequest](#cosmos.base.ostracon.v1beta1.GetLatestBlockRequest) + - [GetLatestBlockResponse](#cosmos.base.ostracon.v1beta1.GetLatestBlockResponse) + - [GetLatestValidatorSetRequest](#cosmos.base.ostracon.v1beta1.GetLatestValidatorSetRequest) + - [GetLatestValidatorSetResponse](#cosmos.base.ostracon.v1beta1.GetLatestValidatorSetResponse) + - [GetNodeInfoRequest](#cosmos.base.ostracon.v1beta1.GetNodeInfoRequest) + - [GetNodeInfoResponse](#cosmos.base.ostracon.v1beta1.GetNodeInfoResponse) + - [GetSyncingRequest](#cosmos.base.ostracon.v1beta1.GetSyncingRequest) + - [GetSyncingResponse](#cosmos.base.ostracon.v1beta1.GetSyncingResponse) + - [GetValidatorSetByHeightRequest](#cosmos.base.ostracon.v1beta1.GetValidatorSetByHeightRequest) + - [GetValidatorSetByHeightResponse](#cosmos.base.ostracon.v1beta1.GetValidatorSetByHeightResponse) + - [Module](#cosmos.base.ostracon.v1beta1.Module) + - [Validator](#cosmos.base.ostracon.v1beta1.Validator) + - [VersionInfo](#cosmos.base.ostracon.v1beta1.VersionInfo) + + - [Service](#cosmos.base.ostracon.v1beta1.Service) + - [cosmos/base/reflection/v1beta1/reflection.proto](#cosmos/base/reflection/v1beta1/reflection.proto) - [ListAllInterfacesRequest](#cosmos.base.reflection.v1beta1.ListAllInterfacesRequest) - [ListAllInterfacesResponse](#cosmos.base.reflection.v1beta1.ListAllInterfacesResponse) @@ -107,25 +126,6 @@ - [SnapshotItem](#cosmos.base.store.v1beta1.SnapshotItem) - [SnapshotStoreItem](#cosmos.base.store.v1beta1.SnapshotStoreItem) -- [cosmos/base/tendermint/v1beta1/query.proto](#cosmos/base/tendermint/v1beta1/query.proto) - - [GetBlockByHeightRequest](#cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest) - - [GetBlockByHeightResponse](#cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse) - - [GetLatestBlockRequest](#cosmos.base.tendermint.v1beta1.GetLatestBlockRequest) - - [GetLatestBlockResponse](#cosmos.base.tendermint.v1beta1.GetLatestBlockResponse) - - [GetLatestValidatorSetRequest](#cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest) - - [GetLatestValidatorSetResponse](#cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse) - - [GetNodeInfoRequest](#cosmos.base.tendermint.v1beta1.GetNodeInfoRequest) - - [GetNodeInfoResponse](#cosmos.base.tendermint.v1beta1.GetNodeInfoResponse) - - [GetSyncingRequest](#cosmos.base.tendermint.v1beta1.GetSyncingRequest) - - [GetSyncingResponse](#cosmos.base.tendermint.v1beta1.GetSyncingResponse) - - [GetValidatorSetByHeightRequest](#cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest) - - [GetValidatorSetByHeightResponse](#cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse) - - [Module](#cosmos.base.tendermint.v1beta1.Module) - - [Validator](#cosmos.base.tendermint.v1beta1.Validator) - - [VersionInfo](#cosmos.base.tendermint.v1beta1.VersionInfo) - - - [Service](#cosmos.base.tendermint.v1beta1.Service) - - [cosmos/capability/v1beta1/capability.proto](#cosmos/capability/v1beta1/capability.proto) - [Capability](#cosmos.capability.v1beta1.Capability) - [CapabilityOwners](#cosmos.capability.v1beta1.CapabilityOwners) @@ -1612,7 +1612,7 @@ Result is the union of ResponseFormat and ResponseCheckTx. | ----- | ---- | ----- | ----------- | | `data` | [bytes](#bytes) | | Data is any data returned from message or handler execution. It MUST be length prefixed in order to separate data from multiple message executions. | | `log` | [string](#string) | | Log contains the log information from message or handler execution. | -| `events` | [tendermint.abci.Event](#tendermint.abci.Event) | repeated | Events contains a slice of Event objects that were emitted during message or handler execution. | +| `events` | [ostracon.abci.Event](#ostracon.abci.Event) | repeated | Events contains a slice of Event objects that were emitted during message or handler execution. | @@ -1772,257 +1772,236 @@ Pairs defines a repeated slice of Pair objects. - +

Top

-## cosmos/base/reflection/v1beta1/reflection.proto - - - - +## cosmos/base/ostracon/v1beta1/query.proto -### ListAllInterfacesRequest -ListAllInterfacesRequest is the request type of the ListAllInterfaces RPC. + - - - - - -### ListAllInterfacesResponse -ListAllInterfacesResponse is the response type of the ListAllInterfaces RPC. +### GetBlockByHeightRequest +GetBlockByHeightRequest is the request type for the Query/GetBlockByHeight RPC method. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `interface_names` | [string](#string) | repeated | interface_names is an array of all the registered interfaces. | +| `height` | [int64](#int64) | | | - + -### ListImplementationsRequest -ListImplementationsRequest is the request type of the ListImplementations -RPC. +### GetBlockByHeightResponse +GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `interface_name` | [string](#string) | | interface_name defines the interface to query the implementations for. | - +| `block_id` | [ostracon.types.BlockID](#ostracon.types.BlockID) | | | +| `block` | [ostracon.types.Block](#ostracon.types.Block) | | | - -### ListImplementationsResponse -ListImplementationsResponse is the response type of the ListImplementations -RPC. + +### GetLatestBlockRequest +GetLatestBlockRequest is the request type for the Query/GetLatestBlock RPC method. -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `implementation_message_names` | [string](#string) | repeated | | - + - +### GetLatestBlockResponse +GetLatestBlockResponse is the response type for the Query/GetLatestBlock RPC method. - +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `block_id` | [ostracon.types.BlockID](#ostracon.types.BlockID) | | | +| `block` | [ostracon.types.Block](#ostracon.types.Block) | | | - -### ReflectionService -ReflectionService defines a service for interface reflection. -| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | -| ----------- | ------------ | ------------- | ------------| ------- | -------- | -| `ListAllInterfaces` | [ListAllInterfacesRequest](#cosmos.base.reflection.v1beta1.ListAllInterfacesRequest) | [ListAllInterfacesResponse](#cosmos.base.reflection.v1beta1.ListAllInterfacesResponse) | ListAllInterfaces lists all the interfaces registered in the interface registry. | GET|/cosmos/base/reflection/v1beta1/interfaces| -| `ListImplementations` | [ListImplementationsRequest](#cosmos.base.reflection.v1beta1.ListImplementationsRequest) | [ListImplementationsResponse](#cosmos.base.reflection.v1beta1.ListImplementationsResponse) | ListImplementations list all the concrete types that implement a given interface. | GET|/cosmos/base/reflection/v1beta1/interfaces/{interface_name}/implementations| - + - -

Top

+### GetLatestValidatorSetRequest +GetLatestValidatorSetRequest is the request type for the Query/GetValidatorSetByHeight RPC method. -## cosmos/base/snapshots/v1beta1/snapshot.proto +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | pagination defines an pagination for the request. | - -### Metadata -Metadata contains SDK-specific snapshot metadata. -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `chunk_hashes` | [bytes](#bytes) | repeated | SHA-256 chunk hashes | + +### GetLatestValidatorSetResponse +GetLatestValidatorSetResponse is the response type for the Query/GetValidatorSetByHeight RPC method. +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `block_height` | [int64](#int64) | | | +| `validators` | [Validator](#cosmos.base.ostracon.v1beta1.Validator) | repeated | | +| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) | | pagination defines an pagination for the response. | - -### Snapshot -Snapshot contains Tendermint state sync snapshot info. -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `height` | [uint64](#uint64) | | | -| `format` | [uint32](#uint32) | | | -| `chunks` | [uint32](#uint32) | | | -| `hash` | [bytes](#bytes) | | | -| `metadata` | [Metadata](#cosmos.base.snapshots.v1beta1.Metadata) | | | + +### GetNodeInfoRequest +GetNodeInfoRequest is the request type for the Query/GetNodeInfo RPC method. - - - - + +### GetNodeInfoResponse +GetNodeInfoResponse is the request type for the Query/GetNodeInfo RPC method. - -

Top

+| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `default_node_info` | [ostracon.p2p.DefaultNodeInfo](#ostracon.p2p.DefaultNodeInfo) | | | +| `application_version` | [VersionInfo](#cosmos.base.ostracon.v1beta1.VersionInfo) | | | -## cosmos/base/store/v1beta1/commit_info.proto - -### CommitID -CommitID defines the committment information when a specific store is -committed. + -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `version` | [int64](#int64) | | | -| `hash` | [bytes](#bytes) | | | +### GetSyncingRequest +GetSyncingRequest is the request type for the Query/GetSyncing RPC method. - + -### CommitInfo -CommitInfo defines commit information used by the multi-store when committing -a version/height. +### GetSyncingResponse +GetSyncingResponse is the response type for the Query/GetSyncing RPC method. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `version` | [int64](#int64) | | | -| `store_infos` | [StoreInfo](#cosmos.base.store.v1beta1.StoreInfo) | repeated | | +| `syncing` | [bool](#bool) | | | - + -### StoreInfo -StoreInfo defines store-specific commit information. It contains a reference -between a store name and the commit ID. +### GetValidatorSetByHeightRequest +GetValidatorSetByHeightRequest is the request type for the Query/GetValidatorSetByHeight RPC method. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `name` | [string](#string) | | | -| `commit_id` | [CommitID](#cosmos.base.store.v1beta1.CommitID) | | | +| `height` | [int64](#int64) | | | +| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | pagination defines an pagination for the request. | - - + - +### GetValidatorSetByHeightResponse +GetValidatorSetByHeightResponse is the response type for the Query/GetValidatorSetByHeight RPC method. - +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `block_height` | [int64](#int64) | | | +| `validators` | [Validator](#cosmos.base.ostracon.v1beta1.Validator) | repeated | | +| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) | | pagination defines an pagination for the response. | - -

Top

-## cosmos/base/store/v1beta1/snapshot.proto - + -### SnapshotIAVLItem -SnapshotIAVLItem is an exported IAVL node. +### Module +Module is the type for VersionInfo | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `key` | [bytes](#bytes) | | | -| `value` | [bytes](#bytes) | | | -| `version` | [int64](#int64) | | | -| `height` | [int32](#int32) | | | +| `path` | [string](#string) | | module path | +| `version` | [string](#string) | | module version | +| `sum` | [string](#string) | | checksum | - + -### SnapshotItem -SnapshotItem is an item contained in a rootmulti.Store snapshot. +### Validator +Validator is the type for the validator-set. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `store` | [SnapshotStoreItem](#cosmos.base.store.v1beta1.SnapshotStoreItem) | | | -| `iavl` | [SnapshotIAVLItem](#cosmos.base.store.v1beta1.SnapshotIAVLItem) | | | +| `address` | [string](#string) | | | +| `pub_key` | [google.protobuf.Any](#google.protobuf.Any) | | | +| `voting_power` | [int64](#int64) | | | +| `proposer_priority` | [int64](#int64) | | | - + -### SnapshotStoreItem -SnapshotStoreItem contains metadata about a snapshotted store. +### VersionInfo +VersionInfo is the type for the GetNodeInfoResponse message. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | `name` | [string](#string) | | | +| `app_name` | [string](#string) | | | +| `version` | [string](#string) | | | +| `git_commit` | [string](#string) | | | +| `build_tags` | [string](#string) | | | +| `go_version` | [string](#string) | | | +| `build_deps` | [Module](#cosmos.base.ostracon.v1beta1.Module) | repeated | | @@ -2034,240 +2013,276 @@ SnapshotStoreItem contains metadata about a snapshotted store. - + +### Service +Service defines the gRPC querier service for ostracon queries. - -

Top

+| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | +| ----------- | ------------ | ------------- | ------------| ------- | -------- | +| `GetNodeInfo` | [GetNodeInfoRequest](#cosmos.base.ostracon.v1beta1.GetNodeInfoRequest) | [GetNodeInfoResponse](#cosmos.base.ostracon.v1beta1.GetNodeInfoResponse) | GetNodeInfo queries the current node info. | GET|/cosmos/base/ostracon/v1beta1/node_info| +| `GetSyncing` | [GetSyncingRequest](#cosmos.base.ostracon.v1beta1.GetSyncingRequest) | [GetSyncingResponse](#cosmos.base.ostracon.v1beta1.GetSyncingResponse) | GetSyncing queries node syncing. | GET|/cosmos/base/ostracon/v1beta1/syncing| +| `GetLatestBlock` | [GetLatestBlockRequest](#cosmos.base.ostracon.v1beta1.GetLatestBlockRequest) | [GetLatestBlockResponse](#cosmos.base.ostracon.v1beta1.GetLatestBlockResponse) | GetLatestBlock returns the latest block. | GET|/cosmos/base/ostracon/v1beta1/blocks/latest| +| `GetBlockByHeight` | [GetBlockByHeightRequest](#cosmos.base.ostracon.v1beta1.GetBlockByHeightRequest) | [GetBlockByHeightResponse](#cosmos.base.ostracon.v1beta1.GetBlockByHeightResponse) | GetBlockByHeight queries block for given height. | GET|/cosmos/base/ostracon/v1beta1/blocks/{height}| +| `GetLatestValidatorSet` | [GetLatestValidatorSetRequest](#cosmos.base.ostracon.v1beta1.GetLatestValidatorSetRequest) | [GetLatestValidatorSetResponse](#cosmos.base.ostracon.v1beta1.GetLatestValidatorSetResponse) | GetLatestValidatorSet queries latest validator-set. | GET|/cosmos/base/ostracon/v1beta1/validatorsets/latest| +| `GetValidatorSetByHeight` | [GetValidatorSetByHeightRequest](#cosmos.base.ostracon.v1beta1.GetValidatorSetByHeightRequest) | [GetValidatorSetByHeightResponse](#cosmos.base.ostracon.v1beta1.GetValidatorSetByHeightResponse) | GetValidatorSetByHeight queries validator-set at a given height. | GET|/cosmos/base/ostracon/v1beta1/validatorsets/{height}| -## cosmos/base/tendermint/v1beta1/query.proto + - + +

Top

-### GetBlockByHeightRequest -GetBlockByHeightRequest is the request type for the Query/GetBlockByHeight RPC method. +## cosmos/base/reflection/v1beta1/reflection.proto -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `height` | [int64](#int64) | | | + +### ListAllInterfacesRequest +ListAllInterfacesRequest is the request type of the ListAllInterfaces RPC. - -### GetBlockByHeightResponse -GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. + + + +### ListAllInterfacesResponse +ListAllInterfacesResponse is the response type of the ListAllInterfaces RPC. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `block_id` | [tendermint.types.BlockID](#tendermint.types.BlockID) | | | -| `block` | [tendermint.types.Block](#tendermint.types.Block) | | | +| `interface_names` | [string](#string) | repeated | interface_names is an array of all the registered interfaces. | - + -### GetLatestBlockRequest -GetLatestBlockRequest is the request type for the Query/GetLatestBlock RPC method. +### ListImplementationsRequest +ListImplementationsRequest is the request type of the ListImplementations +RPC. +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `interface_name` | [string](#string) | | interface_name defines the interface to query the implementations for. | - -### GetLatestBlockResponse -GetLatestBlockResponse is the response type for the Query/GetLatestBlock RPC method. + + + +### ListImplementationsResponse +ListImplementationsResponse is the response type of the ListImplementations +RPC. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `block_id` | [tendermint.types.BlockID](#tendermint.types.BlockID) | | | -| `block` | [tendermint.types.Block](#tendermint.types.Block) | | | +| `implementation_message_names` | [string](#string) | repeated | | + - + -### GetLatestValidatorSetRequest -GetLatestValidatorSetRequest is the request type for the Query/GetValidatorSetByHeight RPC method. + -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | pagination defines an pagination for the request. | + + +### ReflectionService +ReflectionService defines a service for interface reflection. + +| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | +| ----------- | ------------ | ------------- | ------------| ------- | -------- | +| `ListAllInterfaces` | [ListAllInterfacesRequest](#cosmos.base.reflection.v1beta1.ListAllInterfacesRequest) | [ListAllInterfacesResponse](#cosmos.base.reflection.v1beta1.ListAllInterfacesResponse) | ListAllInterfaces lists all the interfaces registered in the interface registry. | GET|/cosmos/base/reflection/v1beta1/interfaces| +| `ListImplementations` | [ListImplementationsRequest](#cosmos.base.reflection.v1beta1.ListImplementationsRequest) | [ListImplementationsResponse](#cosmos.base.reflection.v1beta1.ListImplementationsResponse) | ListImplementations list all the concrete types that implement a given interface. | GET|/cosmos/base/reflection/v1beta1/interfaces/{interface_name}/implementations| + + + +

Top

+## cosmos/base/snapshots/v1beta1/snapshot.proto - -### GetLatestValidatorSetResponse -GetLatestValidatorSetResponse is the response type for the Query/GetValidatorSetByHeight RPC method. + + +### Metadata +Metadata contains SDK-specific snapshot metadata. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `block_height` | [int64](#int64) | | | -| `validators` | [Validator](#cosmos.base.tendermint.v1beta1.Validator) | repeated | | -| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) | | pagination defines an pagination for the response. | +| `chunk_hashes` | [bytes](#bytes) | repeated | SHA-256 chunk hashes | - + + +### Snapshot +Snapshot contains Tendermint state sync snapshot info. -### GetNodeInfoRequest -GetNodeInfoRequest is the request type for the Query/GetNodeInfo RPC method. +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `height` | [uint64](#uint64) | | | +| `format` | [uint32](#uint32) | | | +| `chunks` | [uint32](#uint32) | | | +| `hash` | [bytes](#bytes) | | | +| `metadata` | [Metadata](#cosmos.base.snapshots.v1beta1.Metadata) | | | - + -### GetNodeInfoResponse -GetNodeInfoResponse is the request type for the Query/GetNodeInfo RPC method. + + -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `default_node_info` | [tendermint.p2p.DefaultNodeInfo](#tendermint.p2p.DefaultNodeInfo) | | | -| `application_version` | [VersionInfo](#cosmos.base.tendermint.v1beta1.VersionInfo) | | | + + +

Top

+## cosmos/base/store/v1beta1/commit_info.proto - -### GetSyncingRequest -GetSyncingRequest is the request type for the Query/GetSyncing RPC method. + +### CommitID +CommitID defines the committment information when a specific store is +committed. +| Field | Type | Label | Description | +| ----- | ---- | ----- | ----------- | +| `version` | [int64](#int64) | | | +| `hash` | [bytes](#bytes) | | | - -### GetSyncingResponse -GetSyncingResponse is the response type for the Query/GetSyncing RPC method. + + + + +### CommitInfo +CommitInfo defines commit information used by the multi-store when committing +a version/height. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `syncing` | [bool](#bool) | | | +| `version` | [int64](#int64) | | | +| `store_infos` | [StoreInfo](#cosmos.base.store.v1beta1.StoreInfo) | repeated | | - + -### GetValidatorSetByHeightRequest -GetValidatorSetByHeightRequest is the request type for the Query/GetValidatorSetByHeight RPC method. +### StoreInfo +StoreInfo defines store-specific commit information. It contains a reference +between a store name and the commit ID. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `height` | [int64](#int64) | | | -| `pagination` | [cosmos.base.query.v1beta1.PageRequest](#cosmos.base.query.v1beta1.PageRequest) | | pagination defines an pagination for the request. | +| `name` | [string](#string) | | | +| `commit_id` | [CommitID](#cosmos.base.store.v1beta1.CommitID) | | | + - + -### GetValidatorSetByHeightResponse -GetValidatorSetByHeightResponse is the response type for the Query/GetValidatorSetByHeight RPC method. + + -| Field | Type | Label | Description | -| ----- | ---- | ----- | ----------- | -| `block_height` | [int64](#int64) | | | -| `validators` | [Validator](#cosmos.base.tendermint.v1beta1.Validator) | repeated | | -| `pagination` | [cosmos.base.query.v1beta1.PageResponse](#cosmos.base.query.v1beta1.PageResponse) | | pagination defines an pagination for the response. | + +

Top

+## cosmos/base/store/v1beta1/snapshot.proto - + -### Module -Module is the type for VersionInfo +### SnapshotIAVLItem +SnapshotIAVLItem is an exported IAVL node. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `path` | [string](#string) | | module path | -| `version` | [string](#string) | | module version | -| `sum` | [string](#string) | | checksum | +| `key` | [bytes](#bytes) | | | +| `value` | [bytes](#bytes) | | | +| `version` | [int64](#int64) | | | +| `height` | [int32](#int32) | | | - + -### Validator -Validator is the type for the validator-set. +### SnapshotItem +SnapshotItem is an item contained in a rootmulti.Store snapshot. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `address` | [string](#string) | | | -| `pub_key` | [google.protobuf.Any](#google.protobuf.Any) | | | -| `voting_power` | [int64](#int64) | | | -| `proposer_priority` | [int64](#int64) | | | +| `store` | [SnapshotStoreItem](#cosmos.base.store.v1beta1.SnapshotStoreItem) | | | +| `iavl` | [SnapshotIAVLItem](#cosmos.base.store.v1beta1.SnapshotIAVLItem) | | | - + -### VersionInfo -VersionInfo is the type for the GetNodeInfoResponse message. +### SnapshotStoreItem +SnapshotStoreItem contains metadata about a snapshotted store. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | `name` | [string](#string) | | | -| `app_name` | [string](#string) | | | -| `version` | [string](#string) | | | -| `git_commit` | [string](#string) | | | -| `build_tags` | [string](#string) | | | -| `go_version` | [string](#string) | | | -| `build_deps` | [Module](#cosmos.base.tendermint.v1beta1.Module) | repeated | | @@ -2279,21 +2294,6 @@ VersionInfo is the type for the GetNodeInfoResponse message. - - - -### Service -Service defines the gRPC querier service for tendermint queries. - -| Method Name | Request Type | Response Type | Description | HTTP Verb | Endpoint | -| ----------- | ------------ | ------------- | ------------| ------- | -------- | -| `GetNodeInfo` | [GetNodeInfoRequest](#cosmos.base.tendermint.v1beta1.GetNodeInfoRequest) | [GetNodeInfoResponse](#cosmos.base.tendermint.v1beta1.GetNodeInfoResponse) | GetNodeInfo queries the current node info. | GET|/cosmos/base/tendermint/v1beta1/node_info| -| `GetSyncing` | [GetSyncingRequest](#cosmos.base.tendermint.v1beta1.GetSyncingRequest) | [GetSyncingResponse](#cosmos.base.tendermint.v1beta1.GetSyncingResponse) | GetSyncing queries node syncing. | GET|/cosmos/base/tendermint/v1beta1/syncing| -| `GetLatestBlock` | [GetLatestBlockRequest](#cosmos.base.tendermint.v1beta1.GetLatestBlockRequest) | [GetLatestBlockResponse](#cosmos.base.tendermint.v1beta1.GetLatestBlockResponse) | GetLatestBlock returns the latest block. | GET|/cosmos/base/tendermint/v1beta1/blocks/latest| -| `GetBlockByHeight` | [GetBlockByHeightRequest](#cosmos.base.tendermint.v1beta1.GetBlockByHeightRequest) | [GetBlockByHeightResponse](#cosmos.base.tendermint.v1beta1.GetBlockByHeightResponse) | GetBlockByHeight queries block for given height. | GET|/cosmos/base/tendermint/v1beta1/blocks/{height}| -| `GetLatestValidatorSet` | [GetLatestValidatorSetRequest](#cosmos.base.tendermint.v1beta1.GetLatestValidatorSetRequest) | [GetLatestValidatorSetResponse](#cosmos.base.tendermint.v1beta1.GetLatestValidatorSetResponse) | GetLatestValidatorSet queries latest validator-set. | GET|/cosmos/base/tendermint/v1beta1/validatorsets/latest| -| `GetValidatorSetByHeight` | [GetValidatorSetByHeightRequest](#cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightRequest) | [GetValidatorSetByHeightResponse](#cosmos.base.tendermint.v1beta1.GetValidatorSetByHeightResponse) | GetValidatorSetByHeight queries validator-set at a given height. | GET|/cosmos/base/tendermint/v1beta1/validatorsets/{height}| - @@ -5184,7 +5184,7 @@ recent HistoricalInfo | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `header` | [tendermint.types.Header](#tendermint.types.Header) | | | +| `header` | [ostracon.types.Header](#ostracon.types.Header) | | | | `valset` | [Validator](#cosmos.staking.v1beta1.Validator) | repeated | | @@ -9927,10 +9927,10 @@ trusted validator set at the TrustedHeight. | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | -| `signed_header` | [tendermint.types.SignedHeader](#tendermint.types.SignedHeader) | | | -| `validator_set` | [tendermint.types.ValidatorSet](#tendermint.types.ValidatorSet) | | | +| `signed_header` | [ostracon.types.SignedHeader](#ostracon.types.SignedHeader) | | | +| `validator_set` | [ostracon.types.ValidatorSet](#ostracon.types.ValidatorSet) | | | | `trusted_height` | [ibc.core.client.v1.Height](#ibc.core.client.v1.Height) | | | -| `trusted_validators` | [tendermint.types.ValidatorSet](#tendermint.types.ValidatorSet) | | | +| `trusted_validators` | [ostracon.types.ValidatorSet](#ostracon.types.ValidatorSet) | | | diff --git a/docs/ru/intro/intro.md b/docs/ru/intro/intro.md index ba54cfd7b9..9f08926330 100644 --- a/docs/ru/intro/intro.md +++ b/docs/ru/intro/intro.md @@ -32,4 +32,4 @@ Cosmos SDK является наиболее полным фреймворком - Прочитайте об [архитектуре приложения](./sdk-app-architecture.md), разрабатываемого с помощью SDK. -- Узнайте, как с нуля создать блокчейн для вашего приложения в [пошаговом примере](https://cosmos.network/docs/tutorial). \ No newline at end of file +- Узнайте, как с нуля создать блокчейн для вашего приложения в [пошаговом примере](https://cosmos.network/docs/tutorial). diff --git a/go.mod b/go.mod index ce7363ad1b..c1ae333e67 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,6 @@ require ( github.com/btcsuite/btcutil v1.0.2 github.com/confio/ics23/go v0.6.3 github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/iavl v0.15.3 github.com/cosmos/ledger-cosmos-go v0.11.1 github.com/dgraph-io/ristretto v0.0.3 // indirect github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect @@ -26,6 +25,9 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware v1.2.2 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/hashicorp/golang-lru v0.5.4 + github.com/line/iavl/v2 v2.0.0-init.1 + github.com/line/ostracon v0.34.9-0.20210316071456-5fea666cc7ce + github.com/line/tm-db/v2 v2.0.0-init.1 github.com/magiconair/properties v1.8.4 github.com/mattn/go-isatty v0.0.12 github.com/otiai10/copy v1.4.2 @@ -46,8 +48,6 @@ require ( github.com/tendermint/btcd v0.1.1 github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 github.com/tendermint/go-amino v0.16.0 - github.com/tendermint/tendermint v0.34.8 - github.com/tendermint/tm-db v0.6.4 golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad google.golang.org/genproto v0.0.0-20210114201628-6edceaf6022f google.golang.org/grpc v1.35.0 @@ -55,6 +55,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 ) -replace google.golang.org/grpc => google.golang.org/grpc v1.33.2 - -replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 +replace ( + github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 + google.golang.org/grpc => google.golang.org/grpc v1.33.2 +) diff --git a/go.sum b/go.sum index eb5d78bf26..505e7c7ce5 100644 --- a/go.sum +++ b/go.sum @@ -104,7 +104,6 @@ github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/iavl v0.15.0-rc3.0.20201009144442-230e9bdf52cd/go.mod h1:3xOIaNNX19p0QrX0VqWa6voPRoJRGGYtny+DH8NEPvE= github.com/cosmos/iavl v0.15.0-rc5/go.mod h1:WqoPL9yPTQ85QBMT45OOUzPxG/U/JcJoN7uMjgxke/I= -github.com/cosmos/iavl v0.15.3 h1:xE9r6HW8GeKeoYJN4zefpljZ1oukVScP/7M8oj6SUts= github.com/cosmos/iavl v0.15.3/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= @@ -329,6 +328,13 @@ github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOS github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= github.com/lightstep/lightstep-tracer-go v0.18.1/go.mod h1:jlF1pusYV4pidLvZ+XD0UBX0ZE6WURAspgAczcDHrL4= +github.com/line/iavl/v2 v2.0.0-init.1 h1:Qn+57tRRRlCsyMsgZs9YcoLlPPBi6QMVMhEwjHubCVk= +github.com/line/iavl/v2 v2.0.0-init.1/go.mod h1:isewgbbDSuyhB67oiOoX9ide3AOug2Y35gFqZaHI3L4= +github.com/line/ostracon v0.34.9-0.20210315041958-2a1f43c788f5/go.mod h1:1THU+kF+6fxLaNYQKcdNyLCO6t9LnqSMaExDMiLozbM= +github.com/line/ostracon v0.34.9-0.20210316071456-5fea666cc7ce h1:NLEQisrrFLOHCTfY6oFARnPWO2avqPmmas8lTfgMLCc= +github.com/line/ostracon v0.34.9-0.20210316071456-5fea666cc7ce/go.mod h1:PthHRpDto0bepI2qpZdTSNIx50Jr7HOiecKGyIxm09s= +github.com/line/tm-db/v2 v2.0.0-init.1 h1:oYM+IJk1GuxDx/OPhCbyvGLnpyQYa7dWg1IDjTOqdjQ= +github.com/line/tm-db/v2 v2.0.0-init.1/go.mod h1:TiTwPFffNAqep0nV0YWaxPjElbCp6yG4K8SCxy69mE4= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.4 h1:8KGKTcQQGm0Kv7vEbKFErAoAOFyyacLStRtQSeYtvkY= @@ -553,11 +559,9 @@ github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoM github.com/tendermint/tendermint v0.34.0-rc4/go.mod h1:yotsojf2C1QBOw4dZrTcxbyxmPUrT4hNuOQWX9XUwB4= github.com/tendermint/tendermint v0.34.0-rc6/go.mod h1:ugzyZO5foutZImv0Iyx/gOFCX6mjJTgbLHTwi17VDVg= github.com/tendermint/tendermint v0.34.0/go.mod h1:Aj3PIipBFSNO21r+Lq3TtzQ+uKESxkbA3yo/INM4QwQ= -github.com/tendermint/tendermint v0.34.8 h1:PMWgUx47FrNTsfhxCWzoiIlVAC1SE9+WBlnsF9oQW0I= -github.com/tendermint/tendermint v0.34.8/go.mod h1:JVuu3V1ZexOaZG8VJMRl8lnfrGw6hEB2TVnoUwKRbss= +github.com/tendermint/tendermint v0.34.7/go.mod h1:JVuu3V1ZexOaZG8VJMRl8lnfrGw6hEB2TVnoUwKRbss= github.com/tendermint/tm-db v0.6.2/go.mod h1:GYtQ67SUvATOcoY8/+x6ylk8Qo02BQyLrAs+yAcLvGI= github.com/tendermint/tm-db v0.6.3/go.mod h1:lfA1dL9/Y/Y8wwyPp2NMLyn5P5Ptr/gvDFNWtrCWSf8= -github.com/tendermint/tm-db v0.6.4 h1:3N2jlnYQkXNQclQwd/eKV/NzlqPlfK21cpRRIx80XXQ= github.com/tendermint/tm-db v0.6.4/go.mod h1:dptYhIpJ2M5kUuenLr+Yyf3zQOv1SgBZcl8/BmWlMBw= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= diff --git a/proto/cosmos/base/abci/v1beta1/abci.proto b/proto/cosmos/base/abci/v1beta1/abci.proto index d841c3464a..b3b44b7bf4 100644 --- a/proto/cosmos/base/abci/v1beta1/abci.proto +++ b/proto/cosmos/base/abci/v1beta1/abci.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package cosmos.base.abci.v1beta1; import "gogoproto/gogo.proto"; -import "tendermint/abci/types.proto"; +import "ostracon/abci/types.proto"; import "google/protobuf/any.proto"; option go_package = "github.com/line/lbm-sdk/v2/types"; @@ -91,7 +91,7 @@ message Result { // Events contains a slice of Event objects that were emitted during message // or handler execution. - repeated tendermint.abci.Event events = 3 [(gogoproto.nullable) = false]; + repeated ostracon.abci.Event events = 3 [(gogoproto.nullable) = false]; } // SimulationResponse defines the response generated when a transaction is diff --git a/proto/cosmos/base/tendermint/v1beta1/query.proto b/proto/cosmos/base/ostracon/v1beta1/query.proto similarity index 79% rename from proto/cosmos/base/tendermint/v1beta1/query.proto rename to proto/cosmos/base/ostracon/v1beta1/query.proto index 67d867276e..1f3a9b6f7c 100644 --- a/proto/cosmos/base/tendermint/v1beta1/query.proto +++ b/proto/cosmos/base/ostracon/v1beta1/query.proto @@ -1,42 +1,42 @@ syntax = "proto3"; -package cosmos.base.tendermint.v1beta1; +package cosmos.base.ostracon.v1beta1; import "gogoproto/gogo.proto"; import "google/protobuf/any.proto"; import "google/api/annotations.proto"; -import "tendermint/p2p/types.proto"; -import "tendermint/types/block.proto"; -import "tendermint/types/types.proto"; +import "ostracon/p2p/types.proto"; +import "ostracon/types/block.proto"; +import "ostracon/types/types.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; option go_package = "github.com/line/lbm-sdk/v2/client/grpc/tmservice"; -// Service defines the gRPC querier service for tendermint queries. +// Service defines the gRPC querier service for ostracon queries. service Service { // GetNodeInfo queries the current node info. rpc GetNodeInfo(GetNodeInfoRequest) returns (GetNodeInfoResponse) { - option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/node_info"; + option (google.api.http).get = "/cosmos/base/ostracon/v1beta1/node_info"; } // GetSyncing queries node syncing. rpc GetSyncing(GetSyncingRequest) returns (GetSyncingResponse) { - option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/syncing"; + option (google.api.http).get = "/cosmos/base/ostracon/v1beta1/syncing"; } // GetLatestBlock returns the latest block. rpc GetLatestBlock(GetLatestBlockRequest) returns (GetLatestBlockResponse) { - option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/blocks/latest"; + option (google.api.http).get = "/cosmos/base/ostracon/v1beta1/blocks/latest"; } // GetBlockByHeight queries block for given height. rpc GetBlockByHeight(GetBlockByHeightRequest) returns (GetBlockByHeightResponse) { - option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/blocks/{height}"; + option (google.api.http).get = "/cosmos/base/ostracon/v1beta1/blocks/{height}"; } // GetLatestValidatorSet queries latest validator-set. rpc GetLatestValidatorSet(GetLatestValidatorSetRequest) returns (GetLatestValidatorSetResponse) { - option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/validatorsets/latest"; + option (google.api.http).get = "/cosmos/base/ostracon/v1beta1/validatorsets/latest"; } // GetValidatorSetByHeight queries validator-set at a given height. rpc GetValidatorSetByHeight(GetValidatorSetByHeightRequest) returns (GetValidatorSetByHeightResponse) { - option (google.api.http).get = "/cosmos/base/tendermint/v1beta1/validatorsets/{height}"; + option (google.api.http).get = "/cosmos/base/ostracon/v1beta1/validatorsets/{height}"; } } @@ -84,8 +84,8 @@ message GetBlockByHeightRequest { // GetBlockByHeightResponse is the response type for the Query/GetBlockByHeight RPC method. message GetBlockByHeightResponse { - .tendermint.types.BlockID block_id = 1; - .tendermint.types.Block block = 2; + .ostracon.types.BlockID block_id = 1; + .ostracon.types.Block block = 2; } // GetLatestBlockRequest is the request type for the Query/GetLatestBlock RPC method. @@ -93,8 +93,8 @@ message GetLatestBlockRequest {} // GetLatestBlockResponse is the response type for the Query/GetLatestBlock RPC method. message GetLatestBlockResponse { - .tendermint.types.BlockID block_id = 1; - .tendermint.types.Block block = 2; + .ostracon.types.BlockID block_id = 1; + .ostracon.types.Block block = 2; } // GetSyncingRequest is the request type for the Query/GetSyncing RPC method. @@ -110,8 +110,8 @@ message GetNodeInfoRequest {} // GetNodeInfoResponse is the request type for the Query/GetNodeInfo RPC method. message GetNodeInfoResponse { - .tendermint.p2p.DefaultNodeInfo default_node_info = 1; - VersionInfo application_version = 2; + .ostracon.p2p.DefaultNodeInfo default_node_info = 1; + VersionInfo application_version = 2; } // VersionInfo is the type for the GetNodeInfoResponse message. diff --git a/proto/cosmos/evidence/v1beta1/query.proto b/proto/cosmos/evidence/v1beta1/query.proto index ee0f52c7d9..10c732d599 100644 --- a/proto/cosmos/evidence/v1beta1/query.proto +++ b/proto/cosmos/evidence/v1beta1/query.proto @@ -24,7 +24,7 @@ service Query { // QueryEvidenceRequest is the request type for the Query/Evidence RPC method. message QueryEvidenceRequest { // evidence_hash defines the hash of the requested evidence. - bytes evidence_hash = 1 [(gogoproto.casttype) = "github.com/tendermint/tendermint/libs/bytes.HexBytes"]; + bytes evidence_hash = 1 [(gogoproto.casttype) = "github.com/line/ostracon/libs/bytes.HexBytes"]; } // QueryEvidenceResponse is the response type for the Query/Evidence RPC method. diff --git a/proto/cosmos/mint/v1beta1/mint.proto b/proto/cosmos/mint/v1beta1/mint.proto index 4154b86d40..f9c7f7d825 100644 --- a/proto/cosmos/mint/v1beta1/mint.proto +++ b/proto/cosmos/mint/v1beta1/mint.proto @@ -8,8 +8,7 @@ import "gogoproto/gogo.proto"; // Minter represents the minting state. message Minter { // current annual inflation rate - string inflation = 1 - [(gogoproto.customtype) = "github.com/line/lbm-sdk/v2/types.Dec", (gogoproto.nullable) = false]; + string inflation = 1 [(gogoproto.customtype) = "github.com/line/lbm-sdk/v2/types.Dec", (gogoproto.nullable) = false]; // current annual expected provisions string annual_provisions = 2 [ (gogoproto.moretags) = "yaml:\"annual_provisions\"", diff --git a/proto/cosmos/staking/v1beta1/staking.proto b/proto/cosmos/staking/v1beta1/staking.proto index f6d17624c4..3895854086 100644 --- a/proto/cosmos/staking/v1beta1/staking.proto +++ b/proto/cosmos/staking/v1beta1/staking.proto @@ -8,7 +8,7 @@ import "google/protobuf/timestamp.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/v1beta1/coin.proto"; -import "tendermint/types/types.proto"; +import "ostracon/types/types.proto"; option go_package = "github.com/line/lbm-sdk/v2/x/staking/types"; @@ -17,8 +17,8 @@ option go_package = "github.com/line/lbm-sdk/v2/x/staking/types"; // recent HistoricalInfo // (`n` is set by the staking module's `historical_entries` parameter). message HistoricalInfo { - tendermint.types.Header header = 1 [(gogoproto.nullable) = false]; - repeated Validator valset = 2 [(gogoproto.nullable) = false]; + ostracon.types.Header header = 1 [(gogoproto.nullable) = false]; + repeated Validator valset = 2 [(gogoproto.nullable) = false]; } // CommissionRates defines the initial commission rates to be used for creating @@ -28,7 +28,7 @@ message CommissionRates { option (gogoproto.goproto_stringer) = false; // rate is the commission rate charged to delegators, as a fraction. - string rate = 1 [(gogoproto.customtype) = "github.com/line/lbm-sdk/v2/types.Dec", (gogoproto.nullable) = false]; + string rate = 1 [(gogoproto.customtype) = "github.com/line/lbm-sdk/v2/types.Dec", (gogoproto.nullable) = false]; // max_rate defines the maximum commission rate which validator can ever charge, as a fraction. string max_rate = 2 [ (gogoproto.moretags) = "yaml:\"max_rate\"", @@ -49,9 +49,9 @@ message Commission { option (gogoproto.goproto_stringer) = false; // commission_rates defines the initial commission rates to be used for creating a validator. - CommissionRates commission_rates = 1 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; + CommissionRates commission_rates = 1 [(gogoproto.embed) = true, (gogoproto.nullable) = false]; // update_time is the last time the commission rate was changed. - google.protobuf.Timestamp update_time = 2 + google.protobuf.Timestamp update_time = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"update_time\""]; } @@ -61,15 +61,15 @@ message Description { option (gogoproto.goproto_stringer) = false; // moniker defines a human-readable name for the validator. - string moniker = 1; + string moniker = 1; // identity defines an optional identity signature (ex. UPort or Keybase). - string identity = 2; + string identity = 2; // website defines an optional website link. - string website = 3; + string website = 3; // security_contact defines an optional email for security contact. string security_contact = 4 [(gogoproto.moretags) = "yaml:\"security_contact\""]; // details define other optional details. - string details = 5; + string details = 5; } // Validator defines a validator, together with the total amount of the @@ -86,12 +86,12 @@ message Validator { option (gogoproto.goproto_getters) = false; // operator_address defines the address of the validator's operator; bech encoded in JSON. - string operator_address = 1 [(gogoproto.moretags) = "yaml:\"operator_address\""]; + string operator_address = 1 [(gogoproto.moretags) = "yaml:\"operator_address\""]; // consensus_pubkey is the consensus public key of the validator, as a Protobuf Any. google.protobuf.Any consensus_pubkey = 2 [(cosmos_proto.accepts_interface) = "cosmos.crypto.PubKey", (gogoproto.moretags) = "yaml:\"consensus_pubkey\""]; // jailed defined whether the validator has been jailed from bonded status or not. - bool jailed = 3; + bool jailed = 3; // status is the validator status (bonded/unbonding/unbonded). BondStatus status = 4; // tokens define the delegated tokens (incl. self-delegation). @@ -103,16 +103,16 @@ message Validator { (gogoproto.nullable) = false ]; // description defines the description terms for the validator. - Description description = 7 [(gogoproto.nullable) = false]; + Description description = 7 [(gogoproto.nullable) = false]; // unbonding_height defines, if unbonding, the height at which this validator has begun unbonding. - int64 unbonding_height = 8 [(gogoproto.moretags) = "yaml:\"unbonding_height\""]; + int64 unbonding_height = 8 [(gogoproto.moretags) = "yaml:\"unbonding_height\""]; // unbonding_time defines, if unbonding, the min time for the validator to complete unbonding. - google.protobuf.Timestamp unbonding_time = 9 + google.protobuf.Timestamp unbonding_time = 9 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"unbonding_time\""]; // commission defines the commission parameters. - Commission commission = 10 [(gogoproto.nullable) = false]; + Commission commission = 10 [(gogoproto.nullable) = false]; // min_self_delegation is the validator's self declared minimum self delegation. - string min_self_delegation = 11 [ + string min_self_delegation = 11 [ (gogoproto.moretags) = "yaml:\"min_self_delegation\"", (gogoproto.customtype) = "github.com/line/lbm-sdk/v2/types.Int", (gogoproto.nullable) = false @@ -201,9 +201,9 @@ message UnbondingDelegation { option (gogoproto.goproto_stringer) = false; // delegator_address is the bech32-encoded address of the delegator. - string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; + string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; // validator_address is the bech32-encoded address of the validator. - string validator_address = 2 [(gogoproto.moretags) = "yaml:\"validator_address\""]; + string validator_address = 2 [(gogoproto.moretags) = "yaml:\"validator_address\""]; // entries are the unbonding delegation entries. repeated UnbondingDelegationEntry entries = 3 [(gogoproto.nullable) = false]; // unbonding delegation entries } @@ -214,7 +214,7 @@ message UnbondingDelegationEntry { option (gogoproto.goproto_stringer) = false; // creation_height is the height which the unbonding took place. - int64 creation_height = 1 [(gogoproto.moretags) = "yaml:\"creation_height\""]; + int64 creation_height = 1 [(gogoproto.moretags) = "yaml:\"creation_height\""]; // completion_time is the unix time for unbonding completion. google.protobuf.Timestamp completion_time = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"completion_time\""]; @@ -234,7 +234,7 @@ message RedelegationEntry { option (gogoproto.goproto_stringer) = false; // creation_height defines the height which the redelegation took place. - int64 creation_height = 1 [(gogoproto.moretags) = "yaml:\"creation_height\""]; + int64 creation_height = 1 [(gogoproto.moretags) = "yaml:\"creation_height\""]; // completion_time defines the unix time for redelegation completion. google.protobuf.Timestamp completion_time = 2 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.moretags) = "yaml:\"completion_time\""]; @@ -245,8 +245,7 @@ message RedelegationEntry { (gogoproto.moretags) = "yaml:\"initial_balance\"" ]; // shares_dst is the amount of destination-validator shares created by redelegation. - string shares_dst = 4 - [(gogoproto.customtype) = "github.com/line/lbm-sdk/v2/types.Dec", (gogoproto.nullable) = false]; + string shares_dst = 4 [(gogoproto.customtype) = "github.com/line/lbm-sdk/v2/types.Dec", (gogoproto.nullable) = false]; } // Redelegation contains the list of a particular delegator's redelegating bonds @@ -257,13 +256,13 @@ message Redelegation { option (gogoproto.goproto_stringer) = false; // delegator_address is the bech32-encoded address of the delegator. - string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; + string delegator_address = 1 [(gogoproto.moretags) = "yaml:\"delegator_address\""]; // validator_src_address is the validator redelegation source operator address. - string validator_src_address = 2 [(gogoproto.moretags) = "yaml:\"validator_src_address\""]; + string validator_src_address = 2 [(gogoproto.moretags) = "yaml:\"validator_src_address\""]; // validator_dst_address is the validator redelegation destination operator address. - string validator_dst_address = 3 [(gogoproto.moretags) = "yaml:\"validator_dst_address\""]; + string validator_dst_address = 3 [(gogoproto.moretags) = "yaml:\"validator_dst_address\""]; // entries are the redelegation entries. - repeated RedelegationEntry entries = 4 [(gogoproto.nullable) = false]; // redelegation entries + repeated RedelegationEntry entries = 4 [(gogoproto.nullable) = false]; // redelegation entries } // Params defines the parameters for the staking module. @@ -275,13 +274,13 @@ message Params { google.protobuf.Duration unbonding_time = 1 [(gogoproto.nullable) = false, (gogoproto.stdduration) = true, (gogoproto.moretags) = "yaml:\"unbonding_time\""]; // max_validators is the maximum number of validators. - uint32 max_validators = 2 [(gogoproto.moretags) = "yaml:\"max_validators\""]; + uint32 max_validators = 2 [(gogoproto.moretags) = "yaml:\"max_validators\""]; // max_entries is the max entries for either unbonding delegation or redelegation (per pair/trio). - uint32 max_entries = 3 [(gogoproto.moretags) = "yaml:\"max_entries\""]; + uint32 max_entries = 3 [(gogoproto.moretags) = "yaml:\"max_entries\""]; // historical_entries is the number of historical entries to persist. uint32 historical_entries = 4 [(gogoproto.moretags) = "yaml:\"historical_entries\""]; // bond_denom defines the bondable coin denomination. - string bond_denom = 5 [(gogoproto.moretags) = "yaml:\"bond_denom\""]; + string bond_denom = 5 [(gogoproto.moretags) = "yaml:\"bond_denom\""]; } // DelegationResponse is equivalent to Delegation except that it contains a diff --git a/proto/ibc/lightclients/tendermint/v1/tendermint.proto b/proto/ibc/lightclients/tendermint/v1/tendermint.proto index f374df7071..1d0e318310 100644 --- a/proto/ibc/lightclients/tendermint/v1/tendermint.proto +++ b/proto/ibc/lightclients/tendermint/v1/tendermint.proto @@ -3,8 +3,8 @@ package ibc.lightclients.tendermint.v1; option go_package = "github.com/line/lbm-sdk/v2/x/ibc/light-clients/07-tendermint/types"; -import "tendermint/types/validator.proto"; -import "tendermint/types/types.proto"; +import "ostracon/types/validator.proto"; +import "ostracon/types/types.proto"; import "confio/proofs.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/timestamp.proto"; @@ -67,7 +67,7 @@ message ConsensusState { // commitment root (i.e app hash) ibc.core.commitment.v1.MerkleRoot root = 2 [(gogoproto.nullable) = false]; bytes next_validators_hash = 3 [ - (gogoproto.casttype) = "github.com/tendermint/tendermint/libs/bytes.HexBytes", + (gogoproto.casttype) = "github.com/line/ostracon/libs/bytes.HexBytes", (gogoproto.moretags) = "yaml:\"next_validators_hash\"" ]; } @@ -95,13 +95,13 @@ message Misbehaviour { // hash to TrustedConsensusState.NextValidatorsHash since that is the last // trusted validator set at the TrustedHeight. message Header { - .tendermint.types.SignedHeader signed_header = 1 + .ostracon.types.SignedHeader signed_header = 1 [(gogoproto.embed) = true, (gogoproto.moretags) = "yaml:\"signed_header\""]; - .tendermint.types.ValidatorSet validator_set = 2 [(gogoproto.moretags) = "yaml:\"validator_set\""]; - ibc.core.client.v1.Height trusted_height = 3 + .ostracon.types.ValidatorSet validator_set = 2 [(gogoproto.moretags) = "yaml:\"validator_set\""]; + ibc.core.client.v1.Height trusted_height = 3 [(gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"trusted_height\""]; - .tendermint.types.ValidatorSet trusted_validators = 4 [(gogoproto.moretags) = "yaml:\"trusted_validators\""]; + .ostracon.types.ValidatorSet trusted_validators = 4 [(gogoproto.moretags) = "yaml:\"trusted_validators\""]; } // Fraction defines the protobuf message type for tmmath.Fraction that only supports positive values. diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index 037d852928..7b5d6714ac 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -2,6 +2,11 @@ set -eo pipefail +# TODO ebony +apk add --no-cache git +go env -w GOPRIVATE=github.com/line/* +git config --global url."https://${GITHUB_TOKEN}:x-oauth-basic@github.com/".insteadOf "https://github.com/" + protoc_gen_gocosmos() { if ! grep "github.com/gogo/protobuf => github.com/regen-network/protobuf" go.mod &>/dev/null ; then echo -e "\tPlease run this command from somewhere inside the cosmos-sdk folder." diff --git a/server/api/server.go b/server/api/server.go index cd8f5e7836..c549a5ccaa 100644 --- a/server/api/server.go +++ b/server/api/server.go @@ -11,8 +11,8 @@ import ( "github.com/gorilla/handlers" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/tendermint/tendermint/libs/log" - tmrpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" + "github.com/line/ostracon/libs/log" + ostrpcserver "github.com/line/ostracon/rpc/jsonrpc/server" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/server/config" @@ -93,13 +93,13 @@ func (s *Server) Start(cfg config.Config) error { s.registerMetrics() } - tmCfg := tmrpcserver.DefaultConfig() - tmCfg.MaxOpenConnections = int(cfg.API.MaxOpenConnections) - tmCfg.ReadTimeout = time.Duration(cfg.API.RPCReadTimeout) * time.Second - tmCfg.WriteTimeout = time.Duration(cfg.API.RPCWriteTimeout) * time.Second - tmCfg.MaxBodyBytes = int64(cfg.API.RPCMaxBodyBytes) + ostCfg := ostrpcserver.DefaultConfig() + ostCfg.MaxOpenConnections = int(cfg.API.MaxOpenConnections) + ostCfg.ReadTimeout = time.Duration(cfg.API.RPCReadTimeout) * time.Second + ostCfg.WriteTimeout = time.Duration(cfg.API.RPCWriteTimeout) * time.Second + ostCfg.MaxBodyBytes = int64(cfg.API.RPCMaxBodyBytes) - listener, err := tmrpcserver.Listen(cfg.API.Address, tmCfg) + listener, err := ostrpcserver.Listen(cfg.API.Address, ostCfg) if err != nil { return err } @@ -111,11 +111,11 @@ func (s *Server) Start(cfg config.Config) error { if cfg.API.EnableUnsafeCORS { allowAllCORS := handlers.CORS(handlers.AllowedHeaders([]string{"Content-Type"})) - return tmrpcserver.Serve(s.listener, allowAllCORS(h), s.logger, tmCfg) + return ostrpcserver.Serve(s.listener, allowAllCORS(h), s.logger, ostCfg) } s.logger.Info("starting API server...") - return tmrpcserver.Serve(s.listener, s.Router, s.logger, tmCfg) + return ostrpcserver.Serve(s.listener, s.Router, s.logger, ostCfg) } // Close closes the API server. diff --git a/server/cmd/execute.go b/server/cmd/execute.go index 94287c4395..dd0c3173cb 100644 --- a/server/cmd/execute.go +++ b/server/cmd/execute.go @@ -3,10 +3,10 @@ package cmd import ( "context" + ostcfg "github.com/line/ostracon/config" + ostcli "github.com/line/ostracon/libs/cli" "github.com/rs/zerolog" "github.com/spf13/cobra" - tmcfg "github.com/tendermint/tendermint/config" - tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -30,8 +30,8 @@ func Execute(rootCmd *cobra.Command, defaultHome string) error { ctx = context.WithValue(ctx, server.ServerContextKey, srvCtx) rootCmd.PersistentFlags().String(flags.FlagLogLevel, zerolog.InfoLevel.String(), "The logging level (trace|debug|info|warn|error|fatal|panic)") - rootCmd.PersistentFlags().String(flags.FlagLogFormat, tmcfg.LogFormatPlain, "The logging format (json|plain)") + rootCmd.PersistentFlags().String(flags.FlagLogFormat, ostcfg.LogFormatPlain, "The logging format (json|plain)") - executor := tmcli.PrepareBaseCmd(rootCmd, "", defaultHome) + executor := ostcli.PrepareBaseCmd(rootCmd, "", defaultHome) return executor.ExecuteContext(ctx) } diff --git a/server/config/toml.go b/server/config/toml.go index b042da7429..106821aa4b 100644 --- a/server/config/toml.go +++ b/server/config/toml.go @@ -4,8 +4,8 @@ import ( "bytes" "text/template" + ostos "github.com/line/ostracon/libs/os" "github.com/spf13/viper" - tmos "github.com/tendermint/tendermint/libs/os" ) const defaultConfigTemplate = `# This is a TOML config file. @@ -193,5 +193,5 @@ func WriteConfigFile(configFilePath string, config *Config) { panic(err) } - tmos.MustWriteFile(configFilePath, buffer.Bytes(), 0644) + ostos.MustWriteFile(configFilePath, buffer.Bytes(), 0644) } diff --git a/server/export.go b/server/export.go index 0b91cfff01..1456960c10 100644 --- a/server/export.go +++ b/server/export.go @@ -7,10 +7,10 @@ import ( "io/ioutil" "os" + ostjson "github.com/line/ostracon/libs/json" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" "github.com/spf13/cobra" - tmjson "github.com/tendermint/tendermint/libs/json" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/client/flags" "github.com/line/lbm-sdk/v2/server/types" @@ -73,7 +73,7 @@ func ExportCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra.Com return fmt.Errorf("error exporting state: %v", err) } - doc, err := tmtypes.GenesisDocFromFile(serverCtx.Config.GenesisFile()) + doc, err := osttypes.GenesisDocFromFile(serverCtx.Config.GenesisFile()) if err != nil { return err } @@ -81,18 +81,18 @@ func ExportCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra.Com doc.AppState = exported.AppState doc.Validators = exported.Validators doc.InitialHeight = exported.Height - doc.ConsensusParams = &tmproto.ConsensusParams{ - Block: tmproto.BlockParams{ + doc.ConsensusParams = &ostproto.ConsensusParams{ + Block: ostproto.BlockParams{ MaxBytes: exported.ConsensusParams.Block.MaxBytes, MaxGas: exported.ConsensusParams.Block.MaxGas, TimeIotaMs: doc.ConsensusParams.Block.TimeIotaMs, }, - Evidence: tmproto.EvidenceParams{ + Evidence: ostproto.EvidenceParams{ MaxAgeNumBlocks: exported.ConsensusParams.Evidence.MaxAgeNumBlocks, MaxAgeDuration: exported.ConsensusParams.Evidence.MaxAgeDuration, MaxBytes: exported.ConsensusParams.Evidence.MaxBytes, }, - Validator: tmproto.ValidatorParams{ + Validator: ostproto.ValidatorParams{ PubKeyTypes: exported.ConsensusParams.Validator.PubKeyTypes, }, } @@ -100,7 +100,7 @@ func ExportCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra.Com // NOTE: Tendermint uses a custom JSON decoder for GenesisDoc // (except for stuff inside AppState). Inside AppState, we're free // to encode as protobuf or amino. - encoded, err := tmjson.Marshal(doc) + encoded, err := ostjson.Marshal(doc) if err != nil { return err } diff --git a/server/export_test.go b/server/export_test.go index c31e4a4ef3..512a40a0e9 100644 --- a/server/export_test.go +++ b/server/export_test.go @@ -13,12 +13,12 @@ import ( "github.com/spf13/cobra" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" + abci "github.com/line/ostracon/abci/types" + ostjson "github.com/line/ostracon/libs/json" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -40,8 +40,8 @@ func TestExportCmd_ConsensusParams(t *testing.T) { cmd.SetArgs([]string{fmt.Sprintf("--%s=%s", flags.FlagHome, tempDir)}) require.NoError(t, cmd.ExecuteContext(ctx)) - var exportedGenDoc tmtypes.GenesisDoc - err := tmjson.Unmarshal(output.Bytes(), &exportedGenDoc) + var exportedGenDoc osttypes.GenesisDoc + err := ostjson.Unmarshal(output.Bytes(), &exportedGenDoc) if err != nil { t.Fatalf("error unmarshaling exported genesis doc: %s", err) } @@ -100,7 +100,7 @@ func TestExportCmd_Height(t *testing.T) { // Fast forward to block `tc.fastForward`. for i := int64(2); i <= tc.fastForward; i++ { - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: i}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: i}}) app.Commit() } @@ -110,8 +110,8 @@ func TestExportCmd_Height(t *testing.T) { cmd.SetArgs(args) require.NoError(t, cmd.ExecuteContext(ctx)) - var exportedGenDoc tmtypes.GenesisDoc - err := tmjson.Unmarshal(output.Bytes(), &exportedGenDoc) + var exportedGenDoc osttypes.GenesisDoc + err := ostjson.Unmarshal(output.Bytes(), &exportedGenDoc) if err != nil { t.Fatalf("error unmarshaling exported genesis doc: %s", err) } @@ -122,7 +122,7 @@ func TestExportCmd_Height(t *testing.T) { } -func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, *tmtypes.GenesisDoc, *cobra.Command) { +func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, *osttypes.GenesisDoc, *cobra.Command) { if err := createConfigFolder(tempDir); err != nil { t.Fatalf("error creating config folder: %s", err) } @@ -177,7 +177,7 @@ func createConfigFolder(dir string) error { return os.Mkdir(path.Join(dir, "config"), 0700) } -func newDefaultGenesisDoc(cdc codec.Marshaler) *tmtypes.GenesisDoc { +func newDefaultGenesisDoc(cdc codec.Marshaler) *osttypes.GenesisDoc { genesisState := simapp.NewDefaultGenesisState(cdc) stateBytes, err := json.MarshalIndent(genesisState, "", " ") @@ -185,7 +185,7 @@ func newDefaultGenesisDoc(cdc codec.Marshaler) *tmtypes.GenesisDoc { panic(err) } - genDoc := &tmtypes.GenesisDoc{} + genDoc := &osttypes.GenesisDoc{} genDoc.ChainID = "theChainId" genDoc.Validators = nil genDoc.AppState = stateBytes @@ -193,7 +193,7 @@ func newDefaultGenesisDoc(cdc codec.Marshaler) *tmtypes.GenesisDoc { return genDoc } -func saveGenesisFile(genDoc *tmtypes.GenesisDoc, dir string) error { +func saveGenesisFile(genDoc *osttypes.GenesisDoc, dir string) error { err := genutil.ExportGenesisFile(genDoc, dir) if err != nil { return errors.Wrap(err, "error creating file") diff --git a/server/logger.go b/server/logger.go index e6f6f8c111..b0a2d2db5d 100644 --- a/server/logger.go +++ b/server/logger.go @@ -1,11 +1,11 @@ package server import ( + ostlog "github.com/line/ostracon/libs/log" "github.com/rs/zerolog" - tmlog "github.com/tendermint/tendermint/libs/log" ) -var _ tmlog.Logger = (*ZeroLogWrapper)(nil) +var _ ostlog.Logger = (*ZeroLogWrapper)(nil) // ZeroLogWrapper provides a wrapper around a zerolog.Logger instance. It implements // Tendermint's Logger interface. @@ -37,7 +37,7 @@ func (z ZeroLogWrapper) Debug(msg string, keyVals ...interface{}) { // With returns a new wrapped logger with additional context provided by a set // of key/value tuples. The number of tuples must be even and the key of the // tuple must be a string. -func (z ZeroLogWrapper) With(keyVals ...interface{}) tmlog.Logger { +func (z ZeroLogWrapper) With(keyVals ...interface{}) ostlog.Logger { return ZeroLogWrapper{z.Logger.With().Fields(getLogFields(keyVals...)).Logger()} } diff --git a/server/mock/app.go b/server/mock/app.go index eb83f9b3b9..a7bc0801f7 100644 --- a/server/mock/app.go +++ b/server/mock/app.go @@ -6,10 +6,10 @@ import ( "fmt" "path/filepath" - "github.com/tendermint/tendermint/types" + "github.com/line/ostracon/types" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" bam "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/codec" diff --git a/server/mock/app_test.go b/server/mock/app_test.go index 2741925df0..b5bfcd6ce7 100644 --- a/server/mock/app_test.go +++ b/server/mock/app_test.go @@ -3,10 +3,10 @@ package mock import ( "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" + "github.com/line/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" ) // TestInitApp makes sure we can initialize this thing without an error @@ -56,7 +56,7 @@ func TestDeliverTx(t *testing.T) { tx := NewTx(key, value) txBytes := tx.GetSignBytes() - header := tmproto.Header{ + header := ostproto.Header{ AppHash: []byte("apphash"), Height: 1, } diff --git a/server/mock/helpers.go b/server/mock/helpers.go index 88aacb4d8e..16840531be 100644 --- a/server/mock/helpers.go +++ b/server/mock/helpers.go @@ -5,8 +5,8 @@ import ( "io/ioutil" "os" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" ) // SetupApp returns an application as well as a clean-up function diff --git a/server/mock/store.go b/server/mock/store.go index f8244b7b4f..3cd830d2bd 100644 --- a/server/mock/store.go +++ b/server/mock/store.go @@ -3,7 +3,7 @@ package mock import ( "io" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" store "github.com/line/lbm-sdk/v2/store/types" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/server/mock/store_test.go b/server/mock/store_test.go index 92959815d9..9e2f3079b5 100644 --- a/server/mock/store_test.go +++ b/server/mock/store_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" sdk "github.com/line/lbm-sdk/v2/types" ) diff --git a/server/start.go b/server/start.go index 0aa17c17d6..c66016b21a 100644 --- a/server/start.go +++ b/server/start.go @@ -8,15 +8,15 @@ import ( "runtime/pprof" "time" + "github.com/line/ostracon/abci/server" + ostcmd "github.com/line/ostracon/cmd/tendermint/commands" + ostos "github.com/line/ostracon/libs/os" + "github.com/line/ostracon/node" + "github.com/line/ostracon/p2p" + pvm "github.com/line/ostracon/privval" + "github.com/line/ostracon/proxy" + "github.com/line/ostracon/rpc/client/local" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/abci/server" - tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" - tmos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/node" - "github.com/tendermint/tendermint/p2p" - pvm "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/rpc/client/local" "google.golang.org/grpc" "github.com/line/lbm-sdk/v2/client" @@ -28,9 +28,9 @@ import ( storetypes "github.com/line/lbm-sdk/v2/store/types" ) -// Tendermint full-node start flags +// Ostracon full-node start flags const ( - flagWithTendermint = "with-tendermint" + flagWithOstracon = "with-ostracon" flagAddress = "address" flagTransport = "transport" flagTraceStore = "trace-store" @@ -64,13 +64,13 @@ const ( ) // StartCmd runs the service passed in, either stand-alone or in-process with -// Tendermint. +// Ostracon. func StartCmd(appCreator types.AppCreator, defaultNodeHome string) *cobra.Command { cmd := &cobra.Command{ Use: "start", Short: "Run the full node", - Long: `Run the full node application with Tendermint in or out of process. By -default, the application will run with Tendermint in process. + Long: `Run the full node application with Ostracon in or out of process. By +default, the application will run with Ostracon in process. Pruning options can be provided via the '--pruning' flag or alternatively with '--pruning-keep-recent', 'pruning-keep-every', and 'pruning-interval' together. @@ -108,13 +108,13 @@ which accepts a path for the resulting pprof file. return err } - withTM, _ := cmd.Flags().GetBool(flagWithTendermint) - if !withTM { - serverCtx.Logger.Info("starting ABCI without Tendermint") + withOST, _ := cmd.Flags().GetBool(flagWithOstracon) + if !withOST { + serverCtx.Logger.Info("starting ABCI without Ostracon") return startStandAlone(serverCtx, appCreator) } - serverCtx.Logger.Info("starting ABCI with Tendermint") + serverCtx.Logger.Info("starting ABCI with Ostracon") // amino is needed here for backwards compatibility of REST routes err = startInProcess(serverCtx, clientCtx, appCreator) @@ -129,7 +129,7 @@ which accepts a path for the resulting pprof file. } cmd.Flags().String(flags.FlagHome, defaultNodeHome, "The application home directory") - cmd.Flags().Bool(flagWithTendermint, true, "Run abci app embedded in-process with tendermint") + cmd.Flags().Bool(flagWithOstracon, true, "Run abci app embedded in-process with ostracon") cmd.Flags().String(flagAddress, "tcp://0.0.0.0:26658", "Listen address") cmd.Flags().String(flagTransport, "socket", "Transport protocol: socket, grpc") cmd.Flags().String(flagTraceStore, "", "Enable KVStore tracing to an output file") @@ -145,7 +145,7 @@ which accepts a path for the resulting pprof file. cmd.Flags().Uint64(FlagPruningKeepEvery, 0, "Offset heights to keep on disk after 'keep-every' (ignored if pruning is not 'custom')") cmd.Flags().Uint64(FlagPruningInterval, 0, "Height interval at which pruned heights are removed from disk (ignored if pruning is not 'custom')") cmd.Flags().Uint(FlagInvCheckPeriod, 0, "Assert registered invariants every N blocks") - cmd.Flags().Uint64(FlagMinRetainBlocks, 0, "Minimum block height offset during ABCI commit to prune Tendermint blocks") + cmd.Flags().Uint64(FlagMinRetainBlocks, 0, "Minimum block height offset during ABCI commit to prune Ostracon blocks") cmd.Flags().Bool(flagGRPCEnable, true, "Define if the gRPC server should be enabled") cmd.Flags().String(flagGRPCAddress, config.DefaultGRPCAddress, "the gRPC server address to listen on") @@ -153,8 +153,8 @@ which accepts a path for the resulting pprof file. cmd.Flags().Uint64(FlagStateSyncSnapshotInterval, 0, "State sync snapshot interval") cmd.Flags().Uint32(FlagStateSyncSnapshotKeepRecent, 2, "State sync snapshot to keep") - // add support for all Tendermint-specific command line options - tcmd.AddNodeFlags(cmd) + // add support for all Ostracon-specific command line options + ostcmd.AddNodeFlags(cmd) return cmd } @@ -185,12 +185,12 @@ func startStandAlone(ctx *Context, appCreator types.AppCreator) error { err = svr.Start() if err != nil { - tmos.Exit(err.Error()) + ostos.Exit(err.Error()) } defer func() { if err = svr.Stop(); err != nil { - tmos.Exit(err.Error()) + ostos.Exit(err.Error()) } }() @@ -265,7 +265,7 @@ func startInProcess(ctx *Context, clientCtx client.Context, appCreator types.App // Add the tx service to the gRPC router. We only need to register this // service if API or gRPC is enabled, and avoid doing so in the general - // case, because it spawns a new local tendermint RPC client. + // case, because it spawns a new local ostracon RPC client. if config.API.Enable || config.GRPC.Enable { clientCtx = clientCtx.WithClient(local.New(tmNode)) diff --git a/server/test_helpers.go b/server/test_helpers.go index 0bc6bac801..19b4e6ccec 100644 --- a/server/test_helpers.go +++ b/server/test_helpers.go @@ -5,7 +5,7 @@ import ( "net" ) -// Get a free address for a test tendermint server +// Get a free address for a test ostracon server // protocol is either tcp, http, etc func FreeTCPAddr() (addr, port string, err error) { l, err := net.Listen("tcp", "localhost:0") diff --git a/server/tm_cmds.go b/server/tm_cmds.go index 18a846660f..d41dbce962 100644 --- a/server/tm_cmds.go +++ b/server/tm_cmds.go @@ -6,12 +6,12 @@ import ( "fmt" "strings" + ostcmd "github.com/line/ostracon/cmd/tendermint/commands" + "github.com/line/ostracon/libs/cli" + "github.com/line/ostracon/p2p" + pvm "github.com/line/ostracon/privval" + ostversion "github.com/line/ostracon/version" "github.com/spf13/cobra" - tcmd "github.com/tendermint/tendermint/cmd/tendermint/commands" - "github.com/tendermint/tendermint/libs/cli" - "github.com/tendermint/tendermint/p2p" - pvm "github.com/tendermint/tendermint/privval" - tversion "github.com/tendermint/tendermint/version" yaml "gopkg.in/yaml.v2" "github.com/line/lbm-sdk/v2/codec" @@ -43,7 +43,7 @@ func ShowNodeIDCmd() *cobra.Command { func ShowValidatorCmd() *cobra.Command { cmd := cobra.Command{ Use: "show-validator", - Short: "Show this node's tendermint validator info", + Short: "Show this node's ostracon validator info", RunE: func(cmd *cobra.Command, args []string) error { serverCtx := GetServerContextFromCmd(cmd) cfg := serverCtx.Config @@ -81,7 +81,7 @@ func ShowValidatorCmd() *cobra.Command { func ShowAddressCmd() *cobra.Command { cmd := &cobra.Command{ Use: "show-address", - Short: "Shows this node's tendermint validator consensus address", + Short: "Shows this node's ostracon validator consensus address", RunE: func(cmd *cobra.Command, args []string) error { serverCtx := GetServerContextFromCmd(cmd) cfg := serverCtx.Config @@ -103,11 +103,11 @@ func ShowAddressCmd() *cobra.Command { return cmd } -// VersionCmd prints tendermint and ABCI version numbers. +// VersionCmd prints ostracon and ABCI version numbers. func VersionCmd() *cobra.Command { return &cobra.Command{ Use: "version", - Short: "Print tendermint libraries' version", + Short: "Print ostracon libraries' version", Long: `Print protocols' and libraries' version numbers against which this app has been compiled. `, @@ -118,10 +118,10 @@ against which this app has been compiled. BlockProtocol uint64 P2PProtocol uint64 }{ - Tendermint: tversion.TMCoreSemVer, - ABCI: tversion.ABCIVersion, - BlockProtocol: tversion.BlockProtocol, - P2PProtocol: tversion.P2PProtocol, + Tendermint: ostversion.TMCoreSemVer, + ABCI: ostversion.ABCIVersion, + BlockProtocol: ostversion.BlockProtocol, + P2PProtocol: ostversion.P2PProtocol, }) if err != nil { return err @@ -146,7 +146,7 @@ func printlnJSON(v interface{}) error { return nil } -// UnsafeResetAllCmd - extension of the tendermint command, resets initialization +// UnsafeResetAllCmd - extension of the ostracon command, resets initialization func UnsafeResetAllCmd() *cobra.Command { return &cobra.Command{ Use: "unsafe-reset-all", @@ -155,7 +155,7 @@ func UnsafeResetAllCmd() *cobra.Command { serverCtx := GetServerContextFromCmd(cmd) cfg := serverCtx.Config - tcmd.ResetAll(cfg.DBDir(), cfg.P2P.AddrBookFile(), cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile(), serverCtx.Logger) + ostcmd.ResetAll(cfg.DBDir(), cfg.P2P.AddrBookFile(), cfg.PrivValidatorKeyFile(), cfg.PrivValidatorStateFile(), serverCtx.Logger) return nil }, } diff --git a/server/types/app.go b/server/types/app.go index a353d5334a..b8d2831242 100644 --- a/server/types/app.go +++ b/server/types/app.go @@ -5,11 +5,11 @@ import ( "io" "github.com/gogo/protobuf/grpc" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + osttypes "github.com/line/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/server/api" @@ -44,7 +44,7 @@ type ( // simulation, fetching txs by hash...). RegisterTxService(clientCtx client.Context) - // RegisterTendermintService registers the gRPC Query service for tendermint queries. + // RegisterTendermintService registers the gRPC Query service for ostracon queries. RegisterTendermintService(clientCtx client.Context) } @@ -61,7 +61,7 @@ type ( // AppState is the application state as JSON. AppState json.RawMessage // Validators is the exported validator set. - Validators []tmtypes.GenesisValidator + Validators []osttypes.GenesisValidator // Height is the app's latest block height. Height int64 // ConsensusParams are the exported consensus params for ABCI. diff --git a/server/util.go b/server/util.go index ad8827cd08..950ee402b2 100644 --- a/server/util.go +++ b/server/util.go @@ -14,14 +14,14 @@ import ( "syscall" "time" + ostcfg "github.com/line/ostracon/config" + ostlog "github.com/line/ostracon/libs/log" + dbm "github.com/line/tm-db/v2" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/spf13/viper" - tmcfg "github.com/tendermint/tendermint/config" - tmlog "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/client/flags" "github.com/line/lbm-sdk/v2/server/config" @@ -39,8 +39,8 @@ const ServerContextKey = sdk.ContextKey("server.context") // server context type Context struct { Viper *viper.Viper - Config *tmcfg.Config - Logger tmlog.Logger + Config *ostcfg.Config + Logger ostlog.Logger } // ErrorCode contains the exit code for server exit. @@ -55,12 +55,12 @@ func (e ErrorCode) Error() string { func NewDefaultContext() *Context { return NewContext( viper.New(), - tmcfg.DefaultConfig(), + ostcfg.DefaultConfig(), ZeroLogWrapper{log.Logger}, ) } -func NewContext(v *viper.Viper, config *tmcfg.Config, logger tmlog.Logger) *Context { +func NewContext(v *viper.Viper, config *ostcfg.Config, logger ostlog.Logger) *Context { return &Context{v, config, logger} } @@ -128,14 +128,14 @@ func InterceptConfigsPreRunHandler(cmd *cobra.Command) error { return err } - // return value is a tendermint configuration object + // return value is a ostracon configuration object serverCtx.Config = config if err = bindFlags(basename, cmd, serverCtx.Viper); err != nil { return err } var logWriter io.Writer - if strings.ToLower(serverCtx.Viper.GetString(flags.FlagLogFormat)) == tmcfg.LogFormatPlain { + if strings.ToLower(serverCtx.Viper.GetString(flags.FlagLogFormat)) == ostcfg.LogFormatPlain { logWriter = zerolog.ConsoleWriter{Out: os.Stderr} } else { logWriter = os.Stderr @@ -181,16 +181,16 @@ func SetCmdServerContext(cmd *cobra.Command, serverCtx *Context) error { // configuration file. The Tendermint configuration file is parsed given a root // Viper object, whereas the application is parsed with the private package-aware // viperCfg object. -func interceptConfigs(rootViper *viper.Viper) (*tmcfg.Config, error) { +func interceptConfigs(rootViper *viper.Viper) (*ostcfg.Config, error) { rootDir := rootViper.GetString(flags.FlagHome) configPath := filepath.Join(rootDir, "config") tmCfgFile := filepath.Join(configPath, "config.toml") - conf := tmcfg.DefaultConfig() + conf := ostcfg.DefaultConfig() switch _, err := os.Stat(tmCfgFile); { case os.IsNotExist(err): - tmcfg.EnsureRoot(rootDir) + ostcfg.EnsureRoot(rootDir) if err = conf.ValidateBasic(); err != nil { return nil, fmt.Errorf("error in config file: %v", err) @@ -200,7 +200,7 @@ func interceptConfigs(rootViper *viper.Viper) (*tmcfg.Config, error) { conf.P2P.RecvRate = 5120000 conf.P2P.SendRate = 5120000 conf.Consensus.TimeoutCommit = 5 * time.Second - tmcfg.WriteConfigFile(tmCfgFile, conf) + ostcfg.WriteConfigFile(tmCfgFile, conf) case err != nil: return nil, err @@ -247,12 +247,12 @@ func interceptConfigs(rootViper *viper.Viper) (*tmcfg.Config, error) { // add server commands func AddCommands(rootCmd *cobra.Command, defaultNodeHome string, appCreator types.AppCreator, appExport types.AppExporter, addStartFlags types.ModuleInitFlags) { - tendermintCmd := &cobra.Command{ - Use: "tendermint", - Short: "Tendermint subcommands", + ostraconCmd := &cobra.Command{ + Use: "ostracon", + Short: "Ostracon subcommands", } - tendermintCmd.AddCommand( + ostraconCmd.AddCommand( ShowNodeIDCmd(), ShowValidatorCmd(), ShowAddressCmd(), @@ -265,7 +265,7 @@ func AddCommands(rootCmd *cobra.Command, defaultNodeHome string, appCreator type startCmd, UnsafeResetAllCmd(), flags.LineBreak, - tendermintCmd, + ostraconCmd, ExportCmd(appExport, defaultNodeHome), flags.LineBreak, version.NewVersionCommand(), diff --git a/server/util_test.go b/server/util_test.go index 6868ce552a..bdea790f94 100644 --- a/server/util_test.go +++ b/server/util_test.go @@ -58,9 +58,9 @@ func TestInterceptConfigsPreRunHandlerCreatesConfigFilesWhenMissing(t *testing.T t.Fatal("config.toml created as empty file") } - // Test that tendermint config is initialized + // Test that ostracon config is initialized if serverCtx.Config == nil { - t.Fatal("tendermint config not created") + t.Fatal("ostracon config not created") } // Test that app.toml is created @@ -171,7 +171,7 @@ func TestInterceptConfigsPreRunHandlerReadsFlags(t *testing.T) { t.Fatalf("Could not set home flag [%T] %v", err, err) } - // This flag is added by tendermint + // This flag is added by ostracon if err := cmd.Flags().Set("rpc.laddr", testAddr); err != nil { t.Fatalf("Could not set address flag [%T] %v", err, err) } @@ -204,7 +204,7 @@ func TestInterceptConfigsPreRunHandlerReadsEnvVars(t *testing.T) { } basename := path.Base(executableName) basename = strings.ReplaceAll(basename, ".", "_") - // This is added by tendermint + // This is added by ostracon envVarName := fmt.Sprintf("%s_RPC_LADDR", strings.ToUpper(basename)) os.Setenv(envVarName, testAddr) t.Cleanup(func() { @@ -258,7 +258,7 @@ func newPrecedenceCommon(t *testing.T) precedenceCommon { // Store the name of the env. var. retval.envVarName = fmt.Sprintf("%s_RPC_LADDR", strings.ToUpper(basename)) - // Store the flag name. This flag is added by tendermint + // Store the flag name. This flag is added by ostracon retval.flagName = "rpc.laddr" // Create a tempdir and create './config' under that diff --git a/simapp/app.go b/simapp/app.go index 91f07de803..aa9656ec73 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -7,14 +7,14 @@ import ( "path/filepath" "github.com/gorilla/mux" + abci "github.com/line/ostracon/abci/types" + ostjson "github.com/line/ostracon/libs/json" + "github.com/line/ostracon/libs/log" + ostos "github.com/line/ostracon/libs/os" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/rakyll/statik/fs" "github.com/spf13/cast" - abci "github.com/tendermint/tendermint/abci/types" - tmjson "github.com/tendermint/tendermint/libs/json" - "github.com/tendermint/tendermint/libs/log" - tmos "github.com/tendermint/tendermint/libs/os" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/client" @@ -412,7 +412,7 @@ func NewSimApp( if loadLatest { if err := app.LoadLatestVersion(); err != nil { - tmos.Exit(err.Error()) + ostos.Exit(err.Error()) } // Initialize and seal the capability keeper so all persistent capabilities @@ -422,7 +422,7 @@ func NewSimApp( // that in-memory capabilities get regenerated on app restart. // Note that since this reads from the store, we can only perform it when // `loadLatest` is set to true. - ctx := app.BaseApp.NewUncachedContext(true, tmproto.Header{}) + ctx := app.BaseApp.NewUncachedContext(true, ostproto.Header{}) app.CapabilityKeeper.InitializeAndSeal(ctx) } @@ -460,7 +460,7 @@ func (app *SimApp) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) abci.Re // InitChainer application update at chain initialization func (app *SimApp) InitChainer(ctx sdk.Context, req abci.RequestInitChain) abci.ResponseInitChain { var genesisState GenesisState - if err := tmjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil { + if err := ostjson.Unmarshal(req.AppStateBytes, &genesisState); err != nil { panic(err) } return app.mm.InitGenesis(ctx, app.appCodec, genesisState) diff --git a/simapp/app_test.go b/simapp/app_test.go index da5d8c8ec1..d5d658900c 100644 --- a/simapp/app_test.go +++ b/simapp/app_test.go @@ -5,11 +5,11 @@ import ( "os" "testing" + "github.com/line/ostracon/libs/log" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" ) func TestSimAppExportAndBlockedAddrs(t *testing.T) { diff --git a/simapp/export.go b/simapp/export.go index 5d3a3ba8c0..af18519314 100644 --- a/simapp/export.go +++ b/simapp/export.go @@ -4,7 +4,7 @@ import ( "encoding/json" "log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + osttypes "github.com/line/ostracon/proto/ostracon/types" servertypes "github.com/line/lbm-sdk/v2/server/types" sdk "github.com/line/lbm-sdk/v2/types" @@ -19,7 +19,7 @@ func (app *SimApp) ExportAppStateAndValidators( forZeroHeight bool, jailAllowedAddrs []string, ) (servertypes.ExportedApp, error) { // as if they could withdraw from the start of the next block - ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) + ctx := app.NewContext(true, osttypes.Header{Height: app.LastBlockHeight()}) // We export at last height + 1, because that's the height at which // Tendermint will start InitChain. diff --git a/simapp/genesis_account_test.go b/simapp/genesis_account_test.go index 3371bdffae..c0f7b10b48 100644 --- a/simapp/genesis_account_test.go +++ b/simapp/genesis_account_test.go @@ -9,8 +9,8 @@ import ( sdk "github.com/line/lbm-sdk/v2/types" authtypes "github.com/line/lbm-sdk/v2/x/auth/types" + "github.com/line/ostracon/crypto" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/crypto" ) func TestSimGenesisAccountValidate(t *testing.T) { diff --git a/simapp/sim_bench_test.go b/simapp/sim_bench_test.go index 60bacdc176..ed30e3f560 100644 --- a/simapp/sim_bench_test.go +++ b/simapp/sim_bench_test.go @@ -5,7 +5,7 @@ import ( "os" "testing" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" simtypes "github.com/line/lbm-sdk/v2/types/simulation" "github.com/line/lbm-sdk/v2/x/simulation" @@ -100,7 +100,7 @@ func BenchmarkInvariants(b *testing.B) { PrintStats(db) } - ctx := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight() + 1}) + ctx := app.NewContext(true, ostproto.Header{Height: app.LastBlockHeight() + 1}) // 3. Benchmark each invariant separately // diff --git a/simapp/sim_test.go b/simapp/sim_test.go index 50971f101e..0aa111b16d 100644 --- a/simapp/sim_test.go +++ b/simapp/sim_test.go @@ -7,11 +7,11 @@ import ( "os" "testing" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp/helpers" @@ -153,8 +153,8 @@ func TestAppImportExport(t *testing.T) { err = json.Unmarshal(exported.AppState, &genesisState) require.NoError(t, err) - ctxA := app.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) - ctxB := newApp.NewContext(true, tmproto.Header{Height: app.LastBlockHeight()}) + ctxA := app.NewContext(true, ostproto.Header{Height: app.LastBlockHeight()}) + ctxB := newApp.NewContext(true, ostproto.Header{Height: app.LastBlockHeight()}) newApp.mm.InitGenesis(ctxB, app.AppCodec(), genesisState) newApp.StoreConsensusParams(ctxB, exported.ConsensusParams) diff --git a/simapp/simd/cmd/genaccounts_test.go b/simapp/simd/cmd/genaccounts_test.go index 9ab687f996..67811cf680 100644 --- a/simapp/simd/cmd/genaccounts_test.go +++ b/simapp/simd/cmd/genaccounts_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" + "github.com/line/ostracon/libs/log" "github.com/spf13/viper" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index f214855da3..4ab54e1e09 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -6,11 +6,11 @@ import ( "os" "path/filepath" + ostcli "github.com/line/ostracon/libs/cli" + "github.com/line/ostracon/libs/log" + dbm "github.com/line/tm-db/v2" "github.com/spf13/cast" "github.com/spf13/cobra" - tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/client" @@ -75,7 +75,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { genutilcli.GenTxCmd(simapp.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, simapp.DefaultNodeHome), genutilcli.ValidateGenesisCmd(simapp.ModuleBasics), AddGenesisAccountCmd(simapp.DefaultNodeHome), - tmcli.NewCompletionCmd(rootCmd, true), + ostcli.NewCompletionCmd(rootCmd, true), testnetCmd(simapp.ModuleBasics, banktypes.GenesisBalancesIterator{}), debug.Cmd(), ) diff --git a/simapp/simd/cmd/testnet.go b/simapp/simd/cmd/testnet.go index ff9f9a52af..88c4eb116a 100644 --- a/simapp/simd/cmd/testnet.go +++ b/simapp/simd/cmd/testnet.go @@ -10,12 +10,12 @@ import ( "os" "path/filepath" + ostconfig "github.com/line/ostracon/config" + ostos "github.com/line/ostracon/libs/os" + ostrand "github.com/line/ostracon/libs/rand" + "github.com/line/ostracon/types" + osttime "github.com/line/ostracon/types/time" "github.com/spf13/cobra" - tmconfig "github.com/tendermint/tendermint/config" - tmos "github.com/tendermint/tendermint/libs/os" - tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/types" - tmtime "github.com/tendermint/tendermint/types/time" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -42,7 +42,7 @@ var ( flagStartingIPAddress = "starting-ip-address" ) -// get cmd to initialize all files for tendermint testnet and application +// get cmd to initialize all files for ostracon testnet and application func testnetCmd(mbm module.BasicManager, genBalIterator banktypes.GenesisBalancesIterator) *cobra.Command { cmd := &cobra.Command{ Use: "testnet", @@ -100,7 +100,7 @@ const nodeDirPerm = 0755 func InitTestnet( clientCtx client.Context, cmd *cobra.Command, - nodeConfig *tmconfig.Config, + nodeConfig *ostconfig.Config, mbm module.BasicManager, genBalIterator banktypes.GenesisBalancesIterator, outputDir, @@ -115,7 +115,7 @@ func InitTestnet( ) error { if chainID == "" { - chainID = "chain-" + tmrand.NewRand().Str(6) + chainID = "chain-" + ostrand.NewRand().Str(6) } nodeIDs := make([]string, numValidators) @@ -313,13 +313,13 @@ func initGenFiles( } func collectGenFiles( - clientCtx client.Context, nodeConfig *tmconfig.Config, chainID string, + clientCtx client.Context, nodeConfig *ostconfig.Config, chainID string, nodeIDs []string, valPubKeys []cryptotypes.PubKey, numValidators int, outputDir, nodeDirPrefix, nodeDaemonHome string, genBalIterator banktypes.GenesisBalancesIterator, ) error { var appState json.RawMessage - genTime := tmtime.Now() + genTime := osttime.Now() for i := 0; i < numValidators; i++ { nodeDirName := fmt.Sprintf("%s%d", nodeDirPrefix, i) @@ -386,12 +386,12 @@ func writeFile(name string, dir string, contents []byte) error { writePath := filepath.Join(dir) file := filepath.Join(writePath, name) - err := tmos.EnsureDir(writePath, 0755) + err := ostos.EnsureDir(writePath, 0755) if err != nil { return err } - err = tmos.WriteFile(file, contents, 0644) + err = ostos.WriteFile(file, contents, 0644) if err != nil { return err } diff --git a/simapp/state.go b/simapp/state.go index cd1fb5848a..84c1ac6715 100644 --- a/simapp/state.go +++ b/simapp/state.go @@ -8,8 +8,8 @@ import ( "math/rand" "time" - tmjson "github.com/tendermint/tendermint/libs/json" - tmtypes "github.com/tendermint/tendermint/types" + ostjson "github.com/line/ostracon/libs/json" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" @@ -129,15 +129,15 @@ func AppStateRandomizedFn( // AppStateFromGenesisFileFn util function to generate the genesis AppState // from a genesis.json file. -func AppStateFromGenesisFileFn(r io.Reader, cdc codec.JSONMarshaler, genesisFile string) (tmtypes.GenesisDoc, []simtypes.Account) { +func AppStateFromGenesisFileFn(r io.Reader, cdc codec.JSONMarshaler, genesisFile string) (osttypes.GenesisDoc, []simtypes.Account) { bytes, err := ioutil.ReadFile(genesisFile) if err != nil { panic(err) } - var genesis tmtypes.GenesisDoc + var genesis osttypes.GenesisDoc // NOTE: Tendermint uses a custom JSON decoder for GenesisDoc - err = tmjson.Unmarshal(bytes, &genesis) + err = ostjson.Unmarshal(bytes, &genesis) if err != nil { panic(err) } diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index 1982880396..ce6a844c78 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -9,12 +9,12 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" - dbm "github.com/tendermint/tm-db" bam "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/client" @@ -37,14 +37,14 @@ var DefaultConsensusParams = &abci.ConsensusParams{ MaxBytes: 200000, MaxGas: 2000000, }, - Evidence: &tmproto.EvidenceParams{ + Evidence: &ostproto.EvidenceParams{ MaxAgeNumBlocks: 302400, MaxAgeDuration: 504 * time.Hour, // 3 weeks is the max duration MaxBytes: 10000, }, - Validator: &tmproto.ValidatorParams{ + Validator: &ostproto.ValidatorParams{ PubKeyTypes: []string{ - tmtypes.ABCIPubKeyTypeEd25519, + osttypes.ABCIPubKeyTypeEd25519, }, }, } @@ -86,7 +86,7 @@ func Setup(isCheckTx bool) *SimApp { // that also act as delegators. For simplicity, each validator is bonded with a delegation // of one consensus engine unit (10^6) in the default token of the simapp from first genesis // account. A Nop logger is set in SimApp. -func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *SimApp { +func SetupWithGenesisValSet(t *testing.T, valSet *osttypes.ValidatorSet, genAccs []authtypes.GenesisAccount, balances ...banktypes.Balance) *SimApp { app, genesisState := setup(true, 5) // set genesis accounts authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), genAccs) @@ -148,7 +148,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs // commit genesis changes app.Commit() - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{ + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{ Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, ValidatorsHash: valSet.Hash(), @@ -187,7 +187,7 @@ func SetupWithGenesisAccounts(genAccs []authtypes.GenesisAccount, balances ...ba ) app.Commit() - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1}}) return app } @@ -316,7 +316,7 @@ func TestAddr(addr string, bech string) (sdk.AccAddress, error) { // CheckBalance checks the balance of an account. func CheckBalance(t *testing.T, app *SimApp, addr sdk.AccAddress, balances sdk.Coins) { - ctxCheck := app.BaseApp.NewContext(true, tmproto.Header{}) + ctxCheck := app.BaseApp.NewContext(true, ostproto.Header{}) require.True(t, balances.IsEqual(app.BankKeeper.GetAllBalances(ctxCheck, addr))) } @@ -325,7 +325,7 @@ func CheckBalance(t *testing.T, app *SimApp, addr sdk.AccAddress, balances sdk.C // the parameter 'expPass' against the result. A corresponding result is // returned. func SignCheckDeliver( - t *testing.T, txCfg client.TxConfig, app *bam.BaseApp, header tmproto.Header, msgs []sdk.Msg, + t *testing.T, txCfg client.TxConfig, app *bam.BaseApp, header ostproto.Header, msgs []sdk.Msg, chainID string, accNums, accSeqs []uint64, expSimPass, expPass bool, priv ...cryptotypes.PrivKey, ) (sdk.GasInfo, *sdk.Result, error) { diff --git a/simapp/types.go b/simapp/types.go index 65303f04d2..d28f8131cc 100644 --- a/simapp/types.go +++ b/simapp/types.go @@ -1,7 +1,7 @@ package simapp import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/server/types" diff --git a/simapp/utils.go b/simapp/utils.go index b9987dfc66..b9e312f124 100644 --- a/simapp/utils.go +++ b/simapp/utils.go @@ -5,8 +5,8 @@ import ( "fmt" "io/ioutil" - "github.com/tendermint/tendermint/libs/log" - dbm "github.com/tendermint/tm-db" + "github.com/line/ostracon/libs/log" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp/helpers" diff --git a/snapshots/helpers_test.go b/snapshots/helpers_test.go index a6a05322d9..1c973d3958 100644 --- a/snapshots/helpers_test.go +++ b/snapshots/helpers_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" + db "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - db "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/snapshots" "github.com/line/lbm-sdk/v2/snapshots/types" diff --git a/snapshots/store.go b/snapshots/store.go index 65f04e451f..96cd95749f 100644 --- a/snapshots/store.go +++ b/snapshots/store.go @@ -11,7 +11,7 @@ import ( "sync" "github.com/gogo/protobuf/proto" - db "github.com/tendermint/tm-db" + db "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/snapshots/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" diff --git a/snapshots/store_test.go b/snapshots/store_test.go index c83ca4ba3d..10ca90da5e 100644 --- a/snapshots/store_test.go +++ b/snapshots/store_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" + db "github.com/line/tm-db/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - db "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/snapshots" "github.com/line/lbm-sdk/v2/snapshots/types" diff --git a/snapshots/types/convert.go b/snapshots/types/convert.go index f70003be35..98f129f6c0 100644 --- a/snapshots/types/convert.go +++ b/snapshots/types/convert.go @@ -2,7 +2,7 @@ package types import ( proto "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" ) diff --git a/snapshots/types/snapshot.pb.go b/snapshots/types/snapshot.pb.go index f37192f9c5..91b3d565ae 100644 --- a/snapshots/types/snapshot.pb.go +++ b/snapshots/types/snapshot.pb.go @@ -155,25 +155,26 @@ func init() { } var fileDescriptor_dd7a3c9b0a19e1ee = []byte{ - // 288 bytes of a gzipped FileDescriptorProto + // 293 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x31, 0x4e, 0xc3, 0x30, - 0x14, 0x86, 0x63, 0x1a, 0xaa, 0xc8, 0x0d, 0x8b, 0x85, 0x90, 0x85, 0x84, 0x09, 0x5d, 0xc8, 0xd0, - 0x3a, 0x2a, 0xdc, 0xa0, 0x03, 0x82, 0x81, 0x25, 0x6c, 0x2c, 0xc8, 0x49, 0x4d, 0x5c, 0x55, 0xa9, - 0xa3, 0x3e, 0x17, 0x89, 0x5b, 0x70, 0x15, 0x6e, 0xd1, 0xb1, 0x23, 0x13, 0x42, 0xc9, 0x45, 0x50, - 0x1c, 0x13, 0x31, 0x75, 0xca, 0xfb, 0xbf, 0x7c, 0x4f, 0xcf, 0xfa, 0xf1, 0x24, 0xd7, 0x50, 0x6a, - 0x48, 0x32, 0x01, 0x32, 0x81, 0xb5, 0xa8, 0x40, 0x69, 0x03, 0xc9, 0xdb, 0x2c, 0x93, 0x46, 0xcc, - 0x7a, 0xc2, 0xab, 0x8d, 0x36, 0x9a, 0x5c, 0x74, 0x36, 0x6f, 0x6d, 0xde, 0xdb, 0xdc, 0xd9, 0xe7, - 0xa7, 0x85, 0x2e, 0xb4, 0x35, 0x93, 0x76, 0xea, 0x96, 0xc6, 0x9f, 0x08, 0x07, 0x4f, 0xce, 0x25, - 0x67, 0x78, 0xa8, 0xe4, 0xb2, 0x50, 0x86, 0xa2, 0x08, 0xc5, 0x7e, 0xea, 0x52, 0xcb, 0x5f, 0xf5, - 0xa6, 0x14, 0x86, 0x1e, 0x45, 0x28, 0x3e, 0x49, 0x5d, 0x6a, 0x79, 0xae, 0xb6, 0xeb, 0x15, 0xd0, - 0x41, 0xc7, 0xbb, 0x44, 0x08, 0xf6, 0x95, 0x00, 0x45, 0xfd, 0x08, 0xc5, 0x61, 0x6a, 0x67, 0xf2, - 0x80, 0x83, 0x52, 0x1a, 0xb1, 0x10, 0x46, 0xd0, 0xe3, 0x08, 0xc5, 0xa3, 0x9b, 0x6b, 0x7e, 0xf0, - 0xc1, 0xfc, 0xd1, 0xe9, 0x73, 0x7f, 0xf7, 0x7d, 0xe9, 0xa5, 0xfd, 0xfa, 0x78, 0x8a, 0x83, 0xbf, - 0x7f, 0xe4, 0x0a, 0x87, 0xf6, 0xe8, 0x4b, 0x7b, 0x44, 0x02, 0x45, 0xd1, 0x20, 0x0e, 0xd3, 0x91, - 0x65, 0xf7, 0x16, 0xcd, 0xef, 0x76, 0x35, 0x43, 0xfb, 0x9a, 0xa1, 0x9f, 0x9a, 0xa1, 0x8f, 0x86, - 0x79, 0xfb, 0x86, 0x79, 0x5f, 0x0d, 0xf3, 0x9e, 0x27, 0xc5, 0xd2, 0xa8, 0x6d, 0xc6, 0x73, 0x5d, - 0x26, 0xae, 0xea, 0xee, 0x33, 0x85, 0xc5, 0xea, 0x5f, 0xe1, 0xe6, 0xbd, 0x92, 0x90, 0x0d, 0x6d, - 0x63, 0xb7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x89, 0x2e, 0x8f, 0x96, 0x01, 0x00, 0x00, + 0x14, 0x86, 0x63, 0x1a, 0xaa, 0xc8, 0x0d, 0x8b, 0x85, 0x90, 0x85, 0x84, 0x09, 0x5d, 0x88, 0x10, + 0xb5, 0xd5, 0x72, 0x83, 0x8a, 0x01, 0x06, 0x96, 0xb0, 0xb1, 0x20, 0x27, 0x35, 0x71, 0xd4, 0x26, + 0x8e, 0x6a, 0xb7, 0x12, 0xb7, 0xe0, 0x2a, 0xdc, 0xa2, 0x63, 0x47, 0x26, 0x84, 0x92, 0x8b, 0xa0, + 0x38, 0x21, 0x62, 0xea, 0xf6, 0xfe, 0xcf, 0xdf, 0xd3, 0xb3, 0x7e, 0x78, 0x9b, 0x28, 0x9d, 0x2b, + 0xcd, 0x62, 0xae, 0x05, 0xd3, 0x05, 0x2f, 0xb5, 0x54, 0x46, 0xb3, 0xed, 0x34, 0x16, 0x86, 0x4f, + 0x7b, 0x42, 0xcb, 0xb5, 0x32, 0x0a, 0x5d, 0xb4, 0x36, 0x6d, 0x6c, 0xda, 0xdb, 0xb4, 0xb3, 0xcf, + 0x4f, 0x53, 0x95, 0x2a, 0x6b, 0xb2, 0x66, 0x6a, 0x97, 0xc6, 0x9f, 0x00, 0x7a, 0xcf, 0x9d, 0x8b, + 0xce, 0xe0, 0x50, 0x8a, 0x2c, 0x95, 0x06, 0x83, 0x00, 0x84, 0x6e, 0xd4, 0xa5, 0x86, 0xbf, 0xa9, + 0x75, 0xce, 0x0d, 0x3e, 0x0a, 0x40, 0x78, 0x12, 0x75, 0xa9, 0xe1, 0x89, 0xdc, 0x14, 0x4b, 0x8d, + 0x07, 0x2d, 0x6f, 0x13, 0x42, 0xd0, 0x95, 0x5c, 0x4b, 0xec, 0x06, 0x20, 0xf4, 0x23, 0x3b, 0xa3, + 0x47, 0xe8, 0xe5, 0xc2, 0xf0, 0x05, 0x37, 0x1c, 0x1f, 0x07, 0x20, 0x1c, 0xcd, 0xae, 0xe9, 0xc1, + 0x0f, 0xd3, 0xa7, 0x4e, 0x9f, 0xbb, 0xbb, 0xef, 0x4b, 0x27, 0xea, 0xd7, 0xc7, 0x13, 0xe8, 0xfd, + 0xbd, 0xa1, 0x2b, 0xe8, 0xdb, 0xa3, 0xaf, 0xcd, 0x11, 0xa1, 0x31, 0x08, 0x06, 0xa1, 0x1f, 0x8d, + 0x2c, 0x7b, 0xb0, 0x68, 0x7e, 0xbf, 0xab, 0x08, 0xd8, 0x57, 0x04, 0xfc, 0x54, 0x04, 0x7c, 0xd4, + 0xc4, 0xd9, 0xd7, 0xc4, 0xf9, 0xaa, 0x89, 0xf3, 0x72, 0x93, 0x66, 0x46, 0x6e, 0x62, 0x9a, 0xa8, + 0x9c, 0xad, 0xb2, 0x42, 0xb0, 0x55, 0x9c, 0x4f, 0xf4, 0x62, 0xc9, 0xb6, 0xb3, 0x7f, 0x75, 0x9b, + 0xf7, 0x52, 0xe8, 0x78, 0x68, 0xfb, 0xba, 0xfb, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x64, 0x1d, 0x76, + 0xdf, 0x94, 0x01, 0x00, 0x00, } func (m *Snapshot) Marshal() (dAtA []byte, err error) { diff --git a/store/cache/cache_test.go b/store/cache/cache_test.go index 904961646a..0aa923310f 100644 --- a/store/cache/cache_test.go +++ b/store/cache/cache_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" - "github.com/cosmos/iavl" + "github.com/line/iavl/v2" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/store/cache" iavlstore "github.com/line/lbm-sdk/v2/store/iavl" diff --git a/store/cachekv/memiterator.go b/store/cachekv/memiterator.go index f6b5745c00..953dfce582 100644 --- a/store/cachekv/memiterator.go +++ b/store/cachekv/memiterator.go @@ -4,7 +4,7 @@ import ( "container/list" "errors" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/types/kv" ) diff --git a/store/cachekv/store.go b/store/cachekv/store.go index f3dc649575..b919addf19 100644 --- a/store/cachekv/store.go +++ b/store/cachekv/store.go @@ -10,7 +10,7 @@ import ( "time" "unsafe" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/tracekv" "github.com/line/lbm-sdk/v2/store/types" diff --git a/store/cachekv/store_bench_test.go b/store/cachekv/store_bench_test.go index 0cd07f5810..f33c55fe7c 100644 --- a/store/cachekv/store_bench_test.go +++ b/store/cachekv/store_bench_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/cachekv" "github.com/line/lbm-sdk/v2/store/dbadapter" diff --git a/store/cachekv/store_test.go b/store/cachekv/store_test.go index 172fa4282d..364a8841e9 100644 --- a/store/cachekv/store_test.go +++ b/store/cachekv/store_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + ostrand "github.com/line/ostracon/libs/rand" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - tmrand "github.com/tendermint/tendermint/libs/rand" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/store/cachekv" "github.com/line/lbm-sdk/v2/store/dbadapter" @@ -320,7 +320,7 @@ const ( ) func randInt(n int) int { - return tmrand.NewRand().Int() % n + return ostrand.NewRand().Int() % n } // useful for replaying a error case if we find one diff --git a/store/cachemulti/store.go b/store/cachemulti/store.go index 05f6c5028a..25aa28abc1 100644 --- a/store/cachemulti/store.go +++ b/store/cachemulti/store.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/cachekv" "github.com/line/lbm-sdk/v2/store/dbadapter" diff --git a/store/dbadapter/store.go b/store/dbadapter/store.go index c81e2f17ab..b425350cee 100644 --- a/store/dbadapter/store.go +++ b/store/dbadapter/store.go @@ -3,7 +3,7 @@ package dbadapter import ( "io" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/cachekv" "github.com/line/lbm-sdk/v2/store/tracekv" diff --git a/store/gaskv/store_test.go b/store/gaskv/store_test.go index c16baf4faf..dc936adb90 100644 --- a/store/gaskv/store_test.go +++ b/store/gaskv/store_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/dbadapter" "github.com/line/lbm-sdk/v2/store/gaskv" diff --git a/store/iavl/store.go b/store/iavl/store.go index e1bb080c1d..b4a3313145 100644 --- a/store/iavl/store.go +++ b/store/iavl/store.go @@ -8,10 +8,10 @@ import ( "time" ics23 "github.com/confio/ics23/go" - "github.com/cosmos/iavl" - abci "github.com/tendermint/tendermint/abci/types" - tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" - dbm "github.com/tendermint/tm-db" + "github.com/line/iavl/v2" + abci "github.com/line/ostracon/abci/types" + ostcrypto "github.com/line/ostracon/proto/ostracon/crypto" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/cachekv" "github.com/line/lbm-sdk/v2/store/tracekv" @@ -342,7 +342,7 @@ func (st *Store) Query(req abci.RequestQuery) (res abci.ResponseQuery) { // Takes a MutableTree, a key, and a flag for creating existence or absence proof and returns the // appropriate merkle.Proof. Since this must be called after querying for the value, this function should never error // Thus, it will panic on error rather than returning it -func getProofFromTree(tree *iavl.MutableTree, key []byte, exists bool) *tmcrypto.ProofOps { +func getProofFromTree(tree *iavl.MutableTree, key []byte, exists bool) *ostcrypto.ProofOps { var ( commitmentProof *ics23.CommitmentProof err error @@ -365,7 +365,7 @@ func getProofFromTree(tree *iavl.MutableTree, key []byte, exists bool) *tmcrypto } op := types.NewIavlCommitmentOp(key, commitmentProof) - return &tmcrypto.ProofOps{Ops: []tmcrypto.ProofOp{op.ProofOp()}} + return &ostcrypto.ProofOps{Ops: []ostcrypto.ProofOp{op.ProofOp()}} } //---------------------------------------- diff --git a/store/iavl/store_test.go b/store/iavl/store_test.go index d76025c15f..5a898a901e 100644 --- a/store/iavl/store_test.go +++ b/store/iavl/store_test.go @@ -5,10 +5,10 @@ import ( "fmt" "testing" - "github.com/cosmos/iavl" + "github.com/line/iavl/v2" + abci "github.com/line/ostracon/abci/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/store/types" "github.com/line/lbm-sdk/v2/types/kv" diff --git a/store/iavl/tree.go b/store/iavl/tree.go index 83d1ada301..214f4cc255 100644 --- a/store/iavl/tree.go +++ b/store/iavl/tree.go @@ -3,7 +3,7 @@ package iavl import ( "fmt" - "github.com/cosmos/iavl" + "github.com/line/iavl/v2" ) var ( diff --git a/store/iavl/tree_test.go b/store/iavl/tree_test.go index 24332b42e0..561b5e0ea9 100644 --- a/store/iavl/tree_test.go +++ b/store/iavl/tree_test.go @@ -3,9 +3,9 @@ package iavl import ( "testing" - "github.com/cosmos/iavl" + "github.com/line/iavl/v2" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" ) func TestImmutableTreePanics(t *testing.T) { diff --git a/store/internal/maps/maps.go b/store/internal/maps/maps.go index 0530d00faa..9789926b52 100644 --- a/store/internal/maps/maps.go +++ b/store/internal/maps/maps.go @@ -3,9 +3,9 @@ package maps import ( "encoding/binary" - "github.com/tendermint/tendermint/crypto/merkle" - "github.com/tendermint/tendermint/crypto/tmhash" - tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/line/ostracon/crypto/merkle" + "github.com/line/ostracon/crypto/tmhash" + ostcrypto "github.com/line/ostracon/proto/ostracon/crypto" "github.com/line/lbm-sdk/v2/types/kv" ) @@ -183,7 +183,7 @@ func HashFromMap(m map[string][]byte) []byte { // ProofsFromMap generates proofs from a map. The keys/values of the map will be used as the keys/values // in the underlying key-value pairs. // The keys are sorted before the proofs are computed. -func ProofsFromMap(m map[string][]byte) ([]byte, map[string]*tmcrypto.Proof, []string) { +func ProofsFromMap(m map[string][]byte) ([]byte, map[string]*ostcrypto.Proof, []string) { sm := newSimpleMap() for k, v := range m { sm.Set(k, v) @@ -197,7 +197,7 @@ func ProofsFromMap(m map[string][]byte) ([]byte, map[string]*tmcrypto.Proof, []s } rootHash, proofList := merkle.ProofsFromByteSlices(kvsBytes) - proofs := make(map[string]*tmcrypto.Proof) + proofs := make(map[string]*ostcrypto.Proof) keys := make([]string, len(proofList)) for i, kvp := range kvs.Pairs { diff --git a/store/internal/proofs/convert.go b/store/internal/proofs/convert.go index 7e827ced5f..7c5ed17c05 100644 --- a/store/internal/proofs/convert.go +++ b/store/internal/proofs/convert.go @@ -5,7 +5,7 @@ import ( "math/bits" ics23 "github.com/confio/ics23/go" - "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/line/ostracon/proto/ostracon/crypto" ) // ConvertExistenceProof will convert the given proof into a valid diff --git a/store/internal/proofs/helpers.go b/store/internal/proofs/helpers.go index 65cbbb1481..19e53a7d52 100644 --- a/store/internal/proofs/helpers.go +++ b/store/internal/proofs/helpers.go @@ -3,8 +3,8 @@ package proofs import ( "sort" - "github.com/tendermint/tendermint/libs/rand" - tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/line/ostracon/libs/rand" + ostcrypto "github.com/line/ostracon/proto/ostracon/crypto" sdkmaps "github.com/line/lbm-sdk/v2/store/internal/maps" ) @@ -13,7 +13,7 @@ import ( type SimpleResult struct { Key []byte Value []byte - Proof *tmcrypto.Proof + Proof *ostcrypto.Proof RootHash []byte } diff --git a/store/mem/store.go b/store/mem/store.go index 5ff360809c..ce54292e51 100644 --- a/store/mem/store.go +++ b/store/mem/store.go @@ -3,7 +3,7 @@ package mem import ( "io" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/cachekv" "github.com/line/lbm-sdk/v2/store/dbadapter" diff --git a/store/prefix/store_test.go b/store/prefix/store_test.go index 6e935cdd21..13d4977d49 100644 --- a/store/prefix/store_test.go +++ b/store/prefix/store_test.go @@ -4,10 +4,10 @@ import ( "crypto/rand" "testing" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" - tiavl "github.com/cosmos/iavl" + liavl "github.com/line/iavl/v2" "github.com/line/lbm-sdk/v2/store/dbadapter" "github.com/line/lbm-sdk/v2/store/gaskv" @@ -88,7 +88,7 @@ func testPrefixStore(t *testing.T, baseStore types.KVStore, prefix []byte) { func TestIAVLStorePrefix(t *testing.T) { db := dbm.NewMemDB() - tree, err := tiavl.NewMutableTree(db, cacheSize) + tree, err := liavl.NewMutableTree(db, cacheSize) require.NoError(t, err) iavlStore := iavl.UnsafeNewStore(tree) diff --git a/store/rootmulti/proof.go b/store/rootmulti/proof.go index 3718150d7f..76b14942d6 100644 --- a/store/rootmulti/proof.go +++ b/store/rootmulti/proof.go @@ -1,7 +1,7 @@ package rootmulti import ( - "github.com/tendermint/tendermint/crypto/merkle" + "github.com/line/ostracon/crypto/merkle" storetypes "github.com/line/lbm-sdk/v2/store/types" ) diff --git a/store/rootmulti/proof_test.go b/store/rootmulti/proof_test.go index fae2e5f4b5..9cc437a13e 100644 --- a/store/rootmulti/proof_test.go +++ b/store/rootmulti/proof_test.go @@ -3,9 +3,9 @@ package rootmulti import ( "testing" + abci "github.com/line/ostracon/abci/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/store/iavl" "github.com/line/lbm-sdk/v2/store/types" diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index 67767064cc..4b853de508 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -10,12 +10,12 @@ import ( "sort" "strings" - iavltree "github.com/cosmos/iavl" protoio "github.com/gogo/protobuf/io" gogotypes "github.com/gogo/protobuf/types" + iavltree "github.com/line/iavl/v2" + abci "github.com/line/ostracon/abci/types" + dbm "github.com/line/tm-db/v2" "github.com/pkg/errors" - abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/snapshots" snapshottypes "github.com/line/lbm-sdk/v2/snapshots/types" diff --git a/store/rootmulti/store_test.go b/store/rootmulti/store_test.go index 5628ea9a84..13fb116fb4 100644 --- a/store/rootmulti/store_test.go +++ b/store/rootmulti/store_test.go @@ -11,10 +11,10 @@ import ( "math/rand" "testing" + abci "github.com/line/ostracon/abci/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tm-db" snapshottypes "github.com/line/lbm-sdk/v2/snapshots/types" "github.com/line/lbm-sdk/v2/store/iavl" diff --git a/store/store.go b/store/store.go index e283cc3962..7b31e436c5 100644 --- a/store/store.go +++ b/store/store.go @@ -1,7 +1,7 @@ package store import ( - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/cache" "github.com/line/lbm-sdk/v2/store/rootmulti" diff --git a/store/tracekv/store_test.go b/store/tracekv/store_test.go index bc5e44c17d..f192e6e727 100644 --- a/store/tracekv/store_test.go +++ b/store/tracekv/store_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/dbadapter" "github.com/line/lbm-sdk/v2/store/prefix" diff --git a/store/transient/store.go b/store/transient/store.go index a89bee804b..508cfd7e93 100644 --- a/store/transient/store.go +++ b/store/transient/store.go @@ -1,7 +1,7 @@ package transient import ( - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/store/dbadapter" "github.com/line/lbm-sdk/v2/store/types" diff --git a/store/types/commit_info.go b/store/types/commit_info.go index 9942be9182..259e727797 100644 --- a/store/types/commit_info.go +++ b/store/types/commit_info.go @@ -4,7 +4,7 @@ import ( fmt "fmt" ics23 "github.com/confio/ics23/go" - tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + ostcrypto "github.com/line/ostracon/proto/ostracon/crypto" sdkmaps "github.com/line/lbm-sdk/v2/store/internal/maps" sdkproofs "github.com/line/lbm-sdk/v2/store/internal/proofs" @@ -41,7 +41,7 @@ func (ci CommitInfo) Hash() []byte { return rootHash } -func (ci CommitInfo) ProofOp(storeName string) tmcrypto.ProofOp { +func (ci CommitInfo) ProofOp(storeName string) ostcrypto.ProofOp { cmap := ci.toMap() _, proofs, _ := sdkmaps.ProofsFromMap(cmap) diff --git a/store/types/commit_info.pb.go b/store/types/commit_info.pb.go index 988804d2f3..df838932ea 100644 --- a/store/types/commit_info.pb.go +++ b/store/types/commit_info.pb.go @@ -195,26 +195,27 @@ func init() { } var fileDescriptor_83f4097f6265b52f = []byte{ - // 301 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4e, 0xce, 0x2f, 0xce, - 0xcd, 0x2f, 0xd6, 0x4f, 0x4a, 0x2c, 0x4e, 0xd5, 0x2f, 0x2e, 0xc9, 0x2f, 0x4a, 0xd5, 0x2f, 0x33, - 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xce, 0xcf, 0xcd, 0xcd, 0x2c, 0x89, 0xcf, 0xcc, 0x4b, - 0xcb, 0xd7, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x84, 0x28, 0xd6, 0x03, 0x29, 0xd6, 0x03, - 0x2b, 0xd6, 0x83, 0x2a, 0x96, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xab, 0xd2, 0x07, 0xb1, 0x20, - 0x1a, 0x94, 0x8a, 0xb9, 0xb8, 0x9c, 0xc1, 0xa6, 0x78, 0xe6, 0xa5, 0xe5, 0x0b, 0x49, 0x70, 0xb1, - 0x97, 0xa5, 0x16, 0x15, 0x67, 0xe6, 0xe7, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0xc1, 0xb8, - 0x42, 0xde, 0x5c, 0xdc, 0x60, 0xe3, 0xc0, 0x96, 0x15, 0x4b, 0x30, 0x29, 0x30, 0x6b, 0x70, 0x1b, - 0xa9, 0xe8, 0xe1, 0xb4, 0x4e, 0x2f, 0x18, 0xc4, 0x03, 0x19, 0xea, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, - 0x43, 0x10, 0x57, 0x31, 0x4c, 0xa0, 0x58, 0x29, 0x9d, 0x8b, 0x13, 0x2e, 0x2d, 0x24, 0xc4, 0xc5, - 0x92, 0x97, 0x98, 0x9b, 0x0a, 0xb6, 0x90, 0x33, 0x08, 0xcc, 0x16, 0x72, 0xe3, 0xe2, 0x84, 0xf9, - 0x2d, 0x45, 0x82, 0x49, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x19, 0x8f, 0x5d, 0x50, 0x1f, 0xb8, 0x40, - 0xad, 0xe2, 0x80, 0xe8, 0xf5, 0x4c, 0x51, 0xb2, 0xe3, 0xe2, 0x80, 0xc9, 0xe1, 0xf1, 0x9b, 0x10, - 0x17, 0x4b, 0x46, 0x62, 0x71, 0x06, 0xd8, 0x22, 0x9e, 0x20, 0x30, 0xdb, 0x8a, 0x65, 0xc6, 0x02, - 0x79, 0x06, 0x27, 0xa7, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, - 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xd2, 0x48, - 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x87, 0x46, 0x10, 0x84, 0xd2, 0x2d, - 0x4e, 0xc9, 0x86, 0x46, 0x53, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0x38, 0xa0, 0x8d, 0x01, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x00, 0xc0, 0xc7, 0x12, 0xc8, 0x01, 0x00, 0x00, + // 307 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xb1, 0x4b, 0xc3, 0x40, + 0x14, 0xc6, 0x73, 0x6d, 0xd0, 0xf6, 0xea, 0x74, 0x38, 0x44, 0x87, 0x6b, 0xa9, 0x22, 0x05, 0xf1, + 0x8e, 0xd6, 0xcd, 0x41, 0xa4, 0x8a, 0x50, 0xdc, 0xe2, 0xe6, 0x22, 0x49, 0x7b, 0x4d, 0x83, 0xbd, + 0xbc, 0xd2, 0x77, 0x06, 0xfc, 0x2f, 0x1c, 0x1d, 0xfd, 0x73, 0x3a, 0x76, 0x74, 0x12, 0x49, 0xfe, + 0x11, 0xc9, 0x25, 0x71, 0xb3, 0xdb, 0xf7, 0xf2, 0xbe, 0xf7, 0xfd, 0xf8, 0x72, 0xf4, 0x7c, 0x0a, + 0xa8, 0x01, 0x65, 0x18, 0xa0, 0x92, 0x68, 0x60, 0xad, 0x64, 0x3a, 0x0c, 0x95, 0x09, 0x86, 0x72, + 0x0a, 0x5a, 0xc7, 0xe6, 0x39, 0x4e, 0xe6, 0x20, 0x56, 0x6b, 0x30, 0xc0, 0x8e, 0x4a, 0xb3, 0x28, + 0xcc, 0xc2, 0x9a, 0x45, 0x65, 0x3e, 0x3e, 0x8c, 0x20, 0x02, 0xeb, 0x92, 0x85, 0x2a, 0x0f, 0xfa, + 0x48, 0xe9, 0xad, 0x4d, 0x99, 0x24, 0x73, 0x60, 0x1e, 0xdd, 0x4f, 0xd5, 0x1a, 0x63, 0x48, 0x3c, + 0xd2, 0x23, 0x83, 0xa6, 0x5f, 0x8f, 0xec, 0x81, 0x76, 0x6c, 0x9c, 0x85, 0xa1, 0xd7, 0xe8, 0x35, + 0x07, 0x9d, 0xd1, 0xa9, 0xf8, 0x17, 0x27, 0x1e, 0x8b, 0xa9, 0x08, 0x1d, 0xbb, 0x9b, 0xef, 0xae, + 0xe3, 0x53, 0xac, 0x3f, 0x60, 0x3f, 0xa2, 0xed, 0xbf, 0x35, 0x63, 0xd4, 0x4d, 0x02, 0xad, 0x2c, + 0xb0, 0xed, 0x5b, 0xcd, 0xee, 0x69, 0xbb, 0xee, 0x36, 0xf3, 0x1a, 0x3d, 0x32, 0xe8, 0x8c, 0x4e, + 0x76, 0xb0, 0xaa, 0x06, 0x77, 0x15, 0xaa, 0x55, 0xde, 0x4e, 0x66, 0xfd, 0x6b, 0xda, 0xaa, 0x77, + 0x3b, 0xba, 0x31, 0xea, 0x2e, 0x02, 0x5c, 0x58, 0xd0, 0x81, 0x6f, 0xf5, 0x95, 0xfb, 0xf1, 0xd9, + 0x75, 0xc6, 0x37, 0x9b, 0x8c, 0x93, 0x6d, 0xc6, 0xc9, 0x4f, 0xc6, 0xc9, 0x7b, 0xce, 0x9d, 0x6d, + 0xce, 0x9d, 0xaf, 0x9c, 0x3b, 0x4f, 0x67, 0x51, 0x6c, 0x16, 0xaf, 0xa1, 0x98, 0x82, 0x96, 0xcb, + 0x38, 0x51, 0x72, 0x19, 0xea, 0x0b, 0x9c, 0xbd, 0xc8, 0x74, 0x54, 0x3d, 0x92, 0x79, 0x5b, 0x29, + 0x0c, 0xf7, 0xec, 0x6f, 0xbe, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x16, 0x16, 0xbf, 0xa1, 0xc6, + 0x01, 0x00, 0x00, } func (m *CommitInfo) Marshal() (dAtA []byte, err error) { diff --git a/store/types/iterator_test.go b/store/types/iterator_test.go index 85d25ec924..bf18d6dddc 100644 --- a/store/types/iterator_test.go +++ b/store/types/iterator_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/store/iavl" "github.com/line/lbm-sdk/v2/store/types" diff --git a/store/types/proof.go b/store/types/proof.go index 8ec3f5d8d4..bb647c4ef2 100644 --- a/store/types/proof.go +++ b/store/types/proof.go @@ -2,8 +2,8 @@ package types import ( ics23 "github.com/confio/ics23/go" - "github.com/tendermint/tendermint/crypto/merkle" - tmmerkle "github.com/tendermint/tendermint/proto/tendermint/crypto" + "github.com/line/ostracon/crypto/merkle" + ostmerkle "github.com/line/ostracon/proto/ostracon/crypto" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" ) @@ -49,7 +49,7 @@ func NewSimpleMerkleCommitmentOp(key []byte, proof *ics23.CommitmentProof) Commi // CommitmentOpDecoder takes a merkle.ProofOp and attempts to decode it into a CommitmentOp ProofOperator // The proofOp.Data is just a marshalled CommitmentProof. The Key of the CommitmentOp is extracted // from the unmarshalled proof. -func CommitmentOpDecoder(pop tmmerkle.ProofOp) (merkle.ProofOperator, error) { +func CommitmentOpDecoder(pop ostmerkle.ProofOp) (merkle.ProofOperator, error) { var spec *ics23.ProofSpec switch pop.Type { case ProofOpIAVLCommitment: @@ -118,12 +118,12 @@ func (op CommitmentOp) Run(args [][]byte) ([][]byte, error) { // ProofOp implements ProofOperator interface and converts a CommitmentOp // into a merkle.ProofOp format that can later be decoded by CommitmentOpDecoder // back into a CommitmentOp for proof verification -func (op CommitmentOp) ProofOp() tmmerkle.ProofOp { +func (op CommitmentOp) ProofOp() ostmerkle.ProofOp { bz, err := op.Proof.Marshal() if err != nil { panic(err.Error()) } - return tmmerkle.ProofOp{ + return ostmerkle.ProofOp{ Type: op.Type, Key: op.Key, Data: bz, diff --git a/store/types/snapshot.pb.go b/store/types/snapshot.pb.go index 6f001da1bf..e81a3cddc6 100644 --- a/store/types/snapshot.pb.go +++ b/store/types/snapshot.pb.go @@ -236,28 +236,28 @@ func init() { } var fileDescriptor_9c55879db4cc4502 = []byte{ - // 324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xc1, 0x4a, 0xc3, 0x30, - 0x18, 0xc7, 0x1b, 0xd7, 0x4d, 0xfd, 0xdc, 0x61, 0x86, 0x21, 0xd5, 0x43, 0x1d, 0xbb, 0x58, 0x50, - 0x13, 0xa6, 0x4f, 0x60, 0xf1, 0xb0, 0xa1, 0xa7, 0x0c, 0x3c, 0x78, 0x4b, 0x67, 0x68, 0xcb, 0xd6, - 0x65, 0x2c, 0x59, 0x61, 0x6f, 0xe1, 0x6b, 0xf8, 0x26, 0x1e, 0x77, 0xf4, 0x24, 0xd2, 0xbd, 0x88, - 0x24, 0xe9, 0x2e, 0x8a, 0xe0, 0xa9, 0xdf, 0xbf, 0xfc, 0xfe, 0xbf, 0x7c, 0xf0, 0x41, 0x34, 0x91, - 0xaa, 0x90, 0x8a, 0x26, 0x5c, 0x09, 0xaa, 0xb4, 0x5c, 0x0a, 0x5a, 0x0e, 0x12, 0xa1, 0xf9, 0x80, - 0xaa, 0x39, 0x5f, 0xa8, 0x4c, 0x6a, 0xb2, 0x58, 0x4a, 0x2d, 0xf1, 0xa9, 0x23, 0x89, 0x21, 0x89, - 0x25, 0x49, 0x4d, 0x9e, 0x75, 0x53, 0x99, 0x4a, 0x4b, 0x51, 0x33, 0xb9, 0x42, 0xff, 0x0d, 0x41, - 0x7b, 0x5c, 0x3b, 0x46, 0x5a, 0x14, 0xf8, 0x1e, 0x9a, 0xb6, 0x17, 0xa0, 0x1e, 0x8a, 0x8e, 0x6e, - 0xae, 0xc8, 0x9f, 0x46, 0xb2, 0xeb, 0x8d, 0xcd, 0x5f, 0x53, 0x1e, 0x7a, 0xcc, 0x95, 0xf1, 0x03, - 0xf8, 0x39, 0x2f, 0x67, 0xc1, 0x9e, 0x95, 0x5c, 0xfe, 0x43, 0x32, 0xba, 0x7b, 0x7a, 0x34, 0x8e, - 0xf8, 0xa0, 0xfa, 0x3c, 0xf7, 0x4d, 0x1a, 0x7a, 0xcc, 0x4a, 0xe2, 0x16, 0xf8, 0xb9, 0x16, 0x45, - 0xff, 0x02, 0x8e, 0x7f, 0x3d, 0x89, 0x31, 0xf8, 0x73, 0x5e, 0xb8, 0x75, 0x0f, 0x99, 0x9d, 0xfb, - 0x33, 0xe8, 0xfc, 0xd4, 0xe2, 0x0e, 0x34, 0xa6, 0x62, 0x6d, 0xb1, 0x36, 0x33, 0x23, 0xee, 0x42, - 0xb3, 0xe4, 0xb3, 0x95, 0xb0, 0x4b, 0xb6, 0x99, 0x0b, 0x38, 0x80, 0xfd, 0x52, 0x2c, 0x55, 0x2e, - 0xe7, 0x41, 0xa3, 0x87, 0xa2, 0x06, 0xdb, 0x45, 0x7c, 0x02, 0xad, 0x4c, 0xe4, 0x69, 0xa6, 0x03, - 0xbf, 0x87, 0xa2, 0x26, 0xab, 0x53, 0x1c, 0xbf, 0x57, 0x21, 0xda, 0x54, 0x21, 0xfa, 0xaa, 0x42, - 0xf4, 0xba, 0x0d, 0xbd, 0xcd, 0x36, 0xf4, 0x3e, 0xb6, 0xa1, 0xf7, 0x1c, 0xa5, 0xb9, 0xce, 0x56, - 0x09, 0x99, 0xc8, 0x82, 0xd6, 0x27, 0x74, 0x9f, 0x6b, 0xf5, 0x32, 0xad, 0x0f, 0xa9, 0xd7, 0x0b, - 0xa1, 0x92, 0x96, 0xbd, 0xc6, 0xed, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x75, 0x87, 0x24, 0x7b, - 0xea, 0x01, 0x00, 0x00, + // 330 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0xb1, 0x4e, 0xeb, 0x30, + 0x14, 0x86, 0xe3, 0xdb, 0xb4, 0x17, 0x0e, 0x1d, 0x8a, 0x55, 0xa1, 0xc0, 0x10, 0xaa, 0x0e, 0x10, + 0x09, 0xb0, 0xd5, 0xf2, 0x02, 0x50, 0x31, 0xb4, 0x82, 0xc9, 0x95, 0x18, 0xd8, 0x92, 0x62, 0x25, + 0x51, 0xe3, 0xb8, 0xaa, 0xdd, 0x48, 0x7d, 0x0b, 0x5e, 0x83, 0x37, 0x61, 0xec, 0xc8, 0x84, 0x50, + 0xfa, 0x22, 0xc8, 0x4e, 0xba, 0x80, 0x90, 0xd8, 0xce, 0x6f, 0x7d, 0xff, 0xe7, 0x23, 0x1d, 0x08, + 0x66, 0x52, 0x09, 0xa9, 0x68, 0x14, 0x2a, 0x4e, 0x95, 0x96, 0x4b, 0x4e, 0x8b, 0x41, 0xc4, 0x75, + 0x38, 0xa0, 0x2a, 0x0f, 0x17, 0x2a, 0x91, 0x9a, 0x2c, 0x96, 0x52, 0x4b, 0x7c, 0x5c, 0x91, 0xc4, + 0x90, 0xc4, 0x92, 0xa4, 0x26, 0x4f, 0xba, 0xb1, 0x8c, 0xa5, 0xa5, 0xa8, 0x99, 0xaa, 0x42, 0xff, + 0x15, 0x41, 0x7b, 0x5a, 0x3b, 0x26, 0x9a, 0x0b, 0x7c, 0x07, 0x4d, 0xdb, 0xf3, 0x50, 0x0f, 0x05, + 0x07, 0xc3, 0x4b, 0xf2, 0xab, 0x91, 0xec, 0x7a, 0x53, 0xf3, 0x6a, 0xca, 0x63, 0x87, 0x55, 0x65, + 0x7c, 0x0f, 0x6e, 0x1a, 0x16, 0x99, 0xf7, 0xcf, 0x4a, 0x2e, 0xfe, 0x20, 0x99, 0xdc, 0x3e, 0x3e, + 0x18, 0xc7, 0x68, 0xaf, 0xfc, 0x38, 0x75, 0x4d, 0x1a, 0x3b, 0xcc, 0x4a, 0x46, 0x2d, 0x70, 0x53, + 0xcd, 0x45, 0xff, 0x1c, 0x0e, 0x7f, 0x7c, 0x89, 0x31, 0xb8, 0x79, 0x28, 0xaa, 0x75, 0xf7, 0x99, + 0x9d, 0xfb, 0x19, 0x74, 0xbe, 0x6b, 0x71, 0x07, 0x1a, 0x73, 0xbe, 0xb6, 0x58, 0x9b, 0x99, 0x11, + 0x77, 0xa1, 0x59, 0x84, 0xd9, 0x8a, 0xdb, 0x25, 0xdb, 0xac, 0x0a, 0xd8, 0x83, 0xff, 0x05, 0x5f, + 0xaa, 0x54, 0xe6, 0x5e, 0xa3, 0x87, 0x82, 0x06, 0xdb, 0x45, 0x7c, 0x04, 0xad, 0x84, 0xa7, 0x71, + 0xa2, 0x3d, 0xb7, 0x87, 0x82, 0x26, 0xab, 0xd3, 0xe8, 0xe6, 0xad, 0xf4, 0xd1, 0xa6, 0xf4, 0xd1, + 0x67, 0xe9, 0xa3, 0x97, 0xad, 0xef, 0x6c, 0xb6, 0xbe, 0xf3, 0xbe, 0xf5, 0x9d, 0xa7, 0xb3, 0x38, + 0xd5, 0xc9, 0x2a, 0x22, 0x33, 0x29, 0x68, 0x96, 0xe6, 0x9c, 0x66, 0x91, 0xb8, 0x52, 0xcf, 0x73, + 0x5a, 0x0c, 0xeb, 0x33, 0xea, 0xf5, 0x82, 0xab, 0xa8, 0x65, 0x6f, 0x71, 0xfd, 0x15, 0x00, 0x00, + 0xff, 0xff, 0xdb, 0x88, 0x8a, 0xf1, 0xe8, 0x01, 0x00, 0x00, } func (m *SnapshotItem) Marshal() (dAtA []byte, err error) { diff --git a/store/types/store.go b/store/types/store.go index 143f259f0c..5a162eee65 100644 --- a/store/types/store.go +++ b/store/types/store.go @@ -4,9 +4,9 @@ import ( "fmt" "io" - abci "github.com/tendermint/tendermint/abci/types" - tmstrings "github.com/tendermint/tendermint/libs/strings" - dbm "github.com/tendermint/tm-db" + abci "github.com/line/ostracon/abci/types" + oststrings "github.com/line/ostracon/libs/strings" + dbm "github.com/line/tm-db/v2" snapshottypes "github.com/line/lbm-sdk/v2/snapshots/types" "github.com/line/lbm-sdk/v2/types/kv" @@ -70,7 +70,7 @@ func (s *StoreUpgrades) IsAdded(key string) bool { if s == nil { return false } - return tmstrings.StringInSlice(key, s.Added) + return oststrings.StringInSlice(key, s.Added) } // IsDeleted returns true if the given key should be deleted diff --git a/store/types/utils_test.go b/store/types/utils_test.go index f26ca02f23..1fab2c903b 100644 --- a/store/types/utils_test.go +++ b/store/types/utils_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/store/rootmulti" "github.com/line/lbm-sdk/v2/store/types" diff --git a/tests/mocks/tendermint_tendermint_libs_log_DB.go b/tests/mocks/tendermint_tendermint_libs_log_DB.go index 454fd9c760..19fb828224 100644 --- a/tests/mocks/tendermint_tendermint_libs_log_DB.go +++ b/tests/mocks/tendermint_tendermint_libs_log_DB.go @@ -1,12 +1,12 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/tendermint/tendermint/libs/log (interfaces: Logger) +// Source: github.com/line/ostracon/libs/log (interfaces: Logger) // Package mocks is a generated GoMock package. package mocks import ( gomock "github.com/golang/mock/gomock" - log "github.com/tendermint/tendermint/libs/log" + log "github.com/line/ostracon/libs/log" reflect "reflect" ) diff --git a/tests/mocks/tendermint_tm_db_DB.go b/tests/mocks/tendermint_tm_db_DB.go index cdf5e5ab0a..fab3afd2d6 100644 --- a/tests/mocks/tendermint_tm_db_DB.go +++ b/tests/mocks/tendermint_tm_db_DB.go @@ -1,12 +1,12 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/tendermint/tm-db (interfaces: DB) +// Source: github.com/line/tm-db/v2 (interfaces: DB) // Package mocks is a generated GoMock package. package mocks import ( gomock "github.com/golang/mock/gomock" - db "github.com/tendermint/tm-db" + db "github.com/line/tm-db/v2" reflect "reflect" ) diff --git a/tests/mocks/types_module_module.go b/tests/mocks/types_module_module.go index 868b4af3e1..e62a303709 100644 --- a/tests/mocks/types_module_module.go +++ b/tests/mocks/types_module_module.go @@ -14,8 +14,8 @@ import ( types "github.com/line/lbm-sdk/v2/codec/types" types0 "github.com/line/lbm-sdk/v2/types" module "github.com/line/lbm-sdk/v2/types/module" + types1 "github.com/line/ostracon/abci/types" cobra "github.com/spf13/cobra" - types1 "github.com/tendermint/tendermint/abci/types" reflect "reflect" ) diff --git a/testutil/network/network.go b/testutil/network/network.go index ad5af74a4f..1924b8e50c 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -14,14 +14,14 @@ import ( "testing" "time" + ostcfg "github.com/line/ostracon/config" + ostflags "github.com/line/ostracon/libs/cli/flags" + "github.com/line/ostracon/libs/log" + ostrand "github.com/line/ostracon/libs/rand" + "github.com/line/ostracon/node" + ostclient "github.com/line/ostracon/rpc/client" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - tmcfg "github.com/tendermint/tendermint/config" - tmflags "github.com/tendermint/tendermint/libs/cli/flags" - "github.com/tendermint/tendermint/libs/log" - tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/node" - tmclient "github.com/tendermint/tendermint/rpc/client" - dbm "github.com/tendermint/tm-db" "google.golang.org/grpc" "github.com/line/lbm-sdk/v2/baseapp" @@ -106,7 +106,7 @@ func DefaultConfig() Config { AppConstructor: NewAppConstructor(encCfg), GenesisState: simapp.ModuleBasics.DefaultGenesis(encCfg.Marshaler), TimeoutCommit: 2 * time.Second, - ChainID: "chain-" + tmrand.NewRand().Str(6), + ChainID: "chain-" + ostrand.NewRand().Str(6), NumValidators: 4, BondDenom: sdk.DefaultBondDenom, MinGasPrices: fmt.Sprintf("0.000006%s", sdk.DefaultBondDenom), @@ -155,7 +155,7 @@ type ( P2PAddress string Address sdk.AccAddress ValAddress sdk.ValAddress - RPCClient tmclient.Client + RPCClient ostclient.Client tmNode *node.Node api *api.Server @@ -234,7 +234,7 @@ func New(t *testing.T, cfg Config) *Network { logger := log.NewNopLogger() if cfg.EnableLogging { logger = log.NewTMLogger(log.NewSyncWriter(os.Stdout)) - logger, _ = tmflags.ParseLogLevel("info", logger, tmcfg.DefaultLogLevel) + logger, _ = ostflags.ParseLogLevel("info", logger, ostcfg.DefaultLogLevel) } ctx.Logger = logger diff --git a/testutil/network/util.go b/testutil/network/util.go index b6a36becc4..2c806f69f1 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -5,14 +5,14 @@ import ( "path/filepath" "time" - tmos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/node" - "github.com/tendermint/tendermint/p2p" - pvm "github.com/tendermint/tendermint/privval" - "github.com/tendermint/tendermint/proxy" - "github.com/tendermint/tendermint/rpc/client/local" - "github.com/tendermint/tendermint/types" - tmtime "github.com/tendermint/tendermint/types/time" + ostos "github.com/line/ostracon/libs/os" + "github.com/line/ostracon/node" + "github.com/line/ostracon/p2p" + pvm "github.com/line/ostracon/privval" + "github.com/line/ostracon/proxy" + "github.com/line/ostracon/rpc/client/local" + "github.com/line/ostracon/types" + osttime "github.com/line/ostracon/types/time" "github.com/line/lbm-sdk/v2/server/api" servergrpc "github.com/line/lbm-sdk/v2/server/grpc" @@ -105,7 +105,7 @@ func startInProcess(cfg Config, val *Validator) error { } func collectGenFiles(cfg Config, vals []*Validator, outputDir string) error { - genTime := tmtime.Now() + genTime := osttime.Now() for i := 0; i < cfg.NumValidators; i++ { tmCfg := vals[i].Ctx.Config @@ -185,12 +185,12 @@ func writeFile(name string, dir string, contents []byte) error { writePath := filepath.Join(dir) file := filepath.Join(writePath, name) - err := tmos.EnsureDir(writePath, 0755) + err := ostos.EnsureDir(writePath, 0755) if err != nil { return err } - err = tmos.WriteFile(file, contents, 0644) + err = ostos.WriteFile(file, contents, 0644) if err != nil { return err } diff --git a/testutil/testdata/query.pb.go b/testutil/testdata/query.pb.go index 95dc9dc01b..c1f003a9e1 100644 --- a/testutil/testdata/query.pb.go +++ b/testutil/testdata/query.pb.go @@ -304,30 +304,30 @@ func init() { func init() { proto.RegisterFile("query.proto", fileDescriptor_5c6ac9b241082464) } var fileDescriptor_5c6ac9b241082464 = []byte{ - // 359 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0xcf, 0x4f, 0xc2, 0x30, - 0x14, 0xc7, 0x59, 0x82, 0x02, 0x0f, 0x03, 0xa6, 0xfe, 0x08, 0xf4, 0xb0, 0x98, 0x25, 0x46, 0x2e, - 0x76, 0x09, 0xc4, 0xab, 0x09, 0x26, 0x24, 0x5c, 0x45, 0x4f, 0x5e, 0x4c, 0x81, 0xba, 0x2d, 0x6e, - 0x2d, 0xd0, 0xee, 0xb0, 0xff, 0xc2, 0x7f, 0xc9, 0x9b, 0x47, 0x8e, 0x1e, 0x0d, 0xfc, 0x23, 0x66, - 0x5b, 0xbb, 0x09, 0x21, 0x9e, 0xda, 0xd7, 0x7e, 0xde, 0xe7, 0xe5, 0x7d, 0xa1, 0xb9, 0x8c, 0xd9, - 0x2a, 0x21, 0x8b, 0x95, 0x50, 0x02, 0xd5, 0x15, 0x93, 0x6a, 0x4e, 0x15, 0xc5, 0x5d, 0x4f, 0x08, - 0x2f, 0x64, 0x6e, 0xf6, 0x3e, 0x8d, 0xdf, 0x5c, 0xca, 0x35, 0x84, 0x5b, 0x06, 0xca, 0x6b, 0xe7, - 0x06, 0x9a, 0xa3, 0x99, 0x2f, 0x26, 0x6c, 0x19, 0x33, 0xa9, 0x50, 0x07, 0x6a, 0x11, 0x93, 0x92, - 0x7a, 0xac, 0x63, 0x5d, 0x59, 0xbd, 0xc6, 0xc4, 0x94, 0x4e, 0x0f, 0x4e, 0x72, 0x50, 0x2e, 0x04, - 0x97, 0xec, 0x1f, 0xf2, 0x1a, 0xda, 0x4f, 0x34, 0x19, 0xb3, 0x30, 0x2c, 0xb4, 0x08, 0xaa, 0x9c, - 0x46, 0x86, 0xcc, 0xee, 0x0e, 0x81, 0xd3, 0x12, 0xd3, 0x52, 0x0c, 0x75, 0x6f, 0xc5, 0x98, 0x0a, - 0xb8, 0xa7, 0xd9, 0xa2, 0x76, 0x46, 0xd0, 0x7a, 0x66, 0x52, 0x0d, 0x79, 0x62, 0xac, 0x03, 0x00, - 0xca, 0x93, 0x57, 0xca, 0x83, 0x88, 0x86, 0x19, 0xdf, 0xec, 0x9f, 0x93, 0x7c, 0x77, 0x62, 0x76, - 0x27, 0x69, 0x43, 0x83, 0xf2, 0x64, 0x98, 0x61, 0xce, 0x08, 0xda, 0x85, 0x46, 0x4f, 0xed, 0x03, - 0xf8, 0x54, 0xee, 0x7a, 0xce, 0x48, 0x11, 0xd4, 0x98, 0xca, 0xbc, 0x77, 0xd2, 0xf0, 0xcd, 0xb5, - 0xff, 0x69, 0xc1, 0xd1, 0x63, 0x1a, 0x3e, 0xba, 0x83, 0x6a, 0x1a, 0x0c, 0xba, 0x28, 0x3b, 0xfe, - 0x24, 0x8a, 0x2f, 0xf7, 0x9f, 0xf5, 0xd0, 0x21, 0xd4, 0xcd, 0xfa, 0xa8, 0x5b, 0x32, 0x7b, 0xc9, - 0x61, 0x7c, 0xe8, 0x4b, 0x2b, 0xee, 0xa1, 0xa6, 0x57, 0x41, 0x9d, 0x12, 0xdb, 0x0d, 0x09, 0x77, - 0x0f, 0xfc, 0xe4, 0xfd, 0x0f, 0xe3, 0xaf, 0x8d, 0x6d, 0xad, 0x37, 0xb6, 0xf5, 0xb3, 0xb1, 0xad, - 0x8f, 0xad, 0x5d, 0x59, 0x6f, 0xed, 0xca, 0xf7, 0xd6, 0xae, 0xbc, 0x10, 0x2f, 0x50, 0x7e, 0x3c, - 0x25, 0x33, 0x11, 0xb9, 0x33, 0x21, 0x23, 0x21, 0xf5, 0x71, 0x2b, 0xe7, 0xef, 0x6e, 0x2a, 0x8c, - 0x55, 0x10, 0xba, 0xc6, 0x3c, 0x3d, 0xce, 0xd2, 0x1e, 0xfc, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe8, - 0xb4, 0x42, 0x4e, 0x90, 0x02, 0x00, 0x00, + // 365 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x90, 0x41, 0x4f, 0xe2, 0x40, + 0x18, 0x86, 0x69, 0xc2, 0x2e, 0xf0, 0xb1, 0x81, 0x4d, 0x77, 0x35, 0xd0, 0x43, 0x63, 0x9a, 0x18, + 0x39, 0x68, 0x27, 0x29, 0xf1, 0x6a, 0x82, 0x09, 0x86, 0xab, 0xe8, 0xc9, 0x8b, 0x99, 0xc2, 0xd8, + 0x36, 0x4e, 0x67, 0x80, 0x99, 0x9a, 0xf4, 0x5f, 0xf8, 0x97, 0xbc, 0x79, 0xe4, 0xe8, 0xd1, 0xc0, + 0x1f, 0x31, 0x6d, 0x67, 0x5a, 0x21, 0xc4, 0xdb, 0x7c, 0x33, 0xcf, 0xf7, 0x4c, 0xde, 0x17, 0xda, + 0xcb, 0x84, 0xac, 0x52, 0x77, 0xb1, 0xe2, 0x92, 0x9b, 0x4d, 0x49, 0x84, 0x9c, 0x63, 0x89, 0xad, + 0x7e, 0xc0, 0x79, 0x40, 0x09, 0xca, 0xef, 0xfd, 0xe4, 0x09, 0x61, 0xa6, 0x20, 0xab, 0xa3, 0xa1, + 0x62, 0x76, 0xce, 0xa0, 0x3d, 0x9e, 0x85, 0x7c, 0x4a, 0x96, 0x09, 0x11, 0xd2, 0xec, 0x41, 0x23, + 0x26, 0x42, 0xe0, 0x80, 0xf4, 0x8c, 0x13, 0x63, 0xd0, 0x9a, 0xea, 0xd1, 0x19, 0xc0, 0x9f, 0x02, + 0x14, 0x0b, 0xce, 0x04, 0xf9, 0x81, 0x3c, 0x85, 0xee, 0x1d, 0x4e, 0x27, 0x84, 0xd2, 0x52, 0x6b, + 0x42, 0x9d, 0xe1, 0x58, 0x93, 0xf9, 0xd9, 0x71, 0xe1, 0x6f, 0x85, 0x29, 0xa9, 0x05, 0xcd, 0x60, + 0x45, 0x88, 0x8c, 0x58, 0xa0, 0xd8, 0x72, 0x76, 0xc6, 0xd0, 0xb9, 0x27, 0x42, 0x8e, 0x58, 0xaa, + 0xad, 0x43, 0x00, 0xcc, 0xd2, 0x47, 0xcc, 0xa2, 0x18, 0xd3, 0x9c, 0x6f, 0x7b, 0xff, 0xdd, 0x22, + 0xbb, 0xab, 0xb3, 0xbb, 0xd9, 0x42, 0x0b, 0xb3, 0x74, 0x94, 0x63, 0xce, 0x18, 0xba, 0xa5, 0x46, + 0xfd, 0xea, 0x01, 0x84, 0x58, 0xec, 0x7a, 0xfe, 0xb9, 0x65, 0x51, 0x13, 0x2c, 0x8a, 0xdd, 0x69, + 0x2b, 0xd4, 0x47, 0xef, 0xcd, 0x80, 0x5f, 0xb7, 0x59, 0xf9, 0xe6, 0x25, 0xd4, 0xb3, 0x62, 0xcc, + 0xa3, 0x6a, 0xe3, 0x5b, 0xa3, 0xd6, 0xf1, 0xfe, 0xb5, 0xfa, 0x74, 0x04, 0x4d, 0x1d, 0xdf, 0xec, + 0x57, 0xcc, 0x5e, 0x73, 0x96, 0x75, 0xe8, 0x49, 0x29, 0xae, 0xa0, 0xa1, 0xa2, 0x98, 0xbd, 0x0a, + 0xdb, 0x2d, 0xc9, 0xea, 0x1f, 0x78, 0x29, 0xf6, 0xaf, 0x6f, 0xde, 0x37, 0xb6, 0xb1, 0xde, 0xd8, + 0xc6, 0xe7, 0xc6, 0x36, 0x5e, 0xb7, 0x76, 0x6d, 0xbd, 0xb5, 0x6b, 0x1f, 0x5b, 0xbb, 0xf6, 0x70, + 0x1e, 0x44, 0x32, 0x4c, 0x7c, 0x77, 0xc6, 0x63, 0x44, 0x23, 0x46, 0x10, 0xf5, 0xe3, 0x0b, 0x31, + 0x7f, 0x46, 0x2f, 0x1e, 0xca, 0x74, 0x89, 0x8c, 0x28, 0xd2, 0x5e, 0xff, 0x77, 0xde, 0xf5, 0xf0, + 0x2b, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x4b, 0x6e, 0x6f, 0x8e, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/testutil/testdata/testdata.pb.go b/testutil/testdata/testdata.pb.go index 9f5b38465e..983baecec4 100644 --- a/testutil/testdata/testdata.pb.go +++ b/testutil/testdata/testdata.pb.go @@ -334,30 +334,30 @@ func init() { func init() { proto.RegisterFile("testdata.proto", fileDescriptor_40c4782d007dfce9) } var fileDescriptor_40c4782d007dfce9 = []byte{ - // 365 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0x31, 0x4f, 0xc2, 0x40, - 0x18, 0x86, 0x39, 0x0b, 0x28, 0x9f, 0x0d, 0xc4, 0x0b, 0x43, 0x65, 0xa8, 0xa4, 0x8b, 0x0c, 0xd2, - 0x26, 0x12, 0x17, 0x36, 0xc0, 0x28, 0x0b, 0x4b, 0xdd, 0x5c, 0xc8, 0x95, 0x1e, 0xed, 0x85, 0xb6, - 0x67, 0xb8, 0xab, 0x01, 0x7f, 0x85, 0x7f, 0xc1, 0x7f, 0xe3, 0xc8, 0xe8, 0x68, 0xe0, 0x8f, 0x98, - 0x5e, 0xa9, 0x30, 0x32, 0xf5, 0x7d, 0xdf, 0xaf, 0xef, 0x93, 0xef, 0x92, 0x0f, 0xea, 0x92, 0x0a, - 0xe9, 0x13, 0x49, 0xec, 0xb7, 0x25, 0x97, 0x1c, 0x5f, 0x14, 0xbe, 0xd5, 0x0c, 0x78, 0xc0, 0x55, - 0xe8, 0x64, 0x2a, 0x9f, 0xb7, 0xae, 0x03, 0xce, 0x83, 0x88, 0x3a, 0xca, 0x79, 0xe9, 0xdc, 0x21, - 0xc9, 0x3a, 0x1f, 0x59, 0x5d, 0xd0, 0x1e, 0x79, 0x80, 0x31, 0x94, 0x05, 0xfb, 0xa0, 0x06, 0x6a, - 0xa3, 0x4e, 0xcd, 0x55, 0x3a, 0xcb, 0x12, 0x12, 0x53, 0xe3, 0x2c, 0xcf, 0x32, 0x6d, 0x3d, 0x80, - 0x36, 0x22, 0x12, 0x1b, 0x70, 0x1e, 0xf3, 0x84, 0x2d, 0xe8, 0x72, 0xdf, 0x28, 0x2c, 0x6e, 0x42, - 0x25, 0x62, 0xef, 0x54, 0xa8, 0x56, 0xc5, 0xcd, 0x8d, 0xf5, 0x0c, 0xb5, 0x31, 0x11, 0x83, 0x84, - 0xc5, 0x24, 0xc2, 0x77, 0x50, 0x25, 0x4a, 0xa9, 0xee, 0xe5, 0x7d, 0xd3, 0xce, 0xd7, 0xb3, 0x8b, - 0xf5, 0xec, 0x41, 0xb2, 0x76, 0xf7, 0xff, 0x60, 0x1d, 0xd0, 0x4a, 0xc1, 0x34, 0x17, 0xad, 0xac, - 0x11, 0xe8, 0x63, 0x22, 0x0e, 0xac, 0x1e, 0x40, 0x48, 0xc4, 0xf4, 0x04, 0x5e, 0x2d, 0x2c, 0x4a, - 0xd6, 0x04, 0x1a, 0x39, 0xe4, 0xc0, 0xe9, 0x43, 0x3d, 0xe3, 0x9c, 0xc8, 0xd2, 0xc3, 0xa3, 0xae, - 0xe5, 0xc1, 0xd5, 0x90, 0xf8, 0x93, 0x34, 0x92, 0xec, 0x85, 0x05, 0x09, 0x91, 0xe9, 0x92, 0x62, - 0x13, 0x40, 0x14, 0x46, 0x18, 0xa8, 0xad, 0x75, 0x74, 0xf7, 0x28, 0xc1, 0xb7, 0xd0, 0x88, 0x49, - 0xc4, 0x66, 0x8c, 0xa7, 0x62, 0x3a, 0x67, 0x34, 0xf2, 0x8d, 0x4a, 0x1b, 0x75, 0x74, 0xb7, 0xfe, - 0x1f, 0x3f, 0x65, 0x69, 0xbf, 0xbc, 0xf9, 0xba, 0x41, 0xc3, 0xf1, 0xf7, 0xd6, 0x44, 0x9b, 0xad, - 0x89, 0x7e, 0xb7, 0x26, 0xfa, 0xdc, 0x99, 0xa5, 0xcd, 0xce, 0x2c, 0xfd, 0xec, 0xcc, 0xd2, 0xab, - 0x1d, 0x30, 0x19, 0xa6, 0x9e, 0x3d, 0xe3, 0xb1, 0x33, 0xe3, 0x22, 0xe6, 0x62, 0xff, 0xe9, 0x0a, - 0x7f, 0xe1, 0x64, 0x87, 0x91, 0x4a, 0x16, 0x39, 0xc5, 0x85, 0x78, 0x55, 0xf5, 0x92, 0xde, 0x5f, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xa3, 0x51, 0x62, 0x40, 0x44, 0x02, 0x00, 0x00, + // 367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x92, 0xb1, 0xce, 0xda, 0x30, + 0x14, 0x85, 0x71, 0xf3, 0x43, 0xcb, 0x6d, 0x04, 0xaa, 0xc5, 0x90, 0x32, 0xa4, 0x28, 0x4b, 0x19, + 0x20, 0x96, 0x40, 0x5d, 0xd8, 0x80, 0x8a, 0xb2, 0xb0, 0xa4, 0x5b, 0x17, 0xe4, 0x10, 0x93, 0x58, + 0x38, 0x71, 0x85, 0x1d, 0x04, 0x7d, 0x8a, 0xbe, 0x42, 0xdf, 0xa6, 0x23, 0x63, 0xc7, 0x0a, 0x5e, + 0xa4, 0x8a, 0x43, 0x0a, 0x23, 0xdb, 0x39, 0xe7, 0xfa, 0x7c, 0xba, 0x96, 0x2e, 0xb4, 0x34, 0x53, + 0x3a, 0xa2, 0x9a, 0xfa, 0xdf, 0xf7, 0x52, 0x4b, 0xfc, 0xa6, 0xf2, 0xdd, 0x4e, 0x2c, 0x63, 0x69, + 0x42, 0x52, 0xa8, 0x72, 0xde, 0x7d, 0x1f, 0x4b, 0x19, 0x0b, 0x46, 0x8c, 0x0b, 0xf3, 0x2d, 0xa1, + 0xd9, 0xa9, 0x1c, 0x79, 0x43, 0xb0, 0x3e, 0xcb, 0x18, 0x63, 0x78, 0x51, 0xfc, 0x07, 0x73, 0x50, + 0x0f, 0xf5, 0x9b, 0x81, 0xd1, 0x45, 0x96, 0xd1, 0x94, 0x39, 0xaf, 0xca, 0xac, 0xd0, 0xde, 0x27, + 0xb0, 0xe6, 0x54, 0x63, 0x07, 0x5e, 0xa7, 0x32, 0xe3, 0x3b, 0xb6, 0xbf, 0x35, 0x2a, 0x8b, 0x3b, + 0x50, 0x17, 0xfc, 0xc0, 0x94, 0x69, 0xd5, 0x83, 0xd2, 0x78, 0x5f, 0xa0, 0xb9, 0xa4, 0x6a, 0x9a, + 0xf1, 0x94, 0x0a, 0x3c, 0x80, 0x06, 0x35, 0xca, 0x74, 0xdf, 0x8e, 0x3a, 0x7e, 0xb9, 0x9e, 0x5f, + 0xad, 0xe7, 0x4f, 0xb3, 0x53, 0x70, 0x7b, 0x83, 0x6d, 0x40, 0x47, 0x03, 0xb3, 0x02, 0x74, 0xf4, + 0xe6, 0x60, 0x2f, 0xa9, 0xba, 0xb3, 0xc6, 0x00, 0x09, 0x55, 0xeb, 0x27, 0x78, 0xcd, 0xa4, 0x2a, + 0x79, 0x2b, 0x68, 0x97, 0x90, 0x3b, 0x67, 0x02, 0xad, 0x82, 0xf3, 0x24, 0xcb, 0x4e, 0x1e, 0xba, + 0x5e, 0x08, 0xef, 0x66, 0x34, 0x5a, 0xe5, 0x42, 0xf3, 0xaf, 0x3c, 0xce, 0xa8, 0xce, 0xf7, 0x0c, + 0xbb, 0x00, 0xaa, 0x32, 0xca, 0x41, 0x3d, 0xab, 0x6f, 0x07, 0x0f, 0x09, 0xfe, 0x08, 0xed, 0x94, + 0x0a, 0xbe, 0xe1, 0x32, 0x57, 0xeb, 0x2d, 0x67, 0x22, 0x72, 0xea, 0x3d, 0xd4, 0xb7, 0x83, 0xd6, + 0xff, 0x78, 0x51, 0xa4, 0x93, 0x97, 0xf3, 0xaf, 0x0f, 0x68, 0xb6, 0xf8, 0x7d, 0x71, 0xd1, 0xf9, + 0xe2, 0xa2, 0xbf, 0x17, 0x17, 0xfd, 0xbc, 0xba, 0xb5, 0xf3, 0xd5, 0xad, 0xfd, 0xb9, 0xba, 0xb5, + 0x6f, 0x83, 0x98, 0xeb, 0x24, 0x0f, 0xfd, 0x8d, 0x4c, 0x89, 0xe0, 0x19, 0x23, 0x22, 0x4c, 0x87, + 0x2a, 0xda, 0x91, 0xc3, 0x88, 0x14, 0x67, 0x91, 0x6b, 0x2e, 0x48, 0x75, 0x1f, 0x61, 0xc3, 0xfc, + 0x63, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0xae, 0x26, 0x5b, 0xd6, 0x42, 0x02, 0x00, 0x00, } func (m *Dog) Marshal() (dAtA []byte, err error) { diff --git a/testutil/testdata/tx.pb.go b/testutil/testdata/tx.pb.go index 29e4aa0c4d..d3c9bebfe6 100644 --- a/testutil/testdata/tx.pb.go +++ b/testutil/testdata/tx.pb.go @@ -164,7 +164,7 @@ func init() { func init() { proto.RegisterFile("tx.proto", fileDescriptor_0fd2153dc07d3b5c) } var fileDescriptor_0fd2153dc07d3b5c = []byte{ - // 258 bytes of a gzipped FileDescriptorProto + // 261 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x28, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x28, 0x49, 0x2d, 0x2e, 0x49, 0x49, 0x2c, 0x49, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x0b, 0xea, 0x83, 0x58, 0x10, 0x79, 0x29, 0x3e, 0x98, 0x3c, 0x84, @@ -176,12 +176,12 @@ var fileDescriptor_0fd2153dc07d3b5c = []byte{ 0x49, 0x70, 0xb1, 0x17, 0x67, 0xa6, 0xe7, 0xa5, 0x16, 0x15, 0x4b, 0x30, 0x2a, 0x30, 0x6b, 0x70, 0x06, 0xc1, 0xb8, 0x56, 0x2c, 0x1d, 0x0b, 0xe4, 0x19, 0x8c, 0xbc, 0xb8, 0x98, 0x41, 0xca, 0x9c, 0xb9, 0x38, 0x11, 0x6e, 0x11, 0x43, 0x58, 0x8f, 0x6c, 0xa5, 0x94, 0x1c, 0x76, 0x71, 0x98, 0x53, - 0x9c, 0x3c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, - 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x2f, 0x3d, 0xb3, - 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x39, 0xbf, 0x38, 0x37, 0xbf, 0x18, 0x4a, - 0xe9, 0x16, 0xa7, 0x64, 0xeb, 0x83, 0x4c, 0x2d, 0x2d, 0xc9, 0xcc, 0xd1, 0x87, 0x19, 0x9f, 0xc4, - 0x06, 0x0e, 0x24, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0x63, 0x9a, 0x1b, 0x60, 0x01, - 0x00, 0x00, + 0x9c, 0xdc, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, + 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x27, 0x3d, 0xb3, + 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x27, 0x33, 0x2f, 0x55, 0x3f, 0x27, 0x29, + 0x57, 0xb7, 0x38, 0x25, 0x5b, 0xbf, 0xcc, 0x48, 0x1f, 0x64, 0x66, 0x69, 0x49, 0x66, 0x8e, 0x3e, + 0xcc, 0xf0, 0x24, 0x36, 0x70, 0x10, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9e, 0x35, 0xc0, + 0x93, 0x5e, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/testutil/testdata/unknonwnproto.pb.go b/testutil/testdata/unknonwnproto.pb.go index fc9a000f22..5cd24f4210 100644 --- a/testutil/testdata/unknonwnproto.pb.go +++ b/testutil/testdata/unknonwnproto.pb.go @@ -2809,110 +2809,110 @@ func init() { func init() { proto.RegisterFile("unknonwnproto.proto", fileDescriptor_448ea787339d1228) } var fileDescriptor_448ea787339d1228 = []byte{ - // 1644 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x70, 0x49, 0x89, 0x7c, 0xa2, 0x69, 0x66, 0x6c, 0xb4, 0x1b, 0x3a, 0x66, 0x98, 0x85, - 0xeb, 0xb0, 0x41, 0x43, 0x9a, 0x4b, 0x06, 0x28, 0x72, 0x32, 0xe9, 0x58, 0x95, 0x01, 0x57, 0x2e, - 0xa6, 0x4e, 0x5a, 0xf8, 0x42, 0x2c, 0xb9, 0x43, 0x72, 0x21, 0x72, 0x46, 0xdd, 0x99, 0xb5, 0xc8, - 0x5b, 0xd1, 0x1e, 0x7a, 0xcd, 0xa5, 0x28, 0xd0, 0x6f, 0xd0, 0x53, 0x91, 0x6f, 0xd0, 0xa3, 0x2f, - 0x05, 0x7c, 0x29, 0x50, 0xa0, 0x40, 0x50, 0xd8, 0xd7, 0x7e, 0x83, 0xa2, 0x48, 0x31, 0xb3, 0x7f, - 0xb8, 0x94, 0x44, 0x85, 0x52, 0xda, 0x18, 0x02, 0x72, 0x11, 0x67, 0xde, 0xfe, 0xe6, 0xcd, 0x7b, - 0xbf, 0xf7, 0x67, 0x77, 0x46, 0x70, 0x23, 0x60, 0x87, 0x8c, 0xb3, 0x63, 0x76, 0xe4, 0x73, 0xc9, - 0x1b, 0xfa, 0x2f, 0xce, 0x4b, 0x2a, 0xa4, 0xeb, 0x48, 0xa7, 0x72, 0x73, 0xcc, 0xc7, 0x5c, 0x0b, - 0x9b, 0x6a, 0x14, 0x3e, 0xaf, 0xbc, 0x3d, 0xe6, 0x7c, 0x3c, 0xa5, 0x4d, 0x3d, 0x1b, 0x04, 0xa3, - 0xa6, 0xc3, 0x16, 0xd1, 0xa3, 0xca, 0x90, 0x8b, 0x19, 0x17, 0x4d, 0x39, 0x6f, 0x3e, 0x6f, 0x0d, - 0xa8, 0x74, 0x5a, 0x4d, 0x39, 0x0f, 0x9f, 0x59, 0x12, 0x0a, 0x0f, 0x02, 0x21, 0xf9, 0x8c, 0xfa, - 0x2d, 0x5c, 0x82, 0x8c, 0xe7, 0x9a, 0xa8, 0x86, 0xea, 0x39, 0x92, 0xf1, 0x5c, 0x8c, 0x21, 0xcb, - 0x9c, 0x19, 0x35, 0x33, 0x35, 0x54, 0x2f, 0x10, 0x3d, 0xc6, 0x3f, 0x84, 0xb2, 0x08, 0x06, 0x62, - 0xe8, 0x7b, 0x47, 0xd2, 0xe3, 0xac, 0x3f, 0xa2, 0xd4, 0x34, 0x6a, 0xa8, 0x9e, 0x21, 0xd7, 0xd3, - 0xf2, 0x3d, 0x4a, 0xb1, 0x09, 0x3b, 0x47, 0xce, 0x62, 0x46, 0x99, 0x34, 0x77, 0xb4, 0x86, 0x78, - 0x6a, 0x7d, 0x91, 0x59, 0x6e, 0x6b, 0x9f, 0xda, 0xb6, 0x02, 0x79, 0x8f, 0xb9, 0x81, 0x90, 0xfe, - 0x42, 0x6f, 0x9d, 0x23, 0xc9, 0x3c, 0x31, 0xc9, 0x48, 0x99, 0x74, 0x13, 0x72, 0x23, 0x7a, 0x4c, - 0x7d, 0x33, 0xab, 0xed, 0x08, 0x27, 0xf8, 0x16, 0xe4, 0x7d, 0x2a, 0xa8, 0xff, 0x9c, 0xba, 0xe6, - 0x1f, 0xf2, 0x35, 0x54, 0x37, 0x48, 0x22, 0xc0, 0x3f, 0x82, 0xec, 0xd0, 0x93, 0x0b, 0x73, 0xbb, - 0x86, 0xea, 0x25, 0xdb, 0x6c, 0xc4, 0xe4, 0x36, 0x12, 0xab, 0x1a, 0x0f, 0x3c, 0xb9, 0x20, 0x1a, - 0x85, 0x3f, 0x86, 0x6b, 0x33, 0x4f, 0x0c, 0xe9, 0x74, 0xea, 0x30, 0xca, 0x03, 0x61, 0x42, 0x0d, - 0xd5, 0x77, 0xed, 0x9b, 0x8d, 0x90, 0xf3, 0x46, 0xcc, 0x79, 0xa3, 0xcb, 0x16, 0x64, 0x15, 0x6a, - 0xfd, 0x04, 0xb2, 0x4a, 0x13, 0xce, 0x43, 0xf6, 0xb1, 0xc3, 0x45, 0x79, 0x0b, 0x97, 0x00, 0x1e, - 0x73, 0xd1, 0x65, 0x63, 0x3a, 0xa5, 0xa2, 0x8c, 0x70, 0x11, 0xf2, 0x3f, 0x73, 0xa6, 0xbc, 0x3b, - 0x95, 0xbc, 0x9c, 0xc1, 0x00, 0xdb, 0x3f, 0xe5, 0x62, 0xc8, 0x8f, 0xcb, 0x06, 0xde, 0x85, 0x9d, - 0x03, 0xc7, 0xf3, 0xf9, 0xc0, 0x2b, 0x67, 0xad, 0x06, 0xe4, 0x0f, 0xa8, 0x90, 0xd4, 0xed, 0x74, - 0x37, 0x09, 0x94, 0xf5, 0x37, 0x14, 0x2f, 0x68, 0x6f, 0xb4, 0x00, 0x5b, 0x90, 0x71, 0x3a, 0x66, - 0xb6, 0x66, 0xd4, 0x77, 0x6d, 0xbc, 0x64, 0x24, 0xde, 0x94, 0x64, 0x9c, 0x0e, 0x6e, 0x43, 0xce, - 0x63, 0x2e, 0x9d, 0x9b, 0x39, 0x0d, 0xbb, 0x7d, 0x12, 0xd6, 0xee, 0x36, 0x1e, 0xa9, 0xe7, 0x0f, - 0x99, 0xf4, 0x17, 0x24, 0xc4, 0x56, 0x1e, 0x03, 0x2c, 0x85, 0xb8, 0x0c, 0xc6, 0x21, 0x5d, 0x68, - 0x5b, 0x0c, 0xa2, 0x86, 0xb8, 0x0e, 0xb9, 0xe7, 0xce, 0x34, 0x08, 0xad, 0x39, 0x7b, 0xef, 0x10, - 0xf0, 0x71, 0xe6, 0xc7, 0xc8, 0x7a, 0x16, 0xbb, 0x65, 0x6f, 0xe6, 0xd6, 0x07, 0xb0, 0xcd, 0x34, - 0x5e, 0xe7, 0xcc, 0x19, 0xea, 0xdb, 0x5d, 0x12, 0x21, 0xac, 0xbd, 0x58, 0x77, 0xeb, 0xb4, 0xee, - 0xa5, 0x9e, 0x35, 0x66, 0xda, 0x4b, 0x3d, 0xf7, 0x93, 0x58, 0xf5, 0x4e, 0xe9, 0x29, 0x83, 0xe1, - 0x8c, 0x69, 0x94, 0xd8, 0x6a, 0x78, 0x56, 0x4e, 0x5b, 0x6e, 0x12, 0xbc, 0x4b, 0x6a, 0x50, 0xe1, - 0x1c, 0xac, 0x0f, 0x67, 0x8f, 0x64, 0x06, 0x1d, 0x8b, 0x25, 0x5c, 0x9e, 0xb9, 0x8b, 0xaa, 0x6d, - 0xb5, 0x0b, 0x22, 0x6a, 0xb8, 0x01, 0x93, 0xbd, 0x98, 0x01, 0x55, 0x93, 0x3e, 0x0f, 0x24, 0xd5, - 0x35, 0x59, 0x20, 0xe1, 0xc4, 0xfa, 0x65, 0xc2, 0x6f, 0xef, 0x12, 0xfc, 0x2e, 0xb5, 0x47, 0x0c, - 0x18, 0x09, 0x03, 0xd6, 0x6f, 0x52, 0x1d, 0xa5, 0xbd, 0x51, 0x5e, 0x94, 0x20, 0x23, 0x46, 0x51, - 0xeb, 0xca, 0x88, 0x11, 0x7e, 0x07, 0x0a, 0x22, 0xf0, 0x87, 0x13, 0xc7, 0x1f, 0xd3, 0xa8, 0x93, - 0x2c, 0x05, 0xb8, 0x06, 0xbb, 0x2e, 0x15, 0xd2, 0x63, 0x8e, 0xea, 0x6e, 0x66, 0x4e, 0x2b, 0x4a, - 0x8b, 0xf0, 0x5d, 0x28, 0x0d, 0x7d, 0xea, 0x7a, 0xb2, 0x3f, 0x74, 0x7c, 0xb7, 0xcf, 0x78, 0xd8, - 0xf4, 0xf6, 0xb7, 0x48, 0x31, 0x94, 0x3f, 0x70, 0x7c, 0xf7, 0x80, 0xe3, 0xdb, 0x50, 0x18, 0x4e, - 0xe8, 0xaf, 0x02, 0xaa, 0x20, 0xf9, 0x08, 0x92, 0x0f, 0x45, 0x07, 0x1c, 0x37, 0x21, 0xcf, 0x7d, - 0x6f, 0xec, 0x31, 0x67, 0x6a, 0x16, 0x34, 0x11, 0x37, 0x4e, 0x77, 0xa7, 0x16, 0x49, 0x40, 0xbd, - 0x42, 0xd2, 0x65, 0xad, 0x7f, 0x65, 0xa0, 0xf8, 0x94, 0x0a, 0xf9, 0x19, 0xf5, 0x85, 0xc7, 0x59, - 0x0b, 0x17, 0x01, 0xcd, 0xa3, 0x4a, 0x43, 0x73, 0x7c, 0x07, 0x90, 0x13, 0x91, 0xfb, 0xbd, 0xa5, - 0xce, 0xf4, 0x02, 0x82, 0x1c, 0x85, 0x1a, 0x44, 0x01, 0x5e, 0x8b, 0x1a, 0x28, 0xd4, 0x30, 0x4a, - 0xae, 0xb5, 0xa8, 0x21, 0xfe, 0x00, 0x90, 0x1b, 0xb5, 0x8a, 0x35, 0xa8, 0x5e, 0xf6, 0xc5, 0x97, - 0xef, 0x6e, 0x11, 0xe4, 0xe2, 0x12, 0x20, 0xaa, 0xfb, 0x71, 0x6e, 0x7f, 0x8b, 0x20, 0x8a, 0xef, - 0x02, 0x1a, 0x69, 0x0a, 0xd7, 0xae, 0x55, 0xb8, 0x11, 0xb6, 0x00, 0x8d, 0x35, 0x8f, 0xeb, 0x1a, - 0x32, 0x1a, 0x2b, 0x6b, 0x27, 0x66, 0xe1, 0x7c, 0x6b, 0x27, 0xf8, 0x7d, 0x40, 0x87, 0x66, 0x71, - 0x2d, 0xe7, 0xbd, 0xec, 0xcb, 0x2f, 0xdf, 0x45, 0x04, 0x1d, 0xf6, 0x72, 0x60, 0x88, 0x60, 0x66, - 0xfd, 0xd6, 0x58, 0xa1, 0xdb, 0xbe, 0x28, 0xdd, 0xf6, 0x46, 0x74, 0xdb, 0x1b, 0xd1, 0x6d, 0x2b, - 0xba, 0xef, 0x7c, 0x1d, 0xdd, 0xf6, 0xa5, 0x88, 0xb6, 0xdf, 0x14, 0xd1, 0xf8, 0x16, 0x14, 0x18, - 0x3d, 0xee, 0x8f, 0x3c, 0x3a, 0x75, 0xcd, 0xb7, 0x6b, 0xa8, 0x9e, 0x25, 0x79, 0x46, 0x8f, 0xf7, - 0xd4, 0x3c, 0x8e, 0xc2, 0xef, 0x57, 0xa3, 0xd0, 0xbe, 0x68, 0x14, 0xda, 0x1b, 0x45, 0xa1, 0xbd, - 0x51, 0x14, 0xda, 0x1b, 0x45, 0xa1, 0x7d, 0xa9, 0x28, 0xb4, 0xdf, 0x58, 0x14, 0x3e, 0x04, 0xcc, - 0x38, 0xeb, 0x0f, 0x7d, 0x4f, 0x7a, 0x43, 0x67, 0x1a, 0x85, 0xe3, 0x77, 0xba, 0x77, 0x91, 0x32, - 0xe3, 0xec, 0x41, 0xf4, 0x64, 0x25, 0x2e, 0xff, 0xce, 0x40, 0x25, 0x6d, 0xfe, 0x63, 0xce, 0xe8, - 0x13, 0x46, 0x9f, 0x8c, 0x3e, 0x53, 0xaf, 0xf2, 0x2b, 0x1a, 0xa5, 0x2b, 0xc3, 0xfe, 0x7f, 0xb6, - 0xe1, 0xfb, 0x27, 0xd9, 0x3f, 0xd0, 0x6f, 0xab, 0xf1, 0x15, 0xa1, 0xbe, 0xb5, 0x2c, 0x88, 0xf7, - 0xce, 0x46, 0xa5, 0x7c, 0xba, 0x22, 0xb5, 0x81, 0xef, 0xc3, 0xb6, 0xc7, 0x18, 0xf5, 0x5b, 0x66, - 0x49, 0x2b, 0xaf, 0x7f, 0xad, 0x67, 0x8d, 0x47, 0x1a, 0x4f, 0xa2, 0x75, 0x89, 0x06, 0xdb, 0xbc, - 0x7e, 0x21, 0x0d, 0x76, 0xa4, 0xc1, 0xae, 0xfc, 0x09, 0xc1, 0x76, 0xa8, 0x34, 0xf5, 0x9d, 0x64, - 0xac, 0xfd, 0x4e, 0x7a, 0xa4, 0x3e, 0xf9, 0x19, 0xf5, 0xa3, 0xe8, 0xb7, 0x37, 0xb5, 0x38, 0xfc, - 0xd1, 0x7f, 0x48, 0xa8, 0xa1, 0x72, 0x4f, 0x1d, 0x04, 0x62, 0x61, 0x6a, 0xf3, 0x42, 0xbc, 0xb9, - 0x3e, 0x93, 0x45, 0x9b, 0xab, 0x71, 0xe5, 0xcf, 0xb1, 0xad, 0xf6, 0x29, 0xb8, 0x09, 0x3b, 0x43, - 0x1e, 0xb0, 0xf8, 0x90, 0x58, 0x20, 0xf1, 0xf4, 0xb2, 0x16, 0xdb, 0xff, 0x0b, 0x8b, 0xe3, 0xfa, - 0xfb, 0x6a, 0xb5, 0xfe, 0x3a, 0xdf, 0xd5, 0xdf, 0x15, 0xaa, 0xbf, 0xce, 0x37, 0xae, 0xbf, 0xce, - 0xb7, 0x5c, 0x7f, 0x9d, 0x6f, 0x54, 0x7f, 0xc6, 0xda, 0xfa, 0xfb, 0xe2, 0xff, 0x56, 0x7f, 0x9d, - 0x8d, 0xea, 0xcf, 0x3e, 0xb7, 0xfe, 0x6e, 0xa6, 0x2f, 0x0e, 0x8c, 0xe8, 0x92, 0x20, 0xae, 0xc0, - 0xbf, 0x22, 0x28, 0xa5, 0xf6, 0xdb, 0xfb, 0xe4, 0x72, 0xc7, 0xa1, 0x37, 0x7e, 0x2c, 0x89, 0xfd, - 0xf9, 0x07, 0x5a, 0xf9, 0x9e, 0xda, 0xfb, 0xa4, 0xf5, 0x0b, 0x4f, 0x4e, 0x1e, 0xce, 0xa5, 0xef, - 0x74, 0xd9, 0xe2, 0x5b, 0xf5, 0xed, 0xce, 0xd2, 0xb7, 0x14, 0xae, 0xcb, 0x16, 0x89, 0x45, 0x17, - 0xf6, 0xee, 0x29, 0x14, 0xd3, 0xeb, 0x71, 0x5d, 0x39, 0x80, 0xd6, 0xd3, 0x17, 0x77, 0x00, 0x47, - 0x39, 0x1e, 0x76, 0x46, 0x43, 0x75, 0xc0, 0x62, 0xd8, 0x01, 0xf5, 0x6c, 0x68, 0xfd, 0x05, 0x41, - 0x59, 0x6d, 0xf8, 0xe9, 0x91, 0xeb, 0x48, 0xea, 0x3e, 0x9d, 0x13, 0xe7, 0x18, 0xdf, 0x06, 0x18, - 0x70, 0x77, 0xd1, 0x1f, 0x2c, 0x24, 0x15, 0x7a, 0x8f, 0x22, 0x29, 0x28, 0x49, 0x4f, 0x09, 0xf0, - 0x5d, 0xb8, 0xee, 0x04, 0x72, 0xd2, 0xf7, 0xd8, 0x88, 0x47, 0x98, 0x8c, 0xc6, 0x5c, 0x53, 0xe2, - 0x47, 0x6c, 0xc4, 0x43, 0x5c, 0x15, 0x40, 0x78, 0x63, 0xe6, 0xc8, 0xc0, 0xa7, 0xc2, 0x34, 0x6a, - 0x46, 0xbd, 0x48, 0x52, 0x12, 0x5c, 0x85, 0xdd, 0xe4, 0xec, 0xd2, 0xff, 0x48, 0xdf, 0x18, 0x14, - 0x49, 0x21, 0x3e, 0xbd, 0x7c, 0x84, 0x7f, 0x00, 0xa5, 0xe5, 0xf3, 0xd6, 0x3d, 0xbb, 0x63, 0xfe, - 0x3a, 0xaf, 0x31, 0xc5, 0x18, 0xa3, 0x84, 0xd6, 0xe7, 0x06, 0xbc, 0xb5, 0xe2, 0x42, 0x8f, 0xbb, - 0x0b, 0x7c, 0x0f, 0xf2, 0x33, 0x2a, 0x84, 0x33, 0xd6, 0x1e, 0x18, 0x6b, 0x93, 0x2c, 0x41, 0xa9, - 0xea, 0x9e, 0xd1, 0x19, 0x8f, 0xab, 0x5b, 0x8d, 0x95, 0x09, 0xd2, 0x9b, 0x51, 0x1e, 0xc8, 0xfe, - 0x84, 0x7a, 0xe3, 0x89, 0x8c, 0x78, 0xbc, 0x16, 0x49, 0xf7, 0xb5, 0x10, 0xdf, 0x81, 0x92, 0xe0, - 0x33, 0xda, 0x5f, 0x1e, 0xc5, 0xb2, 0xfa, 0x28, 0x56, 0x54, 0xd2, 0x83, 0xc8, 0x58, 0xbc, 0x0f, - 0xef, 0xad, 0xa2, 0xfa, 0x67, 0x34, 0xe6, 0x3f, 0x86, 0x8d, 0xf9, 0x9d, 0xf4, 0xca, 0x83, 0x93, - 0x4d, 0xba, 0x07, 0x6f, 0xd1, 0xb9, 0xa4, 0x4c, 0xe5, 0x48, 0x9f, 0xeb, 0xeb, 0x64, 0x61, 0x7e, - 0xb5, 0x73, 0x8e, 0x9b, 0xe5, 0x04, 0xff, 0x24, 0x84, 0xe3, 0x67, 0x50, 0x5d, 0xd9, 0xfe, 0x0c, - 0x85, 0xd7, 0xcf, 0x51, 0x78, 0x2b, 0xf5, 0xe6, 0x78, 0x78, 0x42, 0xb7, 0xf5, 0x02, 0xc1, 0x8d, - 0x54, 0x48, 0xba, 0x51, 0x5a, 0xe0, 0xfb, 0x50, 0x54, 0xf1, 0xa7, 0xbe, 0xce, 0x9d, 0x38, 0x30, - 0xb7, 0x1b, 0xe1, 0xf5, 0x7b, 0x43, 0xce, 0x1b, 0xd1, 0xf5, 0x7b, 0xe3, 0xe7, 0x1a, 0xa6, 0x16, - 0x91, 0x5d, 0x91, 0x8c, 0x05, 0xae, 0x2f, 0xef, 0xdc, 0x54, 0xd1, 0x9c, 0x5e, 0xb8, 0x47, 0x69, - 0x78, 0x17, 0xb7, 0x92, 0x5d, 0x6d, 0x1d, 0xb7, 0x54, 0x76, 0xb5, 0x37, 0xcd, 0xae, 0xf7, 0xc3, - 0xe4, 0x22, 0xf4, 0x88, 0x2a, 0x57, 0x3e, 0xf5, 0x98, 0xd4, 0xa9, 0xc2, 0x82, 0x59, 0x68, 0x7f, - 0x96, 0xe8, 0x71, 0x6f, 0xff, 0xc5, 0xab, 0x2a, 0x7a, 0xf9, 0xaa, 0x8a, 0xfe, 0xf9, 0xaa, 0x8a, - 0x3e, 0x7f, 0x5d, 0xdd, 0x7a, 0xf9, 0xba, 0xba, 0xf5, 0xf7, 0xd7, 0xd5, 0xad, 0x67, 0x8d, 0xb1, - 0x27, 0x27, 0xc1, 0xa0, 0x31, 0xe4, 0xb3, 0x66, 0xf4, 0x8f, 0x86, 0xf0, 0xe7, 0x43, 0xe1, 0x1e, - 0x36, 0x55, 0xdd, 0x07, 0xd2, 0x9b, 0x36, 0xe3, 0x06, 0x30, 0xd8, 0xd6, 0x44, 0xb7, 0xff, 0x1b, - 0x00, 0x00, 0xff, 0xff, 0xa6, 0x69, 0x10, 0x33, 0xe6, 0x18, 0x00, 0x00, + // 1647 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4d, 0x6f, 0x1b, 0xc7, + 0x19, 0xd6, 0x70, 0x49, 0x89, 0x7c, 0x45, 0xd3, 0xcc, 0xd8, 0x68, 0x37, 0x74, 0xcc, 0x30, 0x0b, + 0xd7, 0x61, 0x83, 0x84, 0x34, 0x97, 0x0c, 0x50, 0xe4, 0x64, 0xd2, 0xb1, 0x6a, 0x03, 0xae, 0x5c, + 0x4c, 0x9d, 0xb4, 0xf0, 0x85, 0x58, 0xee, 0x0e, 0xc9, 0x85, 0xc8, 0x19, 0x75, 0x67, 0xd6, 0x22, + 0x6f, 0x45, 0x7b, 0xe8, 0x35, 0x97, 0xa2, 0x40, 0xff, 0x41, 0x4f, 0x45, 0xfe, 0x41, 0x8f, 0xbe, + 0x14, 0xf0, 0xa5, 0x40, 0x81, 0x02, 0x41, 0x61, 0x5f, 0xfb, 0x0f, 0x8a, 0x22, 0xc5, 0xcc, 0x7e, + 0x70, 0x69, 0x89, 0x0e, 0xad, 0xb4, 0x31, 0x04, 0xf4, 0x22, 0xcd, 0xbe, 0xfb, 0xcc, 0xfb, 0xf1, + 0xbc, 0x1f, 0xdc, 0x19, 0xb8, 0x12, 0xb2, 0x23, 0xc6, 0xd9, 0x09, 0x3b, 0x0e, 0xb8, 0xe4, 0x2d, + 0xfd, 0x17, 0x17, 0x25, 0x15, 0xd2, 0x73, 0xa4, 0x53, 0xbb, 0x3a, 0xe1, 0x13, 0xae, 0x85, 0x6d, + 0xb5, 0x8a, 0xde, 0xd7, 0xde, 0x9e, 0x70, 0x3e, 0x99, 0xd1, 0xb6, 0x7e, 0x1a, 0x85, 0xe3, 0xb6, + 0xc3, 0x96, 0xf1, 0xab, 0x9a, 0xcb, 0xc5, 0x9c, 0x8b, 0xb6, 0x5c, 0xb4, 0x9f, 0x74, 0x46, 0x54, + 0x3a, 0x9d, 0xb6, 0x5c, 0x44, 0xef, 0x2c, 0x09, 0xa5, 0x3b, 0xa1, 0x90, 0x7c, 0x4e, 0x83, 0x0e, + 0xae, 0x40, 0xce, 0xf7, 0x4c, 0xd4, 0x40, 0xcd, 0x02, 0xc9, 0xf9, 0x1e, 0xc6, 0x90, 0x67, 0xce, + 0x9c, 0x9a, 0xb9, 0x06, 0x6a, 0x96, 0x88, 0x5e, 0xe3, 0x1f, 0x42, 0x55, 0x84, 0x23, 0xe1, 0x06, + 0xfe, 0xb1, 0xf4, 0x39, 0x1b, 0x8e, 0x29, 0x35, 0x8d, 0x06, 0x6a, 0xe6, 0xc8, 0xe5, 0xac, 0xfc, + 0x80, 0x52, 0x6c, 0xc2, 0xde, 0xb1, 0xb3, 0x9c, 0x53, 0x26, 0xcd, 0x3d, 0xad, 0x21, 0x79, 0xb4, + 0xbe, 0xcc, 0xad, 0xcc, 0xda, 0xa7, 0xcc, 0xd6, 0xa0, 0xe8, 0x33, 0x2f, 0x14, 0x32, 0x58, 0x6a, + 0xd3, 0x05, 0x92, 0x3e, 0xa7, 0x2e, 0x19, 0x19, 0x97, 0xae, 0x42, 0x61, 0x4c, 0x4f, 0x68, 0x60, + 0xe6, 0xb5, 0x1f, 0xd1, 0x03, 0xbe, 0x06, 0xc5, 0x80, 0x0a, 0x1a, 0x3c, 0xa1, 0x9e, 0xf9, 0xfb, + 0x62, 0x03, 0x35, 0x0d, 0x92, 0x0a, 0xf0, 0x87, 0x90, 0x77, 0x7d, 0xb9, 0x34, 0x77, 0x1b, 0xa8, + 0x59, 0xb1, 0xcd, 0x56, 0x42, 0x6e, 0x2b, 0xf5, 0xaa, 0x75, 0xc7, 0x97, 0x4b, 0xa2, 0x51, 0xf8, + 0x13, 0xb8, 0x34, 0xf7, 0x85, 0x4b, 0x67, 0x33, 0x87, 0x51, 0x1e, 0x0a, 0x13, 0x1a, 0xa8, 0xb9, + 0x6f, 0x5f, 0x6d, 0x45, 0x9c, 0xb7, 0x12, 0xce, 0x5b, 0x7d, 0xb6, 0x24, 0xeb, 0x50, 0xeb, 0xc7, + 0x90, 0x57, 0x9a, 0x70, 0x11, 0xf2, 0x0f, 0x1c, 0x2e, 0xaa, 0x3b, 0xb8, 0x02, 0xf0, 0x80, 0x8b, + 0x3e, 0x9b, 0xd0, 0x19, 0x15, 0x55, 0x84, 0xcb, 0x50, 0xfc, 0xa9, 0x33, 0xe3, 0xfd, 0x99, 0xe4, + 0xd5, 0x1c, 0x06, 0xd8, 0xfd, 0x09, 0x17, 0x2e, 0x3f, 0xa9, 0x1a, 0x78, 0x1f, 0xf6, 0x0e, 0x1d, + 0x3f, 0xe0, 0x23, 0xbf, 0x9a, 0xb7, 0x5a, 0x50, 0x3c, 0xa4, 0x42, 0x52, 0xaf, 0xd7, 0xdf, 0x26, + 0x51, 0xd6, 0x5f, 0x51, 0xb2, 0xa1, 0xbb, 0xd5, 0x06, 0x6c, 0x41, 0xce, 0xe9, 0x99, 0xf9, 0x86, + 0xd1, 0xdc, 0xb7, 0xf1, 0x8a, 0x91, 0xc4, 0x28, 0xc9, 0x39, 0x3d, 0xdc, 0x85, 0x82, 0xcf, 0x3c, + 0xba, 0x30, 0x0b, 0x1a, 0x76, 0xfd, 0x65, 0x58, 0xb7, 0xdf, 0xba, 0xaf, 0xde, 0xdf, 0x65, 0x32, + 0x58, 0x92, 0x08, 0x5b, 0x7b, 0x00, 0xb0, 0x12, 0xe2, 0x2a, 0x18, 0x47, 0x74, 0xa9, 0x7d, 0x31, + 0x88, 0x5a, 0xe2, 0x26, 0x14, 0x9e, 0x38, 0xb3, 0x30, 0xf2, 0xe6, 0x6c, 0xdb, 0x11, 0xe0, 0x93, + 0xdc, 0x8f, 0x90, 0xf5, 0x38, 0x09, 0xcb, 0xde, 0x2e, 0xac, 0x0f, 0x60, 0x97, 0x69, 0xbc, 0xae, + 0x99, 0x33, 0xd4, 0x77, 0xfb, 0x24, 0x46, 0x58, 0x07, 0x89, 0xee, 0xce, 0x69, 0xdd, 0x2b, 0x3d, + 0x1b, 0xdc, 0xb4, 0x57, 0x7a, 0x6e, 0xa7, 0xb9, 0x1a, 0x9c, 0xd2, 0x53, 0x05, 0xc3, 0x99, 0xd0, + 0xb8, 0xb0, 0xd5, 0xf2, 0xac, 0x9a, 0xb6, 0xbc, 0x34, 0x79, 0xe7, 0xd4, 0xa0, 0xd2, 0x39, 0xda, + 0x9c, 0xce, 0x01, 0xc9, 0x8d, 0x7a, 0x16, 0x4b, 0xb9, 0x3c, 0xd3, 0x8a, 0xea, 0x6d, 0x65, 0x05, + 0x11, 0xb5, 0xdc, 0x82, 0xc9, 0x41, 0xc2, 0x80, 0xea, 0xc9, 0x80, 0x87, 0x92, 0xea, 0x9e, 0x2c, + 0x91, 0xe8, 0xc1, 0xfa, 0x45, 0xca, 0xef, 0xe0, 0x1c, 0xfc, 0xae, 0xb4, 0xc7, 0x0c, 0x18, 0x29, + 0x03, 0xd6, 0xaf, 0x33, 0x13, 0xa5, 0xbb, 0x55, 0x5d, 0x54, 0x20, 0x27, 0xc6, 0xf1, 0xe8, 0xca, + 0x89, 0x31, 0x7e, 0x07, 0x4a, 0x22, 0x0c, 0xdc, 0xa9, 0x13, 0x4c, 0x68, 0x3c, 0x49, 0x56, 0x02, + 0xdc, 0x80, 0x7d, 0x8f, 0x0a, 0xe9, 0x33, 0x47, 0x4d, 0x37, 0xb3, 0xa0, 0x15, 0x65, 0x45, 0xf8, + 0x26, 0x54, 0xdc, 0x80, 0x7a, 0xbe, 0x1c, 0xba, 0x4e, 0xe0, 0x0d, 0x19, 0x8f, 0x86, 0xde, 0xbd, + 0x1d, 0x52, 0x8e, 0xe4, 0x77, 0x9c, 0xc0, 0x3b, 0xe4, 0xf8, 0x3a, 0x94, 0xdc, 0x29, 0xfd, 0x65, + 0x48, 0x15, 0xa4, 0x18, 0x43, 0x8a, 0x91, 0xe8, 0x90, 0xe3, 0x36, 0x14, 0x79, 0xe0, 0x4f, 0x7c, + 0xe6, 0xcc, 0xcc, 0x92, 0x26, 0xe2, 0xca, 0xe9, 0xe9, 0xd4, 0x21, 0x29, 0x68, 0x50, 0x4a, 0xa7, + 0xac, 0xf5, 0xcf, 0x1c, 0x94, 0x1f, 0x51, 0x21, 0x3f, 0xa7, 0x81, 0xf0, 0x39, 0xeb, 0xe0, 0x32, + 0xa0, 0x45, 0xdc, 0x69, 0x68, 0x81, 0x6f, 0x00, 0x72, 0x62, 0x72, 0xbf, 0xb7, 0xd2, 0x99, 0xdd, + 0x40, 0x90, 0xa3, 0x50, 0xa3, 0x38, 0xc1, 0x1b, 0x51, 0x23, 0x85, 0x72, 0xe3, 0xe2, 0xda, 0x88, + 0x72, 0xf1, 0x07, 0x80, 0xbc, 0x78, 0x54, 0x6c, 0x40, 0x0d, 0xf2, 0x4f, 0xbf, 0x7a, 0x77, 0x87, + 0x20, 0x0f, 0x57, 0x00, 0x51, 0x3d, 0x8f, 0x0b, 0xf7, 0x76, 0x08, 0xa2, 0xf8, 0x26, 0xa0, 0xb1, + 0xa6, 0x70, 0xe3, 0x5e, 0x85, 0x1b, 0x63, 0x0b, 0xd0, 0x44, 0xf3, 0xb8, 0x69, 0x20, 0xa3, 0x89, + 0xf2, 0x76, 0x6a, 0x96, 0x5e, 0xed, 0xed, 0x14, 0xbf, 0x0f, 0xe8, 0xc8, 0x2c, 0x6f, 0xe4, 0x7c, + 0x90, 0x7f, 0xf6, 0xd5, 0xbb, 0x88, 0xa0, 0xa3, 0x41, 0x01, 0x0c, 0x11, 0xce, 0xad, 0xdf, 0x18, + 0x6b, 0x74, 0xdb, 0xaf, 0x4b, 0xb7, 0xbd, 0x15, 0xdd, 0xf6, 0x56, 0x74, 0xdb, 0x8a, 0xee, 0x1b, + 0xdf, 0x44, 0xb7, 0x7d, 0x2e, 0xa2, 0xed, 0x37, 0x45, 0x34, 0xbe, 0x06, 0x25, 0x46, 0x4f, 0x86, + 0x63, 0x9f, 0xce, 0x3c, 0xf3, 0xed, 0x06, 0x6a, 0xe6, 0x49, 0x91, 0xd1, 0x93, 0x03, 0xf5, 0x9c, + 0x64, 0xe1, 0x77, 0xeb, 0x59, 0xe8, 0xbe, 0x6e, 0x16, 0xba, 0x5b, 0x65, 0xa1, 0xbb, 0x55, 0x16, + 0xba, 0x5b, 0x65, 0xa1, 0x7b, 0xae, 0x2c, 0x74, 0xdf, 0x58, 0x16, 0x3e, 0x02, 0xcc, 0x38, 0x1b, + 0xba, 0x81, 0x2f, 0x7d, 0xd7, 0x99, 0xc5, 0xe9, 0xf8, 0xad, 0x9e, 0x5d, 0xa4, 0xca, 0x38, 0xbb, + 0x13, 0xbf, 0x59, 0xcb, 0xcb, 0xbf, 0x72, 0x50, 0xcb, 0xba, 0xff, 0x80, 0x33, 0xfa, 0x90, 0xd1, + 0x87, 0xe3, 0xcf, 0xd5, 0x4f, 0xf9, 0x05, 0xcd, 0xd2, 0x85, 0x61, 0xff, 0xdf, 0xbb, 0xf0, 0xfd, + 0x97, 0xd9, 0x3f, 0xd4, 0xbf, 0x56, 0x93, 0x0b, 0x42, 0x7d, 0x67, 0xd5, 0x10, 0xef, 0x9d, 0x8d, + 0xca, 0xc4, 0x74, 0x41, 0x7a, 0x03, 0xdf, 0x86, 0x5d, 0x9f, 0x31, 0x1a, 0x74, 0xcc, 0x8a, 0x56, + 0xde, 0xfc, 0xc6, 0xc8, 0x5a, 0xf7, 0x35, 0x9e, 0xc4, 0xfb, 0x52, 0x0d, 0xb6, 0x79, 0xf9, 0xb5, + 0x34, 0xd8, 0xb1, 0x06, 0xbb, 0xf6, 0x47, 0x04, 0xbb, 0x91, 0xd2, 0xcc, 0x77, 0x92, 0xb1, 0xf1, + 0x3b, 0xe9, 0xbe, 0xfa, 0xe4, 0x67, 0x34, 0x88, 0xb3, 0xdf, 0xdd, 0xd6, 0xe3, 0xe8, 0x9f, 0xfe, + 0x43, 0x22, 0x0d, 0xb5, 0x5b, 0xea, 0x20, 0x90, 0x08, 0x33, 0xc6, 0x4b, 0x89, 0x71, 0x7d, 0x26, + 0x8b, 0x8d, 0xab, 0x75, 0xed, 0x4f, 0x89, 0xaf, 0xf6, 0x29, 0xb8, 0x09, 0x7b, 0x2e, 0x0f, 0x59, + 0x72, 0x48, 0x2c, 0x91, 0xe4, 0xf1, 0xbc, 0x1e, 0xdb, 0xff, 0x0d, 0x8f, 0x93, 0xfe, 0xfb, 0x7a, + 0xbd, 0xff, 0x7a, 0xff, 0xef, 0xbf, 0x0b, 0xd4, 0x7f, 0xbd, 0x6f, 0xdd, 0x7f, 0xbd, 0xef, 0xb8, + 0xff, 0x7a, 0xdf, 0xaa, 0xff, 0x8c, 0x8d, 0xfd, 0xf7, 0xe5, 0xff, 0xac, 0xff, 0x7a, 0x5b, 0xf5, + 0x9f, 0xfd, 0xca, 0xfe, 0xbb, 0x9a, 0xbd, 0x38, 0x30, 0xe2, 0x4b, 0x82, 0xa4, 0x03, 0xff, 0x82, + 0xa0, 0x92, 0xb1, 0x77, 0xf0, 0xe9, 0xf9, 0x8e, 0x43, 0x6f, 0xfc, 0x58, 0x92, 0xc4, 0xf3, 0x77, + 0xb4, 0xf6, 0x3d, 0x75, 0xf0, 0x69, 0xe7, 0xe7, 0xbe, 0x9c, 0xde, 0x5d, 0xc8, 0xc0, 0xe9, 0xb3, + 0xe5, 0x77, 0x1a, 0xdb, 0x8d, 0x55, 0x6c, 0x19, 0x5c, 0x9f, 0x2d, 0x53, 0x8f, 0x5e, 0x3b, 0xba, + 0x47, 0x50, 0xce, 0xee, 0xc7, 0x4d, 0x15, 0x00, 0xda, 0x4c, 0x5f, 0x32, 0x01, 0x1c, 0x15, 0x78, + 0x34, 0x19, 0x0d, 0x35, 0x01, 0xcb, 0xd1, 0x04, 0xd4, 0x4f, 0xae, 0xf5, 0x67, 0x04, 0x55, 0x65, + 0xf0, 0xb3, 0x63, 0xcf, 0x91, 0xd4, 0x7b, 0xb4, 0x20, 0xce, 0x09, 0xbe, 0x0e, 0x30, 0xe2, 0xde, + 0x72, 0x38, 0x5a, 0x4a, 0x2a, 0xb4, 0x8d, 0x32, 0x29, 0x29, 0xc9, 0x40, 0x09, 0xf0, 0x4d, 0xb8, + 0xec, 0x84, 0x72, 0x3a, 0xf4, 0xd9, 0x98, 0xc7, 0x98, 0x9c, 0xc6, 0x5c, 0x52, 0xe2, 0xfb, 0x6c, + 0xcc, 0x23, 0x5c, 0x1d, 0x40, 0xf8, 0x13, 0xe6, 0xc8, 0x30, 0xa0, 0xc2, 0x34, 0x1a, 0x46, 0xb3, + 0x4c, 0x32, 0x12, 0x5c, 0x87, 0xfd, 0xf4, 0xec, 0x32, 0xfc, 0x58, 0xdf, 0x18, 0x94, 0x49, 0x29, + 0x39, 0xbd, 0x7c, 0x8c, 0x7f, 0x00, 0x95, 0xd5, 0xfb, 0xce, 0x2d, 0xbb, 0x67, 0xfe, 0xaa, 0xa8, + 0x31, 0xe5, 0x04, 0xa3, 0x84, 0xd6, 0x17, 0x06, 0xbc, 0xb5, 0x16, 0xc2, 0x80, 0x7b, 0x4b, 0x7c, + 0x0b, 0x8a, 0x73, 0x2a, 0x84, 0x33, 0xd1, 0x11, 0x18, 0x1b, 0x8b, 0x2c, 0x45, 0xa9, 0xee, 0x9e, + 0xd3, 0x39, 0x4f, 0xba, 0x5b, 0xad, 0x95, 0x0b, 0xd2, 0x9f, 0x53, 0x1e, 0xca, 0xe1, 0x94, 0xfa, + 0x93, 0xa9, 0x8c, 0x79, 0xbc, 0x14, 0x4b, 0xef, 0x69, 0x21, 0xbe, 0x01, 0x15, 0xc1, 0xe7, 0x74, + 0xb8, 0x3a, 0x8a, 0xe5, 0xf5, 0x51, 0xac, 0xac, 0xa4, 0x87, 0xb1, 0xb3, 0xf8, 0x1e, 0xbc, 0xb7, + 0x8e, 0x1a, 0x9e, 0x31, 0x98, 0xff, 0x10, 0x0d, 0xe6, 0x77, 0xb2, 0x3b, 0x0f, 0x5f, 0x1e, 0xd2, + 0x03, 0x78, 0x8b, 0x2e, 0x24, 0x65, 0xaa, 0x46, 0x86, 0x5c, 0x5f, 0x27, 0x0b, 0xf3, 0xeb, 0xbd, + 0x57, 0x84, 0x59, 0x4d, 0xf1, 0x0f, 0x23, 0x38, 0x7e, 0x0c, 0xf5, 0x35, 0xf3, 0x67, 0x28, 0xbc, + 0xfc, 0x0a, 0x85, 0xd7, 0x32, 0xbf, 0x1c, 0x77, 0x5f, 0xd2, 0x6d, 0x3d, 0x45, 0x70, 0x25, 0x93, + 0x92, 0x7e, 0x5c, 0x16, 0xf8, 0x36, 0x94, 0x55, 0xfe, 0x69, 0xa0, 0x6b, 0x27, 0x49, 0xcc, 0xf5, + 0x56, 0x74, 0xfd, 0xde, 0x92, 0x8b, 0x56, 0x7c, 0xfd, 0xde, 0xfa, 0x99, 0x86, 0xa9, 0x4d, 0x64, + 0x5f, 0xa4, 0x6b, 0x81, 0x9b, 0xab, 0x3b, 0x37, 0xd5, 0x34, 0xa7, 0x37, 0x1e, 0x50, 0x1a, 0xdd, + 0xc5, 0xad, 0x55, 0x57, 0x57, 0xe7, 0x2d, 0x53, 0x5d, 0xdd, 0x6d, 0xab, 0xeb, 0xfd, 0xa8, 0xb8, + 0x08, 0x3d, 0xa6, 0x2a, 0x94, 0xcf, 0x7c, 0x26, 0x75, 0xa9, 0xb0, 0x70, 0x1e, 0xf9, 0x9f, 0x27, + 0x7a, 0x3d, 0x38, 0x78, 0xfa, 0xbc, 0x8e, 0x9e, 0x3d, 0xaf, 0xa3, 0x7f, 0x3c, 0xaf, 0xa3, 0x2f, + 0x5e, 0xd4, 0x77, 0x9e, 0xbd, 0xa8, 0xef, 0xfc, 0xed, 0x45, 0x7d, 0xe7, 0xf1, 0x87, 0x13, 0x5f, + 0x4e, 0xc3, 0x51, 0xcb, 0xe5, 0xf3, 0xf6, 0xcc, 0x67, 0xb4, 0x3d, 0x1b, 0xcd, 0x3f, 0x12, 0xde, + 0x51, 0xfb, 0x89, 0xdd, 0x56, 0x5d, 0x1f, 0x4a, 0x7f, 0xd6, 0x4e, 0xda, 0x7f, 0xb4, 0xab, 0x69, + 0xee, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x46, 0xeb, 0xb7, 0x29, 0xe4, 0x18, 0x00, 0x00, } func (m *Customer1) Marshal() (dAtA []byte, err error) { diff --git a/third_party/proto/tendermint/abci/types.proto b/third_party/proto/ostracon/abci/types.proto similarity index 89% rename from third_party/proto/tendermint/abci/types.proto rename to third_party/proto/ostracon/abci/types.proto index 2cbcabb29b..096a97546b 100644 --- a/third_party/proto/tendermint/abci/types.proto +++ b/third_party/proto/ostracon/abci/types.proto @@ -1,18 +1,18 @@ syntax = "proto3"; -package tendermint.abci; +package ostracon.abci; -option go_package = "github.com/tendermint/tendermint/abci/types"; +option go_package = "github.com/line/ostracon/abci/types"; // For more information on gogo.proto, see: // https://github.com/gogo/protobuf/blob/master/extensions.md -import "tendermint/crypto/proof.proto"; -import "tendermint/types/types.proto"; -import "tendermint/crypto/keys.proto"; -import "tendermint/types/params.proto"; +import "ostracon/crypto/proof.proto"; +import "ostracon/types/types.proto"; +import "ostracon/crypto/keys.proto"; +import "ostracon/types/params.proto"; import "google/protobuf/timestamp.proto"; import "gogoproto/gogo.proto"; -// This file is copied from http://github.com/tendermint/abci +// This file is copied from http://github.com/ostracon/abci // NOTE: When using custom types, mind the warnings. // https://github.com/gogo/protobuf/blob/master/custom_types.md#warnings-and-issues @@ -75,10 +75,10 @@ message RequestQuery { } message RequestBeginBlock { - bytes hash = 1; - tendermint.types.Header header = 2 [(gogoproto.nullable) = false]; - LastCommitInfo last_commit_info = 3 [(gogoproto.nullable) = false]; - repeated Evidence byzantine_validators = 4 [(gogoproto.nullable) = false]; + bytes hash = 1; + ostracon.types.Header header = 2 [(gogoproto.nullable) = false]; + LastCommitInfo last_commit_info = 3 [(gogoproto.nullable) = false]; + repeated Evidence byzantine_validators = 4 [(gogoproto.nullable) = false]; } enum CheckTxType { @@ -187,14 +187,14 @@ message ResponseInitChain { message ResponseQuery { uint32 code = 1; // bytes data = 2; // use "value" instead. - string log = 3; // nondeterministic - string info = 4; // nondeterministic - int64 index = 5; - bytes key = 6; - bytes value = 7; - tendermint.crypto.ProofOps proof_ops = 8; - int64 height = 9; - string codespace = 10; + string log = 3; // nondeterministic + string info = 4; // nondeterministic + int64 index = 5; + bytes key = 6; + bytes value = 7; + ostracon.crypto.ProofOps proof_ops = 8; + int64 height = 9; + string codespace = 10; } message ResponseBeginBlock { @@ -282,10 +282,10 @@ message ResponseApplySnapshotChunk { // ConsensusParams contains all consensus-relevant parameters // that can be adjusted by the abci app message ConsensusParams { - BlockParams block = 1; - tendermint.types.EvidenceParams evidence = 2; - tendermint.types.ValidatorParams validator = 3; - tendermint.types.VersionParams version = 4; + BlockParams block = 1; + ostracon.types.EvidenceParams evidence = 2; + ostracon.types.ValidatorParams validator = 3; + ostracon.types.VersionParams version = 4; } // BlockParams contains limits on the block size. @@ -341,8 +341,8 @@ message Validator { // ValidatorUpdate message ValidatorUpdate { - tendermint.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; - int64 power = 2; + ostracon.crypto.PublicKey pub_key = 1 [(gogoproto.nullable) = false]; + int64 power = 2; } // VoteInfo diff --git a/third_party/proto/tendermint/crypto/keys.proto b/third_party/proto/ostracon/crypto/keys.proto similarity index 54% rename from third_party/proto/tendermint/crypto/keys.proto rename to third_party/proto/ostracon/crypto/keys.proto index 16fd7adf3e..c375549cb2 100644 --- a/third_party/proto/tendermint/crypto/keys.proto +++ b/third_party/proto/ostracon/crypto/keys.proto @@ -1,11 +1,11 @@ syntax = "proto3"; -package tendermint.crypto; +package ostracon.crypto; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto"; +option go_package = "github.com/line/ostracon/proto/ostracon/crypto"; import "gogoproto/gogo.proto"; -// PublicKey defines the keys available for use with Tendermint Validators +// PublicKey defines the keys available for use with Ostracon Validators message PublicKey { option (gogoproto.compare) = true; option (gogoproto.equal) = true; diff --git a/third_party/proto/tendermint/crypto/proof.proto b/third_party/proto/ostracon/crypto/proof.proto similarity index 88% rename from third_party/proto/tendermint/crypto/proof.proto rename to third_party/proto/ostracon/crypto/proof.proto index 975df76853..7ea7b277f7 100644 --- a/third_party/proto/tendermint/crypto/proof.proto +++ b/third_party/proto/ostracon/crypto/proof.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.crypto; +package ostracon.crypto; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/crypto"; +option go_package = "github.com/line/ostracon/proto/ostracon/crypto"; import "gogoproto/gogo.proto"; diff --git a/third_party/proto/ostracon/libs/bits/types.proto b/third_party/proto/ostracon/libs/bits/types.proto new file mode 100644 index 0000000000..bead2db26f --- /dev/null +++ b/third_party/proto/ostracon/libs/bits/types.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; +package ostracon.libs.bits; + +option go_package = "github.com/line/ostracon/proto/ostracon/libs/bits"; + +message BitArray { + int64 bits = 1; + repeated uint64 elems = 2; +} diff --git a/third_party/proto/tendermint/p2p/types.proto b/third_party/proto/ostracon/p2p/types.proto similarity index 90% rename from third_party/proto/tendermint/p2p/types.proto rename to third_party/proto/ostracon/p2p/types.proto index 0d42ea4002..4db1912637 100644 --- a/third_party/proto/tendermint/p2p/types.proto +++ b/third_party/proto/ostracon/p2p/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.p2p; +package ostracon.p2p; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/p2p"; +option go_package = "github.com/line/ostracon/proto/ostracon/p2p"; import "gogoproto/gogo.proto"; diff --git a/third_party/proto/ostracon/types/block.proto b/third_party/proto/ostracon/types/block.proto new file mode 100644 index 0000000000..96c19fd8b3 --- /dev/null +++ b/third_party/proto/ostracon/types/block.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +package ostracon.types; + +option go_package = "github.com/line/ostracon/proto/ostracon/types"; + +import "gogoproto/gogo.proto"; +import "ostracon/types/types.proto"; +import "ostracon/types/evidence.proto"; + +message Block { + Header header = 1 [(gogoproto.nullable) = false]; + Data data = 2 [(gogoproto.nullable) = false]; + ostracon.types.EvidenceList evidence = 3 [(gogoproto.nullable) = false]; + Commit last_commit = 4; +} diff --git a/third_party/proto/tendermint/types/evidence.proto b/third_party/proto/ostracon/types/evidence.proto similarity index 72% rename from third_party/proto/tendermint/types/evidence.proto rename to third_party/proto/ostracon/types/evidence.proto index 3b234571ba..52af097fb3 100644 --- a/third_party/proto/tendermint/types/evidence.proto +++ b/third_party/proto/ostracon/types/evidence.proto @@ -1,12 +1,12 @@ syntax = "proto3"; -package tendermint.types; +package ostracon.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/line/ostracon/proto/ostracon/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -import "tendermint/types/types.proto"; -import "tendermint/types/validator.proto"; +import "ostracon/types/types.proto"; +import "ostracon/types/validator.proto"; message Evidence { oneof sum { @@ -17,8 +17,8 @@ message Evidence { // DuplicateVoteEvidence contains evidence of a validator signed two conflicting votes. message DuplicateVoteEvidence { - tendermint.types.Vote vote_a = 1; - tendermint.types.Vote vote_b = 2; + ostracon.types.Vote vote_a = 1; + ostracon.types.Vote vote_b = 2; int64 total_voting_power = 3; int64 validator_power = 4; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; @@ -26,9 +26,9 @@ message DuplicateVoteEvidence { // LightClientAttackEvidence contains evidence of a set of validators attempting to mislead a light client. message LightClientAttackEvidence { - tendermint.types.LightBlock conflicting_block = 1; + ostracon.types.LightBlock conflicting_block = 1; int64 common_height = 2; - repeated tendermint.types.Validator byzantine_validators = 3; + repeated ostracon.types.Validator byzantine_validators = 3; int64 total_voting_power = 4; google.protobuf.Timestamp timestamp = 5 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; } diff --git a/third_party/proto/tendermint/types/params.proto b/third_party/proto/ostracon/types/params.proto similarity index 95% rename from third_party/proto/tendermint/types/params.proto rename to third_party/proto/ostracon/types/params.proto index 0de7d846fb..37f39b47b1 100644 --- a/third_party/proto/tendermint/types/params.proto +++ b/third_party/proto/ostracon/types/params.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.types; +package ostracon.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/line/ostracon/proto/ostracon/types"; import "gogoproto/gogo.proto"; import "google/protobuf/duration.proto"; diff --git a/third_party/proto/tendermint/types/types.proto b/third_party/proto/ostracon/types/types.proto similarity index 84% rename from third_party/proto/tendermint/types/types.proto rename to third_party/proto/ostracon/types/types.proto index 7f7ea74cac..21b93ce857 100644 --- a/third_party/proto/tendermint/types/types.proto +++ b/third_party/proto/ostracon/types/types.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package tendermint.types; +package ostracon.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/line/ostracon/proto/ostracon/types"; import "gogoproto/gogo.proto"; import "google/protobuf/timestamp.proto"; -import "tendermint/crypto/proof.proto"; -import "tendermint/version/types.proto"; -import "tendermint/types/validator.proto"; +import "ostracon/crypto/proof.proto"; +import "ostracon/version/types.proto"; +import "ostracon/types/validator.proto"; // BlockIdFlag indicates which BlcokID the signature is for enum BlockIDFlag { @@ -41,9 +41,9 @@ message PartSetHeader { } message Part { - uint32 index = 1; - bytes bytes = 2; - tendermint.crypto.Proof proof = 3 [(gogoproto.nullable) = false]; + uint32 index = 1; + bytes bytes = 2; + ostracon.crypto.Proof proof = 3 [(gogoproto.nullable) = false]; } // BlockID @@ -57,10 +57,10 @@ message BlockID { // Header defines the structure of a Tendermint block header. message Header { // basic block info - tendermint.version.Consensus version = 1 [(gogoproto.nullable) = false]; - string chain_id = 2 [(gogoproto.customname) = "ChainID"]; - int64 height = 3; - google.protobuf.Timestamp time = 4 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; + ostracon.version.Consensus version = 1 [(gogoproto.nullable) = false]; + string chain_id = 2 [(gogoproto.customname) = "ChainID"]; + int64 height = 3; + google.protobuf.Timestamp time = 4 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true]; // prev block info BlockID last_block_id = 5 [(gogoproto.nullable) = false]; @@ -138,8 +138,8 @@ message SignedHeader { } message LightBlock { - SignedHeader signed_header = 1; - tendermint.types.ValidatorSet validator_set = 2; + SignedHeader signed_header = 1; + ostracon.types.ValidatorSet validator_set = 2; } message BlockMeta { @@ -151,7 +151,7 @@ message BlockMeta { // TxProof represents a Merkle proof of the presence of a transaction in the Merkle tree. message TxProof { - bytes root_hash = 1; - bytes data = 2; - tendermint.crypto.Proof proof = 3; + bytes root_hash = 1; + bytes data = 2; + ostracon.crypto.Proof proof = 3; } diff --git a/third_party/proto/tendermint/types/validator.proto b/third_party/proto/ostracon/types/validator.proto similarity index 65% rename from third_party/proto/tendermint/types/validator.proto rename to third_party/proto/ostracon/types/validator.proto index 49860b96d6..b62127ad21 100644 --- a/third_party/proto/tendermint/types/validator.proto +++ b/third_party/proto/ostracon/types/validator.proto @@ -1,10 +1,10 @@ syntax = "proto3"; -package tendermint.types; +package ostracon.types; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; +option go_package = "github.com/line/ostracon/proto/ostracon/types"; import "gogoproto/gogo.proto"; -import "tendermint/crypto/keys.proto"; +import "ostracon/crypto/keys.proto"; message ValidatorSet { repeated Validator validators = 1; @@ -14,12 +14,12 @@ message ValidatorSet { message Validator { bytes address = 1; - tendermint.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false]; + ostracon.crypto.PublicKey pub_key = 2 [(gogoproto.nullable) = false]; int64 voting_power = 3; int64 proposer_priority = 4; } message SimpleValidator { - tendermint.crypto.PublicKey pub_key = 1; + ostracon.crypto.PublicKey pub_key = 1; int64 voting_power = 2; } diff --git a/third_party/proto/tendermint/version/types.proto b/third_party/proto/ostracon/version/types.proto similarity index 84% rename from third_party/proto/tendermint/version/types.proto rename to third_party/proto/ostracon/version/types.proto index 6061868bd4..135dbd49ee 100644 --- a/third_party/proto/tendermint/version/types.proto +++ b/third_party/proto/ostracon/version/types.proto @@ -1,7 +1,7 @@ syntax = "proto3"; -package tendermint.version; +package ostracon.version; -option go_package = "github.com/tendermint/tendermint/proto/tendermint/version"; +option go_package = "github.com/line/ostracon/proto/ostracon/version"; import "gogoproto/gogo.proto"; diff --git a/third_party/proto/tendermint/libs/bits/types.proto b/third_party/proto/tendermint/libs/bits/types.proto deleted file mode 100644 index 3111d113a5..0000000000 --- a/third_party/proto/tendermint/libs/bits/types.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto3"; -package tendermint.libs.bits; - -option go_package = "github.com/tendermint/tendermint/proto/tendermint/libs/bits"; - -message BitArray { - int64 bits = 1; - repeated uint64 elems = 2; -} diff --git a/third_party/proto/tendermint/types/block.proto b/third_party/proto/tendermint/types/block.proto deleted file mode 100644 index 84e9bb15d8..0000000000 --- a/third_party/proto/tendermint/types/block.proto +++ /dev/null @@ -1,15 +0,0 @@ -syntax = "proto3"; -package tendermint.types; - -option go_package = "github.com/tendermint/tendermint/proto/tendermint/types"; - -import "gogoproto/gogo.proto"; -import "tendermint/types/types.proto"; -import "tendermint/types/evidence.proto"; - -message Block { - Header header = 1 [(gogoproto.nullable) = false]; - Data data = 2 [(gogoproto.nullable) = false]; - tendermint.types.EvidenceList evidence = 3 [(gogoproto.nullable) = false]; - Commit last_commit = 4; -} diff --git a/types/abci.go b/types/abci.go index 8f71362eda..c3a68bf6cf 100644 --- a/types/abci.go +++ b/types/abci.go @@ -1,6 +1,6 @@ package types -import abci "github.com/tendermint/tendermint/abci/types" +import abci "github.com/line/ostracon/abci/types" // InitChainer initializes application state at genesis type InitChainer func(ctx Context, req abci.RequestInitChain) abci.ResponseInitChain diff --git a/types/abci.pb.go b/types/abci.pb.go index bab0b75599..63d77171fb 100644 --- a/types/abci.pb.go +++ b/types/abci.pb.go @@ -8,7 +8,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" types "github.com/line/lbm-sdk/v2/codec/types" - types1 "github.com/tendermint/tendermint/abci/types" + types1 "github.com/line/ostracon/abci/types" io "io" math "math" math_bits "math/bits" @@ -609,65 +609,65 @@ func init() { } var fileDescriptor_4e37629bc7eb0df8 = []byte{ - // 922 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0x31, 0x73, 0x1b, 0x45, - 0x14, 0xd6, 0x49, 0xca, 0xc9, 0x7a, 0x72, 0x30, 0x2c, 0x26, 0x39, 0x27, 0xa0, 0x13, 0xe7, 0x64, - 0x46, 0x0d, 0xa7, 0x89, 0x13, 0x18, 0xc6, 0x05, 0x43, 0x2e, 0x10, 0xe2, 0x99, 0x84, 0x62, 0xad, - 0x0c, 0x33, 0x34, 0x9a, 0x95, 0xb4, 0x59, 0x1d, 0xd1, 0xdd, 0x6a, 0x6e, 0x57, 0xb6, 0xd4, 0x51, - 0x52, 0x52, 0xa5, 0xa0, 0xa2, 0xe6, 0x97, 0xa4, 0xc3, 0x65, 0x0a, 0x46, 0x80, 0xdd, 0xa5, 0xf4, - 0x2f, 0x60, 0xf6, 0xed, 0x59, 0x3a, 0x93, 0x91, 0x2b, 0xed, 0xfb, 0xde, 0xdb, 0xb7, 0x6f, 0xbf, - 0xef, 0xd3, 0x1e, 0xec, 0x0e, 0xa4, 0x4a, 0xa4, 0xea, 0xf4, 0x99, 0xe2, 0x1d, 0xd6, 0x1f, 0xc4, - 0x9d, 0xa3, 0x7b, 0x7d, 0xae, 0xd9, 0x3d, 0x0c, 0xc2, 0x49, 0x26, 0xb5, 0x24, 0x9e, 0x2d, 0x0a, - 0x4d, 0x51, 0x88, 0x78, 0x5e, 0x74, 0x6b, 0x5b, 0x48, 0x21, 0xb1, 0xa8, 0x63, 0x56, 0xb6, 0xfe, - 0xd6, 0x6d, 0xcd, 0xd3, 0x21, 0xcf, 0x92, 0x38, 0xd5, 0xb6, 0xa7, 0x9e, 0x4f, 0xb8, 0xca, 0x93, - 0x3b, 0x42, 0x4a, 0x31, 0xe6, 0x1d, 0x8c, 0xfa, 0xd3, 0x17, 0x1d, 0x96, 0xce, 0x6d, 0x2a, 0x78, - 0x55, 0x01, 0xe8, 0xce, 0x28, 0x57, 0x13, 0x99, 0x2a, 0x4e, 0x6e, 0x80, 0x3b, 0xe2, 0xb1, 0x18, - 0x69, 0xcf, 0x69, 0x39, 0xed, 0x0a, 0xcd, 0x23, 0x12, 0x80, 0xab, 0x67, 0x23, 0xa6, 0x46, 0x5e, - 0xb9, 0xe5, 0xb4, 0xeb, 0x11, 0x9c, 0x2e, 0x7c, 0xb7, 0x3b, 0x7b, 0xc2, 0xd4, 0x88, 0xe6, 0x19, - 0xf2, 0x31, 0xd4, 0x07, 0x72, 0xc8, 0xd5, 0x84, 0x0d, 0xb8, 0x57, 0x31, 0x65, 0x74, 0x05, 0x10, - 0x02, 0x55, 0x13, 0x78, 0xd5, 0x96, 0xd3, 0xbe, 0x4e, 0x71, 0x6d, 0xb0, 0x21, 0xd3, 0xcc, 0xbb, - 0x86, 0xc5, 0xb8, 0x26, 0x37, 0xa1, 0x96, 0xb1, 0xe3, 0xde, 0x58, 0x0a, 0xcf, 0x45, 0xd8, 0xcd, - 0xd8, 0xf1, 0x53, 0x29, 0xc8, 0x73, 0xa8, 0x8e, 0xa5, 0x50, 0x5e, 0xad, 0x55, 0x69, 0x37, 0xf6, - 0xda, 0xe1, 0x3a, 0x82, 0xc2, 0x87, 0xd1, 0xa3, 0x83, 0x67, 0x5c, 0x29, 0x26, 0xf8, 0x53, 0x29, - 0xa2, 0x9b, 0xaf, 0x17, 0x7e, 0xe9, 0x8f, 0xbf, 0xfd, 0xad, 0xcb, 0xb8, 0xa2, 0xd8, 0xce, 0xcc, - 0x10, 0xa7, 0x2f, 0xa4, 0xb7, 0x61, 0x67, 0x30, 0x6b, 0xf2, 0x09, 0x80, 0x60, 0xaa, 0x77, 0xcc, - 0x52, 0xcd, 0x87, 0x5e, 0x1d, 0x99, 0xa8, 0x0b, 0xa6, 0x7e, 0x40, 0x80, 0xec, 0xc0, 0x86, 0x49, - 0x4f, 0x15, 0x1f, 0x7a, 0x80, 0xc9, 0x9a, 0x60, 0xea, 0xb9, 0xe2, 0x43, 0x72, 0x07, 0xca, 0x7a, - 0xe6, 0x35, 0x5a, 0x4e, 0xbb, 0xb1, 0xb7, 0x1d, 0x5a, 0xda, 0xc3, 0x0b, 0xda, 0xc3, 0x87, 0xe9, - 0x9c, 0x96, 0xf5, 0xcc, 0x30, 0xa5, 0xe3, 0x84, 0x2b, 0xcd, 0x92, 0x89, 0xb7, 0x69, 0x99, 0x5a, - 0x02, 0xfb, 0xd5, 0x5f, 0x7e, 0xf7, 0x4b, 0xc1, 0x6f, 0x0e, 0xbc, 0x77, 0x79, 0x62, 0x72, 0x1b, - 0xea, 0x89, 0x12, 0xbd, 0x38, 0x1d, 0xf2, 0x19, 0xea, 0x73, 0x9d, 0x6e, 0x24, 0x4a, 0x1c, 0x98, - 0x98, 0xbc, 0x0f, 0x15, 0xc3, 0x19, 0xca, 0x43, 0xcd, 0x92, 0x1c, 0x82, 0xcb, 0x8f, 0x78, 0xaa, - 0x95, 0x57, 0x41, 0xca, 0xee, 0xae, 0xa7, 0xec, 0x50, 0x67, 0x71, 0x2a, 0xbe, 0x35, 0xd5, 0xd1, - 0x76, 0xce, 0xd7, 0x66, 0x01, 0x54, 0x34, 0x6f, 0xb5, 0x5f, 0xfd, 0xf9, 0xaf, 0x96, 0x13, 0x64, - 0xd0, 0x28, 0x64, 0x0d, 0x87, 0xc6, 0x6e, 0x38, 0x53, 0x9d, 0xe2, 0x9a, 0x1c, 0x00, 0x30, 0xad, - 0xb3, 0xb8, 0x3f, 0xd5, 0x5c, 0x79, 0x65, 0x9c, 0x60, 0xf7, 0x0a, 0xd1, 0x2e, 0x6a, 0xa3, 0xaa, - 0x39, 0x9f, 0x16, 0x36, 0xe7, 0x67, 0xde, 0x87, 0xfa, 0xb2, 0xc8, 0xdc, 0xf6, 0x25, 0x9f, 0xe7, - 0x07, 0x9a, 0x25, 0xd9, 0x86, 0x6b, 0x47, 0x6c, 0x3c, 0xe5, 0x39, 0x03, 0x36, 0x08, 0x24, 0xd4, - 0xbe, 0x63, 0xea, 0xc0, 0x88, 0xfa, 0xe0, 0x92, 0xa8, 0x66, 0x67, 0x35, 0xfa, 0xe8, 0x7c, 0xe1, - 0x7f, 0x30, 0x67, 0xc9, 0x78, 0x3f, 0x58, 0xe5, 0x82, 0xa2, 0xd6, 0x61, 0x41, 0xeb, 0x32, 0xee, - 0xf9, 0xf0, 0x7c, 0xe1, 0x6f, 0xad, 0xf6, 0x98, 0x4c, 0xb0, 0x34, 0x40, 0xf0, 0x13, 0xb8, 0x94, - 0xab, 0xe9, 0x58, 0x2f, 0xcd, 0x6d, 0x4e, 0xda, 0xcc, 0xcd, 0xfd, 0xae, 0x48, 0x0f, 0xfe, 0x27, - 0xd2, 0x8d, 0x70, 0xf5, 0x47, 0xb6, 0x0c, 0x59, 0x55, 0x2c, 0x2b, 0x4b, 0x15, 0xd0, 0x22, 0xaf, - 0x1c, 0x20, 0x87, 0x71, 0x32, 0x1d, 0x33, 0x1d, 0xcb, 0x74, 0xf9, 0x1f, 0x7e, 0x6c, 0x47, 0x46, - 0x57, 0x3b, 0xe8, 0xc4, 0x4f, 0xd7, 0xf3, 0x9e, 0xb3, 0x13, 0x6d, 0x98, 0xfe, 0x27, 0x0b, 0xdf, - 0xc1, 0xab, 0x20, 0x61, 0x5f, 0x82, 0x9b, 0xe1, 0x55, 0x70, 0xde, 0xc6, 0x5e, 0x6b, 0x7d, 0x17, - 0x7b, 0x65, 0x9a, 0xd7, 0x07, 0x5f, 0x41, 0xed, 0x99, 0x12, 0xdf, 0x98, 0x1b, 0xef, 0x80, 0xb1, - 0x68, 0xaf, 0x60, 0x8f, 0x5a, 0xa2, 0x44, 0xd7, 0x38, 0xe4, 0x82, 0xa0, 0xf2, 0x8a, 0xa0, 0x5c, - 0xea, 0x27, 0x50, 0xef, 0xce, 0x2e, 0x3a, 0x7c, 0xbe, 0xe4, 0xb1, 0x72, 0xf5, 0x55, 0xf2, 0x0d, - 0x97, 0x3a, 0xfd, 0x59, 0x86, 0xad, 0x43, 0xce, 0xb2, 0xc1, 0xa8, 0x3b, 0x53, 0xb9, 0x30, 0x8f, - 0xa1, 0xa1, 0xa5, 0x66, 0xe3, 0xde, 0x40, 0x4e, 0x53, 0x9d, 0x3b, 0xe1, 0xee, 0xdb, 0x85, 0x5f, - 0x84, 0xcf, 0x17, 0x3e, 0xb1, 0x22, 0x17, 0xc0, 0x80, 0x02, 0x46, 0x8f, 0x4c, 0x60, 0x1c, 0x67, - 0x3b, 0xa0, 0x2f, 0xa8, 0x0d, 0x4c, 0xf7, 0x09, 0x13, 0xbc, 0x97, 0x4e, 0x93, 0x3e, 0xcf, 0xf0, - 0x1d, 0xcc, 0xbb, 0x17, 0xe0, 0x55, 0xf7, 0x02, 0x18, 0x50, 0x30, 0xd1, 0xf7, 0x18, 0x90, 0x08, - 0x30, 0xea, 0xe1, 0x81, 0xf8, 0x6a, 0x56, 0xa3, 0xdd, 0xb7, 0x0b, 0xbf, 0x80, 0xae, 0xcc, 0xbb, - 0xc2, 0x02, 0x5a, 0x37, 0x41, 0xd7, 0xac, 0xcd, 0x84, 0xe3, 0x38, 0x89, 0x35, 0x3e, 0xb0, 0x55, - 0x6a, 0x03, 0xf2, 0x05, 0x54, 0xf4, 0x4c, 0x79, 0x2e, 0xf2, 0x79, 0x67, 0x3d, 0x9f, 0xab, 0xcf, - 0x02, 0x35, 0x1b, 0x2c, 0xa3, 0xd1, 0xd7, 0x6f, 0xfe, 0x6d, 0x96, 0x5e, 0x9f, 0x36, 0x9d, 0x93, - 0xd3, 0xa6, 0xf3, 0xcf, 0x69, 0xd3, 0xf9, 0xf5, 0xac, 0x59, 0x3a, 0x39, 0x6b, 0x96, 0xde, 0x9c, - 0x35, 0x4b, 0x3f, 0x06, 0x22, 0xd6, 0xa3, 0x69, 0x3f, 0x1c, 0xc8, 0xa4, 0x93, 0x7f, 0xe6, 0xec, - 0xcf, 0x67, 0x6a, 0xf8, 0xd2, 0x7e, 0x93, 0xfa, 0x2e, 0xbe, 0x87, 0xf7, 0xff, 0x0b, 0x00, 0x00, - 0xff, 0xff, 0xd8, 0xa9, 0x21, 0xb7, 0x08, 0x07, 0x00, 0x00, + // 923 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x55, 0x31, 0x8f, 0x1b, 0x45, + 0x14, 0xf6, 0xda, 0xce, 0xfa, 0xfc, 0x7c, 0xe1, 0x60, 0x30, 0x64, 0x2f, 0x80, 0xd7, 0xec, 0x25, + 0x92, 0x1b, 0xd6, 0x8a, 0x03, 0x08, 0x5d, 0x11, 0x29, 0x1b, 0x08, 0x39, 0x29, 0xa1, 0x98, 0x73, + 0x84, 0x44, 0x63, 0x8d, 0xed, 0xc9, 0x78, 0x95, 0xdd, 0x1d, 0x6b, 0x67, 0xf6, 0x6e, 0xdd, 0x51, + 0x52, 0x52, 0xa5, 0xa0, 0xa2, 0xe6, 0x97, 0xa4, 0xe3, 0xca, 0x14, 0xc8, 0xc0, 0x5d, 0x97, 0xf2, + 0x7e, 0x01, 0x9a, 0x99, 0xb5, 0xbd, 0x47, 0xe4, 0xeb, 0xde, 0xfb, 0xde, 0x9b, 0x37, 0x6f, 0xbe, + 0xef, 0xf3, 0x1a, 0x0e, 0x26, 0x5c, 0xc4, 0x5c, 0xf4, 0xc7, 0x44, 0xd0, 0x3e, 0x19, 0x4f, 0xc2, + 0xfe, 0xc9, 0xbd, 0x31, 0x95, 0xe4, 0x9e, 0x4e, 0xfc, 0x79, 0xca, 0x25, 0x47, 0x8e, 0x69, 0xf2, + 0x55, 0x93, 0xaf, 0xf1, 0xa2, 0xe9, 0x76, 0x9b, 0x71, 0xc6, 0x75, 0x53, 0x5f, 0x45, 0xa6, 0xff, + 0xf6, 0x3e, 0x17, 0x32, 0x25, 0x13, 0x9e, 0x98, 0x89, 0x72, 0x31, 0xa7, 0x62, 0x55, 0x62, 0x9c, + 0xb3, 0x88, 0xf6, 0x75, 0x36, 0xce, 0x5e, 0xf4, 0x49, 0xb2, 0x30, 0x25, 0xef, 0x55, 0x0d, 0x60, + 0x98, 0x63, 0x2a, 0xe6, 0x3c, 0x11, 0x14, 0x7d, 0x0c, 0xf6, 0x8c, 0x86, 0x6c, 0x26, 0x1d, 0xab, + 0x6b, 0xf5, 0x6a, 0xb8, 0xc8, 0x90, 0x07, 0xb6, 0xcc, 0x67, 0x44, 0xcc, 0x9c, 0x6a, 0xd7, 0xea, + 0x35, 0x03, 0x38, 0x5f, 0xba, 0xf6, 0x30, 0x7f, 0x42, 0xc4, 0x0c, 0x17, 0x15, 0xf4, 0x29, 0x34, + 0x27, 0x7c, 0x4a, 0xc5, 0x9c, 0x4c, 0xa8, 0x53, 0x53, 0x6d, 0x78, 0x03, 0x20, 0x04, 0x75, 0x95, + 0x38, 0xf5, 0xae, 0xd5, 0xbb, 0x89, 0x75, 0xac, 0xb0, 0x29, 0x91, 0xc4, 0xb9, 0xa1, 0x9b, 0x75, + 0x8c, 0x6e, 0x41, 0x23, 0x25, 0xa7, 0xa3, 0x88, 0x33, 0xc7, 0xd6, 0xb0, 0x9d, 0x92, 0xd3, 0xa7, + 0x9c, 0xa1, 0xe7, 0x50, 0x8f, 0x38, 0x13, 0x4e, 0xa3, 0x5b, 0xeb, 0xb5, 0x06, 0x3d, 0x7f, 0x1b, + 0x3d, 0xfe, 0xc3, 0xe0, 0xd1, 0xd1, 0x33, 0x2a, 0x04, 0x61, 0xf4, 0x29, 0x67, 0xc1, 0xad, 0xd7, + 0x4b, 0xb7, 0xf2, 0xc7, 0xdf, 0xee, 0xde, 0x55, 0x5c, 0x60, 0x3d, 0x4e, 0xed, 0x10, 0x26, 0x2f, + 0xb8, 0xb3, 0x63, 0x76, 0x50, 0x31, 0xfa, 0x0c, 0x80, 0x11, 0x31, 0x3a, 0x25, 0x89, 0xa4, 0x53, + 0xa7, 0xa9, 0x99, 0x68, 0x32, 0x22, 0x7e, 0xd4, 0x00, 0xda, 0x87, 0x1d, 0x55, 0xce, 0x04, 0x9d, + 0x3a, 0xa0, 0x8b, 0x0d, 0x46, 0xc4, 0x73, 0x41, 0xa7, 0xe8, 0x0e, 0x54, 0x65, 0xee, 0xb4, 0xba, + 0x56, 0xaf, 0x35, 0x68, 0xfb, 0x86, 0x76, 0x7f, 0x45, 0xbb, 0xff, 0x30, 0x59, 0xe0, 0xaa, 0xcc, + 0x15, 0x53, 0x32, 0x8c, 0xa9, 0x90, 0x24, 0x9e, 0x3b, 0xbb, 0x86, 0xa9, 0x35, 0x70, 0x58, 0xff, + 0xe5, 0x77, 0xb7, 0xe2, 0xfd, 0x66, 0xc1, 0x7b, 0x57, 0x37, 0x46, 0x9f, 0x40, 0x33, 0x16, 0x6c, + 0x14, 0x26, 0x53, 0x9a, 0x6b, 0x7d, 0x6e, 0xe2, 0x9d, 0x58, 0xb0, 0x23, 0x95, 0xa3, 0xf7, 0xa1, + 0xa6, 0x38, 0xd3, 0xf2, 0x60, 0x15, 0xa2, 0x63, 0xb0, 0xe9, 0x09, 0x4d, 0xa4, 0x70, 0x6a, 0x9a, + 0xb2, 0xbb, 0xdb, 0x29, 0x3b, 0x96, 0x69, 0x98, 0xb0, 0xef, 0x54, 0x77, 0xd0, 0x2e, 0xf8, 0xda, + 0x2d, 0x81, 0x02, 0x17, 0xa3, 0x0e, 0xeb, 0x3f, 0xff, 0xd5, 0xb5, 0xbc, 0x14, 0x5a, 0xa5, 0xaa, + 0xe2, 0x50, 0xd9, 0x4d, 0xef, 0xd4, 0xc4, 0x3a, 0x46, 0x47, 0x00, 0x44, 0xca, 0x34, 0x1c, 0x67, + 0x92, 0x0a, 0xa7, 0xaa, 0x37, 0x38, 0xb8, 0x46, 0xb4, 0x55, 0x6f, 0x50, 0x57, 0xf7, 0xe3, 0xd2, + 0xe1, 0xe2, 0xce, 0xfb, 0xd0, 0x5c, 0x37, 0xa9, 0xd7, 0xbe, 0xa4, 0x8b, 0xe2, 0x42, 0x15, 0xa2, + 0x36, 0xdc, 0x38, 0x21, 0x51, 0x46, 0x0b, 0x06, 0x4c, 0xe2, 0x71, 0x68, 0x7c, 0x4f, 0xc4, 0x91, + 0x12, 0xf5, 0xcb, 0x2b, 0xa2, 0xaa, 0x93, 0xf5, 0xe0, 0xa3, 0xcb, 0xa5, 0xfb, 0xc1, 0x82, 0xc4, + 0xd1, 0xa1, 0xb7, 0xa9, 0x79, 0x65, 0xad, 0xfd, 0x92, 0xd6, 0x55, 0x7d, 0xe6, 0xc3, 0xcb, 0xa5, + 0xbb, 0xb7, 0x39, 0xa3, 0x2a, 0xde, 0xda, 0x00, 0xde, 0x0c, 0x6c, 0x4c, 0x45, 0x16, 0xc9, 0xb5, + 0xb9, 0xd5, 0x4d, 0xbb, 0x85, 0xb9, 0xdf, 0x15, 0x69, 0xf0, 0x3f, 0x91, 0xda, 0xfe, 0xea, 0x67, + 0x6c, 0xf8, 0x31, 0x9a, 0x18, 0x4e, 0xd6, 0x1a, 0x68, 0x83, 0xbc, 0xb2, 0x00, 0x1d, 0x87, 0x71, + 0x16, 0x11, 0x19, 0xf2, 0x64, 0xfd, 0x0b, 0x7e, 0x6c, 0x16, 0xd6, 0x9e, 0xb6, 0xb4, 0x0f, 0x3f, + 0xdf, 0xce, 0x7a, 0xc1, 0x4d, 0xb0, 0xa3, 0xe6, 0x9f, 0x2d, 0x5d, 0x4b, 0x3f, 0x44, 0xd3, 0xf5, + 0x0d, 0xd8, 0xa9, 0x7e, 0x88, 0xde, 0xb6, 0x35, 0xe8, 0x6e, 0x9f, 0x62, 0x1e, 0x8c, 0x8b, 0x7e, + 0xef, 0x01, 0x34, 0x9e, 0x09, 0xf6, 0xad, 0x7a, 0xef, 0x3e, 0x28, 0x83, 0x8e, 0x4a, 0xe6, 0x68, + 0xc4, 0x82, 0x0d, 0x95, 0x3f, 0x56, 0xf4, 0x54, 0x37, 0xf4, 0x14, 0x42, 0x3f, 0x81, 0xe6, 0x30, + 0x5f, 0x4d, 0xf8, 0x6a, 0xcd, 0x62, 0xed, 0xfa, 0xa7, 0x14, 0x07, 0xae, 0x4c, 0xfa, 0xb3, 0x0a, + 0x7b, 0xc7, 0x94, 0xa4, 0x93, 0xd9, 0x30, 0x17, 0x85, 0x2c, 0x8f, 0xa1, 0x25, 0xb9, 0x24, 0xd1, + 0x68, 0xc2, 0xb3, 0x44, 0x16, 0x3e, 0xb8, 0xfb, 0x76, 0xe9, 0x96, 0xe1, 0xcb, 0xa5, 0x8b, 0x8c, + 0xc4, 0x25, 0xd0, 0xc3, 0xa0, 0xb3, 0x47, 0x2a, 0x51, 0x7e, 0x33, 0x13, 0xb4, 0x2b, 0xb0, 0x49, + 0xd4, 0xf4, 0x39, 0x61, 0x74, 0x94, 0x64, 0xf1, 0x98, 0xa6, 0xfa, 0x2b, 0x58, 0x4c, 0x2f, 0xc1, + 0x9b, 0xe9, 0x25, 0xd0, 0xc3, 0xa0, 0xb2, 0x1f, 0x74, 0x82, 0x02, 0xd0, 0xd9, 0x48, 0x5f, 0xa8, + 0xbf, 0x99, 0xf5, 0xe0, 0xe0, 0xed, 0xd2, 0x2d, 0xa1, 0x1b, 0xeb, 0x6e, 0x30, 0x0f, 0x37, 0x55, + 0x32, 0x54, 0xb1, 0xda, 0x30, 0x0a, 0xe3, 0x50, 0xea, 0xcf, 0x6b, 0x1d, 0x9b, 0x04, 0x7d, 0x0d, + 0x35, 0x99, 0x0b, 0xc7, 0xd6, 0x7c, 0xde, 0xd9, 0xce, 0xe7, 0xe6, 0x4f, 0x01, 0xab, 0x03, 0x86, + 0xd1, 0xe0, 0xc1, 0x9b, 0x7f, 0x3b, 0x95, 0xd7, 0xe7, 0x1d, 0xeb, 0xec, 0xbc, 0x63, 0xfd, 0x73, + 0xde, 0xb1, 0x7e, 0xbd, 0xe8, 0x54, 0xce, 0x2e, 0x3a, 0x95, 0x37, 0x17, 0x9d, 0xca, 0x4f, 0x5d, + 0x16, 0xca, 0x59, 0x36, 0xf6, 0x27, 0x3c, 0xee, 0x47, 0x61, 0x42, 0xfb, 0xd1, 0x38, 0xfe, 0x42, + 0x4c, 0x5f, 0xf6, 0x4f, 0x06, 0xe6, 0xff, 0x68, 0x6c, 0xeb, 0x6f, 0xe1, 0xfd, 0xff, 0x02, 0x00, + 0x00, 0xff, 0xff, 0xfc, 0xf8, 0x4c, 0x7f, 0x02, 0x07, 0x00, 0x00, } func (m *TxResponse) Marshal() (dAtA []byte, err error) { diff --git a/types/coin.pb.go b/types/coin.pb.go index df8d34d4f9..c197cca7d6 100644 --- a/types/coin.pb.go +++ b/types/coin.pb.go @@ -203,7 +203,7 @@ func init() { func init() { proto.RegisterFile("cosmos/base/v1beta1/coin.proto", fileDescriptor_189a96714eafc2df) } var fileDescriptor_189a96714eafc2df = []byte{ - // 261 bytes of a gzipped FileDescriptorProto + // 268 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x4a, 0x2c, 0x4e, 0xd5, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0xce, 0xcf, 0xcc, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86, 0xc8, 0xeb, 0x81, @@ -215,12 +215,12 @@ var fileDescriptor_189a96714eafc2df = []byte{ 0x2f, 0x2e, 0x76, 0x97, 0xd4, 0x64, 0x72, 0xcc, 0x72, 0x49, 0x4d, 0x46, 0x33, 0x4b, 0x93, 0x8b, 0xc3, 0x33, 0xaf, 0x24, 0x00, 0xec, 0x17, 0x59, 0x2e, 0xe6, 0xcc, 0xbc, 0x12, 0x88, 0x51, 0xa8, 0xf6, 0x83, 0xc4, 0x41, 0x4a, 0x5d, 0x52, 0x93, 0xe1, 0x4a, 0x53, 0x52, 0x93, 0xd1, 0x95, 0x82, - 0x8c, 0x07, 0x89, 0x3b, 0xb9, 0xdc, 0x78, 0x28, 0xc7, 0xd0, 0xf0, 0x48, 0x8e, 0xe1, 0xc4, 0x23, + 0x8c, 0x07, 0x89, 0x3b, 0x39, 0xdd, 0x78, 0x28, 0xc7, 0xd0, 0xf0, 0x48, 0x8e, 0xe1, 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, 0x94, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, - 0x92, 0xf3, 0x73, 0xf5, 0xa1, 0x41, 0x0c, 0xa1, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x4b, 0x2a, 0x0b, - 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xe1, 0x66, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x57, 0xb3, 0x7a, - 0x93, 0x84, 0x01, 0x00, 0x00, + 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x14, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, + 0x92, 0xf3, 0x73, 0xf5, 0x73, 0x32, 0xf3, 0x52, 0xf5, 0x73, 0x92, 0x72, 0x75, 0x8b, 0x53, 0xb2, + 0xf5, 0xcb, 0x8c, 0xf4, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0xa1, 0x66, 0x0c, 0x08, + 0x00, 0x00, 0xff, 0xff, 0x5c, 0xc0, 0x3e, 0x64, 0x82, 0x01, 0x00, 0x00, } func (this *Coin) Equal(that interface{}) bool { diff --git a/types/context.go b/types/context.go index 2e6e85095b..f8eec3d793 100644 --- a/types/context.go +++ b/types/context.go @@ -5,9 +5,9 @@ import ( "time" "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/store/gaskv" stypes "github.com/line/lbm-sdk/v2/store/types" @@ -24,7 +24,7 @@ and standard additions here would be better just to add to the Context struct type Context struct { ctx context.Context ms MultiStore - header tmproto.Header + header ostproto.Header chainID string txBytes []byte logger log.Logger @@ -58,8 +58,8 @@ func (c Context) MinGasPrices() DecCoins { return c.minGasPrice } func (c Context) EventManager() *EventManager { return c.eventManager } // clone the header before returning -func (c Context) BlockHeader() tmproto.Header { - var msg = proto.Clone(&c.header).(*tmproto.Header) +func (c Context) BlockHeader() ostproto.Header { + var msg = proto.Clone(&c.header).(*ostproto.Header) return *msg } @@ -68,7 +68,7 @@ func (c Context) ConsensusParams() *abci.ConsensusParams { } // create a new context -func NewContext(ms MultiStore, header tmproto.Header, isCheckTx bool, logger log.Logger) Context { +func NewContext(ms MultiStore, header ostproto.Header, isCheckTx bool, logger log.Logger) Context { // https://github.com/gogo/protobuf/issues/519 header.Time = header.Time.UTC() return Context{ @@ -97,7 +97,7 @@ func (c Context) WithMultiStore(ms MultiStore) Context { } // WithBlockHeader returns a Context with an updated tendermint block header in UTC time. -func (c Context) WithBlockHeader(header tmproto.Header) Context { +func (c Context) WithBlockHeader(header ostproto.Header) Context { // https://github.com/gogo/protobuf/issues/519 header.Time = header.Time.UTC() c.header = header diff --git a/types/context_test.go b/types/context_test.go index 500c41dc4e..8c2e5b08c8 100644 --- a/types/context_test.go +++ b/types/context_test.go @@ -6,11 +6,11 @@ import ( "time" "github.com/golang/mock/gomock" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" "github.com/line/lbm-sdk/v2/store" @@ -31,7 +31,7 @@ func (s *contextTestSuite) defaultContext(key types.StoreKey) types.Context { cms := store.NewCommitMultiStore(db) cms.MountStoreWithDB(key, types.StoreTypeIAVL, db) s.Require().NoError(cms.LoadLatestVersion()) - ctx := types.NewContext(cms, tmproto.Header{}, false, log.NewNopLogger()) + ctx := types.NewContext(cms, ostproto.Header{}, false, log.NewNopLogger()) return ctx } @@ -93,7 +93,7 @@ func (s *contextTestSuite) TestContextWithCustom() { ctrl := gomock.NewController(s.T()) s.T().Cleanup(ctrl.Finish) - header := tmproto.Header{} + header := ostproto.Header{} height := int64(1) chainid := "chainid" ischeck := true @@ -152,7 +152,7 @@ func (s *contextTestSuite) TestContextHeader() { addr := secp256k1.GenPrivKey().PubKey().Address() proposer := types.ConsAddress(addr) - ctx = types.NewContext(nil, tmproto.Header{}, false, nil) + ctx = types.NewContext(nil, ostproto.Header{}, false, nil) ctx = ctx. WithBlockHeight(height). @@ -166,35 +166,35 @@ func (s *contextTestSuite) TestContextHeader() { func (s *contextTestSuite) TestContextHeaderClone() { cases := map[string]struct { - h tmproto.Header + h ostproto.Header }{ "empty": { - h: tmproto.Header{}, + h: ostproto.Header{}, }, "height": { - h: tmproto.Header{ + h: ostproto.Header{ Height: 77, }, }, "time": { - h: tmproto.Header{ + h: ostproto.Header{ Time: time.Unix(12345677, 12345), }, }, "zero time": { - h: tmproto.Header{ + h: ostproto.Header{ Time: time.Unix(0, 0), }, }, "many items": { - h: tmproto.Header{ + h: ostproto.Header{ Height: 823, Time: time.Unix(9999999999, 0), ChainID: "silly-demo", }, }, "many items with hash": { - h: tmproto.Header{ + h: ostproto.Header{ Height: 823, Time: time.Unix(9999999999, 0), ChainID: "silly-demo", @@ -221,7 +221,7 @@ func (s *contextTestSuite) TestContextHeaderClone() { } func (s *contextTestSuite) TestUnwrapSDKContext() { - sdkCtx := types.NewContext(nil, tmproto.Header{}, false, nil) + sdkCtx := types.NewContext(nil, ostproto.Header{}, false, nil) ctx := types.WrapSDKContext(sdkCtx) sdkCtx2 := types.UnwrapSDKContext(ctx) s.Require().Equal(sdkCtx, sdkCtx2) diff --git a/types/errors/abci.go b/types/errors/abci.go index df85f6bc89..accbd35210 100644 --- a/types/errors/abci.go +++ b/types/errors/abci.go @@ -4,7 +4,7 @@ import ( "fmt" "reflect" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" ) const ( diff --git a/types/events.go b/types/events.go index 92f8872d80..d901f14c1a 100644 --- a/types/events.go +++ b/types/events.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/jsonpb" proto "github.com/gogo/protobuf/proto" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/codec" ) diff --git a/types/events_test.go b/types/events_test.go index ed66762989..408c807126 100644 --- a/types/events_test.go +++ b/types/events_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" + abci "github.com/line/ostracon/abci/types" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" codectypes "github.com/line/lbm-sdk/v2/codec/types" testdata "github.com/line/lbm-sdk/v2/testutil/testdata" diff --git a/types/kv/kv.pb.go b/types/kv/kv.pb.go index eedb948bf5..e06905d4d7 100644 --- a/types/kv/kv.pb.go +++ b/types/kv/kv.pb.go @@ -129,7 +129,7 @@ func init() { func init() { proto.RegisterFile("cosmos/base/kv/v1beta1/kv.proto", fileDescriptor_a44e87fe7182bb73) } var fileDescriptor_a44e87fe7182bb73 = []byte{ - // 221 bytes of a gzipped FileDescriptorProto + // 228 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x4a, 0x2c, 0x4e, 0xd5, 0xcf, 0x2e, 0xd3, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0xcf, 0x2e, 0xd3, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x83, 0x28, 0xd0, @@ -139,11 +139,12 @@ var fileDescriptor_a44e87fe7182bb73 = []byte{ 0xe8, 0x81, 0x54, 0x3b, 0xb1, 0x9c, 0xb8, 0x27, 0xcf, 0x10, 0x04, 0xd1, 0xa0, 0xa4, 0xc7, 0xc5, 0x02, 0x12, 0x14, 0x12, 0xe0, 0x62, 0xce, 0x4e, 0xad, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x09, 0x02, 0x31, 0x85, 0x44, 0xb8, 0x58, 0xcb, 0x12, 0x73, 0x4a, 0x53, 0x25, 0x98, 0xc0, 0x62, 0x10, - 0x8e, 0x93, 0xfd, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, - 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xa9, 0xa6, 0x67, - 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0xbd, 0x09, 0xa1, 0x74, 0x8b, 0x53, - 0xb2, 0xf5, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0xf5, 0xb3, 0xcb, 0x92, 0xd8, 0xc0, 0x4e, 0x37, 0x06, - 0x04, 0x00, 0x00, 0xff, 0xff, 0x15, 0x18, 0x16, 0xcf, 0x0b, 0x01, 0x00, 0x00, + 0x8e, 0x93, 0xed, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, + 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x29, 0xa7, 0x67, + 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xe7, 0x64, 0xe6, 0xa5, 0xea, 0xe7, 0x24, + 0xe5, 0xea, 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x19, 0xe9, 0x97, 0x54, 0x16, 0xa4, 0x16, 0xeb, 0x67, + 0x97, 0x25, 0xb1, 0x81, 0x1d, 0x6e, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x9a, 0xc3, 0x91, 0x77, + 0x09, 0x01, 0x00, 0x00, } func (m *Pairs) Marshal() (dAtA []byte, err error) { diff --git a/types/module/module.go b/types/module/module.go index 59185484c5..005b25ea72 100644 --- a/types/module/module.go +++ b/types/module/module.go @@ -33,8 +33,8 @@ import ( "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/types/module/module_test.go b/types/module/module_test.go index 835895ddd6..1ad60b5ab2 100644 --- a/types/module/module_test.go +++ b/types/module/module_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/mock/gomock" "github.com/gorilla/mux" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/types/query/pagination.pb.go b/types/query/pagination.pb.go index b27db91746..a39ff08369 100644 --- a/types/query/pagination.pb.go +++ b/types/query/pagination.pb.go @@ -182,24 +182,24 @@ func init() { } var fileDescriptor_53d6d609fe6828af = []byte{ - // 266 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x90, 0xc1, 0x4a, 0xc3, 0x40, - 0x14, 0x45, 0x33, 0xb6, 0xd6, 0x32, 0xed, 0x42, 0x06, 0x91, 0x74, 0x33, 0x86, 0xae, 0x82, 0x60, - 0x86, 0xe2, 0x07, 0x08, 0xdd, 0xba, 0x91, 0xe0, 0xca, 0x4d, 0x99, 0xc4, 0xd7, 0x18, 0xda, 0xcc, - 0x4b, 0x3b, 0x2f, 0x62, 0xfe, 0xc2, 0xcf, 0x72, 0xd9, 0xa5, 0x4b, 0x49, 0x7e, 0x44, 0x92, 0x09, - 0x74, 0x35, 0x73, 0x2f, 0x87, 0x77, 0xe0, 0xf2, 0xfb, 0x14, 0x6d, 0x81, 0x56, 0x25, 0xda, 0x82, - 0x3a, 0x54, 0x70, 0xac, 0xd5, 0xe7, 0x2a, 0x01, 0xd2, 0x2b, 0x55, 0xea, 0x2c, 0x37, 0x9a, 0x72, - 0x34, 0x51, 0x79, 0x44, 0x42, 0xb1, 0x70, 0x6c, 0xd4, 0xb1, 0x51, 0xcf, 0x46, 0x03, 0xbb, 0x34, - 0x7c, 0xf6, 0xa2, 0x33, 0x88, 0xe1, 0x50, 0x81, 0x25, 0x71, 0xcd, 0x47, 0x3b, 0xa8, 0x7d, 0x16, - 0xb0, 0x70, 0x1e, 0x77, 0x5f, 0x71, 0xcb, 0x27, 0xb8, 0xdd, 0x5a, 0x20, 0xff, 0x22, 0x60, 0xe1, - 0x38, 0x1e, 0x92, 0xb8, 0xe1, 0x97, 0xfb, 0xbc, 0xc8, 0xc9, 0x1f, 0xf5, 0xb5, 0x0b, 0xe2, 0x8e, - 0xcf, 0x52, 0xac, 0x0c, 0x6d, 0x08, 0x49, 0xef, 0xfd, 0x71, 0xc0, 0xc2, 0x69, 0xcc, 0xfb, 0xea, - 0xb5, 0x6b, 0x96, 0x4f, 0x7c, 0xee, 0x7c, 0xb6, 0x44, 0x63, 0x41, 0x2c, 0xf8, 0xd4, 0xc0, 0x17, - 0x6d, 0xce, 0xd6, 0xab, 0x2e, 0x3f, 0x43, 0xdd, 0x19, 0xdc, 0x15, 0x27, 0x76, 0x61, 0xbd, 0xfe, - 0x69, 0x24, 0x3b, 0x35, 0x92, 0xfd, 0x35, 0x92, 0x7d, 0xb7, 0xd2, 0x3b, 0xb5, 0xd2, 0xfb, 0x6d, - 0xa5, 0xf7, 0x16, 0x66, 0x39, 0x7d, 0x54, 0x49, 0x94, 0x62, 0xa1, 0x86, 0x71, 0xdc, 0xf3, 0x60, - 0xdf, 0x77, 0x8a, 0xea, 0x12, 0xac, 0x1b, 0x2a, 0x99, 0xf4, 0xb3, 0x3c, 0xfe, 0x07, 0x00, 0x00, - 0xff, 0xff, 0xb5, 0x65, 0x82, 0x18, 0x44, 0x01, 0x00, 0x00, + // 271 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x44, 0x90, 0xc1, 0x4a, 0xc3, 0x30, + 0x18, 0xc7, 0x17, 0x37, 0xe7, 0xc8, 0x76, 0x90, 0x20, 0xd2, 0x5d, 0x62, 0xd9, 0x41, 0x8a, 0x60, + 0xc3, 0xf4, 0x01, 0x14, 0xaf, 0x5e, 0xa4, 0x78, 0xf2, 0x32, 0xd2, 0xfa, 0xad, 0x86, 0xb5, 0x49, + 0xb7, 0x7c, 0x1d, 0xf6, 0x2d, 0x7c, 0x2c, 0x8f, 0x3b, 0x7a, 0x94, 0xf6, 0x45, 0x24, 0xcd, 0xc0, + 0x5b, 0x7e, 0x7f, 0x7e, 0xe4, 0x07, 0x1f, 0xbd, 0xc9, 0x8c, 0x2d, 0x8d, 0x15, 0xa9, 0xb4, 0x20, + 0xb6, 0x35, 0xec, 0x1a, 0xb1, 0x5f, 0xa6, 0x80, 0x72, 0x29, 0x2a, 0x99, 0x2b, 0x2d, 0x51, 0x19, + 0x1d, 0x57, 0x3b, 0x83, 0x86, 0xcd, 0xbd, 0x1b, 0x3b, 0x37, 0xee, 0xdd, 0xf8, 0xe8, 0x2e, 0x34, + 0x9d, 0xbe, 0xc8, 0x1c, 0x12, 0xd8, 0xd6, 0x60, 0x91, 0x9d, 0xd3, 0xe1, 0x06, 0x9a, 0x80, 0x84, + 0x24, 0x9a, 0x25, 0xee, 0xc9, 0x2e, 0xe9, 0xd8, 0xac, 0xd7, 0x16, 0x30, 0x38, 0x09, 0x49, 0x34, + 0x4a, 0x8e, 0xc4, 0x2e, 0xe8, 0x69, 0xa1, 0x4a, 0x85, 0xc1, 0xb0, 0x9f, 0x3d, 0xb0, 0x2b, 0x3a, + 0xcd, 0x4c, 0xad, 0x71, 0x85, 0x06, 0x65, 0x11, 0x8c, 0x42, 0x12, 0x4d, 0x12, 0xda, 0x4f, 0xaf, + 0x6e, 0x59, 0x3c, 0xd0, 0x99, 0xef, 0xd9, 0xca, 0x68, 0x0b, 0x6c, 0x4e, 0x27, 0x1a, 0x3e, 0x71, + 0xf5, 0x5f, 0x3d, 0x73, 0xfc, 0x0c, 0x8d, 0x2b, 0xf8, 0x5f, 0x7c, 0xd8, 0xc3, 0xd3, 0xe3, 0x77, + 0xcb, 0xc9, 0xa1, 0xe5, 0xe4, 0xb7, 0xe5, 0xe4, 0xab, 0xe3, 0x83, 0x43, 0xc7, 0x07, 0x3f, 0x1d, + 0x1f, 0xbc, 0x5d, 0xe7, 0x0a, 0x3f, 0xea, 0x34, 0xce, 0x4c, 0x29, 0x0a, 0xa5, 0x41, 0x14, 0x69, + 0x79, 0x6b, 0xdf, 0x37, 0x62, 0x7f, 0x27, 0xb0, 0xa9, 0xc0, 0xfa, 0x33, 0xa5, 0xe3, 0xfe, 0x28, + 0xf7, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x94, 0xa9, 0x34, 0x86, 0x42, 0x01, 0x00, 0x00, } func (m *PageRequest) Marshal() (dAtA []byte, err error) { diff --git a/types/query/pagination_test.go b/types/query/pagination_test.go index 1910805243..944692ba67 100644 --- a/types/query/pagination_test.go +++ b/types/query/pagination_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/codec" @@ -213,7 +213,7 @@ func ExamplePaginate() { func setupTest() (*simapp.SimApp, sdk.Context, codec.Marshaler) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{Height: 1}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{Height: 1}) appCodec := app.AppCodec() db := dbm.NewMemDB() diff --git a/types/queryable.go b/types/queryable.go index f89965906a..3c413ebace 100644 --- a/types/queryable.go +++ b/types/queryable.go @@ -1,7 +1,7 @@ package types import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" ) // Querier defines a function type that a module querier must implement to handle diff --git a/types/rest/rest.go b/types/rest/rest.go index ef8d3c25b1..ce22dce722 100644 --- a/types/rest/rest.go +++ b/types/rest/rest.go @@ -13,7 +13,7 @@ import ( "strconv" "strings" - "github.com/tendermint/tendermint/types" + "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/types/result.go b/types/result.go index 6104be566f..f861308ec8 100644 --- a/types/result.go +++ b/types/result.go @@ -11,8 +11,8 @@ import ( yaml "gopkg.in/yaml.v2" - abci "github.com/tendermint/tendermint/abci/types" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + abci "github.com/line/ostracon/abci/types" + ctypes "github.com/line/ostracon/rpc/core/types" "github.com/line/lbm-sdk/v2/codec" codectypes "github.com/line/lbm-sdk/v2/codec/types" @@ -62,7 +62,7 @@ func (logs ABCIMessageLogs) String() (str string) { return str } -// NewResponseResultTx returns a TxResponse given a ResultTx from tendermint +// NewResponseResultTx returns a TxResponse given a ResultTx from ostracon func NewResponseResultTx(res *ctypes.ResultTx, anyTx *codectypes.Any, timestamp string) *TxResponse { if res == nil { return nil @@ -87,7 +87,7 @@ func NewResponseResultTx(res *ctypes.ResultTx, anyTx *codectypes.Any, timestamp } // NewResponseFormatBroadcastTxCommit returns a TxResponse given a -// ResultBroadcastTxCommit from tendermint. +// ResultBroadcastTxCommit from ostracon. func NewResponseFormatBroadcastTxCommit(res *ctypes.ResultBroadcastTxCommit) *TxResponse { if res == nil { return nil @@ -152,7 +152,7 @@ func newTxResponseDeliverTx(res *ctypes.ResultBroadcastTxCommit) *TxResponse { } } -// NewResponseFormatBroadcastTx returns a TxResponse given a ResultBroadcastTx from tendermint +// NewResponseFormatBroadcastTx returns a TxResponse given a ResultBroadcastTx from ostracon func NewResponseFormatBroadcastTx(res *ctypes.ResultBroadcastTx) *TxResponse { if res == nil { return nil diff --git a/types/result_test.go b/types/result_test.go index 11f93347c5..03a6b61875 100644 --- a/types/result_test.go +++ b/types/result_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/bytes" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/bytes" + ctypes "github.com/line/ostracon/rpc/core/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/testutil/testdata" diff --git a/types/store_test.go b/types/store_test.go index 91374d48d7..f4334c81ec 100644 --- a/types/store_test.go +++ b/types/store_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/suite" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/store/rootmulti" "github.com/line/lbm-sdk/v2/store/types" diff --git a/types/tx/service.pb.go b/types/tx/service.pb.go index e790f44067..6b18f45e91 100644 --- a/types/tx/service.pb.go +++ b/types/tx/service.pb.go @@ -513,54 +513,54 @@ func init() { func init() { proto.RegisterFile("cosmos/tx/v1beta1/service.proto", fileDescriptor_e0b00a618705eca7) } var fileDescriptor_e0b00a618705eca7 = []byte{ - // 737 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcd, 0x4f, 0x13, 0x41, - 0x14, 0xef, 0xb6, 0xc8, 0xc7, 0x2b, 0x68, 0x1d, 0x10, 0x6b, 0xd1, 0xa5, 0x2c, 0x16, 0x08, 0x89, - 0xbb, 0xa1, 0x7a, 0x20, 0xc6, 0xc4, 0xd0, 0x52, 0x08, 0x51, 0x3e, 0xb2, 0xc5, 0x83, 0xc6, 0xa4, - 0x99, 0xb6, 0xc3, 0xb2, 0x91, 0xee, 0x94, 0xce, 0x94, 0x2c, 0x01, 0x62, 0xe2, 0xd1, 0x93, 0x89, - 0xff, 0x94, 0x47, 0x12, 0x2f, 0x1e, 0x0d, 0xf8, 0x47, 0x78, 0x34, 0x3b, 0x3b, 0x6d, 0xb7, 0x65, - 0x0b, 0xc4, 0x13, 0x33, 0xcc, 0xef, 0xfd, 0x3e, 0xde, 0x9b, 0x9d, 0xc2, 0x74, 0x85, 0xb2, 0x1a, - 0x65, 0x06, 0x77, 0x8d, 0xa3, 0xa5, 0x32, 0xe1, 0x78, 0xc9, 0x60, 0xa4, 0x71, 0x64, 0x57, 0x88, - 0x5e, 0x6f, 0x50, 0x4e, 0xd1, 0x7d, 0x1f, 0xa0, 0x73, 0x57, 0x97, 0x80, 0xd4, 0x63, 0x8b, 0x52, - 0xeb, 0x80, 0x18, 0xb8, 0x6e, 0x1b, 0xd8, 0x71, 0x28, 0xc7, 0xdc, 0xa6, 0x0e, 0xf3, 0x0b, 0x52, - 0xb3, 0x92, 0xb1, 0x8c, 0x19, 0x31, 0x70, 0xb9, 0x62, 0xb7, 0x89, 0xbd, 0x8d, 0x04, 0xa5, 0xae, - 0xca, 0x72, 0x57, 0x9e, 0x4d, 0x58, 0xd4, 0xa2, 0x62, 0x69, 0x78, 0x2b, 0xf9, 0xdf, 0xc5, 0x20, - 0xed, 0x61, 0x93, 0x34, 0x8e, 0xdb, 0x95, 0x75, 0x6c, 0xd9, 0x8e, 0xf0, 0xe0, 0x63, 0x35, 0x0e, - 0x68, 0x9d, 0xf0, 0x5d, 0x97, 0x15, 0x8e, 0x88, 0xc3, 0x4d, 0x72, 0xd8, 0x24, 0x8c, 0xa3, 0x49, - 0x18, 0x24, 0xde, 0x9e, 0x25, 0x95, 0x74, 0x6c, 0x61, 0xc4, 0x94, 0x3b, 0xb4, 0x06, 0xd0, 0x61, - 0x48, 0x46, 0xd3, 0xca, 0x42, 0x3c, 0x3b, 0xa7, 0xcb, 0xd8, 0x9e, 0x9c, 0x2e, 0xe4, 0x5a, 0xf1, - 0xf5, 0x1d, 0x6c, 0x11, 0xc9, 0x69, 0x06, 0x2a, 0xb5, 0x73, 0x05, 0xc6, 0xbb, 0x64, 0x59, 0x9d, - 0x3a, 0x8c, 0xa0, 0x79, 0x88, 0x71, 0xd7, 0x17, 0x8d, 0x67, 0x1f, 0xe8, 0x57, 0xfa, 0xa9, 0xef, - 0xba, 0xa6, 0x87, 0x40, 0xeb, 0x30, 0xca, 0xdd, 0x52, 0x43, 0xd6, 0xb1, 0x64, 0x54, 0x54, 0x3c, - 0xed, 0xb2, 0x22, 0x7a, 0x18, 0x28, 0x94, 0x60, 0x33, 0xce, 0xdb, 0x6b, 0x8f, 0x28, 0x98, 0x28, - 0x26, 0x12, 0xcd, 0xdf, 0x98, 0x48, 0x32, 0x05, 0x23, 0x11, 0x40, 0xb9, 0x06, 0xc5, 0xd5, 0x0a, - 0x66, 0xdc, 0x13, 0xf3, 0x1b, 0xf9, 0x08, 0x86, 0xb9, 0x5b, 0x2a, 0x1f, 0x73, 0xe2, 0xa5, 0x52, - 0x16, 0x46, 0xcd, 0x21, 0xee, 0xe6, 0xbc, 0x2d, 0x7a, 0x01, 0x03, 0x35, 0x5a, 0x25, 0xa2, 0x8b, - 0x77, 0xb3, 0xe9, 0x90, 0xb0, 0x6d, 0xbe, 0x4d, 0x5a, 0x25, 0xa6, 0x40, 0x6b, 0x1f, 0x61, 0xbc, - 0x4b, 0x46, 0x36, 0xae, 0x00, 0xf1, 0x40, 0x3f, 0x84, 0xd4, 0x6d, 0xdb, 0x01, 0x9d, 0x76, 0x68, - 0xcb, 0x70, 0xaf, 0x68, 0xd7, 0x9a, 0x07, 0x98, 0xb7, 0xc6, 0x86, 0x32, 0x10, 0xe5, 0xae, 0x24, - 0xec, 0x33, 0x91, 0x28, 0x77, 0xb5, 0xaf, 0x0a, 0x24, 0x3a, 0xa5, 0xd2, 0xd5, 0x2b, 0x18, 0xb6, - 0x30, 0x2b, 0xd9, 0xce, 0x1e, 0x95, 0x0c, 0x33, 0xfd, 0x2d, 0xad, 0x63, 0xb6, 0xe1, 0xec, 0x51, - 0x73, 0xc8, 0xf2, 0x17, 0x68, 0x19, 0x06, 0x1b, 0x84, 0x35, 0x0f, 0xb8, 0xbc, 0x68, 0xe9, 0xfe, - 0xb5, 0xa6, 0xc0, 0x99, 0x12, 0xaf, 0x69, 0x30, 0x2a, 0x6e, 0x57, 0x2b, 0x03, 0x82, 0x81, 0x7d, - 0xcc, 0xf6, 0x85, 0x87, 0x11, 0x53, 0xac, 0xb5, 0x33, 0x18, 0x93, 0x18, 0x69, 0xf6, 0x76, 0x41, - 0x7b, 0x3b, 0x1d, 0xfd, 0xbf, 0x4e, 0x2f, 0x9e, 0xc2, 0x58, 0xd7, 0x78, 0x91, 0x0a, 0xa9, 0x9c, - 0xb9, 0xbd, 0xb2, 0x9a, 0x5f, 0x29, 0xee, 0x96, 0x36, 0xb7, 0x57, 0x0b, 0xa5, 0x77, 0x5b, 0xc5, - 0x9d, 0x42, 0x7e, 0x63, 0x6d, 0xa3, 0xb0, 0x9a, 0x88, 0xa0, 0x24, 0x4c, 0xf4, 0x9c, 0xe7, 0xde, - 0x6e, 0xe7, 0xdf, 0x24, 0x14, 0xf4, 0x10, 0xc6, 0x7b, 0x4e, 0x8a, 0xef, 0xb7, 0xf2, 0x89, 0x68, - 0x48, 0xc9, 0x8a, 0x38, 0x89, 0x65, 0xff, 0xc6, 0x60, 0xa8, 0xe8, 0xbf, 0x5d, 0xe8, 0x04, 0x86, - 0x5b, 0x83, 0x43, 0x5a, 0x48, 0xee, 0x9e, 0x0b, 0x91, 0x9a, 0xbd, 0x16, 0x23, 0x2f, 0xd2, 0xdc, - 0x97, 0x9f, 0x7f, 0xbe, 0x47, 0xd3, 0xda, 0x94, 0x11, 0xf2, 0x68, 0x4a, 0xf0, 0x4b, 0x65, 0x11, - 0x1d, 0xc2, 0x1d, 0x31, 0x05, 0x34, 0x1d, 0xc2, 0x1a, 0x9c, 0x61, 0x2a, 0xdd, 0x1f, 0x20, 0x35, - 0x33, 0x42, 0x73, 0x1a, 0x3d, 0x31, 0xc2, 0x5e, 0x4c, 0x66, 0x9c, 0x78, 0x73, 0x3f, 0x43, 0x9f, - 0x21, 0x1e, 0xf8, 0x82, 0x50, 0xe6, 0xba, 0x0f, 0xaf, 0x23, 0x3f, 0x77, 0x13, 0x4c, 0x9a, 0x98, - 0x11, 0x26, 0xa6, 0xb4, 0xc9, 0x70, 0x13, 0x5e, 0xe6, 0x53, 0x88, 0x07, 0xde, 0xbe, 0x50, 0x03, - 0x57, 0x9f, 0xe4, 0x50, 0x03, 0x21, 0x4f, 0xa8, 0xa6, 0x0a, 0x03, 0x49, 0xd4, 0xc7, 0x40, 0xee, - 0xf5, 0x8f, 0x0b, 0x55, 0x39, 0xbf, 0x50, 0x95, 0xdf, 0x17, 0xaa, 0xf2, 0xed, 0x52, 0x8d, 0x9c, - 0x5f, 0xaa, 0x91, 0x5f, 0x97, 0x6a, 0xe4, 0x43, 0xc6, 0xb2, 0xf9, 0x7e, 0xb3, 0xac, 0x57, 0x68, - 0xad, 0x55, 0xeb, 0xff, 0x79, 0xc6, 0xaa, 0x9f, 0x0c, 0x7e, 0x5c, 0x27, 0x1e, 0x59, 0x79, 0x50, - 0xfc, 0x70, 0x3c, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x96, 0xba, 0xfb, 0xcb, 0x0f, 0x07, 0x00, - 0x00, + // 746 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xcd, 0x4f, 0x13, 0x4d, + 0x18, 0xef, 0xb6, 0xbc, 0x7c, 0x3c, 0x85, 0xf7, 0xed, 0x3b, 0x20, 0xd6, 0xa2, 0x4b, 0x59, 0xe4, + 0x23, 0x24, 0xee, 0x86, 0xea, 0x81, 0x18, 0x3d, 0xd0, 0x52, 0x08, 0x51, 0x3e, 0xb2, 0xc5, 0x83, + 0xc6, 0xa4, 0x99, 0xb6, 0xc3, 0xb2, 0xb1, 0xdd, 0x29, 0x9d, 0x69, 0xb3, 0x04, 0x88, 0x89, 0x47, + 0x4f, 0x26, 0xfe, 0x53, 0x1e, 0x49, 0xbc, 0x78, 0x34, 0xe0, 0x1f, 0xe1, 0xd1, 0xec, 0xec, 0xb4, + 0xdd, 0x96, 0x2d, 0x10, 0x6f, 0x33, 0x9d, 0xdf, 0xf3, 0xfb, 0x78, 0x9e, 0xd9, 0x29, 0xcc, 0x96, + 0x29, 0xab, 0x51, 0x66, 0x70, 0xd7, 0x68, 0xad, 0x96, 0x08, 0xc7, 0xab, 0x06, 0x23, 0x8d, 0x96, + 0x5d, 0x26, 0x7a, 0xbd, 0x41, 0x39, 0x45, 0xff, 0xfb, 0x00, 0x9d, 0xbb, 0xba, 0x04, 0xa4, 0x1e, + 0x5a, 0x94, 0x5a, 0x55, 0x62, 0xe0, 0xba, 0x6d, 0x60, 0xc7, 0xa1, 0x1c, 0x73, 0x9b, 0x3a, 0xcc, + 0x2f, 0x48, 0xcd, 0x4b, 0xc6, 0x12, 0x66, 0xc4, 0xc0, 0xa5, 0xb2, 0xdd, 0x21, 0xf6, 0x36, 0x12, + 0x94, 0xba, 0x2e, 0xcb, 0x5d, 0x79, 0x36, 0x65, 0x51, 0x8b, 0x8a, 0xa5, 0xe1, 0xad, 0xe4, 0xaf, + 0x2b, 0x41, 0xda, 0xe3, 0x26, 0x69, 0x9c, 0x74, 0x2a, 0xeb, 0xd8, 0xb2, 0x1d, 0xe1, 0xc1, 0xc7, + 0x6a, 0x1c, 0xd0, 0x16, 0xe1, 0x07, 0x2e, 0xcb, 0xb7, 0x88, 0xc3, 0x4d, 0x72, 0xdc, 0x24, 0x8c, + 0xa3, 0x69, 0x18, 0x26, 0xde, 0x9e, 0x25, 0x95, 0x74, 0x6c, 0x79, 0xcc, 0x94, 0x3b, 0xb4, 0x09, + 0xd0, 0x65, 0x48, 0x46, 0xd3, 0xca, 0x72, 0x3c, 0xb3, 0xa8, 0xcb, 0xd8, 0x9e, 0x9c, 0x2e, 0xe4, + 0xda, 0xf1, 0xf5, 0x7d, 0x6c, 0x11, 0xc9, 0x69, 0x06, 0x2a, 0xb5, 0x0b, 0x05, 0x26, 0x7b, 0x64, + 0x59, 0x9d, 0x3a, 0x8c, 0xa0, 0x25, 0x88, 0x71, 0xd7, 0x17, 0x8d, 0x67, 0xee, 0xe9, 0xd7, 0xfa, + 0xa9, 0x1f, 0xb8, 0xa6, 0x87, 0x40, 0x5b, 0x30, 0xce, 0xdd, 0x62, 0x43, 0xd6, 0xb1, 0x64, 0x54, + 0x54, 0x3c, 0xee, 0xb1, 0x22, 0x7a, 0x18, 0x28, 0x94, 0x60, 0x33, 0xce, 0x3b, 0x6b, 0x8f, 0x28, + 0x98, 0x28, 0x26, 0x12, 0x2d, 0xdd, 0x9a, 0x48, 0x32, 0x05, 0x23, 0x11, 0x40, 0xd9, 0x06, 0xc5, + 0x95, 0x32, 0x66, 0xdc, 0x13, 0xf3, 0x1b, 0xf9, 0x00, 0x46, 0xb9, 0x5b, 0x2c, 0x9d, 0x70, 0xe2, + 0xa5, 0x52, 0x96, 0xc7, 0xcd, 0x11, 0xee, 0x66, 0xbd, 0x2d, 0x7a, 0x06, 0x43, 0x35, 0x5a, 0x21, + 0xa2, 0x8b, 0xff, 0x66, 0xd2, 0x21, 0x61, 0x3b, 0x7c, 0x3b, 0xb4, 0x42, 0x4c, 0x81, 0xd6, 0xde, + 0xc3, 0x64, 0x8f, 0x8c, 0x6c, 0x5c, 0x1e, 0xe2, 0x81, 0x7e, 0x08, 0xa9, 0xbb, 0xb6, 0x03, 0xba, + 0xed, 0xd0, 0xd6, 0xe0, 0xbf, 0x82, 0x5d, 0x6b, 0x56, 0x31, 0x6f, 0x8f, 0x0d, 0x2d, 0x40, 0x94, + 0xbb, 0x92, 0x70, 0xc0, 0x44, 0xa2, 0xdc, 0xd5, 0x3e, 0x2b, 0x90, 0xe8, 0x96, 0x4a, 0x57, 0x2f, + 0x60, 0xd4, 0xc2, 0xac, 0x68, 0x3b, 0x87, 0x54, 0x32, 0xcc, 0x0d, 0xb6, 0xb4, 0x85, 0xd9, 0xb6, + 0x73, 0x48, 0xcd, 0x11, 0xcb, 0x5f, 0xa0, 0x35, 0x18, 0x6e, 0x10, 0xd6, 0xac, 0x72, 0x79, 0xd1, + 0xd2, 0x83, 0x6b, 0x4d, 0x81, 0x33, 0x25, 0x5e, 0xd3, 0x60, 0x5c, 0xdc, 0xae, 0x76, 0x06, 0x04, + 0x43, 0x47, 0x98, 0x1d, 0x09, 0x0f, 0x63, 0xa6, 0x58, 0x6b, 0xe7, 0x30, 0x21, 0x31, 0xd2, 0xec, + 0xdd, 0x82, 0xf6, 0x77, 0x3a, 0xfa, 0x77, 0x9d, 0x5e, 0x39, 0x83, 0x89, 0x9e, 0xf1, 0x22, 0x15, + 0x52, 0x59, 0x73, 0x6f, 0x7d, 0x23, 0xb7, 0x5e, 0x38, 0x28, 0xee, 0xec, 0x6d, 0xe4, 0x8b, 0x6f, + 0x76, 0x0b, 0xfb, 0xf9, 0xdc, 0xf6, 0xe6, 0x76, 0x7e, 0x23, 0x11, 0x41, 0x49, 0x98, 0xea, 0x3b, + 0xcf, 0xbe, 0xde, 0xcb, 0xbd, 0x4a, 0x28, 0xe8, 0x3e, 0x4c, 0xf6, 0x9d, 0x14, 0xde, 0xee, 0xe6, + 0x12, 0xd1, 0x90, 0x92, 0x75, 0x71, 0x12, 0xcb, 0xfc, 0x8e, 0xc1, 0x48, 0xc1, 0x7f, 0xbb, 0xd0, + 0x29, 0x8c, 0xb6, 0x07, 0x87, 0xb4, 0x90, 0xdc, 0x7d, 0x17, 0x22, 0x35, 0x7f, 0x23, 0x46, 0x5e, + 0xa4, 0xc5, 0x4f, 0xdf, 0x7f, 0x7d, 0x8d, 0xa6, 0xb5, 0x19, 0x23, 0xe4, 0xd1, 0x94, 0xe0, 0xe7, + 0xca, 0x0a, 0x3a, 0x86, 0x7f, 0xc4, 0x14, 0xd0, 0x6c, 0x08, 0x6b, 0x70, 0x86, 0xa9, 0xf4, 0x60, + 0x80, 0xd4, 0x5c, 0x10, 0x9a, 0xb3, 0xe8, 0x91, 0x11, 0xf6, 0x62, 0x32, 0xe3, 0xd4, 0x9b, 0xfb, + 0x39, 0xfa, 0x08, 0xf1, 0xc0, 0x17, 0x84, 0x16, 0x6e, 0xfa, 0xf0, 0xba, 0xf2, 0x8b, 0xb7, 0xc1, + 0xa4, 0x89, 0x39, 0x61, 0x62, 0x46, 0x9b, 0x0e, 0x37, 0xe1, 0x65, 0x3e, 0x83, 0x78, 0xe0, 0xed, + 0x0b, 0x35, 0x70, 0xfd, 0x49, 0x0e, 0x35, 0x10, 0xf2, 0x84, 0x6a, 0xaa, 0x30, 0x90, 0x44, 0x03, + 0x0c, 0x64, 0x5f, 0x7e, 0xbb, 0x54, 0x95, 0x8b, 0x4b, 0x55, 0xf9, 0x79, 0xa9, 0x2a, 0x5f, 0xae, + 0xd4, 0xc8, 0xc5, 0x95, 0x1a, 0xf9, 0x71, 0xa5, 0x46, 0xde, 0xcd, 0x5b, 0x36, 0x3f, 0x6a, 0x96, + 0xf4, 0x32, 0xad, 0x19, 0x55, 0xdb, 0x21, 0x46, 0xb5, 0x54, 0x7b, 0xc2, 0x2a, 0x1f, 0x8c, 0x56, + 0xc6, 0xe0, 0x27, 0x75, 0xe2, 0x51, 0x95, 0x86, 0xc5, 0xdf, 0xc6, 0xd3, 0x3f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x1d, 0xea, 0x8e, 0x1b, 0x0d, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/types/tx/signing/signing.pb.go b/types/tx/signing/signing.pb.go index 73d9ccbac3..7af17b49b2 100644 --- a/types/tx/signing/signing.pb.go +++ b/types/tx/signing/signing.pb.go @@ -391,41 +391,42 @@ func init() { } var fileDescriptor_9a54958ff3d0b1b9 = []byte{ - // 544 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0xed, 0x26, 0x8d, 0xd2, 0x29, 0x42, 0x61, 0x49, 0xa5, 0xc4, 0x20, 0x13, 0x95, 0x03, - 0x11, 0x52, 0xd6, 0x6a, 0x72, 0x40, 0x70, 0xcb, 0x1f, 0x93, 0x86, 0x36, 0x09, 0xd8, 0xa9, 0x04, - 0x5c, 0x2c, 0xdb, 0xd9, 0x1a, 0xab, 0xb1, 0xd7, 0x78, 0xd7, 0xa8, 0x3e, 0xf1, 0x0a, 0xbc, 0x06, - 0xcf, 0xc1, 0x85, 0x63, 0x8f, 0x1c, 0x51, 0xf2, 0x0c, 0xdc, 0x51, 0xec, 0x38, 0x09, 0x52, 0x11, - 0x22, 0x27, 0x6b, 0x66, 0xbe, 0xfd, 0xcd, 0xb7, 0x9a, 0x59, 0xc3, 0x13, 0x9b, 0x32, 0x8f, 0x32, - 0x85, 0x5f, 0x2b, 0xcc, 0x75, 0x7c, 0xd7, 0x77, 0x94, 0x4f, 0x27, 0x16, 0xe1, 0xe6, 0x49, 0x16, - 0xe3, 0x20, 0xa4, 0x9c, 0xa2, 0x6a, 0x2a, 0xc4, 0xfc, 0x1a, 0x67, 0x85, 0x95, 0x50, 0x6a, 0xac, - 0x18, 0x76, 0x18, 0x07, 0x9c, 0x2a, 0x5e, 0x34, 0xe3, 0x2e, 0x73, 0x37, 0xa0, 0x2c, 0x91, 0x92, - 0xa4, 0xaa, 0x43, 0xa9, 0x33, 0x23, 0x4a, 0x12, 0x59, 0xd1, 0xa5, 0x62, 0xfa, 0x71, 0x5a, 0x3a, - 0xbe, 0x84, 0xb2, 0xee, 0x3a, 0xbe, 0xc9, 0xa3, 0x90, 0xf4, 0x08, 0xb3, 0x43, 0x37, 0xe0, 0x34, - 0x64, 0x68, 0x04, 0xc0, 0xb2, 0x3c, 0xab, 0x88, 0xb5, 0x5c, 0xfd, 0xb0, 0x89, 0xf1, 0x5f, 0x1d, - 0xe1, 0x5b, 0x20, 0xda, 0x16, 0xe1, 0xf8, 0x57, 0x1e, 0xee, 0xdf, 0xa2, 0x41, 0x2d, 0x80, 0x20, - 0xb2, 0x66, 0xae, 0x6d, 0x5c, 0x91, 0xb8, 0x22, 0xd6, 0xc4, 0xfa, 0x61, 0xb3, 0x8c, 0x53, 0xbf, - 0x38, 0xf3, 0x8b, 0xdb, 0x7e, 0xac, 0x1d, 0xa4, 0xba, 0x33, 0x12, 0xa3, 0x3e, 0xe4, 0xa7, 0x26, - 0x37, 0x2b, 0x7b, 0x89, 0xbc, 0xf5, 0x7f, 0xb6, 0x70, 0xcf, 0xe4, 0xa6, 0x96, 0x00, 0x90, 0x04, - 0x45, 0x46, 0x3e, 0x46, 0xc4, 0xb7, 0x49, 0x25, 0x57, 0x13, 0xeb, 0x79, 0x6d, 0x1d, 0x4b, 0xdf, - 0x72, 0x90, 0x5f, 0x4a, 0xd1, 0x04, 0x0a, 0xcc, 0xf5, 0x9d, 0x19, 0x59, 0xd9, 0x7b, 0xb1, 0x43, - 0x3f, 0xac, 0x27, 0x84, 0x53, 0x41, 0x5b, 0xb1, 0xd0, 0x1b, 0xd8, 0x4f, 0xa6, 0xb4, 0xba, 0xc4, - 0xf3, 0x5d, 0xa0, 0xc3, 0x25, 0xe0, 0x54, 0xd0, 0x52, 0x92, 0x64, 0x40, 0x21, 0x6d, 0x83, 0x9e, - 0x41, 0xde, 0xa3, 0xd3, 0xd4, 0xf0, 0xdd, 0xe6, 0xe3, 0x7f, 0xb0, 0x87, 0x74, 0x4a, 0xb4, 0xe4, - 0x00, 0x7a, 0x08, 0x07, 0xeb, 0xa1, 0x25, 0xce, 0xee, 0x68, 0x9b, 0x84, 0xf4, 0x55, 0x84, 0xfd, - 0xa4, 0x27, 0x3a, 0x83, 0xa2, 0xe5, 0x72, 0x33, 0x0c, 0xcd, 0x6c, 0x68, 0x4a, 0xd6, 0x24, 0xdd, - 0x49, 0xbc, 0x5e, 0xc1, 0xac, 0x53, 0x97, 0x7a, 0x81, 0x69, 0xf3, 0x8e, 0xcb, 0xdb, 0xcb, 0x63, - 0xda, 0x1a, 0x80, 0xf4, 0x3f, 0x76, 0x6d, 0x2f, 0xd9, 0xb5, 0x9d, 0x86, 0xba, 0x85, 0xe9, 0xec, - 0x43, 0x8e, 0x45, 0xde, 0x53, 0x06, 0xc5, 0xec, 0x8a, 0xa8, 0x0a, 0x47, 0xfa, 0xa0, 0x3f, 0x32, - 0x86, 0xe3, 0x9e, 0x6a, 0x5c, 0x8c, 0xf4, 0xd7, 0x6a, 0x77, 0xf0, 0x72, 0xa0, 0xf6, 0x4a, 0x02, - 0x2a, 0x43, 0x69, 0x53, 0xea, 0x0d, 0x34, 0xb5, 0x3b, 0x29, 0x89, 0xe8, 0x08, 0xee, 0x6d, 0xb2, - 0x13, 0xf5, 0xed, 0xe4, 0xa2, 0x7d, 0x5e, 0xda, 0x43, 0x8f, 0xe0, 0xc1, 0x26, 0x7d, 0xae, 0xf6, - 0xdb, 0xdd, 0x77, 0x46, 0x7b, 0x38, 0x18, 0x8d, 0x8d, 0x57, 0xfa, 0x78, 0x54, 0xfa, 0xdc, 0xe9, - 0x7f, 0x9f, 0xcb, 0xe2, 0xcd, 0x5c, 0x16, 0x7f, 0xce, 0x65, 0xf1, 0xcb, 0x42, 0x16, 0x6e, 0x16, - 0xb2, 0xf0, 0x63, 0x21, 0x0b, 0xef, 0x1b, 0x8e, 0xcb, 0x3f, 0x44, 0x16, 0xb6, 0xa9, 0xa7, 0x64, - 0x6f, 0x38, 0xf9, 0x34, 0xd8, 0xf4, 0x4a, 0xe1, 0x71, 0x40, 0xb6, 0x7f, 0x0c, 0x56, 0x21, 0x79, - 0x01, 0xad, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x86, 0x87, 0x55, 0xbf, 0x34, 0x04, 0x00, 0x00, + // 547 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcd, 0x6e, 0xd3, 0x40, + 0x14, 0x85, 0xed, 0xfc, 0x29, 0x9d, 0x22, 0x14, 0x86, 0x54, 0x4a, 0x0c, 0x32, 0x51, 0x59, 0x10, + 0x81, 0x3a, 0x56, 0x93, 0x05, 0x82, 0x5d, 0x7e, 0x4c, 0x1a, 0xda, 0x24, 0x60, 0xa7, 0x12, 0xb0, + 0xb1, 0x6c, 0x67, 0x6a, 0x46, 0xb5, 0x3d, 0xc6, 0x33, 0xae, 0xea, 0x15, 0xaf, 0xc0, 0x6b, 0xf0, + 0x1c, 0x6c, 0x58, 0x76, 0xc9, 0x12, 0x25, 0xcf, 0xc0, 0x1e, 0xc5, 0x8e, 0x93, 0x20, 0x15, 0x21, + 0xb2, 0xbc, 0xf7, 0x1e, 0x7f, 0xf7, 0x8c, 0xee, 0x91, 0xc1, 0x13, 0x9b, 0x32, 0x8f, 0x32, 0x85, + 0x5f, 0x2b, 0x8c, 0x38, 0x3e, 0xf1, 0x1d, 0xe5, 0xea, 0xd8, 0xc2, 0xdc, 0x3c, 0xce, 0x6a, 0x14, + 0x84, 0x94, 0x53, 0x58, 0x4f, 0x85, 0x88, 0x5f, 0xa3, 0x6c, 0xb0, 0x12, 0x4a, 0x47, 0x2b, 0x86, + 0x1d, 0xc6, 0x01, 0xa7, 0x8a, 0x17, 0xb9, 0x9c, 0x30, 0xb2, 0x01, 0x65, 0x8d, 0x94, 0x24, 0xd5, + 0x1d, 0x4a, 0x1d, 0x17, 0x2b, 0x49, 0x65, 0x45, 0x17, 0x8a, 0xe9, 0xc7, 0xe9, 0xe8, 0xf0, 0x02, + 0x54, 0x75, 0xe2, 0xf8, 0x26, 0x8f, 0x42, 0xdc, 0xc7, 0xcc, 0x0e, 0x49, 0xc0, 0x69, 0xc8, 0xe0, + 0x18, 0x00, 0x96, 0xf5, 0x59, 0x4d, 0x6c, 0xe4, 0x9b, 0xfb, 0x2d, 0x84, 0xfe, 0xea, 0x08, 0xdd, + 0x02, 0xd1, 0xb6, 0x08, 0x87, 0xbf, 0x0a, 0xe0, 0xfe, 0x2d, 0x1a, 0xd8, 0x06, 0x20, 0x88, 0x2c, + 0x97, 0xd8, 0xc6, 0x25, 0x8e, 0x6b, 0x62, 0x43, 0x6c, 0xee, 0xb7, 0xaa, 0x28, 0xf5, 0x8b, 0x32, + 0xbf, 0xa8, 0xe3, 0xc7, 0xda, 0x5e, 0xaa, 0x3b, 0xc5, 0x31, 0x1c, 0x80, 0xc2, 0xcc, 0xe4, 0x66, + 0x2d, 0x97, 0xc8, 0xdb, 0xff, 0x67, 0x0b, 0xf5, 0x4d, 0x6e, 0x6a, 0x09, 0x00, 0x4a, 0xa0, 0xcc, + 0xf0, 0xa7, 0x08, 0xfb, 0x36, 0xae, 0xe5, 0x1b, 0x62, 0xb3, 0xa0, 0xad, 0x6b, 0xe9, 0x5b, 0x1e, + 0x14, 0x96, 0x52, 0x38, 0x05, 0x25, 0x46, 0x7c, 0xc7, 0xc5, 0x2b, 0x7b, 0x2f, 0x77, 0xd8, 0x87, + 0xf4, 0x84, 0x70, 0x22, 0x68, 0x2b, 0x16, 0x7c, 0x0b, 0x8a, 0xc9, 0x95, 0x56, 0x8f, 0x78, 0xb1, + 0x0b, 0x74, 0xb4, 0x04, 0x9c, 0x08, 0x5a, 0x4a, 0x92, 0x0c, 0x50, 0x4a, 0xd7, 0xc0, 0xe7, 0xa0, + 0xe0, 0xd1, 0x59, 0x6a, 0xf8, 0x6e, 0xeb, 0xf1, 0x3f, 0xd8, 0x23, 0x3a, 0xc3, 0x5a, 0xf2, 0x01, + 0x7c, 0x08, 0xf6, 0xd6, 0x47, 0x4b, 0x9c, 0xdd, 0xd1, 0x36, 0x0d, 0xe9, 0xab, 0x08, 0x8a, 0xc9, + 0x4e, 0x78, 0x0a, 0xca, 0x16, 0xe1, 0x66, 0x18, 0x9a, 0xd9, 0xd1, 0x94, 0x6c, 0x49, 0x9a, 0x49, + 0xb4, 0x8e, 0x60, 0xb6, 0xa9, 0x47, 0xbd, 0xc0, 0xb4, 0x79, 0x97, 0xf0, 0xce, 0xf2, 0x33, 0x6d, + 0x0d, 0x80, 0xfa, 0x1f, 0x59, 0xcb, 0x25, 0x59, 0xdb, 0xe9, 0xa8, 0x5b, 0x98, 0x6e, 0x11, 0xe4, + 0x59, 0xe4, 0x3d, 0x65, 0xa0, 0x9c, 0x3d, 0x11, 0xd6, 0xc1, 0x81, 0x3e, 0x1c, 0x8c, 0x8d, 0xd1, + 0xa4, 0xaf, 0x1a, 0xe7, 0x63, 0xfd, 0x8d, 0xda, 0x1b, 0xbe, 0x1a, 0xaa, 0xfd, 0x8a, 0x00, 0xab, + 0xa0, 0xb2, 0x19, 0xf5, 0x87, 0x9a, 0xda, 0x9b, 0x56, 0x44, 0x78, 0x00, 0xee, 0x6d, 0xba, 0x53, + 0xf5, 0xdd, 0xf4, 0xbc, 0x73, 0x56, 0xc9, 0xc1, 0x47, 0xe0, 0xc1, 0xa6, 0x7d, 0xa6, 0x0e, 0x3a, + 0xbd, 0xf7, 0x46, 0x67, 0x34, 0x1c, 0x4f, 0x8c, 0xd7, 0xfa, 0x64, 0x5c, 0xf9, 0xdc, 0x55, 0xbf, + 0xcf, 0x65, 0xf1, 0x66, 0x2e, 0x8b, 0x3f, 0xe7, 0xb2, 0xf8, 0x65, 0x21, 0x0b, 0x37, 0x0b, 0x59, + 0xf8, 0xb1, 0x90, 0x85, 0x0f, 0xcf, 0x1c, 0xc2, 0x3f, 0x46, 0x16, 0xb2, 0xa9, 0xa7, 0xb8, 0xc4, + 0xc7, 0x8a, 0x6b, 0x79, 0x47, 0x6c, 0x76, 0xa9, 0x5c, 0xb5, 0x14, 0x1e, 0x07, 0x78, 0xfb, 0xb7, + 0x60, 0x95, 0x92, 0xfc, 0xb7, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0xba, 0x13, 0xe2, 0xb0, 0x32, + 0x04, 0x00, 0x00, } func (m *SignatureDescriptors) Marshal() (dAtA []byte, err error) { diff --git a/types/tx/tx.pb.go b/types/tx/tx.pb.go index 723fc560cb..dc3ed65c6d 100644 --- a/types/tx/tx.pb.go +++ b/types/tx/tx.pb.go @@ -9,7 +9,7 @@ import ( proto "github.com/gogo/protobuf/proto" types "github.com/line/lbm-sdk/v2/codec/types" types1 "github.com/line/lbm-sdk/v2/crypto/types" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types2 "github.com/line/lbm-sdk/v2/types" signing "github.com/line/lbm-sdk/v2/types/tx/signing" io "io" @@ -667,7 +667,7 @@ func (m *ModeInfo_Multi) GetModeInfos() []*ModeInfo { // which must be above some miminum to be accepted into the mempool. type Fee struct { // amount is the amount of coins to be paid as a fee - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` + Amount github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,1,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` // gas_limit is the maximum gas that can be used in transaction processing // before an out of gas error occurs GasLimit uint64 `protobuf:"varint,2,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"` @@ -714,7 +714,7 @@ func (m *Fee) XXX_DiscardUnknown() { var xxx_messageInfo_Fee proto.InternalMessageInfo -func (m *Fee) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins { +func (m *Fee) GetAmount() github_com_line_lbm_sdk_v2_types.Coins { if m != nil { return m.Amount } @@ -758,60 +758,60 @@ func init() { func init() { proto.RegisterFile("cosmos/tx/v1beta1/tx.proto", fileDescriptor_96d1575ffde80842) } var fileDescriptor_96d1575ffde80842 = []byte{ - // 843 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdd, 0x6e, 0xdc, 0x44, - 0x14, 0x5e, 0xef, 0x5f, 0xd6, 0x27, 0x49, 0x4b, 0x47, 0x11, 0xda, 0x6c, 0x54, 0x37, 0x18, 0x15, - 0xf6, 0x26, 0x76, 0x9b, 0x5e, 0xf0, 0x23, 0x24, 0xc8, 0x16, 0xaa, 0x54, 0xa5, 0x20, 0x4d, 0x72, - 0xd5, 0x1b, 0x6b, 0xec, 0x9d, 0x78, 0x47, 0x5d, 0xcf, 0x2c, 0x9e, 0x71, 0xb1, 0x1f, 0x02, 0xa9, - 0x42, 0x42, 0xbc, 0x03, 0x2f, 0xc0, 0x2b, 0xf4, 0xb2, 0x97, 0x5c, 0x41, 0x95, 0x3c, 0x08, 0x68, - 0xc6, 0x63, 0x27, 0x82, 0x55, 0x72, 0xc3, 0x95, 0xe7, 0x9c, 0xf9, 0xce, 0x37, 0x9f, 0xcf, 0x1f, - 0x4c, 0x12, 0x21, 0x33, 0x21, 0x43, 0x55, 0x86, 0xaf, 0x1e, 0xc6, 0x54, 0x91, 0x87, 0xa1, 0x2a, - 0x83, 0x55, 0x2e, 0x94, 0x40, 0x77, 0xea, 0xbb, 0x40, 0x95, 0x81, 0xbd, 0x9b, 0xec, 0xa4, 0x22, - 0x15, 0xe6, 0x36, 0xd4, 0xa7, 0x1a, 0x38, 0x39, 0xb0, 0x24, 0x49, 0x5e, 0xad, 0x94, 0x08, 0xb3, - 0x62, 0xa9, 0x98, 0x64, 0x69, 0xcb, 0xd8, 0x38, 0x2c, 0xdc, 0xb3, 0xf0, 0x98, 0x48, 0xda, 0x62, - 0x12, 0xc1, 0xb8, 0xbd, 0xff, 0xf8, 0x52, 0x93, 0x64, 0x29, 0x67, 0xfc, 0x92, 0xc9, 0xda, 0x16, - 0xb8, 0x9b, 0x0a, 0x91, 0x2e, 0x69, 0x68, 0xac, 0xb8, 0x38, 0x0b, 0x09, 0xaf, 0xea, 0x2b, 0xff, - 0x27, 0x07, 0xba, 0xa7, 0x25, 0x3a, 0x80, 0x7e, 0x2c, 0xe6, 0xd5, 0xd8, 0xd9, 0x77, 0xa6, 0x9b, - 0x87, 0xbb, 0xc1, 0x7f, 0xfe, 0x28, 0x38, 0x2d, 0x67, 0x62, 0x5e, 0x61, 0x03, 0x43, 0x9f, 0x82, - 0x4b, 0x0a, 0xb5, 0x88, 0x18, 0x3f, 0x13, 0xe3, 0xae, 0x89, 0xd9, 0x5b, 0x13, 0x73, 0x54, 0xa8, - 0xc5, 0x53, 0x7e, 0x26, 0xf0, 0x88, 0xd8, 0x13, 0xf2, 0x00, 0xb4, 0x36, 0xa2, 0x8a, 0x9c, 0xca, - 0x71, 0x6f, 0xbf, 0x37, 0xdd, 0xc2, 0x57, 0x3c, 0x3e, 0x87, 0xc1, 0x69, 0x89, 0xc9, 0x8f, 0xe8, - 0x2e, 0x80, 0x7e, 0x2a, 0x8a, 0x2b, 0x45, 0xa5, 0xd1, 0xb5, 0x85, 0x5d, 0xed, 0x99, 0x69, 0x07, - 0xfa, 0x08, 0x6e, 0xb7, 0x0a, 0x2c, 0xa6, 0x6b, 0x30, 0xdb, 0xcd, 0x53, 0x35, 0xee, 0xa6, 0xf7, - 0x7e, 0x76, 0x60, 0xe3, 0x84, 0xa5, 0xfc, 0x6b, 0x91, 0xfc, 0x5f, 0x4f, 0xee, 0xc2, 0x28, 0x59, - 0x10, 0xc6, 0x23, 0x36, 0x1f, 0xf7, 0xf6, 0x9d, 0xa9, 0x8b, 0x37, 0x8c, 0xfd, 0x74, 0x8e, 0xee, - 0xc3, 0x2d, 0x92, 0x24, 0xa2, 0xe0, 0x2a, 0xe2, 0x45, 0x16, 0xd3, 0x7c, 0xdc, 0xdf, 0x77, 0xa6, - 0x7d, 0xbc, 0x6d, 0xbd, 0xdf, 0x19, 0xa7, 0xff, 0x4b, 0x17, 0x86, 0x75, 0xbe, 0xd1, 0x03, 0x18, - 0x65, 0x54, 0x4a, 0x92, 0x1a, 0x45, 0xbd, 0xe9, 0xe6, 0xe1, 0x4e, 0x50, 0x57, 0x33, 0x68, 0xaa, - 0x19, 0x1c, 0xf1, 0x0a, 0xb7, 0x28, 0x84, 0xa0, 0x9f, 0xd1, 0xac, 0x2e, 0x8b, 0x8b, 0xcd, 0x59, - 0xbf, 0xab, 0x58, 0x46, 0x45, 0xa1, 0xa2, 0x05, 0x65, 0xe9, 0x42, 0x19, 0x61, 0x7d, 0xbc, 0x6d, - 0xbd, 0xc7, 0xc6, 0x89, 0x66, 0x70, 0x87, 0x96, 0x8a, 0x72, 0xc9, 0x04, 0x8f, 0xc4, 0x4a, 0x31, - 0xc1, 0xe5, 0xf8, 0xef, 0x8d, 0x6b, 0x9e, 0x7d, 0xaf, 0xc5, 0x7f, 0x5f, 0xc3, 0xd1, 0x0b, 0xf0, - 0xb8, 0xe0, 0x51, 0x92, 0x33, 0xc5, 0x12, 0xb2, 0x8c, 0xd6, 0x10, 0xde, 0xbe, 0x86, 0x70, 0x8f, - 0x0b, 0xfe, 0xd8, 0xc6, 0x7e, 0xf3, 0x2f, 0x6e, 0xff, 0x15, 0x8c, 0x9a, 0x96, 0x42, 0x5f, 0xc1, - 0x96, 0x2e, 0x23, 0xcd, 0x4d, 0x3d, 0x9a, 0xe4, 0xdc, 0x5d, 0xd3, 0x85, 0x27, 0x06, 0x66, 0xfa, - 0x70, 0x53, 0xb6, 0x67, 0x89, 0xa6, 0xd0, 0x3b, 0xa3, 0xd4, 0xb6, 0xef, 0xfb, 0x6b, 0x02, 0x9f, - 0x50, 0x8a, 0x35, 0xc4, 0xff, 0xd5, 0x01, 0xb8, 0x64, 0x41, 0x8f, 0x00, 0x56, 0x45, 0xbc, 0x64, - 0x49, 0xf4, 0x92, 0x36, 0x23, 0xb3, 0xfe, 0x6f, 0xdc, 0x1a, 0xf7, 0x8c, 0x9a, 0x91, 0xc9, 0xc4, - 0x9c, 0xde, 0x34, 0x32, 0xcf, 0xc5, 0x9c, 0xd6, 0x23, 0x93, 0xd9, 0x13, 0x9a, 0xc0, 0x48, 0xd2, - 0x1f, 0x0a, 0xca, 0x13, 0x6a, 0xcb, 0xd6, 0xda, 0xfe, 0xbb, 0x2e, 0x8c, 0x9a, 0x10, 0xf4, 0x05, - 0x0c, 0x25, 0xe3, 0xe9, 0x92, 0x5a, 0x4d, 0xfe, 0x35, 0xfc, 0xc1, 0x89, 0x41, 0x1e, 0x77, 0xb0, - 0x8d, 0x41, 0x9f, 0xc1, 0xc0, 0xec, 0x1f, 0x2b, 0xee, 0x83, 0xeb, 0x82, 0x9f, 0x6b, 0xe0, 0x71, - 0x07, 0xd7, 0x11, 0x93, 0x23, 0x18, 0xd6, 0x74, 0xe8, 0x13, 0xe8, 0x6b, 0xdd, 0x46, 0xc0, 0xad, - 0xc3, 0x0f, 0xaf, 0x70, 0x34, 0x1b, 0xe9, 0x6a, 0x55, 0x34, 0x1f, 0x36, 0x01, 0x93, 0xd7, 0x0e, - 0x0c, 0x0c, 0x2b, 0x7a, 0x06, 0xa3, 0x98, 0x29, 0x92, 0xe7, 0xa4, 0xc9, 0x6d, 0xd8, 0xd0, 0xd4, - 0x7b, 0x33, 0x68, 0xd7, 0x64, 0xc3, 0xf5, 0x58, 0x64, 0x2b, 0x92, 0xa8, 0x19, 0x53, 0x47, 0x3a, - 0x0c, 0xb7, 0x04, 0xe8, 0x73, 0x80, 0x36, 0xeb, 0x7a, 0x5c, 0x7b, 0x37, 0xa5, 0xdd, 0x6d, 0xd2, - 0x2e, 0x67, 0x03, 0xe8, 0xc9, 0x22, 0xf3, 0x7f, 0x77, 0xa0, 0xf7, 0x84, 0x52, 0x94, 0xc0, 0x90, - 0x64, 0x7a, 0x48, 0x6d, 0xab, 0xb5, 0x4b, 0x52, 0xaf, 0xe7, 0x2b, 0x52, 0x18, 0x9f, 0x3d, 0x78, - 0xf3, 0xe7, 0xbd, 0xce, 0x6f, 0x7f, 0xdd, 0x9b, 0xa6, 0x4c, 0x2d, 0x8a, 0x38, 0x48, 0x44, 0x16, - 0x36, 0xab, 0xdf, 0x7c, 0x0e, 0xe4, 0xfc, 0x65, 0xa8, 0xaa, 0x15, 0x95, 0x26, 0x40, 0x62, 0x4b, - 0x8d, 0xf6, 0xc0, 0x4d, 0x89, 0x8c, 0x96, 0x2c, 0x63, 0xca, 0x14, 0xa2, 0x8f, 0x47, 0x29, 0x91, - 0xdf, 0x6a, 0x1b, 0xed, 0xc0, 0x60, 0x45, 0x2a, 0x9a, 0xdb, 0xad, 0x52, 0x1b, 0x68, 0x0c, 0x1b, - 0x69, 0x4e, 0xb8, 0xb2, 0xcb, 0xc4, 0xc5, 0x8d, 0x39, 0xfb, 0xf2, 0xcd, 0xb9, 0xe7, 0xbc, 0x3d, - 0xf7, 0x9c, 0x77, 0xe7, 0x9e, 0xf3, 0xfa, 0xc2, 0xeb, 0xbc, 0xbd, 0xf0, 0x3a, 0x7f, 0x5c, 0x78, - 0x9d, 0x17, 0xf7, 0x6f, 0x16, 0x16, 0xaa, 0x32, 0x1e, 0x9a, 0x66, 0x7e, 0xf4, 0x4f, 0x00, 0x00, - 0x00, 0xff, 0xff, 0xd4, 0xb7, 0x75, 0x7d, 0xfd, 0x06, 0x00, 0x00, + // 846 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x6f, 0xdc, 0x44, + 0x18, 0x5e, 0xef, 0x57, 0x76, 0xdf, 0x24, 0x2d, 0x1d, 0x45, 0x68, 0xb3, 0x51, 0xdd, 0xb0, 0x15, + 0x65, 0x2f, 0xb1, 0x69, 0x7a, 0xe0, 0x43, 0x20, 0x91, 0x2d, 0x54, 0xa9, 0x4a, 0x41, 0x9a, 0xe4, + 0xd4, 0x8b, 0x35, 0xf6, 0x4e, 0xbc, 0xa3, 0xda, 0x33, 0x8b, 0x67, 0x1c, 0xec, 0x1f, 0x81, 0x54, + 0x21, 0x21, 0xfe, 0x03, 0x77, 0xfe, 0x43, 0x8f, 0x3d, 0x72, 0x82, 0x28, 0xf9, 0x21, 0xa0, 0x19, + 0x8f, 0x9d, 0x08, 0x56, 0xd9, 0x0b, 0xb7, 0x79, 0xdf, 0x79, 0xde, 0x67, 0x9e, 0x79, 0xbf, 0x60, + 0x1c, 0x09, 0x99, 0x0a, 0xe9, 0xab, 0xc2, 0x3f, 0x7f, 0x1c, 0x52, 0x45, 0x1e, 0xfb, 0xaa, 0xf0, + 0x96, 0x99, 0x50, 0x02, 0xdd, 0xab, 0xee, 0x3c, 0x55, 0x78, 0xf6, 0x6e, 0xbc, 0x13, 0x8b, 0x58, + 0x98, 0x5b, 0x5f, 0x9f, 0x2a, 0xe0, 0xf8, 0xc0, 0x92, 0x44, 0x59, 0xb9, 0x54, 0xc2, 0x4f, 0xf3, + 0x44, 0x31, 0xc9, 0xe2, 0x86, 0xb1, 0x76, 0x58, 0xb8, 0x6b, 0xe1, 0x21, 0x91, 0xb4, 0xc1, 0x44, + 0x82, 0x71, 0x7b, 0xff, 0xd1, 0xb5, 0x26, 0xc9, 0x62, 0xce, 0xf8, 0x35, 0x93, 0xb5, 0x2d, 0x70, + 0x37, 0x16, 0x22, 0x4e, 0xa8, 0x6f, 0xac, 0x30, 0x3f, 0xf3, 0x09, 0x2f, 0xab, 0xab, 0xc9, 0x4f, + 0x0e, 0xb4, 0x4f, 0x0b, 0x74, 0x00, 0xdd, 0x50, 0xcc, 0xcb, 0x91, 0xb3, 0xef, 0x4c, 0x37, 0x0f, + 0x77, 0xbd, 0xff, 0xfc, 0xc8, 0x3b, 0x2d, 0x66, 0x62, 0x5e, 0x62, 0x03, 0x43, 0x9f, 0xc2, 0x90, + 0xe4, 0x6a, 0x11, 0x30, 0x7e, 0x26, 0x46, 0x6d, 0x13, 0xb3, 0xb7, 0x22, 0xe6, 0x28, 0x57, 0x8b, + 0xe7, 0xfc, 0x4c, 0xe0, 0x01, 0xb1, 0x27, 0xe4, 0x02, 0x68, 0x6d, 0x44, 0xe5, 0x19, 0x95, 0xa3, + 0xce, 0x7e, 0x67, 0xba, 0x85, 0x6f, 0x78, 0x26, 0x1c, 0x7a, 0xa7, 0x05, 0x26, 0x3f, 0xa2, 0xfb, + 0x00, 0xfa, 0xa9, 0x20, 0x2c, 0x15, 0x95, 0x46, 0xd7, 0x16, 0x1e, 0x6a, 0xcf, 0x4c, 0x3b, 0xd0, + 0x23, 0xb8, 0xdb, 0x28, 0xb0, 0x98, 0xb6, 0xc1, 0x6c, 0xd7, 0x4f, 0x55, 0xb8, 0x75, 0xef, 0xfd, + 0xec, 0xc0, 0xc6, 0x09, 0x8b, 0xf9, 0xd7, 0x22, 0xfa, 0xbf, 0x9e, 0xdc, 0x85, 0x41, 0xb4, 0x20, + 0x8c, 0x07, 0x6c, 0x3e, 0xea, 0xec, 0x3b, 0xd3, 0x21, 0xde, 0x30, 0xf6, 0xf3, 0x39, 0xfa, 0x10, + 0xee, 0x90, 0x28, 0x12, 0x39, 0x57, 0x01, 0xcf, 0xd3, 0x90, 0x66, 0xa3, 0xee, 0xbe, 0x33, 0xed, + 0xe2, 0x6d, 0xeb, 0xfd, 0xce, 0x38, 0x27, 0xbf, 0xb4, 0xa1, 0x5f, 0xe5, 0x1b, 0x7d, 0x0c, 0x83, + 0x94, 0x4a, 0x49, 0x62, 0xa3, 0xa8, 0x33, 0xdd, 0x3c, 0xdc, 0xf1, 0xaa, 0x6a, 0x7a, 0x75, 0x35, + 0xbd, 0x23, 0x5e, 0xe2, 0x06, 0x85, 0x10, 0x74, 0x53, 0x9a, 0x56, 0x65, 0x19, 0x62, 0x73, 0xd6, + 0xef, 0x2a, 0x96, 0x52, 0x91, 0xab, 0x60, 0x41, 0x59, 0xbc, 0x50, 0x46, 0x58, 0x17, 0x6f, 0x5b, + 0xef, 0xb1, 0x71, 0xa2, 0x19, 0xdc, 0xa3, 0x85, 0xa2, 0x5c, 0x32, 0xc1, 0x03, 0xb1, 0x54, 0x4c, + 0x70, 0x39, 0xfa, 0x7b, 0xe3, 0x96, 0x67, 0xdf, 0x6b, 0xf0, 0xdf, 0x57, 0x70, 0xf4, 0x0a, 0x5c, + 0x2e, 0x78, 0x10, 0x65, 0x4c, 0xb1, 0x88, 0x24, 0xc1, 0x0a, 0xc2, 0xbb, 0xb7, 0x10, 0xee, 0x71, + 0xc1, 0x9f, 0xda, 0xd8, 0x6f, 0xfe, 0xc5, 0x3d, 0x39, 0x87, 0x41, 0xdd, 0x52, 0xe8, 0x2b, 0xd8, + 0xd2, 0x65, 0xa4, 0x99, 0xa9, 0x47, 0x9d, 0x9c, 0xfb, 0x2b, 0xba, 0xf0, 0xc4, 0xc0, 0x4c, 0x1f, + 0x6e, 0xca, 0xe6, 0x2c, 0xd1, 0x14, 0x3a, 0x67, 0x94, 0xda, 0xf6, 0x7d, 0x7f, 0x45, 0xe0, 0x33, + 0x4a, 0xb1, 0x86, 0x4c, 0x7e, 0x75, 0x00, 0xae, 0x59, 0xd0, 0x13, 0x80, 0x65, 0x1e, 0x26, 0x2c, + 0x0a, 0x5e, 0xd3, 0x7a, 0x64, 0x56, 0xff, 0x66, 0x58, 0xe1, 0x5e, 0x50, 0x33, 0x32, 0xa9, 0x98, + 0xd3, 0x75, 0x23, 0xf3, 0x52, 0xcc, 0x69, 0x35, 0x32, 0xa9, 0x3d, 0xa1, 0x31, 0x0c, 0x24, 0xfd, + 0x21, 0xa7, 0x3c, 0xa2, 0xb6, 0x6c, 0x8d, 0x3d, 0xb9, 0x68, 0xc3, 0xa0, 0x0e, 0x41, 0x5f, 0x40, + 0x5f, 0x32, 0x1e, 0x27, 0xd4, 0x6a, 0x9a, 0xdc, 0xc2, 0xef, 0x9d, 0x18, 0xe4, 0x71, 0x0b, 0xdb, + 0x18, 0xf4, 0x19, 0xf4, 0xcc, 0xfe, 0xb1, 0xe2, 0x3e, 0xb8, 0x2d, 0xf8, 0xa5, 0x06, 0x1e, 0xb7, + 0x70, 0x15, 0x31, 0x3e, 0x82, 0x7e, 0x45, 0x87, 0x3e, 0x81, 0xae, 0xd6, 0x6d, 0x04, 0xdc, 0x39, + 0x7c, 0x78, 0x83, 0xa3, 0xde, 0x48, 0x37, 0xab, 0xa2, 0xf9, 0xb0, 0x09, 0x18, 0xbf, 0x71, 0xa0, + 0x67, 0x58, 0xd1, 0x0b, 0x18, 0x84, 0x4c, 0x91, 0x2c, 0x23, 0x75, 0x6e, 0xfd, 0x9a, 0xa6, 0xda, + 0x9b, 0x5e, 0xb3, 0x26, 0x6b, 0xae, 0xa7, 0x22, 0x5d, 0x92, 0x48, 0xcd, 0x98, 0x3a, 0xd2, 0x61, + 0xb8, 0x21, 0x40, 0x9f, 0x03, 0x34, 0x59, 0xd7, 0xe3, 0xda, 0x59, 0x97, 0xf6, 0x61, 0x9d, 0x76, + 0x39, 0xeb, 0x41, 0x47, 0xe6, 0xe9, 0xe4, 0x77, 0x07, 0x3a, 0xcf, 0x28, 0x45, 0x04, 0xfa, 0x24, + 0xd5, 0x43, 0x6a, 0x5b, 0xad, 0x59, 0x92, 0x7a, 0x3d, 0xdf, 0x90, 0xc2, 0xf8, 0xcc, 0x7b, 0xfb, + 0xe7, 0x83, 0xd6, 0x6f, 0x7f, 0x3d, 0x78, 0x14, 0x33, 0xb5, 0xc8, 0x43, 0x2f, 0x12, 0xa9, 0x9f, + 0x30, 0x4e, 0xfd, 0x24, 0x4c, 0x0f, 0xe4, 0xfc, 0xb5, 0x7f, 0x7e, 0xe8, 0xab, 0x72, 0x49, 0xa5, + 0x81, 0x4b, 0x6c, 0x89, 0xd1, 0x1e, 0x0c, 0x63, 0x22, 0x83, 0x84, 0xa5, 0x4c, 0x99, 0x32, 0x74, + 0xf1, 0x20, 0x26, 0xf2, 0x5b, 0x6d, 0xa3, 0x1d, 0xe8, 0x2d, 0x49, 0x49, 0x33, 0xbb, 0x53, 0x2a, + 0x03, 0x8d, 0x60, 0x23, 0xce, 0x08, 0x57, 0x76, 0x95, 0x0c, 0x71, 0x6d, 0xce, 0xbe, 0x7c, 0x7b, + 0xe9, 0x3a, 0xef, 0x2e, 0x5d, 0xe7, 0xe2, 0xd2, 0x75, 0xde, 0x5c, 0xb9, 0xad, 0x77, 0x57, 0x6e, + 0xeb, 0x8f, 0x2b, 0xb7, 0xf5, 0xea, 0xe1, 0x3a, 0x59, 0xbe, 0x2a, 0xc2, 0xbe, 0x69, 0xe4, 0x27, + 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x02, 0xad, 0xee, 0x7f, 0xf9, 0x06, 0x00, 0x00, } func (m *Tx) Marshal() (dAtA []byte, err error) { diff --git a/types/utils.go b/types/utils.go index cca98edf0a..8fcae9ff74 100644 --- a/types/utils.go +++ b/types/utils.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" ) var ( diff --git a/version/command.go b/version/command.go index bb632aea5b..c6c1171fbd 100644 --- a/version/command.go +++ b/version/command.go @@ -4,8 +4,8 @@ import ( "encoding/json" "strings" + "github.com/line/ostracon/libs/cli" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/cli" yaml "gopkg.in/yaml.v2" ) diff --git a/version/version_test.go b/version/version_test.go index 1e6baa78f8..25fc859e17 100644 --- a/version/version_test.go +++ b/version/version_test.go @@ -6,9 +6,9 @@ import ( "runtime" "testing" + "github.com/line/ostracon/libs/cli" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/testutil" "github.com/line/lbm-sdk/v2/version" diff --git a/x/auth/ante/testutil_test.go b/x/auth/ante/testutil_test.go index e1b96ffdb5..d1d2b242e2 100644 --- a/x/auth/ante/testutil_test.go +++ b/x/auth/ante/testutil_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/tx" @@ -41,7 +41,7 @@ type AnteTestSuite struct { // returns context and app with params set on account keeper func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { app := simapp.Setup(isCheckTx) - ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + ctx := app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) return app, ctx diff --git a/x/auth/client/cli/cli_test.go b/x/auth/client/cli/cli_test.go index 95e8307215..35e9273fe3 100644 --- a/x/auth/client/cli/cli_test.go +++ b/x/auth/client/cli/cli_test.go @@ -9,9 +9,9 @@ import ( "strings" "testing" + ostcli "github.com/line/ostracon/libs/cli" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -270,25 +270,25 @@ func (s *IntegrationTestSuite) TestCLIQueryTxCmd() { }{ { "with invalid hash", - []string{"somethinginvalid", fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{"somethinginvalid", fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, true, "", }, { "with valid and not existing hash", - []string{"C7E7D3A86A17AB3A321172239F3B61357937AF0F25D9FA4D2F4DCCAD9B0D7747", fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{"C7E7D3A86A17AB3A321172239F3B61357937AF0F25D9FA4D2F4DCCAD9B0D7747", fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, true, "", }, { "happy case (legacy Msg)", - []string{legacyMsgTxRes.TxHash, fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{legacyMsgTxRes.TxHash, fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, false, "", }, { "happy case (service Msg)", - []string{txRes.TxHash, fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{txRes.TxHash, fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, false, "/cosmos.bank.v1beta1.Msg/Send", }, @@ -985,12 +985,12 @@ func (s *IntegrationTestSuite) TestQueryParamsCmd() { }{ { "happy case", - []string{fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, false, }, { "with specific height", - []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, false, }, } diff --git a/x/auth/client/cli/query.go b/x/auth/client/cli/query.go index 3c694c37c5..b18cb0d66e 100644 --- a/x/auth/client/cli/query.go +++ b/x/auth/client/cli/query.go @@ -5,8 +5,8 @@ import ( "fmt" "strings" + osttypes "github.com/line/ostracon/types" "github.com/spf13/cobra" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -145,7 +145,7 @@ $ %s query txs --%s 'message.sender=cosmos1...&message.action=withdraw_delegator } tokens := strings.Split(event, "=") - if tokens[0] == tmtypes.TxHeightKey { + if tokens[0] == osttypes.TxHeightKey { event = fmt.Sprintf("%s=%s", tokens[0], tokens[1]) } else { event = fmt.Sprintf("%s='%s'", tokens[0], tokens[1]) diff --git a/x/auth/client/query.go b/x/auth/client/query.go index 34e984057a..939829698c 100644 --- a/x/auth/client/query.go +++ b/x/auth/client/query.go @@ -8,7 +8,7 @@ import ( "strings" "time" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/line/ostracon/rpc/core/types" "github.com/line/lbm-sdk/v2/client" codectypes "github.com/line/lbm-sdk/v2/codec/types" diff --git a/x/auth/client/testutil/helpers.go b/x/auth/client/testutil/helpers.go index 3b4bb7df92..d35561d0cb 100644 --- a/x/auth/client/testutil/helpers.go +++ b/x/auth/client/testutil/helpers.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - tmcli "github.com/tendermint/tendermint/libs/cli" + ostcli "github.com/line/ostracon/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -24,7 +24,7 @@ func TxSignExec(clientCtx client.Context, from fmt.Stringer, filename string, ex } cmd := cli.GetSignCommand() - tmcli.PrepareBaseCmd(cmd, "", "") + ostcli.PrepareBaseCmd(cmd, "", "") return clitestutil.ExecTestCLICmd(clientCtx, cmd, append(args, extraArgs...)) } @@ -87,7 +87,7 @@ func TxDecodeExec(clientCtx client.Context, encodedTx string, extraArgs ...strin } func QueryAccountExec(clientCtx client.Context, address fmt.Stringer, extraArgs ...string) (testutil.BufferWriter, error) { - args := []string{address.String(), fmt.Sprintf("--%s=json", tmcli.OutputFlag)} + args := []string{address.String(), fmt.Sprintf("--%s=json", ostcli.OutputFlag)} return clitestutil.ExecTestCLICmd(clientCtx, cli.GetAccountCmd(), append(args, extraArgs...)) } diff --git a/x/auth/keeper/integration_test.go b/x/auth/keeper/integration_test.go index 266a4b3da0..2de6fcf9a9 100644 --- a/x/auth/keeper/integration_test.go +++ b/x/auth/keeper/integration_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -11,7 +11,7 @@ import ( // returns context and app with params set on account keeper func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { app := simapp.Setup(isCheckTx) - ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + ctx := app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) return app, ctx diff --git a/x/auth/keeper/keeper.go b/x/auth/keeper/keeper.go index 83593be820..08c2c359ca 100644 --- a/x/auth/keeper/keeper.go +++ b/x/auth/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" gogotypes "github.com/gogo/protobuf/types" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" diff --git a/x/auth/keeper/querier.go b/x/auth/keeper/querier.go index 282395862b..68ab64aa32 100644 --- a/x/auth/keeper/querier.go +++ b/x/auth/keeper/querier.go @@ -1,7 +1,7 @@ package keeper import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/auth/keeper/querier_test.go b/x/auth/keeper/querier_test.go index e5ed184bca..5903486729 100644 --- a/x/auth/keeper/querier_test.go +++ b/x/auth/keeper/querier_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/testutil/testdata" keep "github.com/line/lbm-sdk/v2/x/auth/keeper" diff --git a/x/auth/legacy/legacytx/stdtx_test.go b/x/auth/legacy/legacytx/stdtx_test.go index 810466e07f..55e08cbcdd 100644 --- a/x/auth/legacy/legacytx/stdtx_test.go +++ b/x/auth/legacy/legacytx/stdtx_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" yaml "gopkg.in/yaml.v2" "github.com/line/lbm-sdk/v2/codec" @@ -103,7 +103,7 @@ func TestStdSignBytes(t *testing.T) { } func TestTxValidateBasic(t *testing.T) { - ctx := sdk.NewContext(nil, tmproto.Header{ChainID: "mychainid"}, false, log.NewNopLogger()) + ctx := sdk.NewContext(nil, ostproto.Header{ChainID: "mychainid"}, false, log.NewNopLogger()) // keys and addresses priv1, _, addr1 := testdata.KeyTestPubAddr() diff --git a/x/auth/legacy/v038/types.go b/x/auth/legacy/v038/types.go index d4092af6b8..d77938df14 100644 --- a/x/auth/legacy/v038/types.go +++ b/x/auth/legacy/v038/types.go @@ -11,7 +11,7 @@ import ( "sort" "strings" - tmcrypto "github.com/tendermint/tendermint/crypto" + ostcrypto "github.com/line/ostracon/crypto" "github.com/line/lbm-sdk/v2/codec" cryptocodec "github.com/line/lbm-sdk/v2/crypto/codec" @@ -419,7 +419,7 @@ func (dva *DelayedVestingAccount) UnmarshalJSON(bz []byte) error { } func NewModuleAddress(name string) sdk.AccAddress { - return sdk.AccAddress(tmcrypto.AddressHash([]byte(name))) + return sdk.AccAddress(ostcrypto.AddressHash([]byte(name))) } func NewModuleAccount(baseAccount *BaseAccount, name string, permissions ...string) *ModuleAccount { @@ -439,7 +439,7 @@ func (ma ModuleAccount) Validate() error { return errors.New("module account name cannot be blank") } - if !ma.Address.Equals(sdk.AccAddress(tmcrypto.AddressHash([]byte(ma.Name)))) { + if !ma.Address.Equals(sdk.AccAddress(ostcrypto.AddressHash([]byte(ma.Name)))) { return fmt.Errorf("address %s cannot be derived from the module name '%s'", ma.Address, ma.Name) } diff --git a/x/auth/legacy/v039/types.go b/x/auth/legacy/v039/types.go index 68d5d59ddd..6455b7edfb 100644 --- a/x/auth/legacy/v039/types.go +++ b/x/auth/legacy/v039/types.go @@ -9,7 +9,7 @@ import ( "fmt" "strings" - tmcrypto "github.com/tendermint/tendermint/crypto" + ostcrypto "github.com/line/ostracon/crypto" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/codec/legacy" @@ -382,7 +382,7 @@ func (ma ModuleAccount) Validate() error { return errors.New("module account name cannot be blank") } - if x := sdk.AccAddress(tmcrypto.AddressHash([]byte(ma.Name))); !ma.Address.Equals(x) { + if x := sdk.AccAddress(ostcrypto.AddressHash([]byte(ma.Name))); !ma.Address.Equals(x) { return fmt.Errorf("address %s cannot be derived from the module name '%s'; expected: %s", ma.Address, ma.Name, x) } diff --git a/x/auth/module.go b/x/auth/module.go index 9703a5ba02..9b035ae029 100644 --- a/x/auth/module.go +++ b/x/auth/module.go @@ -9,8 +9,8 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/gorilla/mux" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/auth/module_test.go b/x/auth/module_test.go index 14168e07f1..212800e34b 100644 --- a/x/auth/module_test.go +++ b/x/auth/module_test.go @@ -3,9 +3,9 @@ package auth_test import ( "testing" + abcitypes "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abcitypes "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" "github.com/line/lbm-sdk/v2/x/auth/types" @@ -13,7 +13,7 @@ import ( func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.InitChain( abcitypes.RequestInitChain{ diff --git a/x/auth/signing/verify_test.go b/x/auth/signing/verify_test.go index 03348eae00..733b2568e6 100644 --- a/x/auth/signing/verify_test.go +++ b/x/auth/signing/verify_test.go @@ -3,8 +3,8 @@ package signing_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/codec" kmultisig "github.com/line/lbm-sdk/v2/crypto/keys/multisig" @@ -98,7 +98,7 @@ func TestVerifySignature(t *testing.T) { // returns context and app with params set on account keeper func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { app := simapp.Setup(isCheckTx) - ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + ctx := app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) app.AccountKeeper.SetParams(ctx, types.DefaultParams()) return app, ctx diff --git a/x/auth/tx/xauthclient.go b/x/auth/tx/xauthclient.go index 9eac9ebe7a..59d924fe8e 100644 --- a/x/auth/tx/xauthclient.go +++ b/x/auth/tx/xauthclient.go @@ -12,7 +12,7 @@ import ( "strings" "time" - ctypes "github.com/tendermint/tendermint/rpc/core/types" + ctypes "github.com/line/ostracon/rpc/core/types" "github.com/line/lbm-sdk/v2/client" codectypes "github.com/line/lbm-sdk/v2/codec/types" diff --git a/x/auth/types/account.go b/x/auth/types/account.go index 668446c4a1..03380029bf 100644 --- a/x/auth/types/account.go +++ b/x/auth/types/account.go @@ -8,7 +8,7 @@ import ( "strings" "github.com/gogo/protobuf/proto" - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" "gopkg.in/yaml.v2" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/auth/types/auth.pb.go b/x/auth/types/auth.pb.go index 77504fa3d6..8ecdf20530 100644 --- a/x/auth/types/auth.pb.go +++ b/x/auth/types/auth.pb.go @@ -191,50 +191,50 @@ func init() { func init() { proto.RegisterFile("cosmos/auth/v1beta1/auth.proto", fileDescriptor_7e1f7e915d020d2d) } var fileDescriptor_7e1f7e915d020d2d = []byte{ - // 674 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x4d, 0x4f, 0xdb, 0x4a, - 0x14, 0x8d, 0x5f, 0xf2, 0xf8, 0x98, 0x00, 0x12, 0x26, 0x80, 0x93, 0xf7, 0x64, 0x5b, 0x5e, 0xe5, - 0x49, 0x2f, 0x8e, 0x92, 0x8a, 0x4a, 0x64, 0x51, 0x15, 0xd3, 0x2e, 0x50, 0x0b, 0x42, 0x46, 0xea, - 0xa2, 0xaa, 0xe4, 0x8e, 0x9d, 0xc1, 0x58, 0x64, 0x32, 0xc6, 0x33, 0x46, 0x31, 0xbf, 0xa0, 0xcb, - 0x2e, 0xbb, 0xe4, 0x47, 0xf0, 0x0f, 0xba, 0xe9, 0x12, 0xb1, 0xea, 0xca, 0xad, 0xc2, 0xa6, 0xea, - 0x32, 0xfb, 0x4a, 0x95, 0x67, 0x9c, 0x90, 0xa0, 0x74, 0x95, 0xb9, 0xe7, 0x9c, 0x7b, 0xee, 0x9d, - 0x7b, 0xe3, 0x01, 0xaa, 0x47, 0x28, 0x26, 0xb4, 0x09, 0x63, 0x76, 0xd6, 0xbc, 0x6c, 0xb9, 0x88, - 0xc1, 0x16, 0x0f, 0xcc, 0x30, 0x22, 0x8c, 0xc8, 0x1b, 0x82, 0x37, 0x39, 0x94, 0xf3, 0xb5, 0xaa, - 0x00, 0x1d, 0x2e, 0x69, 0xe6, 0x0a, 0x1e, 0xd4, 0x2a, 0x3e, 0xf1, 0x89, 0xc0, 0xb3, 0x53, 0x8e, - 0x56, 0x7d, 0x42, 0xfc, 0x1e, 0x6a, 0xf2, 0xc8, 0x8d, 0x4f, 0x9b, 0xb0, 0x9f, 0x08, 0xca, 0xf8, - 0x25, 0x81, 0xb2, 0x05, 0x29, 0xda, 0xf3, 0x3c, 0x12, 0xf7, 0x99, 0xac, 0x80, 0x45, 0xd8, 0xed, - 0x46, 0x88, 0x52, 0x45, 0xd2, 0xa5, 0xfa, 0xb2, 0x3d, 0x0e, 0xe5, 0x77, 0x60, 0x31, 0x8c, 0x5d, - 0xe7, 0x1c, 0x25, 0xca, 0x5f, 0xba, 0x54, 0x2f, 0xb7, 0x2b, 0xa6, 0xb0, 0x35, 0xc7, 0xb6, 0xe6, - 0x5e, 0x3f, 0xb1, 0x1a, 0x3f, 0x53, 0xad, 0x12, 0xc6, 0x6e, 0x2f, 0xf0, 0x32, 0xed, 0xff, 0x04, - 0x07, 0x0c, 0xe1, 0x90, 0x25, 0xa3, 0x54, 0x5b, 0x4f, 0x20, 0xee, 0x75, 0x8c, 0x07, 0xd6, 0xb0, - 0x17, 0xc2, 0xd8, 0x7d, 0x85, 0x12, 0xf9, 0x39, 0x58, 0x83, 0xa2, 0x05, 0xa7, 0x1f, 0x63, 0x17, - 0x45, 0x4a, 0x51, 0x97, 0xea, 0x25, 0xab, 0x3a, 0x4a, 0xb5, 0x4d, 0x91, 0x36, 0xcb, 0x1b, 0xf6, - 0x6a, 0x0e, 0x1c, 0xf1, 0x58, 0xae, 0x81, 0x25, 0x8a, 0x2e, 0x62, 0xd4, 0xf7, 0x90, 0x52, 0xca, - 0x72, 0xed, 0x49, 0xdc, 0x51, 0x3e, 0x5c, 0x6b, 0x85, 0x4f, 0xd7, 0x5a, 0xe1, 0xc7, 0xb5, 0x56, - 0xb8, 0xbb, 0x69, 0x2c, 0xe5, 0xd7, 0x3d, 0x30, 0x3e, 0x4b, 0x60, 0xf5, 0x90, 0x74, 0xe3, 0xde, - 0x64, 0x02, 0xef, 0xc1, 0x8a, 0x0b, 0x29, 0x72, 0x72, 0x77, 0x3e, 0x86, 0x72, 0x5b, 0x37, 0xe7, - 0x6c, 0xc2, 0x9c, 0x9a, 0x9c, 0xf5, 0xcf, 0x6d, 0xaa, 0x49, 0xa3, 0x54, 0xdb, 0x10, 0xdd, 0x4e, - 0x7b, 0x18, 0x76, 0xd9, 0x9d, 0x9a, 0xb1, 0x0c, 0x4a, 0x7d, 0x88, 0x11, 0x1f, 0xe3, 0xb2, 0xcd, - 0xcf, 0xb2, 0x0e, 0xca, 0x21, 0x8a, 0x70, 0x40, 0x69, 0x40, 0xfa, 0x54, 0x29, 0xea, 0xc5, 0xfa, - 0xb2, 0x3d, 0x0d, 0x75, 0x6a, 0xe3, 0x3b, 0xdc, 0xdd, 0x34, 0xd6, 0x66, 0x5a, 0x3e, 0x30, 0xbe, - 0x15, 0xc1, 0xc2, 0x31, 0x8c, 0x20, 0xa6, 0xf2, 0x11, 0xd8, 0xc0, 0x70, 0xe0, 0x60, 0x84, 0x89, - 0xe3, 0x9d, 0xc1, 0x08, 0x7a, 0x0c, 0x45, 0x62, 0x99, 0x25, 0x4b, 0x1d, 0xa5, 0x5a, 0x4d, 0xf4, - 0x37, 0x47, 0x64, 0xd8, 0xeb, 0x18, 0x0e, 0x0e, 0x11, 0x26, 0xfb, 0x13, 0x4c, 0xde, 0x05, 0x2b, - 0x6c, 0xe0, 0xd0, 0xc0, 0x77, 0x7a, 0x01, 0x0e, 0x18, 0x6f, 0xba, 0x64, 0x6d, 0x3f, 0x5c, 0x74, - 0x9a, 0x35, 0x6c, 0xc0, 0x06, 0x27, 0x81, 0xff, 0x3a, 0x0b, 0x64, 0x1b, 0x6c, 0x72, 0xf2, 0x0a, - 0x39, 0x1e, 0xa1, 0xcc, 0x09, 0x51, 0xe4, 0xb8, 0x09, 0x43, 0xf9, 0x6a, 0xf5, 0x51, 0xaa, 0xfd, - 0x3b, 0xe5, 0xf1, 0x58, 0x66, 0xd8, 0xeb, 0x99, 0xd9, 0x15, 0xda, 0x27, 0x94, 0x1d, 0xa3, 0xc8, - 0x4a, 0x18, 0x92, 0x2f, 0xc0, 0x76, 0x56, 0xed, 0x12, 0x45, 0xc1, 0x69, 0x22, 0xf4, 0xa8, 0xdb, - 0xde, 0xd9, 0x69, 0xed, 0x8a, 0xa5, 0x5b, 0x9d, 0x61, 0xaa, 0x55, 0x4e, 0x02, 0xff, 0x0d, 0x57, - 0x64, 0xa9, 0x2f, 0x5f, 0x70, 0x7e, 0x94, 0x6a, 0xaa, 0xa8, 0xf6, 0x07, 0x03, 0xc3, 0xae, 0xd0, - 0x99, 0x3c, 0x01, 0xcb, 0x09, 0xa8, 0x3e, 0xce, 0xa0, 0xc8, 0x0b, 0xdb, 0x3b, 0x4f, 0xcf, 0x5b, - 0xca, 0xdf, 0xbc, 0xe8, 0xb3, 0x61, 0xaa, 0x6d, 0xcd, 0x14, 0x3d, 0x19, 0x2b, 0x46, 0xa9, 0xa6, - 0xcf, 0x2f, 0x3b, 0x31, 0x31, 0xec, 0x2d, 0x3a, 0x37, 0xb7, 0xb3, 0x94, 0xff, 0x67, 0x25, 0x6b, - 0xff, 0xcb, 0x50, 0x95, 0x6e, 0x87, 0xaa, 0xf4, 0x7d, 0xa8, 0x4a, 0x1f, 0xef, 0xd5, 0xc2, 0xed, - 0xbd, 0x5a, 0xf8, 0x7a, 0xaf, 0x16, 0xde, 0xfe, 0xe7, 0x07, 0xec, 0x2c, 0x76, 0x4d, 0x8f, 0xe0, - 0xfc, 0x2d, 0xc8, 0x7f, 0x1a, 0xb4, 0x7b, 0xde, 0x1c, 0x88, 0xa7, 0x85, 0x25, 0x21, 0xa2, 0xee, - 0x02, 0xff, 0x52, 0x9f, 0xfc, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x49, 0x90, 0x16, 0xd9, 0x76, 0x04, - 0x00, 0x00, + // 679 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x4f, 0x4f, 0xdb, 0x48, + 0x14, 0x8f, 0x37, 0x59, 0xfe, 0x4c, 0x00, 0x09, 0x13, 0xc0, 0xc9, 0xae, 0x6c, 0xcb, 0x97, 0xcd, + 0x61, 0x63, 0x2b, 0x59, 0xb1, 0x12, 0x39, 0xac, 0x16, 0xb3, 0x7b, 0x40, 0xbb, 0x20, 0x64, 0xa4, + 0x1e, 0xaa, 0x4a, 0xee, 0xd8, 0x19, 0x8c, 0x45, 0xc6, 0x63, 0x3c, 0x63, 0x14, 0xf3, 0x09, 0x7a, + 0xec, 0xb1, 0x47, 0x3e, 0x04, 0xdf, 0xa0, 0x97, 0x1e, 0x11, 0xa7, 0x9e, 0xdc, 0x2a, 0x5c, 0xaa, + 0x1e, 0x73, 0xaf, 0x54, 0x65, 0xc6, 0x09, 0x09, 0x4a, 0x6f, 0xf3, 0xfb, 0xf3, 0x7e, 0xef, 0xcd, + 0x9b, 0xc4, 0x40, 0xf5, 0x09, 0xc5, 0x84, 0x5a, 0x30, 0x65, 0x17, 0xd6, 0x75, 0xdb, 0x43, 0x0c, + 0xb6, 0x39, 0x30, 0xe3, 0x84, 0x30, 0x22, 0x6f, 0x09, 0xdd, 0xe4, 0x54, 0xa1, 0x37, 0xea, 0x82, + 0x74, 0xb9, 0xc5, 0x2a, 0x1c, 0x1c, 0x34, 0x6a, 0x01, 0x09, 0x88, 0xe0, 0xc7, 0xa7, 0x82, 0xad, + 0x07, 0x84, 0x04, 0x7d, 0x64, 0x71, 0xe4, 0xa5, 0xe7, 0x16, 0x8c, 0x32, 0x21, 0x19, 0xdf, 0x24, + 0x50, 0xb5, 0x21, 0x45, 0x07, 0xbe, 0x4f, 0xd2, 0x88, 0xc9, 0x0a, 0x58, 0x86, 0xbd, 0x5e, 0x82, + 0x28, 0x55, 0x24, 0x5d, 0x6a, 0xae, 0x3a, 0x13, 0x28, 0xbf, 0x02, 0xcb, 0x71, 0xea, 0xb9, 0x97, + 0x28, 0x53, 0x7e, 0xd2, 0xa5, 0x66, 0xb5, 0x53, 0x33, 0x45, 0xac, 0x39, 0x89, 0x35, 0x0f, 0xa2, + 0xcc, 0x6e, 0x7d, 0xcd, 0xb5, 0x5a, 0x9c, 0x7a, 0xfd, 0xd0, 0x1f, 0x7b, 0x7f, 0x27, 0x38, 0x64, + 0x08, 0xc7, 0x2c, 0x1b, 0xe5, 0xda, 0x66, 0x06, 0x71, 0xbf, 0x6b, 0x3c, 0xa9, 0x86, 0xb3, 0x14, + 0xa7, 0xde, 0x7f, 0x28, 0x93, 0xff, 0x06, 0x1b, 0x50, 0x8c, 0xe0, 0x46, 0x29, 0xf6, 0x50, 0xa2, + 0x94, 0x75, 0xa9, 0x59, 0xb1, 0xeb, 0xa3, 0x5c, 0xdb, 0x16, 0x65, 0xf3, 0xba, 0xe1, 0xac, 0x17, + 0xc4, 0x09, 0xc7, 0x72, 0x03, 0xac, 0x50, 0x74, 0x95, 0xa2, 0xc8, 0x47, 0x4a, 0x65, 0x5c, 0xeb, + 0x4c, 0x71, 0x57, 0x79, 0x73, 0xab, 0x95, 0xde, 0xdd, 0x6a, 0xa5, 0x2f, 0xb7, 0x5a, 0xe9, 0xe1, + 0xae, 0xb5, 0x52, 0x5c, 0xf7, 0xc8, 0x78, 0x2f, 0x81, 0xf5, 0x63, 0xd2, 0x4b, 0xfb, 0xd3, 0x0d, + 0xbc, 0x06, 0x6b, 0x1e, 0xa4, 0xc8, 0x2d, 0xd2, 0xf9, 0x1a, 0xaa, 0x1d, 0xdd, 0x5c, 0xf0, 0x12, + 0xe6, 0xcc, 0xe6, 0xec, 0x5f, 0xee, 0x73, 0x4d, 0x1a, 0xe5, 0xda, 0x96, 0x98, 0x76, 0x36, 0xc3, + 0x70, 0xaa, 0xde, 0xcc, 0x8e, 0x65, 0x50, 0x89, 0x20, 0x46, 0x7c, 0x8d, 0xab, 0x0e, 0x3f, 0xcb, + 0x3a, 0xa8, 0xc6, 0x28, 0xc1, 0x21, 0xa5, 0x21, 0x89, 0xa8, 0x52, 0xd6, 0xcb, 0xcd, 0x55, 0x67, + 0x96, 0xea, 0x36, 0x26, 0x77, 0x78, 0xb8, 0x6b, 0x6d, 0xcc, 0x8d, 0x7c, 0x64, 0x7c, 0x2a, 0x83, + 0xa5, 0x53, 0x98, 0x40, 0x4c, 0xe5, 0x13, 0xb0, 0x85, 0xe1, 0xc0, 0xc5, 0x08, 0x13, 0xd7, 0xbf, + 0x80, 0x09, 0xf4, 0x19, 0x4a, 0xc4, 0x63, 0x56, 0x6c, 0x75, 0x94, 0x6b, 0x0d, 0x31, 0xdf, 0x02, + 0x93, 0xe1, 0x6c, 0x62, 0x38, 0x38, 0x46, 0x98, 0x1c, 0x4e, 0x39, 0x79, 0x1f, 0xac, 0xb1, 0x81, + 0x4b, 0xc3, 0xc0, 0xed, 0x87, 0x38, 0x64, 0x7c, 0xe8, 0x8a, 0xbd, 0xfb, 0x74, 0xd1, 0x59, 0xd5, + 0x70, 0x00, 0x1b, 0x9c, 0x85, 0xc1, 0xff, 0x63, 0x20, 0x3b, 0x60, 0x9b, 0x8b, 0x37, 0xc8, 0xf5, + 0x09, 0x65, 0x6e, 0x8c, 0x12, 0xd7, 0xcb, 0x18, 0x2a, 0x9e, 0x56, 0x1f, 0xe5, 0xda, 0xaf, 0x33, + 0x19, 0xcf, 0x6d, 0x86, 0xb3, 0x39, 0x0e, 0xbb, 0x41, 0x87, 0x84, 0xb2, 0x53, 0x94, 0xd8, 0x19, + 0x43, 0xf2, 0x15, 0xd8, 0x1d, 0x77, 0xbb, 0x46, 0x49, 0x78, 0x9e, 0x09, 0x3f, 0xea, 0x75, 0xf6, + 0xf6, 0xda, 0xfb, 0xe2, 0xd1, 0xed, 0xee, 0x30, 0xd7, 0x6a, 0x67, 0x61, 0xf0, 0x82, 0x3b, 0xc6, + 0xa5, 0xff, 0xfe, 0xc3, 0xf5, 0x51, 0xae, 0xa9, 0xa2, 0xdb, 0x0f, 0x02, 0x0c, 0xa7, 0x46, 0xe7, + 0xea, 0x04, 0x2d, 0x67, 0xa0, 0xfe, 0xbc, 0x82, 0x22, 0x3f, 0xee, 0xec, 0xfd, 0x79, 0xd9, 0x56, + 0x7e, 0xe6, 0x4d, 0xff, 0x1a, 0xe6, 0xda, 0xce, 0x5c, 0xd3, 0xb3, 0x89, 0x63, 0x94, 0x6b, 0xfa, + 0xe2, 0xb6, 0xd3, 0x10, 0xc3, 0xd9, 0xa1, 0x0b, 0x6b, 0xbb, 0x2b, 0xc5, 0x6f, 0x56, 0xb2, 0x0f, + 0x3e, 0x0c, 0x55, 0xe9, 0x7e, 0xa8, 0x4a, 0x9f, 0x87, 0xaa, 0xf4, 0xf6, 0x51, 0x2d, 0xdd, 0x3f, + 0xaa, 0xa5, 0x8f, 0x8f, 0x6a, 0xe9, 0xe5, 0x6f, 0x41, 0xc8, 0x2e, 0x52, 0xcf, 0xf4, 0x09, 0xb6, + 0xfa, 0x61, 0x84, 0xac, 0xbe, 0x87, 0x5b, 0xb4, 0x77, 0x69, 0x5d, 0x77, 0xac, 0x81, 0xf8, 0xb0, + 0xb0, 0x2c, 0x46, 0xd4, 0x5b, 0xe2, 0xff, 0xd3, 0x3f, 0xbe, 0x07, 0x00, 0x00, 0xff, 0xff, 0xf8, + 0x3b, 0x78, 0x7b, 0x74, 0x04, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { diff --git a/x/auth/types/genesis.pb.go b/x/auth/types/genesis.pb.go index 9d16c72582..dc436515fa 100644 --- a/x/auth/types/genesis.pb.go +++ b/x/auth/types/genesis.pb.go @@ -86,23 +86,24 @@ func init() { func init() { proto.RegisterFile("cosmos/auth/v1beta1/genesis.proto", fileDescriptor_d897ccbce9822332) } var fileDescriptor_d897ccbce9822332 = []byte{ - // 252 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0xce, 0x2f, 0xce, - 0xcd, 0x2f, 0xd6, 0x4f, 0x2c, 0x2d, 0xc9, 0xd0, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, - 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86, - 0x28, 0xd1, 0x03, 0x29, 0xd1, 0x83, 0x2a, 0x91, 0x92, 0x4c, 0xcf, 0xcf, 0x4f, 0xcf, 0x49, 0xd5, - 0x07, 0x2b, 0x49, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0x84, 0xa8, 0x97, 0x12, 0x49, 0xcf, 0x4f, - 0xcf, 0x07, 0x33, 0xf5, 0x41, 0x2c, 0xa8, 0xa8, 0x1c, 0x36, 0x8b, 0xc0, 0x46, 0x82, 0xe5, 0x95, - 0xaa, 0xb9, 0x78, 0xdc, 0x21, 0xd6, 0x06, 0x97, 0x24, 0x96, 0xa4, 0x0a, 0x59, 0x72, 0xb1, 0x15, - 0x24, 0x16, 0x25, 0xe6, 0x16, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x49, 0xeb, 0x61, 0x71, - 0x86, 0x5e, 0x00, 0x58, 0x89, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, 0x50, 0x0d, 0x42, 0x06, - 0x5c, 0x1c, 0x89, 0xc9, 0xc9, 0xf9, 0xa5, 0x79, 0x25, 0xc5, 0x12, 0x4c, 0x0a, 0xcc, 0x1a, 0xdc, - 0x46, 0x22, 0x7a, 0x10, 0xe7, 0xea, 0xc1, 0x9c, 0xab, 0xe7, 0x98, 0x57, 0x19, 0x04, 0x57, 0xe5, - 0xe4, 0x7c, 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, 0x9a, 0xe9, 0x99, 0x25, - 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x1f, 0x40, 0x28, 0xdd, 0xe2, 0x94, 0x6c, - 0xfd, 0x0a, 0x88, 0x77, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x86, 0x1b, 0x03, 0x02, - 0x00, 0x00, 0xff, 0xff, 0xac, 0xe2, 0xe7, 0xb6, 0x53, 0x01, 0x00, 0x00, + // 259 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0x31, 0x4f, 0xc3, 0x30, + 0x10, 0x85, 0x13, 0x40, 0x15, 0x4a, 0x99, 0x42, 0x87, 0x52, 0x24, 0x53, 0x58, 0xe8, 0xc2, 0x1d, + 0x0d, 0x13, 0x63, 0xbb, 0xb0, 0xa2, 0xb2, 0xb1, 0xd9, 0xc1, 0xb8, 0x11, 0x89, 0x2f, 0xaa, 0x9d, + 0x8a, 0x88, 0x3f, 0xc1, 0xcf, 0xea, 0xd8, 0x91, 0x09, 0xa1, 0xe4, 0x8f, 0xa0, 0xda, 0x81, 0xa9, + 0xdb, 0xd3, 0xdd, 0x77, 0xef, 0xbd, 0x8b, 0x2e, 0x53, 0x32, 0x05, 0x19, 0xe4, 0x95, 0x5d, 0xe2, + 0x7a, 0x2a, 0xa4, 0xe5, 0x53, 0x54, 0x52, 0x4b, 0x93, 0x19, 0x28, 0x57, 0x64, 0x29, 0x3e, 0xf5, + 0x08, 0xec, 0x10, 0xe8, 0x90, 0xd1, 0x99, 0x22, 0x52, 0xb9, 0x44, 0x87, 0x88, 0xea, 0x15, 0xb9, + 0xae, 0x3d, 0x3f, 0x1a, 0x28, 0x52, 0xe4, 0x24, 0xee, 0x54, 0x37, 0x65, 0xfb, 0x82, 0x9c, 0xa5, + 0xdb, 0x5f, 0x7d, 0x44, 0x27, 0x0f, 0x3e, 0xf6, 0xc9, 0x72, 0x2b, 0xe3, 0xfb, 0xa8, 0x57, 0xf2, + 0x15, 0x2f, 0xcc, 0x30, 0x1c, 0x87, 0x93, 0x7e, 0x72, 0x0e, 0x7b, 0x6a, 0xc0, 0xa3, 0x43, 0xe6, + 0x47, 0x9b, 0xef, 0x8b, 0x60, 0xd1, 0x1d, 0xc4, 0xb7, 0xd1, 0x31, 0x4f, 0x53, 0xaa, 0xb4, 0x35, + 0xc3, 0x83, 0xf1, 0xe1, 0xa4, 0x9f, 0x0c, 0xc0, 0xd7, 0x85, 0xbf, 0xba, 0x30, 0xd3, 0xf5, 0xe2, + 0x9f, 0x9a, 0xcf, 0x36, 0x0d, 0x0b, 0xb7, 0x0d, 0x0b, 0x7f, 0x1a, 0x16, 0x7e, 0xb6, 0x2c, 0xd8, + 0xb6, 0x2c, 0xf8, 0x6a, 0x59, 0xf0, 0x7c, 0xad, 0x32, 0xbb, 0xac, 0x04, 0xa4, 0x54, 0x60, 0x9e, + 0x69, 0x89, 0xb9, 0x28, 0x6e, 0xcc, 0xcb, 0x1b, 0xae, 0x13, 0x7c, 0xf7, 0xcf, 0xd8, 0xba, 0x94, + 0x46, 0xf4, 0x9c, 0xf5, 0xdd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x53, 0x8d, 0x06, 0x7a, 0x51, + 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/auth/types/query.pb.go b/x/auth/types/query.pb.go index 196ac27738..389e489f9c 100644 --- a/x/auth/types/query.pb.go +++ b/x/auth/types/query.pb.go @@ -210,33 +210,33 @@ func init() { proto.RegisterFile("cosmos/auth/v1beta1/query.proto", fileDescript var fileDescriptor_c451370b3929a27c = []byte{ // 424 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x31, 0x6f, 0xda, 0x40, - 0x14, 0xc7, 0x6d, 0xd4, 0x02, 0xbd, 0x76, 0x3a, 0x3c, 0x50, 0xd3, 0xda, 0x95, 0x3b, 0x00, 0x03, - 0x77, 0x82, 0x4e, 0x54, 0x5d, 0xa0, 0x53, 0x37, 0x6a, 0x75, 0xea, 0x52, 0x9d, 0xcd, 0xd5, 0xa0, - 0x16, 0x9f, 0xf1, 0x9d, 0xab, 0xa2, 0xaa, 0x52, 0x94, 0x29, 0x5b, 0x22, 0x65, 0xcd, 0xc0, 0x87, - 0xc8, 0x87, 0x40, 0x99, 0x90, 0xb2, 0x64, 0x8a, 0x22, 0xc8, 0x90, 0x8f, 0x11, 0x71, 0x77, 0x1e, - 0x90, 0x1c, 0x25, 0x13, 0xbc, 0xf7, 0xfe, 0xff, 0xff, 0xfb, 0xf9, 0x1d, 0x70, 0x43, 0xc6, 0x67, - 0x8c, 0x63, 0x92, 0x89, 0x09, 0xfe, 0xd3, 0x0d, 0xa8, 0x20, 0x5d, 0x3c, 0xcf, 0x68, 0xba, 0x40, - 0x49, 0xca, 0x04, 0x83, 0x35, 0x25, 0x40, 0x3b, 0x01, 0xd2, 0x02, 0xdb, 0x8a, 0x58, 0xc4, 0xe4, - 0x1c, 0xef, 0xfe, 0x29, 0xa9, 0xfd, 0x3a, 0x62, 0x2c, 0xfa, 0x4d, 0xb1, 0xac, 0x82, 0xec, 0x27, - 0x26, 0xb1, 0x4e, 0xb1, 0xdf, 0xe8, 0x11, 0x49, 0xa6, 0x98, 0xc4, 0x31, 0x13, 0x44, 0x4c, 0x59, - 0xcc, 0xf5, 0xd4, 0x29, 0x82, 0x90, 0x0b, 0x75, 0xb0, 0x9a, 0xff, 0x50, 0x1b, 0x35, 0x90, 0x2c, - 0xbc, 0x3e, 0xa8, 0x7d, 0xdd, 0xd1, 0x0e, 0xc2, 0x90, 0x65, 0xb1, 0xf0, 0xe9, 0x3c, 0xa3, 0x5c, - 0xc0, 0x3a, 0xa8, 0x90, 0xf1, 0x38, 0xa5, 0x9c, 0xd7, 0xcd, 0x77, 0x66, 0xeb, 0x85, 0x9f, 0x97, - 0x1f, 0xab, 0x47, 0x4b, 0xd7, 0xb8, 0x5b, 0xba, 0x86, 0xf7, 0x0d, 0x58, 0xfb, 0x56, 0x9e, 0xb0, - 0x98, 0x53, 0xf8, 0x09, 0x54, 0x88, 0x6a, 0x49, 0xef, 0xcb, 0x9e, 0x85, 0x14, 0x3d, 0xca, 0x3f, - 0x0c, 0x0d, 0xe2, 0xc5, 0xf0, 0xd5, 0xc5, 0x79, 0xa7, 0xaa, 0xbd, 0x5f, 0xfc, 0xdc, 0xe2, 0x59, - 0x00, 0xca, 0xd4, 0x11, 0x49, 0xc9, 0x8c, 0x6b, 0x1e, 0x6f, 0xa4, 0x31, 0xf3, 0xae, 0x5e, 0xd5, - 0x07, 0xe5, 0x44, 0x76, 0xf4, 0xa6, 0x06, 0x2a, 0xb8, 0x36, 0x52, 0xa6, 0xe1, 0xb3, 0xd5, 0xb5, - 0x6b, 0xf8, 0xda, 0xd0, 0x3b, 0x2b, 0x81, 0xe7, 0x32, 0x12, 0x1e, 0x9b, 0xa0, 0xa2, 0x39, 0x60, - 0xab, 0x30, 0xa0, 0xe0, 0x42, 0x76, 0xfb, 0x09, 0x4a, 0x45, 0xe9, 0xe1, 0xc3, 0xcb, 0xdb, 0xd3, - 0x52, 0x1b, 0x36, 0x71, 0xe1, 0x3b, 0x29, 0x35, 0xc7, 0xff, 0xf4, 0x89, 0xff, 0xc3, 0x03, 0x13, - 0x94, 0x15, 0x34, 0x6c, 0x3e, 0xbc, 0x66, 0xef, 0x42, 0x76, 0xeb, 0x71, 0xa1, 0xc6, 0x79, 0x2f, - 0x71, 0xde, 0xc2, 0x46, 0x21, 0x8e, 0x3a, 0xcf, 0xf0, 0xf3, 0x6a, 0xe3, 0x98, 0xeb, 0x8d, 0x63, - 0xde, 0x6c, 0x1c, 0xf3, 0x64, 0xeb, 0x18, 0xeb, 0xad, 0x63, 0x5c, 0x6d, 0x1d, 0xe3, 0x7b, 0x3b, - 0x9a, 0x8a, 0x49, 0x16, 0xa0, 0x90, 0xcd, 0xf2, 0x00, 0xf5, 0xd3, 0xe1, 0xe3, 0x5f, 0xf8, 0xaf, - 0x4a, 0x13, 0x8b, 0x84, 0xf2, 0xa0, 0x2c, 0x1f, 0xfc, 0xc3, 0x7d, 0x00, 0x00, 0x00, 0xff, 0xff, - 0xef, 0x40, 0xd8, 0x2e, 0x25, 0x03, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x31, 0xef, 0xd2, 0x40, + 0x18, 0xc6, 0xdb, 0x7f, 0x14, 0xf0, 0x74, 0x3a, 0x3a, 0x60, 0xd1, 0xd6, 0xd4, 0x01, 0x18, 0xb8, + 0x0b, 0x38, 0x61, 0x5c, 0x60, 0x73, 0xc3, 0xc6, 0xc9, 0xc5, 0x5c, 0xcb, 0x59, 0x1a, 0xe9, 0x5d, + 0xe9, 0x5d, 0x89, 0xc4, 0x98, 0x18, 0x27, 0x37, 0x4d, 0x5c, 0x1d, 0xf8, 0x10, 0x7e, 0x08, 0xe2, + 0x44, 0xe2, 0xe2, 0x64, 0x0c, 0x38, 0xf8, 0x31, 0x0c, 0x77, 0xd7, 0x81, 0xa4, 0x46, 0xb7, 0xbe, + 0xef, 0xfb, 0x3c, 0xcf, 0xfb, 0xeb, 0x7b, 0xc0, 0x8f, 0xb9, 0xc8, 0xb8, 0xc0, 0xa4, 0x94, 0x4b, + 0xbc, 0x19, 0x45, 0x54, 0x92, 0x11, 0x5e, 0x97, 0xb4, 0xd8, 0xa2, 0xbc, 0xe0, 0x92, 0xc3, 0xb6, + 0x16, 0xa0, 0xb3, 0x00, 0x19, 0x81, 0xeb, 0x24, 0x3c, 0xe1, 0x6a, 0x8e, 0xcf, 0x5f, 0x5a, 0xea, + 0xde, 0x4e, 0x38, 0x4f, 0x56, 0x14, 0xab, 0x2a, 0x2a, 0x5f, 0x60, 0xc2, 0x4c, 0x8a, 0x7b, 0xc7, + 0x8c, 0x48, 0x9e, 0x62, 0xc2, 0x18, 0x97, 0x44, 0xa6, 0x9c, 0x09, 0x33, 0xf5, 0xea, 0x20, 0xd4, + 0x42, 0x13, 0xac, 0xe7, 0xcf, 0xf5, 0x46, 0x03, 0xa4, 0x8a, 0x60, 0x02, 0xda, 0x4f, 0xce, 0xb4, + 0xd3, 0x38, 0xe6, 0x25, 0x93, 0x21, 0x5d, 0x97, 0x54, 0x48, 0xd8, 0x01, 0x4d, 0xb2, 0x58, 0x14, + 0x54, 0x88, 0x8e, 0x7d, 0xcf, 0xee, 0xdf, 0x08, 0xab, 0xf2, 0x61, 0xeb, 0xfd, 0xce, 0xb7, 0x7e, + 0xef, 0x7c, 0x2b, 0x78, 0x0a, 0x9c, 0x4b, 0xab, 0xc8, 0x39, 0x13, 0x14, 0x3e, 0x02, 0x4d, 0xa2, + 0x5b, 0xca, 0x7b, 0x73, 0xec, 0x20, 0x4d, 0x8f, 0xaa, 0x1f, 0x43, 0x53, 0xb6, 0x9d, 0xdd, 0xfa, + 0xfa, 0x65, 0xd8, 0x32, 0xde, 0xc7, 0x61, 0x65, 0x09, 0x1c, 0x00, 0x55, 0xea, 0x9c, 0x14, 0x24, + 0x13, 0x86, 0x27, 0x98, 0x1b, 0xcc, 0xaa, 0x6b, 0x56, 0x4d, 0x40, 0x23, 0x57, 0x1d, 0xb3, 0xa9, + 0x8b, 0x6a, 0xae, 0x8d, 0xb4, 0x69, 0x76, 0x6d, 0xff, 0xc3, 0xb7, 0x42, 0x63, 0x18, 0x7f, 0xbe, + 0x02, 0xd7, 0x55, 0x24, 0xfc, 0x60, 0x83, 0xa6, 0xe1, 0x80, 0xfd, 0xda, 0x80, 0x9a, 0x0b, 0xb9, + 0x83, 0xff, 0x50, 0x6a, 0xca, 0x00, 0xbf, 0xfb, 0xf6, 0xeb, 0xd3, 0xd5, 0x00, 0xf6, 0x70, 0xed, + 0x3b, 0x69, 0xb5, 0xc0, 0xaf, 0xcd, 0x89, 0xdf, 0xc0, 0xb7, 0x36, 0x68, 0x68, 0x68, 0xd8, 0xfb, + 0xfb, 0x9a, 0x8b, 0x0b, 0xb9, 0xfd, 0x7f, 0x0b, 0x0d, 0xce, 0x7d, 0x85, 0x73, 0x17, 0x76, 0x6b, + 0x71, 0xf4, 0x79, 0x66, 0xd3, 0xfd, 0xd1, 0xb3, 0x0f, 0x47, 0xcf, 0xfe, 0x79, 0xf4, 0xec, 0x8f, + 0x27, 0xcf, 0x3a, 0x9c, 0x3c, 0xeb, 0xfb, 0xc9, 0xb3, 0x9e, 0xf5, 0x92, 0x54, 0x2e, 0xcb, 0x08, + 0xc5, 0x3c, 0xc3, 0xab, 0x94, 0x51, 0xbc, 0x8a, 0xb2, 0xa1, 0x58, 0xbc, 0xc4, 0x9b, 0x31, 0x7e, + 0xa5, 0xb3, 0xe4, 0x36, 0xa7, 0x22, 0x6a, 0xa8, 0xe7, 0x7e, 0xf0, 0x27, 0x00, 0x00, 0xff, 0xff, + 0xd3, 0xef, 0x7a, 0x40, 0x23, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/auth/vesting/handler_test.go b/x/auth/vesting/handler_test.go index 83b8ddf85c..13d4d4d672 100644 --- a/x/auth/vesting/handler_test.go +++ b/x/auth/vesting/handler_test.go @@ -3,8 +3,8 @@ package vesting_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -28,7 +28,7 @@ func (suite *HandlerTestSuite) SetupTest() { } func (suite *HandlerTestSuite) TestMsgCreateVestingAccount() { - ctx := suite.app.BaseApp.NewContext(false, tmproto.Header{Height: suite.app.LastBlockHeight() + 1}) + ctx := suite.app.BaseApp.NewContext(false, ostproto.Header{Height: suite.app.LastBlockHeight() + 1}) balances := sdk.NewCoins(sdk.NewInt64Coin("test", 1000)) addr1 := sdk.AccAddress([]byte("addr1_______________")) diff --git a/x/auth/vesting/module.go b/x/auth/vesting/module.go index 1934954f23..2ebab4c555 100644 --- a/x/auth/vesting/module.go +++ b/x/auth/vesting/module.go @@ -5,8 +5,8 @@ import ( "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/auth/vesting/types/tx.pb.go b/x/auth/vesting/types/tx.pb.go index 11a6436e1a..51cbe66b18 100644 --- a/x/auth/vesting/types/tx.pb.go +++ b/x/auth/vesting/types/tx.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -33,11 +33,11 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgCreateVestingAccount defines a message that enables creating a vesting // account. type MsgCreateVestingAccount struct { - FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty" yaml:"from_address"` - ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty" yaml:"to_address"` - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` - EndTime int64 `protobuf:"varint,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty" yaml:"end_time"` - Delayed bool `protobuf:"varint,5,opt,name=delayed,proto3" json:"delayed,omitempty"` + FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty" yaml:"from_address"` + ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty" yaml:"to_address"` + Amount github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` + EndTime int64 `protobuf:"varint,4,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty" yaml:"end_time"` + Delayed bool `protobuf:"varint,5,opt,name=delayed,proto3" json:"delayed,omitempty"` } func (m *MsgCreateVestingAccount) Reset() { *m = MsgCreateVestingAccount{} } @@ -87,7 +87,7 @@ func (m *MsgCreateVestingAccount) GetToAddress() string { return "" } -func (m *MsgCreateVestingAccount) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins { +func (m *MsgCreateVestingAccount) GetAmount() github_com_line_lbm_sdk_v2_types.Coins { if m != nil { return m.Amount } @@ -153,33 +153,33 @@ func init() { func init() { proto.RegisterFile("cosmos/vesting/v1beta1/tx.proto", fileDescriptor_5338ca97811f9792) } var fileDescriptor_5338ca97811f9792 = []byte{ - // 410 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xbd, 0xae, 0xd3, 0x30, - 0x14, 0x8e, 0x6f, 0x2e, 0xf7, 0xc7, 0x17, 0x09, 0x91, 0x16, 0x1a, 0x3a, 0xc4, 0x21, 0x53, 0x16, - 0x6c, 0x5a, 0x90, 0x90, 0xba, 0x35, 0x1d, 0x51, 0x97, 0x08, 0x31, 0xb0, 0x54, 0x4e, 0x62, 0xd2, - 0x88, 0x26, 0xae, 0x62, 0xb7, 0x6a, 0x37, 0x46, 0x46, 0x1e, 0x81, 0x99, 0xa7, 0x60, 0xec, 0xd8, - 0x91, 0x29, 0xa0, 0x76, 0x61, 0xee, 0x13, 0xa0, 0xc4, 0x49, 0x61, 0x68, 0x91, 0x98, 0xec, 0xa3, - 0xef, 0xc7, 0xe7, 0x7c, 0x3e, 0x10, 0x85, 0x5c, 0xa4, 0x5c, 0x90, 0x25, 0x13, 0x32, 0xc9, 0x62, - 0xb2, 0xec, 0x05, 0x4c, 0xd2, 0x1e, 0x91, 0x2b, 0x3c, 0xcf, 0xb9, 0xe4, 0xc6, 0x63, 0x45, 0xc0, - 0x35, 0x01, 0xd7, 0x84, 0x6e, 0x3b, 0xe6, 0x31, 0xaf, 0x28, 0xa4, 0xbc, 0x29, 0x76, 0xd7, 0xaa, - 0xed, 0x02, 0x2a, 0xd8, 0xd1, 0x2b, 0xe4, 0x49, 0xa6, 0x70, 0xe7, 0xdb, 0x05, 0xec, 0x8c, 0x45, - 0x3c, 0xca, 0x19, 0x95, 0xec, 0xad, 0xb2, 0x1c, 0x86, 0x21, 0x5f, 0x64, 0xd2, 0x18, 0xc0, 0xfb, - 0xef, 0x73, 0x9e, 0x4e, 0x68, 0x14, 0xe5, 0x4c, 0x08, 0x13, 0xd8, 0xc0, 0xbd, 0xf5, 0x3a, 0x87, - 0x02, 0xb5, 0xd6, 0x34, 0x9d, 0x0d, 0x9c, 0xbf, 0x51, 0xc7, 0xbf, 0x2b, 0xcb, 0xa1, 0xaa, 0x8c, - 0x97, 0x10, 0x4a, 0x7e, 0x54, 0x5e, 0x54, 0xca, 0x47, 0x87, 0x02, 0x3d, 0x54, 0xca, 0x3f, 0x98, - 0xe3, 0xdf, 0x4a, 0xde, 0xa8, 0x42, 0x78, 0x45, 0xd3, 0xf2, 0x6d, 0x53, 0xb7, 0x75, 0xf7, 0xae, - 0xff, 0x04, 0xd7, 0xc3, 0x96, 0xed, 0x37, 0x93, 0xe2, 0x11, 0x4f, 0x32, 0xef, 0xf9, 0xa6, 0x40, - 0xda, 0xd7, 0x1f, 0xc8, 0x8d, 0x13, 0x39, 0x5d, 0x04, 0x38, 0xe4, 0x29, 0xa9, 0x67, 0x55, 0xc7, - 0x33, 0x11, 0x7d, 0x20, 0x72, 0x3d, 0x67, 0xa2, 0x12, 0x08, 0xbf, 0xb6, 0x36, 0x30, 0xbc, 0x61, - 0x59, 0x34, 0x91, 0x49, 0xca, 0xcc, 0x4b, 0x1b, 0xb8, 0xba, 0xd7, 0x3a, 0x14, 0xe8, 0x81, 0x6a, - 0xac, 0x41, 0x1c, 0xff, 0x9a, 0x65, 0xd1, 0x9b, 0x24, 0x65, 0x86, 0x09, 0xaf, 0x23, 0x36, 0xa3, - 0x6b, 0x16, 0x99, 0xf7, 0x6c, 0xe0, 0xde, 0xf8, 0x4d, 0x39, 0xb8, 0xfc, 0xf5, 0x05, 0x01, 0xe7, - 0x29, 0x44, 0x67, 0x12, 0xf4, 0x99, 0x98, 0xf3, 0x4c, 0xb0, 0xfe, 0x27, 0x00, 0xf5, 0xb1, 0x88, - 0x8d, 0x8f, 0x00, 0xb6, 0x4f, 0x46, 0x4d, 0xf0, 0xe9, 0x5f, 0xc5, 0x67, 0x9c, 0xbb, 0xaf, 0xfe, - 0x53, 0xd0, 0xb4, 0xe2, 0xbd, 0xde, 0xec, 0x2c, 0xb0, 0xdd, 0x59, 0xe0, 0xe7, 0xce, 0x02, 0x9f, - 0xf7, 0x96, 0xb6, 0xdd, 0x5b, 0xda, 0xf7, 0xbd, 0xa5, 0xbd, 0xeb, 0xfd, 0x33, 0xc9, 0x15, 0xa1, - 0x0b, 0x39, 0x3d, 0xae, 0x65, 0x15, 0x6c, 0x70, 0x55, 0x2d, 0xd1, 0x8b, 0xdf, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xe7, 0x28, 0xaf, 0xe5, 0xb5, 0x02, 0x00, 0x00, + // 416 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x52, 0xbb, 0x6e, 0xd4, 0x40, + 0x14, 0xf5, 0xc4, 0x21, 0x8f, 0x09, 0x12, 0xc2, 0x09, 0xc4, 0x6c, 0xe1, 0x31, 0x2e, 0x90, 0x1b, + 0x66, 0x94, 0x05, 0x09, 0x69, 0xbb, 0x38, 0x15, 0x45, 0x1a, 0x0b, 0x51, 0xd0, 0x44, 0x63, 0xfb, + 0xe2, 0x58, 0x78, 0x66, 0x56, 0x9e, 0xd9, 0x55, 0xb6, 0xa3, 0xa4, 0xe4, 0x13, 0xa8, 0xf9, 0x08, + 0xea, 0x94, 0x29, 0xa9, 0x0c, 0xda, 0x6d, 0xa8, 0xf7, 0x0b, 0x90, 0x5f, 0x0b, 0x45, 0x82, 0x44, + 0xe7, 0xab, 0xf3, 0xf0, 0xb9, 0x67, 0x2e, 0x26, 0xa9, 0xd2, 0x42, 0x69, 0x36, 0x07, 0x6d, 0x0a, + 0x99, 0xb3, 0xf9, 0x49, 0x02, 0x86, 0x9f, 0x30, 0x73, 0x45, 0xa7, 0x95, 0x32, 0xca, 0x79, 0xdc, + 0x11, 0x68, 0x4f, 0xa0, 0x3d, 0x61, 0x74, 0x94, 0xab, 0x5c, 0xb5, 0x14, 0xd6, 0x7c, 0x75, 0xec, + 0x91, 0xd7, 0xdb, 0x25, 0x5c, 0xc3, 0xc6, 0x2b, 0x55, 0x85, 0xec, 0xf0, 0xe0, 0xdb, 0x16, 0x3e, + 0x3e, 0xd7, 0xf9, 0x59, 0x05, 0xdc, 0xc0, 0xdb, 0xce, 0xf2, 0x34, 0x4d, 0xd5, 0x4c, 0x1a, 0x67, + 0x82, 0xef, 0xbf, 0xaf, 0x94, 0xb8, 0xe0, 0x59, 0x56, 0x81, 0xd6, 0x2e, 0xf2, 0x51, 0xb8, 0x1f, + 0x1d, 0xaf, 0x6b, 0x72, 0xb8, 0xe0, 0xa2, 0x9c, 0x04, 0x7f, 0xa3, 0x41, 0x7c, 0xd0, 0x8c, 0xa7, + 0xdd, 0xe4, 0xbc, 0xc4, 0xd8, 0xa8, 0x8d, 0x72, 0xab, 0x55, 0x3e, 0x5a, 0xd7, 0xe4, 0x61, 0xa7, + 0xfc, 0x83, 0x05, 0xf1, 0xbe, 0x51, 0x83, 0x8a, 0xe3, 0x1d, 0x2e, 0x9a, 0x7f, 0xbb, 0xb6, 0x6f, + 0x87, 0x07, 0xe3, 0x27, 0xb4, 0x5f, 0xb6, 0x89, 0x3f, 0x6c, 0x4a, 0xcf, 0x54, 0x21, 0x23, 0x7a, + 0x5d, 0x13, 0xeb, 0xeb, 0x0f, 0xf2, 0x2c, 0x2f, 0xcc, 0xe5, 0x2c, 0xa1, 0xa9, 0x12, 0xac, 0x2c, + 0x24, 0xb0, 0x32, 0x11, 0xcf, 0x75, 0xf6, 0x81, 0xcd, 0xc7, 0xcc, 0x2c, 0xa6, 0xa0, 0x5b, 0xba, + 0x8e, 0x7b, 0x63, 0x87, 0xe2, 0x3d, 0x90, 0xd9, 0x85, 0x29, 0x04, 0xb8, 0xdb, 0x3e, 0x0a, 0xed, + 0xe8, 0x70, 0x5d, 0x93, 0x07, 0x5d, 0xac, 0x01, 0x09, 0xe2, 0x5d, 0x90, 0xd9, 0x9b, 0x42, 0x80, + 0xe3, 0xe2, 0xdd, 0x0c, 0x4a, 0xbe, 0x80, 0xcc, 0xbd, 0xe7, 0xa3, 0x70, 0x2f, 0x1e, 0xc6, 0xc9, + 0xf6, 0xaf, 0x2f, 0x04, 0x05, 0x4f, 0x31, 0xb9, 0xa3, 0xbf, 0x18, 0xf4, 0x54, 0x49, 0x0d, 0xe3, + 0x4f, 0x08, 0xdb, 0xe7, 0x3a, 0x77, 0x3e, 0x22, 0x7c, 0x74, 0x6b, 0xd1, 0x8c, 0xde, 0xfe, 0xa6, + 0xf4, 0x0e, 0xe7, 0xd1, 0xab, 0xff, 0x14, 0x0c, 0x51, 0xa2, 0xd7, 0xd7, 0x4b, 0x0f, 0xdd, 0x2c, + 0x3d, 0xf4, 0x73, 0xe9, 0xa1, 0xcf, 0x2b, 0xcf, 0xba, 0x59, 0x79, 0xd6, 0xf7, 0x95, 0x67, 0xbd, + 0x63, 0xff, 0xe8, 0xf1, 0x8a, 0xf1, 0x99, 0xb9, 0xdc, 0x9c, 0x64, 0x5b, 0x6b, 0xb2, 0xd3, 0x1e, + 0xd0, 0x8b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x05, 0xbb, 0x94, 0x1a, 0xb1, 0x02, 0x00, 0x00, } func (this *MsgCreateVestingAccount) Equal(that interface{}) bool { diff --git a/x/auth/vesting/types/vesting.pb.go b/x/auth/vesting/types/vesting.pb.go index 09b9d674f4..cef7333f90 100644 --- a/x/auth/vesting/types/vesting.pb.go +++ b/x/auth/vesting/types/vesting.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types1 "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/x/auth/types" io "io" @@ -30,10 +30,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // the necessary fields needed for any vesting account implementation. type BaseVestingAccount struct { *types.BaseAccount `protobuf:"bytes,1,opt,name=base_account,json=baseAccount,proto3,embedded=base_account" json:"base_account,omitempty"` - OriginalVesting github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=original_vesting,json=originalVesting,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"original_vesting" yaml:"original_vesting"` - DelegatedFree github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=delegated_free,json=delegatedFree,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"delegated_free" yaml:"delegated_free"` - DelegatedVesting github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=delegated_vesting,json=delegatedVesting,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"delegated_vesting" yaml:"delegated_vesting"` - EndTime int64 `protobuf:"varint,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty" yaml:"end_time"` + OriginalVesting github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,2,rep,name=original_vesting,json=originalVesting,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"original_vesting" yaml:"original_vesting"` + DelegatedFree github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,3,rep,name=delegated_free,json=delegatedFree,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"delegated_free" yaml:"delegated_free"` + DelegatedVesting github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,4,rep,name=delegated_vesting,json=delegatedVesting,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"delegated_vesting" yaml:"delegated_vesting"` + EndTime int64 `protobuf:"varint,5,opt,name=end_time,json=endTime,proto3" json:"end_time,omitempty" yaml:"end_time"` } func (m *BaseVestingAccount) Reset() { *m = BaseVestingAccount{} } @@ -148,8 +148,8 @@ var xxx_messageInfo_DelayedVestingAccount proto.InternalMessageInfo // Period defines a length of time and amount of coins that will vest. type Period struct { - Length int64 `protobuf:"varint,1,opt,name=length,proto3" json:"length,omitempty"` - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` + Length int64 `protobuf:"varint,1,opt,name=length,proto3" json:"length,omitempty"` + Amount github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,2,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` } func (m *Period) Reset() { *m = Period{} } @@ -191,7 +191,7 @@ func (m *Period) GetLength() int64 { return 0 } -func (m *Period) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins { +func (m *Period) GetAmount() github_com_line_lbm_sdk_v2_types.Coins { if m != nil { return m.Amount } @@ -251,45 +251,45 @@ func init() { } var fileDescriptor_89e80273ca606d6e = []byte{ - // 593 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x95, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0x7d, 0x49, 0x08, 0xe5, 0x02, 0x4d, 0x6b, 0x9a, 0x60, 0x3a, 0xd8, 0x91, 0xc5, 0x10, - 0x21, 0xe1, 0x90, 0xc2, 0x94, 0x0d, 0x17, 0x21, 0x55, 0x65, 0x40, 0x16, 0x62, 0x60, 0x89, 0xfc, - 0xe3, 0x70, 0x4e, 0xc4, 0xbe, 0xc8, 0x77, 0xa9, 0xc8, 0x1f, 0x80, 0x84, 0xd4, 0x05, 0x24, 0x06, - 0xc6, 0x2e, 0x2c, 0xfc, 0x11, 0xcc, 0x1d, 0x23, 0x26, 0xa6, 0x80, 0x92, 0xff, 0x20, 0x7f, 0x01, - 0xf2, 0xdd, 0xd9, 0x01, 0x17, 0x88, 0xca, 0x80, 0xd4, 0x29, 0x79, 0xf7, 0xde, 0xfb, 0xde, 0xe7, - 0xbd, 0x7b, 0x77, 0x86, 0xb7, 0x7c, 0x42, 0x23, 0x42, 0x3b, 0x47, 0x88, 0x32, 0x1c, 0x87, 0x9d, - 0xa3, 0xae, 0x87, 0x98, 0xdb, 0xcd, 0x6c, 0x6b, 0x94, 0x10, 0x46, 0xd4, 0xa6, 0x88, 0xb2, 0xb2, - 0x55, 0x19, 0xb5, 0xbb, 0x13, 0x92, 0x90, 0xf0, 0x90, 0x4e, 0xfa, 0x4f, 0x44, 0xef, 0xea, 0x52, - 0xd3, 0x73, 0x29, 0xca, 0x05, 0x7d, 0x82, 0xe3, 0x82, 0xdf, 0x1d, 0xb3, 0x41, 0xee, 0x4f, 0x0d, - 0xe1, 0x37, 0xbf, 0x54, 0xa0, 0x6a, 0xbb, 0x14, 0x3d, 0x13, 0xbb, 0x3d, 0xf0, 0x7d, 0x32, 0x8e, - 0x99, 0x7a, 0x00, 0xaf, 0xa6, 0x8a, 0x7d, 0x57, 0xd8, 0x1a, 0x68, 0x81, 0x76, 0x6d, 0xaf, 0x65, - 0x49, 0x36, 0x2e, 0x20, 0xd5, 0xac, 0x34, 0x5d, 0xe6, 0xd9, 0x95, 0xe9, 0xcc, 0x00, 0x4e, 0xcd, - 0x5b, 0x2d, 0xa9, 0xef, 0x00, 0xdc, 0x22, 0x09, 0x0e, 0x71, 0xec, 0x0e, 0xfb, 0xb2, 0x28, 0xad, - 0xd4, 0x2a, 0xb7, 0x6b, 0x7b, 0x37, 0x33, 0xbd, 0x34, 0x3e, 0xd7, 0xdb, 0x27, 0x38, 0xb6, 0x0f, - 0x4f, 0x67, 0x86, 0xb2, 0x9c, 0x19, 0x37, 0x26, 0x6e, 0x34, 0xec, 0x99, 0x45, 0x01, 0xf3, 0xd3, - 0x37, 0xa3, 0x1d, 0x62, 0x36, 0x18, 0x7b, 0x96, 0x4f, 0xa2, 0x8e, 0xac, 0x52, 0xfc, 0xdc, 0xa1, - 0xc1, 0xcb, 0x0e, 0x9b, 0x8c, 0x10, 0xe5, 0x5a, 0xd4, 0xa9, 0x67, 0xe9, 0xb2, 0x4a, 0xf5, 0x18, - 0xc0, 0xcd, 0x00, 0x0d, 0x51, 0xe8, 0x32, 0x14, 0xf4, 0x5f, 0x24, 0x08, 0x69, 0xe5, 0x75, 0x44, - 0x07, 0x92, 0xa8, 0x21, 0x88, 0x7e, 0x4d, 0x3f, 0x1f, 0xcf, 0xb5, 0x3c, 0xf9, 0x51, 0x82, 0x90, - 0xfa, 0x1e, 0xc0, 0xed, 0x95, 0x5c, 0xd6, 0xa2, 0xca, 0x3a, 0xa0, 0xc7, 0x12, 0x48, 0x2b, 0x02, - 0xfd, 0x53, 0x8f, 0xb6, 0xf2, 0xfc, 0xac, 0x49, 0x16, 0xdc, 0x40, 0x71, 0xd0, 0x67, 0x38, 0x42, - 0xda, 0xa5, 0x16, 0x68, 0x97, 0xed, 0xeb, 0xcb, 0x99, 0x51, 0x17, 0xbb, 0x65, 0x1e, 0xd3, 0xb9, - 0x8c, 0xe2, 0xe0, 0x29, 0x8e, 0x50, 0x6f, 0xe3, 0xcd, 0x89, 0xa1, 0x7c, 0x38, 0x31, 0x14, 0xf3, - 0x33, 0x80, 0xda, 0x3e, 0x89, 0x19, 0x8e, 0xc7, 0x64, 0x4c, 0x0b, 0xa3, 0xe5, 0xc1, 0x1d, 0x3e, - 0x5a, 0x92, 0xb2, 0x30, 0x62, 0xb7, 0xad, 0xdf, 0x8f, 0xbf, 0x75, 0x76, 0x48, 0xe5, 0xb0, 0xa9, - 0xde, 0xd9, 0xf1, 0xbd, 0x0f, 0x21, 0x65, 0x6e, 0xc2, 0x04, 0x7c, 0x89, 0xc3, 0x37, 0x96, 0x33, - 0x63, 0x5b, 0xc0, 0xaf, 0x7c, 0xa6, 0x73, 0x85, 0x1b, 0x85, 0x02, 0x5e, 0x03, 0xd8, 0x78, 0x88, - 0x86, 0xee, 0x24, 0xef, 0xc6, 0x7f, 0xa4, 0xff, 0x89, 0xe3, 0x18, 0xc0, 0xea, 0x13, 0x94, 0x60, - 0x12, 0xa8, 0x4d, 0x58, 0x1d, 0xa2, 0x38, 0x64, 0x03, 0xbe, 0x55, 0xd9, 0x91, 0x96, 0xea, 0xc3, - 0xaa, 0x1b, 0x71, 0x84, 0xb5, 0x77, 0xea, 0x6e, 0x3a, 0x30, 0xe7, 0x1a, 0x0a, 0x29, 0xdd, 0xab, - 0x70, 0x9a, 0x8f, 0x25, 0xd8, 0x14, 0x34, 0xd8, 0xbf, 0x28, 0x87, 0xaa, 0x86, 0xb0, 0x9e, 0x41, - 0x8d, 0x38, 0x3b, 0x95, 0x57, 0x5d, 0xff, 0x13, 0x94, 0x28, 0xd1, 0xd6, 0xe5, 0xf5, 0x6a, 0x0a, - 0xf9, 0x82, 0x88, 0xe9, 0x6c, 0xca, 0x15, 0x11, 0x4e, 0x57, 0xa7, 0x66, 0x1f, 0x9e, 0xce, 0x75, - 0x30, 0x9d, 0xeb, 0xe0, 0xfb, 0x5c, 0x07, 0x6f, 0x17, 0xba, 0x32, 0x5d, 0xe8, 0xca, 0xd7, 0x85, - 0xae, 0x3c, 0xef, 0xfe, 0xb5, 0xf3, 0xaf, 0xe4, 0x2b, 0x2d, 0x3f, 0x0f, 0xfc, 0x20, 0xbc, 0x2a, - 0x7f, 0xa7, 0xef, 0xfd, 0x08, 0x00, 0x00, 0xff, 0xff, 0x97, 0xc5, 0xe2, 0xb4, 0x3d, 0x06, 0x00, - 0x00, + // 596 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x95, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0x7d, 0x4d, 0x08, 0xe5, 0x0a, 0xfd, 0x63, 0xda, 0x60, 0x3a, 0xd8, 0x91, 0x85, 0x50, + 0x85, 0x84, 0xad, 0x16, 0xa6, 0x6e, 0xb8, 0x08, 0x54, 0x26, 0x64, 0x21, 0x06, 0x96, 0xe8, 0x6c, + 0x1f, 0xee, 0x09, 0xdb, 0x17, 0xf9, 0x2e, 0x11, 0xf9, 0x00, 0x48, 0x74, 0x02, 0x31, 0x31, 0x76, + 0x61, 0xe1, 0x43, 0x30, 0x77, 0x60, 0xc8, 0xc8, 0x14, 0x50, 0xf2, 0x0d, 0xf2, 0x09, 0x90, 0xef, + 0xce, 0x0e, 0xb8, 0x40, 0x54, 0x06, 0x24, 0xb6, 0xbc, 0xf7, 0xbe, 0xef, 0x73, 0xbf, 0x7b, 0xef, + 0x39, 0x07, 0xde, 0x08, 0x29, 0x4b, 0x29, 0x73, 0x07, 0x98, 0x71, 0x92, 0xc5, 0xee, 0x60, 0x37, + 0xc0, 0x1c, 0xed, 0x96, 0xb1, 0xd3, 0xcb, 0x29, 0xa7, 0x7a, 0x5b, 0x56, 0x39, 0xe5, 0xaa, 0xaa, + 0xda, 0xde, 0x8c, 0x69, 0x4c, 0x45, 0x89, 0x5b, 0xfc, 0x92, 0xd5, 0xdb, 0xa6, 0xd2, 0x0c, 0x10, + 0xc3, 0x95, 0x60, 0x48, 0x49, 0x56, 0xcb, 0xa3, 0x3e, 0x3f, 0xaa, 0xf2, 0x45, 0x20, 0xf3, 0xf6, + 0xe7, 0x26, 0xd4, 0x3d, 0xc4, 0xf0, 0x53, 0xb9, 0xdb, 0xbd, 0x30, 0xa4, 0xfd, 0x8c, 0xeb, 0x87, + 0xf0, 0x72, 0xa1, 0xd8, 0x45, 0x32, 0x36, 0x40, 0x07, 0xec, 0xac, 0xec, 0x75, 0x1c, 0xc5, 0x26, + 0x04, 0x94, 0x9a, 0x53, 0xb4, 0xab, 0x3e, 0xaf, 0x39, 0x1a, 0x5b, 0xc0, 0x5f, 0x09, 0xe6, 0x4b, + 0xfa, 0x1b, 0x00, 0xd7, 0x69, 0x4e, 0x62, 0x92, 0xa1, 0xa4, 0xab, 0x0e, 0x65, 0x2c, 0x75, 0x1a, + 0x3b, 0x2b, 0x7b, 0xd7, 0x4b, 0xbd, 0xa2, 0xbe, 0xd2, 0x3b, 0xa0, 0x24, 0xf3, 0x0e, 0x4f, 0xc7, + 0x96, 0x36, 0x1b, 0x5b, 0xd7, 0x86, 0x28, 0x4d, 0xf6, 0xed, 0xba, 0x80, 0xfd, 0xf1, 0xab, 0x75, + 0x33, 0x26, 0xfc, 0xa8, 0x1f, 0x38, 0x21, 0x4d, 0xdd, 0x84, 0x64, 0xd8, 0x4d, 0x82, 0xf4, 0x36, + 0x8b, 0x5e, 0xb8, 0x83, 0x3d, 0x97, 0x0f, 0x7b, 0x98, 0x09, 0x25, 0xe6, 0xaf, 0x95, 0xcd, 0xea, + 0x8c, 0xfa, 0x31, 0x80, 0xab, 0x11, 0x4e, 0x70, 0x8c, 0x38, 0x8e, 0xba, 0xcf, 0x73, 0x8c, 0x8d, + 0xc6, 0x22, 0x9e, 0x87, 0x8a, 0x67, 0x4b, 0xf2, 0xfc, 0xdc, 0x7e, 0x1e, 0x9a, 0x2b, 0x55, 0xeb, + 0x83, 0x1c, 0x63, 0xfd, 0x1d, 0x80, 0x1b, 0x73, 0xb1, 0x72, 0x3c, 0xcd, 0x45, 0x38, 0x8f, 0x14, + 0x8e, 0x51, 0xc7, 0xf9, 0x8b, 0xf9, 0xac, 0x57, 0xdd, 0xe5, 0x80, 0x1c, 0xb8, 0x8c, 0xb3, 0xa8, + 0xcb, 0x49, 0x8a, 0x8d, 0x0b, 0x1d, 0xb0, 0xd3, 0xf0, 0xae, 0xce, 0xc6, 0xd6, 0x9a, 0xdc, 0xab, + 0xcc, 0xd8, 0xfe, 0x45, 0x9c, 0x45, 0x4f, 0x48, 0x8a, 0xf7, 0x97, 0x5f, 0x9f, 0x58, 0xda, 0xfb, + 0x13, 0x4b, 0xb3, 0x3f, 0x01, 0x68, 0x1c, 0xd0, 0x8c, 0x93, 0xac, 0x4f, 0xfb, 0xac, 0x66, 0xaa, + 0x00, 0x6e, 0x0a, 0x53, 0x29, 0xc6, 0x9a, 0xb9, 0x6e, 0x39, 0xbf, 0x36, 0xbe, 0x73, 0xd6, 0x9e, + 0xca, 0x66, 0x7a, 0x70, 0xd6, 0xb8, 0x77, 0x21, 0x64, 0x1c, 0xe5, 0x5c, 0xc2, 0x2f, 0x09, 0xf8, + 0xad, 0xd9, 0xd8, 0xda, 0x90, 0xf0, 0xf3, 0x9c, 0xed, 0x5f, 0x12, 0x41, 0xed, 0x00, 0xaf, 0x00, + 0xdc, 0xba, 0x8f, 0x13, 0x34, 0xac, 0xa6, 0xf1, 0x0f, 0xe9, 0x7f, 0xe0, 0x38, 0x06, 0xb0, 0xf5, + 0x18, 0xe7, 0x84, 0x46, 0x7a, 0x1b, 0xb6, 0x12, 0x9c, 0xc5, 0xfc, 0x48, 0x6c, 0xd5, 0xf0, 0x55, + 0xa4, 0x23, 0xd8, 0x42, 0xa9, 0x40, 0x58, 0xf8, 0x9a, 0x9c, 0xc2, 0x2e, 0xe7, 0xb0, 0x84, 0x12, + 0xde, 0x6f, 0x0a, 0x96, 0x0f, 0x4b, 0xb0, 0x2d, 0x59, 0x48, 0xf8, 0xbf, 0x5c, 0xa9, 0x1e, 0xc3, + 0xb5, 0x12, 0xaa, 0x27, 0xd8, 0x99, 0x7a, 0xe4, 0xe6, 0xef, 0xa0, 0xe4, 0x11, 0x3d, 0x53, 0x3d, + 0xad, 0xb6, 0x94, 0xaf, 0x89, 0xd8, 0xfe, 0xaa, 0x5a, 0x91, 0xe5, 0x6c, 0x7e, 0x67, 0xde, 0xe1, + 0xe9, 0xc4, 0x04, 0xa3, 0x89, 0x09, 0xbe, 0x4d, 0x4c, 0xf0, 0x76, 0x6a, 0x6a, 0xa3, 0xa9, 0xa9, + 0x7d, 0x99, 0x9a, 0xda, 0x33, 0xf7, 0x0f, 0x73, 0x7f, 0xa9, 0xbe, 0xcd, 0xea, 0x4f, 0x41, 0x5c, + 0x43, 0xd0, 0x12, 0x5f, 0xe7, 0x3b, 0xdf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x8c, 0xd2, 0x3f, 0x0c, + 0x33, 0x06, 0x00, 0x00, } func (m *BaseVestingAccount) Marshal() (dAtA []byte, err error) { diff --git a/x/auth/vesting/types/vesting_account_test.go b/x/auth/vesting/types/vesting_account_test.go index 5f092ad0f1..f014057436 100644 --- a/x/auth/vesting/types/vesting_account_test.go +++ b/x/auth/vesting/types/vesting_account_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + osttime "github.com/line/ostracon/types/time" "github.com/stretchr/testify/require" - tmtime "github.com/tendermint/tendermint/types/time" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" "github.com/line/lbm-sdk/v2/testutil/testdata" @@ -20,7 +20,7 @@ var ( ) func TestGetVestedCoinsContVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -46,7 +46,7 @@ func TestGetVestedCoinsContVestingAcc(t *testing.T) { } func TestGetVestingCoinsContVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -68,7 +68,7 @@ func TestGetVestingCoinsContVestingAcc(t *testing.T) { } func TestSpendableCoinsContVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -96,7 +96,7 @@ func TestSpendableCoinsContVestingAcc(t *testing.T) { } func TestTrackDelegationContVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -135,7 +135,7 @@ func TestTrackDelegationContVestingAcc(t *testing.T) { } func TestTrackUndelegationContVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -183,7 +183,7 @@ func TestTrackUndelegationContVestingAcc(t *testing.T) { } func TestGetVestedCoinsDelVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -201,7 +201,7 @@ func TestGetVestedCoinsDelVestingAcc(t *testing.T) { } func TestGetVestingCoinsDelVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -219,7 +219,7 @@ func TestGetVestingCoinsDelVestingAcc(t *testing.T) { } func TestSpendableCoinsDelVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -256,7 +256,7 @@ func TestSpendableCoinsDelVestingAcc(t *testing.T) { } func TestTrackDelegationDelVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -293,7 +293,7 @@ func TestTrackDelegationDelVestingAcc(t *testing.T) { } func TestTrackUndelegationDelVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) _, _, addr := testdata.KeyTestPubAddr() @@ -341,7 +341,7 @@ func TestTrackUndelegationDelVestingAcc(t *testing.T) { } func TestGetVestedCoinsPeriodicVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) periods := types.Periods{ types.Period{Length: int64(12 * 60 * 60), Amount: sdk.Coins{sdk.NewInt64Coin(feeDenom, 500), sdk.NewInt64Coin(stakeDenom, 50)}}, @@ -386,7 +386,7 @@ func TestGetVestedCoinsPeriodicVestingAcc(t *testing.T) { } func TestGetVestingCoinsPeriodicVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) periods := types.Periods{ types.Period{Length: int64(12 * 60 * 60), Amount: sdk.Coins{sdk.NewInt64Coin(feeDenom, 500), sdk.NewInt64Coin(stakeDenom, 50)}}, @@ -426,7 +426,7 @@ func TestGetVestingCoinsPeriodicVestingAcc(t *testing.T) { } func TestSpendableCoinsPeriodicVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) periods := types.Periods{ types.Period{Length: int64(12 * 60 * 60), Amount: sdk.Coins{sdk.NewInt64Coin(feeDenom, 500), sdk.NewInt64Coin(stakeDenom, 50)}}, @@ -461,7 +461,7 @@ func TestSpendableCoinsPeriodicVestingAcc(t *testing.T) { } func TestTrackDelegationPeriodicVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) periods := types.Periods{ types.Period{Length: int64(12 * 60 * 60), Amount: sdk.Coins{sdk.NewInt64Coin(feeDenom, 500), sdk.NewInt64Coin(stakeDenom, 50)}}, @@ -519,7 +519,7 @@ func TestTrackDelegationPeriodicVestingAcc(t *testing.T) { } func TestTrackUndelegationPeriodicVestingAcc(t *testing.T) { - now := tmtime.Now() + now := osttime.Now() endTime := now.Add(24 * time.Hour) periods := types.Periods{ types.Period{Length: int64(12 * 60 * 60), Amount: sdk.Coins{sdk.NewInt64Coin(feeDenom, 500), sdk.NewInt64Coin(stakeDenom, 50)}}, diff --git a/x/bank/app_test.go b/x/bank/app_test.go index a4bc945c69..696c3dbd71 100644 --- a/x/bank/app_test.go +++ b/x/bank/app_test.go @@ -3,8 +3,8 @@ package bank_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" @@ -92,7 +92,7 @@ func TestSendNotEnoughBalance(t *testing.T) { genAccs := []authtypes.GenesisAccount{acc} app := simapp.SetupWithGenesisAccounts(genAccs) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) err := app.BankKeeper.SetBalances(ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 67))) require.NoError(t, err) @@ -107,14 +107,14 @@ func TestSendNotEnoughBalance(t *testing.T) { origSeq := res1.GetSequence() sendMsg := types.NewMsgSend(addr1, addr2, sdk.Coins{sdk.NewInt64Coin("foocoin", 100)}) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} txGen := simapp.MakeTestEncodingConfig().TxConfig _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{sendMsg}, "", []uint64{origAccNum}, []uint64{origSeq}, false, false, priv1) require.Error(t, err) simapp.CheckBalance(t, app, addr1, sdk.Coins{sdk.NewInt64Coin("foocoin", 67)}) - res2 := app.AccountKeeper.GetAccount(app.NewContext(true, tmproto.Header{}), addr1) + res2 := app.AccountKeeper.GetAccount(app.NewContext(true, ostproto.Header{}), addr1) require.NotNil(t, res2) require.Equal(t, res2.GetAccountNumber(), origAccNum) @@ -128,7 +128,7 @@ func TestMsgMultiSendWithAccounts(t *testing.T) { genAccs := []authtypes.GenesisAccount{acc} app := simapp.SetupWithGenesisAccounts(genAccs) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) err := app.BankKeeper.SetBalances(ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 67))) require.NoError(t, err) @@ -174,7 +174,7 @@ func TestMsgMultiSendWithAccounts(t *testing.T) { } for _, tc := range testCases { - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} txGen := simapp.MakeTestEncodingConfig().TxConfig _, _, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, tc.msgs, "", tc.accNums, tc.accSeqs, tc.expSimPass, tc.expPass, tc.privKeys...) if tc.expPass { @@ -199,7 +199,7 @@ func TestMsgMultiSendMultipleOut(t *testing.T) { genAccs := []authtypes.GenesisAccount{acc1, acc2} app := simapp.SetupWithGenesisAccounts(genAccs) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) err := app.BankKeeper.SetBalances(ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 42))) require.NoError(t, err) @@ -226,7 +226,7 @@ func TestMsgMultiSendMultipleOut(t *testing.T) { } for _, tc := range testCases { - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} txGen := simapp.MakeTestEncodingConfig().TxConfig _, _, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, tc.msgs, "", tc.accNums, tc.accSeqs, tc.expSimPass, tc.expPass, tc.privKeys...) require.NoError(t, err) @@ -250,7 +250,7 @@ func TestMsgMultiSendMultipleInOut(t *testing.T) { genAccs := []authtypes.GenesisAccount{acc1, acc2, acc4} app := simapp.SetupWithGenesisAccounts(genAccs) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) err := app.BankKeeper.SetBalances(ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 42))) require.NoError(t, err) @@ -281,7 +281,7 @@ func TestMsgMultiSendMultipleInOut(t *testing.T) { } for _, tc := range testCases { - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} txGen := simapp.MakeTestEncodingConfig().TxConfig _, _, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, tc.msgs, "", tc.accNums, tc.accSeqs, tc.expSimPass, tc.expPass, tc.privKeys...) require.NoError(t, err) @@ -300,7 +300,7 @@ func TestMsgMultiSendDependent(t *testing.T) { genAccs := []authtypes.GenesisAccount{acc1, acc2} app := simapp.SetupWithGenesisAccounts(genAccs) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) err = app.BankKeeper.SetBalances(ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 42))) require.NoError(t, err) @@ -334,7 +334,7 @@ func TestMsgMultiSendDependent(t *testing.T) { } for _, tc := range testCases { - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} txGen := simapp.MakeTestEncodingConfig().TxConfig _, _, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, tc.msgs, "", tc.accNums, tc.accSeqs, tc.expSimPass, tc.expPass, tc.privKeys...) require.NoError(t, err) diff --git a/x/bank/bench_test.go b/x/bank/bench_test.go index 0799424254..409431b946 100644 --- a/x/bank/bench_test.go +++ b/x/bank/bench_test.go @@ -3,9 +3,9 @@ package bank_test import ( "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" simappparams "github.com/line/lbm-sdk/v2/simapp/params" @@ -26,7 +26,7 @@ func BenchmarkOneBankSendTxPerBlock(b *testing.B) { // construct genesis state genAccs := []types.GenesisAccount{&acc} benchmarkApp := simapp.SetupWithGenesisAccounts(genAccs) - ctx := benchmarkApp.BaseApp.NewContext(false, tmproto.Header{}) + ctx := benchmarkApp.BaseApp.NewContext(false, ostproto.Header{}) // some value conceivably higher than the benchmarks would ever go err := benchmarkApp.BankKeeper.SetBalances(ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 100000000000))) @@ -45,7 +45,7 @@ func BenchmarkOneBankSendTxPerBlock(b *testing.B) { // Run this with a profiler, so its easy to distinguish what time comes from // Committing, and what time comes from Check/Deliver Tx. for i := 0; i < b.N; i++ { - benchmarkApp.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: height}}) + benchmarkApp.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: height}}) _, _, err := benchmarkApp.Check(txGen.TxEncoder(), txs[i]) if err != nil { panic("something is broken in checking transaction") @@ -68,7 +68,7 @@ func BenchmarkOneBankMultiSendTxPerBlock(b *testing.B) { // Construct genesis state genAccs := []authtypes.GenesisAccount{&acc} benchmarkApp := simapp.SetupWithGenesisAccounts(genAccs) - ctx := benchmarkApp.BaseApp.NewContext(false, tmproto.Header{}) + ctx := benchmarkApp.BaseApp.NewContext(false, ostproto.Header{}) // some value conceivably higher than the benchmarks would ever go err := benchmarkApp.BankKeeper.SetBalances(ctx, addr1, sdk.NewCoins(sdk.NewInt64Coin("foocoin", 100000000000))) @@ -87,7 +87,7 @@ func BenchmarkOneBankMultiSendTxPerBlock(b *testing.B) { // Run this with a profiler, so its easy to distinguish what time comes from // Committing, and what time comes from Check/Deliver Tx. for i := 0; i < b.N; i++ { - benchmarkApp.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: height}}) + benchmarkApp.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: height}}) _, _, err := benchmarkApp.Check(txGen.TxEncoder(), txs[i]) if err != nil { panic("something is broken in checking transaction") diff --git a/x/bank/client/cli/cli_test.go b/x/bank/client/cli/cli_test.go index 8cdccf05e3..af404b1529 100644 --- a/x/bank/client/cli/cli_test.go +++ b/x/bank/client/cli/cli_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/gogo/protobuf/proto" + ostcli "github.com/line/ostracon/libs/cli" "github.com/stretchr/testify/suite" - tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -106,7 +106,7 @@ func (s *IntegrationTestSuite) TestGetBalancesCmd() { "total account balance", []string{ val.Address.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), fmt.Sprintf("--%s=1", flags.FlagHeight), }, false, @@ -123,7 +123,7 @@ func (s *IntegrationTestSuite) TestGetBalancesCmd() { "total account balance of a specific denom", []string{ val.Address.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), fmt.Sprintf("--%s=%s", cli.FlagDenom, s.cfg.BondDenom), fmt.Sprintf("--%s=1", flags.FlagHeight), }, @@ -136,7 +136,7 @@ func (s *IntegrationTestSuite) TestGetBalancesCmd() { []string{ val.Address.String(), fmt.Sprintf("--%s=foobar", cli.FlagDenom), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, &sdk.Coin{}, @@ -176,7 +176,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryTotalSupply() { name: "total supply", args: []string{ fmt.Sprintf("--%s=1", flags.FlagHeight), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, respType: &types.QueryTotalSupplyResponse{}, expected: &types.QueryTotalSupplyResponse{ @@ -190,7 +190,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryTotalSupply() { args: []string{ fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=%s", cli.FlagDenom, s.cfg.BondDenom), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, respType: &sdk.Coin{}, expected: &sdk.Coin{s.cfg.BondDenom, s.cfg.StakingTokens.Add(sdk.NewInt(10))}, @@ -200,7 +200,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryTotalSupply() { args: []string{ fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=foobar", cli.FlagDenom), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, respType: &sdk.Coin{}, expected: &sdk.Coin{"foobar", sdk.ZeroInt()}, @@ -240,7 +240,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDenomsMetadata() { name: "all denoms client metadata", args: []string{ fmt.Sprintf("--%s=1", flags.FlagHeight), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, respType: &types.QueryDenomsMetadataResponse{}, expected: &types.QueryDenomsMetadataResponse{ @@ -288,7 +288,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDenomsMetadata() { args: []string{ fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=%s", cli.FlagDenom, "uatom"), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, respType: &types.QueryDenomMetadataResponse{}, expected: &types.QueryDenomMetadataResponse{ @@ -316,7 +316,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDenomsMetadata() { args: []string{ fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=foobar", cli.FlagDenom), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, expectErr: true, respType: &types.QueryDenomMetadataResponse{}, diff --git a/x/bank/client/testutil/cli_helpers.go b/x/bank/client/testutil/cli_helpers.go index 7ec10dd7f9..f40d91ccec 100644 --- a/x/bank/client/testutil/cli_helpers.go +++ b/x/bank/client/testutil/cli_helpers.go @@ -5,8 +5,8 @@ import ( "fmt" gogogrpc "github.com/gogo/protobuf/grpc" + "github.com/line/ostracon/libs/cli" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/libs/cli" grpc "google.golang.org/grpc" "github.com/line/lbm-sdk/v2/client" diff --git a/x/bank/handler_test.go b/x/bank/handler_test.go index af7192b01d..cf4596001e 100644 --- a/x/bank/handler_test.go +++ b/x/bank/handler_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" "github.com/line/lbm-sdk/v2/simapp" @@ -22,7 +22,7 @@ import ( func TestInvalidMsg(t *testing.T) { h := bank.NewHandler(nil) - res, err := h(sdk.NewContext(nil, tmproto.Header{}, false, nil), testdata.NewTestMsg()) + res, err := h(sdk.NewContext(nil, ostproto.Header{}, false, nil), testdata.NewTestMsg()) require.Error(t, err) require.Nil(t, res) @@ -66,7 +66,7 @@ func TestSendToModuleAccount(t *testing.T) { } app := simapp.SetupWithGenesisAccounts(accs, balances...) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.BankKeeper = bankkeeper.NewBaseKeeper( app.AppCodec(), app.GetKey(types.StoreKey), app.AccountKeeper, app.GetSubspace(types.ModuleName), map[string]bool{ diff --git a/x/bank/keeper/keeper_test.go b/x/bank/keeper/keeper_test.go index edf81a5a0d..7966685b8c 100644 --- a/x/bank/keeper/keeper_test.go +++ b/x/bank/keeper/keeper_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttime "github.com/line/ostracon/types/time" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtime "github.com/tendermint/tendermint/types/time" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp" @@ -68,7 +68,7 @@ type IntegrationTestSuite struct { func (suite *IntegrationTestSuite) SetupTest() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) app.BankKeeper.SetParams(ctx, types.DefaultParams()) @@ -97,7 +97,7 @@ func (suite *IntegrationTestSuite) TestSupply() { func (suite *IntegrationTestSuite) TestSupply_SendCoins() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{Height: 1}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{Height: 1}) appCodec := app.AppCodec() // add module accounts to supply keeper @@ -160,7 +160,7 @@ func (suite *IntegrationTestSuite) TestSupply_SendCoins() { func (suite *IntegrationTestSuite) TestSupply_MintCoins() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{Height: 1}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{Height: 1}) appCodec := app.AppCodec() // add module accounts to supply keeper @@ -214,7 +214,7 @@ func (suite *IntegrationTestSuite) TestSupply_MintCoins() { func (suite *IntegrationTestSuite) TestSupply_BurnCoins() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{Height: 1}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{Height: 1}) appCodec, _ := simapp.MakeCodecs() // add module accounts to supply keeper @@ -407,8 +407,8 @@ func (suite *IntegrationTestSuite) TestSendCoins() { func (suite *IntegrationTestSuite) TestValidateBalance() { app, ctx := suite.app, suite.ctx - now := tmtime.Now() - ctx = ctx.WithBlockHeader(tmproto.Header{Time: now}) + now := osttime.Now() + ctx = ctx.WithBlockHeader(ostproto.Header{Time: now}) endTime := now.Add(24 * time.Hour) addr1 := sdk.AccAddress([]byte("addr1_______________")) @@ -672,8 +672,8 @@ func (suite *IntegrationTestSuite) TestMsgMultiSendEvents() { func (suite *IntegrationTestSuite) TestSpendableCoins() { app, ctx := suite.app, suite.ctx - now := tmtime.Now() - ctx = ctx.WithBlockHeader(tmproto.Header{Time: now}) + now := osttime.Now() + ctx = ctx.WithBlockHeader(ostproto.Header{Time: now}) endTime := now.Add(24 * time.Hour) origCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 100)) @@ -703,8 +703,8 @@ func (suite *IntegrationTestSuite) TestSpendableCoins() { func (suite *IntegrationTestSuite) TestVestingAccountSend() { app, ctx := suite.app, suite.ctx - now := tmtime.Now() - ctx = ctx.WithBlockHeader(tmproto.Header{Time: now}) + now := osttime.Now() + ctx = ctx.WithBlockHeader(ostproto.Header{Time: now}) endTime := now.Add(24 * time.Hour) origCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 100)) @@ -733,8 +733,8 @@ func (suite *IntegrationTestSuite) TestVestingAccountSend() { func (suite *IntegrationTestSuite) TestPeriodicVestingAccountSend() { app, ctx := suite.app, suite.ctx - now := tmtime.Now() - ctx = ctx.WithBlockHeader(tmproto.Header{Time: now}) + now := osttime.Now() + ctx = ctx.WithBlockHeader(ostproto.Header{Time: now}) origCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 100)) sendCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 50)) @@ -766,8 +766,8 @@ func (suite *IntegrationTestSuite) TestPeriodicVestingAccountSend() { func (suite *IntegrationTestSuite) TestVestingAccountReceive() { app, ctx := suite.app, suite.ctx - now := tmtime.Now() - ctx = ctx.WithBlockHeader(tmproto.Header{Time: now}) + now := osttime.Now() + ctx = ctx.WithBlockHeader(ostproto.Header{Time: now}) endTime := now.Add(24 * time.Hour) origCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 100)) @@ -800,8 +800,8 @@ func (suite *IntegrationTestSuite) TestVestingAccountReceive() { func (suite *IntegrationTestSuite) TestPeriodicVestingAccountReceive() { app, ctx := suite.app, suite.ctx - now := tmtime.Now() - ctx = ctx.WithBlockHeader(tmproto.Header{Time: now}) + now := osttime.Now() + ctx = ctx.WithBlockHeader(ostproto.Header{Time: now}) origCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 100)) sendCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 50)) @@ -839,8 +839,8 @@ func (suite *IntegrationTestSuite) TestPeriodicVestingAccountReceive() { func (suite *IntegrationTestSuite) TestDelegateCoins() { app, ctx := suite.app, suite.ctx - now := tmtime.Now() - ctx = ctx.WithBlockHeader(tmproto.Header{Time: now}) + now := osttime.Now() + ctx = ctx.WithBlockHeader(ostproto.Header{Time: now}) endTime := now.Add(24 * time.Hour) origCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 100)) @@ -899,8 +899,8 @@ func (suite *IntegrationTestSuite) TestDelegateCoins_Invalid() { func (suite *IntegrationTestSuite) TestUndelegateCoins() { app, ctx := suite.app, suite.ctx - now := tmtime.Now() - ctx = ctx.WithBlockHeader(tmproto.Header{Time: now}) + now := osttime.Now() + ctx = ctx.WithBlockHeader(ostproto.Header{Time: now}) endTime := now.Add(24 * time.Hour) origCoins := sdk.NewCoins(sdk.NewInt64Coin("stake", 100)) diff --git a/x/bank/keeper/querier.go b/x/bank/keeper/querier.go index 40a16459b4..3cd097775e 100644 --- a/x/bank/keeper/querier.go +++ b/x/bank/keeper/querier.go @@ -1,7 +1,7 @@ package keeper import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/bank/keeper/querier_test.go b/x/bank/keeper/querier_test.go index cd2983a251..e8c5dc6cdc 100644 --- a/x/bank/keeper/querier_test.go +++ b/x/bank/keeper/querier_test.go @@ -3,7 +3,7 @@ package keeper_test import ( "fmt" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/testutil/testdata" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/bank/keeper/view.go b/x/bank/keeper/view.go index c2312f0344..057cc7d391 100644 --- a/x/bank/keeper/view.go +++ b/x/bank/keeper/view.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/store/prefix" diff --git a/x/bank/module.go b/x/bank/module.go index 06415f0450..16f4974ad1 100644 --- a/x/bank/module.go +++ b/x/bank/module.go @@ -9,8 +9,8 @@ import ( "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/bank/simulation/operations_test.go b/x/bank/simulation/operations_test.go index bba70dd382..573a85e664 100644 --- a/x/bank/simulation/operations_test.go +++ b/x/bank/simulation/operations_test.go @@ -4,9 +4,9 @@ import ( "math/rand" "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" simappparams "github.com/line/lbm-sdk/v2/simapp/params" @@ -27,7 +27,7 @@ func (suite *SimTestSuite) SetupTest() { checkTx := false app := simapp.Setup(checkTx) suite.app = app - suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{}) + suite.ctx = app.BaseApp.NewContext(checkTx, ostproto.Header{}) } // TestWeightedOperations tests the weights of the operations. @@ -71,7 +71,7 @@ func (suite *SimTestSuite) TestSimulateMsgSend() { accounts := suite.getTestingAccounts(r, 3) // begin a new block - suite.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) + suite.app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) // execute operation op := simulation.SimulateMsgSend(suite.app.AccountKeeper, suite.app.BankKeeper) @@ -99,7 +99,7 @@ func (suite *SimTestSuite) TestSimulateMsgMultiSend() { accounts := suite.getTestingAccounts(r, 3) // begin a new block - suite.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) + suite.app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) // execute operation op := simulation.SimulateMsgMultiSend(suite.app.AccountKeeper, suite.app.BankKeeper) diff --git a/x/bank/types/bank.pb.go b/x/bank/types/bank.pb.go index 10780dbc3c..58b9a1968e 100644 --- a/x/bank/types/bank.pb.go +++ b/x/bank/types/bank.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" _ "github.com/regen-network/cosmos-proto" io "io" @@ -133,8 +133,8 @@ func (m *SendEnabled) GetEnabled() bool { // Input models transaction input. type Input struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"coins"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Coins github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"coins"` } func (m *Input) Reset() { *m = Input{} } @@ -172,8 +172,8 @@ var xxx_messageInfo_Input proto.InternalMessageInfo // Output models transaction outputs. type Output struct { - Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"coins"` + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Coins github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"coins"` } func (m *Output) Reset() { *m = Output{} } @@ -212,7 +212,7 @@ var xxx_messageInfo_Output proto.InternalMessageInfo // Supply represents a struct that passively keeps track of the total supply // amounts in the network. type Supply struct { - Total github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=total,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"total"` + Total github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,1,rep,name=total,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"total"` } func (m *Supply) Reset() { *m = Supply{} } @@ -403,43 +403,43 @@ func init() { func init() { proto.RegisterFile("cosmos/bank/v1beta1/bank.proto", fileDescriptor_dd052eee12edf988) } var fileDescriptor_dd052eee12edf988 = []byte{ - // 566 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0xbf, 0x6f, 0x13, 0x31, - 0x14, 0x3e, 0x37, 0x4d, 0x48, 0x1d, 0x58, 0x4c, 0x86, 0x6b, 0x24, 0xee, 0x8e, 0x93, 0x90, 0x52, - 0x44, 0x2f, 0x14, 0xc4, 0x92, 0x05, 0x29, 0xa5, 0x42, 0x1d, 0x10, 0xe8, 0x2a, 0x84, 0x04, 0x43, - 0xe4, 0xc4, 0x6e, 0xb0, 0x7a, 0x67, 0x9f, 0x62, 0x1f, 0x6a, 0xfe, 0x03, 0x26, 0x60, 0x44, 0x62, - 0xe9, 0xcc, 0x88, 0xf8, 0x23, 0x3a, 0x56, 0xb0, 0x30, 0x05, 0x94, 0x2c, 0xcc, 0xfd, 0x0b, 0x90, - 0xed, 0xcb, 0x8f, 0x4a, 0x01, 0x31, 0x30, 0x30, 0x9d, 0x9f, 0xdf, 0xf7, 0xbe, 0xf7, 0xe9, 0x7b, - 0xcf, 0x07, 0xbd, 0xbe, 0x90, 0xa9, 0x90, 0xad, 0x1e, 0xe6, 0x47, 0xad, 0x57, 0x3b, 0x3d, 0xaa, - 0xf0, 0x8e, 0x09, 0xa2, 0x6c, 0x28, 0x94, 0x40, 0x57, 0x6d, 0x3e, 0x32, 0x57, 0x45, 0xbe, 0x51, - 0x1f, 0x88, 0x81, 0x30, 0xf9, 0x96, 0x3e, 0x59, 0x68, 0x63, 0xd3, 0x42, 0xbb, 0x36, 0x51, 0xd4, - 0xd9, 0xd4, 0xa2, 0x8b, 0xa4, 0xf3, 0x2e, 0x7d, 0xc1, 0xb8, 0xcd, 0x87, 0x5f, 0x01, 0xac, 0x3c, - 0xc1, 0x43, 0x9c, 0x4a, 0x74, 0x08, 0x2f, 0x4b, 0xca, 0x49, 0x97, 0x72, 0xdc, 0x4b, 0x28, 0x71, - 0x41, 0x50, 0x6a, 0xd6, 0xee, 0x04, 0xd1, 0x0a, 0x1d, 0xd1, 0x01, 0xe5, 0x64, 0xcf, 0xe2, 0x3a, - 0xd7, 0xcf, 0xc7, 0xfe, 0xb5, 0x11, 0x4e, 0x93, 0x76, 0xb8, 0x5c, 0x7f, 0x4b, 0xa4, 0x4c, 0xd1, - 0x34, 0x53, 0xa3, 0x30, 0xae, 0xc9, 0x05, 0x1e, 0xbd, 0x80, 0x75, 0x42, 0x0f, 0x71, 0x9e, 0xa8, - 0xee, 0x85, 0x7e, 0x6b, 0x01, 0x68, 0x56, 0x3b, 0x5b, 0xe7, 0x63, 0xff, 0x86, 0x65, 0x5b, 0x85, - 0x5a, 0x66, 0x45, 0x05, 0x60, 0x49, 0x4c, 0x7b, 0xfd, 0xfd, 0x89, 0xef, 0x84, 0x0f, 0x61, 0x6d, - 0xe9, 0x12, 0xd5, 0x61, 0x99, 0x50, 0x2e, 0x52, 0x17, 0x04, 0xa0, 0xb9, 0x11, 0xdb, 0x00, 0xb9, - 0xf0, 0xd2, 0x85, 0xd6, 0xf1, 0x2c, 0x6c, 0x57, 0x35, 0xc9, 0xcf, 0x13, 0x1f, 0x84, 0x6f, 0x00, - 0x2c, 0xef, 0xf3, 0x2c, 0x57, 0x1a, 0x8d, 0x09, 0x19, 0x52, 0x29, 0x0b, 0x96, 0x59, 0x88, 0x30, - 0x2c, 0x6b, 0x43, 0xa5, 0xbb, 0x66, 0x0c, 0xdb, 0x5c, 0x18, 0x26, 0xe9, 0xdc, 0xb0, 0x5d, 0xc1, - 0x78, 0xe7, 0xf6, 0xe9, 0xd8, 0x77, 0x3e, 0x7e, 0xf7, 0x9b, 0x03, 0xa6, 0x5e, 0xe6, 0xbd, 0xa8, - 0x2f, 0xd2, 0x62, 0x5a, 0xc5, 0x67, 0x5b, 0x92, 0xa3, 0x96, 0x1a, 0x65, 0x54, 0x9a, 0x02, 0x19, - 0x5b, 0xe6, 0x76, 0xf5, 0xb5, 0x15, 0xe4, 0x84, 0x6f, 0x01, 0xac, 0x3c, 0xce, 0xd5, 0x7f, 0xa4, - 0xe8, 0x13, 0x80, 0x95, 0x83, 0x3c, 0xcb, 0x92, 0x91, 0xee, 0xab, 0x84, 0xc2, 0x49, 0xb1, 0x3a, - 0xff, 0xb6, 0xaf, 0x61, 0x6e, 0xef, 0xe9, 0xbe, 0xb3, 0xf1, 0x7c, 0xf9, 0xbc, 0x7d, 0xef, 0xe6, - 0x1f, 0x19, 0x8e, 0xed, 0xf3, 0xa2, 0xc7, 0x99, 0x18, 0x2a, 0x4a, 0x22, 0x2b, 0x74, 0x3f, 0x7c, - 0x06, 0x37, 0x1e, 0xe8, 0x25, 0x78, 0xca, 0x99, 0xfa, 0xcd, 0x7a, 0x34, 0x60, 0x55, 0x97, 0x71, - 0xca, 0x95, 0xd9, 0x8f, 0x2b, 0xf1, 0x3c, 0x36, 0xd6, 0x27, 0x0c, 0x4b, 0x2a, 0xdd, 0x52, 0x50, - 0x32, 0xd6, 0xdb, 0x30, 0xfc, 0x00, 0x60, 0xf5, 0x11, 0x55, 0x98, 0x60, 0x85, 0x51, 0x00, 0x6b, - 0x84, 0xca, 0xfe, 0x90, 0x65, 0x8a, 0x09, 0x5e, 0xd0, 0x2f, 0x5f, 0xa1, 0xfb, 0x1a, 0xc1, 0x45, - 0xda, 0xcd, 0x39, 0x53, 0xb3, 0x79, 0x79, 0x2b, 0x9f, 0xdc, 0x5c, 0x6f, 0x0c, 0xc9, 0xec, 0x28, - 0x11, 0x82, 0xeb, 0xda, 0x5d, 0xb7, 0x64, 0xb8, 0xcd, 0x59, 0xab, 0x23, 0x4c, 0x66, 0x09, 0x1e, - 0xb9, 0xeb, 0x76, 0x31, 0x8a, 0xb0, 0xb3, 0x7b, 0x3a, 0xf1, 0xc0, 0xd9, 0xc4, 0x03, 0x3f, 0x26, - 0x1e, 0x78, 0x37, 0xf5, 0x9c, 0xb3, 0xa9, 0xe7, 0x7c, 0x9b, 0x7a, 0xce, 0xf3, 0xad, 0xbf, 0xb1, - 0xd1, 0xcc, 0xa3, 0x57, 0x31, 0x7f, 0x8e, 0xbb, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x72, - 0xf6, 0xc6, 0xc1, 0x04, 0x00, 0x00, + // 571 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x54, 0xbf, 0x6f, 0xd3, 0x40, + 0x18, 0xf5, 0x35, 0x6d, 0x48, 0x2f, 0xb0, 0x98, 0x0c, 0x6e, 0x24, 0x6c, 0x63, 0x09, 0x08, 0x88, + 0xda, 0x6a, 0xbb, 0x65, 0x41, 0xa4, 0x20, 0xd4, 0x01, 0x81, 0x5c, 0x21, 0x24, 0x18, 0xa2, 0x73, + 0xee, 0x1a, 0x4e, 0xb5, 0xef, 0xac, 0xdc, 0xb9, 0x6a, 0xfe, 0x03, 0x06, 0x90, 0x18, 0x91, 0x58, + 0x3a, 0x33, 0x30, 0xf1, 0x47, 0x74, 0xac, 0x60, 0x61, 0x0a, 0x28, 0x59, 0x98, 0xfb, 0x17, 0xa0, + 0xbb, 0x73, 0x7e, 0x54, 0x0a, 0xb0, 0x30, 0xb0, 0xdd, 0x77, 0xdf, 0xbb, 0xf7, 0x9e, 0xde, 0xf7, + 0xd9, 0xd0, 0xed, 0x71, 0x91, 0x71, 0x11, 0x25, 0x88, 0x1d, 0x46, 0x47, 0x5b, 0x09, 0x91, 0x68, + 0x4b, 0x17, 0x61, 0x3e, 0xe0, 0x92, 0xdb, 0x57, 0x4d, 0x3f, 0xd4, 0x57, 0x65, 0xbf, 0xd9, 0xe8, + 0xf3, 0x3e, 0xd7, 0xfd, 0x48, 0x9d, 0x0c, 0xb4, 0xb9, 0x61, 0xa0, 0x5d, 0xd3, 0x28, 0xdf, 0x99, + 0xd6, 0x5c, 0x45, 0x90, 0x99, 0x4a, 0x8f, 0x53, 0x66, 0xfa, 0xc1, 0x57, 0x00, 0xab, 0x4f, 0xd1, + 0x00, 0x65, 0xc2, 0x3e, 0x80, 0x97, 0x05, 0x61, 0xb8, 0x4b, 0x18, 0x4a, 0x52, 0x82, 0x1d, 0xe0, + 0x57, 0x5a, 0xf5, 0x6d, 0x3f, 0x5c, 0xe2, 0x23, 0xdc, 0x27, 0x0c, 0x3f, 0x34, 0xb8, 0xce, 0xf5, + 0xf3, 0x91, 0x77, 0x6d, 0x88, 0xb2, 0xb4, 0x1d, 0x2c, 0xbe, 0xbf, 0xcb, 0x33, 0x2a, 0x49, 0x96, + 0xcb, 0x61, 0x10, 0xd7, 0xc5, 0x1c, 0x6f, 0xbf, 0x84, 0x0d, 0x4c, 0x0e, 0x50, 0x91, 0xca, 0xee, + 0x05, 0xbd, 0x15, 0x1f, 0xb4, 0x6a, 0x9d, 0xdb, 0xe7, 0x23, 0xef, 0x86, 0x61, 0x5b, 0x86, 0x5a, + 0x64, 0xb5, 0x4b, 0xc0, 0x82, 0x99, 0xf6, 0xea, 0xfb, 0x13, 0xcf, 0x0a, 0x1e, 0xc1, 0xfa, 0xc2, + 0xa5, 0xdd, 0x80, 0x6b, 0x98, 0x30, 0x9e, 0x39, 0xc0, 0x07, 0xad, 0xf5, 0xd8, 0x14, 0xb6, 0x03, + 0x2f, 0x5d, 0x90, 0x8e, 0xa7, 0x65, 0xbb, 0xa6, 0x48, 0x7e, 0x9e, 0x78, 0x20, 0x78, 0x03, 0xe0, + 0xda, 0x1e, 0xcb, 0x0b, 0xa9, 0xd0, 0x08, 0xe3, 0x01, 0x11, 0xa2, 0x64, 0x99, 0x96, 0x76, 0x17, + 0xae, 0xa9, 0x40, 0x85, 0xb3, 0xa2, 0x03, 0xdb, 0x98, 0x07, 0x26, 0xc8, 0x2c, 0xb0, 0x5d, 0x4e, + 0x59, 0x27, 0x3c, 0x1d, 0x79, 0xd6, 0xc7, 0xef, 0xde, 0xcd, 0x3e, 0x95, 0xaf, 0x8a, 0x24, 0xec, + 0xf1, 0x2c, 0x4a, 0x29, 0x23, 0x51, 0x9a, 0x64, 0x9b, 0x02, 0x1f, 0x46, 0x47, 0xdb, 0x91, 0x1c, + 0xe6, 0x44, 0x68, 0xb8, 0x88, 0x0d, 0x6f, 0xbb, 0xf6, 0xda, 0xd8, 0xb1, 0x82, 0xb7, 0x00, 0x56, + 0x9f, 0x14, 0xf2, 0xbf, 0xf1, 0xf3, 0x09, 0xc0, 0xea, 0x7e, 0x91, 0xe7, 0xe9, 0x50, 0xa9, 0x4a, + 0x2e, 0x51, 0x5a, 0xae, 0xcd, 0xbf, 0x54, 0xd5, 0xbc, 0xed, 0x5d, 0xa5, 0x3a, 0x1d, 0xcc, 0x97, + 0xcf, 0x9b, 0x3b, 0x77, 0xfe, 0xf0, 0xfe, 0xd8, 0x7c, 0x56, 0xe4, 0x38, 0xe7, 0x03, 0x49, 0x70, + 0x68, 0x4c, 0xee, 0x05, 0xcf, 0xe1, 0xfa, 0x03, 0x35, 0xfc, 0x67, 0x8c, 0xca, 0xdf, 0xac, 0x45, + 0x13, 0xd6, 0xd4, 0x33, 0x46, 0x98, 0xd4, 0x7b, 0x71, 0x25, 0x9e, 0xd5, 0x3a, 0xf4, 0x94, 0x22, + 0x41, 0x84, 0x53, 0xf1, 0x2b, 0x3a, 0x74, 0x53, 0x06, 0x1f, 0x00, 0xac, 0x3d, 0x26, 0x12, 0x61, + 0x24, 0x91, 0xed, 0xc3, 0x3a, 0x26, 0xa2, 0x37, 0xa0, 0xb9, 0xa4, 0x9c, 0x95, 0xf4, 0x8b, 0x57, + 0xf6, 0x3d, 0x85, 0x60, 0x3c, 0xeb, 0x16, 0x8c, 0xca, 0xe9, 0xa4, 0xdc, 0xa5, 0x9f, 0xda, 0xcc, + 0x6f, 0x0c, 0xf1, 0xf4, 0x28, 0x6c, 0x1b, 0xae, 0xaa, 0x64, 0x9d, 0x8a, 0xe6, 0xd6, 0x67, 0xe5, + 0x0e, 0x53, 0x91, 0xa7, 0x68, 0xe8, 0xac, 0x9a, 0x95, 0x28, 0xcb, 0xce, 0xfd, 0xd3, 0xb1, 0x0b, + 0xce, 0xc6, 0x2e, 0xf8, 0x31, 0x76, 0xc1, 0xbb, 0x89, 0x6b, 0x9d, 0x4d, 0x5c, 0xeb, 0xdb, 0xc4, + 0xb5, 0x5e, 0xdc, 0xfa, 0x7b, 0x88, 0x7a, 0x16, 0x49, 0x55, 0xff, 0x2f, 0x76, 0x7e, 0x05, 0x00, + 0x00, 0xff, 0xff, 0x7b, 0x93, 0xbf, 0x9c, 0xb7, 0x04, 0x00, 0x00, } func (this *SendEnabled) Equal(that interface{}) bool { diff --git a/x/bank/types/genesis.pb.go b/x/bank/types/genesis.pb.go index ccce2bb651..2e3ba953a3 100644 --- a/x/bank/types/genesis.pb.go +++ b/x/bank/types/genesis.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" io "io" math "math" @@ -32,7 +32,7 @@ type GenesisState struct { // balances is an array containing the balances of all the accounts. Balances []Balance `protobuf:"bytes,2,rep,name=balances,proto3" json:"balances"` // supply represents the total supply. - Supply github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=supply,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"supply"` + Supply github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,3,rep,name=supply,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"supply"` // denom_metadata defines the metadata of the differents coins. DenomMetadata []Metadata `protobuf:"bytes,4,rep,name=denom_metadata,json=denomMetadata,proto3" json:"denom_metadata" yaml:"denom_metadata"` } @@ -84,7 +84,7 @@ func (m *GenesisState) GetBalances() []Balance { return nil } -func (m *GenesisState) GetSupply() github_com_cosmos_cosmos_sdk_types.Coins { +func (m *GenesisState) GetSupply() github_com_line_lbm_sdk_v2_types.Coins { if m != nil { return m.Supply } @@ -104,7 +104,7 @@ type Balance struct { // address is the address of the balance holder. Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // coins defines the different coins this balance holds. - Coins github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"coins"` + Coins github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,2,rep,name=coins,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"coins"` } func (m *Balance) Reset() { *m = Balance{} } @@ -148,31 +148,32 @@ func init() { func init() { proto.RegisterFile("cosmos/bank/v1beta1/genesis.proto", fileDescriptor_8f007de11b420c6e) } var fileDescriptor_8f007de11b420c6e = []byte{ - // 383 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0x3f, 0x4f, 0xc2, 0x40, - 0x18, 0x87, 0x5b, 0x40, 0xc0, 0x43, 0x1d, 0xaa, 0x26, 0x15, 0xa5, 0xc5, 0x4e, 0x38, 0xd8, 0x0a, - 0x4e, 0x32, 0x38, 0x94, 0xc1, 0xc9, 0xc4, 0xd4, 0xcd, 0xc5, 0x5c, 0xdb, 0x4b, 0x6d, 0xa0, 0xbd, - 0x86, 0x3b, 0x8c, 0x7c, 0x03, 0x47, 0x3e, 0x02, 0xb3, 0x9f, 0x84, 0x91, 0xc4, 0xc5, 0x09, 0x0d, - 0x2c, 0xce, 0x7e, 0x02, 0xd3, 0xbb, 0xa3, 0x6a, 0x24, 0x4e, 0x4e, 0xfd, 0xf3, 0xfe, 0x9e, 0xe7, - 0xbd, 0xf7, 0xee, 0xc0, 0xa1, 0x87, 0x49, 0x84, 0x89, 0xe5, 0xc2, 0xb8, 0x6b, 0xdd, 0x37, 0x5d, - 0x44, 0x61, 0xd3, 0x0a, 0x50, 0x8c, 0x48, 0x48, 0xcc, 0xa4, 0x8f, 0x29, 0x56, 0xb6, 0x79, 0xc4, - 0x4c, 0x23, 0xa6, 0x88, 0x54, 0x77, 0x02, 0x1c, 0x60, 0x56, 0xb7, 0xd2, 0x37, 0x1e, 0xad, 0x6a, - 0x99, 0x8d, 0xa0, 0xcc, 0xe6, 0xe1, 0x30, 0xfe, 0x55, 0xff, 0xd6, 0x8d, 0x79, 0x59, 0xdd, 0x78, - 0xce, 0x81, 0x8d, 0x0b, 0xde, 0xfc, 0x9a, 0x42, 0x8a, 0x94, 0x33, 0x50, 0x4c, 0x60, 0x1f, 0x46, - 0x44, 0x95, 0xeb, 0x72, 0xa3, 0xd2, 0xda, 0x37, 0x57, 0x2c, 0xc6, 0xbc, 0x62, 0x11, 0xbb, 0x30, - 0x99, 0xe9, 0x92, 0x23, 0x00, 0xe5, 0x1c, 0x94, 0x5d, 0xd8, 0x83, 0xb1, 0x87, 0x88, 0x9a, 0xab, - 0xe7, 0x1b, 0x95, 0xd6, 0xc1, 0x4a, 0xd8, 0xe6, 0x21, 0x41, 0x67, 0x8c, 0xe2, 0x81, 0x22, 0x19, - 0x24, 0x49, 0x6f, 0xa8, 0xe6, 0x19, 0xbd, 0xf7, 0x45, 0x13, 0x94, 0xd1, 0x1d, 0x1c, 0xc6, 0xf6, - 0x49, 0x8a, 0x3e, 0xbd, 0xea, 0x8d, 0x20, 0xa4, 0x77, 0x03, 0xd7, 0xf4, 0x70, 0x64, 0x89, 0x49, - 0xf9, 0xe3, 0x98, 0xf8, 0x5d, 0x8b, 0x0e, 0x13, 0x44, 0x18, 0x40, 0x1c, 0xa1, 0x56, 0x3c, 0xb0, - 0xe5, 0xa3, 0x18, 0x47, 0xb7, 0x11, 0xa2, 0xd0, 0x87, 0x14, 0xaa, 0x05, 0xd6, 0xac, 0xb6, 0x72, - 0xa9, 0x97, 0x22, 0x64, 0xd7, 0xd2, 0x86, 0x1f, 0x33, 0x7d, 0x77, 0x08, 0xa3, 0x5e, 0xdb, 0xf8, - 0xa9, 0x30, 0x9c, 0x4d, 0xf6, 0x63, 0x99, 0x36, 0x46, 0x32, 0x28, 0x89, 0x29, 0x15, 0x15, 0x94, - 0xa0, 0xef, 0xf7, 0x11, 0xe1, 0x3b, 0xba, 0xee, 0x2c, 0x3f, 0x15, 0x08, 0xd6, 0xd2, 0x93, 0x5a, - 0x6e, 0xd6, 0xbf, 0x8e, 0xcb, 0xcd, 0xed, 0xf2, 0xe3, 0x58, 0x97, 0xde, 0xc7, 0xba, 0x64, 0x77, - 0x26, 0x73, 0x4d, 0x9e, 0xce, 0x35, 0xf9, 0x6d, 0xae, 0xc9, 0xa3, 0x85, 0x26, 0x4d, 0x17, 0x9a, - 0xf4, 0xb2, 0xd0, 0xa4, 0x9b, 0xa3, 0x3f, 0xa5, 0x0f, 0xfc, 0xea, 0x30, 0xb7, 0x5b, 0x64, 0x97, - 0xe6, 0xf4, 0x33, 0x00, 0x00, 0xff, 0xff, 0x15, 0x28, 0xf0, 0x44, 0xc4, 0x02, 0x00, 0x00, + // 388 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xb1, 0x4e, 0xc2, 0x40, + 0x1c, 0xc6, 0x5b, 0x40, 0xc0, 0x43, 0x1d, 0xaa, 0x26, 0x15, 0xa5, 0xc5, 0x0e, 0xca, 0x62, 0x2f, + 0xe0, 0x24, 0x83, 0x89, 0x75, 0x70, 0x32, 0x31, 0x75, 0x73, 0x21, 0xd7, 0xf6, 0x52, 0x1b, 0xda, + 0x5e, 0xc3, 0x1d, 0x44, 0xde, 0xc0, 0xc9, 0xf8, 0x08, 0xcc, 0x3e, 0x09, 0x23, 0x6e, 0x4e, 0x68, + 0x60, 0x71, 0xf6, 0x09, 0x4c, 0xaf, 0xa5, 0x6a, 0x24, 0x4e, 0x6e, 0x6d, 0xff, 0xbf, 0xef, 0xf7, + 0xdd, 0x5d, 0x0f, 0xec, 0xdb, 0x84, 0x06, 0x84, 0x42, 0x0b, 0x85, 0x5d, 0x38, 0x68, 0x5a, 0x98, + 0xa1, 0x26, 0x74, 0x71, 0x88, 0xa9, 0x47, 0xf5, 0xa8, 0x47, 0x18, 0x91, 0x36, 0x13, 0x44, 0x8f, + 0x11, 0x3d, 0x45, 0xaa, 0x5b, 0x2e, 0x71, 0x09, 0x9f, 0xc3, 0xf8, 0x29, 0x41, 0xab, 0x4a, 0x66, + 0xa3, 0x38, 0xb3, 0xd9, 0xc4, 0x0b, 0x7f, 0xcd, 0xbf, 0xb5, 0x71, 0x2f, 0x9f, 0x6b, 0xcf, 0x39, + 0xb0, 0x76, 0x91, 0x94, 0x5f, 0x33, 0xc4, 0xb0, 0x74, 0x02, 0x8a, 0x11, 0xea, 0xa1, 0x80, 0xca, + 0x62, 0x5d, 0x6c, 0x54, 0x5a, 0xbb, 0xfa, 0x92, 0xc5, 0xe8, 0x57, 0x1c, 0x31, 0x0a, 0xe3, 0xa9, + 0x2a, 0x98, 0x69, 0x40, 0x3a, 0x05, 0x65, 0x0b, 0xf9, 0x28, 0xb4, 0x31, 0x95, 0x73, 0xf5, 0x7c, + 0xa3, 0xd2, 0xda, 0x5b, 0x1a, 0x36, 0x12, 0x28, 0x4d, 0x67, 0x19, 0x09, 0x81, 0x22, 0xed, 0x47, + 0x91, 0x3f, 0x94, 0xf3, 0x3c, 0xbd, 0xf3, 0x95, 0xa6, 0x38, 0x4b, 0x9f, 0x13, 0x2f, 0x34, 0xf4, + 0x38, 0xfa, 0xf4, 0xaa, 0x1e, 0xb8, 0x1e, 0xbb, 0xed, 0x5b, 0xba, 0x4d, 0x02, 0xe8, 0x7b, 0x21, + 0x86, 0xbe, 0x15, 0x1c, 0x51, 0xa7, 0x0b, 0x07, 0x2d, 0xc8, 0x86, 0x11, 0xa6, 0x1c, 0xa7, 0x66, + 0x2a, 0x96, 0x6c, 0xb0, 0xe1, 0xe0, 0x90, 0x04, 0x9d, 0x00, 0x33, 0xe4, 0x20, 0x86, 0xe4, 0x02, + 0xaf, 0xaa, 0x2d, 0x5d, 0xe8, 0x65, 0x0a, 0x19, 0xb5, 0xb8, 0xee, 0x63, 0xaa, 0x6e, 0x0f, 0x51, + 0xe0, 0xb7, 0xb5, 0x9f, 0x0a, 0xcd, 0x5c, 0xe7, 0x1f, 0x16, 0xb4, 0xf6, 0x20, 0x82, 0x52, 0xba, + 0x47, 0x49, 0x06, 0x25, 0xe4, 0x38, 0x3d, 0x4c, 0x93, 0xf3, 0x5c, 0x35, 0x17, 0xaf, 0x52, 0x07, + 0xac, 0xc4, 0xff, 0x69, 0x71, 0x54, 0xff, 0xb8, 0xd9, 0xc4, 0xdb, 0x2e, 0xdf, 0x8f, 0x54, 0xe1, + 0x7d, 0xa4, 0x0a, 0xc6, 0xd9, 0x78, 0xa6, 0x88, 0x93, 0x99, 0x22, 0xbe, 0xcd, 0x14, 0xf1, 0x71, + 0xae, 0x08, 0x93, 0xb9, 0x22, 0xbc, 0xcc, 0x15, 0xe1, 0xe6, 0xf0, 0x0f, 0xe5, 0x5d, 0x72, 0x69, + 0xb8, 0xd9, 0x2a, 0xf2, 0xeb, 0x72, 0xfc, 0x19, 0x00, 0x00, 0xff, 0xff, 0x85, 0xf1, 0x20, 0x88, + 0xbe, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/bank/types/query.pb.go b/x/bank/types/query.pb.go index 6879e0e2ff..997b15476a 100644 --- a/x/bank/types/query.pb.go +++ b/x/bank/types/query.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" query "github.com/line/lbm-sdk/v2/types/query" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -164,7 +164,7 @@ var xxx_messageInfo_QueryAllBalancesRequest proto.InternalMessageInfo // method. type QueryAllBalancesResponse struct { // balances is the balances of all the coins. - Balances github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=balances,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"balances"` + Balances github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,1,rep,name=balances,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"balances"` // pagination defines the pagination in the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -202,7 +202,7 @@ func (m *QueryAllBalancesResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryAllBalancesResponse proto.InternalMessageInfo -func (m *QueryAllBalancesResponse) GetBalances() github_com_cosmos_cosmos_sdk_types.Coins { +func (m *QueryAllBalancesResponse) GetBalances() github_com_line_lbm_sdk_v2_types.Coins { if m != nil { return m.Balances } @@ -258,7 +258,7 @@ var xxx_messageInfo_QueryTotalSupplyRequest proto.InternalMessageInfo // method type QueryTotalSupplyResponse struct { // supply is the supply of the coins - Supply github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=supply,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"supply"` + Supply github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,1,rep,name=supply,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"supply"` } func (m *QueryTotalSupplyResponse) Reset() { *m = QueryTotalSupplyResponse{} } @@ -294,7 +294,7 @@ func (m *QueryTotalSupplyResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryTotalSupplyResponse proto.InternalMessageInfo -func (m *QueryTotalSupplyResponse) GetSupply() github_com_cosmos_cosmos_sdk_types.Coins { +func (m *QueryTotalSupplyResponse) GetSupply() github_com_line_lbm_sdk_v2_types.Coins { if m != nil { return m.Supply } @@ -690,59 +690,59 @@ func init() { func init() { proto.RegisterFile("cosmos/bank/v1beta1/query.proto", fileDescriptor_9c6fc1939682df13) } var fileDescriptor_9c6fc1939682df13 = []byte{ - // 824 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6b, 0x13, 0x5b, - 0x14, 0xce, 0xed, 0x7b, 0x4d, 0xd3, 0x13, 0xde, 0x5b, 0xdc, 0xe6, 0xf1, 0xd2, 0xe9, 0x6b, 0xf2, - 0x98, 0x6a, 0x9b, 0xd6, 0x74, 0xa6, 0x69, 0x85, 0xa2, 0x1b, 0x69, 0x2a, 0xba, 0x10, 0x69, 0x8c, - 0xae, 0x04, 0x91, 0x9b, 0x64, 0x1c, 0x43, 0x93, 0xb9, 0xd3, 0xdc, 0x89, 0x58, 0x4a, 0x51, 0x04, - 0xc1, 0x95, 0x0a, 0x2e, 0x5c, 0xb8, 0xa9, 0x1b, 0x41, 0x97, 0xfe, 0x15, 0x5d, 0xb8, 0x28, 0xb8, - 0x71, 0xa5, 0xd2, 0xba, 0xf0, 0xcf, 0x90, 0xdc, 0x1f, 0xd3, 0x49, 0x32, 0x4d, 0x06, 0xd1, 0x55, - 0x66, 0xee, 0x3d, 0xe7, 0x3b, 0xdf, 0x77, 0xee, 0xb9, 0xdf, 0x04, 0xb2, 0x55, 0xca, 0x9a, 0x94, - 0x99, 0x15, 0xe2, 0x6c, 0x9a, 0xf7, 0x0a, 0x15, 0xcb, 0x23, 0x05, 0x73, 0xab, 0x6d, 0xb5, 0xb6, - 0x0d, 0xb7, 0x45, 0x3d, 0x8a, 0x27, 0x44, 0x80, 0xd1, 0x09, 0x30, 0x64, 0x80, 0xb6, 0xe0, 0x67, - 0x31, 0x4b, 0x44, 0xfb, 0xb9, 0x2e, 0xb1, 0xeb, 0x0e, 0xf1, 0xea, 0xd4, 0x11, 0x00, 0x5a, 0xca, - 0xa6, 0x36, 0xe5, 0x8f, 0x66, 0xe7, 0x49, 0xae, 0xfe, 0x67, 0x53, 0x6a, 0x37, 0x2c, 0x93, 0xb8, - 0x75, 0x93, 0x38, 0x0e, 0xf5, 0x78, 0x0a, 0x93, 0xbb, 0x99, 0x20, 0xbe, 0x42, 0xae, 0xd2, 0xba, - 0xd3, 0xb7, 0x1f, 0x60, 0xcd, 0x19, 0xf2, 0x7d, 0x7d, 0x03, 0x26, 0xae, 0x75, 0x58, 0x15, 0x49, - 0x83, 0x38, 0x55, 0xab, 0x6c, 0x6d, 0xb5, 0x2d, 0xe6, 0xe1, 0x34, 0x8c, 0x91, 0x5a, 0xad, 0x65, - 0x31, 0x96, 0x46, 0xff, 0xa3, 0xdc, 0x78, 0x59, 0xbd, 0xe2, 0x14, 0x8c, 0xd6, 0x2c, 0x87, 0x36, - 0xd3, 0x23, 0x7c, 0x5d, 0xbc, 0x9c, 0x4f, 0x3c, 0xd9, 0xcb, 0xc6, 0xbe, 0xef, 0x65, 0x63, 0xfa, - 0x15, 0x48, 0x75, 0x03, 0x32, 0x97, 0x3a, 0xcc, 0xc2, 0x2b, 0x30, 0x56, 0x11, 0x4b, 0x1c, 0x31, - 0xb9, 0x3c, 0x69, 0xf8, 0xfd, 0x62, 0x96, 0xea, 0x97, 0xb1, 0x4e, 0xeb, 0x4e, 0x59, 0x45, 0xea, - 0x8f, 0x11, 0xfc, 0xcb, 0xd1, 0xd6, 0x1a, 0x0d, 0x09, 0xc8, 0x86, 0x53, 0xbc, 0x04, 0x70, 0xdc, - 0x5b, 0xce, 0x33, 0xb9, 0x3c, 0xdb, 0x55, 0x4d, 0x1c, 0x9b, 0xaa, 0x59, 0x22, 0xb6, 0x12, 0x5e, - 0x0e, 0x64, 0x06, 0x44, 0x7d, 0x40, 0x90, 0xee, 0xe7, 0x21, 0x95, 0xd9, 0x90, 0x90, 0x7c, 0x3b, - 0x4c, 0xfe, 0x18, 0x28, 0xad, 0xb8, 0xb4, 0xff, 0x39, 0x1b, 0x7b, 0xf7, 0x25, 0x9b, 0xb3, 0xeb, - 0xde, 0xdd, 0x76, 0xc5, 0xa8, 0xd2, 0xa6, 0x29, 0x8f, 0x48, 0xfc, 0x2c, 0xb2, 0xda, 0xa6, 0xe9, - 0x6d, 0xbb, 0x16, 0xe3, 0x09, 0xac, 0xec, 0x83, 0xe3, 0xcb, 0x21, 0xba, 0xe6, 0x86, 0xea, 0x12, - 0x2c, 0x83, 0xc2, 0xf4, 0x49, 0xd9, 0xd5, 0x1b, 0xd4, 0x23, 0x8d, 0xeb, 0x6d, 0xd7, 0x6d, 0x6c, - 0x4b, 0xfd, 0xfa, 0x03, 0x29, 0xb4, 0x6b, 0x4b, 0x0a, 0xad, 0x42, 0x9c, 0xf1, 0x95, 0xdf, 0x21, - 0x53, 0x42, 0xeb, 0x79, 0x39, 0x3f, 0xa2, 0xf6, 0xc6, 0x1d, 0x75, 0xdc, 0xfe, 0xdc, 0xa1, 0xc0, - 0xdc, 0xe9, 0x25, 0xf8, 0xa7, 0x27, 0x5a, 0x72, 0x5d, 0x85, 0x38, 0x69, 0xd2, 0xb6, 0xe3, 0x0d, - 0x9d, 0xb6, 0xe2, 0x9f, 0x1d, 0xae, 0x65, 0x19, 0xae, 0xa7, 0x00, 0x73, 0xc4, 0x12, 0x69, 0x91, - 0xa6, 0x1a, 0x36, 0xbd, 0x24, 0xaf, 0x89, 0x5a, 0x95, 0x55, 0xce, 0x41, 0xdc, 0xe5, 0x2b, 0xb2, - 0xca, 0x94, 0x11, 0xe2, 0x01, 0x86, 0x48, 0x52, 0x75, 0x44, 0x82, 0x5e, 0x03, 0x8d, 0x23, 0x5e, - 0xec, 0xe8, 0x60, 0x57, 0x2d, 0x8f, 0xd4, 0x88, 0x47, 0x94, 0xda, 0xee, 0x11, 0x46, 0x3f, 0x3b, - 0xc2, 0xfa, 0x5b, 0x04, 0x53, 0xa1, 0x65, 0xa4, 0x80, 0x35, 0x18, 0x6f, 0xca, 0x35, 0x35, 0xbc, - 0xd3, 0xa1, 0x1a, 0x54, 0xa6, 0x54, 0x71, 0x9c, 0xf5, 0xeb, 0xa6, 0xb2, 0x00, 0x93, 0xc7, 0x54, - 0x7b, 0x1b, 0x12, 0x7e, 0xfc, 0xb7, 0x82, 0x4d, 0xec, 0x13, 0x77, 0x01, 0x12, 0x8a, 0xa6, 0x6c, - 0x61, 0x24, 0x6d, 0x7e, 0xd2, 0xf2, 0xfb, 0x04, 0x8c, 0x72, 0x7c, 0xfc, 0x12, 0xc1, 0x98, 0xbc, - 0xf8, 0x38, 0x17, 0x0a, 0x12, 0xe2, 0xa2, 0xda, 0x7c, 0x84, 0x48, 0xc1, 0x55, 0x5f, 0x7d, 0xf4, - 0xf1, 0xdb, 0x8b, 0x91, 0x02, 0x36, 0xcd, 0x70, 0xc3, 0x16, 0x16, 0x60, 0xee, 0x48, 0x8f, 0xdb, - 0x35, 0x77, 0x78, 0x07, 0x76, 0xf1, 0x2b, 0x04, 0xc9, 0x80, 0x2b, 0xe1, 0xfc, 0xc9, 0x35, 0xfb, - 0x4d, 0x54, 0x5b, 0x8c, 0x18, 0x2d, 0x59, 0x9a, 0x9c, 0xe5, 0x3c, 0x9e, 0x8b, 0xc8, 0x12, 0x3f, - 0x43, 0x90, 0x0c, 0x58, 0xc9, 0x20, 0x76, 0xfd, 0x66, 0x34, 0x88, 0x5d, 0x88, 0x3f, 0xe9, 0x33, - 0x9c, 0xdd, 0x34, 0x9e, 0x0a, 0x65, 0x27, 0xfc, 0x05, 0x3f, 0x45, 0x90, 0x50, 0x6e, 0x81, 0x07, - 0x1c, 0x50, 0x8f, 0xff, 0x68, 0x0b, 0x51, 0x42, 0x25, 0x91, 0x33, 0x9c, 0xc8, 0x69, 0x3c, 0x33, - 0x80, 0x88, 0x7f, 0x80, 0x0f, 0x11, 0xc4, 0x85, 0x43, 0xe0, 0xb9, 0x93, 0x6b, 0x74, 0xd9, 0x91, - 0x96, 0x1b, 0x1e, 0x18, 0xa9, 0x27, 0xc2, 0x8b, 0xf0, 0x1b, 0x04, 0x7f, 0x75, 0x5d, 0x21, 0x6c, - 0x9c, 0x5c, 0x20, 0xec, 0x7a, 0x6a, 0x66, 0xe4, 0x78, 0xc9, 0xeb, 0x2c, 0xe7, 0x65, 0xe0, 0x7c, - 0x28, 0x2f, 0xde, 0x1a, 0x76, 0x5b, 0x5d, 0x44, 0xbf, 0x57, 0xaf, 0x11, 0xfc, 0xdd, 0xed, 0x64, - 0x78, 0x58, 0xe5, 0x5e, 0x6b, 0xd5, 0x96, 0xa2, 0x27, 0x48, 0xae, 0x79, 0xce, 0x75, 0x16, 0x9f, - 0x8a, 0xc2, 0xb5, 0xb8, 0xbe, 0x7f, 0x98, 0x41, 0x07, 0x87, 0x19, 0xf4, 0xf5, 0x30, 0x83, 0x9e, - 0x1f, 0x65, 0x62, 0x07, 0x47, 0x99, 0xd8, 0xa7, 0xa3, 0x4c, 0xec, 0xe6, 0xfc, 0xc0, 0x8f, 0xe1, - 0x7d, 0x01, 0xcb, 0xbf, 0x89, 0x95, 0x38, 0xff, 0x77, 0xb6, 0xf2, 0x23, 0x00, 0x00, 0xff, 0xff, - 0xb4, 0xd4, 0xb0, 0xfc, 0x75, 0x0a, 0x00, 0x00, + // 827 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x4d, 0x6b, 0x13, 0x5b, + 0x18, 0xc7, 0x73, 0x7a, 0x6f, 0xd3, 0xf4, 0x84, 0x7b, 0x17, 0xa7, 0xb9, 0xdc, 0x74, 0x7a, 0x9b, + 0x5c, 0xa6, 0xda, 0xb4, 0x35, 0x9d, 0x63, 0x52, 0xa1, 0xe8, 0x46, 0x1a, 0x45, 0x17, 0x22, 0x8d, + 0xd1, 0x95, 0x20, 0x72, 0x92, 0x1c, 0x63, 0xe8, 0x64, 0xce, 0x34, 0x67, 0x52, 0x2c, 0xa5, 0x20, + 0x82, 0xe0, 0x4a, 0x05, 0x17, 0x2e, 0xdc, 0xd4, 0x8d, 0xa0, 0x4b, 0x3f, 0x45, 0x71, 0x55, 0x70, + 0xe3, 0x4a, 0xa5, 0x75, 0xe1, 0xc7, 0x90, 0x9c, 0x97, 0xe9, 0x24, 0x99, 0x26, 0x83, 0x74, 0x97, + 0x9c, 0x79, 0x5e, 0x7e, 0xff, 0x67, 0x9e, 0xf3, 0x4f, 0x60, 0xb6, 0xc6, 0x78, 0x8b, 0x71, 0x5c, + 0x25, 0xce, 0x06, 0xde, 0x2a, 0x54, 0xa9, 0x47, 0x0a, 0x78, 0xb3, 0x43, 0xdb, 0xdb, 0x96, 0xdb, + 0x66, 0x1e, 0x43, 0x53, 0x32, 0xc0, 0xea, 0x06, 0x58, 0x2a, 0xc0, 0x58, 0xf2, 0xb3, 0x38, 0x95, + 0xd1, 0x7e, 0xae, 0x4b, 0x1a, 0x4d, 0x87, 0x78, 0x4d, 0xe6, 0xc8, 0x02, 0x46, 0xaa, 0xc1, 0x1a, + 0x4c, 0x7c, 0xc4, 0xdd, 0x4f, 0xea, 0xf4, 0xbf, 0x06, 0x63, 0x0d, 0x9b, 0x62, 0xe2, 0x36, 0x31, + 0x71, 0x1c, 0xe6, 0x89, 0x14, 0xae, 0x9e, 0x66, 0x82, 0xf5, 0x75, 0xe5, 0x1a, 0x6b, 0x3a, 0x03, + 0xcf, 0x03, 0xd4, 0x82, 0x50, 0x3c, 0x37, 0xd7, 0xe1, 0xd4, 0xad, 0x2e, 0x55, 0x89, 0xd8, 0xc4, + 0xa9, 0xd1, 0x0a, 0xdd, 0xec, 0x50, 0xee, 0xa1, 0x34, 0x9c, 0x20, 0xf5, 0x7a, 0x9b, 0x72, 0x9e, + 0x06, 0xff, 0x83, 0x85, 0xc9, 0x8a, 0xfe, 0x8a, 0x52, 0x70, 0xbc, 0x4e, 0x1d, 0xd6, 0x4a, 0x8f, + 0x89, 0x73, 0xf9, 0xe5, 0x52, 0xe2, 0xd9, 0x5e, 0x36, 0xf6, 0x73, 0x2f, 0x1b, 0x33, 0x6f, 0xc0, + 0x54, 0x6f, 0x41, 0xee, 0x32, 0x87, 0x53, 0xb4, 0x02, 0x27, 0xaa, 0xf2, 0x48, 0x54, 0x4c, 0x16, + 0xa7, 0x2d, 0x7f, 0x5e, 0x9c, 0xea, 0x79, 0x59, 0x57, 0x58, 0xd3, 0xa9, 0xe8, 0x48, 0xf3, 0x29, + 0x80, 0xff, 0x8a, 0x6a, 0x6b, 0xb6, 0xad, 0x0a, 0xf2, 0xd1, 0x88, 0xd7, 0x20, 0x3c, 0x9e, 0xad, + 0xe0, 0x4c, 0x16, 0xe7, 0x7b, 0xba, 0xc9, 0xd7, 0xa6, 0x7b, 0x96, 0x49, 0x43, 0x0b, 0xaf, 0x04, + 0x32, 0x03, 0xa2, 0x3e, 0x01, 0x98, 0x1e, 0xe4, 0x50, 0xca, 0x28, 0x4c, 0x28, 0xde, 0x2e, 0xc9, + 0x1f, 0x43, 0xa5, 0x95, 0xac, 0xfd, 0xaf, 0xd9, 0xd8, 0x87, 0x6f, 0xd9, 0xf9, 0x46, 0xd3, 0x7b, + 0xd8, 0xa9, 0x5a, 0x35, 0xd6, 0xc2, 0x76, 0xd3, 0xa1, 0xd8, 0xae, 0xb6, 0x96, 0x79, 0x7d, 0x03, + 0x6f, 0x15, 0xb1, 0xb7, 0xed, 0x52, 0x2e, 0xc2, 0x79, 0xc5, 0x2f, 0x8d, 0xae, 0x87, 0xa8, 0xca, + 0x8d, 0x54, 0x25, 0x19, 0x83, 0xb2, 0xcc, 0x69, 0x35, 0xd3, 0x3b, 0xcc, 0x23, 0xf6, 0xed, 0x8e, + 0xeb, 0xda, 0xdb, 0x4a, 0xbd, 0xb9, 0xab, 0x64, 0xf6, 0x3c, 0x52, 0x32, 0x09, 0x8c, 0x73, 0x71, + 0x72, 0xfa, 0x22, 0x55, 0x61, 0x33, 0xaf, 0x76, 0x47, 0x76, 0x5e, 0x7f, 0xa0, 0x5f, 0xb5, 0xbf, + 0x73, 0x20, 0xb0, 0x73, 0x66, 0x19, 0xfe, 0xd3, 0x17, 0xad, 0x48, 0x57, 0x61, 0x9c, 0xb4, 0x58, + 0xc7, 0xf1, 0x46, 0x6e, 0x5a, 0xe9, 0xcf, 0x2e, 0x69, 0x45, 0x85, 0x9b, 0x29, 0x88, 0x44, 0xc5, + 0x32, 0x69, 0x93, 0x96, 0x5e, 0x34, 0xb3, 0xac, 0xae, 0x88, 0x3e, 0x55, 0x5d, 0x2e, 0xc2, 0xb8, + 0x2b, 0x4e, 0x54, 0x97, 0x19, 0x2b, 0xe4, 0xfe, 0x5b, 0x32, 0x49, 0xf7, 0x91, 0x09, 0x66, 0x1d, + 0x1a, 0xa2, 0xe2, 0xd5, 0xae, 0x0e, 0x7e, 0x93, 0x7a, 0xa4, 0x4e, 0x3c, 0xa2, 0xd5, 0xf6, 0xae, + 0x2f, 0xf8, 0xdd, 0xf5, 0x35, 0xdf, 0x03, 0x38, 0x13, 0xda, 0x46, 0x09, 0x58, 0x83, 0x93, 0x2d, + 0x75, 0xa6, 0x17, 0x77, 0x36, 0x54, 0x83, 0xce, 0x54, 0x2a, 0x8e, 0xb3, 0x4e, 0x6f, 0x27, 0x0b, + 0x70, 0xfa, 0x18, 0xb5, 0x7f, 0x20, 0xe1, 0xaf, 0xff, 0x5e, 0x70, 0x88, 0x03, 0xe2, 0x2e, 0xc3, + 0x84, 0xc6, 0x54, 0x23, 0x8c, 0xa4, 0xcd, 0x4f, 0x2a, 0x7e, 0x4c, 0xc0, 0x71, 0x51, 0x1f, 0xbd, + 0x06, 0x70, 0x42, 0x5d, 0x7a, 0xb4, 0x10, 0x5a, 0x24, 0xc4, 0x41, 0x8d, 0xc5, 0x08, 0x91, 0x92, + 0xd5, 0x5c, 0x7d, 0xf2, 0xf9, 0xc7, 0xab, 0xb1, 0x02, 0xc2, 0x38, 0xdc, 0xac, 0xa5, 0x01, 0xe0, + 0x1d, 0xe5, 0x6f, 0xbb, 0x78, 0x47, 0x4c, 0x60, 0x17, 0xbd, 0x01, 0x30, 0x19, 0x70, 0x24, 0x94, + 0x3f, 0xb9, 0xe7, 0xa0, 0x81, 0x1a, 0xcb, 0x11, 0xa3, 0x15, 0x25, 0x16, 0x94, 0x8b, 0x28, 0x17, + 0x91, 0x12, 0xbd, 0x00, 0x30, 0x19, 0x30, 0x92, 0x61, 0x74, 0x83, 0x56, 0x34, 0x8c, 0x2e, 0xc4, + 0x9d, 0xcc, 0x39, 0x41, 0x37, 0x8b, 0x66, 0x42, 0xe9, 0xa4, 0xbf, 0xa0, 0xe7, 0x00, 0x26, 0xb4, + 0x5b, 0xa0, 0x21, 0x2f, 0xa8, 0xcf, 0x7f, 0x8c, 0xa5, 0x28, 0xa1, 0x0a, 0xe4, 0x9c, 0x00, 0x39, + 0x8b, 0xe6, 0x86, 0x80, 0xf8, 0x2f, 0xf0, 0x31, 0x80, 0x71, 0xe9, 0x10, 0x28, 0x77, 0x72, 0x8f, + 0x1e, 0x3b, 0x32, 0x16, 0x46, 0x07, 0x46, 0x9a, 0x89, 0xf4, 0x22, 0xf4, 0x0e, 0xc0, 0xbf, 0x7a, + 0xae, 0x10, 0xb2, 0x4e, 0x6e, 0x10, 0x76, 0x3d, 0x0d, 0x1c, 0x39, 0x5e, 0x71, 0x5d, 0x10, 0x5c, + 0x16, 0xca, 0x87, 0x72, 0x89, 0xd1, 0xf0, 0xfb, 0xfa, 0x22, 0xfa, 0xb3, 0x7a, 0x0b, 0xe0, 0xdf, + 0xbd, 0x4e, 0x86, 0x46, 0x75, 0xee, 0xb7, 0x56, 0xe3, 0x7c, 0xf4, 0x04, 0xc5, 0x9a, 0x17, 0xac, + 0xf3, 0xe8, 0x4c, 0x14, 0xd6, 0xd2, 0xda, 0xfe, 0x61, 0x06, 0x1c, 0x1c, 0x66, 0xc0, 0xf7, 0xc3, + 0x0c, 0x78, 0x79, 0x94, 0x89, 0x1d, 0x1c, 0x65, 0x62, 0x5f, 0x8e, 0x32, 0xb1, 0xbb, 0xb9, 0x21, + 0x3f, 0x85, 0x8f, 0x64, 0x51, 0xf1, 0x8b, 0x58, 0x8d, 0x8b, 0xff, 0x65, 0x2b, 0xbf, 0x02, 0x00, + 0x00, 0xff, 0xff, 0x3f, 0x97, 0x02, 0xd9, 0x6f, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/bank/types/tx.pb.go b/x/bank/types/tx.pb.go index 3043336398..cab15a60ff 100644 --- a/x/bank/types/tx.pb.go +++ b/x/bank/types/tx.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -32,9 +32,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgSend represents a message to send coins from one account to another. type MsgSend struct { - FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty" yaml:"from_address"` - ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty" yaml:"to_address"` - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` + FromAddress string `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty" yaml:"from_address"` + ToAddress string `protobuf:"bytes,2,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty" yaml:"to_address"` + Amount github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` } func (m *MsgSend) Reset() { *m = MsgSend{} } @@ -207,35 +207,35 @@ func init() { func init() { proto.RegisterFile("cosmos/bank/v1beta1/tx.proto", fileDescriptor_1d8cb1613481f5b7) } var fileDescriptor_1d8cb1613481f5b7 = []byte{ - // 436 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x3f, 0xef, 0xd2, 0x40, - 0x1c, 0xc6, 0x7b, 0x3f, 0x08, 0x3f, 0x39, 0x48, 0x0c, 0x05, 0x15, 0x2b, 0x69, 0xb1, 0x71, 0x80, - 0xc1, 0xab, 0xa0, 0x83, 0xa9, 0x93, 0x65, 0xd2, 0xa4, 0x31, 0xa9, 0x93, 0x2e, 0xa6, 0x7f, 0xce, - 0xda, 0x40, 0x7b, 0x0d, 0x77, 0x35, 0xf0, 0x0e, 0x4c, 0x5c, 0x7c, 0x09, 0xcc, 0xc6, 0x17, 0xc2, - 0xc8, 0xe8, 0x84, 0x06, 0x16, 0xe3, 0xc8, 0x2b, 0x30, 0xbd, 0xfe, 0x81, 0x44, 0xc4, 0xa9, 0xbd, - 0x3c, 0xdf, 0xcf, 0xd3, 0xe7, 0xe9, 0xf7, 0x60, 0xcf, 0x25, 0x34, 0x24, 0x54, 0x73, 0xec, 0x68, - 0xaa, 0x7d, 0x1c, 0x39, 0x98, 0xd9, 0x23, 0x8d, 0x2d, 0x50, 0x3c, 0x27, 0x8c, 0x88, 0xed, 0x4c, - 0x45, 0xa9, 0x8a, 0x72, 0x55, 0xea, 0xf8, 0xc4, 0x27, 0x5c, 0xd7, 0xd2, 0xb7, 0x6c, 0x54, 0x92, - 0x4b, 0x23, 0x8a, 0x4b, 0x23, 0x97, 0x04, 0xd1, 0x5f, 0xfa, 0xc9, 0x87, 0xb8, 0x2f, 0xd7, 0xd5, - 0xdf, 0x00, 0x5e, 0x9b, 0xd4, 0x7f, 0x8d, 0x23, 0x4f, 0xd4, 0x61, 0xf3, 0xfd, 0x9c, 0x84, 0xef, - 0x6c, 0xcf, 0x9b, 0x63, 0x4a, 0xbb, 0xa0, 0x0f, 0x06, 0x75, 0xe3, 0xce, 0x61, 0xab, 0xb4, 0x97, - 0x76, 0x38, 0xd3, 0xd5, 0x53, 0x55, 0xb5, 0x1a, 0xe9, 0xf1, 0x79, 0x76, 0x12, 0x9f, 0x40, 0xc8, - 0x48, 0x49, 0x5e, 0x71, 0xf2, 0xd6, 0x61, 0xab, 0xb4, 0x32, 0xf2, 0xa8, 0xa9, 0x56, 0x9d, 0x91, - 0x82, 0x72, 0x61, 0xcd, 0x0e, 0x49, 0x12, 0xb1, 0x6e, 0xa5, 0x5f, 0x19, 0x34, 0xc6, 0x77, 0x51, - 0xd9, 0x9c, 0xe2, 0xa2, 0x39, 0x9a, 0x90, 0x20, 0x32, 0x1e, 0xad, 0xb7, 0x8a, 0xf0, 0xf5, 0x87, - 0x32, 0xf0, 0x03, 0xf6, 0x21, 0x71, 0x90, 0x4b, 0x42, 0x2d, 0xef, 0x96, 0x3d, 0x1e, 0x52, 0x6f, - 0xaa, 0xb1, 0x65, 0x8c, 0x29, 0x07, 0xa8, 0x95, 0x5b, 0xeb, 0x37, 0x3e, 0xad, 0x14, 0xe1, 0xd7, - 0x4a, 0x11, 0xd4, 0x16, 0xbc, 0x99, 0x77, 0xb5, 0x30, 0x8d, 0x49, 0x44, 0xb1, 0xfa, 0x19, 0xc0, - 0xa6, 0x49, 0x7d, 0x33, 0x99, 0xb1, 0x80, 0xff, 0x84, 0xa7, 0xb0, 0x16, 0x44, 0x71, 0xc2, 0xd2, - 0xfa, 0x69, 0x24, 0x09, 0x9d, 0x59, 0x06, 0x7a, 0x91, 0x8e, 0x18, 0xd5, 0x34, 0x93, 0x95, 0xcf, - 0x8b, 0xcf, 0xe0, 0x35, 0x49, 0x18, 0x47, 0xaf, 0x38, 0x7a, 0xef, 0x2c, 0xfa, 0x8a, 0xcf, 0xe4, - 0x6c, 0x41, 0xe8, 0x55, 0x1e, 0xf0, 0x36, 0xec, 0x9c, 0x86, 0x29, 0x52, 0x8e, 0xbf, 0x01, 0x58, - 0x31, 0xa9, 0x2f, 0xbe, 0x84, 0x55, 0x1e, 0xb2, 0x77, 0xd6, 0x39, 0xef, 0x26, 0x3d, 0xb8, 0xa4, - 0x16, 0x9e, 0xe2, 0x1b, 0x58, 0x3f, 0xb6, 0xbe, 0xff, 0x2f, 0xa4, 0x1c, 0x91, 0x86, 0xff, 0x1d, - 0x29, 0xac, 0x8d, 0xc9, 0x7a, 0x27, 0x83, 0xcd, 0x4e, 0x06, 0x3f, 0x77, 0x32, 0xf8, 0xb2, 0x97, - 0x85, 0xcd, 0x5e, 0x16, 0xbe, 0xef, 0x65, 0xe1, 0xed, 0xf0, 0xe2, 0xf6, 0x16, 0xd9, 0x35, 0xe5, - 0x4b, 0x74, 0x6a, 0xfc, 0x82, 0x3e, 0xfe, 0x13, 0x00, 0x00, 0xff, 0xff, 0x78, 0xdc, 0x7c, 0x0b, - 0x2b, 0x03, 0x00, 0x00, + // 443 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x92, 0x3f, 0x6f, 0xd3, 0x40, + 0x00, 0xc5, 0x7d, 0x4d, 0x94, 0x92, 0x6b, 0x25, 0x54, 0xb7, 0x40, 0x31, 0x95, 0x5d, 0x2c, 0x04, + 0x65, 0xe0, 0x4e, 0x0d, 0x0c, 0xc8, 0x4c, 0x31, 0x13, 0x48, 0x16, 0x92, 0x99, 0x60, 0x41, 0x76, + 0x7c, 0x18, 0x2b, 0xf6, 0x9d, 0x95, 0x3b, 0x47, 0xc9, 0x37, 0x40, 0x62, 0xe1, 0x23, 0x64, 0x46, + 0x7c, 0x90, 0x8c, 0x19, 0x99, 0x02, 0x4a, 0x96, 0xcc, 0xf9, 0x04, 0xc8, 0xe7, 0x3f, 0x89, 0x44, + 0x48, 0xb7, 0x9c, 0xde, 0xfb, 0xbd, 0xbc, 0xe7, 0x3b, 0x78, 0xd1, 0x63, 0x3c, 0x61, 0x1c, 0xfb, + 0x1e, 0xed, 0xe3, 0xe1, 0xb5, 0x4f, 0x84, 0x77, 0x8d, 0xc5, 0x08, 0xa5, 0x03, 0x26, 0x98, 0x7a, + 0x5a, 0xa8, 0x28, 0x57, 0x51, 0xa9, 0x6a, 0x67, 0x21, 0x0b, 0x99, 0xd4, 0x71, 0xfe, 0xab, 0xb0, + 0x6a, 0x7a, 0x1d, 0xc4, 0x49, 0x1d, 0xd4, 0x63, 0x11, 0xfd, 0x47, 0xdf, 0xfa, 0x23, 0x99, 0x2b, + 0x75, 0x73, 0x05, 0xe0, 0xa1, 0xc3, 0xc3, 0xf7, 0x84, 0x06, 0xaa, 0x05, 0x8f, 0x3f, 0x0f, 0x58, + 0xf2, 0xc9, 0x0b, 0x82, 0x01, 0xe1, 0xfc, 0x1c, 0x5c, 0x82, 0xab, 0xb6, 0x7d, 0x6f, 0x3d, 0x37, + 0x4e, 0xc7, 0x5e, 0x12, 0x5b, 0xe6, 0xb6, 0x6a, 0xba, 0x47, 0xf9, 0xb1, 0x5b, 0x9c, 0xd4, 0x17, + 0x10, 0x0a, 0x56, 0x93, 0x07, 0x92, 0xbc, 0xb3, 0x9e, 0x1b, 0x27, 0x05, 0xb9, 0xd1, 0x4c, 0xb7, + 0x2d, 0x58, 0x45, 0x79, 0xb0, 0xe5, 0x25, 0x2c, 0xa3, 0xe2, 0xbc, 0x71, 0xd9, 0xb8, 0x3a, 0xea, + 0xdc, 0x47, 0xf5, 0x72, 0x4e, 0xaa, 0xe5, 0xe8, 0x35, 0x8b, 0xa8, 0x8d, 0xa6, 0x73, 0x43, 0xf9, + 0xf1, 0xdb, 0x78, 0x1c, 0x46, 0xe2, 0x4b, 0xe6, 0xa3, 0x1e, 0x4b, 0x70, 0x1c, 0x51, 0x82, 0x63, + 0x3f, 0x79, 0xc6, 0x83, 0x3e, 0x1e, 0x76, 0xb0, 0x18, 0xa7, 0x84, 0x4b, 0x3b, 0x77, 0xcb, 0x60, + 0xeb, 0xd6, 0xd7, 0x89, 0xa1, 0xac, 0x26, 0x86, 0x62, 0x9e, 0xc0, 0xdb, 0xe5, 0x52, 0x97, 0xf0, + 0x94, 0x51, 0x4e, 0xcc, 0x6f, 0x00, 0x1e, 0x3b, 0x3c, 0x74, 0xb2, 0x58, 0x44, 0xf2, 0x13, 0xbc, + 0x84, 0xad, 0x88, 0xa6, 0x99, 0xc8, 0xc7, 0xe7, 0x85, 0x34, 0xb4, 0xe3, 0x2a, 0xd0, 0x9b, 0xdc, + 0x62, 0x37, 0xf3, 0x46, 0x6e, 0xe9, 0x57, 0x5f, 0xc1, 0x43, 0x96, 0x09, 0x89, 0x1e, 0x48, 0xf4, + 0xc1, 0x4e, 0xf4, 0x9d, 0xf4, 0x94, 0x6c, 0x45, 0x58, 0x4d, 0x59, 0xf0, 0x2e, 0x3c, 0xdb, 0x2e, + 0x53, 0xb5, 0xec, 0xfc, 0x04, 0xb0, 0xe1, 0xf0, 0x50, 0x7d, 0x0b, 0x9b, 0xb2, 0xe4, 0xc5, 0xce, + 0xe4, 0x72, 0x9b, 0xf6, 0x68, 0x9f, 0x5a, 0x65, 0xaa, 0x1f, 0x60, 0x7b, 0xb3, 0xfa, 0xe1, 0xff, + 0x90, 0xda, 0xa2, 0x3d, 0xbd, 0xd1, 0x52, 0x45, 0xdb, 0xdd, 0xe9, 0x42, 0x07, 0xb3, 0x85, 0x0e, + 0xfe, 0x2c, 0x74, 0xf0, 0x7d, 0xa9, 0x2b, 0xb3, 0xa5, 0xae, 0xfc, 0x5a, 0xea, 0xca, 0xc7, 0x27, + 0x7b, 0xee, 0x6e, 0x54, 0x3c, 0x51, 0x79, 0x85, 0x7e, 0x4b, 0x3e, 0xce, 0xe7, 0x7f, 0x03, 0x00, + 0x00, 0xff, 0xff, 0xe4, 0xce, 0x70, 0x01, 0x27, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/capability/keeper/keeper.go b/x/capability/keeper/keeper.go index 233b5db35d..3928f3766d 100644 --- a/x/capability/keeper/keeper.go +++ b/x/capability/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/store/prefix" diff --git a/x/capability/keeper/keeper_test.go b/x/capability/keeper/keeper_test.go index d3a920fbf4..af66acb2db 100644 --- a/x/capability/keeper/keeper_test.go +++ b/x/capability/keeper/keeper_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -32,7 +32,7 @@ func (suite *KeeperTestSuite) SetupTest() { keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(types.MemStoreKey)) suite.app = app - suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1}) + suite.ctx = app.BaseApp.NewContext(checkTx, ostproto.Header{Height: 1}) suite.keeper = keeper } diff --git a/x/capability/module.go b/x/capability/module.go index 18fa4f5792..545bfbdbfe 100644 --- a/x/capability/module.go +++ b/x/capability/module.go @@ -9,7 +9,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/capability/spec/README.md b/x/capability/spec/README.md index ec612ba976..5ff5df7232 100644 --- a/x/capability/spec/README.md +++ b/x/capability/spec/README.md @@ -63,7 +63,7 @@ func NewApp(...) *App { // Initialize and seal the capability keeper so all persistent capabilities // are loaded in-memory and prevent any further modules from creating scoped // sub-keepers. - ctx := app.BaseApp.NewContext(true, tmproto.Header{}) + ctx := app.BaseApp.NewContext(true, ostproto.Header{}) app.capabilityKeeper.InitializeAndSeal(ctx) return app diff --git a/x/capability/types/capability.pb.go b/x/capability/types/capability.pb.go index 785742bd33..4cd858440a 100644 --- a/x/capability/types/capability.pb.go +++ b/x/capability/types/capability.pb.go @@ -164,7 +164,7 @@ func init() { } var fileDescriptor_6308261edd8470a9 = []byte{ - // 299 bytes of a gzipped FileDescriptorProto + // 306 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0x4a, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x4e, 0x2c, 0x48, 0x4c, 0xca, 0xcc, 0xc9, 0x2c, 0xa9, 0xd4, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0x44, 0x12, 0xd2, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x84, @@ -178,12 +178,13 @@ var fileDescriptor_6308261edd8470a9 = []byte{ 0x56, 0xc8, 0xff, 0xe9, 0x9e, 0x3c, 0x37, 0x44, 0x21, 0x48, 0x54, 0x29, 0x08, 0x2c, 0x69, 0xc5, 0xd1, 0xb1, 0x40, 0x9e, 0x01, 0x6c, 0x45, 0x10, 0x97, 0x00, 0xc2, 0x79, 0x60, 0xcb, 0x8a, 0x85, 0xec, 0xb8, 0xd8, 0xf2, 0xc1, 0x2c, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x05, 0x3d, 0x9c, - 0x9e, 0xd6, 0x03, 0x6b, 0x71, 0x62, 0x39, 0x71, 0x4f, 0x9e, 0x21, 0x08, 0xaa, 0xcb, 0xc9, 0xf3, + 0x9e, 0xd6, 0x03, 0x6b, 0x71, 0x62, 0x39, 0x71, 0x4f, 0x9e, 0x21, 0x08, 0xaa, 0xcb, 0xc9, 0xfd, 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, 0xf4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, - 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x61, 0x81, 0x0e, 0xa6, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x2b, - 0x90, 0x63, 0xa0, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x88, 0xc6, 0x80, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x1d, 0xc9, 0xe6, 0xa8, 0xa3, 0x01, 0x00, 0x00, + 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, + 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x73, 0x32, 0xf3, 0x52, 0xf5, 0x73, 0x92, 0x72, 0x75, 0x8b, + 0x53, 0xb2, 0xf5, 0xcb, 0x8c, 0xf4, 0x2b, 0x90, 0xc3, 0xbf, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, + 0x0d, 0x1c, 0x84, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x3e, 0xb4, 0xe4, 0xa1, 0x01, + 0x00, 0x00, } func (m *Capability) Marshal() (dAtA []byte, err error) { diff --git a/x/capability/types/genesis.pb.go b/x/capability/types/genesis.pb.go index e72c18eda5..73e039c2f3 100644 --- a/x/capability/types/genesis.pb.go +++ b/x/capability/types/genesis.pb.go @@ -144,7 +144,7 @@ func init() { } var fileDescriptor_94922dd16a11c23e = []byte{ - // 281 bytes of a gzipped FileDescriptorProto + // 288 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x4e, 0x2c, 0x48, 0x4c, 0xca, 0xcc, 0xc9, 0x2c, 0xa9, 0xd4, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, @@ -157,12 +157,12 @@ var fileDescriptor_94922dd16a11c23e = []byte{ 0x27, 0xee, 0xc9, 0x33, 0x7c, 0xba, 0x27, 0x2f, 0x5c, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0x6c, 0x9c, 0x52, 0x10, 0x37, 0x98, 0x0b, 0x51, 0xa9, 0x94, 0xc3, 0xc5, 0x03, 0x75, 0x53, 0x70, 0x49, 0x62, 0x49, 0x2a, 0x0e, 0x27, 0xb9, 0x71, 0xb1, 0xc1, 0x1d, 0xc3, 0xac, 0xc1, 0x6d, 0xa4, 0x81, - 0xc7, 0x31, 0x28, 0x5e, 0x74, 0x62, 0x01, 0xb9, 0x24, 0x08, 0xaa, 0xdb, 0xc9, 0xf3, 0xc4, 0x23, + 0xc7, 0x31, 0x28, 0x5e, 0x74, 0x62, 0x01, 0xb9, 0x24, 0x08, 0xaa, 0xdb, 0xc9, 0xfd, 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, 0xf4, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, - 0x92, 0xf3, 0x73, 0xf5, 0x61, 0x61, 0x0a, 0xa6, 0x74, 0x8b, 0x53, 0xb2, 0xf5, 0x2b, 0x90, 0x03, - 0xb8, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xa8, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xfd, 0xf4, 0xf2, 0x5d, 0xdc, 0x01, 0x00, 0x00, + 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, 0xa2, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, + 0x92, 0xf3, 0x73, 0xf5, 0x73, 0x32, 0xf3, 0x52, 0xf5, 0x73, 0x92, 0x72, 0x75, 0x8b, 0x53, 0xb2, + 0xf5, 0xcb, 0x8c, 0xf4, 0x2b, 0x90, 0x83, 0xb7, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, + 0xa4, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x81, 0x12, 0xa6, 0x1c, 0xda, 0x01, 0x00, 0x00, } func (m *GenesisOwners) Marshal() (dAtA []byte, err error) { diff --git a/x/crisis/handler_test.go b/x/crisis/handler_test.go index 63565b85e5..c1aa455ab8 100644 --- a/x/crisis/handler_test.go +++ b/x/crisis/handler_test.go @@ -4,10 +4,10 @@ import ( "fmt" "testing" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/simapp" "github.com/line/lbm-sdk/v2/testutil/testdata" @@ -28,7 +28,7 @@ var ( func createTestApp() (*simapp.SimApp, sdk.Context, []sdk.AccAddress) { db := dbm.NewMemDB() app := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 1, simapp.MakeTestEncodingConfig(), simapp.EmptyAppOptions{}) - ctx := app.NewContext(true, tmproto.Header{}) + ctx := app.NewContext(true, ostproto.Header{}) constantFee := sdk.NewInt64Coin(sdk.DefaultBondDenom, 10) app.CrisisKeeper.SetConstantFee(ctx, constantFee) diff --git a/x/crisis/keeper/keeper.go b/x/crisis/keeper/keeper.go index de49225617..d87ec7cef4 100644 --- a/x/crisis/keeper/keeper.go +++ b/x/crisis/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" sdk "github.com/line/lbm-sdk/v2/types" "github.com/line/lbm-sdk/v2/x/crisis/types" diff --git a/x/crisis/keeper/keeper_test.go b/x/crisis/keeper/keeper_test.go index e7d2301e2e..3854d1a6fc 100644 --- a/x/crisis/keeper/keeper_test.go +++ b/x/crisis/keeper/keeper_test.go @@ -3,9 +3,9 @@ package keeper_test import ( "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -14,14 +14,14 @@ import ( func TestLogger(t *testing.T) { app := simapp.Setup(false) - ctx := app.NewContext(true, tmproto.Header{}) + ctx := app.NewContext(true, ostproto.Header{}) require.Equal(t, ctx.Logger(), app.CrisisKeeper.Logger(ctx)) } func TestInvariants(t *testing.T) { app := simapp.Setup(false) app.Commit() - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1}}) require.Equal(t, app.CrisisKeeper.InvCheckPeriod(), uint(5)) @@ -34,9 +34,9 @@ func TestInvariants(t *testing.T) { func TestAssertInvariants(t *testing.T) { app := simapp.Setup(false) app.Commit() - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1}}) - ctx := app.NewContext(true, tmproto.Header{}) + ctx := app.NewContext(true, ostproto.Header{}) app.CrisisKeeper.RegisterRoute("testModule", "testRoute1", func(sdk.Context) (string, bool) { return "", false }) require.NotPanics(t, func() { app.CrisisKeeper.AssertInvariants(ctx) }) diff --git a/x/crisis/module.go b/x/crisis/module.go index dc243d6f97..abf830a963 100644 --- a/x/crisis/module.go +++ b/x/crisis/module.go @@ -7,8 +7,8 @@ import ( "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/crisis/types/genesis.pb.go b/x/crisis/types/genesis.pb.go index 4e744bbc9c..7198bd3496 100644 --- a/x/crisis/types/genesis.pb.go +++ b/x/crisis/types/genesis.pb.go @@ -80,7 +80,7 @@ func init() { } var fileDescriptor_7a9c2781aa8a27ae = []byte{ - // 238 bytes of a gzipped FileDescriptorProto + // 245 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4e, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2e, 0xca, 0x2c, 0xce, 0x2c, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, @@ -91,11 +91,12 @@ var fileDescriptor_7a9c2781aa8a27ae = []byte{ 0x4b, 0x4d, 0x95, 0x60, 0x56, 0x60, 0xd4, 0xe0, 0x36, 0x92, 0xd4, 0x83, 0xda, 0x09, 0x32, 0x06, 0x66, 0xa3, 0x9e, 0x73, 0x7e, 0x66, 0x9e, 0x93, 0xf4, 0x89, 0x7b, 0xf2, 0x0c, 0x9f, 0xee, 0xc9, 0x0b, 0x57, 0x26, 0xe6, 0xe6, 0x58, 0x29, 0x21, 0x6b, 0x56, 0x0a, 0xe2, 0x86, 0x71, 0xdd, 0x52, - 0x53, 0x9d, 0x5c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, - 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x3b, 0x3d, - 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0x16, 0x02, 0x60, 0x4a, 0xb7, 0x38, - 0x25, 0x5b, 0xbf, 0x02, 0x16, 0x1c, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x87, 0x1b, - 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x43, 0x06, 0xff, 0x2c, 0x01, 0x00, 0x00, + 0x53, 0x9d, 0x9c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, + 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x33, 0x3d, + 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x27, 0x33, 0x2f, 0x55, 0x3f, 0x27, + 0x29, 0x57, 0xb7, 0x38, 0x25, 0x5b, 0xbf, 0xcc, 0x48, 0xbf, 0x02, 0x16, 0x18, 0x25, 0x95, 0x05, + 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x67, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x81, 0xac, 0x2e, + 0x80, 0x2a, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/crisis/types/tx.pb.go b/x/crisis/types/tx.pb.go index f84c4adbf1..fb66293d54 100644 --- a/x/crisis/types/tx.pb.go +++ b/x/crisis/types/tx.pb.go @@ -113,7 +113,7 @@ func init() { func init() { proto.RegisterFile("cosmos/crisis/v1beta1/tx.proto", fileDescriptor_61276163172fe867) } var fileDescriptor_61276163172fe867 = []byte{ - // 318 bytes of a gzipped FileDescriptorProto + // 325 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2e, 0xca, 0x2c, 0xce, 0x2c, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x85, 0xc8, 0xeb, 0x41, @@ -129,11 +129,12 @@ var fileDescriptor_61276163172fe867 = []byte{ 0x90, 0x67, 0x78, 0xb1, 0x40, 0x9e, 0x41, 0x49, 0x86, 0x4b, 0x0a, 0xd3, 0x4b, 0x41, 0xa9, 0xc5, 0x05, 0xf9, 0x79, 0xc5, 0xa9, 0x46, 0x65, 0x5c, 0xcc, 0xbe, 0xc5, 0xe9, 0x42, 0xf9, 0x5c, 0xfc, 0xe8, 0x9e, 0xd6, 0xd4, 0xc3, 0x1a, 0x72, 0x7a, 0x98, 0x86, 0x49, 0x19, 0x12, 0xad, 0x14, 0x66, - 0xaf, 0x93, 0xeb, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, - 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x69, 0xa7, 0x67, - 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xc3, 0xe2, 0x16, 0x4c, 0xe9, 0x16, 0xa7, - 0x64, 0xeb, 0x57, 0xc0, 0x22, 0xba, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x6f, 0xc6, - 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x60, 0x68, 0x5a, 0x06, 0x02, 0x00, 0x00, + 0xaf, 0x93, 0xf3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, + 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x69, 0xa6, 0x67, + 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xe7, 0x64, 0xe6, 0xa5, 0xea, 0xe7, 0x24, + 0xe5, 0xea, 0x16, 0xa7, 0x64, 0xeb, 0x97, 0x19, 0xe9, 0x57, 0xc0, 0xa2, 0xb9, 0xa4, 0xb2, 0x20, + 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0x6b, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x98, 0x4b, 0x5e, + 0x7d, 0x04, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/distribution/abci.go b/x/distribution/abci.go index 8f225d1f2c..68739a50c0 100644 --- a/x/distribution/abci.go +++ b/x/distribution/abci.go @@ -3,7 +3,7 @@ package distribution import ( "time" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/telemetry" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/distribution/client/cli/cli_test.go b/x/distribution/client/cli/cli_test.go index b07c18a2de..1d19c996e4 100644 --- a/x/distribution/client/cli/cli_test.go +++ b/x/distribution/client/cli/cli_test.go @@ -10,8 +10,8 @@ import ( "time" "github.com/gogo/protobuf/proto" + ostcli "github.com/line/ostracon/libs/cli" "github.com/stretchr/testify/suite" - tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -78,12 +78,12 @@ func (s *IntegrationTestSuite) TestGetCmdQueryParams() { }{ { "json output", - []string{fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, `{"community_tax":"0.020000000000000000","base_proposer_reward":"0.010000000000000000","bonus_proposer_reward":"0.040000000000000000","withdraw_addr_enabled":true}`, }, { "text output", - []string{fmt.Sprintf("--%s=text", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=text", ostcli.OutputFlag)}, `base_proposer_reward: "0.010000000000000000" bonus_proposer_reward: "0.040000000000000000" community_tax: "0.020000000000000000" @@ -131,7 +131,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorOutstandingRewards() { []string{ fmt.Sprintf("--%s=3", flags.FlagHeight), sdk.ValAddress(val.Address).String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, `{"rewards":[{"denom":"stake","amount":"232.260000000000000000"}]}`, @@ -139,7 +139,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorOutstandingRewards() { { "text output", []string{ - fmt.Sprintf("--%s=text", tmcli.OutputFlag), + fmt.Sprintf("--%s=text", ostcli.OutputFlag), fmt.Sprintf("--%s=3", flags.FlagHeight), sdk.ValAddress(val.Address).String(), }, @@ -194,7 +194,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorCommission() { []string{ fmt.Sprintf("--%s=3", flags.FlagHeight), sdk.ValAddress(val.Address).String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, `{"commission":[{"denom":"stake","amount":"116.130000000000000000"}]}`, @@ -202,7 +202,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorCommission() { { "text output", []string{ - fmt.Sprintf("--%s=text", tmcli.OutputFlag), + fmt.Sprintf("--%s=text", ostcli.OutputFlag), fmt.Sprintf("--%s=3", flags.FlagHeight), sdk.ValAddress(val.Address).String(), }, @@ -275,7 +275,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorSlashes() { []string{ fmt.Sprintf("--%s=3", flags.FlagHeight), sdk.ValAddress(val.Address).String(), "1", "3", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, "{\"slashes\":[],\"pagination\":{\"next_key\":null,\"total\":\"0\"}}", @@ -283,7 +283,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorSlashes() { { "text output", []string{ - fmt.Sprintf("--%s=text", tmcli.OutputFlag), + fmt.Sprintf("--%s=text", ostcli.OutputFlag), fmt.Sprintf("--%s=3", flags.FlagHeight), sdk.ValAddress(val.Address).String(), "1", "3", }, @@ -347,7 +347,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegatorRewards() { []string{ fmt.Sprintf("--%s=10", flags.FlagHeight), addr.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, fmt.Sprintf(`{"rewards":[{"validator_address":"%s","reward":[{"denom":"stake","amount":"387.100000000000000000"}]}],"total":[{"denom":"stake","amount":"387.100000000000000000"}]}`, valAddr.String()), @@ -357,7 +357,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegatorRewards() { []string{ fmt.Sprintf("--%s=10", flags.FlagHeight), addr.String(), valAddr.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, `{"rewards":[{"denom":"stake","amount":"387.100000000000000000"}]}`, @@ -365,7 +365,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegatorRewards() { { "text output", []string{ - fmt.Sprintf("--%s=text", tmcli.OutputFlag), + fmt.Sprintf("--%s=text", ostcli.OutputFlag), fmt.Sprintf("--%s=10", flags.FlagHeight), addr.String(), }, @@ -382,7 +382,7 @@ total: { "text output (specific validator)", []string{ - fmt.Sprintf("--%s=text", tmcli.OutputFlag), + fmt.Sprintf("--%s=text", ostcli.OutputFlag), fmt.Sprintf("--%s=10", flags.FlagHeight), addr.String(), valAddr.String(), }, @@ -424,12 +424,12 @@ func (s *IntegrationTestSuite) TestGetCmdQueryCommunityPool() { }{ { "json output", - []string{fmt.Sprintf("--%s=3", flags.FlagHeight), fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=3", flags.FlagHeight), fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, `{"pool":[{"denom":"stake","amount":"4.740000000000000000"}]}`, }, { "text output", - []string{fmt.Sprintf("--%s=text", tmcli.OutputFlag), fmt.Sprintf("--%s=3", flags.FlagHeight)}, + []string{fmt.Sprintf("--%s=text", ostcli.OutputFlag), fmt.Sprintf("--%s=3", flags.FlagHeight)}, `pool: - amount: "4.740000000000000000" denom: stake`, diff --git a/x/distribution/keeper/allocation.go b/x/distribution/keeper/allocation.go index 094d2edd3b..1a92578171 100644 --- a/x/distribution/keeper/allocation.go +++ b/x/distribution/keeper/allocation.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" sdk "github.com/line/lbm-sdk/v2/types" "github.com/line/lbm-sdk/v2/x/distribution/types" diff --git a/x/distribution/keeper/allocation_test.go b/x/distribution/keeper/allocation_test.go index 9fb33bc81e..5a2057dddb 100644 --- a/x/distribution/keeper/allocation_test.go +++ b/x/distribution/keeper/allocation_test.go @@ -3,9 +3,9 @@ package keeper_test import ( "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -16,7 +16,7 @@ import ( func TestAllocateTokensToValidatorWithCommission(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 3, sdk.NewInt(1234)) valAddrs := simapp.ConvertAddrsToValAddrs(addrs) @@ -45,7 +45,7 @@ func TestAllocateTokensToValidatorWithCommission(t *testing.T) { func TestAllocateTokensToManyValidators(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(1234)) valAddrs := simapp.ConvertAddrsToValAddrs(addrs) @@ -115,7 +115,7 @@ func TestAllocateTokensToManyValidators(t *testing.T) { func TestAllocateTokensTruncation(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 3, sdk.NewInt(1234)) valAddrs := simapp.ConvertAddrsToValAddrs(addrs) diff --git a/x/distribution/keeper/delegation_test.go b/x/distribution/keeper/delegation_test.go index b52b2ac220..267c53bbd2 100644 --- a/x/distribution/keeper/delegation_test.go +++ b/x/distribution/keeper/delegation_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -15,7 +15,7 @@ import ( func TestCalculateRewardsBasic(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) tstaking := teststaking.NewHelper(t, ctx, app.StakingKeeper) addr := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(1000)) @@ -69,7 +69,7 @@ func TestCalculateRewardsBasic(t *testing.T) { func TestCalculateRewardsAfterSlash(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addr := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(100000000)) valAddrs := simapp.ConvertAddrsToValAddrs(addr) @@ -132,7 +132,7 @@ func TestCalculateRewardsAfterSlash(t *testing.T) { func TestCalculateRewardsAfterManySlashes(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) tstaking := teststaking.NewHelper(t, ctx, app.StakingKeeper) addr := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(100000000)) @@ -207,7 +207,7 @@ func TestCalculateRewardsAfterManySlashes(t *testing.T) { func TestCalculateRewardsMultiDelegator(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) tstaking := teststaking.NewHelper(t, ctx, app.StakingKeeper) addr := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(100000000)) @@ -272,7 +272,7 @@ func TestWithdrawDelegationRewardsBasic(t *testing.T) { balancePower := int64(1000) balanceTokens := sdk.TokensFromConsensusPower(balancePower) app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addr := simapp.AddTestAddrs(app, ctx, 1, sdk.NewInt(1000000000)) valAddrs := simapp.ConvertAddrsToValAddrs(addr) @@ -341,7 +341,7 @@ func TestWithdrawDelegationRewardsBasic(t *testing.T) { func TestCalculateRewardsAfterManySlashesInSameBlock(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addr := simapp.AddTestAddrs(app, ctx, 1, sdk.NewInt(1000000000)) valAddrs := simapp.ConvertAddrsToValAddrs(addr) @@ -409,7 +409,7 @@ func TestCalculateRewardsAfterManySlashesInSameBlock(t *testing.T) { func TestCalculateRewardsMultiDelegatorMultiSlash(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) tstaking := teststaking.NewHelper(t, ctx, app.StakingKeeper) addr := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(1000000000)) @@ -483,7 +483,7 @@ func TestCalculateRewardsMultiDelegatorMultiSlash(t *testing.T) { func TestCalculateRewardsMultiDelegatorMultWithdraw(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) tstaking := teststaking.NewHelper(t, ctx, app.StakingKeeper) addr := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(1000000000)) diff --git a/x/distribution/keeper/grpc_query_test.go b/x/distribution/keeper/grpc_query_test.go index 342f4e9525..4c0f620281 100644 --- a/x/distribution/keeper/grpc_query_test.go +++ b/x/distribution/keeper/grpc_query_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp" @@ -30,7 +30,7 @@ type KeeperTestSuite struct { func (suite *KeeperTestSuite) SetupTest() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) types.RegisterQueryServer(queryHelper, app.DistrKeeper) diff --git a/x/distribution/keeper/keeper.go b/x/distribution/keeper/keeper.go index 51c4de3128..aade756d76 100644 --- a/x/distribution/keeper/keeper.go +++ b/x/distribution/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/distribution/keeper/keeper_test.go b/x/distribution/keeper/keeper_test.go index 47c0c4b7ae..f1ac3006ec 100644 --- a/x/distribution/keeper/keeper_test.go +++ b/x/distribution/keeper/keeper_test.go @@ -3,9 +3,9 @@ package keeper_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -14,7 +14,7 @@ import ( func TestSetWithdrawAddr(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addr := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(1000000000)) @@ -36,7 +36,7 @@ func TestSetWithdrawAddr(t *testing.T) { func TestWithdrawValidatorCommission(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) valCommission := sdk.DecCoins{ sdk.NewDecCoinFromDec("mytoken", sdk.NewDec(5).Quo(sdk.NewDec(4))), @@ -90,7 +90,7 @@ func TestWithdrawValidatorCommission(t *testing.T) { func TestGetTotalRewards(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) valCommission := sdk.DecCoins{ sdk.NewDecCoinFromDec("mytoken", sdk.NewDec(5).Quo(sdk.NewDec(4))), @@ -111,7 +111,7 @@ func TestGetTotalRewards(t *testing.T) { func TestFundCommunityPool(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addr := simapp.AddTestAddrs(app, ctx, 2, sdk.NewInt(1000000000)) diff --git a/x/distribution/keeper/querier.go b/x/distribution/keeper/querier.go index ff80c1ffc2..a9b89b3a16 100644 --- a/x/distribution/keeper/querier.go +++ b/x/distribution/keeper/querier.go @@ -3,7 +3,7 @@ package keeper import ( "encoding/json" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/distribution/keeper/querier_test.go b/x/distribution/keeper/querier_test.go index 280ea5d7b2..3ecd0fdf75 100644 --- a/x/distribution/keeper/querier_test.go +++ b/x/distribution/keeper/querier_test.go @@ -4,9 +4,9 @@ import ( "strings" "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -117,7 +117,7 @@ func TestQueries(t *testing.T) { banktypes.RegisterLegacyAminoCodec(cdc) app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addr := simapp.AddTestAddrs(app, ctx, 1, sdk.NewInt(1000000000)) valAddrs := simapp.ConvertAddrsToValAddrs(addr) diff --git a/x/distribution/module.go b/x/distribution/module.go index 315f150843..a861a6f3a8 100644 --- a/x/distribution/module.go +++ b/x/distribution/module.go @@ -9,8 +9,8 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/gorilla/mux" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" sdkclient "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/distribution/module_test.go b/x/distribution/module_test.go index 5b78625997..bda5e0553e 100644 --- a/x/distribution/module_test.go +++ b/x/distribution/module_test.go @@ -3,9 +3,9 @@ package distribution_test import ( "testing" + abcitypes "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abcitypes "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" authtypes "github.com/line/lbm-sdk/v2/x/auth/types" @@ -14,7 +14,7 @@ import ( func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.InitChain( abcitypes.RequestInitChain{ diff --git a/x/distribution/proposal_handler_test.go b/x/distribution/proposal_handler_test.go index 033b7be8c0..4469193d6f 100644 --- a/x/distribution/proposal_handler_test.go +++ b/x/distribution/proposal_handler_test.go @@ -3,8 +3,8 @@ package distribution_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" "github.com/line/lbm-sdk/v2/simapp" @@ -26,7 +26,7 @@ func testProposal(recipient sdk.AccAddress, amount sdk.Coins) *types.CommunityPo func TestProposalHandlerPassed(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) recipient := delAddr1 @@ -56,7 +56,7 @@ func TestProposalHandlerPassed(t *testing.T) { func TestProposalHandlerFailed(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) recipient := delAddr1 diff --git a/x/distribution/simulation/operations_test.go b/x/distribution/simulation/operations_test.go index 666765ac49..03bfeeb50f 100644 --- a/x/distribution/simulation/operations_test.go +++ b/x/distribution/simulation/operations_test.go @@ -4,9 +4,9 @@ import ( "math/rand" "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" simappparams "github.com/line/lbm-sdk/v2/simapp/params" @@ -64,7 +64,7 @@ func (suite *SimTestSuite) TestSimulateMsgSetWithdrawAddress() { accounts := suite.getTestingAccounts(r, 3) // begin a new block - suite.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) + suite.app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) // execute operation op := simulation.SimulateMsgSetWithdrawAddress(suite.app.AccountKeeper, suite.app.BankKeeper, suite.app.DistrKeeper) @@ -105,7 +105,7 @@ func (suite *SimTestSuite) TestSimulateMsgWithdrawDelegatorReward() { suite.setupValidatorRewards(validator0.GetOperator()) // begin a new block - suite.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) + suite.app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) // execute operation op := simulation.SimulateMsgWithdrawDelegatorReward(suite.app.AccountKeeper, suite.app.BankKeeper, suite.app.DistrKeeper, suite.app.StakingKeeper) @@ -162,7 +162,7 @@ func (suite *SimTestSuite) testSimulateMsgWithdrawValidatorCommission(tokenName suite.app.DistrKeeper.SetValidatorAccumulatedCommission(suite.ctx, validator0.GetOperator(), types.ValidatorAccumulatedCommission{Commission: valCommission}) // begin a new block - suite.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) + suite.app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) // execute operation op := simulation.SimulateMsgWithdrawValidatorCommission(suite.app.AccountKeeper, suite.app.BankKeeper, suite.app.DistrKeeper, suite.app.StakingKeeper) @@ -188,7 +188,7 @@ func (suite *SimTestSuite) TestSimulateMsgFundCommunityPool() { accounts := suite.getTestingAccounts(r, 3) // begin a new block - suite.app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) + suite.app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: suite.app.LastBlockHeight() + 1, AppHash: suite.app.LastCommitID().Hash}}) // execute operation op := simulation.SimulateMsgFundCommunityPool(suite.app.AccountKeeper, suite.app.BankKeeper, suite.app.DistrKeeper, suite.app.StakingKeeper) @@ -217,7 +217,7 @@ func (suite *SimTestSuite) SetupTest() { checkTx := false app := simapp.Setup(checkTx) suite.app = app - suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{}) + suite.ctx = app.BaseApp.NewContext(checkTx, ostproto.Header{}) } func (suite *SimTestSuite) getTestingAccounts(r *rand.Rand, n int) []simtypes.Account { diff --git a/x/distribution/simulation/proposals_test.go b/x/distribution/simulation/proposals_test.go index 85de9393a8..04fb33a6e7 100644 --- a/x/distribution/simulation/proposals_test.go +++ b/x/distribution/simulation/proposals_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" simappparams "github.com/line/lbm-sdk/v2/simapp/params" @@ -16,7 +16,7 @@ import ( func TestProposalContents(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) // initialize parameters s := rand.NewSource(1) diff --git a/x/distribution/types/distribution.pb.go b/x/distribution/types/distribution.pb.go index 0f64e1be5c..605bf2e3ad 100644 --- a/x/distribution/types/distribution.pb.go +++ b/x/distribution/types/distribution.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" io "io" math "math" @@ -27,10 +27,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Params defines the set of params for the distribution module. type Params struct { - CommunityTax github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=community_tax,json=communityTax,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"community_tax" yaml:"community_tax"` - BaseProposerReward github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=base_proposer_reward,json=baseProposerReward,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"base_proposer_reward" yaml:"base_proposer_reward"` - BonusProposerReward github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=bonus_proposer_reward,json=bonusProposerReward,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"bonus_proposer_reward" yaml:"bonus_proposer_reward"` - WithdrawAddrEnabled bool `protobuf:"varint,4,opt,name=withdraw_addr_enabled,json=withdrawAddrEnabled,proto3" json:"withdraw_addr_enabled,omitempty" yaml:"withdraw_addr_enabled"` + CommunityTax github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,1,opt,name=community_tax,json=communityTax,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"community_tax" yaml:"community_tax"` + BaseProposerReward github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,2,opt,name=base_proposer_reward,json=baseProposerReward,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"base_proposer_reward" yaml:"base_proposer_reward"` + BonusProposerReward github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,3,opt,name=bonus_proposer_reward,json=bonusProposerReward,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"bonus_proposer_reward" yaml:"bonus_proposer_reward"` + WithdrawAddrEnabled bool `protobuf:"varint,4,opt,name=withdraw_addr_enabled,json=withdrawAddrEnabled,proto3" json:"withdraw_addr_enabled,omitempty" yaml:"withdraw_addr_enabled"` } func (m *Params) Reset() { *m = Params{} } @@ -85,8 +85,8 @@ func (m *Params) GetWithdrawAddrEnabled() bool { // read that record) // + one per validator for the zeroeth period, set on initialization type ValidatorHistoricalRewards struct { - CumulativeRewardRatio github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=cumulative_reward_ratio,json=cumulativeRewardRatio,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"cumulative_reward_ratio" yaml:"cumulative_reward_ratio"` - ReferenceCount uint32 `protobuf:"varint,2,opt,name=reference_count,json=referenceCount,proto3" json:"reference_count,omitempty" yaml:"reference_count"` + CumulativeRewardRatio github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,1,rep,name=cumulative_reward_ratio,json=cumulativeRewardRatio,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"cumulative_reward_ratio" yaml:"cumulative_reward_ratio"` + ReferenceCount uint32 `protobuf:"varint,2,opt,name=reference_count,json=referenceCount,proto3" json:"reference_count,omitempty" yaml:"reference_count"` } func (m *ValidatorHistoricalRewards) Reset() { *m = ValidatorHistoricalRewards{} } @@ -122,7 +122,7 @@ func (m *ValidatorHistoricalRewards) XXX_DiscardUnknown() { var xxx_messageInfo_ValidatorHistoricalRewards proto.InternalMessageInfo -func (m *ValidatorHistoricalRewards) GetCumulativeRewardRatio() github_com_cosmos_cosmos_sdk_types.DecCoins { +func (m *ValidatorHistoricalRewards) GetCumulativeRewardRatio() github_com_line_lbm_sdk_v2_types.DecCoins { if m != nil { return m.CumulativeRewardRatio } @@ -140,8 +140,8 @@ func (m *ValidatorHistoricalRewards) GetReferenceCount() uint32 { // period for a validator kept as a running counter and incremented // each block as long as the validator's tokens remain constant. type ValidatorCurrentRewards struct { - Rewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=rewards,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"rewards"` - Period uint64 `protobuf:"varint,2,opt,name=period,proto3" json:"period,omitempty"` + Rewards github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,1,rep,name=rewards,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"rewards"` + Period uint64 `protobuf:"varint,2,opt,name=period,proto3" json:"period,omitempty"` } func (m *ValidatorCurrentRewards) Reset() { *m = ValidatorCurrentRewards{} } @@ -177,7 +177,7 @@ func (m *ValidatorCurrentRewards) XXX_DiscardUnknown() { var xxx_messageInfo_ValidatorCurrentRewards proto.InternalMessageInfo -func (m *ValidatorCurrentRewards) GetRewards() github_com_cosmos_cosmos_sdk_types.DecCoins { +func (m *ValidatorCurrentRewards) GetRewards() github_com_line_lbm_sdk_v2_types.DecCoins { if m != nil { return m.Rewards } @@ -194,7 +194,7 @@ func (m *ValidatorCurrentRewards) GetPeriod() uint64 { // ValidatorAccumulatedCommission represents accumulated commission // for a validator kept as a running counter, can be withdrawn at any time. type ValidatorAccumulatedCommission struct { - Commission github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=commission,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"commission"` + Commission github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,1,rep,name=commission,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"commission"` } func (m *ValidatorAccumulatedCommission) Reset() { *m = ValidatorAccumulatedCommission{} } @@ -230,7 +230,7 @@ func (m *ValidatorAccumulatedCommission) XXX_DiscardUnknown() { var xxx_messageInfo_ValidatorAccumulatedCommission proto.InternalMessageInfo -func (m *ValidatorAccumulatedCommission) GetCommission() github_com_cosmos_cosmos_sdk_types.DecCoins { +func (m *ValidatorAccumulatedCommission) GetCommission() github_com_line_lbm_sdk_v2_types.DecCoins { if m != nil { return m.Commission } @@ -240,7 +240,7 @@ func (m *ValidatorAccumulatedCommission) GetCommission() github_com_cosmos_cosmo // ValidatorOutstandingRewards represents outstanding (un-withdrawn) rewards // for a validator inexpensive to track, allows simple sanity checks. type ValidatorOutstandingRewards struct { - Rewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=rewards,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"rewards" yaml:"rewards"` + Rewards github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,1,rep,name=rewards,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"rewards" yaml:"rewards"` } func (m *ValidatorOutstandingRewards) Reset() { *m = ValidatorOutstandingRewards{} } @@ -276,7 +276,7 @@ func (m *ValidatorOutstandingRewards) XXX_DiscardUnknown() { var xxx_messageInfo_ValidatorOutstandingRewards proto.InternalMessageInfo -func (m *ValidatorOutstandingRewards) GetRewards() github_com_cosmos_cosmos_sdk_types.DecCoins { +func (m *ValidatorOutstandingRewards) GetRewards() github_com_line_lbm_sdk_v2_types.DecCoins { if m != nil { return m.Rewards } @@ -288,8 +288,8 @@ func (m *ValidatorOutstandingRewards) GetRewards() github_com_cosmos_cosmos_sdk_ // This is needed to calculate appropriate amount of staking tokens // for delegations which are withdrawn after a slash has occurred. type ValidatorSlashEvent struct { - ValidatorPeriod uint64 `protobuf:"varint,1,opt,name=validator_period,json=validatorPeriod,proto3" json:"validator_period,omitempty" yaml:"validator_period"` - Fraction github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=fraction,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"fraction"` + ValidatorPeriod uint64 `protobuf:"varint,1,opt,name=validator_period,json=validatorPeriod,proto3" json:"validator_period,omitempty" yaml:"validator_period"` + Fraction github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,2,opt,name=fraction,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"fraction"` } func (m *ValidatorSlashEvent) Reset() { *m = ValidatorSlashEvent{} } @@ -378,7 +378,7 @@ func (m *ValidatorSlashEvents) GetValidatorSlashEvents() []ValidatorSlashEvent { // FeePool is the global fee pool for distribution. type FeePool struct { - CommunityPool github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=community_pool,json=communityPool,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"community_pool" yaml:"community_pool"` + CommunityPool github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,1,rep,name=community_pool,json=communityPool,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"community_pool" yaml:"community_pool"` } func (m *FeePool) Reset() { *m = FeePool{} } @@ -414,7 +414,7 @@ func (m *FeePool) XXX_DiscardUnknown() { var xxx_messageInfo_FeePool proto.InternalMessageInfo -func (m *FeePool) GetCommunityPool() github_com_cosmos_cosmos_sdk_types.DecCoins { +func (m *FeePool) GetCommunityPool() github_com_line_lbm_sdk_v2_types.DecCoins { if m != nil { return m.CommunityPool } @@ -425,10 +425,10 @@ func (m *FeePool) GetCommunityPool() github_com_cosmos_cosmos_sdk_types.DecCoins // together with how many coins are proposed to be spent, and to which // recipient account. type CommunityPoolSpendProposal struct { - Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` - Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` - Recipient string `protobuf:"bytes,3,opt,name=recipient,proto3" json:"recipient,omitempty"` - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,4,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` + Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` + Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` + Recipient string `protobuf:"bytes,3,opt,name=recipient,proto3" json:"recipient,omitempty"` + Amount github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,4,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` } func (m *CommunityPoolSpendProposal) Reset() { *m = CommunityPoolSpendProposal{} } @@ -470,9 +470,9 @@ var xxx_messageInfo_CommunityPoolSpendProposal proto.InternalMessageInfo // the delegators within the validator may be left with less than a full token, // thus sdk.Dec is used. type DelegatorStartingInfo struct { - PreviousPeriod uint64 `protobuf:"varint,1,opt,name=previous_period,json=previousPeriod,proto3" json:"previous_period,omitempty" yaml:"previous_period"` - Stake github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=stake,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"stake" yaml:"stake"` - Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"creation_height" yaml:"creation_height"` + PreviousPeriod uint64 `protobuf:"varint,1,opt,name=previous_period,json=previousPeriod,proto3" json:"previous_period,omitempty" yaml:"previous_period"` + Stake github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,2,opt,name=stake,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"stake" yaml:"stake"` + Height uint64 `protobuf:"varint,3,opt,name=height,proto3" json:"creation_height" yaml:"creation_height"` } func (m *DelegatorStartingInfo) Reset() { *m = DelegatorStartingInfo{} } @@ -525,8 +525,8 @@ func (m *DelegatorStartingInfo) GetHeight() uint64 { // DelegationDelegatorReward represents the properties // of a delegator's delegation reward. type DelegationDelegatorReward struct { - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` - Reward github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,2,rep,name=reward,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"reward"` + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + Reward github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,2,rep,name=reward,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"reward"` } func (m *DelegationDelegatorReward) Reset() { *m = DelegationDelegatorReward{} } @@ -625,76 +625,76 @@ func init() { } var fileDescriptor_cd78a31ea281a992 = []byte{ - // 1102 bytes of a gzipped FileDescriptorProto + // 1103 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xf6, 0x24, 0x8e, 0x93, 0x4e, 0xf3, 0xab, 0x13, 0x27, 0x71, 0x93, 0xe0, 0x8d, 0x46, 0x6a, - 0x15, 0x04, 0x75, 0x9a, 0xf6, 0x82, 0x72, 0x40, 0x8a, 0x9d, 0x44, 0x14, 0x01, 0x8d, 0xb6, 0x01, - 0x24, 0x2e, 0xd6, 0x78, 0x77, 0x62, 0x8f, 0x62, 0xef, 0x2c, 0x33, 0x63, 0x27, 0x39, 0x20, 0x24, - 0x4e, 0x5c, 0x10, 0x20, 0x2e, 0x1c, 0x00, 0xe5, 0xc8, 0xaf, 0x3f, 0xa4, 0xc7, 0xde, 0x40, 0x20, - 0x2d, 0x28, 0x11, 0x12, 0xe2, 0xe8, 0x1b, 0x37, 0xb4, 0x3b, 0xb3, 0xbb, 0xb6, 0x6b, 0xaa, 0xb8, - 0x52, 0x4f, 0xf6, 0x7e, 0xf3, 0xe6, 0xbd, 0xef, 0xbd, 0xf7, 0xed, 0x7b, 0x0b, 0x4b, 0x0e, 0x97, - 0x2d, 0x2e, 0x37, 0x5d, 0x26, 0x95, 0x60, 0xb5, 0xb6, 0x62, 0xdc, 0xdb, 0xec, 0x6c, 0xd5, 0xa8, - 0x22, 0x5b, 0x7d, 0x60, 0xc9, 0x17, 0x5c, 0x71, 0xb4, 0xaa, 0xed, 0x4b, 0x7d, 0x47, 0xc6, 0x7e, - 0x25, 0x5f, 0xe7, 0x75, 0x1e, 0xd9, 0x6d, 0x86, 0xff, 0xf4, 0x95, 0x95, 0xa2, 0x09, 0x51, 0x23, - 0x92, 0x26, 0xae, 0x1d, 0xce, 0x8c, 0x4b, 0xfc, 0xcb, 0x38, 0xcc, 0x1d, 0x10, 0x41, 0x5a, 0x12, - 0x1d, 0xc3, 0x19, 0x87, 0xb7, 0x5a, 0x6d, 0x8f, 0xa9, 0xb3, 0xaa, 0x22, 0xa7, 0x05, 0xb0, 0x0e, - 0x36, 0xae, 0x95, 0xf7, 0x1f, 0x07, 0x56, 0xe6, 0xb7, 0xc0, 0xba, 0x5d, 0x67, 0xaa, 0xd1, 0xae, - 0x95, 0x1c, 0xde, 0xda, 0x34, 0x4e, 0xf5, 0xcf, 0x1d, 0xe9, 0x1e, 0x6f, 0xaa, 0x33, 0x9f, 0xca, - 0xd2, 0x2e, 0x75, 0xba, 0x81, 0x95, 0x3f, 0x23, 0xad, 0xe6, 0x36, 0xee, 0x73, 0x86, 0xed, 0xe9, - 0xe4, 0xf9, 0x90, 0x9c, 0xa2, 0x8f, 0x61, 0x3e, 0xa4, 0x54, 0xf5, 0x05, 0xf7, 0xb9, 0xa4, 0xa2, - 0x2a, 0xe8, 0x09, 0x11, 0x6e, 0x61, 0x2c, 0x8a, 0xf9, 0xf6, 0xc8, 0x31, 0x57, 0x75, 0xcc, 0x61, - 0x3e, 0xb1, 0x8d, 0x42, 0xf8, 0xc0, 0xa0, 0x76, 0x04, 0xa2, 0x4f, 0x00, 0x5c, 0xac, 0x71, 0xaf, - 0x2d, 0x9f, 0xa2, 0x30, 0x1e, 0x51, 0x78, 0x67, 0x64, 0x0a, 0x6b, 0x86, 0xc2, 0x30, 0xa7, 0xd8, - 0x5e, 0x88, 0xf0, 0x01, 0x12, 0x87, 0x70, 0xf1, 0x84, 0xa9, 0x86, 0x2b, 0xc8, 0x49, 0x95, 0xb8, - 0xae, 0xa8, 0x52, 0x8f, 0xd4, 0x9a, 0xd4, 0x2d, 0x64, 0xd7, 0xc1, 0xc6, 0x54, 0x79, 0x3d, 0xf5, - 0x3a, 0xd4, 0x0c, 0xdb, 0x0b, 0x31, 0xbe, 0xe3, 0xba, 0x62, 0x4f, 0xa3, 0xdb, 0xd9, 0xaf, 0xcf, - 0xad, 0x0c, 0xfe, 0x7c, 0x0c, 0xae, 0xbc, 0x47, 0x9a, 0xcc, 0x25, 0x8a, 0x8b, 0x37, 0x98, 0x54, - 0x5c, 0x30, 0x87, 0x34, 0x75, 0x64, 0x89, 0x7e, 0x02, 0x70, 0xd9, 0x69, 0xb7, 0xda, 0x4d, 0xa2, - 0x58, 0x87, 0x1a, 0x9a, 0x55, 0x41, 0x14, 0xe3, 0x05, 0xb0, 0x3e, 0xbe, 0x71, 0xfd, 0xde, 0x9a, - 0x91, 0x67, 0x29, 0xac, 0x5e, 0x2c, 0xb3, 0x30, 0xd7, 0x0a, 0x67, 0x5e, 0xf9, 0xdd, 0xb0, 0x3e, - 0xdd, 0xc0, 0x2a, 0x9a, 0x66, 0x0f, 0x77, 0x85, 0x7f, 0xfc, 0xc3, 0x7a, 0xe5, 0x6a, 0x15, 0x0c, - 0xbd, 0x4a, 0x7b, 0x31, 0x75, 0xa4, 0x99, 0xda, 0xa1, 0x1b, 0x54, 0x81, 0x73, 0x82, 0x1e, 0x51, - 0x41, 0x3d, 0x87, 0x56, 0x1d, 0xde, 0xf6, 0x54, 0xa4, 0x94, 0x99, 0xf2, 0x4a, 0x37, 0xb0, 0x96, - 0x34, 0x85, 0x01, 0x03, 0x6c, 0xcf, 0x26, 0x48, 0x25, 0x02, 0xbe, 0x03, 0x70, 0x39, 0xa9, 0x48, - 0xa5, 0x2d, 0x04, 0xf5, 0x54, 0x5c, 0x8e, 0x63, 0x38, 0xa9, 0x79, 0xcb, 0x2b, 0x65, 0x7f, 0x3f, - 0xcc, 0x7e, 0xd4, 0xdc, 0xe2, 0x08, 0x68, 0x09, 0xe6, 0x7c, 0x2a, 0x18, 0xd7, 0x72, 0xcf, 0xda, - 0xe6, 0x09, 0x7f, 0x05, 0x60, 0x31, 0x21, 0xb8, 0xe3, 0x98, 0x52, 0x50, 0xb7, 0xc2, 0x5b, 0x2d, - 0x26, 0x25, 0xe3, 0x1e, 0xfa, 0x10, 0x42, 0x27, 0x79, 0x7a, 0x71, 0x54, 0x7b, 0x82, 0xe0, 0x6f, - 0x00, 0x5c, 0x4d, 0x58, 0x3d, 0x6c, 0x2b, 0xa9, 0x88, 0xe7, 0x32, 0xaf, 0x1e, 0x97, 0xee, 0xa3, - 0xd1, 0x4a, 0xb7, 0x67, 0x84, 0x33, 0x1b, 0x77, 0x2d, 0xba, 0x8a, 0x9f, 0xb7, 0x98, 0xf8, 0x07, - 0x00, 0x17, 0x12, 0x7a, 0x8f, 0x9a, 0x44, 0x36, 0xf6, 0x3a, 0xd4, 0x53, 0x68, 0x1f, 0xce, 0x77, - 0x62, 0xb8, 0x6a, 0xca, 0x1d, 0x4e, 0xb4, 0x6c, 0x79, 0xb5, 0x1b, 0x58, 0xcb, 0x3a, 0xfa, 0xa0, - 0x05, 0xb6, 0xe7, 0x12, 0xe8, 0x20, 0x42, 0xd0, 0x9b, 0x70, 0xea, 0x48, 0x10, 0x27, 0x9c, 0xb5, - 0x66, 0x3a, 0x95, 0x46, 0x1b, 0x0d, 0x76, 0x72, 0x1f, 0xff, 0x0c, 0x60, 0x7e, 0x08, 0x57, 0x89, - 0x3e, 0x03, 0x70, 0x29, 0xe5, 0x22, 0xc3, 0x93, 0x2a, 0x8d, 0x8e, 0x4c, 0x4d, 0xef, 0x96, 0x9e, - 0x31, 0xfb, 0x4b, 0x43, 0x7c, 0x96, 0x6f, 0x99, 0x3a, 0xbf, 0x34, 0x98, 0x69, 0xaf, 0x77, 0x6c, - 0xe7, 0x3b, 0x43, 0xf8, 0x98, 0x11, 0xf2, 0x2d, 0x80, 0x93, 0xfb, 0x94, 0x1e, 0x70, 0xde, 0x44, - 0x5f, 0x02, 0x38, 0x9b, 0x4e, 0x74, 0x9f, 0xf3, 0xe6, 0x95, 0xba, 0xfd, 0x96, 0x61, 0xb1, 0x38, - 0xb8, 0x13, 0x42, 0x0f, 0x23, 0x37, 0x3d, 0x5d, 0x50, 0x21, 0x27, 0xfc, 0x17, 0x80, 0x2b, 0x95, - 0x5e, 0xe4, 0x91, 0x4f, 0x3d, 0x57, 0xcf, 0x58, 0xd2, 0x44, 0x79, 0x38, 0xa1, 0x98, 0x6a, 0x52, - 0xbd, 0xc8, 0x6c, 0xfd, 0x80, 0xd6, 0xe1, 0x75, 0x97, 0x4a, 0x47, 0x30, 0x3f, 0x6d, 0xa9, 0xdd, - 0x0b, 0xa1, 0x35, 0x78, 0x4d, 0x50, 0x87, 0xf9, 0x8c, 0x7a, 0x4a, 0x6f, 0x03, 0x3b, 0x05, 0x90, - 0x03, 0x73, 0xa4, 0x15, 0x4d, 0xa0, 0x6c, 0x94, 0xff, 0xcd, 0xa1, 0xf9, 0x47, 0xc9, 0xdf, 0x35, - 0xaf, 0xde, 0xc6, 0x15, 0x72, 0xd4, 0x09, 0x1a, 0xd7, 0xdb, 0xd3, 0x9f, 0x9e, 0x5b, 0x99, 0xb0, - 0x07, 0x7f, 0x87, 0x7d, 0xf8, 0x17, 0xc0, 0xc5, 0x5d, 0xda, 0xa4, 0xf5, 0xa8, 0x4d, 0x8a, 0x08, - 0xc5, 0xbc, 0xfa, 0x03, 0xef, 0x28, 0x9a, 0x8b, 0xbe, 0xa0, 0x1d, 0xc6, 0xc3, 0x95, 0xd3, 0xab, - 0xf1, 0x9e, 0xb9, 0x38, 0x60, 0x80, 0xed, 0xd9, 0x18, 0x31, 0x0a, 0x3f, 0x84, 0x13, 0x52, 0x91, - 0x63, 0x6a, 0xe4, 0xfd, 0xfa, 0xc8, 0x9b, 0x6f, 0x5a, 0x07, 0x8a, 0x9c, 0x60, 0x5b, 0x3b, 0x43, - 0x7b, 0x30, 0xd7, 0xa0, 0xac, 0xde, 0xd0, 0x25, 0xcc, 0x96, 0xef, 0xfc, 0x13, 0x58, 0x73, 0x8e, - 0xa0, 0xe1, 0x3c, 0xf7, 0xaa, 0xfa, 0x28, 0x25, 0x39, 0x70, 0x80, 0x6d, 0x73, 0x19, 0xff, 0x0e, - 0xe0, 0x4d, 0x93, 0x3b, 0xe3, 0x5e, 0x52, 0x05, 0xb3, 0x40, 0x1f, 0xc0, 0x1b, 0xa9, 0xb0, 0xc3, - 0xd5, 0x48, 0xa5, 0x34, 0xdf, 0x2d, 0x6b, 0xdd, 0xc0, 0x2a, 0x0c, 0x6a, 0xdf, 0x98, 0x60, 0x3b, - 0x9d, 0x0d, 0x3b, 0x1a, 0x42, 0x0c, 0xe6, 0x92, 0x6f, 0x90, 0x17, 0x34, 0x55, 0x4d, 0x80, 0xed, - 0x29, 0xd3, 0x5d, 0x80, 0xcf, 0xc7, 0xe0, 0xad, 0xff, 0x57, 0xf0, 0xfb, 0x4c, 0x35, 0x76, 0xa9, - 0xcf, 0x25, 0x53, 0xe8, 0x76, 0x9f, 0x98, 0xcb, 0xf3, 0x69, 0xd9, 0x23, 0x18, 0xc7, 0xf2, 0x7e, - 0x6d, 0x88, 0xbc, 0xcb, 0x4b, 0xdd, 0xc0, 0x42, 0xda, 0xba, 0xe7, 0x10, 0xf7, 0xcb, 0xfe, 0xde, - 0x53, 0xb2, 0x2f, 0xe7, 0xbb, 0x81, 0x35, 0x1f, 0xcf, 0x69, 0x73, 0x84, 0x7b, 0x5f, 0x86, 0x97, - 0x7b, 0x5e, 0x86, 0xf0, 0xc2, 0x8d, 0x6e, 0x60, 0xcd, 0xe8, 0x0b, 0x1a, 0xc7, 0xb1, 0xa4, 0xd1, - 0xab, 0x70, 0xd2, 0xd5, 0xb9, 0x14, 0x26, 0x22, 0x5b, 0x94, 0x2e, 0x01, 0x73, 0x80, 0xed, 0xd8, - 0x24, 0x2d, 0x51, 0xf9, 0xe1, 0xf7, 0x17, 0x45, 0xf0, 0xf8, 0xa2, 0x08, 0x9e, 0x5c, 0x14, 0xc1, - 0x9f, 0x17, 0x45, 0xf0, 0xc5, 0x65, 0x31, 0xf3, 0xe4, 0xb2, 0x98, 0xf9, 0xf5, 0xb2, 0x98, 0xf9, - 0x60, 0xeb, 0x99, 0xf5, 0x3f, 0xed, 0xff, 0xb4, 0x8e, 0xda, 0x51, 0xcb, 0x45, 0x5f, 0xbe, 0xf7, - 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x45, 0x1d, 0xb8, 0x42, 0x7e, 0x0b, 0x00, 0x00, + 0x14, 0xf6, 0x24, 0x8e, 0x93, 0x4e, 0xf3, 0xab, 0x13, 0x27, 0x71, 0x93, 0xe0, 0x8d, 0x46, 0xb4, + 0x4a, 0xa5, 0xd6, 0x26, 0xe1, 0x82, 0x22, 0x2e, 0xb1, 0x93, 0xaa, 0xe5, 0x87, 0x88, 0x36, 0x15, + 0x48, 0x5c, 0xac, 0xf1, 0xee, 0xc4, 0x1e, 0x75, 0xbd, 0x63, 0xcd, 0x8c, 0x9d, 0x44, 0x08, 0x89, + 0x23, 0x97, 0x0a, 0xb8, 0x21, 0xe0, 0x90, 0x1b, 0x3f, 0xc4, 0x1f, 0xd2, 0x63, 0xb9, 0x01, 0x87, + 0x05, 0x25, 0x17, 0xc4, 0xd1, 0x17, 0xae, 0x68, 0x77, 0x66, 0x77, 0x6d, 0xd7, 0x94, 0xb8, 0x52, + 0x6f, 0xde, 0x6f, 0xde, 0x7c, 0xf3, 0xbd, 0xef, 0x3d, 0xbf, 0x19, 0x58, 0x72, 0xb8, 0x6c, 0x71, + 0x59, 0x76, 0x99, 0x54, 0x82, 0xd5, 0x3b, 0x8a, 0x71, 0xbf, 0xdc, 0xdd, 0xae, 0x53, 0x45, 0xb6, + 0x07, 0xc0, 0x52, 0x5b, 0x70, 0xc5, 0xd1, 0xba, 0x8e, 0x2f, 0x0d, 0x2c, 0x99, 0xf8, 0xb5, 0x7c, + 0x83, 0x37, 0x78, 0x14, 0x57, 0x0e, 0x7f, 0xe9, 0x2d, 0x6b, 0x45, 0x73, 0x44, 0x9d, 0x48, 0x9a, + 0x50, 0x3b, 0x9c, 0x19, 0x4a, 0xfc, 0xcb, 0x24, 0xcc, 0x1d, 0x12, 0x41, 0x5a, 0x12, 0x31, 0x38, + 0xe7, 0xf0, 0x56, 0xab, 0xe3, 0x33, 0x75, 0x56, 0x53, 0xe4, 0xb4, 0x00, 0x36, 0xc1, 0xd6, 0xb5, + 0xca, 0xfe, 0xd3, 0xc0, 0xca, 0xfc, 0x1e, 0x58, 0xaf, 0x37, 0x98, 0x6a, 0x76, 0xea, 0x25, 0x87, + 0xb7, 0xca, 0x1e, 0xf3, 0x69, 0xd9, 0xab, 0xb7, 0xee, 0x49, 0xf7, 0x71, 0xb9, 0xbb, 0x53, 0x56, + 0x67, 0x6d, 0x2a, 0x4b, 0xfb, 0xd4, 0xe9, 0x05, 0x56, 0xfe, 0x8c, 0xb4, 0xbc, 0x5d, 0x3c, 0x40, + 0x85, 0xed, 0xd9, 0xe4, 0xfb, 0x11, 0x39, 0x45, 0x9f, 0xc2, 0x7c, 0x28, 0xa8, 0xd6, 0x16, 0xbc, + 0xcd, 0x25, 0x15, 0x35, 0x41, 0x4f, 0x88, 0x70, 0x0b, 0x13, 0xd1, 0x89, 0xef, 0x8e, 0x79, 0xe2, + 0xba, 0x3e, 0x71, 0x14, 0x23, 0xb6, 0x51, 0x08, 0x1f, 0x1a, 0xd4, 0x8e, 0x40, 0xf4, 0x19, 0x80, + 0xcb, 0x75, 0xee, 0x77, 0xe4, 0x73, 0x02, 0x26, 0x23, 0x01, 0xef, 0x8d, 0x29, 0x60, 0xc3, 0x08, + 0x18, 0x45, 0x89, 0xed, 0xa5, 0x08, 0x1f, 0x92, 0xf0, 0x08, 0x2e, 0x9f, 0x30, 0xd5, 0x74, 0x05, + 0x39, 0xa9, 0x11, 0xd7, 0x15, 0x35, 0xea, 0x93, 0xba, 0x47, 0xdd, 0x42, 0x76, 0x13, 0x6c, 0xcd, + 0x54, 0x36, 0x53, 0xd6, 0x91, 0x61, 0xd8, 0x5e, 0x8a, 0xf1, 0x3d, 0xd7, 0x15, 0x07, 0x1a, 0xdd, + 0xcd, 0x7e, 0x7d, 0x6e, 0x65, 0xf0, 0x93, 0x09, 0xb8, 0xf6, 0x21, 0xf1, 0x98, 0x4b, 0x14, 0x17, + 0x0f, 0x98, 0x54, 0x5c, 0x30, 0x87, 0x78, 0xfa, 0x64, 0x89, 0x7e, 0x04, 0x70, 0xd5, 0xe9, 0xb4, + 0x3a, 0x1e, 0x51, 0xac, 0x4b, 0x8d, 0xcc, 0x9a, 0x20, 0x8a, 0xf1, 0x02, 0xd8, 0x9c, 0xdc, 0xba, + 0xbe, 0xb3, 0x61, 0x1a, 0xb3, 0x14, 0x7a, 0x17, 0x37, 0x58, 0x98, 0x6b, 0x95, 0x33, 0xbf, 0x72, + 0x14, 0xba, 0xd3, 0x0b, 0xac, 0xa2, 0x29, 0xf4, 0x68, 0x2a, 0xfc, 0xd3, 0x1f, 0xd6, 0x9d, 0xab, + 0xf8, 0x17, 0x72, 0x4a, 0x7b, 0x39, 0xa5, 0xd1, 0x3a, 0xed, 0x90, 0x04, 0x55, 0xe1, 0x82, 0xa0, + 0xc7, 0x54, 0x50, 0xdf, 0xa1, 0x35, 0x87, 0x77, 0x7c, 0x15, 0xf5, 0xc8, 0x5c, 0x65, 0xad, 0x17, + 0x58, 0x2b, 0x5a, 0xc0, 0x50, 0x00, 0xb6, 0xe7, 0x13, 0xa4, 0x1a, 0x01, 0xdf, 0x01, 0xb8, 0x9a, + 0xf8, 0x51, 0xed, 0x08, 0x41, 0x7d, 0x15, 0x9b, 0xc1, 0xe0, 0xb4, 0x56, 0x2d, 0xaf, 0x94, 0xfb, + 0x76, 0x98, 0xfb, 0x78, 0x99, 0xc5, 0xfc, 0x68, 0x05, 0xe6, 0xda, 0x54, 0x30, 0xae, 0xdb, 0x3c, + 0x6b, 0x9b, 0x2f, 0xfc, 0x15, 0x80, 0xc5, 0x44, 0xde, 0x9e, 0x63, 0x8c, 0xa0, 0x6e, 0x95, 0xb7, + 0x5a, 0x4c, 0x4a, 0xc6, 0x7d, 0xc4, 0x21, 0x74, 0x92, 0xaf, 0x57, 0x25, 0xb4, 0xef, 0x08, 0xfc, + 0x0d, 0x80, 0xeb, 0x89, 0xa6, 0x0f, 0x3a, 0x4a, 0x2a, 0xe2, 0xbb, 0xcc, 0x6f, 0xc4, 0xb6, 0x7d, + 0x32, 0x9e, 0x6d, 0x55, 0xd3, 0x32, 0xf3, 0x71, 0xc5, 0xa2, 0xad, 0xf8, 0xe5, 0x8c, 0xc4, 0xdf, + 0x03, 0xb8, 0x94, 0x88, 0x3b, 0xf2, 0x88, 0x6c, 0x1e, 0x74, 0xa9, 0xaf, 0xd0, 0x7d, 0xb8, 0xd8, + 0x8d, 0xe1, 0x9a, 0xb1, 0x3a, 0x9c, 0x61, 0xd9, 0xca, 0x7a, 0x2f, 0xb0, 0x56, 0xf5, 0xd9, 0xc3, + 0x11, 0xd8, 0x5e, 0x48, 0xa0, 0xc3, 0x08, 0x41, 0x0f, 0xe0, 0xcc, 0xb1, 0x20, 0x4e, 0x38, 0x5d, + 0xcd, 0x44, 0xba, 0x3b, 0xce, 0x40, 0xb0, 0x93, 0xdd, 0xf8, 0x67, 0x00, 0xf3, 0x23, 0x94, 0x4a, + 0xf4, 0x04, 0xc0, 0x95, 0x54, 0x89, 0x0c, 0x57, 0x6a, 0x34, 0x5a, 0x32, 0x7e, 0xbe, 0x51, 0x7a, + 0xc1, 0xac, 0x2f, 0x8d, 0xe0, 0xac, 0xdc, 0x32, 0x1e, 0xbf, 0x36, 0x9c, 0x67, 0x3f, 0x3b, 0xb6, + 0xf3, 0xdd, 0x11, 0x7a, 0xcc, 0xe0, 0xf8, 0x16, 0xc0, 0xe9, 0xfb, 0x94, 0x1e, 0x72, 0xee, 0xa1, + 0x2f, 0x00, 0x9c, 0x4f, 0x67, 0x78, 0x9b, 0x73, 0xef, 0x4a, 0x95, 0x7e, 0xc7, 0xa8, 0x58, 0x1e, + 0xbe, 0x05, 0x42, 0x86, 0x31, 0x0b, 0x9e, 0x5e, 0x47, 0xa1, 0x22, 0x7c, 0x09, 0xe0, 0x5a, 0xb5, + 0x1f, 0x39, 0x6a, 0x53, 0xdf, 0xd5, 0x73, 0x95, 0x78, 0x28, 0x0f, 0xa7, 0x14, 0x53, 0x1e, 0xd5, + 0xd7, 0x96, 0xad, 0x3f, 0xd0, 0x26, 0xbc, 0xee, 0x52, 0xe9, 0x08, 0xd6, 0x4e, 0xcb, 0x69, 0xf7, + 0x43, 0x68, 0x03, 0x5e, 0x13, 0xd4, 0x61, 0x6d, 0x46, 0x7d, 0xa5, 0xe7, 0xbf, 0x9d, 0x02, 0x88, + 0xc0, 0x1c, 0x69, 0x45, 0x73, 0x27, 0x1b, 0x65, 0x7f, 0x73, 0x64, 0xf6, 0x51, 0xea, 0x25, 0xf3, + 0x97, 0xbb, 0xfd, 0xbf, 0x19, 0xea, 0xf4, 0x0c, 0xf1, 0xee, 0xec, 0xe7, 0xe7, 0x56, 0x26, 0xf4, + 0xff, 0xaf, 0xb0, 0x06, 0xff, 0x00, 0xb8, 0xbc, 0x4f, 0x3d, 0xda, 0x88, 0x4a, 0xa4, 0x88, 0x50, + 0xcc, 0x6f, 0x3c, 0xf4, 0x8f, 0xa3, 0x59, 0xd8, 0x16, 0xb4, 0xcb, 0x78, 0x78, 0xc9, 0xf4, 0x77, + 0x77, 0xdf, 0x2c, 0x1c, 0x0a, 0xc0, 0xf6, 0x7c, 0x8c, 0x98, 0xde, 0xb6, 0xe1, 0x94, 0x54, 0xe4, + 0x31, 0x35, 0x8d, 0xfd, 0xf6, 0x98, 0x37, 0xdd, 0xac, 0x3e, 0x26, 0xa2, 0xc0, 0xb6, 0xa6, 0x42, + 0x07, 0x30, 0xd7, 0xa4, 0xac, 0xd1, 0xd4, 0xf6, 0x65, 0x2b, 0xf7, 0xfe, 0x0e, 0xac, 0x05, 0x47, + 0xd0, 0x70, 0x82, 0xfb, 0x35, 0xbd, 0x94, 0x4a, 0x1c, 0x5a, 0xc0, 0xb6, 0xd9, 0x8c, 0x7f, 0x03, + 0xf0, 0xa6, 0xc9, 0x9c, 0x71, 0x3f, 0xf1, 0xc0, 0x5c, 0x98, 0x0f, 0xe1, 0x8d, 0xb4, 0xa5, 0xc3, + 0xab, 0x90, 0x4a, 0x69, 0x5e, 0x28, 0x1b, 0xbd, 0xc0, 0x2a, 0x0c, 0x77, 0xbd, 0x09, 0xc1, 0x76, + 0x3a, 0x13, 0xf6, 0x34, 0x84, 0x1a, 0x30, 0x97, 0xbc, 0x37, 0x5e, 0xc9, 0x24, 0x35, 0xf4, 0xbb, + 0x33, 0xa6, 0xb2, 0x00, 0x9f, 0x4f, 0xc0, 0x5b, 0xff, 0xdd, 0xbb, 0x1f, 0x31, 0xd5, 0xdc, 0xa7, + 0x6d, 0x2e, 0x99, 0x42, 0xb7, 0x07, 0xda, 0xb8, 0xb2, 0x98, 0x9a, 0x1e, 0xc1, 0x38, 0x6e, 0xec, + 0xb7, 0x46, 0x34, 0x76, 0x65, 0xa5, 0x17, 0x58, 0x48, 0x47, 0xf7, 0x2d, 0xe2, 0xc1, 0x86, 0xdf, + 0x79, 0xae, 0xe1, 0x2b, 0xf9, 0x5e, 0x60, 0x2d, 0xc6, 0xb3, 0xd9, 0x2c, 0xe1, 0xfe, 0xbf, 0xc1, + 0x9d, 0xbe, 0xbf, 0x41, 0xb8, 0xe1, 0x46, 0x2f, 0xb0, 0xe6, 0xf4, 0x06, 0x8d, 0xe3, 0xb8, 0x9d, + 0xd1, 0x5d, 0x38, 0xed, 0xea, 0x5c, 0x0a, 0x53, 0x51, 0x2c, 0x4a, 0x07, 0xbf, 0x59, 0xc0, 0x76, + 0x1c, 0x92, 0x5a, 0x54, 0x79, 0xff, 0x87, 0x8b, 0x22, 0x78, 0x7a, 0x51, 0x04, 0xcf, 0x2e, 0x8a, + 0xe0, 0xcf, 0x8b, 0x22, 0xf8, 0xf2, 0xb2, 0x98, 0x79, 0x76, 0x59, 0xcc, 0xfc, 0x7a, 0x59, 0xcc, + 0x7c, 0x5c, 0x7e, 0x81, 0xfb, 0xa7, 0x83, 0x0f, 0xe8, 0xa8, 0x18, 0xf5, 0x5c, 0xf4, 0xbe, 0x7d, + 0xf3, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf0, 0x26, 0x0f, 0x93, 0x64, 0x0b, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { diff --git a/x/distribution/types/genesis.pb.go b/x/distribution/types/genesis.pb.go index 4cd1c9cfaa..2d2d1fd40e 100644 --- a/x/distribution/types/genesis.pb.go +++ b/x/distribution/types/genesis.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" io "io" math "math" @@ -73,7 +73,7 @@ type ValidatorOutstandingRewardsRecord struct { // validator_address is the address of the validator. ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` // outstanding_rewards represents the oustanding rewards of a validator. - OutstandingRewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,2,rep,name=outstanding_rewards,json=outstandingRewards,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"outstanding_rewards" yaml:"outstanding_rewards"` + OutstandingRewards github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,2,rep,name=outstanding_rewards,json=outstandingRewards,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"outstanding_rewards" yaml:"outstanding_rewards"` } func (m *ValidatorOutstandingRewardsRecord) Reset() { *m = ValidatorOutstandingRewardsRecord{} } @@ -397,71 +397,72 @@ func init() { } var fileDescriptor_76eed0f9489db580 = []byte{ - // 1024 bytes of a gzipped FileDescriptorProto + // 1031 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xcd, 0x6f, 0x1b, 0x45, - 0x1c, 0xf5, 0x3a, 0x25, 0x49, 0x27, 0x29, 0x0d, 0xdb, 0x7c, 0xb8, 0x4e, 0xea, 0x4d, 0xa7, 0x45, - 0x04, 0x55, 0xac, 0x9b, 0x80, 0x00, 0x05, 0x81, 0x94, 0x4d, 0x29, 0xf4, 0xd4, 0x30, 0x91, 0x00, - 0x71, 0xb1, 0xd6, 0xbb, 0x63, 0x7b, 0x84, 0xbd, 0x63, 0xcd, 0x8c, 0x1d, 0xc2, 0x3f, 0x00, 0x47, - 0x24, 0xc4, 0xa9, 0x1c, 0x72, 0x44, 0x88, 0x63, 0xef, 0x5c, 0x7b, 0xec, 0x91, 0x03, 0x0a, 0x28, - 0xb9, 0x70, 0xce, 0x81, 0x03, 0x27, 0xb4, 0x33, 0xb3, 0x5f, 0xf6, 0xda, 0x38, 0xa1, 0x39, 0x25, - 0x1e, 0xff, 0xf6, 0xbd, 0xf7, 0x7b, 0xf3, 0xfb, 0x58, 0x83, 0xd7, 0x3d, 0xca, 0x3b, 0x94, 0x57, - 0x7d, 0xc2, 0x05, 0x23, 0xf5, 0x9e, 0x20, 0x34, 0xa8, 0xf6, 0x37, 0xeb, 0x58, 0xb8, 0x9b, 0xd5, - 0x26, 0x0e, 0x30, 0x27, 0xdc, 0xee, 0x32, 0x2a, 0xa8, 0xb9, 0xaa, 0x42, 0xed, 0x74, 0xa8, 0xad, - 0x43, 0xcb, 0x8b, 0x4d, 0xda, 0xa4, 0x32, 0xae, 0x1a, 0xfe, 0xa7, 0x1e, 0x29, 0x57, 0x34, 0x7a, - 0xdd, 0xe5, 0x38, 0x46, 0xf5, 0x28, 0x09, 0xf4, 0xf7, 0xf6, 0x38, 0xf6, 0x0c, 0x8f, 0x8c, 0x87, - 0x4f, 0x0d, 0xb0, 0xf4, 0x00, 0xb7, 0x71, 0xd3, 0x15, 0x94, 0x7d, 0x46, 0x44, 0xcb, 0x67, 0xee, - 0xc1, 0xa3, 0xa0, 0x41, 0xcd, 0x47, 0xe0, 0x15, 0x3f, 0xfa, 0xa2, 0xe6, 0xfa, 0x3e, 0xc3, 0x9c, - 0x97, 0x8c, 0x75, 0x63, 0xe3, 0xaa, 0xb3, 0x76, 0x76, 0x6c, 0x95, 0x0e, 0xdd, 0x4e, 0x7b, 0x1b, - 0x0e, 0x85, 0x40, 0xb4, 0x10, 0x9f, 0xed, 0xa8, 0x23, 0xf3, 0x21, 0x58, 0x38, 0xd0, 0xd0, 0x31, - 0x52, 0x51, 0x22, 0xad, 0x9e, 0x1d, 0x5b, 0x2b, 0x0a, 0x69, 0x30, 0x02, 0xa2, 0xeb, 0xd1, 0x91, - 0xc6, 0xd9, 0x9e, 0xfd, 0xf6, 0xc8, 0x2a, 0xfc, 0x75, 0x64, 0x15, 0xe0, 0x93, 0x22, 0xb8, 0xfd, - 0xa9, 0xdb, 0x26, 0x7e, 0x48, 0xf3, 0xb8, 0x27, 0xb8, 0x70, 0x03, 0x9f, 0x04, 0x4d, 0x84, 0x0f, - 0x5c, 0xe6, 0x73, 0x84, 0x3d, 0xca, 0xfc, 0x30, 0x85, 0x7e, 0x14, 0x34, 0x3a, 0x85, 0xa1, 0x10, - 0x88, 0x16, 0xe2, 0xb3, 0x28, 0x85, 0x23, 0x03, 0xdc, 0xa0, 0x09, 0x4f, 0x8d, 0x29, 0xa2, 0x52, - 0x71, 0x7d, 0x6a, 0x63, 0x6e, 0x6b, 0x4d, 0xdb, 0x6e, 0x87, 0xd7, 0x12, 0xdd, 0xa0, 0xfd, 0x00, - 0x7b, 0xbb, 0x94, 0x04, 0xce, 0x27, 0xcf, 0x8e, 0xad, 0xc2, 0xd9, 0xb1, 0x55, 0x56, 0x7c, 0x39, - 0x30, 0xf0, 0xe7, 0x3f, 0xac, 0x7b, 0x4d, 0x22, 0x5a, 0xbd, 0xba, 0xed, 0xd1, 0x4e, 0x55, 0x5f, - 0xa2, 0xfa, 0xf3, 0x06, 0xf7, 0xbf, 0xac, 0x8a, 0xc3, 0x2e, 0xe6, 0x11, 0x22, 0x47, 0x26, 0x1d, - 0xca, 0x39, 0xe5, 0xce, 0xdf, 0x06, 0xb8, 0x1b, 0xbb, 0xb3, 0xe3, 0x79, 0xbd, 0x4e, 0xaf, 0xed, - 0x0a, 0xec, 0xef, 0xd2, 0x4e, 0x87, 0x70, 0x4e, 0x68, 0xf0, 0xe2, 0x0d, 0x3a, 0x04, 0x73, 0x6e, - 0xc2, 0x24, 0xaf, 0x77, 0x6e, 0xeb, 0x3d, 0x7b, 0x4c, 0x85, 0xdb, 0xe3, 0x25, 0x3a, 0x65, 0x6d, - 0x9b, 0xa9, 0x54, 0xa4, 0xd0, 0x21, 0x4a, 0x73, 0xa5, 0x12, 0xff, 0xc7, 0x00, 0xeb, 0x31, 0xea, - 0xc7, 0x84, 0x0b, 0xca, 0x88, 0xe7, 0xb6, 0x2f, 0xad, 0x2a, 0x96, 0xc1, 0x74, 0x17, 0x33, 0x42, - 0x55, 0xbe, 0x57, 0x90, 0xfe, 0x64, 0x12, 0x30, 0x13, 0x15, 0xc8, 0x94, 0x34, 0xe2, 0x9d, 0xc9, - 0x8c, 0x18, 0x92, 0xec, 0x2c, 0x6b, 0x13, 0x5e, 0x56, 0xaa, 0xa2, 0x7a, 0x41, 0x11, 0x7e, 0x2a, - 0xf9, 0xdf, 0x0d, 0x70, 0x2b, 0x46, 0xda, 0xed, 0x31, 0x86, 0x03, 0x71, 0x69, 0x99, 0x37, 0x92, - 0x0c, 0xd5, 0x55, 0xbf, 0x35, 0x59, 0x86, 0x59, 0x5d, 0xe7, 0x49, 0xef, 0x69, 0x11, 0xac, 0xc6, - 0x93, 0x6a, 0x5f, 0xb8, 0x4c, 0x90, 0xa0, 0x19, 0x4e, 0xaa, 0x24, 0xb9, 0x17, 0x35, 0xaf, 0x72, - 0x7d, 0x2a, 0x5e, 0xc8, 0xa7, 0x1e, 0xb8, 0xc6, 0xb5, 0xd6, 0x1a, 0x09, 0x1a, 0x54, 0xd7, 0xc3, - 0xd6, 0x58, 0xb7, 0x72, 0xd3, 0x74, 0xd6, 0xb4, 0x57, 0x8b, 0x8a, 0x3e, 0x03, 0x0b, 0xd1, 0x3c, - 0x4f, 0xc5, 0xa6, 0x6c, 0xfb, 0xb1, 0x08, 0x6e, 0xc6, 0xee, 0xef, 0xb7, 0x5d, 0xde, 0xfa, 0xb0, - 0x2f, 0x2f, 0xe0, 0x12, 0x7a, 0xa1, 0x85, 0x49, 0xb3, 0x25, 0xa2, 0x5e, 0x50, 0x9f, 0x52, 0x3d, - 0x32, 0x95, 0xe9, 0x91, 0xaf, 0xc1, 0x52, 0x82, 0xcb, 0x43, 0x61, 0x35, 0x1c, 0x2a, 0x2b, 0x5d, - 0x91, 0x0e, 0xdd, 0x9f, 0xac, 0x9e, 0x92, 0x8c, 0x9c, 0x45, 0xed, 0xcf, 0xbc, 0x12, 0x2d, 0xc1, - 0x20, 0xba, 0xd1, 0x1f, 0x0e, 0x4d, 0xd9, 0xf3, 0xcd, 0x1c, 0x98, 0xff, 0x48, 0x2d, 0xe5, 0x7d, - 0xe1, 0x0a, 0x6c, 0x22, 0x30, 0xdd, 0x75, 0x99, 0xdb, 0x51, 0x36, 0xcc, 0x6d, 0xdd, 0x19, 0xab, - 0x63, 0x4f, 0x86, 0x3a, 0x4b, 0x9a, 0xfa, 0x9a, 0xa2, 0x56, 0x00, 0x10, 0x69, 0x24, 0xf3, 0x73, - 0x30, 0xdb, 0xc0, 0xb8, 0xd6, 0xa5, 0xb4, 0xad, 0xbb, 0xe5, 0xee, 0x58, 0xd4, 0x87, 0x18, 0xef, - 0x51, 0xda, 0x76, 0x56, 0x34, 0xec, 0x75, 0x05, 0x1b, 0x61, 0x40, 0x34, 0xd3, 0x50, 0x11, 0xe6, - 0x0f, 0x06, 0x28, 0x25, 0x25, 0x1d, 0xaf, 0xd0, 0xb0, 0x24, 0xc2, 0xd1, 0x33, 0x35, 0x79, 0xa9, - 0xa5, 0x77, 0xbf, 0xf3, 0x9a, 0x26, 0xb6, 0x06, 0x9b, 0x26, 0xcb, 0x00, 0xd1, 0xb2, 0x9f, 0xf7, - 0xbc, 0xec, 0xa0, 0x2e, 0xc3, 0x7d, 0x42, 0x7b, 0xbc, 0xd6, 0x65, 0xb4, 0x4b, 0x39, 0x66, 0xf2, - 0x62, 0x33, 0x75, 0x35, 0x14, 0x02, 0xd1, 0x42, 0x74, 0xb6, 0xa7, 0x8f, 0xcc, 0xef, 0x47, 0x6c, - 0xde, 0x97, 0x64, 0x76, 0x1f, 0x4c, 0x56, 0x26, 0xa3, 0x5e, 0x11, 0x1c, 0xf8, 0xdf, 0xbb, 0x39, - 0x6f, 0xd9, 0x9a, 0xbf, 0x1a, 0xe0, 0x76, 0xaa, 0x2d, 0x92, 0x6d, 0x54, 0xf3, 0xe2, 0x0d, 0xc6, - 0x4b, 0xd3, 0x52, 0xe3, 0xce, 0xff, 0xd8, 0x82, 0x5a, 0xe6, 0x7d, 0x2d, 0x73, 0x63, 0xa8, 0x21, - 0xf3, 0x99, 0x21, 0xb2, 0xfa, 0x63, 0x71, 0xb9, 0xf9, 0x8b, 0x01, 0xd6, 0x12, 0x9c, 0x56, 0xbc, - 0x79, 0x62, 0x83, 0x67, 0xa4, 0xf8, 0xf7, 0x2f, 0xb8, 0xb9, 0xb4, 0xf0, 0x7b, 0x5a, 0xf8, 0x9d, - 0x41, 0xe1, 0xc3, 0x84, 0x10, 0x95, 0xfb, 0x23, 0xe1, 0xc2, 0x17, 0xb0, 0x9b, 0xc9, 0xd3, 0x9e, - 0x5a, 0x23, 0xb1, 0xd6, 0x59, 0xa9, 0x75, 0xfb, 0x22, 0x3b, 0x48, 0x0b, 0xdd, 0xd0, 0x42, 0xd7, - 0x07, 0x85, 0x0e, 0x50, 0x41, 0xb4, 0xd2, 0xcf, 0x07, 0x32, 0x9f, 0x64, 0x9a, 0x31, 0x33, 0x9f, - 0x79, 0xe9, 0xaa, 0x54, 0xf8, 0xee, 0xf9, 0xe7, 0xbe, 0xd6, 0x37, 0xb2, 0x25, 0xb3, 0x3c, 0xe9, - 0x96, 0x4c, 0xa3, 0xf0, 0xb0, 0x8f, 0x96, 0x73, 0x07, 0x2e, 0x2f, 0x01, 0xa9, 0xed, 0xed, 0xf3, - 0x4e, 0x5c, 0xad, 0xec, 0x55, 0xad, 0xec, 0xd6, 0xa0, 0x73, 0x69, 0x0e, 0x88, 0x16, 0x73, 0x06, - 0x71, 0x6a, 0xbf, 0x3b, 0x8f, 0x7f, 0x3a, 0xa9, 0x18, 0xcf, 0x4e, 0x2a, 0xc6, 0xf3, 0x93, 0x8a, - 0xf1, 0xe7, 0x49, 0xc5, 0xf8, 0xee, 0xb4, 0x52, 0x78, 0x7e, 0x5a, 0x29, 0xfc, 0x76, 0x5a, 0x29, - 0x7c, 0xb1, 0x39, 0xf6, 0xed, 0xf8, 0xab, 0xec, 0xef, 0x1d, 0xf9, 0xb2, 0x5c, 0x9f, 0x96, 0xbf, - 0x70, 0xde, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xee, 0xfe, 0x4a, 0x91, 0x0d, 0x00, 0x00, + 0x1c, 0xf5, 0x3a, 0x25, 0x49, 0xc7, 0x29, 0x0d, 0xdb, 0x7c, 0xb8, 0x4e, 0x6a, 0xa7, 0xd3, 0x22, + 0x52, 0x21, 0xbc, 0xad, 0x41, 0x80, 0x82, 0x40, 0xca, 0xa6, 0x14, 0x7a, 0x40, 0x8d, 0x26, 0x12, + 0x20, 0x2e, 0xd6, 0x7a, 0x77, 0x6c, 0x8f, 0x58, 0xef, 0x58, 0x3b, 0xe3, 0x0d, 0xe1, 0x1f, 0x80, + 0x23, 0x12, 0xe2, 0x80, 0x40, 0x28, 0x47, 0x84, 0x38, 0xf6, 0xce, 0xb5, 0xc7, 0x1e, 0x39, 0xa0, + 0x80, 0x92, 0x0b, 0xe7, 0x1c, 0x38, 0x70, 0x42, 0x3b, 0x33, 0xfb, 0x65, 0xaf, 0x8d, 0x93, 0x36, + 0x37, 0x7b, 0xfc, 0xdb, 0xf7, 0xde, 0xef, 0xcd, 0xef, 0x63, 0x0d, 0xee, 0xd8, 0x94, 0xf5, 0x28, + 0x33, 0x1c, 0xc2, 0xb8, 0x4f, 0x5a, 0x03, 0x4e, 0xa8, 0x67, 0x04, 0xf7, 0x5a, 0x98, 0x5b, 0xf7, + 0x8c, 0x0e, 0xf6, 0x30, 0x23, 0xac, 0xde, 0xf7, 0x29, 0xa7, 0xfa, 0x9a, 0x0c, 0xad, 0xa7, 0x43, + 0xeb, 0x2a, 0xb4, 0xb2, 0xd4, 0xa1, 0x1d, 0x2a, 0xe2, 0x8c, 0xf0, 0x93, 0x7c, 0xa4, 0x52, 0x55, + 0xe8, 0x2d, 0x8b, 0xe1, 0x18, 0xd5, 0xa6, 0xc4, 0x53, 0xbf, 0xd7, 0x27, 0xb1, 0x67, 0x78, 0x44, + 0x3c, 0x7c, 0xac, 0x81, 0xe5, 0xfb, 0xd8, 0xc5, 0x1d, 0x8b, 0x53, 0xff, 0x13, 0xc2, 0xbb, 0x8e, + 0x6f, 0xed, 0x3f, 0xf4, 0xda, 0x54, 0x7f, 0x08, 0x5e, 0x72, 0xa2, 0x1f, 0x9a, 0x96, 0xe3, 0xf8, + 0x98, 0xb1, 0xb2, 0xb6, 0xa1, 0x6d, 0x5e, 0x36, 0xd7, 0x4f, 0x8f, 0x6a, 0xe5, 0x03, 0xab, 0xe7, + 0x6e, 0xc1, 0x91, 0x10, 0x88, 0x16, 0xe3, 0xb3, 0x6d, 0x79, 0xa4, 0x3f, 0x00, 0x8b, 0xfb, 0x0a, + 0x3a, 0x46, 0x2a, 0x0a, 0xa4, 0xb5, 0xd3, 0xa3, 0xda, 0xaa, 0x44, 0x1a, 0x8e, 0x80, 0xe8, 0x6a, + 0x74, 0xa4, 0x70, 0xb6, 0xe6, 0xbf, 0x3e, 0xac, 0x15, 0xfe, 0x3e, 0xac, 0x15, 0xe0, 0xf7, 0x45, + 0x70, 0xf3, 0x63, 0xcb, 0x25, 0x4e, 0x48, 0xf3, 0x68, 0xc0, 0x19, 0xb7, 0x3c, 0x87, 0x78, 0x1d, + 0x84, 0xf7, 0x2d, 0xdf, 0x61, 0x08, 0xdb, 0xd4, 0x77, 0xc2, 0x14, 0x82, 0x28, 0x68, 0x7c, 0x0a, + 0x23, 0x21, 0x10, 0x2d, 0xc6, 0x67, 0x51, 0x0a, 0x3f, 0x69, 0xe0, 0x1a, 0x4d, 0x78, 0x9a, 0xbe, + 0x24, 0x2a, 0x17, 0x37, 0x66, 0x36, 0x4b, 0x8d, 0x75, 0x65, 0x7b, 0x3d, 0xbc, 0x96, 0xe8, 0x06, + 0xeb, 0xf7, 0xb1, 0xbd, 0x43, 0x89, 0x67, 0x3e, 0x7a, 0x72, 0x54, 0x2b, 0x9c, 0x1e, 0xd5, 0x2a, + 0x92, 0x2f, 0x07, 0x06, 0xfe, 0xf2, 0x67, 0xed, 0x4e, 0x87, 0xf0, 0xee, 0xa0, 0x55, 0xb7, 0x69, + 0xcf, 0x70, 0x89, 0x87, 0x0d, 0xb7, 0xd5, 0x7b, 0x8d, 0x39, 0x9f, 0x1b, 0x41, 0xc3, 0xe0, 0x07, + 0x7d, 0xcc, 0x22, 0x3c, 0x86, 0x74, 0x3a, 0x92, 0x71, 0xca, 0x9b, 0x7f, 0x34, 0x70, 0x3b, 0xf6, + 0x66, 0xdb, 0xb6, 0x07, 0xbd, 0x81, 0x6b, 0x71, 0xec, 0xec, 0xd0, 0x5e, 0x8f, 0x30, 0x46, 0xa8, + 0xf7, 0xfc, 0xed, 0x39, 0x00, 0x25, 0x2b, 0x61, 0x12, 0x97, 0x5b, 0x6a, 0xbc, 0x53, 0x9f, 0x50, + 0xdf, 0xf5, 0xc9, 0x12, 0xcd, 0x8a, 0x32, 0x4d, 0x97, 0x2a, 0x52, 0xe8, 0x10, 0xa5, 0xb9, 0x52, + 0x89, 0xff, 0xab, 0x81, 0x8d, 0x18, 0xf5, 0x43, 0xc2, 0x38, 0xf5, 0x89, 0x6d, 0xb9, 0x17, 0x56, + 0x13, 0x2b, 0x60, 0xb6, 0x8f, 0x7d, 0x42, 0x65, 0xbe, 0x97, 0x90, 0xfa, 0xa6, 0x13, 0x30, 0x17, + 0x95, 0xc7, 0x8c, 0x30, 0xe2, 0xad, 0xe9, 0x8c, 0x18, 0x91, 0x6c, 0xae, 0x28, 0x13, 0x5e, 0x94, + 0xaa, 0xa2, 0x6a, 0x41, 0x11, 0x7e, 0x2a, 0xf9, 0x3f, 0x34, 0x70, 0x23, 0x46, 0xda, 0x19, 0xf8, + 0x3e, 0xf6, 0xf8, 0x85, 0x65, 0xde, 0x4e, 0x32, 0x94, 0x57, 0xfd, 0xc6, 0x74, 0x19, 0x66, 0x75, + 0x9d, 0x25, 0xbd, 0xc7, 0x45, 0xb0, 0x16, 0xcf, 0xa9, 0x3d, 0x6e, 0xf9, 0x9c, 0x78, 0x9d, 0x70, + 0x4e, 0x25, 0xc9, 0x3d, 0xaf, 0x69, 0x95, 0xeb, 0x53, 0xf1, 0x5c, 0x3e, 0x0d, 0xc0, 0x15, 0xa6, + 0xb4, 0x36, 0x89, 0xd7, 0xa6, 0xaa, 0x1e, 0x1a, 0x13, 0xdd, 0xca, 0x4d, 0xd3, 0x5c, 0x57, 0x5e, + 0x2d, 0x49, 0xfa, 0x0c, 0x2c, 0x44, 0x0b, 0x2c, 0x15, 0x9b, 0xb2, 0xed, 0xc7, 0x22, 0xb8, 0x1e, + 0xbb, 0xbf, 0xe7, 0x5a, 0xac, 0xfb, 0x7e, 0x20, 0x2e, 0xe0, 0x02, 0x7a, 0xa1, 0x8b, 0x49, 0xa7, + 0xcb, 0xa3, 0x5e, 0x90, 0xdf, 0x52, 0x3d, 0x32, 0x93, 0xe9, 0x91, 0x2f, 0xc1, 0x72, 0x82, 0xcb, + 0x42, 0x61, 0x4d, 0x1c, 0x2a, 0x2b, 0x5f, 0x12, 0x0e, 0xdd, 0x9d, 0xae, 0x9e, 0x92, 0x8c, 0xcc, + 0x25, 0xe5, 0xcf, 0x82, 0x14, 0x2d, 0xc0, 0x20, 0xba, 0x16, 0x8c, 0x86, 0xa6, 0xec, 0xf9, 0xaa, + 0x04, 0x16, 0x3e, 0x90, 0x2b, 0x79, 0x8f, 0x5b, 0x1c, 0xeb, 0x08, 0xcc, 0xf6, 0x2d, 0xdf, 0xea, + 0x49, 0x1b, 0x4a, 0x8d, 0x5b, 0x13, 0x75, 0xec, 0x8a, 0x50, 0x73, 0x59, 0x51, 0x5f, 0x91, 0xd4, + 0x12, 0x00, 0x22, 0x85, 0xa4, 0x7f, 0x0a, 0xe6, 0xdb, 0x18, 0x37, 0xfb, 0x94, 0xba, 0xaa, 0x5b, + 0x6e, 0x4f, 0x44, 0x7d, 0x80, 0xf1, 0x2e, 0xa5, 0xae, 0xb9, 0xaa, 0x60, 0xaf, 0x4a, 0xd8, 0x08, + 0x03, 0xa2, 0xb9, 0xb6, 0x8c, 0xd0, 0xbf, 0xd3, 0x40, 0x39, 0x29, 0xe9, 0x78, 0x81, 0x86, 0x25, + 0x11, 0x8e, 0x9e, 0x99, 0xe9, 0x4b, 0x2d, 0xbd, 0xf9, 0xcd, 0x57, 0x14, 0x71, 0x6d, 0xb8, 0x69, + 0xb2, 0x0c, 0x10, 0xad, 0x38, 0x79, 0xcf, 0x8b, 0x0e, 0xea, 0xfb, 0x38, 0x20, 0x74, 0xc0, 0x9a, + 0x7d, 0x9f, 0xf6, 0x29, 0xc3, 0xbe, 0xb8, 0xd8, 0x4c, 0x5d, 0x8d, 0x84, 0x40, 0xb4, 0x18, 0x9d, + 0xed, 0xaa, 0x23, 0xfd, 0xdb, 0x31, 0x7b, 0xf7, 0x05, 0x91, 0xdd, 0x7b, 0xd3, 0x95, 0xc9, 0xb8, + 0x17, 0x04, 0x13, 0xfe, 0xff, 0x66, 0xce, 0x5b, 0xb6, 0xfa, 0x6f, 0x1a, 0xb8, 0x99, 0x6a, 0x8b, + 0x64, 0x1b, 0x35, 0xed, 0x78, 0x83, 0xb1, 0xf2, 0xac, 0xd0, 0xb8, 0xfd, 0x0c, 0x5b, 0x50, 0xc9, + 0xbc, 0xab, 0x64, 0x6e, 0x8e, 0x34, 0x64, 0x3e, 0x33, 0x44, 0xb5, 0x60, 0x22, 0x2e, 0xd3, 0x7f, + 0xd5, 0xc0, 0x7a, 0x82, 0xd3, 0x8d, 0x37, 0x4f, 0x6c, 0xf0, 0x9c, 0x10, 0xff, 0xee, 0x39, 0x37, + 0x97, 0x12, 0xfe, 0xaa, 0x12, 0x7e, 0x6b, 0x58, 0xf8, 0x28, 0x21, 0x44, 0x95, 0x60, 0x2c, 0x9c, + 0x7e, 0xa8, 0x81, 0xeb, 0xc9, 0xd3, 0xb6, 0x5c, 0x23, 0xb1, 0xd6, 0x79, 0xa1, 0x75, 0xeb, 0x3c, + 0x3b, 0x48, 0x09, 0xdd, 0x54, 0x42, 0x37, 0x86, 0x85, 0x0e, 0x51, 0x41, 0xb4, 0x1a, 0xe4, 0x03, + 0xe9, 0x3f, 0x64, 0x9a, 0x31, 0x33, 0x9f, 0x59, 0xf9, 0xb2, 0x50, 0xf8, 0xf6, 0xd9, 0xe7, 0xbe, + 0xd2, 0x37, 0xb6, 0x25, 0xb3, 0x3c, 0xe9, 0x96, 0x4c, 0xa3, 0xb0, 0xb0, 0x8f, 0x56, 0x72, 0x07, + 0x2e, 0x2b, 0x03, 0xa1, 0xed, 0xcd, 0xb3, 0x4e, 0x5c, 0xa5, 0xec, 0x65, 0xa5, 0xec, 0xc6, 0xb0, + 0x73, 0x69, 0x0e, 0x88, 0x96, 0x72, 0x06, 0x71, 0x6a, 0xbf, 0x9b, 0x1f, 0xfd, 0x7c, 0x5c, 0xd5, + 0x9e, 0x1c, 0x57, 0xb5, 0xa7, 0xc7, 0x55, 0xed, 0xaf, 0xe3, 0xaa, 0xf6, 0xcd, 0x49, 0xb5, 0xf0, + 0xf4, 0xa4, 0x5a, 0xf8, 0xfd, 0xa4, 0x5a, 0xf8, 0xcc, 0x98, 0xf0, 0x6e, 0xfc, 0x45, 0xf6, 0xbf, + 0x8e, 0x78, 0x55, 0x6e, 0xcd, 0x8a, 0x7f, 0x37, 0xaf, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0xb4, + 0x0c, 0x86, 0x5c, 0x8d, 0x0d, 0x00, 0x00, } func (m *DelegatorWithdrawInfo) Marshal() (dAtA []byte, err error) { diff --git a/x/distribution/types/query.pb.go b/x/distribution/types/query.pb.go index fe42bd37e6..4fcd9a4f43 100644 --- a/x/distribution/types/query.pb.go +++ b/x/distribution/types/query.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" query "github.com/line/lbm-sdk/v2/types/query" _ "google.golang.org/genproto/googleapis/api/annotations" @@ -454,7 +454,7 @@ var xxx_messageInfo_QueryDelegationRewardsRequest proto.InternalMessageInfo // Query/DelegationRewards RPC method. type QueryDelegationRewardsResponse struct { // rewards defines the rewards accrued by a delegation. - Rewards github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=rewards,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"rewards"` + Rewards github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,1,rep,name=rewards,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"rewards"` } func (m *QueryDelegationRewardsResponse) Reset() { *m = QueryDelegationRewardsResponse{} } @@ -490,7 +490,7 @@ func (m *QueryDelegationRewardsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryDelegationRewardsResponse proto.InternalMessageInfo -func (m *QueryDelegationRewardsResponse) GetRewards() github_com_cosmos_cosmos_sdk_types.DecCoins { +func (m *QueryDelegationRewardsResponse) GetRewards() github_com_line_lbm_sdk_v2_types.DecCoins { if m != nil { return m.Rewards } @@ -543,7 +543,7 @@ type QueryDelegationTotalRewardsResponse struct { // rewards defines all the rewards accrued by a delegator. Rewards []DelegationDelegatorReward `protobuf:"bytes,1,rep,name=rewards,proto3" json:"rewards"` // total defines the sum of all the rewards. - Total github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,2,rep,name=total,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"total"` + Total github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,2,rep,name=total,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"total"` } func (m *QueryDelegationTotalRewardsResponse) Reset() { *m = QueryDelegationTotalRewardsResponse{} } @@ -586,7 +586,7 @@ func (m *QueryDelegationTotalRewardsResponse) GetRewards() []DelegationDelegator return nil } -func (m *QueryDelegationTotalRewardsResponse) GetTotal() github_com_cosmos_cosmos_sdk_types.DecCoins { +func (m *QueryDelegationTotalRewardsResponse) GetTotal() github_com_line_lbm_sdk_v2_types.DecCoins { if m != nil { return m.Total } @@ -795,7 +795,7 @@ var xxx_messageInfo_QueryCommunityPoolRequest proto.InternalMessageInfo // RPC method. type QueryCommunityPoolResponse struct { // pool defines community pool's coins. - Pool github_com_cosmos_cosmos_sdk_types.DecCoins `protobuf:"bytes,1,rep,name=pool,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"pool"` + Pool github_com_line_lbm_sdk_v2_types.DecCoins `protobuf:"bytes,1,rep,name=pool,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.DecCoins" json:"pool"` } func (m *QueryCommunityPoolResponse) Reset() { *m = QueryCommunityPoolResponse{} } @@ -831,7 +831,7 @@ func (m *QueryCommunityPoolResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QueryCommunityPoolResponse proto.InternalMessageInfo -func (m *QueryCommunityPoolResponse) GetPool() github_com_cosmos_cosmos_sdk_types.DecCoins { +func (m *QueryCommunityPoolResponse) GetPool() github_com_line_lbm_sdk_v2_types.DecCoins { if m != nil { return m.Pool } @@ -864,76 +864,77 @@ func init() { } var fileDescriptor_5efd02cbc06efdc9 = []byte{ - // 1101 bytes of a gzipped FileDescriptorProto + // 1105 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x98, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xc7, 0x3d, 0x6e, 0xda, 0xd2, 0x57, 0x4a, 0xd2, 0x69, 0x85, 0xcc, 0x26, 0xd8, 0xd1, 0x86, - 0x92, 0x40, 0x54, 0x6f, 0x93, 0x48, 0x05, 0x5a, 0x10, 0xe4, 0x57, 0xa9, 0xd4, 0x2a, 0x4d, 0x4d, - 0x95, 0x84, 0x5f, 0x8a, 0x26, 0xde, 0xd1, 0x7a, 0x55, 0x7b, 0xc7, 0xdd, 0x19, 0x27, 0x44, 0x55, - 0x2f, 0x04, 0x24, 0x2e, 0x48, 0x48, 0x5c, 0x7a, 0xcc, 0x99, 0x3b, 0x17, 0xfe, 0x82, 0x1e, 0x2b, - 0x21, 0xa1, 0x9e, 0x00, 0x25, 0x08, 0x55, 0x42, 0x9c, 0xb9, 0x22, 0xcf, 0xcc, 0xda, 0xbb, 0xf6, - 0x7a, 0xfd, 0x4b, 0x3d, 0xc5, 0x7a, 0x3b, 0xef, 0x3b, 0xef, 0xf3, 0x66, 0xde, 0xbc, 0xa7, 0xc0, - 0x74, 0x91, 0xf1, 0x0a, 0xe3, 0x96, 0xed, 0x72, 0xe1, 0xbb, 0x3b, 0x35, 0xe1, 0x32, 0xcf, 0xda, - 0x9d, 0xdb, 0xa1, 0x82, 0xcc, 0x59, 0x0f, 0x6a, 0xd4, 0xdf, 0xcf, 0x57, 0x7d, 0x26, 0x18, 0x1e, - 0x57, 0x0b, 0xf3, 0xe1, 0x85, 0x79, 0xbd, 0xd0, 0x78, 0x5b, 0xab, 0xec, 0x10, 0x4e, 0x95, 0x57, - 0x43, 0xa3, 0x4a, 0x1c, 0xd7, 0x23, 0x72, 0xb5, 0x14, 0x32, 0x2e, 0x3a, 0xcc, 0x61, 0xf2, 0xa7, - 0x55, 0xff, 0xa5, 0xad, 0x13, 0x0e, 0x63, 0x4e, 0x99, 0x5a, 0xa4, 0xea, 0x5a, 0xc4, 0xf3, 0x98, - 0x90, 0x2e, 0x5c, 0x7f, 0xcd, 0x86, 0xf5, 0x03, 0xe5, 0x22, 0x73, 0x03, 0xcd, 0x7c, 0x12, 0x45, - 0x24, 0x62, 0xb9, 0xde, 0xbc, 0x08, 0xf8, 0x6e, 0x3d, 0xca, 0x75, 0xe2, 0x93, 0x0a, 0x2f, 0xd0, - 0x07, 0x35, 0xca, 0x85, 0xb9, 0x05, 0x17, 0x22, 0x56, 0x5e, 0x65, 0x1e, 0xa7, 0x78, 0x11, 0x4e, - 0x55, 0xa5, 0x25, 0x83, 0x26, 0xd1, 0xcc, 0xd9, 0xf9, 0xa9, 0x7c, 0x42, 0x2a, 0xf2, 0xca, 0x79, - 0x69, 0xe4, 0xc9, 0xef, 0xb9, 0x54, 0x41, 0x3b, 0x9a, 0x1b, 0x30, 0x2d, 0x95, 0x37, 0x48, 0xd9, - 0xb5, 0x89, 0x60, 0xfe, 0x9d, 0x9a, 0xe0, 0x82, 0x78, 0xb6, 0xeb, 0x39, 0x05, 0xba, 0x47, 0x7c, - 0x3b, 0x08, 0x02, 0xcf, 0xc2, 0xf9, 0xdd, 0x60, 0xd5, 0x36, 0xb1, 0x6d, 0x9f, 0x72, 0xb5, 0xf1, - 0x99, 0xc2, 0x58, 0xe3, 0xc3, 0xa2, 0xb2, 0x9b, 0xdf, 0x20, 0x98, 0xe9, 0x2e, 0xac, 0x39, 0xb6, - 0xe0, 0xb4, 0xaf, 0x4c, 0x1a, 0xe4, 0xdd, 0x44, 0x90, 0x04, 0x49, 0x4d, 0x17, 0xc8, 0x99, 0x6b, - 0x90, 0x8b, 0x46, 0xb1, 0xcc, 0x2a, 0x15, 0x97, 0x73, 0x97, 0x79, 0x03, 0x61, 0x7d, 0x8b, 0x60, - 0xb2, 0xb3, 0xa0, 0xc6, 0x21, 0x00, 0xc5, 0x86, 0x55, 0x13, 0x5d, 0xef, 0x8d, 0x68, 0xb1, 0x58, - 0xac, 0x55, 0x6a, 0x65, 0x22, 0xa8, 0xdd, 0x14, 0xd6, 0x50, 0x21, 0x51, 0xf3, 0x1f, 0x04, 0x13, - 0xd1, 0x38, 0x3e, 0x29, 0x13, 0x5e, 0xa2, 0x03, 0x1d, 0x16, 0x9e, 0x86, 0x51, 0x2e, 0x88, 0x2f, - 0x5c, 0xcf, 0xd9, 0x2e, 0x51, 0xd7, 0x29, 0x89, 0x4c, 0x7a, 0x12, 0xcd, 0x8c, 0x14, 0x5e, 0x09, - 0xcc, 0x37, 0xa5, 0x15, 0x4f, 0xc1, 0x39, 0x2a, 0xd3, 0x1d, 0x2c, 0x3b, 0x21, 0x97, 0xbd, 0xac, - 0x8c, 0x7a, 0xd1, 0x0d, 0x80, 0x66, 0x69, 0x65, 0x46, 0x24, 0xfe, 0x9b, 0x01, 0x7e, 0xbd, 0x4e, - 0xf2, 0xaa, 0x7a, 0x9b, 0xf7, 0xd2, 0xa1, 0x3a, 0xec, 0x42, 0xc8, 0xf3, 0xda, 0x4b, 0xdf, 0x1d, - 0xe6, 0x52, 0x8f, 0x0f, 0x73, 0xc8, 0xfc, 0x05, 0xc1, 0xeb, 0x1d, 0x68, 0x75, 0xca, 0xd7, 0xe1, - 0x34, 0x57, 0xa6, 0x0c, 0x9a, 0x3c, 0x31, 0x73, 0x76, 0xfe, 0x4a, 0x6f, 0xf9, 0x96, 0x3a, 0xab, - 0xbb, 0xd4, 0x13, 0xc1, 0xcd, 0xd1, 0x32, 0xf8, 0xe3, 0x08, 0x45, 0x5a, 0x52, 0x4c, 0x77, 0xa5, - 0x50, 0xe1, 0x84, 0x31, 0xcc, 0x83, 0x20, 0xf8, 0x15, 0x5a, 0xa6, 0x8e, 0xb4, 0xb5, 0x17, 0x96, - 0xad, 0xbe, 0xb5, 0x9f, 0x55, 0xe3, 0x43, 0x70, 0x56, 0xb1, 0x07, 0x9b, 0x8e, 0x3f, 0x58, 0x95, - 0xc2, 0xe7, 0x87, 0xb9, 0x94, 0xf9, 0x3d, 0x82, 0x6c, 0xa7, 0x28, 0x74, 0x0e, 0xef, 0x87, 0xab, - 0xb0, 0x9e, 0xc3, 0x89, 0x08, 0x6e, 0x00, 0xba, 0x42, 0x8b, 0xcb, 0xcc, 0xf5, 0x96, 0x16, 0xea, - 0xf9, 0xfa, 0xe9, 0x8f, 0xdc, 0xac, 0xe3, 0x8a, 0x52, 0x6d, 0x27, 0x5f, 0x64, 0x15, 0x4b, 0x3f, - 0x76, 0xea, 0xcf, 0x65, 0x6e, 0xdf, 0xb7, 0xc4, 0x7e, 0x95, 0xf2, 0xc0, 0x87, 0x37, 0x0b, 0xf3, - 0x73, 0x30, 0x5b, 0xc2, 0xb9, 0xc7, 0x04, 0x29, 0x0f, 0x91, 0x99, 0x10, 0xec, 0xdf, 0x08, 0xa6, - 0x12, 0xd5, 0x35, 0xf1, 0x46, 0x2b, 0xf1, 0xd5, 0xc4, 0x5b, 0xd3, 0x54, 0x5b, 0x09, 0xf6, 0x56, - 0x8a, 0x2d, 0xaf, 0x0e, 0x76, 0xe0, 0xa4, 0xa8, 0xef, 0x97, 0x49, 0xbf, 0xa8, 0x3c, 0x2a, 0x7d, - 0x73, 0x4b, 0x3f, 0x6f, 0x8d, 0x78, 0x1a, 0x17, 0x7b, 0xd8, 0x14, 0xde, 0xd6, 0xef, 0x5c, 0xac, - 0xb2, 0x4e, 0x5f, 0x16, 0xa0, 0x71, 0xe3, 0x54, 0x06, 0xcf, 0x14, 0x42, 0x96, 0x90, 0xda, 0x97, - 0xf0, 0x46, 0x54, 0x6d, 0xd3, 0x15, 0x25, 0xdb, 0x27, 0x7b, 0x7a, 0xe3, 0x21, 0x83, 0xfd, 0x02, - 0x2e, 0x75, 0x91, 0xd7, 0x11, 0xbf, 0x05, 0x63, 0x7b, 0xfa, 0x53, 0x8b, 0xfc, 0xe8, 0x5e, 0xd4, - 0x25, 0xa4, 0x3e, 0x0e, 0xaf, 0x49, 0xf5, 0xfa, 0x83, 0x5c, 0xf3, 0x5c, 0xb1, 0xbf, 0xce, 0x58, - 0x39, 0xe8, 0xcc, 0x07, 0x08, 0x8c, 0xb8, 0xaf, 0x7a, 0x43, 0x0a, 0x23, 0x55, 0xc6, 0xca, 0x2f, - 0xae, 0xa0, 0xa4, 0xfc, 0xfc, 0xb3, 0x51, 0x38, 0x29, 0xa3, 0xc0, 0x8f, 0x11, 0x9c, 0x52, 0x8d, - 0x1e, 0x5b, 0x89, 0x97, 0xb9, 0x7d, 0xca, 0x30, 0xae, 0xf4, 0xee, 0xa0, 0xf0, 0xcc, 0xd9, 0xaf, - 0x7f, 0xfd, 0xeb, 0xc7, 0xf4, 0x25, 0x3c, 0x65, 0x25, 0x8d, 0x39, 0x6a, 0xd4, 0xc0, 0x07, 0x69, - 0x18, 0x4f, 0x68, 0xdd, 0x78, 0xa5, 0xfb, 0xf6, 0xdd, 0xa7, 0x14, 0x63, 0x75, 0x48, 0x15, 0x4d, - 0xb6, 0x29, 0xc9, 0xee, 0xe2, 0x3b, 0x89, 0x64, 0xcd, 0xcb, 0x6e, 0x3d, 0x6c, 0x7b, 0x95, 0x1f, - 0x59, 0xac, 0xa9, 0xbf, 0x1d, 0xbc, 0x0d, 0x47, 0x08, 0x2e, 0xc4, 0x0c, 0x0f, 0xf8, 0xfd, 0x3e, - 0xe2, 0x6e, 0x1b, 0x62, 0x8c, 0x0f, 0x06, 0xf4, 0xd6, 0xb4, 0x6b, 0x92, 0xf6, 0x26, 0xbe, 0x31, - 0x0c, 0x6d, 0x73, 0x3c, 0xc1, 0xbf, 0x21, 0x18, 0x6b, 0xed, 0xd5, 0xf8, 0xbd, 0x3e, 0x62, 0x8c, - 0x4e, 0x33, 0xc6, 0xb5, 0x41, 0x5c, 0x35, 0xdb, 0x2d, 0xc9, 0xb6, 0x8a, 0x97, 0x87, 0x61, 0x0b, - 0xa6, 0x82, 0x7f, 0x11, 0x9c, 0x6f, 0xeb, 0xa0, 0xb8, 0x87, 0xf0, 0x3a, 0x35, 0x7f, 0xe3, 0xfa, - 0x40, 0xbe, 0x9a, 0x6d, 0x5b, 0xb2, 0x7d, 0x8a, 0x37, 0x13, 0xd9, 0x1a, 0x2f, 0x27, 0xb7, 0x1e, - 0xb6, 0x3d, 0xaf, 0x8f, 0x2c, 0x7d, 0x33, 0xe3, 0xb8, 0xf1, 0x73, 0x04, 0xaf, 0xc6, 0x37, 0x51, - 0xfc, 0x61, 0x3f, 0x81, 0xc7, 0x34, 0x77, 0xe3, 0xa3, 0xc1, 0x05, 0xfa, 0x3a, 0xda, 0xde, 0xf0, - 0x65, 0x61, 0xc6, 0x74, 0xbb, 0x5e, 0x0a, 0xb3, 0x73, 0xfb, 0xed, 0xa5, 0x30, 0x13, 0x5a, 0x6c, - 0x8f, 0x85, 0xd9, 0x85, 0xb0, 0x79, 0xb7, 0xf1, 0x7f, 0x08, 0x32, 0x9d, 0xba, 0x24, 0x5e, 0xec, - 0x23, 0xd6, 0xf8, 0x06, 0x6e, 0x2c, 0x0d, 0x23, 0xa1, 0x99, 0xef, 0x49, 0xe6, 0x35, 0x7c, 0x7b, - 0x18, 0xe6, 0xd6, 0x36, 0x8f, 0x7f, 0x46, 0x70, 0x2e, 0xd2, 0xa3, 0xf1, 0xd5, 0xee, 0xb1, 0xc6, - 0xb5, 0x7c, 0xe3, 0x9d, 0xbe, 0xfd, 0x34, 0xd8, 0x82, 0x04, 0xbb, 0x8c, 0x67, 0x13, 0xc1, 0x8a, - 0x81, 0xef, 0x76, 0xbd, 0xb5, 0x2f, 0xdd, 0x7a, 0x72, 0x94, 0x45, 0x4f, 0x8f, 0xb2, 0xe8, 0xcf, - 0xa3, 0x2c, 0xfa, 0xe1, 0x38, 0x9b, 0x7a, 0x7a, 0x9c, 0x4d, 0x3d, 0x3b, 0xce, 0xa6, 0x3e, 0x9b, - 0x4b, 0x9c, 0x13, 0xbe, 0x8a, 0xaa, 0xcb, 0xb1, 0x61, 0xe7, 0x94, 0xfc, 0x27, 0xc3, 0xc2, 0xff, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x68, 0x0b, 0x91, 0xae, 0x5c, 0x11, 0x00, 0x00, + 0x14, 0xc7, 0x3d, 0x6e, 0x9a, 0xd2, 0x57, 0x4a, 0xd2, 0x69, 0x85, 0xcc, 0x26, 0xd8, 0xd1, 0x86, + 0x92, 0x94, 0xa8, 0xde, 0x26, 0x95, 0x0a, 0xb4, 0x20, 0xc8, 0xaf, 0x52, 0x44, 0x95, 0xa6, 0xa6, + 0x4a, 0xc2, 0x2f, 0x59, 0x63, 0xef, 0x68, 0xbd, 0x62, 0xbd, 0xe3, 0xee, 0x8c, 0x13, 0xa2, 0xaa, + 0x07, 0x28, 0x48, 0x48, 0x5c, 0x90, 0xb8, 0xf4, 0x98, 0x33, 0x77, 0x2e, 0xfc, 0x05, 0x3d, 0x56, + 0x42, 0x42, 0x3d, 0x01, 0x4a, 0x7a, 0xa8, 0x84, 0x38, 0x73, 0xad, 0x3c, 0x3b, 0x6b, 0xef, 0xda, + 0xeb, 0xf5, 0x2f, 0xf5, 0x66, 0xbd, 0x9d, 0xf7, 0x9d, 0xf7, 0x79, 0x33, 0x6f, 0xde, 0x93, 0x61, + 0xae, 0xcc, 0x78, 0x95, 0x71, 0xc3, 0xb4, 0xb9, 0xf0, 0xec, 0x52, 0x5d, 0xd8, 0xcc, 0x35, 0x76, + 0x17, 0x4b, 0x54, 0x90, 0x45, 0xe3, 0x6e, 0x9d, 0x7a, 0xfb, 0xf9, 0x9a, 0xc7, 0x04, 0xc3, 0x53, + 0xfe, 0xc2, 0x7c, 0x78, 0x61, 0x5e, 0x2d, 0xd4, 0xde, 0x52, 0x2a, 0x25, 0xc2, 0xa9, 0xef, 0xd5, + 0xd4, 0xa8, 0x11, 0xcb, 0x76, 0x89, 0x5c, 0x2d, 0x85, 0xb4, 0x73, 0x16, 0xb3, 0x98, 0xfc, 0x69, + 0x34, 0x7e, 0x29, 0xeb, 0xb4, 0xc5, 0x98, 0xe5, 0x50, 0x83, 0xd4, 0x6c, 0x83, 0xb8, 0x2e, 0x13, + 0xd2, 0x85, 0xab, 0xaf, 0xd9, 0xb0, 0x7e, 0xa0, 0x5c, 0x66, 0x76, 0xa0, 0x99, 0x4f, 0xa2, 0x88, + 0x44, 0x2c, 0xd7, 0xeb, 0xe7, 0x00, 0xdf, 0x6e, 0x44, 0xb9, 0x49, 0x3c, 0x52, 0xe5, 0x05, 0x7a, + 0xb7, 0x4e, 0xb9, 0xd0, 0x77, 0xe0, 0x6c, 0xc4, 0xca, 0x6b, 0xcc, 0xe5, 0x14, 0x2f, 0xc3, 0x78, + 0x4d, 0x5a, 0x32, 0x68, 0x06, 0xcd, 0x9f, 0x5a, 0x9a, 0xcd, 0x27, 0xa4, 0x22, 0xef, 0x3b, 0xaf, + 0x8c, 0x3d, 0xfa, 0x2b, 0x97, 0x2a, 0x28, 0x47, 0x7d, 0x0b, 0xe6, 0xa4, 0xf2, 0x16, 0x71, 0x6c, + 0x93, 0x08, 0xe6, 0xdd, 0xaa, 0x0b, 0x2e, 0x88, 0x6b, 0xda, 0xae, 0x55, 0xa0, 0x7b, 0xc4, 0x33, + 0x83, 0x20, 0xf0, 0x02, 0x9c, 0xd9, 0x0d, 0x56, 0x15, 0x89, 0x69, 0x7a, 0x94, 0xfb, 0x1b, 0x9f, + 0x2c, 0x4c, 0x36, 0x3f, 0x2c, 0xfb, 0x76, 0xfd, 0x7b, 0x04, 0xf3, 0xbd, 0x85, 0x15, 0xc7, 0x0e, + 0x9c, 0xf0, 0x7c, 0x93, 0x02, 0x79, 0x27, 0x11, 0x24, 0x41, 0x52, 0xd1, 0x05, 0x72, 0xfa, 0x06, + 0xe4, 0xa2, 0x51, 0xac, 0xb2, 0x6a, 0xd5, 0xe6, 0xdc, 0x66, 0xee, 0x50, 0x58, 0x3f, 0x20, 0x98, + 0xe9, 0x2e, 0xa8, 0x70, 0x08, 0x40, 0xb9, 0x69, 0x55, 0x44, 0xd7, 0xfa, 0x23, 0x5a, 0x2e, 0x97, + 0xeb, 0xd5, 0xba, 0x43, 0x04, 0x35, 0x5b, 0xc2, 0x0a, 0x2a, 0x24, 0xaa, 0xff, 0x8b, 0x60, 0x3a, + 0x1a, 0xc7, 0xa7, 0x0e, 0xe1, 0x15, 0x3a, 0xd4, 0x61, 0xe1, 0x39, 0x98, 0xe0, 0x82, 0x78, 0xc2, + 0x76, 0xad, 0x62, 0x85, 0xda, 0x56, 0x45, 0x64, 0xd2, 0x33, 0x68, 0x7e, 0xac, 0xf0, 0x4a, 0x60, + 0xbe, 0x21, 0xad, 0x78, 0x16, 0x4e, 0x53, 0x99, 0xee, 0x60, 0xd9, 0x31, 0xb9, 0xec, 0x65, 0xdf, + 0xa8, 0x16, 0x5d, 0x07, 0x68, 0x95, 0x56, 0x66, 0x4c, 0xe2, 0xbf, 0x19, 0xe0, 0x37, 0xea, 0x24, + 0xef, 0x57, 0x6f, 0xeb, 0x5e, 0x5a, 0x54, 0x85, 0x5d, 0x08, 0x79, 0x5e, 0x7d, 0xe9, 0xc7, 0x83, + 0x5c, 0xea, 0xe1, 0x41, 0x0e, 0xe9, 0xbf, 0x23, 0x78, 0xbd, 0x0b, 0xad, 0x4a, 0xf9, 0x26, 0x9c, + 0xe0, 0xbe, 0x29, 0x83, 0x66, 0x8e, 0xcd, 0x9f, 0x5a, 0xba, 0xd4, 0x5f, 0xbe, 0xa5, 0xce, 0xfa, + 0x2e, 0x75, 0x45, 0x70, 0x73, 0x94, 0x0c, 0xfe, 0x28, 0x42, 0x91, 0x96, 0x14, 0x73, 0x3d, 0x29, + 0xfc, 0x70, 0xc2, 0x18, 0xfa, 0x83, 0x20, 0xf8, 0x35, 0xea, 0x50, 0x4b, 0xda, 0x3a, 0x0b, 0xcb, + 0xf4, 0xbf, 0x75, 0x9e, 0x55, 0xf3, 0x43, 0x70, 0x56, 0xb1, 0x07, 0x9b, 0x8e, 0x3f, 0x58, 0x3f, + 0x85, 0xcf, 0x0e, 0x72, 0x29, 0xfd, 0x27, 0x04, 0xd9, 0x6e, 0x51, 0xa8, 0x1c, 0xda, 0xe1, 0x2a, + 0x6c, 0xe4, 0x70, 0x3a, 0x82, 0x1b, 0x80, 0xae, 0xd1, 0xf2, 0x2a, 0xb3, 0xdd, 0x95, 0xc5, 0x46, + 0xbe, 0x7e, 0xfd, 0x3b, 0x77, 0xc1, 0xb2, 0x45, 0xa5, 0x5e, 0xca, 0x97, 0x59, 0xd5, 0x70, 0x6c, + 0x97, 0x1a, 0x4e, 0xa9, 0x7a, 0x91, 0x9b, 0x5f, 0x1b, 0xbb, 0x4b, 0x86, 0xd8, 0xaf, 0x51, 0x1e, + 0x78, 0xf0, 0x56, 0x59, 0x7e, 0x01, 0x7a, 0x5b, 0x30, 0x77, 0x98, 0x20, 0xce, 0x08, 0x79, 0x09, + 0xa1, 0x3e, 0x45, 0x30, 0x9b, 0xa8, 0xae, 0x78, 0xb7, 0xda, 0x79, 0xaf, 0x24, 0xde, 0x99, 0x96, + 0xda, 0x5a, 0xb0, 0xb7, 0xaf, 0xd8, 0xf6, 0xe6, 0x60, 0x0a, 0xc7, 0x45, 0x63, 0xbf, 0x4c, 0xfa, + 0xc5, 0x64, 0xd1, 0x57, 0xd7, 0x77, 0xd4, 0xd3, 0xd6, 0x8c, 0xa6, 0x79, 0xa9, 0x47, 0x4d, 0xe0, + 0x4d, 0xf5, 0xc6, 0xc5, 0x2a, 0xab, 0xe4, 0x65, 0x01, 0x9a, 0xb7, 0xcd, 0xcf, 0xdf, 0xc9, 0x42, + 0xc8, 0x12, 0x52, 0xfb, 0x0a, 0xde, 0x88, 0xaa, 0x6d, 0xdb, 0xa2, 0x62, 0x7a, 0x64, 0x4f, 0x6d, + 0x3c, 0x62, 0xb0, 0x5f, 0xc2, 0xf9, 0x1e, 0xf2, 0x2a, 0xe2, 0x0b, 0x30, 0xb9, 0xa7, 0x3e, 0xb5, + 0xc9, 0x4f, 0xec, 0x45, 0x5d, 0x42, 0xea, 0x53, 0xf0, 0x9a, 0x54, 0x6f, 0x3c, 0xc6, 0x75, 0xd7, + 0x16, 0xfb, 0x9b, 0x8c, 0x39, 0x41, 0x57, 0xfe, 0x16, 0x81, 0x16, 0xf7, 0x55, 0x6d, 0x58, 0x86, + 0xb1, 0x1a, 0x63, 0xce, 0x8b, 0x2a, 0x26, 0x29, 0xbe, 0xf4, 0x64, 0x02, 0x8e, 0xcb, 0x18, 0xf0, + 0x43, 0x04, 0xe3, 0x7e, 0x8b, 0xc7, 0x46, 0xe2, 0x45, 0xee, 0x9c, 0x2f, 0xb4, 0x4b, 0xfd, 0x3b, + 0xf8, 0x70, 0xfa, 0xc2, 0x77, 0x7f, 0x3c, 0xfd, 0x25, 0x7d, 0x1e, 0xcf, 0x1a, 0x49, 0x03, 0x8e, + 0x3f, 0x64, 0xe0, 0x07, 0x69, 0x98, 0x4a, 0x68, 0xda, 0x78, 0xad, 0xf7, 0xf6, 0xbd, 0xe7, 0x13, + 0x6d, 0x7d, 0x44, 0x15, 0x45, 0xb6, 0x2d, 0xc9, 0x6e, 0xe3, 0x5b, 0x89, 0x64, 0xad, 0xab, 0x6e, + 0xdc, 0xeb, 0x78, 0x8f, 0xef, 0x1b, 0xac, 0xa5, 0x5f, 0x0c, 0xde, 0x85, 0x43, 0x04, 0x67, 0x63, + 0xc6, 0x06, 0xfc, 0xde, 0x00, 0x71, 0x77, 0x8c, 0x2f, 0xda, 0xfb, 0x43, 0x7a, 0x2b, 0xda, 0x0d, + 0x49, 0x7b, 0x03, 0x5f, 0x1f, 0x85, 0xb6, 0x35, 0x98, 0xe0, 0x3f, 0x11, 0x4c, 0xb6, 0x77, 0x69, + 0xfc, 0xee, 0x00, 0x31, 0x46, 0xe7, 0x18, 0xed, 0xea, 0x30, 0xae, 0x8a, 0xed, 0x13, 0xc9, 0xb6, + 0x8e, 0x57, 0x47, 0x61, 0x0b, 0xe6, 0x81, 0xff, 0x10, 0x9c, 0xe9, 0xe8, 0x9d, 0xb8, 0x8f, 0xf0, + 0xba, 0xb5, 0x7d, 0xed, 0xda, 0x50, 0xbe, 0x8a, 0xad, 0x28, 0xd9, 0x3e, 0xc3, 0xdb, 0x89, 0x6c, + 0xcd, 0x77, 0x93, 0x1b, 0xf7, 0x3a, 0x1e, 0xd7, 0xfb, 0x86, 0xba, 0x99, 0x71, 0xdc, 0xf8, 0x19, + 0x82, 0x57, 0xe3, 0x1b, 0x28, 0xfe, 0x60, 0x90, 0xc0, 0x63, 0x1a, 0xbb, 0xf6, 0xe1, 0xf0, 0x02, + 0x03, 0x1d, 0x6d, 0x7f, 0xf8, 0xb2, 0x30, 0x63, 0x7a, 0x5d, 0x3f, 0x85, 0xd9, 0xbd, 0xf9, 0xf6, + 0x53, 0x98, 0x09, 0x0d, 0xb6, 0xcf, 0xc2, 0xec, 0x41, 0xd8, 0xba, 0xdb, 0xf8, 0x7f, 0x04, 0x99, + 0x6e, 0x3d, 0x12, 0x2f, 0x0f, 0x10, 0x6b, 0x7c, 0xfb, 0xd6, 0x56, 0x46, 0x91, 0x50, 0xcc, 0x77, + 0x24, 0xf3, 0x06, 0xbe, 0x39, 0x0a, 0x73, 0x7b, 0x93, 0xc7, 0xbf, 0x21, 0x38, 0x1d, 0xe9, 0xd0, + 0xf8, 0x4a, 0xef, 0x58, 0xe3, 0x1a, 0xbe, 0xf6, 0xf6, 0xc0, 0x7e, 0x0a, 0xec, 0xb2, 0x04, 0xbb, + 0x88, 0x17, 0x12, 0xc1, 0xca, 0x81, 0x6f, 0xb1, 0xd1, 0xda, 0x57, 0x3e, 0x7e, 0x74, 0x98, 0x45, + 0x8f, 0x0f, 0xb3, 0xe8, 0x9f, 0xc3, 0x2c, 0xfa, 0xf9, 0x28, 0x9b, 0x7a, 0x7c, 0x94, 0x4d, 0x3d, + 0x39, 0xca, 0xa6, 0x3e, 0x37, 0x12, 0xa6, 0x84, 0x6f, 0xa2, 0xda, 0x72, 0x68, 0x28, 0x8d, 0xcb, + 0x3f, 0x17, 0x2e, 0x3f, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x9e, 0xc3, 0x72, 0x54, 0x11, 0x00, + 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/distribution/types/tx.pb.go b/x/distribution/types/tx.pb.go index 7ba8c738ba..cdffb4e8a7 100644 --- a/x/distribution/types/tx.pb.go +++ b/x/distribution/types/tx.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -265,8 +265,8 @@ var xxx_messageInfo_MsgWithdrawValidatorCommissionResponse proto.InternalMessage // MsgFundCommunityPool allows an account to directly // fund the community pool. type MsgFundCommunityPool struct { - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` - Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` + Amount github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,1,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` + Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` } func (m *MsgFundCommunityPool) Reset() { *m = MsgFundCommunityPool{} } @@ -355,42 +355,43 @@ func init() { } var fileDescriptor_ed4f433d965e58ca = []byte{ - // 558 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x3f, 0x6f, 0xd3, 0x40, - 0x18, 0xc6, 0x7d, 0x2d, 0xaa, 0xe8, 0x31, 0x90, 0x58, 0x45, 0x0d, 0x4e, 0x38, 0x57, 0x56, 0x85, - 0xb2, 0x60, 0x93, 0x30, 0x20, 0xc2, 0x80, 0x48, 0x50, 0xa5, 0x0e, 0x11, 0xc8, 0x48, 0x20, 0xb1, - 0x20, 0x3b, 0x77, 0x72, 0x4f, 0xc4, 0xbe, 0xc8, 0x77, 0x6e, 0x9a, 0x11, 0x89, 0x81, 0x11, 0x89, - 0x0f, 0x40, 0x25, 0x16, 0xc4, 0xcc, 0xc8, 0x07, 0xc8, 0xd8, 0x91, 0x29, 0xa0, 0x64, 0x61, 0xee, - 0x27, 0x40, 0xf1, 0x3f, 0x92, 0xda, 0x49, 0x29, 0xe9, 0x94, 0xe8, 0xbd, 0xe7, 0xf9, 0xf9, 0x79, - 0x95, 0xe7, 0x62, 0xb8, 0xdb, 0x61, 0xdc, 0x65, 0xdc, 0xc0, 0x94, 0x0b, 0x9f, 0xda, 0x81, 0xa0, - 0xcc, 0x33, 0x0e, 0x6b, 0x36, 0x11, 0x56, 0xcd, 0x10, 0x47, 0x7a, 0xcf, 0x67, 0x82, 0xc9, 0xe5, - 0x48, 0xa5, 0xcf, 0xaa, 0xf4, 0x58, 0xa5, 0x6c, 0x39, 0xcc, 0x61, 0xa1, 0xce, 0x98, 0x7e, 0x8b, - 0x2c, 0x0a, 0x8a, 0xc1, 0xb6, 0xc5, 0x49, 0x0a, 0xec, 0x30, 0xea, 0x45, 0xe7, 0xda, 0x37, 0x00, - 0x6f, 0xb4, 0xb9, 0xf3, 0x9c, 0x88, 0x97, 0x54, 0x1c, 0x60, 0xdf, 0xea, 0x3f, 0xc6, 0xd8, 0x27, - 0x9c, 0xcb, 0xfb, 0xb0, 0x88, 0x49, 0x97, 0x38, 0x96, 0x60, 0xfe, 0x6b, 0x2b, 0x1a, 0x96, 0xc0, - 0x0e, 0xa8, 0x6e, 0x36, 0x2b, 0xa7, 0x23, 0xb5, 0x34, 0xb0, 0xdc, 0x6e, 0x43, 0xcb, 0x48, 0x34, - 0xb3, 0x90, 0xce, 0x12, 0xd4, 0x1e, 0x2c, 0xf4, 0x63, 0x7a, 0x4a, 0x5a, 0x0b, 0x49, 0xe5, 0xd3, - 0x91, 0xba, 0x1d, 0x91, 0xce, 0x2a, 0x34, 0xf3, 0x7a, 0x7f, 0x3e, 0x52, 0xe3, 0xea, 0xfb, 0x63, - 0x55, 0xfa, 0x7d, 0xac, 0x4a, 0x9a, 0x0a, 0x6f, 0xe5, 0xa6, 0x36, 0x09, 0xef, 0x31, 0x8f, 0x13, - 0xed, 0x3b, 0x80, 0x4a, 0x9b, 0x3b, 0xc9, 0xf1, 0x93, 0x24, 0x92, 0x49, 0xfa, 0x96, 0x8f, 0x2f, - 0x73, 0xb9, 0x7d, 0x58, 0x3c, 0xb4, 0xba, 0x14, 0xcf, 0xa1, 0xd6, 0xce, 0xa2, 0x32, 0x12, 0xcd, - 0x2c, 0xa4, 0xb3, 0xec, 0x7e, 0xbb, 0x50, 0x5b, 0x9c, 0x3e, 0x5d, 0x32, 0x80, 0x68, 0x46, 0xf5, - 0x22, 0xc1, 0xb5, 0x98, 0xeb, 0x52, 0xce, 0x29, 0xf3, 0xf2, 0xc3, 0x81, 0x15, 0xc3, 0x55, 0xe1, - 0xed, 0xe5, 0x8f, 0x4d, 0x03, 0x7e, 0x06, 0x70, 0xab, 0xcd, 0x9d, 0xbd, 0xc0, 0xc3, 0xd3, 0xd3, - 0xc0, 0xa3, 0x62, 0xf0, 0x8c, 0xb1, 0xae, 0xdc, 0x81, 0x1b, 0x96, 0xcb, 0x02, 0x4f, 0x94, 0xc0, - 0xce, 0x7a, 0xf5, 0x5a, 0xfd, 0xa6, 0x1e, 0x57, 0x7b, 0xda, 0xd3, 0xa4, 0xd2, 0x7a, 0x8b, 0x51, - 0xaf, 0x79, 0x77, 0x38, 0x52, 0xa5, 0xaf, 0x3f, 0xd5, 0xaa, 0x43, 0xc5, 0x41, 0x60, 0xeb, 0x1d, - 0xe6, 0x1a, 0x71, 0xa9, 0xa3, 0x8f, 0x3b, 0x1c, 0xbf, 0x31, 0xc4, 0xa0, 0x47, 0x78, 0x68, 0xe0, - 0x66, 0x8c, 0x96, 0x2b, 0x70, 0x13, 0x93, 0x1e, 0xe3, 0x54, 0x30, 0x3f, 0xfa, 0x45, 0xcc, 0xbf, - 0x83, 0x99, 0x7d, 0x10, 0xac, 0xe4, 0x85, 0x4c, 0xb6, 0xa8, 0x0f, 0xaf, 0xc0, 0xf5, 0x36, 0x77, - 0xe4, 0x77, 0x00, 0xca, 0x39, 0x17, 0xa5, 0xae, 0x2f, 0xb9, 0x96, 0x7a, 0x6e, 0x4d, 0x95, 0xc6, - 0xc5, 0x3d, 0x49, 0x1c, 0xf9, 0x23, 0x80, 0xdb, 0x8b, 0x7a, 0x7d, 0xff, 0x3c, 0xee, 0x02, 0xa3, - 0xf2, 0xe8, 0x3f, 0x8d, 0x69, 0xaa, 0x4f, 0x00, 0x96, 0x97, 0x35, 0xf1, 0xe1, 0xbf, 0x3e, 0x20, - 0xc7, 0xac, 0xb4, 0x56, 0x30, 0xa7, 0x09, 0xdf, 0x02, 0x58, 0xcc, 0x36, 0xb1, 0x76, 0x1e, 0x3a, - 0x63, 0x51, 0x1e, 0x5c, 0xd8, 0x92, 0x64, 0x68, 0x3e, 0xfd, 0x32, 0x46, 0x60, 0x38, 0x46, 0xe0, - 0x64, 0x8c, 0xc0, 0xaf, 0x31, 0x02, 0x1f, 0x26, 0x48, 0x3a, 0x99, 0x20, 0xe9, 0xc7, 0x04, 0x49, - 0xaf, 0x6a, 0x4b, 0x2b, 0x7e, 0x34, 0xff, 0x76, 0x08, 0x1b, 0x6f, 0x6f, 0x84, 0x7f, 0xe3, 0xf7, - 0xfe, 0x04, 0x00, 0x00, 0xff, 0xff, 0xd2, 0x18, 0x71, 0xb0, 0x41, 0x06, 0x00, 0x00, + // 561 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x31, 0x6f, 0xd3, 0x40, + 0x1c, 0xc5, 0x7d, 0x2d, 0xaa, 0xe8, 0x31, 0xd0, 0x58, 0x45, 0x0d, 0x4e, 0x38, 0x57, 0x56, 0x55, + 0x65, 0xc1, 0x56, 0xc2, 0x80, 0x08, 0x03, 0x22, 0x41, 0x95, 0x3a, 0x44, 0x42, 0x46, 0x02, 0x89, + 0x05, 0x9d, 0x73, 0x27, 0xf7, 0x84, 0xed, 0x8b, 0x7c, 0xe7, 0xa4, 0x19, 0x91, 0x18, 0x18, 0x91, + 0xf8, 0x00, 0x94, 0x0d, 0x31, 0x33, 0xf2, 0x01, 0x32, 0x76, 0x64, 0x0a, 0x28, 0x59, 0x98, 0xfb, + 0x09, 0x50, 0xe2, 0xd8, 0x24, 0xb5, 0x93, 0x52, 0xca, 0x16, 0xfd, 0xef, 0xbd, 0xdf, 0xbd, 0xbf, + 0xf2, 0x2e, 0x81, 0x7b, 0x6d, 0x2e, 0x7c, 0x2e, 0x2c, 0xc2, 0x84, 0x0c, 0x99, 0x13, 0x49, 0xc6, + 0x03, 0xab, 0x5b, 0x75, 0xa8, 0xc4, 0x55, 0x4b, 0x1e, 0x9b, 0x9d, 0x90, 0x4b, 0xae, 0x96, 0x62, + 0x95, 0x39, 0xaf, 0x32, 0x67, 0x2a, 0x6d, 0xdb, 0xe5, 0x2e, 0x9f, 0xea, 0xac, 0xc9, 0xa7, 0xd8, + 0xa2, 0xa1, 0x19, 0xd8, 0xc1, 0x82, 0xa6, 0xc0, 0x36, 0x67, 0x41, 0x7c, 0x6e, 0x7c, 0x05, 0xf0, + 0x56, 0x4b, 0xb8, 0xcf, 0xa8, 0x7c, 0xc1, 0xe4, 0x11, 0x09, 0x71, 0xef, 0x31, 0x21, 0x21, 0x15, + 0x42, 0x3d, 0x84, 0x05, 0x42, 0x3d, 0xea, 0x62, 0xc9, 0xc3, 0x57, 0x38, 0x1e, 0x16, 0xc1, 0x2e, + 0xa8, 0x6c, 0x36, 0xca, 0x67, 0x43, 0xbd, 0xd8, 0xc7, 0xbe, 0x57, 0x37, 0x32, 0x12, 0xc3, 0xde, + 0x4a, 0x67, 0x09, 0xea, 0x00, 0x6e, 0xf5, 0x66, 0xf4, 0x94, 0xb4, 0x36, 0x25, 0x95, 0xce, 0x86, + 0xfa, 0x4e, 0x4c, 0x3a, 0xaf, 0x30, 0xec, 0x9b, 0xbd, 0xc5, 0x48, 0xf5, 0xeb, 0xef, 0x4e, 0x74, + 0xe5, 0xd7, 0x89, 0xae, 0x18, 0x3a, 0xbc, 0x93, 0x9b, 0xda, 0xa6, 0xa2, 0xc3, 0x03, 0x41, 0x8d, + 0x6f, 0x00, 0x6a, 0x2d, 0xe1, 0x26, 0xc7, 0x4f, 0x92, 0x48, 0x36, 0xed, 0xe1, 0x90, 0xfc, 0xcf, + 0xe5, 0x0e, 0x61, 0xa1, 0x8b, 0x3d, 0x46, 0x16, 0x50, 0x6b, 0xe7, 0x51, 0x19, 0x89, 0x61, 0x6f, + 0xa5, 0xb3, 0xec, 0x7e, 0x7b, 0xd0, 0x58, 0x9e, 0x3e, 0x5d, 0x32, 0x82, 0x68, 0x4e, 0xf5, 0x3c, + 0xc1, 0x35, 0xb9, 0xef, 0x33, 0x21, 0x18, 0x0f, 0xf2, 0xc3, 0x81, 0x2b, 0x86, 0xab, 0xc0, 0xfd, + 0xd5, 0xd7, 0xa6, 0x01, 0x3f, 0x01, 0xb8, 0xdd, 0x12, 0xee, 0x41, 0x14, 0x90, 0xc9, 0x69, 0x14, + 0x30, 0xd9, 0x7f, 0xca, 0xb9, 0xa7, 0x62, 0xb8, 0x81, 0x7d, 0x1e, 0x05, 0xb2, 0x08, 0x76, 0xd7, + 0x2b, 0x37, 0x6a, 0xb7, 0xcd, 0x59, 0xb5, 0x27, 0x3d, 0x4d, 0x2a, 0x6d, 0x36, 0x39, 0x0b, 0x1a, + 0xe6, 0x60, 0xa8, 0x2b, 0x5f, 0x7e, 0xe8, 0xfb, 0x2e, 0x93, 0x47, 0x91, 0x63, 0xb6, 0xb9, 0x6f, + 0x79, 0x2c, 0xa0, 0x96, 0xe7, 0xf8, 0x77, 0x05, 0x79, 0x6d, 0x75, 0x6b, 0x96, 0xec, 0x77, 0xa8, + 0x98, 0xca, 0x85, 0x3d, 0x03, 0xab, 0x65, 0xb8, 0x49, 0x68, 0x87, 0x0b, 0x26, 0x79, 0x18, 0x7f, + 0x1f, 0xf6, 0x9f, 0xc1, 0xdc, 0x36, 0x08, 0x96, 0xf3, 0x22, 0x26, 0x3b, 0xd4, 0x06, 0xd7, 0xe0, + 0x7a, 0x4b, 0xb8, 0xea, 0x5b, 0x00, 0xd5, 0x9c, 0x67, 0x52, 0x33, 0x57, 0x3c, 0x4a, 0x33, 0xb7, + 0xa4, 0x5a, 0xfd, 0xf2, 0x9e, 0x24, 0x8e, 0xfa, 0x01, 0xc0, 0x9d, 0x65, 0xad, 0xbe, 0x7f, 0x11, + 0x77, 0x89, 0x51, 0x7b, 0xf4, 0x8f, 0xc6, 0x34, 0xd5, 0x47, 0x00, 0x4b, 0xab, 0x7a, 0xf8, 0xf0, + 0x6f, 0x2f, 0xc8, 0x31, 0x6b, 0xcd, 0x2b, 0x98, 0xd3, 0x84, 0x6f, 0x00, 0x2c, 0x64, 0x7b, 0x58, + 0xbd, 0x08, 0x9d, 0xb1, 0x68, 0x0f, 0x2e, 0x6d, 0x49, 0x32, 0x34, 0x5a, 0x9f, 0x47, 0x08, 0x0c, + 0x46, 0x08, 0x9c, 0x8e, 0x10, 0xf8, 0x39, 0x42, 0xe0, 0xfd, 0x18, 0x29, 0xa7, 0x63, 0xa4, 0x7c, + 0x1f, 0x23, 0xe5, 0xa5, 0xb5, 0xa2, 0xe0, 0xc7, 0x8b, 0xff, 0x0c, 0xd3, 0xbe, 0x3b, 0x1b, 0xd3, + 0x9f, 0xf0, 0x7b, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x27, 0x0a, 0x6e, 0x6b, 0x3d, 0x06, 0x00, + 0x00, } func (this *MsgSetWithdrawAddressResponse) Equal(that interface{}) bool { diff --git a/x/evidence/abci.go b/x/evidence/abci.go index 6200d9f074..10ce3071be 100644 --- a/x/evidence/abci.go +++ b/x/evidence/abci.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/telemetry" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/evidence/exported/evidence.go b/x/evidence/exported/evidence.go index f6d63f3deb..314de30d57 100644 --- a/x/evidence/exported/evidence.go +++ b/x/evidence/exported/evidence.go @@ -2,7 +2,7 @@ package exported import ( "github.com/gogo/protobuf/proto" - tmbytes "github.com/tendermint/tendermint/libs/bytes" + ostbytes "github.com/line/ostracon/libs/bytes" sdk "github.com/line/lbm-sdk/v2/types" ) @@ -15,7 +15,7 @@ type Evidence interface { Route() string Type() string String() string - Hash() tmbytes.HexBytes + Hash() ostbytes.HexBytes ValidateBasic() error // Height at which the infraction occurred diff --git a/x/evidence/genesis_test.go b/x/evidence/genesis_test.go index 189c5cbbfa..2d46f215a9 100644 --- a/x/evidence/genesis_test.go +++ b/x/evidence/genesis_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" + "github.com/line/ostracon/types/time" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types/time" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" "github.com/line/lbm-sdk/v2/simapp" @@ -28,7 +28,7 @@ func (suite *GenesisTestSuite) SetupTest() { checkTx := false app := simapp.Setup(checkTx) - suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1}) + suite.ctx = app.BaseApp.NewContext(checkTx, ostproto.Header{Height: 1}) suite.keeper = app.EvidenceKeeper } diff --git a/x/evidence/handler_test.go b/x/evidence/handler_test.go index 727d6d0307..5e880841e7 100644 --- a/x/evidence/handler_test.go +++ b/x/evidence/handler_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" "github.com/line/lbm-sdk/v2/simapp" @@ -104,7 +104,7 @@ func (suite *HandlerTestSuite) TestMsgSubmitEvidence() { } for i, tc := range testCases { - ctx := suite.app.BaseApp.NewContext(false, tmproto.Header{Height: suite.app.LastBlockHeight() + 1}) + ctx := suite.app.BaseApp.NewContext(false, ostproto.Header{Height: suite.app.LastBlockHeight() + 1}) res, err := suite.handler(ctx, tc.msg) if tc.expectErr { diff --git a/x/evidence/keeper/grpc_query_test.go b/x/evidence/keeper/grpc_query_test.go index 18760f4fda..e2fb7fccbc 100644 --- a/x/evidence/keeper/grpc_query_test.go +++ b/x/evidence/keeper/grpc_query_test.go @@ -8,7 +8,7 @@ import ( "github.com/line/lbm-sdk/v2/x/evidence/exported" "github.com/line/lbm-sdk/v2/x/evidence/types" - tmbytes "github.com/tendermint/tendermint/libs/bytes" + ostbytes "github.com/line/ostracon/libs/bytes" ) func (suite *KeeperTestSuite) TestQueryEvidence() { @@ -34,7 +34,7 @@ func (suite *KeeperTestSuite) TestQueryEvidence() { { "invalid request with empty evidence hash", func() { - req = &types.QueryEvidenceRequest{EvidenceHash: tmbytes.HexBytes{}} + req = &types.QueryEvidenceRequest{EvidenceHash: ostbytes.HexBytes{}} }, false, func(res *types.QueryEvidenceResponse) {}, diff --git a/x/evidence/keeper/keeper.go b/x/evidence/keeper/keeper.go index 174991a53f..d677ed6034 100644 --- a/x/evidence/keeper/keeper.go +++ b/x/evidence/keeper/keeper.go @@ -3,8 +3,8 @@ package keeper import ( "fmt" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/log" + ostbytes "github.com/line/ostracon/libs/bytes" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/store/prefix" @@ -107,7 +107,7 @@ func (k Keeper) SetEvidence(ctx sdk.Context, evidence exported.Evidence) { // GetEvidence retrieves Evidence by hash if it exists. If no Evidence exists for // the given hash, (nil, false) is returned. -func (k Keeper) GetEvidence(ctx sdk.Context, hash tmbytes.HexBytes) (exported.Evidence, bool) { +func (k Keeper) GetEvidence(ctx sdk.Context, hash ostbytes.HexBytes) (exported.Evidence, bool) { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixEvidence) bz := store.Get(hash) diff --git a/x/evidence/keeper/keeper_test.go b/x/evidence/keeper/keeper_test.go index 87d4dfb1f0..5437d3493a 100644 --- a/x/evidence/keeper/keeper_test.go +++ b/x/evidence/keeper/keeper_test.go @@ -5,8 +5,8 @@ import ( "fmt" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" @@ -92,7 +92,7 @@ func (suite *KeeperTestSuite) SetupTest() { app.EvidenceKeeper = *evidenceKeeper - suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1}) + suite.ctx = app.BaseApp.NewContext(checkTx, ostproto.Header{Height: 1}) suite.querier = keeper.NewQuerier(*evidenceKeeper, app.LegacyAmino()) suite.app = app diff --git a/x/evidence/keeper/querier.go b/x/evidence/keeper/querier.go index c3f96d89f5..a086cd35c4 100644 --- a/x/evidence/keeper/querier.go +++ b/x/evidence/keeper/querier.go @@ -8,7 +8,7 @@ import ( "github.com/line/lbm-sdk/v2/x/evidence/exported" "github.com/line/lbm-sdk/v2/x/evidence/types" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" ) func NewQuerier(k Keeper, legacyQuerierCdc *codec.LegacyAmino) sdk.Querier { diff --git a/x/evidence/keeper/querier_test.go b/x/evidence/keeper/querier_test.go index b5e8cb5cc6..e24d03a015 100644 --- a/x/evidence/keeper/querier_test.go +++ b/x/evidence/keeper/querier_test.go @@ -8,7 +8,7 @@ import ( "github.com/line/lbm-sdk/v2/x/evidence/exported" "github.com/line/lbm-sdk/v2/x/evidence/types" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" ) const ( diff --git a/x/evidence/legacy/v038/types.go b/x/evidence/legacy/v038/types.go index 24c4e8b022..05c8a48dd2 100644 --- a/x/evidence/legacy/v038/types.go +++ b/x/evidence/legacy/v038/types.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/crypto/tmhash" - tmbytes "github.com/tendermint/tendermint/libs/bytes" + "github.com/line/ostracon/crypto/tmhash" + ostbytes "github.com/line/ostracon/libs/bytes" "gopkg.in/yaml.v2" "github.com/line/lbm-sdk/v2/codec" @@ -43,7 +43,7 @@ type Evidence interface { Route() string Type() string String() string - Hash() tmbytes.HexBytes + Hash() ostbytes.HexBytes ValidateBasic() error // Height at which the infraction occurred @@ -85,7 +85,7 @@ func (e Equivocation) String() string { } // Hash returns the hash of an Equivocation object. -func (e Equivocation) Hash() tmbytes.HexBytes { +func (e Equivocation) Hash() ostbytes.HexBytes { return tmhash.Sum(ModuleCdc.LegacyAmino.MustMarshalBinaryBare(e)) } diff --git a/x/evidence/module.go b/x/evidence/module.go index ff68e11c5e..c1a302585a 100644 --- a/x/evidence/module.go +++ b/x/evidence/module.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/mux" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/evidence/spec/01_concepts.md b/x/evidence/spec/01_concepts.md index 78a16523da..1e3866e3c7 100644 --- a/x/evidence/spec/01_concepts.md +++ b/x/evidence/spec/01_concepts.md @@ -21,7 +21,7 @@ type Evidence interface { Route() string Type() string String() string - Hash() tmbytes.HexBytes + Hash() ostbytes.HexBytes ValidateBasic() error // Height at which the infraction occurred diff --git a/x/evidence/types/evidence.go b/x/evidence/types/evidence.go index dbb7907d18..7e163ea902 100644 --- a/x/evidence/types/evidence.go +++ b/x/evidence/types/evidence.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/tmhash" - tmbytes "github.com/tendermint/tendermint/libs/bytes" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/crypto/tmhash" + ostbytes "github.com/line/ostracon/libs/bytes" "gopkg.in/yaml.v2" sdk "github.com/line/lbm-sdk/v2/types" @@ -33,7 +33,7 @@ func (e *Equivocation) String() string { } // Hash returns the hash of an Equivocation object. -func (e *Equivocation) Hash() tmbytes.HexBytes { +func (e *Equivocation) Hash() ostbytes.HexBytes { bz, err := e.Marshal() if err != nil { panic(err) diff --git a/x/evidence/types/evidence.pb.go b/x/evidence/types/evidence.pb.go index 284f33a5ba..00a5b64f38 100644 --- a/x/evidence/types/evidence.pb.go +++ b/x/evidence/types/evidence.pb.go @@ -8,7 +8,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/golang/protobuf/ptypes/timestamp" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -77,28 +77,28 @@ func init() { } var fileDescriptor_dd143e71a177f0dd = []byte{ - // 324 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x3f, 0x4f, 0x02, 0x31, - 0x18, 0xc6, 0x5b, 0x41, 0xa2, 0x27, 0x83, 0x5e, 0x88, 0x5e, 0x88, 0x69, 0x09, 0x83, 0x61, 0xe1, - 0x1a, 0x74, 0x31, 0x6c, 0x92, 0x38, 0x18, 0x37, 0xe2, 0xe4, 0x62, 0xee, 0x4f, 0x2d, 0x8d, 0xdc, - 0xbd, 0x27, 0xed, 0xa1, 0x7c, 0x03, 0x47, 0x46, 0x47, 0x46, 0x3f, 0x0a, 0x9b, 0x8c, 0x4e, 0x68, - 0x8e, 0xc5, 0xd9, 0x4f, 0x60, 0xb8, 0x02, 0x0e, 0x4e, 0xed, 0xf3, 0xe4, 0xf7, 0xfe, 0x92, 0xf7, - 0xb5, 0x4e, 0x02, 0x50, 0x11, 0x28, 0xc6, 0x87, 0x32, 0xe4, 0x71, 0xc0, 0xd9, 0xb0, 0xe5, 0x73, - 0xed, 0xb5, 0x36, 0x85, 0x9b, 0x0c, 0x40, 0x83, 0x7d, 0x64, 0x38, 0x77, 0x53, 0xaf, 0xb8, 0x6a, - 0x45, 0x80, 0x80, 0x9c, 0x61, 0xcb, 0x9f, 0xc1, 0xab, 0x54, 0x00, 0x88, 0x3e, 0x67, 0x79, 0xf2, - 0xd3, 0x7b, 0xa6, 0x65, 0xc4, 0x95, 0xf6, 0xa2, 0xc4, 0x00, 0xf5, 0x77, 0x6c, 0x95, 0x2f, 0x1f, - 0x53, 0x39, 0x84, 0xc0, 0xd3, 0x12, 0x62, 0xfb, 0xd0, 0x2a, 0xf5, 0xb8, 0x14, 0x3d, 0xed, 0xe0, - 0x1a, 0x6e, 0x14, 0xba, 0xab, 0x64, 0x9f, 0x5b, 0xc5, 0xe5, 0xac, 0xb3, 0x55, 0xc3, 0x8d, 0xbd, - 0xd3, 0xaa, 0x6b, 0xc4, 0xee, 0x5a, 0xec, 0xde, 0xac, 0xc5, 0x9d, 0x9d, 0xe9, 0x9c, 0xa2, 0xf1, - 0x27, 0xc5, 0xdd, 0x7c, 0xc2, 0xae, 0x58, 0xdb, 0x09, 0x3c, 0xf1, 0x81, 0x53, 0xc8, 0x85, 0x26, - 0xd8, 0x57, 0xd6, 0x41, 0x00, 0xb1, 0xe2, 0xb1, 0x4a, 0xd5, 0x9d, 0x17, 0x86, 0x03, 0xae, 0x94, - 0x53, 0xac, 0xe1, 0xc6, 0x6e, 0xe7, 0xf8, 0x67, 0x4e, 0x9d, 0x91, 0x17, 0xf5, 0xdb, 0xf5, 0x7f, - 0x48, 0xbd, 0xbb, 0xbf, 0xe9, 0x2e, 0x4c, 0xd5, 0x2e, 0xbf, 0x4c, 0x28, 0x7a, 0x9d, 0x50, 0xf4, - 0x3d, 0xa1, 0xa8, 0x73, 0xfd, 0x96, 0x11, 0x3c, 0xcd, 0x08, 0x9e, 0x65, 0x04, 0x7f, 0x65, 0x04, - 0x8f, 0x17, 0x04, 0xcd, 0x16, 0x04, 0x7d, 0x2c, 0x08, 0xba, 0x6d, 0x0a, 0xa9, 0x7b, 0xa9, 0xef, - 0x06, 0x10, 0xb1, 0xd5, 0xc9, 0xcd, 0xd3, 0x54, 0xe1, 0x03, 0x7b, 0xfe, 0xbb, 0xbf, 0x1e, 0x25, - 0x5c, 0xf9, 0xa5, 0x7c, 0xbf, 0xb3, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x61, 0x33, 0x3a, 0x69, - 0x9f, 0x01, 0x00, 0x00, + // 329 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x3f, 0x4f, 0xfa, 0x40, + 0x1c, 0xc6, 0xef, 0x7e, 0xf0, 0x23, 0x5a, 0x19, 0xb4, 0x21, 0xda, 0x10, 0x73, 0x47, 0x18, 0x0c, + 0x89, 0xb1, 0x17, 0x70, 0x31, 0x6c, 0x92, 0x38, 0xb0, 0x12, 0x27, 0x17, 0xd3, 0x3f, 0x67, 0xb9, + 0xd8, 0xf6, 0x5b, 0xb9, 0x6b, 0x95, 0x77, 0xe0, 0xc8, 0xe8, 0xc8, 0xe8, 0x4b, 0x61, 0x93, 0xd1, + 0x09, 0x4d, 0x59, 0x9c, 0x7d, 0x05, 0x86, 0x1e, 0xe0, 0xe0, 0x76, 0xcf, 0x93, 0xcf, 0xf3, 0x49, + 0xee, 0x6b, 0x9c, 0x78, 0x20, 0x23, 0x90, 0x8c, 0x67, 0xc2, 0xe7, 0xb1, 0xc7, 0x59, 0xd6, 0x76, + 0xb9, 0x72, 0xda, 0xdb, 0xc2, 0x4e, 0x46, 0xa0, 0xc0, 0x3c, 0xd2, 0x9c, 0xbd, 0xad, 0xd7, 0x5c, + 0xbd, 0x16, 0x40, 0x00, 0x05, 0xc3, 0x56, 0x2f, 0x8d, 0xd7, 0x69, 0x00, 0x10, 0x84, 0x9c, 0x15, + 0xc9, 0x4d, 0xef, 0x98, 0x12, 0x11, 0x97, 0xca, 0x89, 0x12, 0x0d, 0x34, 0xdf, 0xb0, 0x51, 0xbd, + 0x7a, 0x48, 0x45, 0x06, 0x9e, 0xa3, 0x04, 0xc4, 0xe6, 0xa1, 0x51, 0x19, 0x72, 0x11, 0x0c, 0x95, + 0x85, 0x1b, 0xb8, 0x55, 0x1a, 0xac, 0x93, 0x79, 0x61, 0x94, 0x57, 0x5b, 0xeb, 0x5f, 0x03, 0xb7, + 0xf6, 0x3a, 0x75, 0x5b, 0x8b, 0xed, 0x8d, 0xd8, 0xbe, 0xde, 0x88, 0x7b, 0x3b, 0xb3, 0x05, 0x45, + 0x93, 0x0f, 0x8a, 0x07, 0xc5, 0xc2, 0xac, 0x19, 0xff, 0x13, 0x78, 0xe4, 0x23, 0xab, 0x54, 0x08, + 0x75, 0x30, 0xfb, 0xc6, 0x81, 0x07, 0xb1, 0xe4, 0xb1, 0x4c, 0xe5, 0xad, 0xe3, 0xfb, 0x23, 0x2e, + 0xa5, 0x55, 0x6e, 0xe0, 0xd6, 0x6e, 0xef, 0xf8, 0x7b, 0x41, 0xad, 0xb1, 0x13, 0x85, 0xdd, 0xe6, + 0x1f, 0xa4, 0x39, 0xd8, 0xdf, 0x76, 0x97, 0xba, 0xea, 0x56, 0x9f, 0xa7, 0x14, 0xbd, 0x4c, 0x29, + 0xfa, 0x9a, 0x52, 0xd4, 0xeb, 0xbf, 0xe6, 0x04, 0xcf, 0x72, 0x82, 0xe7, 0x39, 0xc1, 0x9f, 0x39, + 0xc1, 0x93, 0x25, 0x41, 0xf3, 0x25, 0x41, 0xef, 0x4b, 0x82, 0x6e, 0x4e, 0x03, 0xa1, 0x86, 0xa9, + 0x6b, 0x7b, 0x10, 0xb1, 0x50, 0xc4, 0x9c, 0x85, 0x6e, 0x74, 0x26, 0xfd, 0x7b, 0x96, 0x75, 0xd8, + 0xd3, 0xef, 0xf5, 0xd5, 0x38, 0xe1, 0xd2, 0xad, 0x14, 0xbf, 0x3b, 0xff, 0x09, 0x00, 0x00, 0xff, + 0xff, 0x25, 0xc0, 0xcd, 0x43, 0x9d, 0x01, 0x00, 0x00, } func (m *Equivocation) Marshal() (dAtA []byte, err error) { diff --git a/x/evidence/types/evidence_test.go b/x/evidence/types/evidence_test.go index 04f50923f5..8e3bdfb280 100644 --- a/x/evidence/types/evidence_test.go +++ b/x/evidence/types/evidence_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" sdk "github.com/line/lbm-sdk/v2/types" "github.com/line/lbm-sdk/v2/x/evidence/types" diff --git a/x/evidence/types/genesis.pb.go b/x/evidence/types/genesis.pb.go index a8c877ecc5..b7f1c2291d 100644 --- a/x/evidence/types/genesis.pb.go +++ b/x/evidence/types/genesis.pb.go @@ -78,7 +78,7 @@ func init() { } var fileDescriptor_c610c52c26e0e202 = []byte{ - // 195 bytes of a gzipped FileDescriptorProto + // 202 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4d, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2d, 0xcb, 0x4c, 0x49, 0xcd, 0x4b, 0x4e, 0xd5, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, @@ -86,12 +86,12 @@ var fileDescriptor_c610c52c26e0e202 = []byte{ 0x4f, 0xcf, 0x49, 0xd5, 0x07, 0x2b, 0x4b, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0x84, 0xe8, 0x51, 0x72, 0xe0, 0xe2, 0x71, 0x87, 0x18, 0x12, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0x64, 0xc0, 0xc5, 0x01, 0xd3, 0x2e, 0xc1, 0xa8, 0xc0, 0xac, 0xc1, 0x6d, 0x24, 0xa2, 0x07, 0xd1, 0xad, 0x07, 0xd3, 0xad, - 0xe7, 0x98, 0x57, 0x19, 0x04, 0x57, 0xe5, 0xe4, 0x7e, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, + 0xe7, 0x98, 0x57, 0x19, 0x04, 0x57, 0xe5, 0xe4, 0x7a, 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, 0xba, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x50, - 0x1f, 0x40, 0x28, 0xdd, 0xe2, 0x94, 0x6c, 0xfd, 0x0a, 0x84, 0x77, 0x4a, 0x2a, 0x0b, 0x52, 0x8b, - 0x93, 0xd8, 0xc0, 0x16, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x4b, 0xa9, 0xfe, 0xee, - 0x00, 0x00, 0x00, + 0x72, 0x0c, 0x51, 0xda, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0x39, + 0x99, 0x79, 0xa9, 0xfa, 0x39, 0x49, 0xb9, 0xba, 0xc5, 0x29, 0xd9, 0xfa, 0x65, 0x46, 0xfa, 0x15, + 0x08, 0xcf, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x8d, 0x37, 0x06, 0x04, 0x00, 0x00, + 0xff, 0xff, 0x4e, 0x45, 0x47, 0x8f, 0xec, 0x00, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/evidence/types/genesis_test.go b/x/evidence/types/genesis_test.go index d465f667c7..39551eaec7 100644 --- a/x/evidence/types/genesis_test.go +++ b/x/evidence/types/genesis_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + ostbytes "github.com/line/ostracon/libs/bytes" "github.com/stretchr/testify/require" - tmbytes "github.com/tendermint/tendermint/libs/bytes" "github.com/line/lbm-sdk/v2/codec" codectypes "github.com/line/lbm-sdk/v2/codec/types" @@ -178,8 +178,8 @@ func (*TestEvidence) String() string { func (*TestEvidence) ProtoMessage() {} func (*TestEvidence) Reset() {} -func (*TestEvidence) Hash() tmbytes.HexBytes { - return tmbytes.HexBytes([]byte("test-hash")) +func (*TestEvidence) Hash() ostbytes.HexBytes { + return ostbytes.HexBytes([]byte("test-hash")) } func (*TestEvidence) ValidateBasic() error { diff --git a/x/evidence/types/querier.go b/x/evidence/types/querier.go index 8a4141d14f..f32ab04e8b 100644 --- a/x/evidence/types/querier.go +++ b/x/evidence/types/querier.go @@ -1,7 +1,7 @@ package types import ( - tmbytes "github.com/tendermint/tendermint/libs/bytes" + ostbytes "github.com/line/ostracon/libs/bytes" query "github.com/line/lbm-sdk/v2/types/query" ) @@ -13,7 +13,7 @@ const ( ) // NewQueryEvidenceRequest creates a new instance of QueryEvidenceRequest. -func NewQueryEvidenceRequest(hash tmbytes.HexBytes) *QueryEvidenceRequest { +func NewQueryEvidenceRequest(hash ostbytes.HexBytes) *QueryEvidenceRequest { return &QueryEvidenceRequest{EvidenceHash: hash} } diff --git a/x/evidence/types/query.pb.go b/x/evidence/types/query.pb.go index 5258407844..165e3452ab 100644 --- a/x/evidence/types/query.pb.go +++ b/x/evidence/types/query.pb.go @@ -11,7 +11,7 @@ import ( proto "github.com/gogo/protobuf/proto" types "github.com/line/lbm-sdk/v2/codec/types" query "github.com/line/lbm-sdk/v2/types/query" - github_com_tendermint_tendermint_libs_bytes "github.com/tendermint/tendermint/libs/bytes" + github_com_line_ostracon_libs_bytes "github.com/line/ostracon/libs/bytes" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -35,7 +35,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QueryEvidenceRequest is the request type for the Query/Evidence RPC method. type QueryEvidenceRequest struct { // evidence_hash defines the hash of the requested evidence. - EvidenceHash github_com_tendermint_tendermint_libs_bytes.HexBytes `protobuf:"bytes,1,opt,name=evidence_hash,json=evidenceHash,proto3,casttype=github.com/tendermint/tendermint/libs/bytes.HexBytes" json:"evidence_hash,omitempty"` + EvidenceHash github_com_line_ostracon_libs_bytes.HexBytes `protobuf:"bytes,1,opt,name=evidence_hash,json=evidenceHash,proto3,casttype=github.com/line/ostracon/libs/bytes.HexBytes" json:"evidence_hash,omitempty"` } func (m *QueryEvidenceRequest) Reset() { *m = QueryEvidenceRequest{} } @@ -71,7 +71,7 @@ func (m *QueryEvidenceRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryEvidenceRequest proto.InternalMessageInfo -func (m *QueryEvidenceRequest) GetEvidenceHash() github_com_tendermint_tendermint_libs_bytes.HexBytes { +func (m *QueryEvidenceRequest) GetEvidenceHash() github_com_line_ostracon_libs_bytes.HexBytes { if m != nil { return m.EvidenceHash } @@ -240,36 +240,36 @@ func init() { var fileDescriptor_07043de1a84d215a = []byte{ // 468 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xcf, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0xeb, 0x22, 0xd0, 0xe4, 0x8d, 0x8b, 0x55, 0xb4, 0x11, 0xa1, 0x00, 0x99, 0xc4, 0x2f, - 0xa9, 0xf6, 0xb2, 0x71, 0x80, 0xe3, 0x2a, 0xc1, 0xc6, 0x0d, 0x72, 0x44, 0x42, 0xc8, 0x69, 0x4d, - 0x12, 0x91, 0xda, 0x59, 0xed, 0x4c, 0x8d, 0x10, 0x17, 0xfe, 0x02, 0x24, 0xc4, 0x91, 0x1b, 0x7f, - 0x0c, 0x27, 0x54, 0x89, 0x0b, 0x27, 0x84, 0x5a, 0xfe, 0x0a, 0x4e, 0x28, 0xb6, 0xd3, 0xa6, 0xbf, - 0x28, 0x9c, 0xf2, 0x62, 0xbf, 0xf7, 0xfd, 0x7e, 0xfc, 0xde, 0x83, 0xfb, 0x5d, 0x21, 0xfb, 0x42, - 0x12, 0x76, 0x9e, 0xf4, 0x18, 0xef, 0x32, 0x72, 0xee, 0x87, 0x4c, 0x51, 0x9f, 0x9c, 0xe5, 0x6c, - 0x50, 0xe0, 0x6c, 0x20, 0x94, 0x40, 0xbb, 0x26, 0x09, 0x57, 0x49, 0xd8, 0x26, 0x39, 0xf7, 0x6c, - 0x75, 0x48, 0x25, 0x33, 0x15, 0xd3, 0xfa, 0x8c, 0x46, 0x09, 0xa7, 0x2a, 0x11, 0xdc, 0x88, 0x38, - 0xad, 0x48, 0x44, 0x42, 0x87, 0xa4, 0x8c, 0xec, 0xe9, 0xd5, 0x48, 0x88, 0x28, 0x65, 0x44, 0xff, - 0x85, 0xf9, 0x2b, 0x42, 0xb9, 0x75, 0x75, 0xae, 0xd9, 0x2b, 0x9a, 0x25, 0x84, 0x72, 0x2e, 0x94, - 0x56, 0x93, 0xe6, 0xd6, 0xcb, 0x61, 0xeb, 0x59, 0x69, 0xf8, 0xc8, 0x32, 0x05, 0xec, 0x2c, 0x67, - 0x52, 0xa1, 0x17, 0xf0, 0x72, 0x85, 0xf9, 0x32, 0xa6, 0x32, 0xde, 0x03, 0x37, 0xc0, 0x9d, 0x9d, - 0xce, 0x83, 0xdf, 0x3f, 0xae, 0xdf, 0x8f, 0x12, 0x15, 0xe7, 0x21, 0xee, 0x8a, 0x3e, 0x51, 0x8c, - 0xf7, 0xd8, 0xa0, 0x9f, 0x70, 0x55, 0x0f, 0xd3, 0x24, 0x94, 0x24, 0x2c, 0x14, 0x93, 0xf8, 0x94, - 0x0d, 0x3b, 0x65, 0x10, 0xec, 0x54, 0x72, 0xa7, 0x54, 0xc6, 0xde, 0x13, 0x78, 0x65, 0xc1, 0x56, - 0x66, 0x82, 0x4b, 0x86, 0x0e, 0xe0, 0x56, 0x95, 0xa8, 0x2d, 0xb7, 0x0f, 0x5b, 0xd8, 0x3c, 0x00, - 0x57, 0x6f, 0xc3, 0xc7, 0xbc, 0x08, 0xa6, 0x59, 0x1e, 0x85, 0xbb, 0x5a, 0xea, 0x38, 0x4d, 0x17, - 0x1f, 0xf1, 0x18, 0xc2, 0x59, 0xff, 0xac, 0xdc, 0x2d, 0x6c, 0xa7, 0x50, 0x36, 0x1b, 0x9b, 0xf1, - 0xd8, 0x66, 0xe3, 0xa7, 0x34, 0xaa, 0x6a, 0x83, 0x5a, 0xa5, 0xf7, 0x11, 0xc0, 0xbd, 0x65, 0x8f, - 0x95, 0xc4, 0x17, 0x36, 0x13, 0xa3, 0x93, 0x39, 0xac, 0xa6, 0xc6, 0xba, 0xbd, 0x11, 0xcb, 0xd8, - 0xd5, 0xb9, 0x0e, 0xbf, 0x36, 0xe1, 0x45, 0xcd, 0x85, 0x3e, 0x03, 0xb8, 0x55, 0x91, 0xa1, 0x36, - 0x5e, 0xb3, 0x68, 0x78, 0xd5, 0xa8, 0x1d, 0xfc, 0xaf, 0xe9, 0x86, 0xc0, 0x7b, 0xf8, 0xee, 0xdb, - 0xaf, 0x0f, 0xcd, 0x23, 0xe4, 0x93, 0x75, 0x4b, 0x3f, 0x3d, 0x78, 0x33, 0xb7, 0x43, 0x6f, 0xd1, - 0x27, 0x00, 0xb7, 0x6b, 0x3d, 0x44, 0x07, 0x7f, 0xb7, 0x5e, 0x1e, 0xa9, 0xe3, 0xff, 0x47, 0x85, - 0xe5, 0xbd, 0xab, 0x79, 0xf7, 0xd1, 0xcd, 0x8d, 0xbc, 0x9d, 0x93, 0x2f, 0x63, 0x17, 0x8c, 0xc6, - 0x2e, 0xf8, 0x39, 0x76, 0xc1, 0xfb, 0x89, 0xdb, 0x18, 0x4d, 0xdc, 0xc6, 0xf7, 0x89, 0xdb, 0x78, - 0xde, 0xae, 0x2d, 0xbd, 0x95, 0x31, 0x9f, 0xb6, 0xec, 0xbd, 0x26, 0xc3, 0x99, 0xa6, 0x2a, 0x32, - 0x26, 0xc3, 0x4b, 0x7a, 0xf4, 0x47, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x50, 0xfb, 0x8a, 0x39, - 0x18, 0x04, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x3f, 0x6f, 0xd4, 0x30, + 0x18, 0xc6, 0xcf, 0x87, 0x40, 0x95, 0x5b, 0x16, 0xeb, 0x50, 0x4b, 0x84, 0x02, 0xa4, 0x12, 0xff, + 0x6b, 0x5f, 0xae, 0x13, 0x63, 0x4f, 0x2a, 0x94, 0x0d, 0x22, 0xb1, 0xb0, 0x20, 0x3b, 0x35, 0x49, + 0x44, 0x62, 0xa7, 0x67, 0xe7, 0xd4, 0x08, 0xb1, 0xf0, 0x09, 0x90, 0x10, 0x23, 0x1b, 0x1f, 0x86, + 0x09, 0x55, 0x62, 0x61, 0x42, 0xe8, 0x8e, 0x4f, 0xc1, 0x84, 0x62, 0x3b, 0xd7, 0xeb, 0xb5, 0xe5, + 0x60, 0x73, 0xec, 0xf7, 0x79, 0x9e, 0x5f, 0xde, 0xf7, 0x85, 0x9b, 0xb1, 0x54, 0x85, 0x54, 0x84, + 0x8f, 0xb3, 0x7d, 0x2e, 0x62, 0x4e, 0xc6, 0x21, 0xe3, 0x9a, 0x86, 0xe4, 0xa0, 0xe2, 0xa3, 0x1a, + 0x97, 0x23, 0xa9, 0x25, 0x5a, 0xb7, 0x45, 0xb8, 0x2d, 0xc2, 0xae, 0xc8, 0xbb, 0xe7, 0xd4, 0x8c, + 0x2a, 0x6e, 0x15, 0x33, 0x7d, 0x49, 0x93, 0x4c, 0x50, 0x9d, 0x49, 0x61, 0x4d, 0xbc, 0x5e, 0x22, + 0x13, 0x69, 0x8e, 0xa4, 0x39, 0xb9, 0xdb, 0xab, 0x89, 0x94, 0x49, 0xce, 0x89, 0xf9, 0x62, 0xd5, + 0x2b, 0x42, 0x85, 0x4b, 0xf5, 0xae, 0xb9, 0x27, 0x5a, 0x66, 0x84, 0x0a, 0x21, 0xb5, 0x71, 0x53, + 0xf6, 0x35, 0x28, 0x60, 0xef, 0x59, 0x13, 0xb8, 0xeb, 0x98, 0x22, 0x7e, 0x50, 0x71, 0xa5, 0xd1, + 0x73, 0x78, 0xb9, 0xc5, 0x7c, 0x99, 0x52, 0x95, 0x6e, 0x80, 0x1b, 0xe0, 0xce, 0xda, 0xb0, 0xff, + 0xfb, 0xc7, 0xf5, 0x07, 0x49, 0xa6, 0xd3, 0x8a, 0xe1, 0x58, 0x16, 0x24, 0xcf, 0x04, 0x27, 0x52, + 0xe9, 0x11, 0x8d, 0xa5, 0x20, 0x79, 0xc6, 0x14, 0x61, 0xb5, 0xe6, 0x0a, 0xef, 0xf1, 0xc3, 0x61, + 0x73, 0x88, 0xd6, 0x5a, 0x9b, 0x3d, 0xaa, 0xd2, 0xe0, 0x09, 0xbc, 0xb2, 0x10, 0xa7, 0x4a, 0x29, + 0x14, 0x47, 0x7d, 0xb8, 0xd2, 0x16, 0x9a, 0xa8, 0xd5, 0x41, 0x0f, 0x5b, 0x70, 0xdc, 0xfe, 0x13, + 0xde, 0x11, 0x75, 0x34, 0xab, 0x0a, 0x28, 0x5c, 0x37, 0x56, 0x3b, 0x79, 0xbe, 0x08, 0xff, 0x08, + 0xc2, 0xe3, 0xbe, 0x39, 0xbb, 0x5b, 0xd8, 0x75, 0xbf, 0x69, 0x32, 0xb6, 0x63, 0x71, 0x4d, 0xc6, + 0x4f, 0x69, 0xd2, 0x6a, 0xa3, 0x39, 0x65, 0xf0, 0x11, 0xc0, 0x8d, 0xd3, 0x19, 0x67, 0x12, 0x5f, + 0x58, 0x4e, 0x8c, 0x1e, 0x9f, 0xc0, 0xea, 0x1a, 0xac, 0xdb, 0x4b, 0xb1, 0x6c, 0xdc, 0x3c, 0xd7, + 0xe0, 0x6b, 0x17, 0x5e, 0x34, 0x5c, 0xe8, 0x33, 0x80, 0x2b, 0x2d, 0x19, 0xda, 0xc2, 0xe7, 0x2c, + 0x18, 0x3e, 0x6b, 0xc4, 0x1e, 0xfe, 0xd7, 0x72, 0x4b, 0x10, 0x3c, 0x7c, 0xf7, 0xed, 0xd7, 0x87, + 0xee, 0x36, 0x0a, 0xc9, 0x79, 0xcb, 0x3e, 0xbb, 0x78, 0x73, 0x62, 0x77, 0xde, 0xa2, 0x4f, 0x00, + 0xae, 0xce, 0xf5, 0x10, 0xf5, 0xff, 0x1e, 0x7d, 0x7a, 0xa4, 0x5e, 0xf8, 0x1f, 0x0a, 0xc7, 0x7b, + 0xd7, 0xf0, 0x6e, 0xa2, 0x9b, 0x4b, 0x79, 0x87, 0xbb, 0x5f, 0x26, 0x3e, 0x38, 0x9a, 0xf8, 0xe0, + 0xe7, 0xc4, 0x07, 0xef, 0xa7, 0x7e, 0xe7, 0x68, 0xea, 0x77, 0xbe, 0x4f, 0xfd, 0xce, 0x8b, 0xfb, + 0x8b, 0xcb, 0x9e, 0xb3, 0x62, 0x4b, 0xed, 0xbf, 0x26, 0xe3, 0x01, 0x39, 0x3c, 0x76, 0xd4, 0x75, + 0xc9, 0x15, 0xbb, 0x64, 0x06, 0xbf, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x77, 0xd8, 0xbf, 0x9c, + 0x0e, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/evidence/types/tx.pb.go b/x/evidence/types/tx.pb.go index 3c9c66bc5e..b060466d84 100644 --- a/x/evidence/types/tx.pb.go +++ b/x/evidence/types/tx.pb.go @@ -125,7 +125,7 @@ func init() { func init() { proto.RegisterFile("cosmos/evidence/v1beta1/tx.proto", fileDescriptor_3e3242cb23c956e0) } var fileDescriptor_3e3242cb23c956e0 = []byte{ - // 316 bytes of a gzipped FileDescriptorProto + // 324 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x2d, 0xcb, 0x4c, 0x49, 0xcd, 0x4b, 0x4e, 0xd5, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x87, 0xa8, @@ -140,12 +140,13 @@ var fileDescriptor_3e3242cb23c956e0 = []byte{ 0x06, 0x25, 0x7d, 0x2e, 0x49, 0x0c, 0xcb, 0x83, 0x52, 0x8b, 0x0b, 0xf2, 0xf3, 0x8a, 0x53, 0x85, 0x84, 0xb8, 0x58, 0x32, 0x12, 0x8b, 0x33, 0x24, 0x58, 0x14, 0x18, 0x35, 0x78, 0x82, 0xc0, 0x6c, 0xa3, 0x72, 0x2e, 0x66, 0xdf, 0xe2, 0x74, 0xa1, 0x02, 0x2e, 0x3e, 0x34, 0x17, 0x6b, 0xe9, 0xe1, - 0x08, 0x2c, 0x3d, 0x0c, 0x0b, 0xa4, 0x8c, 0x88, 0x57, 0x0b, 0x73, 0x8c, 0x93, 0xf7, 0x8a, 0x47, + 0x08, 0x2c, 0x3d, 0x0c, 0x0b, 0xa4, 0x8c, 0x88, 0x57, 0x0b, 0x73, 0x8c, 0x93, 0xe7, 0x8a, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, - 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9b, 0x9e, 0x59, - 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0x0b, 0x0d, 0x5d, 0x28, 0xa5, 0x5b, 0x9c, 0x92, 0xad, - 0x5f, 0x81, 0x88, 0xe3, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x30, 0x19, 0x03, 0x02, - 0x00, 0x00, 0xff, 0xff, 0xa7, 0x78, 0xdf, 0xa8, 0x03, 0x02, 0x00, 0x00, + 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9d, 0x9e, 0x59, + 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, 0x93, 0x99, 0x97, 0xaa, 0x9f, 0x93, 0x94, + 0xab, 0x5b, 0x9c, 0x92, 0xad, 0x5f, 0x66, 0xa4, 0x5f, 0x81, 0x88, 0xe1, 0x92, 0xca, 0x82, 0xd4, + 0xe2, 0x24, 0x36, 0x70, 0x20, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x36, 0x20, 0xe1, 0xab, + 0x01, 0x02, 0x00, 0x00, } func (this *MsgSubmitEvidenceResponse) Equal(that interface{}) bool { diff --git a/x/genaccounts/legacy/v036/migrate.go b/x/genaccounts/legacy/v036/migrate.go index d0289833ea..e5c4390ba8 100644 --- a/x/genaccounts/legacy/v036/migrate.go +++ b/x/genaccounts/legacy/v036/migrate.go @@ -11,7 +11,7 @@ import ( v034gov "github.com/line/lbm-sdk/v2/x/gov/legacy/v034" v034staking "github.com/line/lbm-sdk/v2/x/staking/legacy/v034" - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" ) const ( diff --git a/x/genaccounts/legacy/v036/migrate_test.go b/x/genaccounts/legacy/v036/migrate_test.go index c4553c9364..c6e2f04354 100644 --- a/x/genaccounts/legacy/v036/migrate_test.go +++ b/x/genaccounts/legacy/v036/migrate_test.go @@ -3,7 +3,7 @@ package v036 import ( "testing" - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" "github.com/line/lbm-sdk/v2/types" diff --git a/x/genutil/client/cli/collect.go b/x/genutil/client/cli/collect.go index c88eaebf81..5826b69672 100644 --- a/x/genutil/client/cli/collect.go +++ b/x/genutil/client/cli/collect.go @@ -4,9 +4,9 @@ import ( "encoding/json" "path/filepath" + osttypes "github.com/line/ostracon/types" "github.com/pkg/errors" "github.com/spf13/cobra" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -36,7 +36,7 @@ func CollectGenTxsCmd(genBalIterator types.GenesisBalancesIterator, defaultNodeH return errors.Wrap(err, "failed to initialize node validator files") } - genDoc, err := tmtypes.GenesisDocFromFile(config.GenesisFile()) + genDoc, err := osttypes.GenesisDocFromFile(config.GenesisFile()) if err != nil { return errors.Wrap(err, "failed to read genesis doc from file") } diff --git a/x/genutil/client/cli/gentx.go b/x/genutil/client/cli/gentx.go index 2137423076..03c23b7432 100644 --- a/x/genutil/client/cli/gentx.go +++ b/x/genutil/client/cli/gentx.go @@ -10,10 +10,10 @@ import ( "os" "path/filepath" + ostos "github.com/line/ostracon/libs/os" + osttypes "github.com/line/ostracon/types" "github.com/pkg/errors" "github.com/spf13/cobra" - tmos "github.com/tendermint/tendermint/libs/os" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -84,7 +84,7 @@ $ %s gentx my-key-name 1000000stake --home=/path/to/home/dir --keyring-backend=o } } - genDoc, err := tmtypes.GenesisDocFromFile(config.GenesisFile()) + genDoc, err := osttypes.GenesisDocFromFile(config.GenesisFile()) if err != nil { return errors.Wrapf(err, "failed to read genesis doc file %s", config.GenesisFile()) } @@ -212,7 +212,7 @@ $ %s gentx my-key-name 1000000stake --home=/path/to/home/dir --keyring-backend=o func makeOutputFilepath(rootDir, nodeID string) (string, error) { writePath := filepath.Join(rootDir, "config", "gentx") - if err := tmos.EnsureDir(writePath, 0700); err != nil { + if err := ostos.EnsureDir(writePath, 0700); err != nil { return "", err } diff --git a/x/genutil/client/cli/init.go b/x/genutil/client/cli/init.go index d3a1fbd673..42eeeccb78 100644 --- a/x/genutil/client/cli/init.go +++ b/x/genutil/client/cli/init.go @@ -8,13 +8,13 @@ import ( "path/filepath" "github.com/cosmos/go-bip39" + cfg "github.com/line/ostracon/config" + "github.com/line/ostracon/libs/cli" + ostos "github.com/line/ostracon/libs/os" + ostrand "github.com/line/ostracon/libs/rand" + "github.com/line/ostracon/types" "github.com/pkg/errors" "github.com/spf13/cobra" - cfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cli" - tmos "github.com/tendermint/tendermint/libs/os" - tmrand "github.com/tendermint/tendermint/libs/rand" - "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -81,7 +81,7 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command { chainID, _ := cmd.Flags().GetString(flags.FlagChainID) if chainID == "" { - chainID = fmt.Sprintf("test-chain-%v", tmrand.Str(6)) + chainID = fmt.Sprintf("test-chain-%v", ostrand.Str(6)) } // Get bip39 mnemonic @@ -109,7 +109,7 @@ func InitCmd(mbm module.BasicManager, defaultNodeHome string) *cobra.Command { genFile := config.GenesisFile() overwrite, _ := cmd.Flags().GetBool(FlagOverwrite) - if !overwrite && tmos.FileExists(genFile) { + if !overwrite && ostos.FileExists(genFile) { return fmt.Errorf("genesis.json file already exists: %v", genFile) } appState, err := json.MarshalIndent(mbm.DefaultGenesis(cdc), "", " ") diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go index ecdbe57795..ad89a0a4d2 100644 --- a/x/genutil/client/cli/init_test.go +++ b/x/genutil/client/cli/init_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" + abci_server "github.com/line/ostracon/abci/server" + "github.com/line/ostracon/libs/cli" + "github.com/line/ostracon/libs/log" "github.com/spf13/viper" "github.com/stretchr/testify/require" - abci_server "github.com/tendermint/tendermint/abci/server" - "github.com/tendermint/tendermint/libs/cli" - "github.com/tendermint/tendermint/libs/log" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/genutil/client/cli/migrate.go b/x/genutil/client/cli/migrate.go index b55b6df8eb..4f13753e45 100644 --- a/x/genutil/client/cli/migrate.go +++ b/x/genutil/client/cli/migrate.go @@ -6,9 +6,9 @@ import ( "sort" "time" + ostjson "github.com/line/ostracon/libs/json" "github.com/pkg/errors" "github.com/spf13/cobra" - tmjson "github.com/tendermint/tendermint/libs/json" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" @@ -121,7 +121,7 @@ $ %s migrate v0.36 /path/to/genesis.json --chain-id=cosmoshub-3 --genesis-time=2 genDoc.ChainID = chainID } - bz, err := tmjson.Marshal(genDoc) + bz, err := ostjson.Marshal(genDoc) if err != nil { return errors.Wrap(err, "failed to marshal genesis doc") } diff --git a/x/genutil/client/cli/validate_genesis.go b/x/genutil/client/cli/validate_genesis.go index c5d1451d14..49902a88aa 100644 --- a/x/genutil/client/cli/validate_genesis.go +++ b/x/genutil/client/cli/validate_genesis.go @@ -4,8 +4,8 @@ import ( "encoding/json" "fmt" + osttypes "github.com/line/ostracon/types" "github.com/spf13/cobra" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/server" @@ -57,8 +57,8 @@ func ValidateGenesisCmd(mbm module.BasicManager) *cobra.Command { // validateGenDoc reads a genesis file and validates that it is a correct // Tendermint GenesisDoc. This function does not do any cosmos-related // validation. -func validateGenDoc(importGenesisFile string) (*tmtypes.GenesisDoc, error) { - genDoc, err := tmtypes.GenesisDocFromFile(importGenesisFile) +func validateGenDoc(importGenesisFile string) (*osttypes.GenesisDoc, error) { + genDoc, err := osttypes.GenesisDocFromFile(importGenesisFile) if err != nil { return nil, fmt.Errorf("%s. Make sure that"+ " you have correctly migrated all Tendermint consensus params, please see the"+ diff --git a/x/genutil/client/testutil/helpers.go b/x/genutil/client/testutil/helpers.go index 38451fa9c0..8ae297028b 100644 --- a/x/genutil/client/testutil/helpers.go +++ b/x/genutil/client/testutil/helpers.go @@ -4,10 +4,10 @@ import ( "context" "fmt" + ostcfg "github.com/line/ostracon/config" + "github.com/line/ostracon/libs/cli" + "github.com/line/ostracon/libs/log" "github.com/spf13/viper" - tmcfg "github.com/tendermint/tendermint/config" - "github.com/tendermint/tendermint/libs/cli" - "github.com/tendermint/tendermint/libs/log" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" @@ -40,10 +40,10 @@ func ExecInitCmd(testMbm module.BasicManager, home string, cdc codec.JSONMarshal return cmd.ExecuteContext(ctx) } -func CreateDefaultTendermintConfig(rootDir string) (*tmcfg.Config, error) { - conf := tmcfg.DefaultConfig() +func CreateDefaultTendermintConfig(rootDir string) (*ostcfg.Config, error) { + conf := ostcfg.DefaultConfig() conf.SetRoot(rootDir) - tmcfg.EnsureRoot(rootDir) + ostcfg.EnsureRoot(rootDir) if err := conf.ValidateBasic(); err != nil { return nil, fmt.Errorf("error in config file: %v", err) diff --git a/x/genutil/collect.go b/x/genutil/collect.go index afec6c9b19..d609aaa82f 100644 --- a/x/genutil/collect.go +++ b/x/genutil/collect.go @@ -13,8 +13,8 @@ import ( "sort" "strings" - cfg "github.com/tendermint/tendermint/config" - tmtypes "github.com/tendermint/tendermint/types" + cfg "github.com/line/ostracon/config" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" @@ -26,7 +26,7 @@ import ( // GenAppStateFromConfig gets the genesis app state from the config func GenAppStateFromConfig(cdc codec.JSONMarshaler, txEncodingConfig client.TxEncodingConfig, - config *cfg.Config, initCfg types.InitConfig, genDoc tmtypes.GenesisDoc, genBalIterator types.GenesisBalancesIterator, + config *cfg.Config, initCfg types.InitConfig, genDoc osttypes.GenesisDoc, genBalIterator types.GenesisBalancesIterator, ) (appState json.RawMessage, err error) { // process genesis transactions, else create default genesis.json @@ -70,7 +70,7 @@ func GenAppStateFromConfig(cdc codec.JSONMarshaler, txEncodingConfig client.TxEn // CollectTxs processes and validates application's genesis Txs and returns // the list of appGenTxs, and persistent peers required to generate genesis.json. func CollectTxs(cdc codec.JSONMarshaler, txJSONDecoder sdk.TxDecoder, moniker, genTxsDir string, - genDoc tmtypes.GenesisDoc, genBalIterator types.GenesisBalancesIterator, + genDoc osttypes.GenesisDoc, genBalIterator types.GenesisBalancesIterator, ) (appGenTxs []sdk.Tx, persistentPeers string, err error) { // prepare a map of all balances in genesis state to then validate // against the validators addresses diff --git a/x/genutil/collect_test.go b/x/genutil/collect_test.go index 681d498f1f..1e4a8e6819 100644 --- a/x/genutil/collect_test.go +++ b/x/genutil/collect_test.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/proto" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/codec" cdctypes "github.com/line/lbm-sdk/v2/codec/types" @@ -58,7 +58,7 @@ func TestCollectTxsHandlesDirectories(t *testing.T) { srvCtx := server.NewDefaultContext() _ = srvCtx cdc := codec.NewProtoCodec(cdctypes.NewInterfaceRegistry()) - gdoc := tmtypes.GenesisDoc{AppState: []byte("{}")} + gdoc := osttypes.GenesisDoc{AppState: []byte("{}")} balItr := new(doNothingIterator) dnc := &doNothingUnmarshalJSON{cdc} diff --git a/x/genutil/genesis.go b/x/genutil/genesis.go index 86c1ddea90..4dac0112ed 100644 --- a/x/genutil/genesis.go +++ b/x/genutil/genesis.go @@ -1,7 +1,7 @@ package genutil import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/genutil/gentx.go b/x/genutil/gentx.go index 5d90123c1a..071b6ea6a4 100644 --- a/x/genutil/gentx.go +++ b/x/genutil/gentx.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/genutil/gentx_test.go b/x/genutil/gentx_test.go index 3f411fffa7..3b667c5038 100644 --- a/x/genutil/gentx_test.go +++ b/x/genutil/gentx_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + osttypes "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" "github.com/line/lbm-sdk/v2/simapp" @@ -45,7 +45,7 @@ type GenTxTestSuite struct { func (suite *GenTxTestSuite) SetupTest() { checkTx := false app := simapp.Setup(checkTx) - suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{}) + suite.ctx = app.BaseApp.NewContext(checkTx, osttypes.Header{}) suite.app = app suite.encodingConfig = simapp.MakeTestEncodingConfig() diff --git a/x/genutil/module.go b/x/genutil/module.go index 58656b70e8..23fdf06790 100644 --- a/x/genutil/module.go +++ b/x/genutil/module.go @@ -8,7 +8,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/genutil/types/expected_keepers.go b/x/genutil/types/expected_keepers.go index dd491342cc..a3144f8bf0 100644 --- a/x/genutil/types/expected_keepers.go +++ b/x/genutil/types/expected_keepers.go @@ -3,7 +3,7 @@ package types import ( "encoding/json" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/genutil/types/genesis.pb.go b/x/genutil/types/genesis.pb.go index 369cd0edfa..565fa904e8 100644 --- a/x/genutil/types/genesis.pb.go +++ b/x/genutil/types/genesis.pb.go @@ -79,7 +79,7 @@ func init() { } var fileDescriptor_31771d25e8d8f90f = []byte{ - // 234 bytes of a gzipped FileDescriptorProto + // 241 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x49, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x4f, 0x4f, 0xcd, 0x2b, 0x2d, 0xc9, 0xcc, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0x04, 0xf1, 0x53, 0x8b, 0x33, 0x8b, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0xc4, @@ -89,12 +89,13 @@ var fileDescriptor_31771d25e8d8f90f = []byte{ 0x0d, 0x1e, 0x27, 0xf3, 0x57, 0xf7, 0xe4, 0xd9, 0xd2, 0x53, 0xf3, 0x4a, 0x2a, 0x8a, 0x3f, 0xdd, 0x93, 0xe7, 0xad, 0x4c, 0xcc, 0xcd, 0xb1, 0x52, 0x82, 0xf0, 0x95, 0x7e, 0xdd, 0x93, 0x97, 0x48, 0xcd, 0x4b, 0xce, 0x4f, 0xc9, 0xcc, 0x4b, 0xd7, 0xcf, 0x2a, 0xce, 0xcf, 0xd3, 0x0b, 0x4a, 0x2c, - 0xf7, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x0d, 0x02, 0x69, 0x0a, 0xa9, 0x28, 0x76, 0x72, 0x3b, + 0xf7, 0x4d, 0x2d, 0x2e, 0x4e, 0x4c, 0x4f, 0x0d, 0x02, 0x69, 0x0a, 0xa9, 0x28, 0x76, 0x72, 0x39, 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, 0x9d, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, - 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0x7d, 0xa8, 0xd7, 0x20, 0x94, 0x6e, 0x71, 0x4a, 0xb6, 0x7e, 0x05, - 0xdc, 0x9f, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x07, 0x1b, 0x03, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x6b, 0x84, 0x7a, 0x20, 0x06, 0x01, 0x00, 0x00, + 0xb8, 0xf0, 0x58, 0x8e, 0xe1, 0xc6, 0x63, 0x39, 0x86, 0x28, 0xad, 0xf4, 0xcc, 0x92, 0x8c, 0xd2, + 0x24, 0xbd, 0xe4, 0xfc, 0x5c, 0xfd, 0x9c, 0xcc, 0xbc, 0x54, 0xfd, 0x9c, 0xa4, 0x5c, 0xdd, 0xe2, + 0x94, 0x6c, 0xfd, 0x32, 0x23, 0xfd, 0x0a, 0xb8, 0x2f, 0x4b, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, + 0xc0, 0xce, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x0a, 0xbb, 0x4e, 0x04, 0x01, 0x00, + 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/genutil/types/genesis_state.go b/x/genutil/types/genesis_state.go index 5ee4b795e4..75a040f811 100644 --- a/x/genutil/types/genesis_state.go +++ b/x/genutil/types/genesis_state.go @@ -5,8 +5,8 @@ import ( "errors" "fmt" - tmos "github.com/tendermint/tendermint/libs/os" - tmtypes "github.com/tendermint/tendermint/types" + ostos "github.com/line/ostracon/libs/os" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" @@ -68,7 +68,7 @@ func SetGenesisStateInAppState( // for the application. // // NOTE: The pubkey input is this machines pubkey. -func GenesisStateFromGenDoc(genDoc tmtypes.GenesisDoc) (genesisState map[string]json.RawMessage, err error) { +func GenesisStateFromGenDoc(genDoc osttypes.GenesisDoc) (genesisState map[string]json.RawMessage, err error) { if err = json.Unmarshal(genDoc.AppState, &genesisState); err != nil { return genesisState, err @@ -80,13 +80,13 @@ func GenesisStateFromGenDoc(genDoc tmtypes.GenesisDoc) (genesisState map[string] // for the application. // // NOTE: The pubkey input is this machines pubkey. -func GenesisStateFromGenFile(genFile string) (genesisState map[string]json.RawMessage, genDoc *tmtypes.GenesisDoc, err error) { - if !tmos.FileExists(genFile) { +func GenesisStateFromGenFile(genFile string) (genesisState map[string]json.RawMessage, genDoc *osttypes.GenesisDoc, err error) { + if !ostos.FileExists(genFile) { return genesisState, genDoc, fmt.Errorf("%s does not exist, run `init` first", genFile) } - genDoc, err = tmtypes.GenesisDocFromFile(genFile) + genDoc, err = osttypes.GenesisDocFromFile(genFile) if err != nil { return genesisState, genDoc, err } diff --git a/x/genutil/utils.go b/x/genutil/utils.go index 68ee13f782..35809f39ae 100644 --- a/x/genutil/utils.go +++ b/x/genutil/utils.go @@ -7,12 +7,12 @@ import ( "time" "github.com/cosmos/go-bip39" - cfg "github.com/tendermint/tendermint/config" - tmed25519 "github.com/tendermint/tendermint/crypto/ed25519" - tmos "github.com/tendermint/tendermint/libs/os" - "github.com/tendermint/tendermint/p2p" - "github.com/tendermint/tendermint/privval" - tmtypes "github.com/tendermint/tendermint/types" + cfg "github.com/line/ostracon/config" + osted25519 "github.com/line/ostracon/crypto/ed25519" + ostos "github.com/line/ostracon/libs/os" + "github.com/line/ostracon/p2p" + "github.com/line/ostracon/privval" + osttypes "github.com/line/ostracon/types" cryptocodec "github.com/line/lbm-sdk/v2/crypto/codec" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" @@ -20,7 +20,7 @@ import ( // ExportGenesisFile creates and writes the genesis configuration to disk. An // error is returned if building or writing the configuration to file fails. -func ExportGenesisFile(genDoc *tmtypes.GenesisDoc, genFile string) error { +func ExportGenesisFile(genDoc *osttypes.GenesisDoc, genFile string) error { if err := genDoc.ValidateAndComplete(); err != nil { return err } @@ -31,11 +31,11 @@ func ExportGenesisFile(genDoc *tmtypes.GenesisDoc, genFile string) error { // ExportGenesisFileWithTime creates and writes the genesis configuration to disk. // An error is returned if building or writing the configuration to file fails. func ExportGenesisFileWithTime( - genFile, chainID string, validators []tmtypes.GenesisValidator, + genFile, chainID string, validators []osttypes.GenesisValidator, appState json.RawMessage, genTime time.Time, ) error { - genDoc := tmtypes.GenesisDoc{ + genDoc := osttypes.GenesisDoc{ GenesisTime: genTime, ChainID: chainID, Validators: validators, @@ -69,12 +69,12 @@ func InitializeNodeValidatorFilesFromMnemonic(config *cfg.Config, mnemonic strin nodeID = string(nodeKey.ID()) pvKeyFile := config.PrivValidatorKeyFile() - if err := tmos.EnsureDir(filepath.Dir(pvKeyFile), 0777); err != nil { + if err := ostos.EnsureDir(filepath.Dir(pvKeyFile), 0777); err != nil { return "", nil, err } pvStateFile := config.PrivValidatorStateFile() - if err := tmos.EnsureDir(filepath.Dir(pvStateFile), 0777); err != nil { + if err := ostos.EnsureDir(filepath.Dir(pvStateFile), 0777); err != nil { return "", nil, err } @@ -82,7 +82,7 @@ func InitializeNodeValidatorFilesFromMnemonic(config *cfg.Config, mnemonic strin if len(mnemonic) == 0 { filePV = privval.LoadOrGenFilePV(pvKeyFile, pvStateFile) } else { - privKey := tmed25519.GenPrivKeyFromSecret([]byte(mnemonic)) + privKey := osted25519.GenPrivKeyFromSecret([]byte(mnemonic)) filePV = privval.NewFilePV(privKey, pvKeyFile, pvStateFile) } diff --git a/x/genutil/utils_test.go b/x/genutil/utils_test.go index a845cc68cd..d904e04baa 100644 --- a/x/genutil/utils_test.go +++ b/x/genutil/utils_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + "github.com/line/ostracon/config" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/config" ) func TestExportGenesisFileWithTime(t *testing.T) { diff --git a/x/gov/abci_test.go b/x/gov/abci_test.go index 945e7af1dd..bfc98fbf2d 100644 --- a/x/gov/abci_test.go +++ b/x/gov/abci_test.go @@ -5,9 +5,9 @@ import ( "time" "github.com/golang/protobuf/proto" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -18,10 +18,10 @@ import ( func TestTickExpiredDepositPeriod(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 10, valTokens) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) govHandler := gov.NewHandler(app.GovKeeper) @@ -70,10 +70,10 @@ func TestTickExpiredDepositPeriod(t *testing.T) { func TestTickMultipleExpiredDepositPeriod(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 10, valTokens) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) govHandler := gov.NewHandler(app.GovKeeper) @@ -147,10 +147,10 @@ func TestTickMultipleExpiredDepositPeriod(t *testing.T) { func TestTickPassedDepositPeriod(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 10, valTokens) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) govHandler := gov.NewHandler(app.GovKeeper) @@ -204,12 +204,12 @@ func TestTickPassedDepositPeriod(t *testing.T) { func TestTickPassedVotingPeriod(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 10, valTokens) SortAddresses(addrs) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) govHandler := gov.NewHandler(app.GovKeeper) @@ -272,7 +272,7 @@ func TestTickPassedVotingPeriod(t *testing.T) { func TestProposalPassedEndblocker(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 10, valTokens) SortAddresses(addrs) @@ -280,7 +280,7 @@ func TestProposalPassedEndblocker(t *testing.T) { handler := gov.NewHandler(app.GovKeeper) stakingHandler := staking.NewHandler(app.StakingKeeper) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) valAddr := sdk.ValAddress(addrs[0]) @@ -323,13 +323,13 @@ func TestProposalPassedEndblocker(t *testing.T) { func TestEndBlockerProposalHandlerFailed(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 1, valTokens) SortAddresses(addrs) stakingHandler := staking.NewHandler(app.StakingKeeper) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) valAddr := sdk.ValAddress(addrs[0]) diff --git a/x/gov/client/cli/cli_test.go b/x/gov/client/cli/cli_test.go index 264aec5ba8..1d448ebfd9 100644 --- a/x/gov/client/cli/cli_test.go +++ b/x/gov/client/cli/cli_test.go @@ -12,7 +12,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - tmcli "github.com/tendermint/tendermint/libs/cli" + ostcli "github.com/line/ostracon/libs/cli" "github.com/line/lbm-sdk/v2/client/flags" clitestutil "github.com/line/lbm-sdk/v2/testutil/cli" @@ -78,7 +78,7 @@ func (s *IntegrationTestSuite) TestCmdParams() { }{ { "json output", - []string{fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, `{"voting_params":{"voting_period":"172800000000000"},"tally_params":{"quorum":"0.334000000000000000","threshold":"0.500000000000000000","veto_threshold":"0.334000000000000000"},"deposit_params":{"min_deposit":[{"denom":"stake","amount":"10000000"}],"max_deposit_period":"172800000000000"}}`, }, { @@ -126,7 +126,7 @@ func (s *IntegrationTestSuite) TestCmdParam() { "voting params", []string{ "voting", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, `{"voting_period":"172800000000000"}`, }, @@ -134,7 +134,7 @@ func (s *IntegrationTestSuite) TestCmdParam() { "tally params", []string{ "tallying", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, `{"quorum":"0.334000000000000000","threshold":"0.500000000000000000","veto_threshold":"0.334000000000000000"}`, }, @@ -142,7 +142,7 @@ func (s *IntegrationTestSuite) TestCmdParam() { "deposit params", []string{ "deposit", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, `{"min_deposit":[{"denom":"stake","amount":"10000000"}],"max_deposit_period":"172800000000000"}`, }, @@ -174,7 +174,7 @@ func (s *IntegrationTestSuite) TestCmdProposer() { { "without proposal id", []string{ - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, ``, @@ -183,7 +183,7 @@ func (s *IntegrationTestSuite) TestCmdProposer() { "json output", []string{ "1", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, fmt.Sprintf("{\"proposal_id\":\"%s\",\"proposer\":\"%s\"}", "1", val.Address.String()), @@ -220,7 +220,7 @@ func (s *IntegrationTestSuite) TestCmdTally() { { "without proposal id", []string{ - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, types.TallyResult{}, @@ -229,7 +229,7 @@ func (s *IntegrationTestSuite) TestCmdTally() { "json output", []string{ "2", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, types.NewTallyResult(sdk.NewInt(0), sdk.NewInt(0), sdk.NewInt(0), sdk.NewInt(0)), @@ -238,7 +238,7 @@ func (s *IntegrationTestSuite) TestCmdTally() { "json output", []string{ "1", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, types.NewTallyResult(s.cfg.BondedTokens, sdk.NewInt(0), sdk.NewInt(0), sdk.NewInt(0)), @@ -370,7 +370,7 @@ func (s *IntegrationTestSuite) TestCmdGetProposal() { "get non existing proposal", []string{ "10", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -378,7 +378,7 @@ func (s *IntegrationTestSuite) TestCmdGetProposal() { "get proposal with json response", []string{ "1", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -415,7 +415,7 @@ func (s *IntegrationTestSuite) TestCmdGetProposals() { { "get proposals as json response", []string{ - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -423,7 +423,7 @@ func (s *IntegrationTestSuite) TestCmdGetProposals() { "get proposals with invalid status", []string{ "--status=unknown", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -469,7 +469,7 @@ func (s *IntegrationTestSuite) TestCmdQueryDeposits() { "get deposits(valid req)", []string{ "1", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -525,7 +525,7 @@ func (s *IntegrationTestSuite) TestCmdQueryDeposit() { []string{ "1", val.Address.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -654,7 +654,7 @@ func (s *IntegrationTestSuite) TestCmdQueryVotes() { "vote for invalid proposal", []string{ "1", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -710,7 +710,7 @@ func (s *IntegrationTestSuite) TestCmdQueryVote() { []string{ "1", val.Address.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, diff --git a/x/gov/client/utils/query_test.go b/x/gov/client/utils/query_test.go index 70d6955f67..6fba9ae138 100644 --- a/x/gov/client/utils/query_test.go +++ b/x/gov/client/utils/query_test.go @@ -4,10 +4,10 @@ import ( "context" "testing" + "github.com/line/ostracon/rpc/client/mock" + ctypes "github.com/line/ostracon/rpc/core/types" + osttypes "github.com/line/ostracon/types" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/rpc/client/mock" - ctypes "github.com/tendermint/tendermint/rpc/core/types" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" @@ -20,7 +20,7 @@ import ( type TxSearchMock struct { mock.Client - txs []tmtypes.Tx + txs []osttypes.Tx } func (mock TxSearchMock) TxSearch(ctx context.Context, query string, prove bool, page, perPage *int, orderBy string) (*ctypes.ResultTxSearch, error) { @@ -47,7 +47,7 @@ func (mock TxSearchMock) TxSearch(ctx context.Context, query string, prove bool, func (mock TxSearchMock) Block(ctx context.Context, height *int64) (*ctypes.ResultBlock, error) { // any non nil Block needs to be returned. used to get time value - return &ctypes.ResultBlock{Block: &tmtypes.Block{}}, nil + return &ctypes.ResultBlock{Block: &osttypes.Block{}}, nil } func newTestCodec() *codec.LegacyAmino { @@ -143,7 +143,7 @@ func TestGetPaginatedVotes(t *testing.T) { t.Run(tc.description, func(t *testing.T) { var ( - marshalled = make([]tmtypes.Tx, len(tc.msgs)) + marshalled = make([]osttypes.Tx, len(tc.msgs)) cdc = newTestCodec() ) diff --git a/x/gov/genesis_test.go b/x/gov/genesis_test.go index 4a0e6a7820..09a16dda11 100644 --- a/x/gov/genesis_test.go +++ b/x/gov/genesis_test.go @@ -4,11 +4,11 @@ import ( "encoding/json" "testing" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/simapp" "github.com/line/lbm-sdk/v2/x/auth" @@ -20,15 +20,15 @@ import ( func TestImportExportQueues(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 2, valTokens) SortAddresses(addrs) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) - ctx = app.BaseApp.NewContext(false, tmproto.Header{}) + ctx = app.BaseApp.NewContext(false, ostproto.Header{}) // Create two proposals, put the second into the voting period proposal := TestProposal @@ -79,12 +79,12 @@ func TestImportExportQueues(t *testing.T) { ) app2.Commit() - app2.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app2.LastBlockHeight() + 1}}) + app2.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app2.LastBlockHeight() + 1}}) - header = tmproto.Header{Height: app2.LastBlockHeight() + 1} + header = ostproto.Header{Height: app2.LastBlockHeight() + 1} app2.BeginBlock(abci.RequestBeginBlock{Header: header}) - ctx2 := app2.BaseApp.NewContext(false, tmproto.Header{}) + ctx2 := app2.BaseApp.NewContext(false, ostproto.Header{}) // Jump the time forward past the DepositPeriod and VotingPeriod ctx2 = ctx2.WithBlockTime(ctx2.BlockHeader().Time.Add(app2.GovKeeper.GetDepositParams(ctx2).MaxDepositPeriod).Add(app2.GovKeeper.GetVotingParams(ctx2).VotingPeriod)) @@ -113,12 +113,12 @@ func TestImportExportQueues(t *testing.T) { func TestEqualProposals(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrs(app, ctx, 2, valTokens) SortAddresses(addrs) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) // Submit two proposals diff --git a/x/gov/handler_test.go b/x/gov/handler_test.go index ca340fef60..3dadd2ca35 100644 --- a/x/gov/handler_test.go +++ b/x/gov/handler_test.go @@ -4,7 +4,7 @@ import ( "strings" "testing" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/testutil/testdata" @@ -19,7 +19,7 @@ func TestInvalidMsg(t *testing.T) { k := keeper.Keeper{} h := gov.NewHandler(k) - res, err := h(sdk.NewContext(nil, tmproto.Header{}, false, nil), testdata.NewTestMsg()) + res, err := h(sdk.NewContext(nil, ostproto.Header{}, false, nil), testdata.NewTestMsg()) require.Error(t, err) require.Nil(t, res) require.True(t, strings.Contains(err.Error(), "unrecognized gov message type")) diff --git a/x/gov/keeper/deposit_test.go b/x/gov/keeper/deposit_test.go index 0be26f90dd..a48ee7a07f 100644 --- a/x/gov/keeper/deposit_test.go +++ b/x/gov/keeper/deposit_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -13,7 +13,7 @@ import ( func TestDeposits(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) TestAddrs := simapp.AddTestAddrsIncremental(app, ctx, 2, sdk.NewInt(10000000)) diff --git a/x/gov/keeper/keeper.go b/x/gov/keeper/keeper.go index d031431f3b..1e11554140 100644 --- a/x/gov/keeper/keeper.go +++ b/x/gov/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/gov/keeper/keeper_test.go b/x/gov/keeper/keeper_test.go index 48ca6bb2d5..005fb9ea66 100644 --- a/x/gov/keeper/keeper_test.go +++ b/x/gov/keeper/keeper_test.go @@ -3,9 +3,9 @@ package keeper_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp" @@ -24,7 +24,7 @@ type KeeperTestSuite struct { func (suite *KeeperTestSuite) SetupTest() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) types.RegisterQueryServer(queryHelper, app.GovKeeper) @@ -38,7 +38,7 @@ func (suite *KeeperTestSuite) SetupTest() { func TestIncrementProposalNumber(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) tp := TestProposal _, err := app.GovKeeper.SubmitProposal(ctx, tp) @@ -59,7 +59,7 @@ func TestIncrementProposalNumber(t *testing.T) { func TestProposalQueues(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) // create test proposals tp := TestProposal diff --git a/x/gov/keeper/proposal_test.go b/x/gov/keeper/proposal_test.go index 9f9e630fc4..014aa5e61b 100644 --- a/x/gov/keeper/proposal_test.go +++ b/x/gov/keeper/proposal_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -17,7 +17,7 @@ import ( func TestGetSetProposal(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) tp := TestProposal proposal, err := app.GovKeeper.SubmitProposal(ctx, tp) @@ -32,7 +32,7 @@ func TestGetSetProposal(t *testing.T) { func TestActivateVotingPeriod(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) tp := TestProposal proposal, err := app.GovKeeper.SubmitProposal(ctx, tp) @@ -61,7 +61,7 @@ func (invalidProposalRoute) ProposalRoute() string { return "nonexistingroute" } func TestSubmitProposal(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) testCases := []struct { content types.Content @@ -86,7 +86,7 @@ func TestSubmitProposal(t *testing.T) { func TestGetProposalsFiltered(t *testing.T) { proposalID := uint64(1) app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) status := []types.ProposalStatus{types.StatusDepositPeriod, types.StatusVotingPeriod} diff --git a/x/gov/keeper/querier.go b/x/gov/keeper/querier.go index 31fd140b26..0fbadcaaf5 100644 --- a/x/gov/keeper/querier.go +++ b/x/gov/keeper/querier.go @@ -1,7 +1,7 @@ package keeper import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/gov/keeper/querier_test.go b/x/gov/keeper/querier_test.go index ea30c09608..241c62676b 100644 --- a/x/gov/keeper/querier_test.go +++ b/x/gov/keeper/querier_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -146,7 +146,7 @@ func getQueriedVotes(t *testing.T, ctx sdk.Context, cdc *codec.LegacyAmino, quer func TestQueries(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) legacyQuerierCdc := app.LegacyAmino() querier := keeper.NewQuerier(app.GovKeeper, legacyQuerierCdc) @@ -305,7 +305,7 @@ func TestQueries(t *testing.T) { func TestPaginatedVotesQuery(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) legacyQuerierCdc := app.LegacyAmino() proposal := types.Proposal{ diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go index a675e05358..f7f1e0fb06 100644 --- a/x/gov/keeper/tally_test.go +++ b/x/gov/keeper/tally_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -15,7 +15,7 @@ import ( func TestTallyNoOneVotes(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) createValidators(t, ctx, app, []int64{5, 5, 5}) @@ -37,7 +37,7 @@ func TestTallyNoOneVotes(t *testing.T) { func TestTallyNoQuorum(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) createValidators(t, ctx, app, []int64{2, 5, 0}) @@ -62,7 +62,7 @@ func TestTallyNoQuorum(t *testing.T) { func TestTallyOnlyValidatorsAllYes(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs, _ := createValidators(t, ctx, app, []int64{5, 5, 5}) tp := TestProposal @@ -88,7 +88,7 @@ func TestTallyOnlyValidatorsAllYes(t *testing.T) { func TestTallyOnlyValidators51No(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) valAccAddrs, _ := createValidators(t, ctx, app, []int64{5, 6, 0}) @@ -112,7 +112,7 @@ func TestTallyOnlyValidators51No(t *testing.T) { func TestTallyOnlyValidators51Yes(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) valAccAddrs, _ := createValidators(t, ctx, app, []int64{5, 6, 0}) @@ -137,7 +137,7 @@ func TestTallyOnlyValidators51Yes(t *testing.T) { func TestTallyOnlyValidatorsVetoed(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) valAccAddrs, _ := createValidators(t, ctx, app, []int64{6, 6, 7}) @@ -163,7 +163,7 @@ func TestTallyOnlyValidatorsVetoed(t *testing.T) { func TestTallyOnlyValidatorsAbstainPasses(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) valAccAddrs, _ := createValidators(t, ctx, app, []int64{6, 6, 7}) @@ -189,7 +189,7 @@ func TestTallyOnlyValidatorsAbstainPasses(t *testing.T) { func TestTallyOnlyValidatorsAbstainFails(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) valAccAddrs, _ := createValidators(t, ctx, app, []int64{6, 6, 7}) @@ -215,7 +215,7 @@ func TestTallyOnlyValidatorsAbstainFails(t *testing.T) { func TestTallyOnlyValidatorsNonVoter(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) valAccAddrs, _ := createValidators(t, ctx, app, []int64{5, 6, 7}) valAccAddr1, valAccAddr2 := valAccAddrs[0], valAccAddrs[1] @@ -241,7 +241,7 @@ func TestTallyOnlyValidatorsNonVoter(t *testing.T) { func TestTallyDelgatorOverride(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs, valAddrs := createValidators(t, ctx, app, []int64{5, 6, 7}) @@ -277,7 +277,7 @@ func TestTallyDelgatorOverride(t *testing.T) { func TestTallyDelgatorInherit(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs, vals := createValidators(t, ctx, app, []int64{5, 6, 7}) @@ -312,7 +312,7 @@ func TestTallyDelgatorInherit(t *testing.T) { func TestTallyDelgatorMultipleOverride(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs, vals := createValidators(t, ctx, app, []int64{5, 6, 7}) @@ -352,7 +352,7 @@ func TestTallyDelgatorMultipleOverride(t *testing.T) { func TestTallyDelgatorMultipleInherit(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) createValidators(t, ctx, app, []int64{25, 6, 7}) @@ -393,7 +393,7 @@ func TestTallyDelgatorMultipleInherit(t *testing.T) { func TestTallyJailedValidator(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs, valAddrs := createValidators(t, ctx, app, []int64{25, 6, 7}) @@ -436,7 +436,7 @@ func TestTallyJailedValidator(t *testing.T) { func TestTallyValidatorMultipleDelegations(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs, valAddrs := createValidators(t, ctx, app, []int64{10, 10, 10}) diff --git a/x/gov/keeper/vote_test.go b/x/gov/keeper/vote_test.go index 73e65dc9d2..74c81708ad 100644 --- a/x/gov/keeper/vote_test.go +++ b/x/gov/keeper/vote_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -13,7 +13,7 @@ import ( func TestVotes(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrs := simapp.AddTestAddrsIncremental(app, ctx, 5, sdk.NewInt(30000000)) diff --git a/x/gov/module.go b/x/gov/module.go index 44f0f9712f..a54325cd2e 100644 --- a/x/gov/module.go +++ b/x/gov/module.go @@ -13,7 +13,7 @@ import ( "github.com/gorilla/mux" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/gov/module_test.go b/x/gov/module_test.go index 5702b47395..b594e6e9bb 100644 --- a/x/gov/module_test.go +++ b/x/gov/module_test.go @@ -3,9 +3,9 @@ package gov_test import ( "testing" + abcitypes "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abcitypes "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" authtypes "github.com/line/lbm-sdk/v2/x/auth/types" @@ -14,7 +14,7 @@ import ( func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.InitChain( abcitypes.RequestInitChain{ diff --git a/x/gov/simulation/operations_test.go b/x/gov/simulation/operations_test.go index 5f8ede5efe..689953f423 100644 --- a/x/gov/simulation/operations_test.go +++ b/x/gov/simulation/operations_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" simappparams "github.com/line/lbm-sdk/v2/simapp/params" @@ -104,7 +104,7 @@ func TestSimulateMsgSubmitProposal(t *testing.T) { accounts := getTestingAccounts(t, r, app, ctx, 3) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash}}) // execute operation op := simulation.SimulateMsgSubmitProposal(app.AccountKeeper, app.BankKeeper, app.GovKeeper, MockWeightedProposalContent{3}.ContentSimulatorFn()) @@ -147,7 +147,7 @@ func TestSimulateMsgDeposit(t *testing.T) { app.GovKeeper.SetProposal(ctx, proposal) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) // execute operation op := simulation.SimulateMsgDeposit(app.AccountKeeper, app.BankKeeper, app.GovKeeper) @@ -189,7 +189,7 @@ func TestSimulateMsgVote(t *testing.T) { app.GovKeeper.ActivateVotingPeriod(ctx, proposal) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) // execute operation op := simulation.SimulateMsgVote(app.AccountKeeper, app.BankKeeper, app.GovKeeper) @@ -212,7 +212,7 @@ func TestSimulateMsgVote(t *testing.T) { func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { app := simapp.Setup(isCheckTx) - ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + ctx := app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) app.MintKeeper.SetParams(ctx, minttypes.DefaultParams()) app.MintKeeper.SetMinter(ctx, minttypes.DefaultInitialMinter()) diff --git a/x/gov/simulation/proposals_test.go b/x/gov/simulation/proposals_test.go index 8bde760792..db01abf5b7 100644 --- a/x/gov/simulation/proposals_test.go +++ b/x/gov/simulation/proposals_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" simappparams "github.com/line/lbm-sdk/v2/simapp/params" sdk "github.com/line/lbm-sdk/v2/types" @@ -18,7 +18,7 @@ func TestProposalContents(t *testing.T) { s := rand.NewSource(1) r := rand.New(s) - ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil) + ctx := sdk.NewContext(nil, ostproto.Header{}, true, nil) accounts := simtypes.RandomAccounts(r, 3) // execute ProposalContents function diff --git a/x/gov/types/genesis.pb.go b/x/gov/types/genesis.pb.go index 4df93da3d0..24150ca85b 100644 --- a/x/gov/types/genesis.pb.go +++ b/x/gov/types/genesis.pb.go @@ -130,34 +130,35 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta1/genesis.proto", fileDescriptor_43cd825e0fa7a627) } var fileDescriptor_43cd825e0fa7a627 = []byte{ - // 430 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x31, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0x63, 0x9a, 0x94, 0xf6, 0x92, 0x20, 0x38, 0x82, 0x64, 0x35, 0xc1, 0x36, 0x9e, 0xb2, - 0x60, 0xab, 0x65, 0x43, 0x62, 0xb1, 0x90, 0x50, 0x07, 0xa4, 0x62, 0x10, 0x03, 0x4b, 0x74, 0x89, - 0x4f, 0x87, 0x85, 0xdd, 0x67, 0xf9, 0x1d, 0x16, 0xf9, 0x16, 0x7c, 0x0e, 0x3e, 0x49, 0xc7, 0x8e, - 0x4c, 0x01, 0x25, 0x13, 0x6b, 0x3f, 0x01, 0xf2, 0xdd, 0x19, 0x1c, 0x61, 0x3a, 0x25, 0x7e, 0xf7, - 0xbf, 0xdf, 0xef, 0xdd, 0xd3, 0x23, 0xde, 0x0a, 0x30, 0x07, 0x0c, 0x05, 0x54, 0x61, 0x75, 0xba, - 0xe4, 0x92, 0x9d, 0x86, 0x82, 0x5f, 0x72, 0x4c, 0x31, 0x28, 0x4a, 0x90, 0x40, 0xa9, 0x4e, 0x04, - 0x02, 0xaa, 0xc0, 0x24, 0x4e, 0x26, 0x02, 0x04, 0xa8, 0xe3, 0xb0, 0xfe, 0xa7, 0x93, 0x27, 0xb3, - 0x2e, 0x16, 0x54, 0xfa, 0xd4, 0xff, 0xd5, 0x27, 0xa3, 0x57, 0x9a, 0xfc, 0x56, 0x32, 0xc9, 0xe9, - 0x1b, 0x32, 0x41, 0xc9, 0x4a, 0x99, 0x5e, 0x8a, 0x45, 0x51, 0x42, 0x01, 0xc8, 0xb2, 0x45, 0x9a, - 0xd8, 0x96, 0x67, 0xcd, 0xfb, 0x91, 0x7b, 0xb3, 0x71, 0xa7, 0x6b, 0x96, 0x67, 0xcf, 0xfd, 0xae, - 0x94, 0x1f, 0xd3, 0xa6, 0x7c, 0x61, 0xaa, 0xe7, 0x09, 0x3d, 0x27, 0x47, 0x09, 0x2f, 0x00, 0x53, - 0x89, 0xf6, 0x1d, 0xef, 0x60, 0x3e, 0x3c, 0x9b, 0x06, 0xff, 0xb6, 0x1f, 0xbc, 0xd4, 0x99, 0xe8, - 0xfe, 0xd5, 0xc6, 0xed, 0x7d, 0xfb, 0xe1, 0x1e, 0x99, 0x02, 0xc6, 0x7f, 0xae, 0xd3, 0x17, 0x64, - 0x50, 0x81, 0xe4, 0x68, 0x1f, 0x28, 0x8e, 0xdd, 0xc5, 0x79, 0x0f, 0x92, 0x47, 0x63, 0x03, 0x19, - 0xd4, 0x5f, 0x18, 0xeb, 0x5b, 0xf4, 0x35, 0x39, 0x6e, 0xba, 0x45, 0xbb, 0xaf, 0x10, 0xb3, 0x2e, - 0x44, 0xd3, 0x7c, 0xf4, 0xc0, 0x60, 0x8e, 0x9b, 0x0a, 0xc6, 0x7f, 0x09, 0x54, 0x90, 0x7b, 0xa6, - 0xb3, 0x45, 0xc1, 0x4a, 0x96, 0xa3, 0x3d, 0xf0, 0xac, 0xf9, 0xf0, 0xec, 0xc9, 0x2d, 0xcf, 0xbb, - 0x50, 0xc1, 0xe8, 0x71, 0x0d, 0xbe, 0xd9, 0xb8, 0x8f, 0xf4, 0x30, 0xf7, 0x31, 0x7e, 0x3c, 0x4e, - 0xda, 0x69, 0xba, 0x22, 0xe3, 0x0a, 0xf4, 0xb0, 0xb5, 0xe7, 0x50, 0x79, 0xbc, 0xff, 0x3c, 0xbf, - 0x1e, 0xbf, 0xd6, 0xcc, 0x8c, 0x66, 0xa2, 0x35, 0x7b, 0x10, 0x3f, 0x1e, 0x55, 0xad, 0x2c, 0x5d, - 0x90, 0x91, 0x64, 0x59, 0xb6, 0x6e, 0x1c, 0x77, 0x95, 0xc3, 0xed, 0x72, 0xbc, 0xab, 0x73, 0x46, - 0x31, 0x35, 0x8a, 0x87, 0x5a, 0xd1, 0x46, 0xf8, 0xf1, 0x50, 0xb6, 0x92, 0xd1, 0xd5, 0xd6, 0xb1, - 0xae, 0xb7, 0x8e, 0xf5, 0x73, 0xeb, 0x58, 0x5f, 0x77, 0x4e, 0xef, 0x7a, 0xe7, 0xf4, 0xbe, 0xef, - 0x9c, 0xde, 0x87, 0xb9, 0x48, 0xe5, 0xc7, 0xcf, 0xcb, 0x60, 0x05, 0x79, 0x68, 0xd6, 0x55, 0xff, - 0x3c, 0xc5, 0xe4, 0x53, 0xf8, 0x45, 0xed, 0xae, 0x5c, 0x17, 0x1c, 0x97, 0x87, 0x6a, 0x6d, 0x9f, - 0xfd, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x63, 0x67, 0xf6, 0x22, 0x03, 0x00, 0x00, + // 436 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x92, 0x41, 0x8b, 0xd3, 0x40, + 0x14, 0xc7, 0x1b, 0xb7, 0x5d, 0x77, 0xa7, 0xad, 0xe8, 0x58, 0x21, 0x6c, 0x6b, 0x12, 0x73, 0x90, + 0x5e, 0x4c, 0xd8, 0x7a, 0x13, 0x04, 0x09, 0x82, 0xec, 0x41, 0x58, 0xa3, 0x78, 0xf0, 0x52, 0xd2, + 0x66, 0x18, 0x83, 0x49, 0x5f, 0xe8, 0x1b, 0x07, 0xfb, 0x2d, 0xfc, 0x1c, 0x7e, 0x92, 0x3d, 0xee, + 0xd1, 0x53, 0x95, 0xf6, 0xe4, 0x75, 0x3f, 0x81, 0x64, 0x66, 0xa2, 0x59, 0x8c, 0x7b, 0x4b, 0xde, + 0xfc, 0xe7, 0xf7, 0x7b, 0xf3, 0x78, 0xc4, 0x5b, 0x02, 0x16, 0x80, 0x21, 0x07, 0x19, 0xca, 0xd3, + 0x05, 0x13, 0xc9, 0x69, 0xc8, 0xd9, 0x8a, 0x61, 0x86, 0x41, 0xb9, 0x06, 0x01, 0x94, 0xea, 0x44, + 0xc0, 0x41, 0x06, 0x26, 0x71, 0x32, 0xe2, 0xc0, 0x41, 0x1d, 0x87, 0xd5, 0x97, 0x4e, 0x9e, 0x4c, + 0xda, 0x58, 0x20, 0xf5, 0xa9, 0xff, 0xab, 0x4b, 0x06, 0xaf, 0x34, 0xf9, 0xad, 0x48, 0x04, 0xa3, + 0x6f, 0xc8, 0x08, 0x45, 0xb2, 0x16, 0xd9, 0x8a, 0xcf, 0xcb, 0x35, 0x94, 0x80, 0x49, 0x3e, 0xcf, + 0x52, 0xdb, 0xf2, 0xac, 0x69, 0x37, 0x72, 0xaf, 0xb6, 0xee, 0x78, 0x93, 0x14, 0xf9, 0x33, 0xbf, + 0x2d, 0xe5, 0xc7, 0xb4, 0x2e, 0x9f, 0x9b, 0xea, 0x59, 0x4a, 0xcf, 0xc8, 0x51, 0xca, 0x4a, 0xc0, + 0x4c, 0xa0, 0x7d, 0xcb, 0x3b, 0x98, 0xf6, 0x67, 0xe3, 0xe0, 0xdf, 0xf6, 0x83, 0x97, 0x3a, 0x13, + 0xdd, 0xbd, 0xd8, 0xba, 0x9d, 0x6f, 0x3f, 0xdc, 0x23, 0x53, 0xc0, 0xf8, 0xcf, 0x75, 0xfa, 0x9c, + 0xf4, 0x24, 0x08, 0x86, 0xf6, 0x81, 0xe2, 0xd8, 0x6d, 0x9c, 0xf7, 0x20, 0x58, 0x34, 0x34, 0x90, + 0x5e, 0xf5, 0x87, 0xb1, 0xbe, 0x45, 0x5f, 0x93, 0xe3, 0xba, 0x5b, 0xb4, 0xbb, 0x0a, 0x31, 0x69, + 0x43, 0xd4, 0xcd, 0x47, 0xf7, 0x0c, 0xe6, 0xb8, 0xae, 0x60, 0xfc, 0x97, 0x40, 0x39, 0xb9, 0x63, + 0x3a, 0x9b, 0x97, 0xc9, 0x3a, 0x29, 0xd0, 0xee, 0x79, 0xd6, 0xb4, 0x3f, 0x7b, 0x74, 0xc3, 0xf3, + 0xce, 0x55, 0x30, 0x7a, 0x58, 0x81, 0xaf, 0xb6, 0xee, 0x03, 0x3d, 0xcc, 0xeb, 0x18, 0x3f, 0x1e, + 0xa6, 0xcd, 0x34, 0x5d, 0x92, 0xa1, 0x04, 0x3d, 0x6c, 0xed, 0x39, 0x54, 0x1e, 0xef, 0x3f, 0xcf, + 0xaf, 0xc6, 0xaf, 0x35, 0x13, 0xa3, 0x19, 0x69, 0xcd, 0x35, 0x88, 0x1f, 0x0f, 0x64, 0x23, 0x4b, + 0xe7, 0x64, 0x20, 0x92, 0x3c, 0xdf, 0xd4, 0x8e, 0xdb, 0xca, 0xe1, 0xb6, 0x39, 0xde, 0x55, 0x39, + 0xa3, 0x18, 0x1b, 0xc5, 0x7d, 0xad, 0x68, 0x22, 0xfc, 0xb8, 0x2f, 0x1a, 0xc9, 0x17, 0x17, 0x3b, + 0xc7, 0xba, 0xdc, 0x39, 0xd6, 0xcf, 0x9d, 0x63, 0x7d, 0xdd, 0x3b, 0x9d, 0xcb, 0xbd, 0xd3, 0xf9, + 0xbe, 0x77, 0x3a, 0x1f, 0x1e, 0xf3, 0x4c, 0x7c, 0xfc, 0xbc, 0x08, 0x96, 0x50, 0x84, 0x79, 0xb6, + 0x62, 0x61, 0xbe, 0x28, 0x9e, 0x60, 0xfa, 0x29, 0x94, 0xb3, 0xf0, 0x8b, 0xda, 0x5c, 0xb1, 0x29, + 0x19, 0x2e, 0x0e, 0xd5, 0xd2, 0x3e, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xcc, 0x6f, 0x12, 0xb3, + 0x20, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/gov/types/gov.pb.go b/x/gov/types/gov.pb.go index 9ffc607356..79555114fc 100644 --- a/x/gov/types/gov.pb.go +++ b/x/gov/types/gov.pb.go @@ -8,12 +8,12 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/golang/protobuf/ptypes/duration" - _ "github.com/golang/protobuf/ptypes/timestamp" types1 "github.com/line/lbm-sdk/v2/codec/types" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types "github.com/line/lbm-sdk/v2/types" _ "github.com/regen-network/cosmos-proto" + _ "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -163,9 +163,9 @@ var xxx_messageInfo_TextProposal proto.InternalMessageInfo // Deposit defines an amount deposited by an account address to an active // proposal. type Deposit struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"` - Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id,omitempty" yaml:"proposal_id"` + Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` + Amount github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` } func (m *Deposit) Reset() { *m = Deposit{} } @@ -202,15 +202,15 @@ var xxx_messageInfo_Deposit proto.InternalMessageInfo // Proposal defines the core field members of a governance proposal. type Proposal struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"id" yaml:"id"` - Content *types1.Any `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` - Status ProposalStatus `protobuf:"varint,3,opt,name=status,proto3,enum=cosmos.gov.v1beta1.ProposalStatus" json:"status,omitempty" yaml:"proposal_status"` - FinalTallyResult TallyResult `protobuf:"bytes,4,opt,name=final_tally_result,json=finalTallyResult,proto3" json:"final_tally_result" yaml:"final_tally_result"` - SubmitTime time.Time `protobuf:"bytes,5,opt,name=submit_time,json=submitTime,proto3,stdtime" json:"submit_time" yaml:"submit_time"` - DepositEndTime time.Time `protobuf:"bytes,6,opt,name=deposit_end_time,json=depositEndTime,proto3,stdtime" json:"deposit_end_time" yaml:"deposit_end_time"` - TotalDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,7,rep,name=total_deposit,json=totalDeposit,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"total_deposit" yaml:"total_deposit"` - VotingStartTime time.Time `protobuf:"bytes,8,opt,name=voting_start_time,json=votingStartTime,proto3,stdtime" json:"voting_start_time" yaml:"voting_start_time"` - VotingEndTime time.Time `protobuf:"bytes,9,opt,name=voting_end_time,json=votingEndTime,proto3,stdtime" json:"voting_end_time" yaml:"voting_end_time"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"id" yaml:"id"` + Content *types1.Any `protobuf:"bytes,2,opt,name=content,proto3" json:"content,omitempty"` + Status ProposalStatus `protobuf:"varint,3,opt,name=status,proto3,enum=cosmos.gov.v1beta1.ProposalStatus" json:"status,omitempty" yaml:"proposal_status"` + FinalTallyResult TallyResult `protobuf:"bytes,4,opt,name=final_tally_result,json=finalTallyResult,proto3" json:"final_tally_result" yaml:"final_tally_result"` + SubmitTime time.Time `protobuf:"bytes,5,opt,name=submit_time,json=submitTime,proto3,stdtime" json:"submit_time" yaml:"submit_time"` + DepositEndTime time.Time `protobuf:"bytes,6,opt,name=deposit_end_time,json=depositEndTime,proto3,stdtime" json:"deposit_end_time" yaml:"deposit_end_time"` + TotalDeposit github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,7,rep,name=total_deposit,json=totalDeposit,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"total_deposit" yaml:"total_deposit"` + VotingStartTime time.Time `protobuf:"bytes,8,opt,name=voting_start_time,json=votingStartTime,proto3,stdtime" json:"voting_start_time" yaml:"voting_start_time"` + VotingEndTime time.Time `protobuf:"bytes,9,opt,name=voting_end_time,json=votingEndTime,proto3,stdtime" json:"voting_end_time" yaml:"voting_end_time"` } func (m *Proposal) Reset() { *m = Proposal{} } @@ -247,10 +247,10 @@ var xxx_messageInfo_Proposal proto.InternalMessageInfo // TallyResult defines a standard tally for a governance proposal. type TallyResult struct { - Yes github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=yes,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"yes"` - Abstain github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=abstain,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"abstain"` - No github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=no,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"no"` - NoWithVeto github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=no_with_veto,json=noWithVeto,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"no_with_veto" yaml:"no_with_veto"` + Yes github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,1,opt,name=yes,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"yes"` + Abstain github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,2,opt,name=abstain,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"abstain"` + No github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,3,opt,name=no,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"no"` + NoWithVeto github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,4,opt,name=no_with_veto,json=noWithVeto,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"no_with_veto" yaml:"no_with_veto"` } func (m *TallyResult) Reset() { *m = TallyResult{} } @@ -328,7 +328,7 @@ var xxx_messageInfo_Vote proto.InternalMessageInfo // DepositParams defines the params for deposits on governance proposals. type DepositParams struct { // Minimum deposit for a proposal to enter voting period. - MinDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=min_deposit,json=minDeposit,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"min_deposit,omitempty" yaml:"min_deposit"` + MinDeposit github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,1,rep,name=min_deposit,json=minDeposit,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"min_deposit,omitempty" yaml:"min_deposit"` // Maximum period for Atom holders to deposit on a proposal. Initial value: 2 // months. MaxDepositPeriod time.Duration `protobuf:"bytes,2,opt,name=max_deposit_period,json=maxDepositPeriod,proto3,stdduration" json:"max_deposit_period,omitempty" yaml:"max_deposit_period"` @@ -408,12 +408,12 @@ var xxx_messageInfo_VotingParams proto.InternalMessageInfo type TallyParams struct { // Minimum percentage of total stake needed to vote for a result to be // considered valid. - Quorum github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=quorum,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"quorum,omitempty"` + Quorum github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,1,opt,name=quorum,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"quorum,omitempty"` // Minimum proportion of Yes votes for proposal to pass. Default value: 0.5. - Threshold github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=threshold,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"threshold,omitempty"` + Threshold github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,2,opt,name=threshold,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"threshold,omitempty"` // Minimum value of Veto votes to Total votes ratio for proposal to be // vetoed. Default value: 1/3. - VetoThreshold github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=veto_threshold,json=vetoThreshold,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"veto_threshold,omitempty" yaml:"veto_threshold"` + VetoThreshold github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,3,opt,name=veto_threshold,json=vetoThreshold,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"veto_threshold,omitempty" yaml:"veto_threshold"` } func (m *TallyParams) Reset() { *m = TallyParams{} } @@ -464,94 +464,94 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta1/gov.proto", fileDescriptor_6e82113c1a9a4b7c) } var fileDescriptor_6e82113c1a9a4b7c = []byte{ - // 1377 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0x5f, 0x6c, 0xdb, 0xd4, - 0x17, 0x8e, 0xd3, 0xbf, 0xb9, 0x49, 0x5b, 0xef, 0x36, 0x6b, 0x53, 0xff, 0xf6, 0xb3, 0x8d, 0x41, - 0xa8, 0x9a, 0xb6, 0x74, 0x2b, 0x08, 0x44, 0x27, 0x21, 0x92, 0xc6, 0x63, 0x41, 0x53, 0x12, 0x39, - 0x5e, 0xa6, 0x8d, 0x07, 0xcb, 0x49, 0xee, 0x52, 0x43, 0xec, 0x1b, 0xe2, 0x9b, 0xd2, 0x88, 0x17, - 0x1e, 0xa7, 0x20, 0xa1, 0xbd, 0x31, 0x09, 0x45, 0x9a, 0xc4, 0x1b, 0xcf, 0x3c, 0xf3, 0x5c, 0x21, - 0x24, 0x26, 0x9e, 0x26, 0x90, 0x32, 0xd6, 0x49, 0x68, 0xea, 0x63, 0x1f, 0x78, 0x46, 0xf6, 0xbd, - 0x6e, 0x9c, 0xa4, 0xa2, 0x84, 0xa7, 0xd9, 0xe7, 0x9e, 0xef, 0xfb, 0xce, 0xfd, 0x7c, 0xce, 0xc9, - 0x0a, 0x2e, 0xd5, 0xb0, 0x6b, 0x63, 0x77, 0xab, 0x81, 0xf7, 0xb7, 0xf6, 0xaf, 0x57, 0x11, 0x31, - 0xaf, 0x7b, 0xcf, 0xe9, 0x56, 0x1b, 0x13, 0x0c, 0x21, 0x3d, 0x4d, 0x7b, 0x11, 0x76, 0x2a, 0x88, - 0x0c, 0x51, 0x35, 0x5d, 0x74, 0x0a, 0xa9, 0x61, 0xcb, 0xa1, 0x18, 0x21, 0xd9, 0xc0, 0x0d, 0xec, - 0x3f, 0x6e, 0x79, 0x4f, 0x2c, 0xba, 0x41, 0x51, 0x06, 0x3d, 0x60, 0xb4, 0xf4, 0x48, 0x6a, 0x60, - 0xdc, 0x68, 0xa2, 0x2d, 0xff, 0xad, 0xda, 0x79, 0xb0, 0x45, 0x2c, 0x1b, 0xb9, 0xc4, 0xb4, 0x5b, - 0x01, 0x76, 0x3c, 0xc1, 0x74, 0xba, 0xec, 0x48, 0x1c, 0x3f, 0xaa, 0x77, 0xda, 0x26, 0xb1, 0x30, - 0x2b, 0x46, 0xb9, 0x0b, 0x12, 0x3a, 0x3a, 0x20, 0xa5, 0x36, 0x6e, 0x61, 0xd7, 0x6c, 0xc2, 0x24, - 0x98, 0x23, 0x16, 0x69, 0xa2, 0x14, 0x27, 0x73, 0x9b, 0x31, 0x8d, 0xbe, 0x40, 0x19, 0xc4, 0xeb, - 0xc8, 0xad, 0xb5, 0xad, 0x96, 0x07, 0x4d, 0x45, 0xfd, 0xb3, 0x70, 0x68, 0x67, 0xe5, 0xd5, 0x13, - 0x89, 0xfb, 0xf5, 0x87, 0xab, 0x0b, 0xbb, 0xd8, 0x21, 0xc8, 0x21, 0xca, 0x2f, 0x1c, 0x58, 0xc8, - 0xa1, 0x16, 0x76, 0x2d, 0x02, 0xdf, 0x05, 0xf1, 0x16, 0x13, 0x30, 0xac, 0xba, 0x4f, 0x3d, 0x9b, - 0x5d, 0x3b, 0x19, 0x48, 0xb0, 0x6b, 0xda, 0xcd, 0x1d, 0x25, 0x74, 0xa8, 0x68, 0x20, 0x78, 0xcb, - 0xd7, 0xe1, 0x25, 0x10, 0xab, 0x53, 0x0e, 0xdc, 0x66, 0xaa, 0xc3, 0x00, 0xac, 0x81, 0x79, 0xd3, - 0xc6, 0x1d, 0x87, 0xa4, 0x66, 0xe4, 0x99, 0xcd, 0xf8, 0xf6, 0x46, 0x9a, 0xd9, 0xe6, 0x39, 0x1f, - 0x7c, 0x8e, 0xf4, 0x2e, 0xb6, 0x9c, 0xec, 0xb5, 0xc3, 0x81, 0x14, 0xf9, 0xfe, 0xb9, 0xb4, 0xd9, - 0xb0, 0xc8, 0x5e, 0xa7, 0x9a, 0xae, 0x61, 0x9b, 0x79, 0xcc, 0xfe, 0xb9, 0xea, 0xd6, 0x3f, 0xdd, - 0x22, 0xdd, 0x16, 0x72, 0x7d, 0x80, 0xab, 0x31, 0xea, 0x9d, 0xc5, 0x87, 0x4f, 0xa4, 0xc8, 0xab, - 0x27, 0x52, 0x44, 0xf9, 0x6b, 0x1e, 0x2c, 0x9e, 0xfa, 0xf4, 0xf6, 0x59, 0x57, 0x5a, 0x3d, 0x1e, - 0x48, 0x51, 0xab, 0x7e, 0x32, 0x90, 0x62, 0xf4, 0x62, 0xe3, 0xf7, 0xb9, 0x01, 0x16, 0x6a, 0xd4, - 0x1f, 0xff, 0x36, 0xf1, 0xed, 0x64, 0x9a, 0x7e, 0x9f, 0x74, 0xf0, 0x7d, 0xd2, 0x19, 0xa7, 0x9b, - 0x8d, 0xff, 0x34, 0x34, 0x52, 0x0b, 0x10, 0xb0, 0x02, 0xe6, 0x5d, 0x62, 0x92, 0x8e, 0x9b, 0x9a, - 0x91, 0xb9, 0xcd, 0xe5, 0x6d, 0x25, 0x3d, 0xd9, 0x7c, 0xe9, 0xa0, 0xc0, 0xb2, 0x9f, 0x99, 0x15, - 0x4e, 0x06, 0xd2, 0xda, 0x98, 0xc9, 0x94, 0x44, 0xd1, 0x18, 0x1b, 0x6c, 0x01, 0xf8, 0xc0, 0x72, - 0xcc, 0xa6, 0x41, 0xcc, 0x66, 0xb3, 0x6b, 0xb4, 0x91, 0xdb, 0x69, 0x92, 0xd4, 0xac, 0x5f, 0x9f, - 0x74, 0x96, 0x86, 0xee, 0xe5, 0x69, 0x7e, 0x5a, 0xf6, 0x35, 0xcf, 0xd8, 0x93, 0x81, 0xb4, 0x41, - 0x45, 0x26, 0x89, 0x14, 0x8d, 0xf7, 0x83, 0x21, 0x10, 0xfc, 0x18, 0xc4, 0xdd, 0x4e, 0xd5, 0xb6, - 0x88, 0xe1, 0x75, 0x72, 0x6a, 0xce, 0x97, 0x12, 0x26, 0xac, 0xd0, 0x83, 0x36, 0xcf, 0x8a, 0x4c, - 0x85, 0xf5, 0x4b, 0x08, 0xac, 0x3c, 0x7a, 0x2e, 0x71, 0x1a, 0xa0, 0x11, 0x0f, 0x00, 0x2d, 0xc0, - 0xb3, 0x16, 0x31, 0x90, 0x53, 0xa7, 0x0a, 0xf3, 0xe7, 0x2a, 0xbc, 0xce, 0x14, 0xd6, 0xa9, 0xc2, - 0x38, 0x03, 0x95, 0x59, 0x66, 0x61, 0xd5, 0xa9, 0xfb, 0x52, 0x0f, 0x39, 0xb0, 0x44, 0x30, 0x31, - 0x9b, 0x06, 0x3b, 0x48, 0x2d, 0x9c, 0xd7, 0x88, 0xb7, 0x98, 0x4e, 0x92, 0xea, 0x8c, 0xa0, 0x95, - 0xa9, 0x1a, 0x34, 0xe1, 0x63, 0x83, 0x11, 0x6b, 0x82, 0x0b, 0xfb, 0x98, 0x58, 0x4e, 0xc3, 0xfb, - 0xbc, 0x6d, 0x66, 0xec, 0xe2, 0xb9, 0xd7, 0x7e, 0x83, 0x95, 0x93, 0xa2, 0xe5, 0x4c, 0x50, 0xd0, - 0x7b, 0xaf, 0xd0, 0x78, 0xd9, 0x0b, 0xfb, 0x17, 0x7f, 0x00, 0x58, 0x68, 0x68, 0x71, 0xec, 0x5c, - 0x2d, 0x85, 0x69, 0xad, 0x8d, 0x68, 0x8d, 0x3a, 0xbc, 0x44, 0xa3, 0xcc, 0xe0, 0x9d, 0x59, 0x6f, - 0xab, 0x28, 0x87, 0x51, 0x10, 0x0f, 0xb7, 0xcf, 0x07, 0x60, 0xa6, 0x8b, 0x5c, 0xba, 0xa1, 0xb2, - 0x69, 0x8f, 0xf5, 0xb7, 0x81, 0xf4, 0xe6, 0xbf, 0x30, 0x2e, 0xef, 0x10, 0xcd, 0x83, 0xc2, 0x5b, - 0x60, 0xc1, 0xac, 0xba, 0xc4, 0xb4, 0xd8, 0x2e, 0x9b, 0x9a, 0x25, 0x80, 0xc3, 0xf7, 0x41, 0xd4, - 0xc1, 0xfe, 0x40, 0x4e, 0x4f, 0x12, 0x75, 0x30, 0x6c, 0x80, 0x84, 0x83, 0x8d, 0xcf, 0x2d, 0xb2, - 0x67, 0xec, 0x23, 0x82, 0xfd, 0xb1, 0x8b, 0x65, 0xd5, 0xe9, 0x98, 0x4e, 0x06, 0xd2, 0x2a, 0x35, - 0x35, 0xcc, 0xa5, 0x68, 0xc0, 0xc1, 0x77, 0x2d, 0xb2, 0x57, 0x41, 0x04, 0x33, 0x2b, 0xbf, 0xe1, - 0xc0, 0x6c, 0x05, 0x13, 0xf4, 0xdf, 0x57, 0x72, 0x12, 0xcc, 0xed, 0x63, 0x82, 0x82, 0x75, 0x4c, - 0x5f, 0xe0, 0x3b, 0x60, 0x1e, 0xd3, 0xdf, 0x06, 0xba, 0x9b, 0xc4, 0xb3, 0xf6, 0x86, 0x27, 0x5c, - 0xf4, 0xb3, 0x34, 0x96, 0xbd, 0xb3, 0xf8, 0x38, 0xd8, 0xae, 0x3f, 0x46, 0xc1, 0x12, 0x6b, 0xe6, - 0x92, 0xd9, 0x36, 0x6d, 0x17, 0x7e, 0xcb, 0x81, 0xb8, 0x6d, 0x39, 0xa7, 0xb3, 0xc5, 0x9d, 0x37, - 0x5b, 0x86, 0xe7, 0xda, 0xf1, 0x40, 0xba, 0x18, 0x42, 0x5d, 0xc1, 0xb6, 0x45, 0x90, 0xdd, 0x22, - 0xdd, 0xe1, 0xdd, 0x42, 0xc7, 0xd3, 0x8d, 0x1c, 0xb0, 0x2d, 0x27, 0x18, 0xb8, 0xaf, 0x39, 0x00, - 0x6d, 0xf3, 0x20, 0x20, 0x32, 0x5a, 0xa8, 0x6d, 0xe1, 0x3a, 0x5b, 0xeb, 0x1b, 0x13, 0x63, 0x90, - 0x63, 0x3f, 0xbb, 0xf4, 0xd3, 0x1e, 0x0f, 0xa4, 0x4b, 0x93, 0xe0, 0x91, 0x5a, 0xd9, 0x42, 0x9d, - 0xcc, 0x52, 0x1e, 0x7b, 0x83, 0xc2, 0xdb, 0xe6, 0x41, 0x60, 0x17, 0x0d, 0x7f, 0xc5, 0x81, 0x44, - 0xc5, 0x9f, 0x1e, 0xe6, 0xdf, 0x17, 0x80, 0x4d, 0x53, 0x50, 0x1b, 0x77, 0x5e, 0x6d, 0x37, 0x58, - 0x6d, 0xeb, 0x23, 0xb8, 0x91, 0xb2, 0x92, 0x23, 0xc3, 0x1b, 0xae, 0x28, 0x41, 0x63, 0xac, 0x9a, - 0xdf, 0x83, 0x99, 0x65, 0xc5, 0xdc, 0x07, 0xf3, 0x9f, 0x75, 0x70, 0xbb, 0x63, 0xfb, 0x55, 0x24, - 0xb2, 0xd9, 0x29, 0x3a, 0x3c, 0x87, 0x6a, 0xc7, 0x03, 0x89, 0xa7, 0xf8, 0x61, 0x35, 0x1a, 0x63, - 0x84, 0x35, 0x10, 0x23, 0x7b, 0x6d, 0xe4, 0xee, 0xe1, 0x26, 0xfd, 0x00, 0x89, 0xa9, 0x06, 0x88, - 0xd2, 0xaf, 0x9e, 0x52, 0x84, 0x14, 0x86, 0xbc, 0xb0, 0xc7, 0x81, 0x65, 0x6f, 0xaa, 0x8c, 0xa1, - 0xd4, 0x8c, 0x2f, 0x55, 0x9b, 0x5a, 0x2a, 0x35, 0xca, 0x33, 0xe2, 0xef, 0x45, 0xe6, 0xef, 0x48, - 0x86, 0xa2, 0x2d, 0x79, 0x01, 0x3d, 0x78, 0xbf, 0xfc, 0x27, 0x07, 0xc0, 0x70, 0x9a, 0xe0, 0x15, - 0xb0, 0x5e, 0x29, 0xea, 0xaa, 0x51, 0x2c, 0xe9, 0xf9, 0x62, 0xc1, 0xb8, 0x53, 0x28, 0x97, 0xd4, - 0xdd, 0xfc, 0xcd, 0xbc, 0x9a, 0xe3, 0x23, 0xc2, 0x4a, 0xaf, 0x2f, 0xc7, 0x69, 0xa2, 0xea, 0x89, - 0x40, 0x05, 0xac, 0x84, 0xb3, 0xef, 0xa9, 0x65, 0x9e, 0x13, 0x96, 0x7a, 0x7d, 0x39, 0x46, 0xb3, - 0xee, 0x21, 0x17, 0x5e, 0x06, 0xab, 0xe1, 0x9c, 0x4c, 0xb6, 0xac, 0x67, 0xf2, 0x05, 0x3e, 0x2a, - 0x5c, 0xe8, 0xf5, 0xe5, 0x25, 0x9a, 0x97, 0x61, 0x2b, 0x50, 0x06, 0xcb, 0xe1, 0xdc, 0x42, 0x91, - 0x9f, 0x11, 0x12, 0xbd, 0xbe, 0xbc, 0x48, 0xd3, 0x0a, 0x18, 0x6e, 0x83, 0xd4, 0x68, 0x86, 0x71, - 0x37, 0xaf, 0xdf, 0x32, 0x2a, 0xaa, 0x5e, 0xe4, 0x67, 0x85, 0x64, 0xaf, 0x2f, 0xf3, 0x41, 0x6e, - 0xb0, 0xaf, 0x84, 0xd9, 0x87, 0xdf, 0x89, 0x91, 0xcb, 0x3f, 0x47, 0xc1, 0xf2, 0xe8, 0x7f, 0x69, - 0x60, 0x1a, 0xfc, 0xaf, 0xa4, 0x15, 0x4b, 0xc5, 0x72, 0xe6, 0xb6, 0x51, 0xd6, 0x33, 0xfa, 0x9d, - 0xf2, 0xd8, 0x85, 0xfd, 0xab, 0xd0, 0xe4, 0x82, 0xd5, 0x84, 0x37, 0x80, 0x38, 0x9e, 0x9f, 0x53, - 0x4b, 0xc5, 0x72, 0x5e, 0x37, 0x4a, 0xaa, 0x96, 0x2f, 0xe6, 0x78, 0x4e, 0x58, 0xef, 0xf5, 0xe5, - 0x55, 0x0a, 0x19, 0x19, 0x2a, 0xf8, 0x1e, 0xf8, 0xff, 0x38, 0xb8, 0x52, 0xd4, 0xf3, 0x85, 0x0f, - 0x03, 0x6c, 0x54, 0x58, 0xeb, 0xf5, 0x65, 0x48, 0xb1, 0x95, 0xd0, 0x04, 0xc0, 0x2b, 0x60, 0x6d, - 0x1c, 0x5a, 0xca, 0x94, 0xcb, 0x6a, 0x8e, 0x9f, 0x11, 0xf8, 0x5e, 0x5f, 0x4e, 0x50, 0x4c, 0xc9, - 0x74, 0x5d, 0x54, 0x87, 0xd7, 0x40, 0x6a, 0x3c, 0x5b, 0x53, 0x3f, 0x52, 0x77, 0x75, 0x35, 0xc7, - 0xcf, 0x0a, 0xb0, 0xd7, 0x97, 0x97, 0x69, 0xbe, 0x86, 0x3e, 0x41, 0x35, 0x82, 0xce, 0xe4, 0xbf, - 0x99, 0xc9, 0xdf, 0x56, 0x73, 0xfc, 0x5c, 0x98, 0xff, 0xa6, 0x69, 0x35, 0x51, 0x9d, 0xda, 0x99, - 0x2d, 0x1c, 0xbe, 0x10, 0x23, 0xcf, 0x5e, 0x88, 0x91, 0x2f, 0x8f, 0xc4, 0xc8, 0xe1, 0x91, 0xc8, - 0x3d, 0x3d, 0x12, 0xb9, 0x3f, 0x8e, 0x44, 0xee, 0xd1, 0x4b, 0x31, 0xf2, 0xf4, 0xa5, 0x18, 0x79, - 0xf6, 0x52, 0x8c, 0xdc, 0xff, 0xe7, 0x85, 0x78, 0xe0, 0xff, 0x29, 0xe4, 0xf7, 0x73, 0x75, 0xde, - 0xdf, 0x21, 0x6f, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xef, 0x91, 0x01, 0x67, 0x25, 0x0d, 0x00, - 0x00, + // 1387 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x57, 0xdf, 0x6f, 0xdb, 0x54, + 0x1b, 0x8e, 0xd3, 0xdf, 0x27, 0x69, 0xeb, 0x9d, 0x76, 0x6d, 0xea, 0x6f, 0x9f, 0xed, 0xcf, 0xdf, + 0x84, 0xa6, 0xa9, 0x4b, 0x58, 0x41, 0x20, 0x3a, 0x84, 0x48, 0x1a, 0x17, 0x82, 0xa6, 0x26, 0x72, + 0xbc, 0x8c, 0x81, 0x90, 0xe5, 0x34, 0x67, 0xa9, 0xc1, 0xf6, 0x09, 0xf1, 0x49, 0x69, 0xc4, 0x0d, + 0x57, 0x68, 0x0a, 0x12, 0xda, 0x1d, 0xe3, 0x22, 0xd2, 0x24, 0xee, 0xb8, 0xe6, 0x92, 0x0b, 0x2e, + 0x27, 0x04, 0xd2, 0x84, 0x84, 0x34, 0x71, 0x91, 0xb1, 0x4e, 0x42, 0xd3, 0x2e, 0x2b, 0xfe, 0x00, + 0x64, 0x9f, 0xe3, 0xc6, 0x49, 0x2a, 0x42, 0xb8, 0xb3, 0xdf, 0xf3, 0x3e, 0xcf, 0xf3, 0x9e, 0xc7, + 0xef, 0xfb, 0xa6, 0x05, 0x17, 0xf6, 0xb1, 0xe7, 0x60, 0x2f, 0x53, 0xc7, 0x87, 0x99, 0xc3, 0xab, + 0x55, 0x44, 0xcc, 0xab, 0xfe, 0x73, 0xba, 0xd1, 0xc4, 0x04, 0x43, 0x48, 0x4f, 0xd3, 0x7e, 0x84, + 0x9d, 0x0a, 0x22, 0x43, 0x54, 0x4d, 0x0f, 0x9d, 0x42, 0xf6, 0xb1, 0xe5, 0x52, 0x8c, 0xb0, 0x5a, + 0xc7, 0x75, 0x1c, 0x3c, 0x66, 0xfc, 0x27, 0x16, 0xdd, 0xa0, 0x28, 0x83, 0x1e, 0x30, 0x5a, 0x7a, + 0x24, 0xd5, 0x31, 0xae, 0xdb, 0x28, 0x13, 0xbc, 0x55, 0x5b, 0xb7, 0x33, 0xc4, 0x72, 0x90, 0x47, + 0x4c, 0xa7, 0x11, 0x62, 0x87, 0x13, 0x4c, 0xb7, 0xcd, 0x8e, 0xc4, 0xe1, 0xa3, 0x5a, 0xab, 0x69, + 0x12, 0x0b, 0xb3, 0x62, 0x94, 0x9b, 0x20, 0xa9, 0xa3, 0x23, 0x52, 0x6a, 0xe2, 0x06, 0xf6, 0x4c, + 0x1b, 0xae, 0x82, 0x19, 0x62, 0x11, 0x1b, 0xa5, 0x38, 0x99, 0xbb, 0xb4, 0xa0, 0xd1, 0x17, 0x28, + 0x83, 0x44, 0x0d, 0x79, 0xfb, 0x4d, 0xab, 0xe1, 0x43, 0x53, 0xf1, 0xe0, 0x2c, 0x1a, 0xda, 0x5e, + 0x7e, 0x76, 0x5f, 0xe2, 0x7e, 0xf9, 0xee, 0xca, 0xdc, 0x0e, 0x76, 0x09, 0x72, 0x89, 0xf2, 0x33, + 0x07, 0xe6, 0xf2, 0xa8, 0x81, 0x3d, 0x8b, 0xc0, 0x57, 0x41, 0xa2, 0xc1, 0x04, 0x0c, 0xab, 0x16, + 0x50, 0x4f, 0xe7, 0xd6, 0x4e, 0x7a, 0x12, 0x6c, 0x9b, 0x8e, 0xbd, 0xad, 0x44, 0x0e, 0x15, 0x0d, + 0x84, 0x6f, 0x85, 0x1a, 0xbc, 0x00, 0x16, 0x6a, 0x94, 0x03, 0x37, 0x99, 0x6a, 0x3f, 0x00, 0x4d, + 0x30, 0x6b, 0x3a, 0xb8, 0xe5, 0x92, 0xd4, 0x94, 0x3c, 0x75, 0x29, 0xb1, 0xb5, 0x91, 0x66, 0xb6, + 0xf9, 0xce, 0x87, 0x9f, 0x23, 0xbd, 0x83, 0x2d, 0x37, 0x97, 0x7e, 0xd0, 0x93, 0x62, 0xdf, 0x3e, + 0x96, 0x5e, 0xa8, 0x5b, 0xe4, 0xa0, 0x55, 0x4d, 0xef, 0x63, 0x27, 0x63, 0x5b, 0x2e, 0xca, 0xd8, + 0x55, 0xe7, 0x8a, 0x57, 0xfb, 0x28, 0x73, 0xb8, 0x95, 0x21, 0xed, 0x06, 0xf2, 0x82, 0x74, 0x4f, + 0x63, 0xc4, 0xdb, 0xf3, 0x77, 0xee, 0x4b, 0xb1, 0x67, 0xf7, 0xa5, 0x98, 0xf2, 0xe7, 0x2c, 0x98, + 0x3f, 0x75, 0xe9, 0xe5, 0xb3, 0x2e, 0xb4, 0xf2, 0xbc, 0x27, 0xc5, 0xad, 0xda, 0x49, 0x4f, 0x5a, + 0xa0, 0xd7, 0x1a, 0xbe, 0xcd, 0x35, 0x30, 0xb7, 0x4f, 0xdd, 0x09, 0xee, 0x92, 0xd8, 0x5a, 0x4d, + 0xd3, 0xaf, 0x93, 0x0e, 0xbf, 0x4e, 0x3a, 0xeb, 0xb6, 0x73, 0x89, 0x1f, 0xfb, 0x36, 0x6a, 0x21, + 0x02, 0x56, 0xc0, 0xac, 0x47, 0x4c, 0xd2, 0xf2, 0x52, 0x53, 0x32, 0x77, 0x69, 0x69, 0x4b, 0x49, + 0x8f, 0xb6, 0x5e, 0x3a, 0x2c, 0xb0, 0x1c, 0x64, 0xe6, 0x84, 0x93, 0x9e, 0xb4, 0x36, 0x64, 0x31, + 0x25, 0x51, 0x34, 0xc6, 0x06, 0x1b, 0x00, 0xde, 0xb6, 0x5c, 0xd3, 0x36, 0x88, 0x69, 0xdb, 0x6d, + 0xa3, 0x89, 0xbc, 0x96, 0x4d, 0x52, 0xd3, 0x41, 0x7d, 0xd2, 0x59, 0x1a, 0xba, 0x9f, 0xa7, 0x05, + 0x69, 0xb9, 0xff, 0xf9, 0xb6, 0x9e, 0xf4, 0xa4, 0x0d, 0x2a, 0x32, 0x4a, 0xa4, 0x68, 0x7c, 0x10, + 0x8c, 0x80, 0xe0, 0xfb, 0x20, 0xe1, 0xb5, 0xaa, 0x8e, 0x45, 0x0c, 0xbf, 0x8f, 0x53, 0x33, 0x81, + 0x94, 0x30, 0x62, 0x85, 0x1e, 0x36, 0x79, 0x4e, 0x64, 0x2a, 0xac, 0x5b, 0x22, 0x60, 0xe5, 0xee, + 0x63, 0x89, 0xd3, 0x00, 0x8d, 0xf8, 0x00, 0x68, 0x01, 0x9e, 0x35, 0x88, 0x81, 0xdc, 0x1a, 0x55, + 0x98, 0x1d, 0xab, 0xf0, 0x7f, 0xa6, 0xb0, 0x4e, 0x15, 0x86, 0x19, 0xa8, 0xcc, 0x12, 0x0b, 0xab, + 0x6e, 0x2d, 0x90, 0xfa, 0x9c, 0x03, 0x8b, 0x04, 0x13, 0xd3, 0x36, 0xd8, 0x41, 0x6a, 0x6e, 0x5c, + 0x1b, 0xee, 0x32, 0x9d, 0x55, 0xaa, 0x33, 0x80, 0x56, 0x26, 0x68, 0xcf, 0x64, 0x80, 0x0c, 0xc7, + 0xcb, 0x06, 0xe7, 0x0e, 0x31, 0xb1, 0xdc, 0xba, 0xff, 0x71, 0x9b, 0xcc, 0xd6, 0xf9, 0xb1, 0x97, + 0xbe, 0xc8, 0x8a, 0x49, 0xd1, 0x62, 0x46, 0x28, 0xe8, 0xad, 0x97, 0x69, 0xbc, 0xec, 0x87, 0x83, + 0x6b, 0xdf, 0x06, 0x2c, 0xd4, 0x37, 0x78, 0x61, 0xac, 0x96, 0xc2, 0xb4, 0xd6, 0x06, 0xb4, 0x06, + 0xfd, 0x5d, 0xa4, 0x51, 0x66, 0xef, 0xf6, 0xb4, 0xbf, 0x51, 0x94, 0x1f, 0xe2, 0x20, 0x11, 0x6d, + 0x9e, 0x37, 0xc0, 0x54, 0x1b, 0x79, 0x74, 0x3b, 0xe5, 0x36, 0x7d, 0xd6, 0xdf, 0x7a, 0xd2, 0xc5, + 0xb1, 0xb6, 0x15, 0x5c, 0xa2, 0xf9, 0x40, 0xb8, 0x0b, 0xe6, 0xcc, 0xaa, 0x47, 0x4c, 0x8b, 0x6d, + 0xb1, 0x09, 0x39, 0x42, 0x30, 0x7c, 0x1d, 0xc4, 0x5d, 0x1c, 0x8c, 0xe2, 0xa4, 0x14, 0x71, 0x17, + 0x43, 0x04, 0x92, 0x2e, 0x36, 0x3e, 0xb1, 0xc8, 0x81, 0x71, 0x88, 0x08, 0x0e, 0xc6, 0x6d, 0x21, + 0xb7, 0x33, 0x09, 0xcf, 0x49, 0x4f, 0x5a, 0xa1, 0x66, 0x46, 0x99, 0x14, 0x0d, 0xb8, 0xf8, 0xa6, + 0x45, 0x0e, 0x2a, 0x88, 0x60, 0x66, 0xe1, 0x57, 0x1c, 0x98, 0xae, 0x60, 0x82, 0xfe, 0xfd, 0x1a, + 0x5e, 0x05, 0x33, 0x87, 0x98, 0xa0, 0x70, 0x05, 0xd3, 0x17, 0xf8, 0x0a, 0x98, 0xc5, 0xf4, 0xf7, + 0x80, 0x6e, 0x24, 0xf1, 0xac, 0x6d, 0xe1, 0x0b, 0x17, 0x83, 0x2c, 0x8d, 0x65, 0x6f, 0xcf, 0xdf, + 0x0b, 0x77, 0xea, 0xf7, 0x71, 0xb0, 0xc8, 0x9a, 0xb8, 0x64, 0x36, 0x4d, 0xc7, 0x83, 0x5f, 0x73, + 0x20, 0xe1, 0x58, 0xee, 0xe9, 0x44, 0x71, 0xe3, 0x26, 0xea, 0x03, 0xdf, 0xb3, 0xe7, 0x3d, 0xe9, + 0x7c, 0x04, 0xb5, 0x89, 0x1d, 0x8b, 0x20, 0xa7, 0x41, 0xda, 0xfd, 0xbb, 0x45, 0x8e, 0x27, 0x19, + 0x34, 0xe0, 0x58, 0x6e, 0x38, 0x66, 0x5f, 0x72, 0x00, 0x3a, 0xe6, 0x51, 0x48, 0x63, 0x34, 0x50, + 0xd3, 0xc2, 0x35, 0xb6, 0xca, 0x37, 0x46, 0x9a, 0x3f, 0xcf, 0x7e, 0x68, 0x73, 0x2a, 0x2b, 0xf1, + 0xc2, 0x28, 0x78, 0xa0, 0x52, 0xb6, 0x44, 0x47, 0xb3, 0x94, 0x7b, 0xfe, 0x78, 0xf0, 0x8e, 0x79, + 0x14, 0x9a, 0x45, 0xc3, 0x5f, 0x70, 0x20, 0x59, 0x09, 0x66, 0x86, 0xb9, 0xf7, 0x29, 0x60, 0x33, + 0x14, 0xd6, 0xc6, 0x8d, 0xab, 0xed, 0x1a, 0xab, 0x6d, 0x7d, 0x00, 0x37, 0x50, 0xd6, 0xea, 0xc0, + 0xc8, 0x46, 0x2b, 0x4a, 0xd2, 0x18, 0xab, 0xe6, 0xd7, 0x70, 0x52, 0x59, 0x31, 0xef, 0x82, 0xd9, + 0x8f, 0x5b, 0xb8, 0xd9, 0x72, 0x82, 0x2a, 0x92, 0xb9, 0x37, 0xff, 0x71, 0x77, 0xe7, 0xd1, 0xfe, + 0xf3, 0x9e, 0xc4, 0x53, 0x74, 0xbf, 0x16, 0x8d, 0xf1, 0x41, 0x13, 0x2c, 0x90, 0x83, 0x26, 0xf2, + 0x0e, 0xb0, 0x4d, 0xed, 0x4f, 0x4e, 0x30, 0x3a, 0x94, 0x7c, 0xe5, 0x94, 0x20, 0xc2, 0xdf, 0x67, + 0x85, 0x77, 0x38, 0xb0, 0xe4, 0xcf, 0x93, 0xd1, 0x17, 0x9a, 0x0a, 0x84, 0xcc, 0x09, 0x85, 0x52, + 0x83, 0x2c, 0x03, 0xce, 0x9e, 0x67, 0xce, 0x0e, 0x64, 0x28, 0xda, 0xa2, 0x1f, 0xd0, 0xc3, 0xf7, + 0xcb, 0x7f, 0x70, 0x00, 0xf4, 0xa7, 0x08, 0x6e, 0x82, 0xf5, 0x4a, 0x51, 0x57, 0x8d, 0x62, 0x49, + 0x2f, 0x14, 0xf7, 0x8c, 0x1b, 0x7b, 0xe5, 0x92, 0xba, 0x53, 0xd8, 0x2d, 0xa8, 0x79, 0x3e, 0x26, + 0x2c, 0x77, 0xba, 0x72, 0x82, 0x26, 0xaa, 0xbe, 0x08, 0x54, 0xc0, 0x72, 0x34, 0xfb, 0x96, 0x5a, + 0xe6, 0x39, 0x61, 0xb1, 0xd3, 0x95, 0x17, 0x68, 0xd6, 0x2d, 0xe4, 0xc1, 0xcb, 0x60, 0x25, 0x9a, + 0x93, 0xcd, 0x95, 0xf5, 0x6c, 0x61, 0x8f, 0x8f, 0x0b, 0xe7, 0x3a, 0x5d, 0x79, 0x91, 0xe6, 0x65, + 0xd9, 0xda, 0x93, 0xc1, 0x52, 0x34, 0x77, 0xaf, 0xc8, 0x4f, 0x09, 0xc9, 0x4e, 0x57, 0x9e, 0xa7, + 0x69, 0x7b, 0x18, 0x6e, 0x81, 0xd4, 0x60, 0x86, 0x71, 0xb3, 0xa0, 0xbf, 0x6d, 0x54, 0x54, 0xbd, + 0xc8, 0x4f, 0x0b, 0xab, 0x9d, 0xae, 0xcc, 0x87, 0xb9, 0xe1, 0x9e, 0x12, 0xa6, 0xef, 0x7c, 0x23, + 0xc6, 0x2e, 0xff, 0x14, 0x07, 0x4b, 0x83, 0x7f, 0xc0, 0xc0, 0x34, 0xf8, 0x4f, 0x49, 0x2b, 0x96, + 0x8a, 0xe5, 0xec, 0x75, 0xa3, 0xac, 0x67, 0xf5, 0x1b, 0xe5, 0xa1, 0x0b, 0x07, 0x57, 0xa1, 0xc9, + 0x7b, 0x96, 0x0d, 0xaf, 0x01, 0x71, 0x38, 0x3f, 0xaf, 0x96, 0x8a, 0xe5, 0x82, 0x6e, 0x94, 0x54, + 0xad, 0x50, 0xcc, 0xf3, 0x9c, 0xb0, 0xde, 0xe9, 0xca, 0x2b, 0x14, 0x32, 0x30, 0x4e, 0xf0, 0x35, + 0xf0, 0xdf, 0x61, 0x70, 0xa5, 0xa8, 0x17, 0xf6, 0xde, 0x0a, 0xb1, 0x71, 0x61, 0xad, 0xd3, 0x95, + 0x21, 0xc5, 0x56, 0x22, 0xbd, 0x0f, 0x37, 0xc1, 0xda, 0x30, 0xb4, 0x94, 0x2d, 0x97, 0xd5, 0x3c, + 0x3f, 0x25, 0xf0, 0x9d, 0xae, 0x9c, 0xa4, 0x98, 0x92, 0xe9, 0x79, 0xa8, 0x06, 0x5f, 0x04, 0xa9, + 0xe1, 0x6c, 0x4d, 0x7d, 0x47, 0xdd, 0xd1, 0xd5, 0x3c, 0x3f, 0x2d, 0xc0, 0x4e, 0x57, 0x5e, 0xa2, + 0xf9, 0x1a, 0xfa, 0x10, 0xed, 0x13, 0x74, 0x26, 0xff, 0x6e, 0xb6, 0x70, 0x5d, 0xcd, 0xf3, 0x33, + 0x51, 0xfe, 0x5d, 0xd3, 0xb2, 0x51, 0x8d, 0xda, 0x99, 0xbb, 0xfe, 0xe0, 0x89, 0x18, 0x7b, 0xf4, + 0x44, 0x8c, 0x7d, 0x76, 0x2c, 0xc6, 0x1e, 0x1c, 0x8b, 0xdc, 0xc3, 0x63, 0x91, 0xfb, 0xfd, 0x58, + 0xe4, 0xee, 0x3e, 0x15, 0x63, 0x0f, 0x9f, 0x8a, 0xb1, 0x47, 0x4f, 0xc5, 0xd8, 0x7b, 0x7f, 0xb7, + 0x08, 0x8f, 0x82, 0x7f, 0x7a, 0x82, 0x6e, 0xae, 0xce, 0x06, 0xbb, 0xe3, 0xa5, 0xbf, 0x02, 0x00, + 0x00, 0xff, 0xff, 0xf9, 0xc9, 0xb5, 0x9f, 0x0f, 0x0d, 0x00, 0x00, } func (this *TextProposal) Equal(that interface{}) bool { diff --git a/x/gov/types/query.pb.go b/x/gov/types/query.pb.go index 01d86af079..9ed55ac76a 100644 --- a/x/gov/types/query.pb.go +++ b/x/gov/types/query.pb.go @@ -839,68 +839,68 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta1/query.proto", fileDescriptor_e35c0d133e91c0a2) } var fileDescriptor_e35c0d133e91c0a2 = []byte{ - // 963 bytes of a gzipped FileDescriptorProto + // 968 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0x41, 0x6f, 0x1b, 0x55, - 0x10, 0xf6, 0x4b, 0x9c, 0xd6, 0x9e, 0xb4, 0x01, 0x86, 0x00, 0xd6, 0x12, 0xec, 0xb0, 0xa2, 0xad, - 0x49, 0xa9, 0x97, 0x24, 0x05, 0xd4, 0x16, 0x50, 0x89, 0x50, 0x5b, 0x54, 0x09, 0x15, 0xa7, 0x02, - 0x89, 0x03, 0xd1, 0xa6, 0x5e, 0x2d, 0x2b, 0x1c, 0xbf, 0xad, 0xdf, 0xb3, 0x45, 0x14, 0x22, 0x24, + 0x10, 0xf6, 0x4b, 0x9c, 0xd6, 0x9e, 0xb4, 0x01, 0x86, 0x00, 0x96, 0x09, 0x76, 0x58, 0xd1, 0xd4, + 0xa4, 0xd4, 0x8f, 0x38, 0x05, 0xd4, 0x16, 0x50, 0x88, 0x50, 0x5b, 0x54, 0x09, 0x15, 0xa7, 0x02, + 0x89, 0x03, 0xd1, 0xba, 0x5e, 0x2d, 0x2b, 0x1c, 0xbf, 0xad, 0xdf, 0xb3, 0x45, 0x14, 0x22, 0x24, 0x4e, 0x20, 0x2e, 0xa0, 0x22, 0x6e, 0x88, 0x4a, 0x95, 0xf8, 0x2d, 0x3d, 0x56, 0x82, 0x03, 0x27, - 0x84, 0x12, 0x0e, 0x88, 0xdf, 0xc0, 0x01, 0xed, 0x7b, 0xf3, 0xd6, 0xbb, 0xce, 0x3a, 0xbb, 0x29, - 0x55, 0x4f, 0xb1, 0xe7, 0x7d, 0x33, 0xf3, 0x7d, 0x33, 0xf3, 0xe6, 0xc5, 0x50, 0xbf, 0xc5, 0xc5, - 0x16, 0x17, 0x8e, 0xcf, 0x87, 0xce, 0x70, 0x79, 0xd3, 0x93, 0xee, 0xb2, 0x73, 0x7b, 0xe0, 0xf5, - 0xb7, 0x5b, 0x61, 0x9f, 0x4b, 0x8e, 0xa8, 0xcf, 0x5b, 0x3e, 0x1f, 0xb6, 0xe8, 0xdc, 0x5a, 0x22, - 0x9f, 0x4d, 0x57, 0x78, 0x1a, 0x1c, 0xbb, 0x86, 0xae, 0x1f, 0xf4, 0x5c, 0x19, 0xf0, 0x9e, 0xf6, - 0xb7, 0xe6, 0x7d, 0xee, 0x73, 0xf5, 0xd1, 0x89, 0x3e, 0x91, 0x75, 0xc1, 0xe7, 0xdc, 0xef, 0x7a, - 0x8e, 0x1b, 0x06, 0x8e, 0xdb, 0xeb, 0x71, 0xa9, 0x5c, 0x84, 0x39, 0xcd, 0xe0, 0x14, 0xe5, 0x57, - 0xa7, 0xf6, 0x1b, 0x30, 0xff, 0x41, 0x94, 0xf3, 0x46, 0x9f, 0x87, 0x5c, 0xb8, 0xdd, 0xb6, 0x77, - 0x7b, 0xe0, 0x09, 0x89, 0x0d, 0x98, 0x0d, 0xc9, 0xb4, 0x11, 0x74, 0x6a, 0x6c, 0x91, 0x35, 0xcb, - 0x6d, 0x30, 0xa6, 0xf7, 0x3a, 0xf6, 0x47, 0xf0, 0xcc, 0x98, 0xa3, 0x08, 0x79, 0x4f, 0x78, 0xf8, - 0x36, 0x54, 0x0c, 0x4c, 0xb9, 0xcd, 0xae, 0x2c, 0xb4, 0x0e, 0xca, 0x6e, 0x19, 0xbf, 0xb5, 0xf2, - 0xfd, 0x3f, 0x1a, 0xa5, 0x76, 0xec, 0x63, 0xff, 0xc3, 0xc6, 0x22, 0x0b, 0xc3, 0xe9, 0x3a, 0x3c, - 0x11, 0x73, 0x12, 0xd2, 0x95, 0x03, 0xa1, 0x12, 0xcc, 0xad, 0xd8, 0x87, 0x25, 0x58, 0x57, 0xc8, - 0xf6, 0x5c, 0x98, 0xfa, 0x8e, 0xf3, 0x30, 0x33, 0xe4, 0xd2, 0xeb, 0xd7, 0xa6, 0x16, 0x59, 0xb3, - 0xda, 0xd6, 0x5f, 0x70, 0x01, 0xaa, 0x1d, 0x2f, 0xe4, 0x22, 0x90, 0xbc, 0x5f, 0x9b, 0x56, 0x27, - 0x23, 0x03, 0x5e, 0x01, 0x18, 0xb5, 0xa4, 0x56, 0x56, 0xe2, 0x4e, 0x9b, 0xdc, 0x51, 0xff, 0x5a, - 0xba, 0xd9, 0x31, 0x05, 0xd7, 0xf7, 0x88, 0x7c, 0x3b, 0xe1, 0x79, 0xb1, 0xf2, 0xf5, 0xdd, 0x46, - 0xe9, 0xef, 0xbb, 0x8d, 0x92, 0x7d, 0x8f, 0xc1, 0xb3, 0xe3, 0x62, 0xa9, 0x8e, 0x97, 0xa1, 0x6a, - 0x28, 0x47, 0x3a, 0xa7, 0x0b, 0x16, 0x72, 0xe4, 0x84, 0x57, 0x53, 0x74, 0xa7, 0x14, 0xdd, 0x33, - 0xb9, 0x74, 0x75, 0xfa, 0x24, 0x5f, 0x7b, 0x1d, 0x9e, 0x54, 0x24, 0x3f, 0xe4, 0xd2, 0x2b, 0x3a, - 0x20, 0xd9, 0x05, 0x4e, 0x48, 0xbf, 0x0a, 0x4f, 0x25, 0x82, 0x92, 0xe8, 0x15, 0x28, 0x47, 0x38, - 0x1a, 0x9c, 0x5a, 0x96, 0xde, 0x08, 0x4f, 0x5a, 0x15, 0xd6, 0xfe, 0x22, 0x11, 0x48, 0x14, 0xa6, - 0x77, 0x25, 0xa3, 0x38, 0x0f, 0xd1, 0x4b, 0xfb, 0x0e, 0x03, 0x4c, 0xa6, 0x27, 0x21, 0xe7, 0xb5, - 0x7a, 0xd3, 0xb9, 0x3c, 0x25, 0x1a, 0xfc, 0xe8, 0x3a, 0xf6, 0x1a, 0x91, 0xba, 0xe1, 0xf6, 0xdd, - 0xad, 0x54, 0x51, 0x94, 0x61, 0x43, 0x6e, 0x87, 0xba, 0xc8, 0xd5, 0xc8, 0x2d, 0x32, 0xdd, 0xdc, - 0x0e, 0x3d, 0xfb, 0x5f, 0x06, 0x4f, 0xa7, 0xfc, 0x48, 0xcd, 0x75, 0x38, 0x39, 0xe4, 0x32, 0xe8, - 0xf9, 0x1b, 0x1a, 0x4c, 0xfd, 0x59, 0x9c, 0xa0, 0x2a, 0xe8, 0xf9, 0x3a, 0x00, 0xa9, 0x3b, 0x31, - 0x4c, 0xd8, 0xf0, 0x7d, 0x98, 0xa3, 0x2b, 0x65, 0xa2, 0x69, 0xa1, 0x2f, 0x66, 0x45, 0x7b, 0x57, - 0x23, 0x53, 0xe1, 0x4e, 0x76, 0x92, 0x46, 0xbc, 0x06, 0x27, 0xa4, 0xdb, 0xed, 0x6e, 0x9b, 0x68, - 0xd3, 0x2a, 0x5a, 0x23, 0x2b, 0xda, 0xcd, 0x08, 0x97, 0x8a, 0x35, 0x2b, 0x47, 0x26, 0xfb, 0x13, - 0x52, 0x4f, 0x49, 0x0b, 0xcf, 0x52, 0x6a, 0x6b, 0x4c, 0x8d, 0x6d, 0x8d, 0xc4, 0xc8, 0xaf, 0xd3, - 0xb2, 0x8d, 0xe3, 0x53, 0x79, 0x2f, 0xc1, 0x71, 0x82, 0x53, 0x61, 0x9f, 0x3f, 0xa4, 0x14, 0x44, - 0xdc, 0x78, 0xd8, 0x5f, 0xa6, 0x83, 0x3e, 0xfe, 0x1b, 0xf0, 0xb3, 0x59, 0xd8, 0x23, 0x06, 0xa4, - 0xeb, 0x2d, 0xa8, 0x10, 0x4b, 0x73, 0x0f, 0x0a, 0x08, 0x8b, 0x5d, 0x1e, 0xdd, 0x6d, 0xb8, 0x08, - 0xcf, 0x29, 0x82, 0xaa, 0xfd, 0x6d, 0x4f, 0x0c, 0xba, 0xf2, 0x08, 0xef, 0x5c, 0xed, 0xa0, 0x6f, - 0xdc, 0xb7, 0x19, 0x35, 0x3e, 0xd4, 0xb5, 0xc9, 0x23, 0xa7, 0xfd, 0xcc, 0x5d, 0x57, 0x3e, 0x2b, - 0xbf, 0x55, 0x61, 0x46, 0x45, 0xc6, 0x1f, 0x18, 0x54, 0xcc, 0x16, 0xc7, 0x66, 0x56, 0x90, 0xac, - 0x27, 0xda, 0x7a, 0xb9, 0x00, 0x52, 0x13, 0xb5, 0x57, 0xbf, 0xfa, 0xf5, 0xaf, 0x3b, 0x53, 0xe7, - 0xf0, 0xac, 0x93, 0xf1, 0xcf, 0x40, 0xfc, 0x60, 0x38, 0x3b, 0x89, 0x52, 0xec, 0xe2, 0x37, 0x0c, - 0xaa, 0xf1, 0xb3, 0x84, 0xf9, 0xd9, 0xcc, 0xe4, 0x59, 0x4b, 0x45, 0xa0, 0xc4, 0xec, 0x94, 0x62, - 0xd6, 0xc0, 0x17, 0x0e, 0x65, 0x86, 0x3f, 0x32, 0x28, 0x47, 0xeb, 0x12, 0x5f, 0x9a, 0x18, 0x3b, - 0xf1, 0x38, 0x59, 0xa7, 0x72, 0x50, 0x94, 0xfc, 0x1d, 0x95, 0xfc, 0x12, 0x5e, 0x38, 0x42, 0x59, - 0x1c, 0xb5, 0xa9, 0x9d, 0x1d, 0xf5, 0x9c, 0xed, 0xe2, 0xf7, 0x0c, 0x66, 0xd4, 0xe6, 0xc7, 0xc3, - 0x73, 0xc6, 0xc5, 0x39, 0x9d, 0x07, 0x23, 0x6e, 0x17, 0x14, 0xb7, 0x55, 0x5c, 0x3e, 0x32, 0x37, - 0xfc, 0x96, 0xc1, 0x31, 0xda, 0x8d, 0x93, 0xb3, 0xa5, 0x5e, 0x06, 0xeb, 0x4c, 0x2e, 0x8e, 0x68, - 0xbd, 0xaa, 0x68, 0x2d, 0x61, 0x33, 0x93, 0x96, 0xc2, 0x3a, 0x3b, 0x89, 0x47, 0x66, 0x17, 0x7f, - 0x61, 0x70, 0x9c, 0x6e, 0x38, 0x4e, 0x4e, 0x93, 0x5e, 0xb9, 0x56, 0x33, 0x1f, 0x48, 0x84, 0xae, - 0x29, 0x42, 0x6b, 0x78, 0xf9, 0x28, 0x75, 0x32, 0x2b, 0xc6, 0xd9, 0x89, 0xd7, 0xf4, 0x2e, 0xfe, - 0xc4, 0xa0, 0x62, 0x56, 0x18, 0xe6, 0x12, 0x10, 0xf9, 0xd7, 0x70, 0x7c, 0x1f, 0xda, 0x6f, 0x2a, - 0xae, 0xaf, 0xe3, 0xf9, 0x87, 0xe1, 0x8a, 0xf7, 0x18, 0xcc, 0x26, 0xb6, 0x09, 0x9e, 0x9d, 0x98, - 0xf8, 0xe0, 0x9e, 0xb3, 0x5e, 0x29, 0x06, 0xfe, 0x3f, 0xc3, 0xa7, 0xd6, 0xda, 0xda, 0xda, 0xfd, - 0xbd, 0x3a, 0x7b, 0xb0, 0x57, 0x67, 0x7f, 0xee, 0xd5, 0xd9, 0x77, 0xfb, 0xf5, 0xd2, 0x83, 0xfd, - 0x7a, 0xe9, 0xf7, 0xfd, 0x7a, 0xe9, 0xe3, 0xa6, 0x1f, 0xc8, 0x4f, 0x07, 0x9b, 0xad, 0x5b, 0x7c, - 0xcb, 0x84, 0xd5, 0x7f, 0xce, 0x89, 0xce, 0x67, 0xce, 0xe7, 0x2a, 0x47, 0x34, 0x32, 0x62, 0xf3, - 0x98, 0xfa, 0x6d, 0xb2, 0xfa, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6f, 0x86, 0xe2, 0x1a, 0x4f, - 0x0d, 0x00, 0x00, + 0x84, 0x12, 0x0e, 0x88, 0xdf, 0xc0, 0x01, 0xed, 0xdb, 0x79, 0xeb, 0x5d, 0x67, 0x9d, 0xb5, 0x4b, + 0xd5, 0x9b, 0x77, 0xde, 0x37, 0x33, 0xdf, 0x37, 0x33, 0x6f, 0x5e, 0x02, 0x95, 0x5b, 0x42, 0xee, + 0x08, 0xc9, 0x5d, 0x31, 0xe0, 0x83, 0xb5, 0x96, 0xa3, 0xec, 0x35, 0x7e, 0xbb, 0xef, 0xf4, 0x76, + 0xeb, 0x7e, 0x4f, 0x28, 0x81, 0x18, 0x9e, 0xd7, 0x5d, 0x31, 0xa8, 0xd3, 0x79, 0x79, 0x95, 0x7c, + 0x5a, 0xb6, 0x74, 0x42, 0x70, 0xe4, 0xea, 0xdb, 0xae, 0xd7, 0xb5, 0x95, 0x27, 0xba, 0xa1, 0x7f, + 0x79, 0xd1, 0x15, 0xae, 0xd0, 0x3f, 0x79, 0xf0, 0x8b, 0xac, 0x4b, 0xae, 0x10, 0x6e, 0xc7, 0xe1, + 0xb6, 0xef, 0x71, 0xbb, 0xdb, 0x15, 0x4a, 0xbb, 0x48, 0x73, 0x9a, 0xc2, 0x29, 0xc8, 0xaf, 0x4f, + 0xad, 0x37, 0x60, 0xf1, 0x83, 0x20, 0xe7, 0x8d, 0x9e, 0xf0, 0x85, 0xb4, 0x3b, 0x4d, 0xe7, 0x76, + 0xdf, 0x91, 0x0a, 0xab, 0x30, 0xef, 0x93, 0x69, 0xdb, 0x6b, 0x97, 0xd8, 0x32, 0xab, 0xe5, 0x9b, + 0x60, 0x4c, 0xef, 0xb5, 0xad, 0x8f, 0xe0, 0x99, 0x11, 0x47, 0xe9, 0x8b, 0xae, 0x74, 0xf0, 0x6d, + 0x28, 0x18, 0x98, 0x76, 0x9b, 0x6f, 0x2c, 0xd5, 0x8f, 0xca, 0xae, 0x1b, 0xbf, 0xcd, 0xfc, 0xfd, + 0x3f, 0xaa, 0xb9, 0x66, 0xe4, 0x63, 0xfd, 0xc3, 0x46, 0x22, 0x4b, 0xc3, 0xe9, 0x3a, 0x3c, 0x11, + 0x71, 0x92, 0xca, 0x56, 0x7d, 0xa9, 0x13, 0x2c, 0x34, 0xac, 0xe3, 0x12, 0x6c, 0x69, 0x64, 0x73, + 0xc1, 0x4f, 0x7c, 0xe3, 0x22, 0xcc, 0x0d, 0x84, 0x72, 0x7a, 0xa5, 0x99, 0x65, 0x56, 0x2b, 0x36, + 0xc3, 0x0f, 0x5c, 0x82, 0x62, 0xdb, 0xf1, 0x85, 0xf4, 0x94, 0xe8, 0x95, 0x66, 0xf5, 0xc9, 0xd0, + 0x80, 0x57, 0x00, 0x86, 0x2d, 0x29, 0xe5, 0xb5, 0xb8, 0x15, 0x93, 0x3b, 0xe8, 0x5f, 0x3d, 0x6c, + 0x76, 0x44, 0xc1, 0x76, 0x1d, 0x22, 0xdf, 0x8c, 0x79, 0x5e, 0x2a, 0x7c, 0x7d, 0xb7, 0x9a, 0xfb, + 0xfb, 0x6e, 0x35, 0x67, 0xdd, 0x63, 0xf0, 0xec, 0xa8, 0x58, 0xaa, 0xe3, 0x06, 0x14, 0x0d, 0xe5, + 0x40, 0xe7, 0xec, 0x84, 0x85, 0x1c, 0x3a, 0xe1, 0xd5, 0x04, 0xdd, 0x19, 0x4d, 0xf7, 0x6c, 0x26, + 0xdd, 0x30, 0x7d, 0x9c, 0xaf, 0xb5, 0x05, 0x4f, 0x6a, 0x92, 0x1f, 0x0a, 0xe5, 0x4c, 0x3a, 0x20, + 0xe9, 0x05, 0x8e, 0x49, 0xbf, 0x0a, 0x4f, 0xc5, 0x82, 0x92, 0xe8, 0x06, 0xe4, 0x03, 0x1c, 0x0d, + 0x4e, 0x29, 0x4d, 0x6f, 0x80, 0x27, 0xad, 0x1a, 0x6b, 0x7d, 0x11, 0x0b, 0x24, 0x27, 0xa6, 0x77, + 0x25, 0xa5, 0x38, 0x0f, 0xd1, 0x4b, 0xeb, 0x0e, 0x03, 0x8c, 0xa7, 0x27, 0x21, 0x17, 0x42, 0xf5, + 0xa6, 0x73, 0x59, 0x4a, 0x42, 0xf0, 0xa3, 0xeb, 0xd8, 0x6b, 0x44, 0xea, 0x86, 0xdd, 0xb3, 0x77, + 0x12, 0x45, 0xd1, 0x86, 0x6d, 0xb5, 0xeb, 0x87, 0x45, 0x2e, 0x06, 0x6e, 0x81, 0xe9, 0xe6, 0xae, + 0xef, 0x58, 0xff, 0x32, 0x78, 0x3a, 0xe1, 0x47, 0x6a, 0xae, 0xc3, 0xe9, 0x81, 0x50, 0x5e, 0xd7, + 0xdd, 0x0e, 0xc1, 0xd4, 0x9f, 0xe5, 0x31, 0xaa, 0xbc, 0xae, 0x1b, 0x06, 0x20, 0x75, 0xa7, 0x06, + 0x31, 0x1b, 0xbe, 0x0f, 0x0b, 0x74, 0xa5, 0x4c, 0xb4, 0x50, 0xe8, 0x8b, 0x69, 0xd1, 0xde, 0x0d, + 0x91, 0x89, 0x70, 0xa7, 0xdb, 0x71, 0x23, 0x5e, 0x83, 0x53, 0xca, 0xee, 0x74, 0x76, 0x4d, 0xb4, + 0x59, 0x1d, 0xad, 0x9a, 0x16, 0xed, 0x66, 0x80, 0x4b, 0xc4, 0x9a, 0x57, 0x43, 0x93, 0xf5, 0x09, + 0xa9, 0xa7, 0xa4, 0x13, 0xcf, 0x52, 0x62, 0x6b, 0xcc, 0x8c, 0x6c, 0x8d, 0xd8, 0xc8, 0x6f, 0xd1, + 0xb2, 0x8d, 0xe2, 0x53, 0x79, 0x2f, 0xc3, 0x49, 0x82, 0x53, 0x61, 0x9f, 0x3f, 0xa6, 0x14, 0x44, + 0xdc, 0x78, 0x58, 0x5f, 0x26, 0x83, 0x3e, 0xfe, 0x1b, 0xf0, 0xb3, 0x59, 0xd8, 0x43, 0x06, 0xa4, + 0xeb, 0x2d, 0x28, 0x10, 0x4b, 0x73, 0x0f, 0x26, 0x10, 0x16, 0xb9, 0x3c, 0xba, 0xdb, 0x70, 0x09, + 0x9e, 0xd3, 0x04, 0x75, 0xfb, 0x9b, 0x8e, 0xec, 0x77, 0xd4, 0x14, 0xef, 0x5c, 0xe9, 0xa8, 0x6f, + 0xd4, 0xb7, 0x39, 0x3d, 0x3e, 0xd4, 0xb5, 0xf1, 0x23, 0x17, 0xfa, 0x99, 0xbb, 0xae, 0x7d, 0x1a, + 0xbf, 0x15, 0x61, 0x4e, 0x47, 0xc6, 0x1f, 0x18, 0x14, 0xcc, 0x16, 0xc7, 0x5a, 0x5a, 0x90, 0xb4, + 0x27, 0xba, 0xfc, 0xf2, 0x04, 0xc8, 0x90, 0xa8, 0xb5, 0xfe, 0xd5, 0xaf, 0x7f, 0xdd, 0x99, 0x39, + 0x8f, 0xe7, 0x78, 0xca, 0x1f, 0x03, 0xd1, 0x83, 0xc1, 0xf7, 0x62, 0xa5, 0xd8, 0xc7, 0x6f, 0x18, + 0x14, 0xa3, 0x67, 0x09, 0xb3, 0xb3, 0x99, 0xc9, 0x2b, 0xaf, 0x4e, 0x02, 0x25, 0x66, 0x67, 0x34, + 0xb3, 0x2a, 0xbe, 0x70, 0x2c, 0x33, 0xfc, 0x91, 0x41, 0x3e, 0x58, 0x97, 0xf8, 0xd2, 0xd8, 0xd8, + 0xb1, 0xc7, 0xa9, 0x7c, 0x26, 0x03, 0x45, 0xc9, 0xdf, 0xd1, 0xc9, 0x2f, 0xe3, 0xc5, 0x29, 0xca, + 0xc2, 0xf5, 0xa6, 0xe6, 0x7b, 0xfa, 0x39, 0xdb, 0xc7, 0xef, 0x19, 0xcc, 0xe9, 0xcd, 0x8f, 0xc7, + 0xe7, 0x8c, 0x8a, 0xb3, 0x92, 0x05, 0x23, 0x6e, 0x17, 0x35, 0xb7, 0x75, 0x5c, 0x9b, 0x9a, 0x1b, + 0x7e, 0xcb, 0xe0, 0x04, 0xed, 0xc6, 0xf1, 0xd9, 0x12, 0x2f, 0x43, 0xf9, 0x6c, 0x26, 0x8e, 0x68, + 0xbd, 0xaa, 0x69, 0xad, 0x62, 0x2d, 0x95, 0x96, 0xc6, 0xf2, 0xbd, 0xd8, 0x23, 0xb3, 0x8f, 0xbf, + 0x30, 0x38, 0x49, 0x37, 0x1c, 0xc7, 0xa7, 0x49, 0xae, 0xdc, 0x72, 0x2d, 0x1b, 0x48, 0x84, 0xae, + 0x69, 0x42, 0x9b, 0xb8, 0x31, 0x4d, 0x9d, 0xcc, 0x8a, 0xe1, 0x7b, 0xd1, 0x9a, 0xde, 0xc7, 0x9f, + 0x18, 0x14, 0xcc, 0x0a, 0xc3, 0x4c, 0x02, 0x32, 0xfb, 0x1a, 0x8e, 0xee, 0x43, 0xeb, 0x4d, 0xcd, + 0xf5, 0x75, 0xbc, 0xf0, 0x30, 0x5c, 0xf1, 0x1e, 0x83, 0xf9, 0xd8, 0x36, 0xc1, 0x73, 0x63, 0x13, + 0x1f, 0xdd, 0x73, 0xe5, 0x57, 0x26, 0x03, 0xff, 0x9f, 0xe1, 0xd3, 0x6b, 0x6d, 0x73, 0xe3, 0xfe, + 0x41, 0x85, 0x3d, 0x38, 0xa8, 0xb0, 0x3f, 0x0f, 0x2a, 0xec, 0xbb, 0xc3, 0x4a, 0xee, 0xc1, 0x61, + 0x25, 0xf7, 0xfb, 0x61, 0x25, 0xf7, 0xf1, 0x8a, 0xeb, 0xa9, 0x4f, 0xfb, 0xad, 0xfa, 0x2d, 0xb1, + 0xc3, 0x3b, 0x5e, 0xd7, 0xe1, 0x9d, 0xd6, 0xce, 0x79, 0xd9, 0xfe, 0x8c, 0x0f, 0x1a, 0xfc, 0x73, + 0x9d, 0x21, 0x18, 0x18, 0xd9, 0x3a, 0xa1, 0xff, 0x33, 0x59, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, + 0x83, 0xaf, 0xa3, 0xc7, 0x4d, 0x0d, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/gov/types/tx.pb.go b/x/gov/types/tx.pb.go index c4dcd48cf2..4b62671624 100644 --- a/x/gov/types/tx.pb.go +++ b/x/gov/types/tx.pb.go @@ -10,7 +10,7 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" types "github.com/line/lbm-sdk/v2/codec/types" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types1 "github.com/line/lbm-sdk/v2/types" _ "github.com/regen-network/cosmos-proto" grpc "google.golang.org/grpc" @@ -35,9 +35,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgSubmitProposal defines an sdk.Msg type that supports submitting arbitrary // proposal Content. type MsgSubmitProposal struct { - Content *types.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` - InitialDeposit github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"initial_deposit" yaml:"initial_deposit"` - Proposer string `protobuf:"bytes,3,opt,name=proposer,proto3" json:"proposer,omitempty"` + Content *types.Any `protobuf:"bytes,1,opt,name=content,proto3" json:"content,omitempty"` + InitialDeposit github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,2,rep,name=initial_deposit,json=initialDeposit,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"initial_deposit" yaml:"initial_deposit"` + Proposer string `protobuf:"bytes,3,opt,name=proposer,proto3" json:"proposer,omitempty"` } func (m *MsgSubmitProposal) Reset() { *m = MsgSubmitProposal{} } @@ -195,9 +195,9 @@ var xxx_messageInfo_MsgVoteResponse proto.InternalMessageInfo // MsgDeposit defines a message to submit a deposit to an existing proposal. type MsgDeposit struct { - ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"` - Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` - Amount github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` + ProposalId uint64 `protobuf:"varint,1,opt,name=proposal_id,json=proposalId,proto3" json:"proposal_id" yaml:"proposal_id"` + Depositor string `protobuf:"bytes,2,opt,name=depositor,proto3" json:"depositor,omitempty"` + Amount github_com_line_lbm_sdk_v2_types.Coins `protobuf:"bytes,3,rep,name=amount,proto3,castrepeated=github.com/line/lbm-sdk/v2/types.Coins" json:"amount"` } func (m *MsgDeposit) Reset() { *m = MsgDeposit{} } @@ -281,44 +281,44 @@ func init() { func init() { proto.RegisterFile("cosmos/gov/v1beta1/tx.proto", fileDescriptor_3c053992595e3dce) } var fileDescriptor_3c053992595e3dce = []byte{ - // 586 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xb6, 0x93, 0xd2, 0xd0, 0x8b, 0x94, 0xd2, 0x53, 0x84, 0x12, 0xb7, 0xb2, 0x23, 0xa3, 0xa2, - 0x2c, 0xb1, 0x69, 0x90, 0x18, 0xca, 0x44, 0x8a, 0x10, 0x20, 0x45, 0x80, 0x91, 0x18, 0x58, 0x22, - 0xdb, 0x71, 0x8d, 0x45, 0xe2, 0x67, 0xe5, 0x2e, 0x51, 0xb3, 0x31, 0x22, 0x06, 0x60, 0x64, 0xcc, - 0xcc, 0x86, 0xc4, 0x1f, 0x51, 0x31, 0x75, 0x64, 0x40, 0x01, 0x25, 0x0b, 0x30, 0xf6, 0x2f, 0x40, - 0xbe, 0x1f, 0x69, 0xd5, 0xa4, 0x01, 0xa4, 0x4e, 0xc9, 0x7b, 0xdf, 0xfb, 0x3e, 0xdd, 0xf7, 0xdd, - 0xf3, 0xa1, 0x4d, 0x1f, 0x48, 0x17, 0x88, 0x1d, 0xc2, 0xc0, 0x1e, 0xec, 0x78, 0x01, 0x75, 0x77, - 0x6c, 0x7a, 0x60, 0x25, 0x3d, 0xa0, 0x80, 0x31, 0x07, 0xad, 0x10, 0x06, 0x96, 0x00, 0x35, 0x5d, - 0x10, 0x3c, 0x97, 0x04, 0x33, 0x86, 0x0f, 0x51, 0xcc, 0x39, 0xda, 0xd6, 0x02, 0xc1, 0x94, 0xcf, - 0xd1, 0x32, 0x47, 0x5b, 0xac, 0xb2, 0x85, 0x3c, 0x87, 0x8a, 0x21, 0x84, 0xc0, 0xfb, 0xe9, 0x3f, - 0x49, 0x08, 0x01, 0xc2, 0x4e, 0x60, 0xb3, 0xca, 0xeb, 0xef, 0xdb, 0x6e, 0x3c, 0xe4, 0x90, 0xf9, - 0x2e, 0x83, 0x36, 0x9a, 0x24, 0x7c, 0xda, 0xf7, 0xba, 0x11, 0x7d, 0xdc, 0x83, 0x04, 0x88, 0xdb, - 0xc1, 0xb7, 0x51, 0xce, 0x87, 0x98, 0x06, 0x31, 0x2d, 0xa9, 0x15, 0xb5, 0x9a, 0xaf, 0x17, 0x2d, - 0x2e, 0x61, 0x49, 0x09, 0xeb, 0x4e, 0x3c, 0x6c, 0xe4, 0xbf, 0x7c, 0xae, 0xe5, 0xf6, 0xf8, 0xa0, - 0x23, 0x19, 0xf8, 0xad, 0x8a, 0xd6, 0xa3, 0x38, 0xa2, 0x91, 0xdb, 0x69, 0xb5, 0x83, 0x04, 0x48, - 0x44, 0x4b, 0x99, 0x4a, 0xb6, 0x9a, 0xaf, 0x97, 0x2d, 0x71, 0xd8, 0xd4, 0xb7, 0x0c, 0xc3, 0xda, - 0x83, 0x28, 0x6e, 0x3c, 0x3c, 0x1c, 0x1b, 0xca, 0xf1, 0xd8, 0xb8, 0x3a, 0x74, 0xbb, 0x9d, 0x5d, - 0xf3, 0x0c, 0xdf, 0xfc, 0xf8, 0xdd, 0xa8, 0x86, 0x11, 0x7d, 0xd1, 0xf7, 0x2c, 0x1f, 0xba, 0xc2, - 0xb3, 0xf8, 0xa9, 0x91, 0xf6, 0x4b, 0x9b, 0x0e, 0x93, 0x80, 0x30, 0x29, 0xe2, 0x14, 0x04, 0xfb, - 0x2e, 0x27, 0x63, 0x0d, 0x5d, 0x4e, 0x98, 0xb3, 0xa0, 0x57, 0xca, 0x56, 0xd4, 0xea, 0x9a, 0x33, - 0xab, 0x77, 0xaf, 0xbc, 0x1e, 0x19, 0xca, 0x87, 0x91, 0xa1, 0xfc, 0x1c, 0x19, 0xca, 0xab, 0x6f, - 0x15, 0xc5, 0xf4, 0x51, 0x79, 0x2e, 0x10, 0x27, 0x20, 0x09, 0xc4, 0x24, 0xc0, 0xf7, 0x50, 0x3e, - 0x11, 0xbd, 0x56, 0xd4, 0x66, 0xe1, 0xac, 0x34, 0xb6, 0x7f, 0x8f, 0x8d, 0xd3, 0xed, 0xe3, 0xb1, - 0x81, 0xb9, 0x8d, 0x53, 0x4d, 0xd3, 0x41, 0xb2, 0x7a, 0xd0, 0x36, 0x3f, 0xa9, 0x28, 0xd7, 0x24, - 0xe1, 0x33, 0xa0, 0x17, 0xa6, 0x89, 0x8b, 0xe8, 0xd2, 0x00, 0x68, 0xd0, 0x2b, 0x65, 0x98, 0x47, - 0x5e, 0xe0, 0x5b, 0x68, 0x15, 0x12, 0x1a, 0x41, 0xcc, 0xac, 0x17, 0xea, 0xba, 0x35, 0xbf, 0x8f, - 0x56, 0x7a, 0x8e, 0x47, 0x6c, 0xca, 0x11, 0xd3, 0x0b, 0x82, 0xd9, 0x40, 0xeb, 0xe2, 0xc8, 0x32, - 0x0e, 0xf3, 0x97, 0x8a, 0x50, 0x93, 0x84, 0x32, 0xe8, 0x8b, 0x72, 0xb2, 0x85, 0xd6, 0xc4, 0xc5, - 0x83, 0x74, 0x73, 0xd2, 0xc0, 0x3e, 0x5a, 0x75, 0xbb, 0xd0, 0x8f, 0x69, 0x29, 0xfb, 0xb7, 0xad, - 0xba, 0x91, 0x6e, 0xd5, 0x7f, 0xed, 0x8e, 0x90, 0x5e, 0x60, 0xbf, 0x88, 0xf0, 0x89, 0x55, 0x99, - 0x40, 0xfd, 0x4d, 0x06, 0x65, 0x9b, 0x24, 0xc4, 0xfb, 0xa8, 0x70, 0xe6, 0x1b, 0xda, 0x5e, 0x14, - 0xf4, 0xdc, 0x66, 0x69, 0xb5, 0x7f, 0x1a, 0x9b, 0x2d, 0xe0, 0x7d, 0xb4, 0xc2, 0x96, 0x66, 0xf3, - 0x1c, 0x5a, 0x0a, 0x6a, 0xd7, 0x96, 0x80, 0x33, 0xa5, 0x27, 0x28, 0x27, 0xef, 0x4d, 0x3f, 0x67, - 0x5e, 0xe0, 0xda, 0xf5, 0xe5, 0xb8, 0x94, 0x6c, 0x34, 0x0e, 0x27, 0xba, 0x7a, 0x34, 0xd1, 0xd5, - 0x1f, 0x13, 0x5d, 0x7d, 0x3f, 0xd5, 0x95, 0xa3, 0xa9, 0xae, 0x7c, 0x9d, 0xea, 0xca, 0xf3, 0xe5, - 0x17, 0x70, 0xc0, 0x1e, 0x3a, 0x76, 0x0d, 0xde, 0x2a, 0x7b, 0x61, 0x6e, 0xfe, 0x09, 0x00, 0x00, - 0xff, 0xff, 0x7f, 0x09, 0x3f, 0x57, 0x54, 0x05, 0x00, 0x00, + // 592 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x31, 0x6f, 0xd3, 0x40, + 0x14, 0xb6, 0x93, 0x92, 0xd0, 0x8b, 0x94, 0xd2, 0x53, 0x84, 0x12, 0xb7, 0xb2, 0x23, 0xa3, 0x56, + 0x59, 0x72, 0x56, 0x83, 0xc4, 0x50, 0x16, 0x48, 0x11, 0x2a, 0x43, 0x04, 0x18, 0x89, 0x81, 0x25, + 0xb2, 0x13, 0xd7, 0x58, 0xd8, 0x7e, 0x56, 0xee, 0x12, 0x35, 0x1b, 0x23, 0x42, 0x20, 0x31, 0x32, + 0x66, 0x66, 0x43, 0xe2, 0x47, 0x54, 0x4c, 0x1d, 0x19, 0x50, 0x40, 0xc9, 0x00, 0x62, 0xec, 0x2f, + 0x40, 0xbe, 0xb3, 0xd3, 0xaa, 0x49, 0x03, 0x95, 0xba, 0xf9, 0xbd, 0xef, 0x7d, 0x9f, 0xee, 0xfb, + 0xee, 0xf9, 0xd0, 0x46, 0x07, 0x68, 0x00, 0xd4, 0x70, 0x61, 0x60, 0x0c, 0x76, 0x6c, 0x87, 0x59, + 0x3b, 0x06, 0x3b, 0x24, 0x51, 0x0f, 0x18, 0x60, 0x2c, 0x40, 0xe2, 0xc2, 0x80, 0x24, 0xa0, 0xa2, + 0x26, 0x04, 0xdb, 0xa2, 0xce, 0x8c, 0xd1, 0x01, 0x2f, 0x14, 0x1c, 0x65, 0x73, 0x81, 0x60, 0xcc, + 0x17, 0x68, 0x45, 0xa0, 0x6d, 0x5e, 0x19, 0x89, 0xbc, 0x80, 0x4a, 0x2e, 0xb8, 0x20, 0xfa, 0xf1, + 0x57, 0x4a, 0x70, 0x01, 0x5c, 0xdf, 0x31, 0x78, 0x65, 0xf7, 0x0f, 0x0c, 0x2b, 0x1c, 0x0a, 0x48, + 0x7f, 0x9f, 0x41, 0xeb, 0x2d, 0xea, 0x3e, 0xeb, 0xdb, 0x81, 0xc7, 0x9e, 0xf4, 0x20, 0x02, 0x6a, + 0xf9, 0xf8, 0x2e, 0xca, 0x77, 0x20, 0x64, 0x4e, 0xc8, 0xca, 0x72, 0x55, 0xae, 0x15, 0x1a, 0x25, + 0x22, 0x24, 0x48, 0x2a, 0x41, 0xee, 0x87, 0xc3, 0x66, 0xe1, 0xeb, 0x97, 0x7a, 0x7e, 0x4f, 0x0c, + 0x9a, 0x29, 0x03, 0xbf, 0x93, 0xd1, 0x9a, 0x17, 0x7a, 0xcc, 0xb3, 0xfc, 0x76, 0xd7, 0x89, 0x80, + 0x7a, 0xac, 0x9c, 0xa9, 0x66, 0x6b, 0x85, 0x46, 0x85, 0x24, 0x87, 0x8d, 0x7d, 0xa7, 0x61, 0x90, + 0x3d, 0xf0, 0xc2, 0xe6, 0xfe, 0xd1, 0x58, 0x93, 0x4e, 0xc6, 0xda, 0xcd, 0xa1, 0x15, 0xf8, 0xbb, + 0xfa, 0x39, 0xbe, 0xfe, 0xe9, 0x87, 0xb6, 0xed, 0x7a, 0xec, 0x65, 0xdf, 0x26, 0x1d, 0x08, 0x0c, + 0xdf, 0x0b, 0x1d, 0xc3, 0xb7, 0x83, 0x3a, 0xed, 0xbe, 0x32, 0x06, 0x0d, 0x83, 0x0d, 0x23, 0x87, + 0x72, 0x21, 0x6a, 0x16, 0x13, 0xee, 0x03, 0x41, 0xc5, 0x0a, 0xba, 0x1e, 0x71, 0x5f, 0x4e, 0xaf, + 0x9c, 0xad, 0xca, 0xb5, 0x55, 0x73, 0x56, 0xef, 0xde, 0x78, 0x33, 0xd2, 0xa4, 0x8f, 0x23, 0x4d, + 0xfa, 0x3d, 0xd2, 0xa4, 0xd7, 0xdf, 0xab, 0x92, 0xde, 0x41, 0x95, 0xb9, 0x38, 0x4c, 0x87, 0x46, + 0x10, 0x52, 0x07, 0x3f, 0x44, 0x85, 0x28, 0xe9, 0xb5, 0xbd, 0x2e, 0x8f, 0x66, 0xa5, 0xb9, 0xf5, + 0x67, 0xac, 0x9d, 0x6d, 0x9f, 0x8c, 0x35, 0x2c, 0x4c, 0x9c, 0x69, 0xea, 0x26, 0x4a, 0xab, 0x47, + 0x5d, 0xfd, 0xb3, 0x8c, 0xf2, 0x2d, 0xea, 0x3e, 0x07, 0x76, 0x65, 0x9a, 0xb8, 0x84, 0xae, 0x0d, + 0x80, 0x39, 0xbd, 0x72, 0x86, 0x7b, 0x14, 0x05, 0xbe, 0x83, 0x72, 0x10, 0x31, 0x0f, 0x42, 0x6e, + 0xbd, 0xd8, 0x50, 0xc9, 0xfc, 0x36, 0x92, 0xf8, 0x1c, 0x8f, 0xf9, 0x94, 0x99, 0x4c, 0x2f, 0x08, + 0x66, 0x1d, 0xad, 0x25, 0x47, 0x4e, 0xe3, 0xd0, 0x7f, 0xc9, 0x08, 0xb5, 0xa8, 0x9b, 0x06, 0x7d, + 0x55, 0x4e, 0x36, 0xd1, 0x6a, 0x72, 0xed, 0x90, 0xba, 0x39, 0x6d, 0x60, 0x0b, 0xe5, 0xac, 0x00, + 0xfa, 0x21, 0x2b, 0x67, 0xff, 0xb5, 0x53, 0x24, 0xde, 0xa9, 0x4b, 0x6c, 0x4e, 0x22, 0xbc, 0xc0, + 0x7c, 0x09, 0xe1, 0x53, 0xa3, 0xa9, 0xff, 0xc6, 0xdb, 0x0c, 0xca, 0xb6, 0xa8, 0x8b, 0x0f, 0x50, + 0xf1, 0xdc, 0xff, 0xb3, 0xb5, 0x28, 0xe6, 0xb9, 0xbd, 0x52, 0xea, 0xff, 0x35, 0x36, 0x5b, 0xbf, + 0x7d, 0xb4, 0xc2, 0x57, 0x66, 0xe3, 0x02, 0x5a, 0x0c, 0x2a, 0xb7, 0x96, 0x80, 0x33, 0xa5, 0xa7, + 0x28, 0x9f, 0xde, 0x9a, 0x7a, 0xc1, 0x7c, 0x82, 0x2b, 0xdb, 0xcb, 0xf1, 0x54, 0xb2, 0x79, 0xef, + 0x68, 0xa2, 0xca, 0xc7, 0x13, 0x55, 0xfe, 0x39, 0x51, 0xe5, 0x0f, 0x53, 0x55, 0x3a, 0x9e, 0xaa, + 0xd2, 0xb7, 0xa9, 0x2a, 0xbd, 0x58, 0x16, 0xff, 0x21, 0x7f, 0xe2, 0xf8, 0x25, 0xd8, 0x39, 0xfe, + 0xb6, 0xdc, 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x4a, 0xee, 0xd5, 0x42, 0x4e, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/applications/transfer/keeper/keeper.go b/x/ibc/applications/transfer/keeper/keeper.go index 23927db0a4..7c0dcbbec5 100644 --- a/x/ibc/applications/transfer/keeper/keeper.go +++ b/x/ibc/applications/transfer/keeper/keeper.go @@ -1,8 +1,8 @@ package keeper import ( - tmbytes "github.com/tendermint/tendermint/libs/bytes" - "github.com/tendermint/tendermint/libs/log" + ostbytes "github.com/line/ostracon/libs/bytes" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/store/prefix" @@ -106,7 +106,7 @@ func (k Keeper) SetPort(ctx sdk.Context, portID string) { } // GetDenomTrace retreives the full identifiers trace and base denomination from the store. -func (k Keeper) GetDenomTrace(ctx sdk.Context, denomTraceHash tmbytes.HexBytes) (types.DenomTrace, bool) { +func (k Keeper) GetDenomTrace(ctx sdk.Context, denomTraceHash ostbytes.HexBytes) (types.DenomTrace, bool) { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.DenomTraceKey) bz := store.Get(denomTraceHash) if bz == nil { @@ -118,7 +118,7 @@ func (k Keeper) GetDenomTrace(ctx sdk.Context, denomTraceHash tmbytes.HexBytes) } // HasDenomTrace checks if a the key with the given denomination trace hash exists on the store. -func (k Keeper) HasDenomTrace(ctx sdk.Context, denomTraceHash tmbytes.HexBytes) bool { +func (k Keeper) HasDenomTrace(ctx sdk.Context, denomTraceHash ostbytes.HexBytes) bool { store := prefix.NewStore(ctx.KVStore(k.storeKey), types.DenomTraceKey) return store.Has(denomTraceHash) } diff --git a/x/ibc/applications/transfer/keeper/keeper_test.go b/x/ibc/applications/transfer/keeper/keeper_test.go index d4c54c27bb..34090c49cd 100644 --- a/x/ibc/applications/transfer/keeper/keeper_test.go +++ b/x/ibc/applications/transfer/keeper/keeper_test.go @@ -3,8 +3,8 @@ package keeper_test import ( "testing" + "github.com/line/ostracon/crypto" "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/crypto" "github.com/line/lbm-sdk/v2/baseapp" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/ibc/applications/transfer/keeper/mbt_relay_test.go b/x/ibc/applications/transfer/keeper/mbt_relay_test.go index 7caf2f32d8..04357962c8 100644 --- a/x/ibc/applications/transfer/keeper/mbt_relay_test.go +++ b/x/ibc/applications/transfer/keeper/mbt_relay_test.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" sdk "github.com/line/lbm-sdk/v2/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" diff --git a/x/ibc/applications/transfer/module.go b/x/ibc/applications/transfer/module.go index 866eee9a12..dc53f5129d 100644 --- a/x/ibc/applications/transfer/module.go +++ b/x/ibc/applications/transfer/module.go @@ -12,7 +12,7 @@ import ( "github.com/gorilla/mux" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/ibc/applications/transfer/types/genesis.pb.go b/x/ibc/applications/transfer/types/genesis.pb.go index 3ae0442f82..a48ec7d8b1 100644 --- a/x/ibc/applications/transfer/types/genesis.pb.go +++ b/x/ibc/applications/transfer/types/genesis.pb.go @@ -93,7 +93,7 @@ func init() { } var fileDescriptor_a4f788affd5bea89 = []byte{ - // 317 bytes of a gzipped FileDescriptorProto + // 320 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xca, 0x4c, 0x4a, 0xd6, 0x4f, 0x2c, 0x28, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0xc9, 0xcc, 0xcf, 0x2b, 0xd6, 0x2f, 0x29, 0x4a, 0xcc, 0x2b, 0x4e, 0x4b, 0x2d, 0xd2, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, @@ -108,12 +108,12 @@ var fileDescriptor_a4f788affd5bea89 = []byte{ 0xa9, 0x9e, 0xb8, 0x27, 0xcf, 0xf0, 0xe9, 0x9e, 0xbc, 0x30, 0xc4, 0x7c, 0x64, 0xb3, 0x94, 0x56, 0xdd, 0x97, 0x67, 0x03, 0xab, 0x2a, 0x0e, 0xe2, 0x4e, 0x81, 0x6b, 0x29, 0x16, 0x72, 0xe2, 0x62, 0x2b, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0x96, 0x60, 0x56, 0x60, 0xd4, 0xe0, 0x36, 0x52, 0xc1, 0x6f, - 0x5b, 0x00, 0x58, 0xad, 0x13, 0x0b, 0xc8, 0xa6, 0x20, 0xa8, 0x4e, 0xa7, 0x88, 0x13, 0x8f, 0xe4, + 0x5b, 0x00, 0x58, 0xad, 0x13, 0x0b, 0xc8, 0xa6, 0x20, 0xa8, 0x4e, 0xa7, 0xb0, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, - 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x4b, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, - 0xce, 0xcf, 0xd5, 0x4f, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0x86, 0x52, 0xba, 0xc5, 0x29, 0xd9, 0xfa, - 0x15, 0xfa, 0xb8, 0xc3, 0xb6, 0xa4, 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0x1c, 0xac, 0xc6, 0x80, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xda, 0xbb, 0x81, 0x1e, 0xe5, 0x01, 0x00, 0x00, + 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0xb2, 0x49, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, + 0xce, 0xcf, 0xd5, 0xcf, 0xc9, 0xcc, 0x4b, 0xd5, 0xcf, 0x49, 0xca, 0xd5, 0x2d, 0x4e, 0xc9, 0xd6, + 0x2f, 0x33, 0xd2, 0xaf, 0xd0, 0xc7, 0x1d, 0xb2, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, + 0x40, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x99, 0x13, 0xdc, 0x27, 0xe3, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/applications/transfer/types/query.pb.go b/x/ibc/applications/transfer/types/query.pb.go index 1b979fd9fb..5f7e4174b8 100644 --- a/x/ibc/applications/transfer/types/query.pb.go +++ b/x/ibc/applications/transfer/types/query.pb.go @@ -324,40 +324,41 @@ func init() { } var fileDescriptor_a638e2800a01538c = []byte{ - // 528 bytes of a gzipped FileDescriptorProto + // 532 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0x3f, 0x6f, 0xd3, 0x40, 0x14, 0xcf, 0x95, 0x12, 0x89, 0x17, 0xc4, 0x70, 0x54, 0x10, 0x59, 0x95, 0x5b, 0x59, 0x08, 0x02, - 0x85, 0x3b, 0x5c, 0xa0, 0x30, 0xa0, 0x0e, 0x15, 0x02, 0xb1, 0x95, 0xc0, 0x80, 0x60, 0x40, 0x67, - 0xe7, 0x70, 0x2c, 0x1a, 0x9f, 0xeb, 0xbb, 0x44, 0x54, 0x88, 0x85, 0x4f, 0x80, 0xc4, 0x8e, 0x98, - 0xd9, 0x19, 0xd8, 0x18, 0x3b, 0x56, 0x62, 0x61, 0x02, 0x94, 0xf0, 0x41, 0x90, 0xef, 0xce, 0x8d, - 0xa3, 0x20, 0x13, 0x4f, 0x39, 0x5d, 0xde, 0xef, 0xfd, 0xfe, 0xbc, 0xe7, 0x83, 0x4e, 0x1c, 0x84, - 0x94, 0xa5, 0xe9, 0x5e, 0x1c, 0x32, 0x15, 0x8b, 0x44, 0x52, 0x95, 0xb1, 0x44, 0xbe, 0xe4, 0x19, - 0x1d, 0xf9, 0x74, 0x7f, 0xc8, 0xb3, 0x03, 0x92, 0x66, 0x42, 0x09, 0xbc, 0x1a, 0x07, 0x21, 0x29, - 0x57, 0x92, 0xa2, 0x92, 0x8c, 0x7c, 0x67, 0x25, 0x12, 0x91, 0xd0, 0x85, 0x34, 0x3f, 0x19, 0x8c, - 0x73, 0x25, 0x14, 0x72, 0x20, 0x24, 0x0d, 0x98, 0xe4, 0xa6, 0x19, 0x1d, 0xf9, 0x01, 0x57, 0xcc, - 0xa7, 0x29, 0x8b, 0xe2, 0x44, 0x37, 0xb2, 0xb5, 0x1b, 0x95, 0x4a, 0x8e, 0xb9, 0x4c, 0xf1, 0x6a, - 0x24, 0x44, 0xb4, 0xc7, 0x29, 0x4b, 0x63, 0xca, 0x92, 0x44, 0x28, 0x2b, 0x49, 0xff, 0xeb, 0x5d, - 0x85, 0x73, 0x8f, 0x72, 0xb2, 0x7b, 0x3c, 0x11, 0x83, 0x27, 0x19, 0x0b, 0x79, 0x97, 0xef, 0x0f, - 0xb9, 0x54, 0x18, 0xc3, 0x72, 0x9f, 0xc9, 0x7e, 0x1b, 0xad, 0xa3, 0xce, 0xa9, 0xae, 0x3e, 0x7b, - 0x3d, 0x38, 0x3f, 0x57, 0x2d, 0x53, 0x91, 0x48, 0x8e, 0x1f, 0x42, 0xab, 0x97, 0xdf, 0xbe, 0x50, - 0xf9, 0xb5, 0x46, 0xb5, 0x36, 0x3b, 0xa4, 0x2a, 0x09, 0x52, 0x6a, 0x03, 0xbd, 0xe3, 0xb3, 0xc7, - 0xe6, 0x58, 0x64, 0x21, 0xea, 0x3e, 0xc0, 0x34, 0x0d, 0x4b, 0x72, 0x91, 0x98, 0xe8, 0x48, 0x1e, - 0x1d, 0x31, 0x73, 0xb0, 0xd1, 0x91, 0x5d, 0x16, 0x15, 0x86, 0xba, 0x25, 0xa4, 0xf7, 0x0d, 0x41, - 0x7b, 0x9e, 0xc3, 0x5a, 0x79, 0x0e, 0xa7, 0x4b, 0x56, 0x64, 0x1b, 0xad, 0x9f, 0xa8, 0xe3, 0x65, - 0xe7, 0xcc, 0xe1, 0xcf, 0xb5, 0xc6, 0xe7, 0x5f, 0x6b, 0x4d, 0xdb, 0xb7, 0x35, 0xf5, 0x26, 0xf1, - 0x83, 0x19, 0x07, 0x4b, 0xda, 0xc1, 0xa5, 0xff, 0x3a, 0x30, 0xca, 0x66, 0x2c, 0xac, 0x00, 0xd6, - 0x0e, 0x76, 0x59, 0xc6, 0x06, 0x45, 0x40, 0xde, 0x63, 0x38, 0x3b, 0x73, 0x6b, 0x2d, 0xdd, 0x85, - 0x66, 0xaa, 0x6f, 0x6c, 0x66, 0x17, 0xaa, 0xcd, 0x58, 0xb4, 0xc5, 0x6c, 0x7e, 0x5c, 0x86, 0x93, - 0xba, 0x2b, 0xfe, 0x8a, 0x00, 0xa6, 0x4e, 0xf1, 0xcd, 0xea, 0x36, 0xff, 0xde, 0x2c, 0xe7, 0x56, - 0x4d, 0x94, 0xf1, 0xe0, 0x6d, 0xbf, 0xfb, 0xfe, 0xe7, 0xc3, 0xd2, 0x1d, 0xbc, 0x45, 0xab, 0xd6, - 0xdf, 0x7c, 0x32, 0xe5, 0xf9, 0xd1, 0x37, 0xf9, 0xee, 0xbe, 0xc5, 0x5f, 0x10, 0xb4, 0x4a, 0xe3, - 0xc6, 0xf5, 0x64, 0x14, 0x09, 0x3b, 0x5b, 0x75, 0x61, 0x56, 0xfe, 0x6d, 0x2d, 0xdf, 0xc7, 0xb4, - 0xa6, 0x7c, 0xfc, 0x09, 0x41, 0xd3, 0x0c, 0x04, 0x5f, 0x5f, 0x80, 0x7b, 0x66, 0x1f, 0x1c, 0xbf, - 0x06, 0xc2, 0x0a, 0xf5, 0xb5, 0xd0, 0x0d, 0x7c, 0x79, 0x01, 0xa1, 0x66, 0x41, 0x76, 0x9e, 0x1e, - 0x8e, 0x5d, 0x74, 0x34, 0x76, 0xd1, 0xef, 0xb1, 0x8b, 0xde, 0x4f, 0xdc, 0xc6, 0xd1, 0xc4, 0x6d, - 0xfc, 0x98, 0xb8, 0x8d, 0x67, 0xdb, 0x51, 0xac, 0xfa, 0xc3, 0x80, 0x84, 0x62, 0x40, 0xed, 0x0b, - 0x67, 0x7e, 0xae, 0xc9, 0xde, 0x2b, 0xfa, 0xba, 0x82, 0x42, 0x1d, 0xa4, 0x5c, 0x06, 0x4d, 0xfd, - 0x4c, 0xdd, 0xf8, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xb2, 0x7f, 0xfe, 0xbd, 0x7d, 0x05, 0x00, 0x00, + 0x85, 0x3b, 0x1c, 0xa0, 0x30, 0x54, 0x0c, 0x15, 0x02, 0xb1, 0x95, 0x80, 0x18, 0x60, 0x40, 0x67, + 0xe7, 0x70, 0x2c, 0x62, 0x9f, 0xeb, 0x73, 0x22, 0x2a, 0xc4, 0xc2, 0x27, 0x40, 0x62, 0x47, 0xcc, + 0xec, 0x0c, 0x6c, 0x8c, 0x1d, 0x2b, 0xb1, 0x30, 0x01, 0x4a, 0xf8, 0x20, 0xc8, 0x77, 0xe7, 0xc6, + 0x51, 0x90, 0x89, 0xb7, 0xd3, 0xcb, 0xfb, 0xbd, 0xdf, 0x9f, 0xf7, 0x62, 0xe8, 0x84, 0x9e, 0x4f, + 0x59, 0x92, 0x0c, 0x43, 0x9f, 0x65, 0xa1, 0x88, 0x25, 0xcd, 0x52, 0x16, 0xcb, 0x97, 0x3c, 0xa5, + 0x63, 0x97, 0xee, 0x8f, 0x78, 0x7a, 0x40, 0x92, 0x54, 0x64, 0x02, 0xaf, 0x87, 0x9e, 0x4f, 0xca, + 0x9d, 0xa4, 0xe8, 0x24, 0x63, 0xd7, 0x5a, 0x0b, 0x44, 0x20, 0x54, 0x23, 0xcd, 0x5f, 0x1a, 0x63, + 0x5d, 0xf1, 0x85, 0x8c, 0x84, 0xa4, 0x1e, 0x93, 0x5c, 0x0f, 0xa3, 0x63, 0xd7, 0xe3, 0x19, 0x73, + 0x69, 0xc2, 0x82, 0x30, 0x56, 0x83, 0x4c, 0xef, 0x56, 0xa5, 0x92, 0x63, 0x2e, 0xdd, 0xbc, 0x1e, + 0x08, 0x11, 0x0c, 0x39, 0x65, 0x49, 0x48, 0x59, 0x1c, 0x8b, 0xcc, 0x48, 0x52, 0xbf, 0x3a, 0x57, + 0xe1, 0xdc, 0xa3, 0x9c, 0xec, 0x1e, 0x8f, 0x45, 0xf4, 0x24, 0x65, 0x3e, 0xef, 0xf1, 0xfd, 0x11, + 0x97, 0x19, 0xc6, 0xb0, 0x3a, 0x60, 0x72, 0xd0, 0x46, 0x9b, 0xa8, 0x73, 0xaa, 0xa7, 0xde, 0x4e, + 0x1f, 0xce, 0x2f, 0x74, 0xcb, 0x44, 0xc4, 0x92, 0xe3, 0x87, 0xd0, 0xea, 0xe7, 0xd5, 0x17, 0x59, + 0x5e, 0x56, 0xa8, 0x56, 0xb7, 0x43, 0xaa, 0x92, 0x20, 0xa5, 0x31, 0xd0, 0x3f, 0x7e, 0x3b, 0x6c, + 0x81, 0x45, 0x16, 0xa2, 0xee, 0x03, 0xcc, 0xd2, 0x30, 0x24, 0x17, 0x89, 0x8e, 0x8e, 0xe4, 0xd1, + 0x11, 0xbd, 0x07, 0x13, 0x1d, 0xd9, 0x63, 0x41, 0x61, 0xa8, 0x57, 0x42, 0x3a, 0xdf, 0x10, 0xb4, + 0x17, 0x39, 0x8c, 0x95, 0xe7, 0x70, 0xba, 0x64, 0x45, 0xb6, 0xd1, 0xe6, 0x89, 0x3a, 0x5e, 0x76, + 0xcf, 0x1c, 0xfe, 0xdc, 0x68, 0x7c, 0xfe, 0xb5, 0xd1, 0x34, 0x73, 0x5b, 0x33, 0x6f, 0x12, 0x3f, + 0x98, 0x73, 0xb0, 0xa2, 0x1c, 0x5c, 0xfa, 0xaf, 0x03, 0xad, 0x6c, 0xce, 0xc2, 0x1a, 0x60, 0xe5, + 0x60, 0x8f, 0xa5, 0x2c, 0x2a, 0x02, 0x72, 0x1e, 0xc3, 0xd9, 0xb9, 0xaa, 0xb1, 0xb4, 0x03, 0xcd, + 0x44, 0x55, 0x4c, 0x66, 0x17, 0xaa, 0xcd, 0x18, 0xb4, 0xc1, 0x74, 0x3f, 0xae, 0xc2, 0x49, 0x35, + 0x15, 0x7f, 0x45, 0x00, 0x33, 0xa7, 0xf8, 0x66, 0xf5, 0x98, 0x7f, 0x5f, 0x96, 0x75, 0xab, 0x26, + 0x4a, 0x7b, 0x70, 0xee, 0xbe, 0xfb, 0xfe, 0xe7, 0xc3, 0xca, 0x1d, 0xbc, 0x4d, 0xab, 0xce, 0x5f, + 0xff, 0x65, 0xca, 0xfb, 0xa3, 0x6f, 0xf2, 0xdb, 0x7d, 0x8b, 0xbf, 0x20, 0x68, 0x95, 0xd6, 0x8d, + 0xeb, 0xc9, 0x28, 0x12, 0xb6, 0xb6, 0xeb, 0xc2, 0x8c, 0xfc, 0xdb, 0x4a, 0xbe, 0x8b, 0x69, 0x4d, + 0xf9, 0xf8, 0x13, 0x82, 0xa6, 0x5e, 0x08, 0xbe, 0xbe, 0x04, 0xf7, 0xdc, 0x3d, 0x58, 0x6e, 0x0d, + 0x84, 0x11, 0xea, 0x2a, 0xa1, 0x5b, 0xf8, 0xf2, 0x12, 0x42, 0xf5, 0x81, 0xec, 0x3e, 0x3d, 0x9c, + 0xd8, 0xe8, 0x68, 0x62, 0xa3, 0xdf, 0x13, 0x1b, 0xbd, 0x9f, 0xda, 0x8d, 0xa3, 0xa9, 0xdd, 0xf8, + 0x31, 0xb5, 0x1b, 0xcf, 0x76, 0x82, 0x30, 0x1b, 0x8c, 0x3c, 0xe2, 0x8b, 0x88, 0x0e, 0xc3, 0x98, + 0xd3, 0xa1, 0x17, 0x5d, 0x93, 0xfd, 0x57, 0x74, 0xdc, 0xa5, 0xaf, 0x2b, 0x08, 0xb2, 0x83, 0x84, + 0x4b, 0xaf, 0xa9, 0x3e, 0x52, 0x37, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x64, 0xd0, 0x4e, 0xef, + 0x7b, 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/applications/transfer/types/trace.go b/x/ibc/applications/transfer/types/trace.go index d42e4533ee..5459cb282e 100644 --- a/x/ibc/applications/transfer/types/trace.go +++ b/x/ibc/applications/transfer/types/trace.go @@ -7,8 +7,8 @@ import ( "sort" "strings" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - tmtypes "github.com/tendermint/tendermint/types" + ostbytes "github.com/line/ostracon/libs/bytes" + osttypes "github.com/line/ostracon/types" sdk "github.com/line/lbm-sdk/v2/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" @@ -41,7 +41,7 @@ func ParseDenomTrace(rawDenom string) DenomTrace { // Hash returns the hex bytes of the SHA256 hash of the DenomTrace fields using the following formula: // // hash = sha256(tracePath + "/" + baseDenom) -func (dt DenomTrace) Hash() tmbytes.HexBytes { +func (dt DenomTrace) Hash() ostbytes.HexBytes { hash := sha256.Sum256([]byte(dt.GetFullDenomPath())) return hash[:] } @@ -189,13 +189,13 @@ func ValidateIBCDenom(denom string) error { } // ParseHexHash parses a hex hash in string format to bytes and validates its correctness. -func ParseHexHash(hexHash string) (tmbytes.HexBytes, error) { +func ParseHexHash(hexHash string) (ostbytes.HexBytes, error) { hash, err := hex.DecodeString(hexHash) if err != nil { return nil, err } - if err := tmtypes.ValidateHash(hash); err != nil { + if err := osttypes.ValidateHash(hash); err != nil { return nil, err } diff --git a/x/ibc/applications/transfer/types/transfer.pb.go b/x/ibc/applications/transfer/types/transfer.pb.go index 62734b85a4..235190d1bd 100644 --- a/x/ibc/applications/transfer/types/transfer.pb.go +++ b/x/ibc/applications/transfer/types/transfer.pb.go @@ -226,30 +226,30 @@ func init() { } var fileDescriptor_5041673e96e97901 = []byte{ - // 362 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x41, 0x6b, 0xe2, 0x40, - 0x14, 0xc7, 0x8d, 0xeb, 0x8a, 0xce, 0x2e, 0xbb, 0x30, 0x2b, 0x1a, 0x64, 0x1b, 0x25, 0x27, 0xa1, - 0x34, 0x41, 0x7a, 0xf3, 0xd0, 0x82, 0xb5, 0x3d, 0x4b, 0xf0, 0x50, 0x7a, 0x91, 0xc9, 0xe4, 0x35, - 0x06, 0x93, 0x99, 0x30, 0x33, 0x4a, 0xa5, 0x9f, 0xa0, 0xb7, 0x7e, 0xac, 0x1e, 0x3d, 0xf6, 0x24, - 0x45, 0xbf, 0x81, 0x9f, 0xa0, 0x64, 0x12, 0x82, 0x14, 0x7a, 0x9a, 0xf7, 0x7b, 0xef, 0xff, 0xff, - 0xcf, 0x83, 0x87, 0xce, 0x23, 0x9f, 0xba, 0x24, 0x4d, 0xe3, 0x88, 0x12, 0x15, 0x71, 0x26, 0x5d, - 0x25, 0x08, 0x93, 0x8f, 0x20, 0xdc, 0xf5, 0xb0, 0xac, 0x9d, 0x54, 0x70, 0xc5, 0xf1, 0xff, 0xc8, - 0xa7, 0xce, 0xa9, 0xd8, 0x29, 0x05, 0xeb, 0x61, 0xb7, 0x15, 0xf2, 0x90, 0x6b, 0xa1, 0x9b, 0x55, - 0xb9, 0xc7, 0x7e, 0x46, 0x9d, 0xbb, 0x15, 0x0b, 0x23, 0x3f, 0x86, 0x19, 0x5f, 0x02, 0x9b, 0x12, - 0xba, 0x04, 0x35, 0x21, 0x8a, 0xe0, 0x16, 0xfa, 0x19, 0x00, 0xe3, 0x89, 0x69, 0xf4, 0x8d, 0x41, - 0xd3, 0xcb, 0x01, 0xb7, 0x51, 0x9d, 0x24, 0x7c, 0xc5, 0x94, 0x59, 0xed, 0x1b, 0x83, 0x9a, 0x57, - 0x50, 0xd6, 0x97, 0xc0, 0x02, 0x10, 0xe6, 0x0f, 0x2d, 0x2f, 0x08, 0x77, 0x51, 0x43, 0x00, 0x85, - 0x68, 0x0d, 0xc2, 0xac, 0xe9, 0x49, 0xc9, 0xf6, 0x35, 0x42, 0x93, 0x2c, 0x74, 0x26, 0x08, 0x05, - 0x8c, 0x51, 0x2d, 0x25, 0x6a, 0x51, 0x7c, 0xa7, 0x6b, 0x7c, 0x86, 0x90, 0x4f, 0x24, 0xcc, 0xf3, - 0x45, 0xaa, 0x7a, 0xd2, 0xcc, 0x3a, 0xda, 0x67, 0xbf, 0x18, 0xa8, 0x3e, 0x25, 0x82, 0x24, 0x12, - 0x8f, 0xd0, 0xef, 0xec, 0xc7, 0x39, 0x30, 0xe2, 0xc7, 0x10, 0xe8, 0x94, 0xc6, 0xb8, 0x73, 0xdc, - 0xf5, 0xfe, 0x6d, 0x48, 0x12, 0x8f, 0xec, 0xd3, 0xa9, 0xed, 0xfd, 0xca, 0xf0, 0x36, 0x27, 0x7c, - 0x83, 0xfe, 0x16, 0x3b, 0x95, 0xf6, 0xaa, 0xb6, 0x77, 0x8f, 0xbb, 0x5e, 0x3b, 0xb7, 0x7f, 0x11, - 0xd8, 0xde, 0x9f, 0xa2, 0x53, 0x84, 0x8c, 0xef, 0xdf, 0xf6, 0x96, 0xb1, 0xdd, 0x5b, 0xc6, 0xc7, - 0xde, 0x32, 0x5e, 0x0f, 0x56, 0x65, 0x7b, 0xb0, 0x2a, 0xef, 0x07, 0xab, 0xf2, 0x70, 0x15, 0x46, - 0x6a, 0xb1, 0xf2, 0x1d, 0xca, 0x13, 0x97, 0x72, 0x99, 0x70, 0x59, 0x3c, 0x17, 0x32, 0x58, 0xba, - 0x4f, 0xee, 0xf7, 0x37, 0x56, 0x9b, 0x14, 0xa4, 0x5f, 0xd7, 0xa7, 0xba, 0xfc, 0x0c, 0x00, 0x00, - 0xff, 0xff, 0x46, 0x73, 0x85, 0x0b, 0x0d, 0x02, 0x00, 0x00, + // 365 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x41, 0x8b, 0xda, 0x40, + 0x14, 0xc7, 0x8d, 0xb5, 0xa2, 0xd3, 0xd2, 0xc2, 0x54, 0x34, 0x48, 0x1b, 0x25, 0x27, 0xa1, 0x34, + 0x83, 0xed, 0x4d, 0x0a, 0x05, 0x6b, 0x7b, 0x96, 0x20, 0x3d, 0xf4, 0x22, 0x33, 0xc9, 0x6b, 0x1c, + 0x4c, 0x66, 0xc2, 0x64, 0x0c, 0x95, 0xfd, 0x04, 0x7b, 0xdb, 0x8f, 0xb5, 0x47, 0x8f, 0x7b, 0x92, + 0x45, 0xbf, 0x81, 0x9f, 0x60, 0xc9, 0x24, 0x04, 0x59, 0xd8, 0xdb, 0xfb, 0xbd, 0xf7, 0xff, 0xff, + 0xdf, 0x83, 0x87, 0x3e, 0x73, 0x16, 0x10, 0x9a, 0xa6, 0x31, 0x0f, 0xa8, 0xe6, 0x52, 0x64, 0x44, + 0x2b, 0x2a, 0xb2, 0x7f, 0xa0, 0x48, 0x3e, 0xad, 0x6b, 0x2f, 0x55, 0x52, 0x4b, 0xfc, 0x91, 0xb3, + 0xc0, 0xbb, 0x16, 0x7b, 0xb5, 0x20, 0x9f, 0x0e, 0x7b, 0x91, 0x8c, 0xa4, 0x11, 0x92, 0xa2, 0x2a, + 0x3d, 0xee, 0x0d, 0x1a, 0xfc, 0xde, 0x89, 0x88, 0xb3, 0x18, 0x56, 0x72, 0x0b, 0x62, 0x49, 0x83, + 0x2d, 0xe8, 0x05, 0xd5, 0x14, 0xf7, 0xd0, 0xeb, 0x10, 0x84, 0x4c, 0x6c, 0x6b, 0x6c, 0x4d, 0xba, + 0x7e, 0x09, 0xb8, 0x8f, 0xda, 0x34, 0x91, 0x3b, 0xa1, 0xed, 0xe6, 0xd8, 0x9a, 0xb4, 0xfc, 0x8a, + 0x8a, 0x7e, 0x06, 0x22, 0x04, 0x65, 0xbf, 0x32, 0xf2, 0x8a, 0xf0, 0x10, 0x75, 0x14, 0x04, 0xc0, + 0x73, 0x50, 0x76, 0xcb, 0x4c, 0x6a, 0x76, 0x7f, 0x20, 0xb4, 0x28, 0x42, 0x57, 0x8a, 0x06, 0x80, + 0x31, 0x6a, 0xa5, 0x54, 0x6f, 0xaa, 0x75, 0xa6, 0xc6, 0x9f, 0x10, 0x62, 0x34, 0x83, 0x75, 0x79, + 0x48, 0xd3, 0x4c, 0xba, 0x45, 0xc7, 0xf8, 0xdc, 0x5b, 0x0b, 0xb5, 0x97, 0x54, 0xd1, 0x24, 0xc3, + 0x33, 0xf4, 0xb6, 0xd8, 0xb8, 0x06, 0x41, 0x59, 0x0c, 0xa1, 0x49, 0xe9, 0xcc, 0x07, 0x97, 0xe3, + 0xe8, 0xc3, 0x9e, 0x26, 0xf1, 0xcc, 0xbd, 0x9e, 0xba, 0xfe, 0x9b, 0x02, 0x7f, 0x95, 0x84, 0x7f, + 0xa2, 0xf7, 0xd5, 0x4d, 0xb5, 0xbd, 0x69, 0xec, 0xc3, 0xcb, 0x71, 0xd4, 0x2f, 0xed, 0xcf, 0x04, + 0xae, 0xff, 0xae, 0xea, 0x54, 0x21, 0xf3, 0x3f, 0xf7, 0x27, 0xc7, 0x3a, 0x9c, 0x1c, 0xeb, 0xf1, + 0xe4, 0x58, 0x77, 0x67, 0xa7, 0x71, 0x38, 0x3b, 0x8d, 0x87, 0xb3, 0xd3, 0xf8, 0xfb, 0x3d, 0xe2, + 0x7a, 0xb3, 0x63, 0x5e, 0x20, 0x13, 0x12, 0x73, 0x01, 0x24, 0x66, 0xc9, 0x97, 0x2c, 0xdc, 0x92, + 0xfc, 0x2b, 0xf9, 0x4f, 0x5e, 0xfe, 0xb0, 0xde, 0xa7, 0x90, 0xb1, 0xb6, 0x79, 0xd4, 0xb7, 0xa7, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x74, 0x8b, 0x97, 0x79, 0x0b, 0x02, 0x00, 0x00, } func (m *FungibleTokenPacketData) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/applications/transfer/types/tx.pb.go b/x/ibc/applications/transfer/types/tx.pb.go index af0be5f0c5..0788d5546a 100644 --- a/x/ibc/applications/transfer/types/tx.pb.go +++ b/x/ibc/applications/transfer/types/tx.pb.go @@ -132,38 +132,38 @@ func init() { } var fileDescriptor_7401ed9bed2f8e09 = []byte{ - // 488 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x41, 0x6f, 0xd3, 0x30, - 0x14, 0xc7, 0x13, 0xd6, 0x95, 0xe2, 0x6a, 0x13, 0x18, 0x36, 0x65, 0xd5, 0x48, 0xaa, 0x48, 0x48, - 0xe5, 0x80, 0xad, 0x0c, 0x21, 0xa4, 0x1d, 0x10, 0xca, 0x2e, 0x70, 0x98, 0x84, 0xa2, 0x1d, 0x10, - 0x97, 0x91, 0x78, 0x26, 0xb1, 0xd6, 0xd8, 0x91, 0xed, 0x46, 0xdb, 0x37, 0xe0, 0xc8, 0x47, 0xd8, - 0x99, 0x4f, 0xb2, 0xe3, 0x8e, 0x9c, 0x2a, 0xd4, 0x5e, 0x38, 0xf7, 0x13, 0xa0, 0xc4, 0x6e, 0x69, - 0x0f, 0x20, 0x4e, 0xf1, 0x7b, 0xff, 0xdf, 0xf3, 0x5f, 0xcf, 0xef, 0x05, 0x3c, 0x63, 0x19, 0xc1, - 0x69, 0x55, 0x8d, 0x19, 0x49, 0x35, 0x13, 0x5c, 0x61, 0x2d, 0x53, 0xae, 0xbe, 0x50, 0x89, 0xeb, - 0x08, 0xeb, 0x2b, 0x54, 0x49, 0xa1, 0x05, 0x3c, 0x64, 0x19, 0x41, 0xeb, 0x18, 0x5a, 0x62, 0xa8, - 0x8e, 0x06, 0x4f, 0x72, 0x91, 0x8b, 0x16, 0xc4, 0xcd, 0xc9, 0xd4, 0x0c, 0x7c, 0x22, 0x54, 0x29, - 0x14, 0xce, 0x52, 0x45, 0x71, 0x1d, 0x65, 0x54, 0xa7, 0x11, 0x26, 0x82, 0x71, 0xab, 0x07, 0x8d, - 0x35, 0x11, 0x92, 0x62, 0x32, 0x66, 0x94, 0xeb, 0xc6, 0xd0, 0x9c, 0x0c, 0x10, 0x7e, 0xdf, 0x02, - 0xfd, 0x53, 0x95, 0x9f, 0x59, 0x27, 0xf8, 0x1a, 0xf4, 0x95, 0x98, 0x48, 0x42, 0xcf, 0x2b, 0x21, - 0xb5, 0xe7, 0x0e, 0xdd, 0xd1, 0x83, 0x78, 0x7f, 0x31, 0x0d, 0xe0, 0x75, 0x5a, 0x8e, 0x8f, 0xc3, - 0x35, 0x31, 0x4c, 0x80, 0x89, 0x3e, 0x08, 0xa9, 0xe1, 0x5b, 0xb0, 0x6b, 0x35, 0x52, 0xa4, 0x9c, - 0xd3, 0xb1, 0x77, 0xaf, 0xad, 0x3d, 0x58, 0x4c, 0x83, 0xbd, 0x8d, 0x5a, 0xab, 0x87, 0xc9, 0x8e, - 0x49, 0x9c, 0x98, 0x18, 0xbe, 0x02, 0xdb, 0x5a, 0x5c, 0x52, 0xee, 0x6d, 0x0d, 0xdd, 0x51, 0xff, - 0xe8, 0x00, 0x99, 0xde, 0x50, 0xd3, 0x1b, 0xb2, 0xbd, 0xa1, 0x13, 0xc1, 0x78, 0xdc, 0xb9, 0x9d, - 0x06, 0x4e, 0x62, 0x68, 0xb8, 0x0f, 0xba, 0x8a, 0xf2, 0x0b, 0x2a, 0xbd, 0x4e, 0x63, 0x98, 0xd8, - 0x08, 0x0e, 0x40, 0x4f, 0x52, 0x42, 0x59, 0x4d, 0xa5, 0xb7, 0xdd, 0x2a, 0xab, 0x18, 0x7e, 0x06, - 0xbb, 0x9a, 0x95, 0x54, 0x4c, 0xf4, 0x79, 0x41, 0x59, 0x5e, 0x68, 0xaf, 0xdb, 0x7a, 0x0e, 0x50, - 0x33, 0x83, 0xe6, 0xbd, 0x90, 0x7d, 0xa5, 0x3a, 0x42, 0xef, 0x5a, 0x22, 0x7e, 0xda, 0x98, 0xfe, - 0x69, 0x66, 0xb3, 0x3e, 0x4c, 0x76, 0x6c, 0xc2, 0xd0, 0xf0, 0x3d, 0x78, 0xb4, 0x24, 0x9a, 0xaf, - 0xd2, 0x69, 0x59, 0x79, 0xf7, 0x87, 0xee, 0xa8, 0x13, 0x1f, 0x2e, 0xa6, 0x81, 0xb7, 0x79, 0xc9, - 0x0a, 0x09, 0x93, 0x87, 0x36, 0x77, 0xb6, 0x4c, 0x1d, 0xf7, 0xbe, 0xde, 0x04, 0xce, 0xaf, 0x9b, - 0xc0, 0x09, 0xf7, 0xc0, 0xe3, 0xb5, 0x59, 0x25, 0x54, 0x55, 0x82, 0x2b, 0x7a, 0x24, 0xc0, 0xd6, - 0xa9, 0xca, 0x61, 0x01, 0x7a, 0xab, 0x31, 0x3e, 0x47, 0xff, 0x5a, 0x26, 0xb4, 0x76, 0xcb, 0x20, - 0xfa, 0x6f, 0x74, 0x69, 0x18, 0x7f, 0xbc, 0x9d, 0xf9, 0xee, 0xdd, 0xcc, 0x77, 0x7f, 0xce, 0x7c, - 0xf7, 0xdb, 0xdc, 0x77, 0xee, 0xe6, 0xbe, 0xf3, 0x63, 0xee, 0x3b, 0x9f, 0xde, 0xe4, 0x4c, 0x17, - 0x93, 0x0c, 0x11, 0x51, 0x62, 0xbb, 0x9a, 0xe6, 0xf3, 0x42, 0x5d, 0x5c, 0xe2, 0x2b, 0xfc, 0xf7, - 0x3f, 0x41, 0x5f, 0x57, 0x54, 0x65, 0xdd, 0x76, 0x2b, 0x5f, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, - 0x26, 0x76, 0x5b, 0xfa, 0x33, 0x03, 0x00, 0x00, + // 493 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xcf, 0x6e, 0xd3, 0x40, + 0x10, 0xc6, 0x6d, 0x92, 0x86, 0xb0, 0x51, 0x2b, 0x58, 0x68, 0xe5, 0x46, 0xc5, 0x8e, 0x2c, 0x21, + 0x85, 0x03, 0xbb, 0x72, 0x10, 0x42, 0xaa, 0x38, 0xa0, 0xf4, 0x02, 0x87, 0x4a, 0xc8, 0xaa, 0x38, + 0x70, 0x29, 0xf6, 0x76, 0x70, 0x56, 0xb5, 0x77, 0xad, 0xdd, 0x8d, 0xd5, 0xbe, 0x01, 0x47, 0x1e, + 0xa1, 0x67, 0x9e, 0xa4, 0xc7, 0x1e, 0x39, 0x45, 0x28, 0xb9, 0x70, 0xce, 0x13, 0x20, 0xff, 0x49, + 0x48, 0x0e, 0x20, 0x4e, 0xde, 0x99, 0xef, 0x37, 0xfb, 0x69, 0x76, 0xc6, 0xe8, 0x19, 0x8f, 0x19, + 0x8d, 0xf2, 0x3c, 0xe5, 0x2c, 0x32, 0x5c, 0x0a, 0x4d, 0x8d, 0x8a, 0x84, 0xfe, 0x02, 0x8a, 0x16, + 0x01, 0x35, 0x57, 0x24, 0x57, 0xd2, 0x48, 0x7c, 0xc4, 0x63, 0x46, 0x36, 0x31, 0xb2, 0xc2, 0x48, + 0x11, 0xf4, 0x9f, 0x24, 0x32, 0x91, 0x15, 0x48, 0xcb, 0x53, 0x5d, 0xd3, 0x77, 0x99, 0xd4, 0x99, + 0xd4, 0x34, 0x8e, 0x34, 0xd0, 0x22, 0x88, 0xc1, 0x44, 0x01, 0x65, 0x92, 0x8b, 0x46, 0xf7, 0x4a, + 0x6b, 0x26, 0x15, 0x50, 0x96, 0x72, 0x10, 0xa6, 0x34, 0xac, 0x4f, 0x35, 0xe0, 0x7f, 0x6f, 0xa1, + 0xde, 0xa9, 0x4e, 0xce, 0x1a, 0x27, 0xfc, 0x1a, 0xf5, 0xb4, 0x9c, 0x2a, 0x06, 0xe7, 0xb9, 0x54, + 0xc6, 0xb1, 0x07, 0xf6, 0xf0, 0xc1, 0xf8, 0x60, 0x39, 0xf3, 0xf0, 0x75, 0x94, 0xa5, 0xc7, 0xfe, + 0x86, 0xe8, 0x87, 0xa8, 0x8e, 0x3e, 0x48, 0x65, 0xf0, 0x5b, 0xb4, 0xd7, 0x68, 0x6c, 0x12, 0x09, + 0x01, 0xa9, 0x73, 0xaf, 0xaa, 0x3d, 0x5c, 0xce, 0xbc, 0xfd, 0xad, 0xda, 0x46, 0xf7, 0xc3, 0xdd, + 0x3a, 0x71, 0x52, 0xc7, 0xf8, 0x15, 0xda, 0x31, 0xf2, 0x12, 0x84, 0xd3, 0x1a, 0xd8, 0xc3, 0xde, + 0xe8, 0x90, 0xd4, 0xbd, 0x91, 0xb2, 0x37, 0xd2, 0xf4, 0x46, 0x4e, 0x24, 0x17, 0xe3, 0xf6, 0xed, + 0xcc, 0xb3, 0xc2, 0x9a, 0xc6, 0x07, 0xa8, 0xa3, 0x41, 0x5c, 0x80, 0x72, 0xda, 0xa5, 0x61, 0xd8, + 0x44, 0xb8, 0x8f, 0xba, 0x0a, 0x18, 0xf0, 0x02, 0x94, 0xb3, 0x53, 0x29, 0xeb, 0x18, 0x7f, 0x46, + 0x7b, 0x86, 0x67, 0x20, 0xa7, 0xe6, 0x7c, 0x02, 0x3c, 0x99, 0x18, 0xa7, 0x53, 0x79, 0xf6, 0x49, + 0x39, 0x83, 0xf2, 0xbd, 0x48, 0xf3, 0x4a, 0x45, 0x40, 0xde, 0x55, 0xc4, 0xf8, 0x69, 0x69, 0xfa, + 0xa7, 0x99, 0xed, 0x7a, 0x3f, 0xdc, 0x6d, 0x12, 0x35, 0x8d, 0xdf, 0xa3, 0x47, 0x2b, 0xa2, 0xfc, + 0x6a, 0x13, 0x65, 0xb9, 0x73, 0x7f, 0x60, 0x0f, 0xdb, 0xe3, 0xa3, 0xe5, 0xcc, 0x73, 0xb6, 0x2f, + 0x59, 0x23, 0x7e, 0xf8, 0xb0, 0xc9, 0x9d, 0xad, 0x52, 0xc7, 0xdd, 0xaf, 0x37, 0x9e, 0xf5, 0xeb, + 0xc6, 0xb3, 0xfc, 0x7d, 0xf4, 0x78, 0x63, 0x56, 0x21, 0xe8, 0x5c, 0x0a, 0x0d, 0x23, 0x89, 0x5a, + 0xa7, 0x3a, 0xc1, 0x13, 0xd4, 0x5d, 0x8f, 0xf1, 0x39, 0xf9, 0xd7, 0x32, 0x91, 0x8d, 0x5b, 0xfa, + 0xc1, 0x7f, 0xa3, 0x2b, 0xc3, 0xf1, 0xc7, 0xdb, 0xb9, 0x6b, 0xdf, 0xcd, 0x5d, 0xfb, 0xe7, 0xdc, + 0xb5, 0xbf, 0x2d, 0x5c, 0xeb, 0x6e, 0xe1, 0x5a, 0x3f, 0x16, 0xae, 0xf5, 0xe9, 0x4d, 0xc2, 0xcd, + 0x64, 0x1a, 0x13, 0x26, 0x33, 0x9a, 0x72, 0x01, 0x34, 0x8d, 0xb3, 0x17, 0xfa, 0xe2, 0x92, 0x16, + 0x23, 0x7a, 0x45, 0xff, 0xfe, 0x1f, 0x98, 0xeb, 0x1c, 0x74, 0xdc, 0xa9, 0x76, 0xf2, 0xe5, 0xef, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xfa, 0x7d, 0x1b, 0x9e, 0x31, 0x03, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/core/02-client/client/utils/utils.go b/x/ibc/core/02-client/client/utils/utils.go index 9f13016dae..b4a7093104 100644 --- a/x/ibc/core/02-client/client/utils/utils.go +++ b/x/ibc/core/02-client/client/utils/utils.go @@ -3,7 +3,7 @@ package utils import ( "context" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/client" @@ -147,7 +147,7 @@ func QueryTendermintHeader(clientCtx client.Context) (ibctmtypes.Header, int64, } protoCommit := commit.SignedHeader.ToProto() - protoValset, err := tmtypes.NewValidatorSet(validators.Validators).ToProto() + protoValset, err := osttypes.NewValidatorSet(validators.Validators).ToProto() if err != nil { return ibctmtypes.Header{}, 0, err } @@ -192,7 +192,7 @@ func QueryNodeConsensusState(clientCtx client.Context) (*ibctmtypes.ConsensusSta state := &ibctmtypes.ConsensusState{ Timestamp: commit.Time, Root: commitmenttypes.NewMerkleRoot(commit.AppHash), - NextValidatorsHash: tmtypes.NewValidatorSet(nextVals.Validators).Hash(), + NextValidatorsHash: osttypes.NewValidatorSet(nextVals.Validators).Hash(), } return state, height, nil diff --git a/x/ibc/core/02-client/keeper/client_test.go b/x/ibc/core/02-client/keeper/client_test.go index 7914fc804b..1cdfbe18d5 100644 --- a/x/ibc/core/02-client/keeper/client_test.go +++ b/x/ibc/core/02-client/keeper/client_test.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" @@ -48,14 +48,14 @@ func (suite *KeeperTestSuite) TestUpdateClientTendermint() { height := suite.header.GetHeight().(clienttypes.Height) return suite.chainA.CreateTMClientHeader(testChainID, int64(heightPlus3.RevisionHeight), height, suite.header.Header.Time.Add(time.Hour), - suite.valSet, suite.valSet, []tmtypes.PrivValidator{suite.privVal}) + suite.valSet, suite.valSet, []osttypes.PrivValidator{suite.privVal}) } createPastUpdateFn := func(s *KeeperTestSuite) *ibctmtypes.Header { heightMinus2 := clienttypes.NewHeight(suite.header.GetHeight().GetRevisionNumber(), suite.header.GetHeight().GetRevisionHeight()-2) heightMinus4 := clienttypes.NewHeight(suite.header.GetHeight().GetRevisionNumber(), suite.header.GetHeight().GetRevisionHeight()-4) return suite.chainA.CreateTMClientHeader(testChainID, int64(heightMinus2.RevisionHeight), heightMinus4, suite.header.Header.Time, - suite.valSet, suite.valSet, []tmtypes.PrivValidator{suite.privVal}) + suite.valSet, suite.valSet, []osttypes.PrivValidator{suite.privVal}) } var ( updateHeader *ibctmtypes.Header @@ -398,23 +398,23 @@ func (suite *KeeperTestSuite) TestCheckMisbehaviourAndUpdateState() { altPrivVal := ibctestingmock.NewPV() altPubKey, err := altPrivVal.GetPubKey() suite.Require().NoError(err) - altVal := tmtypes.NewValidator(altPubKey, 4) + altVal := osttypes.NewValidator(altPubKey, 4) // Set valSet here with suite.valSet so it doesn't get reset on each testcase valSet := suite.valSet valsHash := valSet.Hash() // Create bothValSet with both suite validator and altVal - bothValSet := tmtypes.NewValidatorSet(append(suite.valSet.Validators, altVal)) + bothValSet := osttypes.NewValidatorSet(append(suite.valSet.Validators, altVal)) bothValsHash := bothValSet.Hash() // Create alternative validator set with only altVal - altValSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{altVal}) + altValSet := osttypes.NewValidatorSet([]*osttypes.Validator{altVal}) // Create signer array and ensure it is in same order as bothValSet _, suiteVal := suite.valSet.GetByIndex(0) bothSigners := ibctesting.CreateSortedSignerArray(altPrivVal, suite.privVal, altVal, suiteVal) - altSigners := []tmtypes.PrivValidator{altPrivVal} + altSigners := []osttypes.PrivValidator{altPrivVal} // Create valid Misbehaviour by making a duplicate header that signs over different block time altTime := suite.ctx.BlockTime().Add(time.Minute) diff --git a/x/ibc/core/02-client/keeper/keeper.go b/x/ibc/core/02-client/keeper/keeper.go index 57a842b1c4..f8dd00d43d 100644 --- a/x/ibc/core/02-client/keeper/keeper.go +++ b/x/ibc/core/02-client/keeper/keeper.go @@ -5,8 +5,8 @@ import ( "reflect" "strings" - "github.com/tendermint/tendermint/libs/log" - "github.com/tendermint/tendermint/light" + "github.com/line/ostracon/libs/log" + "github.com/line/ostracon/light" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/store/prefix" diff --git a/x/ibc/core/02-client/keeper/keeper_test.go b/x/ibc/core/02-client/keeper/keeper_test.go index d5141a2f8a..edfe70b90f 100644 --- a/x/ibc/core/02-client/keeper/keeper_test.go +++ b/x/ibc/core/02-client/keeper/keeper_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" + ostbytes "github.com/line/ostracon/libs/bytes" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" "github.com/stretchr/testify/suite" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/codec" @@ -60,9 +60,9 @@ type KeeperTestSuite struct { keeper *keeper.Keeper consensusState *ibctmtypes.ConsensusState header *ibctmtypes.Header - valSet *tmtypes.ValidatorSet - valSetHash tmbytes.HexBytes - privVal tmtypes.PrivValidator + valSet *osttypes.ValidatorSet + valSetHash ostbytes.HexBytes + privVal osttypes.PrivValidator now time.Time past time.Time @@ -82,7 +82,7 @@ func (suite *KeeperTestSuite) SetupTest() { app := simapp.Setup(isCheckTx) suite.cdc = app.AppCodec() - suite.ctx = app.BaseApp.NewContext(isCheckTx, tmproto.Header{Height: height, ChainID: testClientID, Time: now2}) + suite.ctx = app.BaseApp.NewContext(isCheckTx, ostproto.Header{Height: height, ChainID: testClientID, Time: now2}) suite.keeper = &app.IBCKeeper.ClientKeeper suite.privVal = ibctestingmock.NewPV() @@ -91,10 +91,10 @@ func (suite *KeeperTestSuite) SetupTest() { testClientHeightMinus1 := types.NewHeight(0, height-1) - validator := tmtypes.NewValidator(pubKey, 1) - suite.valSet = tmtypes.NewValidatorSet([]*tmtypes.Validator{validator}) + validator := osttypes.NewValidator(pubKey, 1) + suite.valSet = osttypes.NewValidatorSet([]*osttypes.Validator{validator}) suite.valSetHash = suite.valSet.Hash() - suite.header = suite.chainA.CreateTMClientHeader(testChainID, int64(testClientHeight.RevisionHeight), testClientHeightMinus1, now2, suite.valSet, suite.valSet, []tmtypes.PrivValidator{suite.privVal}) + suite.header = suite.chainA.CreateTMClientHeader(testChainID, int64(testClientHeight.RevisionHeight), testClientHeightMinus1, now2, suite.valSet, suite.valSet, []osttypes.PrivValidator{suite.privVal}) suite.consensusState = ibctmtypes.NewConsensusState(suite.now, commitmenttypes.NewMerkleRoot([]byte("hash")), suite.valSetHash) var validators stakingtypes.Validators @@ -327,7 +327,7 @@ func (suite KeeperTestSuite) TestConsensusStateHelpers() { testClientHeightPlus5 := types.NewHeight(0, height+5) header := suite.chainA.CreateTMClientHeader(testClientID, int64(testClientHeightPlus5.RevisionHeight), testClientHeight, suite.header.Header.Time.Add(time.Minute), - suite.valSet, suite.valSet, []tmtypes.PrivValidator{suite.privVal}) + suite.valSet, suite.valSet, []osttypes.PrivValidator{suite.privVal}) // mock update functionality clientState.LatestHeight = header.GetHeight().(types.Height) diff --git a/x/ibc/core/02-client/types/client.pb.go b/x/ibc/core/02-client/types/client.pb.go index 838c9e51ae..ec7b16da73 100644 --- a/x/ibc/core/02-client/types/client.pb.go +++ b/x/ibc/core/02-client/types/client.pb.go @@ -344,43 +344,43 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/client.proto", fileDescriptor_b6bc4c8185546947) } var fileDescriptor_b6bc4c8185546947 = []byte{ - // 574 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xbd, 0x8e, 0xd3, 0x4c, - 0x14, 0x8d, 0x93, 0x7c, 0xd1, 0x66, 0xf2, 0x29, 0x59, 0x99, 0x84, 0xf5, 0xa6, 0xb0, 0xa3, 0xa9, - 0x52, 0xec, 0xda, 0x24, 0x14, 0xa0, 0x74, 0x38, 0x0d, 0x5b, 0x80, 0x82, 0x11, 0x02, 0xd1, 0x44, - 0xfe, 0x99, 0x75, 0x46, 0x38, 0x9e, 0xc8, 0x33, 0x09, 0x9b, 0x37, 0xa0, 0xa4, 0xa4, 0xa0, 0xe0, - 0x09, 0xe8, 0x78, 0x03, 0x8a, 0x2d, 0xb7, 0xa4, 0xb2, 0x50, 0xf2, 0x06, 0x79, 0x02, 0xe4, 0x99, - 0xc9, 0x12, 0x07, 0x22, 0xad, 0xa8, 0x7c, 0x7d, 0xe6, 0xcc, 0xb9, 0xe7, 0xdc, 0x19, 0x0d, 0x30, - 0xb0, 0xe7, 0x5b, 0x3e, 0x49, 0x90, 0xe5, 0x47, 0x18, 0xc5, 0xcc, 0x5a, 0xf4, 0x64, 0x65, 0xce, - 0x12, 0xc2, 0x88, 0xaa, 0x62, 0xcf, 0x37, 0x33, 0x82, 0x29, 0xe1, 0x45, 0xaf, 0xdd, 0x0c, 0x49, - 0x48, 0xf8, 0xb2, 0x95, 0x55, 0x82, 0xd9, 0x3e, 0x0d, 0x09, 0x09, 0x23, 0x64, 0xf1, 0x3f, 0x6f, - 0x7e, 0x69, 0xb9, 0xf1, 0x52, 0x2c, 0xc1, 0xcf, 0x0a, 0x68, 0x5d, 0x04, 0x28, 0x66, 0xf8, 0x12, - 0xa3, 0x60, 0xc8, 0x85, 0x5e, 0x32, 0x97, 0x21, 0xb5, 0x07, 0xaa, 0x42, 0x77, 0x8c, 0x03, 0x4d, - 0xe9, 0x28, 0xdd, 0xaa, 0xdd, 0xdc, 0xa4, 0xc6, 0xf1, 0xd2, 0x9d, 0x46, 0x03, 0x78, 0xbb, 0x04, - 0x9d, 0x23, 0x51, 0x5f, 0x04, 0xea, 0x08, 0xfc, 0x2f, 0x71, 0x9a, 0x49, 0x68, 0xc5, 0x8e, 0xd2, - 0xad, 0xf5, 0x9b, 0xa6, 0x68, 0x6f, 0x6e, 0xdb, 0x9b, 0x4f, 0xe2, 0xa5, 0x7d, 0xb2, 0x49, 0x8d, - 0x7b, 0x39, 0x2d, 0xbe, 0x07, 0x3a, 0x35, 0xff, 0xb7, 0x09, 0xf8, 0x55, 0x01, 0xda, 0x90, 0xc4, - 0x14, 0xc5, 0x74, 0x4e, 0x39, 0xf4, 0x1a, 0xb3, 0xc9, 0x53, 0x84, 0xc3, 0x09, 0x53, 0x1f, 0x83, - 0xca, 0x84, 0x57, 0xdc, 0x5e, 0xad, 0xdf, 0x36, 0xff, 0x9c, 0x88, 0x29, 0xb8, 0x76, 0xf9, 0x3a, - 0x35, 0x0a, 0x8e, 0xe4, 0xab, 0x6f, 0x40, 0xc3, 0xdf, 0xaa, 0xde, 0xc1, 0xeb, 0xe9, 0x26, 0x35, - 0x5a, 0x99, 0x57, 0xb8, 0xb7, 0x0b, 0x3a, 0x75, 0x3f, 0xe7, 0x0e, 0x7e, 0x57, 0x40, 0x4b, 0x4c, - 0x31, 0x6f, 0x9b, 0xfe, 0xcb, 0x3c, 0xaf, 0xc0, 0xf1, 0x5e, 0x43, 0xaa, 0x15, 0x3b, 0xa5, 0x6e, - 0xad, 0x7f, 0xf6, 0xb7, 0xa8, 0x87, 0x06, 0x65, 0x1b, 0x59, 0xf8, 0x4d, 0x6a, 0x9c, 0xc8, 0x5e, - 0x7b, 0x9a, 0xd0, 0x69, 0xe4, 0x53, 0x50, 0xf8, 0x4d, 0x01, 0x4d, 0x11, 0xe3, 0xd5, 0x2c, 0x70, - 0x19, 0x1a, 0x25, 0x64, 0x46, 0xa8, 0x1b, 0xa9, 0x4d, 0xf0, 0x1f, 0xc3, 0x2c, 0x42, 0x22, 0x81, - 0x23, 0x7e, 0xd4, 0x0e, 0xa8, 0x05, 0x88, 0xfa, 0x09, 0x9e, 0x31, 0x4c, 0x62, 0x3e, 0xcb, 0xaa, - 0xb3, 0x0b, 0xe5, 0xd3, 0x97, 0xee, 0x94, 0xfe, 0x2c, 0x3b, 0x5e, 0x37, 0x40, 0x89, 0x56, 0x3e, - 0x7c, 0x36, 0x8e, 0xe4, 0x0c, 0xca, 0x1f, 0xbe, 0x18, 0x85, 0xec, 0x3a, 0x57, 0xe4, 0xed, 0x18, - 0x82, 0x46, 0x82, 0x16, 0x98, 0x62, 0x12, 0x8f, 0xe3, 0xf9, 0xd4, 0x43, 0x09, 0xf7, 0x5c, 0xb6, - 0xdb, 0x9b, 0xd4, 0xb8, 0x2f, 0xfa, 0xee, 0x11, 0xa0, 0x53, 0xdf, 0x22, 0xcf, 0x39, 0x90, 0x13, - 0x91, 0x77, 0xad, 0x78, 0x50, 0x44, 0x10, 0x76, 0x44, 0x84, 0x93, 0xc1, 0x51, 0x66, 0xed, 0x53, - 0x66, 0xef, 0x19, 0xa8, 0x8c, 0xdc, 0xc4, 0x9d, 0xd2, 0x4c, 0xd8, 0x8d, 0x22, 0xf2, 0x1e, 0x05, - 0x63, 0x11, 0x98, 0x6a, 0x4a, 0xa7, 0xd4, 0xad, 0xee, 0x0a, 0xef, 0x11, 0xa0, 0x53, 0x97, 0x88, - 0x38, 0x19, 0x6a, 0xbf, 0xb8, 0x5e, 0xe9, 0xca, 0xcd, 0x4a, 0x57, 0x7e, 0xae, 0x74, 0xe5, 0xe3, - 0x5a, 0x2f, 0xdc, 0xac, 0xf5, 0xc2, 0x8f, 0xb5, 0x5e, 0x78, 0xfb, 0x28, 0xc4, 0x6c, 0x32, 0xf7, - 0x4c, 0x9f, 0x4c, 0x2d, 0x9f, 0xd0, 0x29, 0xa1, 0xf2, 0x73, 0x4e, 0x83, 0x77, 0xd6, 0x95, 0x75, - 0xfb, 0xb6, 0x3c, 0xe8, 0x9f, 0xcb, 0xe7, 0x85, 0x2d, 0x67, 0x88, 0x7a, 0x15, 0x3e, 0xdc, 0x87, - 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x39, 0xbe, 0xfd, 0x04, 0x7e, 0x04, 0x00, 0x00, + // 576 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x3f, 0x8f, 0x12, 0x4f, + 0x18, 0x66, 0x81, 0x1f, 0x39, 0x86, 0x5f, 0xe0, 0xb2, 0x82, 0xb7, 0x47, 0xb1, 0x4b, 0xa6, 0xa2, + 0xb8, 0xdb, 0x11, 0x8c, 0x89, 0xa1, 0x73, 0x69, 0xbc, 0x42, 0x25, 0x6b, 0x8c, 0xc6, 0x86, 0xec, + 0x9f, 0xb9, 0x65, 0xe2, 0xb2, 0x43, 0x76, 0x06, 0x3c, 0xbe, 0x81, 0xa5, 0xa5, 0x85, 0x85, 0x9f, + 0xc0, 0xce, 0x6f, 0x60, 0x71, 0xe5, 0x95, 0x56, 0x1b, 0x03, 0xdf, 0x80, 0x4f, 0x60, 0x76, 0x66, + 0x39, 0x59, 0x94, 0xe4, 0x62, 0xf7, 0xce, 0x33, 0xcf, 0x3c, 0xef, 0xf3, 0xbc, 0x33, 0x19, 0x60, + 0x10, 0xd7, 0x43, 0x1e, 0x8d, 0x31, 0xf2, 0x42, 0x82, 0x23, 0x8e, 0x16, 0xbd, 0xac, 0x32, 0x67, + 0x31, 0xe5, 0x54, 0x55, 0x89, 0xeb, 0x99, 0x29, 0xc1, 0xcc, 0xe0, 0x45, 0xaf, 0xdd, 0x0c, 0x68, + 0x40, 0xc5, 0x36, 0x4a, 0x2b, 0xc9, 0x6c, 0x9f, 0x06, 0x94, 0x06, 0x21, 0x46, 0x62, 0xe5, 0xce, + 0x2f, 0x91, 0x13, 0x2d, 0xe5, 0x16, 0xfc, 0xac, 0x80, 0xd6, 0x85, 0x8f, 0x23, 0x4e, 0x2e, 0x09, + 0xf6, 0x87, 0x42, 0xe8, 0x25, 0x77, 0x38, 0x56, 0x7b, 0xa0, 0x2a, 0x75, 0xc7, 0xc4, 0xd7, 0x94, + 0x8e, 0xd2, 0xad, 0x5a, 0xcd, 0x4d, 0x62, 0x1c, 0x2f, 0x9d, 0x69, 0x38, 0x80, 0xb7, 0x5b, 0xd0, + 0x3e, 0x92, 0xf5, 0x85, 0xaf, 0x8e, 0xc0, 0xff, 0x19, 0xce, 0x52, 0x09, 0xad, 0xd8, 0x51, 0xba, + 0xb5, 0x7e, 0xd3, 0x94, 0xed, 0xcd, 0x6d, 0x7b, 0xf3, 0x49, 0xb4, 0xb4, 0x4e, 0x36, 0x89, 0x71, + 0x2f, 0xa7, 0x25, 0xce, 0x40, 0xbb, 0xe6, 0xfd, 0x36, 0x01, 0xbf, 0x2a, 0x40, 0x1b, 0xd2, 0x88, + 0xe1, 0x88, 0xcd, 0x99, 0x80, 0x5e, 0x13, 0x3e, 0x79, 0x8a, 0x49, 0x30, 0xe1, 0xea, 0x63, 0x50, + 0x99, 0x88, 0x4a, 0xd8, 0xab, 0xf5, 0xdb, 0xe6, 0x9f, 0x13, 0x31, 0x25, 0xd7, 0x2a, 0x5f, 0x27, + 0x46, 0xc1, 0xce, 0xf8, 0xea, 0x1b, 0xd0, 0xf0, 0xb6, 0xaa, 0x77, 0xf0, 0x7a, 0xba, 0x49, 0x8c, + 0x56, 0xea, 0x15, 0xee, 0x9d, 0x82, 0x76, 0xdd, 0xcb, 0xb9, 0x83, 0xdf, 0x15, 0xd0, 0x92, 0x53, + 0xcc, 0xdb, 0x66, 0xff, 0x32, 0xcf, 0x2b, 0x70, 0xbc, 0xd7, 0x90, 0x69, 0xc5, 0x4e, 0xa9, 0x5b, + 0xeb, 0x9f, 0xfd, 0x2d, 0xea, 0xa1, 0x41, 0x59, 0x46, 0x1a, 0x7e, 0x93, 0x18, 0x27, 0x59, 0xaf, + 0x3d, 0x4d, 0x68, 0x37, 0xf2, 0x29, 0x18, 0xfc, 0xa6, 0x80, 0xa6, 0x8c, 0xf1, 0x6a, 0xe6, 0x3b, + 0x1c, 0x8f, 0x62, 0x3a, 0xa3, 0xcc, 0x09, 0xd5, 0x26, 0xf8, 0x8f, 0x13, 0x1e, 0x62, 0x99, 0xc0, + 0x96, 0x0b, 0xb5, 0x03, 0x6a, 0x3e, 0x66, 0x5e, 0x4c, 0x66, 0x9c, 0xd0, 0x48, 0xcc, 0xb2, 0x6a, + 0xef, 0x42, 0xf9, 0xf4, 0xa5, 0x3b, 0xa5, 0x3f, 0x4b, 0xaf, 0xd7, 0xf1, 0x71, 0xac, 0x95, 0x0f, + 0xdf, 0x8d, 0x9d, 0x71, 0x06, 0xe5, 0x0f, 0x5f, 0x8c, 0x42, 0xfa, 0x9c, 0x2b, 0xd9, 0xeb, 0x18, + 0x82, 0x46, 0x8c, 0x17, 0x84, 0x11, 0x1a, 0x8d, 0xa3, 0xf9, 0xd4, 0xc5, 0xb1, 0xf0, 0x5c, 0xb6, + 0xda, 0x9b, 0xc4, 0xb8, 0x2f, 0xfb, 0xee, 0x11, 0xa0, 0x5d, 0xdf, 0x22, 0xcf, 0x05, 0x90, 0x13, + 0xc9, 0xde, 0x5a, 0xf1, 0xa0, 0x88, 0x24, 0xec, 0x88, 0x48, 0x27, 0x83, 0xa3, 0xd4, 0xda, 0xa7, + 0xd4, 0xde, 0x33, 0x50, 0x19, 0x39, 0xb1, 0x33, 0x65, 0xa9, 0xb0, 0x13, 0x86, 0xf4, 0x3d, 0xf6, + 0xc7, 0x32, 0x30, 0xd3, 0x94, 0x4e, 0xa9, 0x5b, 0xdd, 0x15, 0xde, 0x23, 0x40, 0xbb, 0x9e, 0x21, + 0xf2, 0x66, 0x98, 0xf5, 0xe2, 0x7a, 0xa5, 0x2b, 0x37, 0x2b, 0x5d, 0xf9, 0xb9, 0xd2, 0x95, 0x8f, + 0x6b, 0xbd, 0x70, 0xb3, 0xd6, 0x0b, 0x3f, 0xd6, 0x7a, 0xe1, 0xed, 0xa3, 0x80, 0xf0, 0xc9, 0xdc, + 0x35, 0x3d, 0x3a, 0x45, 0x21, 0x89, 0x30, 0x0a, 0xdd, 0xe9, 0x39, 0xf3, 0xdf, 0xa1, 0x45, 0x1f, + 0x5d, 0xa1, 0xdb, 0x9f, 0xe5, 0x41, 0xff, 0x3c, 0xfb, 0x5c, 0xf8, 0x72, 0x86, 0x99, 0x5b, 0x11, + 0xa3, 0x7d, 0xf8, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x78, 0x09, 0x60, 0x65, 0x7c, 0x04, 0x00, 0x00, } func (m *IdentifiedClientState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/core/02-client/types/genesis.pb.go b/x/ibc/core/02-client/types/genesis.pb.go index a8253c343d..39b058dbce 100644 --- a/x/ibc/core/02-client/types/genesis.pb.go +++ b/x/ibc/core/02-client/types/genesis.pb.go @@ -217,41 +217,41 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/genesis.proto", fileDescriptor_bcd0c0f1f2e6a91a) } var fileDescriptor_bcd0c0f1f2e6a91a = []byte{ - // 535 bytes of a gzipped FileDescriptorProto + // 537 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x53, 0x4d, 0x6e, 0xd3, 0x40, - 0x14, 0xce, 0x34, 0x69, 0x68, 0xa7, 0x15, 0x0d, 0xa3, 0xa8, 0x98, 0x54, 0xb2, 0x2d, 0xb3, 0x09, - 0x8b, 0xd8, 0x24, 0x2c, 0x40, 0xd9, 0x20, 0xb9, 0x12, 0xa8, 0x12, 0x48, 0xd4, 0xec, 0xd8, 0x58, - 0x93, 0xf1, 0x90, 0x5a, 0x75, 0x3c, 0x21, 0x33, 0x89, 0x9a, 0x1b, 0xb0, 0x44, 0x9c, 0x80, 0x35, - 0x67, 0xe0, 0x00, 0x5d, 0x76, 0xd9, 0x55, 0x40, 0xc9, 0x0d, 0x72, 0x02, 0xe4, 0x99, 0x71, 0x7f, - 0x5c, 0xb7, 0xab, 0xbc, 0x7c, 0xf3, 0x7d, 0xdf, 0x7b, 0xfa, 0x9e, 0x1f, 0xb4, 0xe3, 0x01, 0xf1, - 0x08, 0x9b, 0x50, 0x8f, 0x24, 0x31, 0x4d, 0x85, 0x37, 0xeb, 0x7a, 0x43, 0x9a, 0x52, 0x1e, 0x73, - 0x77, 0x3c, 0x61, 0x82, 0x21, 0x14, 0x0f, 0x88, 0x9b, 0x31, 0x5c, 0xc5, 0x70, 0x67, 0xdd, 0x96, - 0x55, 0xa2, 0xd2, 0xaf, 0x52, 0xd4, 0x6a, 0x0e, 0xd9, 0x90, 0xc9, 0xd2, 0xcb, 0x2a, 0x85, 0x3a, - 0x97, 0x35, 0xb8, 0xfb, 0x5e, 0x99, 0x7f, 0x16, 0x58, 0x50, 0x44, 0xe0, 0x23, 0x25, 0xe3, 0x06, - 0xb0, 0xab, 0xed, 0x9d, 0xde, 0x0b, 0xf7, 0x6e, 0x37, 0xf7, 0x28, 0xa2, 0xa9, 0x88, 0xbf, 0xc6, - 0x34, 0x3a, 0x94, 0x98, 0xd4, 0xfa, 0xe6, 0xf9, 0xc2, 0xaa, 0xfc, 0xfe, 0x6b, 0xed, 0x97, 0x3e, - 0xf3, 0x20, 0x77, 0x46, 0x3f, 0x01, 0x7c, 0xa2, 0xeb, 0x90, 0xb0, 0x94, 0xd3, 0x94, 0x4f, 0xb9, - 0xb1, 0x71, 0x7f, 0x3f, 0x65, 0x73, 0x98, 0x53, 0x95, 0x9f, 0xdf, 0xcf, 0xfa, 0xad, 0x17, 0x96, - 0x31, 0xc7, 0xa3, 0xa4, 0xef, 0xdc, 0x71, 0x74, 0xb2, 0x59, 0x94, 0x94, 0x17, 0xb4, 0x41, 0x83, - 0x14, 0x70, 0x34, 0x87, 0x39, 0x16, 0x8e, 0xa8, 0xc0, 0x11, 0x16, 0xd8, 0xa8, 0xca, 0x91, 0x3a, - 0x0f, 0x47, 0xa0, 0xf3, 0xfb, 0xa8, 0x45, 0xbe, 0xa5, 0xc7, 0x7a, 0x7a, 0x7b, 0xac, 0xdc, 0xd4, - 0x09, 0xf6, 0x34, 0x94, 0x2b, 0xd0, 0x1b, 0x58, 0x1f, 0xe3, 0x09, 0x1e, 0x71, 0xa3, 0x66, 0x83, - 0xf6, 0x4e, 0xaf, 0x55, 0xd6, 0xf0, 0x93, 0x64, 0xf8, 0xb5, 0xcc, 0x3d, 0xd0, 0x7c, 0xf4, 0x0e, - 0x36, 0xc8, 0x84, 0x62, 0x41, 0xc3, 0x84, 0x11, 0x9c, 0x9c, 0x30, 0x2e, 0x8c, 0x4d, 0x1b, 0xb4, - 0xb7, 0xfc, 0x83, 0x1b, 0x13, 0x14, 0x18, 0xd9, 0x04, 0x12, 0xfa, 0x90, 0x23, 0xe8, 0x18, 0x36, - 0x53, 0x7a, 0x26, 0x42, 0xd5, 0x2e, 0xe4, 0xf4, 0xdb, 0x94, 0xa6, 0x84, 0x1a, 0x75, 0x1b, 0xb4, - 0x6b, 0xbe, 0xb5, 0x5e, 0x58, 0x07, 0xca, 0xab, 0x8c, 0xe5, 0x04, 0x28, 0x83, 0xf5, 0xae, 0x73, - 0xf0, 0x2d, 0xdc, 0x2b, 0x24, 0x83, 0x1a, 0xb0, 0x7a, 0x4a, 0xe7, 0x06, 0xb0, 0x41, 0x7b, 0x37, - 0xc8, 0x4a, 0xd4, 0x84, 0x9b, 0x33, 0x9c, 0x4c, 0xa9, 0xb1, 0x21, 0x31, 0xf5, 0xa7, 0x5f, 0xfb, - 0xfe, 0xcb, 0xaa, 0x38, 0x7f, 0x00, 0x7c, 0x76, 0x6f, 0xca, 0xa8, 0x0b, 0xb7, 0xf5, 0x18, 0x71, - 0x24, 0x1d, 0xb7, 0xfd, 0xe6, 0x7a, 0x61, 0x35, 0x6e, 0x86, 0x1e, 0xc6, 0x91, 0x13, 0x6c, 0xa9, - 0xfa, 0x28, 0x42, 0x09, 0xd4, 0xc9, 0x5f, 0x2f, 0x58, 0x7d, 0x73, 0xcf, 0xcb, 0xf2, 0x2e, 0xae, - 0xd5, 0xd4, 0x6b, 0xdd, 0xbf, 0xd5, 0xe1, 0x7a, 0xab, 0x8f, 0x15, 0x72, 0xc5, 0x3f, 0x3e, 0x5f, - 0x9a, 0xe0, 0x62, 0x69, 0x82, 0x7f, 0x4b, 0x13, 0xfc, 0x58, 0x99, 0x95, 0x8b, 0x95, 0x59, 0xb9, - 0x5c, 0x99, 0x95, 0x2f, 0xaf, 0x87, 0xb1, 0x38, 0x99, 0x0e, 0x5c, 0xc2, 0x46, 0x1e, 0x61, 0x7c, - 0xc4, 0xb8, 0xfe, 0xe9, 0xf0, 0xe8, 0xd4, 0x3b, 0xf3, 0xae, 0x4e, 0xf9, 0x65, 0xaf, 0xa3, 0xaf, - 0x59, 0xcc, 0xc7, 0x94, 0x0f, 0xea, 0xf2, 0x68, 0x5f, 0xfd, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x61, - 0x6f, 0x94, 0xed, 0x23, 0x04, 0x00, 0x00, + 0x18, 0xcd, 0x34, 0x69, 0x68, 0xa7, 0x15, 0x0d, 0xa3, 0xa8, 0x98, 0x54, 0xb2, 0x2d, 0xb3, 0x09, + 0x8b, 0x78, 0x48, 0x10, 0x12, 0xca, 0x06, 0xc9, 0x95, 0x40, 0x95, 0x40, 0x80, 0xd9, 0xb1, 0xb1, + 0x26, 0xe3, 0x21, 0x1d, 0xd5, 0xb1, 0x43, 0x66, 0x12, 0x35, 0x37, 0x60, 0x89, 0x38, 0x01, 0x6b, + 0xce, 0xc0, 0x01, 0xba, 0xec, 0xb2, 0xab, 0x80, 0x92, 0x1b, 0xe4, 0x04, 0xc8, 0x33, 0xe3, 0xfe, + 0xa4, 0x69, 0x77, 0x5f, 0x9e, 0xdf, 0x7b, 0xdf, 0xd3, 0xfb, 0x32, 0xd0, 0xe5, 0x3d, 0x8a, 0x69, + 0x36, 0x62, 0x98, 0x26, 0x9c, 0xa5, 0x12, 0x4f, 0xda, 0xb8, 0xcf, 0x52, 0x26, 0xb8, 0xf0, 0x87, + 0xa3, 0x4c, 0x66, 0x08, 0xf1, 0x1e, 0xf5, 0x73, 0x86, 0xaf, 0x19, 0xfe, 0xa4, 0xdd, 0x70, 0xd6, + 0xa8, 0xcc, 0x57, 0x25, 0x6a, 0xd4, 0xfb, 0x59, 0x3f, 0x53, 0x23, 0xce, 0x27, 0x8d, 0x7a, 0x17, + 0x15, 0xb8, 0xfb, 0x56, 0x9b, 0x7f, 0x96, 0x44, 0x32, 0x44, 0xe1, 0x03, 0x2d, 0x13, 0x16, 0x70, + 0xcb, 0xcd, 0x9d, 0xce, 0x33, 0xff, 0xf6, 0x36, 0xff, 0x28, 0x66, 0xa9, 0xe4, 0x5f, 0x39, 0x8b, + 0x0f, 0x15, 0xa6, 0xb4, 0x81, 0x7d, 0x36, 0x73, 0x4a, 0xbf, 0xff, 0x3a, 0xfb, 0x6b, 0x3f, 0x8b, + 0xb0, 0x70, 0x46, 0x3f, 0x01, 0x7c, 0x64, 0xe6, 0x88, 0x66, 0xa9, 0x60, 0xa9, 0x18, 0x0b, 0x6b, + 0xe3, 0xee, 0x7d, 0xda, 0xe6, 0xb0, 0xa0, 0x6a, 0xbf, 0xa0, 0x9b, 0xef, 0x5b, 0xce, 0x1c, 0x6b, + 0x4a, 0x06, 0x49, 0xd7, 0xbb, 0xe5, 0xe8, 0xe5, 0x59, 0xb4, 0x54, 0xac, 0x68, 0xc3, 0x1a, 0x5d, + 0xc1, 0xd1, 0x14, 0x16, 0x58, 0x34, 0x60, 0x92, 0xc4, 0x44, 0x12, 0xab, 0xac, 0x22, 0xb5, 0xee, + 0xaf, 0xc0, 0xf4, 0xf7, 0xde, 0x88, 0x02, 0xc7, 0xc4, 0x7a, 0x7c, 0x33, 0x56, 0x61, 0xea, 0x85, + 0x7b, 0x06, 0x2a, 0x14, 0xe8, 0x15, 0xac, 0x0e, 0xc9, 0x88, 0x0c, 0x84, 0x55, 0x71, 0x41, 0x73, + 0xa7, 0xd3, 0x58, 0xb7, 0xf0, 0xa3, 0x62, 0x04, 0x95, 0xdc, 0x3d, 0x34, 0x7c, 0xf4, 0x06, 0xd6, + 0xe8, 0x88, 0x11, 0xc9, 0xa2, 0x24, 0xa3, 0x24, 0x39, 0xce, 0x84, 0xb4, 0x36, 0x5d, 0xd0, 0xdc, + 0x0a, 0x0e, 0xae, 0x25, 0x58, 0x61, 0xe4, 0x09, 0x14, 0xf4, 0xae, 0x40, 0xd0, 0x27, 0x58, 0x4f, + 0xd9, 0xa9, 0x8c, 0xf4, 0xba, 0x48, 0xb0, 0x6f, 0x63, 0x96, 0x52, 0x66, 0x55, 0x5d, 0xd0, 0xac, + 0x04, 0xce, 0x72, 0xe6, 0x1c, 0x68, 0xaf, 0x75, 0x2c, 0x2f, 0x44, 0x39, 0x6c, 0x6e, 0x5d, 0x80, + 0xaf, 0xe1, 0xde, 0x4a, 0x33, 0xa8, 0x06, 0xcb, 0x27, 0x6c, 0x6a, 0x01, 0x17, 0x34, 0x77, 0xc3, + 0x7c, 0x44, 0x75, 0xb8, 0x39, 0x21, 0xc9, 0x98, 0x59, 0x1b, 0x0a, 0xd3, 0x3f, 0xba, 0x95, 0xef, + 0xbf, 0x9c, 0x92, 0xf7, 0x07, 0xc0, 0x27, 0x77, 0xb6, 0x8c, 0xda, 0x70, 0xdb, 0xc4, 0xe0, 0xb1, + 0x72, 0xdc, 0x0e, 0xea, 0xcb, 0x99, 0x53, 0xbb, 0x5e, 0x7a, 0xc4, 0x63, 0x2f, 0xdc, 0xd2, 0xf3, + 0x51, 0x8c, 0x12, 0x68, 0x9a, 0xbf, 0x3a, 0xb0, 0xfe, 0xcf, 0x3d, 0x5d, 0xd7, 0xf7, 0xea, 0x59, + 0x6d, 0x73, 0xd6, 0xfd, 0x1b, 0x1b, 0xae, 0xae, 0xfa, 0x50, 0x23, 0x97, 0xfc, 0x0f, 0x67, 0x73, + 0x1b, 0x9c, 0xcf, 0x6d, 0xf0, 0x6f, 0x6e, 0x83, 0x1f, 0x0b, 0xbb, 0x74, 0xbe, 0xb0, 0x4b, 0x17, + 0x0b, 0xbb, 0xf4, 0xe5, 0x65, 0x9f, 0xcb, 0xe3, 0x71, 0xcf, 0xa7, 0xd9, 0x00, 0x27, 0x3c, 0x65, + 0x38, 0xe9, 0x0d, 0x5a, 0x22, 0x3e, 0xc1, 0x93, 0x0e, 0x3e, 0xc5, 0x97, 0x0f, 0xf9, 0x79, 0xa7, + 0x65, 0xde, 0xb2, 0x9c, 0x0e, 0x99, 0xe8, 0x55, 0xd5, 0x93, 0x7d, 0xf1, 0x3f, 0x00, 0x00, 0xff, + 0xff, 0xf6, 0x28, 0xa3, 0x11, 0x21, 0x04, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/core/02-client/types/genesis_test.go b/x/ibc/core/02-client/types/genesis_test.go index a6cd2629a9..c18b81bc7c 100644 --- a/x/ibc/core/02-client/types/genesis_test.go +++ b/x/ibc/core/02-client/types/genesis_test.go @@ -3,7 +3,7 @@ package types_test import ( "time" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" client "github.com/line/lbm-sdk/v2/x/ibc/core/02-client" "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" @@ -51,11 +51,11 @@ func (suite *TypesTestSuite) TestValidateGenesis() { now := time.Now().UTC() - val := tmtypes.NewValidator(pubKey, 10) - valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{val}) + val := osttypes.NewValidator(pubKey, 10) + valSet := osttypes.NewValidatorSet([]*osttypes.Validator{val}) heightMinus1 := types.NewHeight(0, height-1) - header := suite.chainA.CreateTMClientHeader(chainID, int64(clientHeight.RevisionHeight), heightMinus1, now, valSet, valSet, []tmtypes.PrivValidator{privVal}) + header := suite.chainA.CreateTMClientHeader(chainID, int64(clientHeight.RevisionHeight), heightMinus1, now, valSet, valSet, []osttypes.PrivValidator{privVal}) testCases := []struct { name string diff --git a/x/ibc/core/02-client/types/query.pb.go b/x/ibc/core/02-client/types/query.pb.go index ec86f31838..da848f2d8c 100644 --- a/x/ibc/core/02-client/types/query.pb.go +++ b/x/ibc/core/02-client/types/query.pb.go @@ -599,59 +599,59 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/query.proto", fileDescriptor_dc42cdfd1d52d76e) } var fileDescriptor_dc42cdfd1d52d76e = []byte{ - // 824 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x4d, 0x4f, 0xdb, 0x48, - 0x18, 0xce, 0xf0, 0x25, 0x98, 0x04, 0xb2, 0x1a, 0xa1, 0xdd, 0x60, 0x90, 0x89, 0xbc, 0x12, 0x64, - 0x77, 0x61, 0x86, 0x64, 0x3f, 0x90, 0x56, 0xe2, 0xb0, 0x20, 0xb1, 0xe5, 0xd2, 0x82, 0x7b, 0xa8, - 0x54, 0xa9, 0x42, 0xb6, 0x33, 0x38, 0x16, 0xc4, 0x13, 0x32, 0x4e, 0x54, 0x84, 0xb8, 0xf0, 0x07, - 0x5a, 0xa9, 0xc7, 0x5e, 0x7b, 0xea, 0xa1, 0xaa, 0xd4, 0x43, 0xff, 0x41, 0xc5, 0x11, 0xa9, 0x3d, - 0xf4, 0xd4, 0x56, 0xc0, 0xbf, 0xe8, 0xa5, 0xf2, 0xcc, 0x18, 0xec, 0xc4, 0x08, 0x0b, 0xb5, 0xa7, - 0xd8, 0xef, 0xd7, 0x3c, 0xcf, 0xf3, 0xbe, 0xef, 0x38, 0x50, 0xf7, 0x6c, 0x87, 0x38, 0xac, 0x4d, - 0x89, 0xb3, 0xe7, 0x51, 0x3f, 0x20, 0xdd, 0x2a, 0xd9, 0xef, 0xd0, 0xf6, 0x01, 0x6e, 0xb5, 0x59, - 0xc0, 0x10, 0xf2, 0x6c, 0x07, 0x87, 0x7e, 0x2c, 0xfd, 0xb8, 0x5b, 0xd5, 0x7e, 0x77, 0x18, 0x6f, - 0x32, 0x4e, 0x6c, 0x8b, 0x53, 0x19, 0x4c, 0xba, 0x55, 0x9b, 0x06, 0x56, 0x95, 0xb4, 0x2c, 0xd7, - 0xf3, 0xad, 0xc0, 0x63, 0xbe, 0xcc, 0xd7, 0x66, 0x53, 0xea, 0xab, 0x4a, 0x32, 0x60, 0xca, 0x65, - 0xcc, 0xdd, 0xa3, 0x44, 0xbc, 0xd9, 0x9d, 0x1d, 0x62, 0xf9, 0xea, 0x6c, 0x6d, 0x46, 0xb9, 0xac, - 0x96, 0x47, 0x2c, 0xdf, 0x67, 0x81, 0x28, 0xcc, 0x95, 0x77, 0xd2, 0x65, 0x2e, 0x13, 0x8f, 0x24, - 0x7c, 0x92, 0x56, 0xe3, 0x1f, 0xf8, 0xcb, 0x56, 0x88, 0x68, 0x4d, 0x9c, 0x71, 0x3f, 0xb0, 0x02, - 0x6a, 0xd2, 0xfd, 0x0e, 0xe5, 0x01, 0x9a, 0x86, 0x63, 0xf2, 0xe4, 0x6d, 0xaf, 0x5e, 0x02, 0x65, - 0x50, 0x19, 0x33, 0x47, 0xa5, 0x61, 0xa3, 0x6e, 0xbc, 0x02, 0xb0, 0xd4, 0x9f, 0xc8, 0x5b, 0xcc, - 0xe7, 0x14, 0x2d, 0xc3, 0x82, 0xca, 0xe4, 0xa1, 0x5d, 0x24, 0xe7, 0x6b, 0x93, 0x58, 0xe2, 0xc3, - 0x11, 0x74, 0xfc, 0x9f, 0x7f, 0x60, 0xe6, 0x9d, 0xab, 0x02, 0x68, 0x12, 0x0e, 0xb7, 0xda, 0x8c, - 0xed, 0x94, 0x06, 0xca, 0xa0, 0x52, 0x30, 0xe5, 0x0b, 0x5a, 0x83, 0x05, 0xf1, 0xb0, 0xdd, 0xa0, - 0x9e, 0xdb, 0x08, 0x4a, 0x83, 0xa2, 0x9c, 0x86, 0xfb, 0xa5, 0xc6, 0x77, 0x44, 0xc4, 0xea, 0xd0, - 0xc9, 0xa7, 0xd9, 0x9c, 0x99, 0x17, 0x59, 0xd2, 0x64, 0xd8, 0xfd, 0x78, 0x79, 0xc4, 0x74, 0x1d, - 0xc2, 0xab, 0x46, 0x28, 0xb4, 0x73, 0x58, 0x76, 0x0d, 0x87, 0x5d, 0xc3, 0xb2, 0xc5, 0xaa, 0x6b, - 0x78, 0xd3, 0x72, 0x23, 0x95, 0xcc, 0x58, 0xa6, 0xf1, 0x01, 0xc0, 0xa9, 0x94, 0x43, 0x94, 0x2a, - 0x3e, 0x1c, 0x8f, 0xab, 0xc2, 0x4b, 0xa0, 0x3c, 0x58, 0xc9, 0xd7, 0x7e, 0x4b, 0xe3, 0xb1, 0x51, - 0xa7, 0x7e, 0xe0, 0xed, 0x78, 0xb4, 0x1e, 0x2b, 0xb5, 0xaa, 0x87, 0xb4, 0x5e, 0x7e, 0x9e, 0xfd, - 0x39, 0xd5, 0xcd, 0xcd, 0x42, 0x4c, 0x4b, 0x8e, 0xfe, 0x4f, 0xb0, 0x1a, 0x10, 0xac, 0xe6, 0x6f, - 0x64, 0x25, 0xc1, 0x26, 0x68, 0xbd, 0x06, 0x50, 0x93, 0xb4, 0x42, 0x97, 0xcf, 0x3b, 0x3c, 0xf3, - 0x9c, 0xa0, 0x79, 0x58, 0x6c, 0xd3, 0xae, 0xc7, 0x3d, 0xe6, 0x6f, 0xfb, 0x9d, 0xa6, 0x4d, 0xdb, - 0x02, 0xc9, 0x90, 0x39, 0x11, 0x99, 0xef, 0x0a, 0x6b, 0x22, 0x30, 0xd6, 0xe7, 0x58, 0xa0, 0x6c, - 0x24, 0xfa, 0x15, 0x8e, 0xef, 0x85, 0xfc, 0x82, 0x28, 0x6c, 0xa8, 0x0c, 0x2a, 0xa3, 0x66, 0x41, - 0x1a, 0x55, 0xb7, 0xdf, 0x02, 0x38, 0x9d, 0x0a, 0x59, 0xf5, 0x62, 0x05, 0x16, 0x9d, 0xc8, 0x93, - 0x61, 0x48, 0x27, 0x9c, 0x44, 0x99, 0x1f, 0x39, 0xa7, 0xc7, 0xe9, 0xc8, 0x79, 0x26, 0xb5, 0xd7, - 0x53, 0x5a, 0x7e, 0x9b, 0x41, 0x7e, 0x07, 0xe0, 0x4c, 0x3a, 0x08, 0xa5, 0xdf, 0x23, 0xf8, 0x53, - 0x8f, 0x7e, 0xd1, 0x38, 0x2f, 0xa4, 0xd1, 0x4d, 0x96, 0x79, 0xe0, 0x05, 0x8d, 0x84, 0x00, 0xc5, - 0xa4, 0xbc, 0xdf, 0x71, 0x74, 0xb5, 0xc4, 0xd6, 0x6f, 0x5a, 0x6d, 0xab, 0x19, 0x29, 0x69, 0xdc, - 0x4b, 0x2c, 0x6b, 0xe4, 0x53, 0x04, 0x6b, 0x70, 0xa4, 0x25, 0x2c, 0x6a, 0x2e, 0x52, 0xbb, 0xa8, - 0x72, 0x54, 0x64, 0xed, 0xeb, 0x08, 0x1c, 0x16, 0x15, 0xd1, 0x0b, 0x00, 0xf3, 0xb1, 0xcd, 0x44, - 0x7f, 0xa4, 0x65, 0x5f, 0x73, 0xef, 0x6a, 0x0b, 0xd9, 0x82, 0x25, 0x50, 0xe3, 0xdf, 0xe3, 0xf7, - 0x17, 0xcf, 0x06, 0xfe, 0x42, 0x35, 0xd2, 0xff, 0xe5, 0x90, 0xdf, 0x98, 0xc4, 0xa5, 0x43, 0x0e, - 0x2f, 0xa7, 0xe7, 0x08, 0x3d, 0x07, 0xb0, 0x10, 0xbf, 0x40, 0x50, 0xa6, 0xa3, 0x23, 0x01, 0xb5, - 0xc5, 0x8c, 0xd1, 0x0a, 0x29, 0x16, 0x48, 0x2b, 0x68, 0x2e, 0x1b, 0x52, 0x74, 0x01, 0xe0, 0x44, - 0x72, 0x70, 0x10, 0xbe, 0xfe, 0xc4, 0xb4, 0xab, 0x49, 0x23, 0x99, 0xe3, 0x15, 0xc6, 0x7d, 0x81, - 0x71, 0x17, 0x79, 0xd7, 0x63, 0xec, 0x19, 0xfb, 0xb8, 0xa0, 0x24, 0xba, 0xaa, 0xc8, 0x61, 0xcf, - 0xa5, 0x77, 0x44, 0xe4, 0x9d, 0x10, 0x73, 0x48, 0xc3, 0x11, 0x7a, 0x03, 0x60, 0xb1, 0x67, 0xcd, - 0x50, 0x56, 0xdc, 0x97, 0xad, 0x58, 0xca, 0x9e, 0xa0, 0x98, 0xae, 0x08, 0xa6, 0xcb, 0xe8, 0xef, - 0x5b, 0x31, 0x45, 0x4f, 0x2e, 0x47, 0x47, 0x2e, 0xc1, 0x8d, 0xa3, 0x93, 0xd8, 0xbd, 0x1b, 0x47, - 0x27, 0xb9, 0x8d, 0x86, 0x21, 0xc0, 0xce, 0x20, 0x4d, 0x82, 0x4d, 0xe2, 0x94, 0xdb, 0xb7, 0xba, - 0x75, 0x72, 0xa6, 0x83, 0xd3, 0x33, 0x1d, 0x7c, 0x39, 0xd3, 0xc1, 0xd3, 0x73, 0x3d, 0x77, 0x7a, - 0xae, 0xe7, 0x3e, 0x9e, 0xeb, 0xb9, 0x87, 0xcb, 0xae, 0x17, 0x34, 0x3a, 0x36, 0x76, 0x58, 0x93, - 0xa8, 0xbf, 0x62, 0xf2, 0x67, 0x91, 0xd7, 0x77, 0xc9, 0xe3, 0x2b, 0x01, 0x96, 0x6a, 0x8b, 0xaa, - 0x76, 0x70, 0xd0, 0xa2, 0xdc, 0x1e, 0x11, 0x1f, 0x81, 0x3f, 0xbf, 0x05, 0x00, 0x00, 0xff, 0xff, - 0xa7, 0x0d, 0x7c, 0x62, 0xf5, 0x09, 0x00, 0x00, + // 827 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x4f, 0x4b, 0x33, 0x47, + 0x18, 0xcf, 0xf8, 0x0f, 0x9d, 0x44, 0x53, 0x06, 0x69, 0xe3, 0x2a, 0x6b, 0xd8, 0x82, 0xa6, 0xad, + 0xce, 0x98, 0xb4, 0x56, 0x28, 0x78, 0xa8, 0x82, 0xad, 0x97, 0x6a, 0xb7, 0x87, 0x42, 0xa1, 0xc8, + 0xee, 0x66, 0xdc, 0x0c, 0x26, 0x3b, 0x31, 0xb3, 0x09, 0x15, 0xf1, 0xe2, 0x17, 0x68, 0xa1, 0xc7, + 0x5e, 0x7b, 0xea, 0xa1, 0x14, 0x7a, 0xe8, 0x37, 0x28, 0x1e, 0x85, 0xf6, 0xd0, 0x53, 0xdf, 0x17, + 0xf5, 0x5b, 0xbc, 0x97, 0x97, 0x9d, 0x99, 0xd5, 0xdd, 0x64, 0xc5, 0x45, 0xde, 0xf7, 0xb6, 0xfb, + 0xfc, 0x9b, 0xdf, 0xef, 0x79, 0x7e, 0xcf, 0x0c, 0x34, 0x99, 0xeb, 0x11, 0x8f, 0xf7, 0x28, 0xf1, + 0xda, 0x8c, 0x06, 0x21, 0x19, 0xd4, 0xc9, 0x69, 0x9f, 0xf6, 0xce, 0x70, 0xb7, 0xc7, 0x43, 0x8e, + 0x10, 0x73, 0x3d, 0x1c, 0xf9, 0xb1, 0xf2, 0xe3, 0x41, 0xdd, 0xf8, 0xd0, 0xe3, 0xa2, 0xc3, 0x05, + 0x71, 0x1d, 0x41, 0x55, 0x30, 0x19, 0xd4, 0x5d, 0x1a, 0x3a, 0x75, 0xd2, 0x75, 0x7c, 0x16, 0x38, + 0x21, 0xe3, 0x81, 0xca, 0x37, 0x96, 0x33, 0xea, 0xeb, 0x4a, 0x2a, 0x60, 0xc1, 0xe7, 0xdc, 0x6f, + 0x53, 0x22, 0xff, 0xdc, 0xfe, 0x31, 0x71, 0x02, 0x7d, 0xb6, 0xb1, 0xa4, 0x5d, 0x4e, 0x97, 0x11, + 0x27, 0x08, 0x78, 0x28, 0x0b, 0x0b, 0xed, 0x9d, 0xf7, 0xb9, 0xcf, 0xe5, 0x27, 0x89, 0xbe, 0x94, + 0xd5, 0xfa, 0x14, 0xbe, 0xf7, 0x75, 0x84, 0x68, 0x57, 0x9e, 0xf1, 0x4d, 0xe8, 0x84, 0xd4, 0xa6, + 0xa7, 0x7d, 0x2a, 0x42, 0xb4, 0x08, 0x67, 0xd4, 0xc9, 0x47, 0xac, 0x59, 0x01, 0x55, 0x50, 0x9b, + 0xb1, 0xa7, 0x95, 0x61, 0xbf, 0x69, 0xfd, 0x0e, 0x60, 0x65, 0x34, 0x51, 0x74, 0x79, 0x20, 0x28, + 0xda, 0x82, 0x25, 0x9d, 0x29, 0x22, 0xbb, 0x4c, 0x2e, 0x36, 0xe6, 0xb1, 0xc2, 0x87, 0x63, 0xe8, + 0xf8, 0xf3, 0xe0, 0xcc, 0x2e, 0x7a, 0x0f, 0x05, 0xd0, 0x3c, 0x9c, 0xec, 0xf6, 0x38, 0x3f, 0xae, + 0x8c, 0x55, 0x41, 0xad, 0x64, 0xab, 0x1f, 0xb4, 0x0b, 0x4b, 0xf2, 0xe3, 0xa8, 0x45, 0x99, 0xdf, + 0x0a, 0x2b, 0xe3, 0xb2, 0x9c, 0x81, 0x47, 0x5b, 0x8d, 0xbf, 0x94, 0x11, 0x3b, 0x13, 0x57, 0xff, + 0x2f, 0x17, 0xec, 0xa2, 0xcc, 0x52, 0x26, 0xcb, 0x1d, 0xc5, 0x2b, 0x62, 0xa6, 0x7b, 0x10, 0x3e, + 0x0c, 0x42, 0xa3, 0x5d, 0xc1, 0x6a, 0x6a, 0x38, 0x9a, 0x1a, 0x56, 0x23, 0xd6, 0x53, 0xc3, 0x87, + 0x8e, 0x1f, 0x77, 0xc9, 0x4e, 0x64, 0x5a, 0xff, 0x02, 0xb8, 0x90, 0x71, 0x88, 0xee, 0x4a, 0x00, + 0x67, 0x93, 0x5d, 0x11, 0x15, 0x50, 0x1d, 0xaf, 0x15, 0x1b, 0x1f, 0x64, 0xf1, 0xd8, 0x6f, 0xd2, + 0x20, 0x64, 0xc7, 0x8c, 0x36, 0x13, 0xa5, 0x76, 0xcc, 0x88, 0xd6, 0x6f, 0x2f, 0x96, 0xdf, 0xcd, + 0x74, 0x0b, 0xbb, 0x94, 0xe8, 0xa5, 0x40, 0x5f, 0xa4, 0x58, 0x8d, 0x49, 0x56, 0xab, 0x4f, 0xb2, + 0x52, 0x60, 0x53, 0xb4, 0xfe, 0x00, 0xd0, 0x50, 0xb4, 0x22, 0x57, 0x20, 0xfa, 0x22, 0xb7, 0x4e, + 0xd0, 0x2a, 0x2c, 0xf7, 0xe8, 0x80, 0x09, 0xc6, 0x83, 0xa3, 0xa0, 0xdf, 0x71, 0x69, 0x4f, 0x22, + 0x99, 0xb0, 0xe7, 0x62, 0xf3, 0x57, 0xd2, 0x9a, 0x0a, 0x4c, 0xcc, 0x39, 0x11, 0xa8, 0x06, 0x89, + 0xde, 0x87, 0xb3, 0xed, 0x88, 0x5f, 0x18, 0x87, 0x4d, 0x54, 0x41, 0x6d, 0xda, 0x2e, 0x29, 0xa3, + 0x9e, 0xf6, 0x5f, 0x00, 0x2e, 0x66, 0x42, 0xd6, 0xb3, 0xd8, 0x86, 0x65, 0x2f, 0xf6, 0xe4, 0x10, + 0xe9, 0x9c, 0x97, 0x2a, 0xf3, 0x36, 0x75, 0x7a, 0x99, 0x8d, 0x5c, 0xe4, 0xea, 0xf6, 0x5e, 0xc6, + 0xc8, 0x9f, 0x23, 0xe4, 0xbf, 0x01, 0x5c, 0xca, 0x06, 0xa1, 0xfb, 0xf7, 0x3d, 0x7c, 0x67, 0xa8, + 0x7f, 0xb1, 0x9c, 0xd7, 0xb2, 0xe8, 0xa6, 0xcb, 0x7c, 0xcb, 0xc2, 0x56, 0xaa, 0x01, 0xe5, 0x74, + 0x7b, 0xdf, 0xa0, 0x74, 0x8d, 0xd4, 0xd6, 0x1f, 0x3a, 0x3d, 0xa7, 0x13, 0x77, 0xd2, 0x3a, 0x48, + 0x2d, 0x6b, 0xec, 0xd3, 0x04, 0x1b, 0x70, 0xaa, 0x2b, 0x2d, 0x5a, 0x17, 0x99, 0x53, 0xd4, 0x39, + 0x3a, 0xb2, 0xf1, 0x6a, 0x0a, 0x4e, 0xca, 0x8a, 0xe8, 0x57, 0x00, 0x8b, 0x89, 0xcd, 0x44, 0x1f, + 0x65, 0x65, 0x3f, 0x72, 0xef, 0x1a, 0x6b, 0xf9, 0x82, 0x15, 0x50, 0xeb, 0xb3, 0xcb, 0x7f, 0xee, + 0x7e, 0x1e, 0xfb, 0x04, 0x35, 0xc8, 0xe8, 0xcb, 0xa1, 0xde, 0x98, 0xd4, 0xa5, 0x43, 0xce, 0xef, + 0xd5, 0x73, 0x81, 0x7e, 0x01, 0xb0, 0x94, 0xbc, 0x40, 0x50, 0xae, 0xa3, 0xe3, 0x06, 0x1a, 0xeb, + 0x39, 0xa3, 0x35, 0x52, 0x2c, 0x91, 0xd6, 0xd0, 0x4a, 0x3e, 0xa4, 0xe8, 0x0e, 0xc0, 0xb9, 0xb4, + 0x70, 0x10, 0x7e, 0xfc, 0xc4, 0xac, 0xab, 0xc9, 0x20, 0xb9, 0xe3, 0x35, 0xc6, 0x53, 0x89, 0xf1, + 0x04, 0xb1, 0xc7, 0x31, 0x0e, 0xc9, 0x3e, 0xd9, 0x50, 0x12, 0x5f, 0x55, 0xe4, 0x7c, 0xe8, 0xd2, + 0xbb, 0x20, 0xea, 0x4e, 0x48, 0x38, 0x94, 0xe1, 0x02, 0xfd, 0x09, 0x60, 0x79, 0x68, 0xcd, 0x50, + 0x5e, 0xdc, 0xf7, 0xa3, 0xd8, 0xc8, 0x9f, 0xa0, 0x99, 0x6e, 0x4b, 0xa6, 0x5b, 0x68, 0xf3, 0x59, + 0x4c, 0xd1, 0x8f, 0xf7, 0xd2, 0x51, 0x4b, 0xf0, 0xa4, 0x74, 0x52, 0xbb, 0xf7, 0xa4, 0x74, 0xd2, + 0xdb, 0x68, 0x59, 0x12, 0xec, 0x12, 0x32, 0x14, 0xd8, 0x34, 0x4e, 0xb5, 0x7d, 0x3b, 0x07, 0x57, + 0x37, 0x26, 0xb8, 0xbe, 0x31, 0xc1, 0xcb, 0x1b, 0x13, 0xfc, 0x74, 0x6b, 0x16, 0xae, 0x6f, 0xcd, + 0xc2, 0x7f, 0xb7, 0x66, 0xe1, 0xbb, 0x4d, 0x9f, 0x85, 0xad, 0xbe, 0x8b, 0x3d, 0xde, 0x21, 0x6d, + 0x16, 0x50, 0xd2, 0x76, 0x3b, 0xeb, 0xa2, 0x79, 0x42, 0x06, 0x0d, 0xf2, 0xc3, 0x03, 0xfd, 0x8d, + 0xc6, 0xba, 0xae, 0x1c, 0x9e, 0x75, 0xa9, 0x70, 0xa7, 0xe4, 0x13, 0xf0, 0xf1, 0xeb, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xe9, 0x01, 0x97, 0xe5, 0xf3, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/core/02-client/types/tx.pb.go b/x/ibc/core/02-client/types/tx.pb.go index d1fd1f08d7..061d7c4f81 100644 --- a/x/ibc/core/02-client/types/tx.pb.go +++ b/x/ibc/core/02-client/types/tx.pb.go @@ -372,45 +372,45 @@ func init() { func init() { proto.RegisterFile("ibc/core/client/v1/tx.proto", fileDescriptor_cb5dc4651eb49a04) } var fileDescriptor_cb5dc4651eb49a04 = []byte{ - // 601 bytes of a gzipped FileDescriptorProto + // 604 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x3f, 0x6f, 0xd3, 0x40, 0x1c, 0x8d, 0x1b, 0x88, 0x9a, 0x6b, 0xa0, 0x95, 0x09, 0x6d, 0xea, 0xaa, 0x76, 0x64, 0x3a, 0x04, - 0xd1, 0xfa, 0x48, 0x18, 0x40, 0xdd, 0x48, 0x27, 0x86, 0x48, 0xd4, 0x15, 0x03, 0x2c, 0xc1, 0x7f, - 0xae, 0x97, 0x53, 0x13, 0x5f, 0xe4, 0xb3, 0xa3, 0xe6, 0x1b, 0x30, 0x32, 0xf0, 0x01, 0x2a, 0x06, - 0x3e, 0x0b, 0x63, 0x07, 0x06, 0xa6, 0xa8, 0x4a, 0x16, 0xe6, 0x7c, 0x02, 0x14, 0x9f, 0x13, 0x62, - 0xd7, 0x8e, 0x2c, 0xa0, 0x53, 0x7c, 0xfe, 0xbd, 0x7b, 0xef, 0xf7, 0xf2, 0x7e, 0xe7, 0x03, 0x7b, - 0xc4, 0xb4, 0xa0, 0x45, 0x5d, 0x04, 0xad, 0x2e, 0x41, 0x8e, 0x07, 0x07, 0x75, 0xe8, 0x5d, 0x6a, - 0x7d, 0x97, 0x7a, 0x54, 0x14, 0x89, 0x69, 0x69, 0xb3, 0xa2, 0xc6, 0x8b, 0xda, 0xa0, 0x2e, 0x95, - 0x31, 0xc5, 0x34, 0x28, 0xc3, 0xd9, 0x13, 0x47, 0x4a, 0xbb, 0x98, 0x52, 0xdc, 0x45, 0x30, 0x58, - 0x99, 0xfe, 0x39, 0x34, 0x9c, 0x61, 0x58, 0x52, 0x12, 0x14, 0x42, 0xba, 0x00, 0xa0, 0xde, 0x08, - 0x60, 0xb3, 0xc5, 0xf0, 0x89, 0x8b, 0x0c, 0x0f, 0x9d, 0x04, 0x15, 0xf1, 0x2d, 0x28, 0x71, 0x4c, - 0x9b, 0x79, 0x86, 0x87, 0x2a, 0x42, 0x55, 0xa8, 0x6d, 0x34, 0xca, 0x1a, 0x97, 0xd1, 0xe6, 0x32, - 0xda, 0x6b, 0x67, 0xd8, 0xdc, 0x99, 0x8e, 0x94, 0x47, 0x43, 0xa3, 0xd7, 0x3d, 0x56, 0x97, 0xf7, - 0xa8, 0xfa, 0x06, 0x5f, 0x9e, 0xcd, 0x56, 0xe2, 0x7b, 0xb0, 0x69, 0x51, 0x87, 0x21, 0x87, 0xf9, - 0x2c, 0x24, 0x5d, 0x5b, 0x41, 0x2a, 0x4d, 0x47, 0xca, 0x76, 0x48, 0x1a, 0xdd, 0xa6, 0xea, 0x0f, - 0x17, 0x6f, 0x38, 0xf5, 0x36, 0x28, 0x30, 0x82, 0x1d, 0xe4, 0x56, 0xf2, 0x55, 0xa1, 0x56, 0xd4, - 0xc3, 0xd5, 0xf1, 0xfa, 0xa7, 0x2b, 0x25, 0xf7, 0xeb, 0x4a, 0xc9, 0xa9, 0xbb, 0x60, 0x27, 0xe6, - 0x50, 0x47, 0xac, 0x3f, 0x63, 0x51, 0xbf, 0x70, 0xf7, 0xef, 0xfa, 0xf6, 0x1f, 0xf7, 0x75, 0x50, - 0x0c, 0x9d, 0x10, 0x3b, 0xb0, 0x5e, 0x6c, 0x96, 0xa7, 0x23, 0x65, 0x2b, 0x62, 0x92, 0xd8, 0xaa, - 0xbe, 0xce, 0x9f, 0xdf, 0xd8, 0xe2, 0x21, 0x28, 0x74, 0x90, 0x61, 0x23, 0x77, 0x95, 0x2b, 0x3d, - 0xc4, 0x64, 0xee, 0x78, 0xb9, 0xab, 0x45, 0xc7, 0x3f, 0xf2, 0x60, 0x2b, 0xa8, 0x61, 0xd7, 0xb0, - 0xff, 0xa1, 0xe5, 0x78, 0xc6, 0x6b, 0x77, 0x91, 0x71, 0xfe, 0x3f, 0x65, 0x7c, 0x0a, 0xca, 0x7d, - 0x97, 0xd2, 0xf3, 0xb6, 0xcf, 0x6d, 0xb7, 0xb9, 0x6e, 0xe5, 0x5e, 0x55, 0xa8, 0x95, 0x9a, 0xca, - 0x74, 0xa4, 0xec, 0x71, 0xa6, 0x24, 0x94, 0xaa, 0x8b, 0xc1, 0xeb, 0xe8, 0x5f, 0x76, 0x01, 0xf6, - 0x63, 0xe0, 0x58, 0xef, 0xf7, 0x03, 0xee, 0xda, 0x74, 0xa4, 0x1c, 0x24, 0x72, 0xc7, 0x7b, 0x96, - 0x22, 0x22, 0x69, 0x33, 0x5a, 0x48, 0x49, 0x5c, 0x02, 0x95, 0x78, 0xaa, 0x8b, 0xc8, 0xbf, 0x09, - 0xe0, 0x71, 0x8b, 0xe1, 0x33, 0xdf, 0xec, 0x11, 0xaf, 0x45, 0x98, 0x89, 0x3a, 0xc6, 0x80, 0x50, - 0xdf, 0xfd, 0x9b, 0xdc, 0x5f, 0x81, 0x52, 0x6f, 0x89, 0x62, 0xe5, 0xc0, 0x46, 0x90, 0x19, 0xc6, - 0x56, 0x01, 0xfb, 0x89, 0x7d, 0xce, 0x9d, 0x34, 0xbe, 0xe6, 0x41, 0xbe, 0xc5, 0xb0, 0xf8, 0x11, - 0x94, 0x22, 0x1f, 0x9c, 0x27, 0xda, 0xed, 0x6f, 0x9d, 0x16, 0x3b, 0xb3, 0xd2, 0xb3, 0x0c, 0xa0, - 0xb9, 0xd2, 0x4c, 0x21, 0x72, 0xa8, 0xd3, 0x14, 0x96, 0x41, 0xa9, 0x0a, 0x49, 0x07, 0x51, 0xb4, - 0xc0, 0x83, 0xe8, 0x44, 0x1d, 0xa4, 0xee, 0x5e, 0x42, 0x49, 0x87, 0x59, 0x50, 0x0b, 0x11, 0x17, - 0x88, 0x09, 0xb1, 0x3f, 0x4d, 0xe1, 0xb8, 0x0d, 0x95, 0xea, 0x99, 0xa1, 0x73, 0xcd, 0xe6, 0xe9, - 0xf7, 0xb1, 0x2c, 0x5c, 0x8f, 0x65, 0xe1, 0x66, 0x2c, 0x0b, 0x9f, 0x27, 0x72, 0xee, 0x7a, 0x22, - 0xe7, 0x7e, 0x4e, 0xe4, 0xdc, 0x87, 0x97, 0x98, 0x78, 0x1d, 0xdf, 0xd4, 0x2c, 0xda, 0x83, 0x16, - 0x65, 0x3d, 0xca, 0xc2, 0x9f, 0x23, 0x66, 0x5f, 0xc0, 0x4b, 0xb8, 0xb8, 0x6b, 0x9e, 0x37, 0x8e, - 0xc2, 0xeb, 0xc6, 0x1b, 0xf6, 0x11, 0x33, 0x0b, 0xc1, 0x58, 0xbd, 0xf8, 0x1d, 0x00, 0x00, 0xff, - 0xff, 0xf4, 0xf1, 0xa7, 0x9a, 0xf0, 0x06, 0x00, 0x00, + 0xd1, 0xfa, 0x48, 0x10, 0x12, 0xea, 0x46, 0x3a, 0x31, 0x44, 0x80, 0x2b, 0x06, 0x58, 0x82, 0xff, + 0x5c, 0x2f, 0xa7, 0x26, 0xbe, 0xc8, 0x67, 0x47, 0xcd, 0x37, 0x60, 0x64, 0xe0, 0x03, 0x54, 0x0c, + 0x7c, 0x16, 0xc6, 0x0e, 0x0c, 0x4c, 0x51, 0x95, 0x2c, 0xcc, 0xf9, 0x04, 0x28, 0x3e, 0x27, 0xc4, + 0xae, 0x1d, 0x59, 0x40, 0x37, 0x9f, 0x7f, 0xef, 0xde, 0xfb, 0x3d, 0xbf, 0xdf, 0xf9, 0xc0, 0x1e, + 0x31, 0x2d, 0x68, 0x51, 0x17, 0x41, 0xab, 0x4b, 0x90, 0xe3, 0xc1, 0x41, 0x1d, 0x7a, 0x17, 0x5a, + 0xdf, 0xa5, 0x1e, 0x15, 0x45, 0x62, 0x5a, 0xda, 0xac, 0xa8, 0xf1, 0xa2, 0x36, 0xa8, 0x4b, 0x65, + 0x4c, 0x31, 0x0d, 0xca, 0x70, 0xf6, 0xc4, 0x91, 0xd2, 0x2e, 0xa6, 0x14, 0x77, 0x11, 0x0c, 0x56, + 0xa6, 0x7f, 0x06, 0x0d, 0x67, 0x18, 0x96, 0x94, 0x04, 0x85, 0x90, 0x2e, 0x00, 0xa8, 0xd7, 0x02, + 0xd8, 0x6c, 0x31, 0x7c, 0xe2, 0x22, 0xc3, 0x43, 0x27, 0x41, 0x45, 0x7c, 0x03, 0x4a, 0x1c, 0xd3, + 0x66, 0x9e, 0xe1, 0xa1, 0x8a, 0x50, 0x15, 0x6a, 0x1b, 0x8d, 0xb2, 0xc6, 0x65, 0xb4, 0xb9, 0x8c, + 0xf6, 0xd2, 0x19, 0x36, 0x77, 0xa6, 0x23, 0xe5, 0xc1, 0xd0, 0xe8, 0x75, 0x8f, 0xd5, 0xe5, 0x3d, + 0xaa, 0xbe, 0xc1, 0x97, 0xa7, 0xb3, 0x95, 0xf8, 0x1e, 0x6c, 0x5a, 0xd4, 0x61, 0xc8, 0x61, 0x3e, + 0x0b, 0x49, 0xd7, 0x56, 0x90, 0x4a, 0xd3, 0x91, 0xb2, 0x1d, 0x92, 0x46, 0xb7, 0xa9, 0xfa, 0xfd, + 0xc5, 0x1b, 0x4e, 0xbd, 0x0d, 0x0a, 0x8c, 0x60, 0x07, 0xb9, 0x95, 0x7c, 0x55, 0xa8, 0x15, 0xf5, + 0x70, 0x75, 0xbc, 0xfe, 0xe9, 0x52, 0xc9, 0xfd, 0xba, 0x54, 0x72, 0xea, 0x2e, 0xd8, 0x89, 0x39, + 0xd4, 0x11, 0xeb, 0xcf, 0x58, 0xd4, 0x2f, 0xdc, 0xfd, 0xbb, 0xbe, 0xfd, 0xc7, 0x7d, 0x1d, 0x14, + 0x43, 0x27, 0xc4, 0x0e, 0xac, 0x17, 0x9b, 0xe5, 0xe9, 0x48, 0xd9, 0x8a, 0x98, 0x24, 0xb6, 0xaa, + 0xaf, 0xf3, 0xe7, 0x57, 0xb6, 0x78, 0x08, 0x0a, 0x1d, 0x64, 0xd8, 0xc8, 0x5d, 0xe5, 0x4a, 0x0f, + 0x31, 0x99, 0x3b, 0x5e, 0xee, 0x6a, 0xd1, 0xf1, 0x8f, 0x3c, 0xd8, 0x0a, 0x6a, 0xd8, 0x35, 0xec, + 0x7f, 0x68, 0x39, 0x9e, 0xf1, 0xda, 0x6d, 0x64, 0x9c, 0xff, 0x4f, 0x19, 0xbf, 0x05, 0xe5, 0xbe, + 0x4b, 0xe9, 0x59, 0xdb, 0xe7, 0xb6, 0xdb, 0x5c, 0xb7, 0x72, 0xa7, 0x2a, 0xd4, 0x4a, 0x4d, 0x65, + 0x3a, 0x52, 0xf6, 0x38, 0x53, 0x12, 0x4a, 0xd5, 0xc5, 0xe0, 0x75, 0xf4, 0x93, 0x9d, 0x83, 0xfd, + 0x18, 0x38, 0xd6, 0xfb, 0xdd, 0x80, 0xbb, 0x36, 0x1d, 0x29, 0x07, 0x89, 0xdc, 0xf1, 0x9e, 0xa5, + 0x88, 0x48, 0xda, 0x8c, 0x16, 0x52, 0x12, 0x97, 0x40, 0x25, 0x9e, 0xea, 0x22, 0xf2, 0x6f, 0x02, + 0x78, 0xd8, 0x62, 0xf8, 0xd4, 0x37, 0x7b, 0xc4, 0x6b, 0x11, 0x66, 0xa2, 0x8e, 0x31, 0x20, 0xd4, + 0x77, 0xff, 0x26, 0xf7, 0x17, 0xa0, 0xd4, 0x5b, 0xa2, 0x58, 0x39, 0xb0, 0x11, 0x64, 0x86, 0xb1, + 0x55, 0xc0, 0x7e, 0x62, 0x9f, 0x73, 0x27, 0x8d, 0xaf, 0x79, 0x90, 0x6f, 0x31, 0x2c, 0x7e, 0x04, + 0xa5, 0xc8, 0x0f, 0xe7, 0x91, 0x76, 0xf3, 0x5f, 0xa7, 0xc5, 0xce, 0xac, 0xf4, 0x24, 0x03, 0x68, + 0xae, 0x34, 0x53, 0x88, 0x1c, 0xea, 0x34, 0x85, 0x65, 0x50, 0xaa, 0x42, 0xd2, 0x41, 0x14, 0x2d, + 0x70, 0x2f, 0x3a, 0x51, 0x07, 0xa9, 0xbb, 0x97, 0x50, 0xd2, 0x61, 0x16, 0xd4, 0x42, 0xc4, 0x05, + 0x62, 0x42, 0xec, 0x8f, 0x53, 0x38, 0x6e, 0x42, 0xa5, 0x7a, 0x66, 0xe8, 0x5c, 0xb3, 0xf9, 0xfa, + 0xfb, 0x58, 0x16, 0xae, 0xc6, 0xb2, 0x70, 0x3d, 0x96, 0x85, 0xcf, 0x13, 0x39, 0x77, 0x35, 0x91, + 0x73, 0x3f, 0x27, 0x72, 0xee, 0xc3, 0x73, 0x4c, 0xbc, 0x8e, 0x6f, 0x6a, 0x16, 0xed, 0xc1, 0x2e, + 0x71, 0x10, 0xec, 0x9a, 0xbd, 0x23, 0x66, 0x9f, 0xc3, 0x41, 0x03, 0x5e, 0xc0, 0xc5, 0x4d, 0xf3, + 0xb4, 0x71, 0x14, 0x5e, 0x36, 0xde, 0xb0, 0x8f, 0x98, 0x59, 0x08, 0x86, 0xea, 0xd9, 0xef, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x9f, 0xd5, 0x79, 0xd1, 0xee, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/core/03-connection/keeper/keeper.go b/x/ibc/core/03-connection/keeper/keeper.go index e6882b80df..eab1e50a4f 100644 --- a/x/ibc/core/03-connection/keeper/keeper.go +++ b/x/ibc/core/03-connection/keeper/keeper.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/ibc/core/03-connection/types/connection.pb.go b/x/ibc/core/03-connection/types/connection.pb.go index ed2560fe38..a17f684dfc 100644 --- a/x/ibc/core/03-connection/types/connection.pb.go +++ b/x/ibc/core/03-connection/types/connection.pb.go @@ -368,48 +368,48 @@ func init() { } var fileDescriptor_90572467c054e43a = []byte{ - // 654 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x41, 0x6b, 0xdb, 0x4c, - 0x14, 0x94, 0x64, 0x39, 0xb1, 0xd7, 0xf1, 0xf7, 0xb9, 0x5b, 0xd3, 0x0a, 0x41, 0x24, 0xa1, 0x16, - 0x6a, 0x0a, 0xb1, 0xea, 0x04, 0x7a, 0x48, 0xe8, 0x21, 0x76, 0x5c, 0x10, 0x6d, 0x5d, 0xa3, 0x38, - 0x85, 0xe6, 0x62, 0x6c, 0x69, 0x93, 0x2c, 0xb1, 0xb5, 0x42, 0xda, 0x98, 0xf8, 0x1f, 0x84, 0x9c, - 0x7a, 0xed, 0x21, 0x50, 0xe8, 0x7f, 0x29, 0xa1, 0xa7, 0x1c, 0x7b, 0x32, 0x25, 0xb9, 0xf6, 0xe4, - 0x5f, 0x50, 0xa4, 0x95, 0x65, 0x25, 0x34, 0x87, 0xa4, 0x3d, 0xf9, 0xcd, 0xbe, 0x99, 0xf1, 0xbe, - 0xf1, 0xf3, 0x82, 0x67, 0xb8, 0x6f, 0x1b, 0x36, 0xf1, 0x91, 0x61, 0x13, 0xd7, 0x45, 0x36, 0xc5, - 0xc4, 0x35, 0x46, 0xb5, 0x14, 0xaa, 0x7a, 0x3e, 0xa1, 0x04, 0x3e, 0xc2, 0x7d, 0xbb, 0x1a, 0x12, - 0xab, 0xa9, 0xd6, 0xa8, 0x26, 0x97, 0xf7, 0xc9, 0x3e, 0x89, 0x28, 0x46, 0x58, 0x31, 0xb6, 0x9c, - 0xb6, 0x1d, 0x0e, 0x31, 0x1d, 0x22, 0x97, 0x32, 0xdb, 0x19, 0x62, 0x44, 0xfd, 0x9b, 0x00, 0x8a, - 0x8d, 0xc4, 0xb0, 0xe9, 0x3a, 0xb0, 0x06, 0xf2, 0xf6, 0x00, 0x23, 0x97, 0x76, 0xb1, 0x23, 0xf1, - 0x1a, 0x5f, 0xc9, 0xd7, 0xcb, 0xd3, 0x89, 0x5a, 0x1a, 0xf7, 0x86, 0x83, 0x75, 0x3d, 0x69, 0xe9, - 0x56, 0x8e, 0xd5, 0xa6, 0x03, 0x37, 0x40, 0x6e, 0x84, 0xfc, 0x00, 0x13, 0x37, 0x90, 0x04, 0x2d, - 0x53, 0x29, 0xac, 0xaa, 0xd5, 0x3f, 0x5f, 0xb7, 0xfa, 0x81, 0xf1, 0xac, 0x44, 0x00, 0xd7, 0x40, - 0x36, 0xa0, 0x3d, 0x8a, 0xa4, 0x8c, 0xc6, 0x57, 0xfe, 0x5b, 0x5d, 0xbe, 0x4d, 0xb9, 0x1d, 0x92, - 0x2c, 0xc6, 0x85, 0x2d, 0xb0, 0x64, 0x93, 0x23, 0x97, 0x22, 0xdf, 0xeb, 0xf9, 0x74, 0x2c, 0x89, - 0x1a, 0x5f, 0x29, 0xac, 0x3e, 0xbd, 0x4d, 0xdb, 0x48, 0x71, 0xeb, 0xe2, 0xf9, 0x44, 0xe5, 0xac, - 0x6b, 0x7a, 0xb8, 0x0e, 0x96, 0x1c, 0x34, 0xe8, 0x8d, 0xbb, 0x1e, 0xf2, 0x31, 0x71, 0xa4, 0xac, - 0xc6, 0x57, 0xc4, 0xfa, 0xe3, 0xe9, 0x44, 0x7d, 0xc8, 0xe6, 0x4e, 0x77, 0x75, 0xab, 0x10, 0xc1, - 0x76, 0x84, 0xd6, 0xc5, 0x93, 0x2f, 0x2a, 0xa7, 0xff, 0x12, 0x40, 0xd9, 0x74, 0x90, 0x4b, 0xf1, - 0x1e, 0x46, 0xce, 0x3c, 0x52, 0xb8, 0x0c, 0x84, 0x24, 0xc8, 0xe2, 0x74, 0xa2, 0xe6, 0x99, 0x61, - 0x98, 0xa0, 0x80, 0x6f, 0xc4, 0x2d, 0xdc, 0x39, 0xee, 0xcc, 0xbd, 0xe3, 0x16, 0xff, 0x22, 0xee, - 0xec, 0x3f, 0x8e, 0x7b, 0xe1, 0xce, 0x71, 0x7f, 0xe7, 0xc1, 0x52, 0xfa, 0x6b, 0xee, 0xb3, 0xb6, - 0xaf, 0x40, 0x71, 0x7e, 0xef, 0x79, 0xfc, 0xd2, 0x74, 0xa2, 0x96, 0x63, 0x59, 0xba, 0xad, 0x87, - 0x43, 0xcc, 0xb0, 0xe9, 0xc0, 0x3a, 0x58, 0xf0, 0x7c, 0xb4, 0x87, 0x8f, 0xa3, 0xcd, 0xbd, 0x11, - 0x47, 0xf2, 0x37, 0x1b, 0xd5, 0xaa, 0xef, 0x90, 0x7f, 0x38, 0x40, 0xed, 0x88, 0x1b, 0xc7, 0x11, - 0x2b, 0xe3, 0x61, 0x9e, 0x80, 0x42, 0x23, 0xba, 0x54, 0xbb, 0x47, 0x0f, 0x02, 0x58, 0x06, 0x59, - 0x2f, 0x2c, 0x24, 0x5e, 0xcb, 0x54, 0xf2, 0x16, 0x03, 0xfa, 0x2e, 0xf8, 0x7f, 0xbe, 0x55, 0x8c, - 0x78, 0x8f, 0x99, 0x13, 0x6f, 0x21, 0xed, 0xfd, 0x06, 0x2c, 0xc6, 0x9b, 0x02, 0x15, 0x00, 0xf0, - 0x6c, 0x8d, 0x7d, 0x66, 0x6a, 0xa5, 0x4e, 0xa0, 0x0c, 0x72, 0x7b, 0xa8, 0x47, 0x8f, 0x7c, 0x34, - 0xf3, 0x48, 0x30, 0x9b, 0xe6, 0xf9, 0x67, 0x1e, 0x64, 0xa3, 0xed, 0x81, 0x2f, 0x81, 0xba, 0xdd, - 0xd9, 0xec, 0x34, 0xbb, 0x3b, 0x2d, 0xb3, 0x65, 0x76, 0xcc, 0xcd, 0xb7, 0xe6, 0x6e, 0x73, 0xab, - 0xbb, 0xd3, 0xda, 0x6e, 0x37, 0x1b, 0xe6, 0x6b, 0xb3, 0xb9, 0x55, 0xe2, 0xe4, 0x07, 0xa7, 0x67, - 0x5a, 0xf1, 0x1a, 0x01, 0x4a, 0x00, 0x30, 0x5d, 0x78, 0x58, 0xe2, 0xe5, 0xdc, 0xe9, 0x99, 0x26, - 0x86, 0x35, 0x54, 0x40, 0x91, 0x75, 0x3a, 0xd6, 0xc7, 0xf7, 0xed, 0x66, 0xab, 0x24, 0xc8, 0x85, - 0xd3, 0x33, 0x6d, 0x31, 0x86, 0x73, 0x65, 0xd4, 0xcc, 0x30, 0x65, 0x58, 0xcb, 0xe2, 0xc9, 0x57, - 0x85, 0xab, 0xef, 0x9c, 0x5f, 0x2a, 0xfc, 0xc5, 0xa5, 0xc2, 0xff, 0xbc, 0x54, 0xf8, 0x4f, 0x57, - 0x0a, 0x77, 0x71, 0xa5, 0x70, 0x3f, 0xae, 0x14, 0x6e, 0x77, 0x63, 0x1f, 0xd3, 0x83, 0xa3, 0x7e, - 0xf8, 0xd3, 0x19, 0x36, 0x09, 0x86, 0x24, 0x88, 0x3f, 0x56, 0x02, 0xe7, 0xd0, 0x38, 0x36, 0x92, - 0x07, 0xf5, 0xc5, 0xda, 0x4a, 0xea, 0xa9, 0xa6, 0x63, 0x0f, 0x05, 0xfd, 0x85, 0xe8, 0x31, 0x5d, - 0xfb, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x48, 0x0f, 0xf2, 0xaa, 0xce, 0x05, 0x00, 0x00, + // 656 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xd1, 0x6b, 0xda, 0x5e, + 0x14, 0x4e, 0x62, 0x6c, 0xf5, 0x58, 0x7f, 0x3f, 0x77, 0x27, 0x5b, 0x08, 0x34, 0x09, 0xd9, 0x60, + 0x32, 0xa8, 0x99, 0x16, 0x06, 0xeb, 0xd8, 0x43, 0xb5, 0x0e, 0xc2, 0x36, 0x27, 0xd1, 0x0e, 0xd6, + 0x17, 0xd1, 0xe4, 0xb6, 0xbd, 0x54, 0x13, 0x89, 0xb7, 0x52, 0xff, 0x83, 0xd2, 0xa7, 0xbd, 0xee, + 0xa1, 0x30, 0xd8, 0xff, 0x32, 0xca, 0x9e, 0xfa, 0xb8, 0x27, 0x19, 0xed, 0xeb, 0x9e, 0xfc, 0x0b, + 0x46, 0x72, 0x35, 0xa6, 0x65, 0x7d, 0x68, 0xb7, 0xb7, 0xf3, 0xdd, 0xf3, 0x7d, 0x9f, 0xf7, 0x7c, + 0x9e, 0x5c, 0x78, 0x42, 0xba, 0xb6, 0x61, 0x7b, 0x3e, 0x36, 0x6c, 0xcf, 0x75, 0xb1, 0x4d, 0x89, + 0xe7, 0x1a, 0xa3, 0x52, 0x0c, 0x15, 0x07, 0xbe, 0x47, 0x3d, 0xf4, 0x80, 0x74, 0xed, 0x62, 0x40, + 0x2c, 0xc6, 0x5a, 0xa3, 0x92, 0x9c, 0xdf, 0xf3, 0xf6, 0xbc, 0x90, 0x62, 0x04, 0x15, 0x63, 0xcb, + 0x71, 0xdb, 0x7e, 0x9f, 0xd0, 0x3e, 0x76, 0x29, 0xb3, 0x9d, 0x23, 0x46, 0xd4, 0xbf, 0x09, 0x90, + 0xad, 0x46, 0x86, 0x35, 0xd7, 0x41, 0x25, 0x48, 0xdb, 0x3d, 0x82, 0x5d, 0xda, 0x26, 0x8e, 0xc4, + 0x6b, 0x7c, 0x21, 0x5d, 0xc9, 0x4f, 0x27, 0x6a, 0x6e, 0xdc, 0xe9, 0xf7, 0x36, 0xf4, 0xa8, 0xa5, + 0x5b, 0x29, 0x56, 0x9b, 0x0e, 0x7a, 0x09, 0xa9, 0x11, 0xf6, 0x87, 0xc4, 0x73, 0x87, 0x92, 0xa0, + 0x25, 0x0a, 0x99, 0xb2, 0x5a, 0xfc, 0xf3, 0x75, 0x8b, 0x1f, 0x18, 0xcf, 0x8a, 0x04, 0x68, 0x1d, + 0x92, 0x43, 0xda, 0xa1, 0x58, 0x4a, 0x68, 0x7c, 0xe1, 0xbf, 0xf2, 0xea, 0x4d, 0xca, 0x66, 0x40, + 0xb2, 0x18, 0x17, 0xd5, 0x61, 0xc5, 0xf6, 0x0e, 0x5d, 0x8a, 0xfd, 0x41, 0xc7, 0xa7, 0x63, 0x49, + 0xd4, 0xf8, 0x42, 0xa6, 0xfc, 0xf8, 0x26, 0x6d, 0x35, 0xc6, 0xad, 0x88, 0x67, 0x13, 0x95, 0xb3, + 0xae, 0xe8, 0xd1, 0x06, 0xac, 0x38, 0xb8, 0xd7, 0x19, 0xb7, 0x07, 0xd8, 0x27, 0x9e, 0x23, 0x25, + 0x35, 0xbe, 0x20, 0x56, 0x1e, 0x4e, 0x27, 0xea, 0x7d, 0x36, 0x77, 0xbc, 0xab, 0x5b, 0x99, 0x10, + 0x36, 0x42, 0xb4, 0x21, 0x1e, 0x7f, 0x51, 0x39, 0xfd, 0x97, 0x00, 0x79, 0xd3, 0xc1, 0x2e, 0x25, + 0xbb, 0x04, 0x3b, 0x8b, 0x48, 0xd1, 0x2a, 0x08, 0x51, 0x90, 0xd9, 0xe9, 0x44, 0x4d, 0x33, 0xc3, + 0x20, 0x41, 0x81, 0x5c, 0x8b, 0x5b, 0xb8, 0x75, 0xdc, 0x89, 0x3b, 0xc7, 0x2d, 0xfe, 0x45, 0xdc, + 0xc9, 0x7f, 0x1c, 0xf7, 0xd2, 0xad, 0xe3, 0xfe, 0xce, 0xc3, 0x4a, 0xfc, 0x67, 0xee, 0xb2, 0xb6, + 0xaf, 0x20, 0xbb, 0xb8, 0xf7, 0x22, 0x7e, 0x69, 0x3a, 0x51, 0xf3, 0x33, 0x59, 0xbc, 0xad, 0x07, + 0x43, 0xcc, 0xb1, 0xe9, 0xa0, 0x0a, 0x2c, 0x0d, 0x7c, 0xbc, 0x4b, 0x8e, 0xc2, 0xcd, 0xbd, 0x16, + 0x47, 0xf4, 0x99, 0x8d, 0x4a, 0xc5, 0x77, 0xd8, 0x3f, 0xe8, 0xe1, 0x46, 0xc8, 0x9d, 0xc5, 0x31, + 0x53, 0xce, 0x86, 0x79, 0x04, 0x99, 0x6a, 0x78, 0xa9, 0x46, 0x87, 0xee, 0x0f, 0x51, 0x1e, 0x92, + 0x83, 0xa0, 0x90, 0x78, 0x2d, 0x51, 0x48, 0x5b, 0x0c, 0xe8, 0x3b, 0xf0, 0xff, 0x62, 0xab, 0x18, + 0xf1, 0x0e, 0x33, 0x47, 0xde, 0x42, 0xdc, 0xfb, 0x0d, 0x2c, 0xcf, 0x36, 0x05, 0x29, 0x00, 0x64, + 0xbe, 0xc6, 0x3e, 0x33, 0xb5, 0x62, 0x27, 0x48, 0x86, 0xd4, 0x2e, 0xee, 0xd0, 0x43, 0x1f, 0xcf, + 0x3d, 0x22, 0xcc, 0xa6, 0x79, 0xfa, 0x99, 0x87, 0x64, 0xb8, 0x3d, 0xe8, 0x39, 0xa8, 0xcd, 0xd6, + 0x66, 0xab, 0xd6, 0xde, 0xae, 0x9b, 0x75, 0xb3, 0x65, 0x6e, 0xbe, 0x35, 0x77, 0x6a, 0x5b, 0xed, + 0xed, 0x7a, 0xb3, 0x51, 0xab, 0x9a, 0xaf, 0xcd, 0xda, 0x56, 0x8e, 0x93, 0xef, 0x9d, 0x9c, 0x6a, + 0xd9, 0x2b, 0x04, 0x24, 0x01, 0x30, 0x5d, 0x70, 0x98, 0xe3, 0xe5, 0xd4, 0xc9, 0xa9, 0x26, 0x06, + 0x35, 0x52, 0x20, 0xcb, 0x3a, 0x2d, 0xeb, 0xe3, 0xfb, 0x46, 0xad, 0x9e, 0x13, 0xe4, 0xcc, 0xc9, + 0xa9, 0xb6, 0x3c, 0x83, 0x0b, 0x65, 0xd8, 0x4c, 0x30, 0x65, 0x50, 0xcb, 0xe2, 0xf1, 0x57, 0x85, + 0xab, 0x34, 0xcf, 0x2e, 0x14, 0xfe, 0xfc, 0x42, 0xe1, 0x7f, 0x5e, 0x28, 0xfc, 0xa7, 0x4b, 0x85, + 0x3b, 0xbf, 0x54, 0xb8, 0x1f, 0x97, 0x0a, 0xb7, 0xf3, 0x62, 0x8f, 0xd0, 0xfd, 0xc3, 0x6e, 0xf0, + 0xd7, 0x19, 0x3d, 0xe2, 0x62, 0xa3, 0xd7, 0xed, 0xaf, 0x0d, 0x9d, 0x03, 0x63, 0x54, 0x36, 0x8e, + 0x8c, 0xe8, 0x39, 0x7d, 0xb6, 0xbe, 0x16, 0x7b, 0xa8, 0xe9, 0x78, 0x80, 0x87, 0xdd, 0xa5, 0xf0, + 0x29, 0x5d, 0xff, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x26, 0x3a, 0x94, 0x12, 0xcc, 0x05, 0x00, 0x00, } func (m *ConnectionEnd) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/core/03-connection/types/genesis.pb.go b/x/ibc/core/03-connection/types/genesis.pb.go index 5f33f166ae..c4dc1b1ecf 100644 --- a/x/ibc/core/03-connection/types/genesis.pb.go +++ b/x/ibc/core/03-connection/types/genesis.pb.go @@ -95,27 +95,27 @@ func init() { var fileDescriptor_1879d34bc6ac3cd7 = []byte{ // 326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0xc9, 0x4c, 0x4a, 0xd6, - 0x4f, 0xce, 0x2f, 0x4a, 0xd5, 0x4f, 0xce, 0xcf, 0xcb, 0x4b, 0x4d, 0x2e, 0xc9, 0xcc, 0xcf, 0xd3, - 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, - 0x17, 0x12, 0xcb, 0x4c, 0x4a, 0xd6, 0x03, 0xa9, 0xd2, 0x43, 0xa8, 0xd2, 0x2b, 0x33, 0x94, 0x12, - 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd1, 0x07, 0xb1, 0x20, 0xaa, 0xa5, 0xd4, 0x71, 0x98, 0x89, - 0xa4, 0x17, 0xac, 0x50, 0xe9, 0x2c, 0x13, 0x17, 0x8f, 0x3b, 0xc4, 0xa2, 0xe0, 0x92, 0xc4, 0x92, - 0x54, 0xa1, 0x10, 0x2e, 0x6e, 0x84, 0xa2, 0x62, 0x09, 0x46, 0x05, 0x66, 0x0d, 0x6e, 0x23, 0x1d, - 0x3d, 0xec, 0xb6, 0xeb, 0x79, 0xa6, 0xa4, 0xe6, 0x95, 0x64, 0xa6, 0x65, 0xa6, 0xa6, 0x38, 0xc3, - 0xc5, 0x9d, 0x58, 0x4e, 0xdc, 0x93, 0x67, 0x08, 0x42, 0x36, 0x46, 0xa8, 0x9d, 0x91, 0x4b, 0x3c, - 0x39, 0x27, 0x33, 0x35, 0xaf, 0x24, 0x1e, 0x21, 0x1c, 0x5f, 0x90, 0x58, 0x92, 0x51, 0x2c, 0xc1, - 0x04, 0xb6, 0x42, 0x1d, 0x97, 0x15, 0x08, 0x83, 0x03, 0x40, 0xca, 0x9d, 0xd4, 0x40, 0xa6, 0x7f, - 0xba, 0x27, 0x2f, 0x57, 0x99, 0x98, 0x9b, 0x63, 0xa5, 0x84, 0xc3, 0x54, 0xa5, 0x20, 0x51, 0x88, - 0x0c, 0x9a, 0x76, 0xa1, 0x58, 0x2e, 0x89, 0xbc, 0xd4, 0x0a, 0x14, 0x0d, 0xc5, 0xa9, 0x85, 0xa5, - 0xa9, 0x79, 0xc9, 0xa9, 0x12, 0xcc, 0x0a, 0x8c, 0x1a, 0x2c, 0x4e, 0xca, 0x9f, 0xee, 0xc9, 0xcb, - 0x43, 0x0c, 0xc7, 0xa5, 0x52, 0x29, 0x48, 0x0c, 0x24, 0x85, 0x30, 0x3b, 0x18, 0x2a, 0xe1, 0x14, - 0x7a, 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, 0xd6, 0xe9, 0x99, 0x25, 0x19, - 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xc9, 0xf9, 0xc5, 0xb9, 0xf9, 0xc5, 0x50, 0x4a, 0xb7, - 0x38, 0x25, 0x5b, 0xbf, 0x42, 0x1f, 0x1e, 0x63, 0x06, 0xc6, 0xba, 0x48, 0x91, 0x56, 0x52, 0x59, - 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x2d, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0b, 0xad, - 0x14, 0x09, 0x2c, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0xb1, 0x4e, 0xc2, 0x40, + 0x1c, 0xc6, 0x7b, 0x40, 0x1c, 0x8a, 0x53, 0xa3, 0xd8, 0x30, 0x5c, 0x49, 0x35, 0xc2, 0x20, 0x77, + 0x02, 0x93, 0x8e, 0x75, 0x30, 0x6e, 0x06, 0x9c, 0x4c, 0x0c, 0xa1, 0xc7, 0xdf, 0x72, 0xb1, 0xdc, + 0x21, 0x77, 0x10, 0x78, 0x02, 0x57, 0x1f, 0x8b, 0xc5, 0x84, 0xd1, 0x89, 0x18, 0x78, 0x03, 0x9e, + 0xc0, 0xb4, 0x35, 0x14, 0x8d, 0xdd, 0x2e, 0xf7, 0xff, 0x7d, 0xbf, 0x6f, 0xf8, 0xcc, 0x33, 0xee, + 0x33, 0xca, 0xe4, 0x18, 0x28, 0x93, 0x42, 0x00, 0xd3, 0x5c, 0x0a, 0x3a, 0x6d, 0xd0, 0x00, 0x04, + 0x28, 0xae, 0xc8, 0x68, 0x2c, 0xb5, 0xb4, 0x4a, 0xdc, 0x67, 0x24, 0xa2, 0x48, 0x4a, 0x91, 0x69, + 0xa3, 0x7c, 0x14, 0xc8, 0x40, 0xc6, 0x08, 0x8d, 0x5e, 0x09, 0x5d, 0xae, 0x66, 0x38, 0xf7, 0xb2, + 0x31, 0xe8, 0x7e, 0xe4, 0xcc, 0xc3, 0xdb, 0xa4, 0xa8, 0xa3, 0x7b, 0x1a, 0xac, 0x07, 0xb3, 0x98, + 0x42, 0xca, 0x46, 0x95, 0x7c, 0xad, 0xd8, 0xbc, 0x20, 0xff, 0xb7, 0x93, 0xbb, 0x3e, 0x08, 0xcd, + 0x9f, 0x39, 0xf4, 0x6f, 0x76, 0xff, 0x5e, 0x61, 0xb1, 0x72, 0x8c, 0xf6, 0xbe, 0xc6, 0x7a, 0x43, + 0xe6, 0x09, 0x0b, 0x39, 0x08, 0xdd, 0x4d, 0xbf, 0xbb, 0xa3, 0x9e, 0x1e, 0x28, 0x3b, 0x17, 0x57, + 0x54, 0xb3, 0x2a, 0x52, 0xf1, 0x7d, 0x84, 0x7b, 0xe7, 0x91, 0x7d, 0xbb, 0x72, 0xf0, 0xbc, 0x37, + 0x0c, 0xaf, 0xdd, 0x0c, 0xab, 0xdb, 0x3e, 0x4e, 0x2e, 0x7f, 0xe2, 0xd6, 0x93, 0x69, 0x0b, 0x98, + 0xfd, 0x0a, 0x28, 0x78, 0x9d, 0x80, 0x60, 0x60, 0xe7, 0x2b, 0xa8, 0x56, 0xf0, 0x4e, 0xb7, 0x2b, + 0xc7, 0x49, 0xe4, 0x59, 0xa4, 0xdb, 0x2e, 0x45, 0xa7, 0xd4, 0xdd, 0xf9, 0x39, 0x78, 0x9d, 0xc5, + 0x1a, 0xa3, 0xe5, 0x1a, 0xa3, 0xaf, 0x35, 0x46, 0xef, 0x1b, 0x6c, 0x2c, 0x37, 0xd8, 0xf8, 0xdc, + 0x60, 0xe3, 0xf1, 0x2a, 0xe0, 0x7a, 0x30, 0xf1, 0x09, 0x93, 0x43, 0x1a, 0x72, 0x01, 0x34, 0xf4, + 0x87, 0x75, 0xd5, 0x7f, 0xa1, 0xd3, 0x26, 0x9d, 0xd1, 0xdd, 0x5e, 0x97, 0xad, 0xfa, 0xde, 0x64, + 0x7a, 0x3e, 0x02, 0xe5, 0x1f, 0xc4, 0x5b, 0xb5, 0xbe, 0x03, 0x00, 0x00, 0xff, 0xff, 0xd8, 0x43, + 0x7c, 0xb5, 0x2a, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/core/03-connection/types/msgs_test.go b/x/ibc/core/03-connection/types/msgs_test.go index 0a486eec29..a2b4837acf 100644 --- a/x/ibc/core/03-connection/types/msgs_test.go +++ b/x/ibc/core/03-connection/types/msgs_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tm-db" + abci "github.com/line/ostracon/abci/types" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/simapp" "github.com/line/lbm-sdk/v2/store/iavl" diff --git a/x/ibc/core/03-connection/types/query.pb.go b/x/ibc/core/03-connection/types/query.pb.go index 2e53ef6b14..28bdf53e52 100644 --- a/x/ibc/core/03-connection/types/query.pb.go +++ b/x/ibc/core/03-connection/types/query.pb.go @@ -635,63 +635,63 @@ func init() { } var fileDescriptor_cd8d529f8c7cd06b = []byte{ - // 892 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x41, 0x4f, 0x33, 0x45, - 0x18, 0xee, 0x14, 0xbe, 0x2f, 0x1f, 0x53, 0xfc, 0x3e, 0x9d, 0x14, 0xa8, 0xab, 0x16, 0x5c, 0x45, - 0x0a, 0x91, 0x19, 0x0a, 0xd1, 0x20, 0xd0, 0x44, 0x21, 0x88, 0x1c, 0x24, 0xb8, 0xc6, 0x8b, 0x17, - 0xb2, 0xbb, 0x1d, 0xb6, 0x1b, 0xe9, 0x4e, 0xe9, 0x6e, 0x1b, 0x1b, 0xac, 0x07, 0xe3, 0x0f, 0x30, - 0xf1, 0xee, 0xc1, 0x83, 0x89, 0x27, 0x8f, 0x1e, 0xfc, 0x01, 0x72, 0x24, 0xf1, 0xe2, 0x45, 0x62, - 0x8a, 0x57, 0x2f, 0xfe, 0x02, 0xb3, 0x33, 0x53, 0x76, 0xb6, 0xdd, 0x96, 0xd2, 0x7c, 0x9c, 0xba, - 0xfb, 0xce, 0xfb, 0xce, 0x3c, 0xcf, 0xf3, 0xbe, 0xf3, 0x6c, 0xa1, 0xee, 0x5a, 0x36, 0xb1, 0x59, - 0x9d, 0x12, 0x9b, 0x79, 0x1e, 0xb5, 0x03, 0x97, 0x79, 0xa4, 0x59, 0x24, 0xe7, 0x0d, 0x5a, 0x6f, - 0xe1, 0x5a, 0x9d, 0x05, 0x0c, 0xcd, 0xba, 0x96, 0x8d, 0xc3, 0x1c, 0x1c, 0xe5, 0xe0, 0x66, 0x51, - 0xcb, 0x3a, 0xcc, 0x61, 0x3c, 0x85, 0x84, 0x4f, 0x22, 0x5b, 0x5b, 0xb1, 0x99, 0x5f, 0x65, 0x3e, - 0xb1, 0x4c, 0x9f, 0x8a, 0x6d, 0x48, 0xb3, 0x68, 0xd1, 0xc0, 0x2c, 0x92, 0x9a, 0xe9, 0xb8, 0x9e, - 0xc9, 0xcb, 0x45, 0xee, 0x7c, 0x74, 0xfa, 0x99, 0x4b, 0xbd, 0x20, 0x3c, 0x59, 0x3c, 0xc9, 0x84, - 0xa5, 0x01, 0xf0, 0x14, 0x20, 0x22, 0xf1, 0x55, 0x87, 0x31, 0xe7, 0x8c, 0x12, 0xb3, 0xe6, 0x12, - 0xd3, 0xf3, 0x58, 0xc0, 0x8f, 0xf1, 0xe5, 0xea, 0xcb, 0x72, 0x95, 0xbf, 0x59, 0x8d, 0x53, 0x62, - 0x7a, 0x92, 0x9c, 0x5e, 0x82, 0xb3, 0x9f, 0x84, 0x20, 0xf7, 0x6e, 0x77, 0x34, 0xe8, 0x79, 0x83, - 0xfa, 0x01, 0x7a, 0x03, 0xbe, 0x10, 0x1d, 0x73, 0xe2, 0x96, 0x73, 0x60, 0x01, 0x14, 0xa6, 0x8c, - 0xe9, 0x28, 0x78, 0x58, 0xd6, 0x7f, 0x03, 0x70, 0xae, 0xaf, 0xde, 0xaf, 0x31, 0xcf, 0xa7, 0x68, - 0x1f, 0xc2, 0x28, 0x97, 0x57, 0x67, 0xd6, 0x17, 0x71, 0xb2, 0x98, 0x38, 0xaa, 0xdf, 0xf7, 0xca, - 0x86, 0x52, 0x88, 0xb2, 0xf0, 0x51, 0xad, 0xce, 0xd8, 0x69, 0x2e, 0xbd, 0x00, 0x0a, 0xd3, 0x86, - 0x78, 0x41, 0x7b, 0x70, 0x9a, 0x3f, 0x9c, 0x54, 0xa8, 0xeb, 0x54, 0x82, 0xdc, 0x04, 0xdf, 0x5e, - 0x53, 0xb6, 0x17, 0x3a, 0x36, 0x8b, 0xf8, 0x23, 0x9e, 0xb1, 0x3b, 0x79, 0x79, 0x3d, 0x9f, 0x32, - 0x32, 0xbc, 0x4a, 0x84, 0x74, 0xb3, 0x0f, 0xbc, 0xdf, 0x65, 0xff, 0x21, 0x84, 0x51, 0xbb, 0x24, - 0xf8, 0xb7, 0xb0, 0xe8, 0x2d, 0x0e, 0x7b, 0x8b, 0xc5, 0x88, 0xc8, 0xde, 0xe2, 0x63, 0xd3, 0xa1, - 0xb2, 0xd6, 0x50, 0x2a, 0xf5, 0x7f, 0x01, 0xcc, 0xf5, 0x9f, 0x21, 0x15, 0x3a, 0x82, 0x99, 0x88, - 0xa8, 0x9f, 0x03, 0x0b, 0x13, 0x85, 0xcc, 0xfa, 0xdb, 0x83, 0x24, 0x3a, 0x2c, 0x53, 0x2f, 0x70, - 0x4f, 0x5d, 0x5a, 0x56, 0xc4, 0x56, 0x37, 0x40, 0x07, 0x31, 0xd0, 0x69, 0x0e, 0x7a, 0xe9, 0x4e, - 0xd0, 0x02, 0x8c, 0x8a, 0x1a, 0x6d, 0xc2, 0xc7, 0xf7, 0xd4, 0x55, 0xe6, 0xeb, 0x3b, 0xf0, 0x35, - 0x41, 0x97, 0xa7, 0x25, 0x08, 0xfb, 0x0a, 0x9c, 0x12, 0x5b, 0x44, 0x23, 0xf5, 0x44, 0x04, 0x0e, - 0xcb, 0xfa, 0x4f, 0x00, 0xe6, 0x07, 0x95, 0x4b, 0xcd, 0x96, 0xe1, 0x8b, 0xca, 0x58, 0xd6, 0xcc, - 0xa0, 0x22, 0x84, 0x9b, 0x32, 0x9e, 0x45, 0xf1, 0xe3, 0x30, 0xfc, 0x90, 0x93, 0x63, 0xc1, 0xd7, - 0x7b, 0xba, 0x2a, 0x10, 0x7f, 0x1a, 0x98, 0x41, 0x77, 0x0e, 0x50, 0x29, 0xf1, 0x06, 0xed, 0xe6, - 0xfe, 0xbb, 0x9e, 0xcf, 0xb6, 0xcc, 0xea, 0xd9, 0x96, 0x1e, 0x5b, 0xd6, 0x7b, 0xee, 0x56, 0x07, - 0x40, 0x7d, 0xd8, 0x21, 0x52, 0x10, 0x13, 0xce, 0xb9, 0xb7, 0x93, 0x71, 0x22, 0xb5, 0xf5, 0xc3, - 0x14, 0x39, 0xb6, 0xcb, 0x49, 0xd4, 0x94, 0x61, 0x52, 0xf6, 0x9c, 0x71, 0x93, 0xc2, 0x0f, 0x29, - 0xe4, 0xaf, 0x00, 0xbe, 0xd9, 0x4b, 0x32, 0xa4, 0xe5, 0xf9, 0x0d, 0xff, 0x39, 0x8a, 0x89, 0x96, - 0xe0, 0xb3, 0x3a, 0x6d, 0xba, 0x7e, 0xb8, 0xea, 0x35, 0xaa, 0x16, 0xad, 0x73, 0x32, 0x93, 0xc6, - 0xd3, 0x6e, 0xf8, 0x88, 0x47, 0x63, 0x89, 0x0a, 0x31, 0x25, 0x51, 0x22, 0xbf, 0x06, 0x70, 0xf1, - 0x0e, 0xe4, 0xb2, 0x43, 0x25, 0x18, 0x8e, 0xa6, 0x58, 0x89, 0x75, 0x26, 0x8b, 0x85, 0x31, 0xe3, - 0xae, 0x31, 0xe3, 0x0f, 0xbc, 0x96, 0xf1, 0xd4, 0x8e, 0x6d, 0x13, 0xbf, 0x31, 0xe9, 0xf8, 0x8d, - 0x89, 0x5a, 0x33, 0x31, 0xac, 0x35, 0x93, 0x63, 0xb4, 0x66, 0xfd, 0xe7, 0x27, 0xf0, 0x11, 0x27, - 0x88, 0x7e, 0x01, 0x10, 0x46, 0x2c, 0x11, 0x1e, 0xe4, 0x50, 0xc9, 0x5f, 0x12, 0x8d, 0x8c, 0x9c, - 0x2f, 0x04, 0xd3, 0xdf, 0xff, 0xe6, 0x8f, 0x7f, 0xbe, 0x4f, 0x6f, 0xa1, 0x4d, 0x92, 0xfc, 0xfd, - 0x13, 0x9f, 0x53, 0xc5, 0xf9, 0xc8, 0x45, 0xac, 0xf9, 0x6d, 0xf4, 0x23, 0x80, 0x19, 0xc5, 0x3d, - 0xd0, 0xa8, 0x10, 0xba, 0x36, 0xa5, 0xad, 0x8d, 0x5e, 0x20, 0x41, 0xaf, 0x71, 0xd0, 0x2b, 0xa8, - 0x30, 0x2a, 0x68, 0xf4, 0x3b, 0x80, 0x2f, 0xf5, 0x19, 0x1d, 0x7a, 0x67, 0xf8, 0xc9, 0x03, 0x7c, - 0x55, 0x7b, 0xf7, 0xbe, 0x65, 0x12, 0xf6, 0x1e, 0x87, 0x5d, 0x42, 0xdb, 0xc3, 0x61, 0x8b, 0x01, - 0x8c, 0x4b, 0xde, 0x1d, 0xca, 0x36, 0xfa, 0x0b, 0xc0, 0x99, 0x44, 0x97, 0x42, 0xef, 0x8d, 0xa8, - 0x63, 0xbf, 0x7d, 0x6a, 0x5b, 0xe3, 0x94, 0x4a, 0x56, 0x1f, 0x73, 0x56, 0x07, 0x68, 0x7f, 0xdc, - 0x09, 0x22, 0xaa, 0x91, 0xa2, 0x1f, 0xd2, 0x30, 0x37, 0xe8, 0x9a, 0xa3, 0x9d, 0x51, 0x71, 0x26, - 0xf9, 0x9a, 0x56, 0x1a, 0xb3, 0x5a, 0x12, 0xfd, 0x16, 0x70, 0xa6, 0x5f, 0xa3, 0xaf, 0xc6, 0x67, - 0x1a, 0xf7, 0x26, 0xd2, 0xf5, 0x39, 0x72, 0xd1, 0xe3, 0x98, 0x6d, 0x22, 0xec, 0x44, 0x59, 0x10, - 0x81, 0xf6, 0xee, 0x67, 0x97, 0x9d, 0x3c, 0xb8, 0xea, 0xe4, 0xc1, 0xdf, 0x9d, 0x3c, 0xf8, 0xee, - 0x26, 0x9f, 0xba, 0xba, 0xc9, 0xa7, 0xfe, 0xbc, 0xc9, 0xa7, 0x3e, 0xdf, 0x76, 0xdc, 0xa0, 0xd2, - 0xb0, 0xb0, 0xcd, 0xaa, 0x44, 0xfe, 0x35, 0x16, 0x3f, 0xab, 0x7e, 0xf9, 0x0b, 0xf2, 0x65, 0x84, - 0x7a, 0x6d, 0x63, 0x55, 0x01, 0x1e, 0xb4, 0x6a, 0xd4, 0xb7, 0x1e, 0x73, 0x63, 0xdc, 0xf8, 0x3f, - 0x00, 0x00, 0xff, 0xff, 0x7c, 0x35, 0x91, 0xa4, 0xa7, 0x0b, 0x00, 0x00, + // 896 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x55, 0x31, 0x6f, 0x23, 0x45, + 0x14, 0xf6, 0x38, 0xb9, 0xd3, 0x65, 0x1c, 0xee, 0x60, 0xe4, 0xbb, 0x33, 0x0b, 0x38, 0x61, 0xe1, + 0x88, 0x2f, 0x22, 0x33, 0xb1, 0x23, 0x50, 0x12, 0x62, 0x09, 0x12, 0x85, 0x90, 0x82, 0x28, 0x6c, + 0x3a, 0x9a, 0x68, 0x77, 0x3d, 0x59, 0xaf, 0xb0, 0x77, 0x1c, 0xef, 0xda, 0xc2, 0x0a, 0xa6, 0x40, + 0xfc, 0x00, 0x24, 0x7a, 0x0a, 0x0a, 0x24, 0x2a, 0x4a, 0x0a, 0x7e, 0x00, 0x29, 0x23, 0xd1, 0xd0, + 0x10, 0x21, 0x87, 0x96, 0x86, 0x5f, 0x80, 0x76, 0x66, 0x9c, 0x9d, 0xb5, 0xd7, 0x8e, 0x63, 0x5d, + 0x3a, 0xfb, 0xcd, 0x7b, 0x6f, 0xbe, 0xef, 0x7b, 0x6f, 0xbe, 0x85, 0xba, 0x6b, 0xd9, 0xc4, 0x66, + 0x4d, 0x4a, 0x6c, 0xe6, 0x79, 0xd4, 0x0e, 0x5c, 0xe6, 0x91, 0x76, 0x91, 0x9c, 0xb6, 0x68, 0xb3, + 0x83, 0x1b, 0x4d, 0x16, 0x30, 0xf4, 0xc4, 0xb5, 0x6c, 0x1c, 0xe6, 0xe0, 0x28, 0x07, 0xb7, 0x8b, + 0x5a, 0xd6, 0x61, 0x0e, 0xe3, 0x29, 0x24, 0xfc, 0x25, 0xb2, 0xb5, 0x65, 0x9b, 0xf9, 0x75, 0xe6, + 0x13, 0xcb, 0xf4, 0xa9, 0x68, 0x43, 0xda, 0x45, 0x8b, 0x06, 0x66, 0x91, 0x34, 0x4c, 0xc7, 0xf5, + 0x4c, 0x5e, 0x2e, 0x72, 0x17, 0xa2, 0xdb, 0x6b, 0x2e, 0xf5, 0x82, 0xf0, 0x66, 0xf1, 0x4b, 0x26, + 0x2c, 0x8d, 0x80, 0xa7, 0x00, 0x11, 0x89, 0xaf, 0x3b, 0x8c, 0x39, 0x35, 0x4a, 0xcc, 0x86, 0x4b, + 0x4c, 0xcf, 0x63, 0x01, 0xbf, 0xc6, 0x97, 0xa7, 0xaf, 0xca, 0x53, 0xfe, 0xcf, 0x6a, 0x9d, 0x10, + 0xd3, 0x93, 0xe4, 0xf4, 0x32, 0x7c, 0xf2, 0x59, 0x08, 0x72, 0xe7, 0xba, 0xa3, 0x41, 0x4f, 0x5b, + 0xd4, 0x0f, 0xd0, 0x5b, 0xf0, 0xa5, 0xe8, 0x9a, 0x63, 0xb7, 0x92, 0x03, 0x8b, 0xa0, 0x30, 0x67, + 0xcc, 0x47, 0xc1, 0xfd, 0x8a, 0xfe, 0x1b, 0x80, 0x4f, 0x87, 0xea, 0xfd, 0x06, 0xf3, 0x7c, 0x8a, + 0x76, 0x21, 0x8c, 0x72, 0x79, 0x75, 0xa6, 0xf4, 0x0c, 0x27, 0x8b, 0x89, 0xa3, 0xfa, 0x5d, 0xaf, + 0x62, 0x28, 0x85, 0x28, 0x0b, 0xef, 0x35, 0x9a, 0x8c, 0x9d, 0xe4, 0xd2, 0x8b, 0xa0, 0x30, 0x6f, + 0x88, 0x3f, 0x68, 0x07, 0xce, 0xf3, 0x1f, 0xc7, 0x55, 0xea, 0x3a, 0xd5, 0x20, 0x37, 0xc3, 0xdb, + 0x6b, 0x4a, 0x7b, 0xa1, 0x63, 0xbb, 0x88, 0x3f, 0xe1, 0x19, 0xdb, 0xb3, 0xe7, 0x97, 0x0b, 0x29, + 0x23, 0xc3, 0xab, 0x44, 0x48, 0x37, 0x87, 0xc0, 0xfb, 0x7d, 0xf6, 0x1f, 0x43, 0x18, 0x8d, 0x4b, + 0x82, 0x7f, 0x07, 0x8b, 0xd9, 0xe2, 0x70, 0xb6, 0x58, 0xac, 0x88, 0x9c, 0x2d, 0x3e, 0x34, 0x1d, + 0x2a, 0x6b, 0x0d, 0xa5, 0x52, 0xff, 0x17, 0xc0, 0xdc, 0xf0, 0x1d, 0x52, 0xa1, 0x03, 0x98, 0x89, + 0x88, 0xfa, 0x39, 0xb0, 0x38, 0x53, 0xc8, 0x94, 0xde, 0x1d, 0x25, 0xd1, 0x7e, 0x85, 0x7a, 0x81, + 0x7b, 0xe2, 0xd2, 0x8a, 0x22, 0xb6, 0xda, 0x00, 0xed, 0xc5, 0x40, 0xa7, 0x39, 0xe8, 0xa5, 0x1b, + 0x41, 0x0b, 0x30, 0x2a, 0x6a, 0xb4, 0x0e, 0xef, 0xdf, 0x52, 0x57, 0x99, 0xaf, 0x6f, 0xc1, 0x37, + 0x04, 0x5d, 0x9e, 0x96, 0x20, 0xec, 0x6b, 0x70, 0x4e, 0xb4, 0x88, 0x56, 0xea, 0x81, 0x08, 0xec, + 0x57, 0xf4, 0x9f, 0x00, 0xcc, 0x8f, 0x2a, 0x97, 0x9a, 0x3d, 0x87, 0x2f, 0x2b, 0x6b, 0xd9, 0x30, + 0x83, 0xaa, 0x10, 0x6e, 0xce, 0x78, 0x14, 0xc5, 0x0f, 0xc3, 0xf0, 0x5d, 0x6e, 0x8e, 0x05, 0xdf, + 0x1c, 0x98, 0xaa, 0x40, 0x7c, 0x14, 0x98, 0x41, 0x7f, 0x0f, 0x50, 0x39, 0xf1, 0x05, 0x6d, 0xe7, + 0xfe, 0xbb, 0x5c, 0xc8, 0x76, 0xcc, 0x7a, 0x6d, 0x53, 0x8f, 0x1d, 0xeb, 0x03, 0x6f, 0xab, 0x07, + 0xa0, 0x3e, 0xee, 0x12, 0x29, 0x88, 0x09, 0x9f, 0xba, 0xd7, 0x9b, 0x71, 0x2c, 0xb5, 0xf5, 0xc3, + 0x14, 0xb9, 0xb6, 0xcf, 0x93, 0xa8, 0x29, 0xcb, 0xa4, 0xf4, 0x7c, 0xec, 0x26, 0x85, 0xef, 0x52, + 0xc8, 0x5f, 0x01, 0x7c, 0x7b, 0x90, 0x64, 0x48, 0xcb, 0xf3, 0x5b, 0xfe, 0x0b, 0x14, 0x13, 0x2d, + 0xc1, 0x47, 0x4d, 0xda, 0x76, 0xfd, 0xf0, 0xd4, 0x6b, 0xd5, 0x2d, 0xda, 0xe4, 0x64, 0x66, 0x8d, + 0x87, 0xfd, 0xf0, 0x01, 0x8f, 0xc6, 0x12, 0x15, 0x62, 0x4a, 0xa2, 0x44, 0x7e, 0x09, 0xe0, 0xb3, + 0x1b, 0x90, 0xcb, 0x09, 0x95, 0x61, 0xb8, 0x9a, 0xe2, 0x24, 0x36, 0x99, 0x2c, 0x16, 0xc6, 0x8c, + 0xfb, 0xc6, 0x8c, 0x3f, 0xf2, 0x3a, 0xc6, 0x43, 0x3b, 0xd6, 0x26, 0xfe, 0x62, 0xd2, 0xf1, 0x17, + 0x13, 0x8d, 0x66, 0x66, 0xdc, 0x68, 0x66, 0xa7, 0x18, 0x4d, 0xe9, 0xe7, 0x07, 0xf0, 0x1e, 0x27, + 0x88, 0x7e, 0x01, 0x10, 0x46, 0x2c, 0x11, 0x1e, 0xe5, 0x50, 0xc9, 0x5f, 0x12, 0x8d, 0x4c, 0x9c, + 0x2f, 0x04, 0xd3, 0x3f, 0xfc, 0xe6, 0x8f, 0x7f, 0xbe, 0x4f, 0x6f, 0xa2, 0x75, 0x92, 0xfc, 0xfd, + 0x13, 0x9f, 0x53, 0xc5, 0xf9, 0xc8, 0x59, 0x6c, 0xf8, 0x5d, 0xf4, 0x23, 0x80, 0x19, 0xc5, 0x3d, + 0xd0, 0xa4, 0x10, 0xfa, 0x36, 0xa5, 0xad, 0x4e, 0x5e, 0x20, 0x41, 0xaf, 0x72, 0xd0, 0xcb, 0xa8, + 0x30, 0x29, 0x68, 0xf4, 0x3b, 0x80, 0xaf, 0x0c, 0x19, 0x1d, 0x7a, 0x6f, 0xfc, 0xcd, 0x23, 0x7c, + 0x55, 0x7b, 0xff, 0xb6, 0x65, 0x12, 0xf6, 0x0e, 0x87, 0x5d, 0x46, 0x1f, 0x8c, 0x87, 0x2d, 0x16, + 0x30, 0x2e, 0x79, 0x7f, 0x29, 0xbb, 0xe8, 0x2f, 0x00, 0x1f, 0x27, 0xba, 0x14, 0xda, 0x98, 0x50, + 0xc7, 0x61, 0xfb, 0xd4, 0x36, 0xa7, 0x29, 0x95, 0xac, 0x3e, 0xe5, 0xac, 0xf6, 0xd0, 0xee, 0xb4, + 0x1b, 0x44, 0x54, 0x23, 0x45, 0x3f, 0xa4, 0x61, 0x6e, 0xd4, 0x33, 0x47, 0x5b, 0x93, 0xe2, 0x4c, + 0xf2, 0x35, 0xad, 0x3c, 0x65, 0xb5, 0x24, 0xfa, 0x2d, 0xe0, 0x4c, 0xbf, 0x46, 0x5f, 0x4d, 0xcf, + 0x34, 0xee, 0x4d, 0xa4, 0xef, 0x73, 0xe4, 0x6c, 0xc0, 0x31, 0xbb, 0x44, 0xd8, 0x89, 0x72, 0x20, + 0x02, 0xdd, 0xed, 0xa3, 0xf3, 0x5e, 0x1e, 0x5c, 0xf4, 0xf2, 0xe0, 0xef, 0x5e, 0x1e, 0x7c, 0x77, + 0x95, 0x4f, 0x5d, 0x5c, 0xe5, 0x53, 0x7f, 0x5e, 0xe5, 0x53, 0x9f, 0x6f, 0x38, 0x6e, 0x50, 0x6d, + 0x59, 0xd8, 0x66, 0x75, 0x52, 0x73, 0x3d, 0x4a, 0x6a, 0x56, 0x7d, 0xc5, 0xaf, 0x7c, 0x41, 0xda, + 0x25, 0xf2, 0x65, 0x84, 0x79, 0x75, 0x6d, 0x45, 0x81, 0x1d, 0x74, 0x1a, 0xd4, 0xb7, 0xee, 0x73, + 0x5b, 0x5c, 0xfb, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x11, 0x3d, 0x37, 0x1d, 0xa5, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/core/03-connection/types/tx.pb.go b/x/ibc/core/03-connection/types/tx.pb.go index 7e53d37c91..af87cf1daf 100644 --- a/x/ibc/core/03-connection/types/tx.pb.go +++ b/x/ibc/core/03-connection/types/tx.pb.go @@ -386,65 +386,65 @@ func init() { func init() { proto.RegisterFile("ibc/core/connection/v1/tx.proto", fileDescriptor_5d00fde5fc97399e) } var fileDescriptor_5d00fde5fc97399e = []byte{ - // 921 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x31, 0x93, 0xdb, 0x44, - 0x14, 0xb6, 0xce, 0xbe, 0x3b, 0x7b, 0x6d, 0x48, 0xb2, 0xf8, 0xee, 0x84, 0x48, 0x2c, 0x47, 0x03, - 0x83, 0x0b, 0x4e, 0x8a, 0x93, 0x30, 0x03, 0x66, 0x28, 0x6c, 0x37, 0x5c, 0x11, 0xc8, 0x88, 0x00, - 0x33, 0x69, 0x3c, 0xb6, 0xbc, 0xd6, 0x69, 0x6c, 0x6b, 0x35, 0x5a, 0xd9, 0x44, 0xb4, 0x34, 0x0c, - 0x15, 0x0d, 0x7d, 0xfe, 0x03, 0x7f, 0x22, 0xe5, 0x95, 0x54, 0x1a, 0xb8, 0x6b, 0xa8, 0xd5, 0xd1, - 0x31, 0xda, 0x95, 0xe4, 0xb5, 0x2d, 0x0f, 0x36, 0x3e, 0x2a, 0xe9, 0xed, 0xfb, 0xde, 0x7b, 0xbb, - 0xef, 0x7d, 0xdf, 0xce, 0x02, 0xd9, 0x1a, 0x18, 0x9a, 0x81, 0x5d, 0xa4, 0x19, 0xd8, 0xb6, 0x91, - 0xe1, 0x59, 0xd8, 0xd6, 0xe6, 0x4d, 0xcd, 0x7b, 0xa5, 0x3a, 0x2e, 0xf6, 0x30, 0x3c, 0xb5, 0x06, - 0x86, 0x1a, 0x01, 0xd4, 0x05, 0x40, 0x9d, 0x37, 0xa5, 0xaa, 0x89, 0x4d, 0x4c, 0x21, 0x5a, 0xf4, - 0xc7, 0xd0, 0xd2, 0xbb, 0x26, 0xc6, 0xe6, 0x04, 0x69, 0xd4, 0x1a, 0xcc, 0x46, 0x5a, 0xdf, 0xf6, - 0x63, 0x17, 0x57, 0x69, 0x62, 0x21, 0xdb, 0x8b, 0xaa, 0xb0, 0xbf, 0x18, 0xf0, 0xe1, 0x86, 0xad, - 0x70, 0x75, 0x29, 0x50, 0xf9, 0xed, 0x00, 0x9c, 0x3c, 0x23, 0x66, 0x37, 0x5d, 0xff, 0xca, 0x41, - 0xf6, 0x85, 0x6d, 0x79, 0xb0, 0x09, 0x4a, 0x2c, 0x65, 0xcf, 0x1a, 0x8a, 0x42, 0x5d, 0x68, 0x94, - 0x3a, 0xd5, 0x30, 0x90, 0xef, 0xfa, 0xfd, 0xe9, 0xa4, 0xa5, 0xa4, 0x2e, 0x45, 0x2f, 0xb2, 0xff, - 0x8b, 0x21, 0xfc, 0x12, 0x54, 0x0c, 0x3c, 0xb3, 0x3d, 0xe4, 0x3a, 0x7d, 0xd7, 0xf3, 0xc5, 0x83, - 0xba, 0xd0, 0x28, 0x3f, 0x7e, 0x5f, 0xcd, 0x3e, 0xb6, 0xda, 0xe5, 0xb0, 0x9d, 0xc2, 0x9b, 0x40, - 0xce, 0xe9, 0x4b, 0xf1, 0xf0, 0x53, 0x70, 0x3c, 0x47, 0x2e, 0xb1, 0xb0, 0x2d, 0xe6, 0x69, 0x2a, - 0x79, 0x53, 0xaa, 0x6f, 0x19, 0x4c, 0x4f, 0xf0, 0xb0, 0x05, 0x2a, 0x43, 0x34, 0xe9, 0xfb, 0x3d, - 0x07, 0xb9, 0x16, 0x1e, 0x8a, 0x85, 0xba, 0xd0, 0x28, 0x74, 0xce, 0xc2, 0x40, 0x7e, 0x87, 0x1d, - 0x80, 0xf7, 0x2a, 0x7a, 0x99, 0x9a, 0xcf, 0xa9, 0x05, 0x4f, 0xc1, 0x11, 0xb1, 0x4c, 0x1b, 0xb9, - 0xe2, 0x61, 0x74, 0x6c, 0x3d, 0xb6, 0x5a, 0xc5, 0x9f, 0x5e, 0xcb, 0xb9, 0xbf, 0x5e, 0xcb, 0x39, - 0x45, 0x06, 0x0f, 0x32, 0x9b, 0xa6, 0x23, 0xe2, 0x60, 0x9b, 0x20, 0xe5, 0xd7, 0x63, 0x50, 0x5d, - 0x43, 0xbc, 0x70, 0xfd, 0xff, 0xd2, 0xd5, 0xef, 0xc0, 0xa9, 0xe3, 0xa2, 0xb9, 0x85, 0x67, 0xa4, - 0xb7, 0x38, 0x75, 0x14, 0x7f, 0x40, 0xe3, 0x1f, 0x86, 0x81, 0xfc, 0x80, 0xc5, 0x67, 0xe3, 0x14, - 0xbd, 0x9a, 0x38, 0x16, 0x1b, 0xba, 0x18, 0xc2, 0xe7, 0xa0, 0x12, 0x17, 0x24, 0x5e, 0xdf, 0x43, - 0x71, 0x8f, 0xab, 0x2a, 0xe3, 0x9d, 0x9a, 0xf0, 0x4e, 0x6d, 0xdb, 0x3e, 0xdf, 0x39, 0x3e, 0x46, - 0xd1, 0xcb, 0xcc, 0xfc, 0x3a, 0xb2, 0xd6, 0x08, 0x50, 0xd8, 0x93, 0x00, 0xab, 0x53, 0x3c, 0xdc, - 0x61, 0x8a, 0x73, 0x70, 0xc2, 0xe7, 0xea, 0xc5, 0xcc, 0x20, 0xe2, 0x51, 0x3d, 0xbf, 0x05, 0x95, - 0x3a, 0xf5, 0x30, 0x90, 0xef, 0xc7, 0x27, 0xce, 0xca, 0xa3, 0xe8, 0x55, 0x7e, 0x3d, 0x0e, 0x23, - 0xf0, 0x25, 0xa8, 0x38, 0x2e, 0xc6, 0xa3, 0xde, 0x25, 0xb2, 0xcc, 0x4b, 0x4f, 0x3c, 0xa6, 0x3d, - 0x90, 0xb8, 0x72, 0x4c, 0xa8, 0xf3, 0xa6, 0xfa, 0x05, 0x45, 0x74, 0xde, 0x8b, 0x4e, 0xbe, 0x38, - 0x13, 0x1f, 0xad, 0xe8, 0x65, 0x6a, 0x32, 0x24, 0x7c, 0x0a, 0x00, 0xf3, 0x5a, 0xb6, 0xe5, 0x89, - 0xc5, 0xba, 0xd0, 0xa8, 0x74, 0x4e, 0xc2, 0x40, 0xbe, 0xc7, 0x47, 0x46, 0x3e, 0x45, 0x2f, 0x51, - 0x83, 0x2a, 0xb9, 0x95, 0xec, 0x88, 0x55, 0x16, 0x4b, 0x34, 0xee, 0x6c, 0xb5, 0x22, 0xf3, 0x26, - 0x15, 0xbb, 0xd4, 0x82, 0x5d, 0x70, 0x27, 0xf6, 0x46, 0xbc, 0xb6, 0xc9, 0x8c, 0x88, 0x80, 0x86, - 0x4b, 0x61, 0x20, 0x9f, 0x2e, 0x85, 0x27, 0x00, 0x45, 0x7f, 0x9b, 0x65, 0x48, 0x16, 0xe0, 0x08, - 0xdc, 0x4d, 0xbd, 0x49, 0x5b, 0xca, 0xff, 0xda, 0x16, 0x39, 0x6e, 0xcb, 0x59, 0x32, 0x84, 0xe5, - 0x0c, 0x8a, 0x7e, 0x27, 0x5d, 0x8a, 0xdb, 0xb3, 0x10, 0x6e, 0x65, 0x83, 0x70, 0x6b, 0xe0, 0x7e, - 0x96, 0x2c, 0x53, 0xdd, 0xfe, 0x79, 0x98, 0xa1, 0xdb, 0xb6, 0x31, 0x86, 0x9f, 0x83, 0xb7, 0x96, - 0xb5, 0xc7, 0xb4, 0x2b, 0x86, 0x81, 0x5c, 0x4d, 0xf7, 0xc7, 0x4b, 0xae, 0x62, 0xf0, 0x52, 0x33, - 0x80, 0xb4, 0x44, 0xa2, 0x2c, 0x1d, 0x7f, 0x10, 0x06, 0xf2, 0xc3, 0x0c, 0xc2, 0xad, 0x24, 0x16, - 0x79, 0xe7, 0x92, 0x9e, 0xf7, 0xb8, 0x2e, 0x57, 0xaf, 0x82, 0xc2, 0xde, 0x57, 0xc1, 0xaa, 0x0c, - 0x0e, 0x6f, 0x51, 0x06, 0x4d, 0xc0, 0xd8, 0xdd, 0xf3, 0x5c, 0x5f, 0x3c, 0xa2, 0x74, 0xe4, 0x2e, - 0xd1, 0xd4, 0xa5, 0xe8, 0x45, 0xfa, 0x1f, 0xdd, 0xbb, 0xab, 0x1a, 0x38, 0xde, 0x4f, 0x03, 0xc5, - 0x5b, 0xd1, 0x40, 0xe9, 0x7f, 0xd5, 0x00, 0xd8, 0x41, 0x03, 0x6d, 0x63, 0x9c, 0x6a, 0xe0, 0xe7, - 0x03, 0x20, 0xae, 0x01, 0xba, 0xd8, 0x1e, 0x59, 0xee, 0x74, 0x5f, 0x1d, 0xa4, 0x93, 0xeb, 0x1b, - 0x63, 0x4a, 0xfb, 0x8c, 0xc9, 0xf5, 0x8d, 0x71, 0x32, 0xb9, 0x48, 0x79, 0xab, 0x44, 0xca, 0xdf, - 0x22, 0x91, 0x16, 0xcd, 0x2a, 0x6c, 0x68, 0x96, 0x02, 0xea, 0x9b, 0x7a, 0x91, 0x34, 0xec, 0xf1, - 0xdf, 0x79, 0x90, 0x7f, 0x46, 0x4c, 0xf8, 0x03, 0x80, 0x19, 0xef, 0xa8, 0xf3, 0x4d, 0x22, 0xcc, - 0x7c, 0x41, 0x48, 0x1f, 0xef, 0x04, 0x4f, 0xf6, 0x00, 0xbf, 0x07, 0xf7, 0xd6, 0x1f, 0x1b, 0x1f, - 0x6d, 0x9d, 0xeb, 0x85, 0xeb, 0x4b, 0x4f, 0x77, 0x41, 0x6f, 0x2e, 0x1c, 0xcd, 0x6c, 0xfb, 0xc2, - 0x6d, 0x63, 0xbc, 0x43, 0x61, 0x8e, 0xa6, 0xf0, 0x47, 0x01, 0x9c, 0x64, 0x73, 0xf4, 0xd1, 0xd6, - 0xf9, 0xe2, 0x08, 0xe9, 0x93, 0x5d, 0x23, 0x92, 0x5d, 0x74, 0xbe, 0x79, 0x73, 0x5d, 0x13, 0xae, - 0xae, 0x6b, 0xc2, 0x1f, 0xd7, 0x35, 0xe1, 0x97, 0x9b, 0x5a, 0xee, 0xea, 0xa6, 0x96, 0xfb, 0xfd, - 0xa6, 0x96, 0x7b, 0xf9, 0x99, 0x69, 0x79, 0x97, 0xb3, 0x81, 0x6a, 0xe0, 0xa9, 0x66, 0x60, 0x32, - 0xc5, 0x24, 0xfe, 0x9c, 0x93, 0xe1, 0x58, 0x7b, 0xa5, 0xa5, 0x2f, 0xf4, 0x47, 0x4f, 0xce, 0xb9, - 0x47, 0xba, 0xe7, 0x3b, 0x88, 0x0c, 0x8e, 0xe8, 0x8d, 0xfb, 0xe4, 0x9f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xc4, 0x4d, 0xc5, 0x58, 0x53, 0x0c, 0x00, 0x00, + // 924 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0x31, 0x6f, 0xdb, 0x46, + 0x14, 0x16, 0x2d, 0xd9, 0x96, 0x4e, 0x6a, 0x93, 0x5c, 0x65, 0x9b, 0x65, 0x13, 0x51, 0x21, 0x5a, + 0xd4, 0x43, 0x4d, 0x46, 0x4e, 0x0a, 0x34, 0x06, 0x3a, 0x58, 0x5a, 0xea, 0x21, 0x6d, 0xc0, 0x04, + 0x2d, 0x90, 0x45, 0x90, 0xa8, 0x33, 0x7d, 0x90, 0x74, 0x47, 0x90, 0x94, 0x1a, 0x76, 0xed, 0x52, + 0x74, 0xea, 0xd2, 0x3d, 0xff, 0xa1, 0x7f, 0x22, 0x63, 0xc6, 0x4e, 0x44, 0x6b, 0x2f, 0x9d, 0xb9, + 0x75, 0x2b, 0x78, 0x47, 0x52, 0x27, 0x89, 0x42, 0xa5, 0xca, 0xdd, 0xee, 0xdd, 0xfb, 0xde, 0x7b, + 0x77, 0xef, 0x7d, 0xdf, 0xe1, 0x80, 0x8a, 0xfb, 0x96, 0x61, 0x51, 0x17, 0x19, 0x16, 0x25, 0x04, + 0x59, 0x3e, 0xa6, 0xc4, 0x98, 0xb6, 0x0c, 0xff, 0xb5, 0xee, 0xb8, 0xd4, 0xa7, 0xf0, 0x10, 0xf7, + 0x2d, 0x3d, 0x06, 0xe8, 0x33, 0x80, 0x3e, 0x6d, 0x29, 0x75, 0x9b, 0xda, 0x94, 0x41, 0x8c, 0x78, + 0xc5, 0xd1, 0xca, 0x87, 0x36, 0xa5, 0xf6, 0x08, 0x19, 0xcc, 0xea, 0x4f, 0x2e, 0x8d, 0x1e, 0x09, + 0x12, 0x97, 0x50, 0x69, 0x84, 0x11, 0xf1, 0xe3, 0x2a, 0x7c, 0x95, 0x00, 0x3e, 0x5d, 0x71, 0x14, + 0xa1, 0x2e, 0x03, 0x6a, 0xbf, 0xed, 0x80, 0x83, 0x67, 0x9e, 0xdd, 0xc9, 0xf6, 0xbf, 0x71, 0x10, + 0xb9, 0x20, 0xd8, 0x87, 0x2d, 0x50, 0xe1, 0x29, 0xbb, 0x78, 0x20, 0x4b, 0x4d, 0xe9, 0xb8, 0xd2, + 0xae, 0x47, 0xa1, 0x7a, 0x37, 0xe8, 0x8d, 0x47, 0x67, 0x5a, 0xe6, 0xd2, 0xcc, 0x32, 0x5f, 0x5f, + 0x0c, 0xe0, 0xd7, 0xa0, 0x66, 0xd1, 0x09, 0xf1, 0x91, 0xeb, 0xf4, 0x5c, 0x3f, 0x90, 0x77, 0x9a, + 0xd2, 0x71, 0xf5, 0xf4, 0x63, 0x3d, 0xff, 0xda, 0x7a, 0x47, 0xc0, 0xb6, 0x4b, 0x6f, 0x43, 0xb5, + 0x60, 0xce, 0xc5, 0xc3, 0xa7, 0x60, 0x7f, 0x8a, 0x5c, 0x0f, 0x53, 0x22, 0x17, 0x59, 0x2a, 0x75, + 0x55, 0xaa, 0x6f, 0x39, 0xcc, 0x4c, 0xf1, 0xf0, 0x0c, 0xd4, 0x06, 0x68, 0xd4, 0x0b, 0xba, 0x0e, + 0x72, 0x31, 0x1d, 0xc8, 0xa5, 0xa6, 0x74, 0x5c, 0x6a, 0x1f, 0x45, 0xa1, 0xfa, 0x01, 0xbf, 0x80, + 0xe8, 0xd5, 0xcc, 0x2a, 0x33, 0x9f, 0x33, 0x0b, 0x1e, 0x82, 0x3d, 0x0f, 0xdb, 0x04, 0xb9, 0xf2, + 0x6e, 0x7c, 0x6d, 0x33, 0xb1, 0xce, 0xca, 0x3f, 0xbd, 0x51, 0x0b, 0x7f, 0xbd, 0x51, 0x0b, 0x9a, + 0x0a, 0x1e, 0xe4, 0x36, 0xcd, 0x44, 0x9e, 0x43, 0x89, 0x87, 0xb4, 0x5f, 0xf7, 0x41, 0x7d, 0x09, + 0xf1, 0xd2, 0x0d, 0xfe, 0x4b, 0x57, 0xbf, 0x03, 0x87, 0x8e, 0x8b, 0xa6, 0x98, 0x4e, 0xbc, 0xee, + 0xec, 0xd6, 0x71, 0xfc, 0x0e, 0x8b, 0x7f, 0x18, 0x85, 0xea, 0x03, 0x1e, 0x9f, 0x8f, 0xd3, 0xcc, + 0x7a, 0xea, 0x98, 0x1d, 0xe8, 0x62, 0x00, 0x9f, 0x83, 0x5a, 0x52, 0xd0, 0xf3, 0x7b, 0x3e, 0x4a, + 0x7a, 0x5c, 0xd7, 0x39, 0xef, 0xf4, 0x94, 0x77, 0xfa, 0x39, 0x09, 0xc4, 0xce, 0x89, 0x31, 0x9a, + 0x59, 0xe5, 0xe6, 0x8b, 0xd8, 0x5a, 0x22, 0x40, 0x69, 0x4b, 0x02, 0x2c, 0x4e, 0x71, 0x77, 0x83, + 0x29, 0x4e, 0xc1, 0x81, 0x98, 0xab, 0x9b, 0x30, 0xc3, 0x93, 0xf7, 0x9a, 0xc5, 0x35, 0xa8, 0xd4, + 0x6e, 0x46, 0xa1, 0x7a, 0x3f, 0xb9, 0x71, 0x5e, 0x1e, 0xcd, 0xac, 0x8b, 0xfb, 0x49, 0x98, 0x07, + 0x5f, 0x81, 0x9a, 0xe3, 0x52, 0x7a, 0xd9, 0xbd, 0x42, 0xd8, 0xbe, 0xf2, 0xe5, 0x7d, 0xd6, 0x03, + 0x45, 0x28, 0xc7, 0x85, 0x3a, 0x6d, 0xe9, 0x5f, 0x31, 0x44, 0xfb, 0xa3, 0xf8, 0xe6, 0xb3, 0x3b, + 0x89, 0xd1, 0x9a, 0x59, 0x65, 0x26, 0x47, 0xc2, 0x27, 0x00, 0x70, 0x2f, 0x26, 0xd8, 0x97, 0xcb, + 0x4d, 0xe9, 0xb8, 0xd6, 0x3e, 0x88, 0x42, 0xf5, 0x9e, 0x18, 0x19, 0xfb, 0x34, 0xb3, 0xc2, 0x0c, + 0xa6, 0xe4, 0xb3, 0xf4, 0x44, 0xbc, 0xb2, 0x5c, 0x61, 0x71, 0x47, 0x8b, 0x15, 0xb9, 0x37, 0xad, + 0xd8, 0x61, 0x16, 0xec, 0x80, 0x3b, 0x89, 0x37, 0xe6, 0x35, 0xf1, 0x26, 0x9e, 0x0c, 0x58, 0xb8, + 0x12, 0x85, 0xea, 0xe1, 0x5c, 0x78, 0x0a, 0xd0, 0xcc, 0xf7, 0x79, 0x86, 0x74, 0x03, 0x5e, 0x82, + 0xbb, 0x99, 0x37, 0x6d, 0x4b, 0xf5, 0x5f, 0xdb, 0xa2, 0x26, 0x6d, 0x39, 0x4a, 0x87, 0x30, 0x9f, + 0x41, 0x33, 0xef, 0x64, 0x5b, 0x49, 0x7b, 0x66, 0xc2, 0xad, 0xad, 0x10, 0x6e, 0x03, 0xdc, 0xcf, + 0x93, 0x65, 0xa6, 0xdb, 0x3f, 0x77, 0x73, 0x74, 0x7b, 0x6e, 0x0d, 0xe1, 0x97, 0xe0, 0xbd, 0x79, + 0xed, 0x71, 0xed, 0xca, 0x51, 0xa8, 0xd6, 0xb3, 0xf3, 0x89, 0x92, 0xab, 0x59, 0xa2, 0xd4, 0x2c, + 0xa0, 0xcc, 0x91, 0x28, 0x4f, 0xc7, 0x9f, 0x44, 0xa1, 0xfa, 0x30, 0x87, 0x70, 0x0b, 0x89, 0x65, + 0xd1, 0x39, 0xa7, 0xe7, 0x2d, 0x9e, 0xcb, 0xc5, 0xa7, 0xa0, 0xb4, 0xf5, 0x53, 0xb0, 0x28, 0x83, + 0xdd, 0x5b, 0x94, 0x41, 0x0b, 0x70, 0x76, 0x77, 0x7d, 0x37, 0x90, 0xf7, 0x18, 0x1d, 0x85, 0x47, + 0x34, 0x73, 0x69, 0x66, 0x99, 0xad, 0xe3, 0x77, 0x77, 0x51, 0x03, 0xfb, 0xdb, 0x69, 0xa0, 0x7c, + 0x2b, 0x1a, 0xa8, 0xfc, 0xaf, 0x1a, 0x00, 0x1b, 0x68, 0xe0, 0xdc, 0x1a, 0x66, 0x1a, 0xf8, 0x79, + 0x07, 0xc8, 0x4b, 0x80, 0x0e, 0x25, 0x97, 0xd8, 0x1d, 0x6f, 0xab, 0x83, 0x6c, 0x72, 0x3d, 0x6b, + 0xc8, 0x68, 0x9f, 0x33, 0xb9, 0x9e, 0x35, 0x4c, 0x27, 0x17, 0x2b, 0x6f, 0x91, 0x48, 0xc5, 0x5b, + 0x24, 0xd2, 0xac, 0x59, 0xa5, 0x15, 0xcd, 0xd2, 0x40, 0x73, 0x55, 0x2f, 0xd2, 0x86, 0x9d, 0xfe, + 0x5d, 0x04, 0xc5, 0x67, 0x9e, 0x0d, 0x7f, 0x00, 0x30, 0xe7, 0x1f, 0x75, 0xb2, 0x4a, 0x84, 0xb9, + 0x3f, 0x08, 0xe5, 0xf3, 0x8d, 0xe0, 0xe9, 0x19, 0xe0, 0xf7, 0xe0, 0xde, 0xf2, 0x67, 0xe3, 0xb3, + 0xb5, 0x73, 0xbd, 0x74, 0x03, 0xe5, 0xc9, 0x26, 0xe8, 0xd5, 0x85, 0xe3, 0x99, 0xad, 0x5f, 0xf8, + 0xdc, 0x1a, 0x6e, 0x50, 0x58, 0xa0, 0x29, 0xfc, 0x51, 0x02, 0x07, 0xf9, 0x1c, 0x7d, 0xb4, 0x76, + 0xbe, 0x24, 0x42, 0xf9, 0x62, 0xd3, 0x88, 0xf4, 0x14, 0xed, 0x17, 0x6f, 0xaf, 0x1b, 0xd2, 0xbb, + 0xeb, 0x86, 0xf4, 0xc7, 0x75, 0x43, 0xfa, 0xe5, 0xa6, 0x51, 0x78, 0x77, 0xd3, 0x28, 0xfc, 0x7e, + 0xd3, 0x28, 0xbc, 0x7a, 0x6a, 0x63, 0xff, 0x6a, 0xd2, 0xd7, 0x2d, 0x3a, 0x36, 0x46, 0x98, 0x20, + 0x63, 0xd4, 0x1f, 0x9f, 0x78, 0x83, 0xa1, 0x31, 0x3d, 0x35, 0x5e, 0x1b, 0xd9, 0xff, 0xfc, 0xd1, + 0xe3, 0x13, 0xe1, 0x8b, 0xee, 0x07, 0x0e, 0xf2, 0xfa, 0x7b, 0xec, 0xbd, 0x7d, 0xfc, 0x4f, 0x00, + 0x00, 0x00, 0xff, 0xff, 0x91, 0x46, 0x70, 0x55, 0x51, 0x0c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/core/04-channel/keeper/keeper.go b/x/ibc/core/04-channel/keeper/keeper.go index 6593954307..75d069db40 100644 --- a/x/ibc/core/04-channel/keeper/keeper.go +++ b/x/ibc/core/04-channel/keeper/keeper.go @@ -4,8 +4,8 @@ import ( "strconv" "strings" - "github.com/tendermint/tendermint/libs/log" - db "github.com/tendermint/tm-db" + "github.com/line/ostracon/libs/log" + db "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/ibc/core/04-channel/types/channel.pb.go b/x/ibc/core/04-channel/types/channel.pb.go index c062b0434a..a14e771e5c 100644 --- a/x/ibc/core/04-channel/types/channel.pb.go +++ b/x/ibc/core/04-channel/types/channel.pb.go @@ -455,64 +455,64 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/channel.proto", fileDescriptor_c3a07336710636a0) } var fileDescriptor_c3a07336710636a0 = []byte{ - // 904 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0xcb, 0x6e, 0xdb, 0x46, - 0x14, 0x15, 0x25, 0xea, 0x75, 0x65, 0xc9, 0xf2, 0xa4, 0x56, 0x58, 0x36, 0x11, 0x15, 0xa2, 0x0b, - 0x23, 0x45, 0xa4, 0x38, 0x0d, 0xda, 0x22, 0xab, 0x5a, 0x8f, 0xc0, 0x44, 0x03, 0xc9, 0xa0, 0xe4, - 0x45, 0xb3, 0x51, 0x65, 0x72, 0x2a, 0x11, 0x96, 0x38, 0x2a, 0x39, 0xb2, 0xeb, 0x3f, 0x08, 0xb4, - 0xea, 0x0f, 0x08, 0x28, 0x50, 0xb4, 0xbf, 0xd0, 0x5f, 0xc8, 0x32, 0xcb, 0xae, 0x88, 0xc2, 0x5e, - 0x74, 0xaf, 0x1f, 0x68, 0xc1, 0x99, 0xa1, 0x1e, 0x4e, 0xe0, 0x65, 0x57, 0x59, 0x71, 0xee, 0x39, - 0xe7, 0x3e, 0x74, 0xef, 0xd5, 0x0c, 0x3c, 0x72, 0xce, 0xac, 0x9a, 0x45, 0x3c, 0x5c, 0xb3, 0x46, - 0x03, 0xd7, 0xc5, 0xe3, 0xda, 0xc5, 0x61, 0x74, 0xac, 0x4e, 0x3d, 0x42, 0x09, 0xba, 0xe7, 0x9c, - 0x59, 0xd5, 0x50, 0x52, 0x8d, 0xf0, 0x8b, 0x43, 0xf5, 0x93, 0x21, 0x19, 0x12, 0xc6, 0xd7, 0xc2, - 0x13, 0x97, 0xaa, 0xda, 0x3a, 0xda, 0xd8, 0xc1, 0x2e, 0x65, 0xc1, 0xd8, 0x89, 0x0b, 0xf4, 0xdf, - 0xe3, 0x90, 0x6e, 0xf0, 0x28, 0xe8, 0x29, 0x24, 0x7d, 0x3a, 0xa0, 0x58, 0x91, 0x2a, 0xd2, 0x41, - 0xe1, 0x99, 0x5a, 0xfd, 0x40, 0x9e, 0x6a, 0x37, 0x54, 0x98, 0x5c, 0x88, 0xbe, 0x82, 0x0c, 0xf1, - 0x6c, 0xec, 0x39, 0xee, 0x50, 0x89, 0xdf, 0xe1, 0xd4, 0x09, 0x45, 0xe6, 0x4a, 0x8b, 0xbe, 0x83, - 0x1d, 0x8b, 0xcc, 0x5c, 0x8a, 0xbd, 0xe9, 0xc0, 0xa3, 0x57, 0x4a, 0xa2, 0x22, 0x1d, 0xe4, 0x9e, - 0x3d, 0xfa, 0xa0, 0x6f, 0x63, 0x43, 0x58, 0x97, 0xdf, 0x06, 0x5a, 0xcc, 0xdc, 0x72, 0x46, 0x0d, - 0xd8, 0xb5, 0x88, 0xeb, 0x62, 0x8b, 0x3a, 0xc4, 0xed, 0x8f, 0xc8, 0xd4, 0x57, 0xe4, 0x4a, 0xe2, - 0x20, 0x5b, 0x57, 0x97, 0x81, 0x56, 0xba, 0x1a, 0x4c, 0xc6, 0x2f, 0xf4, 0x5b, 0x02, 0xdd, 0x2c, - 0xac, 0x91, 0x63, 0x32, 0xf5, 0x91, 0x02, 0xe9, 0x0b, 0xec, 0xf9, 0x0e, 0x71, 0x95, 0x64, 0x45, - 0x3a, 0xc8, 0x9a, 0x91, 0xf9, 0x42, 0x7e, 0xf3, 0xab, 0x16, 0xd3, 0xff, 0x89, 0xc3, 0x9e, 0x61, - 0x63, 0x97, 0x3a, 0x3f, 0x3a, 0xd8, 0xfe, 0xd8, 0xb1, 0x3b, 0x3a, 0x86, 0xee, 0x43, 0x7a, 0x4a, - 0x3c, 0xda, 0x77, 0x6c, 0x25, 0xc5, 0x98, 0x54, 0x68, 0x1a, 0x36, 0x7a, 0x08, 0x20, 0xca, 0x0c, - 0xb9, 0x34, 0xe3, 0xb2, 0x02, 0x31, 0x6c, 0xd1, 0xe9, 0x4b, 0xd8, 0xd9, 0xfc, 0x01, 0xe8, 0x8b, - 0x75, 0xb4, 0xb0, 0xcb, 0xd9, 0x3a, 0x5a, 0x06, 0x5a, 0x81, 0x17, 0x29, 0x08, 0x7d, 0x95, 0xe1, - 0xf9, 0x56, 0x86, 0x38, 0xd3, 0xef, 0x2f, 0x03, 0x6d, 0x4f, 0xfc, 0xa8, 0x15, 0xa7, 0xbf, 0x9f, - 0xf8, 0xdf, 0x04, 0xa4, 0x4e, 0x06, 0xd6, 0x39, 0xa6, 0x48, 0x85, 0x8c, 0x8f, 0x7f, 0x9a, 0x61, - 0xd7, 0xe2, 0xa3, 0x95, 0xcd, 0x95, 0x8d, 0xbe, 0x86, 0x9c, 0x4f, 0x66, 0x9e, 0x85, 0xfb, 0x61, - 0x4e, 0x91, 0xa3, 0xb4, 0x0c, 0x34, 0xc4, 0x73, 0x6c, 0x90, 0xba, 0x09, 0xdc, 0x3a, 0x21, 0x1e, - 0x45, 0xdf, 0x42, 0x41, 0x70, 0x22, 0x33, 0x1b, 0x62, 0xb6, 0xfe, 0xe9, 0x32, 0xd0, 0xf6, 0xb7, - 0x7c, 0x05, 0xaf, 0x9b, 0x79, 0x0e, 0x44, 0xeb, 0xf6, 0x12, 0x8a, 0x36, 0xf6, 0xa9, 0xe3, 0x0e, - 0xd8, 0x5c, 0x58, 0x7e, 0x99, 0xc5, 0xf8, 0x6c, 0x19, 0x68, 0xf7, 0x79, 0x8c, 0xdb, 0x0a, 0xdd, - 0xdc, 0xdd, 0x80, 0x58, 0x25, 0x1d, 0xb8, 0xb7, 0xa9, 0x8a, 0xca, 0x61, 0x63, 0xac, 0x97, 0x97, - 0x81, 0xa6, 0xbe, 0x1f, 0x6a, 0x55, 0x13, 0xda, 0x40, 0xa3, 0xc2, 0x10, 0xc8, 0xf6, 0x80, 0x0e, - 0xd8, 0xb8, 0x77, 0x4c, 0x76, 0x46, 0x3f, 0x40, 0x81, 0x3a, 0x13, 0x4c, 0x66, 0xb4, 0x3f, 0xc2, - 0xce, 0x70, 0x44, 0xd9, 0xc0, 0x73, 0x5b, 0xfb, 0xce, 0x6f, 0xa2, 0x8b, 0xc3, 0xea, 0x31, 0x53, - 0xd4, 0x1f, 0x86, 0xcb, 0xba, 0x6e, 0xc7, 0xb6, 0xbf, 0x6e, 0xe6, 0x05, 0xc0, 0xd5, 0xc8, 0x80, - 0xbd, 0x48, 0x11, 0x7e, 0x7d, 0x3a, 0x98, 0x4c, 0x95, 0x4c, 0x38, 0xae, 0xfa, 0x83, 0x65, 0xa0, - 0x29, 0xdb, 0x41, 0x56, 0x12, 0xdd, 0x2c, 0x0a, 0xac, 0x17, 0x41, 0x62, 0x03, 0xfe, 0x90, 0x20, - 0xc7, 0x37, 0x80, 0xfd, 0x67, 0xff, 0x87, 0xd5, 0xdb, 0xda, 0xb4, 0xc4, 0xad, 0x4d, 0x8b, 0xba, - 0x2a, 0xaf, 0xbb, 0x2a, 0x0a, 0xed, 0xc0, 0xee, 0x91, 0x75, 0xee, 0x92, 0xcb, 0x31, 0xb6, 0x87, - 0x78, 0x82, 0x5d, 0x8a, 0x14, 0x48, 0x79, 0xd8, 0x9f, 0x8d, 0xa9, 0xb2, 0x1f, 0xca, 0x8f, 0x63, - 0xa6, 0xb0, 0x51, 0x09, 0x92, 0xd8, 0xf3, 0x88, 0xa7, 0x94, 0xc2, 0x9a, 0x8e, 0x63, 0x26, 0x37, - 0xeb, 0x00, 0x19, 0x0f, 0xfb, 0x53, 0xe2, 0xfa, 0xf8, 0xf1, 0x9f, 0x12, 0x24, 0xbb, 0xe2, 0x82, - 0xd2, 0xba, 0xbd, 0xa3, 0x5e, 0xab, 0x7f, 0xda, 0x36, 0xda, 0x46, 0xcf, 0x38, 0x7a, 0x65, 0xbc, - 0x6e, 0x35, 0xfb, 0xa7, 0xed, 0xee, 0x49, 0xab, 0x61, 0xbc, 0x34, 0x5a, 0xcd, 0x62, 0x4c, 0xdd, - 0x9b, 0x2f, 0x2a, 0xf9, 0x2d, 0x01, 0x52, 0x00, 0xb8, 0x5f, 0x08, 0x16, 0x25, 0x35, 0x33, 0x5f, - 0x54, 0xe4, 0xf0, 0x8c, 0xca, 0x90, 0xe7, 0x4c, 0xcf, 0xfc, 0xbe, 0x73, 0xd2, 0x6a, 0x17, 0xe3, - 0x6a, 0x6e, 0xbe, 0xa8, 0xa4, 0x85, 0xb9, 0xf6, 0x64, 0x64, 0x82, 0x7b, 0x32, 0xe6, 0x01, 0xec, - 0x70, 0xa6, 0xf1, 0xaa, 0xd3, 0x6d, 0x35, 0x8b, 0xb2, 0x0a, 0xf3, 0x45, 0x25, 0xc5, 0x2d, 0x55, - 0x7e, 0xf3, 0x5b, 0x39, 0xf6, 0xf8, 0x12, 0x92, 0xec, 0xae, 0x44, 0x9f, 0x43, 0xa9, 0x63, 0x36, - 0x5b, 0x66, 0xbf, 0xdd, 0x69, 0xb7, 0x6e, 0xd5, 0xcb, 0x42, 0x86, 0x38, 0xd2, 0x61, 0x97, 0xab, - 0x4e, 0xdb, 0xec, 0xdb, 0x6a, 0x16, 0x25, 0x35, 0x3f, 0x5f, 0x54, 0xb2, 0x2b, 0x20, 0x2c, 0x98, - 0x6b, 0x22, 0x85, 0x28, 0x58, 0x98, 0x3c, 0x71, 0xdd, 0x7c, 0x7b, 0x5d, 0x96, 0xde, 0x5d, 0x97, - 0xa5, 0xbf, 0xaf, 0xcb, 0xd2, 0x2f, 0x37, 0xe5, 0xd8, 0xbb, 0x9b, 0x72, 0xec, 0xaf, 0x9b, 0x72, - 0xec, 0xf5, 0x37, 0x43, 0x87, 0x8e, 0x66, 0x67, 0x55, 0x8b, 0x4c, 0x6a, 0x16, 0xf1, 0x27, 0xc4, - 0x17, 0x9f, 0x27, 0xbe, 0x7d, 0x5e, 0xfb, 0xb9, 0xb6, 0x7a, 0x93, 0x9f, 0x3e, 0x7f, 0x12, 0x3d, - 0xf2, 0xf4, 0x6a, 0x8a, 0xfd, 0xb3, 0x14, 0x7b, 0x94, 0xbf, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, - 0xd7, 0x33, 0x69, 0x35, 0x05, 0x08, 0x00, 0x00, + // 908 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0xcd, 0x6e, 0x1a, 0x57, + 0x14, 0x66, 0xcc, 0xf0, 0x77, 0x30, 0x18, 0xdf, 0xd4, 0x64, 0x3a, 0x4d, 0x18, 0x32, 0xea, 0xc2, + 0x4a, 0x15, 0x88, 0xdd, 0x28, 0x95, 0xb2, 0xaa, 0xf9, 0x89, 0x3c, 0x6a, 0x04, 0x68, 0xc0, 0x8b, + 0x66, 0x43, 0x61, 0xe6, 0x16, 0x46, 0x86, 0xb9, 0x74, 0xe6, 0x82, 0xeb, 0x37, 0x88, 0x58, 0xf5, + 0x05, 0x90, 0x2a, 0x55, 0xed, 0x2b, 0xf4, 0x15, 0xb2, 0xcc, 0xb2, 0x2b, 0x54, 0xd9, 0x8b, 0xee, + 0x79, 0x81, 0x56, 0x73, 0xef, 0x1d, 0x7e, 0x9c, 0x28, 0xcb, 0xae, 0xb2, 0xe2, 0x9e, 0xef, 0xfb, + 0xce, 0xcf, 0x9c, 0x73, 0xb8, 0x17, 0x1e, 0x39, 0x7d, 0xab, 0x6c, 0x11, 0x0f, 0x97, 0xad, 0x61, + 0xcf, 0x75, 0xf1, 0xa8, 0x3c, 0x3b, 0x09, 0x8f, 0xa5, 0x89, 0x47, 0x28, 0x41, 0xf7, 0x9c, 0xbe, + 0x55, 0x0a, 0x24, 0xa5, 0x10, 0x9f, 0x9d, 0xa8, 0x9f, 0x0d, 0xc8, 0x80, 0x30, 0xbe, 0x1c, 0x9c, + 0xb8, 0x54, 0xd5, 0x36, 0xd1, 0x46, 0x0e, 0x76, 0x29, 0x0b, 0xc6, 0x4e, 0x5c, 0xa0, 0xff, 0xbe, + 0x07, 0x89, 0x2a, 0x8f, 0x82, 0x9e, 0x42, 0xcc, 0xa7, 0x3d, 0x8a, 0x15, 0xa9, 0x28, 0x1d, 0x67, + 0x4f, 0xd5, 0xd2, 0x07, 0xf2, 0x94, 0xda, 0x81, 0xc2, 0xe4, 0x42, 0xf4, 0x1c, 0x92, 0xc4, 0xb3, + 0xb1, 0xe7, 0xb8, 0x03, 0x65, 0xef, 0x23, 0x4e, 0xcd, 0x40, 0x64, 0xae, 0xb5, 0xe8, 0x3b, 0xd8, + 0xb7, 0xc8, 0xd4, 0xa5, 0xd8, 0x9b, 0xf4, 0x3c, 0x7a, 0xad, 0x44, 0x8b, 0xd2, 0x71, 0xfa, 0xf4, + 0xd1, 0x07, 0x7d, 0xab, 0x5b, 0xc2, 0x8a, 0xfc, 0x76, 0xa9, 0x45, 0xcc, 0x1d, 0x67, 0x54, 0x85, + 0x03, 0x8b, 0xb8, 0x2e, 0xb6, 0xa8, 0x43, 0xdc, 0xee, 0x90, 0x4c, 0x7c, 0x45, 0x2e, 0x46, 0x8f, + 0x53, 0x15, 0x75, 0xb5, 0xd4, 0xf2, 0xd7, 0xbd, 0xf1, 0xe8, 0x85, 0x7e, 0x47, 0xa0, 0x9b, 0xd9, + 0x0d, 0x72, 0x4e, 0x26, 0x3e, 0x52, 0x20, 0x31, 0xc3, 0x9e, 0xef, 0x10, 0x57, 0x89, 0x15, 0xa5, + 0xe3, 0x94, 0x19, 0x9a, 0x2f, 0xe4, 0x37, 0xbf, 0x6a, 0x11, 0xfd, 0x9f, 0x3d, 0x38, 0x34, 0x6c, + 0xec, 0x52, 0xe7, 0x47, 0x07, 0xdb, 0x9f, 0x3a, 0xf6, 0x91, 0x8e, 0xa1, 0xfb, 0x90, 0x98, 0x10, + 0x8f, 0x76, 0x1d, 0x5b, 0x89, 0x33, 0x26, 0x1e, 0x98, 0x86, 0x8d, 0x1e, 0x02, 0x88, 0x32, 0x03, + 0x2e, 0xc1, 0xb8, 0x94, 0x40, 0x0c, 0x5b, 0x74, 0xfa, 0x0a, 0xf6, 0xb7, 0x3f, 0x00, 0x7d, 0xb5, + 0x89, 0x16, 0x74, 0x39, 0x55, 0x41, 0xab, 0xa5, 0x96, 0xe5, 0x45, 0x0a, 0x42, 0x5f, 0x67, 0x78, + 0xb6, 0x93, 0x61, 0x8f, 0xe9, 0x8f, 0x56, 0x4b, 0xed, 0x50, 0x7c, 0xd4, 0x9a, 0xd3, 0xdf, 0x4f, + 0xfc, 0x6f, 0x14, 0xe2, 0xad, 0x9e, 0x75, 0x89, 0x29, 0x52, 0x21, 0xe9, 0xe3, 0x9f, 0xa6, 0xd8, + 0xb5, 0xf8, 0x68, 0x65, 0x73, 0x6d, 0xa3, 0x6f, 0x20, 0xed, 0x93, 0xa9, 0x67, 0xe1, 0x6e, 0x90, + 0x53, 0xe4, 0xc8, 0xaf, 0x96, 0x1a, 0xe2, 0x39, 0xb6, 0x48, 0xdd, 0x04, 0x6e, 0xb5, 0x88, 0x47, + 0xd1, 0xb7, 0x90, 0x15, 0x9c, 0xc8, 0xcc, 0x86, 0x98, 0xaa, 0x7c, 0xbe, 0x5a, 0x6a, 0x47, 0x3b, + 0xbe, 0x82, 0xd7, 0xcd, 0x0c, 0x07, 0xc2, 0x75, 0x7b, 0x09, 0x39, 0x1b, 0xfb, 0xd4, 0x71, 0x7b, + 0x6c, 0x2e, 0x2c, 0xbf, 0xcc, 0x62, 0x7c, 0xb1, 0x5a, 0x6a, 0xf7, 0x79, 0x8c, 0xbb, 0x0a, 0xdd, + 0x3c, 0xd8, 0x82, 0x58, 0x25, 0x4d, 0xb8, 0xb7, 0xad, 0x0a, 0xcb, 0x61, 0x63, 0xac, 0x14, 0x56, + 0x4b, 0x4d, 0x7d, 0x3f, 0xd4, 0xba, 0x26, 0xb4, 0x85, 0x86, 0x85, 0x21, 0x90, 0xed, 0x1e, 0xed, + 0xb1, 0x71, 0xef, 0x9b, 0xec, 0x8c, 0x7e, 0x80, 0x2c, 0x75, 0xc6, 0x98, 0x4c, 0x69, 0x77, 0x88, + 0x9d, 0xc1, 0x90, 0xb2, 0x81, 0xa7, 0x77, 0xf6, 0x9d, 0xdf, 0x44, 0xb3, 0x93, 0xd2, 0x39, 0x53, + 0x54, 0x1e, 0x06, 0xcb, 0xba, 0x69, 0xc7, 0xae, 0xbf, 0x6e, 0x66, 0x04, 0xc0, 0xd5, 0xc8, 0x80, + 0xc3, 0x50, 0x11, 0xfc, 0xfa, 0xb4, 0x37, 0x9e, 0x28, 0xc9, 0x60, 0x5c, 0x95, 0x07, 0xab, 0xa5, + 0xa6, 0xec, 0x06, 0x59, 0x4b, 0x74, 0x33, 0x27, 0xb0, 0x4e, 0x08, 0x89, 0x0d, 0xf8, 0x43, 0x82, + 0x34, 0xdf, 0x00, 0xf6, 0x9f, 0xfd, 0x1f, 0x56, 0x6f, 0x67, 0xd3, 0xa2, 0x77, 0x36, 0x2d, 0xec, + 0xaa, 0xbc, 0xe9, 0xaa, 0x28, 0xb4, 0x09, 0x07, 0x67, 0xd6, 0xa5, 0x4b, 0xae, 0x46, 0xd8, 0x1e, + 0xe0, 0x31, 0x76, 0x29, 0x52, 0x20, 0xee, 0x61, 0x7f, 0x3a, 0xa2, 0xca, 0x51, 0x20, 0x3f, 0x8f, + 0x98, 0xc2, 0x46, 0x79, 0x88, 0x61, 0xcf, 0x23, 0x9e, 0x92, 0x0f, 0x6a, 0x3a, 0x8f, 0x98, 0xdc, + 0xac, 0x00, 0x24, 0x3d, 0xec, 0x4f, 0x88, 0xeb, 0xe3, 0xc7, 0x7f, 0x4a, 0x10, 0x6b, 0x8b, 0x0b, + 0x4a, 0x6b, 0x77, 0xce, 0x3a, 0xf5, 0xee, 0x45, 0xc3, 0x68, 0x18, 0x1d, 0xe3, 0xec, 0x95, 0xf1, + 0xba, 0x5e, 0xeb, 0x5e, 0x34, 0xda, 0xad, 0x7a, 0xd5, 0x78, 0x69, 0xd4, 0x6b, 0xb9, 0x88, 0x7a, + 0x38, 0x5f, 0x14, 0x33, 0x3b, 0x02, 0xa4, 0x00, 0x70, 0xbf, 0x00, 0xcc, 0x49, 0x6a, 0x72, 0xbe, + 0x28, 0xca, 0xc1, 0x19, 0x15, 0x20, 0xc3, 0x99, 0x8e, 0xf9, 0x7d, 0xb3, 0x55, 0x6f, 0xe4, 0xf6, + 0xd4, 0xf4, 0x7c, 0x51, 0x4c, 0x08, 0x73, 0xe3, 0xc9, 0xc8, 0x28, 0xf7, 0x64, 0xcc, 0x03, 0xd8, + 0xe7, 0x4c, 0xf5, 0x55, 0xb3, 0x5d, 0xaf, 0xe5, 0x64, 0x15, 0xe6, 0x8b, 0x62, 0x9c, 0x5b, 0xaa, + 0xfc, 0xe6, 0xb7, 0x42, 0xe4, 0xf1, 0x15, 0xc4, 0xd8, 0x5d, 0x89, 0xbe, 0x84, 0x7c, 0xd3, 0xac, + 0xd5, 0xcd, 0x6e, 0xa3, 0xd9, 0xa8, 0xdf, 0xa9, 0x97, 0x85, 0x0c, 0x70, 0xa4, 0xc3, 0x01, 0x57, + 0x5d, 0x34, 0xd8, 0x6f, 0xbd, 0x96, 0x93, 0xd4, 0xcc, 0x7c, 0x51, 0x4c, 0xad, 0x81, 0xa0, 0x60, + 0xae, 0x09, 0x15, 0xa2, 0x60, 0x61, 0xf2, 0xc4, 0x95, 0xd6, 0xdb, 0x9b, 0x82, 0xf4, 0xee, 0xa6, + 0x20, 0xfd, 0x7d, 0x53, 0x90, 0x7e, 0xb9, 0x2d, 0x44, 0xde, 0xdd, 0x16, 0x22, 0x7f, 0xdd, 0x16, + 0x22, 0xaf, 0x9f, 0x0f, 0x1c, 0x3a, 0x9c, 0xf6, 0x4b, 0x16, 0x19, 0x97, 0x47, 0x8e, 0x8b, 0xcb, + 0xa3, 0xfe, 0xf8, 0x89, 0x6f, 0x5f, 0x96, 0x67, 0xa7, 0xe5, 0x9f, 0xcb, 0xeb, 0x17, 0xf9, 0xe9, + 0xb3, 0x27, 0xe1, 0x13, 0x4f, 0xaf, 0x27, 0xd8, 0xef, 0xc7, 0xd9, 0x93, 0xfc, 0xf5, 0x7f, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x64, 0x04, 0xeb, 0xf8, 0x03, 0x08, 0x00, 0x00, } func (m *Channel) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/core/04-channel/types/genesis.pb.go b/x/ibc/core/04-channel/types/genesis.pb.go index c54c6f9deb..3fcf02f4aa 100644 --- a/x/ibc/core/04-channel/types/genesis.pb.go +++ b/x/ibc/core/04-channel/types/genesis.pb.go @@ -195,39 +195,39 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/genesis.proto", fileDescriptor_cb06ec201f452595) } var fileDescriptor_cb06ec201f452595 = []byte{ - // 501 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0x87, 0xe3, 0x26, 0x4d, 0xd3, 0x6d, 0x13, 0xd1, 0x6d, 0x23, 0x99, 0xa8, 0xd8, 0xc6, 0x48, - 0x28, 0x12, 0xaa, 0x4d, 0xa1, 0x07, 0xc4, 0xd1, 0x1c, 0x20, 0x37, 0xb4, 0x70, 0x42, 0x42, 0x91, - 0xb3, 0x9e, 0xba, 0x2b, 0xc7, 0xde, 0xe0, 0xdd, 0x86, 0xf6, 0x29, 0xe0, 0xb1, 0x7a, 0xec, 0x91, - 0x93, 0x85, 0x92, 0x37, 0xc8, 0x91, 0x13, 0xf2, 0xdf, 0x24, 0x6a, 0x84, 0x68, 0x4f, 0xde, 0x9d, - 0xf9, 0xcd, 0xf7, 0xcd, 0xc1, 0x8b, 0x9e, 0xb2, 0x11, 0xb5, 0x29, 0x8f, 0xc1, 0xa6, 0x17, 0x6e, - 0x14, 0xc1, 0xd8, 0x9e, 0x9e, 0xda, 0x3e, 0x44, 0x20, 0x98, 0xb0, 0x26, 0x31, 0x97, 0x1c, 0x1f, - 0xb2, 0x11, 0xb5, 0xd2, 0x88, 0x55, 0x44, 0xac, 0xe9, 0x69, 0xef, 0xc8, 0xe7, 0x3e, 0xcf, 0xfa, - 0x76, 0x7a, 0xca, 0xa3, 0xbd, 0x8d, 0xb4, 0x72, 0x2a, 0x8b, 0x98, 0xf3, 0x6d, 0xb4, 0xff, 0x3e, - 0xe7, 0x7f, 0x92, 0xae, 0x04, 0xfc, 0x15, 0xb5, 0x8a, 0x84, 0x50, 0x15, 0xa3, 0xde, 0xdf, 0x7b, - 0xf5, 0xdc, 0xda, 0x60, 0xb4, 0x06, 0x1e, 0x44, 0x92, 0x9d, 0x33, 0xf0, 0xde, 0xe5, 0x45, 0xe7, - 0xf1, 0x4d, 0xa2, 0xd7, 0xfe, 0x24, 0xfa, 0xc1, 0x9d, 0x16, 0xa9, 0x90, 0x98, 0xa0, 0x47, 0x2e, - 0x0d, 0x22, 0xfe, 0x7d, 0x0c, 0x9e, 0x0f, 0x21, 0x44, 0x52, 0xa8, 0x5b, 0x99, 0xc6, 0xd8, 0xa8, - 0xf9, 0xe8, 0xd2, 0x00, 0x64, 0xb6, 0x9a, 0xd3, 0x48, 0x05, 0xe4, 0xce, 0x3c, 0xfe, 0x80, 0xf6, - 0x28, 0x0f, 0x43, 0x26, 0x73, 0x5c, 0xfd, 0x5e, 0xb8, 0xd5, 0x51, 0xec, 0xa0, 0x56, 0x0c, 0x14, - 0xd8, 0x44, 0x0a, 0xb5, 0x71, 0x2f, 0x4c, 0x35, 0x87, 0x19, 0xea, 0x08, 0x88, 0xbc, 0xa1, 0x80, - 0x6f, 0x97, 0x10, 0x51, 0x10, 0xea, 0x76, 0x46, 0x7a, 0xf6, 0x2f, 0x52, 0x91, 0x75, 0x9e, 0xa4, - 0xb0, 0x45, 0xa2, 0x77, 0xaf, 0xdd, 0x70, 0xfc, 0xd6, 0x5c, 0x07, 0x99, 0xa4, 0x9d, 0x16, 0xca, - 0x70, 0xa6, 0x8a, 0x81, 0x4e, 0x57, 0x54, 0xcd, 0x07, 0xab, 0xd6, 0x41, 0x26, 0x69, 0xa7, 0x85, - 0xa5, 0xea, 0x1c, 0xb5, 0x5d, 0x1a, 0xac, 0x98, 0x76, 0xfe, 0xdf, 0x74, 0x5c, 0x98, 0x8e, 0x72, - 0xd3, 0x1a, 0xc7, 0x24, 0xfb, 0x2e, 0x0d, 0x96, 0x9e, 0xcf, 0xa8, 0x1b, 0xc1, 0x95, 0x1c, 0x16, - 0xb4, 0x2a, 0xa8, 0xb6, 0x0c, 0xa5, 0xdf, 0x70, 0x8c, 0x45, 0xa2, 0x1f, 0xe7, 0x98, 0x8d, 0x31, - 0x93, 0x1c, 0xa6, 0xf5, 0xe2, 0xbf, 0x2b, 0xb1, 0xe6, 0x0f, 0x05, 0x75, 0xd6, 0x97, 0xc2, 0x2f, - 0xd0, 0xce, 0x84, 0xc7, 0x72, 0xc8, 0x3c, 0x55, 0x31, 0x94, 0xfe, 0xae, 0x83, 0x17, 0x89, 0xde, - 0xc9, 0xd1, 0x45, 0xc3, 0x24, 0xcd, 0xf4, 0x34, 0xf0, 0xf0, 0x19, 0x42, 0xa5, 0x89, 0x79, 0xea, - 0x56, 0x96, 0xef, 0x2e, 0x12, 0xfd, 0x20, 0xcf, 0x2f, 0x7b, 0x26, 0xd9, 0x2d, 0x2e, 0x03, 0x0f, - 0xf7, 0x50, 0xab, 0x5a, 0xbf, 0x9e, 0xae, 0x4f, 0xaa, 0xbb, 0x43, 0x6e, 0x66, 0x9a, 0x72, 0x3b, - 0xd3, 0x94, 0xdf, 0x33, 0x4d, 0xf9, 0x39, 0xd7, 0x6a, 0xb7, 0x73, 0xad, 0xf6, 0x6b, 0xae, 0xd5, - 0xbe, 0xbc, 0xf1, 0x99, 0xbc, 0xb8, 0x1c, 0x59, 0x94, 0x87, 0x36, 0xe5, 0x22, 0xe4, 0xa2, 0xf8, - 0x9c, 0x08, 0x2f, 0xb0, 0xaf, 0xec, 0xea, 0x4d, 0xbf, 0x3c, 0x3b, 0x29, 0x9f, 0xb5, 0xbc, 0x9e, - 0x80, 0x18, 0x35, 0xb3, 0x27, 0xfd, 0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x42, 0xc2, - 0x18, 0x45, 0x04, 0x00, 0x00, + // 505 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x93, 0x4f, 0x6f, 0xd3, 0x4c, + 0x10, 0x87, 0xe3, 0x26, 0x4d, 0xd3, 0x6d, 0x13, 0xbd, 0xdd, 0x36, 0x92, 0xdf, 0xa8, 0xd8, 0xc1, + 0x48, 0x28, 0x12, 0xaa, 0x97, 0x96, 0x8a, 0x03, 0x47, 0x73, 0x80, 0xdc, 0xaa, 0x85, 0x13, 0x12, + 0x8a, 0x9c, 0xf5, 0x34, 0x5d, 0xc5, 0x5e, 0x07, 0xef, 0x36, 0xb4, 0x9f, 0x02, 0x3e, 0x56, 0x8f, + 0x3d, 0x72, 0xb2, 0x50, 0xf2, 0x0d, 0x72, 0xe4, 0x84, 0xfc, 0x37, 0x89, 0x1a, 0x21, 0xca, 0xcd, + 0x3b, 0xf3, 0x9b, 0xe7, 0x99, 0x83, 0x07, 0x3d, 0xe5, 0x43, 0x46, 0x58, 0x18, 0x01, 0x61, 0x57, + 0xae, 0x10, 0xe0, 0x93, 0xe9, 0x29, 0x19, 0x81, 0x00, 0xc9, 0xa5, 0x3d, 0x89, 0x42, 0x15, 0xe2, + 0x43, 0x3e, 0x64, 0x76, 0x12, 0xb1, 0xf3, 0x88, 0x3d, 0x3d, 0xed, 0x1c, 0x8d, 0xc2, 0x51, 0x98, + 0xf6, 0x49, 0xf2, 0x95, 0x45, 0x3b, 0x1b, 0x69, 0xc5, 0x54, 0x1a, 0xb1, 0xe6, 0xdb, 0x68, 0xff, + 0x5d, 0xc6, 0xff, 0xa0, 0x5c, 0x05, 0xf8, 0x33, 0x6a, 0xe4, 0x09, 0xa9, 0x6b, 0xdd, 0x6a, 0x6f, + 0xef, 0xec, 0xb9, 0xbd, 0xc1, 0x68, 0xf7, 0x3d, 0x10, 0x8a, 0x5f, 0x72, 0xf0, 0xde, 0x66, 0x45, + 0xe7, 0xff, 0xbb, 0xd8, 0xac, 0xfc, 0x8a, 0xcd, 0x83, 0x07, 0x2d, 0x5a, 0x22, 0x31, 0x45, 0xff, + 0xb9, 0x6c, 0x2c, 0xc2, 0xaf, 0x3e, 0x78, 0x23, 0x08, 0x40, 0x28, 0xa9, 0x6f, 0xa5, 0x9a, 0xee, + 0x46, 0xcd, 0x85, 0xcb, 0xc6, 0xa0, 0xd2, 0xd5, 0x9c, 0x5a, 0x22, 0xa0, 0x0f, 0xe6, 0xf1, 0x7b, + 0xb4, 0xc7, 0xc2, 0x20, 0xe0, 0x2a, 0xc3, 0x55, 0x1f, 0x85, 0x5b, 0x1d, 0xc5, 0x0e, 0x6a, 0x44, + 0xc0, 0x80, 0x4f, 0x94, 0xd4, 0x6b, 0x8f, 0xc2, 0x94, 0x73, 0x98, 0xa3, 0x96, 0x04, 0xe1, 0x0d, + 0x24, 0x7c, 0xb9, 0x06, 0xc1, 0x40, 0xea, 0xdb, 0x29, 0xe9, 0xd9, 0x9f, 0x48, 0x79, 0xd6, 0x79, + 0x92, 0xc0, 0x16, 0xb1, 0xd9, 0xbe, 0x75, 0x03, 0xff, 0x8d, 0xb5, 0x0e, 0xb2, 0x68, 0x33, 0x29, + 0x14, 0xe1, 0x54, 0x15, 0x01, 0x9b, 0xae, 0xa8, 0xea, 0xff, 0xac, 0x5a, 0x07, 0x59, 0xb4, 0x99, + 0x14, 0x96, 0xaa, 0x4b, 0xd4, 0x74, 0xd9, 0x78, 0xc5, 0xb4, 0xf3, 0xf7, 0xa6, 0xe3, 0xdc, 0x74, + 0x94, 0x99, 0xd6, 0x38, 0x16, 0xdd, 0x77, 0xd9, 0x78, 0xe9, 0xf9, 0x88, 0xda, 0x02, 0x6e, 0xd4, + 0x20, 0xa7, 0x95, 0x41, 0xbd, 0xd1, 0xd5, 0x7a, 0x35, 0xa7, 0xbb, 0x88, 0xcd, 0xe3, 0x0c, 0xb3, + 0x31, 0x66, 0xd1, 0xc3, 0xa4, 0x9e, 0xff, 0x77, 0x05, 0xd6, 0xfa, 0xa6, 0xa1, 0xd6, 0xfa, 0x52, + 0xf8, 0x05, 0xda, 0x99, 0x84, 0x91, 0x1a, 0x70, 0x4f, 0xd7, 0xba, 0x5a, 0x6f, 0xd7, 0xc1, 0x8b, + 0xd8, 0x6c, 0x65, 0xe8, 0xbc, 0x61, 0xd1, 0x7a, 0xf2, 0xd5, 0xf7, 0xf0, 0x39, 0x42, 0x85, 0x89, + 0x7b, 0xfa, 0x56, 0x9a, 0x6f, 0x2f, 0x62, 0xf3, 0x20, 0xcb, 0x2f, 0x7b, 0x16, 0xdd, 0xcd, 0x1f, + 0x7d, 0x0f, 0x77, 0x50, 0xa3, 0x5c, 0xbf, 0x9a, 0xac, 0x4f, 0xcb, 0xb7, 0x73, 0x71, 0x37, 0x33, + 0xb4, 0xfb, 0x99, 0xa1, 0xfd, 0x9c, 0x19, 0xda, 0xf7, 0xb9, 0x51, 0xb9, 0x9f, 0x1b, 0x95, 0x1f, + 0x73, 0xa3, 0xf2, 0xe9, 0xf5, 0x88, 0xab, 0xab, 0xeb, 0xa1, 0xcd, 0xc2, 0x80, 0xf8, 0x5c, 0x00, + 0xf1, 0x87, 0xc1, 0x89, 0xf4, 0xc6, 0x64, 0x7a, 0x46, 0x6e, 0x48, 0x79, 0xd1, 0x2f, 0xcf, 0x4f, + 0x8a, 0xa3, 0x56, 0xb7, 0x13, 0x90, 0xc3, 0x7a, 0x7a, 0xd0, 0xaf, 0x7e, 0x07, 0x00, 0x00, 0xff, + 0xff, 0x88, 0xa8, 0x23, 0xda, 0x43, 0x04, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/core/04-channel/types/msgs_test.go b/x/ibc/core/04-channel/types/msgs_test.go index 93485299b0..26d685083b 100644 --- a/x/ibc/core/04-channel/types/msgs_test.go +++ b/x/ibc/core/04-channel/types/msgs_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/suite" - abci "github.com/tendermint/tendermint/abci/types" - dbm "github.com/tendermint/tm-db" + abci "github.com/line/ostracon/abci/types" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/simapp" "github.com/line/lbm-sdk/v2/store/iavl" diff --git a/x/ibc/core/04-channel/types/query.pb.go b/x/ibc/core/04-channel/types/query.pb.go index 025142fb4e..2829a0b34e 100644 --- a/x/ibc/core/04-channel/types/query.pb.go +++ b/x/ibc/core/04-channel/types/query.pb.go @@ -1699,100 +1699,100 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/query.proto", fileDescriptor_1034a1e9abc4cca1) } var fileDescriptor_1034a1e9abc4cca1 = []byte{ - // 1482 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xdd, 0x6f, 0x14, 0x55, - 0x14, 0xef, 0xdd, 0x16, 0x68, 0x0f, 0xc8, 0xc7, 0x6d, 0x0b, 0x65, 0x28, 0x4b, 0x19, 0x8d, 0x14, + // 1485 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0xdd, 0x6f, 0x14, 0x55, + 0x14, 0xef, 0xdd, 0x16, 0x68, 0x0f, 0xc8, 0xc7, 0x6d, 0x0b, 0x65, 0x28, 0x4b, 0x59, 0x8d, 0x14, 0x12, 0xe6, 0xd2, 0x82, 0x48, 0x62, 0xd0, 0x94, 0x26, 0x62, 0x13, 0x40, 0x1c, 0x40, 0x81, 0x28, - 0x9b, 0xd9, 0xd9, 0xcb, 0x76, 0xd2, 0x76, 0x66, 0xd8, 0x99, 0x2d, 0x6d, 0x9a, 0x7d, 0x50, 0x13, - 0xe2, 0x83, 0x24, 0x26, 0x3c, 0x68, 0x7c, 0xf1, 0xc5, 0xc4, 0xf0, 0xe0, 0x83, 0xff, 0x83, 0x0f, - 0xbc, 0x49, 0xa2, 0x26, 0x18, 0x13, 0x24, 0x60, 0x22, 0x0f, 0x3e, 0xeb, 0xab, 0x99, 0xfb, 0x31, - 0x1f, 0xbb, 0x33, 0xd3, 0x2e, 0xdb, 0x4d, 0x1a, 0x9f, 0xba, 0x73, 0xe7, 0x9c, 0x73, 0x7f, 0xbf, - 0xdf, 0xb9, 0xe7, 0xec, 0x3d, 0x5b, 0x38, 0x60, 0x95, 0x4d, 0x62, 0x3a, 0x35, 0x4a, 0xcc, 0x59, - 0xc3, 0xb6, 0xe9, 0x3c, 0x59, 0x9c, 0x20, 0xb7, 0xea, 0xb4, 0xb6, 0xac, 0xb9, 0x35, 0xc7, 0x77, - 0xf0, 0xa0, 0x55, 0x36, 0xb5, 0xc0, 0x40, 0x13, 0x06, 0xda, 0xe2, 0x84, 0x12, 0xf3, 0x9a, 0xb7, - 0xa8, 0xed, 0x07, 0x4e, 0xfc, 0x13, 0xf7, 0x52, 0x8e, 0x98, 0x8e, 0xb7, 0xe0, 0x78, 0xa4, 0x6c, - 0x78, 0x94, 0x87, 0x23, 0x8b, 0x13, 0x65, 0xea, 0x1b, 0x13, 0xc4, 0x35, 0xaa, 0x96, 0x6d, 0xf8, - 0x96, 0x63, 0x0b, 0xdb, 0x83, 0x69, 0x10, 0xe4, 0x66, 0xdc, 0x64, 0xb4, 0xea, 0x38, 0xd5, 0x79, - 0x4a, 0x0c, 0xd7, 0x22, 0x86, 0x6d, 0x3b, 0x3e, 0xf3, 0xf7, 0xc4, 0xdb, 0xbd, 0xe2, 0x2d, 0x7b, - 0x2a, 0xd7, 0x6f, 0x12, 0xc3, 0x16, 0xe8, 0x95, 0xa1, 0xaa, 0x53, 0x75, 0xd8, 0x47, 0x12, 0x7c, - 0xe2, 0xab, 0xea, 0x79, 0x18, 0x7c, 0x2f, 0xc0, 0x34, 0xcd, 0x37, 0xd1, 0xe9, 0xad, 0x3a, 0xf5, - 0x7c, 0xbc, 0x07, 0xb6, 0xb8, 0x4e, 0xcd, 0x2f, 0x59, 0x95, 0x11, 0x34, 0x86, 0xc6, 0x07, 0xf4, - 0xcd, 0xc1, 0xe3, 0x4c, 0x05, 0xef, 0x07, 0x10, 0x78, 0x82, 0x77, 0x05, 0xf6, 0x6e, 0x40, 0xac, - 0xcc, 0x54, 0xd4, 0xfb, 0x08, 0x86, 0x92, 0xf1, 0x3c, 0xd7, 0xb1, 0x3d, 0x8a, 0x4f, 0xc2, 0x16, - 0x61, 0xc5, 0x02, 0x6e, 0x9d, 0x1c, 0xd5, 0x52, 0xd4, 0xd4, 0xa4, 0x9b, 0x34, 0xc6, 0x43, 0xb0, - 0xc9, 0xad, 0x39, 0xce, 0x4d, 0xb6, 0xd5, 0x36, 0x9d, 0x3f, 0xe0, 0x69, 0xd8, 0xc6, 0x3e, 0x94, - 0x66, 0xa9, 0x55, 0x9d, 0xf5, 0x47, 0x7a, 0x59, 0x48, 0x25, 0x16, 0x92, 0x67, 0x60, 0x71, 0x42, - 0x7b, 0x87, 0x59, 0x9c, 0xe9, 0x7b, 0xf0, 0xf8, 0x40, 0x8f, 0xbe, 0x95, 0x79, 0xf1, 0x25, 0xf5, - 0x46, 0x12, 0xaa, 0x27, 0xb9, 0xbf, 0x0d, 0x10, 0x25, 0x46, 0xa0, 0x7d, 0x55, 0xe3, 0x59, 0xd4, - 0x82, 0x2c, 0x6a, 0xfc, 0x50, 0x88, 0x2c, 0x6a, 0x17, 0x8d, 0x2a, 0x15, 0xbe, 0x7a, 0xcc, 0x53, - 0x7d, 0x8c, 0x60, 0xb8, 0x69, 0x03, 0x21, 0xc6, 0x19, 0xe8, 0x17, 0xfc, 0xbc, 0x11, 0x34, 0xd6, - 0xcb, 0xe2, 0xa7, 0xa9, 0x31, 0x53, 0xa1, 0xb6, 0x6f, 0xdd, 0xb4, 0x68, 0x45, 0xea, 0x12, 0xfa, - 0xe1, 0xb3, 0x09, 0x94, 0x05, 0x86, 0xf2, 0xd0, 0xaa, 0x28, 0x39, 0x80, 0x38, 0x4c, 0x7c, 0x0a, - 0x36, 0xb7, 0xa9, 0xa2, 0xb0, 0x57, 0x3f, 0x43, 0x50, 0xe4, 0x04, 0x1d, 0xdb, 0xa6, 0x66, 0x10, - 0xad, 0x59, 0xcb, 0x22, 0x80, 0x19, 0xbe, 0x14, 0x47, 0x29, 0xb6, 0xd2, 0xa4, 0x75, 0xe1, 0x85, - 0xb5, 0x7e, 0x8e, 0xe0, 0x40, 0x26, 0x94, 0xff, 0x97, 0xea, 0x57, 0xa5, 0xe8, 0x1c, 0xd3, 0x34, - 0xb3, 0xbe, 0xe4, 0x1b, 0x3e, 0xed, 0xb4, 0x78, 0xff, 0x08, 0x45, 0x4c, 0x09, 0x2d, 0x44, 0x34, - 0x60, 0x8f, 0x15, 0xea, 0x53, 0xe2, 0x50, 0x4b, 0x5e, 0x60, 0x22, 0x2a, 0xe5, 0x70, 0x1a, 0x91, - 0x98, 0xa4, 0xb1, 0x98, 0xc3, 0x56, 0xda, 0x72, 0x37, 0x4b, 0xfe, 0x7b, 0x04, 0x07, 0x13, 0x0c, - 0x03, 0x4e, 0xb6, 0x57, 0xf7, 0xd6, 0x43, 0x3f, 0x7c, 0x08, 0x76, 0xd4, 0xe8, 0xa2, 0xe5, 0x59, - 0x8e, 0x5d, 0xb2, 0xeb, 0x0b, 0x65, 0x5a, 0x63, 0x28, 0xfb, 0xf4, 0xed, 0x72, 0xf9, 0x02, 0x5b, - 0x4d, 0x18, 0x0a, 0x3a, 0x7d, 0x49, 0x43, 0x81, 0xf7, 0x77, 0x04, 0x6a, 0x1e, 0x5e, 0x91, 0x94, - 0xd3, 0xb0, 0xc3, 0x94, 0x6f, 0x12, 0xc9, 0x18, 0xd2, 0xf8, 0xf7, 0x81, 0x26, 0xbf, 0x0f, 0xb4, - 0x29, 0x7b, 0x59, 0xdf, 0x6e, 0x26, 0xc2, 0xe0, 0x7d, 0x30, 0x20, 0x12, 0x19, 0xb2, 0xea, 0xe7, - 0x0b, 0x33, 0x95, 0x28, 0x1b, 0xbd, 0x79, 0xd9, 0xe8, 0x7b, 0x91, 0x6c, 0xd4, 0x60, 0x94, 0x91, - 0xbb, 0x68, 0x98, 0x73, 0xd4, 0x9f, 0x76, 0x16, 0x16, 0x2c, 0x7f, 0x81, 0xda, 0x7e, 0xa7, 0x79, - 0x50, 0xa0, 0xdf, 0x0b, 0x42, 0xd8, 0x26, 0x15, 0x09, 0x08, 0x9f, 0xd5, 0xaf, 0x11, 0xec, 0xcf, - 0xd8, 0x54, 0x88, 0xc9, 0x5a, 0x96, 0x5c, 0x65, 0x1b, 0x6f, 0xd3, 0x63, 0x2b, 0xdd, 0x3c, 0x9e, - 0xdf, 0x64, 0x81, 0xf3, 0x3a, 0x95, 0x24, 0xd9, 0x67, 0x7b, 0x5f, 0xb8, 0xcf, 0xfe, 0x25, 0x5b, - 0x7e, 0x0a, 0xc2, 0xb0, 0xcd, 0x6e, 0x8d, 0xd4, 0x92, 0x9d, 0x76, 0x2c, 0xb5, 0xd3, 0xf2, 0x20, - 0xfc, 0x2c, 0xc7, 0x9d, 0x36, 0x42, 0x9b, 0x75, 0x60, 0x6f, 0x8c, 0xa8, 0x4e, 0x4d, 0x6a, 0xb9, - 0x5d, 0x3d, 0x99, 0xf7, 0x10, 0x28, 0x69, 0x3b, 0x0a, 0x59, 0x15, 0xe8, 0xaf, 0x05, 0x4b, 0x8b, - 0x94, 0xc7, 0xed, 0xd7, 0xc3, 0xe7, 0x6e, 0xd6, 0xe8, 0x6d, 0xd1, 0x30, 0x39, 0xa8, 0x29, 0x73, - 0xce, 0x76, 0x6e, 0xcf, 0xd3, 0x4a, 0x95, 0x76, 0xbb, 0x50, 0xef, 0xcb, 0xd6, 0x97, 0xb1, 0xb3, - 0x90, 0x65, 0x1c, 0x76, 0x18, 0xc9, 0x57, 0xa2, 0x64, 0x9b, 0x97, 0xbb, 0x59, 0xb7, 0xdf, 0xe6, - 0x62, 0xdd, 0x30, 0xc5, 0xfb, 0x0f, 0x82, 0x97, 0x73, 0x61, 0x0a, 0x4d, 0xcf, 0xc1, 0xce, 0x26, - 0xf1, 0xd6, 0x5e, 0xc6, 0x2d, 0x9e, 0x1b, 0xa1, 0x96, 0xbf, 0x94, 0x7d, 0xf5, 0x8a, 0x2d, 0x6b, - 0x86, 0x63, 0xee, 0x38, 0x35, 0x6f, 0xc2, 0x3e, 0x97, 0x45, 0x2a, 0x45, 0xed, 0xab, 0x24, 0xcf, - 0xb0, 0x37, 0xd2, 0x3b, 0xd6, 0x3b, 0xde, 0xa7, 0xef, 0x75, 0x9b, 0x9a, 0xe5, 0x25, 0x69, 0xa0, - 0x2e, 0x89, 0x76, 0x9a, 0x02, 0x4c, 0x24, 0x63, 0x14, 0x06, 0xa2, 0x78, 0x88, 0xc5, 0x8b, 0x16, - 0x62, 0x9a, 0x14, 0xda, 0xd4, 0xe4, 0x8e, 0x6c, 0x37, 0xd1, 0xd6, 0x53, 0xe6, 0x5c, 0xc7, 0x82, - 0x1c, 0x83, 0x21, 0x21, 0x88, 0x61, 0xce, 0xb5, 0x28, 0x81, 0x5d, 0x79, 0xf2, 0x22, 0x09, 0xea, - 0xb0, 0x2f, 0x15, 0x47, 0x97, 0xf9, 0x5f, 0x13, 0x77, 0xdd, 0x0b, 0x74, 0x29, 0xcc, 0x87, 0xce, - 0x01, 0x74, 0x7a, 0x8f, 0xfe, 0x01, 0xc1, 0x58, 0x76, 0x6c, 0xc1, 0x6b, 0x12, 0x86, 0x6d, 0xba, - 0x14, 0x1d, 0x96, 0x92, 0x60, 0xcf, 0xb6, 0xea, 0xd3, 0x07, 0xed, 0x56, 0xdf, 0x2e, 0xb6, 0xb0, - 0xc9, 0x9f, 0x76, 0xc3, 0x26, 0x86, 0x19, 0x7f, 0x87, 0x60, 0x8b, 0xb8, 0x6e, 0xe2, 0xf1, 0xd4, - 0x7a, 0x4f, 0xf9, 0xc1, 0x40, 0x39, 0xbc, 0x06, 0x4b, 0xce, 0x5c, 0x3d, 0xfb, 0xc9, 0xcf, 0x7f, - 0xde, 0x2b, 0x4c, 0xe1, 0xb7, 0x48, 0xca, 0xaf, 0x1d, 0xfc, 0x87, 0x11, 0x39, 0x6f, 0x91, 0x95, - 0x48, 0xe7, 0x06, 0x09, 0xd4, 0xf7, 0xc8, 0x8a, 0xc8, 0x49, 0x03, 0xdf, 0x45, 0xd0, 0x2f, 0xa7, - 0x3c, 0xbc, 0x3a, 0x00, 0x79, 0xb6, 0x95, 0x23, 0x6b, 0x31, 0x15, 0x60, 0x8f, 0x30, 0xb0, 0xaf, - 0x60, 0x75, 0x75, 0xb0, 0xf8, 0x47, 0x04, 0xb8, 0x75, 0xfe, 0xc4, 0xc7, 0x73, 0xb6, 0xcb, 0x1a, - 0x9c, 0x95, 0x13, 0xed, 0x39, 0x09, 0xb4, 0xd3, 0x0c, 0xed, 0x69, 0xfc, 0x46, 0x0e, 0xda, 0xd0, - 0x3b, 0x50, 0x37, 0x7c, 0x68, 0x44, 0x34, 0x7e, 0x0d, 0x68, 0xb4, 0x4c, 0x80, 0xb9, 0x34, 0xb2, - 0x46, 0xd1, 0x5c, 0x1a, 0x99, 0x43, 0xa6, 0x7a, 0x99, 0xd1, 0xb8, 0x80, 0xcf, 0x75, 0x78, 0x42, - 0x48, 0x7c, 0x3e, 0xc5, 0x5f, 0x15, 0x60, 0x38, 0x75, 0x8e, 0xc2, 0x27, 0x57, 0x47, 0x99, 0x36, - 0x28, 0x2a, 0xaf, 0xb7, 0xed, 0x27, 0x08, 0xde, 0x45, 0x8c, 0xe1, 0x1d, 0x84, 0x3f, 0x45, 0x1d, - 0x73, 0x4c, 0x4e, 0x7e, 0x44, 0x8e, 0x90, 0x64, 0xa5, 0x69, 0x18, 0x6d, 0x10, 0xde, 0x20, 0x62, - 0x2f, 0xf8, 0x42, 0x03, 0x3f, 0x41, 0xb0, 0xb3, 0xf9, 0x46, 0x8f, 0x27, 0xb2, 0xd9, 0x65, 0x4c, - 0x6c, 0xca, 0x64, 0x3b, 0x2e, 0x42, 0x0b, 0xca, 0xa4, 0x28, 0xe1, 0x8f, 0x3a, 0x15, 0xa2, 0xe5, - 0x8b, 0xd8, 0x23, 0x2b, 0xb2, 0xbb, 0x36, 0xf0, 0x23, 0x04, 0xbb, 0x5a, 0x86, 0x16, 0xdc, 0x06, - 0xe0, 0xb0, 0x34, 0x8f, 0xb7, 0xe5, 0x23, 0x58, 0x5e, 0x67, 0x2c, 0x2f, 0x63, 0x7d, 0xfd, 0x59, - 0xe2, 0x5f, 0x10, 0xbc, 0x94, 0x18, 0x1a, 0xb0, 0xb6, 0x1a, 0xc4, 0xe4, 0x3c, 0xa3, 0x90, 0x35, - 0xdb, 0x0b, 0x3a, 0x65, 0x46, 0xe7, 0x43, 0x7c, 0x7d, 0x9d, 0xe8, 0xd4, 0x78, 0xfc, 0x44, 0xc6, - 0x9e, 0x23, 0x18, 0x4e, 0xbd, 0xa9, 0xe6, 0xd5, 0x6b, 0xde, 0x9c, 0x92, 0x57, 0xaf, 0xb9, 0x53, - 0x86, 0x7a, 0x83, 0xd1, 0xbd, 0x8a, 0xdf, 0x5f, 0x27, 0xba, 0x86, 0x39, 0x97, 0xa0, 0xfa, 0x37, - 0x82, 0xdd, 0xe9, 0x97, 0x72, 0xdc, 0x2e, 0xe6, 0xf0, 0x98, 0x9e, 0x6a, 0xdf, 0x51, 0xb0, 0x2d, - 0x31, 0xb6, 0xd7, 0xf0, 0x07, 0xeb, 0xc7, 0x36, 0xc9, 0xe9, 0xf3, 0x02, 0xec, 0x6a, 0xb9, 0xf1, - 0xe6, 0xd5, 0x62, 0xd6, 0xbd, 0x3d, 0xaf, 0x16, 0x33, 0xaf, 0xd4, 0xeb, 0xda, 0x7d, 0xd3, 0x9a, - 0x4e, 0xce, 0x44, 0xd0, 0x20, 0xf5, 0x10, 0x56, 0xc9, 0x15, 0xc4, 0xff, 0x45, 0xb0, 0x3d, 0x79, - 0xfb, 0xc5, 0x64, 0x2d, 0xbc, 0x62, 0xf7, 0x75, 0xe5, 0xd8, 0xda, 0x1d, 0x84, 0x0a, 0x1f, 0x73, - 0x15, 0x56, 0xf0, 0x72, 0x17, 0x35, 0x48, 0x0c, 0x01, 0x09, 0xf2, 0x41, 0x09, 0xe0, 0xdf, 0x10, - 0x0c, 0xa6, 0x5c, 0x92, 0x71, 0xce, 0xb5, 0x21, 0xfb, 0xbe, 0xae, 0xbc, 0xd6, 0xa6, 0x97, 0x10, - 0xe2, 0x0a, 0xd3, 0xe1, 0x5d, 0x7c, 0xbe, 0x53, 0x1d, 0x12, 0xf7, 0xf9, 0x33, 0xfa, 0x83, 0xa7, - 0x45, 0xf4, 0xf0, 0x69, 0x11, 0x3d, 0x79, 0x5a, 0x44, 0x5f, 0x3c, 0x2b, 0xf6, 0x3c, 0x7c, 0x56, - 0xec, 0x79, 0xf4, 0xac, 0xd8, 0x73, 0xfd, 0x54, 0xd5, 0xf2, 0x67, 0xeb, 0x65, 0xcd, 0x74, 0x16, - 0x88, 0xf8, 0xe7, 0x20, 0xff, 0x73, 0xd4, 0xab, 0xcc, 0x91, 0xa5, 0x08, 0xc6, 0xb1, 0x13, 0x47, - 0x25, 0x12, 0x7f, 0xd9, 0xa5, 0x5e, 0x79, 0x33, 0xfb, 0x1d, 0xf7, 0xf8, 0x7f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xce, 0x1d, 0x1b, 0xcd, 0xab, 0x1c, 0x00, 0x00, + 0x9b, 0xd9, 0xd9, 0xcb, 0x76, 0xd2, 0xee, 0xcc, 0xb0, 0x33, 0xbb, 0xb4, 0x69, 0xf6, 0x41, 0x4d, + 0x88, 0x0f, 0x92, 0x98, 0xf0, 0xa0, 0xf1, 0xc5, 0x17, 0x13, 0xc3, 0x83, 0x0f, 0xfe, 0x0f, 0x3e, + 0xf0, 0x26, 0x89, 0x9a, 0x60, 0x4c, 0x90, 0x80, 0x89, 0x3c, 0xf8, 0xac, 0xaf, 0x66, 0xee, 0xc7, + 0x7c, 0xec, 0xce, 0x4c, 0xbb, 0x6c, 0x37, 0x69, 0x7c, 0xdb, 0xb9, 0x73, 0xce, 0xb9, 0xbf, 0xdf, + 0xef, 0xdc, 0x73, 0xf6, 0x9e, 0x81, 0x03, 0x66, 0xc9, 0x20, 0x86, 0x5d, 0xa3, 0xc4, 0x98, 0xd7, + 0x2d, 0x8b, 0x2e, 0x92, 0xc6, 0x14, 0xb9, 0x55, 0xa7, 0xb5, 0x65, 0xd5, 0xa9, 0xd9, 0x9e, 0x8d, + 0x87, 0xcd, 0x92, 0xa1, 0xfa, 0x06, 0xaa, 0x30, 0x50, 0x1b, 0x53, 0x4a, 0xc4, 0x6b, 0xd1, 0xa4, + 0x96, 0xe7, 0x3b, 0xf1, 0x5f, 0xdc, 0x4b, 0x39, 0x62, 0xd8, 0x6e, 0xd5, 0x76, 0x49, 0x49, 0x77, + 0x29, 0x0f, 0x47, 0x1a, 0x53, 0x25, 0xea, 0xe9, 0x53, 0xc4, 0xd1, 0x2b, 0xa6, 0xa5, 0x7b, 0xa6, + 0x6d, 0x09, 0xdb, 0x83, 0x49, 0x10, 0xe4, 0x66, 0xdc, 0x64, 0xbc, 0x62, 0xdb, 0x95, 0x45, 0x4a, + 0x74, 0xc7, 0x24, 0xba, 0x65, 0xd9, 0x1e, 0xf3, 0x77, 0xc5, 0xdb, 0xbd, 0xe2, 0x2d, 0x7b, 0x2a, + 0xd5, 0x6f, 0x12, 0xdd, 0x12, 0xe8, 0x95, 0x91, 0x8a, 0x5d, 0xb1, 0xd9, 0x4f, 0xe2, 0xff, 0xe2, + 0xab, 0x85, 0xf3, 0x30, 0xfc, 0x9e, 0x8f, 0x69, 0x96, 0x6f, 0xa2, 0xd1, 0x5b, 0x75, 0xea, 0x7a, + 0x78, 0x0f, 0x6c, 0x71, 0xec, 0x9a, 0x57, 0x34, 0xcb, 0x63, 0x68, 0x02, 0x4d, 0x0e, 0x69, 0x9b, + 0xfd, 0xc7, 0xb9, 0x32, 0xde, 0x0f, 0x20, 0xf0, 0xf8, 0xef, 0x72, 0xec, 0xdd, 0x90, 0x58, 0x99, + 0x2b, 0x17, 0xee, 0x23, 0x18, 0x89, 0xc7, 0x73, 0x1d, 0xdb, 0x72, 0x29, 0x3e, 0x09, 0x5b, 0x84, + 0x15, 0x0b, 0xb8, 0x75, 0x7a, 0x5c, 0x4d, 0x50, 0x53, 0x95, 0x6e, 0xd2, 0x18, 0x8f, 0xc0, 0x26, + 0xa7, 0x66, 0xdb, 0x37, 0xd9, 0x56, 0xdb, 0x34, 0xfe, 0x80, 0x67, 0x61, 0x1b, 0xfb, 0x51, 0x9c, + 0xa7, 0x66, 0x65, 0xde, 0x1b, 0xeb, 0x67, 0x21, 0x95, 0x48, 0x48, 0x9e, 0x81, 0xc6, 0x94, 0xfa, + 0x0e, 0xb3, 0x38, 0x33, 0xf0, 0xe0, 0xf1, 0x81, 0x3e, 0x6d, 0x2b, 0xf3, 0xe2, 0x4b, 0x85, 0x1b, + 0x71, 0xa8, 0xae, 0xe4, 0xfe, 0x36, 0x40, 0x98, 0x18, 0x81, 0xf6, 0x55, 0x95, 0x67, 0x51, 0xf5, + 0xb3, 0xa8, 0xf2, 0x43, 0x21, 0xb2, 0xa8, 0x5e, 0xd4, 0x2b, 0x54, 0xf8, 0x6a, 0x11, 0xcf, 0xc2, + 0x63, 0x04, 0xa3, 0x2d, 0x1b, 0x08, 0x31, 0xce, 0xc0, 0xa0, 0xe0, 0xe7, 0x8e, 0xa1, 0x89, 0x7e, + 0x16, 0x3f, 0x49, 0x8d, 0xb9, 0x32, 0xb5, 0x3c, 0xf3, 0xa6, 0x49, 0xcb, 0x52, 0x97, 0xc0, 0x0f, + 0x9f, 0x8d, 0xa1, 0xcc, 0x31, 0x94, 0x87, 0x56, 0x45, 0xc9, 0x01, 0x44, 0x61, 0xe2, 0x53, 0xb0, + 0xb9, 0x43, 0x15, 0x85, 0x7d, 0xe1, 0x33, 0x04, 0x79, 0x4e, 0xd0, 0xb6, 0x2c, 0x6a, 0xf8, 0xd1, + 0x5a, 0xb5, 0xcc, 0x03, 0x18, 0xc1, 0x4b, 0x71, 0x94, 0x22, 0x2b, 0x2d, 0x5a, 0xe7, 0x5e, 0x58, + 0xeb, 0xe7, 0x08, 0x0e, 0xa4, 0x42, 0xf9, 0x7f, 0xa9, 0x7e, 0x55, 0x8a, 0xce, 0x31, 0xcd, 0x32, + 0xeb, 0x4b, 0x9e, 0xee, 0xd1, 0x6e, 0x8b, 0xf7, 0x8f, 0x40, 0xc4, 0x84, 0xd0, 0x42, 0x44, 0x1d, + 0xf6, 0x98, 0x81, 0x3e, 0x45, 0x0e, 0xb5, 0xe8, 0xfa, 0x26, 0xa2, 0x52, 0x0e, 0x27, 0x11, 0x89, + 0x48, 0x1a, 0x89, 0x39, 0x6a, 0x26, 0x2d, 0xf7, 0xb2, 0xe4, 0xbf, 0x47, 0x70, 0x30, 0xc6, 0xd0, + 0xe7, 0x64, 0xb9, 0x75, 0x77, 0x3d, 0xf4, 0xc3, 0x87, 0x60, 0x47, 0x8d, 0x36, 0x4c, 0xd7, 0xb4, + 0xad, 0xa2, 0x55, 0xaf, 0x96, 0x68, 0x8d, 0xa1, 0x1c, 0xd0, 0xb6, 0xcb, 0xe5, 0x0b, 0x6c, 0x35, + 0x66, 0x28, 0xe8, 0x0c, 0xc4, 0x0d, 0x05, 0xde, 0xdf, 0x11, 0x14, 0xb2, 0xf0, 0x8a, 0xa4, 0x9c, + 0x86, 0x1d, 0x86, 0x7c, 0x13, 0x4b, 0xc6, 0x88, 0xca, 0xff, 0x0f, 0x54, 0xf9, 0x7f, 0xa0, 0xce, + 0x58, 0xcb, 0xda, 0x76, 0x23, 0x16, 0x06, 0xef, 0x83, 0x21, 0x91, 0xc8, 0x80, 0xd5, 0x20, 0x5f, + 0x98, 0x2b, 0x87, 0xd9, 0xe8, 0xcf, 0xca, 0xc6, 0xc0, 0x8b, 0x64, 0xa3, 0x06, 0xe3, 0x8c, 0xdc, + 0x45, 0xdd, 0x58, 0xa0, 0xde, 0xac, 0x5d, 0xad, 0x9a, 0x5e, 0x95, 0x5a, 0x5e, 0xb7, 0x79, 0x50, + 0x60, 0xd0, 0xf5, 0x43, 0x58, 0x06, 0x15, 0x09, 0x08, 0x9e, 0x0b, 0x5f, 0x23, 0xd8, 0x9f, 0xb2, + 0xa9, 0x10, 0x93, 0xb5, 0x2c, 0xb9, 0xca, 0x36, 0xde, 0xa6, 0x45, 0x56, 0x7a, 0x79, 0x3c, 0xbf, + 0x49, 0x03, 0xe7, 0x76, 0x2b, 0x49, 0xbc, 0xcf, 0xf6, 0xbf, 0x70, 0x9f, 0xfd, 0x4b, 0xb6, 0xfc, + 0x04, 0x84, 0x41, 0x9b, 0xdd, 0x1a, 0xaa, 0x25, 0x3b, 0xed, 0x44, 0x62, 0xa7, 0xe5, 0x41, 0xf8, + 0x59, 0x8e, 0x3a, 0x6d, 0x84, 0x36, 0x6b, 0xc3, 0xde, 0x08, 0x51, 0x8d, 0x1a, 0xd4, 0x74, 0x7a, + 0x7a, 0x32, 0xef, 0x21, 0x50, 0x92, 0x76, 0x14, 0xb2, 0x2a, 0x30, 0x58, 0xf3, 0x97, 0x1a, 0x94, + 0xc7, 0x1d, 0xd4, 0x82, 0xe7, 0x5e, 0xd6, 0xe8, 0x6d, 0xd1, 0x30, 0x39, 0xa8, 0x19, 0x63, 0xc1, + 0xb2, 0x6f, 0x2f, 0xd2, 0x72, 0x85, 0xf6, 0xba, 0x50, 0xef, 0xcb, 0xd6, 0x97, 0xb2, 0xb3, 0x90, + 0x65, 0x12, 0x76, 0xe8, 0xf1, 0x57, 0xa2, 0x64, 0x5b, 0x97, 0x7b, 0x59, 0xb7, 0xdf, 0x66, 0x62, + 0xdd, 0x30, 0xc5, 0xfb, 0x0f, 0x82, 0x97, 0x33, 0x61, 0x0a, 0x4d, 0xcf, 0xc1, 0xce, 0x16, 0xf1, + 0xd6, 0x5e, 0xc6, 0x6d, 0x9e, 0x1b, 0xa1, 0x96, 0xbf, 0x94, 0x7d, 0xf5, 0x8a, 0x25, 0x6b, 0x86, + 0x63, 0xee, 0x3a, 0x35, 0x6f, 0xc2, 0x3e, 0x87, 0x45, 0x2a, 0x86, 0xed, 0xab, 0x28, 0xcf, 0xb0, + 0x3b, 0xd6, 0x3f, 0xd1, 0x3f, 0x39, 0xa0, 0xed, 0x75, 0x5a, 0x9a, 0xe5, 0x25, 0x69, 0x50, 0x58, + 0x12, 0xed, 0x34, 0x01, 0x98, 0x48, 0xc6, 0x38, 0x0c, 0x85, 0xf1, 0x10, 0x8b, 0x17, 0x2e, 0x44, + 0x34, 0xc9, 0x75, 0xa8, 0xc9, 0x1d, 0xd9, 0x6e, 0xc2, 0xad, 0x67, 0x8c, 0x85, 0xae, 0x05, 0x39, + 0x06, 0x23, 0x42, 0x10, 0xdd, 0x58, 0x68, 0x53, 0x02, 0x3b, 0xf2, 0xe4, 0x85, 0x12, 0xd4, 0x61, + 0x5f, 0x22, 0x8e, 0x1e, 0xf3, 0xbf, 0x26, 0xee, 0xba, 0x17, 0xe8, 0x52, 0x90, 0x0f, 0x8d, 0x03, + 0xe8, 0xf6, 0x1e, 0xfd, 0x03, 0x82, 0x89, 0xf4, 0xd8, 0x82, 0xd7, 0x34, 0x8c, 0x5a, 0x74, 0x29, + 0x3c, 0x2c, 0x45, 0xc1, 0x9e, 0x6d, 0x35, 0xa0, 0x0d, 0x5b, 0xed, 0xbe, 0x3d, 0x6c, 0x61, 0xd3, + 0x3f, 0xed, 0x86, 0x4d, 0x0c, 0x33, 0xfe, 0x0e, 0xc1, 0x16, 0x71, 0xdd, 0xc4, 0x93, 0x89, 0xf5, + 0x9e, 0xf0, 0xc1, 0x40, 0x39, 0xbc, 0x06, 0x4b, 0xce, 0xbc, 0x70, 0xf6, 0x93, 0x9f, 0xff, 0xbc, + 0x97, 0x9b, 0xc1, 0x6f, 0x91, 0x84, 0xaf, 0x1d, 0xfc, 0xc3, 0x88, 0x9c, 0xb7, 0xc8, 0x4a, 0xa8, + 0x73, 0x93, 0xf8, 0xea, 0xbb, 0x64, 0x45, 0xe4, 0xa4, 0x89, 0xef, 0x22, 0x18, 0x94, 0x53, 0x1e, + 0x5e, 0x1d, 0x80, 0x3c, 0xdb, 0xca, 0x91, 0xb5, 0x98, 0x0a, 0xb0, 0x47, 0x18, 0xd8, 0x57, 0x70, + 0x61, 0x75, 0xb0, 0xf8, 0x47, 0x04, 0xb8, 0x7d, 0xfe, 0xc4, 0xc7, 0x33, 0xb6, 0x4b, 0x1b, 0x9c, + 0x95, 0x13, 0x9d, 0x39, 0x09, 0xb4, 0xb3, 0x0c, 0xed, 0x69, 0xfc, 0x46, 0x06, 0xda, 0xc0, 0xdb, + 0x57, 0x37, 0x78, 0x68, 0x86, 0x34, 0x7e, 0xf5, 0x69, 0xb4, 0x4d, 0x80, 0x99, 0x34, 0xd2, 0x46, + 0xd1, 0x4c, 0x1a, 0xa9, 0x43, 0x66, 0xe1, 0x32, 0xa3, 0x71, 0x01, 0x9f, 0xeb, 0xf2, 0x84, 0x90, + 0xe8, 0x7c, 0x8a, 0xbf, 0xca, 0xc1, 0x68, 0xe2, 0x1c, 0x85, 0x4f, 0xae, 0x8e, 0x32, 0x69, 0x50, + 0x54, 0x5e, 0xef, 0xd8, 0x4f, 0x10, 0xbc, 0x8b, 0x18, 0xc3, 0x3b, 0x08, 0x7f, 0x8a, 0xba, 0xe6, + 0x18, 0x9f, 0xfc, 0x88, 0x1c, 0x21, 0xc9, 0x4a, 0xcb, 0x30, 0xda, 0x24, 0xbc, 0x41, 0x44, 0x5e, + 0xf0, 0x85, 0x26, 0x7e, 0x82, 0x60, 0x67, 0xeb, 0x8d, 0x1e, 0x4f, 0xa5, 0xb3, 0x4b, 0x99, 0xd8, + 0x94, 0xe9, 0x4e, 0x5c, 0x84, 0x16, 0x94, 0x49, 0x51, 0xc4, 0x1f, 0x75, 0x2b, 0x44, 0xdb, 0x1f, + 0xb1, 0x4b, 0x56, 0x64, 0x77, 0x6d, 0xe2, 0x47, 0x08, 0x76, 0xb5, 0x0d, 0x2d, 0xb8, 0x03, 0xc0, + 0x41, 0x69, 0x1e, 0xef, 0xc8, 0x47, 0xb0, 0xbc, 0xce, 0x58, 0x5e, 0xc6, 0xda, 0xfa, 0xb3, 0xc4, + 0xbf, 0x20, 0x78, 0x29, 0x36, 0x34, 0x60, 0x75, 0x35, 0x88, 0xf1, 0x79, 0x46, 0x21, 0x6b, 0xb6, + 0x17, 0x74, 0x4a, 0x8c, 0xce, 0x87, 0xf8, 0xfa, 0x3a, 0xd1, 0xa9, 0xf1, 0xf8, 0xb1, 0x8c, 0x3d, + 0x47, 0x30, 0x9a, 0x78, 0x53, 0xcd, 0xaa, 0xd7, 0xac, 0x39, 0x25, 0xab, 0x5e, 0x33, 0xa7, 0x8c, + 0xc2, 0x0d, 0x46, 0xf7, 0x2a, 0x7e, 0x7f, 0x9d, 0xe8, 0xea, 0xc6, 0x42, 0x8c, 0xea, 0xdf, 0x08, + 0x76, 0x27, 0x5f, 0xca, 0x71, 0xa7, 0x98, 0x83, 0x63, 0x7a, 0xaa, 0x73, 0x47, 0xc1, 0xb6, 0xc8, + 0xd8, 0x5e, 0xc3, 0x1f, 0xac, 0x1f, 0xdb, 0x38, 0xa7, 0xcf, 0x73, 0xb0, 0xab, 0xed, 0xc6, 0x9b, + 0x55, 0x8b, 0x69, 0xf7, 0xf6, 0xac, 0x5a, 0x4c, 0xbd, 0x52, 0xaf, 0x6b, 0xf7, 0x4d, 0x6a, 0x3a, + 0x19, 0x13, 0x41, 0x93, 0xd4, 0x03, 0x58, 0x45, 0x47, 0x10, 0xff, 0x17, 0xc1, 0xf6, 0xf8, 0xed, + 0x17, 0x93, 0xb5, 0xf0, 0x8a, 0xdc, 0xd7, 0x95, 0x63, 0x6b, 0x77, 0x10, 0x2a, 0x7c, 0xcc, 0x55, + 0x58, 0xc1, 0xcb, 0x3d, 0xd4, 0x20, 0x36, 0x04, 0xc4, 0xc8, 0xfb, 0x25, 0x80, 0x7f, 0x43, 0x30, + 0x9c, 0x70, 0x49, 0xc6, 0x19, 0xd7, 0x86, 0xf4, 0xfb, 0xba, 0xf2, 0x5a, 0x87, 0x5e, 0x42, 0x88, + 0x2b, 0x4c, 0x87, 0x77, 0xf1, 0xf9, 0x6e, 0x75, 0x88, 0xdd, 0xe7, 0xcf, 0x5c, 0x7c, 0xf0, 0x34, + 0x8f, 0x1e, 0x3e, 0xcd, 0xa3, 0x27, 0x4f, 0xf3, 0xe8, 0x8b, 0x67, 0xf9, 0xbe, 0x87, 0xcf, 0xf2, + 0x7d, 0x8f, 0x9e, 0xe5, 0xfb, 0xae, 0x9f, 0xac, 0x98, 0xde, 0x7c, 0xbd, 0xa4, 0x1a, 0x76, 0x95, + 0x2c, 0x9a, 0x16, 0x25, 0x8b, 0xa5, 0xea, 0x51, 0xb7, 0xbc, 0x40, 0x1a, 0xd3, 0x64, 0x29, 0x04, + 0x71, 0xec, 0xc4, 0x51, 0x89, 0xc3, 0x5b, 0x76, 0xa8, 0x5b, 0xda, 0xcc, 0xbe, 0xe2, 0x1e, 0xff, + 0x2f, 0x00, 0x00, 0xff, 0xff, 0xfe, 0x83, 0xe1, 0xa2, 0xa9, 0x1c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/core/04-channel/types/tx.pb.go b/x/ibc/core/04-channel/types/tx.pb.go index e47841b960..62f3d91c7f 100644 --- a/x/ibc/core/04-channel/types/tx.pb.go +++ b/x/ibc/core/04-channel/types/tx.pb.go @@ -853,77 +853,78 @@ func init() { func init() { proto.RegisterFile("ibc/core/channel/v1/tx.proto", fileDescriptor_bc4637e0ac3fc7b7) } var fileDescriptor_bc4637e0ac3fc7b7 = []byte{ - // 1120 bytes of a gzipped FileDescriptorProto + // 1123 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6e, 0xdb, 0x46, 0x10, 0xd6, 0x8f, 0x2d, 0xdb, 0x63, 0x37, 0xb6, 0x29, 0xff, 0x28, 0x94, 0x2d, 0xba, 0x3c, 0x24, - 0x42, 0x8a, 0x48, 0xb1, 0x63, 0xa0, 0x6d, 0xd0, 0x8b, 0x64, 0xa0, 0x68, 0x50, 0xb8, 0x29, 0x18, - 0xb7, 0x07, 0xa3, 0x80, 0x20, 0xaf, 0x36, 0x14, 0x21, 0x89, 0xab, 0x92, 0x94, 0x62, 0xbd, 0x41, + 0x42, 0x8a, 0x88, 0xb1, 0x62, 0xb4, 0x68, 0xd0, 0x8b, 0x64, 0xa0, 0x68, 0x50, 0xb8, 0x09, 0x18, + 0xb7, 0x07, 0xa3, 0x80, 0x20, 0xad, 0x36, 0x14, 0x21, 0x69, 0xa9, 0x92, 0x94, 0x62, 0xbd, 0x41, 0x8f, 0x39, 0xf7, 0x94, 0x9e, 0x7b, 0x48, 0x1f, 0x23, 0xc7, 0x9c, 0xda, 0xa2, 0x07, 0xa2, 0xb0, - 0x2f, 0x3d, 0xf3, 0x09, 0x0a, 0xee, 0x2e, 0x29, 0x4a, 0x22, 0x2b, 0x2a, 0xa9, 0x9c, 0x9c, 0xb4, - 0x9c, 0xf9, 0x76, 0x76, 0xf6, 0xfb, 0x86, 0xb3, 0x4b, 0xc1, 0x9e, 0x76, 0x81, 0xca, 0x88, 0x18, - 0xb8, 0x8c, 0x9a, 0x75, 0x5d, 0xc7, 0xed, 0x72, 0xff, 0xb0, 0x6c, 0x5d, 0x96, 0xba, 0x06, 0xb1, - 0x88, 0x90, 0xd5, 0x2e, 0x50, 0xc9, 0xf5, 0x96, 0xb8, 0xb7, 0xd4, 0x3f, 0x14, 0xb7, 0x54, 0xa2, - 0x12, 0xea, 0x2f, 0xbb, 0x23, 0x06, 0x15, 0xa5, 0x61, 0xa0, 0xb6, 0x86, 0x75, 0xcb, 0x8d, 0xc3, - 0x46, 0x1c, 0xf0, 0x71, 0xd8, 0x4a, 0x5e, 0x58, 0x0a, 0x91, 0x7f, 0x49, 0x82, 0x70, 0x6a, 0xaa, - 0x27, 0xcc, 0xf8, 0xa4, 0x8b, 0xf5, 0xc7, 0xba, 0x66, 0x09, 0x9f, 0xc0, 0x52, 0x97, 0x18, 0x56, - 0x4d, 0x6b, 0xe4, 0x92, 0x07, 0xc9, 0xe2, 0x4a, 0x55, 0x70, 0x6c, 0xe9, 0xd6, 0xa0, 0xde, 0x69, - 0x3f, 0x92, 0xb9, 0x43, 0x56, 0x32, 0xee, 0xe8, 0x71, 0x43, 0xf8, 0x02, 0x96, 0x78, 0xd0, 0x5c, - 0xea, 0x20, 0x59, 0x5c, 0x3d, 0xda, 0x2b, 0x85, 0x6c, 0xa2, 0xc4, 0xd7, 0xa8, 0x2e, 0xbc, 0xb6, - 0xa5, 0x84, 0xe2, 0x4d, 0x11, 0x76, 0x20, 0x63, 0x6a, 0xaa, 0x8e, 0x8d, 0x5c, 0xda, 0x5d, 0x49, - 0xe1, 0x4f, 0x8f, 0x96, 0x7f, 0x7a, 0x29, 0x25, 0xfe, 0x79, 0x29, 0x25, 0xe4, 0x3d, 0x10, 0x27, - 0x53, 0x54, 0xb0, 0xd9, 0x25, 0xba, 0x89, 0xe5, 0xdf, 0xd3, 0xb0, 0x39, 0xea, 0x3e, 0x33, 0x06, - 0xb3, 0x6d, 0xe0, 0x1b, 0xc8, 0x76, 0x0d, 0xdc, 0xd7, 0x48, 0xcf, 0xac, 0xf1, 0xb4, 0xdc, 0x89, - 0x29, 0x3a, 0xb1, 0xe0, 0xd8, 0x92, 0xc8, 0x27, 0x4e, 0x82, 0x64, 0x65, 0xd3, 0xb3, 0xf2, 0x0c, - 0x46, 0x09, 0x49, 0xcf, 0x4e, 0x88, 0x02, 0x5b, 0x88, 0xf4, 0x74, 0x0b, 0x1b, 0xdd, 0xba, 0x61, - 0x0d, 0x6a, 0x7d, 0x6c, 0x98, 0x1a, 0xd1, 0x73, 0x0b, 0x34, 0x1d, 0xc9, 0xb1, 0xa5, 0x3c, 0x4b, - 0x27, 0x0c, 0x25, 0x2b, 0xd9, 0xa0, 0xf9, 0x7b, 0x66, 0x15, 0x8e, 0x01, 0xba, 0x06, 0x21, 0xcf, - 0x6a, 0x9a, 0xae, 0x59, 0xb9, 0xc5, 0x83, 0x64, 0x71, 0xad, 0xba, 0xed, 0xd8, 0xd2, 0xa6, 0xb7, - 0x31, 0xcf, 0x27, 0x2b, 0x2b, 0xf4, 0x81, 0x56, 0xc1, 0x39, 0xac, 0x31, 0x4f, 0x13, 0x6b, 0x6a, - 0xd3, 0xca, 0x65, 0xe8, 0x66, 0xc4, 0xc0, 0x66, 0x58, 0xb5, 0xf5, 0x0f, 0x4b, 0x5f, 0x51, 0x44, - 0x35, 0xef, 0x6e, 0xc5, 0xb1, 0xa5, 0x6c, 0x30, 0x2e, 0x9b, 0x2d, 0x2b, 0xab, 0xf4, 0x91, 0x21, - 0x03, 0xb2, 0x2f, 0x45, 0xc8, 0x9e, 0x87, 0xdb, 0x13, 0xba, 0xfa, 0xaa, 0xff, 0x31, 0xa1, 0x7a, - 0x05, 0xb5, 0x66, 0x53, 0xfd, 0x18, 0x60, 0x42, 0xec, 0x00, 0x27, 0x41, 0x8d, 0x57, 0x90, 0xaf, - 0xed, 0x39, 0xec, 0x8e, 0xf0, 0x1e, 0x08, 0x41, 0xeb, 0xb7, 0x2a, 0x3b, 0xb6, 0x54, 0x08, 0x11, - 0x28, 0x18, 0x6f, 0x3b, 0xe8, 0x19, 0xd6, 0xcd, 0x3c, 0x94, 0x3f, 0x04, 0x26, 0x68, 0xcd, 0x32, - 0x06, 0x5c, 0xf8, 0x2d, 0xc7, 0x96, 0x36, 0x82, 0x02, 0x59, 0xc6, 0x40, 0x56, 0x96, 0xe9, 0xd8, - 0x7d, 0x77, 0x3e, 0x30, 0xd9, 0x2b, 0xa8, 0xe5, 0xcb, 0xfe, 0x6b, 0x0a, 0xb6, 0x47, 0xbd, 0x27, - 0x44, 0x7f, 0xa6, 0x19, 0x9d, 0x9b, 0x90, 0xde, 0xa7, 0xb2, 0x8e, 0x5a, 0x54, 0xec, 0x10, 0x2a, - 0xeb, 0xa8, 0xe5, 0x51, 0xe9, 0x16, 0xe4, 0x38, 0x95, 0x0b, 0x73, 0xa1, 0x72, 0x31, 0x82, 0x4a, - 0x09, 0xf6, 0x43, 0xc9, 0xf2, 0xe9, 0xfc, 0x39, 0x09, 0xd9, 0x21, 0xe2, 0xa4, 0x4d, 0x4c, 0x3c, - 0x7b, 0xfb, 0x7f, 0x3b, 0x32, 0xa7, 0xb7, 0xfd, 0x7d, 0xc8, 0x87, 0xe4, 0xe6, 0xe7, 0xfe, 0x2a, - 0x05, 0x3b, 0x63, 0xfe, 0x1b, 0xac, 0x85, 0xd1, 0x86, 0x9a, 0x7e, 0xcb, 0x86, 0x7a, 0xb3, 0xe5, - 0x70, 0x00, 0x85, 0x70, 0xc2, 0x7c, 0x4e, 0x5f, 0xa4, 0xe0, 0xa3, 0x53, 0x53, 0x55, 0x30, 0xea, - 0x7f, 0x5b, 0x47, 0x2d, 0x6c, 0x09, 0x9f, 0x43, 0xa6, 0x4b, 0x47, 0x94, 0xc9, 0xd5, 0xa3, 0x7c, - 0xe8, 0x49, 0xc6, 0xc0, 0xfc, 0x20, 0xe3, 0x13, 0x84, 0x2f, 0x61, 0x83, 0xa5, 0x8b, 0x48, 0xa7, - 0xa3, 0x59, 0x1d, 0xac, 0x5b, 0x94, 0xde, 0xb5, 0x6a, 0xde, 0xb1, 0xa5, 0xdd, 0xe0, 0x86, 0x86, - 0x08, 0x59, 0x59, 0xa7, 0xa6, 0x13, 0xdf, 0x32, 0x41, 0x5a, 0x7a, 0x2e, 0xa4, 0x2d, 0x44, 0x90, - 0xb6, 0x4b, 0x1b, 0xce, 0x90, 0x11, 0x9f, 0xab, 0xbf, 0x52, 0x00, 0xa7, 0xa6, 0x7a, 0xa6, 0x75, - 0x30, 0xe9, 0xfd, 0x3f, 0x44, 0xf5, 0x74, 0x03, 0x23, 0xac, 0xf5, 0x71, 0x23, 0x8a, 0xa8, 0x21, - 0xc2, 0x23, 0xea, 0x3b, 0xdf, 0x32, 0x57, 0xa2, 0xbe, 0x06, 0x41, 0xc7, 0x97, 0x56, 0xcd, 0xc4, - 0x3f, 0xf6, 0xb0, 0x8e, 0x70, 0xcd, 0xc0, 0xa8, 0x4f, 0x49, 0x5b, 0xa8, 0xee, 0x3b, 0xb6, 0x74, - 0x9b, 0x45, 0x98, 0xc4, 0xc8, 0xca, 0x86, 0x6b, 0x7c, 0xca, 0x6d, 0x2e, 0x91, 0x31, 0x4a, 0x75, - 0x8b, 0xde, 0x4a, 0x39, 0xb7, 0xc3, 0x76, 0xc5, 0x0e, 0x7d, 0x6e, 0x7e, 0xa2, 0xd3, 0x1a, 0xfe, - 0x10, 0x98, 0xff, 0x14, 0x56, 0x79, 0x21, 0xbb, 0x19, 0xf1, 0x76, 0xb0, 0xe3, 0xd8, 0x92, 0x30, - 0x52, 0xe5, 0xae, 0x53, 0x56, 0x58, 0xe3, 0x60, 0xb9, 0xcf, 0xb3, 0x21, 0x84, 0x4b, 0xb6, 0xf8, - 0xae, 0x92, 0x65, 0xfe, 0xf3, 0xdc, 0x1e, 0xd5, 0xc6, 0x57, 0xee, 0xb7, 0x14, 0x15, 0xb4, 0x82, - 0x5a, 0x3a, 0x79, 0xde, 0xc6, 0x0d, 0x15, 0xd3, 0x57, 0xfb, 0x1d, 0xa4, 0x2b, 0xc2, 0x7a, 0x7d, - 0x34, 0x1a, 0x53, 0x4e, 0x19, 0x37, 0x0f, 0xc5, 0x71, 0x27, 0x36, 0xa2, 0xc4, 0xa1, 0x4e, 0x4f, - 0x9c, 0x8a, 0xfb, 0xf0, 0x9e, 0xbb, 0x35, 0xfb, 0xea, 0x19, 0x63, 0xcc, 0x23, 0xf4, 0xe8, 0xd5, - 0x32, 0xa4, 0x4f, 0x4d, 0x55, 0x68, 0xc1, 0xfa, 0xf8, 0xb7, 0xdb, 0xdd, 0x50, 0x12, 0x27, 0xbf, - 0xa0, 0xc4, 0x72, 0x4c, 0xa0, 0xb7, 0xa8, 0xd0, 0x84, 0x5b, 0x63, 0x9f, 0x59, 0x77, 0x62, 0x84, - 0x38, 0x33, 0x06, 0x62, 0x29, 0x1e, 0x2e, 0x62, 0x25, 0xf7, 0x26, 0x15, 0x67, 0xa5, 0x0a, 0x6a, - 0xc5, 0x5a, 0x29, 0x70, 0xa3, 0x14, 0x2c, 0x10, 0x42, 0x6e, 0x93, 0xf7, 0x62, 0x44, 0xe1, 0x58, - 0xf1, 0x28, 0x3e, 0xd6, 0x5f, 0x55, 0x87, 0x8d, 0x89, 0x4b, 0x57, 0x71, 0x4a, 0x1c, 0x1f, 0x29, - 0x3e, 0x88, 0x8b, 0xf4, 0xd7, 0x7b, 0x0e, 0xd9, 0xd0, 0x8b, 0x52, 0x9c, 0x40, 0xde, 0x3e, 0x1f, - 0xce, 0x00, 0xf6, 0x17, 0xfe, 0x01, 0x20, 0x70, 0x9b, 0x90, 0xa3, 0x42, 0x0c, 0x31, 0xe2, 0xbd, - 0xe9, 0x18, 0x3f, 0xfa, 0x53, 0x58, 0xf2, 0xce, 0x5f, 0x29, 0x6a, 0x1a, 0x07, 0x88, 0x77, 0xa7, - 0x00, 0x82, 0xb5, 0x37, 0x76, 0xc2, 0xdc, 0x99, 0x32, 0x95, 0xe3, 0xa2, 0x6b, 0x2f, 0xbc, 0x2b, - 0xba, 0x2f, 0xef, 0x78, 0x47, 0x8c, 0xcc, 0x72, 0x0c, 0x18, 0xfd, 0xf2, 0x46, 0x74, 0x8c, 0xaa, - 0xf2, 0xfa, 0xaa, 0x90, 0x7c, 0x73, 0x55, 0x48, 0xfe, 0x7d, 0x55, 0x48, 0xbe, 0xb8, 0x2e, 0x24, - 0xde, 0x5c, 0x17, 0x12, 0x7f, 0x5e, 0x17, 0x12, 0xe7, 0x9f, 0xa9, 0x9a, 0xd5, 0xec, 0x5d, 0x94, - 0x10, 0xe9, 0x94, 0x11, 0x31, 0x3b, 0xc4, 0xe4, 0x3f, 0xf7, 0xcd, 0x46, 0xab, 0x7c, 0x59, 0xf6, - 0xff, 0x45, 0x7a, 0x70, 0x7c, 0xdf, 0xfb, 0x23, 0xc9, 0x1a, 0x74, 0xb1, 0x79, 0x91, 0xa1, 0x7f, - 0x22, 0x3d, 0xfc, 0x37, 0x00, 0x00, 0xff, 0xff, 0x38, 0xe9, 0x16, 0xfa, 0xd3, 0x12, 0x00, 0x00, + 0x2f, 0x3d, 0xf3, 0x09, 0x0a, 0x2e, 0x97, 0x14, 0x25, 0x91, 0x15, 0x95, 0x54, 0x6e, 0x6e, 0xcb, + 0x99, 0x6f, 0x67, 0x67, 0xbf, 0x6f, 0x38, 0xbb, 0x24, 0x1c, 0xa8, 0x0d, 0x24, 0x21, 0x4d, 0xc7, + 0x12, 0x6a, 0xd5, 0x09, 0xc1, 0x1d, 0x69, 0x70, 0x2c, 0x99, 0x97, 0xa5, 0x9e, 0xae, 0x99, 0x1a, + 0x97, 0x55, 0x1b, 0xa8, 0xe4, 0x78, 0x4b, 0xcc, 0x5b, 0x1a, 0x1c, 0xf3, 0x3b, 0x8a, 0xa6, 0x68, + 0xd4, 0x2f, 0x39, 0x23, 0x17, 0xca, 0x0b, 0xa3, 0x40, 0x1d, 0x15, 0x13, 0xd3, 0x89, 0xe3, 0x8e, + 0x18, 0xe0, 0xe3, 0xb0, 0x95, 0xbc, 0xb0, 0x14, 0x22, 0xfe, 0x9c, 0x04, 0xee, 0xcc, 0x50, 0x4e, + 0x5d, 0xe3, 0x93, 0x1e, 0x26, 0x8f, 0x89, 0x6a, 0x72, 0x9f, 0xc0, 0x4a, 0x4f, 0xd3, 0xcd, 0x9a, + 0xda, 0xcc, 0x25, 0x8f, 0x92, 0xc5, 0xb5, 0x2a, 0x67, 0x5b, 0xc2, 0xad, 0x61, 0xbd, 0xdb, 0x79, + 0x24, 0x32, 0x87, 0x28, 0x67, 0x9c, 0xd1, 0xe3, 0x26, 0xf7, 0x05, 0xac, 0xb0, 0xa0, 0xb9, 0xd4, + 0x51, 0xb2, 0xb8, 0x5e, 0x3e, 0x28, 0x85, 0x6c, 0xa2, 0xc4, 0xd6, 0xa8, 0x2e, 0xbd, 0xb1, 0x84, + 0x84, 0xec, 0x4d, 0xe1, 0xf6, 0x20, 0x63, 0xa8, 0x0a, 0xc1, 0x7a, 0x2e, 0xed, 0xac, 0x24, 0xb3, + 0xa7, 0x47, 0xab, 0x3f, 0xbe, 0x12, 0x12, 0x7f, 0xbf, 0x12, 0x12, 0xe2, 0x01, 0xf0, 0xd3, 0x29, + 0xca, 0xd8, 0xe8, 0x69, 0xc4, 0xc0, 0xe2, 0x6f, 0x69, 0xd8, 0x1e, 0x77, 0x9f, 0xeb, 0xc3, 0xf9, + 0x36, 0xf0, 0x0d, 0x64, 0x7b, 0x3a, 0x1e, 0xa8, 0x5a, 0xdf, 0xa8, 0xb1, 0xb4, 0x9c, 0x89, 0x29, + 0x3a, 0xb1, 0x60, 0x5b, 0x02, 0xcf, 0x26, 0x4e, 0x83, 0x44, 0x79, 0xdb, 0xb3, 0xb2, 0x0c, 0xc6, + 0x09, 0x49, 0xcf, 0x4f, 0x88, 0x0c, 0x3b, 0x48, 0xeb, 0x13, 0x13, 0xeb, 0xbd, 0xba, 0x6e, 0x0e, + 0x6b, 0x03, 0xac, 0x1b, 0xaa, 0x46, 0x72, 0x4b, 0x34, 0x1d, 0xc1, 0xb6, 0x84, 0xbc, 0x9b, 0x4e, + 0x18, 0x4a, 0x94, 0xb3, 0x41, 0xf3, 0x77, 0xae, 0x95, 0x3b, 0x01, 0xe8, 0xe9, 0x9a, 0xf6, 0xbc, + 0xa6, 0x12, 0xd5, 0xcc, 0x2d, 0x1f, 0x25, 0x8b, 0x1b, 0xd5, 0x5d, 0xdb, 0x12, 0xb6, 0xbd, 0x8d, + 0x79, 0x3e, 0x51, 0x5e, 0xa3, 0x0f, 0xb4, 0x0a, 0x2e, 0x60, 0xc3, 0xf5, 0xb4, 0xb0, 0xaa, 0xb4, + 0xcc, 0x5c, 0x86, 0x6e, 0x86, 0x0f, 0x6c, 0xc6, 0xad, 0xb6, 0xc1, 0x71, 0xe9, 0x2b, 0x8a, 0xa8, + 0xe6, 0x9d, 0xad, 0xd8, 0x96, 0x90, 0x0d, 0xc6, 0x75, 0x67, 0x8b, 0xf2, 0x3a, 0x7d, 0x74, 0x91, + 0x01, 0xd9, 0x57, 0x22, 0x64, 0xcf, 0xc3, 0xed, 0x29, 0x5d, 0x7d, 0xd5, 0x7f, 0x9f, 0x52, 0xbd, + 0x82, 0xda, 0xf3, 0xa9, 0x7e, 0x02, 0x30, 0x25, 0x76, 0x80, 0x93, 0xa0, 0xc6, 0x6b, 0xc8, 0xd7, + 0xf6, 0x02, 0xf6, 0xc7, 0x78, 0x0f, 0x84, 0xa0, 0xf5, 0x5b, 0x15, 0x6d, 0x4b, 0x28, 0x84, 0x08, + 0x14, 0x8c, 0xb7, 0x1b, 0xf4, 0x8c, 0xea, 0x66, 0x11, 0xca, 0x1f, 0x83, 0x2b, 0x68, 0xcd, 0xd4, + 0x87, 0x4c, 0xf8, 0x1d, 0xdb, 0x12, 0xb6, 0x82, 0x02, 0x99, 0xfa, 0x50, 0x94, 0x57, 0xe9, 0xd8, + 0x79, 0x77, 0x3e, 0x30, 0xd9, 0x2b, 0xa8, 0xed, 0xcb, 0xfe, 0x4b, 0x0a, 0x76, 0xc7, 0xbd, 0xa7, + 0x1a, 0x79, 0xae, 0xea, 0xdd, 0x9b, 0x90, 0xde, 0xa7, 0xb2, 0x8e, 0xda, 0x54, 0xec, 0x10, 0x2a, + 0xeb, 0xa8, 0xed, 0x51, 0xe9, 0x14, 0xe4, 0x24, 0x95, 0x4b, 0x0b, 0xa1, 0x72, 0x39, 0x82, 0x4a, + 0x01, 0x0e, 0x43, 0xc9, 0xf2, 0xe9, 0xfc, 0x29, 0x09, 0xd9, 0x11, 0xe2, 0xb4, 0xa3, 0x19, 0x78, + 0xfe, 0xf6, 0xff, 0x6e, 0x64, 0xce, 0x6e, 0xfb, 0x87, 0x90, 0x0f, 0xc9, 0xcd, 0xcf, 0xfd, 0x75, + 0x0a, 0xf6, 0x26, 0xfc, 0x37, 0x58, 0x0b, 0xe3, 0x0d, 0x35, 0xfd, 0x8e, 0x0d, 0xf5, 0x66, 0xcb, + 0xe1, 0x08, 0x0a, 0xe1, 0x84, 0xf9, 0x9c, 0xbe, 0x4c, 0xc1, 0x47, 0x67, 0x86, 0x22, 0x63, 0x34, + 0x78, 0x5a, 0x47, 0x6d, 0x6c, 0x72, 0x9f, 0x43, 0xa6, 0x47, 0x47, 0x94, 0xc9, 0xf5, 0x72, 0x3e, + 0xf4, 0x24, 0x73, 0xc1, 0xec, 0x20, 0x63, 0x13, 0xb8, 0x2f, 0x61, 0xcb, 0x4d, 0x17, 0x69, 0xdd, + 0xae, 0x6a, 0x76, 0x31, 0x31, 0x29, 0xbd, 0x1b, 0xd5, 0xbc, 0x6d, 0x09, 0xfb, 0xc1, 0x0d, 0x8d, + 0x10, 0xa2, 0xbc, 0x49, 0x4d, 0xa7, 0xbe, 0x65, 0x8a, 0xb4, 0xf4, 0x42, 0x48, 0x5b, 0x8a, 0x20, + 0x6d, 0x9f, 0x36, 0x9c, 0x11, 0x23, 0x3e, 0x57, 0x7f, 0xa6, 0x00, 0xce, 0x0c, 0xe5, 0x5c, 0xed, + 0x62, 0xad, 0xff, 0xdf, 0x10, 0xd5, 0x27, 0x3a, 0x46, 0x58, 0x1d, 0xe0, 0x66, 0x14, 0x51, 0x23, + 0x84, 0x47, 0xd4, 0xb7, 0xbe, 0x65, 0xa1, 0x44, 0x7d, 0x0d, 0x1c, 0xc1, 0x97, 0x66, 0xcd, 0xc0, + 0x3f, 0xf4, 0x31, 0x41, 0xb8, 0xa6, 0x63, 0x34, 0xa0, 0xa4, 0x2d, 0x55, 0x0f, 0x6d, 0x4b, 0xb8, + 0xed, 0x46, 0x98, 0xc6, 0x88, 0xf2, 0x96, 0x63, 0x7c, 0xc6, 0x6c, 0x0e, 0x91, 0x31, 0x4a, 0x75, + 0x87, 0xde, 0x4a, 0x19, 0xb7, 0xa3, 0x76, 0xe5, 0x1e, 0xfa, 0xcc, 0xfc, 0x84, 0xd0, 0x1a, 0xfe, + 0x10, 0x98, 0xff, 0x0c, 0xd6, 0x59, 0x21, 0x3b, 0x19, 0xb1, 0x76, 0xb0, 0x67, 0x5b, 0x02, 0x37, + 0x56, 0xe5, 0x8e, 0x53, 0x94, 0xdd, 0xc6, 0xe1, 0xe6, 0xbe, 0xc8, 0x86, 0x10, 0x2e, 0xd9, 0xf2, + 0xfb, 0x4a, 0x96, 0xf9, 0xd7, 0x73, 0x7b, 0x5c, 0x1b, 0x5f, 0xb9, 0x5f, 0x53, 0x54, 0xd0, 0x0a, + 0x6a, 0x13, 0xed, 0x45, 0x07, 0x37, 0x15, 0x4c, 0x5f, 0xed, 0xf7, 0x90, 0xae, 0x08, 0x9b, 0xf5, + 0xf1, 0x68, 0xae, 0x72, 0xf2, 0xa4, 0x79, 0x24, 0x8e, 0x33, 0xb1, 0x19, 0x25, 0x0e, 0x75, 0x7a, + 0xe2, 0x54, 0x9c, 0x87, 0xff, 0xb9, 0x5b, 0xbb, 0x5f, 0x3d, 0x13, 0x8c, 0x79, 0x84, 0x96, 0x5f, + 0xaf, 0x42, 0xfa, 0xcc, 0x50, 0xb8, 0x36, 0x6c, 0x4e, 0x7e, 0xbb, 0xdd, 0x0d, 0x25, 0x71, 0xfa, + 0x0b, 0x8a, 0x97, 0x62, 0x02, 0xbd, 0x45, 0xb9, 0x16, 0xdc, 0x9a, 0xf8, 0xcc, 0xba, 0x13, 0x23, + 0xc4, 0xb9, 0x3e, 0xe4, 0x4b, 0xf1, 0x70, 0x11, 0x2b, 0x39, 0x37, 0xa9, 0x38, 0x2b, 0x55, 0x50, + 0x3b, 0xd6, 0x4a, 0x81, 0x1b, 0x25, 0x67, 0x02, 0x17, 0x72, 0x9b, 0xbc, 0x17, 0x23, 0x0a, 0xc3, + 0xf2, 0xe5, 0xf8, 0x58, 0x7f, 0x55, 0x02, 0x5b, 0x53, 0x97, 0xae, 0xe2, 0x8c, 0x38, 0x3e, 0x92, + 0x7f, 0x10, 0x17, 0xe9, 0xaf, 0xf7, 0x02, 0xb2, 0xa1, 0x17, 0xa5, 0x38, 0x81, 0xbc, 0x7d, 0x3e, + 0x9c, 0x03, 0xec, 0x2f, 0xfc, 0x3d, 0x40, 0xe0, 0x36, 0x21, 0x46, 0x85, 0x18, 0x61, 0xf8, 0x7b, + 0xb3, 0x31, 0x7e, 0xf4, 0x67, 0xb0, 0xe2, 0x9d, 0xbf, 0x42, 0xd4, 0x34, 0x06, 0xe0, 0xef, 0xce, + 0x00, 0x04, 0x6b, 0x6f, 0xe2, 0x84, 0xb9, 0x33, 0x63, 0x2a, 0xc3, 0x45, 0xd7, 0x5e, 0x78, 0x57, + 0x74, 0x5e, 0xde, 0xc9, 0x8e, 0x18, 0x99, 0xe5, 0x04, 0x30, 0xfa, 0xe5, 0x8d, 0xe8, 0x18, 0xd5, + 0xa7, 0x6f, 0xae, 0x0a, 0xc9, 0xb7, 0x57, 0x85, 0xe4, 0x5f, 0x57, 0x85, 0xe4, 0xcb, 0xeb, 0x42, + 0xe2, 0xed, 0x75, 0x21, 0xf1, 0xc7, 0x75, 0x21, 0x71, 0xf1, 0xa9, 0xa2, 0x9a, 0xad, 0x7e, 0xa3, + 0x84, 0xb4, 0xae, 0xd4, 0x51, 0x09, 0x96, 0x3a, 0x8d, 0xee, 0x7d, 0xa3, 0xd9, 0x96, 0x06, 0x65, + 0xe9, 0x52, 0xf2, 0xff, 0x21, 0x3d, 0x38, 0xb9, 0xef, 0xfd, 0x46, 0x32, 0x87, 0x3d, 0x6c, 0x34, + 0x32, 0xf4, 0x17, 0xd2, 0xc3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x8c, 0xa6, 0x0d, 0xd1, + 0x12, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/ibc/core/05-port/keeper/keeper.go b/x/ibc/core/05-port/keeper/keeper.go index a1293c8d5c..f09a823250 100644 --- a/x/ibc/core/05-port/keeper/keeper.go +++ b/x/ibc/core/05-port/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" sdk "github.com/line/lbm-sdk/v2/types" capabilitykeeper "github.com/line/lbm-sdk/v2/x/capability/keeper" diff --git a/x/ibc/core/05-port/keeper/keeper_test.go b/x/ibc/core/05-port/keeper/keeper_test.go index 23e7dff10c..f3b0d6644b 100644 --- a/x/ibc/core/05-port/keeper/keeper_test.go +++ b/x/ibc/core/05-port/keeper/keeper_test.go @@ -3,9 +3,9 @@ package keeper_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -28,7 +28,7 @@ func (suite *KeeperTestSuite) SetupTest() { isCheckTx := false app := simapp.Setup(isCheckTx) - suite.ctx = app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + suite.ctx = app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) suite.keeper = &app.IBCKeeper.PortKeeper } diff --git a/x/ibc/core/23-commitment/types/commitment.pb.go b/x/ibc/core/23-commitment/types/commitment.pb.go index 06bc665226..c659933c94 100644 --- a/x/ibc/core/23-commitment/types/commitment.pb.go +++ b/x/ibc/core/23-commitment/types/commitment.pb.go @@ -217,28 +217,28 @@ func init() { } var fileDescriptor_7921d88972a41469 = []byte{ - // 334 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0xcf, 0x4e, 0xfa, 0x40, - 0x10, 0xc7, 0xdb, 0xfc, 0x08, 0x3f, 0x59, 0x48, 0x8c, 0x45, 0x89, 0xe1, 0x50, 0x4c, 0x0f, 0xca, - 0x85, 0xdd, 0x00, 0x9e, 0x30, 0x5e, 0xaa, 0x57, 0x13, 0xd2, 0xc4, 0x8b, 0x17, 0xd3, 0xae, 0x5b, - 0xba, 0x29, 0x65, 0x9a, 0xee, 0x4a, 0xe8, 0x1b, 0x78, 0xf4, 0xe8, 0xd1, 0xc7, 0xf1, 0xc8, 0xd1, - 0x13, 0x31, 0xf0, 0x06, 0x3c, 0x81, 0xe9, 0x2e, 0x60, 0x4f, 0x3b, 0xb3, 0xf3, 0x99, 0x7f, 0xdf, - 0x41, 0x57, 0x3c, 0xa0, 0x84, 0x42, 0xc6, 0x08, 0x85, 0x24, 0xe1, 0x32, 0x61, 0x33, 0x49, 0xe6, - 0xfd, 0x92, 0x87, 0xd3, 0x0c, 0x24, 0x58, 0x2d, 0x1e, 0x50, 0x5c, 0x80, 0xb8, 0x14, 0x9a, 0xf7, - 0xdb, 0xa7, 0x13, 0x98, 0x80, 0x42, 0x48, 0x61, 0x69, 0xba, 0xdd, 0xa4, 0x30, 0x0b, 0x39, 0x90, - 0x34, 0x03, 0x08, 0x85, 0xfe, 0x74, 0x2e, 0x11, 0x7a, 0x60, 0x59, 0x3c, 0x65, 0x1e, 0x80, 0xb4, - 0x2c, 0x54, 0x89, 0x7c, 0x11, 0x9d, 0x9b, 0x17, 0x66, 0xb7, 0xe1, 0x29, 0x7b, 0x54, 0x79, 0xfb, - 0xec, 0x18, 0xce, 0x3d, 0x6a, 0x68, 0x6e, 0x9c, 0xb1, 0x90, 0x2f, 0xac, 0x6b, 0x84, 0x62, 0x96, - 0x3f, 0xa7, 0xca, 0xd3, 0xbc, 0x7b, 0xb6, 0x5d, 0x75, 0x4e, 0x72, 0x3f, 0x99, 0x8e, 0x9c, 0xbf, - 0x98, 0xe3, 0xd5, 0x62, 0x96, 0xeb, 0x2c, 0xc7, 0xdd, 0x77, 0x1b, 0xfb, 0x32, 0xb2, 0x30, 0x3a, - 0x52, 0x9c, 0x2f, 0x8b, 0x8e, 0xff, 0xba, 0x35, 0xb7, 0xb9, 0x5d, 0x75, 0x8e, 0x4b, 0x15, 0x7c, - 0x19, 0x39, 0xde, 0xff, 0x22, 0xdf, 0x97, 0xd1, 0xa8, 0xf2, 0x51, 0x4c, 0x72, 0x8b, 0xea, 0xfb, - 0x49, 0x00, 0x42, 0x0b, 0xa3, 0xaa, 0x5e, 0x48, 0x95, 0xa8, 0x0f, 0x5a, 0x98, 0x53, 0x31, 0x18, - 0xe2, 0xbb, 0x83, 0x22, 0x8a, 0xf3, 0x76, 0x94, 0xfb, 0xf8, 0xb5, 0xb6, 0xcd, 0xe5, 0xda, 0x36, - 0x7f, 0xd6, 0xb6, 0xf9, 0xbe, 0xb1, 0x8d, 0xe5, 0xc6, 0x36, 0xbe, 0x37, 0xb6, 0xf1, 0x74, 0x33, - 0xe1, 0x32, 0x7a, 0x0d, 0x0a, 0x2d, 0x09, 0x05, 0x91, 0x80, 0xd8, 0x3d, 0x3d, 0xf1, 0x12, 0x93, - 0x05, 0x39, 0x5c, 0x65, 0x30, 0xec, 0x95, 0x0e, 0x23, 0xf3, 0x94, 0x89, 0xa0, 0xaa, 0xe4, 0x1c, - 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xe7, 0x68, 0xd0, 0xbc, 0x01, 0x00, 0x00, + // 335 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x91, 0x3f, 0x4f, 0xc2, 0x40, + 0x18, 0xc6, 0xdb, 0x48, 0x50, 0x0e, 0x12, 0x63, 0x51, 0x62, 0x18, 0x8a, 0xe9, 0xa0, 0x2c, 0xdc, + 0x85, 0xe2, 0x22, 0x89, 0x4b, 0x75, 0x35, 0x21, 0x75, 0x73, 0x31, 0x6d, 0xbd, 0xd2, 0x4b, 0x5b, + 0xde, 0xa6, 0x3d, 0x09, 0xfd, 0x06, 0x8e, 0x8e, 0x8e, 0x7e, 0x1c, 0x47, 0x46, 0x27, 0x62, 0xe0, + 0x1b, 0xf0, 0x09, 0xcc, 0xdd, 0x09, 0x76, 0x7b, 0xdf, 0x7b, 0x7f, 0xef, 0x9f, 0x7b, 0x1e, 0x74, + 0xc5, 0xfc, 0x80, 0x04, 0x90, 0x53, 0x12, 0x40, 0x9a, 0x32, 0x9e, 0xd2, 0x19, 0x27, 0xf3, 0x61, + 0x25, 0xc3, 0x59, 0x0e, 0x1c, 0x8c, 0x0e, 0xf3, 0x03, 0x2c, 0x40, 0x5c, 0x29, 0xcd, 0x87, 0xdd, + 0xd3, 0x29, 0x4c, 0x41, 0x22, 0x44, 0x44, 0x8a, 0xee, 0xb6, 0x03, 0x98, 0x85, 0x0c, 0x48, 0x96, + 0x03, 0x84, 0x85, 0x7a, 0xb4, 0x2e, 0x11, 0x7a, 0xa0, 0x79, 0x9c, 0x50, 0x17, 0x80, 0x1b, 0x06, + 0xaa, 0x45, 0x5e, 0x11, 0x9d, 0xeb, 0x17, 0x7a, 0xbf, 0xe5, 0xca, 0x78, 0x5c, 0x7b, 0xfb, 0xec, + 0x69, 0xd6, 0x3d, 0x6a, 0x29, 0x6e, 0x92, 0xd3, 0x90, 0x2d, 0x8c, 0x6b, 0x84, 0x62, 0x5a, 0x3e, + 0x67, 0x32, 0x53, 0xbc, 0x73, 0xb6, 0x5d, 0xf5, 0x4e, 0x4a, 0x2f, 0x4d, 0xc6, 0xd6, 0x7f, 0xcd, + 0x72, 0x1b, 0x31, 0x2d, 0x55, 0x97, 0xe5, 0xec, 0xb6, 0x4d, 0x3c, 0x1e, 0x19, 0x18, 0x1d, 0x49, + 0xce, 0xe3, 0x62, 0xe3, 0x41, 0xbf, 0xe1, 0xb4, 0xb7, 0xab, 0xde, 0x71, 0x65, 0x82, 0xc7, 0x23, + 0xcb, 0x3d, 0x14, 0xfd, 0x1e, 0x8f, 0xc6, 0xb5, 0x0f, 0x71, 0xc9, 0x2d, 0x6a, 0xee, 0x2e, 0x01, + 0x08, 0x0d, 0x8c, 0xea, 0xea, 0x43, 0x72, 0x44, 0xd3, 0xee, 0x60, 0x16, 0x14, 0xf6, 0x08, 0xdf, + 0xed, 0x15, 0x91, 0x9c, 0xfb, 0x47, 0x39, 0x8f, 0x5f, 0x6b, 0x53, 0x5f, 0xae, 0x4d, 0xfd, 0x67, + 0x6d, 0xea, 0xef, 0x1b, 0x53, 0x5b, 0x6e, 0x4c, 0xed, 0x7b, 0x63, 0x6a, 0x4f, 0x37, 0x53, 0xc6, + 0xa3, 0x57, 0x5f, 0x68, 0x49, 0x12, 0x36, 0xa3, 0x24, 0xf1, 0xd3, 0x41, 0xf1, 0x12, 0x93, 0xb9, + 0x4d, 0x16, 0x64, 0xef, 0x89, 0x3d, 0x1a, 0x54, 0x6c, 0xe1, 0x65, 0x46, 0x0b, 0xbf, 0x2e, 0xc5, + 0x1c, 0xfd, 0x06, 0x00, 0x00, 0xff, 0xff, 0x7d, 0xf7, 0x28, 0xae, 0xba, 0x01, 0x00, 0x00, } func (m *MerkleRoot) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/core/23-commitment/types/commitment_test.go b/x/ibc/core/23-commitment/types/commitment_test.go index 2d49d5c093..f4611311f5 100644 --- a/x/ibc/core/23-commitment/types/commitment_test.go +++ b/x/ibc/core/23-commitment/types/commitment_test.go @@ -9,7 +9,7 @@ import ( "github.com/line/lbm-sdk/v2/store/rootmulti" storetypes "github.com/line/lbm-sdk/v2/store/types" - dbm "github.com/tendermint/tm-db" + dbm "github.com/line/tm-db/v2" ) type MerkleTestSuite struct { diff --git a/x/ibc/core/23-commitment/types/merkle.go b/x/ibc/core/23-commitment/types/merkle.go index 817b596a87..452e138383 100644 --- a/x/ibc/core/23-commitment/types/merkle.go +++ b/x/ibc/core/23-commitment/types/merkle.go @@ -7,7 +7,7 @@ import ( ics23 "github.com/confio/ics23/go" "github.com/gogo/protobuf/proto" - tmcrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + ostcrypto "github.com/line/ostracon/proto/ostracon/crypto" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" "github.com/line/lbm-sdk/v2/x/ibc/core/exported" @@ -272,7 +272,7 @@ func verifyChainedMembershipProof(root []byte, specs []*ics23.ProofSpec, proofs // blankMerkleProof and blankProofOps will be used to compare against their zero values, // and are declared as globals to avoid having to unnecessarily re-allocate on every comparison. var blankMerkleProof = &MerkleProof{} -var blankProofOps = &tmcrypto.ProofOps{} +var blankProofOps = &ostcrypto.ProofOps{} // Empty returns true if the root is empty func (proof *MerkleProof) Empty() bool { diff --git a/x/ibc/core/23-commitment/types/merkle_test.go b/x/ibc/core/23-commitment/types/merkle_test.go index 5b1d97bf75..ecbe3d4df1 100644 --- a/x/ibc/core/23-commitment/types/merkle_test.go +++ b/x/ibc/core/23-commitment/types/merkle_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + abci "github.com/line/ostracon/abci/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/x/ibc/core/23-commitment/types" ) diff --git a/x/ibc/core/23-commitment/types/utils.go b/x/ibc/core/23-commitment/types/utils.go index ac771507fe..0841681031 100644 --- a/x/ibc/core/23-commitment/types/utils.go +++ b/x/ibc/core/23-commitment/types/utils.go @@ -2,7 +2,7 @@ package types import ( ics23 "github.com/confio/ics23/go" - crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + crypto "github.com/line/ostracon/proto/ostracon/crypto" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" ) diff --git a/x/ibc/core/23-commitment/types/utils_test.go b/x/ibc/core/23-commitment/types/utils_test.go index 2fd75fde52..1e83ccf524 100644 --- a/x/ibc/core/23-commitment/types/utils_test.go +++ b/x/ibc/core/23-commitment/types/utils_test.go @@ -3,9 +3,9 @@ package types_test import ( "fmt" + abci "github.com/line/ostracon/abci/types" + crypto "github.com/line/ostracon/proto/ostracon/crypto" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - crypto "github.com/tendermint/tendermint/proto/tendermint/crypto" "github.com/line/lbm-sdk/v2/x/ibc/core/23-commitment/types" ) diff --git a/x/ibc/core/client/query.go b/x/ibc/core/client/query.go index a9f9ab528b..1831da5997 100644 --- a/x/ibc/core/client/query.go +++ b/x/ibc/core/client/query.go @@ -3,7 +3,7 @@ package client import ( "fmt" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/ibc/core/genesis_test.go b/x/ibc/core/genesis_test.go index fc6701721f..96df77c487 100644 --- a/x/ibc/core/genesis_test.go +++ b/x/ibc/core/genesis_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -317,7 +317,7 @@ func (suite *IBCTestSuite) TestInitGenesis() { app := simapp.Setup(false) suite.NotPanics(func() { - ibc.InitGenesis(app.BaseApp.NewContext(false, tmproto.Header{Height: 1}), *app.IBCKeeper, true, tc.genState) + ibc.InitGenesis(app.BaseApp.NewContext(false, ostproto.Header{Height: 1}), *app.IBCKeeper, true, tc.genState) }) } } diff --git a/x/ibc/core/module.go b/x/ibc/core/module.go index 0b9e93a721..7f9aca2de8 100644 --- a/x/ibc/core/module.go +++ b/x/ibc/core/module.go @@ -10,7 +10,7 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/ibc/core/types/genesis.pb.go b/x/ibc/core/types/genesis.pb.go index db36003fdc..137e500e1b 100644 --- a/x/ibc/core/types/genesis.pb.go +++ b/x/ibc/core/types/genesis.pb.go @@ -97,27 +97,28 @@ func init() { func init() { proto.RegisterFile("ibc/core/types/v1/genesis.proto", fileDescriptor_b9a49c5663e6fc59) } var fileDescriptor_b9a49c5663e6fc59 = []byte{ - // 316 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0x3d, 0x4e, 0xc3, 0x30, - 0x18, 0x86, 0x93, 0x22, 0x31, 0x04, 0x28, 0x6a, 0x04, 0x08, 0x2a, 0xe1, 0x36, 0x51, 0x07, 0x96, - 0xda, 0x0a, 0x6c, 0x8c, 0x5d, 0xba, 0x87, 0x8d, 0x05, 0x25, 0xc6, 0xa4, 0x86, 0xc4, 0xae, 0x6a, - 0x13, 0xd1, 0x5b, 0x70, 0xac, 0x8e, 0x1d, 0x11, 0x43, 0x85, 0x92, 0x1b, 0x70, 0x02, 0xd4, 0xd8, - 0xe4, 0x47, 0x9e, 0x12, 0xbd, 0x7e, 0xbe, 0xf7, 0xf9, 0x94, 0xd8, 0x19, 0xd1, 0x18, 0x23, 0xcc, - 0x57, 0x04, 0xc9, 0xf5, 0x92, 0x08, 0x94, 0x07, 0x28, 0x21, 0x8c, 0x08, 0x2a, 0xe0, 0x72, 0xc5, - 0x25, 0x77, 0x07, 0x34, 0xc6, 0x70, 0x0f, 0xc0, 0x0a, 0x80, 0x79, 0x30, 0x3c, 0x4b, 0x78, 0xc2, - 0xab, 0x53, 0xb4, 0x7f, 0x53, 0xe0, 0x70, 0x5c, 0x37, 0xe1, 0x94, 0x12, 0x26, 0x8d, 0xaa, 0xe1, - 0xa4, 0x21, 0x38, 0x63, 0x04, 0x4b, 0xca, 0x99, 0x49, 0x79, 0x0d, 0xb5, 0x88, 0x18, 0x23, 0xa9, - 0x81, 0xf8, 0xdf, 0x3d, 0xe7, 0x78, 0xae, 0x92, 0x07, 0x19, 0x49, 0xe2, 0xbe, 0x38, 0x7d, 0x25, - 0x7d, 0xd2, 0xe0, 0xa5, 0x3d, 0xb6, 0x6f, 0x8e, 0x6e, 0xc7, 0xb0, 0xde, 0x5e, 0x9d, 0xc3, 0x3c, - 0x80, 0xed, 0xc9, 0xd9, 0xf5, 0x66, 0x37, 0xb2, 0x7e, 0x77, 0xa3, 0xf3, 0x75, 0x94, 0xa5, 0xf7, - 0x7e, 0xb7, 0xc5, 0x0f, 0x4f, 0x54, 0xa0, 0x47, 0xdc, 0xdc, 0x71, 0x9b, 0xd5, 0x6b, 0x57, 0xaf, - 0x72, 0x4d, 0x5a, 0xae, 0x9a, 0x31, 0x7c, 0x9e, 0xf6, 0x5d, 0x69, 0x9f, 0xd1, 0xe6, 0x87, 0x83, - 0x26, 0xfc, 0xf7, 0xbe, 0x3a, 0xa7, 0xfa, 0x63, 0xd4, 0xd2, 0x83, 0x4a, 0xea, 0xb5, 0xa4, 0x0a, - 0x30, 0x8c, 0x40, 0x1b, 0x2f, 0xb4, 0xb1, 0xdb, 0xe3, 0x87, 0x7d, 0x9d, 0xe8, 0xa1, 0xd9, 0x7c, - 0x53, 0x00, 0x7b, 0x5b, 0x00, 0xfb, 0xa7, 0x00, 0xf6, 0x67, 0x09, 0xac, 0x6d, 0x09, 0xac, 0xaf, - 0x12, 0x58, 0x8f, 0xd3, 0x84, 0xca, 0xc5, 0x7b, 0x0c, 0x31, 0xcf, 0x10, 0xe6, 0x22, 0xe3, 0x42, - 0x3f, 0xa6, 0xe2, 0xf9, 0x0d, 0x7d, 0xa0, 0xee, 0x55, 0x8a, 0x0f, 0xab, 0x9f, 0x75, 0xf7, 0x17, - 0x00, 0x00, 0xff, 0xff, 0x90, 0x81, 0x26, 0xd1, 0x63, 0x02, 0x00, 0x00, + // 321 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x92, 0xcd, 0x4a, 0xf3, 0x40, + 0x14, 0x86, 0x93, 0x7e, 0xf0, 0x2d, 0xa2, 0x56, 0x1a, 0x54, 0xb4, 0xe0, 0xe4, 0x87, 0x2e, 0x04, + 0x71, 0x86, 0xd4, 0x9d, 0xcb, 0x82, 0xb8, 0x8f, 0x3b, 0x37, 0x92, 0x8c, 0x63, 0x3a, 0x9a, 0xcc, + 0x94, 0x66, 0x0c, 0xf6, 0x2e, 0xbc, 0xac, 0x2e, 0xbb, 0x14, 0x17, 0x45, 0x92, 0x3b, 0xf0, 0x0a, + 0xa4, 0x99, 0x31, 0x3f, 0xcc, 0x2e, 0xbc, 0xe7, 0x39, 0xef, 0x73, 0x48, 0x62, 0x39, 0x34, 0xc6, + 0x08, 0xf3, 0x25, 0x41, 0x62, 0xb5, 0x20, 0x39, 0x2a, 0x02, 0x94, 0x10, 0x46, 0x72, 0x9a, 0xc3, + 0xc5, 0x92, 0x0b, 0x6e, 0x8f, 0x68, 0x8c, 0xe1, 0x0e, 0x80, 0x35, 0x00, 0x8b, 0x60, 0x7c, 0x94, + 0xf0, 0x84, 0xd7, 0x53, 0xb4, 0x7b, 0x92, 0xe0, 0xd8, 0x6d, 0x9a, 0x70, 0x4a, 0x09, 0x13, 0x5a, + 0xd5, 0x78, 0xd2, 0x12, 0x9c, 0x31, 0x82, 0x05, 0xe5, 0x4c, 0xa7, 0xbc, 0x96, 0x9a, 0x47, 0x8c, + 0x91, 0x54, 0x43, 0xfc, 0xaf, 0x81, 0xb5, 0x7f, 0x27, 0x93, 0x7b, 0x11, 0x09, 0x62, 0x3f, 0x5b, + 0x43, 0x29, 0x7d, 0x54, 0xe0, 0xa9, 0xe9, 0x9a, 0x17, 0x7b, 0x53, 0x17, 0x36, 0xd7, 0xcb, 0x39, + 0x2c, 0x02, 0xd8, 0xdd, 0x9c, 0x9d, 0xaf, 0xb7, 0x8e, 0xf1, 0xb3, 0x75, 0x8e, 0x57, 0x51, 0x96, + 0xde, 0xf8, 0xfd, 0x16, 0x3f, 0x3c, 0x90, 0x81, 0x5a, 0xb1, 0x0b, 0xcb, 0x6e, 0x4f, 0x6f, 0x5c, + 0x83, 0xda, 0x35, 0xe9, 0xb8, 0x1a, 0x46, 0xf3, 0x79, 0xca, 0x77, 0xa6, 0x7c, 0x5a, 0x9b, 0x1f, + 0x8e, 0xda, 0xf0, 0xcf, 0xfb, 0x62, 0x1d, 0xaa, 0x97, 0xd1, 0x48, 0xff, 0xd5, 0x52, 0xaf, 0x23, + 0x95, 0x80, 0x66, 0x04, 0xca, 0x78, 0xa2, 0x8c, 0xfd, 0x1e, 0x3f, 0x1c, 0xaa, 0x44, 0x2d, 0xcd, + 0x6e, 0xd7, 0x25, 0x30, 0x37, 0x25, 0x30, 0xbf, 0x4b, 0x60, 0x7e, 0x54, 0xc0, 0xd8, 0x54, 0xc0, + 0xf8, 0xac, 0x80, 0xf1, 0x70, 0x99, 0x50, 0x31, 0x7f, 0x8b, 0x21, 0xe6, 0x19, 0x4a, 0x29, 0x23, + 0x28, 0x8d, 0xb3, 0xab, 0xfc, 0xe9, 0x15, 0x15, 0x53, 0xf4, 0x8e, 0xfa, 0x3f, 0x52, 0xfc, 0xbf, + 0xfe, 0x54, 0xd7, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x94, 0x1b, 0x27, 0xe3, 0x61, 0x02, 0x00, + 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go b/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go index 4b227994b5..d5f357ec21 100644 --- a/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go +++ b/x/ibc/light-clients/06-solomachine/types/solomachine.pb.go @@ -821,92 +821,93 @@ func init() { } var fileDescriptor_6cc2ee18f7f86d4e = []byte{ - // 1359 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5f, 0x8f, 0xdb, 0x44, - 0x10, 0x3f, 0xa7, 0xe9, 0xf5, 0x32, 0xb9, 0xe6, 0x82, 0x9b, 0xb6, 0x39, 0xb7, 0x4a, 0x8c, 0x11, - 0xe5, 0x40, 0x34, 0xe1, 0x8a, 0xa8, 0x50, 0x85, 0x00, 0xc7, 0x31, 0x34, 0xed, 0x9d, 0x2f, 0x38, - 0x3e, 0xa0, 0x15, 0x92, 0xe5, 0x38, 0x7b, 0x89, 0x75, 0x89, 0x1d, 0xe2, 0x4d, 0xd2, 0x20, 0x21, - 0x21, 0x9e, 0x4a, 0xc4, 0x03, 0x5f, 0x20, 0x12, 0x02, 0xf1, 0x55, 0x80, 0xc7, 0xf2, 0xc6, 0x53, - 0x40, 0xed, 0x37, 0xc8, 0x27, 0x40, 0xf6, 0x6e, 0x62, 0x3b, 0xd7, 0xcb, 0x89, 0x7f, 0x4f, 0xd9, - 0x9d, 0xf9, 0xcd, 0x6f, 0x66, 0x67, 0x26, 0xb3, 0x6b, 0xd8, 0xb5, 0xea, 0x66, 0xb1, 0x6d, 0x35, - 0x5b, 0xd8, 0x6c, 0x5b, 0xc8, 0xc6, 0x6e, 0xd1, 0x75, 0xda, 0x4e, 0xc7, 0x30, 0x5b, 0x96, 0x8d, - 0x8a, 0x83, 0xdd, 0xf0, 0xb6, 0xd0, 0xed, 0x39, 0xd8, 0x61, 0xf3, 0x56, 0xdd, 0x2c, 0x84, 0x4d, - 0x0a, 0x61, 0xcc, 0x60, 0x97, 0x7b, 0xc5, 0xe3, 0x34, 0x9d, 0x1e, 0x2a, 0x9a, 0x8e, 0x6d, 0x23, - 0x13, 0x5b, 0x8e, 0xed, 0x51, 0x05, 0x3b, 0xc2, 0xc4, 0xbd, 0x18, 0x00, 0x5b, 0x86, 0x6d, 0xa3, - 0xb6, 0x8f, 0x22, 0x4b, 0x0a, 0xc9, 0x34, 0x9d, 0xa6, 0xe3, 0x2f, 0x8b, 0xde, 0x8a, 0x4a, 0xb7, - 0x9b, 0x8e, 0xd3, 0x6c, 0xa3, 0xa2, 0xbf, 0xab, 0xf7, 0x8f, 0x8a, 0x86, 0x3d, 0x22, 0x2a, 0xe1, - 0xb7, 0x18, 0x24, 0x25, 0x3f, 0xae, 0x1a, 0x36, 0x30, 0x62, 0x39, 0xd8, 0x70, 0xd1, 0xe7, 0x7d, - 0x64, 0x9b, 0x28, 0xcb, 0xf0, 0xcc, 0x4e, 0x5c, 0x5d, 0xec, 0x59, 0x09, 0xb6, 0x8e, 0x7a, 0xce, - 0x17, 0xc8, 0xd6, 0x17, 0x90, 0x98, 0x07, 0x29, 0x71, 0xb3, 0x69, 0xfe, 0xca, 0xc8, 0xe8, 0xb4, - 0xef, 0x08, 0x4b, 0x00, 0x41, 0x4d, 0x11, 0x49, 0x6d, 0x4e, 0x82, 0x61, 0xcb, 0x74, 0x6c, 0x17, - 0xd9, 0x6e, 0xdf, 0xd5, 0x5d, 0xcf, 0x67, 0xf6, 0x1c, 0xcf, 0xec, 0x24, 0x6f, 0x15, 0x0b, 0x67, - 0x24, 0xaa, 0x20, 0xcd, 0xed, 0xfc, 0x50, 0xc3, 0x5e, 0x97, 0x18, 0x05, 0x35, 0x65, 0x46, 0xb0, - 0x2c, 0x82, 0x6b, 0x46, 0xbb, 0xed, 0x0c, 0xf5, 0x7e, 0xb7, 0x61, 0x60, 0xa4, 0x1b, 0x47, 0x18, - 0xf5, 0xf4, 0x6e, 0xcf, 0xe9, 0x3a, 0xae, 0xd1, 0xce, 0xc6, 0x79, 0x66, 0x67, 0xa3, 0x74, 0x63, - 0x36, 0xcd, 0x0b, 0x84, 0x70, 0x05, 0x58, 0x50, 0xb3, 0xbe, 0xf6, 0xd0, 0x57, 0x8a, 0x9e, 0xae, - 0x4a, 0x55, 0x77, 0xe2, 0x8f, 0xbf, 0xcf, 0xaf, 0x09, 0x3f, 0x30, 0x90, 0x8a, 0xc6, 0xca, 0xde, - 0x03, 0xe8, 0xf6, 0xeb, 0x6d, 0xcb, 0xd4, 0x8f, 0xd1, 0xc8, 0x4f, 0x6c, 0xf2, 0x56, 0xa6, 0x40, - 0xca, 0x52, 0x98, 0x97, 0xa5, 0x20, 0xda, 0xa3, 0xd2, 0xe5, 0xd9, 0x34, 0xff, 0x02, 0x09, 0x22, - 0xb0, 0x10, 0xd4, 0x04, 0xd9, 0xdc, 0x47, 0x23, 0x96, 0x87, 0x64, 0xc3, 0x1a, 0xa0, 0x9e, 0x6b, - 0x1d, 0x59, 0xa8, 0xe7, 0x97, 0x20, 0xa1, 0x86, 0x45, 0xec, 0x75, 0x48, 0x60, 0xab, 0x83, 0x5c, - 0x6c, 0x74, 0xba, 0x7e, 0x76, 0xe3, 0x6a, 0x20, 0xa0, 0x41, 0x7e, 0x1d, 0x83, 0xf5, 0xbb, 0xc8, - 0x68, 0xa0, 0xde, 0xca, 0x9a, 0x47, 0xa8, 0x62, 0x4b, 0x54, 0x9e, 0xd6, 0xb5, 0x9a, 0xb6, 0x81, - 0xfb, 0x3d, 0x52, 0xc6, 0x4d, 0x35, 0x10, 0xb0, 0x87, 0x90, 0xb2, 0xd1, 0x50, 0x0f, 0x1d, 0x3c, - 0xbe, 0xe2, 0xe0, 0xdb, 0xb3, 0x69, 0xfe, 0x32, 0x39, 0x78, 0xd4, 0x4a, 0x50, 0x37, 0x6d, 0x34, - 0xac, 0x2e, 0xce, 0x2f, 0xc1, 0x96, 0x07, 0x08, 0xe7, 0xe0, 0xbc, 0x97, 0x83, 0x70, 0x43, 0x2c, - 0x01, 0x04, 0xd5, 0x8b, 0xa4, 0x1c, 0x08, 0x68, 0x12, 0x7e, 0x89, 0xc1, 0xe6, 0xbe, 0xe5, 0xd6, - 0x51, 0xcb, 0x18, 0x58, 0x4e, 0xbf, 0xc7, 0xee, 0x42, 0x82, 0x34, 0x9f, 0x6e, 0x35, 0xfc, 0x5c, - 0x24, 0x4a, 0x99, 0xd9, 0x34, 0x9f, 0xa6, 0x6d, 0x36, 0x57, 0x09, 0xea, 0x06, 0x59, 0x57, 0x1a, - 0x91, 0xec, 0xc5, 0x96, 0xb2, 0xd7, 0x85, 0x8b, 0x8b, 0x74, 0xe8, 0x8e, 0x3d, 0x6f, 0xf5, 0xdd, - 0x33, 0x5b, 0xbd, 0x36, 0xb7, 0x12, 0xed, 0x46, 0xd9, 0xc0, 0x46, 0x29, 0x3b, 0x9b, 0xe6, 0x33, - 0x24, 0x8a, 0x08, 0xa3, 0xa0, 0x6e, 0x2e, 0xf6, 0x07, 0xf6, 0x92, 0x47, 0x3c, 0x74, 0x68, 0xca, - 0xff, 0x2b, 0x8f, 0x78, 0xe8, 0x84, 0x3d, 0x6a, 0x43, 0x87, 0x66, 0xf2, 0x67, 0x06, 0xd2, 0xcb, - 0x14, 0xd1, 0xf6, 0x60, 0x96, 0xdb, 0xe3, 0x33, 0x48, 0x34, 0x0c, 0x6c, 0xe8, 0x78, 0xd4, 0x25, - 0x99, 0x4b, 0xdd, 0x7a, 0xf5, 0xcc, 0x30, 0x3d, 0x5e, 0x6d, 0xd4, 0x45, 0xe1, 0xb2, 0x2c, 0x58, - 0x04, 0x75, 0xa3, 0x41, 0xf5, 0x2c, 0x0b, 0x71, 0x6f, 0x4d, 0xbb, 0xd2, 0x5f, 0x47, 0x9b, 0x39, - 0xfe, 0xfc, 0xff, 0xc5, 0x57, 0x0c, 0x64, 0xb5, 0xb9, 0x0c, 0x35, 0x16, 0x67, 0xf2, 0x0f, 0xf4, - 0x3e, 0xa4, 0x82, 0x5c, 0xf8, 0xf4, 0xfe, 0xa9, 0xc2, 0xbd, 0x1b, 0xd5, 0x0b, 0x6a, 0x50, 0x8e, - 0xf2, 0x89, 0x10, 0x62, 0xcf, 0x0f, 0xe1, 0x0f, 0x06, 0x12, 0x9e, 0xdf, 0xd2, 0x08, 0x23, 0xf7, - 0x5f, 0xfc, 0x3b, 0x97, 0x06, 0xc5, 0xb9, 0x93, 0x83, 0x22, 0x52, 0x82, 0xf8, 0xff, 0x55, 0x82, - 0xf3, 0x41, 0x09, 0xe8, 0x09, 0x7f, 0x62, 0x00, 0xc8, 0xf0, 0xf1, 0x93, 0xb2, 0x07, 0x49, 0xfa, - 0x97, 0x3f, 0x73, 0x3c, 0x5e, 0x99, 0x4d, 0xf3, 0x6c, 0x64, 0x4a, 0xd0, 0xf9, 0x48, 0x46, 0xc4, - 0x29, 0xf3, 0x21, 0xf6, 0x0f, 0xe7, 0xc3, 0x97, 0xb0, 0x15, 0xba, 0x1c, 0xfd, 0x58, 0x59, 0x88, - 0x77, 0x0d, 0xdc, 0xa2, 0xed, 0xec, 0xaf, 0xd9, 0x2a, 0x6c, 0xd2, 0xd1, 0x40, 0x2e, 0xb4, 0xd8, - 0x8a, 0x03, 0x5c, 0x9d, 0x4d, 0xf3, 0x97, 0x22, 0xe3, 0x84, 0x5e, 0x59, 0x49, 0x33, 0xf0, 0x44, - 0xdd, 0x7f, 0xc3, 0x00, 0x1b, 0xbd, 0x48, 0x4e, 0x0d, 0xe1, 0xc1, 0xc9, 0x6b, 0x75, 0x55, 0x14, - 0x7f, 0xe3, 0xee, 0xa4, 0xb1, 0x0c, 0xe0, 0x92, 0xb4, 0x78, 0x90, 0xac, 0x8e, 0x45, 0x06, 0x08, - 0xde, 0x2e, 0x34, 0x8c, 0x97, 0xfd, 0xb6, 0xf2, 0x1e, 0x2f, 0x85, 0xd0, 0xbb, 0x86, 0x5c, 0xea, - 0x74, 0x27, 0xdb, 0x0d, 0x35, 0x64, 0x48, 0xfd, 0x36, 0x20, 0x2d, 0x91, 0x27, 0xce, 0x6a, 0xa7, - 0xb7, 0xe1, 0x02, 0x7d, 0x0a, 0x51, 0x8f, 0xd7, 0x43, 0x1e, 0xe9, 0x1b, 0xc9, 0x73, 0x47, 0x96, - 0xea, 0x1c, 0x4c, 0xbd, 0xdc, 0x83, 0x4c, 0xd5, 0x30, 0x8f, 0x11, 0x96, 0x9c, 0x4e, 0xc7, 0xc2, - 0x1d, 0x64, 0xe3, 0x53, 0x3d, 0xe5, 0xbc, 0xe3, 0xcd, 0x51, 0xbe, 0xb3, 0x4d, 0x35, 0x24, 0x11, - 0x1e, 0xc0, 0x36, 0xe1, 0x12, 0xcd, 0x63, 0xdb, 0x19, 0xb6, 0x51, 0xa3, 0x89, 0x56, 0x12, 0xee, - 0xc0, 0x96, 0x11, 0x85, 0x52, 0xd6, 0x65, 0xb1, 0x50, 0x80, 0x2c, 0xa1, 0x56, 0x91, 0x89, 0xac, - 0x2e, 0x16, 0xeb, 0xae, 0x37, 0x07, 0x4e, 0x63, 0x16, 0x5a, 0x90, 0x51, 0xd0, 0x23, 0x3c, 0x7f, - 0x7c, 0xa9, 0xc8, 0x1c, 0x9c, 0x1a, 0xc5, 0x3b, 0x70, 0xd1, 0x46, 0x8f, 0xb0, 0xf7, 0x74, 0xd3, - 0x7b, 0xc8, 0x1c, 0xd0, 0xb7, 0x5d, 0xe8, 0x1a, 0x88, 0xa8, 0x05, 0x35, 0x69, 0x13, 0x6a, 0x8f, - 0xf5, 0xb5, 0x6f, 0xe3, 0xb0, 0x31, 0x1f, 0x0c, 0xec, 0xdb, 0xf0, 0x52, 0x59, 0xd4, 0x44, 0x5d, - 0x7b, 0x50, 0x95, 0xf5, 0x43, 0xa5, 0xa2, 0x54, 0xb4, 0x8a, 0xb8, 0x57, 0x79, 0x28, 0x97, 0xf5, - 0x43, 0xa5, 0x56, 0x95, 0xa5, 0xca, 0x07, 0x15, 0xb9, 0x9c, 0x5e, 0xe3, 0xb6, 0xc6, 0x13, 0x3e, - 0x19, 0x12, 0xb1, 0x37, 0xe0, 0x4a, 0x60, 0x29, 0xed, 0x55, 0x64, 0x45, 0xd3, 0x6b, 0x9a, 0xa8, - 0xc9, 0x69, 0x86, 0x83, 0xf1, 0x84, 0x5f, 0x27, 0x32, 0xf6, 0x75, 0xd8, 0x0e, 0xe1, 0x0e, 0x94, - 0x9a, 0xac, 0xd4, 0x0e, 0x6b, 0x14, 0x1a, 0xe3, 0x2e, 0x8e, 0x27, 0x7c, 0x62, 0x21, 0x66, 0x0b, - 0xc0, 0x45, 0xd0, 0x8a, 0x2c, 0x69, 0x95, 0x03, 0x85, 0xc2, 0xcf, 0x71, 0xa9, 0xf1, 0x84, 0x87, - 0x40, 0xce, 0xee, 0xc0, 0xd5, 0x10, 0xfe, 0xae, 0xa8, 0x28, 0xf2, 0x1e, 0x05, 0xc7, 0xb9, 0xe4, - 0x78, 0xc2, 0x5f, 0xa0, 0x42, 0xf6, 0x2d, 0xb8, 0x16, 0x20, 0xab, 0xa2, 0x74, 0x5f, 0xd6, 0x74, - 0xe9, 0x60, 0x7f, 0xbf, 0xa2, 0xed, 0xcb, 0x8a, 0x96, 0x3e, 0xcf, 0x65, 0xc6, 0x13, 0x3e, 0x4d, - 0x14, 0x81, 0x9c, 0x7d, 0x0f, 0xf8, 0x13, 0x66, 0xa2, 0x74, 0x5f, 0x39, 0xf8, 0x64, 0x4f, 0x2e, - 0x7f, 0x28, 0xfb, 0xb6, 0xeb, 0xdc, 0xf6, 0x78, 0xc2, 0x5f, 0x26, 0xda, 0x25, 0x25, 0xfb, 0xee, - 0x73, 0x08, 0x54, 0x59, 0x92, 0x2b, 0x55, 0x4d, 0x17, 0x4b, 0x35, 0x59, 0x91, 0xe4, 0xf4, 0x05, - 0x2e, 0x3b, 0x9e, 0xf0, 0x19, 0xa2, 0xa5, 0x4a, 0xaa, 0x63, 0x6f, 0xc3, 0xf5, 0xc0, 0x5e, 0x91, - 0x3f, 0xd5, 0xf4, 0x9a, 0xfc, 0xd1, 0xa1, 0xa7, 0xf2, 0x68, 0x3e, 0x4e, 0x6f, 0x90, 0xc0, 0x3d, - 0xcd, 0x5c, 0xe1, 0xc9, 0x59, 0x1e, 0xd2, 0x81, 0xdd, 0x5d, 0x59, 0x2c, 0xcb, 0x6a, 0x3a, 0x41, - 0x2a, 0x43, 0x76, 0x5c, 0xfc, 0xf1, 0x8f, 0xb9, 0xb5, 0x92, 0xfe, 0xeb, 0xd3, 0x1c, 0xf3, 0xe4, - 0x69, 0x8e, 0xf9, 0xf3, 0x69, 0x8e, 0xf9, 0xee, 0x59, 0x6e, 0xed, 0xc9, 0xb3, 0xdc, 0xda, 0xef, - 0xcf, 0x72, 0x6b, 0x0f, 0xe5, 0xa6, 0x85, 0x5b, 0xfd, 0x7a, 0xc1, 0x74, 0x3a, 0x45, 0xd3, 0x71, - 0x3b, 0x8e, 0x4b, 0x7f, 0x6e, 0xba, 0x8d, 0xe3, 0xe2, 0xa3, 0xe2, 0xe2, 0x03, 0xeb, 0xe6, 0xfc, - 0x0b, 0xeb, 0x8d, 0xdb, 0x37, 0xc3, 0x1f, 0x59, 0xde, 0x2d, 0xe3, 0xd6, 0xd7, 0xfd, 0x71, 0xf6, - 0xe6, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x80, 0xd3, 0x79, 0xb6, 0x91, 0x0d, 0x00, 0x00, + // 1365 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5f, 0x8f, 0xdb, 0xd4, + 0x12, 0x5f, 0xa7, 0xe9, 0x76, 0x33, 0xd9, 0x66, 0x73, 0xdd, 0xb4, 0xcd, 0xba, 0x55, 0xe2, 0xeb, + 0xab, 0xdb, 0xbb, 0x17, 0xd1, 0x84, 0x5d, 0x44, 0x85, 0x2a, 0x04, 0x38, 0x8e, 0xa1, 0x69, 0x77, + 0xbd, 0xc1, 0xf1, 0x02, 0xad, 0x40, 0x96, 0xe3, 0x9c, 0x4d, 0xac, 0x4d, 0xec, 0x10, 0x9f, 0x24, + 0x0d, 0x12, 0x12, 0xe2, 0xa9, 0x44, 0x3c, 0xf0, 0x05, 0x22, 0x21, 0x10, 0x5f, 0x05, 0x78, 0x2c, + 0x6f, 0x3c, 0x05, 0xd4, 0x7e, 0x83, 0x7c, 0x02, 0x64, 0x9f, 0x93, 0xd8, 0xce, 0x76, 0xb3, 0xe2, + 0xdf, 0xdb, 0x39, 0x33, 0xbf, 0xf9, 0xcd, 0x9c, 0x99, 0xf1, 0x9c, 0x63, 0xd8, 0xb5, 0xea, 0x66, + 0xb1, 0x6d, 0x35, 0x5b, 0xd8, 0x6c, 0x5b, 0xc8, 0xc6, 0x6e, 0xd1, 0x75, 0xda, 0x4e, 0xc7, 0x30, + 0x5b, 0x96, 0x8d, 0x8a, 0x83, 0xdd, 0xf0, 0xb6, 0xd0, 0xed, 0x39, 0xd8, 0x61, 0xf3, 0x56, 0xdd, + 0x2c, 0x84, 0x4d, 0x0a, 0x61, 0xcc, 0x60, 0x97, 0xfb, 0x9f, 0xc7, 0x69, 0x3a, 0x3d, 0x54, 0x34, + 0x1d, 0xdb, 0x46, 0x26, 0xb6, 0x1c, 0xdb, 0xa3, 0x0a, 0x76, 0x84, 0x89, 0xfb, 0x77, 0x00, 0x6c, + 0x19, 0xb6, 0x8d, 0xda, 0x3e, 0x8a, 0x2c, 0x29, 0x24, 0xd3, 0x74, 0x9a, 0x8e, 0xbf, 0x2c, 0x7a, + 0x2b, 0x2a, 0xdd, 0x6e, 0x3a, 0x4e, 0xb3, 0x8d, 0x8a, 0xfe, 0xae, 0xde, 0x3f, 0x2e, 0x1a, 0xf6, + 0x88, 0xa8, 0x84, 0x9f, 0x63, 0x90, 0x94, 0xfc, 0xb8, 0x6a, 0xd8, 0xc0, 0x88, 0xe5, 0x60, 0xc3, + 0x45, 0x9f, 0xf4, 0x91, 0x6d, 0xa2, 0x2c, 0xc3, 0x33, 0x3b, 0x71, 0x75, 0xb1, 0x67, 0x25, 0xd8, + 0x3a, 0xee, 0x39, 0x9f, 0x22, 0x5b, 0x5f, 0x40, 0x62, 0x1e, 0xa4, 0xc4, 0xcd, 0xa6, 0xf9, 0x6b, + 0x23, 0xa3, 0xd3, 0xbe, 0x2b, 0x2c, 0x01, 0x04, 0x35, 0x45, 0x24, 0xb5, 0x39, 0x09, 0x86, 0x2d, + 0xd3, 0xb1, 0x5d, 0x64, 0xbb, 0x7d, 0x57, 0x77, 0x3d, 0x9f, 0xd9, 0x0b, 0x3c, 0xb3, 0x93, 0xdc, + 0x2b, 0x16, 0xce, 0x49, 0x54, 0x41, 0x9a, 0xdb, 0xf9, 0xa1, 0x86, 0xbd, 0x2e, 0x31, 0x0a, 0x6a, + 0xca, 0x8c, 0x60, 0x59, 0x04, 0x37, 0x8c, 0x76, 0xdb, 0x19, 0xea, 0xfd, 0x6e, 0xc3, 0xc0, 0x48, + 0x37, 0x8e, 0x31, 0xea, 0xe9, 0xdd, 0x9e, 0xd3, 0x75, 0x5c, 0xa3, 0x9d, 0x8d, 0xf3, 0xcc, 0xce, + 0x46, 0xe9, 0xd6, 0x6c, 0x9a, 0x17, 0x08, 0xe1, 0x0a, 0xb0, 0xa0, 0x66, 0x7d, 0xed, 0x91, 0xaf, + 0x14, 0x3d, 0x5d, 0x95, 0xaa, 0xee, 0xc6, 0x9f, 0x7c, 0x93, 0x5f, 0x13, 0xbe, 0x65, 0x20, 0x15, + 0x8d, 0x95, 0xbd, 0x0f, 0xd0, 0xed, 0xd7, 0xdb, 0x96, 0xa9, 0x9f, 0xa0, 0x91, 0x9f, 0xd8, 0xe4, + 0x5e, 0xa6, 0x40, 0xca, 0x52, 0x98, 0x97, 0xa5, 0x20, 0xda, 0xa3, 0xd2, 0xd5, 0xd9, 0x34, 0xff, + 0x2f, 0x12, 0x44, 0x60, 0x21, 0xa8, 0x09, 0xb2, 0x79, 0x80, 0x46, 0x2c, 0x0f, 0xc9, 0x86, 0x35, + 0x40, 0x3d, 0xd7, 0x3a, 0xb6, 0x50, 0xcf, 0x2f, 0x41, 0x42, 0x0d, 0x8b, 0xd8, 0x9b, 0x90, 0xc0, + 0x56, 0x07, 0xb9, 0xd8, 0xe8, 0x74, 0xfd, 0xec, 0xc6, 0xd5, 0x40, 0x40, 0x83, 0xfc, 0x22, 0x06, + 0xeb, 0xf7, 0x90, 0xd1, 0x40, 0xbd, 0x95, 0x35, 0x8f, 0x50, 0xc5, 0x96, 0xa8, 0x3c, 0xad, 0x6b, + 0x35, 0x6d, 0x03, 0xf7, 0x7b, 0xa4, 0x8c, 0x9b, 0x6a, 0x20, 0x60, 0x8f, 0x20, 0x65, 0xa3, 0xa1, + 0x1e, 0x3a, 0x78, 0x7c, 0xc5, 0xc1, 0xb7, 0x67, 0xd3, 0xfc, 0x55, 0x72, 0xf0, 0xa8, 0x95, 0xa0, + 0x6e, 0xda, 0x68, 0x58, 0x5d, 0x9c, 0x5f, 0x82, 0x2d, 0x0f, 0x10, 0xce, 0xc1, 0x45, 0x2f, 0x07, + 0xe1, 0x86, 0x58, 0x02, 0x08, 0xaa, 0x17, 0x49, 0x39, 0x10, 0xd0, 0x24, 0xfc, 0x18, 0x83, 0xcd, + 0x03, 0xcb, 0xad, 0xa3, 0x96, 0x31, 0xb0, 0x9c, 0x7e, 0x8f, 0xdd, 0x85, 0x04, 0x69, 0x3e, 0xdd, + 0x6a, 0xf8, 0xb9, 0x48, 0x94, 0x32, 0xb3, 0x69, 0x3e, 0x4d, 0xdb, 0x6c, 0xae, 0x12, 0xd4, 0x0d, + 0xb2, 0xae, 0x34, 0x22, 0xd9, 0x8b, 0x2d, 0x65, 0xaf, 0x0b, 0x97, 0x17, 0xe9, 0xd0, 0x1d, 0x7b, + 0xde, 0xea, 0xbb, 0xe7, 0xb6, 0x7a, 0x6d, 0x6e, 0x25, 0xda, 0x8d, 0xb2, 0x81, 0x8d, 0x52, 0x76, + 0x36, 0xcd, 0x67, 0x48, 0x14, 0x11, 0x46, 0x41, 0xdd, 0x5c, 0xec, 0x0f, 0xed, 0x25, 0x8f, 0x78, + 0xe8, 0xd0, 0x94, 0xff, 0x5d, 0x1e, 0xf1, 0xd0, 0x09, 0x7b, 0xd4, 0x86, 0x0e, 0xcd, 0xe4, 0x0f, + 0x0c, 0xa4, 0x97, 0x29, 0xa2, 0xed, 0xc1, 0x2c, 0xb7, 0xc7, 0x47, 0x90, 0x68, 0x18, 0xd8, 0xd0, + 0xf1, 0xa8, 0x4b, 0x32, 0x97, 0xda, 0xfb, 0xff, 0xb9, 0x61, 0x7a, 0xbc, 0xda, 0xa8, 0x8b, 0xc2, + 0x65, 0x59, 0xb0, 0x08, 0xea, 0x46, 0x83, 0xea, 0x59, 0x16, 0xe2, 0xde, 0x9a, 0x76, 0xa5, 0xbf, + 0x8e, 0x36, 0x73, 0xfc, 0xc5, 0xdf, 0xc5, 0xe7, 0x0c, 0x64, 0xb5, 0xb9, 0x0c, 0x35, 0x16, 0x67, + 0xf2, 0x0f, 0xf4, 0x36, 0xa4, 0x82, 0x5c, 0xf8, 0xf4, 0xfe, 0xa9, 0xc2, 0xbd, 0x1b, 0xd5, 0x0b, + 0x6a, 0x50, 0x8e, 0xf2, 0xa9, 0x10, 0x62, 0x2f, 0x0e, 0xe1, 0x57, 0x06, 0x12, 0x9e, 0xdf, 0xd2, + 0x08, 0x23, 0xf7, 0x2f, 0x7c, 0x9d, 0x4b, 0x83, 0xe2, 0xc2, 0xe9, 0x41, 0x11, 0x29, 0x41, 0xfc, + 0x9f, 0x2a, 0xc1, 0xc5, 0xa0, 0x04, 0xf4, 0x84, 0xdf, 0x33, 0x00, 0x64, 0xf8, 0xf8, 0x49, 0xd9, + 0x87, 0x24, 0xfd, 0xe4, 0xcf, 0x1d, 0x8f, 0xd7, 0x66, 0xd3, 0x3c, 0x1b, 0x99, 0x12, 0x74, 0x3e, + 0x92, 0x11, 0x71, 0xc6, 0x7c, 0x88, 0xfd, 0xc9, 0xf9, 0xf0, 0x19, 0x6c, 0x85, 0x2e, 0x47, 0x3f, + 0x56, 0x16, 0xe2, 0x5d, 0x03, 0xb7, 0x68, 0x3b, 0xfb, 0x6b, 0xb6, 0x0a, 0x9b, 0x74, 0x34, 0x90, + 0x0b, 0x2d, 0xb6, 0xe2, 0x00, 0xd7, 0x67, 0xd3, 0xfc, 0x95, 0xc8, 0x38, 0xa1, 0x57, 0x56, 0xd2, + 0x0c, 0x3c, 0x51, 0xf7, 0x5f, 0x32, 0xc0, 0x46, 0x2f, 0x92, 0x33, 0x43, 0x78, 0x78, 0xfa, 0x5a, + 0x5d, 0x15, 0xc5, 0x1f, 0xb8, 0x3b, 0x69, 0x2c, 0x03, 0xb8, 0x22, 0x2d, 0x1e, 0x24, 0xab, 0x63, + 0x91, 0x01, 0x82, 0xb7, 0x0b, 0x0d, 0xe3, 0xbf, 0x7e, 0x5b, 0x79, 0x8f, 0x97, 0x42, 0xe8, 0x5d, + 0x43, 0x2e, 0x75, 0xba, 0x93, 0xed, 0x86, 0x1a, 0x32, 0xa4, 0x7e, 0x1b, 0x90, 0x96, 0xc8, 0x13, + 0x67, 0xb5, 0xd3, 0x3b, 0x70, 0x89, 0x3e, 0x85, 0xa8, 0xc7, 0x9b, 0x21, 0x8f, 0xf4, 0x8d, 0xe4, + 0xb9, 0x23, 0x4b, 0x75, 0x0e, 0xa6, 0x5e, 0xee, 0x43, 0xa6, 0x6a, 0x98, 0x27, 0x08, 0x4b, 0x4e, + 0xa7, 0x63, 0xe1, 0x0e, 0xb2, 0xf1, 0x99, 0x9e, 0x72, 0xde, 0xf1, 0xe6, 0x28, 0xdf, 0xd9, 0xa6, + 0x1a, 0x92, 0x08, 0x0f, 0x61, 0x9b, 0x70, 0x89, 0xe6, 0x89, 0xed, 0x0c, 0xdb, 0xa8, 0xd1, 0x44, + 0x2b, 0x09, 0x77, 0x60, 0xcb, 0x88, 0x42, 0x29, 0xeb, 0xb2, 0x58, 0x28, 0x40, 0x96, 0x50, 0xab, + 0xc8, 0x44, 0x56, 0x17, 0x8b, 0x75, 0xd7, 0x9b, 0x03, 0x67, 0x31, 0x0b, 0x2d, 0xc8, 0x28, 0xe8, + 0x31, 0x9e, 0x3f, 0xbe, 0x54, 0x64, 0x0e, 0xce, 0x8c, 0xe2, 0x0d, 0xb8, 0x6c, 0xa3, 0xc7, 0xd8, + 0x7b, 0xba, 0xe9, 0x3d, 0x64, 0x0e, 0xe8, 0xdb, 0x2e, 0x74, 0x0d, 0x44, 0xd4, 0x82, 0x9a, 0xb4, + 0x09, 0xb5, 0xc7, 0xfa, 0xd2, 0x57, 0x71, 0xd8, 0x98, 0x0f, 0x06, 0xf6, 0x75, 0xf8, 0x4f, 0x59, + 0xd4, 0x44, 0x5d, 0x7b, 0x58, 0x95, 0xf5, 0x23, 0xa5, 0xa2, 0x54, 0xb4, 0x8a, 0xb8, 0x5f, 0x79, + 0x24, 0x97, 0xf5, 0x23, 0xa5, 0x56, 0x95, 0xa5, 0xca, 0x3b, 0x15, 0xb9, 0x9c, 0x5e, 0xe3, 0xb6, + 0xc6, 0x13, 0x3e, 0x19, 0x12, 0xb1, 0xb7, 0xe0, 0x5a, 0x60, 0x29, 0xed, 0x57, 0x64, 0x45, 0xd3, + 0x6b, 0x9a, 0xa8, 0xc9, 0x69, 0x86, 0x83, 0xf1, 0x84, 0x5f, 0x27, 0x32, 0xf6, 0x65, 0xd8, 0x0e, + 0xe1, 0x0e, 0x95, 0x9a, 0xac, 0xd4, 0x8e, 0x6a, 0x14, 0x1a, 0xe3, 0x2e, 0x8f, 0x27, 0x7c, 0x62, + 0x21, 0x66, 0x0b, 0xc0, 0x45, 0xd0, 0x8a, 0x2c, 0x69, 0x95, 0x43, 0x85, 0xc2, 0x2f, 0x70, 0xa9, + 0xf1, 0x84, 0x87, 0x40, 0xce, 0xee, 0xc0, 0xf5, 0x10, 0xfe, 0x9e, 0xa8, 0x28, 0xf2, 0x3e, 0x05, + 0xc7, 0xb9, 0xe4, 0x78, 0xc2, 0x5f, 0xa2, 0x42, 0xf6, 0x35, 0xb8, 0x11, 0x20, 0xab, 0xa2, 0xf4, + 0x40, 0xd6, 0x74, 0xe9, 0xf0, 0xe0, 0xa0, 0xa2, 0x1d, 0xc8, 0x8a, 0x96, 0xbe, 0xc8, 0x65, 0xc6, + 0x13, 0x3e, 0x4d, 0x14, 0x81, 0x9c, 0x7d, 0x0b, 0xf8, 0x53, 0x66, 0xa2, 0xf4, 0x40, 0x39, 0xfc, + 0x60, 0x5f, 0x2e, 0xbf, 0x2b, 0xfb, 0xb6, 0xeb, 0xdc, 0xf6, 0x78, 0xc2, 0x5f, 0x25, 0xda, 0x25, + 0x25, 0xfb, 0xe6, 0x0b, 0x08, 0x54, 0x59, 0x92, 0x2b, 0x55, 0x4d, 0x17, 0x4b, 0x35, 0x59, 0x91, + 0xe4, 0xf4, 0x25, 0x2e, 0x3b, 0x9e, 0xf0, 0x19, 0xa2, 0xa5, 0x4a, 0xaa, 0x63, 0xef, 0xc0, 0xcd, + 0xc0, 0x5e, 0x91, 0x3f, 0xd4, 0xf4, 0x9a, 0xfc, 0xde, 0x91, 0xa7, 0xf2, 0x68, 0xde, 0x4f, 0x6f, + 0x90, 0xc0, 0x3d, 0xcd, 0x5c, 0xe1, 0xc9, 0x59, 0x1e, 0xd2, 0x81, 0xdd, 0x3d, 0x59, 0x2c, 0xcb, + 0x6a, 0x3a, 0x41, 0x2a, 0x43, 0x76, 0x5c, 0xfc, 0xc9, 0x77, 0xb9, 0xb5, 0xd2, 0xc7, 0x3f, 0x3d, + 0xcb, 0x31, 0x4f, 0x9f, 0xe5, 0x98, 0xdf, 0x9e, 0xe5, 0x98, 0xaf, 0x9f, 0xe7, 0xd6, 0x9e, 0x3e, + 0xcf, 0xad, 0xfd, 0xf2, 0x3c, 0xb7, 0xf6, 0x48, 0x6a, 0x5a, 0xb8, 0xd5, 0xaf, 0x17, 0x4c, 0xa7, + 0x53, 0x6c, 0x7b, 0x3f, 0x4d, 0xed, 0x7a, 0xe7, 0xb6, 0xdb, 0x38, 0x29, 0x0e, 0xf6, 0x8a, 0x8f, + 0x8b, 0x8b, 0xdf, 0xab, 0xdb, 0xf3, 0xff, 0xab, 0x57, 0xee, 0xdc, 0x0e, 0xff, 0x62, 0x79, 0x77, + 0x8c, 0x5b, 0x5f, 0xf7, 0x87, 0xd9, 0xab, 0xbf, 0x07, 0x00, 0x00, 0xff, 0xff, 0x27, 0x5e, 0x82, + 0x3c, 0x8f, 0x0d, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/light-clients/07-tendermint/client/cli/tx.go b/x/ibc/light-clients/07-tendermint/client/cli/tx.go index 6c8956e246..0f4f2d7cd6 100644 --- a/x/ibc/light-clients/07-tendermint/client/cli/tx.go +++ b/x/ibc/light-clients/07-tendermint/client/cli/tx.go @@ -8,9 +8,9 @@ import ( "time" ics23 "github.com/confio/ics23/go" + "github.com/line/ostracon/light" "github.com/pkg/errors" "github.com/spf13/cobra" - "github.com/tendermint/tendermint/light" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/client/flags" diff --git a/x/ibc/light-clients/07-tendermint/types/client_state.go b/x/ibc/light-clients/07-tendermint/types/client_state.go index a5e3493f04..427d74de7c 100644 --- a/x/ibc/light-clients/07-tendermint/types/client_state.go +++ b/x/ibc/light-clients/07-tendermint/types/client_state.go @@ -5,7 +5,7 @@ import ( "time" ics23 "github.com/confio/ics23/go" - "github.com/tendermint/tendermint/light" + "github.com/line/ostracon/light" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/ibc/light-clients/07-tendermint/types/consensus_state.go b/x/ibc/light-clients/07-tendermint/types/consensus_state.go index 9b9c179018..b3bf57a018 100644 --- a/x/ibc/light-clients/07-tendermint/types/consensus_state.go +++ b/x/ibc/light-clients/07-tendermint/types/consensus_state.go @@ -3,8 +3,8 @@ package types import ( "time" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - tmtypes "github.com/tendermint/tendermint/types" + ostbytes "github.com/line/ostracon/libs/bytes" + osttypes "github.com/line/ostracon/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" @@ -14,7 +14,7 @@ import ( // NewConsensusState creates a new ConsensusState instance. func NewConsensusState( - timestamp time.Time, root commitmenttypes.MerkleRoot, nextValsHash tmbytes.HexBytes, + timestamp time.Time, root commitmenttypes.MerkleRoot, nextValsHash ostbytes.HexBytes, ) *ConsensusState { return &ConsensusState{ Timestamp: timestamp, @@ -45,7 +45,7 @@ func (cs ConsensusState) ValidateBasic() error { if cs.Root.Empty() { return sdkerrors.Wrap(clienttypes.ErrInvalidConsensus, "root cannot be empty") } - if err := tmtypes.ValidateHash(cs.NextValidatorsHash); err != nil { + if err := osttypes.ValidateHash(cs.NextValidatorsHash); err != nil { return sdkerrors.Wrap(err, "next validators hash is invalid") } if cs.Timestamp.Unix() <= 0 { diff --git a/x/ibc/light-clients/07-tendermint/types/fraction.go b/x/ibc/light-clients/07-tendermint/types/fraction.go index e445f19ba6..7f87b5d576 100644 --- a/x/ibc/light-clients/07-tendermint/types/fraction.go +++ b/x/ibc/light-clients/07-tendermint/types/fraction.go @@ -1,24 +1,24 @@ package types import ( - tmmath "github.com/tendermint/tendermint/libs/math" - "github.com/tendermint/tendermint/light" + ostmath "github.com/line/ostracon/libs/math" + "github.com/line/ostracon/light" ) // DefaultTrustLevel is the tendermint light client default trust level var DefaultTrustLevel = NewFractionFromTm(light.DefaultTrustLevel) -// NewFractionFromTm returns a new Fraction instance from a tmmath.Fraction -func NewFractionFromTm(f tmmath.Fraction) Fraction { +// NewFractionFromTm returns a new Fraction instance from a ostmath.Fraction +func NewFractionFromTm(f ostmath.Fraction) Fraction { return Fraction{ Numerator: f.Numerator, Denominator: f.Denominator, } } -// ToTendermint converts Fraction to tmmath.Fraction -func (f Fraction) ToTendermint() tmmath.Fraction { - return tmmath.Fraction{ +// ToTendermint converts Fraction to ostmath.Fraction +func (f Fraction) ToTendermint() ostmath.Fraction { + return ostmath.Fraction{ Numerator: f.Numerator, Denominator: f.Denominator, } diff --git a/x/ibc/light-clients/07-tendermint/types/header.go b/x/ibc/light-clients/07-tendermint/types/header.go index 8cb5aa122d..01746ebd1e 100644 --- a/x/ibc/light-clients/07-tendermint/types/header.go +++ b/x/ibc/light-clients/07-tendermint/types/header.go @@ -4,7 +4,7 @@ import ( "bytes" "time" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" @@ -54,7 +54,7 @@ func (h Header) ValidateBasic() error { if h.Header == nil { return sdkerrors.Wrap(clienttypes.ErrInvalidHeader, "tendermint header cannot be nil") } - tmSignedHeader, err := tmtypes.SignedHeaderFromProto(h.SignedHeader) + tmSignedHeader, err := osttypes.SignedHeaderFromProto(h.SignedHeader) if err != nil { return sdkerrors.Wrap(err, "header is not a tendermint header") } @@ -72,7 +72,7 @@ func (h Header) ValidateBasic() error { if h.ValidatorSet == nil { return sdkerrors.Wrap(clienttypes.ErrInvalidHeader, "validator set is nil") } - tmValset, err := tmtypes.ValidatorSetFromProto(h.ValidatorSet) + tmValset, err := osttypes.ValidatorSetFromProto(h.ValidatorSet) if err != nil { return sdkerrors.Wrap(err, "validator set is not tendermint validator set") } diff --git a/x/ibc/light-clients/07-tendermint/types/header_test.go b/x/ibc/light-clients/07-tendermint/types/header_test.go index 1d16357e88..ee3647fc4e 100644 --- a/x/ibc/light-clients/07-tendermint/types/header_test.go +++ b/x/ibc/light-clients/07-tendermint/types/header_test.go @@ -3,7 +3,7 @@ package types_test import ( "time" - tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + ostprotocrypto "github.com/line/ostracon/proto/ostracon/crypto" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" "github.com/line/lbm-sdk/v2/x/ibc/core/exported" @@ -50,7 +50,7 @@ func (suite *TendermintTestSuite) TestHeaderValidateBasic() { header.ValidatorSet = nil }, false}, {"ValidatorSetFromProto failed", func() { - header.ValidatorSet.Validators[0].PubKey = tmprotocrypto.PublicKey{} + header.ValidatorSet.Validators[0].PubKey = ostprotocrypto.PublicKey{} }, false}, {"header validator hash does not equal hash of validator set", func() { // use chainB's randomly generated validator set diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour.go index ce04ab7cb8..eda2fba3a8 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour.go @@ -4,8 +4,8 @@ import ( "bytes" "time" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" @@ -98,11 +98,11 @@ func (misbehaviour Misbehaviour) ValidateBasic() error { return sdkerrors.Wrapf(clienttypes.ErrInvalidMisbehaviour, "headers in misbehaviour are on different heights (%d ≠ %d)", misbehaviour.Header1.GetHeight(), misbehaviour.Header2.GetHeight()) } - blockID1, err := tmtypes.BlockIDFromProto(&misbehaviour.Header1.SignedHeader.Commit.BlockID) + blockID1, err := osttypes.BlockIDFromProto(&misbehaviour.Header1.SignedHeader.Commit.BlockID) if err != nil { return sdkerrors.Wrap(err, "invalid block ID from header 1 in misbehaviour") } - blockID2, err := tmtypes.BlockIDFromProto(&misbehaviour.Header2.SignedHeader.Commit.BlockID) + blockID2, err := osttypes.BlockIDFromProto(&misbehaviour.Header2.SignedHeader.Commit.BlockID) if err != nil { return sdkerrors.Wrap(err, "invalid block ID from header 2 in misbehaviour") } @@ -123,12 +123,12 @@ func (misbehaviour Misbehaviour) ValidateBasic() error { } // validCommit checks if the given commit is a valid commit from the passed-in validatorset -func validCommit(chainID string, blockID tmtypes.BlockID, commit *tmproto.Commit, valSet *tmproto.ValidatorSet) (err error) { - tmCommit, err := tmtypes.CommitFromProto(commit) +func validCommit(chainID string, blockID osttypes.BlockID, commit *ostproto.Commit, valSet *ostproto.ValidatorSet) (err error) { + tmCommit, err := osttypes.CommitFromProto(commit) if err != nil { return sdkerrors.Wrap(err, "commit is not tendermint commit type") } - tmValset, err := tmtypes.ValidatorSetFromProto(valSet) + tmValset, err := osttypes.ValidatorSetFromProto(valSet) if err != nil { return sdkerrors.Wrap(err, "validator set is not tendermint validator set type") } diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go index dadd298a74..2392c8499a 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle.go @@ -3,7 +3,7 @@ package types import ( "time" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" @@ -77,12 +77,12 @@ func checkMisbehaviourHeader( clientState *ClientState, consState *ConsensusState, header *Header, currentTimestamp time.Time, ) error { - tmTrustedValset, err := tmtypes.ValidatorSetFromProto(header.TrustedValidators) + tmTrustedValset, err := osttypes.ValidatorSetFromProto(header.TrustedValidators) if err != nil { return sdkerrors.Wrap(err, "trusted validator set is not tendermint validator set type") } - tmCommit, err := tmtypes.CommitFromProto(header.Commit) + tmCommit, err := osttypes.CommitFromProto(header.Commit) if err != nil { return sdkerrors.Wrap(err, "commit is not tendermint commit type") } diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go index 0e57f51053..da5af4495e 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_handle_test.go @@ -4,8 +4,8 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/crypto/tmhash" - tmtypes "github.com/tendermint/tendermint/types" + "github.com/line/ostracon/crypto/tmhash" + osttypes "github.com/line/ostracon/types" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" commitmenttypes "github.com/line/lbm-sdk/v2/x/ibc/core/23-commitment/types" @@ -20,20 +20,20 @@ func (suite *TendermintTestSuite) TestCheckMisbehaviourAndUpdateState() { altPubKey, err := altPrivVal.GetPubKey() suite.Require().NoError(err) - altVal := tmtypes.NewValidator(altPubKey, 4) + altVal := osttypes.NewValidator(altPubKey, 4) // Create bothValSet with both suite validator and altVal - bothValSet := tmtypes.NewValidatorSet(append(suite.valSet.Validators, altVal)) + bothValSet := osttypes.NewValidatorSet(append(suite.valSet.Validators, altVal)) bothValsHash := bothValSet.Hash() // Create alternative validator set with only altVal - altValSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{altVal}) + altValSet := osttypes.NewValidatorSet([]*osttypes.Validator{altVal}) _, suiteVal := suite.valSet.GetByIndex(0) // Create signer array and ensure it is in same order as bothValSet bothSigners := ibctesting.CreateSortedSignerArray(altPrivVal, suite.privVal, altVal, suiteVal) - altSigners := []tmtypes.PrivValidator{altPrivVal} + altSigners := []osttypes.PrivValidator{altPrivVal} heightMinus1 := clienttypes.NewHeight(height.RevisionNumber, height.RevisionHeight-1) heightMinus3 := clienttypes.NewHeight(height.RevisionNumber, height.RevisionHeight-3) diff --git a/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go b/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go index fe7a006a84..d04498761c 100644 --- a/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go +++ b/x/ibc/light-clients/07-tendermint/types/misbehaviour_test.go @@ -3,9 +3,9 @@ package types_test import ( "time" - "github.com/tendermint/tendermint/crypto/tmhash" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" + "github.com/line/ostracon/crypto/tmhash" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" "github.com/line/lbm-sdk/v2/x/ibc/core/exported" @@ -15,7 +15,7 @@ import ( ) func (suite *TendermintTestSuite) TestMisbehaviour() { - signers := []tmtypes.PrivValidator{suite.privVal} + signers := []osttypes.PrivValidator{suite.privVal} heightMinus1 := clienttypes.NewHeight(0, height.RevisionHeight-1) misbehaviour := &types.Misbehaviour{ @@ -36,20 +36,20 @@ func (suite *TendermintTestSuite) TestMisbehaviourValidateBasic() { revisionHeight := int64(height.RevisionHeight) - altVal := tmtypes.NewValidator(altPubKey, revisionHeight) + altVal := osttypes.NewValidator(altPubKey, revisionHeight) // Create bothValSet with both suite validator and altVal - bothValSet := tmtypes.NewValidatorSet(append(suite.valSet.Validators, altVal)) + bothValSet := osttypes.NewValidatorSet(append(suite.valSet.Validators, altVal)) // Create alternative validator set with only altVal - altValSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{altVal}) + altValSet := osttypes.NewValidatorSet([]*osttypes.Validator{altVal}) - signers := []tmtypes.PrivValidator{suite.privVal} + signers := []osttypes.PrivValidator{suite.privVal} // Create signer array and ensure it is in same order as bothValSet _, suiteVal := suite.valSet.GetByIndex(0) bothSigners := ibctesting.CreateSortedSignerArray(altPrivVal, suite.privVal, altVal, suiteVal) - altSigners := []tmtypes.PrivValidator{altPrivVal} + altSigners := []osttypes.PrivValidator{altPrivVal} heightMinus1 := clienttypes.NewHeight(0, height.RevisionHeight-1) @@ -180,13 +180,13 @@ func (suite *TendermintTestSuite) TestMisbehaviourValidateBasic() { }, func(misbehaviour *types.Misbehaviour) error { // voteSet contains only altVal which is less than 2/3 of total power (height/1height) - wrongVoteSet := tmtypes.NewVoteSet(chainID, int64(misbehaviour.Header1.GetHeight().GetRevisionHeight()), 1, tmproto.PrecommitType, altValSet) - blockID, err := tmtypes.BlockIDFromProto(&misbehaviour.Header1.Commit.BlockID) + wrongVoteSet := osttypes.NewVoteSet(chainID, int64(misbehaviour.Header1.GetHeight().GetRevisionHeight()), 1, ostproto.PrecommitType, altValSet) + blockID, err := osttypes.BlockIDFromProto(&misbehaviour.Header1.Commit.BlockID) if err != nil { return err } - tmCommit, err := tmtypes.MakeCommit(*blockID, int64(misbehaviour.Header2.GetHeight().GetRevisionHeight()), misbehaviour.Header1.Commit.Round, wrongVoteSet, altSigners, suite.now) + tmCommit, err := osttypes.MakeCommit(*blockID, int64(misbehaviour.Header2.GetHeight().GetRevisionHeight()), misbehaviour.Header1.Commit.Round, wrongVoteSet, altSigners, suite.now) misbehaviour.Header1.Commit = tmCommit.ToProto() return err }, @@ -201,13 +201,13 @@ func (suite *TendermintTestSuite) TestMisbehaviourValidateBasic() { }, func(misbehaviour *types.Misbehaviour) error { // voteSet contains only altVal which is less than 2/3 of total power (height/1height) - wrongVoteSet := tmtypes.NewVoteSet(chainID, int64(misbehaviour.Header2.GetHeight().GetRevisionHeight()), 1, tmproto.PrecommitType, altValSet) - blockID, err := tmtypes.BlockIDFromProto(&misbehaviour.Header2.Commit.BlockID) + wrongVoteSet := osttypes.NewVoteSet(chainID, int64(misbehaviour.Header2.GetHeight().GetRevisionHeight()), 1, ostproto.PrecommitType, altValSet) + blockID, err := osttypes.BlockIDFromProto(&misbehaviour.Header2.Commit.BlockID) if err != nil { return err } - tmCommit, err := tmtypes.MakeCommit(*blockID, int64(misbehaviour.Header2.GetHeight().GetRevisionHeight()), misbehaviour.Header2.Commit.Round, wrongVoteSet, altSigners, suite.now) + tmCommit, err := osttypes.MakeCommit(*blockID, int64(misbehaviour.Header2.GetHeight().GetRevisionHeight()), misbehaviour.Header2.Commit.Round, wrongVoteSet, altSigners, suite.now) misbehaviour.Header2.Commit = tmCommit.ToProto() return err }, diff --git a/x/ibc/light-clients/07-tendermint/types/proposal_handle.go b/x/ibc/light-clients/07-tendermint/types/proposal_handle.go index 935e8df21a..dd3df9c109 100644 --- a/x/ibc/light-clients/07-tendermint/types/proposal_handle.go +++ b/x/ibc/light-clients/07-tendermint/types/proposal_handle.go @@ -3,7 +3,7 @@ package types import ( "time" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" @@ -96,7 +96,7 @@ func (cs ClientState) unexpireClient( // NOTE: header.ValidateBasic is called in the 02-client proposal handler. Additional checks // on the validator set and the validator set hash are done in header.ValidateBasic. func (cs ClientState) checkProposedHeader(consensusState *ConsensusState, header *Header, currentTimestamp time.Time) error { - tmSignedHeader, err := tmtypes.SignedHeaderFromProto(header.SignedHeader) + tmSignedHeader, err := osttypes.SignedHeaderFromProto(header.SignedHeader) if err != nil { return sdkerrors.Wrap(err, "signed header in not tendermint signed header type") } diff --git a/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go b/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go index 3f5d17653d..a385cbcb32 100644 --- a/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go +++ b/x/ibc/light-clients/07-tendermint/types/tendermint.pb.go @@ -9,12 +9,12 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/golang/protobuf/ptypes/duration" - _ "github.com/golang/protobuf/ptypes/timestamp" types "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" types1 "github.com/line/lbm-sdk/v2/x/ibc/core/23-commitment/types" - github_com_tendermint_tendermint_libs_bytes "github.com/tendermint/tendermint/libs/bytes" - types2 "github.com/tendermint/tendermint/proto/tendermint/types" + github_com_line_ostracon_libs_bytes "github.com/line/ostracon/libs/bytes" + types2 "github.com/line/ostracon/proto/ostracon/types" + _ "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -104,8 +104,8 @@ type ConsensusState struct { // was stored. Timestamp time.Time `protobuf:"bytes,1,opt,name=timestamp,proto3,stdtime" json:"timestamp"` // commitment root (i.e app hash) - Root types1.MerkleRoot `protobuf:"bytes,2,opt,name=root,proto3" json:"root"` - NextValidatorsHash github_com_tendermint_tendermint_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=next_validators_hash,json=nextValidatorsHash,proto3,casttype=github.com/tendermint/tendermint/libs/bytes.HexBytes" json:"next_validators_hash,omitempty" yaml:"next_validators_hash"` + Root types1.MerkleRoot `protobuf:"bytes,2,opt,name=root,proto3" json:"root"` + NextValidatorsHash github_com_line_ostracon_libs_bytes.HexBytes `protobuf:"bytes,3,opt,name=next_validators_hash,json=nextValidatorsHash,proto3,casttype=github.com/line/ostracon/libs/bytes.HexBytes" json:"next_validators_hash,omitempty" yaml:"next_validators_hash"` } func (m *ConsensusState) Reset() { *m = ConsensusState{} } @@ -321,75 +321,76 @@ func init() { } var fileDescriptor_c6d6cf2b288949be = []byte{ - // 1081 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x6f, 0xe3, 0xc4, - 0x17, 0x6f, 0xda, 0x7e, 0xb7, 0xc9, 0x24, 0xdd, 0xf6, 0xeb, 0x2d, 0xdd, 0xb4, 0x74, 0xe3, 0xc8, - 0xa0, 0x25, 0x42, 0xaa, 0x4d, 0xb2, 0x48, 0x48, 0x15, 0x17, 0xdc, 0x82, 0x5a, 0xc4, 0x4a, 0x95, - 0xcb, 0x0f, 0x09, 0x09, 0xcc, 0xc4, 0x9e, 0xc4, 0xa3, 0xda, 0x1e, 0xe3, 0x99, 0x84, 0x94, 0xbf, - 0x00, 0x0e, 0x48, 0x7b, 0x44, 0x9c, 0x38, 0xf0, 0xc7, 0xec, 0xb1, 0x47, 0x4e, 0x06, 0xb5, 0x17, - 0xce, 0x39, 0x72, 0x42, 0x9e, 0x19, 0xdb, 0xd3, 0x6c, 0x97, 0x6a, 0xb9, 0xb4, 0xf3, 0xde, 0xfb, - 0xbc, 0xcf, 0x27, 0xf3, 0xe6, 0xcd, 0x1b, 0x03, 0x0b, 0x0f, 0x3d, 0x2b, 0xc4, 0xe3, 0x80, 0x79, - 0x21, 0x46, 0x31, 0xa3, 0x16, 0x43, 0xb1, 0x8f, 0xd2, 0x08, 0xc7, 0xcc, 0x9a, 0xf6, 0x15, 0xcb, - 0x4c, 0x52, 0xc2, 0x88, 0xd6, 0xc1, 0x43, 0xcf, 0x54, 0x13, 0x4c, 0x05, 0x32, 0xed, 0xef, 0x76, - 0x95, 0x7c, 0x76, 0x91, 0x20, 0x6a, 0x4d, 0x61, 0x88, 0x7d, 0xc8, 0x48, 0x2a, 0x18, 0x76, 0xf7, - 0x5e, 0x40, 0xf0, 0xbf, 0x32, 0xfa, 0xc0, 0x23, 0xf1, 0x08, 0x13, 0x2b, 0x49, 0x09, 0x19, 0x15, - 0xce, 0xce, 0x98, 0x90, 0x71, 0x88, 0x2c, 0x6e, 0x0d, 0x27, 0x23, 0xcb, 0x9f, 0xa4, 0x90, 0x61, - 0x12, 0xcb, 0xb8, 0xbe, 0x18, 0x67, 0x38, 0x42, 0x94, 0xc1, 0x28, 0x29, 0x00, 0xf9, 0x36, 0x3d, - 0x92, 0x22, 0x4b, 0xfc, 0xea, 0x7c, 0x6b, 0x62, 0x25, 0x01, 0x6f, 0x55, 0x00, 0x12, 0x45, 0x98, - 0x45, 0x05, 0xa8, 0xb4, 0x24, 0x70, 0x6b, 0x4c, 0xc6, 0x84, 0x2f, 0xad, 0x7c, 0x25, 0xbc, 0xc6, - 0x5f, 0x6b, 0xa0, 0x79, 0xc8, 0xf9, 0xce, 0x18, 0x64, 0x48, 0xdb, 0x01, 0x75, 0x2f, 0x80, 0x38, - 0x76, 0xb1, 0xdf, 0xae, 0x75, 0x6b, 0xbd, 0x86, 0xb3, 0xc6, 0xed, 0x13, 0x5f, 0x43, 0xa0, 0xc9, - 0xd2, 0x09, 0x65, 0x6e, 0x88, 0xa6, 0x28, 0x6c, 0x2f, 0x77, 0x6b, 0xbd, 0xe6, 0xa0, 0x67, 0xfe, - 0x7b, 0x59, 0xcd, 0x8f, 0x52, 0xe8, 0xe5, 0x1b, 0xb6, 0x77, 0x9f, 0x67, 0xfa, 0xd2, 0x3c, 0xd3, - 0xb5, 0x0b, 0x18, 0x85, 0x07, 0x86, 0x42, 0x65, 0x38, 0x80, 0x5b, 0x9f, 0xe4, 0x86, 0x36, 0x02, - 0x1b, 0xdc, 0xc2, 0xf1, 0xd8, 0x4d, 0x50, 0x8a, 0x89, 0xdf, 0x5e, 0xe1, 0x52, 0x3b, 0xa6, 0x28, - 0x96, 0x59, 0x14, 0xcb, 0x3c, 0x92, 0xc5, 0xb4, 0x0d, 0xc9, 0xbd, 0xad, 0x70, 0x57, 0xf9, 0xc6, - 0xcf, 0x7f, 0xe8, 0x35, 0xe7, 0x7e, 0xe1, 0x3d, 0xe5, 0x4e, 0x0d, 0x83, 0xcd, 0x49, 0x3c, 0x24, - 0xb1, 0xaf, 0x08, 0xad, 0xde, 0x25, 0xf4, 0x86, 0x14, 0x7a, 0x28, 0x84, 0x16, 0x09, 0x84, 0xd2, - 0x46, 0xe9, 0x96, 0x52, 0x08, 0x6c, 0x44, 0x70, 0xe6, 0x7a, 0x21, 0xf1, 0xce, 0x5d, 0x3f, 0xc5, - 0x23, 0xd6, 0xfe, 0xdf, 0x2b, 0x6e, 0x69, 0x21, 0x5f, 0x08, 0xad, 0x47, 0x70, 0x76, 0x98, 0x3b, - 0x8f, 0x72, 0x9f, 0xf6, 0x15, 0x58, 0x1f, 0xa5, 0xe4, 0x7b, 0x14, 0xbb, 0x01, 0xca, 0x0f, 0xa4, - 0x7d, 0x8f, 0x8b, 0xec, 0xf2, 0x23, 0xca, 0x5b, 0xc4, 0x94, 0x9d, 0x33, 0xed, 0x9b, 0xc7, 0x1c, - 0x61, 0xef, 0x49, 0x95, 0x2d, 0xa1, 0x72, 0x23, 0xdd, 0x70, 0x5a, 0xc2, 0x16, 0xd8, 0x9c, 0x3e, - 0x84, 0x0c, 0x51, 0x56, 0xd0, 0xaf, 0xbd, 0x2a, 0xfd, 0x8d, 0x74, 0xc3, 0x69, 0x09, 0x5b, 0xd2, - 0x9f, 0x80, 0x26, 0xbf, 0x3a, 0x2e, 0x4d, 0x90, 0x47, 0xdb, 0xf5, 0xee, 0x4a, 0xaf, 0x39, 0xd8, - 0x34, 0xb1, 0x47, 0x07, 0x4f, 0xcc, 0xd3, 0x3c, 0x72, 0x96, 0x20, 0xcf, 0xde, 0xae, 0x5a, 0x48, - 0x81, 0x1b, 0x0e, 0x48, 0x0a, 0x08, 0xd5, 0x0e, 0x40, 0x6b, 0x92, 0x8c, 0x53, 0xe8, 0x23, 0x37, - 0x81, 0x2c, 0x68, 0x37, 0xba, 0x2b, 0xbd, 0x86, 0xfd, 0x70, 0x9e, 0xe9, 0x0f, 0xe4, 0xb9, 0x29, - 0x51, 0xc3, 0x69, 0x4a, 0xf3, 0x14, 0xb2, 0x40, 0x73, 0xc1, 0x0e, 0x0c, 0x43, 0xf2, 0x9d, 0x3b, - 0x49, 0x7c, 0xc8, 0x90, 0x0b, 0x47, 0x0c, 0xa5, 0x2e, 0x9a, 0x25, 0x38, 0xbd, 0x68, 0x83, 0x6e, - 0xad, 0x57, 0xb7, 0xdf, 0x9c, 0x67, 0x7a, 0x57, 0x10, 0xbd, 0x14, 0x6a, 0x38, 0xdb, 0x3c, 0xf6, - 0x19, 0x0f, 0x7d, 0x90, 0x47, 0x3e, 0xe4, 0x01, 0xed, 0x5b, 0xa0, 0xdf, 0x92, 0x15, 0x61, 0x3a, - 0x44, 0x01, 0x9c, 0x62, 0x32, 0x49, 0xdb, 0x4d, 0x2e, 0xf3, 0xf6, 0x3c, 0xd3, 0x1f, 0xbf, 0x54, - 0x46, 0x4d, 0x30, 0x9c, 0xbd, 0x45, 0xb1, 0xa7, 0x4a, 0xf8, 0x60, 0xf5, 0x87, 0x5f, 0xf5, 0x25, - 0xe3, 0xb7, 0x65, 0x70, 0xff, 0x90, 0xc4, 0x14, 0xc5, 0x74, 0x42, 0xc5, 0x6d, 0xb7, 0x41, 0xa3, - 0x1c, 0x38, 0xfc, 0xba, 0xe7, 0xc7, 0xb9, 0xd8, 0x92, 0x9f, 0x16, 0x08, 0xbb, 0x9e, 0x1f, 0xe7, - 0xb3, 0xbc, 0xf3, 0xaa, 0x34, 0xed, 0x7d, 0xb0, 0x9a, 0x12, 0xc2, 0xe4, 0x3c, 0x30, 0x94, 0x6e, - 0xa8, 0x26, 0xd0, 0xb4, 0x6f, 0x3e, 0x45, 0xe9, 0x79, 0x88, 0x1c, 0x42, 0x98, 0xbd, 0x9a, 0xd3, - 0x38, 0x3c, 0x4b, 0xfb, 0xb1, 0x06, 0xb6, 0x62, 0x34, 0x63, 0x6e, 0x39, 0x6c, 0xa9, 0x1b, 0x40, - 0x1a, 0xf0, 0x3b, 0xdf, 0xb2, 0xbf, 0x98, 0x67, 0xfa, 0xeb, 0xa2, 0x06, 0xb7, 0xa1, 0x8c, 0xbf, - 0x33, 0xfd, 0xdd, 0x31, 0x66, 0xc1, 0x64, 0x98, 0xcb, 0xa9, 0x4f, 0x80, 0xb2, 0x0c, 0xf1, 0x90, - 0x5a, 0xc3, 0x0b, 0x86, 0xa8, 0x79, 0x8c, 0x66, 0x76, 0xbe, 0x70, 0xb4, 0x9c, 0xee, 0xf3, 0x92, - 0xed, 0x18, 0xd2, 0x40, 0x96, 0xe9, 0xa7, 0x65, 0xd0, 0x52, 0xab, 0xa7, 0xf5, 0x41, 0x43, 0x34, - 0x76, 0x39, 0x13, 0xed, 0xad, 0x79, 0xa6, 0x6f, 0x8a, 0x9f, 0x55, 0x86, 0x0c, 0xa7, 0x2e, 0xd6, - 0x27, 0xbe, 0x06, 0x41, 0x3d, 0x40, 0xd0, 0x47, 0xa9, 0xdb, 0x97, 0x75, 0x79, 0x7c, 0xd7, 0x9c, - 0x3c, 0xe6, 0x78, 0xbb, 0x73, 0x95, 0xe9, 0x6b, 0x62, 0xdd, 0x9f, 0x67, 0xfa, 0x86, 0x10, 0x29, - 0xc8, 0x0c, 0x67, 0x4d, 0x2c, 0xfb, 0x8a, 0xc4, 0x40, 0xce, 0xc7, 0xff, 0x20, 0x31, 0x78, 0x41, - 0x62, 0x50, 0x4a, 0x0c, 0x64, 0x3d, 0x7e, 0x59, 0x01, 0xf7, 0x04, 0x5a, 0x83, 0x60, 0x9d, 0xe2, - 0x71, 0x8c, 0x7c, 0x57, 0x40, 0x64, 0xcb, 0x74, 0x54, 0x1d, 0xf1, 0x24, 0x9e, 0x71, 0x98, 0x14, - 0xdc, 0xbb, 0xcc, 0xf4, 0x5a, 0x35, 0x05, 0x6e, 0x50, 0x18, 0x4e, 0x8b, 0x2a, 0xd8, 0x7c, 0xc8, - 0x94, 0x67, 0xec, 0x52, 0x54, 0xb4, 0xd5, 0x2d, 0x12, 0xe5, 0xe1, 0x9d, 0x21, 0x66, 0xb7, 0x2b, - 0xfa, 0x1b, 0xe9, 0x86, 0xd3, 0x9a, 0x2a, 0x38, 0xed, 0x1b, 0x20, 0x9e, 0x01, 0xae, 0xcf, 0x87, - 0xd8, 0xca, 0x9d, 0x43, 0xec, 0x91, 0x1c, 0x62, 0xaf, 0x29, 0x8f, 0x4b, 0x99, 0x6f, 0x38, 0xeb, - 0xd2, 0x21, 0xc7, 0x58, 0x08, 0xb4, 0x02, 0x51, 0x35, 0xab, 0x7c, 0x58, 0xee, 0xda, 0xc5, 0xa3, - 0x79, 0xa6, 0xef, 0xdc, 0x54, 0xa9, 0x38, 0x0c, 0xe7, 0xff, 0xd2, 0x59, 0xb5, 0xad, 0xf1, 0x31, - 0xa8, 0x17, 0x0f, 0xac, 0xb6, 0x07, 0x1a, 0xf1, 0x24, 0x42, 0x69, 0x1e, 0xe1, 0x27, 0xb3, 0xea, - 0x54, 0x0e, 0xad, 0x0b, 0x9a, 0x3e, 0x8a, 0x49, 0x84, 0x63, 0x1e, 0x5f, 0xe6, 0x71, 0xd5, 0x65, - 0x7f, 0xfd, 0xfc, 0xaa, 0x53, 0xbb, 0xbc, 0xea, 0xd4, 0xfe, 0xbc, 0xea, 0xd4, 0x9e, 0x5d, 0x77, - 0x96, 0x2e, 0xaf, 0x3b, 0x4b, 0xbf, 0x5f, 0x77, 0x96, 0xbe, 0x3c, 0x52, 0xae, 0x98, 0x47, 0x68, - 0x44, 0xa8, 0xfc, 0xb7, 0x4f, 0xfd, 0x73, 0x6b, 0x56, 0x7d, 0x8a, 0xed, 0x17, 0xdf, 0x62, 0xef, - 0xbc, 0xb7, 0xbf, 0xf8, 0xb1, 0x34, 0xbc, 0xc7, 0x27, 0xca, 0x93, 0x7f, 0x02, 0x00, 0x00, 0xff, - 0xff, 0x8f, 0xde, 0xf9, 0xa9, 0xba, 0x09, 0x00, 0x00, + // 1090 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xbd, 0x73, 0xe3, 0x44, + 0x14, 0x8f, 0x93, 0x70, 0xb1, 0xd7, 0xce, 0x25, 0xe8, 0x42, 0xce, 0x09, 0x39, 0xcb, 0xb3, 0x30, + 0x87, 0x87, 0x21, 0x12, 0xf6, 0x15, 0xcc, 0x64, 0x68, 0x50, 0x0e, 0x26, 0x61, 0xb8, 0x21, 0xa3, + 0x00, 0x05, 0x1f, 0x23, 0xd6, 0xd2, 0xda, 0x5a, 0x22, 0x69, 0x85, 0x76, 0x6d, 0x1c, 0x3a, 0x3a, + 0x1a, 0x66, 0xae, 0xa0, 0xa0, 0xa0, 0xe0, 0xcf, 0xb9, 0x32, 0x25, 0x95, 0x60, 0x92, 0x86, 0xda, + 0x25, 0x15, 0xa3, 0xdd, 0xd5, 0x47, 0x7c, 0x1f, 0x99, 0xa3, 0xf1, 0xec, 0x7b, 0xef, 0xf7, 0x7e, + 0x3f, 0xef, 0xdb, 0xb7, 0x6f, 0x05, 0x4c, 0x32, 0x74, 0xcd, 0x80, 0x8c, 0x7d, 0xee, 0x06, 0x04, + 0x47, 0x9c, 0x99, 0x1c, 0x47, 0x1e, 0x4e, 0x42, 0x12, 0x71, 0x73, 0xda, 0xaf, 0x58, 0x46, 0x9c, + 0x50, 0x4e, 0xb5, 0x0e, 0x19, 0xba, 0x46, 0x35, 0xc1, 0xa8, 0x40, 0xa6, 0xfd, 0xdd, 0x0e, 0x65, + 0x3c, 0x41, 0x2e, 0x8d, 0x4c, 0x7e, 0x1e, 0x63, 0x66, 0x4e, 0x51, 0x40, 0x3c, 0xc4, 0x69, 0x22, + 0xf3, 0x77, 0x77, 0x17, 0xe2, 0xe2, 0x57, 0xc5, 0xee, 0xb8, 0x34, 0x1a, 0x11, 0x6a, 0xc6, 0x09, + 0xa5, 0xa3, 0xdc, 0xd9, 0x19, 0x53, 0x3a, 0x0e, 0xb0, 0x29, 0xac, 0xe1, 0x64, 0x64, 0x7a, 0x93, + 0x04, 0x71, 0x42, 0x23, 0x15, 0xd7, 0x17, 0xe3, 0x9c, 0x84, 0x98, 0x71, 0x14, 0xc6, 0x39, 0x20, + 0xdb, 0xa2, 0x4b, 0x13, 0x6c, 0xca, 0x7f, 0x9c, 0x6d, 0x4b, 0xae, 0x14, 0xe0, 0xad, 0x12, 0x40, + 0xc3, 0x90, 0xf0, 0x30, 0x07, 0x15, 0x96, 0x02, 0x6e, 0x8d, 0xe9, 0x98, 0x8a, 0xa5, 0x99, 0xad, + 0xa4, 0x17, 0xfe, 0xb3, 0x06, 0x9a, 0x87, 0x82, 0xef, 0x94, 0x23, 0x8e, 0xb5, 0x1d, 0x50, 0x77, + 0x7d, 0x44, 0x22, 0x87, 0x78, 0xed, 0x5a, 0xb7, 0xd6, 0x6b, 0xd8, 0x6b, 0xc2, 0x3e, 0xf6, 0x34, + 0x0c, 0x9a, 0x3c, 0x99, 0x30, 0xee, 0x04, 0x78, 0x8a, 0x83, 0xf6, 0x72, 0xb7, 0xd6, 0x6b, 0x0e, + 0x7a, 0xc6, 0x8b, 0x4b, 0x6a, 0x7c, 0x94, 0x20, 0x37, 0xdb, 0xb0, 0xb5, 0xfb, 0x24, 0xd5, 0x97, + 0xe6, 0xa9, 0xae, 0x9d, 0xa3, 0x30, 0x38, 0x80, 0x15, 0x2a, 0x68, 0x03, 0x61, 0x7d, 0x92, 0x19, + 0xda, 0x08, 0x6c, 0x08, 0x8b, 0x44, 0x63, 0x27, 0xc6, 0x09, 0xa1, 0x5e, 0x7b, 0x45, 0x48, 0xed, + 0x18, 0xb2, 0x58, 0x46, 0x5e, 0x2c, 0xe3, 0xa1, 0x2a, 0xa6, 0x05, 0x15, 0xf7, 0x76, 0x85, 0xbb, + 0xcc, 0x87, 0xbf, 0xfd, 0xa5, 0xd7, 0xec, 0xdb, 0xb9, 0xf7, 0x44, 0x38, 0x35, 0x02, 0x36, 0x27, + 0xd1, 0x90, 0x46, 0x5e, 0x45, 0x68, 0xf5, 0x26, 0xa1, 0x37, 0x94, 0xd0, 0x5d, 0x29, 0xb4, 0x48, + 0x20, 0x95, 0x36, 0x0a, 0xb7, 0x92, 0xc2, 0x60, 0x23, 0x44, 0x33, 0xc7, 0x0d, 0xa8, 0x7b, 0xe6, + 0x78, 0x09, 0x19, 0xf1, 0xf6, 0x2b, 0x2f, 0xb9, 0xa5, 0x85, 0x7c, 0x29, 0xb4, 0x1e, 0xa2, 0xd9, + 0x61, 0xe6, 0x7c, 0x98, 0xf9, 0xb4, 0x6f, 0xc0, 0xfa, 0x28, 0xa1, 0x3f, 0xe2, 0xc8, 0xf1, 0x71, + 0x76, 0x20, 0xed, 0x5b, 0x42, 0x64, 0x57, 0x1c, 0x51, 0xd6, 0x22, 0x86, 0xea, 0x9c, 0x69, 0xdf, + 0x38, 0x12, 0x08, 0x6b, 0x4f, 0xa9, 0x6c, 0x49, 0x95, 0x6b, 0xe9, 0xd0, 0x6e, 0x49, 0x5b, 0x62, + 0x33, 0xfa, 0x00, 0x71, 0xcc, 0x78, 0x4e, 0xbf, 0xf6, 0xb2, 0xf4, 0xd7, 0xd2, 0xa1, 0xdd, 0x92, + 0xb6, 0xa2, 0x3f, 0x06, 0x4d, 0x71, 0x75, 0x1c, 0x16, 0x63, 0x97, 0xb5, 0xeb, 0xdd, 0x95, 0x5e, + 0x73, 0xb0, 0x69, 0x10, 0x97, 0x0d, 0x1e, 0x18, 0x27, 0x59, 0xe4, 0x34, 0xc6, 0xae, 0xb5, 0x5d, + 0xb6, 0x50, 0x05, 0x0e, 0x6d, 0x10, 0xe7, 0x10, 0xa6, 0x1d, 0x80, 0xd6, 0x24, 0x1e, 0x27, 0xc8, + 0xc3, 0x4e, 0x8c, 0xb8, 0xdf, 0x6e, 0x74, 0x57, 0x7a, 0x0d, 0xeb, 0xee, 0x3c, 0xd5, 0xef, 0xa8, + 0x73, 0xab, 0x44, 0xa1, 0xdd, 0x54, 0xe6, 0x09, 0xe2, 0xbe, 0xe6, 0x80, 0x1d, 0x14, 0x04, 0xf4, + 0x07, 0x67, 0x12, 0x7b, 0x88, 0x63, 0x07, 0x8d, 0x38, 0x4e, 0x1c, 0x3c, 0x8b, 0x49, 0x72, 0xde, + 0x06, 0xdd, 0x5a, 0xaf, 0x6e, 0xbd, 0x39, 0x4f, 0xf5, 0xae, 0x24, 0x7a, 0x2e, 0x14, 0xda, 0xdb, + 0x22, 0xf6, 0xb9, 0x08, 0x7d, 0x90, 0x45, 0x3e, 0x14, 0x01, 0xed, 0x7b, 0xa0, 0x3f, 0x23, 0x2b, + 0x24, 0x6c, 0x88, 0x7d, 0x34, 0x25, 0x74, 0x92, 0xb4, 0x9b, 0x42, 0xe6, 0xed, 0x79, 0xaa, 0xdf, + 0x7f, 0xae, 0x4c, 0x35, 0x01, 0xda, 0x7b, 0x8b, 0x62, 0x8f, 0x2a, 0xe1, 0x83, 0xd5, 0x9f, 0xff, + 0xd0, 0x97, 0xe0, 0xef, 0xcb, 0xe0, 0xf6, 0x21, 0x8d, 0x18, 0x8e, 0xd8, 0x84, 0xc9, 0xdb, 0x6e, + 0x81, 0x46, 0x31, 0x70, 0xc4, 0x75, 0xcf, 0x8e, 0x73, 0xb1, 0x25, 0x3f, 0xcb, 0x11, 0x56, 0x3d, + 0x3b, 0xce, 0xc7, 0x59, 0xe7, 0x95, 0x69, 0xda, 0xfb, 0x60, 0x35, 0xa1, 0x94, 0xab, 0x79, 0x00, + 0x2b, 0xdd, 0x50, 0x4e, 0xa0, 0x69, 0xdf, 0x78, 0x84, 0x93, 0xb3, 0x00, 0xdb, 0x94, 0x72, 0x6b, + 0x35, 0xa3, 0xb1, 0x45, 0x96, 0xf6, 0x53, 0x0d, 0x6c, 0x45, 0x78, 0xc6, 0x9d, 0x62, 0xd4, 0x32, + 0xc7, 0x47, 0xcc, 0x17, 0x77, 0xbe, 0x65, 0x7d, 0x3a, 0x4f, 0xf5, 0xd7, 0x65, 0x0d, 0x9e, 0x85, + 0x82, 0xff, 0xa6, 0xfa, 0x3b, 0x63, 0xc2, 0xfd, 0xc9, 0x30, 0x93, 0x33, 0x03, 0x12, 0x61, 0xb3, + 0x98, 0xd1, 0x01, 0x19, 0x32, 0x73, 0x78, 0xce, 0x31, 0x33, 0x8e, 0xf0, 0xcc, 0xca, 0x16, 0xb6, + 0x96, 0xd1, 0x7c, 0x51, 0xb0, 0x1c, 0x21, 0xe6, 0xab, 0xf2, 0xfc, 0xb2, 0x0c, 0x5a, 0xd5, 0xaa, + 0x69, 0x7d, 0xd0, 0x90, 0x0d, 0x5d, 0xcc, 0x42, 0x6b, 0x6b, 0x9e, 0xea, 0x9b, 0xf2, 0xef, 0x14, + 0x21, 0x68, 0xd7, 0xe5, 0xfa, 0xd8, 0xd3, 0x10, 0xa8, 0xfb, 0x18, 0x79, 0x38, 0x71, 0xfa, 0xaa, + 0x1e, 0xf7, 0x6f, 0x9a, 0x8f, 0x47, 0x02, 0x6f, 0x75, 0x2e, 0x53, 0x7d, 0x4d, 0xae, 0xfb, 0xf3, + 0x54, 0xdf, 0x90, 0x22, 0x39, 0x19, 0xb4, 0xd7, 0xe4, 0xb2, 0x5f, 0x91, 0x18, 0xa8, 0xb9, 0xf8, + 0x3f, 0x24, 0x06, 0x4f, 0x49, 0x0c, 0x0a, 0x89, 0x81, 0xaa, 0xc7, 0xaf, 0x2b, 0xe0, 0x96, 0x44, + 0x6b, 0x0e, 0x58, 0x67, 0x64, 0x1c, 0x61, 0xcf, 0x91, 0x10, 0xd5, 0x2a, 0x7b, 0x46, 0x5e, 0x6a, + 0x43, 0x3e, 0x84, 0xa7, 0x02, 0xa4, 0xe4, 0xf6, 0x2e, 0x52, 0xbd, 0x56, 0xde, 0xfd, 0x6b, 0x04, + 0xd0, 0x6e, 0xb1, 0x0a, 0x56, 0xfb, 0x0a, 0xac, 0x17, 0x27, 0xeb, 0x30, 0x9c, 0x37, 0xd3, 0x53, + 0x02, 0xc5, 0xc1, 0x9d, 0x62, 0x6e, 0xb5, 0x4b, 0xf2, 0x6b, 0xc9, 0xd0, 0x6e, 0x4d, 0x2b, 0x38, + 0xed, 0x5b, 0x20, 0x47, 0xbf, 0x50, 0x17, 0x83, 0x6b, 0xe5, 0xc6, 0xc1, 0x75, 0x4f, 0x0d, 0xae, + 0xd7, 0x2a, 0x0f, 0x4a, 0x91, 0x0f, 0xed, 0x75, 0xe5, 0x50, 0xa3, 0xeb, 0x3b, 0xa0, 0xe5, 0x88, + 0xb2, 0x41, 0xd5, 0x63, 0xf2, 0xe2, 0x3d, 0xdc, 0x9b, 0xa7, 0xfa, 0xce, 0x75, 0x8d, 0x92, 0x01, + 0xda, 0xaf, 0x2a, 0x67, 0xd9, 0xb0, 0xf0, 0x63, 0x50, 0xcf, 0x9f, 0x54, 0x6d, 0x0f, 0x34, 0xa2, + 0x49, 0x88, 0x93, 0x2c, 0x22, 0xce, 0x64, 0xd5, 0x2e, 0x1d, 0x5a, 0x17, 0x34, 0x3d, 0x1c, 0xd1, + 0x90, 0x44, 0x22, 0xbe, 0x2c, 0xe2, 0x55, 0x97, 0xf5, 0xf5, 0x93, 0xcb, 0x4e, 0xed, 0xe2, 0xb2, + 0x53, 0xfb, 0xfb, 0xb2, 0x53, 0x7b, 0x7c, 0xd5, 0x59, 0xba, 0xb8, 0xea, 0x2c, 0xfd, 0x79, 0xd5, + 0x59, 0xfa, 0xd2, 0x5a, 0xbc, 0x54, 0xc1, 0x30, 0xdc, 0x67, 0xde, 0x99, 0x39, 0x1d, 0x98, 0xb3, + 0xf2, 0xb3, 0x6b, 0x3f, 0xff, 0xee, 0x7a, 0xf7, 0xbd, 0xfd, 0xca, 0xa7, 0x97, 0xd8, 0xe8, 0xf0, + 0x96, 0x98, 0x20, 0x0f, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x1a, 0xdb, 0xd0, 0xb1, 0xa6, 0x09, + 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/light-clients/07-tendermint/types/tendermint_test.go b/x/ibc/light-clients/07-tendermint/types/tendermint_test.go index 542a26bb78..9993e95e75 100644 --- a/x/ibc/light-clients/07-tendermint/types/tendermint_test.go +++ b/x/ibc/light-clients/07-tendermint/types/tendermint_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" + ostbytes "github.com/line/ostracon/libs/bytes" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" "github.com/stretchr/testify/suite" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -46,9 +46,9 @@ type TendermintTestSuite struct { // TODO: deprecate usage in favor of testing package ctx sdk.Context cdc codec.Marshaler - privVal tmtypes.PrivValidator - valSet *tmtypes.ValidatorSet - valsHash tmbytes.HexBytes + privVal osttypes.PrivValidator + valSet *osttypes.ValidatorSet + valsHash ostbytes.HexBytes header *ibctmtypes.Header now time.Time headerTime time.Time @@ -83,11 +83,11 @@ func (suite *TendermintTestSuite) SetupTest() { heightMinus1 := clienttypes.NewHeight(0, height.RevisionHeight-1) - val := tmtypes.NewValidator(pubKey, 10) - suite.valSet = tmtypes.NewValidatorSet([]*tmtypes.Validator{val}) + val := osttypes.NewValidator(pubKey, 10) + suite.valSet = osttypes.NewValidatorSet([]*osttypes.Validator{val}) suite.valsHash = suite.valSet.Hash() - suite.header = suite.chainA.CreateTMClientHeader(chainID, int64(height.RevisionHeight), heightMinus1, suite.now, suite.valSet, suite.valSet, []tmtypes.PrivValidator{suite.privVal}) - suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1, Time: suite.now}) + suite.header = suite.chainA.CreateTMClientHeader(chainID, int64(height.RevisionHeight), heightMinus1, suite.now, suite.valSet, suite.valSet, []osttypes.PrivValidator{suite.privVal}) + suite.ctx = app.BaseApp.NewContext(checkTx, ostproto.Header{Height: 1, Time: suite.now}) } func TestTendermintTestSuite(t *testing.T) { diff --git a/x/ibc/light-clients/07-tendermint/types/update.go b/x/ibc/light-clients/07-tendermint/types/update.go index f59c344e80..0b909ee605 100644 --- a/x/ibc/light-clients/07-tendermint/types/update.go +++ b/x/ibc/light-clients/07-tendermint/types/update.go @@ -4,8 +4,8 @@ import ( "bytes" "time" - "github.com/tendermint/tendermint/light" - tmtypes "github.com/tendermint/tendermint/types" + "github.com/line/ostracon/light" + osttypes "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" @@ -66,7 +66,7 @@ func (cs ClientState) CheckHeaderAndUpdateState( // checkTrustedHeader checks that consensus state matches trusted fields of Header func checkTrustedHeader(header *Header, consState *ConsensusState) error { - tmTrustedValidators, err := tmtypes.ValidatorSetFromProto(header.TrustedValidators) + tmTrustedValidators, err := osttypes.ValidatorSetFromProto(header.TrustedValidators) if err != nil { return sdkerrors.Wrap(err, "trusted validator set in not tendermint validator set type") } @@ -104,17 +104,17 @@ func checkValidity( ) } - tmTrustedValidators, err := tmtypes.ValidatorSetFromProto(header.TrustedValidators) + tmTrustedValidators, err := osttypes.ValidatorSetFromProto(header.TrustedValidators) if err != nil { return sdkerrors.Wrap(err, "trusted validator set in not tendermint validator set type") } - tmSignedHeader, err := tmtypes.SignedHeaderFromProto(header.SignedHeader) + tmSignedHeader, err := osttypes.SignedHeaderFromProto(header.SignedHeader) if err != nil { return sdkerrors.Wrap(err, "signed header in not tendermint signed header type") } - tmValidatorSet, err := tmtypes.ValidatorSetFromProto(header.ValidatorSet) + tmValidatorSet, err := osttypes.ValidatorSetFromProto(header.ValidatorSet) if err != nil { return sdkerrors.Wrap(err, "validator set in not tendermint validator set type") } @@ -140,13 +140,13 @@ func checkValidity( // Construct a trusted header using the fields in consensus state // Only Height, Time, and NextValidatorsHash are necessary for verification - trustedHeader := tmtypes.Header{ + trustedHeader := osttypes.Header{ ChainID: chainID, Height: int64(header.TrustedHeight.RevisionHeight), Time: consState.Timestamp, NextValidatorsHash: consState.NextValidatorsHash, } - signedHeader := tmtypes.SignedHeader{ + signedHeader := osttypes.SignedHeader{ Header: &trustedHeader, } diff --git a/x/ibc/light-clients/07-tendermint/types/update_test.go b/x/ibc/light-clients/07-tendermint/types/update_test.go index 42543ce169..8a90a2c20a 100644 --- a/x/ibc/light-clients/07-tendermint/types/update_test.go +++ b/x/ibc/light-clients/07-tendermint/types/update_test.go @@ -3,7 +3,7 @@ package types_test import ( "time" - tmtypes "github.com/tendermint/tendermint/types" + osttypes "github.com/line/ostracon/types" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" commitmenttypes "github.com/line/lbm-sdk/v2/x/ibc/core/23-commitment/types" @@ -34,20 +34,20 @@ func (suite *TendermintTestSuite) TestCheckHeaderAndUpdateState() { heightMinus3 := clienttypes.NewHeight(height.RevisionNumber, height.RevisionHeight-3) heightPlus5 := clienttypes.NewHeight(height.RevisionNumber, height.RevisionHeight+5) - altVal := tmtypes.NewValidator(altPubKey, revisionHeight) + altVal := osttypes.NewValidator(altPubKey, revisionHeight) // Create bothValSet with both suite validator and altVal. Would be valid update - bothValSet := tmtypes.NewValidatorSet(append(suite.valSet.Validators, altVal)) + bothValSet := osttypes.NewValidatorSet(append(suite.valSet.Validators, altVal)) // Create alternative validator set with only altVal, invalid update (too much change in valSet) - altValSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{altVal}) + altValSet := osttypes.NewValidatorSet([]*osttypes.Validator{altVal}) - signers := []tmtypes.PrivValidator{suite.privVal} + signers := []osttypes.PrivValidator{suite.privVal} // Create signer array and ensure it is in same order as bothValSet _, suiteVal := suite.valSet.GetByIndex(0) bothSigners := ibctesting.CreateSortedSignerArray(altPrivVal, suite.privVal, altVal, suiteVal) - altSigners := []tmtypes.PrivValidator{altPrivVal} + altSigners := []osttypes.PrivValidator{altPrivVal} testCases := []struct { name string diff --git a/x/ibc/light-clients/09-localhost/types/localhost.pb.go b/x/ibc/light-clients/09-localhost/types/localhost.pb.go index c1aaabae4b..10cb3ea8b6 100644 --- a/x/ibc/light-clients/09-localhost/types/localhost.pb.go +++ b/x/ibc/light-clients/09-localhost/types/localhost.pb.go @@ -75,7 +75,7 @@ func init() { } var fileDescriptor_acd9f5b22d41bf6d = []byte{ - // 279 bytes of a gzipped FileDescriptorProto + // 282 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xd2, 0xcd, 0x4c, 0x4a, 0xd6, 0xcf, 0xc9, 0x4c, 0xcf, 0x28, 0x49, 0xce, 0xc9, 0x4c, 0xcd, 0x2b, 0x29, 0xd6, 0xcf, 0xc9, 0x4f, 0x4e, 0xcc, 0xc9, 0xc8, 0x2f, 0x2e, 0xd1, 0x2f, 0x33, 0x44, 0x70, 0xf4, 0x0a, 0x8a, 0xf2, 0x4b, @@ -87,13 +87,13 @@ var fileDescriptor_acd9f5b22d41bf6d = []byte{ 0x95, 0x89, 0xb9, 0x39, 0x56, 0x4a, 0x30, 0x19, 0xa5, 0x20, 0x76, 0x30, 0xd3, 0x33, 0x45, 0xc8, 0x82, 0x8b, 0x2d, 0x23, 0x15, 0xe4, 0x26, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x29, 0x3d, 0x90, 0x2b, 0x41, 0x16, 0xea, 0x41, 0xad, 0x29, 0x33, 0xd4, 0xf3, 0x00, 0xab, 0x70, 0x62, 0x39, - 0x71, 0x4f, 0x9e, 0x21, 0x08, 0xaa, 0xde, 0x8a, 0xa5, 0x63, 0x81, 0x3c, 0x83, 0x53, 0xec, 0x89, + 0x71, 0x4f, 0x9e, 0x21, 0x08, 0xaa, 0xde, 0x8a, 0xa5, 0x63, 0x81, 0x3c, 0x83, 0x53, 0xf4, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, - 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x39, 0xa7, 0x67, 0x96, 0x64, 0x94, 0x26, - 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x27, 0xe7, 0x17, 0xe7, 0xe6, 0x17, 0x43, 0x29, 0xdd, 0xe2, 0x94, - 0x6c, 0xfd, 0x0a, 0x7d, 0x78, 0xe0, 0xe9, 0xc2, 0x42, 0xcf, 0xc0, 0x52, 0x17, 0x11, 0x80, 0x25, - 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x4f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xcd, - 0x7d, 0x91, 0x77, 0x6b, 0x01, 0x00, 0x00, + 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x39, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, + 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xe7, 0x64, 0xe6, 0xa5, 0xea, 0xe7, 0x24, 0xe5, 0xea, 0x16, 0xa7, + 0x64, 0xeb, 0x97, 0x19, 0xe9, 0x57, 0xe8, 0xc3, 0x83, 0x4e, 0x17, 0x16, 0x76, 0x06, 0x96, 0xba, + 0x88, 0xe0, 0x2b, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x7b, 0xd1, 0x18, 0x10, 0x00, 0x00, + 0xff, 0xff, 0xe6, 0x95, 0xde, 0x69, 0x69, 0x01, 0x00, 0x00, } func (m *ClientState) Marshal() (dAtA []byte, err error) { diff --git a/x/ibc/light-clients/09-localhost/types/localhost_test.go b/x/ibc/light-clients/09-localhost/types/localhost_test.go index 878f19117e..48742ee206 100644 --- a/x/ibc/light-clients/09-localhost/types/localhost_test.go +++ b/x/ibc/light-clients/09-localhost/types/localhost_test.go @@ -3,8 +3,8 @@ package types_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -34,7 +34,7 @@ func (suite *LocalhostTestSuite) SetupTest() { app := simapp.Setup(isCheckTx) suite.cdc = app.AppCodec() - suite.ctx = app.BaseApp.NewContext(isCheckTx, tmproto.Header{Height: 1, ChainID: "ibc-chain"}) + suite.ctx = app.BaseApp.NewContext(isCheckTx, ostproto.Header{Height: 1, ChainID: "ibc-chain"}) suite.store = app.IBCKeeper.ClientKeeper.ClientStore(suite.ctx, exported.Localhost) } diff --git a/x/ibc/testing/chain.go b/x/ibc/testing/chain.go index 8080f19b4e..6760c8ef22 100644 --- a/x/ibc/testing/chain.go +++ b/x/ibc/testing/chain.go @@ -7,13 +7,13 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/crypto/tmhash" + ostproto "github.com/line/ostracon/proto/ostracon/types" + ostprotoversion "github.com/line/ostracon/proto/ostracon/version" + osttypes "github.com/line/ostracon/types" + tmversion "github.com/line/ostracon/version" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/tmhash" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmprotoversion "github.com/tendermint/tendermint/proto/tendermint/version" - tmtypes "github.com/tendermint/tendermint/types" - tmversion "github.com/tendermint/tendermint/version" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" @@ -87,13 +87,13 @@ type TestChain struct { App *simapp.SimApp ChainID string LastHeader *ibctmtypes.Header // header for last block height committed - CurrentHeader tmproto.Header // header for current block height + CurrentHeader ostproto.Header // header for current block height QueryServer types.QueryServer TxConfig client.TxConfig Codec codec.BinaryMarshaler - Vals *tmtypes.ValidatorSet - Signers []tmtypes.PrivValidator + Vals *osttypes.ValidatorSet + Signers []osttypes.PrivValidator senderPrivKey cryptotypes.PrivKey SenderAccount authtypes.AccountI @@ -118,9 +118,9 @@ func NewTestChain(t *testing.T, chainID string) *TestChain { require.NoError(t, err) // create validator set with single validator - validator := tmtypes.NewValidator(pubKey, 1) - valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator}) - signers := []tmtypes.PrivValidator{privVal} + validator := osttypes.NewValidator(pubKey, 1) + valSet := osttypes.NewValidatorSet([]*osttypes.Validator{validator}) + signers := []osttypes.PrivValidator{privVal} // generate genesis account senderPrivKey := secp256k1.GenPrivKey() @@ -133,7 +133,7 @@ func NewTestChain(t *testing.T, chainID string) *TestChain { app := simapp.SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, balance) // create current header and call begin block - header := tmproto.Header{ + header := ostproto.Header{ ChainID: chainID, Height: 1, Time: globalStartTime, @@ -255,7 +255,7 @@ func (chain *TestChain) NextBlock() { chain.LastHeader = chain.CurrentTMClientHeader() // increment the current header - chain.CurrentHeader = tmproto.Header{ + chain.CurrentHeader = ostproto.Header{ ChainID: chain.ChainID, Height: chain.App.LastBlockHeight() + 1, AppHash: chain.App.LastCommitID().Hash, @@ -321,7 +321,7 @@ func (chain *TestChain) GetConsensusState(clientID string, height exported.Heigh // GetValsAtHeight will return the validator set of the chain at a given height. It will return // a success boolean depending on if the validator set exists or not at that height. -func (chain *TestChain) GetValsAtHeight(height int64) (*tmtypes.ValidatorSet, bool) { +func (chain *TestChain) GetValsAtHeight(height int64) (*osttypes.ValidatorSet, bool) { histInfo, ok := chain.App.StakingKeeper.GetHistoricalInfo(chain.GetContext(), height) if !ok { return nil, false @@ -333,7 +333,7 @@ func (chain *TestChain) GetValsAtHeight(height int64) (*tmtypes.ValidatorSet, bo if err != nil { panic(err) } - return tmtypes.NewValidatorSet(tmValidators), true + return osttypes.NewValidatorSet(tmValidators), true } // GetConnection retrieves an IBC Connection for the provided TestConnection. The @@ -498,7 +498,7 @@ func (chain *TestChain) ConstructUpdateTMClientHeader(counterparty *TestChain, c // Relayer must query for LatestHeight on client to get TrustedHeight trustedHeight := chain.GetClientState(clientID).GetLatestHeight().(clienttypes.Height) var ( - tmTrustedVals *tmtypes.ValidatorSet + tmTrustedVals *osttypes.ValidatorSet ok bool ) // Once we get TrustedHeight from client, we must query the validators from the counterparty chain @@ -544,17 +544,17 @@ func (chain *TestChain) CurrentTMClientHeader() *ibctmtypes.Header { // CreateTMClientHeader creates a TM header to update the TM client. Args are passed in to allow // caller flexibility to use params that differ from the chain. -func (chain *TestChain) CreateTMClientHeader(chainID string, blockHeight int64, trustedHeight clienttypes.Height, timestamp time.Time, tmValSet, tmTrustedVals *tmtypes.ValidatorSet, signers []tmtypes.PrivValidator) *ibctmtypes.Header { +func (chain *TestChain) CreateTMClientHeader(chainID string, blockHeight int64, trustedHeight clienttypes.Height, timestamp time.Time, tmValSet, tmTrustedVals *osttypes.ValidatorSet, signers []osttypes.PrivValidator) *ibctmtypes.Header { var ( - valSet *tmproto.ValidatorSet - trustedVals *tmproto.ValidatorSet + valSet *ostproto.ValidatorSet + trustedVals *ostproto.ValidatorSet ) require.NotNil(chain.t, tmValSet) vsetHash := tmValSet.Hash() - tmHeader := tmtypes.Header{ - Version: tmprotoversion.Consensus{Block: tmversion.BlockProtocol, App: 2}, + tmHeader := osttypes.Header{ + Version: ostprotoversion.Consensus{Block: tmversion.BlockProtocol, App: 2}, ChainID: chainID, Height: blockHeight, Time: timestamp, @@ -571,12 +571,12 @@ func (chain *TestChain) CreateTMClientHeader(chainID string, blockHeight int64, } hhash := tmHeader.Hash() blockID := MakeBlockID(hhash, 3, tmhash.Sum([]byte("part_set"))) - voteSet := tmtypes.NewVoteSet(chainID, blockHeight, 1, tmproto.PrecommitType, tmValSet) + voteSet := osttypes.NewVoteSet(chainID, blockHeight, 1, ostproto.PrecommitType, tmValSet) - commit, err := tmtypes.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp) + commit, err := osttypes.MakeCommit(blockID, blockHeight, 1, voteSet, signers, timestamp) require.NoError(chain.t, err) - signedHeader := &tmproto.SignedHeader{ + signedHeader := &ostproto.SignedHeader{ Header: tmHeader.ToProto(), Commit: commit.ToProto(), } @@ -605,11 +605,11 @@ func (chain *TestChain) CreateTMClientHeader(chainID string, blockHeight int64, } } -// MakeBlockID copied unimported test functions from tmtypes to use them here -func MakeBlockID(hash []byte, partSetSize uint32, partSetHash []byte) tmtypes.BlockID { - return tmtypes.BlockID{ +// MakeBlockID copied unimported test functions from osttypes to use them here +func MakeBlockID(hash []byte, partSetSize uint32, partSetHash []byte) osttypes.BlockID { + return osttypes.BlockID{ Hash: hash, - PartSetHeader: tmtypes.PartSetHeader{ + PartSetHeader: osttypes.PartSetHeader{ Total: partSetSize, Hash: partSetHash, }, @@ -620,19 +620,19 @@ func MakeBlockID(hash []byte, partSetSize uint32, partSetHash []byte) tmtypes.Bl // (including voting power). It returns a signer array of PrivValidators that matches the // sorting of ValidatorSet. // The sorting is first by .VotingPower (descending), with secondary index of .Address (ascending). -func CreateSortedSignerArray(altPrivVal, suitePrivVal tmtypes.PrivValidator, - altVal, suiteVal *tmtypes.Validator) []tmtypes.PrivValidator { +func CreateSortedSignerArray(altPrivVal, suitePrivVal osttypes.PrivValidator, + altVal, suiteVal *osttypes.Validator) []osttypes.PrivValidator { switch { case altVal.VotingPower > suiteVal.VotingPower: - return []tmtypes.PrivValidator{altPrivVal, suitePrivVal} + return []osttypes.PrivValidator{altPrivVal, suitePrivVal} case altVal.VotingPower < suiteVal.VotingPower: - return []tmtypes.PrivValidator{suitePrivVal, altPrivVal} + return []osttypes.PrivValidator{suitePrivVal, altPrivVal} default: if bytes.Compare(altVal.Address, suiteVal.Address) == -1 { - return []tmtypes.PrivValidator{altPrivVal, suitePrivVal} + return []osttypes.PrivValidator{altPrivVal, suitePrivVal} } - return []tmtypes.PrivValidator{suitePrivVal, altPrivVal} + return []osttypes.PrivValidator{suitePrivVal, altPrivVal} } } diff --git a/x/ibc/testing/chain_test.go b/x/ibc/testing/chain_test.go index 11775a97d8..afb352efbf 100644 --- a/x/ibc/testing/chain_test.go +++ b/x/ibc/testing/chain_test.go @@ -3,8 +3,8 @@ package ibctesting_test import ( "testing" + osttypes "github.com/line/ostracon/types" "github.com/stretchr/testify/require" - tmtypes "github.com/tendermint/tendermint/types" ibctesting "github.com/line/lbm-sdk/v2/x/ibc/testing" "github.com/line/lbm-sdk/v2/x/ibc/testing/mock" @@ -19,10 +19,10 @@ func TestCreateSortedSignerArray(t *testing.T) { pubKey2, err := privVal2.GetPubKey() require.NoError(t, err) - validator1 := tmtypes.NewValidator(pubKey1, 1) - validator2 := tmtypes.NewValidator(pubKey2, 2) + validator1 := osttypes.NewValidator(pubKey1, 1) + validator2 := osttypes.NewValidator(pubKey2, 2) - expected := []tmtypes.PrivValidator{privVal2, privVal1} + expected := []osttypes.PrivValidator{privVal2, privVal1} actual := ibctesting.CreateSortedSignerArray(privVal1, privVal2, validator1, validator2) require.Equal(t, expected, actual) @@ -36,7 +36,7 @@ func TestCreateSortedSignerArray(t *testing.T) { validator2.Address = []byte{2} validator2.VotingPower = 1 - expected = []tmtypes.PrivValidator{privVal1, privVal2} + expected = []osttypes.PrivValidator{privVal1, privVal2} actual = ibctesting.CreateSortedSignerArray(privVal1, privVal2, validator1, validator2) require.Equal(t, expected, actual) diff --git a/x/ibc/testing/coordinator.go b/x/ibc/testing/coordinator.go index 8200beef65..963594ad22 100644 --- a/x/ibc/testing/coordinator.go +++ b/x/ibc/testing/coordinator.go @@ -6,8 +6,8 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" sdk "github.com/line/lbm-sdk/v2/types" channeltypes "github.com/line/lbm-sdk/v2/x/ibc/core/04-channel/types" diff --git a/x/ibc/testing/mock/mock.go b/x/ibc/testing/mock/mock.go index d6224b5da8..ab7b27ee45 100644 --- a/x/ibc/testing/mock/mock.go +++ b/x/ibc/testing/mock/mock.go @@ -10,7 +10,7 @@ import ( "github.com/gorilla/mux" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/ibc/testing/mock/privval.go b/x/ibc/testing/mock/privval.go index 8283f96299..942975d239 100644 --- a/x/ibc/testing/mock/privval.go +++ b/x/ibc/testing/mock/privval.go @@ -1,16 +1,16 @@ package mock import ( - "github.com/tendermint/tendermint/crypto" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" + "github.com/line/ostracon/crypto" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" cryptocodec "github.com/line/lbm-sdk/v2/crypto/codec" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" ) -var _ tmtypes.PrivValidator = PV{} +var _ osttypes.PrivValidator = PV{} // MockPV implements PrivValidator without any safety or persistence. // Only use it for testing. @@ -28,8 +28,8 @@ func (pv PV) GetPubKey() (crypto.PubKey, error) { } // SignVote implements PrivValidator interface -func (pv PV) SignVote(chainID string, vote *tmproto.Vote) error { - signBytes := tmtypes.VoteSignBytes(chainID, vote) +func (pv PV) SignVote(chainID string, vote *ostproto.Vote) error { + signBytes := osttypes.VoteSignBytes(chainID, vote) sig, err := pv.PrivKey.Sign(signBytes) if err != nil { return err @@ -39,8 +39,8 @@ func (pv PV) SignVote(chainID string, vote *tmproto.Vote) error { } // SignProposal implements PrivValidator interface -func (pv PV) SignProposal(chainID string, proposal *tmproto.Proposal) error { - signBytes := tmtypes.ProposalSignBytes(chainID, proposal) +func (pv PV) SignProposal(chainID string, proposal *ostproto.Proposal) error { + signBytes := osttypes.ProposalSignBytes(chainID, proposal) sig, err := pv.PrivKey.Sign(signBytes) if err != nil { return err diff --git a/x/ibc/testing/mock/privval_test.go b/x/ibc/testing/mock/privval_test.go index 02a09f4aa8..59475ed9d5 100644 --- a/x/ibc/testing/mock/privval_test.go +++ b/x/ibc/testing/mock/privval_test.go @@ -3,9 +3,9 @@ package mock_test import ( "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/x/ibc/testing/mock" ) @@ -23,10 +23,10 @@ func TestSignVote(t *testing.T) { pv := mock.NewPV() pk, _ := pv.GetPubKey() - vote := &tmproto.Vote{Height: 2} + vote := &ostproto.Vote{Height: 2} pv.SignVote(chainID, vote) - msg := tmtypes.VoteSignBytes(chainID, vote) + msg := osttypes.VoteSignBytes(chainID, vote) ok := pk.VerifySignature(msg, vote.Signature) require.True(t, ok) } @@ -35,10 +35,10 @@ func TestSignProposal(t *testing.T) { pv := mock.NewPV() pk, _ := pv.GetPubKey() - proposal := &tmproto.Proposal{Round: 2} + proposal := &ostproto.Proposal{Round: 2} pv.SignProposal(chainID, proposal) - msg := tmtypes.ProposalSignBytes(chainID, proposal) + msg := osttypes.ProposalSignBytes(chainID, proposal) ok := pk.VerifySignature(msg, proposal.Signature) require.True(t, ok) } diff --git a/x/mint/client/cli/cli_test.go b/x/mint/client/cli/cli_test.go index 708243d7b8..50c55f7f4f 100644 --- a/x/mint/client/cli/cli_test.go +++ b/x/mint/client/cli/cli_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + ostcli "github.com/line/ostracon/libs/cli" "github.com/stretchr/testify/suite" - tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client/flags" clitestutil "github.com/line/lbm-sdk/v2/testutil/cli" @@ -67,12 +67,12 @@ func (s *IntegrationTestSuite) TestGetCmdQueryParams() { }{ { "json output", - []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, `{"mint_denom":"stake","inflation_rate_change":"0.130000000000000000","inflation_max":"1.000000000000000000","inflation_min":"1.000000000000000000","goal_bonded":"0.670000000000000000","blocks_per_year":"6311520"}`, }, { "text output", - []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=text", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=text", ostcli.OutputFlag)}, `blocks_per_year: "6311520" goal_bonded: "0.670000000000000000" inflation_max: "1.000000000000000000" @@ -106,12 +106,12 @@ func (s *IntegrationTestSuite) TestGetCmdQueryInflation() { }{ { "json output", - []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, `1.000000000000000000`, }, { "text output", - []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=text", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=text", ostcli.OutputFlag)}, `1.000000000000000000`, }, } @@ -140,12 +140,12 @@ func (s *IntegrationTestSuite) TestGetCmdQueryAnnualProvisions() { }{ { "json output", - []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, `500000000.000000000000000000`, }, { "text output", - []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=text", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=1", flags.FlagHeight), fmt.Sprintf("--%s=text", ostcli.OutputFlag)}, `500000000.000000000000000000`, }, } diff --git a/x/mint/keeper/grpc_query_test.go b/x/mint/keeper/grpc_query_test.go index 5514324f74..1c940718ce 100644 --- a/x/mint/keeper/grpc_query_test.go +++ b/x/mint/keeper/grpc_query_test.go @@ -4,8 +4,8 @@ import ( gocontext "context" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp" @@ -23,7 +23,7 @@ type MintTestSuite struct { func (suite *MintTestSuite) SetupTest() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) queryHelper := baseapp.NewQueryServerTestHelper(ctx, app.InterfaceRegistry()) types.RegisterQueryServer(queryHelper, app.MintKeeper) diff --git a/x/mint/keeper/integration_test.go b/x/mint/keeper/integration_test.go index e1517698a8..509e67ce50 100644 --- a/x/mint/keeper/integration_test.go +++ b/x/mint/keeper/integration_test.go @@ -1,7 +1,7 @@ package keeper_test import ( - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -12,7 +12,7 @@ import ( func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { app := simapp.Setup(isCheckTx) - ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + ctx := app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) app.MintKeeper.SetParams(ctx, types.DefaultParams()) app.MintKeeper.SetMinter(ctx, types.DefaultInitialMinter()) diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 4a667ba21e..d432b5d7f7 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/mint/keeper/querier.go b/x/mint/keeper/querier.go index 1765594310..c791bfeb83 100644 --- a/x/mint/keeper/querier.go +++ b/x/mint/keeper/querier.go @@ -1,7 +1,7 @@ package keeper import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/mint/keeper/querier_test.go b/x/mint/keeper/querier_test.go index d26cbdfe71..0e8be39f1e 100644 --- a/x/mint/keeper/querier_test.go +++ b/x/mint/keeper/querier_test.go @@ -11,7 +11,7 @@ import ( keep "github.com/line/lbm-sdk/v2/x/mint/keeper" "github.com/line/lbm-sdk/v2/x/mint/types" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" ) func TestNewQuerier(t *testing.T) { diff --git a/x/mint/module.go b/x/mint/module.go index 93802e847f..41c21c8e15 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -8,8 +8,8 @@ import ( "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/mint/module_test.go b/x/mint/module_test.go index 6f31efbd26..b31eff8825 100644 --- a/x/mint/module_test.go +++ b/x/mint/module_test.go @@ -3,9 +3,9 @@ package mint_test import ( "testing" + abcitypes "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abcitypes "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" authtypes "github.com/line/lbm-sdk/v2/x/auth/types" @@ -14,7 +14,7 @@ import ( func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.InitChain( abcitypes.RequestInitChain{ diff --git a/x/mint/types/genesis.pb.go b/x/mint/types/genesis.pb.go index 1486c35f22..6c204866b5 100644 --- a/x/mint/types/genesis.pb.go +++ b/x/mint/types/genesis.pb.go @@ -85,7 +85,7 @@ func init() { func init() { proto.RegisterFile("cosmos/mint/v1beta1/genesis.proto", fileDescriptor_0e215eb1d09cd648) } var fileDescriptor_0e215eb1d09cd648 = []byte{ - // 218 bytes of a gzipped FileDescriptorProto + // 225 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86, @@ -94,12 +94,13 @@ var fileDescriptor_0e215eb1d09cd648 = []byte{ 0xf1, 0xb8, 0x43, 0x0c, 0x0f, 0x2e, 0x49, 0x2c, 0x49, 0x15, 0xb2, 0xe4, 0x62, 0x03, 0x49, 0xa7, 0x16, 0x49, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x49, 0xeb, 0x61, 0xb1, 0x4c, 0xcf, 0x17, 0xac, 0xc4, 0x89, 0xe5, 0xc4, 0x3d, 0x79, 0x86, 0x20, 0xa8, 0x06, 0x90, 0xd6, 0x82, 0xc4, 0xa2, 0xc4, - 0xdc, 0x62, 0x09, 0x26, 0x3c, 0x5a, 0x03, 0xc0, 0x4a, 0x60, 0x5a, 0x21, 0x1a, 0x9c, 0x9c, 0x4f, + 0xdc, 0x62, 0x09, 0x26, 0x3c, 0x5a, 0x03, 0xc0, 0x4a, 0x60, 0x5a, 0x21, 0x1a, 0x9c, 0x1c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, - 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x33, 0x3d, 0xb3, 0x24, 0xa3, 0x34, - 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x1f, 0xea, 0x17, 0x08, 0xa5, 0x5b, 0x9c, 0x92, 0xad, 0x5f, 0x01, - 0xf1, 0x58, 0x49, 0x65, 0x41, 0x6a, 0x71, 0x12, 0x1b, 0xd8, 0x4b, 0xc6, 0x80, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xbb, 0xc1, 0x11, 0x51, 0x42, 0x01, 0x00, 0x00, + 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x3d, 0x3d, 0xb3, 0x24, 0xa3, 0x34, + 0x49, 0x2f, 0x39, 0x3f, 0x57, 0x3f, 0x27, 0x33, 0x2f, 0x55, 0x3f, 0x27, 0x29, 0x57, 0xb7, 0x38, + 0x25, 0x5b, 0xbf, 0xcc, 0x48, 0xbf, 0x02, 0xe2, 0xad, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, + 0xb0, 0x87, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0x3b, 0xf1, 0xab, 0xc1, 0x40, 0x01, 0x00, + 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/mint.pb.go b/x/mint/types/mint.pb.go index b3a83d457c..348418fdc7 100644 --- a/x/mint/types/mint.pb.go +++ b/x/mint/types/mint.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" io "io" math "math" math_bits "math/bits" @@ -27,9 +27,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // Minter represents the minting state. type Minter struct { // current annual inflation rate - Inflation github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation"` + Inflation github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation"` // current annual expected provisions - AnnualProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=annual_provisions,json=annualProvisions,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"annual_provisions" yaml:"annual_provisions"` + AnnualProvisions github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,2,opt,name=annual_provisions,json=annualProvisions,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"annual_provisions" yaml:"annual_provisions"` } func (m *Minter) Reset() { *m = Minter{} } @@ -70,13 +70,13 @@ type Params struct { // type of coin to mint MintDenom string `protobuf:"bytes,1,opt,name=mint_denom,json=mintDenom,proto3" json:"mint_denom,omitempty"` // maximum annual change in inflation rate - InflationRateChange github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=inflation_rate_change,json=inflationRateChange,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation_rate_change" yaml:"inflation_rate_change"` + InflationRateChange github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,2,opt,name=inflation_rate_change,json=inflationRateChange,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation_rate_change" yaml:"inflation_rate_change"` // maximum inflation rate - InflationMax github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=inflation_max,json=inflationMax,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation_max" yaml:"inflation_max"` + InflationMax github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,3,opt,name=inflation_max,json=inflationMax,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation_max" yaml:"inflation_max"` // minimum inflation rate - InflationMin github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=inflation_min,json=inflationMin,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation_min" yaml:"inflation_min"` + InflationMin github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,4,opt,name=inflation_min,json=inflationMin,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation_min" yaml:"inflation_min"` // goal of percent bonded atoms - GoalBonded github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=goal_bonded,json=goalBonded,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"goal_bonded" yaml:"goal_bonded"` + GoalBonded github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,5,opt,name=goal_bonded,json=goalBonded,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"goal_bonded" yaml:"goal_bonded"` // expected blocks per year BlocksPerYear uint64 `protobuf:"varint,6,opt,name=blocks_per_year,json=blocksPerYear,proto3" json:"blocks_per_year,omitempty" yaml:"blocks_per_year"` } @@ -135,35 +135,35 @@ func init() { func init() { proto.RegisterFile("cosmos/mint/v1beta1/mint.proto", fileDescriptor_2df116d183c1e223) } var fileDescriptor_2df116d183c1e223 = []byte{ - // 437 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xc1, 0x6e, 0xd3, 0x30, - 0x1c, 0xc6, 0x63, 0x28, 0x95, 0x6a, 0x98, 0x00, 0x6f, 0xa0, 0x68, 0x82, 0x64, 0xca, 0x01, 0x8d, - 0x03, 0x89, 0x26, 0x6e, 0x3b, 0x66, 0x15, 0x07, 0xc4, 0x50, 0xe5, 0x1b, 0x5c, 0xa2, 0x7f, 0x52, - 0x93, 0x59, 0x8d, 0xed, 0xca, 0xf6, 0x46, 0x7b, 0xe5, 0x09, 0x38, 0x72, 0xe4, 0x2d, 0x78, 0x85, - 0xdd, 0xd8, 0x11, 0x71, 0xa8, 0x50, 0xfb, 0x06, 0x7b, 0x02, 0x14, 0xbb, 0x6a, 0xa1, 0x20, 0xa4, - 0x4a, 0x9c, 0x92, 0xef, 0xfb, 0xff, 0xf3, 0xfd, 0xbe, 0x58, 0x32, 0x8e, 0x2a, 0x65, 0x84, 0x32, - 0x99, 0xe0, 0xd2, 0x66, 0x17, 0x47, 0x25, 0xb3, 0x70, 0xe4, 0x44, 0x3a, 0xd6, 0xca, 0x2a, 0xb2, - 0xeb, 0xe7, 0xa9, 0xb3, 0x96, 0xf3, 0xfd, 0xbd, 0x5a, 0xd5, 0xca, 0xcd, 0xb3, 0xf6, 0xcd, 0xaf, - 0x26, 0x5f, 0x11, 0xee, 0x9e, 0x72, 0x69, 0x99, 0x26, 0xaf, 0x70, 0x8f, 0xcb, 0x77, 0x0d, 0x58, - 0xae, 0x64, 0x88, 0x0e, 0xd0, 0x61, 0x2f, 0x4f, 0x2f, 0x67, 0x71, 0xf0, 0x7d, 0x16, 0x3f, 0xa9, - 0xb9, 0x3d, 0x3b, 0x2f, 0xd3, 0x4a, 0x89, 0x6c, 0xc9, 0xf6, 0x8f, 0x67, 0x66, 0x38, 0xca, 0xec, - 0x74, 0xcc, 0x4c, 0xda, 0x67, 0x15, 0x5d, 0x07, 0x90, 0xf7, 0xf8, 0x3e, 0x48, 0x79, 0x0e, 0x4d, - 0x31, 0xd6, 0xea, 0x82, 0x1b, 0xae, 0xa4, 0x09, 0x6f, 0xb8, 0xd4, 0x97, 0xdb, 0xa5, 0x5e, 0xcf, - 0xe2, 0x70, 0x0a, 0xa2, 0x39, 0x4e, 0xfe, 0x08, 0x4c, 0xe8, 0x3d, 0xef, 0x0d, 0xd6, 0xd6, 0x97, - 0x0e, 0xee, 0x0e, 0x40, 0x83, 0x30, 0xe4, 0x31, 0xc6, 0xed, 0x11, 0x14, 0x43, 0x26, 0x95, 0xf0, - 0xbf, 0x44, 0x7b, 0xad, 0xd3, 0x6f, 0x0d, 0xf2, 0x01, 0xe1, 0x07, 0xab, 0xc2, 0x85, 0x06, 0xcb, - 0x8a, 0xea, 0x0c, 0x64, 0xcd, 0x96, 0x3d, 0x5f, 0x6f, 0xdd, 0xf3, 0x91, 0xef, 0xf9, 0xd7, 0xd0, - 0x84, 0xee, 0xae, 0x7c, 0x0a, 0x96, 0x9d, 0x38, 0x97, 0x8c, 0xf0, 0xce, 0x7a, 0x5d, 0xc0, 0x24, - 0xbc, 0xe9, 0xd8, 0x2f, 0xb6, 0x66, 0xef, 0x6d, 0xb2, 0x05, 0x4c, 0x12, 0x7a, 0x67, 0xa5, 0x4f, - 0x61, 0xb2, 0x01, 0xe3, 0x32, 0xec, 0xfc, 0x37, 0x18, 0x97, 0xbf, 0xc1, 0xb8, 0x24, 0x0c, 0xdf, - 0xae, 0x15, 0x34, 0x45, 0xa9, 0xe4, 0x90, 0x0d, 0xc3, 0x5b, 0x0e, 0xd5, 0xdf, 0x1a, 0x45, 0x3c, - 0xea, 0x97, 0xa8, 0x84, 0xe2, 0x56, 0xe5, 0x4e, 0x90, 0x1c, 0xdf, 0x2d, 0x1b, 0x55, 0x8d, 0x4c, - 0x31, 0x66, 0xba, 0x98, 0x32, 0xd0, 0x61, 0xf7, 0x00, 0x1d, 0x76, 0xf2, 0xfd, 0xeb, 0x59, 0xfc, - 0xd0, 0x7f, 0xbc, 0xb1, 0x90, 0xd0, 0x1d, 0xef, 0x0c, 0x98, 0x7e, 0xc3, 0x40, 0x1f, 0x77, 0x3e, - 0x7d, 0x8e, 0x83, 0xfc, 0xe4, 0x72, 0x1e, 0xa1, 0xab, 0x79, 0x84, 0x7e, 0xcc, 0x23, 0xf4, 0x71, - 0x11, 0x05, 0x57, 0x8b, 0x28, 0xf8, 0xb6, 0x88, 0x82, 0xb7, 0x4f, 0xff, 0xd9, 0x76, 0xe2, 0x2f, - 0xa2, 0x2b, 0x5d, 0x76, 0xdd, 0xbd, 0x7a, 0xfe, 0x33, 0x00, 0x00, 0xff, 0xff, 0x34, 0x52, 0xcf, - 0x87, 0xa4, 0x03, 0x00, 0x00, + // 442 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x93, 0xc1, 0x8a, 0x13, 0x31, + 0x1c, 0xc6, 0x27, 0x5a, 0x0b, 0x8d, 0x2e, 0x6a, 0x76, 0x95, 0x61, 0xd1, 0x99, 0x65, 0x10, 0xdc, + 0x83, 0x76, 0x58, 0xbd, 0xed, 0xcd, 0xb1, 0x07, 0x11, 0x17, 0x4a, 0x6e, 0x7a, 0x19, 0xfe, 0x33, + 0x8d, 0xb3, 0x61, 0x27, 0x49, 0x49, 0xd2, 0xd2, 0xde, 0x7c, 0x04, 0x8f, 0x1e, 0x7d, 0x03, 0x5f, + 0x63, 0xc1, 0xcb, 0x1e, 0xc5, 0x43, 0x91, 0xf6, 0x0d, 0xf6, 0x09, 0x64, 0x92, 0xa5, 0xd5, 0x2a, + 0xc2, 0x80, 0xb7, 0x7c, 0xdf, 0xff, 0x9f, 0xef, 0xf7, 0xe5, 0x10, 0x1c, 0x95, 0xca, 0x08, 0x65, + 0x52, 0xc1, 0xa5, 0x4d, 0xa7, 0x47, 0x05, 0xb3, 0x70, 0xe4, 0x44, 0x7f, 0xac, 0x95, 0x55, 0x64, + 0xd7, 0xcf, 0xfb, 0xce, 0xba, 0x9a, 0xef, 0xef, 0x55, 0xaa, 0x52, 0x6e, 0x9e, 0x36, 0x27, 0xbf, + 0x9a, 0x7c, 0x45, 0xb8, 0x7b, 0xc2, 0xa5, 0x65, 0x9a, 0xbc, 0xc6, 0x3d, 0x2e, 0xdf, 0xd7, 0x60, + 0xb9, 0x92, 0x21, 0x3a, 0x40, 0x87, 0xbd, 0xec, 0xc9, 0xf9, 0x22, 0x0e, 0xbe, 0x2f, 0xe2, 0x47, + 0x15, 0xb7, 0xa7, 0x93, 0xa2, 0x5f, 0x2a, 0x91, 0xd6, 0x5c, 0xb2, 0xb4, 0x2e, 0xc4, 0x53, 0x33, + 0x3a, 0x4b, 0xa7, 0xcf, 0x52, 0x3b, 0x1f, 0x33, 0xd3, 0x1f, 0xb0, 0x92, 0x6e, 0xae, 0x93, 0x09, + 0xbe, 0x0b, 0x52, 0x4e, 0xa0, 0xce, 0xc7, 0x5a, 0x4d, 0xb9, 0xe1, 0x4a, 0x9a, 0xf0, 0x9a, 0xcb, + 0x7c, 0xd5, 0x26, 0xf3, 0x72, 0x11, 0x87, 0x73, 0x10, 0xf5, 0x71, 0xf2, 0x47, 0x5c, 0x42, 0xef, + 0x78, 0x6f, 0xb8, 0xb1, 0xbe, 0x74, 0x70, 0x77, 0x08, 0x1a, 0x84, 0x21, 0x0f, 0x31, 0x6e, 0x9e, + 0x9f, 0x8f, 0x98, 0x54, 0xc2, 0x3f, 0x87, 0xf6, 0x1a, 0x67, 0xd0, 0x18, 0xe4, 0x03, 0xc2, 0xf7, + 0xd6, 0x75, 0x73, 0x0d, 0x96, 0xe5, 0xe5, 0x29, 0xc8, 0x8a, 0x5d, 0xb5, 0x7c, 0xd3, 0xb2, 0xe5, + 0x03, 0xdf, 0xf2, 0xaf, 0x91, 0x09, 0xdd, 0x5d, 0xfb, 0x14, 0x2c, 0x7b, 0xe9, 0x5c, 0xc2, 0xf1, + 0xce, 0x66, 0x5d, 0xc0, 0x2c, 0xbc, 0xee, 0xc8, 0x83, 0x96, 0xe4, 0xbd, 0x6d, 0xb2, 0x80, 0x59, + 0x42, 0x6f, 0xad, 0xf5, 0x09, 0xcc, 0xb6, 0x50, 0x5c, 0x86, 0x9d, 0xff, 0x84, 0xe2, 0xf2, 0x37, + 0x14, 0x97, 0xa4, 0xc4, 0x37, 0x2b, 0x05, 0x75, 0x5e, 0x28, 0x39, 0x62, 0xa3, 0xf0, 0x86, 0x03, + 0x65, 0x2d, 0x41, 0xc4, 0x83, 0x7e, 0x09, 0x4a, 0x28, 0x6e, 0x54, 0xe6, 0x04, 0xc9, 0xf0, 0xed, + 0xa2, 0x56, 0xe5, 0x99, 0xc9, 0xc7, 0x4c, 0xe7, 0x73, 0x06, 0x3a, 0xec, 0x1e, 0xa0, 0xc3, 0x4e, + 0xb6, 0x7f, 0xb9, 0x88, 0xef, 0xfb, 0xcb, 0x5b, 0x0b, 0x09, 0xdd, 0xf1, 0xce, 0x90, 0xe9, 0xb7, + 0x0c, 0xf4, 0x71, 0xe7, 0xd3, 0xe7, 0x38, 0xc8, 0x5e, 0x9c, 0x2f, 0x23, 0x74, 0xb1, 0x8c, 0xd0, + 0x8f, 0x65, 0x84, 0x3e, 0xae, 0xa2, 0xe0, 0x62, 0x15, 0x05, 0xdf, 0x56, 0x51, 0xf0, 0xee, 0xf1, + 0x3f, 0xba, 0xce, 0xfc, 0xd7, 0x73, 0x95, 0x8b, 0xae, 0xfb, 0x49, 0xcf, 0x7f, 0x06, 0x00, 0x00, + 0xff, 0xff, 0x8f, 0x30, 0xf6, 0x14, 0x96, 0x03, 0x00, 0x00, } func (m *Minter) Marshal() (dAtA []byte, err error) { diff --git a/x/mint/types/query.pb.go b/x/mint/types/query.pb.go index 5fca5cf89f..4a94e76a95 100644 --- a/x/mint/types/query.pb.go +++ b/x/mint/types/query.pb.go @@ -9,7 +9,7 @@ import ( _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" _ "google.golang.org/genproto/googleapis/api/annotations" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -154,7 +154,7 @@ var xxx_messageInfo_QueryInflationRequest proto.InternalMessageInfo // method. type QueryInflationResponse struct { // inflation is the current minting inflation value. - Inflation github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation"` + Inflation github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,1,opt,name=inflation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"inflation"` } func (m *QueryInflationResponse) Reset() { *m = QueryInflationResponse{} } @@ -232,7 +232,7 @@ var xxx_messageInfo_QueryAnnualProvisionsRequest proto.InternalMessageInfo // Query/AnnualProvisions RPC method. type QueryAnnualProvisionsResponse struct { // annual_provisions is the current minting annual provisions value. - AnnualProvisions github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=annual_provisions,json=annualProvisions,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"annual_provisions"` + AnnualProvisions github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,1,opt,name=annual_provisions,json=annualProvisions,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"annual_provisions"` } func (m *QueryAnnualProvisionsResponse) Reset() { *m = QueryAnnualProvisionsResponse{} } @@ -280,35 +280,36 @@ func init() { func init() { proto.RegisterFile("cosmos/mint/v1beta1/query.proto", fileDescriptor_d0a1e393be338aea) } var fileDescriptor_d0a1e393be338aea = []byte{ - // 446 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xce, 0x2f, 0xce, - 0xcd, 0x2f, 0xd6, 0xcf, 0xcd, 0xcc, 0x2b, 0xd1, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, - 0x2f, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x86, 0x28, 0xd0, - 0x03, 0x29, 0xd0, 0x83, 0x2a, 0x90, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xeb, 0x83, 0x58, - 0x10, 0xa5, 0x52, 0x32, 0xe9, 0xf9, 0xf9, 0xe9, 0x39, 0xa9, 0xfa, 0x89, 0x05, 0x99, 0xfa, 0x89, - 0x79, 0x79, 0xf9, 0x25, 0x89, 0x25, 0x99, 0xf9, 0x79, 0xc5, 0x50, 0x59, 0x39, 0x6c, 0x36, 0x81, - 0x4d, 0x05, 0xcb, 0x2b, 0x89, 0x70, 0x09, 0x05, 0x82, 0xec, 0x0d, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, - 0x0e, 0x4a, 0x2d, 0x2c, 0x4d, 0x2d, 0x2e, 0x51, 0x0a, 0xe0, 0x12, 0x46, 0x11, 0x2d, 0x2e, 0xc8, - 0xcf, 0x2b, 0x4e, 0x15, 0xb2, 0xe4, 0x62, 0x2b, 0x00, 0x8b, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, - 0x1b, 0x49, 0xeb, 0x61, 0x71, 0xa6, 0x1e, 0x44, 0x93, 0x13, 0xcb, 0x89, 0x7b, 0xf2, 0x0c, 0x41, - 0x50, 0x0d, 0x4a, 0xe2, 0x5c, 0xa2, 0x60, 0x13, 0x3d, 0xf3, 0xd2, 0x72, 0xc0, 0x0e, 0x84, 0x59, - 0x95, 0xc6, 0x25, 0x86, 0x2e, 0x01, 0xb5, 0xcd, 0x87, 0x8b, 0x33, 0x13, 0x26, 0x08, 0xb6, 0x90, - 0xc7, 0x49, 0x0f, 0x64, 0xe6, 0xad, 0x7b, 0xf2, 0x6a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, - 0xc9, 0xf9, 0xb9, 0xfa, 0x50, 0x0f, 0x42, 0x28, 0xdd, 0xe2, 0x94, 0x6c, 0xfd, 0x92, 0xca, 0x82, - 0xd4, 0x62, 0x3d, 0x97, 0xd4, 0xe4, 0x20, 0x84, 0x01, 0x4a, 0x72, 0x5c, 0x32, 0x60, 0x7b, 0x1c, - 0xf3, 0xf2, 0x4a, 0x13, 0x73, 0x02, 0x8a, 0xf2, 0xcb, 0x32, 0x8b, 0x41, 0xe1, 0x04, 0x73, 0x47, - 0x0d, 0x97, 0x2c, 0x0e, 0x79, 0xa8, 0x73, 0xa2, 0xb9, 0x04, 0x13, 0xc1, 0x72, 0xf1, 0x05, 0x70, - 0x49, 0x32, 0x9d, 0x25, 0x90, 0x88, 0x66, 0x89, 0xd1, 0x51, 0x66, 0x2e, 0x56, 0xb0, 0xf5, 0x42, - 0x0d, 0x8c, 0x5c, 0x6c, 0x90, 0x10, 0x14, 0x52, 0xc7, 0x1a, 0xbc, 0x98, 0xd1, 0x25, 0xa5, 0x41, - 0x58, 0x21, 0xc4, 0x13, 0x4a, 0xca, 0x4d, 0x97, 0x9f, 0x4c, 0x66, 0x92, 0x15, 0x92, 0xd6, 0xc7, - 0x96, 0x2e, 0x20, 0x71, 0x25, 0xd4, 0xc3, 0xc8, 0xc5, 0x09, 0x8f, 0x0e, 0x21, 0x2d, 0xdc, 0x86, - 0xa3, 0x47, 0xa6, 0x94, 0x36, 0x51, 0x6a, 0xa1, 0x6e, 0x51, 0x03, 0xbb, 0x45, 0x41, 0x48, 0x0e, - 0xab, 0x5b, 0xe0, 0x31, 0x27, 0xb4, 0x92, 0x91, 0x4b, 0x00, 0x3d, 0x56, 0x84, 0x0c, 0x71, 0xdb, - 0x84, 0x23, 0x86, 0xa5, 0x8c, 0x48, 0xd1, 0x02, 0x75, 0xa3, 0x1e, 0xd8, 0x8d, 0x1a, 0x42, 0x6a, - 0x58, 0xdd, 0x88, 0x91, 0x1e, 0x9c, 0x9c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, - 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, - 0x21, 0x4a, 0x13, 0x6f, 0xda, 0xa8, 0x80, 0x18, 0x0c, 0x4e, 0x22, 0x49, 0x6c, 0xe0, 0xac, 0x69, - 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0xc7, 0xed, 0x9c, 0x7b, 0x26, 0x04, 0x00, 0x00, + // 450 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0xbb, 0x8e, 0xd3, 0x40, + 0x14, 0xf5, 0xf0, 0x88, 0xb4, 0x03, 0xc5, 0x32, 0xbb, 0x3c, 0xe4, 0xdd, 0x9d, 0xac, 0x0c, 0x4a, + 0x22, 0x1e, 0x33, 0x8a, 0xa9, 0x28, 0x13, 0xd1, 0x40, 0x15, 0xd2, 0x41, 0x83, 0xc6, 0xc9, 0x60, + 0x2c, 0xec, 0x19, 0xc7, 0x33, 0x8e, 0x08, 0x15, 0xa2, 0xa6, 0x40, 0xe2, 0x2b, 0xf8, 0x10, 0xa4, + 0x94, 0x91, 0x68, 0x10, 0x45, 0x84, 0x12, 0x3e, 0x04, 0x79, 0xec, 0x04, 0xe1, 0xd8, 0x3c, 0xb6, + 0xb3, 0xee, 0x39, 0xf7, 0x9e, 0xe3, 0x7b, 0xee, 0xc0, 0xe6, 0x48, 0xaa, 0x48, 0x2a, 0x1a, 0x05, + 0x42, 0xd3, 0x69, 0xd7, 0xe3, 0x9a, 0x75, 0xe9, 0x24, 0xe5, 0xc9, 0x8c, 0xc4, 0x89, 0xd4, 0x12, + 0x1d, 0xe4, 0x04, 0x92, 0x11, 0x48, 0x41, 0xb0, 0x0f, 0x7d, 0xe9, 0x4b, 0x83, 0xd3, 0xec, 0x2b, + 0xa7, 0xda, 0xc7, 0xbe, 0x94, 0x7e, 0xc8, 0x29, 0x8b, 0x03, 0xca, 0x84, 0x90, 0x9a, 0xe9, 0x40, + 0x0a, 0x55, 0xa0, 0xb8, 0x4a, 0xc9, 0x4c, 0x35, 0xb8, 0x73, 0x08, 0xd1, 0x93, 0x4c, 0x77, 0xc0, + 0x12, 0x16, 0xa9, 0x21, 0x9f, 0xa4, 0x5c, 0x69, 0x67, 0x00, 0x0f, 0x7e, 0xab, 0xaa, 0x58, 0x0a, + 0xc5, 0xd1, 0x03, 0xd8, 0x88, 0x4d, 0xe5, 0x06, 0x38, 0x05, 0x9d, 0x4b, 0xee, 0x11, 0xa9, 0xb0, + 0x49, 0xf2, 0xa6, 0xfe, 0x85, 0xf9, 0xb2, 0x69, 0x0d, 0x8b, 0x06, 0xe7, 0x3a, 0xbc, 0x6a, 0x26, + 0x3e, 0x12, 0x2f, 0x42, 0x63, 0x70, 0x23, 0x35, 0x86, 0xd7, 0xca, 0x40, 0xa1, 0xf6, 0x18, 0xee, + 0x05, 0x9b, 0xa2, 0x11, 0xbc, 0xdc, 0xbf, 0x9b, 0xcd, 0xfc, 0xb6, 0x6c, 0xde, 0xf2, 0x03, 0xfd, + 0x32, 0xf5, 0xc8, 0x48, 0x46, 0x34, 0x0c, 0x04, 0xa7, 0xa1, 0x17, 0xdd, 0x53, 0xe3, 0x57, 0x74, + 0xea, 0x52, 0x3d, 0x8b, 0xb9, 0x22, 0x0f, 0xf9, 0x68, 0xf8, 0xab, 0xdd, 0xc1, 0xf0, 0xd8, 0xa8, + 0xf4, 0x84, 0x48, 0x59, 0x38, 0x48, 0xe4, 0x34, 0x50, 0xd9, 0x96, 0x36, 0x2e, 0xde, 0xc0, 0x93, + 0x1a, 0xbc, 0x30, 0xf3, 0x14, 0x5e, 0x61, 0x06, 0x7b, 0x1e, 0x6f, 0xc1, 0x33, 0x99, 0xda, 0x67, + 0x25, 0x09, 0xf7, 0xf3, 0x79, 0x78, 0xd1, 0x88, 0xa3, 0xb7, 0x00, 0x36, 0xf2, 0xed, 0xa1, 0x76, + 0xe5, 0x6a, 0x77, 0xa3, 0xb2, 0x3b, 0x7f, 0x27, 0xe6, 0xbf, 0xe0, 0xdc, 0x7c, 0xf7, 0xe5, 0xc7, + 0xc7, 0x73, 0x27, 0xe8, 0x88, 0x56, 0xdd, 0x44, 0x9e, 0x13, 0x7a, 0x0f, 0xe0, 0xde, 0x36, 0x0a, + 0x74, 0xbb, 0x7e, 0x78, 0x39, 0x48, 0xfb, 0xce, 0x3f, 0x71, 0x0b, 0x2f, 0x2d, 0xe3, 0xe5, 0x14, + 0xe1, 0x4a, 0x2f, 0xdb, 0xdc, 0xd0, 0x27, 0x00, 0xf7, 0xcb, 0x99, 0xa0, 0x6e, 0xbd, 0x52, 0x4d, + 0xbe, 0xb6, 0xfb, 0x3f, 0x2d, 0x85, 0x47, 0x62, 0x3c, 0x76, 0x50, 0xab, 0xd2, 0xe3, 0xce, 0x35, + 0xf4, 0x7b, 0xf3, 0x15, 0x06, 0x8b, 0x15, 0x06, 0xdf, 0x57, 0x18, 0x7c, 0x58, 0x63, 0x6b, 0xb1, + 0xc6, 0xd6, 0xd7, 0x35, 0xb6, 0x9e, 0xb5, 0xff, 0x70, 0x19, 0xaf, 0xf3, 0xb1, 0xe6, 0x40, 0xbc, + 0x86, 0x79, 0x94, 0xf7, 0x7f, 0x06, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x27, 0x15, 0x5c, 0x20, 0x04, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/params/client/cli/cli_test.go b/x/params/client/cli/cli_test.go index c26c86b41d..7013ff7cf0 100644 --- a/x/params/client/cli/cli_test.go +++ b/x/params/client/cli/cli_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" + ostcli "github.com/line/ostracon/libs/cli" "github.com/stretchr/testify/suite" - tmcli "github.com/tendermint/tendermint/libs/cli" clitestutil "github.com/line/lbm-sdk/v2/testutil/cli" "github.com/line/lbm-sdk/v2/testutil/network" @@ -52,7 +52,7 @@ func (s *IntegrationTestSuite) TestNewQuerySubspaceParamsCmd() { "json output", []string{ "staking", "MaxValidators", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, `{"subspace":"staking","key":"MaxValidators","value":"100"}`, }, @@ -60,7 +60,7 @@ func (s *IntegrationTestSuite) TestNewQuerySubspaceParamsCmd() { "text output", []string{ "staking", "MaxValidators", - fmt.Sprintf("--%s=text", tmcli.OutputFlag), + fmt.Sprintf("--%s=text", ostcli.OutputFlag), }, `key: MaxValidators subspace: staking diff --git a/x/params/keeper/common_test.go b/x/params/keeper/common_test.go index 6fd4eb914c..d34dffdf19 100644 --- a/x/params/keeper/common_test.go +++ b/x/params/keeper/common_test.go @@ -1,9 +1,9 @@ package keeper_test import ( - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/line/lbm-sdk/v2/simapp" @@ -47,6 +47,6 @@ func defaultContext(key sdk.StoreKey, tkey sdk.StoreKey) sdk.Context { if err != nil { panic(err) } - ctx := sdk.NewContext(cms, tmproto.Header{}, false, log.NewNopLogger()) + ctx := sdk.NewContext(cms, ostproto.Header{}, false, log.NewNopLogger()) return ctx } diff --git a/x/params/keeper/consensus_params.go b/x/params/keeper/consensus_params.go index 5b5cf901be..bbf781097b 100644 --- a/x/params/keeper/consensus_params.go +++ b/x/params/keeper/consensus_params.go @@ -1,8 +1,8 @@ package keeper import ( - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/x/params/types" @@ -19,10 +19,10 @@ func ConsensusParamsKeyTable() types.KeyTable { baseapp.ParamStoreKeyBlockParams, abci.BlockParams{}, baseapp.ValidateBlockParams, ), types.NewParamSetPair( - baseapp.ParamStoreKeyEvidenceParams, tmproto.EvidenceParams{}, baseapp.ValidateEvidenceParams, + baseapp.ParamStoreKeyEvidenceParams, ostproto.EvidenceParams{}, baseapp.ValidateEvidenceParams, ), types.NewParamSetPair( - baseapp.ParamStoreKeyValidatorParams, tmproto.ValidatorParams{}, baseapp.ValidateValidatorParams, + baseapp.ParamStoreKeyValidatorParams, ostproto.ValidatorParams{}, baseapp.ValidateValidatorParams, ), ) } diff --git a/x/params/keeper/keeper.go b/x/params/keeper/keeper.go index 8aa6207957..48d4f50cc6 100644 --- a/x/params/keeper/keeper.go +++ b/x/params/keeper/keeper.go @@ -1,7 +1,7 @@ package keeper import ( - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/params/keeper/keeper_test.go b/x/params/keeper/keeper_test.go index 672ff44563..952afbca06 100644 --- a/x/params/keeper/keeper_test.go +++ b/x/params/keeper/keeper_test.go @@ -4,9 +4,9 @@ import ( "reflect" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp" @@ -40,7 +40,7 @@ func TestKeeperTestSuite(t *testing.T) { // returns context and app func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { app := simapp.Setup(isCheckTx) - ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + ctx := app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) return app, ctx } diff --git a/x/params/keeper/querier.go b/x/params/keeper/querier.go index 1d45d0615d..afe3b64efb 100644 --- a/x/params/keeper/querier.go +++ b/x/params/keeper/querier.go @@ -1,7 +1,7 @@ package keeper import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/params/module.go b/x/params/module.go index 42249cb20d..0f477f18b9 100644 --- a/x/params/module.go +++ b/x/params/module.go @@ -8,8 +8,8 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/gorilla/mux" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/params/proposal_handler_test.go b/x/params/proposal_handler_test.go index d4a6c10183..16caefbfab 100644 --- a/x/params/proposal_handler_test.go +++ b/x/params/proposal_handler_test.go @@ -5,10 +5,10 @@ import ( "github.com/line/lbm-sdk/v2/simapp" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/store" @@ -78,7 +78,7 @@ func newTestInput(t *testing.T) testInput { encCfg := simapp.MakeTestEncodingConfig() keeper := keeper.NewKeeper(encCfg.Marshaler, encCfg.Amino, keyParams, tKeyParams) - ctx := sdk.NewContext(cms, tmproto.Header{}, false, log.NewNopLogger()) + ctx := sdk.NewContext(cms, ostproto.Header{}, false, log.NewNopLogger()) return testInput{ctx, cdc, keeper} } diff --git a/x/params/simulation/operations_test.go b/x/params/simulation/operations_test.go index 56d5458283..5a3c39df38 100644 --- a/x/params/simulation/operations_test.go +++ b/x/params/simulation/operations_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sdk "github.com/line/lbm-sdk/v2/types" simtypes "github.com/line/lbm-sdk/v2/types/simulation" @@ -43,7 +43,7 @@ func TestSimulateParamChangeProposalContent(t *testing.T) { s := rand.NewSource(1) r := rand.New(s) - ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil) + ctx := sdk.NewContext(nil, ostproto.Header{}, true, nil) accounts := simtypes.RandomAccounts(r, 3) paramChangePool := []simtypes.ParamChange{MockParamChange{1}, MockParamChange{2}, MockParamChange{3}} diff --git a/x/params/simulation/proposals_test.go b/x/params/simulation/proposals_test.go index 887c01672f..b7a49429e3 100644 --- a/x/params/simulation/proposals_test.go +++ b/x/params/simulation/proposals_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" simappparams "github.com/line/lbm-sdk/v2/simapp/params" sdk "github.com/line/lbm-sdk/v2/types" @@ -19,7 +19,7 @@ func TestProposalContents(t *testing.T) { s := rand.NewSource(1) r := rand.New(s) - ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil) + ctx := sdk.NewContext(nil, ostproto.Header{}, true, nil) accounts := simtypes.RandomAccounts(r, 3) paramChangePool := []simtypes.ParamChange{MockParamChange{1}, MockParamChange{2}, MockParamChange{3}} diff --git a/x/params/types/proposal/params.pb.go b/x/params/types/proposal/params.pb.go index 1681b3960e..a8e4af10a3 100644 --- a/x/params/types/proposal/params.pb.go +++ b/x/params/types/proposal/params.pb.go @@ -133,27 +133,27 @@ func init() { } var fileDescriptor_53a944ecb0483e4c = []byte{ - // 307 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4a, 0xce, 0x2f, 0xce, - 0xcd, 0x2f, 0xd6, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, - 0x34, 0x84, 0x72, 0xf5, 0x0a, 0x8a, 0xf2, 0x4b, 0xf2, 0x85, 0x44, 0x21, 0x6a, 0xf4, 0xa0, 0x82, - 0x50, 0x35, 0x52, 0x22, 0xe9, 0xf9, 0xe9, 0xf9, 0x60, 0x15, 0xfa, 0x20, 0x16, 0x44, 0xb1, 0xd2, - 0x7c, 0x46, 0x2e, 0xf1, 0x00, 0x90, 0xc2, 0xd4, 0x92, 0xd4, 0x22, 0xe7, 0x8c, 0xc4, 0xbc, 0xf4, - 0xd4, 0x80, 0xa2, 0xfc, 0x82, 0xfc, 0xe2, 0xc4, 0x1c, 0x21, 0x11, 0x2e, 0xd6, 0x92, 0xcc, 0x92, - 0x9c, 0x54, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xce, 0x20, 0x08, 0x47, 0x48, 0x81, 0x8b, 0x3b, 0x25, - 0xb5, 0x38, 0xb9, 0x28, 0xb3, 0xa0, 0x24, 0x33, 0x3f, 0x4f, 0x82, 0x09, 0x2c, 0x87, 0x2c, 0x24, - 0xe4, 0xc4, 0xc5, 0x9e, 0x0c, 0x36, 0xa9, 0x58, 0x82, 0x59, 0x81, 0x59, 0x83, 0xdb, 0x48, 0x49, - 0x0f, 0xab, 0x93, 0xf4, 0xc0, 0x16, 0x43, 0x2c, 0x75, 0x62, 0x39, 0x71, 0x4f, 0x9e, 0x21, 0x08, - 0xa6, 0xd1, 0x8a, 0xa3, 0x63, 0x81, 0x3c, 0xc3, 0x8c, 0x05, 0xf2, 0x0c, 0x4a, 0xe1, 0x5c, 0xdc, - 0x48, 0xea, 0x84, 0xa4, 0xb8, 0x38, 0x8a, 0x4b, 0x93, 0x8a, 0x0b, 0x12, 0x93, 0x61, 0xee, 0x82, - 0xf3, 0x85, 0x04, 0xb8, 0x98, 0xb3, 0x53, 0x2b, 0xa1, 0x4e, 0x02, 0x31, 0x41, 0x5e, 0x28, 0x4b, - 0xcc, 0x29, 0x4d, 0x95, 0x60, 0x86, 0x78, 0x01, 0xcc, 0xb1, 0x62, 0x01, 0x19, 0xec, 0x14, 0xb4, - 0xe2, 0x91, 0x1c, 0xe3, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, - 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x99, 0xa4, - 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0x43, 0x03, 0x1d, 0x42, 0xe9, 0x16, - 0xa7, 0x64, 0xeb, 0x57, 0xc0, 0x62, 0xa0, 0xa4, 0xb2, 0x20, 0xb5, 0x58, 0xbf, 0x00, 0x1a, 0x64, - 0x49, 0x6c, 0xe0, 0x50, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0xb7, 0x26, 0x09, 0x3d, 0xa8, - 0x01, 0x00, 0x00, + // 311 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xb1, 0x4e, 0xf3, 0x30, + 0x14, 0x85, 0xed, 0x3f, 0xfd, 0xa1, 0xb8, 0x0b, 0xb2, 0x8a, 0x88, 0x3a, 0xb8, 0x55, 0xa6, 0x2e, + 0xc4, 0x6a, 0xd9, 0x3a, 0x86, 0x17, 0x88, 0xba, 0x20, 0xb1, 0x39, 0xa9, 0x95, 0x46, 0x4d, 0x62, + 0x2b, 0x76, 0x22, 0xfa, 0x06, 0x8c, 0x8c, 0x6c, 0x74, 0xe4, 0x51, 0x3a, 0x76, 0x64, 0x42, 0x28, + 0x79, 0x11, 0x14, 0x27, 0x41, 0x1d, 0xd8, 0xee, 0xb9, 0xfe, 0x7c, 0xef, 0xb9, 0x07, 0x39, 0xa1, + 0x50, 0xa9, 0x50, 0x54, 0xb2, 0x9c, 0xa5, 0x8a, 0x96, 0x8b, 0x80, 0x6b, 0xb6, 0xe8, 0xa4, 0x2b, + 0x73, 0xa1, 0x05, 0xbe, 0x69, 0x19, 0xb7, 0x6b, 0x76, 0xcc, 0x64, 0x1c, 0x89, 0x48, 0x18, 0x82, + 0x36, 0x55, 0x0b, 0x3b, 0xef, 0x10, 0xdd, 0xfa, 0x0d, 0xc8, 0x35, 0xcf, 0x1f, 0xb6, 0x2c, 0x8b, + 0xb8, 0x9f, 0x0b, 0x29, 0x14, 0x4b, 0xf0, 0x18, 0xfd, 0xd7, 0xb1, 0x4e, 0xb8, 0x0d, 0x67, 0x70, + 0x7e, 0xb5, 0x6e, 0x05, 0x9e, 0xa1, 0xd1, 0x86, 0xab, 0x30, 0x8f, 0xa5, 0x8e, 0x45, 0x66, 0xff, + 0x33, 0x6f, 0xe7, 0x2d, 0xec, 0xa1, 0xcb, 0xd0, 0x4c, 0x52, 0xb6, 0x35, 0xb3, 0xe6, 0xa3, 0xa5, + 0xe3, 0xfe, 0x69, 0xc9, 0x35, 0x8b, 0xdb, 0xa5, 0xde, 0xe0, 0xf8, 0x35, 0x05, 0xeb, 0xfe, 0xe3, + 0x6a, 0xf8, 0x72, 0x98, 0x82, 0xb7, 0xc3, 0x14, 0x38, 0x8f, 0x68, 0x74, 0xc6, 0xe1, 0x09, 0x1a, + 0xaa, 0x22, 0x50, 0x92, 0x85, 0xbd, 0xaf, 0x5f, 0x8d, 0xaf, 0x91, 0xb5, 0xe3, 0xfb, 0xce, 0x52, + 0x53, 0x36, 0x27, 0x94, 0x2c, 0x29, 0xb8, 0x6d, 0xb5, 0x27, 0x18, 0xb1, 0x1a, 0x34, 0x83, 0x3d, + 0xff, 0xa3, 0x22, 0xf0, 0x58, 0x11, 0x78, 0xaa, 0x08, 0xfc, 0xae, 0x08, 0x7c, 0xad, 0x09, 0x38, + 0xd5, 0x04, 0x7c, 0xd6, 0x04, 0x3c, 0x2d, 0xa3, 0x58, 0x6f, 0x8b, 0xc0, 0x0d, 0x45, 0x4a, 0x93, + 0x38, 0xe3, 0x34, 0x09, 0xd2, 0x3b, 0xb5, 0xd9, 0xd1, 0x72, 0x49, 0x9f, 0xfb, 0xfc, 0xf5, 0x5e, + 0x72, 0x45, 0x65, 0x17, 0x58, 0x70, 0x61, 0x32, 0xbd, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x40, + 0xd7, 0xc9, 0xf3, 0xa6, 0x01, 0x00, 0x00, } func (this *ParameterChangeProposal) Equal(that interface{}) bool { diff --git a/x/params/types/proposal/query.pb.go b/x/params/types/proposal/query.pb.go index e0c770d70e..5e73d7e945 100644 --- a/x/params/types/proposal/query.pb.go +++ b/x/params/types/proposal/query.pb.go @@ -138,28 +138,28 @@ func init() { func init() { proto.RegisterFile("cosmos/params/v1beta1/query.proto", fileDescriptor_2b32979c1792ccc4) } var fileDescriptor_2b32979c1792ccc4 = []byte{ - // 321 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x31, 0x4b, 0x3b, 0x31, - 0x14, 0xc0, 0x2f, 0xfd, 0xff, 0x5b, 0x34, 0x2e, 0x12, 0x15, 0xca, 0xa1, 0x57, 0x3d, 0x10, 0x54, - 0x30, 0xa1, 0xd5, 0xd9, 0xa1, 0xee, 0xa2, 0x05, 0x17, 0xb7, 0x5c, 0x0d, 0x69, 0x69, 0x7b, 0x2f, - 0xbd, 0x97, 0x13, 0xbb, 0x3a, 0x38, 0x17, 0xfc, 0x52, 0x1d, 0x0b, 0x2e, 0x4e, 0x22, 0xad, 0x1f, - 0x44, 0x9a, 0xb4, 0x82, 0x58, 0xc5, 0x29, 0x2f, 0x2f, 0xbf, 0xf7, 0x7b, 0x79, 0x09, 0xdd, 0x6b, - 0x02, 0xf6, 0x00, 0x85, 0x91, 0x99, 0xec, 0xa1, 0xb8, 0xab, 0x26, 0xca, 0xca, 0xaa, 0xe8, 0xe7, - 0x2a, 0x1b, 0x70, 0x93, 0x81, 0x05, 0xb6, 0xe5, 0x11, 0xee, 0x11, 0x3e, 0x47, 0xc2, 0x4d, 0x0d, - 0x1a, 0x1c, 0x21, 0x66, 0x91, 0x87, 0xc3, 0x6d, 0x0d, 0xa0, 0xbb, 0x4a, 0x48, 0xd3, 0x16, 0x32, - 0x4d, 0xc1, 0x4a, 0xdb, 0x86, 0x14, 0xe7, 0xa7, 0xf1, 0xf2, 0x6e, 0x73, 0xb3, 0x63, 0xe2, 0x3a, - 0x65, 0x57, 0xb3, 0xee, 0x97, 0x2e, 0xd9, 0x50, 0xfd, 0x5c, 0xa1, 0x65, 0x21, 0x5d, 0xc1, 0x3c, - 0x41, 0x23, 0x9b, 0xaa, 0x4c, 0x76, 0xc9, 0xc1, 0x6a, 0xe3, 0x73, 0xcf, 0xd6, 0xe9, 0xbf, 0x8e, - 0x1a, 0x94, 0x0b, 0x2e, 0x3d, 0x0b, 0xe3, 0x6b, 0xba, 0xf1, 0xc5, 0x81, 0x06, 0x52, 0x54, 0xec, - 0x8c, 0x16, 0x5d, 0x2b, 0x67, 0x58, 0xab, 0xc5, 0x7c, 0xe9, 0x64, 0xdc, 0x55, 0x9d, 0xb7, 0x64, - 0xaa, 0x55, 0xfd, 0xff, 0xe8, 0xb5, 0x12, 0x34, 0x7c, 0x59, 0x6d, 0x48, 0x68, 0xd1, 0x79, 0xd9, - 0x23, 0xa1, 0x25, 0x2f, 0x67, 0x87, 0x3f, 0x58, 0xbe, 0x0f, 0x11, 0x1e, 0xfd, 0x05, 0xf5, 0x77, - 0x8d, 0xf7, 0x1f, 0x9e, 0xdf, 0x9f, 0x0a, 0x15, 0xb6, 0x23, 0x7e, 0x7b, 0xb3, 0xfa, 0xc5, 0x68, - 0x12, 0x91, 0xf1, 0x24, 0x22, 0x6f, 0x93, 0x88, 0x0c, 0xa7, 0x51, 0x30, 0x9e, 0x46, 0xc1, 0xcb, - 0x34, 0x0a, 0x6e, 0x4e, 0x75, 0xdb, 0xb6, 0xf2, 0x84, 0x37, 0xa1, 0xb7, 0x50, 0xf8, 0xe5, 0x18, - 0x6f, 0x3b, 0xe2, 0x7e, 0xe1, 0xb3, 0x03, 0xa3, 0x50, 0x98, 0x0c, 0x0c, 0xa0, 0xec, 0x26, 0x25, - 0xf7, 0x09, 0x27, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xaa, 0xd5, 0x67, 0xc7, 0x18, 0x02, 0x00, - 0x00, + // 325 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x91, 0x31, 0x4b, 0xc3, 0x40, + 0x14, 0xc7, 0x73, 0xd5, 0x16, 0x3d, 0x17, 0x39, 0x15, 0x4a, 0xd0, 0x54, 0x03, 0x82, 0x0a, 0xe6, + 0x68, 0xdc, 0x1d, 0xea, 0xea, 0xa0, 0x05, 0x17, 0xb7, 0x4b, 0x3d, 0xd2, 0xd0, 0x24, 0xef, 0x9a, + 0x77, 0x29, 0x76, 0x75, 0x70, 0x2e, 0xf8, 0xa5, 0x3a, 0x16, 0x5c, 0x9c, 0x44, 0x5a, 0x3f, 0x88, + 0xf4, 0xae, 0x0a, 0x62, 0x15, 0xb7, 0x97, 0x97, 0xdf, 0xfb, 0xfd, 0xef, 0xdd, 0xd1, 0x83, 0x0e, + 0x60, 0x06, 0xc8, 0x95, 0x28, 0x44, 0x86, 0x7c, 0xd0, 0x8c, 0xa4, 0x16, 0x4d, 0xde, 0x2f, 0x65, + 0x31, 0x0c, 0x54, 0x01, 0x1a, 0xd8, 0x8e, 0x45, 0x02, 0x8b, 0x04, 0x0b, 0xc4, 0xdd, 0x8e, 0x21, + 0x06, 0x43, 0xf0, 0x79, 0x65, 0x61, 0x77, 0x37, 0x06, 0x88, 0x53, 0xc9, 0x85, 0x4a, 0xb8, 0xc8, + 0x73, 0xd0, 0x42, 0x27, 0x90, 0xe3, 0xe2, 0xaf, 0xbf, 0x3c, 0x6d, 0x61, 0x36, 0x8c, 0xdf, 0xa2, + 0xec, 0x7a, 0x9e, 0x7e, 0x65, 0x9a, 0x6d, 0xd9, 0x2f, 0x25, 0x6a, 0xe6, 0xd2, 0x35, 0x2c, 0x23, + 0x54, 0xa2, 0x23, 0xeb, 0x64, 0x9f, 0x1c, 0xad, 0xb7, 0xbf, 0xbe, 0xd9, 0x26, 0x5d, 0xe9, 0xc9, + 0x61, 0xbd, 0x62, 0xda, 0xf3, 0xd2, 0xbf, 0xa1, 0x5b, 0xdf, 0x1c, 0xa8, 0x20, 0x47, 0xc9, 0xce, + 0x69, 0xd5, 0x44, 0x19, 0xc3, 0x46, 0xe8, 0x07, 0x4b, 0x37, 0x0b, 0xcc, 0xd4, 0x45, 0x57, 0xe4, + 0xb1, 0x6c, 0xad, 0x8e, 0x5f, 0x1b, 0x4e, 0xdb, 0x8e, 0x85, 0x23, 0x42, 0xab, 0xc6, 0xcb, 0x1e, + 0x09, 0xad, 0x59, 0x39, 0x3b, 0xfe, 0xc5, 0xf2, 0x73, 0x09, 0xf7, 0xe4, 0x3f, 0xa8, 0x3d, 0xab, + 0x7f, 0xf8, 0xf0, 0xfc, 0xfe, 0x54, 0x69, 0xb0, 0x3d, 0xfe, 0xd7, 0x9d, 0xb5, 0x2e, 0xc7, 0x53, + 0x8f, 0x4c, 0xa6, 0x1e, 0x79, 0x9b, 0x7a, 0x64, 0x34, 0xf3, 0x9c, 0xc9, 0xcc, 0x73, 0x5e, 0x66, + 0x9e, 0x73, 0x1b, 0xc6, 0x89, 0xee, 0x96, 0x51, 0xd0, 0x81, 0x8c, 0xa7, 0x49, 0x2e, 0x79, 0x1a, + 0x65, 0xa7, 0x78, 0xd7, 0xe3, 0x83, 0x90, 0xdf, 0x7f, 0xda, 0xf4, 0x50, 0x49, 0xe4, 0xaa, 0x00, + 0x05, 0x28, 0xd2, 0xa8, 0x66, 0x9e, 0xe0, 0xec, 0x23, 0x00, 0x00, 0xff, 0xff, 0x8c, 0x78, 0x33, + 0x89, 0x16, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/params/types/subspace_test.go b/x/params/types/subspace_test.go index 25284de1ca..988c240cec 100644 --- a/x/params/types/subspace_test.go +++ b/x/params/types/subspace_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/suite" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -39,7 +39,7 @@ func (suite *SubspaceTestSuite) SetupTest() { suite.cdc = encCfg.Marshaler suite.amino = encCfg.Amino - suite.ctx = sdk.NewContext(ms, tmproto.Header{}, false, log.NewNopLogger()) + suite.ctx = sdk.NewContext(ms, ostproto.Header{}, false, log.NewNopLogger()) suite.ss = ss.WithKeyTable(paramKeyTable()) } diff --git a/x/simulation/mock_tendermint.go b/x/simulation/mock_tendermint.go index ad84e8213d..5735c7c9bd 100644 --- a/x/simulation/mock_tendermint.go +++ b/x/simulation/mock_tendermint.go @@ -7,10 +7,10 @@ import ( "testing" "time" - abci "github.com/tendermint/tendermint/abci/types" - cryptoenc "github.com/tendermint/tendermint/crypto/encoding" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/line/ostracon/abci/types" + cryptoenc "github.com/line/ostracon/crypto/encoding" + ostbytes "github.com/line/ostracon/libs/bytes" + ostproto "github.com/line/ostracon/proto/ostracon/types" ) type mockValidator struct { @@ -62,7 +62,7 @@ func (vals mockValidators) getKeys() []string { //_________________________________________________________________________________ // randomProposer picks a random proposer from the current validator set -func (vals mockValidators) randomProposer(r *rand.Rand) tmbytes.HexBytes { +func (vals mockValidators) randomProposer(r *rand.Rand) ostbytes.HexBytes { keys := vals.getKeys() if len(keys) == 0 { return nil @@ -121,7 +121,7 @@ func updateValidators( func RandomRequestBeginBlock(r *rand.Rand, params Params, validators mockValidators, pastTimes []time.Time, pastVoteInfos [][]abci.VoteInfo, - event func(route, op, evResult string), header tmproto.Header) abci.RequestBeginBlock { + event func(route, op, evResult string), header ostproto.Header) abci.RequestBeginBlock { if len(validators) == 0 { return abci.RequestBeginBlock{ Header: header, diff --git a/x/simulation/params.go b/x/simulation/params.go index 957d888678..92ec45feaf 100644 --- a/x/simulation/params.go +++ b/x/simulation/params.go @@ -5,9 +5,9 @@ import ( "fmt" "math/rand" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/tendermint/tendermint/types" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" + "github.com/line/ostracon/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/types/simulation" @@ -167,10 +167,10 @@ func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSO MaxBytes: int64(simulation.RandIntBetween(r, 20000000, 30000000)), MaxGas: -1, }, - Validator: &tmproto.ValidatorParams{ + Validator: &ostproto.ValidatorParams{ PubKeyTypes: []string{types.ABCIPubKeyTypeEd25519}, }, - Evidence: &tmproto.EvidenceParams{ + Evidence: &ostproto.EvidenceParams{ MaxAgeNumBlocks: int64(stakingGenesisState.Params.UnbondingTime / AverageBlockTime), MaxAgeDuration: stakingGenesisState.Params.UnbondingTime, }, diff --git a/x/simulation/params_test.go b/x/simulation/params_test.go index f0b56fc46e..226a588b28 100644 --- a/x/simulation/params_test.go +++ b/x/simulation/params_test.go @@ -5,8 +5,8 @@ import ( "math/rand" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" sdk "github.com/line/lbm-sdk/v2/types" simtypes "github.com/line/lbm-sdk/v2/types/simulation" @@ -39,7 +39,7 @@ func TestNewWeightedProposalContent(t *testing.T) { require.Equal(t, key, pContent.AppParamsKey()) require.Equal(t, weight, pContent.DefaultWeight()) - ctx := sdk.NewContext(nil, tmproto.Header{}, true, nil) + ctx := sdk.NewContext(nil, ostproto.Header{}, true, nil) require.Equal(t, content, pContent.ContentSimulatorFn()(nil, ctx, nil)) } diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go index f5af94a3bd..6301b04829 100644 --- a/x/simulation/simulate.go +++ b/x/simulation/simulate.go @@ -10,8 +10,8 @@ import ( "testing" "time" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/codec" @@ -93,7 +93,7 @@ func SimulateFromSeed( accs = tmpAccs nextValidators := validators - header := tmproto.Header{ + header := ostproto.Header{ ChainID: config.ChainID, Height: 1, Time: genesisTimestamp, @@ -243,7 +243,7 @@ func SimulateFromSeed( //______________________________________________________________________________ type blockSimFn func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, - accounts []simulation.Account, header tmproto.Header) (opCount int) + accounts []simulation.Account, header ostproto.Header) (opCount int) // Returns a function to simulate blocks. Written like this to avoid constant // parameters being passed everytime, to minimize memory overhead. @@ -257,7 +257,7 @@ func createBlockSimulator(testingMode bool, tb testing.TB, w io.Writer, params P selectOp := ops.getSelectOpFn() return func( - r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simulation.Account, header tmproto.Header, + r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simulation.Account, header ostproto.Header, ) (opCount int) { _, _ = fmt.Fprintf( w, "\rSimulating... block %d/%d, operation %d/%d.", diff --git a/x/slashing/abci.go b/x/slashing/abci.go index 502359a4c7..8ad61218c3 100644 --- a/x/slashing/abci.go +++ b/x/slashing/abci.go @@ -3,7 +3,7 @@ package slashing import ( "time" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/telemetry" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/slashing/abci_test.go b/x/slashing/abci_test.go index 22a656bc38..fed939ebef 100644 --- a/x/slashing/abci_test.go +++ b/x/slashing/abci_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -18,7 +18,7 @@ import ( func TestBeginBlocker(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) pks := simapp.CreateTestPubKeys(1) simapp.AddTestAddrsFromPubKeys(app, ctx, pks, sdk.TokensFromConsensusPower(200)) diff --git a/x/slashing/app_test.go b/x/slashing/app_test.go index abeb1f55b8..548cb63715 100644 --- a/x/slashing/app_test.go +++ b/x/slashing/app_test.go @@ -4,9 +4,9 @@ import ( "errors" "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" "github.com/line/lbm-sdk/v2/crypto/keys/secp256k1" @@ -27,14 +27,14 @@ var ( ) func checkValidator(t *testing.T, app *simapp.SimApp, _ sdk.AccAddress, expFound bool) stakingtypes.Validator { - ctxCheck := app.BaseApp.NewContext(true, tmproto.Header{}) + ctxCheck := app.BaseApp.NewContext(true, ostproto.Header{}) validator, found := app.StakingKeeper.GetValidator(ctxCheck, sdk.ValAddress(addr1)) require.Equal(t, expFound, found) return validator } func checkValidatorSigningInfo(t *testing.T, app *simapp.SimApp, addr sdk.ConsAddress, expFound bool) types.ValidatorSigningInfo { - ctxCheck := app.BaseApp.NewContext(true, tmproto.Header{}) + ctxCheck := app.BaseApp.NewContext(true, ostproto.Header{}) signingInfo, found := app.SlashingKeeper.GetValidatorSigningInfo(ctxCheck, addr) require.Equal(t, expFound, found) return signingInfo @@ -68,13 +68,13 @@ func TestSlashingMsgs(t *testing.T) { ) require.NoError(t, err) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} txGen := simapp.MakeTestEncodingConfig().TxConfig _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{createValidatorMsg}, "", []uint64{0}, []uint64{0}, true, true, priv1) require.NoError(t, err) simapp.CheckBalance(t, app, addr1, sdk.Coins{genCoin.Sub(bondCoin)}) - header = tmproto.Header{Height: app.LastBlockHeight() + 1} + header = ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) validator := checkValidator(t, app, addr1, true) @@ -86,7 +86,7 @@ func TestSlashingMsgs(t *testing.T) { checkValidatorSigningInfo(t, app, sdk.ConsAddress(valAddr), true) // unjail should fail with unknown validator - header = tmproto.Header{Height: app.LastBlockHeight() + 1} + header = ostproto.Header{Height: app.LastBlockHeight() + 1} _, res, err := simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{unjailMsg}, "", []uint64{0}, []uint64{1}, false, false, priv1) require.Error(t, err) require.Nil(t, res) diff --git a/x/slashing/client/cli/cli_test.go b/x/slashing/client/cli/cli_test.go index 6491c5abcb..760a273f5a 100644 --- a/x/slashing/client/cli/cli_test.go +++ b/x/slashing/client/cli/cli_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/gogo/protobuf/proto" + ostcli "github.com/line/ostracon/libs/cli" "github.com/stretchr/testify/suite" - tmcli "github.com/tendermint/tendermint/libs/cli" "github.com/line/lbm-sdk/v2/client/flags" clitestutil "github.com/line/lbm-sdk/v2/testutil/cli" @@ -64,7 +64,7 @@ func (s *IntegrationTestSuite) TestGetCmdQuerySigningInfo() { "valid address (json output)", []string{ valConsPubKey, - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), fmt.Sprintf("--%s=1", flags.FlagHeight), }, false, @@ -74,7 +74,7 @@ func (s *IntegrationTestSuite) TestGetCmdQuerySigningInfo() { "valid address (text output)", []string{ valConsPubKey, - fmt.Sprintf("--%s=text", tmcli.OutputFlag), + fmt.Sprintf("--%s=text", ostcli.OutputFlag), fmt.Sprintf("--%s=1", flags.FlagHeight), }, false, @@ -115,12 +115,12 @@ func (s *IntegrationTestSuite) TestGetCmdQueryParams() { }{ { "json output", - []string{fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, `{"signed_blocks_window":"100","min_signed_per_window":"0.500000000000000000","downtime_jail_duration":"600s","slash_fraction_double_sign":"0.050000000000000000","slash_fraction_downtime":"0.010000000000000000"}`, }, { "text output", - []string{fmt.Sprintf("--%s=text", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=text", ostcli.OutputFlag)}, `downtime_jail_duration: 600s min_signed_per_window: "0.500000000000000000" signed_blocks_window: "100" diff --git a/x/slashing/genesis_test.go b/x/slashing/genesis_test.go index 58a8bfe513..28f503983c 100644 --- a/x/slashing/genesis_test.go +++ b/x/slashing/genesis_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -16,7 +16,7 @@ import ( func TestExportAndInitGenesis(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.SlashingKeeper.SetParams(ctx, testslashing.TestParams()) diff --git a/x/slashing/handler_test.go b/x/slashing/handler_test.go index e0153922e8..7171bf3b48 100644 --- a/x/slashing/handler_test.go +++ b/x/slashing/handler_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" "github.com/line/lbm-sdk/v2/testutil/testdata" @@ -24,7 +24,7 @@ import ( func TestCannotUnjailUnlessJailed(t *testing.T) { // initial setup app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) pks := simapp.CreateTestPubKeys(1) simapp.AddTestAddrsFromPubKeys(app, ctx, pks, sdk.TokensFromConsensusPower(200)) @@ -50,7 +50,7 @@ func TestCannotUnjailUnlessJailed(t *testing.T) { func TestCannotUnjailUnlessMeetMinSelfDelegation(t *testing.T) { // initial setup app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) pks := simapp.CreateTestPubKeys(1) simapp.AddTestAddrsFromPubKeys(app, ctx, pks, sdk.TokensFromConsensusPower(200)) @@ -81,7 +81,7 @@ func TestCannotUnjailUnlessMeetMinSelfDelegation(t *testing.T) { func TestJailedValidatorDelegations(t *testing.T) { // initial setup app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{Time: time.Unix(0, 0)}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{Time: time.Unix(0, 0)}) pks := simapp.CreateTestPubKeys(3) simapp.AddTestAddrsFromPubKeys(app, ctx, pks, sdk.TokensFromConsensusPower(20)) @@ -132,7 +132,7 @@ func TestInvalidMsg(t *testing.T) { k := keeper.Keeper{} h := slashing.NewHandler(k) - res, err := h(sdk.NewContext(nil, tmproto.Header{}, false, nil), testdata.NewTestMsg()) + res, err := h(sdk.NewContext(nil, ostproto.Header{}, false, nil), testdata.NewTestMsg()) require.Error(t, err) require.Nil(t, res) require.True(t, strings.Contains(err.Error(), "unrecognized slashing message type")) @@ -143,7 +143,7 @@ func TestInvalidMsg(t *testing.T) { func TestHandleAbsentValidator(t *testing.T) { // initial setup app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{Time: time.Unix(0, 0)}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{Time: time.Unix(0, 0)}) pks := simapp.CreateTestPubKeys(1) simapp.AddTestAddrsFromPubKeys(app, ctx, pks, sdk.TokensFromConsensusPower(200)) app.SlashingKeeper.SetParams(ctx, testslashing.TestParams()) @@ -241,7 +241,7 @@ func TestHandleAbsentValidator(t *testing.T) { require.Nil(t, res) // unrevocation should succeed after jail expiration - ctx = ctx.WithBlockHeader(tmproto.Header{Time: time.Unix(1, 0).Add(app.SlashingKeeper.DowntimeJailDuration(ctx))}) + ctx = ctx.WithBlockHeader(ostproto.Header{Time: time.Unix(1, 0).Add(app.SlashingKeeper.DowntimeJailDuration(ctx))}) res, err = slh(ctx, types.NewMsgUnjail(addr)) require.NoError(t, err) require.NotNil(t, res) diff --git a/x/slashing/keeper/grpc_query_test.go b/x/slashing/keeper/grpc_query_test.go index 9e535b645d..bd0eed9b54 100644 --- a/x/slashing/keeper/grpc_query_test.go +++ b/x/slashing/keeper/grpc_query_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp" @@ -29,7 +29,7 @@ type SlashingTestSuite struct { func (suite *SlashingTestSuite) SetupTest() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams()) app.BankKeeper.SetParams(ctx, banktypes.DefaultParams()) diff --git a/x/slashing/keeper/hooks.go b/x/slashing/keeper/hooks.go index 8ed76d83d0..bd5e96cfe0 100644 --- a/x/slashing/keeper/hooks.go +++ b/x/slashing/keeper/hooks.go @@ -3,7 +3,7 @@ package keeper import ( "time" - "github.com/tendermint/tendermint/crypto" + "github.com/line/ostracon/crypto" sdk "github.com/line/lbm-sdk/v2/types" "github.com/line/lbm-sdk/v2/x/slashing/types" diff --git a/x/slashing/keeper/keeper.go b/x/slashing/keeper/keeper.go index 31559d4b61..37b4e2fa83 100644 --- a/x/slashing/keeper/keeper.go +++ b/x/slashing/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" diff --git a/x/slashing/keeper/keeper_test.go b/x/slashing/keeper/keeper_test.go index a6d62faee1..6e826ffe2c 100644 --- a/x/slashing/keeper/keeper_test.go +++ b/x/slashing/keeper/keeper_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -17,7 +17,7 @@ import ( func TestUnJailNotBonded(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) p := app.StakingKeeper.GetParams(ctx) p.MaxValidators = 5 @@ -81,7 +81,7 @@ func TestUnJailNotBonded(t *testing.T) { // and that they are not immediately jailed func TestHandleNewValidator(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrDels := simapp.AddTestAddrsIncremental(app, ctx, 1, sdk.TokensFromConsensusPower(200)) valAddrs := simapp.ConvertAddrsToValAddrs(addrDels) @@ -125,7 +125,7 @@ func TestHandleNewValidator(t *testing.T) { func TestHandleAlreadyJailed(t *testing.T) { // initial setup app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrDels := simapp.AddTestAddrsIncremental(app, ctx, 1, sdk.TokensFromConsensusPower(200)) valAddrs := simapp.ConvertAddrsToValAddrs(addrDels) @@ -179,7 +179,7 @@ func TestValidatorDippingInAndOut(t *testing.T) { // initial setup // TestParams set the SignedBlocksWindow to 1000 and MaxMissedBlocksPerWindow to 500 app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.SlashingKeeper.SetParams(ctx, testslashing.TestParams()) params := app.StakingKeeper.GetParams(ctx) diff --git a/x/slashing/keeper/querier.go b/x/slashing/keeper/querier.go index 4838e079ee..3409cf1964 100644 --- a/x/slashing/keeper/querier.go +++ b/x/slashing/keeper/querier.go @@ -1,7 +1,7 @@ package keeper import ( - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/slashing/keeper/querier_test.go b/x/slashing/keeper/querier_test.go index d0476648f5..19dfe203e4 100644 --- a/x/slashing/keeper/querier_test.go +++ b/x/slashing/keeper/querier_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -17,7 +17,7 @@ import ( func TestNewQuerier(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.SlashingKeeper.SetParams(ctx, testslashing.TestParams()) legacyQuerierCdc := codec.NewAminoCodec(app.LegacyAmino()) querier := keeper.NewQuerier(app.SlashingKeeper, legacyQuerierCdc.LegacyAmino) @@ -35,7 +35,7 @@ func TestQueryParams(t *testing.T) { cdc := codec.NewLegacyAmino() legacyQuerierCdc := codec.NewAminoCodec(cdc) app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.SlashingKeeper.SetParams(ctx, testslashing.TestParams()) querier := keeper.NewQuerier(app.SlashingKeeper, legacyQuerierCdc.LegacyAmino) diff --git a/x/slashing/keeper/signing_info_test.go b/x/slashing/keeper/signing_info_test.go index f0cdf83153..fc571b6c4f 100644 --- a/x/slashing/keeper/signing_info_test.go +++ b/x/slashing/keeper/signing_info_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -14,7 +14,7 @@ import ( func TestGetSetValidatorSigningInfo(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrDels := simapp.AddTestAddrsIncremental(app, ctx, 1, sdk.TokensFromConsensusPower(200)) info, found := app.SlashingKeeper.GetValidatorSigningInfo(ctx, sdk.ConsAddress(addrDels[0])) @@ -38,7 +38,7 @@ func TestGetSetValidatorSigningInfo(t *testing.T) { func TestGetSetValidatorMissedBlockBitArray(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrDels := simapp.AddTestAddrsIncremental(app, ctx, 1, sdk.TokensFromConsensusPower(200)) missed := app.SlashingKeeper.GetValidatorMissedBlockBitArray(ctx, sdk.ConsAddress(addrDels[0]), 0) @@ -50,7 +50,7 @@ func TestGetSetValidatorMissedBlockBitArray(t *testing.T) { func TestTombstoned(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrDels := simapp.AddTestAddrsIncremental(app, ctx, 1, sdk.TokensFromConsensusPower(200)) require.Panics(t, func() { app.SlashingKeeper.Tombstone(ctx, sdk.ConsAddress(addrDels[0])) }) @@ -74,7 +74,7 @@ func TestTombstoned(t *testing.T) { func TestJailUntil(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) addrDels := simapp.AddTestAddrsIncremental(app, ctx, 1, sdk.TokensFromConsensusPower(200)) require.Panics(t, func() { app.SlashingKeeper.JailUntil(ctx, sdk.ConsAddress(addrDels[0]), time.Now()) }) diff --git a/x/slashing/module.go b/x/slashing/module.go index b93c2af113..8847d42d19 100644 --- a/x/slashing/module.go +++ b/x/slashing/module.go @@ -11,7 +11,7 @@ import ( "github.com/gorilla/mux" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/slashing/simulation/operations_test.go b/x/slashing/simulation/operations_test.go index 2dbde788b1..393b362152 100644 --- a/x/slashing/simulation/operations_test.go +++ b/x/slashing/simulation/operations_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" simappparams "github.com/line/lbm-sdk/v2/simapp/params" @@ -86,7 +86,7 @@ func TestSimulateMsgUnjail(t *testing.T) { app.DistrKeeper.SetDelegatorStartingInfo(ctx, validator0.GetOperator(), val0AccAddress.Bytes(), distrtypes.NewDelegatorStartingInfo(2, sdk.OneDec(), 200)) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) // execute operation op := simulation.SimulateMsgUnjail(app.AccountKeeper, app.BankKeeper, app.SlashingKeeper, app.StakingKeeper) @@ -106,7 +106,7 @@ func TestSimulateMsgUnjail(t *testing.T) { func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { app := simapp.Setup(isCheckTx) - ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + ctx := app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) app.MintKeeper.SetParams(ctx, minttypes.DefaultParams()) app.MintKeeper.SetMinter(ctx, minttypes.DefaultInitialMinter()) diff --git a/x/slashing/types/genesis.pb.go b/x/slashing/types/genesis.pb.go index 9819899d09..8d48203a95 100644 --- a/x/slashing/types/genesis.pb.go +++ b/x/slashing/types/genesis.pb.go @@ -267,34 +267,34 @@ func init() { } var fileDescriptor_1923b9188b635394 = []byte{ - // 424 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x53, 0x3d, 0x8e, 0xd3, 0x40, - 0x14, 0xf6, 0x24, 0x10, 0x60, 0x9c, 0x6d, 0x46, 0x66, 0xb1, 0x56, 0xe0, 0xac, 0x2c, 0x16, 0x6d, - 0x13, 0x5b, 0xbb, 0x74, 0x20, 0x1a, 0x37, 0x2b, 0x0a, 0x24, 0xe4, 0x95, 0x28, 0x68, 0xa2, 0x71, - 0x3c, 0x3b, 0x19, 0xc5, 0xf6, 0x04, 0x3f, 0x13, 0x25, 0x57, 0xa0, 0xa2, 0xe6, 0x06, 0xf4, 0x1c, - 0x22, 0x65, 0x4a, 0xaa, 0x08, 0x25, 0x37, 0xe0, 0x04, 0x28, 0x33, 0x0e, 0x71, 0xa2, 0x98, 0x88, - 0xca, 0x7e, 0xd2, 0xf7, 0xf7, 0xbe, 0xd1, 0xc3, 0x17, 0x7d, 0x09, 0xa9, 0x04, 0x1f, 0x12, 0x0a, - 0x03, 0x91, 0x71, 0x7f, 0x7c, 0x15, 0xb1, 0x82, 0x5e, 0xf9, 0x9c, 0x65, 0x0c, 0x04, 0x78, 0xa3, - 0x5c, 0x16, 0x92, 0x3c, 0xd1, 0x30, 0x6f, 0x03, 0xf3, 0x4a, 0xd8, 0x99, 0xc5, 0x25, 0x97, 0x0a, - 0xe3, 0xaf, 0xff, 0x34, 0xfc, 0xec, 0x45, 0x9d, 0xea, 0x5f, 0xbe, 0xc2, 0xb9, 0xdf, 0x1b, 0xb8, - 0x7d, 0xa3, 0x8d, 0x6e, 0x0b, 0x5a, 0x30, 0xf2, 0x06, 0xb7, 0x46, 0x34, 0xa7, 0x29, 0xd8, 0xe8, - 0x1c, 0x5d, 0x9a, 0xd7, 0x1d, 0xaf, 0xc6, 0xd8, 0x7b, 0xaf, 0x60, 0xc1, 0xbd, 0xd9, 0xa2, 0x63, - 0x84, 0x25, 0x89, 0x70, 0x7c, 0x02, 0x82, 0x67, 0x22, 0xe3, 0x3d, 0x91, 0xdd, 0x49, 0xb0, 0x1b, - 0xe7, 0xcd, 0x4b, 0xf3, 0xfa, 0x79, 0xad, 0xca, 0xad, 0x46, 0xbf, 0xcd, 0xee, 0x64, 0xf0, 0x74, - 0x2d, 0xf5, 0x7b, 0xd1, 0xb1, 0xa6, 0x34, 0x4d, 0x5e, 0xb9, 0x3b, 0x42, 0x6e, 0xd8, 0x86, 0x2d, - 0x14, 0xc8, 0x27, 0x7c, 0x92, 0x0a, 0x00, 0x16, 0xf7, 0xa2, 0x44, 0xf6, 0x87, 0x60, 0x37, 0x95, - 0x91, 0x57, 0x6b, 0xf4, 0x81, 0x26, 0x22, 0xa6, 0x85, 0xcc, 0xdf, 0x29, 0x5a, 0xa0, 0x58, 0xfb, - 0x96, 0x3b, 0x92, 0x6e, 0xd8, 0x4e, 0x2b, 0x58, 0xf7, 0x07, 0xc2, 0x66, 0x25, 0x2e, 0xb1, 0xf1, - 0x03, 0x1a, 0xc7, 0x39, 0x03, 0xdd, 0xd5, 0xa3, 0x70, 0x33, 0x92, 0x2f, 0x08, 0x9f, 0x8e, 0x37, - 0x7e, 0xbd, 0xea, 0x1e, 0x76, 0x43, 0xb5, 0xda, 0x3d, 0x1e, 0xb3, 0x5a, 0xcc, 0x45, 0x99, 0xf2, - 0x99, 0x4e, 0x79, 0x58, 0xda, 0x0d, 0xad, 0xf1, 0x01, 0xb2, 0xfb, 0x0d, 0xe1, 0xc7, 0x07, 0x97, - 0xff, 0xc7, 0x02, 0x7c, 0xbf, 0xdd, 0x63, 0xcf, 0x58, 0xd1, 0xfd, 0xaf, 0x4e, 0x5f, 0x63, 0xb3, - 0x42, 0x25, 0x16, 0xbe, 0x2f, 0xb2, 0x98, 0x4d, 0x54, 0x9e, 0x66, 0xa8, 0x07, 0x72, 0x8a, 0x5b, - 0x9a, 0xa4, 0xda, 0x7b, 0x18, 0x96, 0x53, 0x70, 0x33, 0x5b, 0x3a, 0x68, 0xbe, 0x74, 0xd0, 0xaf, - 0xa5, 0x83, 0xbe, 0xae, 0x1c, 0x63, 0xbe, 0x72, 0x8c, 0x9f, 0x2b, 0xc7, 0xf8, 0xd8, 0xe5, 0xa2, - 0x18, 0x7c, 0x8e, 0xbc, 0xbe, 0x4c, 0xfd, 0xf2, 0x12, 0xf4, 0xa7, 0x0b, 0xf1, 0xd0, 0x9f, 0x6c, - 0xcf, 0xa2, 0x98, 0x8e, 0x18, 0x44, 0x2d, 0x75, 0x0c, 0x2f, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, - 0x03, 0x3c, 0xa8, 0xf6, 0x8c, 0x03, 0x00, 0x00, + // 432 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xc1, 0x6a, 0xd4, 0x40, + 0x18, 0xc7, 0x33, 0xbb, 0xba, 0xea, 0x64, 0x7b, 0x19, 0x62, 0x0d, 0x45, 0xb3, 0x25, 0x58, 0x29, + 0x48, 0x33, 0x74, 0xbd, 0x29, 0x5e, 0x02, 0x22, 0x1e, 0x04, 0x49, 0xc1, 0x83, 0x97, 0x65, 0xb2, + 0x99, 0x4e, 0x87, 0x26, 0x33, 0x6b, 0xbe, 0x18, 0xda, 0x57, 0xf0, 0xe4, 0xd9, 0x37, 0xf0, 0xee, + 0x43, 0xf4, 0xd8, 0xa3, 0xa7, 0x22, 0xbb, 0x6f, 0xe0, 0x13, 0x48, 0x67, 0xb2, 0x36, 0x2d, 0x1b, + 0x97, 0xde, 0xf2, 0xc1, 0xef, 0xff, 0xff, 0x7f, 0xdf, 0x3f, 0x0c, 0xde, 0x99, 0x6a, 0x28, 0x34, + 0x50, 0xc8, 0x19, 0x1c, 0x49, 0x25, 0x68, 0xbd, 0x9f, 0xf2, 0x8a, 0xed, 0x53, 0xc1, 0x15, 0x07, + 0x09, 0xd1, 0xac, 0xd4, 0x95, 0x26, 0x8f, 0x2c, 0x16, 0x2d, 0xb1, 0xa8, 0xc1, 0xb6, 0x3c, 0xa1, + 0x85, 0x36, 0x0c, 0xbd, 0xfc, 0xb2, 0xf8, 0xd6, 0xb3, 0x2e, 0xd7, 0x7f, 0x7a, 0xc3, 0x85, 0x3f, + 0x7a, 0x78, 0xf8, 0xd6, 0x06, 0x1d, 0x54, 0xac, 0xe2, 0xe4, 0x35, 0x1e, 0xcc, 0x58, 0xc9, 0x0a, + 0xf0, 0xd1, 0x36, 0xda, 0x75, 0xc7, 0xa3, 0xa8, 0x23, 0x38, 0xfa, 0x60, 0xb0, 0xf8, 0xce, 0xd9, + 0xc5, 0xc8, 0x49, 0x1a, 0x11, 0x11, 0x78, 0x03, 0xa4, 0x50, 0x52, 0x89, 0x89, 0x54, 0x87, 0x1a, + 0xfc, 0xde, 0x76, 0x7f, 0xd7, 0x1d, 0x3f, 0xed, 0x74, 0x39, 0xb0, 0xf4, 0x3b, 0x75, 0xa8, 0xe3, + 0xc7, 0x97, 0x56, 0x7f, 0x2e, 0x46, 0xde, 0x29, 0x2b, 0xf2, 0x97, 0xe1, 0x35, 0xa3, 0x30, 0x19, + 0xc2, 0x15, 0x0a, 0xe4, 0x33, 0xde, 0x28, 0x24, 0x00, 0xcf, 0x26, 0x69, 0xae, 0xa7, 0xc7, 0xe0, + 0xf7, 0x4d, 0x50, 0xd4, 0x19, 0xf4, 0x91, 0xe5, 0x32, 0x63, 0x95, 0x2e, 0xdf, 0x1b, 0x59, 0x6c, + 0x54, 0x37, 0x23, 0xaf, 0x59, 0x86, 0xc9, 0xb0, 0x68, 0xb1, 0xe1, 0x4f, 0x84, 0xdd, 0xd6, 0xba, + 0xc4, 0xc7, 0xf7, 0x58, 0x96, 0x95, 0x1c, 0x6c, 0x57, 0x0f, 0x92, 0xe5, 0x48, 0xbe, 0x22, 0xbc, + 0x59, 0x2f, 0xf3, 0x26, 0xed, 0x3b, 0xfc, 0x9e, 0x69, 0x75, 0x6f, 0xfd, 0x9a, 0xed, 0x62, 0x76, + 0x9a, 0x2d, 0x9f, 0xd8, 0x2d, 0x57, 0x5b, 0x87, 0x89, 0x57, 0xaf, 0x10, 0x87, 0xdf, 0x11, 0x7e, + 0xb8, 0xf2, 0xf8, 0xff, 0x1c, 0x20, 0x6e, 0xb6, 0xbb, 0xee, 0x37, 0xb6, 0x7c, 0x6f, 0xd5, 0xe9, + 0x2b, 0xec, 0xb6, 0xa4, 0xc4, 0xc3, 0x77, 0xa5, 0xca, 0xf8, 0x89, 0xd9, 0xa7, 0x9f, 0xd8, 0x81, + 0x6c, 0xe2, 0x81, 0x15, 0x99, 0xf6, 0xee, 0x27, 0xcd, 0x14, 0xbf, 0x39, 0x9b, 0x07, 0xe8, 0x7c, + 0x1e, 0xa0, 0xdf, 0xf3, 0x00, 0x7d, 0x5b, 0x04, 0xce, 0xf9, 0x22, 0x70, 0x7e, 0x2d, 0x02, 0xe7, + 0xd3, 0x73, 0x21, 0xab, 0xa3, 0x2f, 0x69, 0x34, 0xd5, 0x05, 0xcd, 0xa5, 0xe2, 0x34, 0x4f, 0x8b, + 0x3d, 0xc8, 0x8e, 0x69, 0x3d, 0xa6, 0x27, 0x57, 0x8f, 0xa2, 0x3a, 0x9d, 0x71, 0x48, 0x07, 0xe6, + 0x29, 0xbc, 0xf8, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x40, 0x1c, 0x2b, 0x4b, 0x8a, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/slashing/types/query.pb.go b/x/slashing/types/query.pb.go index da6ed34de8..0b950364ed 100644 --- a/x/slashing/types/query.pb.go +++ b/x/slashing/types/query.pb.go @@ -321,40 +321,41 @@ func init() { } var fileDescriptor_791b11d41a861ed0 = []byte{ - // 526 bytes of a gzipped FileDescriptorProto + // 531 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0x41, 0x6b, 0x13, 0x41, 0x14, 0xc7, 0x33, 0x6d, 0x0d, 0x38, 0x29, 0x22, 0x63, 0xa1, 0x35, 0xc8, 0xc6, 0xae, 0x90, 0x16, - 0x35, 0x3b, 0x26, 0x22, 0x5e, 0xec, 0xc1, 0x1e, 0x0c, 0xde, 0x34, 0x8a, 0x07, 0x41, 0xc2, 0x6c, + 0x6b, 0x77, 0x4c, 0x44, 0xbc, 0xd8, 0x83, 0x05, 0x2d, 0xde, 0x34, 0x8a, 0x07, 0x41, 0xc2, 0x6c, 0x32, 0x9d, 0x0e, 0x6e, 0x66, 0xb6, 0xfb, 0x36, 0xc1, 0x20, 0x5e, 0x3c, 0x7b, 0x10, 0xfc, 0x0c, 0x1e, 0x3d, 0xf8, 0x2d, 0x7a, 0x2c, 0x78, 0xf1, 0x24, 0x92, 0xf8, 0x09, 0xfc, 0x04, 0x92, 0x99, - 0x49, 0xb2, 0x25, 0xae, 0xa6, 0x3d, 0xed, 0xf0, 0xe6, 0xfd, 0xdf, 0xff, 0xf7, 0xe6, 0x3d, 0x16, - 0xdf, 0xe8, 0x68, 0xe8, 0x69, 0xa0, 0x10, 0x31, 0x38, 0x94, 0x4a, 0xd0, 0x41, 0x3d, 0xe4, 0x29, - 0xab, 0xd3, 0xa3, 0x3e, 0x4f, 0x86, 0x41, 0x9c, 0xe8, 0x54, 0x93, 0x4d, 0x9b, 0x14, 0x4c, 0x93, - 0x02, 0x97, 0x54, 0xbe, 0xe9, 0xd4, 0x21, 0x03, 0x6e, 0x15, 0x33, 0x7d, 0xcc, 0x84, 0x54, 0x2c, - 0x95, 0x5a, 0xd9, 0x22, 0xe5, 0x0d, 0xa1, 0x85, 0x36, 0x47, 0x3a, 0x39, 0xb9, 0xe8, 0x35, 0xa1, - 0xb5, 0x88, 0x38, 0x65, 0xb1, 0xa4, 0x4c, 0x29, 0x9d, 0x1a, 0x09, 0xb8, 0xdb, 0x6a, 0x1e, 0xdd, - 0x8c, 0xc4, 0xe4, 0xf9, 0x1b, 0x98, 0x3c, 0x9d, 0xb8, 0x3f, 0x61, 0x09, 0xeb, 0x41, 0x8b, 0x1f, - 0xf5, 0x39, 0xa4, 0xfe, 0x73, 0x7c, 0xe5, 0x54, 0x14, 0x62, 0xad, 0x80, 0x93, 0x3d, 0x5c, 0x8c, - 0x4d, 0x64, 0x0b, 0x5d, 0x47, 0xbb, 0xa5, 0x46, 0x25, 0xc8, 0x69, 0x2f, 0xb0, 0xc2, 0xfd, 0xb5, - 0xe3, 0x1f, 0x95, 0x42, 0xcb, 0x89, 0xfc, 0x07, 0x78, 0xd3, 0x54, 0x7d, 0x26, 0x85, 0x92, 0x4a, - 0x3c, 0x56, 0x07, 0xda, 0x19, 0x92, 0x6d, 0xbc, 0xde, 0xd1, 0x0a, 0xda, 0xac, 0xdb, 0x4d, 0x38, - 0xd8, 0xfa, 0x17, 0x5b, 0xa5, 0x49, 0xec, 0xa1, 0x0d, 0xf9, 0x43, 0xbc, 0xb5, 0xa8, 0x76, 0x60, - 0xaf, 0xf0, 0xe5, 0x01, 0x8b, 0xda, 0x60, 0xaf, 0xda, 0x52, 0x1d, 0x68, 0x87, 0x58, 0xcb, 0x45, - 0x7c, 0xc1, 0x22, 0xd9, 0x65, 0xa9, 0x4e, 0x32, 0x05, 0x1d, 0xf0, 0xa5, 0x01, 0x8b, 0x32, 0x51, - 0x3f, 0x5c, 0xb4, 0x9e, 0x3e, 0x15, 0x79, 0x84, 0xf1, 0x7c, 0x60, 0xce, 0xb4, 0x3a, 0x35, 0x9d, - 0x4c, 0x37, 0xb0, 0xfb, 0x30, 0x7f, 0x19, 0xc1, 0x9d, 0xb6, 0x95, 0x51, 0xfa, 0x5f, 0x10, 0xbe, - 0xfa, 0x17, 0x13, 0xd7, 0x60, 0x13, 0xaf, 0xb9, 0xa6, 0x56, 0xcf, 0xdb, 0x94, 0x29, 0x40, 0x9a, - 0xa7, 0x70, 0x57, 0x0c, 0xee, 0xce, 0x7f, 0x71, 0x2d, 0x45, 0x96, 0xb7, 0xf1, 0x7b, 0x15, 0x5f, - 0x30, 0xbc, 0xe4, 0x03, 0xc2, 0x45, 0x3b, 0x6f, 0x72, 0x2b, 0x17, 0x6c, 0x71, 0xc9, 0xca, 0xb7, - 0x97, 0x4b, 0xb6, 0xde, 0xfe, 0xce, 0xfb, 0x6f, 0xbf, 0x3e, 0xad, 0x6c, 0x93, 0x0a, 0xcd, 0xdb, - 0x6c, 0xbb, 0x65, 0xe4, 0x2b, 0xc2, 0xa5, 0x4c, 0xf7, 0xe4, 0xce, 0xbf, 0x6d, 0x16, 0x97, 0xb1, - 0x5c, 0x3f, 0x83, 0xc2, 0xd1, 0xed, 0x19, 0xba, 0xfb, 0xe4, 0x5e, 0x2e, 0x5d, 0x76, 0x37, 0x81, - 0xbe, 0xcd, 0x6e, 0xfb, 0x3b, 0xf2, 0x19, 0xe1, 0xf5, 0xec, 0xdc, 0xc9, 0xf2, 0x08, 0xb3, 0xe7, - 0x6c, 0x9c, 0x45, 0xe2, 0xb0, 0x03, 0x83, 0xbd, 0x4b, 0xaa, 0xcb, 0x61, 0xef, 0x37, 0x8f, 0x47, - 0x1e, 0x3a, 0x19, 0x79, 0xe8, 0xe7, 0xc8, 0x43, 0x1f, 0xc7, 0x5e, 0xe1, 0x64, 0xec, 0x15, 0xbe, - 0x8f, 0xbd, 0xc2, 0xcb, 0x9a, 0x90, 0xe9, 0x61, 0x3f, 0x0c, 0x3a, 0xba, 0x37, 0xad, 0x65, 0x3f, - 0x35, 0xe8, 0xbe, 0xa6, 0x6f, 0xe6, 0x85, 0xd3, 0x61, 0xcc, 0x21, 0x2c, 0x9a, 0xbf, 0xcf, 0xdd, - 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x0f, 0xc0, 0xe6, 0x45, 0x05, 0x00, 0x00, + 0x49, 0xb2, 0x25, 0xae, 0x26, 0xbd, 0x2d, 0x6f, 0xde, 0xff, 0xfd, 0x7f, 0x6f, 0xe6, 0xcf, 0xe2, + 0x1b, 0x2d, 0x0d, 0x1d, 0x0d, 0x14, 0x22, 0x06, 0x47, 0x52, 0x09, 0xda, 0xab, 0x85, 0x3c, 0x65, + 0x35, 0x7a, 0xdc, 0xe5, 0x49, 0x3f, 0x88, 0x13, 0x9d, 0x6a, 0xb2, 0x6e, 0x9b, 0x82, 0x71, 0x53, + 0xe0, 0x9a, 0xca, 0x37, 0x9d, 0x3a, 0x64, 0xc0, 0xad, 0x62, 0xa2, 0x8f, 0x99, 0x90, 0x8a, 0xa5, + 0x52, 0x2b, 0x3b, 0xa4, 0xbc, 0x26, 0xb4, 0xd0, 0xe6, 0x93, 0x8e, 0xbe, 0x5c, 0xf5, 0x9a, 0xd0, + 0x5a, 0x44, 0x9c, 0xb2, 0x58, 0x52, 0xa6, 0x94, 0x4e, 0x8d, 0x04, 0xdc, 0x69, 0x35, 0x8f, 0x6e, + 0x42, 0x62, 0xfa, 0xfc, 0x35, 0x4c, 0x9e, 0x8e, 0xdc, 0x9f, 0xb0, 0x84, 0x75, 0xa0, 0xc1, 0x8f, + 0xbb, 0x1c, 0x52, 0xff, 0x39, 0xbe, 0x72, 0xa6, 0x0a, 0xb1, 0x56, 0xc0, 0xc9, 0x1e, 0x2e, 0xc6, + 0xa6, 0xb2, 0x81, 0xae, 0xa3, 0xed, 0x52, 0xbd, 0x12, 0xe4, 0xac, 0x17, 0x58, 0xe1, 0xfe, 0xca, + 0xc9, 0x8f, 0x4a, 0xa1, 0xe1, 0x44, 0xfe, 0x7d, 0xbc, 0x6e, 0xa6, 0x3e, 0x93, 0x42, 0x49, 0x25, + 0x1e, 0xab, 0x43, 0xed, 0x0c, 0xc9, 0x26, 0x5e, 0x6d, 0x69, 0x05, 0x4d, 0xd6, 0x6e, 0x27, 0x1c, + 0xec, 0xfc, 0x8b, 0x8d, 0xd2, 0xa8, 0xf6, 0xc0, 0x96, 0xfc, 0x3e, 0xde, 0x98, 0x55, 0x3b, 0xb0, + 0x57, 0xf8, 0x72, 0x8f, 0x45, 0x4d, 0xb0, 0x47, 0x4d, 0xa9, 0x0e, 0xb5, 0x43, 0xdc, 0xcd, 0x45, + 0x7c, 0xc1, 0x22, 0xd9, 0x66, 0xa9, 0x4e, 0x32, 0x03, 0x1d, 0xf0, 0xa5, 0x1e, 0x8b, 0x32, 0x55, + 0x3f, 0x9c, 0xb5, 0x1e, 0x5f, 0x15, 0x79, 0x84, 0xf1, 0xf4, 0xc1, 0x9c, 0x69, 0x75, 0x6c, 0x3a, + 0x7a, 0xdd, 0xc0, 0xe6, 0x61, 0x7a, 0x33, 0x82, 0x3b, 0x6d, 0x23, 0xa3, 0xf4, 0xbf, 0x20, 0x7c, + 0xf5, 0x2f, 0x26, 0x6e, 0xc1, 0x03, 0xbc, 0xe2, 0x96, 0x5a, 0x3e, 0xef, 0x52, 0x66, 0x00, 0x39, + 0x38, 0x83, 0xbb, 0x64, 0x70, 0xb7, 0xfe, 0x8b, 0x6b, 0x29, 0xb2, 0xbc, 0xf5, 0xdf, 0xcb, 0xf8, + 0x82, 0xe1, 0x25, 0x1f, 0x10, 0x2e, 0xda, 0xf7, 0x26, 0x3b, 0xb9, 0x60, 0xb3, 0x21, 0x2b, 0xdf, + 0x9a, 0xaf, 0xd9, 0x7a, 0xfb, 0x5b, 0xef, 0xbf, 0xfd, 0xfa, 0xb4, 0xb4, 0x49, 0x2a, 0x34, 0x2f, + 0xd9, 0x36, 0x65, 0xe4, 0x2b, 0xc2, 0xa5, 0xcc, 0xf6, 0xe4, 0xf6, 0xbf, 0x6d, 0x66, 0xc3, 0x58, + 0xae, 0x2d, 0xa0, 0x70, 0x74, 0x7b, 0x86, 0xee, 0x1e, 0xb9, 0x9b, 0x4b, 0x97, 0xcd, 0x26, 0xd0, + 0xb7, 0xd9, 0xb4, 0xbf, 0x23, 0x9f, 0x11, 0x5e, 0xcd, 0xbe, 0x3b, 0x99, 0x1f, 0x61, 0x72, 0x9d, + 0xf5, 0x45, 0x24, 0x0e, 0x3b, 0x30, 0xd8, 0xdb, 0xa4, 0x3a, 0x1f, 0xf6, 0xfe, 0xc3, 0x93, 0x81, + 0x87, 0x4e, 0x07, 0x1e, 0xfa, 0x39, 0xf0, 0xd0, 0xc7, 0xa1, 0x57, 0x38, 0x1d, 0x7a, 0x85, 0xef, + 0x43, 0xaf, 0xf0, 0x72, 0x47, 0xc8, 0xf4, 0xa8, 0x1b, 0x06, 0x2d, 0xdd, 0xa1, 0x91, 0x54, 0x9c, + 0x46, 0x61, 0x67, 0x17, 0xda, 0xaf, 0x69, 0xaf, 0x4e, 0xdf, 0x4c, 0xc7, 0xa6, 0xfd, 0x98, 0x43, + 0x58, 0x34, 0xff, 0x9e, 0x3b, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xae, 0xd8, 0xbf, 0x43, + 0x05, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/slashing/types/slashing.pb.go b/x/slashing/types/slashing.pb.go index 763d69e58d..cc5bc931ba 100644 --- a/x/slashing/types/slashing.pb.go +++ b/x/slashing/types/slashing.pb.go @@ -8,9 +8,9 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/golang/protobuf/ptypes/duration" - _ "github.com/golang/protobuf/ptypes/timestamp" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" + _ "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -33,19 +33,16 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // liveness activity. type ValidatorSigningInfo struct { Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - // Height at which validator was first a candidate OR was unjailed + // height at which validator was first a candidate OR was unjailed StartHeight int64 `protobuf:"varint,2,opt,name=start_height,json=startHeight,proto3" json:"start_height,omitempty" yaml:"start_height"` - // Index which is incremented each time the validator was a bonded - // in a block and may have signed a precommit or not. This in conjunction with the - // `SignedBlocksWindow` param determines the index in the `MissedBlocksBitArray`. + // index offset into signed block bit array IndexOffset int64 `protobuf:"varint,3,opt,name=index_offset,json=indexOffset,proto3" json:"index_offset,omitempty" yaml:"index_offset"` - // Timestamp until which the validator is jailed due to liveness downtime. + // timestamp validator cannot be unjailed until JailedUntil time.Time `protobuf:"bytes,4,opt,name=jailed_until,json=jailedUntil,proto3,stdtime" json:"jailed_until" yaml:"jailed_until"` - // Whether or not a validator has been tombstoned (killed out of validator set). It is set - // once the validator commits an equivocation or for any other configured misbehiavor. + // whether or not a validator has been tombstoned (killed out of validator + // set) Tombstoned bool `protobuf:"varint,5,opt,name=tombstoned,proto3" json:"tombstoned,omitempty"` - // A counter kept to avoid unnecessary array reads. - // Note that `Sum(MissedBlocksBitArray)` always equals `MissedBlocksCounter`. + // missed blocks counter (to avoid scanning the array every time) MissedBlocksCounter int64 `protobuf:"varint,6,opt,name=missed_blocks_counter,json=missedBlocksCounter,proto3" json:"missed_blocks_counter,omitempty" yaml:"missed_blocks_counter"` } @@ -125,11 +122,11 @@ func (m *ValidatorSigningInfo) GetMissedBlocksCounter() int64 { // Params represents the parameters used for by the slashing module. type Params struct { - SignedBlocksWindow int64 `protobuf:"varint,1,opt,name=signed_blocks_window,json=signedBlocksWindow,proto3" json:"signed_blocks_window,omitempty" yaml:"signed_blocks_window"` - MinSignedPerWindow github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=min_signed_per_window,json=minSignedPerWindow,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"min_signed_per_window" yaml:"min_signed_per_window"` - DowntimeJailDuration time.Duration `protobuf:"bytes,3,opt,name=downtime_jail_duration,json=downtimeJailDuration,proto3,stdduration" json:"downtime_jail_duration" yaml:"downtime_jail_duration"` - SlashFractionDoubleSign github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=slash_fraction_double_sign,json=slashFractionDoubleSign,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"slash_fraction_double_sign" yaml:"slash_fraction_double_sign"` - SlashFractionDowntime github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=slash_fraction_downtime,json=slashFractionDowntime,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"slash_fraction_downtime" yaml:"slash_fraction_downtime"` + SignedBlocksWindow int64 `protobuf:"varint,1,opt,name=signed_blocks_window,json=signedBlocksWindow,proto3" json:"signed_blocks_window,omitempty" yaml:"signed_blocks_window"` + MinSignedPerWindow github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,2,opt,name=min_signed_per_window,json=minSignedPerWindow,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"min_signed_per_window" yaml:"min_signed_per_window"` + DowntimeJailDuration time.Duration `protobuf:"bytes,3,opt,name=downtime_jail_duration,json=downtimeJailDuration,proto3,stdduration" json:"downtime_jail_duration" yaml:"downtime_jail_duration"` + SlashFractionDoubleSign github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,4,opt,name=slash_fraction_double_sign,json=slashFractionDoubleSign,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"slash_fraction_double_sign" yaml:"slash_fraction_double_sign"` + SlashFractionDowntime github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,5,opt,name=slash_fraction_downtime,json=slashFractionDowntime,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"slash_fraction_downtime" yaml:"slash_fraction_downtime"` } func (m *Params) Reset() { *m = Params{} } @@ -189,47 +186,47 @@ func init() { } var fileDescriptor_1078e5d96a74cc52 = []byte{ - // 636 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xbd, 0x6f, 0xd3, 0x4e, - 0x18, 0xce, 0xfd, 0xd2, 0x5f, 0x29, 0x97, 0x4c, 0x6e, 0x4a, 0x4c, 0x00, 0x3b, 0x78, 0xa8, 0xc2, - 0x50, 0x5b, 0x2d, 0x5b, 0x47, 0x53, 0x21, 0x3e, 0x24, 0x28, 0x6e, 0x01, 0x89, 0x01, 0xeb, 0x9c, - 0xbb, 0x38, 0x47, 0xed, 0xbb, 0xc8, 0x77, 0xa1, 0x2d, 0x1b, 0x5b, 0xc7, 0x8e, 0x1d, 0x3b, 0xf2, - 0xa7, 0x74, 0xec, 0x88, 0x18, 0x02, 0x4a, 0x17, 0xe6, 0x6e, 0x6c, 0xc8, 0x77, 0x76, 0x1b, 0xa5, - 0x29, 0x52, 0xa7, 0xe4, 0x7d, 0xde, 0xe7, 0x7d, 0xee, 0x79, 0x3f, 0x12, 0xb8, 0xdc, 0xe5, 0x22, - 0xe5, 0xc2, 0x13, 0x09, 0x12, 0x7d, 0xca, 0x62, 0xef, 0xf3, 0x6a, 0x44, 0x24, 0x5a, 0xbd, 0x00, - 0xdc, 0x41, 0xc6, 0x25, 0x37, 0x9a, 0x9a, 0xe7, 0x5e, 0xc0, 0x05, 0xaf, 0xd5, 0x88, 0x79, 0xcc, - 0x15, 0xc7, 0xcb, 0xbf, 0x69, 0x7a, 0xcb, 0x8a, 0x39, 0x8f, 0x13, 0xe2, 0xa9, 0x28, 0x1a, 0xf6, - 0x3c, 0x3c, 0xcc, 0x90, 0xa4, 0x9c, 0x15, 0x79, 0x7b, 0x3a, 0x2f, 0x69, 0x4a, 0x84, 0x44, 0xe9, - 0x40, 0x13, 0x9c, 0x83, 0x2a, 0x6c, 0xbc, 0x43, 0x09, 0xc5, 0x48, 0xf2, 0x6c, 0x8b, 0xc6, 0x8c, - 0xb2, 0xf8, 0x39, 0xeb, 0x71, 0xc3, 0x84, 0xb7, 0x10, 0xc6, 0x19, 0x11, 0xc2, 0x04, 0x6d, 0xd0, - 0xb9, 0x1d, 0x94, 0xa1, 0xb1, 0x0e, 0xeb, 0x42, 0xa2, 0x4c, 0x86, 0x7d, 0x42, 0xe3, 0xbe, 0x34, - 0xff, 0x6b, 0x83, 0x4e, 0xd5, 0x6f, 0x9e, 0x8f, 0xec, 0xc5, 0x7d, 0x94, 0x26, 0xeb, 0xce, 0x64, - 0xd6, 0x09, 0x6a, 0x2a, 0x7c, 0xa6, 0xa2, 0xbc, 0x96, 0x32, 0x4c, 0xf6, 0x42, 0xde, 0xeb, 0x09, - 0x22, 0xcd, 0xea, 0x74, 0xed, 0x64, 0xd6, 0x09, 0x6a, 0x2a, 0x7c, 0xad, 0x22, 0xe3, 0x23, 0xac, - 0x7f, 0x42, 0x34, 0x21, 0x38, 0x1c, 0x32, 0x49, 0x13, 0x73, 0xae, 0x0d, 0x3a, 0xb5, 0xb5, 0x96, - 0xab, 0x5b, 0x74, 0xcb, 0x16, 0xdd, 0xed, 0xb2, 0x45, 0xdf, 0x3e, 0x19, 0xd9, 0x95, 0x4b, 0xed, - 0xc9, 0x6a, 0xe7, 0xf0, 0xa7, 0x0d, 0x82, 0x9a, 0x86, 0xde, 0xe6, 0x88, 0x61, 0x41, 0x28, 0x79, - 0x1a, 0x09, 0xc9, 0x19, 0xc1, 0xe6, 0xff, 0x6d, 0xd0, 0x59, 0x08, 0x26, 0x10, 0x63, 0x1b, 0x2e, - 0xa5, 0x54, 0x08, 0x82, 0xc3, 0x28, 0xe1, 0xdd, 0x1d, 0x11, 0x76, 0xf9, 0x90, 0x49, 0x92, 0x99, - 0xf3, 0xaa, 0x89, 0xf6, 0xf9, 0xc8, 0xbe, 0xaf, 0x1f, 0x9a, 0x49, 0x73, 0x82, 0x45, 0x8d, 0xfb, - 0x0a, 0x7e, 0xa2, 0xd1, 0xf5, 0x85, 0xa3, 0x63, 0xbb, 0xf2, 0xfb, 0xd8, 0x06, 0xce, 0x9f, 0x39, - 0x38, 0xbf, 0x89, 0x32, 0x94, 0x0a, 0xe3, 0x0d, 0x6c, 0x08, 0x1a, 0xb3, 0x4b, 0x8d, 0x5d, 0xca, - 0x30, 0xdf, 0x55, 0x9b, 0xa8, 0xfa, 0xf6, 0xf9, 0xc8, 0xbe, 0x57, 0x8c, 0x7a, 0x06, 0xcb, 0x09, - 0x0c, 0x0d, 0xeb, 0x87, 0xde, 0x2b, 0xd0, 0xf8, 0x0a, 0x72, 0xfb, 0x2c, 0x2c, 0x2a, 0x06, 0x24, - 0x2b, 0x45, 0xf3, 0xfd, 0xd5, 0xfd, 0x57, 0xf9, 0xac, 0x7e, 0x8c, 0xec, 0xe5, 0x98, 0xca, 0xfe, - 0x30, 0x72, 0xbb, 0x3c, 0xf5, 0x8a, 0x9b, 0xd5, 0x1f, 0x2b, 0x02, 0xef, 0x78, 0x72, 0x7f, 0x40, - 0x84, 0xbb, 0x41, 0xba, 0x93, 0xcd, 0xce, 0x10, 0x75, 0x02, 0x23, 0xa5, 0x6c, 0x4b, 0xc1, 0x9b, - 0x24, 0x2b, 0x3c, 0x7c, 0x81, 0x77, 0x30, 0xdf, 0x65, 0xf9, 0x0d, 0x86, 0xf9, 0xe4, 0xc3, 0xf2, - 0x5a, 0xd5, 0x1d, 0xd4, 0xd6, 0xee, 0x5e, 0xd9, 0xe5, 0x46, 0x41, 0xf0, 0x1f, 0x15, 0xab, 0x7c, - 0xa0, 0x1f, 0x9d, 0x2d, 0xe3, 0x1c, 0xe5, 0x4b, 0x6d, 0x94, 0xc9, 0x17, 0x88, 0x26, 0xa5, 0x80, - 0x71, 0x08, 0x60, 0x4b, 0xfd, 0xa8, 0xc2, 0x5e, 0x86, 0xba, 0x39, 0x14, 0x62, 0x3e, 0x8c, 0x12, - 0xa2, 0xcc, 0xab, 0x63, 0xaa, 0xfb, 0x5b, 0x37, 0x1e, 0xc2, 0xc3, 0x62, 0x0f, 0xd7, 0x2a, 0x3b, - 0x41, 0x53, 0x25, 0x9f, 0x16, 0xb9, 0x0d, 0x95, 0xca, 0x27, 0x63, 0x1c, 0x00, 0xd8, 0xbc, 0x52, - 0xa8, 0xad, 0xab, 0xf3, 0xab, 0xfb, 0x9b, 0x37, 0xf6, 0x63, 0x5d, 0xe3, 0x47, 0xcb, 0x3a, 0xc1, - 0xd2, 0x94, 0x19, 0x8d, 0xfb, 0x2f, 0xbf, 0x8d, 0x2d, 0x70, 0x32, 0xb6, 0xc0, 0xe9, 0xd8, 0x02, - 0xbf, 0xc6, 0x16, 0x38, 0x3c, 0xb3, 0x2a, 0xa7, 0x67, 0x56, 0xe5, 0xfb, 0x99, 0x55, 0xf9, 0xb0, - 0xf2, 0xcf, 0xe7, 0xf7, 0x2e, 0xff, 0xd4, 0x94, 0x93, 0x68, 0x5e, 0xad, 0xef, 0xf1, 0xdf, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x7b, 0x78, 0xfd, 0x40, 0xf4, 0x04, 0x00, 0x00, + // 640 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x54, 0xbf, 0x6f, 0xd3, 0x40, + 0x14, 0xce, 0x91, 0x52, 0xca, 0x25, 0x93, 0x9b, 0x12, 0x13, 0xc0, 0x0e, 0x16, 0x42, 0x41, 0x08, + 0x5b, 0x2d, 0x5b, 0x47, 0x53, 0x21, 0x8a, 0x10, 0xb4, 0x6e, 0x01, 0x89, 0x01, 0xeb, 0x1c, 0x5f, + 0x9c, 0xa3, 0xf6, 0x5d, 0xe4, 0x3b, 0xf7, 0x07, 0x0b, 0x1b, 0x62, 0x42, 0x1d, 0x3b, 0x76, 0xe4, + 0x4f, 0xe9, 0xd8, 0x11, 0x31, 0x04, 0x94, 0x2e, 0xcc, 0xf9, 0x0b, 0x90, 0xef, 0xec, 0x36, 0x6a, + 0x53, 0xa4, 0x6e, 0x79, 0xdf, 0xfb, 0xde, 0x77, 0xdf, 0xfb, 0x11, 0xc3, 0x87, 0x5d, 0xc6, 0x13, + 0xc6, 0x1d, 0x1e, 0x23, 0xde, 0x27, 0x34, 0x72, 0xb6, 0x17, 0x03, 0x2c, 0xd0, 0xe2, 0x29, 0x60, + 0x0f, 0x52, 0x26, 0x98, 0xd6, 0x54, 0x3c, 0xfb, 0x14, 0x2e, 0x78, 0xad, 0x46, 0xc4, 0x22, 0x26, + 0x39, 0x4e, 0xfe, 0x4b, 0xd1, 0x5b, 0x46, 0xc4, 0x58, 0x14, 0x63, 0x47, 0x46, 0x41, 0xd6, 0x73, + 0xc2, 0x2c, 0x45, 0x82, 0x30, 0x5a, 0xe4, 0xcd, 0xf3, 0x79, 0x41, 0x12, 0xcc, 0x05, 0x4a, 0x06, + 0x8a, 0x60, 0x7d, 0xab, 0xc2, 0xc6, 0x3b, 0x14, 0x93, 0x10, 0x09, 0x96, 0x6e, 0x90, 0x88, 0x12, + 0x1a, 0xad, 0xd2, 0x1e, 0xd3, 0x74, 0x78, 0x03, 0x85, 0x61, 0x8a, 0x39, 0xd7, 0x41, 0x1b, 0x74, + 0x6e, 0x7a, 0x65, 0xa8, 0x2d, 0xc3, 0x3a, 0x17, 0x28, 0x15, 0x7e, 0x1f, 0x93, 0xa8, 0x2f, 0xf4, + 0x6b, 0x6d, 0xd0, 0xa9, 0xba, 0xcd, 0xf1, 0xd0, 0x9c, 0xdf, 0x43, 0x49, 0xbc, 0x6c, 0x4d, 0x66, + 0x2d, 0xaf, 0x26, 0xc3, 0x17, 0x32, 0xca, 0x6b, 0x09, 0x0d, 0xf1, 0xae, 0xcf, 0x7a, 0x3d, 0x8e, + 0x85, 0x5e, 0x3d, 0x5f, 0x3b, 0x99, 0xb5, 0xbc, 0x9a, 0x0c, 0xdf, 0xc8, 0x48, 0xfb, 0x08, 0xeb, + 0x9f, 0x10, 0x89, 0x71, 0xe8, 0x67, 0x54, 0x90, 0x58, 0x9f, 0x69, 0x83, 0x4e, 0x6d, 0xa9, 0x65, + 0xab, 0x16, 0xed, 0xb2, 0x45, 0x7b, 0xb3, 0x6c, 0xd1, 0x35, 0x8f, 0x86, 0x66, 0xe5, 0x4c, 0x7b, + 0xb2, 0xda, 0xda, 0xff, 0x6d, 0x02, 0xaf, 0xa6, 0xa0, 0xb7, 0x39, 0xa2, 0x19, 0x10, 0x0a, 0x96, + 0x04, 0x5c, 0x30, 0x8a, 0x43, 0xfd, 0x7a, 0x1b, 0x74, 0xe6, 0xbc, 0x09, 0x44, 0xdb, 0x84, 0x0b, + 0x09, 0xe1, 0x1c, 0x87, 0x7e, 0x10, 0xb3, 0xee, 0x16, 0xf7, 0xbb, 0x2c, 0xa3, 0x02, 0xa7, 0xfa, + 0xac, 0x6c, 0xa2, 0x3d, 0x1e, 0x9a, 0x77, 0xd5, 0x43, 0x53, 0x69, 0x96, 0x37, 0xaf, 0x70, 0x57, + 0xc2, 0xcf, 0x14, 0xba, 0x3c, 0x77, 0x70, 0x68, 0x56, 0xfe, 0x1e, 0x9a, 0xc0, 0x1a, 0xcf, 0xc0, + 0xd9, 0x35, 0x94, 0xa2, 0x84, 0x6b, 0xeb, 0xb0, 0xc1, 0x49, 0x44, 0xcf, 0x34, 0x76, 0x08, 0x0d, + 0xd9, 0x8e, 0xdc, 0x44, 0xd5, 0x35, 0xc7, 0x43, 0xf3, 0x4e, 0x31, 0xea, 0x29, 0x2c, 0xcb, 0xd3, + 0x14, 0xac, 0x1e, 0x7a, 0x2f, 0x41, 0xed, 0x4b, 0xee, 0x9e, 0xfa, 0x45, 0xc1, 0x00, 0xa7, 0xa5, + 0x66, 0xbe, 0xbe, 0xba, 0xfb, 0x2a, 0x1f, 0xd5, 0xaf, 0xa1, 0xf9, 0x20, 0x22, 0xa2, 0x9f, 0x05, + 0x76, 0x97, 0x25, 0x4e, 0x4c, 0x28, 0x76, 0xe2, 0x20, 0x79, 0xc2, 0xc3, 0x2d, 0x67, 0x7b, 0xc9, + 0x11, 0x7b, 0x03, 0xcc, 0xed, 0x15, 0xdc, 0x9d, 0xec, 0x74, 0x8a, 0xa4, 0xe5, 0x69, 0x09, 0xa1, + 0x1b, 0x12, 0x5e, 0xc3, 0x69, 0x61, 0xe0, 0x33, 0xbc, 0x15, 0xb2, 0x1d, 0x9a, 0x1f, 0xa0, 0x9f, + 0x8f, 0xdd, 0x2f, 0x4f, 0x55, 0x1e, 0x41, 0x6d, 0xe9, 0xf6, 0x85, 0x45, 0xae, 0x14, 0x04, 0xf7, + 0x51, 0xb1, 0xc7, 0x7b, 0xea, 0xd1, 0xe9, 0x32, 0xd6, 0x41, 0xbe, 0xd1, 0x46, 0x99, 0x7c, 0x89, + 0x48, 0x5c, 0x0a, 0x68, 0xdf, 0x01, 0x6c, 0xc9, 0x7f, 0x94, 0xdf, 0x4b, 0x51, 0x37, 0x87, 0xfc, + 0x90, 0x65, 0x41, 0x8c, 0xa5, 0x79, 0x79, 0x49, 0x75, 0x77, 0xfd, 0x8a, 0x23, 0xb8, 0x5f, 0xac, + 0xe0, 0x52, 0x5d, 0xcb, 0x6b, 0xca, 0xe4, 0xf3, 0x22, 0xb7, 0x22, 0x53, 0xf9, 0x5c, 0xb4, 0xaf, + 0x00, 0x36, 0x2f, 0x14, 0x2a, 0xe3, 0xf2, 0xf2, 0xea, 0xee, 0xeb, 0x2b, 0xba, 0x31, 0x2e, 0x71, + 0xa3, 0x44, 0x2d, 0x6f, 0xe1, 0x9c, 0x15, 0x85, 0xbb, 0xab, 0x3f, 0x46, 0x06, 0x38, 0x1a, 0x19, + 0xe0, 0x78, 0x64, 0x80, 0x3f, 0x23, 0x03, 0xec, 0x9f, 0x18, 0x95, 0xe3, 0x13, 0xa3, 0xf2, 0xf3, + 0xc4, 0xa8, 0x7c, 0x78, 0xfc, 0x9f, 0xc7, 0x77, 0xcf, 0xbe, 0x65, 0xd2, 0x47, 0x30, 0x2b, 0x17, + 0xf7, 0xf4, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfc, 0x7e, 0xf2, 0xa8, 0xeb, 0x04, 0x00, 0x00, } func (this *ValidatorSigningInfo) Equal(that interface{}) bool { diff --git a/x/slashing/types/tx.pb.go b/x/slashing/types/tx.pb.go index ed6dbcd170..b6bbb5302b 100644 --- a/x/slashing/types/tx.pb.go +++ b/x/slashing/types/tx.pb.go @@ -111,7 +111,7 @@ func init() { func init() { proto.RegisterFile("cosmos/slashing/v1beta1/tx.proto", fileDescriptor_3c5611c0c4a59d9d) } var fileDescriptor_3c5611c0c4a59d9d = []byte{ - // 269 bytes of a gzipped FileDescriptorProto + // 276 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x48, 0xce, 0x2f, 0xce, 0xcd, 0x2f, 0xd6, 0x2f, 0xce, 0x49, 0x2c, 0xce, 0xc8, 0xcc, 0x4b, 0xd7, 0x2f, 0x33, 0x4c, 0x4a, 0x2d, 0x49, 0x34, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x87, 0xa8, @@ -123,12 +123,13 @@ var fileDescriptor_3c5611c0c4a59d9d = []byte{ 0x05, 0xf1, 0xc2, 0x35, 0x39, 0xa6, 0xa4, 0x14, 0x59, 0x71, 0x74, 0x2c, 0x90, 0x67, 0x98, 0xb1, 0x40, 0x9e, 0x51, 0x49, 0x98, 0x4b, 0x10, 0x6e, 0x78, 0x50, 0x6a, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0x51, 0x3c, 0x17, 0xb3, 0x6f, 0x71, 0xba, 0x50, 0x04, 0x17, 0x1b, 0xd4, 0x56, 0x25, 0x3d, - 0x1c, 0x4e, 0xd6, 0x83, 0x6b, 0x96, 0xd2, 0x22, 0xac, 0x06, 0x66, 0x81, 0x93, 0xf7, 0x8a, 0x47, + 0x1c, 0x4e, 0xd6, 0x83, 0x6b, 0x96, 0xd2, 0x22, 0xac, 0x06, 0x66, 0x81, 0x93, 0xe7, 0x8a, 0x47, 0x72, 0x8c, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x84, - 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9b, 0x9e, 0x59, - 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x0f, 0x0d, 0x4c, 0x08, 0xa5, 0x5b, 0x9c, 0x92, - 0xad, 0x5f, 0x81, 0x08, 0xd9, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0x70, 0x30, 0x19, 0x03, - 0x02, 0x00, 0x00, 0xff, 0xff, 0x1b, 0xa7, 0xdc, 0xcf, 0x79, 0x01, 0x00, 0x00, + 0xc7, 0x72, 0x0c, 0x17, 0x1e, 0xcb, 0x31, 0xdc, 0x78, 0x2c, 0xc7, 0x10, 0xa5, 0x9d, 0x9e, 0x59, + 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f, 0x93, 0x99, 0x97, 0xaa, 0x9f, 0x93, 0x94, + 0xab, 0x5b, 0x9c, 0x92, 0xad, 0x5f, 0x66, 0xa4, 0x5f, 0x81, 0x08, 0xd7, 0x92, 0xca, 0x82, 0xd4, + 0xe2, 0x24, 0x36, 0x70, 0x20, 0x19, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x81, 0x87, 0x44, 0x0d, + 0x77, 0x01, 0x00, 0x00, } func (this *MsgUnjail) Equal(that interface{}) bool { diff --git a/x/staking/abci.go b/x/staking/abci.go index 9791311769..7c3b2d8d9c 100644 --- a/x/staking/abci.go +++ b/x/staking/abci.go @@ -3,7 +3,7 @@ package staking import ( "time" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/telemetry" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/staking/app_test.go b/x/staking/app_test.go index 1ed0245525..92fac7bd03 100644 --- a/x/staking/app_test.go +++ b/x/staking/app_test.go @@ -3,9 +3,9 @@ package staking_test import ( "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -15,7 +15,7 @@ import ( ) func checkValidator(t *testing.T, app *simapp.SimApp, addr sdk.ValAddress, expFound bool) types.Validator { - ctxCheck := app.BaseApp.NewContext(true, tmproto.Header{}) + ctxCheck := app.BaseApp.NewContext(true, ostproto.Header{}) validator, found := app.StakingKeeper.GetValidator(ctxCheck, addr) require.Equal(t, expFound, found) @@ -27,7 +27,7 @@ func checkDelegation( validatorAddr sdk.ValAddress, expFound bool, expShares sdk.Dec, ) { - ctxCheck := app.BaseApp.NewContext(true, tmproto.Header{}) + ctxCheck := app.BaseApp.NewContext(true, ostproto.Header{}) delegation, found := app.StakingKeeper.GetDelegation(ctxCheck, delegatorAddr, validatorAddr) if expFound { require.True(t, found) @@ -70,13 +70,13 @@ func TestStakingMsgs(t *testing.T) { ) require.NoError(t, err) - header := tmproto.Header{Height: app.LastBlockHeight() + 1} + header := ostproto.Header{Height: app.LastBlockHeight() + 1} txGen := simapp.MakeTestEncodingConfig().TxConfig _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{createValidatorMsg}, "", []uint64{0}, []uint64{0}, true, true, priv1) require.NoError(t, err) simapp.CheckBalance(t, app, addr1, sdk.Coins{genCoin.Sub(bondCoin)}) - header = tmproto.Header{Height: app.LastBlockHeight() + 1} + header = ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) validator := checkValidator(t, app, sdk.ValAddress(addr1), true) @@ -84,14 +84,14 @@ func TestStakingMsgs(t *testing.T) { require.Equal(t, types.Bonded, validator.Status) require.True(sdk.IntEq(t, bondTokens, validator.BondedTokens())) - header = tmproto.Header{Height: app.LastBlockHeight() + 1} + header = ostproto.Header{Height: app.LastBlockHeight() + 1} app.BeginBlock(abci.RequestBeginBlock{Header: header}) // edit the validator description = types.NewDescription("bar_moniker", "", "", "", "") editValidatorMsg := types.NewMsgEditValidator(sdk.ValAddress(addr1), description, nil, nil) - header = tmproto.Header{Height: app.LastBlockHeight() + 1} + header = ostproto.Header{Height: app.LastBlockHeight() + 1} _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{editValidatorMsg}, "", []uint64{0}, []uint64{1}, true, true, priv1) require.NoError(t, err) @@ -102,7 +102,7 @@ func TestStakingMsgs(t *testing.T) { simapp.CheckBalance(t, app, addr2, sdk.Coins{genCoin}) delegateMsg := types.NewMsgDelegate(addr2, sdk.ValAddress(addr1), bondCoin) - header = tmproto.Header{Height: app.LastBlockHeight() + 1} + header = ostproto.Header{Height: app.LastBlockHeight() + 1} _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{delegateMsg}, "", []uint64{1}, []uint64{0}, true, true, priv2) require.NoError(t, err) @@ -111,7 +111,7 @@ func TestStakingMsgs(t *testing.T) { // begin unbonding beginUnbondingMsg := types.NewMsgUndelegate(addr2, sdk.ValAddress(addr1), bondCoin) - header = tmproto.Header{Height: app.LastBlockHeight() + 1} + header = ostproto.Header{Height: app.LastBlockHeight() + 1} _, _, err = simapp.SignCheckDeliver(t, txGen, app.BaseApp, header, []sdk.Msg{beginUnbondingMsg}, "", []uint64{1}, []uint64{1}, true, true, priv2) require.NoError(t, err) diff --git a/x/staking/client/cli/cli_test.go b/x/staking/client/cli/cli_test.go index 9295488724..dd59296388 100644 --- a/x/staking/client/cli/cli_test.go +++ b/x/staking/client/cli/cli_test.go @@ -9,10 +9,10 @@ import ( "testing" "github.com/gogo/protobuf/proto" + ostcli "github.com/line/ostracon/libs/cli" + "github.com/line/ostracon/proto/ostracon/crypto" + "github.com/line/ostracon/rpc/client/http" "github.com/stretchr/testify/suite" - tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/tendermint/tendermint/proto/tendermint/crypto" - "github.com/tendermint/tendermint/rpc/client/http" "github.com/line/lbm-sdk/v2/client/flags" "github.com/line/lbm-sdk/v2/crypto/hd" @@ -214,17 +214,17 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidator() { }{ { "with invalid address ", - []string{"somethinginvalidaddress", fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{"somethinginvalidaddress", fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, true, }, { "with valid and not existing address", - []string{"cosmosvaloper15jkng8hytwt22lllv6mw4k89qkqehtahd84ptu", fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{"cosmosvaloper15jkng8hytwt22lllv6mw4k89qkqehtahd84ptu", fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, true, }, { "happy case", - []string{fmt.Sprintf("%s", val.ValAddress), fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("%s", val.ValAddress), fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, false, }, } @@ -257,14 +257,14 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidators() { { "one validator case", []string{ - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), fmt.Sprintf("--%s=1", flags.FlagLimit), }, 1, }, { "multi validator case", - []string{fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, len(s.network.Validators), }, } @@ -302,7 +302,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegation() { []string{ "wrongDelAddr", val2.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, nil, nil, }, @@ -311,7 +311,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegation() { []string{ val.Address.String(), "wrongValAddr", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, nil, nil, }, @@ -320,7 +320,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegation() { []string{ val.Address.String(), val2.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, &types.DelegationResponse{}, @@ -377,7 +377,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegations() { "valid request (height specific)", []string{ val.Address.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), fmt.Sprintf("--%s=1", flags.FlagHeight), }, false, @@ -433,7 +433,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryDelegationsTo() { "valid request(height specific)", []string{ val.Address.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), fmt.Sprintf("--%s=1", flags.FlagHeight), }, false, @@ -477,7 +477,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryUnbondingDelegations() { "wrong delegator address", []string{ "wrongDelAddr", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -485,7 +485,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryUnbondingDelegations() { "valid request", []string{ val.Address.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -526,7 +526,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryUnbondingDelegation() { []string{ "wrongDelAddr", val.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -535,7 +535,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryUnbondingDelegation() { []string{ val.Address.String(), "wrongValAddr", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -544,7 +544,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryUnbondingDelegation() { []string{ val.Address.String(), val.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -585,7 +585,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorUnbondingDelegations() { "wrong validator address", []string{ "wrongValAddr", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -593,7 +593,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryValidatorUnbondingDelegations() { "valid request", []string{ val.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -634,7 +634,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegations() { "wrong delegator address", []string{ "wrongdeladdr", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -642,7 +642,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegations() { "valid request", []string{ val.Address.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -688,7 +688,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegation() { "wrongdeladdr", val.ValAddress.String(), val2.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -698,7 +698,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegation() { val.Address.String(), "wrongSrcValAddress", val2.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -708,7 +708,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegation() { val.Address.String(), val.ValAddress.String(), "wrongDestValAddress", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -718,7 +718,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegation() { val.Address.String(), val.ValAddress.String(), val2.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -762,7 +762,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegationsFrom() { "wrong validator address", []string{ "wrongValAddr", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -770,7 +770,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryRedelegationsFrom() { "valid request", []string{ val.ValAddress.String(), - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -813,7 +813,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryHistoricalInfo() { "wrong height", []string{ "-1", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, true, }, @@ -821,7 +821,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryHistoricalInfo() { "valid request", []string{ "1", - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), }, false, }, @@ -856,7 +856,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryParams() { }{ { "with text output", - []string{fmt.Sprintf("--%s=text", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=text", ostcli.OutputFlag)}, `bond_denom: stake historical_entries: 10000 max_entries: 7 @@ -865,7 +865,7 @@ unbonding_time: 1814400s`, }, { "with json output", - []string{fmt.Sprintf("--%s=json", tmcli.OutputFlag)}, + []string{fmt.Sprintf("--%s=json", ostcli.OutputFlag)}, `{"unbonding_time":"1814400s","max_validators":100,"max_entries":7,"historical_entries":10000,"bond_denom":"stake"}`, }, } @@ -891,7 +891,7 @@ func (s *IntegrationTestSuite) TestGetCmdQueryPool() { { "with text", []string{ - fmt.Sprintf("--%s=text", tmcli.OutputFlag), + fmt.Sprintf("--%s=text", ostcli.OutputFlag), fmt.Sprintf("--%s=1", flags.FlagHeight), }, fmt.Sprintf(`bonded_tokens: "%s" @@ -900,7 +900,7 @@ not_bonded_tokens: "0"`, cli.DefaultTokens.Mul(sdk.NewInt(2)).String()), { "with json", []string{ - fmt.Sprintf("--%s=json", tmcli.OutputFlag), + fmt.Sprintf("--%s=json", ostcli.OutputFlag), fmt.Sprintf("--%s=1", flags.FlagHeight), }, fmt.Sprintf(`{"not_bonded_tokens":"0","bonded_tokens":"%s"}`, cli.DefaultTokens.Mul(sdk.NewInt(2)).String()), diff --git a/x/staking/common_test.go b/x/staking/common_test.go index 2d1c7020bc..d66adff731 100644 --- a/x/staking/common_test.go +++ b/x/staking/common_test.go @@ -3,7 +3,7 @@ package staking_test import ( "math/big" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" @@ -37,7 +37,7 @@ var ( // to avoid messing with the hooks. func getBaseSimappWithCustomKeeper() (*codec.LegacyAmino, *simapp.SimApp, sdk.Context) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) appCodec := app.AppCodec() diff --git a/x/staking/genesis.go b/x/staking/genesis.go index 9f90e2f584..9d6889a772 100644 --- a/x/staking/genesis.go +++ b/x/staking/genesis.go @@ -4,8 +4,8 @@ import ( "fmt" "log" - abci "github.com/tendermint/tendermint/abci/types" - tmtypes "github.com/tendermint/tendermint/types" + abci "github.com/line/ostracon/abci/types" + osttypes "github.com/line/ostracon/types" cryptocodec "github.com/line/lbm-sdk/v2/crypto/codec" sdk "github.com/line/lbm-sdk/v2/types" @@ -196,7 +196,7 @@ func ExportGenesis(ctx sdk.Context, keeper keeper.Keeper) *types.GenesisState { } // WriteValidators returns a slice of bonded genesis validators. -func WriteValidators(ctx sdk.Context, keeper keeper.Keeper) (vals []tmtypes.GenesisValidator, err error) { +func WriteValidators(ctx sdk.Context, keeper keeper.Keeper) (vals []osttypes.GenesisValidator, err error) { keeper.IterateLastValidators(ctx, func(_ int64, validator types.ValidatorI) (stop bool) { pk, err := validator.ConsPubKey() if err != nil { @@ -207,7 +207,7 @@ func WriteValidators(ctx sdk.Context, keeper keeper.Keeper) (vals []tmtypes.Gene return true } - vals = append(vals, tmtypes.GenesisValidator{ + vals = append(vals, osttypes.GenesisValidator{ Address: sdk.ConsAddress(tmPk.Address()).Bytes(), PubKey: tmPk, Power: validator.GetConsensusPower(), diff --git a/x/staking/genesis_test.go b/x/staking/genesis_test.go index d3e4d604ab..f78b0c061a 100644 --- a/x/staking/genesis_test.go +++ b/x/staking/genesis_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + abci "github.com/line/ostracon/abci/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" codectypes "github.com/line/lbm-sdk/v2/codec/types" "github.com/line/lbm-sdk/v2/crypto/keys/ed25519" diff --git a/x/staking/handler_test.go b/x/staking/handler_test.go index 6e3662c436..670d90a7c4 100644 --- a/x/staking/handler_test.go +++ b/x/staking/handler_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" + osttypes "github.com/line/ostracon/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" "github.com/golang/protobuf/proto" @@ -174,7 +174,7 @@ func TestInvalidPubKeyTypeMsgCreateValidator(t *testing.T) { initPower := int64(1000) app, ctx, _, valAddrs := bootstrapHandlerGenesisTest(t, initPower, 1, sdk.TokensFromConsensusPower(initPower)) ctx = ctx.WithConsensusParams(&abci.ConsensusParams{ - Validator: &tmproto.ValidatorParams{PubKeyTypes: []string{tmtypes.ABCIPubKeyTypeEd25519}}, + Validator: &ostproto.ValidatorParams{PubKeyTypes: []string{osttypes.ABCIPubKeyTypeEd25519}}, }) addr := valAddrs[0] @@ -188,7 +188,7 @@ func TestInvalidPubKeyTypeMsgCreateValidator(t *testing.T) { func TestBothPubKeyTypesMsgCreateValidator(t *testing.T) { app, ctx, _, valAddrs := bootstrapHandlerGenesisTest(t, 1000, 2, sdk.NewInt(1000)) ctx = ctx.WithConsensusParams(&abci.ConsensusParams{ - Validator: &tmproto.ValidatorParams{PubKeyTypes: []string{tmtypes.ABCIPubKeyTypeEd25519, tmtypes.ABCIPubKeyTypeSecp256k1}}, + Validator: &ostproto.ValidatorParams{PubKeyTypes: []string{osttypes.ABCIPubKeyTypeEd25519, osttypes.ABCIPubKeyTypeSecp256k1}}, }) tstaking := teststaking.NewHelper(t, ctx, app.StakingKeeper) @@ -1170,7 +1170,7 @@ func TestInvalidMsg(t *testing.T) { k := keeper.Keeper{} h := staking.NewHandler(k) - res, err := h(sdk.NewContext(nil, tmproto.Header{}, false, nil), testdata.NewTestMsg()) + res, err := h(sdk.NewContext(nil, ostproto.Header{}, false, nil), testdata.NewTestMsg()) require.Error(t, err) require.Nil(t, res) require.True(t, strings.Contains(err.Error(), "unrecognized staking message type")) diff --git a/x/staking/keeper/common_test.go b/x/staking/keeper/common_test.go index fab5f2d58d..cac9cbaa4b 100644 --- a/x/staking/keeper/common_test.go +++ b/x/staking/keeper/common_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -25,7 +25,7 @@ func init() { // to avoid messing with the hooks. func createTestInput() (*codec.LegacyAmino, *simapp.SimApp, sdk.Context) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.StakingKeeper = keeper.NewKeeper( app.AppCodec(), diff --git a/x/staking/keeper/historical_info_test.go b/x/staking/keeper/historical_info_test.go index 5998f55266..cd92f47743 100644 --- a/x/staking/keeper/historical_info_test.go +++ b/x/staking/keeper/historical_info_test.go @@ -4,8 +4,8 @@ import ( "sort" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -53,11 +53,11 @@ func TestTrackHistoricalInfo(t *testing.T) { // set historical info at 5, 4 which should be pruned // and check that it has been stored - h4 := tmproto.Header{ + h4 := ostproto.Header{ ChainID: "HelloChain", Height: 4, } - h5 := tmproto.Header{ + h5 := ostproto.Header{ ChainID: "HelloChain", Height: 5, } @@ -88,7 +88,7 @@ func TestTrackHistoricalInfo(t *testing.T) { sort.Sort(types.ValidatorsByVotingPower(vals)) // Set Header for BeginBlock context - header := tmproto.Header{ + header := ostproto.Header{ ChainID: "HelloChain", Height: 10, } @@ -125,9 +125,9 @@ func TestGetAllHistoricalInfo(t *testing.T) { teststaking.NewValidator(t, addrVals[1], PKs[1]), } - header1 := tmproto.Header{ChainID: "HelloChain", Height: 10} - header2 := tmproto.Header{ChainID: "HelloChain", Height: 11} - header3 := tmproto.Header{ChainID: "HelloChain", Height: 12} + header1 := ostproto.Header{ChainID: "HelloChain", Height: 10} + header2 := ostproto.Header{ChainID: "HelloChain", Height: 11} + header3 := ostproto.Header{ChainID: "HelloChain", Height: 12} hist1 := types.HistoricalInfo{Header: header1, Valset: valSet} hist2 := types.HistoricalInfo{Header: header2, Valset: valSet} diff --git a/x/staking/keeper/keeper.go b/x/staking/keeper/keeper.go index aee722d1cf..5c8f98e90f 100644 --- a/x/staking/keeper/keeper.go +++ b/x/staking/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "container/list" "fmt" - "github.com/tendermint/tendermint/libs/log" + "github.com/line/ostracon/libs/log" "github.com/line/lbm-sdk/v2/codec" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/staking/keeper/keeper_test.go b/x/staking/keeper/keeper_test.go index 1141806885..c7f93182ef 100644 --- a/x/staking/keeper/keeper_test.go +++ b/x/staking/keeper/keeper_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp" @@ -27,7 +27,7 @@ type KeeperTestSuite struct { func (suite *KeeperTestSuite) SetupTest() { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) querier := keeper.Querier{Keeper: app.StakingKeeper} @@ -36,7 +36,7 @@ func (suite *KeeperTestSuite) SetupTest() { queryClient := types.NewQueryClient(queryHelper) addrs, _, validators := createValidators(suite.T(), ctx, app, []int64{9, 8, 7}) - header := tmproto.Header{ + header := ostproto.Header{ ChainID: "HelloChain", Height: 5, } @@ -52,7 +52,7 @@ func (suite *KeeperTestSuite) SetupTest() { } func TestParams(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) expParams := types.DefaultParams() diff --git a/x/staking/keeper/msg_server.go b/x/staking/keeper/msg_server.go index 66bdb41668..ba29247a80 100644 --- a/x/staking/keeper/msg_server.go +++ b/x/staking/keeper/msg_server.go @@ -5,7 +5,7 @@ import ( "time" metrics "github.com/armon/go-metrics" - tmstrings "github.com/tendermint/tendermint/libs/strings" + oststrings "github.com/line/ostracon/libs/strings" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" "github.com/line/lbm-sdk/v2/telemetry" @@ -59,7 +59,7 @@ func (k msgServer) CreateValidator(goCtx context.Context, msg *types.MsgCreateVa cp := ctx.ConsensusParams() if cp != nil && cp.Validator != nil { - if !tmstrings.StringInSlice(pk.Type(), cp.Validator.PubKeyTypes) { + if !oststrings.StringInSlice(pk.Type(), cp.Validator.PubKeyTypes) { return nil, sdkerrors.Wrapf( types.ErrValidatorPubKeyTypeNotSupported, "got: %s, expected: %s", pk.Type(), cp.Validator.PubKeyTypes, diff --git a/x/staking/keeper/querier.go b/x/staking/keeper/querier.go index d2279924c7..6e66aaeccd 100644 --- a/x/staking/keeper/querier.go +++ b/x/staking/keeper/querier.go @@ -4,7 +4,7 @@ import ( "errors" "strings" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/staking/keeper/querier_test.go b/x/staking/keeper/querier_test.go index 4b2ec4c724..17ddc9daae 100644 --- a/x/staking/keeper/querier_test.go +++ b/x/staking/keeper/querier_test.go @@ -4,9 +4,9 @@ import ( "fmt" "testing" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/simapp" @@ -33,7 +33,7 @@ func TestNewQuerier(t *testing.T) { app.StakingKeeper.SetValidatorByPowerIndex(ctx, validators[i]) } - header := tmproto.Header{ + header := ostproto.Header{ ChainID: "HelloChain", Height: 5, } @@ -720,7 +720,7 @@ func TestQueryHistoricalInfo(t *testing.T) { app.StakingKeeper.SetValidator(ctx, val1) app.StakingKeeper.SetValidator(ctx, val2) - header := tmproto.Header{ + header := ostproto.Header{ ChainID: "HelloChain", Height: 5, } diff --git a/x/staking/keeper/slash_test.go b/x/staking/keeper/slash_test.go index 9aef691a4a..a212337515 100644 --- a/x/staking/keeper/slash_test.go +++ b/x/staking/keeper/slash_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" sdk "github.com/line/lbm-sdk/v2/types" @@ -93,7 +93,7 @@ func TestSlashUnbondingDelegation(t *testing.T) { require.True(t, slashAmount.Equal(sdk.NewInt(0))) // after the expiration time, no longer eligible for slashing - ctx = ctx.WithBlockHeader(tmproto.Header{Time: time.Unix(10, 0)}) + ctx = ctx.WithBlockHeader(ostproto.Header{Time: time.Unix(10, 0)}) app.StakingKeeper.SetUnbondingDelegation(ctx, ubd) slashAmount = app.StakingKeeper.SlashUnbondingDelegation(ctx, ubd, 0, fraction) require.True(t, slashAmount.Equal(sdk.NewInt(0))) @@ -101,7 +101,7 @@ func TestSlashUnbondingDelegation(t *testing.T) { // test valid slash, before expiration timestamp and to which stake contributed notBondedPool := app.StakingKeeper.GetNotBondedPool(ctx) oldUnbondedPoolBalances := app.BankKeeper.GetAllBalances(ctx, notBondedPool.GetAddress()) - ctx = ctx.WithBlockHeader(tmproto.Header{Time: time.Unix(0, 0)}) + ctx = ctx.WithBlockHeader(ostproto.Header{Time: time.Unix(0, 0)}) app.StakingKeeper.SetUnbondingDelegation(ctx, ubd) slashAmount = app.StakingKeeper.SlashUnbondingDelegation(ctx, ubd, 0, fraction) require.True(t, slashAmount.Equal(sdk.NewInt(5))) @@ -150,7 +150,7 @@ func TestSlashRedelegation(t *testing.T) { require.True(t, slashAmount.Equal(sdk.NewInt(0))) // after the expiration time, no longer eligible for slashing - ctx = ctx.WithBlockHeader(tmproto.Header{Time: time.Unix(10, 0)}) + ctx = ctx.WithBlockHeader(ostproto.Header{Time: time.Unix(10, 0)}) app.StakingKeeper.SetRedelegation(ctx, rd) validator, found = app.StakingKeeper.GetValidator(ctx, addrVals[1]) require.True(t, found) @@ -160,7 +160,7 @@ func TestSlashRedelegation(t *testing.T) { balances = app.BankKeeper.GetAllBalances(ctx, bondedPool.GetAddress()) // test valid slash, before expiration timestamp and to which stake contributed - ctx = ctx.WithBlockHeader(tmproto.Header{Time: time.Unix(0, 0)}) + ctx = ctx.WithBlockHeader(ostproto.Header{Time: time.Unix(0, 0)}) app.StakingKeeper.SetRedelegation(ctx, rd) validator, found = app.StakingKeeper.GetValidator(ctx, addrVals[1]) require.True(t, found) diff --git a/x/staking/keeper/val_state_change.go b/x/staking/keeper/val_state_change.go index ff9a7cff90..4630c8a671 100644 --- a/x/staking/keeper/val_state_change.go +++ b/x/staking/keeper/val_state_change.go @@ -6,7 +6,7 @@ import ( "sort" gogotypes "github.com/gogo/protobuf/types" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" sdk "github.com/line/lbm-sdk/v2/types" "github.com/line/lbm-sdk/v2/x/staking/types" diff --git a/x/staking/keeper/validator_test.go b/x/staking/keeper/validator_test.go index ba397a6a31..70bc07448c 100644 --- a/x/staking/keeper/validator_test.go +++ b/x/staking/keeper/validator_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" "github.com/line/lbm-sdk/v2/simapp" @@ -1057,7 +1057,7 @@ func TestApplyAndReturnValidatorSetUpdatesBondTransition(t *testing.T) { func TestUpdateValidatorCommission(t *testing.T) { app, ctx, _, addrVals := bootstrapValidatorTest(t, 1000, 20) - ctx = ctx.WithBlockHeader(tmproto.Header{Time: time.Now().UTC()}) + ctx = ctx.WithBlockHeader(ostproto.Header{Time: time.Now().UTC()}) commission1 := types.NewCommissionWithTime( sdk.NewDecWithPrec(1, 1), sdk.NewDecWithPrec(3, 1), diff --git a/x/staking/module.go b/x/staking/module.go index 61f966e7ca..66f1c8db6c 100644 --- a/x/staking/module.go +++ b/x/staking/module.go @@ -9,8 +9,8 @@ import ( "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/gorilla/mux" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/staking/module_test.go b/x/staking/module_test.go index dd3cc7a8f9..1a14dd2432 100644 --- a/x/staking/module_test.go +++ b/x/staking/module_test.go @@ -3,9 +3,9 @@ package staking_test import ( "testing" + abcitypes "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abcitypes "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" authtypes "github.com/line/lbm-sdk/v2/x/auth/types" @@ -14,7 +14,7 @@ import ( func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { app := simapp.Setup(false) - ctx := app.BaseApp.NewContext(false, tmproto.Header{}) + ctx := app.BaseApp.NewContext(false, ostproto.Header{}) app.InitChain( abcitypes.RequestInitChain{ diff --git a/x/staking/simulation/operations_test.go b/x/staking/simulation/operations_test.go index 576b0841cf..cd380c5a00 100644 --- a/x/staking/simulation/operations_test.go +++ b/x/staking/simulation/operations_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" simappparams "github.com/line/lbm-sdk/v2/simapp/params" @@ -71,7 +71,7 @@ func TestSimulateMsgCreateValidator(t *testing.T) { accounts := getTestingAccounts(t, r, app, ctx, 3) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash}}) // execute operation op := simulation.SimulateMsgCreateValidator(app.AccountKeeper, app.BankKeeper, app.StakingKeeper) @@ -108,7 +108,7 @@ func TestSimulateMsgEditValidator(t *testing.T) { _ = getTestingValidator0(t, app, ctx, accounts) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) // execute operation op := simulation.SimulateMsgEditValidator(app.AccountKeeper, app.BankKeeper, app.StakingKeeper) @@ -146,7 +146,7 @@ func TestSimulateMsgDelegate(t *testing.T) { setupValidatorRewards(app, ctx, validator0.GetOperator()) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) // execute operation op := simulation.SimulateMsgDelegate(app.AccountKeeper, app.BankKeeper, app.StakingKeeper) @@ -191,7 +191,7 @@ func TestSimulateMsgUndelegate(t *testing.T) { setupValidatorRewards(app, ctx, validator0.GetOperator()) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) // execute operation op := simulation.SimulateMsgUndelegate(app.AccountKeeper, app.BankKeeper, app.StakingKeeper) @@ -240,7 +240,7 @@ func TestSimulateMsgBeginRedelegate(t *testing.T) { setupValidatorRewards(app, ctx, validator1.GetOperator()) // begin a new block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: app.LastBlockHeight() + 1, AppHash: app.LastCommitID().Hash, Time: blockTime}}) // execute operation op := simulation.SimulateMsgBeginRedelegate(app.AccountKeeper, app.BankKeeper, app.StakingKeeper) @@ -266,7 +266,7 @@ func createTestApp(isCheckTx bool) (*simapp.SimApp, sdk.Context) { // sdk.PowerReduction = sdk.NewIntFromBigInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil)) app := simapp.Setup(isCheckTx) - ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{}) + ctx := app.BaseApp.NewContext(isCheckTx, ostproto.Header{}) app.MintKeeper.SetParams(ctx, minttypes.DefaultParams()) app.MintKeeper.SetMinter(ctx, minttypes.DefaultInitialMinter()) diff --git a/x/staking/teststaking/tm.go b/x/staking/teststaking/tm.go index fe0f4b2134..666eb37eef 100644 --- a/x/staking/teststaking/tm.go +++ b/x/staking/teststaking/tm.go @@ -1,15 +1,15 @@ package teststaking import ( - tmcrypto "github.com/tendermint/tendermint/crypto" - tmtypes "github.com/tendermint/tendermint/types" + ostcrypto "github.com/line/ostracon/crypto" + osttypes "github.com/line/ostracon/types" cryptocodec "github.com/line/lbm-sdk/v2/crypto/codec" "github.com/line/lbm-sdk/v2/x/staking/types" ) -// GetTmConsPubKey gets the validator's public key as a tmcrypto.PubKey. -func GetTmConsPubKey(v types.Validator) (tmcrypto.PubKey, error) { +// GetTmConsPubKey gets the validator's public key as a ostcrypto.PubKey. +func GetTmConsPubKey(v types.Validator) (ostcrypto.PubKey, error) { pk, err := v.ConsPubKey() if err != nil { return nil, err @@ -19,18 +19,18 @@ func GetTmConsPubKey(v types.Validator) (tmcrypto.PubKey, error) { } // ToTmValidator casts an SDK validator to a tendermint type Validator. -func ToTmValidator(v types.Validator) (*tmtypes.Validator, error) { +func ToTmValidator(v types.Validator) (*osttypes.Validator, error) { tmPk, err := GetTmConsPubKey(v) if err != nil { return nil, err } - return tmtypes.NewValidator(tmPk, v.ConsensusPower()), nil + return osttypes.NewValidator(tmPk, v.ConsensusPower()), nil } // ToTmValidators casts all validators to the corresponding tendermint type. -func ToTmValidators(v types.Validators) ([]*tmtypes.Validator, error) { - validators := make([]*tmtypes.Validator, len(v)) +func ToTmValidators(v types.Validators) ([]*osttypes.Validator, error) { + validators := make([]*osttypes.Validator, len(v)) var err error for i, val := range v { validators[i], err = ToTmValidator(val) diff --git a/x/staking/types/exported.go b/x/staking/types/exported.go index ac4ff894ab..902c2440bb 100644 --- a/x/staking/types/exported.go +++ b/x/staking/types/exported.go @@ -1,7 +1,7 @@ package types import ( - tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + ostprotocrypto "github.com/line/ostracon/proto/ostracon/crypto" cryptotypes "github.com/line/lbm-sdk/v2/crypto/types" sdk "github.com/line/lbm-sdk/v2/types" @@ -24,7 +24,7 @@ type ValidatorI interface { IsUnbonding() bool // check if has status unbonding GetOperator() sdk.ValAddress // operator address to receive/return validators coins ConsPubKey() (cryptotypes.PubKey, error) // validation consensus pubkey (cryptotypes.PubKey) - TmConsPublicKey() (tmprotocrypto.PublicKey, error) // validation consensus pubkey (Tendermint) + TmConsPublicKey() (ostprotocrypto.PublicKey, error) // validation consensus pubkey (Tendermint) GetConsAddr() (sdk.ConsAddress, error) // validation consensus address GetTokens() sdk.Int // validation tokens GetBondedTokens() sdk.Int // validator bonded tokens diff --git a/x/staking/types/genesis.pb.go b/x/staking/types/genesis.pb.go index 63bde40781..b1017e7e0f 100644 --- a/x/staking/types/genesis.pb.go +++ b/x/staking/types/genesis.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" io "io" math "math" math_bits "math/bits" @@ -30,7 +30,7 @@ type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` // last_total_power tracks the total amounts of bonded tokens recorded during // the previous end block. - LastTotalPower github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=last_total_power,json=lastTotalPower,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"last_total_power" yaml:"last_total_power"` + LastTotalPower github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,2,opt,name=last_total_power,json=lastTotalPower,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"last_total_power" yaml:"last_total_power"` // last_validator_powers is a special index that provides a historical list // of the last-block's bonded validators. LastValidatorPowers []LastValidatorPower `protobuf:"bytes,3,rep,name=last_validator_powers,json=lastValidatorPowers,proto3" json:"last_validator_powers" yaml:"last_validator_powers"` @@ -178,38 +178,38 @@ func init() { } var fileDescriptor_9b3dec8894f2831b = []byte{ - // 493 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x3d, 0x6f, 0xd3, 0x40, - 0x18, 0xc7, 0x7d, 0xa4, 0x49, 0xc3, 0xa5, 0x20, 0x74, 0xa4, 0x60, 0x45, 0xc8, 0x0e, 0x56, 0x84, - 0x22, 0x5e, 0x6c, 0xb5, 0x6c, 0x15, 0x53, 0x84, 0xa8, 0x8a, 0x10, 0x8a, 0x8e, 0x97, 0x81, 0x25, - 0xba, 0xd4, 0x27, 0x63, 0xd5, 0xf1, 0x59, 0x7e, 0x2e, 0xa5, 0xdd, 0x11, 0x62, 0xe4, 0x23, 0xf4, - 0xe3, 0x74, 0xec, 0xc0, 0x80, 0x18, 0x2c, 0x94, 0x2c, 0xcc, 0xfd, 0x04, 0xc8, 0xe7, 0x17, 0x4c, - 0x52, 0x33, 0x25, 0x77, 0xfa, 0xfd, 0x7f, 0x7f, 0xfb, 0xfc, 0x1c, 0x1e, 0x1c, 0x0a, 0x98, 0x09, - 0x70, 0x40, 0xb2, 0x23, 0x3f, 0xf4, 0x9c, 0xe3, 0x9d, 0x29, 0x97, 0x6c, 0xc7, 0xf1, 0x78, 0xc8, - 0xc1, 0x07, 0x3b, 0x8a, 0x85, 0x14, 0xe4, 0x4e, 0x46, 0xd9, 0x39, 0x65, 0xe7, 0x54, 0xaf, 0xeb, - 0x09, 0x4f, 0x28, 0xc4, 0x49, 0xff, 0x65, 0x74, 0xaf, 0xce, 0x59, 0xa4, 0x15, 0x65, 0x7d, 0x6f, - 0xe2, 0xad, 0xfd, 0xac, 0xe5, 0x8d, 0x64, 0x92, 0x93, 0x67, 0xb8, 0x15, 0xb1, 0x98, 0xcd, 0x40, - 0x47, 0x7d, 0x34, 0xec, 0xec, 0x1a, 0xf6, 0xd5, 0xad, 0xf6, 0x58, 0x51, 0xa3, 0x8d, 0xf3, 0xc4, - 0xd4, 0x68, 0x9e, 0x21, 0x80, 0x6f, 0x05, 0x0c, 0xe4, 0x44, 0x0a, 0xc9, 0x82, 0x49, 0x24, 0x3e, - 0xf1, 0x58, 0xbf, 0xd6, 0x47, 0xc3, 0xad, 0xd1, 0x41, 0xca, 0xfd, 0x4c, 0xcc, 0x07, 0x9e, 0x2f, - 0x3f, 0xce, 0xa7, 0xf6, 0xa1, 0x98, 0x39, 0xf9, 0x13, 0x66, 0x3f, 0x4f, 0xc0, 0x3d, 0x72, 0xe4, - 0x69, 0xc4, 0xc1, 0x3e, 0x08, 0xe5, 0x65, 0x62, 0xde, 0x3d, 0x65, 0xb3, 0x60, 0xcf, 0x5a, 0xf5, - 0x59, 0xf4, 0x66, 0xba, 0xf5, 0x36, 0xdd, 0x19, 0xa7, 0x1b, 0xe4, 0x33, 0xc2, 0xdb, 0x8a, 0x3a, - 0x66, 0x81, 0xef, 0x32, 0x29, 0xe2, 0x8c, 0x04, 0xbd, 0xd1, 0x6f, 0x0c, 0x3b, 0xbb, 0x0f, 0xeb, - 0x5e, 0xe1, 0x15, 0x03, 0xf9, 0xbe, 0xc8, 0x28, 0xd7, 0x68, 0x90, 0x3e, 0xe6, 0x65, 0x62, 0xde, - 0xab, 0x94, 0xaf, 0x6a, 0x2d, 0x7a, 0x3b, 0x58, 0x4b, 0x02, 0xd9, 0xc7, 0xb8, 0x24, 0x41, 0xdf, - 0x50, 0xd5, 0xf7, 0xeb, 0xaa, 0xcb, 0x70, 0x7e, 0x80, 0x95, 0x28, 0x79, 0x89, 0x3b, 0x2e, 0x0f, - 0xb8, 0xc7, 0xa4, 0x2f, 0x42, 0xd0, 0x9b, 0xca, 0x64, 0xd5, 0x99, 0x9e, 0x97, 0x68, 0xae, 0xaa, - 0x86, 0xc9, 0x17, 0x84, 0xb7, 0xe7, 0xe1, 0x54, 0x84, 0xae, 0x1f, 0x7a, 0x93, 0xaa, 0xb6, 0xa5, - 0xb4, 0x8f, 0xea, 0xb4, 0xef, 0x8a, 0x50, 0xc5, 0xbf, 0x72, 0x38, 0x57, 0x7a, 0x2d, 0xda, 0x9d, - 0xaf, 0x47, 0x81, 0x8c, 0xf1, 0x8d, 0x98, 0x57, 0xfb, 0x37, 0x55, 0xff, 0xa0, 0xae, 0x9f, 0x56, - 0xe0, 0xfc, 0xc5, 0xfe, 0x15, 0x90, 0x1e, 0x6e, 0xf3, 0x93, 0x48, 0xc4, 0x92, 0xbb, 0x7a, 0xbb, - 0x8f, 0x86, 0x6d, 0x5a, 0xae, 0xad, 0xd7, 0x98, 0xac, 0x7f, 0x5c, 0xa2, 0xe3, 0x4d, 0xe6, 0xba, - 0x31, 0x87, 0x6c, 0xb8, 0xaf, 0xd3, 0x62, 0x49, 0xba, 0xb8, 0xf9, 0x77, 0x58, 0x1b, 0x34, 0x5b, - 0xec, 0xb5, 0xbf, 0x9e, 0x99, 0xda, 0xef, 0x33, 0x53, 0x1b, 0xbd, 0x38, 0x5f, 0x18, 0xe8, 0x62, - 0x61, 0xa0, 0x5f, 0x0b, 0x03, 0x7d, 0x5b, 0x1a, 0xda, 0xc5, 0xd2, 0xd0, 0x7e, 0x2c, 0x0d, 0xed, - 0xc3, 0xe3, 0xff, 0xce, 0xf3, 0x49, 0x79, 0xfd, 0xd4, 0x64, 0x4f, 0x5b, 0xea, 0xd6, 0x3d, 0xfd, - 0x13, 0x00, 0x00, 0xff, 0xff, 0xff, 0x85, 0xad, 0xc8, 0xf1, 0x03, 0x00, 0x00, + // 496 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x93, 0x3f, 0x6f, 0xd3, 0x40, + 0x18, 0xc6, 0x7d, 0xa4, 0x49, 0xc3, 0xa5, 0x20, 0x74, 0xa4, 0x60, 0x45, 0xc8, 0x0e, 0x56, 0x86, + 0xa8, 0x08, 0x5b, 0x0d, 0x5b, 0xc5, 0x14, 0x55, 0x8a, 0x40, 0x08, 0x45, 0xe6, 0xcf, 0xc0, 0x12, + 0x9d, 0xeb, 0x93, 0xb1, 0x6a, 0xfb, 0x8c, 0xdf, 0x4b, 0x68, 0x77, 0x84, 0x18, 0xf9, 0x08, 0xfd, + 0x38, 0x1d, 0x2b, 0x26, 0xc4, 0x10, 0xa1, 0x64, 0x61, 0xee, 0x27, 0x40, 0x3e, 0x3b, 0xc6, 0x24, + 0x71, 0xb7, 0xdc, 0xe9, 0xf7, 0xfc, 0x9e, 0xdc, 0xf9, 0x3d, 0xdc, 0x3b, 0xe1, 0x10, 0x72, 0xb0, + 0x40, 0xd0, 0x53, 0x3f, 0xf2, 0xac, 0xd9, 0xa1, 0xc3, 0x04, 0x3d, 0xb4, 0x3c, 0x16, 0x31, 0xf0, + 0xc1, 0x8c, 0x13, 0x2e, 0x38, 0x79, 0x90, 0x51, 0x66, 0x4e, 0x99, 0x39, 0xd5, 0x69, 0x7b, 0xdc, + 0xe3, 0x12, 0xb1, 0xd2, 0x5f, 0x19, 0xdd, 0xa9, 0x72, 0xae, 0xd2, 0x92, 0x32, 0x7e, 0xd4, 0xf1, + 0xde, 0x28, 0x6b, 0x79, 0x23, 0xa8, 0x60, 0xe4, 0x39, 0x6e, 0xc4, 0x34, 0xa1, 0x21, 0xa8, 0xa8, + 0x8b, 0xfa, 0xad, 0x81, 0x66, 0x6e, 0x6f, 0x35, 0xc7, 0x92, 0x1a, 0xee, 0x5c, 0xce, 0x75, 0xc5, + 0xce, 0x33, 0xe4, 0x13, 0xbe, 0x17, 0x50, 0x10, 0x13, 0xc1, 0x05, 0x0d, 0x26, 0x31, 0xff, 0xcc, + 0x12, 0xf5, 0x56, 0x17, 0xf5, 0xf7, 0x86, 0xa3, 0x94, 0xfb, 0x35, 0xd7, 0x7b, 0x9e, 0x2f, 0x3e, + 0x4e, 0x1d, 0xf3, 0x84, 0x87, 0x56, 0xe0, 0x47, 0xcc, 0x0a, 0x9c, 0xf0, 0x29, 0xb8, 0xa7, 0xd6, + 0x6c, 0x60, 0x89, 0xf3, 0x98, 0x81, 0xf9, 0x22, 0x12, 0xd7, 0x73, 0xfd, 0xe1, 0x39, 0x0d, 0x83, + 0x23, 0x63, 0xdd, 0x66, 0xd8, 0x77, 0xd3, 0xad, 0xb7, 0xe9, 0xce, 0x38, 0xdd, 0x20, 0x5f, 0x10, + 0xde, 0x97, 0xd4, 0x8c, 0x06, 0xbe, 0x4b, 0x05, 0x4f, 0x32, 0x12, 0xd4, 0x5a, 0xb7, 0xd6, 0x6f, + 0x0d, 0x0e, 0xaa, 0x0e, 0xf0, 0x8a, 0x82, 0x78, 0xbf, 0xca, 0x48, 0xd7, 0xb0, 0x97, 0xfe, 0xc9, + 0xeb, 0xb9, 0xfe, 0xa8, 0x54, 0xbe, 0xae, 0x35, 0xec, 0xfb, 0xc1, 0x46, 0x12, 0xc8, 0x08, 0xe3, + 0x82, 0x04, 0x75, 0x47, 0x56, 0x3f, 0xae, 0xaa, 0x2e, 0xc2, 0xf9, 0xf5, 0x95, 0xa2, 0xe4, 0x25, + 0x6e, 0xb9, 0x2c, 0x60, 0x1e, 0x15, 0x3e, 0x8f, 0x40, 0xad, 0x4b, 0x93, 0x51, 0x65, 0x3a, 0x2e, + 0xd0, 0x5c, 0x55, 0x0e, 0x93, 0xaf, 0x08, 0xef, 0x4f, 0x23, 0x87, 0x47, 0xae, 0x1f, 0x79, 0x93, + 0xb2, 0xb6, 0x21, 0xb5, 0x4f, 0xaa, 0xb4, 0xef, 0x56, 0xa1, 0x92, 0x7f, 0xed, 0x72, 0xb6, 0x7a, + 0x0d, 0xbb, 0x3d, 0xdd, 0x8c, 0x02, 0x19, 0xe3, 0x3b, 0x09, 0x2b, 0xf7, 0xef, 0xca, 0xfe, 0x5e, + 0x55, 0xbf, 0x5d, 0x82, 0xf3, 0x83, 0xfd, 0x2f, 0x20, 0x1d, 0xdc, 0x64, 0x67, 0x31, 0x4f, 0x04, + 0x73, 0xd5, 0x66, 0x17, 0xf5, 0x9b, 0x76, 0xb1, 0x36, 0x5e, 0x63, 0xb2, 0xf9, 0x71, 0x89, 0x8a, + 0x77, 0xa9, 0xeb, 0x26, 0x0c, 0xb2, 0xd1, 0xbe, 0x6d, 0xaf, 0x96, 0xa4, 0x8d, 0xeb, 0xff, 0x46, + 0xb5, 0x66, 0x67, 0x8b, 0xa3, 0xe6, 0xb7, 0x0b, 0x5d, 0xf9, 0x73, 0xa1, 0x2b, 0xc3, 0xe3, 0xcb, + 0x85, 0x86, 0xae, 0x16, 0x1a, 0xfa, 0xbd, 0xd0, 0xd0, 0xf7, 0xa5, 0xa6, 0x5c, 0x2d, 0x35, 0xe5, + 0xe7, 0x52, 0x53, 0x3e, 0x1c, 0xdc, 0x30, 0xcd, 0x67, 0xc5, 0xd3, 0x93, 0x73, 0xed, 0x34, 0xe4, + 0x8b, 0x7b, 0xf6, 0x37, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x9f, 0xe1, 0x25, 0xed, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/staking/types/historical_info.go b/x/staking/types/historical_info.go index 72c41813c5..cdf5bc3b2e 100644 --- a/x/staking/types/historical_info.go +++ b/x/staking/types/historical_info.go @@ -4,7 +4,7 @@ import ( "sort" "github.com/gogo/protobuf/proto" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/line/lbm-sdk/v2/codec" codectypes "github.com/line/lbm-sdk/v2/codec/types" @@ -13,7 +13,7 @@ import ( // NewHistoricalInfo will create a historical information struct from header and valset // it will first sort valset before inclusion into historical info -func NewHistoricalInfo(header tmproto.Header, valSet Validators) HistoricalInfo { +func NewHistoricalInfo(header ostproto.Header, valSet Validators) HistoricalInfo { // Must sort in the same way that tendermint does sort.Sort(ValidatorsByVotingPower(valSet)) diff --git a/x/staking/types/historical_info_test.go b/x/staking/types/historical_info_test.go index 8e80dcb37f..04941cc151 100644 --- a/x/staking/types/historical_info_test.go +++ b/x/staking/types/historical_info_test.go @@ -5,13 +5,13 @@ import ( "sort" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/x/staking/types" ) -var header = tmproto.Header{ +var header = ostproto.Header{ ChainID: "hello", Height: 5, } diff --git a/x/staking/types/query.pb.go b/x/staking/types/query.pb.go index 394c0bc90f..82e84e60ac 100644 --- a/x/staking/types/query.pb.go +++ b/x/staking/types/query.pb.go @@ -1425,89 +1425,89 @@ func init() { } var fileDescriptor_f270127f442bbcd8 = []byte{ - // 1303 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcf, 0x4f, 0x1c, 0x75, - 0x14, 0xdf, 0x2f, 0x20, 0x91, 0xd7, 0xb4, 0xa9, 0xdf, 0x05, 0xc4, 0x29, 0xee, 0xd2, 0x09, 0x22, - 0xa5, 0x74, 0x46, 0xa0, 0x52, 0xac, 0x4d, 0x15, 0xac, 0x54, 0xd2, 0x83, 0xb0, 0x46, 0xfc, 0x75, - 0x20, 0xb3, 0x3b, 0xd3, 0xd9, 0x49, 0x97, 0x99, 0xed, 0xcc, 0x40, 0x40, 0xc2, 0x41, 0x4f, 0x7a, - 0xd3, 0x78, 0x52, 0x2f, 0x3d, 0x98, 0x98, 0xe8, 0x51, 0xff, 0x01, 0x4f, 0xd6, 0x1b, 0x46, 0x0f, - 0x7a, 0xa9, 0x06, 0x3c, 0x34, 0x9e, 0xbc, 0x19, 0x6f, 0x66, 0xbf, 0xf3, 0x66, 0x76, 0x86, 0xf9, - 0xb9, 0xcb, 0x12, 0xd2, 0x13, 0xbb, 0xdf, 0x7d, 0x3f, 0x3e, 0x9f, 0xf7, 0xbe, 0xef, 0x7d, 0xdf, - 0x0b, 0xc0, 0x57, 0x0c, 0x6b, 0xdd, 0xb0, 0x44, 0xcb, 0x96, 0xee, 0x68, 0xba, 0x2a, 0x6e, 0x4e, - 0x95, 0x15, 0x5b, 0x9a, 0x12, 0xef, 0x6e, 0x28, 0xe6, 0xb6, 0x50, 0x37, 0x0d, 0xdb, 0xa0, 0x83, - 0x8e, 0x8c, 0x80, 0x32, 0x02, 0xca, 0x70, 0x13, 0xa8, 0x5b, 0x96, 0x2c, 0xc5, 0x51, 0xf0, 0xd4, - 0xeb, 0x92, 0xaa, 0xe9, 0x92, 0xad, 0x19, 0xba, 0x63, 0x83, 0xeb, 0x57, 0x0d, 0xd5, 0x60, 0x1f, - 0xc5, 0xc6, 0x27, 0x3c, 0x1d, 0x56, 0x0d, 0x43, 0xad, 0x29, 0xa2, 0x54, 0xd7, 0x44, 0x49, 0xd7, - 0x0d, 0x9b, 0xa9, 0x58, 0xf8, 0xeb, 0x68, 0x0c, 0x36, 0x17, 0x07, 0x93, 0xe2, 0xb7, 0x60, 0x70, - 0xa5, 0xe1, 0x7b, 0x55, 0xaa, 0x69, 0xb2, 0x64, 0x1b, 0xa6, 0x55, 0x52, 0xee, 0x6e, 0x28, 0x96, - 0x4d, 0x07, 0xa1, 0xd7, 0xb2, 0x25, 0x7b, 0xc3, 0x1a, 0x22, 0x23, 0x64, 0xbc, 0xaf, 0x84, 0xdf, - 0xe8, 0x22, 0x40, 0x13, 0xdf, 0x50, 0xd7, 0x08, 0x19, 0x3f, 0x35, 0x3d, 0x26, 0x20, 0xc9, 0x06, - 0x19, 0xc1, 0x61, 0x8f, 0xfe, 0x84, 0x65, 0x49, 0x55, 0xd0, 0x66, 0xc9, 0xa7, 0xc9, 0x7f, 0x4b, - 0xe0, 0xc9, 0x90, 0x6b, 0xab, 0x6e, 0xe8, 0x96, 0x42, 0x6f, 0x02, 0x6c, 0x7a, 0xa7, 0x43, 0x64, - 0xa4, 0x7b, 0xfc, 0xd4, 0xf4, 0x79, 0x21, 0x3a, 0x90, 0x82, 0xa7, 0xbf, 0xd0, 0x73, 0xff, 0x41, - 0x31, 0x57, 0xf2, 0xa9, 0x36, 0x0c, 0x85, 0xc0, 0x3e, 0x9b, 0x0a, 0xd6, 0x41, 0x11, 0x40, 0x7b, - 0x1d, 0x06, 0x82, 0x60, 0xdd, 0x30, 0x3d, 0x03, 0x67, 0x3c, 0x7f, 0x6b, 0x92, 0x2c, 0x9b, 0x18, - 0xae, 0xd3, 0xde, 0xe9, 0xbc, 0x2c, 0x9b, 0xfc, 0xda, 0xe1, 0x38, 0x7b, 0x5c, 0x5f, 0x85, 0x3e, - 0x4f, 0x94, 0xe9, 0xb6, 0x40, 0xb5, 0xa9, 0xc9, 0x7f, 0x4a, 0x60, 0x24, 0xe8, 0xe1, 0x86, 0x52, - 0x53, 0x54, 0xe7, 0x4a, 0xb4, 0x06, 0xb6, 0x63, 0x29, 0x7e, 0x48, 0xe0, 0x7c, 0x02, 0x26, 0x0c, - 0xc0, 0xfb, 0xd0, 0x2f, 0x7b, 0xc7, 0x6b, 0x26, 0x1e, 0xbb, 0x69, 0x9f, 0x88, 0x8b, 0x45, 0xd3, - 0x94, 0x6b, 0x69, 0xe1, 0x5c, 0x23, 0x28, 0xdf, 0xfc, 0x51, 0xcc, 0x87, 0x7f, 0xb3, 0x4a, 0x79, - 0x39, 0x7c, 0xd8, 0xb9, 0xfb, 0xf1, 0x05, 0x81, 0x0b, 0x41, 0xaa, 0x6f, 0xea, 0x65, 0x43, 0x97, - 0x35, 0x5d, 0x3d, 0xf9, 0x3c, 0xfc, 0x4e, 0x60, 0x22, 0x0b, 0x38, 0x4c, 0x48, 0x19, 0xf2, 0x1b, - 0xee, 0xef, 0xa1, 0x7c, 0x5c, 0x8c, 0xcb, 0x47, 0x84, 0x49, 0xbc, 0xa5, 0xd4, 0xb3, 0x76, 0x0c, - 0x81, 0xaf, 0x63, 0x61, 0xf9, 0x53, 0xee, 0x05, 0x19, 0x53, 0x7e, 0x28, 0xc8, 0xde, 0x29, 0x0b, - 0x72, 0x38, 0x17, 0x5d, 0x11, 0xb9, 0xb8, 0xfa, 0xf8, 0x47, 0xf7, 0x8a, 0xb9, 0x87, 0xf7, 0x8a, - 0x39, 0x7e, 0x13, 0xfb, 0x56, 0xf8, 0x92, 0xd1, 0xf7, 0x20, 0x1f, 0x71, 0x95, 0xb1, 0xaa, 0x5b, - 0xb8, 0xc9, 0x25, 0x1a, 0xbe, 0xac, 0xfc, 0x36, 0x14, 0x99, 0xdf, 0x88, 0x40, 0x1f, 0x37, 0xe5, - 0x75, 0xec, 0x2d, 0x91, 0xae, 0x91, 0xfb, 0x12, 0xf4, 0x3a, 0x79, 0x46, 0xba, 0x6d, 0x5c, 0x14, - 0x34, 0xc0, 0x7f, 0xe9, 0xf6, 0xb2, 0x1b, 0x2e, 0xec, 0xe8, 0x1a, 0xca, 0xc2, 0xb5, 0x43, 0x35, - 0xe4, 0x0b, 0xc6, 0xcf, 0x6e, 0x57, 0x8b, 0x46, 0x87, 0xe1, 0xa8, 0x74, 0xac, 0xab, 0x39, 0xb1, - 0x39, 0xde, 0xf6, 0xf5, 0x95, 0xdb, 0xbe, 0x3c, 0x4e, 0x29, 0xed, 0xeb, 0x64, 0x42, 0xef, 0x35, - 0xb2, 0x14, 0x98, 0x8f, 0x62, 0x23, 0xfb, 0x87, 0xc0, 0x53, 0x8c, 0x5b, 0x49, 0x91, 0xdb, 0x0e, - 0xf9, 0x24, 0x50, 0xcb, 0xac, 0xac, 0x45, 0x56, 0xf7, 0x59, 0xcb, 0xac, 0xac, 0x06, 0xde, 0x97, - 0x49, 0xa0, 0xb2, 0x65, 0x1f, 0x96, 0xee, 0x76, 0xa4, 0x65, 0xcb, 0x5e, 0x4d, 0x78, 0x8d, 0x7a, - 0x3a, 0x90, 0xce, 0x3d, 0x02, 0x5c, 0x14, 0x65, 0x4c, 0x9f, 0x06, 0x83, 0xa6, 0x92, 0x50, 0x44, - 0x93, 0x71, 0x19, 0xf4, 0x9b, 0x3b, 0x54, 0x46, 0x03, 0xa6, 0x72, 0xdc, 0x73, 0x40, 0x31, 0x78, - 0x43, 0xc3, 0x93, 0xf5, 0x89, 0x95, 0xcf, 0xf7, 0xa1, 0xbe, 0xfa, 0x48, 0xcc, 0xde, 0x5b, 0x50, - 0x88, 0x41, 0x7d, 0xdc, 0xef, 0x5e, 0x35, 0x36, 0x99, 0x9d, 0x1e, 0xdf, 0x2f, 0x63, 0x25, 0xbc, - 0xa6, 0x59, 0xb6, 0x61, 0x6a, 0x15, 0xa9, 0xb6, 0xa4, 0xdf, 0x36, 0x7c, 0xbb, 0x58, 0x55, 0xd1, - 0xd4, 0xaa, 0xcd, 0x3c, 0x74, 0x97, 0xf0, 0x1b, 0xff, 0x0e, 0x9c, 0x8b, 0xd4, 0x42, 0x6c, 0x57, - 0xa1, 0xa7, 0xaa, 0x59, 0x36, 0xc2, 0x1a, 0x8b, 0x83, 0x75, 0x48, 0x9b, 0xe9, 0xf0, 0x14, 0xce, - 0x32, 0xd3, 0xcb, 0x86, 0x51, 0x43, 0x18, 0xfc, 0x2d, 0x78, 0xc2, 0x77, 0x86, 0x4e, 0x66, 0xa1, - 0xa7, 0x6e, 0x18, 0x35, 0x74, 0x32, 0x1c, 0xe7, 0xa4, 0xa1, 0x83, 0xb4, 0x99, 0x3c, 0xdf, 0x0f, - 0xd4, 0x31, 0x26, 0x99, 0xd2, 0xba, 0x5b, 0x1b, 0xfc, 0x1b, 0x90, 0x0f, 0x9c, 0xa2, 0x93, 0x6b, - 0xd0, 0x5b, 0x67, 0x27, 0xe8, 0xa6, 0x10, 0xeb, 0x86, 0x49, 0xb9, 0xf3, 0x84, 0xa3, 0x33, 0xfd, - 0xf7, 0x00, 0x3c, 0xc6, 0xac, 0xd2, 0xcf, 0x09, 0x40, 0xf3, 0xce, 0x53, 0x21, 0xce, 0x4c, 0xf4, - 0x4e, 0xcc, 0x89, 0x99, 0xe5, 0x71, 0x66, 0x9b, 0xf8, 0xf0, 0x97, 0xbf, 0x3e, 0xeb, 0x1a, 0xa5, - 0xbc, 0x18, 0xb3, 0x8d, 0xfb, 0xea, 0xe5, 0x6b, 0x02, 0x7d, 0x9e, 0x09, 0x7a, 0x29, 0x9b, 0x2b, - 0x17, 0x99, 0x90, 0x55, 0x1c, 0x81, 0xbd, 0xc8, 0x80, 0x3d, 0x4f, 0x67, 0xd2, 0x81, 0x89, 0x3b, - 0xc1, 0xa2, 0xd9, 0xa5, 0xbf, 0x12, 0xe8, 0x8f, 0x5a, 0xe9, 0xe8, 0x5c, 0x36, 0x14, 0xe1, 0x91, - 0x82, 0x7b, 0xa1, 0x0d, 0x4d, 0xa4, 0x72, 0x93, 0x51, 0x99, 0xa7, 0x2f, 0xb5, 0x41, 0x45, 0xf4, - 0xbd, 0x3b, 0xf4, 0x3f, 0x02, 0x4f, 0x27, 0x6e, 0x48, 0x74, 0x3e, 0x1b, 0xca, 0x84, 0xd9, 0x89, - 0x5b, 0x38, 0x8a, 0x09, 0x64, 0xbc, 0xc2, 0x18, 0xdf, 0xa2, 0x4b, 0xed, 0x30, 0x6e, 0x4e, 0x44, - 0x7e, 0xee, 0x3f, 0x12, 0x80, 0xa6, 0xab, 0x94, 0xc2, 0x08, 0x2d, 0x1e, 0x29, 0x85, 0x11, 0x1e, - 0x6a, 0xf9, 0xb7, 0x19, 0x85, 0x12, 0x5d, 0x3e, 0x62, 0xd2, 0xc4, 0x9d, 0x60, 0xe3, 0xdf, 0xa5, - 0xff, 0x12, 0xc8, 0x47, 0x44, 0x8f, 0x5e, 0x49, 0x84, 0x18, 0xbf, 0x54, 0x71, 0x73, 0xad, 0x2b, - 0x22, 0xc9, 0x75, 0x46, 0x52, 0xa5, 0x4a, 0xa7, 0x49, 0x46, 0x26, 0x91, 0xfe, 0x44, 0xa0, 0x3f, - 0x6a, 0x27, 0x49, 0x29, 0xcb, 0x84, 0x25, 0x2b, 0xa5, 0x2c, 0x93, 0x16, 0x20, 0xfe, 0x1a, 0x23, - 0x3f, 0x4b, 0x2f, 0xc7, 0x91, 0x4f, 0xcc, 0x62, 0xa3, 0x16, 0x13, 0x87, 0xfc, 0x94, 0x5a, 0xcc, - 0xb2, 0xc7, 0xa4, 0xd4, 0x62, 0xa6, 0x1d, 0x23, 0xbd, 0x16, 0x3d, 0x66, 0x19, 0xd3, 0x68, 0xd1, - 0x1f, 0x08, 0x9c, 0x0e, 0x4c, 0xc4, 0x74, 0x2a, 0x11, 0x68, 0xd4, 0xc2, 0xc0, 0x4d, 0xb7, 0xa2, - 0x82, 0x5c, 0x96, 0x18, 0x97, 0x57, 0xe8, 0x7c, 0x3b, 0x5c, 0xcc, 0x00, 0xe2, 0x3d, 0x02, 0xf9, - 0x88, 0x29, 0x33, 0xa5, 0x0a, 0xe3, 0x87, 0x66, 0x6e, 0xae, 0x75, 0x45, 0x64, 0xb5, 0xc8, 0x58, - 0xbd, 0x4c, 0xaf, 0xb7, 0xc3, 0xca, 0xf7, 0x3e, 0x3f, 0x20, 0x40, 0xc3, 0x7e, 0xe8, 0x6c, 0x8b, - 0xc0, 0x5c, 0x42, 0x57, 0x5a, 0xd6, 0x43, 0x3e, 0x6f, 0x31, 0x3e, 0x2b, 0xf4, 0xf5, 0xa3, 0xf1, - 0x09, 0x3f, 0xeb, 0xdf, 0x11, 0x38, 0x13, 0x9c, 0x05, 0x69, 0xf2, 0x2d, 0x8a, 0x1c, 0x56, 0xb9, - 0x99, 0x96, 0x74, 0x90, 0xd4, 0x1c, 0x23, 0x35, 0x4d, 0x9f, 0x8b, 0x23, 0x55, 0xf5, 0xf4, 0xd6, - 0x34, 0xfd, 0xb6, 0x21, 0xee, 0x38, 0x23, 0xf0, 0x2e, 0xfd, 0x80, 0x40, 0x4f, 0x63, 0xb8, 0xa4, - 0xe3, 0x89, 0x7e, 0x7d, 0x73, 0x2c, 0x77, 0x21, 0x83, 0x24, 0xe2, 0x1a, 0x65, 0xb8, 0x0a, 0x74, - 0x38, 0x0e, 0x57, 0x63, 0x96, 0xa5, 0x1f, 0x13, 0xe8, 0x75, 0x26, 0x4f, 0x3a, 0x91, 0x6c, 0xdb, - 0x3f, 0xec, 0x72, 0x17, 0x33, 0xc9, 0x22, 0x92, 0x31, 0x86, 0x64, 0x84, 0x16, 0x62, 0x91, 0x38, - 0xa3, 0xef, 0xe2, 0xfd, 0xfd, 0x02, 0xd9, 0xdb, 0x2f, 0x90, 0x3f, 0xf7, 0x0b, 0xe4, 0x93, 0x83, - 0x42, 0x6e, 0xef, 0xa0, 0x90, 0xfb, 0xed, 0xa0, 0x90, 0x7b, 0x77, 0x52, 0xd5, 0xec, 0xea, 0x46, - 0x59, 0xa8, 0x18, 0xeb, 0xae, 0x0d, 0xe7, 0xcf, 0x25, 0x4b, 0xbe, 0x23, 0x6e, 0x79, 0x06, 0xed, - 0xed, 0xba, 0x62, 0x95, 0x7b, 0xd9, 0x3f, 0x88, 0x66, 0xfe, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x4b, - 0x6e, 0xeb, 0x7f, 0xe4, 0x1a, 0x00, 0x00, + // 1309 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x59, 0xcd, 0x6f, 0x1b, 0x55, + 0x10, 0xf7, 0x6b, 0x43, 0x44, 0xa6, 0x6a, 0x55, 0x9e, 0x93, 0x10, 0xb6, 0xc1, 0x4e, 0x57, 0x21, + 0xa4, 0x6e, 0xea, 0x25, 0x4e, 0x49, 0x43, 0xa9, 0x0a, 0x09, 0xa1, 0x25, 0xea, 0x81, 0xc4, 0x88, + 0xf0, 0x75, 0x88, 0xd6, 0xde, 0xed, 0x7a, 0x55, 0x7b, 0xd7, 0xdd, 0xdd, 0x44, 0x09, 0x51, 0x0e, + 0x70, 0x82, 0x1b, 0x88, 0x13, 0x70, 0xe9, 0x01, 0x09, 0x09, 0x8e, 0xf0, 0x0f, 0x70, 0xa2, 0xdc, + 0x82, 0xe0, 0x00, 0x97, 0x82, 0x12, 0x0e, 0x15, 0x27, 0x6e, 0x88, 0x1b, 0xf2, 0xdb, 0xd9, 0xf5, + 0x6e, 0xf6, 0xd3, 0x8e, 0xa3, 0xa8, 0xb7, 0xf8, 0xed, 0x7c, 0xfc, 0x7e, 0x33, 0x6f, 0xe6, 0xcd, + 0x28, 0xc0, 0x57, 0x75, 0xb3, 0xa1, 0x9b, 0x82, 0x69, 0x89, 0x77, 0x54, 0x4d, 0x11, 0x36, 0xa6, + 0x2b, 0xb2, 0x25, 0x4e, 0x0b, 0x77, 0xd7, 0x65, 0x63, 0xab, 0xd8, 0x34, 0x74, 0x4b, 0xa7, 0xc3, + 0xb6, 0x4c, 0x11, 0x65, 0x8a, 0x28, 0xc3, 0x15, 0x50, 0xb7, 0x22, 0x9a, 0xb2, 0xad, 0xe0, 0xaa, + 0x37, 0x45, 0x45, 0xd5, 0x44, 0x4b, 0xd5, 0x35, 0xdb, 0x06, 0x37, 0xa8, 0xe8, 0x8a, 0xce, 0xfe, + 0x14, 0x5a, 0x7f, 0xe1, 0xe9, 0xa8, 0xa2, 0xeb, 0x4a, 0x5d, 0x16, 0xc4, 0xa6, 0x2a, 0x88, 0x9a, + 0xa6, 0x5b, 0x4c, 0xc5, 0xc4, 0xaf, 0xe3, 0x11, 0xd8, 0x1c, 0x1c, 0x4c, 0x8a, 0xdf, 0x84, 0xe1, + 0x95, 0x96, 0xef, 0x55, 0xb1, 0xae, 0x4a, 0xa2, 0xa5, 0x1b, 0x66, 0x59, 0xbe, 0xbb, 0x2e, 0x9b, + 0x16, 0x1d, 0x86, 0x7e, 0xd3, 0x12, 0xad, 0x75, 0x73, 0x84, 0x8c, 0x91, 0xc9, 0x81, 0x32, 0xfe, + 0xa2, 0x37, 0x00, 0xda, 0xf8, 0x46, 0x4e, 0x8c, 0x91, 0xc9, 0x53, 0xa5, 0x89, 0x22, 0x92, 0x6c, + 0x91, 0x29, 0xda, 0xec, 0xd1, 0x5f, 0x71, 0x59, 0x54, 0x64, 0xb4, 0x59, 0xf6, 0x68, 0xf2, 0xdf, + 0x12, 0x78, 0x32, 0xe0, 0xda, 0x6c, 0xea, 0x9a, 0x29, 0xd3, 0x9b, 0x00, 0x1b, 0xee, 0xe9, 0x08, + 0x19, 0x3b, 0x39, 0x79, 0xaa, 0x74, 0xbe, 0x18, 0x1e, 0xc8, 0xa2, 0xab, 0xbf, 0xd0, 0x77, 0xff, + 0x41, 0x3e, 0x53, 0xf6, 0xa8, 0xb6, 0x0c, 0x05, 0xc0, 0x3e, 0x9b, 0x08, 0xd6, 0x46, 0xe1, 0x43, + 0x7b, 0x1d, 0x86, 0xfc, 0x60, 0x9d, 0x30, 0x3d, 0x03, 0x67, 0x5c, 0x7f, 0x6b, 0xa2, 0x24, 0x19, + 0x18, 0xae, 0xd3, 0xee, 0xe9, 0xbc, 0x24, 0x19, 0xfc, 0xda, 0xc1, 0x38, 0xbb, 0x5c, 0x5f, 0x85, + 0x01, 0x57, 0x94, 0xe9, 0x76, 0x40, 0xb5, 0xad, 0xc9, 0x7f, 0x4a, 0x60, 0xcc, 0xef, 0x61, 0x51, + 0xae, 0xcb, 0x8a, 0x7d, 0x25, 0x3a, 0x03, 0xdb, 0xb3, 0x14, 0x3f, 0x24, 0x70, 0x3e, 0x06, 0x13, + 0x06, 0xe0, 0x7d, 0x18, 0x94, 0xdc, 0xe3, 0x35, 0x03, 0x8f, 0x9d, 0xb4, 0x17, 0xa2, 0x62, 0xd1, + 0x36, 0xe5, 0x58, 0x5a, 0x38, 0xd7, 0x0a, 0xca, 0x37, 0x7f, 0xe4, 0xb3, 0xc1, 0x6f, 0x66, 0x39, + 0x2b, 0x05, 0x0f, 0x7b, 0x77, 0x3f, 0xbe, 0x20, 0x70, 0xc1, 0x4f, 0xf5, 0x4d, 0xad, 0xa2, 0x6b, + 0x92, 0xaa, 0x29, 0xc7, 0x9f, 0x87, 0xdf, 0x09, 0x14, 0xd2, 0x80, 0xc3, 0x84, 0x54, 0x20, 0xbb, + 0xee, 0x7c, 0x0f, 0xe4, 0xe3, 0x62, 0x54, 0x3e, 0x42, 0x4c, 0xe2, 0x2d, 0xa5, 0xae, 0xb5, 0x23, + 0x08, 0x7c, 0x13, 0x0b, 0xcb, 0x9b, 0x72, 0x37, 0xc8, 0x98, 0xf2, 0x03, 0x41, 0x76, 0x4f, 0x59, + 0x90, 0x83, 0xb9, 0x38, 0x11, 0x92, 0x8b, 0xab, 0x8f, 0x7f, 0x74, 0x2f, 0x9f, 0x79, 0x78, 0x2f, + 0x9f, 0xe1, 0x37, 0xb0, 0x6f, 0x05, 0x2f, 0x19, 0x7d, 0x0f, 0xb2, 0x21, 0x57, 0x19, 0xab, 0xba, + 0x83, 0x9b, 0x5c, 0xa6, 0xc1, 0xcb, 0xca, 0x6f, 0x41, 0x9e, 0xf9, 0x0d, 0x09, 0xf4, 0x51, 0x53, + 0x6e, 0x60, 0x6f, 0x09, 0x75, 0x8d, 0xdc, 0x97, 0xa0, 0xdf, 0xce, 0x33, 0xd2, 0xed, 0xe2, 0xa2, + 0xa0, 0x01, 0xfe, 0x4b, 0xa7, 0x97, 0x2d, 0x3a, 0xb0, 0xc3, 0x6b, 0x28, 0x0d, 0xd7, 0x1e, 0xd5, + 0x90, 0x27, 0x18, 0x3f, 0x3b, 0x5d, 0x2d, 0x1c, 0x1d, 0x86, 0xa3, 0xda, 0xb3, 0xae, 0x66, 0xc7, + 0xe6, 0x68, 0xdb, 0xd7, 0x57, 0x4e, 0xfb, 0x72, 0x39, 0x25, 0xb4, 0xaf, 0xe3, 0x09, 0xbd, 0xdb, + 0xc8, 0x12, 0x60, 0x3e, 0x8a, 0x8d, 0xec, 0x1f, 0x02, 0x4f, 0x31, 0x6e, 0x65, 0x59, 0xea, 0x3a, + 0xe4, 0x53, 0x40, 0x4d, 0xa3, 0xba, 0x16, 0x5a, 0xdd, 0x67, 0x4d, 0xa3, 0xba, 0xea, 0x7b, 0x5f, + 0xa6, 0x80, 0x4a, 0xa6, 0x75, 0x50, 0xfa, 0xa4, 0x2d, 0x2d, 0x99, 0xd6, 0x6a, 0xcc, 0x6b, 0xd4, + 0xd7, 0x83, 0x74, 0xee, 0x12, 0xe0, 0xc2, 0x28, 0x63, 0xfa, 0x54, 0x18, 0x36, 0xe4, 0x98, 0x22, + 0x9a, 0x8a, 0xca, 0xa0, 0xd7, 0xdc, 0x81, 0x32, 0x1a, 0x32, 0xe4, 0xa3, 0x9e, 0x03, 0xf2, 0xfe, + 0x1b, 0x1a, 0x9c, 0xac, 0x8f, 0xad, 0x7c, 0xbe, 0x0f, 0xf4, 0xd5, 0x47, 0x62, 0xf6, 0xde, 0x84, + 0x5c, 0x04, 0xea, 0xa3, 0x7e, 0xf7, 0x6a, 0x91, 0xc9, 0xec, 0xf5, 0xf8, 0x7e, 0x19, 0x2b, 0xe1, + 0x35, 0xd5, 0xb4, 0x74, 0x43, 0xad, 0x8a, 0xf5, 0x25, 0xed, 0xb6, 0xee, 0xd9, 0xc5, 0x6a, 0xb2, + 0xaa, 0xd4, 0x2c, 0xe6, 0xe1, 0x64, 0x19, 0x7f, 0xf1, 0xef, 0xc0, 0xb9, 0x50, 0x2d, 0xc4, 0x76, + 0x15, 0xfa, 0x6a, 0xaa, 0x69, 0x21, 0xac, 0x89, 0x28, 0x58, 0x07, 0xb4, 0x99, 0x0e, 0x4f, 0xe1, + 0x2c, 0x33, 0xbd, 0xac, 0xeb, 0x75, 0x84, 0xc1, 0xdf, 0x82, 0x27, 0x3c, 0x67, 0xe8, 0x64, 0x16, + 0xfa, 0x9a, 0xba, 0x5e, 0x47, 0x27, 0xa3, 0x51, 0x4e, 0x5a, 0x3a, 0x48, 0x9b, 0xc9, 0xf3, 0x83, + 0x40, 0x6d, 0x63, 0xa2, 0x21, 0x36, 0x9c, 0xda, 0xe0, 0xdf, 0x80, 0xac, 0xef, 0x14, 0x9d, 0x5c, + 0x83, 0xfe, 0x26, 0x3b, 0x41, 0x37, 0xb9, 0x48, 0x37, 0x4c, 0xca, 0x99, 0x27, 0x6c, 0x9d, 0xd2, + 0xdf, 0x43, 0xf0, 0x18, 0xb3, 0x4a, 0x3f, 0x27, 0x00, 0xed, 0x3b, 0x4f, 0x8b, 0x51, 0x66, 0xc2, + 0x77, 0x62, 0x4e, 0x48, 0x2d, 0x8f, 0x33, 0x5b, 0xe1, 0xc3, 0x5f, 0xfe, 0xfa, 0xec, 0xc4, 0x38, + 0xe5, 0x85, 0x88, 0x6d, 0xdc, 0x53, 0x2f, 0x5f, 0x13, 0x18, 0x70, 0x4d, 0xd0, 0x4b, 0xe9, 0x5c, + 0x39, 0xc8, 0x8a, 0x69, 0xc5, 0x11, 0xd8, 0x8b, 0x0c, 0xd8, 0xf3, 0x74, 0x26, 0x19, 0x98, 0xb0, + 0xed, 0x2f, 0x9a, 0x1d, 0xfa, 0x2b, 0x81, 0xc1, 0xb0, 0x95, 0x8e, 0xce, 0xa5, 0x43, 0x11, 0x1c, + 0x29, 0xb8, 0x17, 0xba, 0xd0, 0x44, 0x2a, 0x37, 0x19, 0x95, 0x79, 0xfa, 0x52, 0x17, 0x54, 0x04, + 0xcf, 0xbb, 0x43, 0xff, 0x23, 0xf0, 0x74, 0xec, 0x86, 0x44, 0xe7, 0xd3, 0xa1, 0x8c, 0x99, 0x9d, + 0xb8, 0x85, 0xc3, 0x98, 0x40, 0xc6, 0x2b, 0x8c, 0xf1, 0x2d, 0xba, 0xd4, 0x0d, 0xe3, 0xf6, 0x44, + 0xe4, 0xe5, 0xfe, 0x23, 0x01, 0x68, 0xbb, 0x4a, 0x28, 0x8c, 0xc0, 0xe2, 0x91, 0x50, 0x18, 0xc1, + 0xa1, 0x96, 0x7f, 0x9b, 0x51, 0x28, 0xd3, 0xe5, 0x43, 0x26, 0x4d, 0xd8, 0xf6, 0x37, 0xfe, 0x1d, + 0xfa, 0x2f, 0x81, 0x6c, 0x48, 0xf4, 0xe8, 0x95, 0x58, 0x88, 0xd1, 0x4b, 0x15, 0x37, 0xd7, 0xb9, + 0x22, 0x92, 0x6c, 0x30, 0x92, 0x0a, 0x95, 0x7b, 0x4d, 0x32, 0x34, 0x89, 0xf4, 0x27, 0x02, 0x83, + 0x61, 0x3b, 0x49, 0x42, 0x59, 0xc6, 0x2c, 0x59, 0x09, 0x65, 0x19, 0xb7, 0x00, 0xf1, 0xd7, 0x18, + 0xf9, 0x59, 0x7a, 0x39, 0x8a, 0x7c, 0x6c, 0x16, 0x5b, 0xb5, 0x18, 0x3b, 0xe4, 0x27, 0xd4, 0x62, + 0x9a, 0x3d, 0x26, 0xa1, 0x16, 0x53, 0xed, 0x18, 0xc9, 0xb5, 0xe8, 0x32, 0x4b, 0x99, 0x46, 0x93, + 0xfe, 0x40, 0xe0, 0xb4, 0x6f, 0x22, 0xa6, 0xd3, 0xb1, 0x40, 0xc3, 0x16, 0x06, 0xae, 0xd4, 0x89, + 0x0a, 0x72, 0x59, 0x62, 0x5c, 0x5e, 0xa1, 0xf3, 0xdd, 0x70, 0x31, 0x7c, 0x88, 0x77, 0x09, 0x64, + 0x43, 0xa6, 0xcc, 0x84, 0x2a, 0x8c, 0x1e, 0x9a, 0xb9, 0xb9, 0xce, 0x15, 0x91, 0xd5, 0x0d, 0xc6, + 0xea, 0x65, 0x7a, 0xbd, 0x1b, 0x56, 0x9e, 0xf7, 0xf9, 0x01, 0x01, 0x1a, 0xf4, 0x43, 0x67, 0x3b, + 0x04, 0xe6, 0x10, 0xba, 0xd2, 0xb1, 0x1e, 0xf2, 0x79, 0x8b, 0xf1, 0x59, 0xa1, 0xaf, 0x1f, 0x8e, + 0x4f, 0xf0, 0x59, 0xff, 0x8e, 0xc0, 0x19, 0xff, 0x2c, 0x48, 0xe3, 0x6f, 0x51, 0xe8, 0xb0, 0xca, + 0xcd, 0x74, 0xa4, 0x83, 0xa4, 0xe6, 0x18, 0xa9, 0x12, 0x7d, 0x2e, 0x8a, 0x54, 0xcd, 0xd5, 0x5b, + 0x53, 0xb5, 0xdb, 0xba, 0xb0, 0x6d, 0x8f, 0xc0, 0x3b, 0xf4, 0x03, 0x02, 0x7d, 0xad, 0xe1, 0x92, + 0x4e, 0xc6, 0xfa, 0xf5, 0xcc, 0xb1, 0xdc, 0x85, 0x14, 0x92, 0x88, 0x6b, 0x9c, 0xe1, 0xca, 0xd1, + 0xd1, 0x28, 0x5c, 0xad, 0x59, 0x96, 0x7e, 0x4c, 0xa0, 0xdf, 0x9e, 0x3c, 0x69, 0x21, 0xde, 0xb6, + 0x77, 0xd8, 0xe5, 0x2e, 0xa6, 0x92, 0x45, 0x24, 0x13, 0x0c, 0xc9, 0x18, 0xcd, 0x45, 0x22, 0xb1, + 0x47, 0xdf, 0xc5, 0xfb, 0x7b, 0x39, 0xb2, 0xbb, 0x97, 0x23, 0x7f, 0xee, 0xe5, 0xc8, 0x27, 0xfb, + 0xb9, 0xcc, 0xee, 0x7e, 0x2e, 0xf3, 0xdb, 0x7e, 0x2e, 0xf3, 0x6e, 0x41, 0x51, 0xad, 0xda, 0x7a, + 0xa5, 0x58, 0xd5, 0x1b, 0x42, 0x5d, 0xd5, 0x64, 0xa1, 0x5e, 0x69, 0x5c, 0x32, 0xa5, 0x3b, 0xc2, + 0x46, 0x49, 0xd8, 0x74, 0xcd, 0x59, 0x5b, 0x4d, 0xd9, 0xac, 0xf4, 0xb3, 0x7f, 0x0f, 0xcd, 0xfc, + 0x1f, 0x00, 0x00, 0xff, 0xff, 0x77, 0x52, 0x73, 0xc7, 0xe2, 0x1a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/staking/types/staking.pb.go b/x/staking/types/staking.pb.go index 3d884f4af6..8adb1405a6 100644 --- a/x/staking/types/staking.pb.go +++ b/x/staking/types/staking.pb.go @@ -12,13 +12,13 @@ import ( proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_protoc_gen_gogo_descriptor "github.com/gogo/protobuf/protoc-gen-gogo/descriptor" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/golang/protobuf/ptypes/duration" - _ "github.com/golang/protobuf/ptypes/timestamp" types1 "github.com/line/lbm-sdk/v2/codec/types" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types2 "github.com/line/lbm-sdk/v2/types" + types "github.com/line/ostracon/proto/ostracon/types" _ "github.com/regen-network/cosmos-proto" - types "github.com/tendermint/tendermint/proto/tendermint/types" + _ "google.golang.org/protobuf/types/known/durationpb" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" io_ioutil "io/ioutil" math "math" @@ -136,11 +136,11 @@ func (m *HistoricalInfo) GetValset() []Validator { // a validator. type CommissionRates struct { // rate is the commission rate charged to delegators, as a fraction. - Rate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=rate,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"rate"` + Rate github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,1,opt,name=rate,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"rate"` // max_rate defines the maximum commission rate which validator can ever charge, as a fraction. - MaxRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=max_rate,json=maxRate,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"max_rate" yaml:"max_rate"` + MaxRate github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,2,opt,name=max_rate,json=maxRate,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"max_rate" yaml:"max_rate"` // max_change_rate defines the maximum daily increase of the validator commission, as a fraction. - MaxChangeRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=max_change_rate,json=maxChangeRate,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"max_change_rate" yaml:"max_change_rate"` + MaxChangeRate github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,3,opt,name=max_change_rate,json=maxChangeRate,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"max_change_rate" yaml:"max_change_rate"` } func (m *CommissionRates) Reset() { *m = CommissionRates{} } @@ -321,9 +321,9 @@ type Validator struct { // status is the validator status (bonded/unbonding/unbonded). Status BondStatus `protobuf:"varint,4,opt,name=status,proto3,enum=cosmos.staking.v1beta1.BondStatus" json:"status,omitempty"` // tokens define the delegated tokens (incl. self-delegation). - Tokens github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,5,opt,name=tokens,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"tokens"` + Tokens github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,5,opt,name=tokens,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"tokens"` // delegator_shares defines total shares issued to a validator's delegators. - DelegatorShares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=delegator_shares,json=delegatorShares,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"delegator_shares" yaml:"delegator_shares"` + DelegatorShares github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,6,opt,name=delegator_shares,json=delegatorShares,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"delegator_shares" yaml:"delegator_shares"` // description defines the description terms for the validator. Description Description `protobuf:"bytes,7,opt,name=description,proto3" json:"description"` // unbonding_height defines, if unbonding, the height at which this validator has begun unbonding. @@ -333,7 +333,7 @@ type Validator struct { // commission defines the commission parameters. Commission Commission `protobuf:"bytes,10,opt,name=commission,proto3" json:"commission"` // min_self_delegation is the validator's self declared minimum self delegation. - MinSelfDelegation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,11,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"min_self_delegation" yaml:"min_self_delegation"` + MinSelfDelegation github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,11,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"min_self_delegation" yaml:"min_self_delegation"` } func (m *Validator) Reset() { *m = Validator{} } @@ -593,7 +593,7 @@ type Delegation struct { // validator_address is the bech32-encoded address of the validator. ValidatorAddress string `protobuf:"bytes,2,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` // shares define the delegation shares received. - Shares github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=shares,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"shares"` + Shares github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,3,opt,name=shares,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"shares"` } func (m *Delegation) Reset() { *m = Delegation{} } @@ -678,9 +678,9 @@ type UnbondingDelegationEntry struct { // completion_time is the unix time for unbonding completion. CompletionTime time.Time `protobuf:"bytes,2,opt,name=completion_time,json=completionTime,proto3,stdtime" json:"completion_time" yaml:"completion_time"` // initial_balance defines the tokens initially scheduled to receive at completion. - InitialBalance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=initial_balance,json=initialBalance,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"initial_balance" yaml:"initial_balance"` + InitialBalance github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,3,opt,name=initial_balance,json=initialBalance,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"initial_balance" yaml:"initial_balance"` // balance defines the tokens to receive at completion. - Balance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=balance,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"balance"` + Balance github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,4,opt,name=balance,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"balance"` } func (m *UnbondingDelegationEntry) Reset() { *m = UnbondingDelegationEntry{} } @@ -736,9 +736,9 @@ type RedelegationEntry struct { // completion_time defines the unix time for redelegation completion. CompletionTime time.Time `protobuf:"bytes,2,opt,name=completion_time,json=completionTime,proto3,stdtime" json:"completion_time" yaml:"completion_time"` // initial_balance defines the initial balance when redelegation started. - InitialBalance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=initial_balance,json=initialBalance,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"initial_balance" yaml:"initial_balance"` + InitialBalance github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,3,opt,name=initial_balance,json=initialBalance,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"initial_balance" yaml:"initial_balance"` // shares_dst is the amount of destination-validator shares created by redelegation. - SharesDst github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=shares_dst,json=sharesDst,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"shares_dst"` + SharesDst github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,4,opt,name=shares_dst,json=sharesDst,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"shares_dst"` } func (m *RedelegationEntry) Reset() { *m = RedelegationEntry{} } @@ -970,8 +970,8 @@ func (m *DelegationResponse) GetBalance() types2.Coin { // contains a balance in addition to shares which is more suitable for client // responses. type RedelegationEntryResponse struct { - RedelegationEntry RedelegationEntry `protobuf:"bytes,1,opt,name=redelegation_entry,json=redelegationEntry,proto3" json:"redelegation_entry"` - Balance github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=balance,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"balance"` + RedelegationEntry RedelegationEntry `protobuf:"bytes,1,opt,name=redelegation_entry,json=redelegationEntry,proto3" json:"redelegation_entry"` + Balance github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,4,opt,name=balance,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"balance"` } func (m *RedelegationEntryResponse) Reset() { *m = RedelegationEntryResponse{} } @@ -1072,8 +1072,8 @@ func (m *RedelegationResponse) GetEntries() []RedelegationEntryResponse { // Pool is used for tracking bonded and not-bonded token supply of the bond // denomination. type Pool struct { - NotBondedTokens github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=not_bonded_tokens,json=notBondedTokens,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"not_bonded_tokens"` - BondedTokens github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=bonded_tokens,json=bondedTokens,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"bonded_tokens" yaml:"bonded_tokens"` + NotBondedTokens github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,1,opt,name=not_bonded_tokens,json=notBondedTokens,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"not_bonded_tokens"` + BondedTokens github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,2,opt,name=bonded_tokens,json=bondedTokens,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"bonded_tokens" yaml:"bonded_tokens"` } func (m *Pool) Reset() { *m = Pool{} } @@ -1138,120 +1138,120 @@ func init() { } var fileDescriptor_64c30c6cf92913c9 = []byte{ - // 1796 bytes of a gzipped FileDescriptorProto + // 1800 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x58, 0x4d, 0x6c, 0x23, 0x49, - 0x15, 0x76, 0x3b, 0x5e, 0xc7, 0x7e, 0x4e, 0xe2, 0xa4, 0x26, 0x33, 0xeb, 0x98, 0xc1, 0xed, 0x6d, - 0x56, 0x4b, 0x40, 0xbb, 0x0e, 0x93, 0x45, 0x8b, 0xc8, 0x05, 0xc6, 0x71, 0x86, 0x58, 0xbb, 0x0c, - 0xa1, 0x93, 0x09, 0x12, 0xac, 0xb0, 0xca, 0xdd, 0x15, 0xa7, 0x89, 0xbb, 0xdb, 0x74, 0x95, 0x87, - 0x58, 0xda, 0x03, 0xc7, 0x65, 0x10, 0x62, 0xb9, 0xed, 0x65, 0xa4, 0x91, 0xf6, 0xba, 0x12, 0x17, - 0xc4, 0x95, 0xeb, 0x02, 0x97, 0xe1, 0x86, 0x10, 0x32, 0x68, 0xe6, 0x82, 0x38, 0x21, 0x1f, 0x10, - 0x37, 0x50, 0xfd, 0xf4, 0x4f, 0xda, 0xf1, 0xcc, 0x78, 0xb4, 0x87, 0x91, 0xd8, 0x4b, 0xe2, 0x7a, - 0xf5, 0xde, 0xf7, 0xea, 0xfd, 0xd6, 0xab, 0x86, 0x57, 0x2d, 0x9f, 0xba, 0x3e, 0xdd, 0xa2, 0x0c, - 0x9f, 0x39, 0x5e, 0x6f, 0xeb, 0xee, 0x8d, 0x2e, 0x61, 0xf8, 0x46, 0xb8, 0x6e, 0x0c, 0x02, 0x9f, - 0xf9, 0xe8, 0x9a, 0xe4, 0x6a, 0x84, 0x54, 0xc5, 0x55, 0x5d, 0xef, 0xf9, 0x3d, 0x5f, 0xb0, 0x6c, - 0xf1, 0x5f, 0x92, 0xbb, 0xba, 0xd1, 0xf3, 0xfd, 0x5e, 0x9f, 0x6c, 0x89, 0x55, 0x77, 0x78, 0xb2, - 0x85, 0xbd, 0x91, 0xda, 0xaa, 0xa5, 0xb7, 0xec, 0x61, 0x80, 0x99, 0xe3, 0x7b, 0x6a, 0x5f, 0x4f, - 0xef, 0x33, 0xc7, 0x25, 0x94, 0x61, 0x77, 0x10, 0x62, 0xcb, 0x93, 0x74, 0xa4, 0x52, 0x75, 0x2c, - 0x85, 0xad, 0x4c, 0xe9, 0x62, 0x4a, 0x22, 0x3b, 0x2c, 0xdf, 0x09, 0xb1, 0xaf, 0x33, 0xe2, 0xd9, - 0x24, 0x70, 0x1d, 0x8f, 0x6d, 0xb1, 0xd1, 0x80, 0x50, 0xf9, 0x57, 0xee, 0x1a, 0x3f, 0xd3, 0x60, - 0x65, 0xdf, 0xa1, 0xcc, 0x0f, 0x1c, 0x0b, 0xf7, 0xdb, 0xde, 0x89, 0x8f, 0xde, 0x82, 0xfc, 0x29, - 0xc1, 0x36, 0x09, 0x2a, 0x5a, 0x5d, 0xdb, 0x2c, 0x6d, 0x57, 0x1a, 0x31, 0x42, 0x43, 0xca, 0xee, - 0x8b, 0xfd, 0x66, 0xee, 0x93, 0xb1, 0x9e, 0x31, 0x15, 0x37, 0xfa, 0x06, 0xe4, 0xef, 0xe2, 0x3e, - 0x25, 0xac, 0x92, 0xad, 0x2f, 0x6c, 0x96, 0xb6, 0x5f, 0x69, 0x5c, 0xee, 0xbe, 0xc6, 0x31, 0xee, - 0x3b, 0x36, 0x66, 0x7e, 0x04, 0x20, 0xc5, 0x8c, 0x5f, 0x67, 0xa1, 0xbc, 0xeb, 0xbb, 0xae, 0x43, - 0xa9, 0xe3, 0x7b, 0x26, 0x66, 0x84, 0xa2, 0x26, 0xe4, 0x02, 0xcc, 0x88, 0x38, 0x4a, 0xb1, 0xd9, - 0xe0, 0xfc, 0x7f, 0x19, 0xeb, 0xaf, 0xf5, 0x1c, 0x76, 0x3a, 0xec, 0x36, 0x2c, 0xdf, 0x55, 0xce, - 0x50, 0xff, 0xde, 0xa0, 0xf6, 0x99, 0xb2, 0xaf, 0x45, 0x2c, 0x53, 0xc8, 0xa2, 0x77, 0xa1, 0xe0, - 0xe2, 0xf3, 0x8e, 0xc0, 0xc9, 0x0a, 0x9c, 0x9b, 0xf3, 0xe1, 0x4c, 0xc6, 0x7a, 0x79, 0x84, 0xdd, - 0xfe, 0x8e, 0x11, 0xe2, 0x18, 0xe6, 0xa2, 0x8b, 0xcf, 0xf9, 0x11, 0xd1, 0x00, 0xca, 0x9c, 0x6a, - 0x9d, 0x62, 0xaf, 0x47, 0xa4, 0x92, 0x05, 0xa1, 0x64, 0x7f, 0x6e, 0x25, 0xd7, 0x62, 0x25, 0x09, - 0x38, 0xc3, 0x5c, 0x76, 0xf1, 0xf9, 0xae, 0x20, 0x70, 0x8d, 0x3b, 0x85, 0x0f, 0x1f, 0xe8, 0x99, - 0x7f, 0x3c, 0xd0, 0x35, 0xe3, 0x4f, 0x1a, 0x40, 0xec, 0x31, 0xf4, 0x2e, 0xac, 0x5a, 0xd1, 0x4a, - 0xc8, 0x52, 0x15, 0xc3, 0x2f, 0xce, 0x8a, 0x45, 0xca, 0xdf, 0xcd, 0x02, 0x3f, 0xf4, 0xc3, 0xb1, - 0xae, 0x99, 0x65, 0x2b, 0x15, 0x8a, 0x1f, 0x40, 0x69, 0x38, 0xb0, 0x31, 0x23, 0x1d, 0x9e, 0x9d, - 0xc2, 0x93, 0xa5, 0xed, 0x6a, 0x43, 0xa6, 0x6e, 0x23, 0x4c, 0xdd, 0xc6, 0x51, 0x98, 0xba, 0xcd, - 0x1a, 0xc7, 0x9a, 0x8c, 0x75, 0x24, 0xcd, 0x4a, 0x08, 0x1b, 0x1f, 0xfc, 0x4d, 0xd7, 0x4c, 0x90, - 0x14, 0x2e, 0x90, 0xb0, 0xe9, 0xf7, 0x1a, 0x94, 0x5a, 0x84, 0x5a, 0x81, 0x33, 0xe0, 0x15, 0x82, - 0x2a, 0xb0, 0xe8, 0xfa, 0x9e, 0x73, 0xa6, 0xf2, 0xb1, 0x68, 0x86, 0x4b, 0x54, 0x85, 0x82, 0x63, - 0x13, 0x8f, 0x39, 0x6c, 0x24, 0xe3, 0x6a, 0x46, 0x6b, 0x2e, 0xf5, 0x13, 0xd2, 0xa5, 0x4e, 0x18, - 0x0d, 0x33, 0x5c, 0xa2, 0x5b, 0xb0, 0x4a, 0x89, 0x35, 0x0c, 0x1c, 0x36, 0xea, 0x58, 0xbe, 0xc7, - 0xb0, 0xc5, 0x2a, 0x39, 0x11, 0xb0, 0xcf, 0x4d, 0xc6, 0xfa, 0xcb, 0xf2, 0xac, 0x69, 0x0e, 0xc3, - 0x2c, 0x87, 0xa4, 0x5d, 0x49, 0xe1, 0x1a, 0x6c, 0xc2, 0xb0, 0xd3, 0xa7, 0x95, 0x97, 0xa4, 0x06, - 0xb5, 0x4c, 0xd8, 0xf2, 0xf1, 0x22, 0x14, 0xa3, 0x6c, 0xe7, 0x9a, 0xfd, 0x01, 0x09, 0xf8, 0xef, - 0x0e, 0xb6, 0xed, 0x80, 0x50, 0xaa, 0xf2, 0x3a, 0xa1, 0x39, 0xcd, 0x61, 0x98, 0xe5, 0x90, 0x74, - 0x53, 0x52, 0x10, 0xe3, 0x61, 0xf6, 0x28, 0xf1, 0xe8, 0x90, 0x76, 0x06, 0xc3, 0xee, 0x19, 0x19, - 0xa9, 0x68, 0xac, 0x4f, 0x45, 0xe3, 0xa6, 0x37, 0x6a, 0xbe, 0x19, 0xa3, 0xa7, 0xe5, 0x8c, 0x3f, - 0xfc, 0xe6, 0x8d, 0x75, 0x95, 0x1a, 0x56, 0x30, 0x1a, 0x30, 0xbf, 0x71, 0x30, 0xec, 0xbe, 0x4d, - 0x46, 0x3c, 0xfc, 0x8a, 0xf5, 0x40, 0x70, 0xa2, 0x6b, 0x90, 0xff, 0x11, 0x76, 0xfa, 0xc4, 0x16, - 0x0e, 0x2d, 0x98, 0x6a, 0x85, 0x76, 0x20, 0x4f, 0x19, 0x66, 0x43, 0x2a, 0xbc, 0xb8, 0xb2, 0x6d, - 0xcc, 0x4a, 0xb5, 0xa6, 0xef, 0xd9, 0x87, 0x82, 0xd3, 0x54, 0x12, 0xe8, 0x16, 0xe4, 0x99, 0x7f, - 0x46, 0x3c, 0xe5, 0xc2, 0xb9, 0xea, 0xbb, 0xed, 0x31, 0x53, 0x49, 0x73, 0x8f, 0xd8, 0xa4, 0x4f, - 0x7a, 0xc2, 0x71, 0xf4, 0x14, 0x07, 0x84, 0x56, 0xf2, 0x02, 0xb1, 0x3d, 0x77, 0x11, 0x2a, 0x4f, - 0xa5, 0xf1, 0x0c, 0xb3, 0x1c, 0x91, 0x0e, 0x05, 0x05, 0xbd, 0x0d, 0x25, 0x3b, 0x4e, 0xd4, 0xca, - 0xa2, 0x08, 0xc1, 0x17, 0x66, 0x99, 0x9f, 0xc8, 0x69, 0xd5, 0xf7, 0x92, 0xd2, 0x3c, 0x39, 0x86, - 0x5e, 0xd7, 0xf7, 0x6c, 0xc7, 0xeb, 0x75, 0x4e, 0x89, 0xd3, 0x3b, 0x65, 0x95, 0x42, 0x5d, 0xdb, - 0x5c, 0x48, 0x26, 0x47, 0x9a, 0xc3, 0x30, 0xcb, 0x11, 0x69, 0x5f, 0x50, 0x90, 0x0d, 0x2b, 0x31, - 0x97, 0x28, 0xd4, 0xe2, 0x53, 0x0b, 0xf5, 0x15, 0x55, 0xa8, 0x57, 0xd3, 0x5a, 0xe2, 0x5a, 0x5d, - 0x8e, 0x88, 0x5c, 0x0c, 0xed, 0x03, 0xc4, 0xed, 0xa1, 0x02, 0x42, 0x83, 0xf1, 0xf4, 0x1e, 0xa3, - 0x0c, 0x4f, 0xc8, 0xa2, 0xf7, 0xe0, 0x8a, 0xeb, 0x78, 0x1d, 0x4a, 0xfa, 0x27, 0x1d, 0xe5, 0x60, - 0x0e, 0x59, 0x12, 0xd1, 0x7b, 0x67, 0xbe, 0x7c, 0x98, 0x8c, 0xf5, 0xaa, 0x6a, 0xa1, 0xd3, 0x90, - 0x86, 0xb9, 0xe6, 0x3a, 0xde, 0x21, 0xe9, 0x9f, 0xb4, 0x22, 0xda, 0xce, 0xd2, 0xfb, 0x0f, 0xf4, - 0x8c, 0x2a, 0xd7, 0x8c, 0xf1, 0x16, 0x2c, 0x1d, 0xe3, 0xbe, 0x2a, 0x33, 0x42, 0xd1, 0x75, 0x28, - 0xe2, 0x70, 0x51, 0xd1, 0xea, 0x0b, 0x9b, 0x45, 0x33, 0x26, 0xc8, 0x32, 0xff, 0xe9, 0x5f, 0xeb, - 0x9a, 0xf1, 0xb1, 0x06, 0xf9, 0xd6, 0xf1, 0x01, 0x76, 0x02, 0xd4, 0x86, 0xb5, 0x38, 0x73, 0x2e, - 0x16, 0xf9, 0xf5, 0xc9, 0x58, 0xaf, 0xa4, 0x93, 0x2b, 0xaa, 0xf2, 0x38, 0x81, 0xc3, 0x32, 0x6f, - 0xc3, 0xda, 0xdd, 0xb0, 0x77, 0x44, 0x50, 0xd9, 0x34, 0xd4, 0x14, 0x8b, 0x61, 0xae, 0x46, 0x34, - 0x05, 0x95, 0x32, 0x73, 0x0f, 0x16, 0xe5, 0x69, 0x29, 0xda, 0x81, 0x97, 0x06, 0xfc, 0x87, 0xb0, - 0xae, 0xb4, 0x5d, 0x9b, 0x99, 0xbc, 0x82, 0x5f, 0x85, 0x4f, 0x8a, 0x18, 0xbf, 0xca, 0x02, 0xb4, - 0x8e, 0x8f, 0x8f, 0x02, 0x67, 0xd0, 0x27, 0xec, 0xd3, 0xb4, 0xfc, 0x08, 0xae, 0xc6, 0x66, 0xd1, - 0xc0, 0x4a, 0x59, 0x5f, 0x9f, 0x8c, 0xf5, 0xeb, 0x69, 0xeb, 0x13, 0x6c, 0x86, 0x79, 0x25, 0xa2, - 0x1f, 0x06, 0xd6, 0xa5, 0xa8, 0x36, 0x65, 0x11, 0xea, 0xc2, 0x6c, 0xd4, 0x04, 0x5b, 0x12, 0xb5, - 0x45, 0xd9, 0xe5, 0xae, 0x3d, 0x84, 0x52, 0xec, 0x12, 0x8a, 0x5a, 0x50, 0x60, 0xea, 0xb7, 0xf2, - 0xb0, 0x31, 0xdb, 0xc3, 0xa1, 0x98, 0xf2, 0x72, 0x24, 0x69, 0xfc, 0x47, 0x03, 0x88, 0x73, 0xf6, - 0xc5, 0x4c, 0x31, 0xde, 0xca, 0x55, 0xe3, 0x5d, 0x78, 0xae, 0x51, 0x4d, 0x49, 0xa7, 0xfc, 0xf9, - 0xf3, 0x2c, 0x5c, 0xb9, 0x13, 0x76, 0x9e, 0x17, 0xde, 0x07, 0x07, 0xb0, 0x48, 0x3c, 0x16, 0x38, - 0xc2, 0x09, 0x3c, 0xda, 0x5f, 0x99, 0x15, 0xed, 0x4b, 0x6c, 0xda, 0xf3, 0x58, 0x30, 0x52, 0xb1, - 0x0f, 0x61, 0x52, 0xde, 0xf8, 0xe5, 0x02, 0x54, 0x66, 0x49, 0xa2, 0x5d, 0x28, 0x5b, 0x01, 0x11, - 0x84, 0xf0, 0xfe, 0xd0, 0xc4, 0xfd, 0x51, 0x8d, 0x27, 0xcb, 0x14, 0x83, 0x61, 0xae, 0x84, 0x14, - 0x75, 0x7b, 0xf4, 0x80, 0x8f, 0x7d, 0x3c, 0xed, 0x38, 0xd7, 0x33, 0xce, 0x79, 0x86, 0xba, 0x3e, - 0x42, 0x25, 0x17, 0x01, 0xe4, 0xfd, 0xb1, 0x12, 0x53, 0xc5, 0x05, 0xf2, 0x63, 0x28, 0x3b, 0x9e, - 0xc3, 0x1c, 0xdc, 0xef, 0x74, 0x71, 0x1f, 0x7b, 0xd6, 0xf3, 0x4c, 0xcd, 0xb2, 0xe5, 0x2b, 0xb5, - 0x29, 0x38, 0xc3, 0x5c, 0x51, 0x94, 0xa6, 0x24, 0xa0, 0x7d, 0x58, 0x0c, 0x55, 0xe5, 0x9e, 0x6b, - 0xda, 0x08, 0xc5, 0x13, 0x03, 0xde, 0x2f, 0x16, 0x60, 0xcd, 0x24, 0xf6, 0x67, 0xa1, 0x98, 0x2f, - 0x14, 0xdf, 0x06, 0x90, 0xe5, 0xce, 0x1b, 0xec, 0x73, 0x44, 0x83, 0x37, 0x8c, 0xa2, 0x44, 0x68, - 0x51, 0x96, 0x88, 0xc7, 0x38, 0x0b, 0x4b, 0xc9, 0x78, 0xfc, 0x9f, 0xde, 0x4a, 0xa8, 0x1d, 0x77, - 0xa2, 0x9c, 0xe8, 0x44, 0x5f, 0x9a, 0xd5, 0x89, 0xa6, 0xb2, 0xf7, 0xc9, 0x2d, 0xe8, 0xdf, 0x59, - 0xc8, 0x1f, 0xe0, 0x00, 0xbb, 0x14, 0x59, 0x53, 0x93, 0xa6, 0x7c, 0x6b, 0x6e, 0x4c, 0xe5, 0x67, - 0x4b, 0x7d, 0xed, 0x78, 0xca, 0xa0, 0xf9, 0xe1, 0x25, 0x83, 0xe6, 0x37, 0x61, 0x85, 0x3f, 0x87, - 0x23, 0x1b, 0xa5, 0xb7, 0x97, 0x9b, 0x1b, 0x31, 0xca, 0xc5, 0x7d, 0xf9, 0x5a, 0x8e, 0x1e, 0x5d, - 0x14, 0x7d, 0x0d, 0x4a, 0x9c, 0x23, 0x6e, 0xcc, 0x5c, 0xfc, 0x5a, 0xfc, 0x2c, 0x4d, 0x6c, 0x1a, - 0x26, 0xb8, 0xf8, 0x7c, 0x4f, 0x2e, 0xd0, 0x3b, 0x80, 0x4e, 0xa3, 0x2f, 0x23, 0x9d, 0xd8, 0x9d, - 0x5c, 0xfe, 0xf3, 0x93, 0xb1, 0xbe, 0x21, 0xe5, 0xa7, 0x79, 0x0c, 0x73, 0x2d, 0x26, 0x86, 0x68, - 0x5f, 0x05, 0xe0, 0x76, 0x75, 0x6c, 0xe2, 0xf9, 0xae, 0x7a, 0xee, 0x5c, 0x9d, 0x8c, 0xf5, 0x35, - 0x89, 0x12, 0xef, 0x19, 0x66, 0x91, 0x2f, 0x5a, 0xfc, 0x77, 0x22, 0xb3, 0x3f, 0xd2, 0x00, 0xc5, - 0x2d, 0xdf, 0x24, 0x74, 0xc0, 0xdf, 0x67, 0x7c, 0x10, 0x4f, 0x4c, 0xcd, 0xda, 0x93, 0x07, 0xf1, - 0x58, 0x3e, 0x1c, 0xc4, 0x13, 0x95, 0xf2, 0xf5, 0xb8, 0x3d, 0x66, 0x55, 0x1c, 0x15, 0x4c, 0x17, - 0x53, 0x92, 0x18, 0xe6, 0x9d, 0x50, 0x7a, 0xaa, 0x1f, 0x66, 0x8c, 0x3f, 0x6a, 0xb0, 0x31, 0x95, - 0x51, 0xd1, 0x61, 0x7f, 0x08, 0x28, 0x48, 0x6c, 0x0a, 0x7f, 0x8d, 0xd4, 0xa1, 0xe7, 0x4e, 0xd0, - 0xb5, 0x60, 0xaa, 0xef, 0x7e, 0x7a, 0x1d, 0x3e, 0x27, 0x7c, 0xfe, 0x3b, 0x0d, 0xd6, 0x93, 0xea, - 0x23, 0x43, 0x6e, 0xc3, 0x52, 0x52, 0xbb, 0x32, 0xe1, 0xd5, 0x67, 0x31, 0x41, 0x9d, 0xfe, 0x82, - 0x3c, 0xfa, 0x6e, 0x5c, 0xae, 0xf2, 0xdb, 0xd9, 0x8d, 0x67, 0xf6, 0x46, 0x78, 0xa6, 0x74, 0xd9, - 0xe6, 0x44, 0x3c, 0xfe, 0xab, 0x41, 0xee, 0xc0, 0xf7, 0xfb, 0xc8, 0x87, 0x35, 0xcf, 0x67, 0x1d, - 0x9e, 0x59, 0xc4, 0xee, 0xa8, 0x47, 0xb7, 0xec, 0x83, 0xbb, 0xf3, 0x39, 0xe9, 0x9f, 0x63, 0x7d, - 0x1a, 0xca, 0x2c, 0x7b, 0x3e, 0x6b, 0x0a, 0xca, 0x91, 0x7c, 0x92, 0xbf, 0x07, 0xcb, 0x17, 0x95, - 0xc9, 0x2e, 0xf9, 0xbd, 0xb9, 0x95, 0x5d, 0x84, 0x99, 0x8c, 0xf5, 0xf5, 0xb8, 0x62, 0x22, 0xb2, - 0x61, 0x2e, 0x75, 0x13, 0xda, 0x77, 0x0a, 0x3c, 0x7e, 0xff, 0x7a, 0xa0, 0x6b, 0x5f, 0xfe, 0xad, - 0x06, 0x10, 0x7f, 0x79, 0x40, 0xaf, 0xc3, 0xcb, 0xcd, 0xef, 0xdc, 0x6e, 0x75, 0x0e, 0x8f, 0x6e, - 0x1e, 0xdd, 0x39, 0xec, 0xdc, 0xb9, 0x7d, 0x78, 0xb0, 0xb7, 0xdb, 0xbe, 0xd5, 0xde, 0x6b, 0xad, - 0x66, 0xaa, 0xe5, 0x7b, 0xf7, 0xeb, 0xa5, 0x3b, 0x1e, 0x1d, 0x10, 0xcb, 0x39, 0x71, 0x88, 0x8d, - 0x5e, 0x83, 0xf5, 0x8b, 0xdc, 0x7c, 0xb5, 0xd7, 0x5a, 0xd5, 0xaa, 0x4b, 0xf7, 0xee, 0xd7, 0x0b, - 0x72, 0x16, 0x23, 0x36, 0xda, 0x84, 0xab, 0xd3, 0x7c, 0xed, 0xdb, 0xdf, 0x5a, 0xcd, 0x56, 0x97, - 0xef, 0xdd, 0xaf, 0x17, 0xa3, 0xa1, 0x0d, 0x19, 0x80, 0x92, 0x9c, 0x0a, 0x6f, 0xa1, 0x0a, 0xf7, - 0xee, 0xd7, 0xf3, 0xd2, 0x81, 0xd5, 0xdc, 0xfb, 0x1f, 0xd5, 0x32, 0xcd, 0x5b, 0x9f, 0x3c, 0xaa, - 0x69, 0x0f, 0x1f, 0xd5, 0xb4, 0xbf, 0x3f, 0xaa, 0x69, 0x1f, 0x3c, 0xae, 0x65, 0x1e, 0x3e, 0xae, - 0x65, 0xfe, 0xfc, 0xb8, 0x96, 0xf9, 0xfe, 0xeb, 0x4f, 0xf4, 0xdd, 0x79, 0xf4, 0x51, 0x5b, 0x78, - 0xb1, 0x9b, 0x17, 0x6d, 0xf8, 0xcd, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x48, 0x4c, 0x86, - 0xf3, 0x16, 0x00, 0x00, + 0xf5, 0x77, 0x3b, 0x5e, 0xc7, 0x7e, 0x4e, 0xe2, 0xa4, 0x26, 0x93, 0x75, 0xfc, 0x9f, 0xbf, 0xdb, + 0xdb, 0x8c, 0x20, 0xac, 0x76, 0x6d, 0x26, 0xbb, 0x02, 0x91, 0xcb, 0xee, 0x38, 0xce, 0xec, 0x84, + 0x41, 0x43, 0xe8, 0x7c, 0x1c, 0x16, 0x84, 0x55, 0xee, 0xae, 0x38, 0x4d, 0xdc, 0xdd, 0x56, 0x57, + 0x79, 0x88, 0xf7, 0xc4, 0x8d, 0x65, 0xb8, 0x2c, 0xb7, 0xbd, 0x8c, 0x34, 0xd2, 0x4a, 0x48, 0x48, + 0x1c, 0x11, 0x57, 0xae, 0x0b, 0xa7, 0xe1, 0x86, 0x10, 0x32, 0x68, 0xe6, 0x82, 0x38, 0x21, 0x1f, + 0xf6, 0xc2, 0x05, 0xd5, 0x47, 0x7f, 0xa4, 0x1d, 0xcf, 0x8c, 0x57, 0x7b, 0x58, 0x09, 0x2e, 0x96, + 0xeb, 0xd5, 0x7b, 0xbf, 0x57, 0xef, 0xb3, 0x5e, 0x35, 0xdc, 0xb4, 0x7c, 0xea, 0xfa, 0xb4, 0x49, + 0x19, 0x3e, 0x77, 0xbc, 0x5e, 0xf3, 0xc1, 0xad, 0x2e, 0x61, 0xf8, 0x56, 0xb8, 0x6e, 0x0c, 0x02, + 0x9f, 0xf9, 0x68, 0x43, 0x72, 0x35, 0x42, 0xaa, 0xe2, 0xaa, 0xae, 0xf7, 0xfc, 0x9e, 0x2f, 0x58, + 0x9a, 0xfc, 0x9f, 0xe4, 0xae, 0x6e, 0xf6, 0x7c, 0xbf, 0xd7, 0x27, 0x4d, 0xb1, 0xea, 0x0e, 0x4f, + 0x9b, 0xd8, 0x1b, 0xa9, 0xad, 0x5a, 0x7a, 0xcb, 0x1e, 0x06, 0x98, 0x39, 0xbe, 0xa7, 0xf6, 0xf5, + 0xf4, 0x3e, 0x73, 0x5c, 0x42, 0x19, 0x76, 0x07, 0x21, 0xb6, 0x3c, 0x49, 0x47, 0x2a, 0x55, 0xc7, + 0x52, 0xd8, 0xca, 0x94, 0x2e, 0xa6, 0x24, 0xb2, 0xc3, 0xf2, 0x9d, 0x10, 0xbb, 0xea, 0x53, 0x16, + 0x60, 0xcb, 0xf7, 0x9a, 0x6c, 0x34, 0x20, 0x54, 0xfe, 0xca, 0x3d, 0xe3, 0x67, 0x1a, 0xac, 0xdc, + 0x75, 0x28, 0xf3, 0x03, 0xc7, 0xc2, 0xfd, 0x7d, 0xef, 0xd4, 0x47, 0x6f, 0x43, 0xfe, 0x8c, 0x60, + 0x9b, 0x04, 0x15, 0xad, 0xae, 0x6d, 0x95, 0xb6, 0x37, 0x1a, 0xa1, 0x7c, 0x43, 0x4a, 0xde, 0x15, + 0xbb, 0xad, 0xdc, 0xa7, 0x63, 0x3d, 0x63, 0x2a, 0x5e, 0xf4, 0x0e, 0xe4, 0x1f, 0xe0, 0x3e, 0x25, + 0xac, 0x92, 0xad, 0x2f, 0x6c, 0x95, 0xb6, 0x5f, 0x6b, 0x5c, 0xed, 0xba, 0xc6, 0x09, 0xee, 0x3b, + 0x36, 0x66, 0x7e, 0x04, 0x20, 0xc5, 0x8c, 0x5f, 0x67, 0xa1, 0xbc, 0xeb, 0xbb, 0xae, 0x43, 0xa9, + 0xe3, 0x7b, 0x26, 0x66, 0x84, 0xa2, 0x77, 0x21, 0x17, 0x60, 0x46, 0xc4, 0x41, 0x8a, 0xad, 0x37, + 0x38, 0xff, 0x5f, 0xc6, 0xfa, 0xcd, 0x9e, 0xc3, 0xce, 0x86, 0xdd, 0x86, 0xe5, 0xbb, 0xcd, 0xbe, + 0xe3, 0x91, 0x66, 0xbf, 0xeb, 0xbe, 0x49, 0xed, 0xf3, 0xe6, 0x83, 0x6d, 0x65, 0x5b, 0x9b, 0x58, + 0xa6, 0x90, 0x44, 0xef, 0x43, 0xc1, 0xc5, 0x17, 0x1d, 0x81, 0x92, 0x15, 0x28, 0xef, 0xcc, 0x83, + 0x32, 0x19, 0xeb, 0xe5, 0x11, 0x76, 0xfb, 0x3b, 0x46, 0x88, 0x62, 0x98, 0x8b, 0x2e, 0xbe, 0xe0, + 0xc7, 0x43, 0x1e, 0x94, 0x39, 0xd5, 0x3a, 0xc3, 0x5e, 0x8f, 0x48, 0x15, 0x0b, 0x42, 0xc5, 0x9d, + 0x39, 0x55, 0x6c, 0xc4, 0x2a, 0x12, 0x60, 0x86, 0xb9, 0xec, 0xe2, 0x8b, 0x5d, 0x41, 0xe0, 0xfa, + 0x76, 0x0a, 0x1f, 0x3f, 0xd6, 0x33, 0xff, 0x78, 0xac, 0x6b, 0xc6, 0x9f, 0x34, 0x80, 0xd8, 0x57, + 0xe8, 0x87, 0xb0, 0x6a, 0x45, 0x2b, 0x21, 0x4b, 0x55, 0xec, 0xbe, 0x36, 0x2b, 0x0a, 0x29, 0x4f, + 0xb7, 0x0a, 0xfc, 0xc8, 0x4f, 0xc6, 0xba, 0x66, 0x96, 0xad, 0x54, 0x10, 0x7e, 0x00, 0xa5, 0xe1, + 0xc0, 0xc6, 0x8c, 0x74, 0x78, 0x4e, 0x0a, 0x2f, 0x96, 0xb6, 0xab, 0x0d, 0x99, 0xb0, 0x8d, 0x30, + 0x61, 0x1b, 0x47, 0x61, 0xc2, 0xb6, 0x6a, 0x1c, 0x6b, 0x32, 0xd6, 0x91, 0x34, 0x2b, 0x21, 0x6c, + 0x7c, 0xf4, 0x37, 0x5d, 0x33, 0x41, 0x52, 0xb8, 0x40, 0xc2, 0xa6, 0x3f, 0x68, 0x50, 0x6a, 0x13, + 0x6a, 0x05, 0xce, 0x80, 0xd7, 0x05, 0xaa, 0xc0, 0xa2, 0xeb, 0x7b, 0xce, 0xb9, 0xca, 0xc3, 0xa2, + 0x19, 0x2e, 0x51, 0x15, 0x0a, 0x8e, 0x4d, 0x3c, 0xe6, 0xb0, 0x91, 0x8c, 0xa9, 0x19, 0xad, 0xb9, + 0xd4, 0x4f, 0x48, 0x97, 0x3a, 0x61, 0x2c, 0xcc, 0x70, 0x89, 0xee, 0xc0, 0x2a, 0x25, 0xd6, 0x30, + 0x70, 0xd8, 0xa8, 0x63, 0xf9, 0x1e, 0xc3, 0x16, 0xab, 0xe4, 0x44, 0xb8, 0xfe, 0x6f, 0x32, 0xd6, + 0x5f, 0x95, 0x67, 0x4d, 0x73, 0x18, 0x66, 0x39, 0x24, 0xed, 0x4a, 0x0a, 0xd7, 0x60, 0x13, 0x86, + 0x9d, 0x3e, 0xad, 0xbc, 0x22, 0x35, 0xa8, 0x65, 0xc2, 0x96, 0x5f, 0x2d, 0x42, 0x31, 0xca, 0x73, + 0xae, 0xd9, 0x1f, 0x90, 0x80, 0xff, 0xef, 0x60, 0xdb, 0x0e, 0x08, 0xa5, 0x2a, 0xa3, 0x13, 0x9a, + 0xd3, 0x1c, 0x86, 0x59, 0x0e, 0x49, 0xb7, 0x25, 0x05, 0x31, 0x1e, 0x66, 0x8f, 0x12, 0x8f, 0x0e, + 0x69, 0x67, 0x30, 0xec, 0x9e, 0x93, 0x91, 0x8a, 0xc6, 0xfa, 0x54, 0x34, 0x6e, 0x7b, 0xa3, 0xd6, + 0x5b, 0x31, 0x7a, 0x5a, 0xce, 0xf8, 0xe3, 0x6f, 0xdf, 0x5c, 0x57, 0xa9, 0x61, 0x05, 0xa3, 0x01, + 0xf3, 0x1b, 0x07, 0xc3, 0xee, 0x3d, 0x32, 0xe2, 0xe1, 0x57, 0xac, 0x07, 0x82, 0x13, 0x6d, 0x40, + 0xfe, 0xc7, 0xd8, 0xe9, 0x13, 0x5b, 0x38, 0xb4, 0x60, 0xaa, 0x15, 0xda, 0x81, 0x3c, 0x65, 0x98, + 0x0d, 0xa9, 0xf0, 0xe2, 0xca, 0xb6, 0x31, 0x2b, 0xd5, 0x5a, 0xbe, 0x67, 0x1f, 0x0a, 0x4e, 0x53, + 0x49, 0xa0, 0x36, 0xe4, 0x99, 0x7f, 0x4e, 0x3c, 0xe5, 0xc2, 0x39, 0x2a, 0x7b, 0xdf, 0x63, 0xa6, + 0x92, 0x45, 0x01, 0xac, 0xda, 0xa4, 0x4f, 0x7a, 0xc2, 0x6d, 0xf4, 0x0c, 0x07, 0x84, 0x56, 0xf2, + 0x02, 0xef, 0xbd, 0x39, 0x0b, 0x50, 0x79, 0x29, 0x8d, 0x66, 0x98, 0xe5, 0x88, 0x74, 0x28, 0x28, + 0xe8, 0x1e, 0x94, 0xec, 0x38, 0x49, 0x2b, 0x8b, 0xc2, 0xfd, 0x5f, 0x99, 0x65, 0x7a, 0x22, 0x9f, + 0x55, 0xb7, 0x4b, 0x4a, 0xf3, 0xc4, 0x18, 0x7a, 0x5d, 0xdf, 0xb3, 0x1d, 0xaf, 0xd7, 0x39, 0x23, + 0x4e, 0xef, 0x8c, 0x55, 0x0a, 0x75, 0x6d, 0x6b, 0x21, 0x99, 0x18, 0x69, 0x0e, 0xc3, 0x2c, 0x47, + 0xa4, 0xbb, 0x82, 0x82, 0x6c, 0x58, 0x89, 0xb9, 0x44, 0x91, 0x16, 0x5f, 0x58, 0xa4, 0xaf, 0xa9, + 0x22, 0xbd, 0x9e, 0xd6, 0x12, 0xd7, 0xe9, 0x72, 0x44, 0xe4, 0x62, 0xe8, 0x2e, 0x40, 0xdc, 0x1a, + 0x2a, 0x20, 0x34, 0x18, 0x2f, 0xee, 0x2f, 0xca, 0xf0, 0x84, 0x2c, 0xfa, 0x00, 0xae, 0xb9, 0x8e, + 0xd7, 0xa1, 0xa4, 0x7f, 0xda, 0x51, 0x0e, 0xe6, 0x90, 0x25, 0x11, 0xbb, 0xef, 0xcc, 0x93, 0x0b, + 0x93, 0xb1, 0x5e, 0x55, 0xcd, 0x73, 0x1a, 0xd0, 0x30, 0xd7, 0x5c, 0xc7, 0x3b, 0x24, 0xfd, 0xd3, + 0x76, 0x44, 0xdb, 0x59, 0xfa, 0xf0, 0xb1, 0x9e, 0x51, 0x85, 0x9a, 0x31, 0xbe, 0x09, 0x4b, 0x27, + 0xb8, 0xaf, 0x0a, 0x8c, 0x50, 0x74, 0x03, 0x8a, 0x38, 0x5c, 0x54, 0xb4, 0xfa, 0xc2, 0x56, 0xd1, + 0x8c, 0x09, 0xb2, 0xc0, 0x7f, 0xfa, 0xd7, 0xba, 0x66, 0xfc, 0x46, 0x83, 0x7c, 0xfb, 0xe4, 0x00, + 0x3b, 0x01, 0xda, 0x87, 0xb5, 0x38, 0x6f, 0x2e, 0x97, 0xf7, 0x8d, 0xc9, 0x58, 0xaf, 0xa4, 0x53, + 0x2b, 0xaa, 0xef, 0x38, 0x79, 0xc3, 0x02, 0xdf, 0x87, 0xb5, 0x07, 0x61, 0xd7, 0x88, 0xa0, 0xb2, + 0x69, 0xa8, 0x29, 0x16, 0xc3, 0x5c, 0x8d, 0x68, 0x0a, 0x2a, 0x65, 0xe6, 0x1e, 0x2c, 0xca, 0xd3, + 0x52, 0xb4, 0x03, 0xaf, 0x0c, 0xf8, 0x1f, 0x61, 0x5d, 0x69, 0xbb, 0x36, 0x33, 0x75, 0x05, 0xbf, + 0x0a, 0x9e, 0x14, 0x31, 0x7e, 0x99, 0x05, 0x68, 0x9f, 0x9c, 0x1c, 0x05, 0xce, 0xa0, 0x4f, 0xd8, + 0x17, 0x69, 0xf9, 0x11, 0x5c, 0x8f, 0xcd, 0xa2, 0x81, 0x95, 0xb2, 0xbe, 0x3e, 0x19, 0xeb, 0x37, + 0xd2, 0xd6, 0x27, 0xd8, 0x0c, 0xf3, 0x5a, 0x44, 0x3f, 0x0c, 0xac, 0x2b, 0x51, 0x6d, 0xca, 0x22, + 0xd4, 0x85, 0xd9, 0xa8, 0x09, 0xb6, 0x24, 0x6a, 0x9b, 0xb2, 0xab, 0x5d, 0x7b, 0x08, 0xa5, 0xd8, + 0x25, 0xbc, 0xb3, 0x15, 0x98, 0xfa, 0xaf, 0x3c, 0x6c, 0xcc, 0xf6, 0x70, 0x28, 0xa6, 0xbc, 0x1c, + 0x49, 0x1a, 0x9f, 0x69, 0x00, 0x71, 0xce, 0x7e, 0x39, 0x53, 0x8c, 0x37, 0x71, 0xd5, 0x74, 0x17, + 0x3e, 0xc7, 0x78, 0xa6, 0x64, 0x53, 0xde, 0xfc, 0x45, 0x16, 0xae, 0x1d, 0x87, 0x5d, 0xe7, 0x4b, + 0xef, 0x81, 0x03, 0x58, 0x24, 0x1e, 0x0b, 0x1c, 0xe1, 0x02, 0x1e, 0xeb, 0x6f, 0xcc, 0x8a, 0xf5, + 0x15, 0x36, 0xed, 0x79, 0x2c, 0x18, 0xa9, 0xc8, 0x87, 0x30, 0x69, 0x6f, 0x2c, 0x40, 0x65, 0x96, + 0x24, 0xda, 0x85, 0xb2, 0x15, 0x10, 0x41, 0x08, 0xef, 0x0e, 0x4d, 0xdc, 0x1d, 0xd5, 0x78, 0xa2, + 0x4c, 0x31, 0x18, 0xe6, 0x4a, 0x48, 0x51, 0x37, 0x47, 0x0f, 0xf8, 0xb8, 0xc7, 0x93, 0x8e, 0x73, + 0xbd, 0xe4, 0x7c, 0x67, 0xa8, 0xab, 0x23, 0x54, 0x72, 0x19, 0x40, 0xde, 0x1d, 0x2b, 0x31, 0x55, + 0x5c, 0x1e, 0x3e, 0x94, 0x1d, 0xcf, 0x61, 0x0e, 0xee, 0x77, 0xba, 0xb8, 0x8f, 0x3d, 0x6b, 0xfe, + 0x59, 0x59, 0xb6, 0x7b, 0xa5, 0x34, 0x05, 0x66, 0x98, 0x2b, 0x8a, 0xd2, 0x92, 0x04, 0x74, 0x07, + 0x16, 0x43, 0x45, 0xb9, 0xcf, 0x31, 0x63, 0x84, 0xc2, 0x89, 0xa1, 0xee, 0xe7, 0x0b, 0xb0, 0x66, + 0x12, 0xfb, 0x7f, 0x61, 0x98, 0x27, 0x0c, 0xf7, 0x00, 0x64, 0xa1, 0xf3, 0xc6, 0x3a, 0x77, 0x24, + 0x78, 0xa3, 0x28, 0x4a, 0xf9, 0x36, 0x65, 0x89, 0x58, 0x8c, 0xb3, 0xb0, 0x94, 0x8c, 0xc5, 0x7f, + 0xe9, 0x5d, 0x84, 0xf6, 0xe3, 0x0e, 0x94, 0x13, 0x1d, 0xe8, 0xeb, 0xb3, 0x3a, 0xd0, 0x54, 0xe6, + 0x3e, 0xbf, 0xf5, 0x7c, 0x96, 0x85, 0xfc, 0x01, 0x0e, 0xb0, 0x4b, 0x91, 0x35, 0x35, 0x5d, 0xca, + 0xb7, 0xe5, 0xe6, 0x54, 0x6e, 0xb6, 0xd5, 0x37, 0x8d, 0x17, 0x0c, 0x97, 0x1f, 0x5f, 0x31, 0x5c, + 0xbe, 0x0b, 0x2b, 0xfc, 0xf9, 0x1b, 0xd9, 0x28, 0xbd, 0xbd, 0xdc, 0xda, 0x8c, 0x51, 0x2e, 0xef, + 0xcb, 0xd7, 0x71, 0xf4, 0xc8, 0xa2, 0xe8, 0x5b, 0x50, 0xe2, 0x1c, 0x71, 0x43, 0xe6, 0xe2, 0x1b, + 0xf1, 0x33, 0x34, 0xb1, 0x69, 0x98, 0xe0, 0xe2, 0x8b, 0x3d, 0xb9, 0x40, 0xdf, 0x05, 0x74, 0x16, + 0x7d, 0x01, 0xe9, 0xc4, 0xee, 0xe4, 0xf2, 0xff, 0x3f, 0x19, 0xeb, 0x9b, 0x52, 0x7e, 0x9a, 0xc7, + 0x30, 0xd7, 0x62, 0x62, 0x88, 0xf6, 0x36, 0x00, 0xb7, 0xab, 0x63, 0x13, 0xcf, 0x77, 0xd5, 0xf3, + 0xe6, 0xfa, 0x64, 0xac, 0xaf, 0x49, 0x94, 0x78, 0xcf, 0x30, 0x8b, 0x7c, 0xd1, 0xe6, 0xff, 0x13, + 0x99, 0xfd, 0x89, 0x06, 0x28, 0x6e, 0xf5, 0x26, 0xa1, 0x03, 0xfe, 0x1e, 0xe3, 0xc3, 0x77, 0x62, + 0x52, 0xd6, 0x9e, 0x3f, 0x7c, 0xc7, 0xf2, 0xe1, 0xf0, 0x9d, 0xa8, 0x94, 0x6f, 0xc7, 0x8d, 0x31, + 0xab, 0xe2, 0xa8, 0x60, 0xba, 0x98, 0x92, 0xc4, 0x00, 0xef, 0x84, 0xd2, 0x53, 0xbd, 0x30, 0xc3, + 0x1f, 0xeb, 0x9b, 0x53, 0x19, 0x15, 0x1d, 0xf6, 0x47, 0x80, 0x82, 0xc4, 0xa6, 0xf0, 0xd7, 0x48, + 0x1d, 0x7a, 0xee, 0x04, 0x5d, 0x0b, 0xa6, 0x7a, 0xee, 0x17, 0xd5, 0xdb, 0x73, 0xc2, 0xe3, 0xbf, + 0xd7, 0x60, 0x3d, 0xa9, 0x3c, 0x32, 0xe3, 0x3e, 0x2c, 0x25, 0x75, 0x2b, 0x03, 0x6e, 0xbe, 0x8c, + 0x01, 0xea, 0xec, 0x97, 0xe4, 0xd1, 0xf7, 0xe3, 0x62, 0x95, 0xdf, 0xc8, 0x6e, 0xbd, 0xb4, 0x2f, + 0xc2, 0x33, 0xa5, 0x8b, 0x36, 0x27, 0xa2, 0xf1, 0x6f, 0x0d, 0x72, 0x07, 0xbe, 0xdf, 0x47, 0x2e, + 0xac, 0x79, 0x3e, 0xeb, 0xf0, 0xbc, 0x22, 0x76, 0x47, 0x3d, 0xb1, 0x65, 0x17, 0xbc, 0x3d, 0x8f, + 0x8b, 0xfe, 0x39, 0xd6, 0xa7, 0x81, 0xcc, 0xb2, 0xe7, 0xb3, 0x96, 0xa0, 0x1c, 0xc9, 0x07, 0xf8, + 0x07, 0xb0, 0x7c, 0x59, 0x95, 0xec, 0x90, 0xc7, 0x73, 0xaa, 0xba, 0x0c, 0x32, 0x19, 0xeb, 0xeb, + 0x71, 0xad, 0x44, 0x64, 0xc3, 0x5c, 0xea, 0x26, 0x74, 0xef, 0x14, 0x78, 0xec, 0xfe, 0xf5, 0x58, + 0xd7, 0x5e, 0xff, 0x9d, 0x06, 0x10, 0x7f, 0x63, 0x40, 0x6f, 0xc0, 0xab, 0xad, 0xef, 0xdd, 0x6f, + 0x77, 0x0e, 0x8f, 0x6e, 0x1f, 0x1d, 0x1f, 0x76, 0x8e, 0xef, 0x1f, 0x1e, 0xec, 0xed, 0xee, 0xdf, + 0xd9, 0xdf, 0x6b, 0xaf, 0x66, 0xaa, 0xe5, 0x87, 0x8f, 0xea, 0xa5, 0x63, 0x8f, 0x0e, 0x88, 0xe5, + 0x9c, 0x3a, 0xc4, 0x46, 0x5f, 0x85, 0xf5, 0xcb, 0xdc, 0x7c, 0xb5, 0xd7, 0x5e, 0xd5, 0xaa, 0x4b, + 0x0f, 0x1f, 0xd5, 0x0b, 0x72, 0xfa, 0x22, 0x36, 0xda, 0x82, 0xeb, 0xd3, 0x7c, 0xfb, 0xf7, 0xdf, + 0x5b, 0xcd, 0x56, 0x97, 0x1f, 0x3e, 0xaa, 0x17, 0xa3, 0x31, 0x0d, 0x19, 0x80, 0x92, 0x9c, 0x0a, + 0x6f, 0xa1, 0x0a, 0x0f, 0x1f, 0xd5, 0xf3, 0xd2, 0x7d, 0xd5, 0xdc, 0x87, 0x9f, 0xd4, 0x32, 0xad, + 0xf6, 0xa7, 0x4f, 0x6b, 0xda, 0x93, 0xa7, 0x35, 0xed, 0xef, 0x4f, 0x6b, 0xda, 0x47, 0xcf, 0x6a, + 0x99, 0x27, 0xcf, 0x6a, 0x99, 0x3f, 0x3f, 0xab, 0x65, 0xde, 0x7f, 0xfd, 0x39, 0x9e, 0xbb, 0x88, + 0x3e, 0x59, 0x0b, 0x1f, 0x76, 0xf3, 0xa2, 0xfd, 0xbe, 0xf5, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x5c, 0xd0, 0x87, 0x0e, 0xd1, 0x16, 0x00, 0x00, } func (this *Pool) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { @@ -1260,608 +1260,607 @@ func (this *Pool) Description() (desc *github_com_gogo_protobuf_protoc_gen_gogo_ func StakingDescription() (desc *github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet) { d := &github_com_gogo_protobuf_protoc_gen_gogo_descriptor.FileDescriptorSet{} var gzipped = []byte{ - // 9603 bytes of a gzipped FileDescriptorSet - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x70, 0x24, 0xd7, - 0x71, 0xd8, 0xcd, 0xee, 0x02, 0xd8, 0x6d, 0x2c, 0x80, 0xc5, 0x03, 0xee, 0x6e, 0x6f, 0x79, 0x04, - 0xc0, 0xe1, 0xd7, 0xf1, 0x48, 0x02, 0xe4, 0x91, 0x77, 0x24, 0xf7, 0x24, 0xd2, 0x58, 0x60, 0x0f, - 0x07, 0x1e, 0xbe, 0x38, 0x00, 0x8e, 0xd4, 0x87, 0xb3, 0x35, 0x98, 0x7d, 0x58, 0x0c, 0xb1, 0x3b, - 0x33, 0x9c, 0x99, 0xbd, 0x3b, 0x50, 0x52, 0x15, 0x2d, 0x29, 0x8a, 0x44, 0xc7, 0x91, 0x14, 0xb9, - 0x1c, 0x89, 0xd6, 0x29, 0x92, 0xe5, 0x44, 0x8e, 0xac, 0xc4, 0x1f, 0x52, 0x94, 0x38, 0x49, 0x55, - 0xa4, 0x24, 0x8e, 0x25, 0xa5, 0xe2, 0x92, 0x2a, 0xae, 0xc4, 0x71, 0x25, 0x67, 0x87, 0x52, 0x39, - 0x8c, 0xa2, 0xc4, 0xf2, 0x59, 0x4e, 0x9c, 0x52, 0xa5, 0x92, 0x7a, 0x5f, 0xf3, 0xb5, 0x1f, 0xb3, - 0x0b, 0xdd, 0x49, 0x72, 0x9c, 0x5f, 0xd8, 0xd7, 0xaf, 0xbb, 0x5f, 0xbf, 0x7e, 0xfd, 0xba, 0xfb, - 0x7d, 0x0d, 0xe0, 0x9f, 0x9f, 0x87, 0x99, 0x9a, 0x69, 0xd6, 0xea, 0x78, 0xce, 0xb2, 0x4d, 0xd7, - 0xdc, 0x69, 0xee, 0xce, 0x55, 0xb1, 0xa3, 0xd9, 0xba, 0xe5, 0x9a, 0xf6, 0x2c, 0x85, 0xa1, 0x31, - 0x86, 0x31, 0x2b, 0x30, 0xe4, 0x55, 0x18, 0xbf, 0xa0, 0xd7, 0xf1, 0xa2, 0x87, 0xb8, 0x89, 0x5d, - 0xf4, 0x24, 0xa4, 0x76, 0xf5, 0x3a, 0xce, 0x4b, 0x33, 0xc9, 0x53, 0xc3, 0x67, 0xee, 0x99, 0x8d, - 0x10, 0xcd, 0x86, 0x29, 0x36, 0x08, 0x58, 0xa1, 0x14, 0xf2, 0xb7, 0x52, 0x30, 0xd1, 0xa6, 0x16, - 0x21, 0x48, 0x19, 0x6a, 0x83, 0x70, 0x94, 0x4e, 0x65, 0x14, 0xfa, 0x1b, 0xe5, 0x61, 0xc8, 0x52, - 0xb5, 0x7d, 0xb5, 0x86, 0xf3, 0x09, 0x0a, 0x16, 0x45, 0x34, 0x05, 0x50, 0xc5, 0x16, 0x36, 0xaa, - 0xd8, 0xd0, 0x0e, 0xf2, 0xc9, 0x99, 0xe4, 0xa9, 0x8c, 0x12, 0x80, 0xa0, 0x07, 0x61, 0xdc, 0x6a, - 0xee, 0xd4, 0x75, 0xad, 0x12, 0x40, 0x83, 0x99, 0xe4, 0xa9, 0x01, 0x25, 0xc7, 0x2a, 0x16, 0x7d, - 0xe4, 0xfb, 0x61, 0xec, 0x2a, 0x56, 0xf7, 0x83, 0xa8, 0xc3, 0x14, 0x75, 0x94, 0x80, 0x03, 0x88, - 0x0b, 0x90, 0x6d, 0x60, 0xc7, 0x51, 0x6b, 0xb8, 0xe2, 0x1e, 0x58, 0x38, 0x9f, 0xa2, 0xbd, 0x9f, - 0x69, 0xe9, 0x7d, 0xb4, 0xe7, 0xc3, 0x9c, 0x6a, 0xeb, 0xc0, 0xc2, 0x68, 0x1e, 0x32, 0xd8, 0x68, - 0x36, 0x18, 0x87, 0x81, 0x0e, 0xfa, 0x2b, 0x1b, 0xcd, 0x46, 0x94, 0x4b, 0x9a, 0x90, 0x71, 0x16, - 0x43, 0x0e, 0xb6, 0xaf, 0xe8, 0x1a, 0xce, 0x0f, 0x52, 0x06, 0xf7, 0xb7, 0x30, 0xd8, 0x64, 0xf5, - 0x51, 0x1e, 0x82, 0x0e, 0x2d, 0x40, 0x06, 0x5f, 0x73, 0xb1, 0xe1, 0xe8, 0xa6, 0x91, 0x1f, 0xa2, - 0x4c, 0xee, 0x6d, 0x33, 0x8a, 0xb8, 0x5e, 0x8d, 0xb2, 0xf0, 0xe9, 0xd0, 0x39, 0x18, 0x32, 0x2d, - 0x57, 0x37, 0x0d, 0x27, 0x9f, 0x9e, 0x91, 0x4e, 0x0d, 0x9f, 0x39, 0xd9, 0xd6, 0x10, 0xd6, 0x19, - 0x8e, 0x22, 0x90, 0xd1, 0x32, 0xe4, 0x1c, 0xb3, 0x69, 0x6b, 0xb8, 0xa2, 0x99, 0x55, 0x5c, 0xd1, - 0x8d, 0x5d, 0x33, 0x9f, 0xa1, 0x0c, 0xa6, 0x5b, 0x3b, 0x42, 0x11, 0x17, 0xcc, 0x2a, 0x5e, 0x36, - 0x76, 0x4d, 0x65, 0xd4, 0x09, 0x95, 0xd1, 0x31, 0x18, 0x74, 0x0e, 0x0c, 0x57, 0xbd, 0x96, 0xcf, - 0x52, 0x0b, 0xe1, 0x25, 0xf9, 0x37, 0x06, 0x61, 0xac, 0x17, 0x13, 0x3b, 0x0f, 0x03, 0xbb, 0xa4, - 0x97, 0xf9, 0x44, 0x3f, 0x3a, 0x60, 0x34, 0x61, 0x25, 0x0e, 0x1e, 0x52, 0x89, 0xf3, 0x30, 0x6c, - 0x60, 0xc7, 0xc5, 0x55, 0x66, 0x11, 0xc9, 0x1e, 0x6d, 0x0a, 0x18, 0x51, 0xab, 0x49, 0xa5, 0x0e, - 0x65, 0x52, 0x2f, 0xc0, 0x98, 0x27, 0x52, 0xc5, 0x56, 0x8d, 0x9a, 0xb0, 0xcd, 0xb9, 0x38, 0x49, - 0x66, 0xcb, 0x82, 0x4e, 0x21, 0x64, 0xca, 0x28, 0x0e, 0x95, 0xd1, 0x22, 0x80, 0x69, 0x60, 0x73, - 0xb7, 0x52, 0xc5, 0x5a, 0x3d, 0x9f, 0xee, 0xa0, 0xa5, 0x75, 0x82, 0xd2, 0xa2, 0x25, 0x93, 0x41, - 0xb5, 0x3a, 0x7a, 0xca, 0x37, 0xb5, 0xa1, 0x0e, 0x96, 0xb2, 0xca, 0x26, 0x59, 0x8b, 0xb5, 0x6d, - 0xc3, 0xa8, 0x8d, 0x89, 0xdd, 0xe3, 0x2a, 0xef, 0x59, 0x86, 0x0a, 0x31, 0x1b, 0xdb, 0x33, 0x85, - 0x93, 0xb1, 0x8e, 0x8d, 0xd8, 0xc1, 0x22, 0xba, 0x1b, 0x3c, 0x40, 0x85, 0x9a, 0x15, 0x50, 0x2f, - 0x94, 0x15, 0xc0, 0x35, 0xb5, 0x81, 0x0b, 0x2f, 0xc3, 0x68, 0x58, 0x3d, 0x68, 0x12, 0x06, 0x1c, - 0x57, 0xb5, 0x5d, 0x6a, 0x85, 0x03, 0x0a, 0x2b, 0xa0, 0x1c, 0x24, 0xb1, 0x51, 0xa5, 0x5e, 0x6e, - 0x40, 0x21, 0x3f, 0xd1, 0x4f, 0xf8, 0x1d, 0x4e, 0xd2, 0x0e, 0xdf, 0xd7, 0x3a, 0xa2, 0x21, 0xce, - 0xd1, 0x7e, 0x17, 0x9e, 0x80, 0x91, 0x50, 0x07, 0x7a, 0x6d, 0x5a, 0x7e, 0x27, 0x1c, 0x6d, 0xcb, - 0x1a, 0xbd, 0x00, 0x93, 0x4d, 0x43, 0x37, 0x5c, 0x6c, 0x5b, 0x36, 0x26, 0x16, 0xcb, 0x9a, 0xca, - 0xff, 0xe7, 0xa1, 0x0e, 0x36, 0xb7, 0x1d, 0xc4, 0x66, 0x5c, 0x94, 0x89, 0x66, 0x2b, 0xf0, 0x74, - 0x26, 0xfd, 0xc6, 0x50, 0xee, 0x95, 0x57, 0x5e, 0x79, 0x25, 0x21, 0x7f, 0x79, 0x10, 0x26, 0xdb, - 0xcd, 0x99, 0xb6, 0xd3, 0xf7, 0x18, 0x0c, 0x1a, 0xcd, 0xc6, 0x0e, 0xb6, 0xa9, 0x92, 0x06, 0x14, - 0x5e, 0x42, 0xf3, 0x30, 0x50, 0x57, 0x77, 0x70, 0x3d, 0x9f, 0x9a, 0x91, 0x4e, 0x8d, 0x9e, 0x79, - 0xb0, 0xa7, 0x59, 0x39, 0xbb, 0x42, 0x48, 0x14, 0x46, 0x89, 0x9e, 0x86, 0x14, 0x77, 0xd1, 0x84, - 0xc3, 0xe9, 0xde, 0x38, 0x90, 0xb9, 0xa4, 0x50, 0x3a, 0x74, 0x07, 0x64, 0xc8, 0x5f, 0x66, 0x1b, - 0x83, 0x54, 0xe6, 0x34, 0x01, 0x10, 0xbb, 0x40, 0x05, 0x48, 0xd3, 0x69, 0x52, 0xc5, 0x22, 0xb4, - 0x79, 0x65, 0x62, 0x58, 0x55, 0xbc, 0xab, 0x36, 0xeb, 0x6e, 0xe5, 0x8a, 0x5a, 0x6f, 0x62, 0x6a, - 0xf0, 0x19, 0x25, 0xcb, 0x81, 0x97, 0x09, 0x0c, 0x4d, 0xc3, 0x30, 0x9b, 0x55, 0xba, 0x51, 0xc5, - 0xd7, 0xa8, 0xf7, 0x1c, 0x50, 0xd8, 0x44, 0x5b, 0x26, 0x10, 0xd2, 0xfc, 0x8b, 0x8e, 0x69, 0x08, - 0xd3, 0xa4, 0x4d, 0x10, 0x00, 0x6d, 0xfe, 0x89, 0xa8, 0xe3, 0xbe, 0xb3, 0x7d, 0xf7, 0x5a, 0xe6, - 0xd2, 0xfd, 0x30, 0x46, 0x31, 0x1e, 0xe3, 0x43, 0xaf, 0xd6, 0xf3, 0xe3, 0x33, 0xd2, 0xa9, 0xb4, - 0x32, 0xca, 0xc0, 0xeb, 0x1c, 0x2a, 0x7f, 0x31, 0x01, 0x29, 0xea, 0x58, 0xc6, 0x60, 0x78, 0xeb, - 0x2d, 0x1b, 0xe5, 0xca, 0xe2, 0xfa, 0x76, 0x69, 0xa5, 0x9c, 0x93, 0xd0, 0x28, 0x00, 0x05, 0x5c, - 0x58, 0x59, 0x9f, 0xdf, 0xca, 0x25, 0xbc, 0xf2, 0xf2, 0xda, 0xd6, 0xb9, 0xc7, 0x73, 0x49, 0x8f, - 0x60, 0x9b, 0x01, 0x52, 0x41, 0x84, 0xc7, 0xce, 0xe4, 0x06, 0x50, 0x0e, 0xb2, 0x8c, 0xc1, 0xf2, - 0x0b, 0xe5, 0xc5, 0x73, 0x8f, 0xe7, 0x06, 0xc3, 0x90, 0xc7, 0xce, 0xe4, 0x86, 0xd0, 0x08, 0x64, - 0x28, 0xa4, 0xb4, 0xbe, 0xbe, 0x92, 0x4b, 0x7b, 0x3c, 0x37, 0xb7, 0x94, 0xe5, 0xb5, 0xa5, 0x5c, - 0xc6, 0xe3, 0xb9, 0xa4, 0xac, 0x6f, 0x6f, 0xe4, 0xc0, 0xe3, 0xb0, 0x5a, 0xde, 0xdc, 0x9c, 0x5f, - 0x2a, 0xe7, 0x86, 0x3d, 0x8c, 0xd2, 0x5b, 0xb6, 0xca, 0x9b, 0xb9, 0x6c, 0x48, 0xac, 0xc7, 0xce, - 0xe4, 0x46, 0xbc, 0x26, 0xca, 0x6b, 0xdb, 0xab, 0xb9, 0x51, 0x34, 0x0e, 0x23, 0xac, 0x09, 0x21, - 0xc4, 0x58, 0x04, 0x74, 0xee, 0xf1, 0x5c, 0xce, 0x17, 0x84, 0x71, 0x19, 0x0f, 0x01, 0xce, 0x3d, - 0x9e, 0x43, 0xf2, 0x02, 0x0c, 0x50, 0x33, 0x44, 0x08, 0x46, 0x57, 0xe6, 0x4b, 0xe5, 0x95, 0xca, - 0xfa, 0xc6, 0xd6, 0xf2, 0xfa, 0xda, 0xfc, 0x4a, 0x4e, 0xf2, 0x61, 0x4a, 0xf9, 0xb9, 0xed, 0x65, - 0xa5, 0xbc, 0x98, 0x4b, 0x04, 0x61, 0x1b, 0xe5, 0xf9, 0xad, 0xf2, 0x62, 0x2e, 0x29, 0x6b, 0x30, - 0xd9, 0xce, 0xa1, 0xb6, 0x9d, 0x42, 0x01, 0x5b, 0x48, 0x74, 0xb0, 0x05, 0xca, 0x2b, 0x6a, 0x0b, - 0xf2, 0x37, 0x13, 0x30, 0xd1, 0x26, 0xa8, 0xb4, 0x6d, 0xe4, 0x19, 0x18, 0x60, 0xb6, 0xcc, 0xc2, - 0xec, 0x03, 0x6d, 0xa3, 0x13, 0xb5, 0xec, 0x96, 0x50, 0x4b, 0xe9, 0x82, 0xa9, 0x46, 0xb2, 0x43, - 0xaa, 0x41, 0x58, 0xb4, 0x18, 0xec, 0x4f, 0xb6, 0x38, 0x7f, 0x16, 0x1f, 0xcf, 0xf5, 0x12, 0x1f, - 0x29, 0xac, 0xbf, 0x20, 0x30, 0xd0, 0x26, 0x08, 0x9c, 0x87, 0xf1, 0x16, 0x46, 0x3d, 0x3b, 0xe3, - 0xf7, 0x48, 0x90, 0xef, 0xa4, 0x9c, 0x18, 0x97, 0x98, 0x08, 0xb9, 0xc4, 0xf3, 0x51, 0x0d, 0xde, - 0xd5, 0x79, 0x10, 0x5a, 0xc6, 0xfa, 0x33, 0x12, 0x1c, 0x6b, 0x9f, 0x52, 0xb6, 0x95, 0xe1, 0x69, - 0x18, 0x6c, 0x60, 0x77, 0xcf, 0x14, 0x69, 0xd5, 0x7d, 0x6d, 0x82, 0x35, 0xa9, 0x8e, 0x0e, 0x36, - 0xa7, 0x0a, 0x46, 0xfb, 0x64, 0xa7, 0xbc, 0x90, 0x49, 0xd3, 0x22, 0xe9, 0x07, 0x12, 0x70, 0xb4, - 0x2d, 0xf3, 0xb6, 0x82, 0xde, 0x09, 0xa0, 0x1b, 0x56, 0xd3, 0x65, 0xa9, 0x13, 0xf3, 0xc4, 0x19, - 0x0a, 0xa1, 0xce, 0x8b, 0x78, 0xd9, 0xa6, 0xeb, 0xd5, 0x27, 0x69, 0x3d, 0x30, 0x10, 0x45, 0x78, - 0xd2, 0x17, 0x34, 0x45, 0x05, 0x9d, 0xea, 0xd0, 0xd3, 0x16, 0xc3, 0x7c, 0x04, 0x72, 0x5a, 0x5d, - 0xc7, 0x86, 0x5b, 0x71, 0x5c, 0x1b, 0xab, 0x0d, 0xdd, 0xa8, 0xd1, 0x50, 0x93, 0x2e, 0x0e, 0xec, - 0xaa, 0x75, 0x07, 0x2b, 0x63, 0xac, 0x7a, 0x53, 0xd4, 0x12, 0x0a, 0x6a, 0x40, 0x76, 0x80, 0x62, - 0x30, 0x44, 0xc1, 0xaa, 0x3d, 0x0a, 0xf9, 0xc3, 0x19, 0x18, 0x0e, 0x24, 0xe0, 0xe8, 0x2e, 0xc8, - 0xbe, 0xa8, 0x5e, 0x51, 0x2b, 0x62, 0x51, 0xc5, 0x34, 0x31, 0x4c, 0x60, 0x1b, 0x7c, 0x61, 0xf5, - 0x08, 0x4c, 0x52, 0x14, 0xb3, 0xe9, 0x62, 0xbb, 0xa2, 0xd5, 0x55, 0xc7, 0xa1, 0x4a, 0x4b, 0x53, - 0x54, 0x44, 0xea, 0xd6, 0x49, 0xd5, 0x82, 0xa8, 0x41, 0x67, 0x61, 0x82, 0x52, 0x34, 0x9a, 0x75, - 0x57, 0xb7, 0xea, 0xb8, 0x42, 0x96, 0x79, 0x0e, 0x0d, 0x39, 0x9e, 0x64, 0xe3, 0x04, 0x63, 0x95, - 0x23, 0x10, 0x89, 0x1c, 0xb4, 0x08, 0x77, 0x52, 0xb2, 0x1a, 0x36, 0xb0, 0xad, 0xba, 0xb8, 0x82, - 0x5f, 0x6a, 0xaa, 0x75, 0xa7, 0xa2, 0x1a, 0xd5, 0xca, 0x9e, 0xea, 0xec, 0xe5, 0x27, 0x09, 0x83, - 0x52, 0x22, 0x2f, 0x29, 0x27, 0x08, 0xe2, 0x12, 0xc7, 0x2b, 0x53, 0xb4, 0x79, 0xa3, 0x7a, 0x51, - 0x75, 0xf6, 0x50, 0x11, 0x8e, 0x51, 0x2e, 0x8e, 0x6b, 0xeb, 0x46, 0xad, 0xa2, 0xed, 0x61, 0x6d, - 0xbf, 0xd2, 0x74, 0x77, 0x9f, 0xcc, 0xdf, 0x11, 0x6c, 0x9f, 0x4a, 0xb8, 0x49, 0x71, 0x16, 0x08, - 0xca, 0xb6, 0xbb, 0xfb, 0x24, 0xda, 0x84, 0x2c, 0x19, 0x8c, 0x86, 0xfe, 0x32, 0xae, 0xec, 0x9a, - 0x36, 0x8d, 0xa1, 0xa3, 0x6d, 0x5c, 0x53, 0x40, 0x83, 0xb3, 0xeb, 0x9c, 0x60, 0xd5, 0xac, 0xe2, - 0xe2, 0xc0, 0xe6, 0x46, 0xb9, 0xbc, 0xa8, 0x0c, 0x0b, 0x2e, 0x17, 0x4c, 0x9b, 0x18, 0x54, 0xcd, - 0xf4, 0x14, 0x3c, 0xcc, 0x0c, 0xaa, 0x66, 0x0a, 0xf5, 0x9e, 0x85, 0x09, 0x4d, 0x63, 0x7d, 0xd6, - 0xb5, 0x0a, 0x5f, 0x8c, 0x39, 0xf9, 0x5c, 0x48, 0x59, 0x9a, 0xb6, 0xc4, 0x10, 0xb8, 0x8d, 0x3b, - 0xe8, 0x29, 0x38, 0xea, 0x2b, 0x2b, 0x48, 0x38, 0xde, 0xd2, 0xcb, 0x28, 0xe9, 0x59, 0x98, 0xb0, - 0x0e, 0x5a, 0x09, 0x51, 0xa8, 0x45, 0xeb, 0x20, 0x4a, 0xf6, 0x04, 0x4c, 0x5a, 0x7b, 0x56, 0x2b, - 0xdd, 0xe9, 0x20, 0x1d, 0xb2, 0xf6, 0xac, 0x28, 0xe1, 0xbd, 0x74, 0x65, 0x6e, 0x63, 0x4d, 0x75, - 0x71, 0x35, 0x7f, 0x3c, 0x88, 0x1e, 0xa8, 0x40, 0xb3, 0x90, 0xd3, 0xb4, 0x0a, 0x36, 0xd4, 0x9d, - 0x3a, 0xae, 0xa8, 0x36, 0x36, 0x54, 0x27, 0x3f, 0x4d, 0x91, 0x53, 0xae, 0xdd, 0xc4, 0xca, 0xa8, - 0xa6, 0x95, 0x69, 0xe5, 0x3c, 0xad, 0x43, 0xa7, 0x61, 0xdc, 0xdc, 0x79, 0x51, 0x63, 0x16, 0x59, - 0xb1, 0x6c, 0xbc, 0xab, 0x5f, 0xcb, 0xdf, 0x43, 0xd5, 0x3b, 0x46, 0x2a, 0xa8, 0x3d, 0x6e, 0x50, - 0x30, 0x7a, 0x00, 0x72, 0x9a, 0xb3, 0xa7, 0xda, 0x16, 0x75, 0xc9, 0x8e, 0xa5, 0x6a, 0x38, 0x7f, - 0x2f, 0x43, 0x65, 0xf0, 0x35, 0x01, 0x26, 0x33, 0xc2, 0xb9, 0xaa, 0xef, 0xba, 0x82, 0xe3, 0xfd, - 0x6c, 0x46, 0x50, 0x18, 0xe7, 0x76, 0x0a, 0x72, 0x44, 0x13, 0xa1, 0x86, 0x4f, 0x51, 0xb4, 0x51, - 0x6b, 0xcf, 0x0a, 0xb6, 0x7b, 0x37, 0x8c, 0x10, 0x4c, 0xbf, 0xd1, 0x07, 0x58, 0xe2, 0x66, 0xed, - 0x05, 0x5a, 0x7c, 0x1c, 0x8e, 0x11, 0xa4, 0x06, 0x76, 0xd5, 0xaa, 0xea, 0xaa, 0x01, 0xec, 0x87, - 0x28, 0x36, 0x51, 0xfb, 0x2a, 0xaf, 0x0c, 0xc9, 0x69, 0x37, 0x77, 0x0e, 0x3c, 0xc3, 0x7a, 0x98, - 0xc9, 0x49, 0x60, 0xc2, 0xb4, 0x6e, 0x5b, 0x72, 0x2e, 0x17, 0x21, 0x1b, 0xb4, 0x7b, 0x94, 0x01, - 0x66, 0xf9, 0x39, 0x89, 0x24, 0x41, 0x0b, 0xeb, 0x8b, 0x24, 0x7d, 0x79, 0x6b, 0x39, 0x97, 0x20, - 0x69, 0xd4, 0xca, 0xf2, 0x56, 0xb9, 0xa2, 0x6c, 0xaf, 0x6d, 0x2d, 0xaf, 0x96, 0x73, 0xc9, 0x40, - 0x62, 0xff, 0x6c, 0x2a, 0x7d, 0x5f, 0xee, 0x7e, 0xf9, 0x1b, 0x09, 0x18, 0x0d, 0xaf, 0xd4, 0xd0, - 0x9b, 0xe0, 0xb8, 0xd8, 0x56, 0x71, 0xb0, 0x5b, 0xb9, 0xaa, 0xdb, 0x74, 0x42, 0x36, 0x54, 0x16, - 0x1c, 0x3d, 0xfb, 0x99, 0xe4, 0x58, 0x9b, 0xd8, 0x7d, 0x5e, 0xb7, 0xc9, 0x74, 0x6b, 0xa8, 0x2e, - 0x5a, 0x81, 0x69, 0xc3, 0xac, 0x38, 0xae, 0x6a, 0x54, 0x55, 0xbb, 0x5a, 0xf1, 0x37, 0xb4, 0x2a, - 0xaa, 0xa6, 0x61, 0xc7, 0x31, 0x59, 0x20, 0xf4, 0xb8, 0x9c, 0x34, 0xcc, 0x4d, 0x8e, 0xec, 0x47, - 0x88, 0x79, 0x8e, 0x1a, 0x31, 0xdf, 0x64, 0x27, 0xf3, 0xbd, 0x03, 0x32, 0x0d, 0xd5, 0xaa, 0x60, - 0xc3, 0xb5, 0x0f, 0x68, 0x7e, 0x9e, 0x56, 0xd2, 0x0d, 0xd5, 0x2a, 0x93, 0xf2, 0x0f, 0x65, 0x99, - 0xf4, 0x6c, 0x2a, 0x9d, 0xce, 0x65, 0x9e, 0x4d, 0xa5, 0x33, 0x39, 0x90, 0x5f, 0x4f, 0x42, 0x36, - 0x98, 0xaf, 0x93, 0xe5, 0x8f, 0x46, 0x23, 0x96, 0x44, 0x7d, 0xda, 0xdd, 0x5d, 0xb3, 0xfb, 0xd9, - 0x05, 0x12, 0xca, 0x8a, 0x83, 0x2c, 0x39, 0x56, 0x18, 0x25, 0x49, 0x23, 0x88, 0xb1, 0x61, 0x96, - 0x8c, 0xa4, 0x15, 0x5e, 0x42, 0x4b, 0x30, 0xf8, 0xa2, 0x43, 0x79, 0x0f, 0x52, 0xde, 0xf7, 0x74, - 0xe7, 0xfd, 0xec, 0x26, 0x65, 0x9e, 0x79, 0x76, 0xb3, 0xb2, 0xb6, 0xae, 0xac, 0xce, 0xaf, 0x28, - 0x9c, 0x1c, 0x9d, 0x80, 0x54, 0x5d, 0x7d, 0xf9, 0x20, 0x1c, 0xf4, 0x28, 0xa8, 0xd7, 0x41, 0x38, - 0x01, 0xa9, 0xab, 0x58, 0xdd, 0x0f, 0x87, 0x1a, 0x0a, 0xba, 0x8d, 0x93, 0x61, 0x0e, 0x06, 0xa8, - 0xbe, 0x10, 0x00, 0xd7, 0x58, 0xee, 0x08, 0x4a, 0x43, 0x6a, 0x61, 0x5d, 0x21, 0x13, 0x22, 0x07, - 0x59, 0x06, 0xad, 0x6c, 0x2c, 0x97, 0x17, 0xca, 0xb9, 0x84, 0x7c, 0x16, 0x06, 0x99, 0x12, 0xc8, - 0x64, 0xf1, 0xd4, 0x90, 0x3b, 0xc2, 0x8b, 0x9c, 0x87, 0x24, 0x6a, 0xb7, 0x57, 0x4b, 0x65, 0x25, - 0x97, 0x08, 0x0f, 0x75, 0x2a, 0x37, 0x20, 0x3b, 0x90, 0x0d, 0xe6, 0xe1, 0x3f, 0x9c, 0xc5, 0xf8, - 0x97, 0x24, 0x18, 0x0e, 0xe4, 0xd5, 0x24, 0x21, 0x52, 0xeb, 0x75, 0xf3, 0x6a, 0x45, 0xad, 0xeb, - 0xaa, 0xc3, 0x4d, 0x03, 0x28, 0x68, 0x9e, 0x40, 0x7a, 0x1d, 0xba, 0x1f, 0xd2, 0x14, 0x19, 0xc8, - 0x0d, 0xca, 0x9f, 0x90, 0x20, 0x17, 0x4d, 0x6c, 0x23, 0x62, 0x4a, 0x3f, 0x4a, 0x31, 0xe5, 0x8f, - 0x4b, 0x30, 0x1a, 0xce, 0x66, 0x23, 0xe2, 0xdd, 0xf5, 0x23, 0x15, 0xef, 0x0f, 0x12, 0x30, 0x12, - 0xca, 0x61, 0x7b, 0x95, 0xee, 0x25, 0x18, 0xd7, 0xab, 0xb8, 0x61, 0x99, 0x2e, 0x36, 0xb4, 0x83, - 0x4a, 0x1d, 0x5f, 0xc1, 0xf5, 0xbc, 0x4c, 0x9d, 0xc6, 0x5c, 0xf7, 0x2c, 0x79, 0x76, 0xd9, 0xa7, - 0x5b, 0x21, 0x64, 0xc5, 0x89, 0xe5, 0xc5, 0xf2, 0xea, 0xc6, 0xfa, 0x56, 0x79, 0x6d, 0xe1, 0x2d, - 0x95, 0xed, 0xb5, 0x4b, 0x6b, 0xeb, 0xcf, 0xaf, 0x29, 0x39, 0x3d, 0x82, 0x76, 0x1b, 0xa7, 0xfd, - 0x06, 0xe4, 0xa2, 0x42, 0xa1, 0xe3, 0xd0, 0x4e, 0xac, 0xdc, 0x11, 0x34, 0x01, 0x63, 0x6b, 0xeb, - 0x95, 0xcd, 0xe5, 0xc5, 0x72, 0xa5, 0x7c, 0xe1, 0x42, 0x79, 0x61, 0x6b, 0x93, 0xed, 0x7b, 0x78, - 0xd8, 0x5b, 0xa1, 0x09, 0x2e, 0xbf, 0x96, 0x84, 0x89, 0x36, 0x92, 0xa0, 0x79, 0xbe, 0x62, 0x61, - 0x8b, 0xa8, 0x87, 0x7b, 0x91, 0x7e, 0x96, 0xe4, 0x0c, 0x1b, 0xaa, 0xed, 0xf2, 0x05, 0xce, 0x03, - 0x40, 0xb4, 0x64, 0xb8, 0xfa, 0xae, 0x8e, 0x6d, 0xbe, 0x9f, 0xc4, 0x96, 0x31, 0x63, 0x3e, 0x9c, - 0x6d, 0x29, 0x3d, 0x04, 0xc8, 0x32, 0x1d, 0xdd, 0xd5, 0xaf, 0xe0, 0x8a, 0x6e, 0x88, 0xcd, 0x27, - 0xb2, 0xac, 0x49, 0x29, 0x39, 0x51, 0xb3, 0x6c, 0xb8, 0x1e, 0xb6, 0x81, 0x6b, 0x6a, 0x04, 0x9b, - 0x38, 0xf3, 0xa4, 0x92, 0x13, 0x35, 0x1e, 0xf6, 0x5d, 0x90, 0xad, 0x9a, 0x4d, 0x92, 0xeb, 0x31, - 0x3c, 0x12, 0x3b, 0x24, 0x65, 0x98, 0xc1, 0x3c, 0x14, 0x9e, 0xc5, 0xfb, 0xbb, 0x5e, 0x59, 0x65, - 0x98, 0xc1, 0x18, 0xca, 0xfd, 0x30, 0xa6, 0xd6, 0x6a, 0x36, 0x61, 0x2e, 0x18, 0xb1, 0x75, 0xc9, - 0xa8, 0x07, 0xa6, 0x88, 0x85, 0x67, 0x21, 0x2d, 0xf4, 0x40, 0x42, 0x35, 0xd1, 0x44, 0xc5, 0x62, - 0x8b, 0xed, 0xc4, 0xa9, 0x8c, 0x92, 0x36, 0x44, 0xe5, 0x5d, 0x90, 0xd5, 0x9d, 0x8a, 0xbf, 0x89, - 0x9f, 0x98, 0x49, 0x9c, 0x4a, 0x2b, 0xc3, 0xba, 0xe3, 0x6d, 0x80, 0xca, 0x9f, 0x49, 0xc0, 0x68, - 0xf8, 0x10, 0x02, 0x2d, 0x42, 0xba, 0x6e, 0x6a, 0x2a, 0x35, 0x2d, 0x76, 0x02, 0x76, 0x2a, 0xe6, - 0xdc, 0x62, 0x76, 0x85, 0xe3, 0x2b, 0x1e, 0x65, 0xe1, 0xb7, 0x25, 0x48, 0x0b, 0x30, 0x3a, 0x06, - 0x29, 0x4b, 0x75, 0xf7, 0x28, 0xbb, 0x81, 0x52, 0x22, 0x27, 0x29, 0xb4, 0x4c, 0xe0, 0x8e, 0xa5, - 0x1a, 0xd4, 0x04, 0x38, 0x9c, 0x94, 0xc9, 0xb8, 0xd6, 0xb1, 0x5a, 0xa5, 0x8b, 0x1e, 0xb3, 0xd1, - 0xc0, 0x86, 0xeb, 0x88, 0x71, 0xe5, 0xf0, 0x05, 0x0e, 0x46, 0x0f, 0xc2, 0xb8, 0x6b, 0xab, 0x7a, - 0x3d, 0x84, 0x9b, 0xa2, 0xb8, 0x39, 0x51, 0xe1, 0x21, 0x17, 0xe1, 0x84, 0xe0, 0x5b, 0xc5, 0xae, - 0xaa, 0xed, 0xe1, 0xaa, 0x4f, 0x34, 0x48, 0x37, 0x37, 0x8e, 0x73, 0x84, 0x45, 0x5e, 0x2f, 0x68, - 0xe5, 0x6f, 0x48, 0x30, 0x2e, 0x96, 0x69, 0x55, 0x4f, 0x59, 0xab, 0x00, 0xaa, 0x61, 0x98, 0x6e, - 0x50, 0x5d, 0xad, 0xa6, 0xdc, 0x42, 0x37, 0x3b, 0xef, 0x11, 0x29, 0x01, 0x06, 0x85, 0x06, 0x80, - 0x5f, 0xd3, 0x51, 0x6d, 0xd3, 0x30, 0xcc, 0x4f, 0x98, 0xe8, 0x31, 0x25, 0x5b, 0xd8, 0x03, 0x03, - 0x91, 0xf5, 0x1c, 0x9a, 0x84, 0x81, 0x1d, 0x5c, 0xd3, 0x0d, 0xbe, 0x6f, 0xcc, 0x0a, 0x62, 0xfb, - 0x25, 0xe5, 0x6d, 0xbf, 0x94, 0x3e, 0x28, 0xc1, 0x84, 0x66, 0x36, 0xa2, 0xf2, 0x96, 0x72, 0x91, - 0xdd, 0x05, 0xe7, 0xa2, 0xf4, 0xd6, 0xa7, 0x6b, 0xba, 0xbb, 0xd7, 0xdc, 0x99, 0xd5, 0xcc, 0xc6, - 0x5c, 0xcd, 0xac, 0xab, 0x46, 0xcd, 0x3f, 0x67, 0xa5, 0x3f, 0xb4, 0x87, 0x6b, 0xd8, 0x78, 0xb8, - 0x66, 0x06, 0x4e, 0x5d, 0xcf, 0xfb, 0x3f, 0xff, 0x4c, 0x92, 0x7e, 0x21, 0x91, 0x5c, 0xda, 0x28, - 0x7d, 0x36, 0x51, 0x58, 0x62, 0xcd, 0x6d, 0x08, 0xf5, 0x28, 0x78, 0xb7, 0x8e, 0x35, 0xd2, 0x65, - 0xf8, 0xf6, 0x83, 0x30, 0x59, 0x33, 0x6b, 0x26, 0xe5, 0x38, 0x47, 0x7e, 0xf1, 0x93, 0xdb, 0x8c, - 0x07, 0x2d, 0xc4, 0x1e, 0xf3, 0x16, 0xd7, 0x60, 0x82, 0x23, 0x57, 0xe8, 0xd1, 0x11, 0x5b, 0xd8, - 0xa0, 0xae, 0xbb, 0x6a, 0xf9, 0x5f, 0xfb, 0x16, 0x0d, 0xe8, 0xca, 0x38, 0x27, 0x25, 0x75, 0x6c, - 0xed, 0x53, 0x54, 0xe0, 0x68, 0x88, 0x1f, 0x9b, 0xb6, 0xd8, 0x8e, 0xe1, 0xf8, 0x9b, 0x9c, 0xe3, - 0x44, 0x80, 0xe3, 0x26, 0x27, 0x2d, 0x2e, 0xc0, 0x48, 0x3f, 0xbc, 0xfe, 0x25, 0xe7, 0x95, 0xc5, - 0x41, 0x26, 0x4b, 0x30, 0x46, 0x99, 0x68, 0x4d, 0xc7, 0x35, 0x1b, 0xd4, 0x27, 0x76, 0x67, 0xf3, - 0x5b, 0xdf, 0x62, 0xf3, 0x68, 0x94, 0x90, 0x2d, 0x78, 0x54, 0xc5, 0x22, 0xd0, 0xd3, 0xb2, 0x2a, - 0xd6, 0xea, 0x31, 0x1c, 0xbe, 0xc2, 0x05, 0xf1, 0xf0, 0x8b, 0x97, 0x61, 0x92, 0xfc, 0xa6, 0x2e, - 0x2b, 0x28, 0x49, 0xfc, 0x16, 0x5c, 0xfe, 0x1b, 0xef, 0x61, 0x53, 0x75, 0xc2, 0x63, 0x10, 0x90, - 0x29, 0x30, 0x8a, 0x35, 0xec, 0xba, 0xd8, 0x76, 0x2a, 0x6a, 0xbd, 0x9d, 0x78, 0x81, 0x3d, 0x8c, - 0xfc, 0xc7, 0xbe, 0x13, 0x1e, 0xc5, 0x25, 0x46, 0x39, 0x5f, 0xaf, 0x17, 0xb7, 0xe1, 0x78, 0x1b, - 0xab, 0xe8, 0x81, 0xe7, 0x6b, 0x9c, 0xe7, 0x64, 0x8b, 0x65, 0x10, 0xb6, 0x1b, 0x20, 0xe0, 0xde, - 0x58, 0xf6, 0xc0, 0xf3, 0xe7, 0x39, 0x4f, 0xc4, 0x69, 0xc5, 0x90, 0x12, 0x8e, 0xcf, 0xc2, 0xf8, - 0x15, 0x6c, 0xef, 0x98, 0x0e, 0xdf, 0x37, 0xea, 0x81, 0xdd, 0xc7, 0x39, 0xbb, 0x31, 0x4e, 0x48, - 0x37, 0x92, 0x08, 0xaf, 0xa7, 0x20, 0xbd, 0xab, 0x6a, 0xb8, 0x07, 0x16, 0xd7, 0x39, 0x8b, 0x21, - 0x82, 0x4f, 0x48, 0xe7, 0x21, 0x5b, 0x33, 0x79, 0xd4, 0x8a, 0x27, 0xff, 0x04, 0x27, 0x1f, 0x16, - 0x34, 0x9c, 0x85, 0x65, 0x5a, 0xcd, 0x3a, 0x09, 0x69, 0xf1, 0x2c, 0xfe, 0xa6, 0x60, 0x21, 0x68, - 0x38, 0x8b, 0x3e, 0xd4, 0xfa, 0x49, 0xc1, 0xc2, 0x09, 0xe8, 0xf3, 0x19, 0x18, 0x36, 0x8d, 0xfa, - 0x81, 0x69, 0xf4, 0x22, 0xc4, 0xa7, 0x38, 0x07, 0xe0, 0x24, 0x84, 0xc1, 0x79, 0xc8, 0xf4, 0x3a, - 0x10, 0x7f, 0xeb, 0x3b, 0x62, 0x7a, 0x88, 0x11, 0x58, 0x82, 0x31, 0xe1, 0xa0, 0x74, 0xd3, 0xe8, - 0x81, 0xc5, 0xdf, 0xe6, 0x2c, 0x46, 0x03, 0x64, 0xbc, 0x1b, 0x2e, 0x76, 0xdc, 0x1a, 0xee, 0x85, - 0xc9, 0x67, 0x44, 0x37, 0x38, 0x09, 0x57, 0xe5, 0x0e, 0x36, 0xb4, 0xbd, 0xde, 0x38, 0xfc, 0x92, - 0x50, 0xa5, 0xa0, 0x21, 0x2c, 0x16, 0x60, 0xa4, 0xa1, 0xda, 0xce, 0x9e, 0x5a, 0xef, 0x69, 0x38, - 0xfe, 0x0e, 0xe7, 0x91, 0xf5, 0x88, 0xb8, 0x46, 0x9a, 0x46, 0x3f, 0x6c, 0x3e, 0x2b, 0x34, 0x12, - 0x20, 0xe3, 0x53, 0xcf, 0x71, 0xe9, 0x26, 0x5b, 0x3f, 0xdc, 0x7e, 0x59, 0x4c, 0x3d, 0x46, 0xbb, - 0x1a, 0xe4, 0x78, 0x1e, 0x32, 0x8e, 0xfe, 0x72, 0x4f, 0x6c, 0x3e, 0x27, 0x46, 0x9a, 0x12, 0x10, - 0xe2, 0xb7, 0xc0, 0x89, 0xb6, 0x61, 0xa2, 0x07, 0x66, 0x7f, 0x97, 0x33, 0x3b, 0xd6, 0x26, 0x54, - 0x70, 0x97, 0xd0, 0x2f, 0xcb, 0xbf, 0x27, 0x5c, 0x02, 0x8e, 0xf0, 0xda, 0x20, 0xeb, 0x08, 0x47, - 0xdd, 0xed, 0x4f, 0x6b, 0xbf, 0x22, 0xb4, 0xc6, 0x68, 0x43, 0x5a, 0xdb, 0x82, 0x63, 0x9c, 0x63, - 0x7f, 0xe3, 0xfa, 0xab, 0xc2, 0xb1, 0x32, 0xea, 0xed, 0xf0, 0xe8, 0xbe, 0x0d, 0x0a, 0x9e, 0x3a, - 0x45, 0xc2, 0xea, 0x54, 0x1a, 0xaa, 0xd5, 0x03, 0xe7, 0x5f, 0xe3, 0x9c, 0x85, 0xc7, 0xf7, 0x32, - 0x5e, 0x67, 0x55, 0xb5, 0x08, 0xf3, 0x17, 0x20, 0x2f, 0x98, 0x37, 0x0d, 0x1b, 0x6b, 0x66, 0xcd, - 0xd0, 0x5f, 0xc6, 0xd5, 0x1e, 0x58, 0xff, 0x7a, 0x64, 0xa8, 0xb6, 0x03, 0xe4, 0x84, 0xf3, 0x32, - 0xe4, 0xbc, 0x5c, 0xa5, 0xa2, 0x37, 0x2c, 0xd3, 0x76, 0x63, 0x38, 0x7e, 0x5e, 0x8c, 0x94, 0x47, - 0xb7, 0x4c, 0xc9, 0x8a, 0x65, 0x60, 0x27, 0xcf, 0xbd, 0x9a, 0xe4, 0x17, 0x38, 0xa3, 0x11, 0x9f, - 0x8a, 0x3b, 0x0e, 0xcd, 0x6c, 0x58, 0xaa, 0xdd, 0x8b, 0xff, 0xfb, 0xfb, 0xc2, 0x71, 0x70, 0x12, - 0xee, 0x38, 0xdc, 0x03, 0x0b, 0x93, 0x68, 0xdf, 0x03, 0x87, 0x2f, 0x0a, 0xc7, 0x21, 0x68, 0x38, - 0x0b, 0x91, 0x30, 0xf4, 0xc0, 0xe2, 0x1f, 0x08, 0x16, 0x82, 0x86, 0xb0, 0x78, 0xce, 0x0f, 0xb4, - 0x36, 0xae, 0xe9, 0x8e, 0x6b, 0xb3, 0x34, 0xb9, 0x3b, 0xab, 0x7f, 0xf8, 0x9d, 0x70, 0x12, 0xa6, - 0x04, 0x48, 0x89, 0x27, 0xe2, 0xdb, 0xae, 0x74, 0x15, 0x15, 0x2f, 0xd8, 0x6f, 0x08, 0x4f, 0x14, - 0x20, 0x23, 0xb2, 0x05, 0x32, 0x44, 0xa2, 0x76, 0x8d, 0xac, 0x1d, 0x7a, 0x60, 0xf7, 0x8f, 0x22, - 0xc2, 0x6d, 0x0a, 0x5a, 0xc2, 0x33, 0x90, 0xff, 0x34, 0x8d, 0x7d, 0x7c, 0xd0, 0x93, 0x75, 0xfe, - 0xe3, 0x48, 0xfe, 0xb3, 0xcd, 0x28, 0x99, 0x0f, 0x19, 0x8b, 0xe4, 0x53, 0x28, 0xee, 0x9e, 0x51, - 0xfe, 0xa7, 0xbe, 0xc7, 0xfb, 0x1b, 0x4e, 0xa7, 0x8a, 0x2b, 0xc4, 0xc8, 0xc3, 0x49, 0x4f, 0x3c, - 0xb3, 0xf7, 0x7c, 0xcf, 0xb3, 0xf3, 0x50, 0xce, 0x53, 0xbc, 0x00, 0x23, 0xa1, 0x84, 0x27, 0x9e, - 0xd5, 0x7b, 0x39, 0xab, 0x6c, 0x30, 0xdf, 0x29, 0x9e, 0x85, 0x14, 0x49, 0x5e, 0xe2, 0xc9, 0xff, - 0x32, 0x27, 0xa7, 0xe8, 0xc5, 0x37, 0x43, 0x5a, 0x24, 0x2d, 0xf1, 0xa4, 0xef, 0xe3, 0xa4, 0x1e, - 0x09, 0x21, 0x17, 0x09, 0x4b, 0x3c, 0xf9, 0x5f, 0x11, 0xe4, 0x82, 0x84, 0x90, 0xf7, 0xae, 0xc2, - 0x2f, 0xfd, 0x74, 0x8a, 0x07, 0x1d, 0xa1, 0xbb, 0xf3, 0x30, 0xc4, 0x33, 0x95, 0x78, 0xea, 0x0f, - 0xf0, 0xc6, 0x05, 0x45, 0xf1, 0x09, 0x18, 0xe8, 0x51, 0xe1, 0x3f, 0xc3, 0x49, 0x19, 0x7e, 0x71, - 0x01, 0x86, 0x03, 0xd9, 0x49, 0x3c, 0xf9, 0x5f, 0xe3, 0xe4, 0x41, 0x2a, 0x22, 0x3a, 0xcf, 0x4e, - 0xe2, 0x19, 0x7c, 0x50, 0x88, 0xce, 0x29, 0x88, 0xda, 0x44, 0x62, 0x12, 0x4f, 0xfd, 0x21, 0xa1, - 0x75, 0x41, 0x52, 0x7c, 0x06, 0x32, 0x5e, 0xb0, 0x89, 0xa7, 0xff, 0x30, 0xa7, 0xf7, 0x69, 0x88, - 0x06, 0x02, 0xc1, 0x2e, 0x9e, 0xc5, 0x5f, 0x17, 0x1a, 0x08, 0x50, 0x91, 0x69, 0x14, 0x4d, 0x60, - 0xe2, 0x39, 0x7d, 0x44, 0x4c, 0xa3, 0x48, 0xfe, 0x42, 0x46, 0x93, 0xfa, 0xfc, 0x78, 0x16, 0x3f, - 0x2b, 0x46, 0x93, 0xe2, 0x13, 0x31, 0xa2, 0x19, 0x41, 0x3c, 0x8f, 0xbf, 0x21, 0xc4, 0x88, 0x24, - 0x04, 0xc5, 0x0d, 0x40, 0xad, 0xd9, 0x40, 0x3c, 0xbf, 0x8f, 0x72, 0x7e, 0xe3, 0x2d, 0xc9, 0x40, - 0xf1, 0x79, 0x38, 0xd6, 0x3e, 0x13, 0x88, 0xe7, 0xfa, 0xb1, 0xef, 0x45, 0xd6, 0x6e, 0xc1, 0x44, - 0xa0, 0xb8, 0xe5, 0x87, 0x94, 0x60, 0x16, 0x10, 0xcf, 0xf6, 0xb5, 0xef, 0x85, 0x1d, 0x77, 0x30, - 0x09, 0x28, 0xce, 0x03, 0xf8, 0x01, 0x38, 0x9e, 0xd7, 0xc7, 0x39, 0xaf, 0x00, 0x11, 0x99, 0x1a, - 0x3c, 0xfe, 0xc6, 0xd3, 0x5f, 0x17, 0x53, 0x83, 0x53, 0x90, 0xa9, 0x21, 0x42, 0x6f, 0x3c, 0xf5, - 0x27, 0xc4, 0xd4, 0x10, 0x24, 0xc4, 0xb2, 0x03, 0xd1, 0x2d, 0x9e, 0xc3, 0xa7, 0x84, 0x65, 0x07, - 0xa8, 0x8a, 0x6b, 0x30, 0xde, 0x12, 0x10, 0xe3, 0x59, 0xfd, 0x02, 0x67, 0x95, 0x8b, 0xc6, 0xc3, - 0x60, 0xf0, 0xe2, 0xc1, 0x30, 0x9e, 0xdb, 0xa7, 0x23, 0xc1, 0x8b, 0xc7, 0xc2, 0xe2, 0x79, 0x48, - 0x1b, 0xcd, 0x7a, 0x9d, 0x4c, 0x1e, 0xd4, 0xfd, 0x6e, 0x60, 0xfe, 0xbf, 0x7c, 0x9f, 0x6b, 0x47, - 0x10, 0x14, 0xcf, 0xc2, 0x00, 0x6e, 0xec, 0xe0, 0x6a, 0x1c, 0xe5, 0xb7, 0xbf, 0x2f, 0x1c, 0x26, - 0xc1, 0x2e, 0x3e, 0x03, 0xc0, 0xb6, 0x46, 0xe8, 0xf1, 0x60, 0x0c, 0xed, 0x7f, 0xfd, 0x3e, 0xbf, - 0x8c, 0xe3, 0x93, 0xf8, 0x0c, 0xd8, 0xd5, 0x9e, 0xee, 0x0c, 0xbe, 0x13, 0x66, 0x40, 0x47, 0xe4, - 0x29, 0x18, 0x7a, 0xd1, 0x31, 0x0d, 0x57, 0xad, 0xc5, 0x51, 0xff, 0x37, 0x4e, 0x2d, 0xf0, 0x89, - 0xc2, 0x1a, 0xa6, 0x8d, 0x5d, 0xb5, 0xe6, 0xc4, 0xd1, 0xfe, 0x77, 0x4e, 0xeb, 0x11, 0x10, 0x62, - 0x4d, 0x75, 0xdc, 0x5e, 0xfa, 0xfd, 0x47, 0x82, 0x58, 0x10, 0x10, 0xa1, 0xc9, 0xef, 0x7d, 0x7c, - 0x10, 0x47, 0xfb, 0x5d, 0x21, 0x34, 0xc7, 0x2f, 0xbe, 0x19, 0x32, 0xe4, 0x27, 0xbb, 0x61, 0x17, - 0x43, 0xfc, 0xc7, 0x9c, 0xd8, 0xa7, 0x20, 0x2d, 0x3b, 0x6e, 0xd5, 0xd5, 0xe3, 0x95, 0x7d, 0x93, - 0x8f, 0xb4, 0xc0, 0x2f, 0xce, 0xc3, 0xb0, 0xe3, 0x56, 0xab, 0x4d, 0x9e, 0x9f, 0xc6, 0x90, 0xff, - 0xc9, 0xf7, 0xbd, 0x2d, 0x0b, 0x8f, 0x86, 0x8c, 0xf6, 0xd5, 0x7d, 0xd7, 0x32, 0xe9, 0x11, 0x48, - 0x1c, 0x87, 0xef, 0x71, 0x0e, 0x01, 0x92, 0xe2, 0x02, 0x64, 0x49, 0x5f, 0x6c, 0x6c, 0x61, 0x7a, - 0x5e, 0x15, 0xc3, 0xe2, 0x4f, 0xb9, 0x02, 0x42, 0x44, 0xa5, 0x9f, 0xfc, 0xca, 0xeb, 0x53, 0xd2, - 0xd7, 0x5f, 0x9f, 0x92, 0xfe, 0xe0, 0xf5, 0x29, 0xe9, 0x43, 0xdf, 0x9c, 0x3a, 0xf2, 0xf5, 0x6f, - 0x4e, 0x1d, 0xf9, 0xdd, 0x6f, 0x4e, 0x1d, 0x69, 0xbf, 0x6d, 0x0c, 0x4b, 0xe6, 0x92, 0xc9, 0x36, - 0x8c, 0xdf, 0x2a, 0x87, 0xb6, 0x8b, 0x6b, 0xa6, 0xbf, 0x5b, 0xeb, 0x2d, 0x72, 0xe0, 0x4f, 0x25, - 0xb2, 0x60, 0x0e, 0xef, 0xe5, 0xaa, 0xc6, 0x41, 0x87, 0xb7, 0x3a, 0x85, 0xb6, 0x1b, 0xc3, 0xf2, - 0x9b, 0x20, 0x39, 0x6f, 0x1c, 0xa0, 0x13, 0xcc, 0xe7, 0x55, 0x9a, 0x76, 0x9d, 0xdf, 0xfc, 0x1a, - 0x22, 0xe5, 0x6d, 0xbb, 0x8e, 0x26, 0xfd, 0xeb, 0x99, 0xd2, 0xa9, 0x2c, 0xbf, 0x73, 0x59, 0x4c, - 0x7d, 0xf7, 0x53, 0xd3, 0x47, 0x4a, 0xfb, 0xd1, 0x1e, 0x7e, 0x29, 0xb6, 0x97, 0xe9, 0x79, 0xe3, - 0x80, 0x76, 0x72, 0x43, 0x7a, 0xeb, 0x00, 0x69, 0xc3, 0x11, 0x1b, 0xdb, 0x53, 0xd1, 0x8d, 0xed, - 0xe7, 0x71, 0xbd, 0x7e, 0xc9, 0x30, 0xaf, 0x1a, 0x5b, 0x04, 0x6d, 0x67, 0x90, 0x5d, 0x23, 0x86, - 0xbf, 0x9a, 0x80, 0xa9, 0x96, 0x3d, 0x6c, 0x3e, 0xf2, 0x9d, 0x1e, 0x2a, 0x15, 0x21, 0xbd, 0x28, - 0x0c, 0x2a, 0x0f, 0x43, 0x0e, 0xd6, 0x4c, 0xa3, 0xea, 0xd0, 0xae, 0x26, 0x15, 0x51, 0x24, 0x5d, - 0x35, 0x54, 0xc3, 0x74, 0xf8, 0xed, 0x48, 0x56, 0x28, 0xfd, 0xac, 0xd4, 0xdf, 0x38, 0x8e, 0x88, - 0x96, 0x44, 0x37, 0x4f, 0x77, 0xdb, 0xfb, 0xa7, 0x2a, 0xf0, 0xe4, 0x0f, 0xec, 0xf3, 0xf7, 0xaa, - 0x8e, 0x0f, 0x25, 0x60, 0x3a, 0xaa, 0x0e, 0x32, 0x8f, 0x1c, 0x57, 0x6d, 0x58, 0x9d, 0xf4, 0x71, - 0x1e, 0x32, 0x5b, 0x02, 0xa7, 0x6f, 0x85, 0xfc, 0x5c, 0x9f, 0x0a, 0x19, 0xf5, 0x9a, 0x12, 0x1a, - 0x79, 0x30, 0x5e, 0x23, 0x5e, 0x17, 0x0e, 0xa1, 0x92, 0x77, 0x27, 0xe1, 0x84, 0x66, 0x3a, 0x0d, - 0xd3, 0xa9, 0x30, 0x83, 0x67, 0x05, 0xae, 0x8c, 0x6c, 0xb0, 0xaa, 0x87, 0xe3, 0x90, 0x8b, 0x30, - 0x4a, 0x9d, 0x02, 0xdd, 0x08, 0xa6, 0x7e, 0x38, 0x36, 0x74, 0x7e, 0xf5, 0xdf, 0x0e, 0xd0, 0x49, - 0x34, 0xe2, 0x11, 0xd2, 0x9b, 0x2e, 0x5b, 0x30, 0xa9, 0x37, 0xac, 0x3a, 0xa6, 0x47, 0x62, 0x15, - 0xaf, 0x2e, 0x9e, 0xdf, 0xd7, 0x38, 0xbf, 0x09, 0x9f, 0x7c, 0x59, 0x50, 0x17, 0x57, 0x60, 0x5c, - 0xd5, 0x34, 0x6c, 0x85, 0x58, 0xc6, 0x38, 0x2c, 0x21, 0x60, 0x8e, 0x53, 0x7a, 0xdc, 0x4a, 0xcf, - 0x74, 0x1a, 0xdb, 0xb7, 0xde, 0x1b, 0x18, 0x34, 0x1b, 0xd7, 0xb0, 0xf1, 0xb0, 0x81, 0xdd, 0xab, - 0xa6, 0xbd, 0xcf, 0xd5, 0xfb, 0x30, 0x6b, 0x4a, 0x0c, 0xc2, 0x7b, 0x93, 0x30, 0xc5, 0x2a, 0xe6, - 0x76, 0x54, 0x07, 0xcf, 0x5d, 0x79, 0x74, 0x07, 0xbb, 0xea, 0xa3, 0x73, 0x9a, 0xa9, 0x8b, 0x69, - 0x3a, 0xc1, 0xc7, 0x85, 0xd4, 0xcf, 0xf2, 0xfa, 0x0e, 0x7e, 0x6a, 0x09, 0x52, 0x0b, 0xa6, 0x6e, - 0x10, 0x8b, 0xac, 0x62, 0xc3, 0x6c, 0x70, 0x2f, 0xc5, 0x0a, 0xe8, 0x6e, 0x18, 0x54, 0x1b, 0x66, - 0xd3, 0x70, 0xd9, 0x69, 0x5e, 0x69, 0xf8, 0x2b, 0x37, 0xa6, 0x8f, 0xfc, 0xde, 0x8d, 0xe9, 0xe4, - 0xb2, 0xe1, 0x2a, 0xbc, 0xaa, 0x98, 0x7a, 0xe3, 0x93, 0xd3, 0x92, 0xfc, 0x2c, 0x0c, 0x2d, 0x62, - 0xed, 0x30, 0xbc, 0x16, 0xb1, 0x16, 0xe1, 0xf5, 0x00, 0xa4, 0x97, 0x0d, 0x97, 0xdd, 0x20, 0xbe, - 0x13, 0x92, 0xba, 0xc1, 0x2e, 0xa5, 0x45, 0xda, 0x27, 0x70, 0x82, 0xba, 0x88, 0x35, 0x0f, 0xb5, - 0x8a, 0xb5, 0x28, 0x2a, 0x61, 0x4f, 0xe0, 0xa5, 0xc5, 0xdf, 0xfd, 0x4f, 0x53, 0x47, 0x5e, 0x79, - 0x7d, 0xea, 0x48, 0xc7, 0x91, 0x08, 0x46, 0x07, 0xae, 0x62, 0x3e, 0x04, 0x4e, 0x75, 0x7f, 0xce, - 0x0d, 0xcd, 0x85, 0xcf, 0xa6, 0xe0, 0x4e, 0xfa, 0x78, 0xc4, 0x6e, 0xe8, 0x86, 0x3b, 0xa7, 0xd9, - 0x07, 0x96, 0x4b, 0xc3, 0x89, 0xb9, 0xcb, 0x47, 0x61, 0xdc, 0xaf, 0x9e, 0x65, 0xd5, 0x1d, 0xc6, - 0x60, 0x17, 0x06, 0x36, 0x08, 0x1d, 0x51, 0x9c, 0x6b, 0xba, 0x6a, 0x9d, 0xbb, 0x0b, 0x56, 0x20, - 0x50, 0xf6, 0xe0, 0x24, 0xc1, 0xa0, 0xba, 0x78, 0x6b, 0x52, 0xc7, 0xea, 0x2e, 0xbb, 0xb7, 0x9b, - 0xa4, 0x21, 0x24, 0x4d, 0x00, 0xf4, 0x8a, 0xee, 0x24, 0x0c, 0xa8, 0x4d, 0x76, 0xe4, 0x9c, 0x24, - 0xb1, 0x85, 0x16, 0xe4, 0x4b, 0x30, 0xc4, 0x8f, 0xb9, 0x50, 0x0e, 0x92, 0xfb, 0xf8, 0x80, 0xb6, - 0x93, 0x55, 0xc8, 0x4f, 0x34, 0x0b, 0x03, 0x54, 0x78, 0xfe, 0x20, 0x21, 0x3f, 0xdb, 0x22, 0xfd, - 0x2c, 0x15, 0x52, 0x61, 0x68, 0xf2, 0xb3, 0x90, 0x5e, 0x34, 0x1b, 0xba, 0x61, 0x86, 0xb9, 0x65, - 0x18, 0x37, 0x2a, 0xb3, 0xd5, 0xe4, 0x63, 0xad, 0xb0, 0x02, 0x3a, 0x06, 0x83, 0xec, 0x1e, 0x37, - 0x3f, 0x36, 0xe7, 0x25, 0x79, 0x01, 0x86, 0x28, 0xef, 0x75, 0x0b, 0x21, 0xfe, 0x02, 0x88, 0x5f, - 0x18, 0xa7, 0x6e, 0x81, 0xb3, 0x4f, 0xf8, 0xc2, 0x22, 0x48, 0x55, 0x55, 0x57, 0xe5, 0xfd, 0xa6, - 0xbf, 0xe5, 0xa7, 0x21, 0xcd, 0x99, 0x38, 0xe8, 0x0c, 0x24, 0x4d, 0xcb, 0xe1, 0x07, 0xdf, 0x85, - 0x4e, 0x5d, 0x59, 0xb7, 0x4a, 0x29, 0x62, 0x25, 0x0a, 0x41, 0x2e, 0x29, 0x1d, 0xcd, 0xe2, 0xc9, - 0x80, 0x59, 0x04, 0x86, 0x3c, 0xf0, 0x93, 0x0d, 0x69, 0x8b, 0x39, 0x78, 0xc6, 0xf2, 0xa9, 0x04, - 0x4c, 0x05, 0x6a, 0xaf, 0x60, 0x9b, 0xac, 0xf5, 0x98, 0x45, 0x71, 0x6b, 0x41, 0x01, 0x21, 0x79, - 0x7d, 0x07, 0x73, 0x79, 0x33, 0x24, 0xe7, 0x2d, 0x0b, 0x15, 0x20, 0xcd, 0x0e, 0xb8, 0x4d, 0x66, - 0x2f, 0x29, 0xc5, 0x2b, 0x93, 0x3a, 0xc7, 0xdc, 0x75, 0xaf, 0xaa, 0xb6, 0xf7, 0xd4, 0x49, 0x94, - 0xe5, 0xa7, 0x20, 0xb3, 0x60, 0x1a, 0x0e, 0x36, 0x9c, 0x26, 0x0d, 0x44, 0x3b, 0x75, 0x53, 0xdb, - 0xe7, 0x1c, 0x58, 0x81, 0x28, 0x5c, 0xb5, 0x2c, 0x4a, 0x99, 0x52, 0xc8, 0x4f, 0x36, 0x2f, 0x4b, - 0x9b, 0x1d, 0x55, 0xf4, 0x54, 0xff, 0x2a, 0xe2, 0x9d, 0xf4, 0x74, 0xf4, 0xbf, 0x25, 0x38, 0xd9, - 0x3a, 0xa1, 0xf6, 0xf1, 0x81, 0xd3, 0xef, 0x7c, 0x7a, 0x01, 0x32, 0x1b, 0xf4, 0xbd, 0xf1, 0x25, - 0x7c, 0x80, 0x0a, 0x30, 0x84, 0xab, 0x67, 0xce, 0x9e, 0x7d, 0xf4, 0x29, 0x66, 0xed, 0x17, 0x8f, - 0x28, 0x02, 0x80, 0xa6, 0x20, 0xe3, 0x60, 0xcd, 0x3a, 0x73, 0xf6, 0xdc, 0xfe, 0xa3, 0xcc, 0xbc, - 0x2e, 0x1e, 0x51, 0x7c, 0x50, 0x31, 0x4d, 0x7a, 0xfd, 0xc6, 0xa7, 0xa6, 0xa5, 0xd2, 0x00, 0x24, - 0x9d, 0x66, 0xe3, 0xb6, 0xda, 0xc8, 0x6b, 0x03, 0x30, 0x13, 0xa4, 0xa4, 0xd1, 0xfa, 0x8a, 0x5a, - 0xd7, 0xab, 0xaa, 0xff, 0x52, 0x3c, 0x17, 0xd0, 0x01, 0xc5, 0x68, 0xaf, 0x82, 0x42, 0x57, 0x4d, - 0xca, 0xbf, 0x2e, 0x41, 0xf6, 0xb2, 0xe0, 0xbc, 0x89, 0x5d, 0x74, 0x1e, 0xc0, 0x6b, 0x49, 0x4c, - 0x9b, 0x3b, 0x66, 0xa3, 0x6d, 0xcd, 0x7a, 0x34, 0x4a, 0x00, 0x1d, 0x3d, 0x41, 0x0d, 0xd1, 0x32, - 0x1d, 0xfe, 0xfc, 0x25, 0x86, 0xd4, 0x43, 0x46, 0x0f, 0x01, 0xa2, 0x1e, 0xae, 0x72, 0xc5, 0x74, - 0x75, 0xa3, 0x56, 0xb1, 0xcc, 0xab, 0xfc, 0x51, 0x61, 0x52, 0xc9, 0xd1, 0x9a, 0xcb, 0xb4, 0x62, - 0x83, 0xc0, 0x89, 0xd0, 0x19, 0x8f, 0x0b, 0xc9, 0xad, 0xd4, 0x6a, 0xd5, 0xc6, 0x8e, 0xc3, 0x9d, - 0x98, 0x28, 0xa2, 0xf3, 0x30, 0x64, 0x35, 0x77, 0x2a, 0xc2, 0x63, 0x0c, 0x9f, 0x39, 0xd9, 0x6e, - 0xfe, 0x0b, 0xfb, 0xe0, 0x1e, 0x60, 0xd0, 0x6a, 0xee, 0x10, 0x6b, 0xb9, 0x0b, 0xb2, 0x6d, 0x84, - 0x19, 0xbe, 0xe2, 0xcb, 0x41, 0x9f, 0xb9, 0xf3, 0x1e, 0x54, 0x2c, 0x5b, 0x37, 0x6d, 0xdd, 0x3d, - 0xa0, 0xb7, 0x57, 0x92, 0x4a, 0x4e, 0x54, 0x6c, 0x70, 0xb8, 0xbc, 0x0f, 0x63, 0x9b, 0x34, 0xb7, - 0xf0, 0x25, 0x3f, 0xeb, 0xcb, 0x27, 0xc5, 0xcb, 0xd7, 0x51, 0xb2, 0x44, 0x8b, 0x64, 0xa5, 0xe7, - 0x3a, 0x5a, 0xe7, 0x13, 0xfd, 0x5b, 0x67, 0x38, 0xda, 0xfd, 0xd1, 0x89, 0xd0, 0xe4, 0xe4, 0xa9, - 0x64, 0xc0, 0x7d, 0xf5, 0x6a, 0x98, 0x71, 0x29, 0x75, 0xa1, 0x7b, 0x50, 0x2d, 0xc4, 0xb8, 0xd1, - 0x42, 0xec, 0x14, 0x92, 0x9f, 0x82, 0x91, 0x0d, 0xd5, 0x76, 0x37, 0xb1, 0x7b, 0x11, 0xab, 0x55, - 0x6c, 0x87, 0xa3, 0xee, 0x88, 0x88, 0xba, 0x08, 0x52, 0x34, 0xb4, 0xb2, 0xa8, 0x43, 0x7f, 0xcb, - 0x7b, 0x90, 0xa2, 0x37, 0xd8, 0xbc, 0x88, 0xcc, 0x29, 0x58, 0x44, 0x26, 0xbe, 0xf4, 0xc0, 0xc5, - 0x8e, 0x58, 0xd0, 0xd1, 0x02, 0x7a, 0x5c, 0xc4, 0xd5, 0x64, 0xf7, 0xb8, 0xca, 0x0d, 0x91, 0x47, - 0xd7, 0x3a, 0x0c, 0x95, 0x88, 0x2b, 0x5e, 0x5e, 0xf4, 0x04, 0x91, 0x7c, 0x41, 0xd0, 0x2a, 0x8c, - 0x59, 0xaa, 0xed, 0xd2, 0xab, 0xfb, 0x7b, 0xb4, 0x17, 0xdc, 0xd6, 0xa7, 0x5b, 0x67, 0x5e, 0xa8, - 0xb3, 0xbc, 0x95, 0x11, 0x2b, 0x08, 0x94, 0xff, 0x30, 0x05, 0x83, 0x5c, 0x19, 0x6f, 0x86, 0x21, - 0xae, 0x56, 0x6e, 0x9d, 0x77, 0xce, 0xb6, 0x06, 0xa6, 0x59, 0x2f, 0x80, 0x70, 0x7e, 0x82, 0x06, - 0xdd, 0x07, 0x69, 0x6d, 0x4f, 0xd5, 0x8d, 0x8a, 0x5e, 0x15, 0x69, 0xde, 0xeb, 0x37, 0xa6, 0x87, - 0x16, 0x08, 0x6c, 0x79, 0x51, 0x19, 0xa2, 0x95, 0xcb, 0x55, 0x92, 0x09, 0xec, 0x61, 0xbd, 0xb6, - 0xe7, 0xf2, 0x19, 0xc6, 0x4b, 0xe8, 0x49, 0x48, 0x11, 0x83, 0xe0, 0x0f, 0xbb, 0x0a, 0x2d, 0xc9, - 0xb6, 0xb7, 0xe2, 0x29, 0xa5, 0x49, 0xc3, 0x1f, 0xfa, 0xfd, 0x69, 0x49, 0xa1, 0x14, 0x68, 0x01, - 0x46, 0xea, 0xaa, 0xe3, 0x56, 0x68, 0x04, 0x23, 0xcd, 0x0f, 0x50, 0x16, 0x27, 0x5a, 0x15, 0xc2, - 0x15, 0xcb, 0x45, 0x1f, 0x26, 0x54, 0x0c, 0x54, 0x45, 0xa7, 0x20, 0x47, 0x99, 0x68, 0x66, 0xa3, - 0xa1, 0xbb, 0x2c, 0xb7, 0x1a, 0xa4, 0x7a, 0x1f, 0x25, 0xf0, 0x05, 0x0a, 0xa6, 0x19, 0xd6, 0x1d, - 0x90, 0xa1, 0x4f, 0x49, 0x28, 0x0a, 0xbb, 0x36, 0x99, 0x26, 0x00, 0x5a, 0x79, 0x3f, 0x8c, 0xf9, - 0xfe, 0x91, 0xa1, 0xa4, 0x19, 0x17, 0x1f, 0x4c, 0x11, 0x1f, 0x81, 0x49, 0x03, 0x5f, 0xa3, 0x17, - 0x39, 0x43, 0xd8, 0x19, 0x8a, 0x8d, 0x48, 0xdd, 0xe5, 0x30, 0xc5, 0xbd, 0x30, 0xaa, 0x09, 0xe5, - 0x33, 0x5c, 0xa0, 0xb8, 0x23, 0x1e, 0x94, 0xa2, 0x9d, 0x80, 0xb4, 0x6a, 0x59, 0x0c, 0x61, 0x98, - 0xfb, 0x47, 0xcb, 0xa2, 0x55, 0xa7, 0x61, 0x9c, 0xf6, 0xd1, 0xc6, 0x4e, 0xb3, 0xee, 0x72, 0x26, - 0x59, 0x8a, 0x33, 0x46, 0x2a, 0x14, 0x06, 0xa7, 0xb8, 0x77, 0xc3, 0x08, 0xbe, 0xa2, 0x57, 0xb1, - 0xa1, 0x61, 0x86, 0x37, 0x42, 0xf1, 0xb2, 0x02, 0x48, 0x91, 0x1e, 0x00, 0xcf, 0xef, 0x55, 0x84, - 0x4f, 0x1e, 0x65, 0xfc, 0x04, 0x7c, 0x9e, 0x81, 0xe5, 0x3c, 0xa4, 0x16, 0x55, 0x57, 0x25, 0x09, - 0x86, 0x7b, 0x8d, 0x05, 0x9a, 0xac, 0x42, 0x7e, 0xca, 0x6f, 0x24, 0x20, 0x75, 0xd9, 0x74, 0x31, - 0x7a, 0x2c, 0x90, 0x00, 0x8e, 0xb6, 0xb3, 0xe7, 0x4d, 0xbd, 0x66, 0xe0, 0xea, 0xaa, 0x53, 0x0b, - 0xbc, 0xfb, 0xf6, 0xcd, 0x29, 0x11, 0x32, 0xa7, 0x49, 0x18, 0xb0, 0xcd, 0xa6, 0x51, 0x15, 0x37, - 0x0e, 0x69, 0x01, 0x95, 0x21, 0xed, 0x59, 0x49, 0x2a, 0xce, 0x4a, 0xc6, 0x88, 0x95, 0x10, 0x1b, - 0xe6, 0x00, 0x65, 0x68, 0x87, 0x1b, 0x4b, 0x09, 0x32, 0x9e, 0xf3, 0xe2, 0xd6, 0xd6, 0x9b, 0xc1, - 0xfa, 0x64, 0x24, 0x98, 0x78, 0x63, 0xef, 0x29, 0x8f, 0x59, 0x5c, 0xce, 0xab, 0xe0, 0xda, 0x0b, - 0x99, 0x15, 0x7f, 0x83, 0x3e, 0x44, 0xfb, 0xe5, 0x9b, 0x15, 0x7b, 0x87, 0x7e, 0x12, 0x32, 0x8e, - 0x5e, 0x33, 0x54, 0xb7, 0x69, 0x63, 0x6e, 0x79, 0x3e, 0x40, 0xfe, 0x92, 0x04, 0x83, 0xcc, 0x92, - 0x03, 0x7a, 0x93, 0xda, 0xeb, 0x2d, 0xd1, 0x49, 0x6f, 0xc9, 0xc3, 0xeb, 0x6d, 0x1e, 0xc0, 0x13, - 0xc6, 0xe1, 0x4f, 0x83, 0xdb, 0x64, 0x0c, 0x4c, 0xc4, 0x4d, 0xbd, 0xc6, 0x27, 0x6a, 0x80, 0x48, - 0xfe, 0x8f, 0x12, 0x49, 0x62, 0x79, 0x3d, 0x9a, 0x87, 0x11, 0x21, 0x57, 0x65, 0xb7, 0xae, 0xd6, - 0xb8, 0xed, 0xdc, 0xd9, 0x51, 0xb8, 0x0b, 0x75, 0xb5, 0xa6, 0x0c, 0x73, 0x79, 0x48, 0xa1, 0xfd, - 0x38, 0x24, 0x3a, 0x8c, 0x43, 0x68, 0xe0, 0x93, 0x87, 0x1b, 0xf8, 0xd0, 0x10, 0xa5, 0xa2, 0x43, - 0xf4, 0xf9, 0x04, 0x5d, 0xcc, 0x58, 0xa6, 0xa3, 0xd6, 0x7f, 0x18, 0x33, 0xe2, 0x0e, 0xc8, 0x58, - 0x66, 0xbd, 0xc2, 0x6a, 0xd8, 0x4d, 0xdc, 0xb4, 0x65, 0xd6, 0x95, 0x96, 0x61, 0x1f, 0xb8, 0x45, - 0xd3, 0x65, 0xf0, 0x16, 0x68, 0x6d, 0x28, 0xaa, 0x35, 0x1b, 0xb2, 0x4c, 0x15, 0x3c, 0x96, 0x3d, - 0x42, 0x74, 0x40, 0x83, 0xa3, 0xd4, 0x1a, 0x7b, 0x99, 0xd8, 0x0c, 0x53, 0xe1, 0x78, 0x84, 0x82, - 0xb9, 0xfe, 0x76, 0xab, 0xe0, 0xa0, 0x59, 0x2a, 0x1c, 0x4f, 0xfe, 0x39, 0x09, 0x60, 0x85, 0x68, - 0x96, 0xf6, 0x97, 0x44, 0x21, 0x87, 0x8a, 0x50, 0x09, 0xb5, 0x3c, 0xd5, 0x69, 0xd0, 0x78, 0xfb, - 0x59, 0x27, 0x28, 0xf7, 0x02, 0x8c, 0xf8, 0xc6, 0xe8, 0x60, 0x21, 0xcc, 0x54, 0x97, 0xac, 0x7a, - 0x13, 0xbb, 0x4a, 0xf6, 0x4a, 0xa0, 0x24, 0xff, 0x33, 0x09, 0x32, 0x54, 0xa6, 0x55, 0xec, 0xaa, - 0xa1, 0x31, 0x94, 0x0e, 0x3f, 0x86, 0x77, 0x02, 0x30, 0x36, 0x8e, 0xfe, 0x32, 0xe6, 0x96, 0x95, - 0xa1, 0x90, 0x4d, 0xfd, 0x65, 0x8c, 0xce, 0x79, 0x0a, 0x4f, 0x76, 0x57, 0xb8, 0xc8, 0xba, 0xb9, - 0xda, 0x8f, 0xc3, 0x10, 0xfd, 0x94, 0xce, 0x35, 0x87, 0x27, 0xd2, 0x83, 0x46, 0xb3, 0xb1, 0x75, - 0xcd, 0x91, 0x5f, 0x84, 0xa1, 0xad, 0x6b, 0x6c, 0x6f, 0xe4, 0x0e, 0xc8, 0xd8, 0xa6, 0xc9, 0x63, - 0x32, 0xcb, 0x85, 0xd2, 0x04, 0x40, 0x43, 0x90, 0xd8, 0x0f, 0x48, 0xf8, 0xfb, 0x01, 0xfe, 0x86, - 0x46, 0xb2, 0xa7, 0x0d, 0x8d, 0xd3, 0xff, 0x4e, 0x82, 0xe1, 0x80, 0x7f, 0x40, 0x8f, 0xc2, 0xd1, - 0xd2, 0xca, 0xfa, 0xc2, 0xa5, 0xca, 0xf2, 0x62, 0xe5, 0xc2, 0xca, 0xfc, 0x92, 0xff, 0xd6, 0xa4, - 0x70, 0xec, 0xd5, 0xeb, 0x33, 0x28, 0x80, 0xbb, 0x6d, 0xec, 0x1b, 0xe6, 0x55, 0x03, 0xcd, 0xc1, - 0x64, 0x98, 0x64, 0xbe, 0xb4, 0x59, 0x5e, 0xdb, 0xca, 0x49, 0x85, 0xa3, 0xaf, 0x5e, 0x9f, 0x19, - 0x0f, 0x50, 0xcc, 0xef, 0x38, 0xd8, 0x70, 0x5b, 0x09, 0x16, 0xd6, 0x57, 0x57, 0x97, 0xb7, 0x72, - 0x89, 0x16, 0x02, 0xee, 0xb0, 0x1f, 0x80, 0xf1, 0x30, 0xc1, 0xda, 0xf2, 0x4a, 0x2e, 0x59, 0x40, - 0xaf, 0x5e, 0x9f, 0x19, 0x0d, 0x60, 0xaf, 0xe9, 0xf5, 0x42, 0xfa, 0xfd, 0x9f, 0x9e, 0x3a, 0xf2, - 0x4b, 0xbf, 0x38, 0x25, 0x91, 0x9e, 0x8d, 0x84, 0x7c, 0x04, 0x7a, 0x08, 0x8e, 0x6f, 0x2e, 0x2f, - 0xad, 0x95, 0x17, 0x2b, 0xab, 0x9b, 0x4b, 0x15, 0xf6, 0x8d, 0x0d, 0xaf, 0x77, 0x63, 0xaf, 0x5e, - 0x9f, 0x19, 0xe6, 0x5d, 0xea, 0x84, 0xbd, 0xa1, 0x94, 0x2f, 0xaf, 0x6f, 0x95, 0x73, 0x12, 0xc3, - 0xde, 0xb0, 0xf1, 0x15, 0xd3, 0x65, 0xdf, 0xda, 0x7a, 0x04, 0x4e, 0xb4, 0xc1, 0xf6, 0x3a, 0x36, - 0xfe, 0xea, 0xf5, 0x99, 0x91, 0x0d, 0x1b, 0xb3, 0xf9, 0x43, 0x29, 0x66, 0x21, 0xdf, 0x4a, 0xb1, - 0xbe, 0xb1, 0xbe, 0x39, 0xbf, 0x92, 0x9b, 0x29, 0xe4, 0x5e, 0xbd, 0x3e, 0x93, 0x15, 0xce, 0x90, - 0xe0, 0xfb, 0x3d, 0xbb, 0x9d, 0x2b, 0x9e, 0x3f, 0x79, 0x18, 0xee, 0xe1, 0x7b, 0x80, 0x8e, 0xab, - 0xee, 0xeb, 0x46, 0xcd, 0xdb, 0x69, 0xe5, 0x65, 0xbe, 0xf2, 0x39, 0xc6, 0x37, 0x5b, 0x05, 0xb4, - 0xeb, 0x7e, 0x6b, 0xa1, 0xf3, 0xc9, 0x52, 0x21, 0xe6, 0xf0, 0x25, 0x7e, 0xe9, 0xd4, 0x79, 0x6f, - 0xbe, 0x10, 0xb3, 0x63, 0x5c, 0xe8, 0xba, 0xb8, 0x93, 0x3f, 0x20, 0xc1, 0xe8, 0x45, 0xdd, 0x71, - 0x4d, 0x5b, 0xd7, 0xd4, 0x3a, 0x7d, 0x61, 0x72, 0xae, 0x57, 0xdf, 0x1a, 0x99, 0xea, 0xcf, 0xc0, - 0xe0, 0x15, 0xb5, 0xce, 0x9c, 0x5a, 0x92, 0x7e, 0x10, 0xa3, 0xbd, 0xfa, 0x7c, 0xd7, 0x26, 0x18, - 0x30, 0x32, 0xf9, 0x57, 0x12, 0x30, 0x46, 0x27, 0x83, 0xc3, 0x3e, 0x95, 0x44, 0xd6, 0x58, 0x25, - 0x48, 0xd9, 0xaa, 0xcb, 0x37, 0x0d, 0x4b, 0xb3, 0x7c, 0xe7, 0xf7, 0xbe, 0xf8, 0xdd, 0xdc, 0xd9, - 0x45, 0xac, 0x29, 0x94, 0x16, 0xbd, 0x1d, 0xd2, 0x0d, 0xf5, 0x5a, 0x85, 0xf2, 0x61, 0x2b, 0x97, - 0xf9, 0xfe, 0xf8, 0xdc, 0xbc, 0x31, 0x3d, 0x76, 0xa0, 0x36, 0xea, 0x45, 0x59, 0xf0, 0x91, 0x95, - 0xa1, 0x86, 0x7a, 0x8d, 0x88, 0x88, 0x2c, 0x18, 0x23, 0x50, 0x6d, 0x4f, 0x35, 0x6a, 0x98, 0x35, - 0x42, 0xb7, 0x40, 0x4b, 0x17, 0xfb, 0x6e, 0xe4, 0x98, 0xdf, 0x48, 0x80, 0x9d, 0xac, 0x8c, 0x34, - 0xd4, 0x6b, 0x0b, 0x14, 0x40, 0x5a, 0x2c, 0xa6, 0x3f, 0xfa, 0xc9, 0xe9, 0x23, 0x74, 0x37, 0xfd, - 0x1b, 0x12, 0x80, 0xaf, 0x31, 0xf4, 0x76, 0xc8, 0x69, 0x5e, 0x89, 0xd2, 0x3a, 0x7c, 0x0c, 0xef, - 0xef, 0x34, 0x16, 0x11, 0x7d, 0xb3, 0xd8, 0xfc, 0xf5, 0x1b, 0xd3, 0x92, 0x32, 0xa6, 0x45, 0x86, - 0xe2, 0x6d, 0x30, 0xdc, 0xb4, 0xaa, 0xaa, 0x8b, 0x2b, 0x74, 0x1d, 0x97, 0x88, 0x8d, 0xf3, 0x53, - 0x84, 0xd7, 0xcd, 0x1b, 0xd3, 0x88, 0x75, 0x2b, 0x40, 0x2c, 0xd3, 0xe8, 0x0f, 0x0c, 0x42, 0x08, - 0x02, 0x7d, 0xfa, 0xaa, 0x04, 0xc3, 0x8b, 0x81, 0x9b, 0x5e, 0x79, 0x18, 0x6a, 0x98, 0x86, 0xbe, - 0xcf, 0xed, 0x31, 0xa3, 0x88, 0x22, 0x2a, 0x40, 0x9a, 0x3d, 0xba, 0x73, 0x0f, 0xc4, 0x56, 0xa8, - 0x28, 0x13, 0xaa, 0xab, 0x78, 0xc7, 0xd1, 0xc5, 0x68, 0x28, 0xa2, 0x88, 0x2e, 0x40, 0xce, 0xc1, - 0x5a, 0xd3, 0xd6, 0xdd, 0x83, 0x8a, 0x66, 0x1a, 0xae, 0xaa, 0xb9, 0xec, 0xf9, 0x56, 0xe9, 0x8e, - 0x9b, 0x37, 0xa6, 0x8f, 0x33, 0x59, 0xa3, 0x18, 0xb2, 0x32, 0x26, 0x40, 0x0b, 0x0c, 0x42, 0x5a, - 0xa8, 0x62, 0x57, 0xd5, 0xeb, 0x4e, 0x9e, 0x1d, 0x0c, 0x89, 0x62, 0xa0, 0x2f, 0x9f, 0x1b, 0x0a, - 0x6e, 0x6c, 0x5d, 0x80, 0x9c, 0x69, 0x61, 0x3b, 0x94, 0x88, 0x4a, 0xd1, 0x96, 0xa3, 0x18, 0xb2, - 0x32, 0x26, 0x40, 0x22, 0x49, 0x75, 0xc9, 0x30, 0x8b, 0x85, 0xa2, 0xd5, 0xdc, 0xf1, 0xf7, 0xc3, - 0x26, 0x5b, 0x46, 0x63, 0xde, 0x38, 0x28, 0x3d, 0xe6, 0x73, 0x8f, 0xd2, 0xc9, 0x5f, 0xfb, 0xc2, - 0xc3, 0x93, 0xdc, 0x34, 0xfc, 0xfd, 0xa9, 0x4b, 0xf8, 0x80, 0x0c, 0x3f, 0x47, 0xdd, 0xa0, 0x98, - 0x24, 0xed, 0x7c, 0x51, 0xd5, 0xeb, 0xe2, 0x19, 0xb2, 0xc2, 0x4b, 0xa8, 0x08, 0x83, 0x8e, 0xab, - 0xba, 0x4d, 0x87, 0x7f, 0x1c, 0x4c, 0xee, 0x64, 0x6a, 0x25, 0xd3, 0xa8, 0x6e, 0x52, 0x4c, 0x85, - 0x53, 0xa0, 0x0b, 0x30, 0xe8, 0x9a, 0xfb, 0xd8, 0xe0, 0x2a, 0xec, 0x6b, 0x7e, 0xd3, 0x73, 0x2a, - 0x46, 0x4d, 0x34, 0x52, 0xc5, 0x75, 0x5c, 0x63, 0x69, 0xd5, 0x9e, 0x4a, 0x56, 0x1f, 0xf4, 0x1b, - 0x61, 0xa5, 0xe5, 0xbe, 0x27, 0x21, 0xd7, 0x54, 0x94, 0x9f, 0xac, 0x8c, 0x79, 0xa0, 0x4d, 0x0a, - 0x41, 0x97, 0x42, 0x57, 0x12, 0xf9, 0x87, 0xf4, 0xee, 0xee, 0xd4, 0xfd, 0x80, 0x4d, 0x8b, 0xfd, - 0x89, 0xe0, 0x85, 0xc6, 0x0b, 0x90, 0x6b, 0x1a, 0x3b, 0xa6, 0x41, 0xdf, 0x0a, 0xf2, 0xfc, 0x9e, - 0xac, 0xef, 0x92, 0x41, 0xe3, 0x88, 0x62, 0xc8, 0xca, 0x98, 0x07, 0xba, 0xc8, 0x56, 0x01, 0x55, - 0x18, 0xf5, 0xb1, 0xe8, 0x44, 0xcd, 0xc4, 0x4e, 0xd4, 0xbb, 0xf8, 0x44, 0x3d, 0x1a, 0x6d, 0xc5, - 0x9f, 0xab, 0x23, 0x1e, 0x90, 0x90, 0xa1, 0x8b, 0x00, 0xbe, 0x7b, 0xa0, 0xfb, 0x14, 0xc3, 0x9d, - 0x07, 0xde, 0xf7, 0x31, 0x62, 0xbd, 0xe7, 0xd3, 0xa2, 0x77, 0xc2, 0x44, 0x43, 0x37, 0x2a, 0x0e, - 0xae, 0xef, 0x56, 0xb8, 0x82, 0x09, 0x4b, 0xfa, 0xa9, 0x97, 0xd2, 0x4a, 0x7f, 0xf6, 0x70, 0xf3, - 0xc6, 0x74, 0x81, 0xbb, 0xd0, 0x56, 0x96, 0xb2, 0x32, 0xde, 0xd0, 0x8d, 0x4d, 0x5c, 0xdf, 0x5d, - 0xf4, 0x60, 0xc5, 0xec, 0xfb, 0x3f, 0x39, 0x7d, 0x84, 0x4f, 0xd7, 0x23, 0xf2, 0x39, 0xba, 0x77, - 0xce, 0xa7, 0x19, 0x76, 0xc8, 0x9a, 0x44, 0x15, 0x05, 0xba, 0xa3, 0x91, 0x51, 0x7c, 0x00, 0x9b, - 0xe6, 0xaf, 0xfc, 0x87, 0x19, 0x49, 0xfe, 0x9c, 0x04, 0x83, 0x8b, 0x97, 0x37, 0x54, 0xdd, 0x46, - 0xcb, 0x30, 0xee, 0x5b, 0x4e, 0x78, 0x92, 0x9f, 0xbc, 0x79, 0x63, 0x3a, 0x1f, 0x35, 0x2e, 0x6f, - 0x96, 0xfb, 0x06, 0x2c, 0xa6, 0xf9, 0x72, 0xa7, 0x85, 0x6b, 0x88, 0x55, 0x0b, 0x8a, 0xdc, 0xba, - 0xac, 0x8d, 0x74, 0xb3, 0x0c, 0x43, 0x4c, 0x5a, 0x07, 0x15, 0x61, 0xc0, 0x22, 0x3f, 0xf8, 0xc1, - 0xc0, 0x54, 0x47, 0xe3, 0xa5, 0xf8, 0xde, 0x46, 0x26, 0x21, 0x91, 0x3f, 0x9c, 0x00, 0x58, 0xbc, - 0x7c, 0x79, 0xcb, 0xd6, 0xad, 0x3a, 0x76, 0x6f, 0x65, 0xcf, 0xb7, 0xe0, 0x68, 0x60, 0x95, 0x64, - 0x6b, 0x91, 0xde, 0xcf, 0xdc, 0xbc, 0x31, 0x7d, 0x32, 0xda, 0xfb, 0x00, 0x9a, 0xac, 0x4c, 0xf8, - 0xeb, 0x25, 0x5b, 0x6b, 0xcb, 0xb5, 0xea, 0xb8, 0x1e, 0xd7, 0x64, 0x67, 0xae, 0x01, 0xb4, 0x20, - 0xd7, 0x45, 0xc7, 0x6d, 0xaf, 0xda, 0x4d, 0x18, 0xf6, 0x55, 0xe2, 0xa0, 0x45, 0x48, 0xbb, 0xfc, - 0x37, 0xd7, 0xb0, 0xdc, 0x59, 0xc3, 0x82, 0x8c, 0x6b, 0xd9, 0xa3, 0x94, 0xff, 0x4c, 0x02, 0xf0, - 0x6d, 0xf6, 0xc7, 0xd3, 0xc4, 0x88, 0x2b, 0xe7, 0x8e, 0x37, 0x79, 0xa8, 0x54, 0x8d, 0x53, 0x47, - 0xf4, 0xf9, 0xd3, 0x09, 0x98, 0xd8, 0x16, 0x9e, 0xe7, 0xc7, 0x5e, 0x07, 0x1b, 0x30, 0x84, 0x0d, - 0xd7, 0xd6, 0xa9, 0x12, 0xc8, 0x68, 0x3f, 0xd2, 0x69, 0xb4, 0xdb, 0xf4, 0x89, 0x7e, 0xec, 0x46, - 0x6c, 0xba, 0x73, 0x36, 0x11, 0x6d, 0x7c, 0x30, 0x09, 0xf9, 0x4e, 0x94, 0x68, 0x01, 0xc6, 0x34, - 0x1b, 0x53, 0x40, 0x25, 0xb8, 0xf3, 0x57, 0x2a, 0xf8, 0x99, 0x65, 0x04, 0x41, 0x56, 0x46, 0x05, - 0x84, 0x47, 0x8f, 0x1a, 0x90, 0xb4, 0x8f, 0x98, 0x1d, 0xc1, 0xea, 0x31, 0xcf, 0x93, 0x79, 0xf8, - 0x10, 0x8d, 0x84, 0x19, 0xb0, 0xf8, 0x31, 0xea, 0x43, 0x69, 0x00, 0x79, 0x09, 0xc6, 0x74, 0x43, - 0x77, 0x75, 0xb5, 0x5e, 0xd9, 0x51, 0xeb, 0xaa, 0xa1, 0x1d, 0x26, 0x6b, 0x66, 0x2e, 0x9f, 0x37, - 0x1b, 0x61, 0x27, 0x2b, 0xa3, 0x1c, 0x52, 0x62, 0x00, 0x74, 0x11, 0x86, 0x44, 0x53, 0xa9, 0x43, - 0x65, 0x1b, 0x82, 0x3c, 0x90, 0xe0, 0xfd, 0x4c, 0x12, 0xc6, 0x15, 0x5c, 0xfd, 0xff, 0x43, 0xd1, - 0xdf, 0x50, 0xac, 0x02, 0xb0, 0xe9, 0x4e, 0x1c, 0xec, 0x21, 0x46, 0x83, 0x38, 0x8c, 0x0c, 0xe3, - 0xb0, 0xe8, 0xb8, 0x81, 0xf1, 0xb8, 0x91, 0x80, 0x6c, 0x70, 0x3c, 0xfe, 0x82, 0x46, 0x25, 0xb4, - 0xec, 0x7b, 0xa2, 0x14, 0xff, 0x44, 0x68, 0x07, 0x4f, 0xd4, 0x62, 0xbd, 0xdd, 0x5d, 0xd0, 0xff, - 0x48, 0xc0, 0xe0, 0x86, 0x6a, 0xab, 0x0d, 0x07, 0x69, 0x2d, 0x99, 0xa6, 0xd8, 0x7e, 0x6c, 0xf9, - 0x10, 0x34, 0xdf, 0xed, 0x88, 0x49, 0x34, 0x3f, 0xda, 0x26, 0xd1, 0xfc, 0x09, 0x18, 0x25, 0xcb, - 0xe1, 0xc0, 0x15, 0x06, 0xa2, 0xed, 0x91, 0xd2, 0x09, 0x9f, 0x4b, 0xb8, 0x9e, 0xad, 0x96, 0x2f, - 0x07, 0xef, 0x30, 0x0c, 0x13, 0x0c, 0xdf, 0x31, 0x13, 0xf2, 0x63, 0xfe, 0xb2, 0x34, 0x50, 0x29, - 0x2b, 0xd0, 0x50, 0xaf, 0x95, 0x59, 0x01, 0xad, 0x00, 0xda, 0xf3, 0x76, 0x46, 0x2a, 0xbe, 0x3a, - 0x09, 0xfd, 0x9d, 0x37, 0x6f, 0x4c, 0x9f, 0x60, 0xf4, 0xad, 0x38, 0xb2, 0x32, 0xee, 0x03, 0x05, - 0xb7, 0xc7, 0x01, 0x48, 0xbf, 0x2a, 0xec, 0xfa, 0x1c, 0x5b, 0xee, 0x1c, 0xbd, 0x79, 0x63, 0x7a, - 0x9c, 0x71, 0xf1, 0xeb, 0x64, 0x25, 0x43, 0x0a, 0x8b, 0xe4, 0x77, 0xc0, 0xb2, 0x3f, 0x2d, 0x01, - 0xf2, 0x5d, 0xbe, 0x82, 0x1d, 0x8b, 0xac, 0xcf, 0x48, 0x22, 0x1e, 0xc8, 0x9a, 0xa5, 0xee, 0x89, - 0xb8, 0x4f, 0x2f, 0x12, 0xf1, 0xc0, 0x4c, 0x79, 0xca, 0x77, 0x8f, 0x09, 0x3e, 0x8e, 0x6d, 0xee, - 0x1a, 0xce, 0x2e, 0x98, 0xba, 0xa0, 0x6e, 0xf1, 0x87, 0x47, 0xe4, 0x7f, 0x25, 0xc1, 0x89, 0x16, - 0x8b, 0xf2, 0x84, 0xfd, 0x4b, 0x80, 0xec, 0x40, 0x25, 0xff, 0xde, 0x1b, 0x13, 0xba, 0x6f, 0x03, - 0x1d, 0xb7, 0x5b, 0xfc, 0xee, 0xad, 0xf3, 0xf0, 0xec, 0xb2, 0xe2, 0x3f, 0x95, 0x60, 0x32, 0xd8, - 0xbc, 0xd7, 0x91, 0x35, 0xc8, 0x06, 0x5b, 0xe7, 0x5d, 0xb8, 0xa7, 0x97, 0x2e, 0x70, 0xe9, 0x43, - 0xf4, 0xe8, 0x39, 0x7f, 0xba, 0xb2, 0xbd, 0xb3, 0x47, 0x7b, 0xd6, 0x86, 0x90, 0x29, 0x3a, 0x6d, - 0x53, 0x74, 0x3c, 0xfe, 0x8f, 0x04, 0xa9, 0x0d, 0xd3, 0xac, 0x23, 0x13, 0xc6, 0x0d, 0xd3, 0xad, - 0x10, 0xcb, 0xc2, 0xd5, 0x0a, 0x5f, 0x74, 0x33, 0x3f, 0xb8, 0xd0, 0x9f, 0x92, 0xbe, 0x7d, 0x63, - 0xba, 0x95, 0x95, 0x32, 0x66, 0x98, 0x6e, 0x89, 0x42, 0xb6, 0xd8, 0x92, 0xfc, 0x9d, 0x30, 0x12, - 0x6e, 0x8c, 0x79, 0xc9, 0xe7, 0xfb, 0x6e, 0x2c, 0xcc, 0xe6, 0xe6, 0x8d, 0xe9, 0x49, 0x7f, 0xc6, - 0x78, 0x60, 0x59, 0xc9, 0xee, 0x04, 0x5a, 0x67, 0xd7, 0xbb, 0xbe, 0xfb, 0xc9, 0x69, 0xe9, 0xf4, - 0x17, 0x25, 0x00, 0x7f, 0xe7, 0x01, 0x3d, 0x04, 0xc7, 0x4b, 0xeb, 0x6b, 0x8b, 0x95, 0xcd, 0xad, - 0xf9, 0xad, 0xed, 0xcd, 0xca, 0xf6, 0xda, 0xe6, 0x46, 0x79, 0x61, 0xf9, 0xc2, 0x72, 0x79, 0xd1, - 0xdf, 0x1e, 0x77, 0x2c, 0xac, 0xe9, 0xbb, 0x3a, 0xae, 0xa2, 0xfb, 0x60, 0x32, 0x8c, 0x4d, 0x4a, - 0xe5, 0xc5, 0x9c, 0x54, 0xc8, 0xbe, 0x7a, 0x7d, 0x26, 0xcd, 0x72, 0x31, 0x5c, 0x45, 0xa7, 0xe0, - 0x68, 0x2b, 0xde, 0xf2, 0xda, 0x52, 0x2e, 0x51, 0x18, 0x79, 0xf5, 0xfa, 0x4c, 0xc6, 0x4b, 0xda, - 0x90, 0x0c, 0x28, 0x88, 0xc9, 0xf9, 0x25, 0x0b, 0xf0, 0xea, 0xf5, 0x99, 0x41, 0xa6, 0xc0, 0x42, - 0xea, 0xfd, 0x9f, 0x9e, 0x3a, 0x52, 0xba, 0xd0, 0x71, 0x03, 0xfc, 0xa1, 0xae, 0xba, 0xbb, 0xe6, - 0x6d, 0x6a, 0x87, 0x77, 0xbd, 0xff, 0x78, 0xa8, 0xe3, 0xae, 0x77, 0x0d, 0x1b, 0xd8, 0xd1, 0x9d, - 0x43, 0xed, 0x7a, 0xf7, 0xb4, 0x93, 0x2e, 0xff, 0xce, 0x00, 0x64, 0x97, 0x58, 0x2b, 0x64, 0x20, - 0x30, 0x7a, 0x13, 0x0c, 0x5a, 0x34, 0x8c, 0x78, 0xc7, 0x68, 0x1d, 0x0c, 0x9e, 0x05, 0x1b, 0xef, - 0x2e, 0x17, 0x0b, 0x3d, 0x0e, 0xbf, 0xcc, 0xc1, 0xee, 0x98, 0xf9, 0xb7, 0xa6, 0xb2, 0x7d, 0xed, - 0xf7, 0xb0, 0x9c, 0x85, 0x6f, 0xad, 0x44, 0xf9, 0xc9, 0xec, 0x5e, 0xc8, 0x16, 0x81, 0xb0, 0xdb, - 0x61, 0xef, 0x95, 0xe0, 0x28, 0xc5, 0xf2, 0x03, 0x31, 0xc5, 0x14, 0xc9, 0xfe, 0xe9, 0x4e, 0x5d, - 0x58, 0x51, 0x1d, 0xff, 0xae, 0x07, 0xbb, 0xcf, 0x75, 0x0f, 0x0f, 0x84, 0x27, 0x03, 0x8d, 0x47, - 0xd9, 0xca, 0xca, 0x44, 0xbd, 0x85, 0xd2, 0x41, 0x4b, 0xa1, 0x0b, 0x7d, 0xa9, 0xfe, 0xb6, 0xda, - 0x83, 0x97, 0xfb, 0x9e, 0x85, 0x61, 0xdf, 0x97, 0x38, 0xfc, 0xff, 0x53, 0xf4, 0x1e, 0x3b, 0x82, - 0xc4, 0xe8, 0x7d, 0x12, 0x1c, 0xf5, 0xa3, 0x79, 0x90, 0x2d, 0xfb, 0x3f, 0x1e, 0x0f, 0xf6, 0xb1, - 0x10, 0x8a, 0x2a, 0xa7, 0x2d, 0x5f, 0x59, 0x99, 0x6c, 0xb6, 0x92, 0x92, 0x25, 0xd8, 0x48, 0xd0, - 0xb3, 0x3a, 0x79, 0xf1, 0xa9, 0xba, 0xde, 0x5d, 0x73, 0x98, 0x01, 0xfb, 0xdf, 0x02, 0x96, 0x69, - 0xbb, 0xb8, 0x4a, 0x37, 0xe4, 0xd2, 0x8a, 0x57, 0x96, 0xd7, 0x00, 0xb5, 0x0e, 0x6e, 0xf4, 0x02, - 0x63, 0xc6, 0xbf, 0xc0, 0x38, 0x09, 0x03, 0xc1, 0x2b, 0x7e, 0xac, 0x50, 0x4c, 0xbf, 0x9f, 0x87, - 0xcf, 0x5b, 0x3e, 0xe7, 0xff, 0x45, 0x02, 0x4e, 0x07, 0x8f, 0x87, 0x5e, 0x6a, 0x62, 0xfb, 0xc0, - 0x9b, 0xa2, 0x96, 0x5a, 0xd3, 0x8d, 0xe0, 0x1b, 0xa0, 0x13, 0xc1, 0x80, 0x4f, 0x71, 0x85, 0x9e, - 0x64, 0x03, 0x86, 0x37, 0xd4, 0x1a, 0x56, 0xf0, 0x4b, 0x4d, 0xec, 0xb8, 0x6d, 0x2e, 0x99, 0x1f, - 0x83, 0x41, 0x73, 0x77, 0x57, 0x1c, 0x69, 0xa7, 0x14, 0x5e, 0x22, 0x5d, 0xae, 0xeb, 0x0d, 0x9d, - 0xdd, 0x06, 0x4b, 0x29, 0xac, 0x80, 0xa6, 0x61, 0x58, 0x33, 0x9b, 0x06, 0x9f, 0x71, 0xf9, 0x94, - 0xf8, 0x00, 0x44, 0xd3, 0x60, 0x33, 0x4e, 0x7e, 0x06, 0xb2, 0xac, 0x3d, 0x1e, 0x71, 0x4f, 0x40, - 0x9a, 0x5e, 0xa7, 0xf2, 0x5b, 0x1d, 0x22, 0xe5, 0x4b, 0xec, 0x42, 0x3a, 0xe3, 0xc2, 0x1a, 0x66, - 0x85, 0x52, 0xa9, 0xa3, 0x2a, 0x4f, 0xc5, 0xbb, 0x06, 0xa6, 0x28, 0x4f, 0x8d, 0xbf, 0x39, 0x00, - 0x47, 0xf9, 0x09, 0x9d, 0x6a, 0xe9, 0x73, 0x7b, 0xae, 0x2b, 0x5e, 0x09, 0x01, 0x4f, 0x75, 0x55, - 0x4b, 0x97, 0x0f, 0x20, 0x75, 0xd1, 0x75, 0x2d, 0x74, 0x1a, 0x06, 0xec, 0x66, 0x1d, 0x8b, 0x1d, - 0x1f, 0x6f, 0x4f, 0x5e, 0xb5, 0xf4, 0x59, 0x82, 0xa0, 0x34, 0xeb, 0x58, 0x61, 0x28, 0xa8, 0x0c, - 0xd3, 0xbb, 0xcd, 0x7a, 0xfd, 0xa0, 0x52, 0xc5, 0xf4, 0x7f, 0xf7, 0x78, 0x5f, 0xbf, 0xc7, 0xd7, - 0x2c, 0x55, 0x7c, 0x43, 0x8f, 0xe8, 0xe6, 0x24, 0x45, 0x5b, 0xa4, 0x58, 0xe2, 0xcb, 0xf7, 0x65, - 0x81, 0x23, 0xff, 0x5e, 0x02, 0xd2, 0x82, 0x35, 0xbd, 0x21, 0x8e, 0xeb, 0x58, 0x73, 0x4d, 0x71, - 0x62, 0xe2, 0x95, 0x11, 0x82, 0x64, 0x8d, 0x0f, 0x51, 0xe6, 0xe2, 0x11, 0x85, 0x14, 0x08, 0xcc, - 0xbb, 0xb7, 0x4f, 0x60, 0x56, 0x93, 0x8c, 0x5a, 0xca, 0x32, 0xc5, 0xd2, 0xec, 0xe2, 0x11, 0x85, - 0x96, 0x50, 0x1e, 0x06, 0xc9, 0xcc, 0x70, 0xd9, 0x87, 0x09, 0x09, 0x9c, 0x97, 0xd1, 0x31, 0x18, - 0xb0, 0x54, 0x57, 0x63, 0x57, 0xea, 0x48, 0x05, 0x2b, 0xa2, 0x27, 0x60, 0x90, 0x3d, 0x08, 0x8d, - 0xfe, 0x63, 0x0c, 0xa2, 0x0c, 0xf6, 0xe5, 0x2d, 0x22, 0xf7, 0x86, 0xea, 0xba, 0xd8, 0x36, 0x08, - 0x43, 0x86, 0x8e, 0x10, 0xa4, 0x76, 0xcc, 0xea, 0x01, 0xff, 0x67, 0x1d, 0xf4, 0x37, 0xff, 0xef, - 0x00, 0xd4, 0x1e, 0x2a, 0xb4, 0x92, 0xfd, 0x8f, 0xa2, 0xac, 0x00, 0x96, 0x08, 0x52, 0x19, 0x26, - 0xd4, 0x6a, 0x55, 0x67, 0xff, 0x37, 0xa3, 0xb2, 0xa3, 0x53, 0x0f, 0xe1, 0xd0, 0xff, 0x40, 0xd5, - 0x69, 0x2c, 0x90, 0x4f, 0x50, 0xe2, 0xf8, 0xa5, 0x0c, 0x0c, 0x59, 0x4c, 0x28, 0xf9, 0x3c, 0x8c, - 0xb7, 0x48, 0x4a, 0xe4, 0xdb, 0xd7, 0x8d, 0xaa, 0x78, 0xcc, 0x40, 0x7e, 0x13, 0x18, 0xfd, 0x7a, - 0x1e, 0x3b, 0x8b, 0xa2, 0xbf, 0x4b, 0xef, 0xee, 0xfc, 0xf0, 0x6b, 0x34, 0xf0, 0xf0, 0x4b, 0xb5, - 0xf4, 0x52, 0x86, 0xf2, 0xe7, 0xcf, 0xbd, 0xe6, 0x79, 0x05, 0x7b, 0xea, 0x35, 0x6b, 0xda, 0x35, - 0x12, 0xa5, 0x45, 0xf4, 0x25, 0x55, 0xaa, 0xa5, 0x3b, 0xd4, 0x1c, 0xfd, 0xaf, 0xf9, 0x39, 0xe7, - 0x03, 0xbf, 0xe9, 0x23, 0xb0, 0xd4, 0xd2, 0xfc, 0xc6, 0xb2, 0x67, 0xc7, 0x5f, 0x4e, 0xc0, 0xc9, - 0x80, 0x1d, 0x07, 0x90, 0x5b, 0xcd, 0xb9, 0xd0, 0xde, 0xe2, 0x7b, 0x78, 0xfc, 0x75, 0x09, 0x52, - 0x04, 0x1f, 0xc5, 0x7c, 0xbb, 0x3f, 0xff, 0xab, 0x5f, 0xfb, 0x27, 0x72, 0xf8, 0xd4, 0x2a, 0x34, - 0x2a, 0x94, 0x49, 0xe9, 0x7d, 0xbd, 0xeb, 0x2f, 0xe7, 0x7f, 0xc8, 0xd0, 0xb9, 0x75, 0x6a, 0x8c, - 0xea, 0xf0, 0x5b, 0x67, 0x41, 0xee, 0x90, 0xf2, 0x30, 0x8f, 0xd9, 0x3d, 0x89, 0xea, 0xc3, 0x1d, - 0x77, 0xba, 0xff, 0xdf, 0x6d, 0x04, 0x7b, 0x4c, 0xc7, 0xae, 0xc1, 0xb1, 0xe7, 0x48, 0xdb, 0xfe, - 0x32, 0x59, 0x38, 0xf6, 0x63, 0xde, 0x69, 0x9e, 0xc4, 0xff, 0x01, 0x98, 0x38, 0xa9, 0x03, 0x5f, - 0x3e, 0xbe, 0x40, 0xbc, 0x6f, 0xb6, 0x63, 0xbc, 0x98, 0x0d, 0x04, 0x0b, 0x25, 0x40, 0x29, 0xff, - 0xb2, 0x04, 0xc7, 0x5b, 0x9a, 0xe6, 0x3e, 0x7e, 0xa9, 0xcd, 0x53, 0x85, 0x43, 0x65, 0x36, 0x4b, - 0x6d, 0x84, 0xbd, 0x3f, 0x56, 0x58, 0x26, 0x45, 0x48, 0xda, 0xa7, 0xe1, 0x68, 0x58, 0x58, 0xa1, - 0xa6, 0x7b, 0x61, 0x34, 0xbc, 0x23, 0xcc, 0xd5, 0x35, 0x12, 0xda, 0x13, 0x96, 0x2b, 0x51, 0x3d, - 0x7b, 0x7d, 0x2d, 0x43, 0xc6, 0x43, 0xe5, 0x29, 0x70, 0xcf, 0x5d, 0xf5, 0x29, 0xe5, 0x0f, 0x4b, - 0x30, 0x13, 0x6e, 0x21, 0x90, 0x0c, 0xf5, 0x27, 0xec, 0x2d, 0x1b, 0xe2, 0x37, 0x24, 0xb8, 0xab, - 0x8b, 0x4c, 0x5c, 0x01, 0x2f, 0xc3, 0x64, 0x60, 0x27, 0x40, 0xb8, 0x70, 0x31, 0xec, 0xa7, 0xe3, - 0xd3, 0x50, 0x6f, 0xe1, 0x7b, 0x07, 0x51, 0xca, 0x67, 0x7f, 0x7f, 0x7a, 0xa2, 0xb5, 0xce, 0x51, - 0x26, 0x5a, 0x57, 0xef, 0xb7, 0xd0, 0x3e, 0x5e, 0x93, 0xe0, 0x81, 0x70, 0x57, 0xdb, 0xe4, 0xb3, - 0x3f, 0xaa, 0x71, 0xf8, 0xf7, 0x12, 0x9c, 0xee, 0x45, 0x38, 0x3e, 0x20, 0x3b, 0x30, 0xe1, 0x67, - 0xda, 0xd1, 0xf1, 0xe8, 0x2b, 0x7f, 0x67, 0x56, 0x8a, 0x3c, 0x6e, 0xb7, 0x41, 0xf1, 0x16, 0x9f, - 0x58, 0xc1, 0x21, 0xf7, 0x94, 0x1c, 0xde, 0xcd, 0x15, 0x4a, 0x0e, 0xed, 0xe7, 0xb6, 0x19, 0x8b, - 0x44, 0x9b, 0xb1, 0xf0, 0x53, 0x73, 0xf9, 0x0a, 0xf7, 0x5b, 0x6d, 0xf6, 0xe0, 0xde, 0x06, 0x13, - 0x6d, 0x4c, 0x99, 0xcf, 0xea, 0x3e, 0x2c, 0x59, 0x41, 0xad, 0xc6, 0x2a, 0x1f, 0xc0, 0x34, 0x6d, - 0xb7, 0x8d, 0xa2, 0x6f, 0x77, 0x97, 0x1b, 0xdc, 0xb7, 0xb4, 0x6d, 0x9a, 0xf7, 0x7d, 0x19, 0x06, - 0xd9, 0x38, 0xf3, 0xee, 0x1e, 0xc2, 0x50, 0x38, 0x03, 0xf9, 0xe7, 0x85, 0x2f, 0x5b, 0x14, 0x62, - 0xb7, 0x9f, 0x43, 0xbd, 0xf4, 0xf5, 0x16, 0xcd, 0xa1, 0x80, 0x32, 0xbe, 0x21, 0xbc, 0x5a, 0x7b, - 0xe9, 0xb8, 0x3a, 0xb4, 0x5b, 0xe6, 0xd5, 0x98, 0x6e, 0x6e, 0xaf, 0xfb, 0xfa, 0x45, 0xe1, 0xbe, - 0xbc, 0x3e, 0xc5, 0xb8, 0xaf, 0x1f, 0x8d, 0xea, 0x3d, 0x47, 0x16, 0x23, 0xe6, 0x9f, 0x47, 0x47, - 0xf6, 0x5d, 0x09, 0x4e, 0xd0, 0xbe, 0x05, 0x37, 0x22, 0xfa, 0x55, 0xf9, 0x43, 0x80, 0x1c, 0x5b, - 0xab, 0xb4, 0x9d, 0xdd, 0x39, 0xc7, 0xd6, 0x2e, 0x87, 0xe2, 0xcb, 0x43, 0x80, 0xaa, 0xa1, 0xed, - 0x26, 0x8a, 0xcd, 0x6e, 0xc9, 0xe5, 0xaa, 0x81, 0xdd, 0x8c, 0x36, 0xc3, 0x99, 0xba, 0x05, 0xc3, - 0xf9, 0x75, 0x09, 0x0a, 0xed, 0xba, 0xcc, 0x87, 0x4f, 0x87, 0x63, 0xa1, 0x43, 0x82, 0xe8, 0x08, - 0x3e, 0xd4, 0xcb, 0x56, 0x4e, 0x64, 0x1a, 0x1d, 0xb5, 0xf1, 0xed, 0xce, 0x03, 0xa6, 0xc3, 0x16, - 0xda, 0x9a, 0x59, 0xff, 0xc8, 0xa6, 0xcf, 0x17, 0x5a, 0xfc, 0xea, 0x9f, 0x8b, 0xdc, 0xfb, 0x1a, - 0x4c, 0x75, 0x90, 0xfa, 0x76, 0xc7, 0xbd, 0xbd, 0x8e, 0x83, 0x79, 0xab, 0xd3, 0xf7, 0xc7, 0xf9, - 0x4c, 0x08, 0xdf, 0xc0, 0x0e, 0xac, 0xc5, 0xda, 0x3d, 0xe1, 0x92, 0xdf, 0x02, 0x77, 0xb4, 0xa5, - 0xe2, 0xb2, 0x15, 0x21, 0xb5, 0xa7, 0x3b, 0x2e, 0x17, 0xeb, 0xbe, 0x4e, 0x62, 0x45, 0xa8, 0x29, - 0x8d, 0x8c, 0x20, 0x47, 0x59, 0x6f, 0x98, 0x66, 0x9d, 0x8b, 0x21, 0x5f, 0x82, 0xf1, 0x00, 0x8c, - 0x37, 0x72, 0x0e, 0x52, 0x96, 0xc9, 0x3f, 0x4f, 0x30, 0x7c, 0xe6, 0x64, 0xc7, 0xdd, 0x7b, 0xd3, - 0xac, 0xf3, 0x6e, 0x53, 0x7c, 0x79, 0x12, 0x10, 0x63, 0x46, 0x37, 0xf2, 0x45, 0x13, 0x9b, 0x30, - 0x11, 0x82, 0xf2, 0x46, 0x7e, 0xa0, 0x43, 0x82, 0x33, 0xdf, 0x3e, 0x0a, 0x03, 0x94, 0x2b, 0xfa, - 0x98, 0x04, 0x10, 0x38, 0x11, 0x9e, 0xed, 0xc4, 0xa6, 0xfd, 0x9a, 0xb8, 0x30, 0xd7, 0x33, 0x3e, - 0xcf, 0xd9, 0x4e, 0xbf, 0xfb, 0xdf, 0x7c, 0xeb, 0x23, 0x89, 0x7b, 0x90, 0x3c, 0xd7, 0x61, 0x35, - 0x1e, 0x98, 0x2f, 0x9f, 0x09, 0xbd, 0x7d, 0x7f, 0xb8, 0xb7, 0xa6, 0x84, 0x64, 0xb3, 0xbd, 0xa2, - 0x73, 0xc1, 0xce, 0x53, 0xc1, 0xce, 0xa2, 0xc7, 0xe2, 0x05, 0x9b, 0x7b, 0x47, 0x78, 0xd2, 0xbc, - 0x0b, 0xfd, 0x8e, 0x04, 0x93, 0xed, 0x96, 0x74, 0xe8, 0xc9, 0xde, 0xa4, 0x68, 0x4d, 0x29, 0x0a, - 0x4f, 0x1d, 0x82, 0x92, 0x77, 0x65, 0x89, 0x76, 0x65, 0x1e, 0x3d, 0x73, 0x88, 0xae, 0xcc, 0x05, - 0xf7, 0xf7, 0xff, 0x97, 0x04, 0x77, 0x76, 0x5d, 0x21, 0xa1, 0xf9, 0xde, 0xa4, 0xec, 0x92, 0x3b, - 0x15, 0x4a, 0x3f, 0x08, 0x0b, 0xde, 0xe3, 0xe7, 0x68, 0x8f, 0x2f, 0xa1, 0xe5, 0xc3, 0xf4, 0xb8, - 0xed, 0x21, 0x0a, 0xfa, 0xad, 0xf0, 0xcd, 0xc2, 0xee, 0xe6, 0xd4, 0xb2, 0xf0, 0x88, 0x99, 0x18, - 0xad, 0x49, 0xad, 0xfc, 0x02, 0xed, 0x82, 0x82, 0x36, 0x7e, 0xc0, 0x41, 0x9b, 0x7b, 0x47, 0xd8, - 0xf1, 0xbf, 0x0b, 0xfd, 0x4f, 0xa9, 0xfd, 0x45, 0xc1, 0x27, 0xba, 0x8a, 0xd8, 0x79, 0x51, 0x55, - 0x78, 0xb2, 0x7f, 0x42, 0xde, 0xc9, 0x06, 0xed, 0x64, 0x0d, 0xe1, 0x5b, 0xdd, 0xc9, 0xb6, 0x83, - 0x88, 0xbe, 0x2a, 0xc1, 0x64, 0xbb, 0x35, 0x49, 0xcc, 0xb4, 0xec, 0xb2, 0xc8, 0x8a, 0x99, 0x96, - 0xdd, 0x16, 0x40, 0xf2, 0x9b, 0x68, 0xe7, 0xcf, 0xa1, 0xc7, 0x3b, 0x75, 0xbe, 0xeb, 0x28, 0x92, - 0xb9, 0xd8, 0x35, 0xc9, 0x8f, 0x99, 0x8b, 0xbd, 0xac, 0x63, 0x62, 0xe6, 0x62, 0x4f, 0x6b, 0x8c, - 0xf8, 0xb9, 0xe8, 0xf5, 0xac, 0xc7, 0x61, 0x74, 0xd0, 0x97, 0x25, 0x18, 0x09, 0x65, 0xc4, 0xe8, - 0xd1, 0xae, 0x82, 0xb6, 0x5b, 0x30, 0x14, 0xce, 0xf4, 0x43, 0xc2, 0xfb, 0xb2, 0x4c, 0xfb, 0xb2, - 0x80, 0xe6, 0x0f, 0xd3, 0x97, 0xf0, 0x59, 0xe9, 0xd7, 0x25, 0x98, 0x68, 0x93, 0x65, 0xc6, 0xcc, - 0xc2, 0xce, 0x49, 0x73, 0xe1, 0xc9, 0xfe, 0x09, 0x79, 0xaf, 0x2e, 0xd0, 0x5e, 0xfd, 0x04, 0x7a, - 0xfa, 0x30, 0xbd, 0x0a, 0xc4, 0xe7, 0x1b, 0xfe, 0xbd, 0xab, 0x40, 0x3b, 0xe8, 0x5c, 0x9f, 0x82, - 0x89, 0x0e, 0x3d, 0xd1, 0x37, 0x1d, 0xef, 0xcf, 0xf3, 0xb4, 0x3f, 0xcf, 0xa1, 0xf5, 0x1f, 0xac, - 0x3f, 0xad, 0x61, 0xfd, 0xf3, 0xad, 0x2f, 0x00, 0xbb, 0x5b, 0x51, 0xdb, 0x64, 0xb5, 0xf0, 0x58, - 0x5f, 0x34, 0xbc, 0x53, 0x4f, 0xd2, 0x4e, 0x9d, 0x41, 0x8f, 0x74, 0xea, 0x54, 0xe0, 0x72, 0x9d, - 0x6e, 0xec, 0x9a, 0x73, 0xef, 0x60, 0x29, 0xf0, 0xbb, 0xd0, 0x4f, 0x89, 0x8b, 0x4d, 0xa7, 0xba, - 0xb6, 0x1b, 0xc8, 0x63, 0x0b, 0x0f, 0xf4, 0x80, 0xc9, 0xe5, 0xba, 0x87, 0xca, 0x35, 0x85, 0x4e, - 0x76, 0x92, 0x8b, 0xe4, 0xb2, 0xe8, 0x03, 0x92, 0x77, 0x17, 0xf2, 0x74, 0x77, 0xde, 0xc1, 0x64, - 0xb7, 0xf0, 0x60, 0x4f, 0xb8, 0x5c, 0x92, 0xfb, 0xa8, 0x24, 0x33, 0x68, 0xaa, 0xa3, 0x24, 0x2c, - 0xf5, 0xbd, 0xd5, 0x37, 0x07, 0x5e, 0x3d, 0x0e, 0xd3, 0x1d, 0x5a, 0x74, 0xaf, 0xc5, 0x9c, 0x71, - 0x75, 0x79, 0x08, 0x1b, 0xfb, 0xd0, 0xb5, 0xc3, 0xd3, 0xda, 0xc3, 0x3f, 0x7f, 0xed, 0xed, 0x40, - 0xec, 0x5f, 0xa7, 0x00, 0xad, 0x3a, 0xb5, 0x05, 0x1b, 0xb3, 0x7f, 0x7a, 0xc7, 0x67, 0x79, 0xe4, - 0x85, 0x97, 0xf4, 0x03, 0xbd, 0xf0, 0x5a, 0x0d, 0xbd, 0x99, 0x4a, 0xf4, 0xf7, 0x2e, 0xb3, 0xe7, - 0x87, 0x53, 0xc9, 0x1f, 0xca, 0xc3, 0xa9, 0xf6, 0xf7, 0xaa, 0x53, 0xb7, 0xee, 0x01, 0xc6, 0xc0, - 0x61, 0x1f, 0xa1, 0xf0, 0xf7, 0x90, 0x83, 0x5d, 0xde, 0x43, 0xe6, 0x3b, 0x3e, 0x7a, 0xe4, 0xd4, - 0xe8, 0xac, 0xf8, 0x80, 0xef, 0x50, 0x6f, 0x37, 0x61, 0xf9, 0x17, 0x7e, 0xfd, 0x2d, 0x84, 0x93, - 0x50, 0x68, 0x35, 0x27, 0x6f, 0x52, 0x7f, 0x24, 0x09, 0xb9, 0x55, 0xa7, 0x56, 0xae, 0xea, 0xee, - 0x6d, 0xb2, 0xb5, 0x67, 0x3a, 0x3f, 0x6a, 0x41, 0x37, 0x6f, 0x4c, 0x8f, 0x32, 0x9d, 0x76, 0xd1, - 0x64, 0x03, 0xc6, 0x22, 0x4f, 0x89, 0xb9, 0x65, 0x2d, 0x1e, 0xe6, 0x45, 0x73, 0x84, 0x95, 0x4c, - 0xdf, 0x20, 0x04, 0xec, 0x1b, 0x5d, 0x6b, 0x6f, 0xcc, 0xcc, 0xa0, 0x2e, 0xde, 0xce, 0x17, 0x80, - 0xfe, 0x98, 0x15, 0x20, 0x1f, 0x1d, 0x14, 0x6f, 0xc4, 0xfe, 0x50, 0x82, 0xe1, 0x55, 0x47, 0xa4, - 0x82, 0xf8, 0xc7, 0xf4, 0xfd, 0xd1, 0x13, 0xde, 0x77, 0x58, 0x93, 0xbd, 0xd9, 0xad, 0xf8, 0x36, - 0xab, 0xaf, 0x84, 0xa3, 0x30, 0x11, 0xe8, 0xa7, 0xd7, 0xff, 0xdf, 0x4e, 0x50, 0xff, 0x58, 0xc2, - 0x35, 0xdd, 0xf0, 0xb2, 0x48, 0xfc, 0x17, 0xf5, 0x75, 0x85, 0xaf, 0xe7, 0xd4, 0x61, 0xf5, 0xbc, - 0x4f, 0x1d, 0x44, 0x44, 0x9f, 0xde, 0xc6, 0xd7, 0x6a, 0xeb, 0xdb, 0x1f, 0xa9, 0x8f, 0xcf, 0xea, - 0x44, 0x5e, 0xf8, 0xc8, 0x6f, 0x48, 0x30, 0xb2, 0xea, 0xd4, 0xb6, 0x8d, 0xea, 0xff, 0xf3, 0xf6, - 0xbb, 0x0b, 0x47, 0x43, 0x3d, 0xbd, 0x4d, 0x2a, 0x3d, 0xf3, 0x5a, 0x0a, 0x92, 0xab, 0x4e, 0x0d, - 0xbd, 0x04, 0x63, 0xd1, 0xa4, 0xa1, 0x63, 0x2e, 0xd8, 0x1a, 0x11, 0x3a, 0xaf, 0xd7, 0x3a, 0x47, - 0x0f, 0xb4, 0x0f, 0x23, 0xe1, 0xc8, 0x71, 0xaa, 0x0b, 0x93, 0x10, 0x66, 0xe1, 0x91, 0x5e, 0x31, - 0xbd, 0xc6, 0xde, 0x0e, 0x69, 0xcf, 0xe9, 0xdd, 0xdd, 0x85, 0x5a, 0x20, 0x75, 0xce, 0x6e, 0xdb, - 0xb8, 0x15, 0xa2, 0xbd, 0xa8, 0x4b, 0xe9, 0xa6, 0xbd, 0x08, 0x6e, 0x57, 0xed, 0x75, 0x9a, 0x5a, - 0x3b, 0x00, 0x81, 0x79, 0x70, 0x6f, 0x17, 0x0e, 0x3e, 0x5a, 0xe1, 0xe1, 0x9e, 0xd0, 0xbc, 0x43, - 0xa7, 0x5b, 0x9c, 0x8c, 0xff, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd5, 0xca, 0x34, 0x9e, 0x6a, - 0x94, 0x00, 0x00, + // 9586 bytes of a gzipped FileDescriptorSet + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x7d, 0x6d, 0x70, 0x1c, 0xd9, + 0x71, 0x18, 0x67, 0x3f, 0x80, 0xdd, 0xc6, 0x02, 0x58, 0x3c, 0x80, 0xe4, 0x72, 0xc9, 0x03, 0x70, + 0x73, 0x5f, 0x3c, 0xde, 0x11, 0xb8, 0xe3, 0x1d, 0x79, 0xc7, 0xa5, 0x24, 0x0a, 0x0b, 0x2c, 0x41, + 0x90, 0xf8, 0xba, 0x01, 0x40, 0x9d, 0x4e, 0x76, 0xb6, 0x06, 0xb3, 0x0f, 0x8b, 0x39, 0xec, 0xce, + 0xcc, 0xcd, 0xcc, 0x92, 0x04, 0x15, 0xa5, 0xce, 0x92, 0x23, 0x4b, 0xe7, 0x4a, 0x2c, 0x59, 0xa9, + 0xb2, 0xbe, 0xa8, 0x48, 0x96, 0x63, 0xd9, 0xb2, 0x63, 0x4b, 0xb1, 0x22, 0xc7, 0x89, 0x2b, 0x91, + 0x52, 0xe5, 0x58, 0x52, 0xaa, 0x5c, 0xba, 0x24, 0x95, 0x38, 0x4e, 0x8a, 0x76, 0x4e, 0xaa, 0x44, + 0x51, 0xe4, 0x58, 0x61, 0x64, 0x27, 0x29, 0xfd, 0x49, 0xbd, 0xaf, 0xf9, 0xda, 0x6f, 0x88, 0x94, + 0xe4, 0x38, 0xbf, 0xb0, 0xd3, 0xaf, 0xbb, 0x5f, 0x77, 0xbf, 0x7e, 0xdd, 0xfd, 0xde, 0xbc, 0x37, + 0x80, 0xcf, 0x5f, 0x80, 0xe9, 0xaa, 0x69, 0x56, 0x6b, 0x78, 0xd6, 0xb2, 0x4d, 0xd7, 0xdc, 0x6e, + 0xec, 0xcc, 0x56, 0xb0, 0xa3, 0xd9, 0xba, 0xe5, 0x9a, 0xf6, 0x0c, 0x85, 0xa1, 0x51, 0x86, 0x31, + 0x23, 0x30, 0xe4, 0x15, 0x18, 0xbb, 0xa4, 0xd7, 0xf0, 0x82, 0x87, 0xb8, 0x81, 0x5d, 0xf4, 0x3c, + 0x24, 0x76, 0xf4, 0x1a, 0xce, 0x49, 0xd3, 0xf1, 0x93, 0x43, 0x67, 0x1e, 0x9e, 0x89, 0x10, 0xcd, + 0x84, 0x29, 0xd6, 0x09, 0x58, 0xa1, 0x14, 0xf2, 0x37, 0x13, 0x30, 0xde, 0xa2, 0x15, 0x21, 0x48, + 0x18, 0x6a, 0x9d, 0x70, 0x94, 0x4e, 0xa6, 0x15, 0xfa, 0x1b, 0xe5, 0x60, 0xd0, 0x52, 0xb5, 0x3d, + 0xb5, 0x8a, 0x73, 0x31, 0x0a, 0x16, 0x8f, 0x68, 0x12, 0xa0, 0x82, 0x2d, 0x6c, 0x54, 0xb0, 0xa1, + 0xed, 0xe7, 0xe2, 0xd3, 0xf1, 0x93, 0x69, 0x25, 0x00, 0x41, 0x4f, 0xc0, 0x98, 0xd5, 0xd8, 0xae, + 0xe9, 0x5a, 0x39, 0x80, 0x06, 0xd3, 0xf1, 0x93, 0x49, 0x25, 0xcb, 0x1a, 0x16, 0x7c, 0xe4, 0xc7, + 0x60, 0xf4, 0x06, 0x56, 0xf7, 0x82, 0xa8, 0x43, 0x14, 0x75, 0x84, 0x80, 0x03, 0x88, 0xf3, 0x90, + 0xa9, 0x63, 0xc7, 0x51, 0xab, 0xb8, 0xec, 0xee, 0x5b, 0x38, 0x97, 0xa0, 0xda, 0x4f, 0x37, 0x69, + 0x1f, 0xd5, 0x7c, 0x88, 0x53, 0x6d, 0xee, 0x5b, 0x18, 0xcd, 0x41, 0x1a, 0x1b, 0x8d, 0x3a, 0xe3, + 0x90, 0x6c, 0x63, 0xbf, 0x92, 0xd1, 0xa8, 0x47, 0xb9, 0xa4, 0x08, 0x19, 0x67, 0x31, 0xe8, 0x60, + 0xfb, 0xba, 0xae, 0xe1, 0xdc, 0x00, 0x65, 0xf0, 0x58, 0x13, 0x83, 0x0d, 0xd6, 0x1e, 0xe5, 0x21, + 0xe8, 0xd0, 0x3c, 0xa4, 0xf1, 0x4d, 0x17, 0x1b, 0x8e, 0x6e, 0x1a, 0xb9, 0x41, 0xca, 0xe4, 0x91, + 0x16, 0xa3, 0x88, 0x6b, 0x95, 0x28, 0x0b, 0x9f, 0x0e, 0x9d, 0x83, 0x41, 0xd3, 0x72, 0x75, 0xd3, + 0x70, 0x72, 0xa9, 0x69, 0xe9, 0xe4, 0xd0, 0x99, 0x13, 0x2d, 0x1d, 0x61, 0x8d, 0xe1, 0x28, 0x02, + 0x19, 0x2d, 0x41, 0xd6, 0x31, 0x1b, 0xb6, 0x86, 0xcb, 0x9a, 0x59, 0xc1, 0x65, 0xdd, 0xd8, 0x31, + 0x73, 0x69, 0xca, 0x60, 0xaa, 0x59, 0x11, 0x8a, 0x38, 0x6f, 0x56, 0xf0, 0x92, 0xb1, 0x63, 0x2a, + 0x23, 0x4e, 0xe8, 0x19, 0x1d, 0x81, 0x01, 0x67, 0xdf, 0x70, 0xd5, 0x9b, 0xb9, 0x0c, 0xf5, 0x10, + 0xfe, 0x24, 0xff, 0xce, 0x00, 0x8c, 0xf6, 0xe2, 0x62, 0x17, 0x20, 0xb9, 0x43, 0xb4, 0xcc, 0xc5, + 0xfa, 0xb1, 0x01, 0xa3, 0x09, 0x1b, 0x71, 0xe0, 0x80, 0x46, 0x9c, 0x83, 0x21, 0x03, 0x3b, 0x2e, + 0xae, 0x30, 0x8f, 0x88, 0xf7, 0xe8, 0x53, 0xc0, 0x88, 0x9a, 0x5d, 0x2a, 0x71, 0x20, 0x97, 0x7a, + 0x11, 0x46, 0x3d, 0x91, 0xca, 0xb6, 0x6a, 0x54, 0x85, 0x6f, 0xce, 0x76, 0x93, 0x64, 0xa6, 0x24, + 0xe8, 0x14, 0x42, 0xa6, 0x8c, 0xe0, 0xd0, 0x33, 0x5a, 0x00, 0x30, 0x0d, 0x6c, 0xee, 0x94, 0x2b, + 0x58, 0xab, 0xe5, 0x52, 0x6d, 0xac, 0xb4, 0x46, 0x50, 0x9a, 0xac, 0x64, 0x32, 0xa8, 0x56, 0x43, + 0xe7, 0x7d, 0x57, 0x1b, 0x6c, 0xe3, 0x29, 0x2b, 0x6c, 0x92, 0x35, 0x79, 0xdb, 0x16, 0x8c, 0xd8, + 0x98, 0xf8, 0x3d, 0xae, 0x70, 0xcd, 0xd2, 0x54, 0x88, 0x99, 0xae, 0x9a, 0x29, 0x9c, 0x8c, 0x29, + 0x36, 0x6c, 0x07, 0x1f, 0xd1, 0x43, 0xe0, 0x01, 0xca, 0xd4, 0xad, 0x80, 0x46, 0xa1, 0x8c, 0x00, + 0xae, 0xaa, 0x75, 0x9c, 0xbf, 0x05, 0x23, 0x61, 0xf3, 0xa0, 0x09, 0x48, 0x3a, 0xae, 0x6a, 0xbb, + 0xd4, 0x0b, 0x93, 0x0a, 0x7b, 0x40, 0x59, 0x88, 0x63, 0xa3, 0x42, 0xa3, 0x5c, 0x52, 0x21, 0x3f, + 0xd1, 0x5b, 0x7d, 0x85, 0xe3, 0x54, 0xe1, 0x47, 0x9b, 0x47, 0x34, 0xc4, 0x39, 0xaa, 0x77, 0xfe, + 0x39, 0x18, 0x0e, 0x29, 0xd0, 0x6b, 0xd7, 0xf2, 0x5f, 0x87, 0xc3, 0x2d, 0x59, 0xa3, 0x17, 0x61, + 0xa2, 0x61, 0xe8, 0x86, 0x8b, 0x6d, 0xcb, 0xc6, 0xc4, 0x63, 0x59, 0x57, 0xb9, 0xff, 0x32, 0xd8, + 0xc6, 0xe7, 0xb6, 0x82, 0xd8, 0x8c, 0x8b, 0x32, 0xde, 0x68, 0x06, 0x9e, 0x4a, 0xa7, 0xbe, 0x35, + 0x98, 0x7d, 0xf5, 0xd5, 0x57, 0x5f, 0x8d, 0xc9, 0x5f, 0x1e, 0x80, 0x89, 0x56, 0x73, 0xa6, 0xe5, + 0xf4, 0x3d, 0x02, 0x03, 0x46, 0xa3, 0xbe, 0x8d, 0x6d, 0x6a, 0xa4, 0xa4, 0xc2, 0x9f, 0xd0, 0x1c, + 0x24, 0x6b, 0xea, 0x36, 0xae, 0xe5, 0x12, 0xd3, 0xd2, 0xc9, 0x91, 0x33, 0x4f, 0xf4, 0x34, 0x2b, + 0x67, 0x96, 0x09, 0x89, 0xc2, 0x28, 0xd1, 0x5b, 0x20, 0xc1, 0x43, 0x34, 0xe1, 0x70, 0xaa, 0x37, + 0x0e, 0x64, 0x2e, 0x29, 0x94, 0x0e, 0x1d, 0x87, 0x34, 0xf9, 0xcb, 0x7c, 0x63, 0x80, 0xca, 0x9c, + 0x22, 0x00, 0xe2, 0x17, 0x28, 0x0f, 0x29, 0x3a, 0x4d, 0x2a, 0x58, 0xa4, 0x36, 0xef, 0x99, 0x38, + 0x56, 0x05, 0xef, 0xa8, 0x8d, 0x9a, 0x5b, 0xbe, 0xae, 0xd6, 0x1a, 0x98, 0x3a, 0x7c, 0x5a, 0xc9, + 0x70, 0xe0, 0x35, 0x02, 0x43, 0x53, 0x30, 0xc4, 0x66, 0x95, 0x6e, 0x54, 0xf0, 0x4d, 0x1a, 0x3d, + 0x93, 0x0a, 0x9b, 0x68, 0x4b, 0x04, 0x42, 0xba, 0x7f, 0xd9, 0x31, 0x0d, 0xe1, 0x9a, 0xb4, 0x0b, + 0x02, 0xa0, 0xdd, 0x3f, 0x17, 0x0d, 0xdc, 0x0f, 0xb4, 0x56, 0xaf, 0x69, 0x2e, 0x3d, 0x06, 0xa3, + 0x14, 0xe3, 0x19, 0x3e, 0xf4, 0x6a, 0x2d, 0x37, 0x36, 0x2d, 0x9d, 0x4c, 0x29, 0x23, 0x0c, 0xbc, + 0xc6, 0xa1, 0xf2, 0x17, 0x63, 0x90, 0xa0, 0x81, 0x65, 0x14, 0x86, 0x36, 0xdf, 0xbe, 0x5e, 0x2a, + 0x2f, 0xac, 0x6d, 0x15, 0x97, 0x4b, 0x59, 0x09, 0x8d, 0x00, 0x50, 0xc0, 0xa5, 0xe5, 0xb5, 0xb9, + 0xcd, 0x6c, 0xcc, 0x7b, 0x5e, 0x5a, 0xdd, 0x3c, 0xf7, 0x6c, 0x36, 0xee, 0x11, 0x6c, 0x31, 0x40, + 0x22, 0x88, 0xf0, 0xcc, 0x99, 0x6c, 0x12, 0x65, 0x21, 0xc3, 0x18, 0x2c, 0xbd, 0x58, 0x5a, 0x38, + 0xf7, 0x6c, 0x76, 0x20, 0x0c, 0x79, 0xe6, 0x4c, 0x76, 0x10, 0x0d, 0x43, 0x9a, 0x42, 0x8a, 0x6b, + 0x6b, 0xcb, 0xd9, 0x94, 0xc7, 0x73, 0x63, 0x53, 0x59, 0x5a, 0x5d, 0xcc, 0xa6, 0x3d, 0x9e, 0x8b, + 0xca, 0xda, 0xd6, 0x7a, 0x16, 0x3c, 0x0e, 0x2b, 0xa5, 0x8d, 0x8d, 0xb9, 0xc5, 0x52, 0x76, 0xc8, + 0xc3, 0x28, 0xbe, 0x7d, 0xb3, 0xb4, 0x91, 0xcd, 0x84, 0xc4, 0x7a, 0xe6, 0x4c, 0x76, 0xd8, 0xeb, + 0xa2, 0xb4, 0xba, 0xb5, 0x92, 0x1d, 0x41, 0x63, 0x30, 0xcc, 0xba, 0x10, 0x42, 0x8c, 0x46, 0x40, + 0xe7, 0x9e, 0xcd, 0x66, 0x7d, 0x41, 0x18, 0x97, 0xb1, 0x10, 0xe0, 0xdc, 0xb3, 0x59, 0x24, 0xcf, + 0x43, 0x92, 0xba, 0x21, 0x42, 0x30, 0xb2, 0x3c, 0x57, 0x2c, 0x2d, 0x97, 0xd7, 0xd6, 0x37, 0x97, + 0xd6, 0x56, 0xe7, 0x96, 0xb3, 0x92, 0x0f, 0x53, 0x4a, 0x2f, 0x6c, 0x2d, 0x29, 0xa5, 0x85, 0x6c, + 0x2c, 0x08, 0x5b, 0x2f, 0xcd, 0x6d, 0x96, 0x16, 0xb2, 0x71, 0x59, 0x83, 0x89, 0x56, 0x01, 0xb5, + 0xe5, 0x14, 0x0a, 0xf8, 0x42, 0xac, 0x8d, 0x2f, 0x50, 0x5e, 0x51, 0x5f, 0x90, 0xbf, 0x11, 0x83, + 0xf1, 0x16, 0x49, 0xa5, 0x65, 0x27, 0x17, 0x21, 0xc9, 0x7c, 0x99, 0xa5, 0xd9, 0xc7, 0x5b, 0x66, + 0x27, 0xea, 0xd9, 0x4d, 0xa9, 0x96, 0xd2, 0x05, 0x4b, 0x8d, 0x78, 0x9b, 0x52, 0x83, 0xb0, 0x68, + 0x72, 0xd8, 0x9f, 0x6c, 0x0a, 0xfe, 0x2c, 0x3f, 0x9e, 0xeb, 0x25, 0x3f, 0x52, 0x58, 0x7f, 0x49, + 0x20, 0xd9, 0x22, 0x09, 0x5c, 0x80, 0xb1, 0x26, 0x46, 0x3d, 0x07, 0xe3, 0xf7, 0x48, 0x90, 0x6b, + 0x67, 0x9c, 0x2e, 0x21, 0x31, 0x16, 0x0a, 0x89, 0x17, 0xa2, 0x16, 0x7c, 0xb0, 0xfd, 0x20, 0x34, + 0x8d, 0xf5, 0x67, 0x24, 0x38, 0xd2, 0xba, 0xa4, 0x6c, 0x29, 0xc3, 0x5b, 0x60, 0xa0, 0x8e, 0xdd, + 0x5d, 0x53, 0x94, 0x55, 0x8f, 0xb6, 0x48, 0xd6, 0xa4, 0x39, 0x3a, 0xd8, 0x9c, 0x2a, 0x98, 0xed, + 0xe3, 0xed, 0xea, 0x42, 0x26, 0x4d, 0x93, 0xa4, 0xef, 0x8f, 0xc1, 0xe1, 0x96, 0xcc, 0x5b, 0x0a, + 0xfa, 0x00, 0x80, 0x6e, 0x58, 0x0d, 0x97, 0x95, 0x4e, 0x2c, 0x12, 0xa7, 0x29, 0x84, 0x06, 0x2f, + 0x12, 0x65, 0x1b, 0xae, 0xd7, 0x1e, 0xa7, 0xed, 0xc0, 0x40, 0x14, 0xe1, 0x79, 0x5f, 0xd0, 0x04, + 0x15, 0x74, 0xb2, 0x8d, 0xa6, 0x4d, 0x8e, 0xf9, 0x14, 0x64, 0xb5, 0x9a, 0x8e, 0x0d, 0xb7, 0xec, + 0xb8, 0x36, 0x56, 0xeb, 0xba, 0x51, 0xa5, 0xa9, 0x26, 0x55, 0x48, 0xee, 0xa8, 0x35, 0x07, 0x2b, + 0xa3, 0xac, 0x79, 0x43, 0xb4, 0x12, 0x0a, 0xea, 0x40, 0x76, 0x80, 0x62, 0x20, 0x44, 0xc1, 0x9a, + 0x3d, 0x0a, 0xf9, 0x83, 0x69, 0x18, 0x0a, 0x14, 0xe0, 0xe8, 0x41, 0xc8, 0xbc, 0xac, 0x5e, 0x57, + 0xcb, 0x62, 0x51, 0xc5, 0x2c, 0x31, 0x44, 0x60, 0xeb, 0x7c, 0x61, 0xf5, 0x14, 0x4c, 0x50, 0x14, + 0xb3, 0xe1, 0x62, 0xbb, 0xac, 0xd5, 0x54, 0xc7, 0xa1, 0x46, 0x4b, 0x51, 0x54, 0x44, 0xda, 0xd6, + 0x48, 0xd3, 0xbc, 0x68, 0x41, 0x67, 0x61, 0x9c, 0x52, 0xd4, 0x1b, 0x35, 0x57, 0xb7, 0x6a, 0xb8, + 0x4c, 0x96, 0x79, 0x0e, 0x4d, 0x39, 0x9e, 0x64, 0x63, 0x04, 0x63, 0x85, 0x23, 0x10, 0x89, 0x1c, + 0xb4, 0x00, 0x0f, 0x50, 0xb2, 0x2a, 0x36, 0xb0, 0xad, 0xba, 0xb8, 0x8c, 0x5f, 0x69, 0xa8, 0x35, + 0xa7, 0xac, 0x1a, 0x95, 0xf2, 0xae, 0xea, 0xec, 0xe6, 0x26, 0x08, 0x83, 0x62, 0x2c, 0x27, 0x29, + 0xc7, 0x08, 0xe2, 0x22, 0xc7, 0x2b, 0x51, 0xb4, 0x39, 0xa3, 0x72, 0x59, 0x75, 0x76, 0x51, 0x01, + 0x8e, 0x50, 0x2e, 0x8e, 0x6b, 0xeb, 0x46, 0xb5, 0xac, 0xed, 0x62, 0x6d, 0xaf, 0xdc, 0x70, 0x77, + 0x9e, 0xcf, 0x1d, 0x0f, 0xf6, 0x4f, 0x25, 0xdc, 0xa0, 0x38, 0xf3, 0x04, 0x65, 0xcb, 0xdd, 0x79, + 0x1e, 0x6d, 0x40, 0x86, 0x0c, 0x46, 0x5d, 0xbf, 0x85, 0xcb, 0x3b, 0xa6, 0x4d, 0x73, 0xe8, 0x48, + 0x8b, 0xd0, 0x14, 0xb0, 0xe0, 0xcc, 0x1a, 0x27, 0x58, 0x31, 0x2b, 0xb8, 0x90, 0xdc, 0x58, 0x2f, + 0x95, 0x16, 0x94, 0x21, 0xc1, 0xe5, 0x92, 0x69, 0x13, 0x87, 0xaa, 0x9a, 0x9e, 0x81, 0x87, 0x98, + 0x43, 0x55, 0x4d, 0x61, 0xde, 0xb3, 0x30, 0xae, 0x69, 0x4c, 0x67, 0x5d, 0x2b, 0xf3, 0xc5, 0x98, + 0x93, 0xcb, 0x86, 0x8c, 0xa5, 0x69, 0x8b, 0x0c, 0x81, 0xfb, 0xb8, 0x83, 0xce, 0xc3, 0x61, 0xdf, + 0x58, 0x41, 0xc2, 0xb1, 0x26, 0x2d, 0xa3, 0xa4, 0x67, 0x61, 0xdc, 0xda, 0x6f, 0x26, 0x44, 0xa1, + 0x1e, 0xad, 0xfd, 0x28, 0xd9, 0x73, 0x30, 0x61, 0xed, 0x5a, 0xcd, 0x74, 0xa7, 0x82, 0x74, 0xc8, + 0xda, 0xb5, 0xa2, 0x84, 0x8f, 0xd0, 0x95, 0xb9, 0x8d, 0x35, 0xd5, 0xc5, 0x95, 0xdc, 0xd1, 0x20, + 0x7a, 0xa0, 0x01, 0xcd, 0x40, 0x56, 0xd3, 0xca, 0xd8, 0x50, 0xb7, 0x6b, 0xb8, 0xac, 0xda, 0xd8, + 0x50, 0x9d, 0xdc, 0x14, 0x45, 0x4e, 0xb8, 0x76, 0x03, 0x2b, 0x23, 0x9a, 0x56, 0xa2, 0x8d, 0x73, + 0xb4, 0x0d, 0x9d, 0x82, 0x31, 0x73, 0xfb, 0x65, 0x8d, 0x79, 0x64, 0xd9, 0xb2, 0xf1, 0x8e, 0x7e, + 0x33, 0xf7, 0x30, 0x35, 0xef, 0x28, 0x69, 0xa0, 0xfe, 0xb8, 0x4e, 0xc1, 0xe8, 0x71, 0xc8, 0x6a, + 0xce, 0xae, 0x6a, 0x5b, 0x34, 0x24, 0x3b, 0x96, 0xaa, 0xe1, 0xdc, 0x23, 0x0c, 0x95, 0xc1, 0x57, + 0x05, 0x98, 0xcc, 0x08, 0xe7, 0x86, 0xbe, 0xe3, 0x0a, 0x8e, 0x8f, 0xb1, 0x19, 0x41, 0x61, 0x9c, + 0xdb, 0x49, 0xc8, 0x12, 0x4b, 0x84, 0x3a, 0x3e, 0x49, 0xd1, 0x46, 0xac, 0x5d, 0x2b, 0xd8, 0xef, + 0x43, 0x30, 0x4c, 0x30, 0xfd, 0x4e, 0x1f, 0x67, 0x85, 0x9b, 0xb5, 0x1b, 0xe8, 0xf1, 0x59, 0x38, + 0x42, 0x90, 0xea, 0xd8, 0x55, 0x2b, 0xaa, 0xab, 0x06, 0xb0, 0x9f, 0xa4, 0xd8, 0xc4, 0xec, 0x2b, + 0xbc, 0x31, 0x24, 0xa7, 0xdd, 0xd8, 0xde, 0xf7, 0x1c, 0xeb, 0x34, 0x93, 0x93, 0xc0, 0x84, 0x6b, + 0xdd, 0xb7, 0xe2, 0x5c, 0x2e, 0x40, 0x26, 0xe8, 0xf7, 0x28, 0x0d, 0xcc, 0xf3, 0xb3, 0x12, 0x29, + 0x82, 0xe6, 0xd7, 0x16, 0x48, 0xf9, 0xf2, 0x52, 0x29, 0x1b, 0x23, 0x65, 0xd4, 0xf2, 0xd2, 0x66, + 0xa9, 0xac, 0x6c, 0xad, 0x6e, 0x2e, 0xad, 0x94, 0xb2, 0xf1, 0x40, 0x61, 0x7f, 0x25, 0x91, 0x7a, + 0x34, 0xfb, 0x98, 0xfc, 0x7a, 0x0c, 0x46, 0xc2, 0x2b, 0x35, 0xf4, 0x26, 0x38, 0x2a, 0xb6, 0x55, + 0x1c, 0xec, 0x96, 0x6f, 0xe8, 0x36, 0x9d, 0x90, 0x75, 0x95, 0x25, 0x47, 0xcf, 0x7f, 0x26, 0x38, + 0xd6, 0x06, 0x76, 0xdf, 0xa6, 0xdb, 0x64, 0xba, 0xd5, 0x55, 0x17, 0x2d, 0xc3, 0x94, 0x61, 0x96, + 0x1d, 0x57, 0x35, 0x2a, 0xaa, 0x5d, 0x29, 0xfb, 0x1b, 0x5a, 0x65, 0x55, 0xd3, 0xb0, 0xe3, 0x98, + 0x2c, 0x11, 0x7a, 0x5c, 0x4e, 0x18, 0xe6, 0x06, 0x47, 0xf6, 0x33, 0xc4, 0x1c, 0x47, 0x8d, 0xb8, + 0x6f, 0xbc, 0x9d, 0xfb, 0x1e, 0x87, 0x74, 0x5d, 0xb5, 0xca, 0xd8, 0x70, 0xed, 0x7d, 0x5a, 0x9f, + 0xa7, 0x94, 0x54, 0x5d, 0xb5, 0x4a, 0xe4, 0xf9, 0x87, 0xb2, 0x4c, 0xba, 0x92, 0x48, 0xa5, 0xb2, + 0xe9, 0x2b, 0x89, 0x54, 0x3a, 0x0b, 0xf2, 0x1b, 0x71, 0xc8, 0x04, 0xeb, 0x75, 0xb2, 0xfc, 0xd1, + 0x68, 0xc6, 0x92, 0x68, 0x4c, 0x7b, 0xa8, 0x63, 0x75, 0x3f, 0x33, 0x4f, 0x52, 0x59, 0x61, 0x80, + 0x15, 0xc7, 0x0a, 0xa3, 0x24, 0x65, 0x04, 0x71, 0x36, 0xcc, 0x8a, 0x91, 0x94, 0xc2, 0x9f, 0xd0, + 0x22, 0x0c, 0xbc, 0xec, 0x50, 0xde, 0x03, 0x94, 0xf7, 0xc3, 0x9d, 0x79, 0x5f, 0xd9, 0xa0, 0xcc, + 0xd3, 0x57, 0x36, 0xca, 0xab, 0x6b, 0xca, 0xca, 0xdc, 0xb2, 0xc2, 0xc9, 0xd1, 0x31, 0x48, 0xd4, + 0xd4, 0x5b, 0xfb, 0xe1, 0xa4, 0x47, 0x41, 0xbd, 0x0e, 0xc2, 0x31, 0x48, 0xdc, 0xc0, 0xea, 0x5e, + 0x38, 0xd5, 0x50, 0xd0, 0x7d, 0x9c, 0x0c, 0xb3, 0x90, 0xa4, 0xf6, 0x42, 0x00, 0xdc, 0x62, 0xd9, + 0x43, 0x28, 0x05, 0x89, 0xf9, 0x35, 0x85, 0x4c, 0x88, 0x2c, 0x64, 0x18, 0xb4, 0xbc, 0xbe, 0x54, + 0x9a, 0x2f, 0x65, 0x63, 0xf2, 0x59, 0x18, 0x60, 0x46, 0x20, 0x93, 0xc5, 0x33, 0x43, 0xf6, 0x10, + 0x7f, 0xe4, 0x3c, 0x24, 0xd1, 0xba, 0xb5, 0x52, 0x2c, 0x29, 0xd9, 0x58, 0x78, 0xa8, 0x13, 0xd9, + 0xa4, 0xec, 0x40, 0x26, 0x58, 0x87, 0xff, 0x70, 0x16, 0xe3, 0x5f, 0x92, 0x60, 0x28, 0x50, 0x57, + 0x93, 0x82, 0x48, 0xad, 0xd5, 0xcc, 0x1b, 0x65, 0xb5, 0xa6, 0xab, 0x0e, 0x77, 0x0d, 0xa0, 0xa0, + 0x39, 0x02, 0xe9, 0x75, 0xe8, 0x7e, 0x48, 0x53, 0x24, 0x99, 0x1d, 0x90, 0x3f, 0x21, 0x41, 0x36, + 0x5a, 0xd8, 0x46, 0xc4, 0x94, 0x7e, 0x94, 0x62, 0xca, 0x1f, 0x97, 0x60, 0x24, 0x5c, 0xcd, 0x46, + 0xc4, 0x7b, 0xf0, 0x47, 0x2a, 0xde, 0x9f, 0xc4, 0x60, 0x38, 0x54, 0xc3, 0xf6, 0x2a, 0xdd, 0x2b, + 0x30, 0xa6, 0x57, 0x70, 0xdd, 0x32, 0x5d, 0x6c, 0x68, 0xfb, 0xe5, 0x1a, 0xbe, 0x8e, 0x6b, 0x39, + 0x99, 0x06, 0x8d, 0xd9, 0xce, 0x55, 0xf2, 0xcc, 0x92, 0x4f, 0xb7, 0x4c, 0xc8, 0x0a, 0xe3, 0x4b, + 0x0b, 0xa5, 0x95, 0xf5, 0xb5, 0xcd, 0xd2, 0xea, 0xfc, 0xdb, 0xcb, 0x5b, 0xab, 0x57, 0x57, 0xd7, + 0xde, 0xb6, 0xaa, 0x64, 0xf5, 0x08, 0xda, 0x7d, 0x9c, 0xf6, 0xeb, 0x90, 0x8d, 0x0a, 0x85, 0x8e, + 0x42, 0x2b, 0xb1, 0xb2, 0x87, 0xd0, 0x38, 0x8c, 0xae, 0xae, 0x95, 0x37, 0x96, 0x16, 0x4a, 0xe5, + 0xd2, 0xa5, 0x4b, 0xa5, 0xf9, 0xcd, 0x0d, 0xb6, 0xef, 0xe1, 0x61, 0x6f, 0x86, 0x26, 0xb8, 0xfc, + 0xd1, 0x38, 0x8c, 0xb7, 0x90, 0x04, 0xcd, 0xf1, 0x15, 0x0b, 0x5b, 0x44, 0x9d, 0xee, 0x45, 0xfa, + 0x19, 0x52, 0x33, 0xac, 0xab, 0xb6, 0xcb, 0x17, 0x38, 0x8f, 0x03, 0xb1, 0x92, 0xe1, 0xea, 0x3b, + 0x3a, 0xb6, 0xf9, 0x7e, 0x12, 0x5b, 0xc6, 0x8c, 0xfa, 0x70, 0xb6, 0xa5, 0xf4, 0x24, 0x20, 0xcb, + 0x74, 0x74, 0x57, 0xbf, 0x8e, 0xcb, 0xba, 0x21, 0x36, 0x9f, 0xc8, 0xb2, 0x26, 0xa1, 0x64, 0x45, + 0xcb, 0x92, 0xe1, 0x7a, 0xd8, 0x06, 0xae, 0xaa, 0x11, 0x6c, 0x12, 0xcc, 0xe3, 0x4a, 0x56, 0xb4, + 0x78, 0xd8, 0x0f, 0x42, 0xa6, 0x62, 0x36, 0x48, 0xad, 0xc7, 0xf0, 0x48, 0xee, 0x90, 0x94, 0x21, + 0x06, 0xf3, 0x50, 0x78, 0x15, 0xef, 0xef, 0x7a, 0x65, 0x94, 0x21, 0x06, 0x63, 0x28, 0x8f, 0xc1, + 0xa8, 0x5a, 0xad, 0xda, 0x84, 0xb9, 0x60, 0xc4, 0xd6, 0x25, 0x23, 0x1e, 0x98, 0x22, 0xe6, 0xaf, + 0x40, 0x4a, 0xd8, 0x81, 0xa4, 0x6a, 0x62, 0x89, 0xb2, 0xc5, 0x16, 0xdb, 0xb1, 0x93, 0x69, 0x25, + 0x65, 0x88, 0xc6, 0x07, 0x21, 0xa3, 0x3b, 0x65, 0x7f, 0x13, 0x3f, 0x36, 0x1d, 0x3b, 0x99, 0x52, + 0x86, 0x74, 0xc7, 0xdb, 0x00, 0x95, 0x3f, 0x13, 0x83, 0x91, 0xf0, 0x4b, 0x08, 0xb4, 0x00, 0xa9, + 0x9a, 0xa9, 0xa9, 0xd4, 0xb5, 0xd8, 0x1b, 0xb0, 0x93, 0x5d, 0xde, 0x5b, 0xcc, 0x2c, 0x73, 0x7c, + 0xc5, 0xa3, 0xcc, 0xff, 0x81, 0x04, 0x29, 0x01, 0x46, 0x47, 0x20, 0x61, 0xa9, 0xee, 0x2e, 0x65, + 0x97, 0x2c, 0xc6, 0xb2, 0x92, 0x42, 0x9f, 0x09, 0xdc, 0xb1, 0x54, 0x83, 0xba, 0x00, 0x87, 0x93, + 0x67, 0x32, 0xae, 0x35, 0xac, 0x56, 0xe8, 0xa2, 0xc7, 0xac, 0xd7, 0xb1, 0xe1, 0x3a, 0x62, 0x5c, + 0x39, 0x7c, 0x9e, 0x83, 0xd1, 0x13, 0x30, 0xe6, 0xda, 0xaa, 0x5e, 0x0b, 0xe1, 0x26, 0x28, 0x6e, + 0x56, 0x34, 0x78, 0xc8, 0x05, 0x38, 0x26, 0xf8, 0x56, 0xb0, 0xab, 0x6a, 0xbb, 0xb8, 0xe2, 0x13, + 0x0d, 0xd0, 0xcd, 0x8d, 0xa3, 0x1c, 0x61, 0x81, 0xb7, 0x0b, 0x5a, 0xf9, 0x75, 0x09, 0xc6, 0xc4, + 0x32, 0xad, 0xe2, 0x19, 0x6b, 0x05, 0x40, 0x35, 0x0c, 0xd3, 0x0d, 0x9a, 0xab, 0xd9, 0x95, 0x9b, + 0xe8, 0x66, 0xe6, 0x3c, 0x22, 0x25, 0xc0, 0x20, 0x5f, 0x07, 0xf0, 0x5b, 0xda, 0x9a, 0x6d, 0x0a, + 0x86, 0xf8, 0x1b, 0x26, 0xfa, 0x9a, 0x92, 0x2d, 0xec, 0x81, 0x81, 0xc8, 0x7a, 0x0e, 0x4d, 0x40, + 0x72, 0x1b, 0x57, 0x75, 0x83, 0xef, 0x1b, 0xb3, 0x07, 0xb1, 0xfd, 0x92, 0xf0, 0xb6, 0x5f, 0x8a, + 0x7f, 0x03, 0xc6, 0x35, 0xb3, 0x1e, 0x15, 0xb7, 0x98, 0x8d, 0x6c, 0x2e, 0x38, 0x97, 0xa5, 0x97, + 0x4e, 0x73, 0xa4, 0xaa, 0x59, 0x53, 0x8d, 0xea, 0x8c, 0x69, 0x57, 0xfd, 0xd7, 0xac, 0xa4, 0xe2, + 0x71, 0x02, 0x2f, 0x5b, 0xad, 0xed, 0xff, 0x2d, 0x49, 0xbf, 0x18, 0x8b, 0x2f, 0xae, 0x17, 0x3f, + 0x1b, 0xcb, 0x2f, 0x32, 0xc2, 0x75, 0x61, 0x0c, 0x05, 0xef, 0xd4, 0xb0, 0x46, 0x14, 0x84, 0x6f, + 0x3f, 0x01, 0x13, 0x55, 0xb3, 0x6a, 0x52, 0x4e, 0xb3, 0xe4, 0x17, 0x7f, 0x4f, 0x9b, 0xf6, 0xa0, + 0xf9, 0xae, 0x2f, 0x75, 0x0b, 0xab, 0x30, 0xce, 0x91, 0xcb, 0xf4, 0x45, 0x11, 0x5b, 0xc6, 0xa0, + 0x8e, 0x7b, 0x68, 0xb9, 0xcf, 0x7f, 0x93, 0xa6, 0x6f, 0x65, 0x8c, 0x93, 0x92, 0x36, 0xb6, 0xd2, + 0x29, 0x28, 0x70, 0x38, 0xc4, 0x8f, 0x4d, 0x52, 0x6c, 0x77, 0xe1, 0xf8, 0x7b, 0x9c, 0xe3, 0x78, + 0x80, 0xe3, 0x06, 0x27, 0x2d, 0xcc, 0xc3, 0x70, 0x3f, 0xbc, 0xfe, 0x05, 0xe7, 0x95, 0xc1, 0x41, + 0x26, 0x8b, 0x30, 0x4a, 0x99, 0x68, 0x0d, 0xc7, 0x35, 0xeb, 0x34, 0x02, 0x76, 0x66, 0xf3, 0xfb, + 0xdf, 0x64, 0xb3, 0x66, 0x84, 0x90, 0xcd, 0x7b, 0x54, 0x85, 0x02, 0xd0, 0x77, 0x63, 0x15, 0xac, + 0xd5, 0xba, 0x70, 0xf8, 0x0a, 0x17, 0xc4, 0xc3, 0x2f, 0x5c, 0x83, 0x09, 0xf2, 0x9b, 0x06, 0xa8, + 0xa0, 0x24, 0xdd, 0x37, 0xdc, 0x72, 0xaf, 0xbf, 0x87, 0x4d, 0xcc, 0x71, 0x8f, 0x41, 0x40, 0xa6, + 0xc0, 0x28, 0x56, 0xb1, 0xeb, 0x62, 0xdb, 0x29, 0xab, 0xb5, 0x56, 0xe2, 0x05, 0x76, 0x2c, 0x72, + 0x1f, 0xf9, 0x4e, 0x78, 0x14, 0x17, 0x19, 0xe5, 0x5c, 0xad, 0x56, 0xd8, 0x82, 0xa3, 0x2d, 0xbc, + 0xa2, 0x07, 0x9e, 0x1f, 0xe5, 0x3c, 0x27, 0x9a, 0x3c, 0x83, 0xb0, 0x5d, 0x07, 0x01, 0xf7, 0xc6, + 0xb2, 0x07, 0x9e, 0x1f, 0xe3, 0x3c, 0x11, 0xa7, 0x15, 0x43, 0x4a, 0x38, 0x5e, 0x81, 0xb1, 0xeb, + 0xd8, 0xde, 0x36, 0x1d, 0xbe, 0x4b, 0xd4, 0x03, 0xbb, 0x8f, 0x73, 0x76, 0xa3, 0x9c, 0x90, 0x6e, + 0x1b, 0x11, 0x5e, 0xe7, 0x21, 0xb5, 0xa3, 0x6a, 0xb8, 0x07, 0x16, 0xb7, 0x39, 0x8b, 0x41, 0x82, + 0x4f, 0x48, 0xe7, 0x20, 0x53, 0x35, 0x79, 0x8e, 0xea, 0x4e, 0xfe, 0x09, 0x4e, 0x3e, 0x24, 0x68, + 0x38, 0x0b, 0xcb, 0xb4, 0x1a, 0x35, 0x92, 0xc0, 0xba, 0xb3, 0xf8, 0xbb, 0x82, 0x85, 0xa0, 0xe1, + 0x2c, 0xfa, 0x30, 0xeb, 0x27, 0x05, 0x0b, 0x27, 0x60, 0xcf, 0x8b, 0x30, 0x64, 0x1a, 0xb5, 0x7d, + 0xd3, 0xe8, 0x45, 0x88, 0x4f, 0x71, 0x0e, 0xc0, 0x49, 0x08, 0x83, 0x0b, 0x90, 0xee, 0x75, 0x20, + 0xfe, 0xde, 0x77, 0xc4, 0xf4, 0x10, 0x23, 0xb0, 0x08, 0xa3, 0x22, 0x40, 0xe9, 0xa6, 0xd1, 0x03, + 0x8b, 0x5f, 0xe6, 0x2c, 0x46, 0x02, 0x64, 0x5c, 0x0d, 0x17, 0x3b, 0x6e, 0x15, 0xf7, 0xc2, 0xe4, + 0x33, 0x42, 0x0d, 0x4e, 0xc2, 0x4d, 0xb9, 0x8d, 0x0d, 0x6d, 0xb7, 0x37, 0x0e, 0xbf, 0x22, 0x4c, + 0x29, 0x68, 0x08, 0x8b, 0x79, 0x18, 0xae, 0xab, 0xb6, 0xb3, 0xab, 0xd6, 0x7a, 0x1a, 0x8e, 0x5f, + 0xe5, 0x3c, 0x32, 0x1e, 0x11, 0xb7, 0x48, 0xc3, 0xe8, 0x87, 0xcd, 0x67, 0x85, 0x45, 0x02, 0x64, + 0x7c, 0xea, 0x39, 0x2e, 0xdd, 0x52, 0xeb, 0x87, 0xdb, 0xaf, 0x89, 0xa9, 0xc7, 0x68, 0x57, 0x82, + 0x1c, 0x2f, 0x40, 0xda, 0xd1, 0x6f, 0xf5, 0xc4, 0xe6, 0xd7, 0xc5, 0x48, 0x53, 0x02, 0x42, 0xfc, + 0x76, 0x38, 0xd6, 0x32, 0x4d, 0xf4, 0xc0, 0xec, 0xef, 0x73, 0x66, 0x47, 0x5a, 0xa4, 0x0a, 0x1e, + 0x12, 0xfa, 0x65, 0xf9, 0x1b, 0x22, 0x24, 0xe0, 0x08, 0xaf, 0x75, 0xb2, 0x6a, 0x70, 0xd4, 0x9d, + 0xfe, 0xac, 0xf6, 0x9b, 0xc2, 0x6a, 0x8c, 0x36, 0x64, 0xb5, 0x4d, 0x38, 0xc2, 0x39, 0xf6, 0x37, + 0xae, 0x9f, 0x13, 0x81, 0x95, 0x51, 0x6f, 0x85, 0x47, 0xf7, 0x1d, 0x90, 0xf7, 0xcc, 0x29, 0xca, + 0x53, 0xa7, 0x5c, 0x57, 0xad, 0x1e, 0x38, 0x7f, 0x9e, 0x73, 0x16, 0x11, 0xdf, 0xab, 0x6f, 0x9d, + 0x15, 0xd5, 0x22, 0xcc, 0x5f, 0x84, 0x9c, 0x60, 0xde, 0x30, 0x6c, 0xac, 0x99, 0x55, 0x43, 0xbf, + 0x85, 0x2b, 0x3d, 0xb0, 0xfe, 0x07, 0x91, 0xa1, 0xda, 0x0a, 0x90, 0x13, 0xce, 0x4b, 0x90, 0xf5, + 0x6a, 0x95, 0xb2, 0x5e, 0xb7, 0x4c, 0xdb, 0xed, 0xc2, 0xf1, 0xb7, 0xc4, 0x48, 0x79, 0x74, 0x4b, + 0x94, 0xac, 0x50, 0x02, 0xf6, 0x9e, 0xb9, 0x57, 0x97, 0xfc, 0x02, 0x67, 0x34, 0xec, 0x53, 0xf1, + 0xc0, 0xa1, 0x99, 0x75, 0x4b, 0xb5, 0x7b, 0x89, 0x7f, 0xff, 0x50, 0x04, 0x0e, 0x4e, 0xc2, 0x03, + 0x07, 0xa9, 0xe8, 0x48, 0xb6, 0xef, 0x81, 0xc3, 0x17, 0x45, 0xe0, 0x10, 0x34, 0x9c, 0x85, 0x28, + 0x18, 0x7a, 0x60, 0xf1, 0xdb, 0x82, 0x85, 0xa0, 0x21, 0x2c, 0x5e, 0xf0, 0x13, 0xad, 0x8d, 0xab, + 0xba, 0xe3, 0xda, 0xac, 0x28, 0xee, 0xcc, 0xea, 0x1f, 0x7d, 0x27, 0x5c, 0x84, 0x29, 0x01, 0x52, + 0x12, 0x89, 0xf8, 0x26, 0x2b, 0x5d, 0x33, 0x75, 0x17, 0xec, 0x77, 0x44, 0x24, 0x0a, 0x90, 0x11, + 0xd9, 0x02, 0x15, 0x22, 0x31, 0xbb, 0x46, 0x56, 0x0a, 0x3d, 0xb0, 0xfb, 0xc7, 0x11, 0xe1, 0x36, + 0x04, 0x2d, 0xe1, 0x19, 0xa8, 0x7f, 0x1a, 0xc6, 0x1e, 0xde, 0xef, 0xc9, 0x3b, 0xff, 0x49, 0xa4, + 0xfe, 0xd9, 0x62, 0x94, 0x2c, 0x86, 0x8c, 0x46, 0xea, 0x29, 0xd4, 0xed, 0x54, 0x51, 0xee, 0xa7, + 0xbe, 0xc7, 0xf5, 0x0d, 0x97, 0x53, 0x85, 0x65, 0xe2, 0xe4, 0xe1, 0xa2, 0xa7, 0x3b, 0xb3, 0xf7, + 0x7c, 0xcf, 0xf3, 0xf3, 0x50, 0xcd, 0x53, 0xb8, 0x04, 0xc3, 0xa1, 0x82, 0xa7, 0x3b, 0xab, 0x9f, + 0xe6, 0xac, 0x32, 0xc1, 0x7a, 0xa7, 0x70, 0x16, 0x12, 0xa4, 0x78, 0xe9, 0x4e, 0xfe, 0x37, 0x39, + 0x39, 0x45, 0x2f, 0xbc, 0x19, 0x52, 0xa2, 0x68, 0xe9, 0x4e, 0xfa, 0x5e, 0x4e, 0xea, 0x91, 0x10, + 0x72, 0x51, 0xb0, 0x74, 0x27, 0xff, 0x19, 0x41, 0x2e, 0x48, 0x08, 0x79, 0xef, 0x26, 0xfc, 0xd2, + 0xcf, 0x26, 0x78, 0xd2, 0x11, 0xb6, 0xbb, 0x00, 0x83, 0xbc, 0x52, 0xe9, 0x4e, 0xfd, 0x7e, 0xde, + 0xb9, 0xa0, 0x28, 0x3c, 0x07, 0xc9, 0x1e, 0x0d, 0xfe, 0xb7, 0x38, 0x29, 0xc3, 0x2f, 0xcc, 0xc3, + 0x50, 0xa0, 0x3a, 0xe9, 0x4e, 0xfe, 0xb7, 0x39, 0x79, 0x90, 0x8a, 0x88, 0xce, 0xab, 0x93, 0xee, + 0x0c, 0x7e, 0x4e, 0x88, 0xce, 0x29, 0x88, 0xd9, 0x44, 0x61, 0xd2, 0x9d, 0xfa, 0x03, 0xc2, 0xea, + 0x82, 0xa4, 0x70, 0x11, 0xd2, 0x5e, 0xb2, 0xe9, 0x4e, 0xff, 0x41, 0x4e, 0xef, 0xd3, 0x10, 0x0b, + 0x04, 0x92, 0x5d, 0x77, 0x16, 0x3f, 0x2f, 0x2c, 0x10, 0xa0, 0x22, 0xd3, 0x28, 0x5a, 0xc0, 0x74, + 0xe7, 0xf4, 0x21, 0x31, 0x8d, 0x22, 0xf5, 0x0b, 0x19, 0x4d, 0x1a, 0xf3, 0xbb, 0xb3, 0xf8, 0x3b, + 0x62, 0x34, 0x29, 0x3e, 0x11, 0x23, 0x5a, 0x11, 0x74, 0xe7, 0xf1, 0x0b, 0x42, 0x8c, 0x48, 0x41, + 0x50, 0x58, 0x07, 0xd4, 0x5c, 0x0d, 0x74, 0xe7, 0xf7, 0x61, 0xce, 0x6f, 0xac, 0xa9, 0x18, 0x28, + 0xbc, 0x0d, 0x8e, 0xb4, 0xae, 0x04, 0xba, 0x73, 0xfd, 0xc8, 0xf7, 0x22, 0x6b, 0xb7, 0x60, 0x21, + 0x50, 0xd8, 0xf4, 0x53, 0x4a, 0xb0, 0x0a, 0xe8, 0xce, 0xf6, 0xa3, 0xdf, 0x0b, 0x07, 0xee, 0x60, + 0x11, 0x50, 0x98, 0x03, 0xf0, 0x13, 0x70, 0x77, 0x5e, 0x1f, 0xe7, 0xbc, 0x02, 0x44, 0x64, 0x6a, + 0xf0, 0xfc, 0xdb, 0x9d, 0xfe, 0xb6, 0x98, 0x1a, 0x9c, 0x82, 0x4c, 0x0d, 0x91, 0x7a, 0xbb, 0x53, + 0x7f, 0x42, 0x4c, 0x0d, 0x41, 0x42, 0x3c, 0x3b, 0x90, 0xdd, 0xba, 0x73, 0xf8, 0x94, 0xf0, 0xec, + 0x00, 0x55, 0x61, 0x15, 0xc6, 0x9a, 0x12, 0x62, 0x77, 0x56, 0xbf, 0xc8, 0x59, 0x65, 0xa3, 0xf9, + 0x30, 0x98, 0xbc, 0x78, 0x32, 0xec, 0xce, 0xed, 0xd3, 0x91, 0xe4, 0xc5, 0x73, 0x61, 0xe1, 0x02, + 0xa4, 0x8c, 0x46, 0xad, 0x46, 0x26, 0x0f, 0xea, 0x7c, 0x12, 0x30, 0xf7, 0x5f, 0xbf, 0xcf, 0xad, + 0x23, 0x08, 0x0a, 0x67, 0x21, 0x89, 0xeb, 0xdb, 0xb8, 0xd2, 0x8d, 0xf2, 0xdb, 0xdf, 0x17, 0x01, + 0x93, 0x60, 0x17, 0x2e, 0x02, 0xb0, 0xad, 0x11, 0xfa, 0x32, 0xb0, 0x0b, 0xed, 0x7f, 0xfb, 0x3e, + 0x3f, 0x7a, 0xe3, 0x93, 0xf8, 0x0c, 0xd8, 0x41, 0x9e, 0xce, 0x0c, 0xbe, 0x13, 0x66, 0x40, 0x47, + 0xe4, 0x3c, 0x0c, 0xbe, 0xec, 0x98, 0x86, 0xab, 0x56, 0xbb, 0x51, 0xff, 0x29, 0xa7, 0x16, 0xf8, + 0xc4, 0x60, 0x75, 0xd3, 0xc6, 0xae, 0x5a, 0x75, 0xba, 0xd1, 0xfe, 0x77, 0x4e, 0xeb, 0x11, 0x10, + 0x62, 0x4d, 0x75, 0xdc, 0x5e, 0xf4, 0xfe, 0x33, 0x41, 0x2c, 0x08, 0x88, 0xd0, 0xe4, 0xf7, 0x1e, + 0xde, 0xef, 0x46, 0xfb, 0x5d, 0x21, 0x34, 0xc7, 0x2f, 0xbc, 0x19, 0xd2, 0xe4, 0x27, 0x3b, 0x4f, + 0xd7, 0x85, 0xf8, 0x7f, 0x70, 0x62, 0x9f, 0x82, 0xf4, 0xec, 0xb8, 0x15, 0x57, 0xef, 0x6e, 0xec, + 0xbb, 0x7c, 0xa4, 0x05, 0x7e, 0x61, 0x0e, 0x86, 0x1c, 0xb7, 0x52, 0x69, 0xf0, 0xfa, 0xb4, 0x0b, + 0xf9, 0xff, 0xfc, 0xbe, 0xb7, 0x65, 0xe1, 0xd1, 0x90, 0xd1, 0xbe, 0xb1, 0xe7, 0x5a, 0x26, 0x7d, + 0xe1, 0xd1, 0x8d, 0xc3, 0xf7, 0x38, 0x87, 0x00, 0x49, 0x61, 0x1e, 0x32, 0x44, 0x17, 0x1b, 0x5b, + 0x98, 0xbe, 0x9d, 0xea, 0xc2, 0xe2, 0xcf, 0xb9, 0x01, 0x42, 0x44, 0xc5, 0x9f, 0xfc, 0xca, 0x1b, + 0x93, 0xd2, 0xd7, 0xdf, 0x98, 0x94, 0xfe, 0xe4, 0x8d, 0x49, 0xe9, 0x03, 0xdf, 0x98, 0x3c, 0xf4, + 0xf5, 0x6f, 0x4c, 0x1e, 0xfa, 0xc3, 0x6f, 0x4c, 0x1e, 0x6a, 0xbd, 0x4b, 0x0c, 0x8b, 0xe6, 0xa2, + 0xc9, 0xf6, 0x87, 0x5f, 0x92, 0xab, 0xba, 0xbb, 0xdb, 0xd8, 0x9e, 0xd1, 0xcc, 0x3a, 0xdd, 0xc6, + 0xf5, 0x77, 0x6b, 0xbd, 0x45, 0x0e, 0xfc, 0xb9, 0x44, 0x16, 0xcc, 0xe1, 0xbd, 0x5c, 0xd5, 0xd8, + 0x6f, 0x73, 0x33, 0x27, 0xdf, 0x72, 0x63, 0x58, 0x7e, 0x13, 0xc4, 0xe7, 0x8c, 0x7d, 0x74, 0x8c, + 0xc5, 0xbc, 0x72, 0xc3, 0xae, 0xf1, 0x73, 0x5e, 0x83, 0xe4, 0x79, 0xcb, 0xae, 0xa1, 0x09, 0xff, + 0x30, 0xa6, 0x74, 0x32, 0xc3, 0x4f, 0x58, 0x16, 0x12, 0xdf, 0xfd, 0xd4, 0xd4, 0xa1, 0xe2, 0x5e, + 0x54, 0xc3, 0x2f, 0x75, 0xd5, 0x32, 0x35, 0x67, 0xec, 0x53, 0x25, 0xd7, 0xa5, 0x97, 0x92, 0x74, + 0xa3, 0x5b, 0x6c, 0x6c, 0x4f, 0x46, 0x37, 0xb6, 0xdf, 0x86, 0x6b, 0xb5, 0xab, 0x86, 0x79, 0xc3, + 0xd8, 0x24, 0x68, 0xdb, 0x03, 0xec, 0xd0, 0x30, 0x7c, 0x28, 0x06, 0x93, 0x4d, 0x7b, 0xd8, 0x7c, + 0xe4, 0xdb, 0x5d, 0x4b, 0x2a, 0x40, 0x6a, 0x41, 0x38, 0x54, 0x0e, 0x06, 0x1d, 0xac, 0x99, 0x46, + 0xc5, 0xa1, 0xaa, 0xc6, 0x15, 0xf1, 0x48, 0x54, 0x35, 0x54, 0xc3, 0x74, 0xf8, 0x59, 0x48, 0xf6, + 0x50, 0xfc, 0x98, 0xd4, 0xdf, 0x38, 0x0e, 0x8b, 0x9e, 0x84, 0x9a, 0x4f, 0x77, 0xdd, 0xea, 0xdf, + 0x23, 0x5a, 0x7a, 0x4a, 0x84, 0xb6, 0xfb, 0x7b, 0xb5, 0xca, 0x2f, 0xc4, 0x60, 0x2a, 0x6a, 0x15, + 0x32, 0x9d, 0x1c, 0x57, 0xad, 0x5b, 0xed, 0xcc, 0x72, 0x01, 0xd2, 0x9b, 0x02, 0xa7, 0x6f, 0xbb, + 0xdc, 0xee, 0xd3, 0x2e, 0x23, 0x5e, 0x57, 0xc2, 0x30, 0x67, 0x7a, 0x34, 0x8c, 0xa7, 0xc7, 0x81, + 0x2c, 0xf3, 0xee, 0x38, 0x1c, 0xd3, 0x4c, 0xa7, 0x6e, 0x3a, 0x65, 0xe6, 0xfe, 0xec, 0x81, 0xdb, + 0x24, 0x13, 0x6c, 0xea, 0xe1, 0xe5, 0xc8, 0x65, 0x18, 0xa1, 0x21, 0x82, 0x6e, 0x0b, 0xd3, 0xa8, + 0xdc, 0x35, 0x91, 0x7e, 0xf5, 0xdf, 0x26, 0xe9, 0x94, 0x1a, 0xf6, 0x08, 0xe9, 0x29, 0x97, 0x4d, + 0x98, 0xd0, 0xeb, 0x56, 0x0d, 0xd3, 0xd7, 0x61, 0x65, 0xaf, 0xad, 0x3b, 0xbf, 0xaf, 0x71, 0x7e, + 0xe3, 0x3e, 0xf9, 0x92, 0xa0, 0x2e, 0x2c, 0xc3, 0x98, 0xaa, 0x69, 0xd8, 0x0a, 0xb1, 0xec, 0x12, + 0xbe, 0x84, 0x80, 0x59, 0x4e, 0xe9, 0x71, 0x2b, 0x5e, 0x6c, 0x37, 0xc4, 0x2f, 0x3d, 0x12, 0x88, + 0x50, 0x36, 0xae, 0x62, 0xe3, 0xb4, 0x81, 0xdd, 0x1b, 0xa6, 0xbd, 0xc7, 0xcd, 0x7b, 0x9a, 0x75, + 0x15, 0x18, 0x84, 0x49, 0xd6, 0x30, 0xbb, 0xad, 0x3a, 0x78, 0xf6, 0xfa, 0xd3, 0xdb, 0xd8, 0x55, + 0x9f, 0x9e, 0xd5, 0x4c, 0x5d, 0x4c, 0xda, 0x71, 0x3e, 0x2e, 0xa4, 0x7d, 0x86, 0xb7, 0xb7, 0x89, + 0x5a, 0x8b, 0x90, 0x98, 0x37, 0x75, 0x83, 0x38, 0x66, 0x05, 0x1b, 0x66, 0x9d, 0xc7, 0x2c, 0xf6, + 0x80, 0x1e, 0x82, 0x01, 0xb5, 0x6e, 0x36, 0x0c, 0x97, 0xbd, 0xc9, 0x2b, 0x0e, 0x7d, 0xe5, 0xce, + 0xd4, 0xa1, 0x3f, 0xba, 0x33, 0x15, 0x5f, 0x32, 0x5c, 0x85, 0x37, 0x15, 0x12, 0xdf, 0xfa, 0xe4, + 0x94, 0x24, 0x5f, 0x81, 0xc1, 0x05, 0xac, 0x1d, 0x84, 0xd7, 0x02, 0xd6, 0x22, 0xbc, 0x1e, 0x87, + 0xd4, 0x92, 0xe1, 0xb2, 0xd3, 0xc3, 0x0f, 0x40, 0x5c, 0x37, 0xd8, 0x81, 0xb4, 0x48, 0xff, 0x04, + 0x4e, 0x50, 0x17, 0xb0, 0xe6, 0xa1, 0x56, 0xb0, 0x16, 0x45, 0x25, 0xec, 0x09, 0xbc, 0x58, 0xfc, + 0xc3, 0xff, 0x34, 0x79, 0xe8, 0xd5, 0x37, 0x26, 0x0f, 0xb5, 0x1d, 0x89, 0xe9, 0xc0, 0x48, 0xd4, + 0x74, 0x03, 0xcf, 0xd6, 0xb6, 0xeb, 0xa7, 0x9d, 0xca, 0xde, 0xec, 0xf5, 0x33, 0x6c, 0x16, 0x79, + 0x83, 0xf0, 0xe1, 0x04, 0x1c, 0x27, 0xcb, 0x6e, 0x55, 0x33, 0x8d, 0x59, 0xcd, 0xde, 0xb7, 0x5c, + 0x9a, 0x58, 0xcc, 0x1d, 0x11, 0x1f, 0x44, 0xe3, 0x0c, 0x6b, 0x6c, 0x63, 0xfd, 0x1d, 0x48, 0xae, + 0x13, 0x2a, 0x62, 0x32, 0xd7, 0x74, 0xd5, 0x1a, 0x8f, 0x17, 0xec, 0x81, 0x40, 0xd9, 0x35, 0x93, + 0x18, 0x83, 0xea, 0xe2, 0x86, 0x49, 0x0d, 0xab, 0x3b, 0xec, 0xb4, 0x6e, 0x9c, 0xa6, 0x92, 0x14, + 0x01, 0xd0, 0x83, 0xb9, 0x13, 0x90, 0x54, 0x1b, 0xec, 0x45, 0x73, 0x9c, 0xe4, 0x18, 0xfa, 0x20, + 0x2f, 0xc1, 0x20, 0x7f, 0xdd, 0x85, 0xb2, 0x10, 0xdf, 0xc3, 0xfb, 0xb4, 0x9f, 0x8c, 0x42, 0x7e, + 0xa2, 0x27, 0x21, 0x49, 0x45, 0xe7, 0xd7, 0x10, 0x8e, 0xcc, 0x44, 0x64, 0x9f, 0xa1, 0x22, 0x2a, + 0x0c, 0x49, 0xbe, 0x02, 0xa9, 0x05, 0xb3, 0xae, 0x1b, 0x66, 0x98, 0x57, 0x9a, 0xf1, 0xa2, 0x12, + 0x5b, 0x0d, 0x3e, 0xc6, 0x0a, 0x7b, 0x40, 0x47, 0x60, 0x80, 0x9d, 0xdd, 0xe6, 0xaf, 0xca, 0xf9, + 0x93, 0x3c, 0x0f, 0x83, 0x94, 0xf7, 0x9a, 0x85, 0x10, 0xbf, 0xf5, 0xc3, 0x0f, 0x89, 0xd3, 0x70, + 0xc0, 0xd9, 0xc7, 0x7c, 0x51, 0x11, 0x24, 0x2a, 0xaa, 0xab, 0x72, 0xad, 0xe9, 0x6f, 0xf9, 0x4d, + 0x90, 0xe2, 0x4c, 0x1c, 0xf4, 0x14, 0xc4, 0x4d, 0xcb, 0xe1, 0x2f, 0xbb, 0x73, 0xad, 0x15, 0x59, + 0xb3, 0x8a, 0x09, 0xe2, 0x1b, 0x0a, 0x41, 0x2d, 0x5e, 0x6e, 0xeb, 0x0c, 0x33, 0x51, 0x67, 0xf0, + 0xc6, 0x9b, 0x0d, 0x63, 0x64, 0xf8, 0x83, 0x49, 0xf5, 0x84, 0xd7, 0x76, 0x1d, 0xdb, 0x64, 0x8d, + 0xc7, 0xbc, 0x87, 0xfb, 0x46, 0xd6, 0x13, 0x8b, 0xb7, 0xb6, 0x71, 0x8e, 0x37, 0x43, 0x7c, 0xce, + 0xb2, 0x50, 0x1e, 0x52, 0xf4, 0x59, 0x33, 0x99, 0x77, 0x24, 0x14, 0xef, 0x99, 0xb4, 0x39, 0xe6, + 0x8e, 0x7b, 0x43, 0xb5, 0xbd, 0xeb, 0x4c, 0xe2, 0x59, 0x3e, 0x0f, 0xe9, 0x79, 0xd3, 0x70, 0xb0, + 0xe1, 0x34, 0x68, 0xde, 0xd9, 0xae, 0x99, 0xda, 0x1e, 0xe7, 0xc0, 0x1e, 0x88, 0x81, 0x55, 0xcb, + 0xa2, 0x94, 0x09, 0x85, 0xfc, 0x64, 0xf3, 0xaf, 0xb8, 0xd4, 0xd6, 0x28, 0xb3, 0xbd, 0x1a, 0x85, + 0xab, 0xe6, 0x59, 0xe5, 0xcf, 0x24, 0xc8, 0x47, 0x27, 0xcc, 0x1e, 0xde, 0x77, 0xfa, 0x9b, 0x2f, + 0x2f, 0x42, 0x7a, 0x9d, 0xde, 0x22, 0xbe, 0x8a, 0xf7, 0x51, 0x1e, 0x06, 0x71, 0xe5, 0xcc, 0xd9, + 0xb3, 0x4f, 0x9f, 0x67, 0xde, 0x7c, 0xf9, 0x90, 0x22, 0x00, 0x68, 0x12, 0xd2, 0x0e, 0xd6, 0xac, + 0x33, 0x67, 0xcf, 0xed, 0x3d, 0xcd, 0x1c, 0xe8, 0xf2, 0x21, 0xc5, 0x07, 0x15, 0x52, 0x44, 0xcf, + 0x6f, 0x7d, 0x6a, 0x4a, 0x2a, 0x26, 0x21, 0xee, 0x34, 0xea, 0xf7, 0xc1, 0x0f, 0xde, 0x9d, 0x84, + 0x49, 0xaf, 0x8d, 0xe5, 0xe0, 0xeb, 0x6a, 0x4d, 0xaf, 0xa8, 0xfe, 0x9d, 0xef, 0x11, 0x4f, 0x6b, + 0xda, 0xde, 0x5a, 0xe9, 0x7c, 0x07, 0xbb, 0xc9, 0xbf, 0x21, 0x41, 0xe6, 0x9a, 0xe0, 0xba, 0x81, + 0x5d, 0x74, 0x1e, 0xc0, 0xeb, 0x45, 0x4c, 0x84, 0x63, 0x33, 0xe1, 0x7e, 0x66, 0x3c, 0x0a, 0x25, + 0x80, 0x8c, 0xce, 0x52, 0x47, 0xb3, 0x4c, 0x87, 0x5f, 0x61, 0xe9, 0x48, 0xe8, 0xa1, 0xa2, 0x27, + 0x01, 0xd1, 0x68, 0x55, 0xbe, 0x6e, 0xba, 0xba, 0x51, 0x2d, 0x5b, 0xe6, 0x0d, 0x7e, 0x2d, 0x30, + 0xae, 0x64, 0x69, 0xcb, 0x35, 0xda, 0xb0, 0x4e, 0xe0, 0xf2, 0xe7, 0x24, 0x48, 0x7b, 0x5c, 0x48, + 0xa1, 0xa4, 0x56, 0x2a, 0x36, 0x76, 0x1c, 0x1e, 0x90, 0xc4, 0x23, 0x3a, 0x0f, 0x83, 0x56, 0x63, + 0xbb, 0x2c, 0xe6, 0xff, 0xd0, 0x99, 0x7c, 0xf3, 0x6c, 0x16, 0x9e, 0xc0, 0xe7, 0xf3, 0x80, 0xd5, + 0xd8, 0x26, 0x7e, 0xf1, 0x20, 0x64, 0x5a, 0x88, 0x32, 0x74, 0xdd, 0x97, 0x82, 0x5e, 0x53, 0xe7, + 0xf2, 0x97, 0x2d, 0x5b, 0x37, 0x6d, 0xdd, 0xdd, 0xa7, 0xa7, 0x4f, 0xe2, 0x4a, 0x56, 0x34, 0xac, + 0x73, 0xb8, 0xac, 0xc3, 0xe8, 0x06, 0xad, 0x0f, 0x7c, 0xb9, 0x9f, 0xf1, 0xa5, 0x93, 0xba, 0x49, + 0xd7, 0x56, 0xae, 0x58, 0x93, 0x5c, 0xc5, 0xc5, 0xb6, 0x5e, 0x78, 0xba, 0x57, 0x2f, 0x0c, 0xe7, + 0xa9, 0xdf, 0x3e, 0x16, 0x98, 0x76, 0xcc, 0x09, 0x83, 0xa1, 0xa8, 0x37, 0x07, 0xec, 0x56, 0x0d, + 0xe7, 0x3b, 0xa5, 0xc2, 0x7c, 0xc7, 0x60, 0x98, 0xef, 0x32, 0x45, 0xe4, 0xf3, 0x30, 0xbc, 0xae, + 0xda, 0xee, 0x06, 0x76, 0x2f, 0x63, 0xb5, 0x82, 0xed, 0x70, 0xa6, 0x1c, 0x16, 0x99, 0x12, 0x41, + 0x82, 0xa6, 0x43, 0x96, 0x2b, 0xe8, 0x6f, 0x79, 0x07, 0x12, 0xf4, 0xac, 0x99, 0x97, 0x45, 0x39, + 0x05, 0xcb, 0xa2, 0x24, 0x22, 0xee, 0xbb, 0xd8, 0x11, 0x8b, 0x31, 0xfa, 0x80, 0xce, 0x88, 0x5c, + 0x18, 0xef, 0x94, 0x0b, 0xb9, 0xc3, 0xf1, 0x8c, 0xf8, 0x32, 0x0c, 0x16, 0x49, 0x38, 0x5d, 0x5a, + 0xf0, 0xc4, 0x90, 0x7c, 0x31, 0xd0, 0x55, 0x18, 0xb5, 0x54, 0xdb, 0xa5, 0x47, 0xec, 0x77, 0xa9, + 0x0e, 0xde, 0x7d, 0xbf, 0xc8, 0xec, 0x0a, 0x29, 0xca, 0xfb, 0x18, 0xb6, 0x82, 0x40, 0xf9, 0x8d, + 0x04, 0x0c, 0x70, 0x43, 0x5c, 0x80, 0x41, 0x6e, 0x50, 0xee, 0x83, 0xc7, 0x67, 0xa2, 0x89, 0x65, + 0xc6, 0x4b, 0x00, 0x9c, 0x9b, 0xa0, 0x40, 0x8f, 0x42, 0x4a, 0xdb, 0x55, 0x75, 0xa3, 0xac, 0x57, + 0x44, 0x39, 0xf6, 0xc6, 0x9d, 0xa9, 0xc1, 0x79, 0x02, 0x5b, 0x5a, 0x50, 0x06, 0x69, 0xe3, 0x52, + 0x85, 0x64, 0xee, 0x5d, 0xac, 0x57, 0x77, 0x5d, 0x3e, 0x8b, 0xf8, 0x13, 0x7a, 0x1e, 0x12, 0xc4, + 0x09, 0xf8, 0xe5, 0xab, 0x7c, 0x53, 0x51, 0xec, 0x2d, 0x50, 0x8a, 0x29, 0xd2, 0xf1, 0x07, 0xfe, + 0x78, 0x4a, 0x52, 0x28, 0x05, 0x9a, 0x83, 0xe1, 0x9a, 0xea, 0xb8, 0x65, 0x9a, 0x81, 0x48, 0xf7, + 0x49, 0xca, 0xe2, 0x68, 0xd4, 0x18, 0xdc, 0xa4, 0x5c, 0xf0, 0x21, 0x42, 0xc3, 0x40, 0x15, 0x74, + 0x12, 0xb2, 0x94, 0x85, 0x66, 0xd6, 0xeb, 0xba, 0xcb, 0xea, 0xa0, 0x01, 0x6a, 0xf1, 0x11, 0x02, + 0x9f, 0xa7, 0x60, 0x5a, 0x0d, 0x1d, 0x87, 0x34, 0xbd, 0xec, 0x41, 0x51, 0xd8, 0xc1, 0xc6, 0x14, + 0x01, 0xd0, 0xc6, 0xc7, 0x60, 0xd4, 0x8f, 0x7e, 0x0c, 0x25, 0xc5, 0xb8, 0xf8, 0x60, 0x8a, 0xf8, + 0x14, 0x4c, 0x18, 0xf8, 0x26, 0x3d, 0x6a, 0x19, 0xc2, 0x4e, 0x53, 0x6c, 0x44, 0xda, 0xae, 0x85, + 0x29, 0x1e, 0x81, 0x11, 0x4d, 0x98, 0x9e, 0xe1, 0x02, 0xc5, 0x1d, 0xf6, 0xa0, 0x14, 0xed, 0x18, + 0xa4, 0x54, 0xcb, 0x62, 0x08, 0x43, 0x3c, 0xfe, 0x59, 0x16, 0x6d, 0x3a, 0x05, 0x63, 0x54, 0x47, + 0x1b, 0x3b, 0x8d, 0x9a, 0xcb, 0x99, 0x64, 0x28, 0xce, 0x28, 0x69, 0x50, 0x18, 0x9c, 0xe2, 0x3e, + 0x04, 0xc3, 0xf8, 0xba, 0x5e, 0xc1, 0x86, 0x86, 0x19, 0xde, 0x30, 0xc5, 0xcb, 0x08, 0x20, 0x45, + 0x7a, 0x1c, 0xbc, 0xc8, 0x56, 0x16, 0x31, 0x77, 0x84, 0xf1, 0x13, 0xf0, 0x39, 0x06, 0x96, 0x73, + 0x90, 0x58, 0x50, 0x5d, 0x95, 0x94, 0x07, 0xee, 0x4d, 0x96, 0x44, 0x32, 0x0a, 0xf9, 0x29, 0x7f, + 0x33, 0x06, 0x89, 0x6b, 0xa6, 0x8b, 0xd1, 0xd3, 0x81, 0x72, 0x6d, 0xa4, 0xd9, 0x93, 0x37, 0xf4, + 0xaa, 0x81, 0x2b, 0x2b, 0x4e, 0x35, 0x70, 0x2f, 0xdb, 0x77, 0xa5, 0x58, 0xc8, 0x95, 0x26, 0x20, + 0x69, 0x9b, 0x0d, 0xa3, 0x22, 0x4e, 0x04, 0xd2, 0x07, 0x34, 0x0f, 0x29, 0xcf, 0x43, 0x12, 0x9d, + 0x3d, 0x64, 0x94, 0x78, 0x08, 0xf1, 0x5e, 0x0e, 0x50, 0x06, 0xb7, 0xb9, 0xa3, 0x14, 0x21, 0xed, + 0x85, 0x2a, 0xee, 0x67, 0xbd, 0xb9, 0xaa, 0x4f, 0x46, 0x52, 0x85, 0x37, 0xee, 0x9e, 0xe1, 0x98, + 0xb7, 0x65, 0xbd, 0x06, 0x6e, 0xb9, 0x90, 0x4b, 0xf1, 0x1b, 0xe2, 0x83, 0x54, 0x2b, 0xdf, 0xa5, + 0xd8, 0x2d, 0xf1, 0x13, 0x90, 0x76, 0xf4, 0xaa, 0xa1, 0xba, 0x0d, 0x1b, 0x73, 0xaf, 0xf3, 0x01, + 0xf2, 0xef, 0x4a, 0x30, 0xc0, 0xbc, 0x38, 0x60, 0x35, 0xa9, 0xb5, 0xd5, 0x62, 0xed, 0xac, 0x16, + 0x3f, 0xa8, 0xd5, 0x2e, 0x02, 0x78, 0xa2, 0x38, 0xfc, 0xda, 0x6e, 0x53, 0x25, 0xc0, 0xc4, 0xdb, + 0xd0, 0xab, 0x7c, 0x82, 0x06, 0x48, 0xe4, 0xff, 0x20, 0x91, 0xd2, 0x93, 0xb7, 0xa3, 0x8b, 0x30, + 0x2c, 0x64, 0x2a, 0xef, 0xd4, 0xd4, 0x2a, 0xf7, 0x99, 0xe3, 0x6d, 0x04, 0xbb, 0x54, 0x53, 0xab, + 0xca, 0x10, 0x97, 0x85, 0x3c, 0xb4, 0x1e, 0x81, 0x58, 0x9b, 0x11, 0x08, 0x0d, 0x79, 0xfc, 0x60, + 0x43, 0x1e, 0x1a, 0x9c, 0x44, 0x74, 0x70, 0x7e, 0x33, 0x46, 0x17, 0x1c, 0x96, 0xe9, 0xa8, 0xb5, + 0xfb, 0x3f, 0x0f, 0x8e, 0x43, 0xda, 0x32, 0x6b, 0x65, 0xd6, 0xc2, 0xce, 0xc7, 0xa6, 0x2c, 0xb3, + 0xa6, 0x34, 0x0d, 0x77, 0xf2, 0x9e, 0x4c, 0x92, 0x81, 0x7b, 0x60, 0xb1, 0xc1, 0xa8, 0xc5, 0x0c, + 0xc8, 0x30, 0x43, 0xf0, 0xcc, 0x35, 0x43, 0x2c, 0x40, 0x13, 0xa1, 0x14, 0xcd, 0xb2, 0x4c, 0x68, + 0x86, 0xa7, 0x70, 0x2c, 0x82, 0xcf, 0x42, 0x7d, 0xf3, 0x0a, 0x35, 0xe8, 0x8c, 0x0a, 0xc7, 0x92, + 0x7f, 0x5e, 0x02, 0x58, 0x26, 0x36, 0xa5, 0xba, 0x92, 0x8c, 0xe3, 0xd0, 0xee, 0xcb, 0xa1, 0x5e, + 0x4f, 0xb4, 0x1e, 0x2c, 0xde, 0x77, 0xc6, 0x09, 0x4a, 0x3c, 0x07, 0xc3, 0xbe, 0x0b, 0x3a, 0x58, + 0x08, 0x72, 0xa2, 0x6d, 0x7d, 0xbc, 0x81, 0x5d, 0x25, 0x73, 0x3d, 0xf0, 0x24, 0xff, 0x53, 0x09, + 0xd2, 0x54, 0x9e, 0x15, 0xec, 0xaa, 0xa1, 0x91, 0x93, 0x0e, 0x3a, 0x72, 0x0f, 0x00, 0x30, 0x26, + 0x8e, 0x7e, 0x0b, 0x73, 0x6f, 0x4a, 0x53, 0xc8, 0x86, 0x7e, 0x0b, 0xa3, 0x67, 0x3d, 0x33, 0xc7, + 0x3b, 0x99, 0x59, 0x54, 0xcf, 0xdc, 0xd8, 0x47, 0x61, 0x90, 0x7e, 0xd2, 0xe6, 0xa6, 0xc3, 0x0b, + 0xe2, 0x01, 0xa3, 0x51, 0xdf, 0xbc, 0xe9, 0xc8, 0xbb, 0x30, 0xb8, 0x79, 0x93, 0xed, 0x56, 0x1c, + 0x87, 0xb4, 0x6d, 0x9a, 0x3c, 0xf3, 0xb2, 0x5a, 0x27, 0x45, 0x00, 0x34, 0xd1, 0x88, 0x35, 0x7a, + 0xcc, 0x5f, 0xa3, 0xfb, 0x5b, 0x0c, 0xf1, 0x1e, 0xb6, 0x18, 0x4e, 0xfd, 0x3b, 0x09, 0x86, 0x02, + 0xd1, 0x00, 0x3d, 0x0d, 0x87, 0x8b, 0xcb, 0x6b, 0xf3, 0x57, 0xcb, 0x4b, 0x0b, 0xe5, 0x4b, 0xcb, + 0x73, 0x8b, 0xfe, 0x8d, 0x8f, 0xfc, 0x91, 0xd7, 0x6e, 0x4f, 0xa3, 0x00, 0xee, 0x96, 0x41, 0xf7, + 0x39, 0xd1, 0x2c, 0x4c, 0x84, 0x49, 0xe6, 0x8a, 0x1b, 0xa5, 0xd5, 0xcd, 0xac, 0x94, 0x3f, 0xfc, + 0xda, 0xed, 0xe9, 0xb1, 0x00, 0xc5, 0xdc, 0xb6, 0x83, 0x0d, 0xb7, 0x99, 0x60, 0x7e, 0x6d, 0x65, + 0x65, 0x69, 0x33, 0x1b, 0x6b, 0x22, 0xe0, 0x81, 0xf9, 0x71, 0x18, 0x0b, 0x13, 0xac, 0x2e, 0x2d, + 0x67, 0xe3, 0x79, 0xf4, 0xda, 0xed, 0xe9, 0x91, 0x00, 0xf6, 0xaa, 0x5e, 0xcb, 0xa7, 0xde, 0xf7, + 0xe9, 0xc9, 0x43, 0xbf, 0xf2, 0x4b, 0x93, 0x12, 0xd1, 0x6c, 0x38, 0x14, 0x13, 0xd0, 0x93, 0x70, + 0x74, 0x63, 0x69, 0x71, 0xb5, 0xb4, 0x50, 0x5e, 0xd9, 0x58, 0x2c, 0xb3, 0x2f, 0x5d, 0x78, 0xda, + 0x8d, 0xbe, 0x76, 0x7b, 0x7a, 0x88, 0xab, 0xd4, 0x0e, 0x7b, 0x5d, 0x29, 0x5d, 0x5b, 0xdb, 0x2c, + 0x65, 0x25, 0x86, 0xbd, 0x6e, 0xe3, 0xeb, 0xa6, 0xcb, 0xbe, 0x78, 0xf5, 0x14, 0x1c, 0x6b, 0x81, + 0xed, 0x29, 0x36, 0xf6, 0xda, 0xed, 0xe9, 0xe1, 0x75, 0x1b, 0xb3, 0x59, 0x43, 0x29, 0x66, 0x20, + 0xd7, 0x4c, 0xb1, 0xb6, 0xbe, 0xb6, 0x31, 0xb7, 0x9c, 0x9d, 0xce, 0x67, 0x5f, 0xbb, 0x3d, 0x9d, + 0x11, 0xa1, 0x8f, 0xe0, 0xfb, 0x9a, 0xdd, 0xfb, 0x95, 0xcb, 0xeb, 0xa7, 0xe1, 0x61, 0xbe, 0xcd, + 0xe9, 0xb8, 0xea, 0x9e, 0x6e, 0x54, 0xbd, 0x9d, 0x4e, 0xfe, 0xcc, 0xd7, 0x30, 0x47, 0xf8, 0x66, + 0xa7, 0x80, 0x76, 0xdc, 0xef, 0xcc, 0xb7, 0x7f, 0xcf, 0x93, 0xef, 0xf2, 0x2a, 0xa4, 0xfb, 0x32, + 0xa8, 0xfd, 0xde, 0x78, 0xbe, 0xcb, 0x8e, 0x6d, 0xbe, 0xc3, 0x22, 0x4d, 0xfe, 0x19, 0x09, 0x46, + 0x2e, 0xeb, 0x8e, 0x6b, 0xda, 0xba, 0xa6, 0xd6, 0xe8, 0xdd, 0x8e, 0x67, 0x7b, 0x8b, 0xa0, 0x91, + 0xa9, 0x7d, 0x11, 0x06, 0xae, 0xab, 0x35, 0x16, 0xbe, 0xe2, 0xf4, 0x43, 0x14, 0xad, 0x4d, 0xe7, + 0x87, 0x31, 0xc1, 0x80, 0x91, 0xc9, 0xbf, 0x1a, 0x83, 0x51, 0xea, 0xfe, 0x0e, 0xfb, 0x44, 0x11, + 0x59, 0x31, 0xbd, 0x15, 0x12, 0xb6, 0xea, 0xf2, 0x8d, 0xbb, 0xe2, 0x93, 0x7c, 0xd7, 0xf5, 0xe1, + 0x6e, 0x3b, 0xa9, 0x33, 0x0b, 0x58, 0x53, 0x28, 0x25, 0x7a, 0x09, 0x52, 0x75, 0xf5, 0x66, 0x99, + 0x72, 0x61, 0x6b, 0x91, 0x8b, 0xfd, 0x70, 0xb9, 0x7b, 0x67, 0x6a, 0x74, 0x5f, 0xad, 0xd7, 0x0a, + 0xb2, 0xe0, 0x22, 0x2b, 0x83, 0x75, 0xf5, 0x26, 0x11, 0x0f, 0x19, 0x30, 0x4a, 0xa0, 0xda, 0xae, + 0x6a, 0x54, 0x31, 0xeb, 0x82, 0x6e, 0x41, 0x16, 0x2f, 0xf5, 0xd9, 0xc5, 0x11, 0xbf, 0x8b, 0x00, + 0x33, 0x59, 0x19, 0xae, 0xab, 0x37, 0xe7, 0x29, 0x80, 0xf4, 0x57, 0x48, 0x7d, 0xf8, 0x93, 0x53, + 0x87, 0xe8, 0x1e, 0xf6, 0xeb, 0x12, 0x80, 0x6f, 0x2b, 0xf4, 0x13, 0x90, 0xd5, 0xbc, 0x27, 0x4a, + 0xeb, 0xf0, 0xb1, 0x7b, 0xac, 0xdd, 0x28, 0x44, 0x2c, 0xcd, 0x32, 0xef, 0xd7, 0xef, 0x4c, 0x49, + 0xca, 0xa8, 0x16, 0x19, 0x84, 0x77, 0xc0, 0x50, 0xc3, 0xaa, 0xa8, 0x2e, 0x2e, 0xd3, 0x55, 0x59, + 0xac, 0x6b, 0x16, 0x9f, 0x24, 0xbc, 0xee, 0xde, 0x99, 0x42, 0x4c, 0xad, 0x00, 0xb1, 0x4c, 0x73, + 0x3b, 0x30, 0x08, 0x21, 0x08, 0xe8, 0xf4, 0x55, 0x09, 0x86, 0x16, 0x02, 0xa7, 0xad, 0x72, 0x30, + 0x58, 0x37, 0x0d, 0x7d, 0x8f, 0xfb, 0x61, 0x5a, 0x11, 0x8f, 0x28, 0x0f, 0x29, 0x76, 0xcd, 0xcd, + 0xdd, 0x17, 0x1b, 0x93, 0xe2, 0x99, 0x50, 0xdd, 0xc0, 0xdb, 0x8e, 0x2e, 0xc6, 0x42, 0x11, 0x8f, + 0xe8, 0x12, 0x64, 0x1d, 0xac, 0x35, 0x6c, 0xdd, 0xdd, 0x2f, 0x6b, 0xa6, 0xe1, 0xaa, 0x9a, 0xcb, + 0x2e, 0x4c, 0x15, 0x8f, 0xdf, 0xbd, 0x33, 0x75, 0x94, 0xc9, 0x1a, 0xc5, 0x90, 0x95, 0x51, 0x01, + 0x9a, 0x67, 0x10, 0xd2, 0x43, 0x05, 0xbb, 0xaa, 0x5e, 0x73, 0x72, 0xec, 0x75, 0x8c, 0x78, 0x0c, + 0xe8, 0xf2, 0xcb, 0x83, 0xc1, 0x8d, 0xa8, 0x4b, 0x90, 0x35, 0x2d, 0x6c, 0x87, 0x4a, 0x4c, 0x29, + 0xda, 0x73, 0x14, 0x43, 0x56, 0x46, 0x05, 0x48, 0x94, 0x9f, 0x2e, 0x19, 0x66, 0xb1, 0xf0, 0xb3, + 0x1a, 0xdb, 0xfe, 0xfe, 0xd5, 0x44, 0xd3, 0x68, 0xcc, 0x19, 0xfb, 0xc5, 0x67, 0x7c, 0xee, 0x51, + 0x3a, 0xf9, 0x6b, 0x5f, 0x38, 0x3d, 0xc1, 0x5d, 0xc3, 0xdf, 0x53, 0xba, 0x8a, 0xf7, 0xc9, 0xf0, + 0x73, 0xd4, 0x75, 0x8a, 0x49, 0x4a, 0xca, 0x97, 0x55, 0xbd, 0x26, 0x2e, 0xfe, 0x2a, 0xfc, 0x09, + 0x15, 0x60, 0xc0, 0x71, 0x55, 0xb7, 0xe1, 0xf0, 0xcf, 0x71, 0xc9, 0xed, 0x5c, 0xad, 0x68, 0x1a, + 0x95, 0x0d, 0x8a, 0xa9, 0x70, 0x0a, 0xb4, 0x00, 0x03, 0xae, 0xb9, 0x87, 0x0d, 0x6e, 0xc2, 0x3e, + 0x66, 0x36, 0x7d, 0x37, 0xc4, 0x68, 0x91, 0x0d, 0xd9, 0x0a, 0xae, 0xe1, 0x2a, 0x2b, 0x9c, 0x76, + 0x55, 0xb2, 0xa2, 0xa0, 0xdf, 0xe4, 0x2a, 0x2e, 0xf6, 0x39, 0x01, 0xb9, 0x95, 0xa2, 0xdc, 0x64, + 0x65, 0xd4, 0x03, 0x6d, 0x50, 0x08, 0xba, 0x1a, 0x3a, 0x12, 0xc8, 0x3f, 0x5b, 0xf7, 0x50, 0x3b, + 0xd5, 0x03, 0xfe, 0x2c, 0xf6, 0x1a, 0x82, 0x07, 0x0a, 0x2f, 0x41, 0xb6, 0x61, 0x6c, 0x9b, 0x06, + 0xbd, 0x99, 0xc7, 0xeb, 0x76, 0xb2, 0x5e, 0x8b, 0x07, 0x1d, 0x23, 0x8a, 0x21, 0x2b, 0xa3, 0x1e, + 0xe8, 0x32, 0xab, 0xee, 0x2b, 0x30, 0xe2, 0x63, 0xd1, 0x49, 0x9a, 0xee, 0x3a, 0x49, 0x1f, 0xe4, + 0x93, 0xf4, 0x70, 0xb4, 0x17, 0x7f, 0x9e, 0x0e, 0x7b, 0x40, 0x42, 0x86, 0x2e, 0x03, 0xf8, 0xa1, + 0x81, 0xee, 0x39, 0x0c, 0xb5, 0x1f, 0x74, 0x3f, 0xbe, 0x88, 0x35, 0x9c, 0x4f, 0x8b, 0x6e, 0xc1, + 0x78, 0x5d, 0x37, 0xca, 0x0e, 0xae, 0xed, 0x94, 0xb9, 0x81, 0x09, 0x4b, 0xfa, 0x61, 0x95, 0xe2, + 0x95, 0x7e, 0x7c, 0xe1, 0xee, 0x9d, 0xa9, 0x3c, 0x0f, 0x9e, 0xcd, 0x0c, 0x65, 0x65, 0xac, 0xae, + 0x1b, 0x1b, 0xb8, 0xb6, 0xb3, 0xe0, 0xc1, 0x0a, 0x99, 0xf7, 0x7d, 0x72, 0xea, 0x10, 0x9f, 0xa8, + 0x87, 0xe4, 0x73, 0x74, 0x87, 0x9b, 0x4f, 0x30, 0xec, 0x90, 0xb5, 0x86, 0x2a, 0x1e, 0xe8, 0xde, + 0x44, 0x5a, 0xf1, 0x01, 0x6c, 0x82, 0xbf, 0xfa, 0x1f, 0xa7, 0x25, 0xf9, 0xd7, 0x25, 0x18, 0x58, + 0xb8, 0xb6, 0xae, 0xea, 0x36, 0x5a, 0x82, 0x31, 0xdf, 0x6f, 0xc2, 0xd3, 0xfb, 0xc4, 0xdd, 0x3b, + 0x53, 0xb9, 0xa8, 0x6b, 0x79, 0xf3, 0xdb, 0x77, 0x5e, 0x31, 0xc1, 0x97, 0xda, 0x2d, 0x46, 0x43, + 0xac, 0x9a, 0x50, 0xe4, 0xe6, 0xa5, 0x6a, 0x44, 0xcd, 0x12, 0x0c, 0x32, 0x69, 0x1d, 0x54, 0x80, + 0xa4, 0x45, 0x7e, 0xf0, 0xed, 0xfb, 0xc9, 0xb6, 0xae, 0x4b, 0xf1, 0xbd, 0xcd, 0x48, 0x42, 0x22, + 0x7f, 0x30, 0x06, 0xb0, 0x70, 0xed, 0xda, 0xa6, 0xad, 0x5b, 0x35, 0xec, 0xde, 0x4b, 0xcd, 0x37, + 0xe1, 0x70, 0x60, 0x0d, 0x64, 0x6b, 0x11, 0xed, 0xa7, 0xef, 0xde, 0x99, 0x3a, 0x11, 0xd5, 0x3e, + 0x80, 0x26, 0x2b, 0xe3, 0xfe, 0x7a, 0xc8, 0xd6, 0x5a, 0x72, 0xad, 0x38, 0xae, 0xc7, 0x35, 0xde, + 0x9e, 0x6b, 0x00, 0x2d, 0xc8, 0x75, 0xc1, 0x71, 0x5b, 0x9b, 0x76, 0x03, 0x86, 0x7c, 0x93, 0x90, + 0xc8, 0x96, 0x72, 0xf9, 0x6f, 0x6e, 0x61, 0xb9, 0xbd, 0x85, 0x05, 0x19, 0xb7, 0xb2, 0x47, 0x29, + 0xff, 0x85, 0x04, 0xe0, 0xfb, 0xec, 0x8f, 0xa7, 0x8b, 0x91, 0x20, 0xce, 0x83, 0x6e, 0xfc, 0x00, + 0xe5, 0x19, 0xa7, 0x8d, 0x58, 0xf3, 0x67, 0x63, 0x30, 0xbe, 0x25, 0xa2, 0xce, 0x8f, 0xbd, 0x05, + 0xd6, 0x61, 0x10, 0x1b, 0xae, 0xad, 0x53, 0x13, 0x90, 0xb1, 0x7e, 0xaa, 0xdd, 0x58, 0xb7, 0xd0, + 0x89, 0x7e, 0x56, 0x46, 0x6c, 0x9d, 0x73, 0x36, 0x51, 0x6b, 0xc4, 0x21, 0xd7, 0x8e, 0x12, 0xcd, + 0xc3, 0xa8, 0x66, 0x63, 0x0a, 0x28, 0x07, 0x77, 0xf1, 0x8a, 0x79, 0xbf, 0xa2, 0x8c, 0x20, 0xc8, + 0xca, 0x88, 0x80, 0xf0, 0xcc, 0x51, 0x05, 0x52, 0xee, 0x11, 0xa7, 0x23, 0x58, 0x3d, 0xd6, 0x77, + 0x32, 0x4f, 0x1d, 0xa2, 0x93, 0x30, 0x03, 0x96, 0x3b, 0x46, 0x7c, 0x28, 0x4d, 0x1e, 0x26, 0x8c, + 0xea, 0x86, 0xee, 0xea, 0x6a, 0xad, 0xbc, 0xad, 0xd6, 0x54, 0x43, 0xeb, 0xbf, 0x56, 0x66, 0xe1, + 0x9e, 0x77, 0x1a, 0x61, 0x26, 0x2b, 0x23, 0x1c, 0x52, 0x64, 0x00, 0x74, 0x09, 0x06, 0x45, 0x47, + 0x89, 0x03, 0xd4, 0x18, 0x82, 0x38, 0x50, 0xd4, 0xbd, 0x3f, 0x0e, 0x63, 0x0a, 0xae, 0xfc, 0xff, + 0x61, 0xe8, 0x67, 0x18, 0xae, 0x02, 0xb0, 0x89, 0x4e, 0x02, 0x6b, 0xdf, 0x23, 0x41, 0x02, 0x45, + 0x9a, 0xd1, 0x2f, 0x38, 0x6e, 0x60, 0x2c, 0xee, 0xc4, 0x20, 0x13, 0x1c, 0x8b, 0xbf, 0xa2, 0xb9, + 0x08, 0x2d, 0xf9, 0x11, 0x28, 0xc1, 0x3f, 0xc2, 0xd9, 0x26, 0x02, 0x35, 0x79, 0x6e, 0xe7, 0xd0, + 0xf3, 0x17, 0x31, 0x18, 0x58, 0x57, 0x6d, 0xb5, 0xee, 0x20, 0xad, 0xa9, 0xba, 0x94, 0xf8, 0x0b, + 0xfc, 0xa6, 0x4f, 0x2d, 0xf3, 0x3d, 0x8d, 0x2e, 0xc5, 0xe5, 0x87, 0x5b, 0x14, 0x97, 0x6f, 0x85, + 0x11, 0xb2, 0xfc, 0x0d, 0x1c, 0x2f, 0x20, 0xd6, 0x1e, 0x2e, 0x1e, 0xf3, 0xb9, 0x84, 0xdb, 0xd9, + 0xea, 0xd8, 0x7f, 0x35, 0x86, 0x9e, 0x83, 0x21, 0x82, 0xe1, 0x07, 0x64, 0x42, 0x7e, 0xc4, 0x5f, + 0x86, 0x06, 0x1a, 0x65, 0x05, 0xea, 0xea, 0xcd, 0x12, 0x7b, 0x40, 0xcb, 0x80, 0x76, 0xbd, 0x1d, + 0x90, 0xb2, 0x6f, 0x4e, 0x42, 0xff, 0xc0, 0xdd, 0x3b, 0x53, 0xc7, 0x18, 0x7d, 0x33, 0x8e, 0xac, + 0x8c, 0xf9, 0x40, 0xc1, 0xed, 0x59, 0x00, 0xa2, 0x57, 0x99, 0x1d, 0x52, 0x63, 0xcb, 0x9b, 0xc3, + 0x77, 0xef, 0x4c, 0x8d, 0x31, 0x2e, 0x7e, 0x9b, 0xac, 0xa4, 0xc9, 0xc3, 0x02, 0xf9, 0x1d, 0xf0, + 0xec, 0x4f, 0x4b, 0x80, 0xfc, 0x50, 0xaf, 0x60, 0xc7, 0x22, 0xeb, 0x31, 0x52, 0x7c, 0x07, 0x2a, + 0x65, 0xa9, 0x73, 0xf1, 0xed, 0xd3, 0x8b, 0xe2, 0x3b, 0x30, 0x53, 0xce, 0xfb, 0x81, 0x51, 0x1c, + 0xc4, 0x68, 0x71, 0xa2, 0x6f, 0x66, 0xde, 0xd4, 0x05, 0x75, 0x53, 0x2c, 0x3c, 0x44, 0x16, 0xeb, + 0xc7, 0x9a, 0x3c, 0xca, 0x13, 0xf6, 0xaf, 0x01, 0xb2, 0x03, 0x8d, 0xfc, 0x8b, 0x6a, 0x4c, 0xe8, + 0xbe, 0x1d, 0x74, 0xcc, 0x6e, 0x8a, 0xb9, 0xf7, 0x2a, 0xb6, 0xb3, 0x03, 0x81, 0xff, 0x4c, 0x82, + 0x89, 0x60, 0xe7, 0x9e, 0x1a, 0xab, 0x90, 0x09, 0xf6, 0xcd, 0x15, 0x78, 0xb8, 0x17, 0x05, 0xb8, + 0xec, 0x21, 0x7a, 0xf4, 0x82, 0x3f, 0x59, 0xd9, 0x1e, 0xd9, 0xd3, 0x3d, 0xdb, 0x42, 0xc8, 0x14, + 0x9d, 0xb4, 0x09, 0x3a, 0x1a, 0xdf, 0x97, 0x20, 0xb1, 0x6e, 0x9a, 0x35, 0x54, 0x87, 0x31, 0xc3, + 0x74, 0xcb, 0xc4, 0xaf, 0x70, 0xa5, 0xcc, 0x97, 0xd8, 0x2c, 0x0a, 0xce, 0xf5, 0x63, 0xa2, 0x6f, + 0xdf, 0x99, 0x6a, 0x66, 0xa4, 0x8c, 0x1a, 0xa6, 0x5b, 0xa4, 0x90, 0x4d, 0xb6, 0x00, 0xbf, 0x05, + 0xc3, 0xe1, 0xae, 0x58, 0x84, 0xdc, 0xea, 0xb3, 0xab, 0x30, 0x93, 0xbb, 0x77, 0xa6, 0x26, 0xfc, + 0xb9, 0xe2, 0x81, 0x65, 0x25, 0xb3, 0x1d, 0xe8, 0x9b, 0x1d, 0xb2, 0xfa, 0xee, 0x27, 0xa7, 0xa4, + 0x53, 0x5f, 0x94, 0x00, 0xfc, 0x3d, 0x06, 0xf4, 0x24, 0x1c, 0x2d, 0xae, 0xad, 0x2e, 0x94, 0x37, + 0x36, 0xe7, 0x36, 0xb7, 0x36, 0xca, 0x5b, 0xab, 0x1b, 0xeb, 0xa5, 0xf9, 0xa5, 0x4b, 0x4b, 0xa5, + 0x05, 0x7f, 0xd3, 0xdb, 0xb1, 0xb0, 0xa6, 0xef, 0xe8, 0xb8, 0x82, 0x1e, 0x85, 0x89, 0x30, 0x36, + 0x79, 0x2a, 0x2d, 0x64, 0xa5, 0x7c, 0xe6, 0xb5, 0xdb, 0xd3, 0x29, 0x56, 0x7d, 0xe1, 0x0a, 0x3a, + 0x09, 0x87, 0x9b, 0xf1, 0x96, 0x56, 0x17, 0xb3, 0xb1, 0xfc, 0xf0, 0x6b, 0xb7, 0xa7, 0xd3, 0x5e, + 0x99, 0x86, 0x64, 0x40, 0x41, 0x4c, 0xce, 0x2f, 0x9e, 0x87, 0xd7, 0x6e, 0x4f, 0x0f, 0x30, 0xf3, + 0xe5, 0x13, 0xef, 0xfb, 0xf4, 0xe4, 0xa1, 0xe2, 0x42, 0xdb, 0x6d, 0xed, 0x53, 0x1d, 0x2c, 0x77, + 0xd3, 0xdb, 0xb2, 0x0e, 0xef, 0x69, 0xff, 0xe9, 0x60, 0xdb, 0x3d, 0xed, 0x2a, 0x36, 0xb0, 0xa3, + 0x3b, 0x07, 0xda, 0xd3, 0xee, 0x69, 0x9f, 0x5c, 0xfe, 0x57, 0x49, 0xc8, 0x2c, 0xb2, 0x5e, 0xc8, + 0x30, 0x60, 0xf4, 0x26, 0x18, 0xb0, 0x68, 0xfa, 0xe0, 0xb3, 0xa6, 0xed, 0x3a, 0x93, 0x25, 0x19, + 0xef, 0x94, 0x15, 0x4b, 0x39, 0xaf, 0xf0, 0x43, 0x18, 0xec, 0xec, 0x97, 0x7f, 0xa2, 0x29, 0xd3, + 0xc7, 0xce, 0x0e, 0xab, 0x53, 0xf8, 0x26, 0x4a, 0x94, 0x9b, 0xcc, 0x4e, 0x73, 0x6c, 0x12, 0x08, + 0x3b, 0xb5, 0xf5, 0xd3, 0x12, 0x1c, 0xa6, 0x58, 0x7e, 0xfa, 0xa5, 0x98, 0xa2, 0xb4, 0x3f, 0xd5, + 0x4e, 0x81, 0x65, 0xd5, 0xf1, 0x4f, 0x68, 0xb0, 0x93, 0x56, 0x0f, 0xf3, 0xf4, 0x77, 0x22, 0xd0, + 0x79, 0x94, 0xad, 0xac, 0x8c, 0xd7, 0x9a, 0x28, 0x1d, 0xb4, 0x18, 0x3a, 0x62, 0x97, 0xe8, 0x6f, + 0x2b, 0x3d, 0x78, 0xe0, 0xee, 0x0a, 0x0c, 0xf9, 0x31, 0xc4, 0xe1, 0xff, 0xf7, 0xa1, 0xf7, 0x8c, + 0x11, 0x24, 0x46, 0xef, 0x95, 0xe0, 0xb0, 0x9f, 0xc3, 0x83, 0x6c, 0xd9, 0xff, 0xc7, 0x78, 0xa2, + 0x8f, 0x65, 0x4f, 0xd4, 0x38, 0x2d, 0xf9, 0xca, 0xca, 0x44, 0xa3, 0x99, 0x94, 0x2c, 0xb8, 0x86, + 0x83, 0x11, 0xd5, 0xc9, 0x89, 0x4f, 0xc0, 0xf5, 0x1e, 0x92, 0xc3, 0x0c, 0xd8, 0x37, 0xfb, 0x2d, + 0xd3, 0x76, 0x71, 0x85, 0x6e, 0xbd, 0xa5, 0x14, 0xef, 0x59, 0x5e, 0x05, 0xd4, 0x3c, 0xb8, 0xd1, + 0x63, 0x85, 0x69, 0xff, 0x58, 0xe1, 0x04, 0x24, 0x83, 0x87, 0xef, 0xd8, 0x43, 0x21, 0xf5, 0x3e, + 0x9e, 0x34, 0xef, 0xf1, 0x7c, 0xff, 0xe7, 0x31, 0x38, 0x15, 0x7c, 0xf1, 0xf3, 0x4a, 0x03, 0xdb, + 0xfb, 0xde, 0xf4, 0xb4, 0xd4, 0xaa, 0x6e, 0x04, 0xef, 0xda, 0x1c, 0x0b, 0x26, 0x79, 0x8a, 0x2b, + 0xac, 0x24, 0x1b, 0x30, 0xb4, 0xae, 0x56, 0xb1, 0x82, 0x5f, 0x69, 0x60, 0xc7, 0x6d, 0x71, 0x88, + 0xfb, 0x08, 0x0c, 0x98, 0x3b, 0x3b, 0xe2, 0xd5, 0x74, 0x42, 0xe1, 0x4f, 0x44, 0xe1, 0x9a, 0x5e, + 0xd7, 0xd9, 0xf9, 0xad, 0x84, 0xc2, 0x1e, 0xd0, 0x14, 0x0c, 0x69, 0x66, 0xc3, 0xe0, 0xf3, 0x2d, + 0x97, 0x10, 0x1f, 0x5a, 0x68, 0x18, 0x6c, 0xbe, 0xc9, 0x17, 0x21, 0xc3, 0xfa, 0xe3, 0x79, 0xf6, + 0x18, 0xa4, 0xe8, 0x11, 0x28, 0xbf, 0xd7, 0x41, 0xf2, 0x7c, 0x95, 0x1d, 0xf9, 0x66, 0x5c, 0x58, + 0xc7, 0xec, 0xa1, 0xf8, 0xd6, 0xb6, 0x86, 0x7c, 0xb4, 0x5b, 0x58, 0x60, 0x66, 0xf2, 0x8c, 0xf8, + 0x7b, 0x49, 0x38, 0xcc, 0xdf, 0xbc, 0xa9, 0x96, 0x3e, 0xbb, 0xeb, 0xba, 0xe2, 0x12, 0x0e, 0xf0, + 0xe2, 0x56, 0xb5, 0x74, 0x79, 0x1f, 0x12, 0x97, 0x5d, 0xd7, 0x42, 0xa7, 0x20, 0x69, 0x37, 0x6a, + 0x58, 0xec, 0xec, 0x78, 0xbb, 0xee, 0xaa, 0xa5, 0xcf, 0x10, 0x04, 0xa5, 0x51, 0xc3, 0x0a, 0x43, + 0x41, 0x25, 0x98, 0xda, 0x69, 0xd4, 0x6a, 0xfb, 0xe5, 0x0a, 0xa6, 0xff, 0x0f, 0xc7, 0xfb, 0xa2, + 0x3c, 0xbe, 0x69, 0xa9, 0xe2, 0xbb, 0x74, 0xc4, 0x32, 0x27, 0x28, 0xda, 0x02, 0xc5, 0x12, 0x5f, + 0x93, 0x2f, 0x09, 0x1c, 0xf9, 0x8f, 0x62, 0x90, 0x12, 0xac, 0xe9, 0x89, 0x6c, 0x5c, 0xc3, 0x9a, + 0x6b, 0x8a, 0x77, 0x22, 0xde, 0x33, 0x42, 0x10, 0xaf, 0xf2, 0x01, 0x4a, 0x5f, 0x3e, 0xa4, 0x90, + 0x07, 0x02, 0xf3, 0xce, 0xc5, 0x13, 0x98, 0xd5, 0x20, 0x63, 0x96, 0xb0, 0x4c, 0xb1, 0x14, 0xbb, + 0x7c, 0x48, 0xa1, 0x4f, 0x28, 0x07, 0x03, 0x64, 0x56, 0xb8, 0xec, 0x63, 0x7f, 0x04, 0xce, 0x9f, + 0xd1, 0x11, 0x48, 0x5a, 0xaa, 0xab, 0xb1, 0x43, 0x70, 0xa4, 0x81, 0x3d, 0xa2, 0xe7, 0x60, 0x80, + 0x5d, 0xbb, 0x8c, 0xfe, 0xb3, 0x09, 0x62, 0x0c, 0xf6, 0x7d, 0x2b, 0x22, 0xf7, 0xba, 0xea, 0xba, + 0xd8, 0x36, 0x08, 0x43, 0x86, 0x8e, 0x10, 0x24, 0xb6, 0xcd, 0xca, 0x3e, 0xff, 0x07, 0x18, 0xf4, + 0x37, 0xff, 0xe2, 0x3e, 0xf5, 0x86, 0x32, 0x6d, 0x64, 0xff, 0xf7, 0x27, 0x23, 0x80, 0x45, 0x82, + 0x54, 0x82, 0x71, 0xb5, 0x52, 0xd1, 0xd9, 0xff, 0xa2, 0x28, 0x6f, 0xeb, 0x34, 0x3a, 0x38, 0xf4, + 0xbf, 0x3a, 0xb5, 0x1b, 0x0b, 0xe4, 0x13, 0x14, 0x39, 0x7e, 0x31, 0x0d, 0x83, 0x16, 0x13, 0x4a, + 0xbe, 0x00, 0x63, 0x4d, 0x92, 0x12, 0xf9, 0xf6, 0x74, 0xa3, 0x22, 0x2e, 0x0b, 0x90, 0xdf, 0x04, + 0x46, 0xbf, 0x48, 0xc7, 0xde, 0x36, 0xd1, 0xdf, 0xc5, 0x77, 0xb7, 0xbf, 0x57, 0x35, 0x12, 0xb8, + 0x57, 0xa5, 0x5a, 0x7a, 0x31, 0x4d, 0xf9, 0xf3, 0xdb, 0x54, 0x73, 0xcd, 0xb7, 0xa9, 0xaa, 0xd8, + 0x10, 0x79, 0x97, 0x34, 0xa9, 0x96, 0xee, 0x50, 0x77, 0xf4, 0xbf, 0x90, 0xe7, 0x5c, 0x08, 0xfc, + 0xa6, 0x97, 0xab, 0x12, 0x8b, 0x73, 0xeb, 0x4b, 0x9e, 0x1f, 0x7f, 0x39, 0x06, 0x27, 0x02, 0x7e, + 0x1c, 0x40, 0x6e, 0x76, 0xe7, 0x7c, 0x6b, 0x8f, 0xef, 0xe1, 0x52, 0xd5, 0x55, 0x48, 0x10, 0x7c, + 0xd4, 0xe5, 0x7b, 0xf8, 0xb9, 0xcf, 0x7d, 0xed, 0x77, 0xe5, 0xf0, 0x7b, 0xa9, 0xd0, 0xa8, 0x50, + 0x26, 0xc5, 0xf7, 0xf6, 0x6e, 0xbf, 0xac, 0xff, 0x71, 0x40, 0xe7, 0xde, 0x99, 0x31, 0x6a, 0xc3, + 0x37, 0xce, 0x82, 0xdc, 0xa6, 0xd8, 0x61, 0xf1, 0xb2, 0x73, 0xf9, 0xd4, 0x47, 0x30, 0x6e, 0x53, + 0x6a, 0x75, 0x1c, 0xc1, 0x1e, 0x0b, 0xb1, 0x9b, 0x70, 0xe4, 0x05, 0xd2, 0xb7, 0xbf, 0x30, 0x16, + 0x61, 0xfd, 0x88, 0xf7, 0xbe, 0x4e, 0xe2, 0xff, 0x54, 0x8b, 0xd5, 0xcb, 0x97, 0x00, 0x7c, 0xf9, + 0xf8, 0x92, 0xf0, 0xd1, 0x99, 0xb6, 0xd9, 0x62, 0x26, 0x90, 0x2a, 0x94, 0x00, 0xa5, 0xfc, 0x6b, + 0x12, 0x1c, 0x6d, 0xea, 0x9a, 0x47, 0xf8, 0xc5, 0x16, 0x17, 0x07, 0x0e, 0x54, 0xd5, 0x2c, 0xb6, + 0x10, 0xf6, 0xb1, 0xae, 0xc2, 0x32, 0x29, 0x42, 0xd2, 0xbe, 0x05, 0x0e, 0x87, 0x85, 0x15, 0x66, + 0x7a, 0x04, 0x46, 0xc2, 0x7b, 0xbf, 0xdc, 0x5c, 0xc3, 0xa1, 0xdd, 0x5f, 0xb9, 0x1c, 0xb5, 0xb3, + 0xa7, 0x6b, 0x09, 0xd2, 0x1e, 0x2a, 0x2f, 0x7e, 0x7b, 0x56, 0xd5, 0xa7, 0x94, 0x3f, 0x28, 0xc1, + 0x74, 0xb8, 0x87, 0x40, 0x21, 0xd4, 0x9f, 0xb0, 0xf7, 0x6c, 0x88, 0xbf, 0x25, 0xc1, 0x83, 0x1d, + 0x64, 0xe2, 0x06, 0xb8, 0x05, 0x13, 0x81, 0xb5, 0xbf, 0x08, 0xe1, 0x62, 0xd8, 0x4f, 0x75, 0x2f, + 0x41, 0xbd, 0xc5, 0xee, 0x71, 0x62, 0x94, 0xcf, 0xfe, 0xf1, 0xd4, 0x78, 0x73, 0x9b, 0xa3, 0x8c, + 0x37, 0xaf, 0xd8, 0xef, 0xa1, 0x7f, 0x7c, 0x54, 0x82, 0xc7, 0xc3, 0xaa, 0xb6, 0xa8, 0x65, 0x7f, + 0x54, 0xe3, 0xf0, 0xef, 0x25, 0x38, 0xd5, 0x8b, 0x70, 0x7c, 0x40, 0xb6, 0x61, 0xdc, 0xaf, 0xb2, + 0xa3, 0xe3, 0xd1, 0x57, 0xed, 0xce, 0xbc, 0x14, 0x79, 0xdc, 0xee, 0x83, 0xe1, 0x2d, 0x3e, 0xb1, + 0x82, 0x43, 0xee, 0x19, 0x39, 0xbc, 0x7f, 0x2b, 0x8c, 0x1c, 0xda, 0xc1, 0x6d, 0x31, 0x16, 0xb1, + 0x16, 0x63, 0xe1, 0x97, 0xe5, 0xf2, 0x75, 0x1e, 0xb7, 0x5a, 0xec, 0xba, 0xbd, 0x03, 0xc6, 0x5b, + 0xb8, 0x32, 0x9f, 0xd5, 0x7d, 0x78, 0xb2, 0x82, 0x9a, 0x9d, 0x55, 0xde, 0x87, 0x29, 0xda, 0x6f, + 0x0b, 0x43, 0xdf, 0x6f, 0x95, 0xeb, 0x3c, 0xb6, 0xb4, 0xec, 0x9a, 0xeb, 0xbe, 0x04, 0x03, 0x6c, + 0x9c, 0xb9, 0xba, 0x07, 0x70, 0x14, 0xce, 0x40, 0xfe, 0x98, 0x88, 0x65, 0x0b, 0x42, 0xec, 0xd6, + 0x73, 0xa8, 0x17, 0x5d, 0xef, 0xd1, 0x1c, 0x0a, 0x18, 0xe3, 0x75, 0x11, 0xd5, 0x5a, 0x4b, 0xc7, + 0xcd, 0xa1, 0xdd, 0xb3, 0xa8, 0xc6, 0x6c, 0x73, 0x7f, 0xc3, 0xd7, 0x2f, 0x89, 0xf0, 0xe5, 0xe9, + 0xd4, 0x25, 0x7c, 0xfd, 0x68, 0x4c, 0xef, 0x05, 0xb2, 0x2e, 0x62, 0xfe, 0x65, 0x0c, 0x64, 0xdf, + 0x95, 0xe0, 0x18, 0xd5, 0x2d, 0xb8, 0x09, 0xd1, 0xaf, 0xc9, 0x9f, 0x04, 0xe4, 0xd8, 0x5a, 0xb9, + 0xe5, 0xec, 0xce, 0x3a, 0xb6, 0x76, 0x2d, 0x94, 0x5f, 0x9e, 0x04, 0x54, 0x09, 0x6d, 0x35, 0x51, + 0x6c, 0x76, 0x0e, 0x2e, 0x5b, 0x09, 0xec, 0x64, 0xb4, 0x18, 0xce, 0xc4, 0x3d, 0x18, 0xce, 0xaf, + 0x4b, 0x90, 0x6f, 0xa5, 0x32, 0x1f, 0x3e, 0x1d, 0x8e, 0x84, 0x5e, 0x0b, 0x44, 0x47, 0xf0, 0xc9, + 0x5e, 0xb6, 0x71, 0x22, 0xd3, 0xe8, 0xb0, 0x8d, 0xef, 0x77, 0x1d, 0x30, 0x15, 0xf6, 0xd0, 0xe6, + 0xca, 0xfa, 0x47, 0x36, 0x7d, 0xbe, 0xd0, 0x14, 0x57, 0xff, 0x52, 0xd4, 0xde, 0x37, 0x61, 0xb2, + 0x8d, 0xd4, 0xf7, 0x3b, 0xef, 0xed, 0xb6, 0x1d, 0xcc, 0x7b, 0x5d, 0xbe, 0x3f, 0xcb, 0x67, 0x42, + 0xf8, 0x6c, 0x75, 0x60, 0x2d, 0xd6, 0xea, 0xe2, 0x95, 0xfc, 0x76, 0x38, 0xde, 0x92, 0x8a, 0xcb, + 0x56, 0x80, 0xc4, 0xae, 0xee, 0xb8, 0x5c, 0xac, 0x47, 0xdb, 0x89, 0x15, 0xa1, 0xa6, 0x34, 0x32, + 0x82, 0x2c, 0x65, 0xbd, 0x6e, 0x9a, 0x35, 0x2e, 0x86, 0x7c, 0x15, 0xc6, 0x02, 0x30, 0xde, 0xc9, + 0x39, 0x48, 0x58, 0x26, 0xff, 0x1c, 0xc0, 0xd0, 0x99, 0x13, 0x6d, 0xf7, 0xed, 0x4d, 0xb3, 0xc6, + 0xd5, 0xa6, 0xf8, 0xf2, 0x04, 0x20, 0xc6, 0x8c, 0x6e, 0xe1, 0x8b, 0x2e, 0x36, 0x60, 0x3c, 0x04, + 0xe5, 0x9d, 0xfc, 0x40, 0xaf, 0x07, 0xce, 0x7c, 0xfb, 0x30, 0x24, 0x29, 0x57, 0xf4, 0x11, 0x09, + 0x20, 0xf0, 0x0e, 0x78, 0xa6, 0x1d, 0x9b, 0xd6, 0x6b, 0xe2, 0xfc, 0x6c, 0xcf, 0xf8, 0xbc, 0x66, + 0x3b, 0xf5, 0xee, 0x7f, 0xfd, 0xcd, 0x0f, 0xc5, 0x1e, 0x46, 0xf2, 0x6c, 0x9b, 0xd5, 0x78, 0x60, + 0xbe, 0x7c, 0x26, 0x74, 0x1b, 0xfd, 0x74, 0x6f, 0x5d, 0x09, 0xc9, 0x66, 0x7a, 0x45, 0xe7, 0x82, + 0x5d, 0xa0, 0x82, 0x9d, 0x45, 0xcf, 0x74, 0x17, 0x6c, 0xf6, 0x9d, 0xe1, 0x49, 0xf3, 0x2e, 0xf4, + 0x6f, 0x24, 0x98, 0x68, 0xb5, 0xa4, 0x43, 0xcf, 0xf7, 0x26, 0x45, 0x73, 0x49, 0x91, 0x3f, 0x7f, + 0x00, 0x4a, 0xae, 0xca, 0x22, 0x55, 0x65, 0x0e, 0x5d, 0x3c, 0x80, 0x2a, 0xb3, 0xc1, 0xbd, 0xfd, + 0xff, 0x23, 0xc1, 0x03, 0x1d, 0x57, 0x48, 0x68, 0xae, 0x37, 0x29, 0x3b, 0xd4, 0x4e, 0xf9, 0xe2, + 0x0f, 0xc2, 0x82, 0x6b, 0xfc, 0x02, 0xd5, 0xf8, 0x2a, 0x5a, 0x3a, 0x88, 0xc6, 0x2d, 0x5f, 0xa0, + 0xa0, 0xdf, 0x0f, 0x9f, 0x20, 0xec, 0xec, 0x4e, 0x4d, 0x0b, 0x8f, 0x2e, 0x13, 0xa3, 0xb9, 0xa8, + 0x95, 0x5f, 0xa4, 0x2a, 0x28, 0x68, 0xfd, 0x07, 0x1c, 0xb4, 0xd9, 0x77, 0x86, 0x03, 0xff, 0xbb, + 0xd0, 0xff, 0x92, 0x5a, 0x1f, 0x09, 0x7c, 0xae, 0xa3, 0x88, 0xed, 0x17, 0x55, 0xf9, 0xe7, 0xfb, + 0x27, 0xe4, 0x4a, 0xd6, 0xa9, 0x92, 0x55, 0x84, 0xef, 0xb5, 0x92, 0x2d, 0x07, 0x11, 0x7d, 0x55, + 0x82, 0x89, 0x56, 0x6b, 0x92, 0x2e, 0xd3, 0xb2, 0xc3, 0x22, 0xab, 0xcb, 0xb4, 0xec, 0xb4, 0x00, + 0x92, 0xdf, 0x44, 0x95, 0x3f, 0x87, 0x9e, 0x6d, 0xa7, 0x7c, 0xc7, 0x51, 0x24, 0x73, 0xb1, 0x63, + 0x91, 0xdf, 0x65, 0x2e, 0xf6, 0xb2, 0x8e, 0xe9, 0x32, 0x17, 0x7b, 0x5a, 0x63, 0x74, 0x9f, 0x8b, + 0x9e, 0x66, 0x3d, 0x0e, 0xa3, 0x83, 0xbe, 0x2c, 0xc1, 0x70, 0xa8, 0x22, 0x46, 0x4f, 0x77, 0x14, + 0xb4, 0xd5, 0x82, 0x21, 0x7f, 0xa6, 0x1f, 0x12, 0xae, 0xcb, 0x12, 0xd5, 0x65, 0x1e, 0xcd, 0x1d, + 0x44, 0x97, 0xf0, 0x7b, 0xd2, 0xaf, 0x4b, 0x30, 0xde, 0xa2, 0xca, 0xec, 0x32, 0x0b, 0xdb, 0x17, + 0xcd, 0xf9, 0xe7, 0xfb, 0x27, 0xe4, 0x5a, 0x5d, 0xa2, 0x5a, 0xbd, 0x15, 0xbd, 0xe5, 0x20, 0x5a, + 0x05, 0xf2, 0xf3, 0x1d, 0xff, 0xa4, 0x55, 0xa0, 0x1f, 0x74, 0xae, 0x4f, 0xc1, 0x84, 0x42, 0xcf, + 0xf5, 0x4d, 0xc7, 0xf5, 0x79, 0x1b, 0xd5, 0xe7, 0x05, 0xb4, 0xf6, 0x83, 0xe9, 0xd3, 0x9c, 0xd6, + 0x7f, 0xab, 0xf9, 0x6e, 0x5f, 0x67, 0x2f, 0x6a, 0x59, 0xac, 0xe6, 0x9f, 0xe9, 0x8b, 0x86, 0x2b, + 0xf5, 0x3c, 0x55, 0xea, 0x0c, 0x7a, 0xaa, 0x9d, 0x52, 0x81, 0xe3, 0x74, 0xba, 0xb1, 0x63, 0xce, + 0xbe, 0x93, 0x95, 0xc0, 0xef, 0x42, 0x3f, 0x25, 0x0e, 0x33, 0x9d, 0xec, 0xd8, 0x6f, 0xa0, 0x8e, + 0xcd, 0x3f, 0xde, 0x03, 0x26, 0x97, 0xeb, 0x61, 0x2a, 0xd7, 0x24, 0x3a, 0xd1, 0x4e, 0x2e, 0x52, + 0xcb, 0xa2, 0xf7, 0x4b, 0xde, 0xe9, 0xc7, 0x53, 0x9d, 0x79, 0x07, 0x8b, 0xdd, 0xfc, 0x13, 0x3d, + 0xe1, 0x72, 0x49, 0x1e, 0xa5, 0x92, 0x4c, 0xa3, 0xc9, 0xb6, 0x92, 0xb0, 0xd2, 0xf7, 0xde, 0x9e, + 0x1a, 0x78, 0xf7, 0x51, 0x98, 0x6a, 0xd3, 0x9f, 0x7b, 0xb3, 0xcb, 0x1b, 0xae, 0x0e, 0xd7, 0x5b, + 0xbb, 0x5e, 0x5f, 0x6d, 0x73, 0x61, 0xf6, 0xe0, 0x97, 0x5a, 0x7b, 0x7b, 0x1d, 0xf6, 0x2f, 0x13, + 0x80, 0x56, 0x9c, 0xea, 0xbc, 0x8d, 0xd9, 0xbf, 0x91, 0xe3, 0x73, 0x3c, 0x72, 0x8b, 0x4b, 0xfa, + 0x81, 0x6e, 0x71, 0xad, 0x84, 0xee, 0x45, 0xc5, 0xfa, 0xbb, 0x77, 0xd9, 0xf3, 0xe5, 0xa8, 0xf8, + 0x0f, 0xe1, 0x72, 0x54, 0xeb, 0x53, 0xd4, 0x89, 0x7b, 0x77, 0xcd, 0x22, 0x79, 0xa0, 0x6b, 0x16, + 0x97, 0x60, 0x80, 0xdf, 0x76, 0x1c, 0xe8, 0x70, 0xdb, 0x31, 0xd7, 0xf6, 0x4a, 0x23, 0xa7, 0x46, + 0x67, 0xc5, 0x27, 0x72, 0x07, 0x7b, 0x3b, 0xf7, 0xca, 0xbf, 0xa1, 0xeb, 0x6f, 0x1f, 0x9c, 0x80, + 0x7c, 0xb3, 0x33, 0x79, 0x13, 0xfa, 0xe7, 0xe2, 0x90, 0x5d, 0x71, 0xaa, 0xa5, 0x8a, 0xee, 0xde, + 0x27, 0x4f, 0xbb, 0xd8, 0xfe, 0xea, 0x0a, 0xba, 0x7b, 0x67, 0x6a, 0x84, 0xd9, 0xb4, 0x83, 0x25, + 0xf7, 0x60, 0x34, 0x72, 0x51, 0x98, 0xfb, 0x55, 0xb1, 0xff, 0xdb, 0xca, 0x11, 0x46, 0x32, 0xbd, + 0x6b, 0x10, 0xf0, 0x6d, 0x74, 0xbd, 0xb5, 0x23, 0x33, 0x77, 0xba, 0x74, 0xff, 0x6e, 0xf8, 0xf9, + 0xe3, 0x95, 0x87, 0x5c, 0x74, 0x40, 0xbc, 0xd1, 0xfa, 0xcf, 0x12, 0x0c, 0xad, 0x38, 0xa2, 0x04, + 0xc4, 0x3f, 0xa6, 0x37, 0x8c, 0x9e, 0xf3, 0xbe, 0x6b, 0x1a, 0xef, 0xcd, 0x67, 0xc5, 0xb7, 0x4e, + 0x7d, 0x23, 0x1c, 0x86, 0xf1, 0x80, 0x9e, 0x9e, 0xfe, 0x7f, 0x10, 0xa3, 0x91, 0xb1, 0x88, 0xab, + 0xba, 0xe1, 0x55, 0x8f, 0xf8, 0xaf, 0xea, 0x3d, 0x0a, 0xdf, 0xce, 0x89, 0x83, 0xda, 0x79, 0x8f, + 0x06, 0x87, 0x88, 0x3d, 0xbd, 0x0d, 0xaf, 0x95, 0xe6, 0x1b, 0x3e, 0x52, 0x1f, 0x9f, 0xc3, 0x89, + 0xdc, 0xe3, 0x91, 0xbf, 0x25, 0xc1, 0xf0, 0x8a, 0x53, 0xdd, 0x32, 0x2a, 0xff, 0xcf, 0xfb, 0xef, + 0x0e, 0x1c, 0x0e, 0x69, 0x7a, 0x9f, 0x4c, 0x7a, 0xe6, 0xa3, 0x09, 0x88, 0xaf, 0x38, 0x55, 0xf4, + 0x0a, 0x8c, 0x46, 0xcb, 0x85, 0xb6, 0x35, 0x60, 0x73, 0x36, 0x68, 0xbf, 0x4e, 0x6b, 0x9f, 0x39, + 0xd0, 0x1e, 0x0c, 0x87, 0xb3, 0xc6, 0xc9, 0x0e, 0x4c, 0x42, 0x98, 0xf9, 0xa7, 0x7a, 0xc5, 0xf4, + 0x3a, 0xfb, 0x09, 0x48, 0x79, 0x41, 0xef, 0xa1, 0x0e, 0xd4, 0x02, 0xa9, 0x7d, 0x55, 0xdb, 0x22, + 0xac, 0x10, 0xeb, 0x45, 0x43, 0x4a, 0x27, 0xeb, 0x45, 0x70, 0x3b, 0x5a, 0xaf, 0xdd, 0xd4, 0xda, + 0x06, 0x08, 0xcc, 0x83, 0x47, 0x3a, 0x70, 0xf0, 0xd1, 0xf2, 0xa7, 0x7b, 0x42, 0xf3, 0x5e, 0x36, + 0xdd, 0xd3, 0x22, 0xfc, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x92, 0x32, 0xac, 0x39, 0xb4, 0x93, + 0x00, 0x00, } r := bytes.NewReader(gzipped) gzipr, err := compress_gzip.NewReader(r) diff --git a/x/staking/types/tx.pb.go b/x/staking/types/tx.pb.go index ec0d6847a7..f9f398e9c3 100644 --- a/x/staking/types/tx.pb.go +++ b/x/staking/types/tx.pb.go @@ -10,14 +10,14 @@ import ( grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/golang/protobuf/ptypes/timestamp" types "github.com/line/lbm-sdk/v2/codec/types" - github_com_cosmos_cosmos_sdk_types "github.com/line/lbm-sdk/v2/types" + github_com_line_lbm_sdk_v2_types "github.com/line/lbm-sdk/v2/types" types1 "github.com/line/lbm-sdk/v2/types" _ "github.com/regen-network/cosmos-proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -38,13 +38,13 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // MsgCreateValidator defines a SDK message for creating a new validator. type MsgCreateValidator struct { - Description Description `protobuf:"bytes,1,opt,name=description,proto3" json:"description"` - Commission CommissionRates `protobuf:"bytes,2,opt,name=commission,proto3" json:"commission"` - MinSelfDelegation github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,3,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"min_self_delegation" yaml:"min_self_delegation"` - DelegatorAddress string `protobuf:"bytes,4,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` - ValidatorAddress string `protobuf:"bytes,5,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` - Pubkey *types.Any `protobuf:"bytes,6,opt,name=pubkey,proto3" json:"pubkey,omitempty"` - Value types1.Coin `protobuf:"bytes,7,opt,name=value,proto3" json:"value"` + Description Description `protobuf:"bytes,1,opt,name=description,proto3" json:"description"` + Commission CommissionRates `protobuf:"bytes,2,opt,name=commission,proto3" json:"commission"` + MinSelfDelegation github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,3,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"min_self_delegation" yaml:"min_self_delegation"` + DelegatorAddress string `protobuf:"bytes,4,opt,name=delegator_address,json=delegatorAddress,proto3" json:"delegator_address,omitempty" yaml:"delegator_address"` + ValidatorAddress string `protobuf:"bytes,5,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty" yaml:"validator_address"` + Pubkey *types.Any `protobuf:"bytes,6,opt,name=pubkey,proto3" json:"pubkey,omitempty"` + Value types1.Coin `protobuf:"bytes,7,opt,name=value,proto3" json:"value"` } func (m *MsgCreateValidator) Reset() { *m = MsgCreateValidator{} } @@ -125,8 +125,8 @@ type MsgEditValidator struct { // it's not mandatory to update. If not updated, the deserialized rate will be // zero with no way to distinguish if an update was intended. // REF: #2373 - CommissionRate *github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=commission_rate,json=commissionRate,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"commission_rate,omitempty" yaml:"commission_rate"` - MinSelfDelegation *github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,4,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"min_self_delegation,omitempty" yaml:"min_self_delegation"` + CommissionRate *github_com_line_lbm_sdk_v2_types.Dec `protobuf:"bytes,3,opt,name=commission_rate,json=commissionRate,proto3,customtype=github.com/line/lbm-sdk/v2/types.Dec" json:"commission_rate,omitempty" yaml:"commission_rate"` + MinSelfDelegation *github_com_line_lbm_sdk_v2_types.Int `protobuf:"bytes,4,opt,name=min_self_delegation,json=minSelfDelegation,proto3,customtype=github.com/line/lbm-sdk/v2/types.Int" json:"min_self_delegation,omitempty" yaml:"min_self_delegation"` } func (m *MsgEditValidator) Reset() { *m = MsgEditValidator{} } @@ -466,61 +466,61 @@ func init() { func init() { proto.RegisterFile("cosmos/staking/v1beta1/tx.proto", fileDescriptor_0926ef28816b35ab) } var fileDescriptor_0926ef28816b35ab = []byte{ - // 860 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0x4d, 0x6b, 0xe3, 0x46, - 0x18, 0xb6, 0x6c, 0xc7, 0x4d, 0x27, 0xe4, 0x4b, 0xf9, 0xc0, 0x11, 0xc1, 0x0a, 0x4a, 0x3f, 0x42, - 0xdb, 0xc8, 0x4d, 0x4a, 0x29, 0xe4, 0x52, 0xe2, 0xb8, 0xa1, 0x21, 0x35, 0x14, 0x25, 0xed, 0xa1, - 0x14, 0x8c, 0x3e, 0xc6, 0xaa, 0xb0, 0xa4, 0x51, 0x34, 0xe3, 0x10, 0x43, 0x7f, 0x40, 0x8f, 0x81, - 0xde, 0xf6, 0x94, 0x1f, 0xb1, 0x3f, 0x22, 0x2c, 0xec, 0x92, 0xe3, 0xb2, 0x07, 0xef, 0x92, 0xc0, - 0x92, 0xb3, 0x7f, 0xc1, 0xa2, 0xd1, 0x48, 0x96, 0xe5, 0x0f, 0x4c, 0x58, 0x5f, 0xf6, 0x64, 0x33, - 0xf3, 0xcc, 0xf3, 0xce, 0xfb, 0xbc, 0xcf, 0xbc, 0xaf, 0x80, 0xa8, 0x23, 0xec, 0x20, 0x5c, 0xc6, - 0x44, 0x6d, 0x5a, 0xae, 0x59, 0xbe, 0xdc, 0xd3, 0x20, 0x51, 0xf7, 0xca, 0xe4, 0x4a, 0xf6, 0x7c, - 0x44, 0x10, 0xbf, 0x1e, 0x02, 0x64, 0x06, 0x90, 0x19, 0x40, 0xd8, 0x30, 0x11, 0x32, 0x6d, 0x58, - 0xa6, 0x28, 0xad, 0xd5, 0x28, 0xab, 0x6e, 0x3b, 0x3c, 0x22, 0x88, 0xe9, 0x2d, 0x62, 0x39, 0x10, - 0x13, 0xd5, 0xf1, 0x18, 0x60, 0xd5, 0x44, 0x26, 0xa2, 0x7f, 0xcb, 0xc1, 0x3f, 0xb6, 0xba, 0x11, - 0x46, 0xaa, 0x87, 0x1b, 0x2c, 0x6c, 0xb8, 0x55, 0x62, 0xb7, 0xd4, 0x54, 0x0c, 0xe3, 0x2b, 0xea, - 0xc8, 0x72, 0xd9, 0xfe, 0x17, 0x23, 0xb2, 0x88, 0x2e, 0x4d, 0x51, 0xd2, 0xcb, 0x3c, 0xe0, 0x6b, - 0xd8, 0x3c, 0xf2, 0xa1, 0x4a, 0xe0, 0x9f, 0xaa, 0x6d, 0x19, 0x2a, 0x41, 0x3e, 0x7f, 0x0a, 0xe6, - 0x0c, 0x88, 0x75, 0xdf, 0xf2, 0x88, 0x85, 0xdc, 0x22, 0xb7, 0xc5, 0xed, 0xcc, 0xed, 0x6f, 0xcb, - 0xc3, 0xf3, 0x96, 0xab, 0x3d, 0x68, 0x25, 0x7f, 0xdb, 0x11, 0x33, 0x4a, 0xf2, 0x34, 0x5f, 0x03, - 0x40, 0x47, 0x8e, 0x63, 0x61, 0x1c, 0x70, 0x65, 0x29, 0xd7, 0xd7, 0xa3, 0xb8, 0x8e, 0x62, 0xa4, - 0xa2, 0x12, 0x88, 0x19, 0x5f, 0x82, 0x80, 0xff, 0x17, 0xac, 0x38, 0x96, 0x5b, 0xc7, 0xd0, 0x6e, - 0xd4, 0x0d, 0x68, 0x43, 0x53, 0xa5, 0x77, 0xcc, 0x6d, 0x71, 0x3b, 0x9f, 0x57, 0x7e, 0x0b, 0xe0, - 0x6f, 0x3a, 0xe2, 0x57, 0xa6, 0x45, 0xfe, 0x69, 0x69, 0xb2, 0x8e, 0x1c, 0x26, 0x1b, 0xfb, 0xd9, - 0xc5, 0x46, 0xb3, 0x4c, 0xda, 0x1e, 0xc4, 0xf2, 0x89, 0x4b, 0xba, 0x1d, 0x51, 0x68, 0xab, 0x8e, - 0x7d, 0x20, 0x0d, 0xa1, 0x94, 0x94, 0x65, 0xc7, 0x72, 0xcf, 0xa0, 0xdd, 0xa8, 0xc6, 0x6b, 0xfc, - 0x09, 0x58, 0x66, 0x08, 0xe4, 0xd7, 0x55, 0xc3, 0xf0, 0x21, 0xc6, 0xc5, 0x3c, 0x8d, 0xbd, 0xd9, - 0xed, 0x88, 0xc5, 0x90, 0x6d, 0x00, 0x22, 0x29, 0x4b, 0xf1, 0xda, 0x61, 0xb8, 0x14, 0x50, 0x5d, - 0x46, 0x8a, 0xc7, 0x54, 0x33, 0x69, 0xaa, 0x01, 0x88, 0xa4, 0x2c, 0xc5, 0x6b, 0x11, 0xd5, 0x31, - 0x28, 0x78, 0x2d, 0xad, 0x09, 0xdb, 0xc5, 0x02, 0x95, 0x77, 0x55, 0x0e, 0xfd, 0x26, 0x47, 0x7e, - 0x93, 0x0f, 0xdd, 0x76, 0xa5, 0xf8, 0xe2, 0xf9, 0xee, 0x2a, 0xd3, 0x5d, 0xf7, 0xdb, 0x1e, 0x41, - 0xf2, 0xef, 0x2d, 0xed, 0x14, 0xb6, 0x15, 0x76, 0x9a, 0xff, 0x11, 0xcc, 0x5c, 0xaa, 0x76, 0x0b, - 0x16, 0x3f, 0xa3, 0x34, 0x1b, 0x51, 0x95, 0x02, 0x93, 0x25, 0x4a, 0x64, 0x45, 0x75, 0x0e, 0xd1, - 0x07, 0xb3, 0xff, 0xdd, 0x88, 0x99, 0xc7, 0x1b, 0x31, 0x23, 0x6d, 0x02, 0x61, 0xd0, 0x4e, 0x0a, - 0xc4, 0x1e, 0x72, 0x31, 0x94, 0xfe, 0xcf, 0x81, 0xa5, 0x1a, 0x36, 0x7f, 0x31, 0x2c, 0x32, 0x25, - 0xaf, 0xfd, 0x3c, 0x4c, 0xd3, 0x2c, 0xd5, 0x94, 0xef, 0x76, 0xc4, 0x85, 0x50, 0xd3, 0x31, 0x4a, - 0x3a, 0x60, 0xb1, 0xe7, 0xb5, 0xba, 0xaf, 0x12, 0xc8, 0x9c, 0x55, 0x9d, 0xd0, 0x55, 0x55, 0xa8, - 0x77, 0x3b, 0xe2, 0x7a, 0x18, 0x28, 0x45, 0x25, 0x29, 0x0b, 0x7a, 0x9f, 0xbf, 0xf9, 0xab, 0xe1, - 0x66, 0x0e, 0x0d, 0xf5, 0xeb, 0x14, 0x8d, 0x9c, 0xa8, 0x99, 0x00, 0x8a, 0xe9, 0xa2, 0xc4, 0x15, - 0x7b, 0xcf, 0x81, 0xb9, 0x1a, 0x36, 0xd9, 0x39, 0x38, 0xdc, 0xfe, 0xdc, 0xc7, 0xb3, 0x7f, 0xf6, - 0x49, 0xf6, 0xff, 0x09, 0x14, 0x54, 0x07, 0xb5, 0x5c, 0x42, 0x6b, 0x35, 0x81, 0x6f, 0x19, 0x3c, - 0x21, 0xc2, 0x1a, 0x58, 0x49, 0xe4, 0x19, 0xe7, 0xff, 0x2a, 0x4b, 0xfb, 0x63, 0x05, 0x9a, 0x96, - 0xab, 0x40, 0x63, 0x0a, 0x32, 0x9c, 0x83, 0xb5, 0x5e, 0x8e, 0xd8, 0xd7, 0x53, 0x52, 0x6c, 0x75, - 0x3b, 0xe2, 0x66, 0x5a, 0x8a, 0x04, 0x4c, 0x52, 0x56, 0xe2, 0xf5, 0x33, 0x5f, 0x1f, 0xca, 0x6a, - 0x60, 0x12, 0xb3, 0xe6, 0x46, 0xb3, 0x26, 0x60, 0x49, 0xd6, 0x2a, 0x26, 0x83, 0x3a, 0xe7, 0x9f, - 0xaa, 0x73, 0x93, 0x36, 0x88, 0x94, 0x9e, 0x91, 0xdc, 0x7c, 0x8d, 0xbe, 0x3e, 0xcf, 0x86, 0x81, - 0x45, 0xeb, 0xc1, 0x8c, 0x64, 0xfd, 0x40, 0x18, 0x68, 0x68, 0xe7, 0xd1, 0x00, 0xad, 0xcc, 0x06, - 0xa1, 0xae, 0xdf, 0x8a, 0x1c, 0x7d, 0x5d, 0xec, 0x70, 0xb0, 0x2d, 0x3d, 0x72, 0x60, 0xbe, 0x86, - 0xcd, 0x3f, 0x5c, 0xe3, 0x93, 0xf7, 0x6f, 0x03, 0xac, 0xf5, 0x65, 0x3a, 0x25, 0x49, 0xf7, 0x9f, - 0xe5, 0x41, 0xae, 0x86, 0x4d, 0xfe, 0x02, 0x2c, 0xa6, 0x3f, 0x1a, 0xbe, 0x19, 0xd5, 0xb3, 0x07, - 0x27, 0x82, 0xb0, 0x3f, 0x39, 0x36, 0xce, 0xa4, 0x09, 0xe6, 0xfb, 0x27, 0xc7, 0xce, 0x18, 0x92, - 0x3e, 0xa4, 0xf0, 0xfd, 0xa4, 0xc8, 0x38, 0xd8, 0xdf, 0x60, 0x36, 0x6e, 0x7a, 0xdb, 0x63, 0x4e, - 0x47, 0x20, 0xe1, 0xdb, 0x09, 0x40, 0x31, 0xfb, 0x05, 0x58, 0x4c, 0xb7, 0x94, 0x71, 0xea, 0xa5, - 0xb0, 0x63, 0xd5, 0x1b, 0xf5, 0xb4, 0x34, 0x00, 0x12, 0xef, 0xe0, 0xcb, 0x31, 0x0c, 0x3d, 0x98, - 0xb0, 0x3b, 0x11, 0x2c, 0x8a, 0x51, 0x39, 0xbe, 0xbd, 0x2f, 0x71, 0x77, 0xf7, 0x25, 0xee, 0xdd, - 0x7d, 0x89, 0xbb, 0x7e, 0x28, 0x65, 0xee, 0x1e, 0x4a, 0x99, 0xd7, 0x0f, 0xa5, 0xcc, 0x5f, 0xdf, - 0x8d, 0x1d, 0x63, 0x57, 0xf1, 0x57, 0x2a, 0x1d, 0x68, 0x5a, 0x81, 0x5a, 0xf2, 0x87, 0x0f, 0x01, - 0x00, 0x00, 0xff, 0xff, 0xa1, 0x2b, 0xfd, 0x07, 0x8a, 0x0b, 0x00, 0x00, + // 861 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x56, 0xcd, 0x6a, 0xf3, 0x46, + 0x14, 0xb5, 0x6c, 0x7f, 0x6e, 0x3a, 0xe1, 0xfb, 0x92, 0x28, 0x3f, 0x38, 0x22, 0x58, 0x41, 0x49, + 0x69, 0x48, 0x89, 0xd4, 0xb8, 0x94, 0x42, 0x36, 0x25, 0x8e, 0x1b, 0x48, 0x83, 0xa1, 0x28, 0x69, + 0x17, 0xa5, 0x60, 0xf4, 0x33, 0x56, 0x85, 0x25, 0x8d, 0xa2, 0x19, 0x9b, 0xb8, 0x4f, 0xd0, 0x5d, + 0xb3, 0xee, 0x2a, 0x0f, 0xd1, 0x87, 0x08, 0x2d, 0x94, 0x2c, 0x4b, 0x17, 0x6e, 0x49, 0xa0, 0x64, + 0xed, 0x27, 0x28, 0x1a, 0x8d, 0x64, 0x59, 0xfe, 0xc1, 0x84, 0x7a, 0xd3, 0x9d, 0x98, 0x39, 0x73, + 0xee, 0xdc, 0x73, 0xcf, 0xdc, 0x2b, 0x20, 0x1a, 0x08, 0xbb, 0x08, 0x2b, 0x98, 0x68, 0x6d, 0xdb, + 0xb3, 0x94, 0xee, 0xb1, 0x0e, 0x89, 0x76, 0xac, 0x90, 0x5b, 0xd9, 0x0f, 0x10, 0x41, 0xfc, 0x56, + 0x04, 0x90, 0x19, 0x40, 0x66, 0x00, 0x61, 0xdb, 0x42, 0xc8, 0x72, 0xa0, 0x42, 0x51, 0x7a, 0xa7, + 0xa5, 0x68, 0x5e, 0x2f, 0x3a, 0x22, 0x88, 0xd9, 0x2d, 0x62, 0xbb, 0x10, 0x13, 0xcd, 0xf5, 0x19, + 0x60, 0xc3, 0x42, 0x16, 0xa2, 0x9f, 0x4a, 0xf8, 0xc5, 0x56, 0xb7, 0xa3, 0x48, 0xcd, 0x68, 0x83, + 0x85, 0x8d, 0xb6, 0x2a, 0xec, 0x96, 0xba, 0x86, 0x61, 0x72, 0x45, 0x03, 0xd9, 0x1e, 0xdb, 0xdf, + 0x9f, 0x92, 0x45, 0x7c, 0x69, 0x8a, 0x92, 0x7e, 0x2b, 0x02, 0xbe, 0x81, 0xad, 0xb3, 0x00, 0x6a, + 0x04, 0x7e, 0xa3, 0x39, 0xb6, 0xa9, 0x11, 0x14, 0xf0, 0x97, 0x60, 0xd9, 0x84, 0xd8, 0x08, 0x6c, + 0x9f, 0xd8, 0xc8, 0x2b, 0x73, 0xbb, 0xdc, 0xc1, 0x72, 0x75, 0x4f, 0x9e, 0x9c, 0xb7, 0x5c, 0x1f, + 0x42, 0x6b, 0xc5, 0x87, 0xbe, 0x98, 0x53, 0xd3, 0xa7, 0xf9, 0x06, 0x00, 0x06, 0x72, 0x5d, 0x1b, + 0xe3, 0x90, 0x2b, 0x4f, 0xb9, 0x3e, 0x9c, 0xc6, 0x75, 0x96, 0x20, 0x55, 0x8d, 0x40, 0xcc, 0xf8, + 0x52, 0x04, 0xfc, 0x0f, 0x60, 0xdd, 0xb5, 0xbd, 0x26, 0x86, 0x4e, 0xab, 0x69, 0x42, 0x07, 0x5a, + 0x1a, 0xbd, 0x63, 0x61, 0x97, 0x3b, 0x78, 0xbf, 0xf6, 0x65, 0x08, 0xff, 0xb3, 0x2f, 0xee, 0x5b, + 0x36, 0xf9, 0xbe, 0xa3, 0xcb, 0x06, 0x72, 0x15, 0xc7, 0xf6, 0xa0, 0xe2, 0xe8, 0xee, 0x11, 0x36, + 0xdb, 0x4a, 0xb7, 0xaa, 0x90, 0x9e, 0x0f, 0xb1, 0x7c, 0xe1, 0x91, 0x41, 0x5f, 0x14, 0x7a, 0x9a, + 0xeb, 0x9c, 0x48, 0x13, 0x08, 0x25, 0x75, 0xcd, 0xb5, 0xbd, 0x2b, 0xe8, 0xb4, 0xea, 0xc9, 0x1a, + 0x7f, 0x01, 0xd6, 0x18, 0x02, 0x05, 0x4d, 0xcd, 0x34, 0x03, 0x88, 0x71, 0xb9, 0x48, 0x23, 0xef, + 0x0c, 0xfa, 0x62, 0x39, 0x62, 0x1b, 0x83, 0x48, 0xea, 0x6a, 0xb2, 0x76, 0x1a, 0x2d, 0x85, 0x54, + 0xdd, 0x58, 0xef, 0x84, 0xea, 0x4d, 0x96, 0x6a, 0x0c, 0x22, 0xa9, 0xab, 0xc9, 0x5a, 0x4c, 0x75, + 0x0e, 0x4a, 0x7e, 0x47, 0x6f, 0xc3, 0x5e, 0xb9, 0x44, 0xc5, 0xdd, 0x90, 0x23, 0xb7, 0xc9, 0xb1, + 0xdb, 0xe4, 0x53, 0xaf, 0x57, 0x2b, 0xff, 0xfa, 0xcb, 0xd1, 0x06, 0x53, 0xdd, 0x08, 0x7a, 0x3e, + 0x41, 0xf2, 0x57, 0x1d, 0xfd, 0x12, 0xf6, 0x54, 0x76, 0x9a, 0xff, 0x14, 0xbc, 0xe9, 0x6a, 0x4e, + 0x07, 0x96, 0xdf, 0xa3, 0x34, 0xdb, 0x71, 0x8d, 0x42, 0x8b, 0xa5, 0x0a, 0x64, 0xc7, 0x55, 0x8e, + 0xd0, 0x27, 0x4b, 0x3f, 0xde, 0x8b, 0xb9, 0x97, 0x7b, 0x31, 0x27, 0xed, 0x00, 0x61, 0xdc, 0x4c, + 0x2a, 0xc4, 0x3e, 0xf2, 0x30, 0x94, 0x7e, 0x2a, 0x80, 0xd5, 0x06, 0xb6, 0xbe, 0x30, 0x6d, 0xb2, + 0x20, 0xa7, 0x7d, 0x3e, 0x49, 0xd3, 0x3c, 0xd5, 0x94, 0x1f, 0xf4, 0xc5, 0x77, 0x91, 0xa6, 0x33, + 0x94, 0x6c, 0x83, 0x95, 0xa1, 0xd3, 0x9a, 0x81, 0x46, 0x20, 0xf3, 0x55, 0x6d, 0x2e, 0x4f, 0xd5, + 0xa1, 0x31, 0xe8, 0x8b, 0x5b, 0x51, 0x98, 0x0c, 0x91, 0xa4, 0xbe, 0x33, 0x46, 0xbc, 0xcd, 0x77, + 0x27, 0x1b, 0x39, 0xb2, 0xd3, 0xf9, 0xc2, 0x4c, 0x9c, 0xaa, 0x97, 0x00, 0xca, 0xd9, 0x82, 0x24, + 0xd5, 0xfa, 0x87, 0x03, 0xcb, 0x0d, 0x6c, 0xb1, 0x73, 0x70, 0xb2, 0xf5, 0xb9, 0xff, 0xce, 0xfa, + 0xf9, 0x57, 0x59, 0xff, 0x33, 0x50, 0xd2, 0x5c, 0xd4, 0xf1, 0x08, 0xad, 0xd3, 0x1c, 0x9e, 0x65, + 0xf0, 0x94, 0x08, 0x9b, 0x60, 0x3d, 0x95, 0x67, 0x92, 0xff, 0xef, 0x79, 0xda, 0x19, 0x6b, 0xd0, + 0xb2, 0x3d, 0x15, 0x9a, 0x0b, 0x90, 0xe1, 0x1a, 0x6c, 0x0e, 0x73, 0xc4, 0x81, 0x91, 0x91, 0x62, + 0x77, 0xd0, 0x17, 0x77, 0xb2, 0x52, 0xa4, 0x60, 0x92, 0xba, 0x9e, 0xac, 0x5f, 0x05, 0xc6, 0x44, + 0x56, 0x13, 0x93, 0x84, 0xb5, 0x30, 0x9d, 0x35, 0x05, 0x4b, 0xb3, 0xd6, 0x31, 0x19, 0xd7, 0xb9, + 0xf8, 0x5a, 0x9d, 0xdb, 0xb4, 0x39, 0x64, 0xf4, 0x8c, 0xe5, 0xe6, 0x1b, 0xf4, 0xe5, 0xf9, 0x0e, + 0x0c, 0x2d, 0xda, 0x0c, 0xa7, 0x23, 0xeb, 0x05, 0xc2, 0x58, 0x33, 0xbb, 0x8e, 0x47, 0x67, 0x6d, + 0x29, 0x0c, 0x75, 0xf7, 0x97, 0xc8, 0xd1, 0xb7, 0xc5, 0x0e, 0x87, 0xdb, 0xd2, 0x0b, 0x07, 0xde, + 0x36, 0xb0, 0xf5, 0xb5, 0x67, 0xfe, 0xef, 0xfd, 0xdb, 0x02, 0x9b, 0x23, 0x99, 0x2e, 0x48, 0xd2, + 0xea, 0xcf, 0x45, 0x50, 0x68, 0x60, 0x8b, 0xbf, 0x01, 0x2b, 0xd9, 0xdf, 0x85, 0xc3, 0x69, 0xfd, + 0x7a, 0x7c, 0x1a, 0x08, 0xd5, 0xf9, 0xb1, 0x49, 0x26, 0x6d, 0xf0, 0x76, 0x74, 0x6a, 0x1c, 0xcc, + 0x20, 0x19, 0x41, 0x0a, 0x1f, 0xcf, 0x8b, 0x4c, 0x82, 0x7d, 0x07, 0x96, 0x92, 0xa6, 0xb7, 0x37, + 0xe3, 0x74, 0x0c, 0x12, 0x3e, 0x9a, 0x03, 0x94, 0xb0, 0xdf, 0x80, 0x95, 0x6c, 0x4b, 0x99, 0xa5, + 0x5e, 0x06, 0x3b, 0x53, 0xbd, 0x69, 0x4f, 0x4b, 0x07, 0x20, 0xf5, 0x0e, 0x3e, 0x98, 0xc1, 0x30, + 0x84, 0x09, 0x47, 0x73, 0xc1, 0xe2, 0x18, 0xb5, 0xfa, 0xc3, 0x53, 0x85, 0x7b, 0x7c, 0xaa, 0x70, + 0x7f, 0x3f, 0x55, 0xb8, 0xbb, 0xe7, 0x4a, 0xee, 0xf1, 0xb9, 0x92, 0xfb, 0xe3, 0xb9, 0x92, 0xfb, + 0xf6, 0x70, 0xc6, 0x10, 0xbb, 0x4d, 0xfe, 0x4e, 0xe9, 0x38, 0xd3, 0x4b, 0xd4, 0x90, 0x9f, 0xfc, + 0x1b, 0x00, 0x00, 0xff, 0xff, 0xab, 0x32, 0x44, 0xf0, 0x82, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1831,7 +1831,7 @@ func (m *MsgEditValidator) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Dec + var v github_com_line_lbm_sdk_v2_types.Dec m.CommissionRate = &v if err := m.CommissionRate.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1867,7 +1867,7 @@ func (m *MsgEditValidator) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - var v github_com_cosmos_cosmos_sdk_types.Int + var v github_com_line_lbm_sdk_v2_types.Int m.MinSelfDelegation = &v if err := m.MinSelfDelegation.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index 90923c0fab..d7bc10a193 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -7,8 +7,8 @@ import ( "strings" "time" - abci "github.com/tendermint/tendermint/abci/types" - tmprotocrypto "github.com/tendermint/tendermint/proto/tendermint/crypto" + abci "github.com/line/ostracon/abci/types" + ostprotocrypto "github.com/line/ostracon/proto/ostracon/crypto" "gopkg.in/yaml.v2" "github.com/line/lbm-sdk/v2/codec" @@ -111,7 +111,7 @@ func (v Validators) Swap(i, j int) { // ValidatorsByVotingPower implements sort.Interface for []Validator based on // the VotingPower and Address fields. // The validators are sorted first by their voting power (descending). Secondary index - Address (ascending). -// Copied from tendermint/types/validator_set.go +// Copied from ostracon/types/validator_set.go type ValidatorsByVotingPower []Validator func (valz ValidatorsByVotingPower) Len() int { return len(valz) } @@ -480,16 +480,16 @@ func (v Validator) ConsPubKey() (cryptotypes.PubKey, error) { } -// TmConsPublicKey casts Validator.ConsensusPubkey to tmprotocrypto.PubKey. -func (v Validator) TmConsPublicKey() (tmprotocrypto.PublicKey, error) { +// TmConsPublicKey casts Validator.ConsensusPubkey to ostprotocrypto.PubKey. +func (v Validator) TmConsPublicKey() (ostprotocrypto.PublicKey, error) { pk, err := v.ConsPubKey() if err != nil { - return tmprotocrypto.PublicKey{}, err + return ostprotocrypto.PublicKey{}, err } tmPk, err := cryptocodec.ToTmProtoPublicKey(pk) if err != nil { - return tmprotocrypto.PublicKey{}, err + return ostprotocrypto.PublicKey{}, err } return tmPk, nil diff --git a/x/staking/types/validator_test.go b/x/staking/types/validator_test.go index 06f48d65ce..bc7ddb02fb 100644 --- a/x/staking/types/validator_test.go +++ b/x/staking/types/validator_test.go @@ -5,9 +5,9 @@ import ( "sort" "testing" + osttypes "github.com/line/ostracon/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - tmtypes "github.com/tendermint/tendermint/types" "github.com/line/lbm-sdk/v2/codec/legacy" cryptocodec "github.com/line/lbm-sdk/v2/crypto/codec" @@ -271,7 +271,7 @@ func TestValidatorsSortDeterminism(t *testing.T) { } } -// Check SortTendermint sorts the same as tendermint +// Check SortTendermint sorts the same as ostracon func TestValidatorsSortTendermint(t *testing.T) { vals := make([]types.Validator, 100) @@ -289,12 +289,12 @@ func TestValidatorsSortTendermint(t *testing.T) { valz := types.Validators(vals) - // create expected tendermint validators by converting to tendermint then sorting + // create expected ostracon validators by converting to ostracon then sorting expectedVals, err := teststaking.ToTmValidators(valz) require.NoError(t, err) - sort.Sort(tmtypes.ValidatorsByVotingPower(expectedVals)) + sort.Sort(osttypes.ValidatorsByVotingPower(expectedVals)) - // sort in SDK and then convert to tendermint + // sort in SDK and then convert to ostracon sort.Sort(types.ValidatorsByVotingPower(valz)) actualVals, err := teststaking.ToTmValidators(valz) require.NoError(t, err) @@ -304,7 +304,7 @@ func TestValidatorsSortTendermint(t *testing.T) { func TestValidatorToTm(t *testing.T) { vals := make(types.Validators, 10) - expected := make([]*tmtypes.Validator, 10) + expected := make([]*osttypes.Validator, 10) for i := range vals { pk := ed25519.GenPrivKey().PubKey() @@ -314,7 +314,7 @@ func TestValidatorToTm(t *testing.T) { vals[i] = val tmPk, err := cryptocodec.ToTmPubKeyInterface(pk) require.NoError(t, err) - expected[i] = tmtypes.NewValidator(tmPk, val.ConsensusPower()) + expected[i] = osttypes.NewValidator(tmPk, val.ConsensusPower()) } vs, err := teststaking.ToTmValidators(vals) require.NoError(t, err) diff --git a/x/upgrade/abci.go b/x/upgrade/abci.go index a6edbdad8a..8c049b3f97 100644 --- a/x/upgrade/abci.go +++ b/x/upgrade/abci.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" "github.com/line/lbm-sdk/v2/telemetry" sdk "github.com/line/lbm-sdk/v2/types" diff --git a/x/upgrade/abci_test.go b/x/upgrade/abci_test.go index 4546df358d..17f9c7cc54 100644 --- a/x/upgrade/abci_test.go +++ b/x/upgrade/abci_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/simapp" storetypes "github.com/line/lbm-sdk/v2/store/types" @@ -54,7 +54,7 @@ func setupTest(height int64, skip map[int64]bool) TestSuite { ) s.keeper = app.UpgradeKeeper - s.ctx = app.BaseApp.NewContext(false, tmproto.Header{Height: height, Time: time.Now()}) + s.ctx = app.BaseApp.NewContext(false, ostproto.Header{Height: height, Time: time.Now()}) s.module = upgrade.NewAppModule(s.keeper) s.querier = s.module.LegacyQuerierHandler(app.LegacyAmino()) @@ -123,7 +123,7 @@ func TestCanOverwriteScheduleUpgrade(t *testing.T) { func VerifyDoIBCLastBlock(t *testing.T) { t.Log("Verify that chain committed to consensus state on the last height it will commit") nextValsHash := []byte("nextValsHash") - newCtx := s.ctx.WithBlockHeader(tmproto.Header{ + newCtx := s.ctx.WithBlockHeader(ostproto.Header{ Height: s.ctx.BlockHeight(), NextValidatorsHash: nextValsHash, }) diff --git a/x/upgrade/keeper/grpc_query_test.go b/x/upgrade/keeper/grpc_query_test.go index 3d1d501401..7751af6cc2 100644 --- a/x/upgrade/keeper/grpc_query_test.go +++ b/x/upgrade/keeper/grpc_query_test.go @@ -5,8 +5,8 @@ import ( "fmt" "testing" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/simapp" @@ -24,7 +24,7 @@ type UpgradeTestSuite struct { func (suite *UpgradeTestSuite) SetupTest() { suite.app = simapp.Setup(false) - suite.ctx = suite.app.BaseApp.NewContext(false, tmproto.Header{}) + suite.ctx = suite.app.BaseApp.NewContext(false, ostproto.Header{}) queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, suite.app.InterfaceRegistry()) types.RegisterQueryServer(queryHelper, suite.app.UpgradeKeeper) diff --git a/x/upgrade/keeper/keeper.go b/x/upgrade/keeper/keeper.go index 7295bca12d..78f0e5768d 100644 --- a/x/upgrade/keeper/keeper.go +++ b/x/upgrade/keeper/keeper.go @@ -8,8 +8,8 @@ import ( "path" "path/filepath" - "github.com/tendermint/tendermint/libs/log" - tmos "github.com/tendermint/tendermint/libs/os" + "github.com/line/ostracon/libs/log" + ostos "github.com/line/ostracon/libs/os" "github.com/line/lbm-sdk/v2/codec" "github.com/line/lbm-sdk/v2/store/prefix" @@ -257,7 +257,7 @@ func (k Keeper) DumpUpgradeInfoToDisk(height int64, name string) error { // GetUpgradeInfoPath returns the upgrade info file path func (k Keeper) GetUpgradeInfoPath() (string, error) { upgradeInfoFileDir := path.Join(k.getHomeDir(), "data") - err := tmos.EnsureDir(upgradeInfoFileDir, os.ModePerm) + err := ostos.EnsureDir(upgradeInfoFileDir, os.ModePerm) if err != nil { return "", err } diff --git a/x/upgrade/keeper/keeper_test.go b/x/upgrade/keeper/keeper_test.go index d112dbcd8f..c49888c325 100644 --- a/x/upgrade/keeper/keeper_test.go +++ b/x/upgrade/keeper/keeper_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/line/lbm-sdk/v2/simapp" store "github.com/line/lbm-sdk/v2/store/types" @@ -36,7 +36,7 @@ func (s *KeeperTestSuite) SetupTest() { s.T().Log("home dir:", homeDir) s.homeDir = homeDir s.app = app - s.ctx = app.BaseApp.NewContext(false, tmproto.Header{ + s.ctx = app.BaseApp.NewContext(false, ostproto.Header{ Time: time.Now(), Height: 10, }) diff --git a/x/upgrade/keeper/querier.go b/x/upgrade/keeper/querier.go index 2750d9dd99..1f5b4319a5 100644 --- a/x/upgrade/keeper/querier.go +++ b/x/upgrade/keeper/querier.go @@ -7,7 +7,7 @@ import ( "github.com/line/lbm-sdk/v2/x/upgrade/types" - abci "github.com/tendermint/tendermint/abci/types" + abci "github.com/line/ostracon/abci/types" sdk "github.com/line/lbm-sdk/v2/types" sdkerrors "github.com/line/lbm-sdk/v2/types/errors" diff --git a/x/upgrade/module.go b/x/upgrade/module.go index 7881e9ea07..5d7f000397 100644 --- a/x/upgrade/module.go +++ b/x/upgrade/module.go @@ -6,8 +6,8 @@ import ( "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" + abci "github.com/line/ostracon/abci/types" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" "github.com/line/lbm-sdk/v2/client" "github.com/line/lbm-sdk/v2/codec" diff --git a/x/upgrade/types/plan_test.go b/x/upgrade/types/plan_test.go index a631e452eb..fdaada1419 100644 --- a/x/upgrade/types/plan_test.go +++ b/x/upgrade/types/plan_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" clienttypes "github.com/line/lbm-sdk/v2/x/ibc/core/02-client/types" ibctmtypes "github.com/line/lbm-sdk/v2/x/ibc/light-clients/07-tendermint/types" @@ -217,7 +217,7 @@ func TestShouldExecute(t *testing.T) { for name, tc := range cases { tc := tc // copy to local variable for scopelint t.Run(name, func(t *testing.T) { - ctx := sdk.NewContext(nil, tmproto.Header{Height: tc.ctxHeight, Time: tc.ctxTime}, false, log.NewNopLogger()) + ctx := sdk.NewContext(nil, ostproto.Header{Height: tc.ctxHeight, Time: tc.ctxTime}, false, log.NewNopLogger()) should := tc.p.ShouldExecute(ctx) assert.Equal(t, tc.expected, should) }) diff --git a/x/upgrade/types/query.pb.go b/x/upgrade/types/query.pb.go index b4db8485a0..fb87832483 100644 --- a/x/upgrade/types/query.pb.go +++ b/x/upgrade/types/query.pb.go @@ -316,38 +316,38 @@ func init() { } var fileDescriptor_4a334d07ad8374f0 = []byte{ - // 487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x41, 0x8b, 0x13, 0x31, - 0x18, 0x6d, 0xb4, 0x2e, 0x98, 0xde, 0x82, 0xd4, 0x6e, 0x59, 0x46, 0x89, 0x8b, 0x08, 0x6e, 0x93, - 0xdd, 0xee, 0x4d, 0x41, 0x5c, 0x17, 0x17, 0x0f, 0x22, 0x5a, 0xf1, 0xe2, 0xa5, 0xa4, 0x9d, 0x38, - 0x1d, 0x9c, 0x26, 0xd9, 0x49, 0x22, 0x96, 0x65, 0x2f, 0xfe, 0x02, 0xc1, 0xbb, 0x37, 0x6f, 0xfe, - 0x10, 0x8f, 0x0b, 0x5e, 0xf4, 0x26, 0xad, 0x3f, 0x44, 0x26, 0xc9, 0x48, 0x97, 0x76, 0x66, 0xc5, - 0x53, 0x3b, 0x93, 0xf7, 0xbe, 0xf7, 0xbe, 0xbc, 0x37, 0x10, 0x8f, 0xa5, 0x9e, 0x4a, 0x4d, 0xad, - 0x4a, 0x72, 0x16, 0x73, 0xfa, 0x6e, 0x6f, 0xc4, 0x0d, 0xdb, 0xa3, 0xc7, 0x96, 0xe7, 0x33, 0xa2, - 0x72, 0x69, 0x24, 0x6a, 0x7b, 0x0c, 0x09, 0x18, 0x12, 0x30, 0xdd, 0xcd, 0x44, 0xca, 0x24, 0xe3, - 0xd4, 0xa1, 0x46, 0xf6, 0x0d, 0x65, 0x22, 0x50, 0xba, 0x5b, 0xe1, 0x88, 0xa9, 0x94, 0x32, 0x21, - 0xa4, 0x61, 0x26, 0x95, 0x42, 0x87, 0xd3, 0xed, 0x0a, 0xd1, 0x52, 0xc0, 0xa1, 0xf0, 0x26, 0xbc, - 0xfe, 0xa2, 0x70, 0x71, 0x68, 0xf3, 0x9c, 0x0b, 0xf3, 0x3c, 0x63, 0x62, 0xc0, 0x8f, 0x2d, 0xd7, - 0x06, 0x3f, 0x85, 0x9d, 0xd5, 0x23, 0xad, 0xa4, 0xd0, 0x1c, 0xed, 0xc2, 0xa6, 0xca, 0x98, 0xe8, - 0x80, 0x9b, 0xe0, 0x4e, 0xab, 0xbf, 0x45, 0xd6, 0x9b, 0x27, 0x8e, 0xe3, 0x90, 0xb8, 0x17, 0x84, - 0x0e, 0x94, 0xca, 0x52, 0x1e, 0x2f, 0x09, 0x21, 0x04, 0x9b, 0x82, 0x4d, 0xb9, 0x1b, 0x76, 0x75, - 0xe0, 0xfe, 0xe3, 0x7e, 0x10, 0x3f, 0x07, 0x0f, 0xe2, 0x6d, 0xb8, 0x31, 0xe1, 0x69, 0x32, 0x31, - 0x8e, 0x71, 0x79, 0x10, 0x9e, 0xf0, 0x63, 0x88, 0x1d, 0xe7, 0x95, 0x77, 0x11, 0x1f, 0x16, 0x68, - 0xa1, 0xad, 0x7e, 0x69, 0x98, 0xe1, 0xa5, 0xda, 0x0d, 0xd8, 0xca, 0x98, 0x36, 0xc3, 0x73, 0x23, - 0x60, 0xf1, 0xea, 0x89, 0x1f, 0x63, 0xe1, 0xad, 0xda, 0x31, 0xc1, 0xc5, 0x33, 0xd8, 0x09, 0xeb, - 0xc6, 0xc3, 0x71, 0x09, 0x19, 0xea, 0x02, 0x13, 0xae, 0xe5, 0x1a, 0xf1, 0x01, 0x91, 0x32, 0x3b, - 0x72, 0x20, 0x66, 0x83, 0xb6, 0x5d, 0x3b, 0xb7, 0xff, 0xb5, 0x09, 0xaf, 0x38, 0x5d, 0xf4, 0x19, - 0xc0, 0xd6, 0xd2, 0xa5, 0x23, 0x5a, 0x75, 0xbd, 0x15, 0xc9, 0x75, 0x77, 0xff, 0x9d, 0xe0, 0x97, - 0xc1, 0x3b, 0x1f, 0xbe, 0xff, 0xfe, 0x74, 0xe9, 0x36, 0xda, 0xa6, 0x15, 0xad, 0x19, 0x7b, 0xd2, - 0xb0, 0xc8, 0x12, 0x7d, 0x01, 0xb0, 0xb5, 0x14, 0xcc, 0x05, 0x06, 0x57, 0x13, 0xbf, 0xc0, 0xe0, - 0x9a, 0xcc, 0xf1, 0xbe, 0x33, 0xd8, 0x43, 0x77, 0xab, 0x0c, 0x32, 0x4f, 0x72, 0x06, 0xe9, 0x49, - 0xd1, 0xa1, 0x53, 0xf4, 0x13, 0xc0, 0xf6, 0xfa, 0x14, 0xd1, 0xbd, 0x5a, 0x07, 0xb5, 0x0d, 0xea, - 0xde, 0xff, 0x2f, 0x6e, 0x58, 0xe4, 0xc8, 0x2d, 0xf2, 0x10, 0x3d, 0xa0, 0xf5, 0xdf, 0xe7, 0x4a, - 0xa9, 0xe8, 0xc9, 0x52, 0x6d, 0x4f, 0x1f, 0x1d, 0x7d, 0x9b, 0x47, 0xe0, 0x6c, 0x1e, 0x81, 0x5f, - 0xf3, 0x08, 0x7c, 0x5c, 0x44, 0x8d, 0xb3, 0x45, 0xd4, 0xf8, 0xb1, 0x88, 0x1a, 0xaf, 0x77, 0x92, - 0xd4, 0x4c, 0xec, 0x88, 0x8c, 0xe5, 0xb4, 0xd4, 0xf0, 0x3f, 0x3d, 0x1d, 0xbf, 0xa5, 0xef, 0xff, - 0x0a, 0x9a, 0x99, 0xe2, 0x7a, 0xb4, 0xe1, 0xca, 0xb9, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0xee, - 0x4b, 0xe2, 0xe8, 0xa4, 0x04, 0x00, 0x00, + // 493 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x53, 0x41, 0x6f, 0xd3, 0x30, + 0x18, 0xad, 0xa1, 0x4c, 0xc2, 0xbd, 0x59, 0xa8, 0x74, 0xd5, 0x14, 0x90, 0x99, 0x10, 0x02, 0x6a, + 0x6f, 0xdd, 0x0d, 0x24, 0xc4, 0x18, 0x20, 0x0e, 0x08, 0x41, 0x11, 0x17, 0x2e, 0x95, 0xd3, 0x98, + 0x34, 0x22, 0xb5, 0xbd, 0xd8, 0x9e, 0xa8, 0xa6, 0x5d, 0xf8, 0x05, 0x48, 0xdc, 0xb9, 0x71, 0xe3, + 0x87, 0x70, 0x9c, 0xc4, 0x05, 0x6e, 0xa8, 0xe5, 0x87, 0xa0, 0x38, 0x2e, 0xea, 0xd4, 0x24, 0x45, + 0xbb, 0x25, 0xf1, 0x7b, 0xdf, 0x7b, 0x9f, 0xdf, 0x0b, 0xc4, 0x23, 0xa9, 0x27, 0x52, 0x53, 0xab, + 0xe2, 0x8c, 0x45, 0x9c, 0x1e, 0xed, 0x86, 0xdc, 0xb0, 0x5d, 0x7a, 0x68, 0x79, 0x36, 0x25, 0x2a, + 0x93, 0x46, 0xa2, 0x76, 0x81, 0x21, 0x1e, 0x43, 0x3c, 0xa6, 0xbb, 0x19, 0x4b, 0x19, 0xa7, 0x9c, + 0x3a, 0x54, 0x68, 0xdf, 0x51, 0x26, 0x3c, 0xa5, 0xbb, 0xe5, 0x8f, 0x98, 0x4a, 0x28, 0x13, 0x42, + 0x1a, 0x66, 0x12, 0x29, 0xb4, 0x3f, 0xdd, 0xae, 0x10, 0x5d, 0x08, 0x38, 0x14, 0xde, 0x84, 0x57, + 0x5f, 0xe5, 0x2e, 0x0e, 0x6c, 0x96, 0x71, 0x61, 0x5e, 0xa6, 0x4c, 0x0c, 0xf8, 0xa1, 0xe5, 0xda, + 0xe0, 0xe7, 0xb0, 0xb3, 0x7a, 0xa4, 0x95, 0x14, 0x9a, 0xa3, 0x1d, 0xd8, 0x54, 0x29, 0x13, 0x1d, + 0x70, 0x1d, 0xdc, 0x6a, 0xf5, 0xb7, 0x48, 0xb9, 0x79, 0xe2, 0x38, 0x0e, 0x89, 0x7b, 0x5e, 0x68, + 0x5f, 0xa9, 0x34, 0xe1, 0xd1, 0x92, 0x10, 0x42, 0xb0, 0x29, 0xd8, 0x84, 0xbb, 0x61, 0x97, 0x07, + 0xee, 0x19, 0xf7, 0xbd, 0xf8, 0x19, 0xb8, 0x17, 0x6f, 0xc3, 0x8d, 0x31, 0x4f, 0xe2, 0xb1, 0x71, + 0x8c, 0x8b, 0x03, 0xff, 0x86, 0x9f, 0x40, 0xec, 0x38, 0x6f, 0x0a, 0x17, 0xd1, 0x41, 0x8e, 0x16, + 0xda, 0xea, 0xd7, 0x86, 0x19, 0xbe, 0x50, 0xbb, 0x06, 0x5b, 0x29, 0xd3, 0x66, 0x78, 0x66, 0x04, + 0xcc, 0x3f, 0x3d, 0x2b, 0xc6, 0x58, 0x78, 0xa3, 0x76, 0x8c, 0x77, 0xf1, 0x02, 0x76, 0xfc, 0xba, + 0xd1, 0x70, 0xb4, 0x80, 0x0c, 0x75, 0x8e, 0xf1, 0xd7, 0x72, 0x85, 0x14, 0x01, 0x91, 0x45, 0x76, + 0x64, 0x5f, 0x4c, 0x07, 0x6d, 0x5b, 0x3a, 0xb7, 0xff, 0xad, 0x09, 0x2f, 0x39, 0x5d, 0xf4, 0x05, + 0xc0, 0xd6, 0xd2, 0xa5, 0x23, 0x5a, 0x75, 0xbd, 0x15, 0xc9, 0x75, 0x77, 0xfe, 0x9f, 0x50, 0x2c, + 0x83, 0xef, 0x7e, 0xfc, 0xf1, 0xe7, 0xf3, 0x85, 0x9b, 0x68, 0x9b, 0x56, 0xb4, 0x66, 0x54, 0x90, + 0x86, 0x79, 0x96, 0xe8, 0x2b, 0x80, 0xad, 0xa5, 0x60, 0xd6, 0x18, 0x5c, 0x4d, 0x7c, 0x8d, 0xc1, + 0x92, 0xcc, 0xf1, 0x9e, 0x33, 0xd8, 0x43, 0x77, 0xaa, 0x0c, 0xb2, 0x82, 0xe4, 0x0c, 0xd2, 0xe3, + 0xbc, 0x43, 0x27, 0xe8, 0x17, 0x80, 0xed, 0xf2, 0x14, 0xd1, 0xbd, 0x5a, 0x07, 0xb5, 0x0d, 0xea, + 0xde, 0x3f, 0x17, 0xd7, 0x2f, 0xf2, 0xd4, 0x2d, 0xf2, 0x10, 0x3d, 0xa0, 0xf5, 0xff, 0xe7, 0x4a, + 0xa9, 0xe8, 0xf1, 0x52, 0x6d, 0x4f, 0x1e, 0x3d, 0xfe, 0x3e, 0x0b, 0xc0, 0xe9, 0x2c, 0x00, 0xbf, + 0x67, 0x01, 0xf8, 0x34, 0x0f, 0x1a, 0xa7, 0xf3, 0xa0, 0xf1, 0x73, 0x1e, 0x34, 0xde, 0xde, 0x8e, + 0x13, 0x33, 0xb6, 0x21, 0x19, 0xc9, 0x09, 0x4d, 0x13, 0xc1, 0x69, 0x1a, 0x4e, 0x7a, 0x3a, 0x7a, + 0x4f, 0x8f, 0xfa, 0xf4, 0xc3, 0x3f, 0x39, 0x33, 0x55, 0x5c, 0x87, 0x1b, 0xae, 0x9a, 0x7b, 0x7f, + 0x03, 0x00, 0x00, 0xff, 0xff, 0x0d, 0x92, 0xe0, 0xbe, 0xa2, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/upgrade/types/storeloader_test.go b/x/upgrade/types/storeloader_test.go index 001751af33..b81272e5ff 100644 --- a/x/upgrade/types/storeloader_test.go +++ b/x/upgrade/types/storeloader_test.go @@ -7,11 +7,11 @@ import ( "path/filepath" "testing" + abci "github.com/line/ostracon/abci/types" + "github.com/line/ostracon/libs/log" + ostproto "github.com/line/ostracon/proto/ostracon/types" + dbm "github.com/line/tm-db/v2" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/libs/log" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - dbm "github.com/tendermint/tm-db" "github.com/line/lbm-sdk/v2/baseapp" "github.com/line/lbm-sdk/v2/store/rootmulti" @@ -125,7 +125,7 @@ func TestSetLoader(t *testing.T) { require.Nil(t, err) for i := int64(2); i <= upgradeHeight-1; i++ { - origapp.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: i}}) + origapp.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: i}}) res := origapp.Commit() require.NotNil(t, res.Data) } @@ -141,7 +141,7 @@ func TestSetLoader(t *testing.T) { require.Nil(t, err) // "execute" one block - app.BeginBlock(abci.RequestBeginBlock{Header: tmproto.Header{Height: upgradeHeight}}) + app.BeginBlock(abci.RequestBeginBlock{Header: ostproto.Header{Height: upgradeHeight}}) res := app.Commit() require.NotNil(t, res.Data) diff --git a/x/upgrade/types/upgrade.pb.go b/x/upgrade/types/upgrade.pb.go index 6bf9192b53..bfaec1b4d1 100644 --- a/x/upgrade/types/upgrade.pb.go +++ b/x/upgrade/types/upgrade.pb.go @@ -8,8 +8,8 @@ import ( _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" - _ "github.com/golang/protobuf/ptypes/timestamp" types "github.com/line/lbm-sdk/v2/codec/types" + _ "google.golang.org/protobuf/types/known/timestamppb" io "io" math "math" math_bits "math/bits" @@ -177,34 +177,34 @@ func init() { } var fileDescriptor_ccf2a7d4d7b48dca = []byte{ - // 426 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0x31, 0x6f, 0xd4, 0x30, - 0x18, 0x8d, 0x69, 0x5a, 0x51, 0xdf, 0x66, 0x8e, 0x12, 0x4e, 0xc5, 0x89, 0x4e, 0x0c, 0x37, 0x80, - 0xa3, 0x16, 0x09, 0xa1, 0x6e, 0xa4, 0x3b, 0xaa, 0x52, 0x58, 0x90, 0x50, 0xe5, 0x24, 0xbe, 0x9c, - 0xc1, 0xb1, 0xa3, 0xd8, 0x07, 0xe4, 0x57, 0xd0, 0x9f, 0xc0, 0xcf, 0xb9, 0xb1, 0x63, 0xa7, 0x42, - 0xef, 0x16, 0xe6, 0xfe, 0x02, 0x14, 0x3b, 0x41, 0x08, 0x3a, 0x76, 0xf2, 0xf7, 0x3d, 0xbd, 0xef, - 0x3d, 0xfb, 0xf9, 0x83, 0x4f, 0x73, 0xa5, 0x2b, 0xa5, 0xe3, 0x65, 0x5d, 0x36, 0xb4, 0x60, 0xf1, - 0xe7, 0x83, 0x8c, 0x19, 0x7a, 0x30, 0xf4, 0xa4, 0x6e, 0x94, 0x51, 0x68, 0xcf, 0xb1, 0xc8, 0x80, - 0xf6, 0xac, 0xc9, 0xe3, 0x52, 0xa9, 0x52, 0xb0, 0xd8, 0xb2, 0xb2, 0xe5, 0x3c, 0xa6, 0xb2, 0x75, - 0x23, 0x93, 0x71, 0xa9, 0x4a, 0x65, 0xcb, 0xb8, 0xab, 0x7a, 0x34, 0xfc, 0x77, 0xc0, 0xf0, 0x8a, - 0x69, 0x43, 0xab, 0xda, 0x11, 0xa6, 0x37, 0x00, 0xfa, 0x27, 0x82, 0x4a, 0x84, 0xa0, 0x2f, 0x69, - 0xc5, 0x02, 0x10, 0x81, 0xd9, 0x6e, 0x6a, 0x6b, 0xf4, 0x0a, 0xfa, 0x1d, 0x3f, 0xb8, 0x17, 0x81, - 0xd9, 0xe8, 0x70, 0x42, 0x9c, 0x18, 0x19, 0xc4, 0xc8, 0xdb, 0x41, 0x2c, 0xb9, 0xbf, 0xba, 0x0a, - 0xbd, 0xf3, 0x1f, 0x21, 0x48, 0xed, 0x04, 0xda, 0x83, 0x3b, 0x0b, 0xc6, 0xcb, 0x85, 0x09, 0xb6, - 0x22, 0x30, 0xdb, 0x4a, 0xfb, 0xae, 0x73, 0xe1, 0x72, 0xae, 0x02, 0xdf, 0xb9, 0x74, 0x35, 0xfa, - 0x08, 0x1f, 0xf6, 0xef, 0x2c, 0xce, 0x72, 0xc1, 0x99, 0x34, 0x67, 0xda, 0x50, 0xc3, 0x82, 0x6d, - 0x6b, 0x3b, 0xfe, 0xcf, 0xf6, 0xb5, 0x6c, 0x93, 0xe8, 0xe6, 0x2a, 0xdc, 0x6f, 0x69, 0x25, 0x8e, - 0xa6, 0xb7, 0x0e, 0x4f, 0xd3, 0x07, 0x03, 0x7e, 0x6c, 0xe1, 0xd3, 0x0e, 0x3d, 0xf2, 0x7f, 0x7d, - 0x0f, 0xc1, 0xf4, 0x1b, 0x80, 0x8f, 0x4e, 0xd5, 0xdc, 0x7c, 0xa1, 0x0d, 0x7b, 0xe7, 0x58, 0x27, - 0x8d, 0xaa, 0x95, 0xa6, 0x02, 0x8d, 0xe1, 0xb6, 0xe1, 0x46, 0x0c, 0x41, 0xb8, 0x06, 0x45, 0x70, - 0x54, 0x30, 0x9d, 0x37, 0xbc, 0x36, 0x5c, 0x49, 0x1b, 0xc8, 0x6e, 0xfa, 0x37, 0x84, 0x5e, 0x42, - 0xbf, 0x16, 0x54, 0xda, 0xf7, 0x8e, 0x0e, 0xf7, 0xc9, 0xed, 0x3f, 0x48, 0xba, 0xac, 0x13, 0xbf, - 0x4b, 0x2b, 0xb5, 0xfc, 0xfe, 0x46, 0x1f, 0xe0, 0x93, 0x63, 0x2a, 0x73, 0x26, 0xee, 0xf8, 0x5a, - 0x4e, 0x3e, 0x79, 0xb3, 0xba, 0xc6, 0xde, 0xe5, 0x35, 0xf6, 0x56, 0x6b, 0x0c, 0x2e, 0xd6, 0x18, - 0xfc, 0x5c, 0x63, 0x70, 0xbe, 0xc1, 0xde, 0xc5, 0x06, 0x7b, 0x97, 0x1b, 0xec, 0xbd, 0x7f, 0x56, - 0x72, 0xb3, 0x58, 0x66, 0x24, 0x57, 0x55, 0xdc, 0xaf, 0xa8, 0x3b, 0x9e, 0xeb, 0xe2, 0x53, 0xfc, - 0xf5, 0xcf, 0xbe, 0x9a, 0xb6, 0x66, 0x3a, 0xdb, 0xb1, 0x7f, 0xf1, 0xe2, 0x77, 0x00, 0x00, 0x00, - 0xff, 0xff, 0xca, 0x9e, 0x7a, 0x5d, 0xce, 0x02, 0x00, 0x00, + // 429 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x52, 0xcf, 0x6e, 0xd3, 0x30, + 0x1c, 0x8e, 0x59, 0x36, 0x31, 0xf7, 0x66, 0xca, 0x08, 0xd5, 0x70, 0xa2, 0x8a, 0x43, 0x85, 0x84, + 0xad, 0x15, 0x09, 0xa1, 0xdd, 0xe8, 0xae, 0x1c, 0xa6, 0x0c, 0x2e, 0x48, 0x68, 0x72, 0x52, 0x37, + 0x35, 0x38, 0x76, 0x14, 0xbb, 0x83, 0x3e, 0x05, 0x7b, 0x04, 0x1e, 0xa7, 0xc7, 0x1d, 0x77, 0x1a, + 0xac, 0xbd, 0x70, 0xde, 0x13, 0xa0, 0xd8, 0x09, 0x42, 0xd0, 0x23, 0xb7, 0xdf, 0xef, 0xd3, 0xf7, + 0xc7, 0xfe, 0x6c, 0xf8, 0x34, 0xd7, 0xa6, 0xd4, 0x86, 0x2e, 0xaa, 0xa2, 0x66, 0x53, 0x4e, 0x2f, + 0x8e, 0x32, 0x6e, 0xd9, 0x51, 0xb7, 0x93, 0xaa, 0xd6, 0x56, 0xa3, 0x03, 0xcf, 0x22, 0x1d, 0xda, + 0xb2, 0x06, 0x8f, 0x0b, 0xad, 0x0b, 0xc9, 0xa9, 0x63, 0x65, 0x8b, 0x19, 0x65, 0x6a, 0xe9, 0x25, + 0x83, 0x7e, 0xa1, 0x0b, 0xed, 0x46, 0xda, 0x4c, 0x2d, 0x1a, 0xff, 0x2d, 0xb0, 0xa2, 0xe4, 0xc6, + 0xb2, 0xb2, 0xf2, 0x84, 0xe1, 0x1d, 0x80, 0xe1, 0xa9, 0x64, 0x0a, 0x21, 0x18, 0x2a, 0x56, 0xf2, + 0x08, 0x24, 0x60, 0xb4, 0x9f, 0xba, 0x19, 0xbd, 0x82, 0x61, 0xc3, 0x8f, 0xee, 0x25, 0x60, 0xd4, + 0x1b, 0x0f, 0x88, 0x37, 0x23, 0x9d, 0x19, 0x79, 0xdb, 0x99, 0x4d, 0xee, 0xaf, 0x6e, 0xe2, 0xe0, + 0xf2, 0x7b, 0x0c, 0x52, 0xa7, 0x40, 0x07, 0x70, 0x6f, 0xce, 0x45, 0x31, 0xb7, 0xd1, 0x4e, 0x02, + 0x46, 0x3b, 0x69, 0xbb, 0x35, 0x29, 0x42, 0xcd, 0x74, 0x14, 0xfa, 0x94, 0x66, 0x46, 0x1f, 0xe1, + 0xc3, 0xf6, 0x9e, 0xd3, 0xf3, 0x5c, 0x0a, 0xae, 0xec, 0xb9, 0xb1, 0xcc, 0xf2, 0x68, 0xd7, 0xc5, + 0xf6, 0xff, 0x89, 0x7d, 0xad, 0x96, 0x93, 0xe4, 0xee, 0x26, 0x3e, 0x5c, 0xb2, 0x52, 0x1e, 0x0f, + 0xb7, 0x8a, 0x87, 0xe9, 0x83, 0x0e, 0x3f, 0x71, 0xf0, 0x59, 0x83, 0x1e, 0x87, 0x3f, 0xbf, 0xc5, + 0x60, 0xf8, 0x15, 0xc0, 0x47, 0x67, 0x7a, 0x66, 0x3f, 0xb3, 0x9a, 0xbf, 0xf3, 0xac, 0xd3, 0x5a, + 0x57, 0xda, 0x30, 0x89, 0xfa, 0x70, 0xd7, 0x0a, 0x2b, 0xbb, 0x22, 0xfc, 0x82, 0x12, 0xd8, 0x9b, + 0x72, 0x93, 0xd7, 0xa2, 0xb2, 0x42, 0x2b, 0x57, 0xc8, 0x7e, 0xfa, 0x27, 0x84, 0x5e, 0xc2, 0xb0, + 0x92, 0x4c, 0xb9, 0xfb, 0xf6, 0xc6, 0x87, 0x64, 0xfb, 0x0b, 0x92, 0xa6, 0xeb, 0x49, 0xd8, 0xb4, + 0x95, 0x3a, 0x7e, 0x7b, 0xa2, 0x0f, 0xf0, 0xc9, 0x09, 0x53, 0x39, 0x97, 0xff, 0xf9, 0x58, 0xde, + 0x7e, 0xf2, 0x66, 0x75, 0x8b, 0x83, 0xeb, 0x5b, 0x1c, 0xac, 0xd6, 0x18, 0x5c, 0xad, 0x31, 0xf8, + 0xb1, 0xc6, 0xe0, 0x72, 0x83, 0x83, 0xab, 0x0d, 0x0e, 0xae, 0x37, 0x38, 0x78, 0xff, 0xac, 0x10, + 0x76, 0xbe, 0xc8, 0x48, 0xae, 0x4b, 0x2a, 0x85, 0xe2, 0x54, 0x66, 0xe5, 0x73, 0x33, 0xfd, 0x44, + 0x2f, 0xc6, 0xf4, 0xcb, 0xef, 0xdf, 0x6a, 0x97, 0x15, 0x37, 0xd9, 0x9e, 0x7b, 0x89, 0x17, 0xbf, + 0x02, 0x00, 0x00, 0xff, 0xff, 0xdd, 0x65, 0x6f, 0x59, 0xcc, 0x02, 0x00, 0x00, } func (this *Plan) Equal(that interface{}) bool {