diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 5aee1738..86f748e2 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -18,8 +18,12 @@ jobs: permissions: contents: read packages: write - runs-on: [self-hosted, linux] + runs-on: ubuntu-20.04 steps: + - name: Set up Go 1.18 + uses: actions/setup-go@v2 + with: + go-version: 1.18 - name: checkout uses: actions/checkout@v2 - name: Set up Docker Buildx @@ -64,7 +68,7 @@ jobs: permissions: contents: write packages: write - runs-on: [self-hosted, linux] + runs-on: ubuntu-20.04 steps: - name: checkout uses: actions/checkout@v2 @@ -108,18 +112,23 @@ jobs: integration-tests: environment: CI - runs-on: [self-hosted, linux] - needs: [sommelier-build, hardhat-build] + runs-on: ubuntu-20.04 + needs: [ sommelier-build, hardhat-build ] strategy: fail-fast: false matrix: - test_type: ["ScheduledCork", "AuctionModule", "CellarFees", "Incentives"] + test_type: [ + "Cork", + "ScheduledCork", + "AuctionModule", + "CellarFees", + "Incentives", + ] steps: - # Not needed on self hosted test runner that already has go installed - # - name: Set up Go 1.16 - # uses: actions/setup-go@v2 - # with: - # go-version: ^1.16 + - name: Set up Go 1.18 + uses: actions/setup-go@v2 + with: + go-version: 1.18 - name: checkout uses: actions/checkout@v2 - name: go-cache @@ -166,4 +175,9 @@ jobs: - name: Run end to end test run: ./integration_tests/integration_tests.test -test.failfast -test.v -test.run IntegrationTestSuite -testify.m Test${{ matrix.test_type }} env: + E2E_SKIP_CLEANUP: true ARCHIVE_NODE_URL: ${{ secrets.ARCHIVE_NODE_URL }} + - name: Clean up docker images + run: ./clean_slate.sh + - name: Remove testnet tempdir + run: sudo rm -rf somm-e2e-testnet* diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1f570225..5f5e4659 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -10,12 +10,12 @@ on: jobs: golangci: name: golangci-lint - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 timeout-minutes: 6 steps: - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: 1.15 + go-version: 1.18 - uses: actions/checkout@v2 - uses: technote-space/get-diff-action@v4 with: @@ -26,8 +26,7 @@ jobs: - uses: golangci/golangci-lint-action@v3 with: # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version. - version: v1.37 - skip-go-installation: true + version: v1.47 args: --timeout 10m github-token: ${{ secrets.github_token }} if: env.GIT_DIFF diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 82a6fbdf..d8d41570 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: jobs: goreleaser: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout uses: actions/checkout@v2.3.4 @@ -18,7 +18,7 @@ jobs: - uses: actions/setup-go@v2 with: - go-version: '1.16' + go-version: '1.18' - run: echo ":rocket::rocket::rocket:" > ../release_notes.md if: startsWith(github.ref, 'refs/tags/') diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 26124c8f..12e2b882 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -12,7 +12,7 @@ jobs: test: strategy: matrix: - go-version: [1.16] + go-version: [1.18] os: [ubuntu-latest] runs-on: ubuntu-latest steps: diff --git a/Makefile b/Makefile index 4f1f0204..c4cebe5c 100644 --- a/Makefile +++ b/Makefile @@ -351,7 +351,7 @@ tools-clean: # Integration tests # ##################### -ORCHESTRATOR_IMAGE := "ghcr.io/peggyjv/gravity-bridge-orchestrator:main" +ORCHESTRATOR_IMAGE := "ghcr.io/peggyjv/gravity-bridge-orchestrator:v2.0.4" e2e_build_images: e2e_clean_slate @docker pull $(ORCHESTRATOR_IMAGE) @@ -360,22 +360,7 @@ e2e_build_images: e2e_clean_slate @docker build -t ethereum:prebuilt -f integration_tests/ethereum/Dockerfile integration_tests/ethereum/ e2e_clean_slate: - @docker rm --force \ - $(shell docker ps -qa --filter="name=ethereum") \ - $(shell docker ps -qa --filter="name=sommelier") \ - $(shell docker ps -qa --filter="name=orchestrator") \ - 1>/dev/null \ - 2>/dev/null \ - || true - @docker wait \ - $(shell docker ps -qa --filter="name=ethereum") \ - $(shell docker ps -qa --filter="name=sommelier") \ - $(shell docker ps -qa --filter="name=orchestrator") \ - 1>/dev/null \ - 2>/dev/null \ - || true - @docker network prune --force 1>/dev/null 2>/dev/null || true - @cd integration_tests && go test -c + @./clean_slate.sh e2e_basic: e2e_clean_slate @integration_tests/integration_tests.test -test.run TestBasicChain -test.failfast -test.v || make -s fail diff --git a/app/app.go b/app/app.go index e1426d65..3853fcbb 100644 --- a/app/app.go +++ b/app/app.go @@ -29,6 +29,7 @@ import ( authtx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting" + vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" "github.com/cosmos/cosmos-sdk/x/authz" authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper" authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module" @@ -74,39 +75,48 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - ibctransfer "github.com/cosmos/ibc-go/v2/modules/apps/transfer" - ibctransferkeeper "github.com/cosmos/ibc-go/v2/modules/apps/transfer/keeper" - ibctransfertypes "github.com/cosmos/ibc-go/v2/modules/apps/transfer/types" - ibc "github.com/cosmos/ibc-go/v2/modules/core" - ibcclient "github.com/cosmos/ibc-go/v2/modules/core/02-client" - ibcclienttypes "github.com/cosmos/ibc-go/v2/modules/core/02-client/types" - ibcporttypes "github.com/cosmos/ibc-go/v2/modules/core/05-port/types" - ibchost "github.com/cosmos/ibc-go/v2/modules/core/24-host" - ibckeeper "github.com/cosmos/ibc-go/v2/modules/core/keeper" + ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts" + icahost "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host" + icahostkeeper "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/keeper" + icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types" + ibctransfer "github.com/cosmos/ibc-go/v3/modules/apps/transfer" + ibctransferkeeper "github.com/cosmos/ibc-go/v3/modules/apps/transfer/keeper" + ibctransfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" + ibc "github.com/cosmos/ibc-go/v3/modules/core" + ibcclient "github.com/cosmos/ibc-go/v3/modules/core/02-client" + ibcclienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types" + ibcporttypes "github.com/cosmos/ibc-go/v3/modules/core/05-port/types" + ibchost "github.com/cosmos/ibc-go/v3/modules/core/24-host" + ibckeeper "github.com/cosmos/ibc-go/v3/modules/core/keeper" "github.com/gorilla/mux" - "github.com/peggyjv/gravity-bridge/module/v2/x/gravity" - gravityclient "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/client" - gravitykeeper "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/keeper" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - appParams "github.com/peggyjv/sommelier/v4/app/params" - v4 "github.com/peggyjv/sommelier/v4/app/upgrades/v4" - "github.com/peggyjv/sommelier/v4/x/auction" - auctionclient "github.com/peggyjv/sommelier/v4/x/auction/client" - auctionkeeper "github.com/peggyjv/sommelier/v4/x/auction/keeper" - auctiontypes "github.com/peggyjv/sommelier/v4/x/auction/types" - "github.com/peggyjv/sommelier/v4/x/cellarfees" - cellarfeeskeeper "github.com/peggyjv/sommelier/v4/x/cellarfees/keeper" - cellarfeestypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" - "github.com/peggyjv/sommelier/v4/x/cork" - corkclient "github.com/peggyjv/sommelier/v4/x/cork/client" - corkkeeper "github.com/peggyjv/sommelier/v4/x/cork/keeper" - corktypes "github.com/peggyjv/sommelier/v4/x/cork/types" - "github.com/peggyjv/sommelier/v4/x/incentives" - incentiveskeeper "github.com/peggyjv/sommelier/v4/x/incentives/keeper" - incentivestypes "github.com/peggyjv/sommelier/v4/x/incentives/types" - "github.com/peggyjv/sommelier/v4/x/pubsub" - pubsubkeeper "github.com/peggyjv/sommelier/v4/x/pubsub/keeper" - pubsubtypes "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/gravity-bridge/module/v3/x/gravity" + gravityclient "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/client" + gravitykeeper "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/keeper" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + appParams "github.com/peggyjv/sommelier/v7/app/params" + v4 "github.com/peggyjv/sommelier/v7/app/upgrades/v4" + v5 "github.com/peggyjv/sommelier/v7/app/upgrades/v5" + v6 "github.com/peggyjv/sommelier/v7/app/upgrades/v6" + v7 "github.com/peggyjv/sommelier/v7/app/upgrades/v7" + "github.com/peggyjv/sommelier/v7/x/auction" + auctionclient "github.com/peggyjv/sommelier/v7/x/auction/client" + auctionkeeper "github.com/peggyjv/sommelier/v7/x/auction/keeper" + auctiontypes "github.com/peggyjv/sommelier/v7/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/cellarfees" + cellarfeeskeeper "github.com/peggyjv/sommelier/v7/x/cellarfees/keeper" + cellarfeestypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/x/cork" + corkclient "github.com/peggyjv/sommelier/v7/x/cork/client" + corkkeeper "github.com/peggyjv/sommelier/v7/x/cork/keeper" + corktypes "github.com/peggyjv/sommelier/v7/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/incentives" + incentiveskeeper "github.com/peggyjv/sommelier/v7/x/incentives/keeper" + incentivestypes "github.com/peggyjv/sommelier/v7/x/incentives/types" + "github.com/peggyjv/sommelier/v7/x/pubsub" + pubsubclient "github.com/peggyjv/sommelier/v7/x/pubsub/client" + pubsubkeeper "github.com/peggyjv/sommelier/v7/x/pubsub/keeper" + pubsubtypes "github.com/peggyjv/sommelier/v7/x/pubsub/types" "github.com/rakyll/statik/fs" abci "github.com/tendermint/tendermint/abci/types" tmjson "github.com/tendermint/tendermint/libs/json" @@ -151,11 +161,16 @@ var ( corkclient.RemoveProposalHandler, corkclient.ScheduledCorkProposalHandler, auctionclient.SetProposalHandler, + pubsubclient.AddPublisherProposalHandler, + pubsubclient.RemovePublisherProposalHandler, + pubsubclient.AddDefaultSubscriptionProposalHandler, + pubsubclient.RemoveDefaultSubscriptionProposalHandler, ), params.AppModuleBasic{}, crisis.AppModuleBasic{}, slashing.AppModuleBasic{}, ibc.AppModuleBasic{}, + ica.AppModuleBasic{}, feegrantmodule.AppModuleBasic{}, upgrade.AppModuleBasic{}, evidence.AppModuleBasic{}, @@ -165,8 +180,8 @@ var ( gravity.AppModuleBasic{}, cork.AppModuleBasic{}, cellarfees.AppModuleBasic{}, - auction.AppModuleBasic{}, incentives.AppModuleBasic{}, + auction.AppModuleBasic{}, pubsub.AppModuleBasic{}, ) @@ -179,10 +194,11 @@ var ( stakingtypes.NotBondedPoolName: {authtypes.Burner, authtypes.Staking}, govtypes.ModuleName: {authtypes.Burner}, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, + icatypes.ModuleName: nil, gravitytypes.ModuleName: {authtypes.Minter, authtypes.Burner}, cellarfeestypes.ModuleName: nil, - auctiontypes.ModuleName: nil, incentivestypes.ModuleName: nil, + auctiontypes.ModuleName: nil, pubsubtypes.ModuleName: nil, } @@ -222,6 +238,7 @@ type SommelierApp struct { UpgradeKeeper upgradekeeper.Keeper ParamsKeeper paramskeeper.Keeper IBCKeeper *ibckeeper.Keeper // IBC Keeper must be a pointer in the app, so we can SetRouter on it correctly + ICAHostKeeper icahostkeeper.Keeper EvidenceKeeper evidencekeeper.Keeper TransferKeeper ibctransferkeeper.Keeper GravityKeeper gravitykeeper.Keeper @@ -231,13 +248,14 @@ type SommelierApp struct { // Sommelier keepers CorkKeeper corkkeeper.Keeper CellarFeesKeeper cellarfeeskeeper.Keeper - AuctionKeeper auctionkeeper.Keeper IncentivesKeeper incentiveskeeper.Keeper + AuctionKeeper auctionkeeper.Keeper PubsubKeeper pubsubkeeper.Keeper // make capability scoped keepers public for test purposes (IBC only) ScopedIBCKeeper capabilitykeeper.ScopedKeeper ScopedTransferKeeper capabilitykeeper.ScopedKeeper + ScopedICAHostKeeper capabilitykeeper.ScopedKeeper // the module manager mm *module.Manager @@ -273,12 +291,27 @@ func NewSommelierApp( bApp.SetInterfaceRegistry(interfaceRegistry) keys := sdk.NewKVStoreKeys( - authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, - minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, - govtypes.StoreKey, paramstypes.StoreKey, ibchost.StoreKey, upgradetypes.StoreKey, - evidencetypes.StoreKey, ibctransfertypes.StoreKey, capabilitytypes.StoreKey, - gravitytypes.StoreKey, feegrant.StoreKey, authzkeeper.StoreKey, corktypes.StoreKey, - cellarfeestypes.StoreKey, auctiontypes.StoreKey, incentivestypes.StoreKey, + authtypes.StoreKey, + banktypes.StoreKey, + stakingtypes.StoreKey, + minttypes.StoreKey, + distrtypes.StoreKey, + slashingtypes.StoreKey, + govtypes.StoreKey, + paramstypes.StoreKey, + ibchost.StoreKey, + upgradetypes.StoreKey, + evidencetypes.StoreKey, + ibctransfertypes.StoreKey, + icahosttypes.StoreKey, + capabilitytypes.StoreKey, + gravitytypes.StoreKey, + feegrant.StoreKey, + authzkeeper.StoreKey, + corktypes.StoreKey, + incentivestypes.StoreKey, + auctiontypes.StoreKey, + cellarfeestypes.StoreKey, pubsubtypes.StoreKey, ) tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey) @@ -303,6 +336,7 @@ func NewSommelierApp( app.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey]) scopedIBCKeeper := app.CapabilityKeeper.ScopeToModule(ibchost.ModuleName) scopedTransferKeeper := app.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) + scopedICAHostKeeper := app.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) app.CapabilityKeeper.Seal() // add keepers @@ -342,7 +376,7 @@ func NewSommelierApp( ), ) - app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.BaseApp.MsgServiceRouter()) + app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.MsgServiceRouter()) // Create IBC Keeper app.IBCKeeper = ibckeeper.NewKeeper( @@ -357,10 +391,24 @@ func NewSommelierApp( // Create Transfer Keepers app.TransferKeeper = ibctransferkeeper.NewKeeper( appCodec, keys[ibctransfertypes.StoreKey], app.GetSubspace(ibctransfertypes.ModuleName), - app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, + app.IBCKeeper.ChannelKeeper, app.IBCKeeper.ChannelKeeper, &app.IBCKeeper.PortKeeper, app.AccountKeeper, app.BankKeeper, scopedTransferKeeper, ) transferModule := ibctransfer.NewAppModule(app.TransferKeeper) + transferIBCModule := ibctransfer.NewIBCModule(app.TransferKeeper) + + // Create the ICAHost Keeper + app.ICAHostKeeper = icahostkeeper.NewKeeper( + appCodec, + app.keys[icahosttypes.StoreKey], + app.GetSubspace(icahosttypes.SubModuleName), + app.IBCKeeper.ChannelKeeper, + &app.IBCKeeper.PortKeeper, + app.AccountKeeper, + scopedICAHostKeeper, + app.MsgServiceRouter(), + ) + icaHostIBCModule := icahost.NewIBCModule(app.ICAHostKeeper) // todo: check if default power reduction is appropriate app.GravityKeeper = gravitykeeper.NewKeeper( @@ -387,21 +435,25 @@ func NewSommelierApp( app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.GravityKeeper, app.AuctionKeeper, ) + app.IncentivesKeeper = incentiveskeeper.NewKeeper( + appCodec, keys[incentivestypes.StoreKey], app.GetSubspace(incentivestypes.ModuleName), app.DistrKeeper, app.BankKeeper, app.MintKeeper, + ) + app.PubsubKeeper = pubsubkeeper.NewKeeper( appCodec, keys[pubsubtypes.StoreKey], app.GetSubspace(pubsubtypes.ModuleName), app.StakingKeeper, app.GravityKeeper, ) + app.IncentivesKeeper = incentiveskeeper.NewKeeper( + appCodec, keys[incentivestypes.StoreKey], app.GetSubspace(incentivestypes.ModuleName), app.DistrKeeper, app.BankKeeper, app.MintKeeper, + ) + app.GravityKeeper = *app.GravityKeeper.SetHooks( gravitytypes.NewMultiGravityHooks( app.CorkKeeper.Hooks(), app.CellarFeesKeeper.Hooks(), )) - app.IncentivesKeeper = incentiveskeeper.NewKeeper( - appCodec, keys[incentivestypes.StoreKey], app.GetSubspace(incentivestypes.ModuleName), app.DistrKeeper, app.BankKeeper, app.MintKeeper, - ) - // register the proposal types govRouter := govtypes.NewRouter() govRouter.AddRoute(govtypes.RouterKey, govtypes.ProposalHandler). @@ -420,7 +472,9 @@ func NewSommelierApp( // Create static IBC router, add transfer route, then set and seal it ibcRouter := ibcporttypes.NewRouter() - ibcRouter.AddRoute(ibctransfertypes.ModuleName, transferModule) + ibcRouter. + AddRoute(ibctransfertypes.ModuleName, transferIBCModule). + AddRoute(icahosttypes.SubModuleName, icaHostIBCModule) app.IBCKeeper.SetRouter(ibcRouter) // create evidence keeper with router @@ -450,7 +504,6 @@ func NewSommelierApp( vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), capability.NewAppModule(appCodec, *app.CapabilityKeeper), - crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), @@ -461,14 +514,15 @@ func NewSommelierApp( upgrade.NewAppModule(app.UpgradeKeeper), evidence.NewAppModule(app.EvidenceKeeper), ibc.NewAppModule(app.IBCKeeper), + ica.NewAppModule(nil, &app.ICAHostKeeper), params.NewAppModule(app.ParamsKeeper), transferModule, gravity.NewAppModule(app.GravityKeeper, app.BankKeeper), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), cork.NewAppModule(app.CorkKeeper, appCodec), + incentives.NewAppModule(app.IncentivesKeeper, app.DistrKeeper, app.BankKeeper, app.MintKeeper, appCodec), cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec, app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.GravityKeeper, app.AuctionKeeper), auction.NewAppModule(app.AuctionKeeper, app.BankKeeper, app.AccountKeeper, appCodec), - incentives.NewAppModule(app.IncentivesKeeper, app.DistrKeeper, app.BankKeeper, app.MintKeeper, appCodec), pubsub.NewAppModule(appCodec, app.PubsubKeeper, app.StakingKeeper, app.GravityKeeper), ) @@ -478,17 +532,59 @@ func NewSommelierApp( // NOTE: staking module is required if HistoricalEntries param > 0 // NOTE: capability module's beginblocker must come before any modules using capabilities (e.g. IBC) app.mm.SetOrderBeginBlockers( - upgradetypes.ModuleName, capabilitytypes.ModuleName, minttypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName, - evidencetypes.ModuleName, stakingtypes.ModuleName, ibchost.ModuleName, ibctransfertypes.ModuleName, authtypes.ModuleName, - banktypes.ModuleName, govtypes.ModuleName, crisistypes.ModuleName, genutiltypes.ModuleName, authz.ModuleName, feegrant.ModuleName, - paramstypes.ModuleName, incentivestypes.ModuleName, gravitytypes.ModuleName, corktypes.ModuleName, auctiontypes.ModuleName, cellarfeestypes.ModuleName, + upgradetypes.ModuleName, + capabilitytypes.ModuleName, + minttypes.ModuleName, + distrtypes.ModuleName, + slashingtypes.ModuleName, + evidencetypes.ModuleName, + stakingtypes.ModuleName, + authtypes.ModuleName, + banktypes.ModuleName, + govtypes.ModuleName, + crisistypes.ModuleName, + ibchost.ModuleName, + ibctransfertypes.ModuleName, + icatypes.ModuleName, + genutiltypes.ModuleName, + authz.ModuleName, + feegrant.ModuleName, + paramstypes.ModuleName, + vestingtypes.ModuleName, + incentivestypes.ModuleName, + gravitytypes.ModuleName, + corktypes.ModuleName, + cellarfeestypes.ModuleName, + auctiontypes.ModuleName, pubsubtypes.ModuleName, ) + + // NOTE gov must come before staking app.mm.SetOrderEndBlockers( - crisistypes.ModuleName, govtypes.ModuleName, stakingtypes.ModuleName, ibchost.ModuleName, ibctransfertypes.ModuleName, - capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, slashingtypes.ModuleName, - minttypes.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, authz.ModuleName, feegrant.ModuleName, paramstypes.ModuleName, - upgradetypes.ModuleName, incentivestypes.ModuleName, gravitytypes.ModuleName, corktypes.ModuleName, auctiontypes.ModuleName, cellarfeestypes.ModuleName, + crisistypes.ModuleName, + govtypes.ModuleName, + stakingtypes.ModuleName, + ibchost.ModuleName, + ibctransfertypes.ModuleName, + icatypes.ModuleName, + capabilitytypes.ModuleName, + authtypes.ModuleName, + banktypes.ModuleName, + distrtypes.ModuleName, + slashingtypes.ModuleName, + minttypes.ModuleName, + genutiltypes.ModuleName, + evidencetypes.ModuleName, + authz.ModuleName, + feegrant.ModuleName, + paramstypes.ModuleName, + upgradetypes.ModuleName, + vestingtypes.ModuleName, + incentivestypes.ModuleName, + gravitytypes.ModuleName, + corktypes.ModuleName, + cellarfeestypes.ModuleName, + auctiontypes.ModuleName, pubsubtypes.ModuleName, ) @@ -502,11 +598,31 @@ func NewSommelierApp( // if a module listed after crisis has invariants that depend on their own state being initialized, // their keeper will panic when a nil state is returned. app.mm.SetOrderInitGenesis( - capabilitytypes.ModuleName, authtypes.ModuleName, banktypes.ModuleName, distrtypes.ModuleName, - stakingtypes.ModuleName, slashingtypes.ModuleName, govtypes.ModuleName, minttypes.ModuleName, - ibchost.ModuleName, genutiltypes.ModuleName, evidencetypes.ModuleName, ibctransfertypes.ModuleName, - gravitytypes.ModuleName, authz.ModuleName, feegrant.ModuleName, incentivestypes.ModuleName, corktypes.ModuleName, - auctiontypes.ModuleName, cellarfeestypes.ModuleName, pubsubtypes.ModuleName, crisistypes.ModuleName, + capabilitytypes.ModuleName, + authtypes.ModuleName, + banktypes.ModuleName, + distrtypes.ModuleName, + govtypes.ModuleName, + stakingtypes.ModuleName, + slashingtypes.ModuleName, + minttypes.ModuleName, + crisistypes.ModuleName, + genutiltypes.ModuleName, + ibchost.ModuleName, + ibctransfertypes.ModuleName, + icatypes.ModuleName, + evidencetypes.ModuleName, + authz.ModuleName, + feegrant.ModuleName, + paramstypes.ModuleName, + upgradetypes.ModuleName, + vestingtypes.ModuleName, + gravitytypes.ModuleName, + incentivestypes.ModuleName, + corktypes.ModuleName, + cellarfeestypes.ModuleName, + auctiontypes.ModuleName, + pubsubtypes.ModuleName, ) app.mm.RegisterInvariants(&app.CrisisKeeper) @@ -535,6 +651,7 @@ func NewSommelierApp( ibc.NewAppModule(app.IBCKeeper), authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), cork.NewAppModule(app.CorkKeeper, appCodec), + incentives.NewAppModule(app.IncentivesKeeper, app.DistrKeeper, app.BankKeeper, app.MintKeeper, appCodec), cellarfees.NewAppModule(app.CellarFeesKeeper, appCodec, app.AccountKeeper, app.BankKeeper, app.MintKeeper, app.CorkKeeper, app.GravityKeeper, app.AuctionKeeper), auction.NewAppModule(app.AuctionKeeper, app.BankKeeper, app.AccountKeeper, appCodec), pubsub.NewAppModule(appCodec, app.PubsubKeeper, app.StakingKeeper, app.GravityKeeper), @@ -573,6 +690,7 @@ func NewSommelierApp( } app.ScopedIBCKeeper = scopedIBCKeeper app.ScopedTransferKeeper = scopedTransferKeeper + app.ScopedICAHostKeeper = scopedICAHostKeeper return app } @@ -766,11 +884,12 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) paramsKeeper.Subspace(ibchost.ModuleName) + paramsKeeper.Subspace(icahosttypes.SubModuleName) paramsKeeper.Subspace(gravitytypes.ModuleName) paramsKeeper.Subspace(corktypes.ModuleName) paramsKeeper.Subspace(cellarfeestypes.ModuleName) - paramsKeeper.Subspace(auctiontypes.ModuleName) paramsKeeper.Subspace(incentivestypes.ModuleName) + paramsKeeper.Subspace(auctiontypes.ModuleName) paramsKeeper.Subspace(pubsubtypes.ModuleName) return paramsKeeper @@ -782,13 +901,39 @@ func (app *SommelierApp) setupUpgradeStoreLoaders() { panic(fmt.Sprintf("failed to read upgrade info from disk %s", err)) } - if upgradeInfo.Name == v4.UpgradeName && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) { - storeUpgrades := store.StoreUpgrades{ + if app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) { + return + } + + var storeUpgrades *store.StoreUpgrades = nil + + if upgradeInfo.Name == v4.UpgradeName { + storeUpgrades = &store.StoreUpgrades{ Added: []string{corktypes.ModuleName, cellarfeestypes.ModuleName}, Deleted: []string{"allocation"}, } + } + + if upgradeInfo.Name == v5.UpgradeName { + storeUpgrades = &store.StoreUpgrades{ + Added: []string{incentivestypes.ModuleName}, + } + } - app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, &storeUpgrades)) + if upgradeInfo.Name == v6.UpgradeName { + storeUpgrades = &store.StoreUpgrades{ + Added: []string{icahosttypes.SubModuleName}, + } + } + + if upgradeInfo.Name == v7.UpgradeName { + storeUpgrades = &store.StoreUpgrades{ + Added: []string{auctiontypes.ModuleName, pubsubtypes.ModuleName}, + } + } + + if storeUpgrades != nil { + app.SetStoreLoader(upgradetypes.UpgradeStoreLoader(upgradeInfo.Height, storeUpgrades)) } } @@ -802,4 +947,32 @@ func (app *SommelierApp) setupUpgradeHandlers() { app.BankKeeper, ), ) + + app.UpgradeKeeper.SetUpgradeHandler( + v5.UpgradeName, + v5.CreateUpgradeHandler( + app.mm, + app.configurator, + app.IncentivesKeeper, + ), + ) + + app.UpgradeKeeper.SetUpgradeHandler( + v6.UpgradeName, + v6.CreateUpgradeHandler( + app.mm, + app.configurator, + ), + ) + + app.UpgradeKeeper.SetUpgradeHandler( + v7.UpgradeName, + v7.CreateUpgradeHandler( + app.mm, + app.configurator, + app.AuctionKeeper, + app.CellarFeesKeeper, + app.PubsubKeeper, + ), + ) } diff --git a/app/encoding.go b/app/encoding.go index 002bd544..4aedb707 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -2,7 +2,7 @@ package app import ( "github.com/cosmos/cosmos-sdk/std" - "github.com/peggyjv/sommelier/v4/app/params" + "github.com/peggyjv/sommelier/v7/app/params" ) // MakeEncodingConfig creates an EncodingConfig for testing. This function diff --git a/app/export.go b/app/export.go index 1cecbe3d..9440de66 100644 --- a/app/export.go +++ b/app/export.go @@ -45,8 +45,7 @@ func (app *SommelierApp) ExportAppStateAndValidators( } // prepare for fresh start at zero height -// NOTE zero height genesis is a temporary feature which will be deprecated -// in favour of export at a block height +// NOTE zero height genesis is a temporary feature which will be deprecated in favour of export at a block height func (app *SommelierApp) prepForZeroHeightGenesis(ctx sdk.Context, jailAllowedAddrs []string) { applyAllowedAddrs := false diff --git a/app/params/config.go b/app/params/config.go index 7ae7a5ab..efb4fa2e 100644 --- a/app/params/config.go +++ b/app/params/config.go @@ -8,7 +8,7 @@ import ( const ( HumanCoinUnit = "somm" BaseCoinUnit = "usomm" - OsmoExponent = 6 + CoinExponent = 6 // Bech32PrefixAccAddr defines the Bech32 prefix of an account's address Bech32PrefixAccAddr = "somm" @@ -34,7 +34,7 @@ func init() { // func RegisterDenoms() { // sdk.RegisterDenom(HumanCoinUnit, sdk.OneDec()) -// sdk.RegisterDenom(BaseCoinUnit, sdk.NewDecWithPrec(1, OsmoExponent)) +// sdk.RegisterDenom(BaseCoinUnit, sdk.NewDecWithPrec(1, CoinExponent)) // } func SetAddressPrefixes() { diff --git a/app/sim_test.go b/app/sim_test.go index 939ad721..e29456e7 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -6,7 +6,7 @@ import ( "os" "testing" - sommelier "github.com/peggyjv/sommelier/v4/app" + sommelier "github.com/peggyjv/sommelier/v7/app" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" diff --git a/app/upgrades/v4/constants.go b/app/upgrades/v4/constants.go index eb037370..f024a90a 100644 --- a/app/upgrades/v4/constants.go +++ b/app/upgrades/v4/constants.go @@ -1,4 +1,4 @@ package v4 -// UgradeName defines the on-chain upgrade name for the Sommelier v4 upgrade +// UpgradeName defines the on-chain upgrade name for the Sommelier v4 upgrade const UpgradeName = "v4" diff --git a/app/upgrades/v4/upgrades.go b/app/upgrades/v4/upgrades.go index 198367aa..fccf1abe 100644 --- a/app/upgrades/v4/upgrades.go +++ b/app/upgrades/v4/upgrades.go @@ -6,9 +6,9 @@ import ( authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - cellarfeestypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" - corktypes "github.com/peggyjv/sommelier/v4/x/cork/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + cellarfeestypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" + corktypes "github.com/peggyjv/sommelier/v7/x/cork/types" ) func CreateUpgradeHandler( diff --git a/app/upgrades/v4/upgrades_test.go b/app/upgrades/v4/upgrades_test.go index c8bca150..001211e7 100644 --- a/app/upgrades/v4/upgrades_test.go +++ b/app/upgrades/v4/upgrades_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/keeper" - "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/keeper" + "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" "github.com/stretchr/testify/require" ) diff --git a/app/upgrades/v5/README.md b/app/upgrades/v5/README.md new file mode 100644 index 00000000..90235268 --- /dev/null +++ b/app/upgrades/v5/README.md @@ -0,0 +1,8 @@ +# v5 upgrade + +This upgrade moves Sommelier to major version 5. + +## Summary of changes + +* Add the incentives module to provide a way of distributing community pool funds on a per-block, pro-rata basis to incentivize stakers while cellar TVL is built over time into a meaningful staking return +* Pin to a version of the gravity module with ledger support \ No newline at end of file diff --git a/app/upgrades/v5/constants.go b/app/upgrades/v5/constants.go new file mode 100644 index 00000000..0be7a81b --- /dev/null +++ b/app/upgrades/v5/constants.go @@ -0,0 +1,4 @@ +package v5 + +// UpgradeName defines the on-chain upgrade name for the Sommelier v5 upgrade +const UpgradeName = "v5" diff --git a/app/upgrades/v5/upgrades.go b/app/upgrades/v5/upgrades.go new file mode 100644 index 00000000..bb34bd83 --- /dev/null +++ b/app/upgrades/v5/upgrades.go @@ -0,0 +1,47 @@ +package v5 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + appparams "github.com/peggyjv/sommelier/v7/app/params" + incentiveskeeper "github.com/peggyjv/sommelier/v7/x/incentives/keeper" + incentivestypes "github.com/peggyjv/sommelier/v7/x/incentives/types" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + incentivesKeeper incentiveskeeper.Keeper, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("v5 upgrade: entering handler") + + // We must manually run InitGenesis for incentives so we can adjust their values during the upgrade process. + // Setting the consensus version to 1 prevents RunMigrations from running InitGenesis itself. + fromVM[incentivestypes.ModuleName] = mm.Modules[incentivestypes.ModuleName].ConsensusVersion() + + ctx.Logger().Info("v5 upgrade: initializing incentives genesis state") + incentivesInitGenesis(ctx, incentivesKeeper) + + ctx.Logger().Info("v5 upgrade: running migrations and exiting handler") + return mm.RunMigrations(ctx, configurator, fromVM) + } +} + +// Launch the incentives module with 2 SOMM per block distribution and a cutoff height 5 million blocks past +// the upgrade height +func incentivesInitGenesis(ctx sdk.Context, incentivesKeeper incentiveskeeper.Keeper) { + genesisState := incentivestypes.DefaultGenesisState() + + upgradeHeight := uint64(7766725) + incentivesBlocks := uint64(5000000) + + params := incentivestypes.Params{ + DistributionPerBlock: sdk.NewCoin(appparams.BaseCoinUnit, sdk.NewInt(2000000)), + IncentivesCutoffHeight: upgradeHeight + incentivesBlocks, + } + genesisState.Params = params + + incentiveskeeper.InitGenesis(ctx, incentivesKeeper, genesisState) +} diff --git a/app/upgrades/v6/README.md b/app/upgrades/v6/README.md new file mode 100644 index 00000000..8254d4a7 --- /dev/null +++ b/app/upgrades/v6/README.md @@ -0,0 +1,10 @@ +# v6 upgrade + +This upgrade moves Sommelier to major version 6. + +## Summary of changes + +* Upgrade to cosmos-sdk 0.45.10 +* Upgrade to ibc-go 3.4.0 +* Add support for interchain accounts by adding the ICA host module +* Pin to a version of the gravity module with bugfixes for ledger support, setting delegate keys, and corresponding dependency upgrades diff --git a/app/upgrades/v6/constants.go b/app/upgrades/v6/constants.go new file mode 100644 index 00000000..357c6fe4 --- /dev/null +++ b/app/upgrades/v6/constants.go @@ -0,0 +1,4 @@ +package v6 + +// UpgradeName defines the on-chain upgrade name for the Sommelier v6 upgrade +const UpgradeName = "v6" diff --git a/app/upgrades/v6/upgrades.go b/app/upgrades/v6/upgrades.go new file mode 100644 index 00000000..00f9cf27 --- /dev/null +++ b/app/upgrades/v6/upgrades.go @@ -0,0 +1,62 @@ +package v6 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + distrtypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + ica "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts" + icacontrollertypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/controller/types" + icahosttypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/host/types" + icatypes "github.com/cosmos/ibc-go/v3/modules/apps/27-interchain-accounts/types" + transfertypes "github.com/cosmos/ibc-go/v3/modules/apps/transfer/types" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("v6 upgrade: entering handler") + + // set the ICS27 consensus version so InitGenesis is not run + fromVM[icatypes.ModuleName] = mm.Modules[icatypes.ModuleName].ConsensusVersion() + + // create ICS27 Controller submodule params, controller module not enabled. + controllerParams := icacontrollertypes.Params{} + + // create ICS27 Host submodule params + hostParams := icahosttypes.Params{ + HostEnabled: true, + AllowMessages: []string{ + sdk.MsgTypeURL(&banktypes.MsgSend{}), + sdk.MsgTypeURL(&banktypes.MsgMultiSend{}), + sdk.MsgTypeURL(&distrtypes.MsgSetWithdrawAddress{}), + sdk.MsgTypeURL(&distrtypes.MsgWithdrawDelegatorReward{}), + sdk.MsgTypeURL(&distrtypes.MsgWithdrawValidatorCommission{}), + sdk.MsgTypeURL(&distrtypes.MsgFundCommunityPool{}), + sdk.MsgTypeURL(&govtypes.MsgVote{}), + sdk.MsgTypeURL(&govtypes.MsgVoteWeighted{}), + sdk.MsgTypeURL(&stakingtypes.MsgDelegate{}), + sdk.MsgTypeURL(&stakingtypes.MsgUndelegate{}), + sdk.MsgTypeURL(&stakingtypes.MsgBeginRedelegate{}), + sdk.MsgTypeURL(&transfertypes.MsgTransfer{}), + }, + } + + // initialize ICS27 module + ctx.Logger().Info("v6 upgrade: initializing ICA module") + icamodule, correctTypecast := mm.Modules[icatypes.ModuleName].(ica.AppModule) + if !correctTypecast { + panic("mm.Modules[icatypes.ModuleName] is not of type ica.AppModule") + } + + icamodule.InitModule(ctx, controllerParams, hostParams) + + ctx.Logger().Info("v6 upgrade: running migrations and exiting handler") + return mm.RunMigrations(ctx, configurator, fromVM) + } +} diff --git a/app/upgrades/v7/README.md b/app/upgrades/v7/README.md new file mode 100644 index 00000000..35b49f5e --- /dev/null +++ b/app/upgrades/v7/README.md @@ -0,0 +1,11 @@ +# v7 upgrade + +This upgrade moves Sommelier to major version 7. + +## Summary of changes + +* Update the cork module to only use scheduled corks and attach an ID and status to cork execution +* Add the auction module to provide the capability of auctioning received cellar fee tokens in exchange for SOMM +* Update the cellarfees module to trigger auctions for balances stored in its module account based on amount of times fees have been sent +* Add the pubsub module to provide a method for coordinating publishers (strategy providers) and subscribers (validators) via subscription IDs (cellar addresses) to enable multi-strategist authenticaton and authorization to Steward +* Add the incentives module to provide a way of distributing community pool funds on a per-block, pro-rata basis to incentivize stakers while cellar TVL is built over time into a meaningful staking return diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go new file mode 100644 index 00000000..2e7bd2dd --- /dev/null +++ b/app/upgrades/v7/constants.go @@ -0,0 +1,501 @@ +package v7 + +// UpgradeName defines the on-chain upgrade name for the Sommelier v7 upgrade +const UpgradeName = "v7" + +// 7seas domain +const SevenSeasDomain = "7seas.capital" + +// TODO(bolten): update this +// CA certificate literals +// See source data at: https://github.com/PeggyJV/steward-registry +// data captured at commit cdee05a8bf97f264353e10ab65752710bfb85dc9 + +// Publisher CA certificate +const SevenSeasPublisherCA = `-----BEGIN CERTIFICATE----- +MIICGjCCAaCgAwIBAgIUc+HkMr23CFNHqHMujXNc5+2bd3cwCgYIKoZIzj0EAwMw +RDELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxIDAeBgNVBAoMF1Nl +dmVuIFNlYXMgU3RyYXRlZ3kgSW5jMB4XDTIyMDcwNjIzMjIxNVoXDTI0MDcwNTIz +MjIxNVowRDELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxIDAeBgNV +BAoMF1NldmVuIFNlYXMgU3RyYXRlZ3kgSW5jMHYwEAYHKoZIzj0CAQYFK4EEACID +YgAE2pprBwCCI0DoBtuX5+Xq+Uo5ZpH+SlTkh6bS46Lq/YICh5FpWGOLsjT51uTX +gyTD6gOzLKQjiWt7D18pqM5DldJ4lT9ZsEjQkpdn2IDNkMWvUKJlDdds9VUfk6Xb +QgtVo1MwUTAdBgNVHQ4EFgQUNugdj3bw6N5owK2p8JuYlJ91xtMwHwYDVR0jBBgw +FoAUNugdj3bw6N5owK2p8JuYlJ91xtMwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjO +PQQDAwNoADBlAjBcJBGQvx1oDQ3nBDLSWUl/F3EU0EUYwGkU/5jPlOLo9jEIeSBC +FbHA97/ROdzMYOICMQCBnUe1BU5dRki6/ToK16lqHHS3c1oX2953oWBmvZV5+auA +M12q1LwBzeHzVAr28q8= +-----END CERTIFICATE----- +` + +// Subscriber CA certificates +const FigmentSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICtjCCAjygAwIBAgIUUTtadL/U8YrQsevLZMj/32FjtE4wCgYIKoZIzj0EAwMw +gZExCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJ +bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxEDAOBgNVBAsMB0ZpZ21lbnQxODA2BgNV +BAMML3NvbW1lbGllci1zdGV3YXJkLnN0YWtpbmcucHJvZHVjdGlvbi5maWdtZW50 +LmlvMB4XDTIyMDUxODIzNDkwOFoXDTI0MDUxNzIzNDkwOFowgZExCzAJBgNVBAYT +AkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRn +aXRzIFB0eSBMdGQxEDAOBgNVBAsMB0ZpZ21lbnQxODA2BgNVBAMML3NvbW1lbGll +ci1zdGV3YXJkLnN0YWtpbmcucHJvZHVjdGlvbi5maWdtZW50LmlvMHYwEAYHKoZI +zj0CAQYFK4EEACIDYgAEn/nhx68b7k/IHKlzuViX6lyqln3wKNt/eMi/2TLGd4RC +RwFYCQJhLWC8X5G1Zva0M5u8HY63r4MT7318MCZ1Ixn83CoiUO+owXnDM/KKD662 +DIw621JAYJ5t08hhzt3wo1MwUTAdBgNVHQ4EFgQU8gsJCCztQ2vSMfo9Cn+IhxvV +vsIwHwYDVR0jBBgwFoAU8gsJCCztQ2vSMfo9Cn+IhxvVvsIwDwYDVR0TAQH/BAUw +AwEB/zAKBggqhkjOPQQDAwNoADBlAjAY1PBTIPun17hV6PxJlRBq1qDfwzAy4BvX +yJMVcOHs18taVMXiVDtReK9P7LpFVJECMQC2YMmfLbM9Chu1vduQIv1H+Q3EaIep +Ccmsdu0/lduoeuO6AqMPXW6nCZw4PonrttA= +-----END CERTIFICATE----- +` + +const StandardCryptoSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICBTCCAYqgAwIBAgIUKAjFu5IU/BKQ+uBZmuTGF6X4K6owCgYIKoZIzj0EAwMw +OTEYMBYGA1UECgwPU3RhbmRhcmQgQ3J5cHRvMR0wGwYDVQQDDBRzdGFuZGFyZGNy +eXB0b3ZjLmNvbTAeFw0yMjA1MTMwNDM1MDlaFw0yNDA1MTIwNDM1MDlaMDkxGDAW +BgNVBAoMD1N0YW5kYXJkIENyeXB0bzEdMBsGA1UEAwwUc3RhbmRhcmRjcnlwdG92 +Yy5jb20wdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATW7dxvqytu0MAtURLBATejrkTE +xXNtYDYysqdl0enTTaFZ5Co1zy4OvXz9Db8FdiZKMKS4V4oQegcAMqpPwVwz/6z3 +AK40aWVWquzBcTtnvBwP2Oq4UFIYNASIGOrd2mmjUzBRMB0GA1UdDgQWBBTH6Zuh +M8Akp5vs+NObKpw0vhYWYTAfBgNVHSMEGDAWgBTH6ZuhM8Akp5vs+NObKpw0vhYW +YTAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2kAMGYCMQCTBQw15XacLD0C +SmsTzIuqJZO/3rNaSvnvnoWSsrY2MZQwdWlC17WsSKOEALCh+90CMQCqh1wE8GYw +6e1n90a+O/9yQru2jnNXp/z+vUMEacx6ZnOM/RXE3eQctR6pC4R80io= +-----END CERTIFICATE----- +` + +const RockawaySubscriberCA = `-----BEGIN CERTIFICATE----- +MIICSTCCAc6gAwIBAgIUKQbrzzmbw9e14+IPwdwsxphJwqQwCgYIKoZIzj0EAwMw +WzELMAkGA1UEBhMCQ1oxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGElu +dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDEUMBIGA1UEAwwLcmJmLnN5c3RlbXMwHhcN +MjIwNTEzMTUzOTM3WhcNMjQwNTEyMTUzOTM3WjBbMQswCQYDVQQGEwJDWjETMBEG +A1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkg +THRkMRQwEgYDVQQDDAtyYmYuc3lzdGVtczB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BOjOff/X4d3ZQ3uSokoqgUtVwr9OQJjWqJM3CJkk7FUYTg/AP1UnU42cmOUbhbKn +4+96RK0M6qye6+wGVJB+yR6LqkPuoyzYvswGjaB9NQWKIAW4OIDUrw4Uc4qitsjG +G6NTMFEwHQYDVR0OBBYEFNt1sXxbYAZZMEaGGC/5uHmTcnueMB8GA1UdIwQYMBaA +FNt1sXxbYAZZMEaGGC/5uHmTcnueMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0E +AwMDaQAwZgIxAKym3BhXv7oQOsEwKf57TRSBFyY+nYvA1h3KK+h3RhCvORjDIaMr +NsCHc3hjYwmt8wIxAPNOix7pd6e7KyhUGSxGsI3S/99XhqAZIO4WwlcXQ3ekcPgL +JEZSGkKH8mWi6uOyFQ== +-----END CERTIFICATE----- +` + +const BlockscapeSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICdjCCAfygAwIBAgIJALDoLnBuMsOCMAoGCCqGSM49BAMDMHkxCzAJBgNVBAYT +AkRFMQswCQYDVQQIDAJCVzESMBAGA1UEBwwJU3R1dHRnYXJ0MQ0wCwYDVQQKDARN +V0FZMRMwEQYDVQQLDApibG9ja3NjYXBlMSUwIwYJKoZIhvcNAQkBFhZkZXZAYmxv +Y2tzY2FwZS5uZXR3b3JrMB4XDTIyMDUyMDEyNDc0NVoXDTI0MDUxOTEyNDc0NVow +eTELMAkGA1UEBhMCREUxCzAJBgNVBAgMAkJXMRIwEAYDVQQHDAlTdHV0dGdhcnQx +DTALBgNVBAoMBE1XQVkxEzARBgNVBAsMCmJsb2Nrc2NhcGUxJTAjBgkqhkiG9w0B +CQEWFmRldkBibG9ja3NjYXBlLm5ldHdvcmswdjAQBgcqhkjOPQIBBgUrgQQAIgNi +AATXYZ8ovRJ+VUSUXR8SPk1AGzUoEmJSPYNo2Gz+7IwtH8r5lvo/rG2R4rgM2oH5 +K5DP5xuReQaeu0i3wHleHyLj/Z/vv2h4STWVK4e9RrBX9ytCViDHIMYZyAU5/d/E +c3GjUDBOMB0GA1UdDgQWBBQrGubTZudwLx8sWsLYQJ6W/eLhRDAfBgNVHSMEGDAW +gBQrGubTZudwLx8sWsLYQJ6W/eLhRDAMBgNVHRMEBTADAQH/MAoGCCqGSM49BAMD +A2gAMGUCMQCiVbvLpqBNGSMPLSqdtScrBKxDH+cbjkst+fbgqbNyeVU7pstSilyK +28yjZgbnYRACMDXTuPDOjT3qTnYhPjNGQHfjOPt4Wc9dSXbykpByoNj6qWRLg+os +vxKm6JF/QUn+kQ== +-----END CERTIFICATE----- +` + +const SimplySubscriberCA = `-----BEGIN CERTIFICATE----- +MIICdjCCAfygAwIBAgIUTMulocP5XzC3bt3Kkqw7QaGox+YwCgYIKoZIzj0EAwMw +cjELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGElu +dGVybmV0IFdpZGdpdHMgUHR5IEx0ZDErMCkGA1UEAwwic29tbWVsaWVyLXN0ZXdh +cmQuc2ltcGx5LXZjLmNvbS5tdDAeFw0yMjA1MjMyMzI3NTdaFw0yNDA1MjIyMzI3 +NTdaMHIxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQK +DBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxKzApBgNVBAMMInNvbW1lbGllci1z +dGV3YXJkLnNpbXBseS12Yy5jb20ubXQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARl +amVEMqPdpopyCYaAHzot2GIcj0W5F3sP8rPMFs2HzO+T9ZQaIokPX6AVMVGp2e+K +XqGVPhDhtlGtdbjNlG2anJoYvuDPnzzh5eHEtAfjkLT0vkTgQj580pxK8STWhiij +UzBRMB0GA1UdDgQWBBT/nNSZL/itgCGxZBkBZTR7w1aXRDAfBgNVHSMEGDAWgBT/ +nNSZL/itgCGxZBkBZTR7w1aXRDAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMD +A2gAMGUCMQDGZspQGgJaJkb1NaOU6TtlKIfwydroT7tCTkx1SnQLdGt45TVUZ+Hx +DvfQ01lsakECMBIjzSOaLxBxVH1VhJ56qUXOU6+qxq220SKRs59SYDJDXOijlcwt +/ZQt9kN29MSCXg== +-----END CERTIFICATE----- +` + +const PupmosSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICxTCCAkqgAwIBAgIULdZ72d7nrmnEhacXf/otvo/uDfgwCgYIKoZIzj0EAwMw +gZgxCzAJBgNVBAYTAlNHMRIwEAYDVQQIDAlTaW5nYXBvcmUxEjAQBgNVBAcMCVNp +bmdhcG9yZTESMBAGA1UECgwJUFVQTcODwphTMSkwJwYDVQQDDCBzdGV3YXJkLnNv +bW1lbGllci5wdXBtb3MubmV0d29yazEiMCAGCSqGSIb3DQEJARYTcm9vdEBwdXBt +b3MubmV0d29yazAeFw0yMjA1MjQwNjE5NDdaFw0yNDA1MjMwNjE5NDdaMIGYMQsw +CQYDVQQGEwJTRzESMBAGA1UECAwJU2luZ2Fwb3JlMRIwEAYDVQQHDAlTaW5nYXBv +cmUxEjAQBgNVBAoMCVBVUE3Dg8KYUzEpMCcGA1UEAwwgc3Rld2FyZC5zb21tZWxp +ZXIucHVwbW9zLm5ldHdvcmsxIjAgBgkqhkiG9w0BCQEWE3Jvb3RAcHVwbW9zLm5l +dHdvcmswdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATvBrmLqBCxHfWTt+h9tfrckH8g +YvOP4BCBTied5VU7x3pocN8v2JnvnW3+eN5q+TGqAZHooFwTQX1lDrXP+4x+Wdrj +9Dk4R6fP4ZJjDWP9LXmqW4x/f9VcKQxneRyFENmjUzBRMB0GA1UdDgQWBBSzeIQr +9DSejT8+PNSq0dMUHigOljAfBgNVHSMEGDAWgBSzeIQr9DSejT8+PNSq0dMUHigO +ljAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2kAMGYCMQCqGKROfs1o6ptI +RKz4YAkQM4WKQH9ST1GONrJc5G+i6XHH4/fmL/nFzpWqJD6Odn4CMQDREtkJcOvJ +AB22WYnV23hsSHcOO73P1WcUtSJ6gLq5VYO01XksW7IbV7r6c78DJWU= +-----END CERTIFICATE----- +` + +const LavenderFiveSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICqDCCAi6gAwIBAgIUJdWH+cIDeAXzAzWvA1f0ybmnOPwwCgYIKoZIzj0EAwMw +gYoxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMRwwGgYDVQQKDBNM +YXZlbmRlci5GaXZlIE5vZGVzMSEwHwYDVQQDDBhzdGV3YXJkLmxhdmVuZGVyZml2 +ZS5jb20xJTAjBgkqhkiG9w0BCQEWFmhlbGxvQGxhdmVuZGVyZml2ZS5jb20wHhcN +MjMwMTE4MTI0MDQ3WhcNMjUwMTE3MTI0MDQ3WjCBijELMAkGA1UEBhMCQVUxEzAR +BgNVBAgMClNvbWUtU3RhdGUxHDAaBgNVBAoME0xhdmVuZGVyLkZpdmUgTm9kZXMx +ITAfBgNVBAMMGHN0ZXdhcmQubGF2ZW5kZXJmaXZlLmNvbTElMCMGCSqGSIb3DQEJ +ARYWaGVsbG9AbGF2ZW5kZXJmaXZlLmNvbTB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BGypluhCoE8a2oxbjaYGUtEOjmqJvBu4D/0jk6aioNc1G3huD2/jO8HAMzawedDH +oASy6nqSk+fGCjhsoB56NiBb95MmQRpivobAUB7Rqyz1Bd3rTmFAn3czodacwI1d +U6NTMFEwHQYDVR0OBBYEFABDT7eDMwbcM/ETpCScv+uDvoI+MB8GA1UdIwQYMBaA +FABDT7eDMwbcM/ETpCScv+uDvoI+MA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0E +AwMDaAAwZQIxAJEtNYDXJpa63AuKLsn6cE5S6QK6gDpDDxVxqkTUxbHiJFtYgvUm +H0fy8w85H9nLYQIwAZ/1pMQJVO/9baDBlJeNga1cYXFi3+KAv6+eSe0uH1JCym/V +rPbOti9Ui2zE+3/p +-----END CERTIFICATE----- +` + +const PolkachuSubscriberCA = `-----BEGIN CERTIFICATE----- +MIIC4DCCAmagAwIBAgIUHcEDyHKLg7DxRlcJOGbExDRn99YwCgYIKoZIzj0EAwMw +gaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJ +bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxHTAbBgNVBAsMFHN0ZXdhcmQucG9sa2Fj +aHUuY29tMR0wGwYDVQQDDBRzdGV3YXJkLnBvbGthY2h1LmNvbTEhMB8GCSqGSIb3 +DQEJARYSaGVsbG9AcG9sa2FjaHUuY29tMB4XDTIyMDYyMDAyMjYzOFoXDTI0MDYx +OTAyMjYzOFowgaYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMSEw +HwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxHTAbBgNVBAsMFHN0ZXdh +cmQucG9sa2FjaHUuY29tMR0wGwYDVQQDDBRzdGV3YXJkLnBvbGthY2h1LmNvbTEh +MB8GCSqGSIb3DQEJARYSaGVsbG9AcG9sa2FjaHUuY29tMHYwEAYHKoZIzj0CAQYF +K4EEACIDYgAESPHHmuU+a6ks0jAtei47fJ4PlGDTv4Dep6uUW8qkiJYcE2yxFCcv +DiPARfZ1t2sEZ4ukvACI8ynpMgKhzpaSqukqL5cCDiFZ+ZY425+SoHoaRq+yp+E/ +f+rcyHw0k604o1MwUTAdBgNVHQ4EFgQUZDwBKGcI0AgutfvELrRkP4e5bz8wHwYD +VR0jBBgwFoAUZDwBKGcI0AgutfvELrRkP4e5bz8wDwYDVR0TAQH/BAUwAwEB/zAK +BggqhkjOPQQDAwNoADBlAjEAjYQ4+2R0ls9HIJjjeLhaxiTmcSVIoSlczntIQZjE +HGX6nbnJEFDl+zDz40FwCeXLAjB5H3XQ7uaxwlj4fMDarIk8Rem1gJer1MnJmunv +q0681JGP9hLU0SeXy0G4qwADZRc= +-----END CERTIFICATE----- +` + +const StakecitoSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICbzCCAfagAwIBAgIUNF3FmpWSUhkR9Ei0EplK3vywOlkwCgYIKoZIzj0EAwMw +bzELMAkGA1UEBhMCREUxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAoMCVN0 +YWtlY2l0bzESMBAGA1UECwwJU3Rha2VjaXRvMSMwIQYDVQQDDBpzdGV3YXJkLnN0 +YWtlc2FuZHN0b25lLmNvbTAeFw0yMjA1MjYwODM4MjRaFw0yNDA1MjUwODM4MjRa +MG8xCzAJBgNVBAYTAkRFMRMwEQYDVQQIDApTb21lLVN0YXRlMRIwEAYDVQQKDAlT +dGFrZWNpdG8xEjAQBgNVBAsMCVN0YWtlY2l0bzEjMCEGA1UEAwwac3Rld2FyZC5z +dGFrZXNhbmRzdG9uZS5jb20wdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQhv4yVeP3H +LGleaAgtv8Nv+0qMKvXImDeywDVuLntE4OsPwNu2PpShT0Ksk1JkwFZs3NgCU/Hz +VZ26g1fI1Dyjkk40AXCX+rUqLlch8qM7IwZ7qHOAxP/3UFxUERCu0xSjUzBRMB0G +A1UdDgQWBBTmoTdY3c3gIq0UDyFn87m4hTHF+DAfBgNVHSMEGDAWgBTmoTdY3c3g +Iq0UDyFn87m4hTHF+DAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2cAMGQC +MBpAnQ0xgp6mSX1P6ll937FnKgZKA1NAGac5bKXSDzPtuR5V6DtsCK96eoSLah65 +ugIwdFtkaqpm8eeTcwWNxrbtl7mXyr9dp4qGbM1KQYFR7v6lGGmYrCfdfJhPT87c +yJqh +-----END CERTIFICATE----- +` + +const ChorusOneSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICzjCCAlSgAwIBAgIUYVmGGtT24lipwycw/tt92fK6C18wCgYIKoZIzj0EAwMw +gZ0xCzAJBgNVBAYTAkNIMQwwCgYDVQQIDANadWcxDTALBgNVBAcMBEJhYXIxFjAU +BgNVBAoMDUNob3J1cyBPbmUgQUcxFzAVBgNVBAsMDkluZnJhc3RydWN0dXJlMRMw +EQYDVQQDDApjaG9ydXMub25lMSswKQYJKoZIhvcNAQkBFhx0ZWNob3BzK3NvbW1l +bGllckBjaG9ydXMub25lMB4XDTIyMDUyNjE5NTQzMloXDTI0MDUyNTE5NTQzMlow +gZ0xCzAJBgNVBAYTAkNIMQwwCgYDVQQIDANadWcxDTALBgNVBAcMBEJhYXIxFjAU +BgNVBAoMDUNob3J1cyBPbmUgQUcxFzAVBgNVBAsMDkluZnJhc3RydWN0dXJlMRMw +EQYDVQQDDApjaG9ydXMub25lMSswKQYJKoZIhvcNAQkBFhx0ZWNob3BzK3NvbW1l +bGllckBjaG9ydXMub25lMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEHjPQcxD30w/k +HhyNWBUDbjty1VAfF3jWuOeCV6vhQAC4tjrANRndxciL0MkmVUdpuIWfQfwwsv0z +M+6bXvqc0b0gOcWcDmBoVxqXLwCpOLyp9B3+DuqgbjiAS7u8HFxio1MwUTAdBgNV +HQ4EFgQUkcv4PTRvZWZqevGtRLoJIGWlsk4wHwYDVR0jBBgwFoAUkcv4PTRvZWZq +evGtRLoJIGWlsk4wDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjBw +dzW4iAIOsJCgqshFaBA0+mSIxDUmnMsngg2IK0C/uTHg+zrh9M+YJ5QrJzRsCfMC +MQCemfMGhRec90/hC+osODiyd6qU5QkLxi1hcmwBzriRpGIlUohbQDSuMtHSO+pI +cdA= +-----END CERTIFICATE----- +` + +const ImperatorSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICpjCCAiygAwIBAgIUNyJMRHi7p+7g9FVkLQ5mrKAw4aswCgYIKoZIzj0EAwMw +gYkxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJ +bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxHTAbBgNVBAMMFHN0ZXdhcmQuaW1wZXJh +dG9yLmNvMSMwIQYJKoZIhvcNAQkBFhRjb250YWN0QGltcGVyYXRvci5jbzAeFw0y +MjA1MjcyMzM5NDRaFw0yNDA1MjYyMzM5NDRaMIGJMQswCQYDVQQGEwJBVTETMBEG +A1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50ZXJuZXQgV2lkZ2l0cyBQdHkg +THRkMR0wGwYDVQQDDBRzdGV3YXJkLmltcGVyYXRvci5jbzEjMCEGCSqGSIb3DQEJ +ARYUY29udGFjdEBpbXBlcmF0b3IuY28wdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASm +CXKJvuAWw+g22f8AHZAkth3MxYWrNMQkZy37tK8h10hQkAVCVWSDoVXkuvcJuop4 +rYdzoyS85pY/5xlywaNvQ6pMHRA5EJi0x8B1kdg1zpPuUV2K4rnoeQxGwiyKbTqj +UzBRMB0GA1UdDgQWBBQJzTYDuy3gNOzQ0PKuCO5liub37TAfBgNVHSMEGDAWgBQJ +zTYDuy3gNOzQ0PKuCO5liub37TAPBgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMD +A2gAMGUCMFeX4Alu3mPjGagxE9M3Sub7INxppi2a1Td4kmUA9j+ZmCL9xQq2Bhu6 +O3FhyNvkoQIxAPkyVm7znMlRymHc6tT0AigjRqv/fHmLXQi2QxYE9plLSVzSuzzH +cQMDmlZncNhv0g== +-----END CERTIFICATE----- +` + +const TekuSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICjjCCAhSgAwIBAgIUGQD0x2z2zd2bpdn2ctlzz/9H38gwCgYIKoZIzj0EAwMw +fjELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxDTALBgNVBAoMBFRl +a3UxHzAdBgNVBAMMFnNvbW1lbGllci50ZWt1Lm5ldHdvcmsxKjAoBgkqhkiG9w0B +CQEWG3Rla3Uuc3Rha2luZ0Bwcm90b25tYWlsLmNvbTAeFw0yMjA1MTgwNDMzMzNa +Fw0yNDA1MTcwNDMzMzNaMH4xCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0 +YXRlMQ0wCwYDVQQKDARUZWt1MR8wHQYDVQQDDBZzb21tZWxpZXIudGVrdS5uZXR3 +b3JrMSowKAYJKoZIhvcNAQkBFht0ZWt1LnN0YWtpbmdAcHJvdG9ubWFpbC5jb20w +djAQBgcqhkjOPQIBBgUrgQQAIgNiAASuK7+43q/sw6vwOrY9qSJDOru8tNxfFMKL +/tlHsP77PMDrOkgp+KPbBL26gfZXc1n7Hpy6pSN40xD9I4BN1AvV3LTMqZ3fXKFd +7/BWfysX4cTsO4W6Ip70SaSv2oPqBM2jUzBRMB0GA1UdDgQWBBSFezl3NsJ+qdB7 +48AEO39UGrpUfTAfBgNVHSMEGDAWgBSFezl3NsJ+qdB748AEO39UGrpUfTAPBgNV +HRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQDX4+6dws5YjbL0UvTGTjZA +jXUDkAjawNGrtsjDCbi93XrU9veDSAbjBinS36ig0sYCMDpR105PAY0G8FYXJD+W +qbc8gnvrA9v3urubAECl9AgE411rViVIUYaMQzSu4tRTvw== +-----END CERTIFICATE----- +` + +const ForboleSubscriberCA = `-----BEGIN CERTIFICATE----- +MIIB4TCCAWigAwIBAgIUI3jkPC9tBB+gBtNpX4RgF4DFqp4wCgYIKoZIzj0EAwMw +KDEmMCQGA1UEAwwdc3Rld2FyZC5zb21tZWxpZXIuZm9yYm9sZS5jb20wHhcNMjIw +NTEzMDczMTQ5WhcNMjQwNTEyMDczMTQ5WjAoMSYwJAYDVQQDDB1zdGV3YXJkLnNv +bW1lbGllci5mb3Jib2xlLmNvbTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJ0D6kKg +72NuQlTsHGsAgJ0QrhacCzq0/1ELLX06YFU5Wn7718Reo8dlmw2MJ4BlBBhAUJGi +DK/WWUg6Oe//2sst76S0XLW/uUPwUR5M29ynHyH7UiuxdIzgpj7hrtpEb6NTMFEw +HQYDVR0OBBYEFJBIz4UxsCMIXVl9qwIl7+NJzYLVMB8GA1UdIwQYMBaAFJBIz4Ux +sCMIXVl9qwIl7+NJzYLVMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwMDZwAw +ZAIwWtrNasLUQjWIuMoDK9gmqGnbgdmT4upDDtRu3cXpAJFcE9SDCNQn5VnO+xTM +OFNwAjBCBRYa3W8Vxspmn5O8UCNryhbXBwt4q1ce2fPx2Uywx8vd8Fzvy0m7YAkH +ZgzN5W4= +-----END CERTIFICATE----- +` + +const BoubouSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICkDCCAhagAwIBAgIUF7G5HqVlFee6I76X1LDc9wUN+DowCgYIKoZIzj0EAwMw +fzELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAkNBMRYwFAYDVQQHDA1TYW4gRnJhbmNp +c2NvMRMwEQYDVQQKDApDeWduaSBMYWJzMRMwEQYDVQQLDApCb3VCb3VOb2RlMSEw +HwYJKoZIhvcNAQkBFhJpbmZvQGN5Z25pbGFicy5jb20wHhcNMjIwNzA5MTIyMjQ4 +WhcNMjQwNzA4MTIyMjQ4WjB/MQswCQYDVQQGEwJVUzELMAkGA1UECAwCQ0ExFjAU +BgNVBAcMDVNhbiBGcmFuY2lzY28xEzARBgNVBAoMCkN5Z25pIExhYnMxEzARBgNV +BAsMCkJvdUJvdU5vZGUxITAfBgkqhkiG9w0BCQEWEmluZm9AY3lnbmlsYWJzLmNv +bTB2MBAGByqGSM49AgEGBSuBBAAiA2IABAGbsPh3MVQ5+EKQdEHMHQgsiuG/SYhA +9epiqLsLAR+TTxSO87OLeFDN8ciq5RZW/6lV3qREFiBkMwIVz87H9XTt3BxhdTTt +Q/V1fP6gLbrA2cTdC139oOqXSxl0N/m6ZaNTMFEwHQYDVR0OBBYEFNnzknRvyXwK +fSX+y7LerlWurBRCMB8GA1UdIwQYMBaAFNnzknRvyXwKfSX+y7LerlWurBRCMA8G +A1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwMDaAAwZQIxAOpjjxkU8aRBffoMiTkU +Gv0GbdJrM0PPRuA2dOvFrhwmIUuykONx8El+3MeTcT6J2AIwdg0ueHNu+bSxY+wc +7pHbfqR6sGS/IIpUiV1qCW9JI714lnt1AM5BSbJUHswk6Rmn +-----END CERTIFICATE----- +` + +const SleepyKittenSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICYTCCAeagAwIBAgIUASnfEzEt6dvHbpTAvNCCtlJKlPUwCgYIKoZIzj0EAwMw +ZzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoMDFNs +ZWVweUtpdHRlbjEsMCoGA1UEAwwjc3Rld2FyZC5zb21tZWxpZXIuc2xlZXB5a2l0 +dGVuLmluZm8wHhcNMjIwNzE4MTMwMDI2WhcNMjQwNzE3MTMwMDI2WjBnMQswCQYD +VQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEVMBMGA1UECgwMU2xlZXB5S2l0 +dGVuMSwwKgYDVQQDDCNzdGV3YXJkLnNvbW1lbGllci5zbGVlcHlraXR0ZW4uaW5m +bzB2MBAGByqGSM49AgEGBSuBBAAiA2IABOsFJjyyhPDzzbx1eTS+WS5M1dQYBVxJ +EQlL9xtVvTXsMPdLa/OCQwrhZ467dfISnRw9jE2NB9qDY1EQWPJbOsMDbU8k726A +EiAUAeJdKLHf2guvlgF8rh1PBGWR4UMnu6NTMFEwHQYDVR0OBBYEFBi/u/WxU2ps +rKW6jxM4vPPMcsx9MB8GA1UdIwQYMBaAFBi/u/WxU2psrKW6jxM4vPPMcsx9MA8G +A1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwMDaQAwZgIxAKoLCqK/pTW7sClM5YaO +leROfs7rCp1eq8aceetqiRXdGHm7GJDBYHzewd8bLM6kdQIxAPdLBbpcSbgAX+R7 +4+4iKN725+x6hP8z/ebf6bhY/1ARmxO85+RLjo4IapEtXBHnWQ== +-----END CERTIFICATE----- +` + +const EverstakeSubscriberCA = `-----BEGIN CERTIFICATE----- +MIIC3TCCAmSgAwIBAgIUD8wVRwhFpOqk6SZGqBSnvxncSnMwCgYIKoZIzj0EAwMw +gaUxCzAJBgNVBAYTAlVBMQ0wCwYDVQQIDARLWUlWMQ0wCwYDVQQHDARLWUlWMRIw +EAYDVQQKDAlFdmVyc3Rha2UxEjAQBgNVBAsMCUV2ZXJzdGFrZTEoMCYGA1UEAwwf +c29tbWVsaWVyLXN0ZXdhcmQuZXZlcnN0YWtlLm9uZTEmMCQGCSqGSIb3DQEJARYX +YS5ieWNoa292QGV2ZXJzdGFrZS5vbmUwHhcNMjIwNzE1MTAzNzA3WhcNMjQwNzE0 +MTAzNzA3WjCBpTELMAkGA1UEBhMCVUExDTALBgNVBAgMBEtZSVYxDTALBgNVBAcM +BEtZSVYxEjAQBgNVBAoMCUV2ZXJzdGFrZTESMBAGA1UECwwJRXZlcnN0YWtlMSgw +JgYDVQQDDB9zb21tZWxpZXItc3Rld2FyZC5ldmVyc3Rha2Uub25lMSYwJAYJKoZI +hvcNAQkBFhdhLmJ5Y2hrb3ZAZXZlcnN0YWtlLm9uZTB2MBAGByqGSM49AgEGBSuB +BAAiA2IABKMpiMX+aaKi96j1IGzFgwZj93R8m5m6v5OU6IluCfKqbtQKVBlCg6jV +Z6TnTYRs+0xMEN0TuuzkaiIwjKzeTZzotkz/wVWjwTJcGoHfO+D9HFsTFZcXUnEd +nRWaOOmf4qNTMFEwHQYDVR0OBBYEFEdTR/YTV2+W9+GSdcDS5h+XjwO8MB8GA1Ud +IwQYMBaAFEdTR/YTV2+W9+GSdcDS5h+XjwO8MA8GA1UdEwEB/wQFMAMBAf8wCgYI +KoZIzj0EAwMDZwAwZAIwQ32DlklQkbcz7lFEpw+FCzh/FpN9qZflnoRuaVnqK4tB +Xst+v3tImFlfH2B+Y0CwAjBiFLdczKLdhZzfj1FGyqGaX7adds/DTH6TuXIG+ccT +pC4FDMh3VxtCYDx0QeR78yg= +-----END CERTIFICATE----- +` + +const TesselatedSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICtDCCAjqgAwIBAgIUb8i6J7xdTLzgNPV7OXlKSyCJARYwCgYIKoZIzj0EAwMw +gZAxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMR0wGwYDVQQKDBRU +ZXNzZWxsYXRlZCBHZW9tZXRyeTEfMB0GA1UEAwwWc29tbWVsaWVyLnRlc3NhZ2Vv +LmNvbTEsMCoGCSqGSIb3DQEJARYdaGVsbG9AdGVzc2VsbGF0ZWRnZW9tZXRyeS5j +b20wHhcNMjIwODA4MDMwOTEwWhcNMjQwODA3MDMwOTEwWjCBkDELMAkGA1UEBhMC +QVUxEzARBgNVBAgMClNvbWUtU3RhdGUxHTAbBgNVBAoMFFRlc3NlbGxhdGVkIEdl +b21ldHJ5MR8wHQYDVQQDDBZzb21tZWxpZXIudGVzc2FnZW8uY29tMSwwKgYJKoZI +hvcNAQkBFh1oZWxsb0B0ZXNzZWxsYXRlZGdlb21ldHJ5LmNvbTB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABAbBGDp23qbfjyh1/nZUbi9a+f31XT5p3GGX0IwVvHaF8GBa +p+ut7upgtXkKyO81ykraX9Oybn/d0ygQ2ZxVGL48RlrRZEjwcZgqZa2/by77YofO +LrOTR2OaqVoJHAtBhaNTMFEwHQYDVR0OBBYEFDO9k3B5tLC4D71Dc2fD/eXEdNPe +MB8GA1UdIwQYMBaAFDO9k3B5tLC4D71Dc2fD/eXEdNPeMA8GA1UdEwEB/wQFMAMB +Af8wCgYIKoZIzj0EAwMDaAAwZQIxANfqkQNi5tZ8ufakos+vP4cYWLLwPiaSLmnz +Ppqtxd5JnbMr2NIwuwrqh/7f1SJJ2gIwWwxhl2h8ZV1O3r+5HMBqXkIUg5p4vBHO +Pl6yQFjHgCjEJb0bDx3n/qHpzmj9loIK +-----END CERTIFICATE----- +` + +const ZtakeSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICtDCCAjqgAwIBAgIUa54gP36t+ms+IAqQlh1EtabbumEwCgYIKoZIzj0EAwMw +gZAxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJXQTEQMA4GA1UEBwwHU2VhdHRsZTES +MBAGA1UECgwJWnRha2Uub3JnMRIwEAYDVQQLDAladGFrZS5vcmcxHDAaBgNVBAMM +E3NvbW1lbGllci56dGFrZS5vcmcxHDAaBgkqhkiG9w0BCQEWDW1heEB6dGFrZS5v +cmcwHhcNMjIwNzA0MTM0NzA1WhcNMjQwNzAzMTM0NzA1WjCBkDELMAkGA1UEBhMC +VVMxCzAJBgNVBAgMAldBMRAwDgYDVQQHDAdTZWF0dGxlMRIwEAYDVQQKDAladGFr +ZS5vcmcxEjAQBgNVBAsMCVp0YWtlLm9yZzEcMBoGA1UEAwwTc29tbWVsaWVyLnp0 +YWtlLm9yZzEcMBoGCSqGSIb3DQEJARYNbWF4QHp0YWtlLm9yZzB2MBAGByqGSM49 +AgEGBSuBBAAiA2IABM6lPxWKbW5uen75VLnev3V5eg14oOkGrwNdMCdyya3Kq9AM +9Ikxb8wHrbz0t+Pux3SKeqLNsl2/S8n45yeRTd/8Ekh03Fy4J9m62K1vlUKCJq1r +P+UNYfcOr8VMpM18WKNTMFEwHQYDVR0OBBYEFHZrsbcSN2+Bz9JT/y6C/18l/6al +MB8GA1UdIwQYMBaAFHZrsbcSN2+Bz9JT/y6C/18l/6alMA8GA1UdEwEB/wQFMAMB +Af8wCgYIKoZIzj0EAwMDaAAwZQIxANN/OQLOp/ykhfxYR1QindLUdYSx3o23eaeW +FFfYVpW1+URH57JoIQIGjOowldDwbwIwElOS4lVQIoPbvxppU9XYY7KiAKc7QqnF +vELj6/thfVS5XZaoDfw+5DPgT/PUiRAd +-----END CERTIFICATE----- +` + +const TwoBuckChuckSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICHzCCAaSgAwIBAgIUIo1u3e6h6gO+8LIqUQjdjRQqpSQwCgYIKoZIzj0EAwMw +RjEVMBMGA1UECgwMMiBCdWNrIENodWNrMRAwDgYDVQQLDAdWaW50bmVyMRswGQYD +VQQDDBJ0d28tYnVjay1jaHVjay54eXowHhcNMjIwODIyMTUwOTQyWhcNMjQwODIx +MTUwOTQyWjBGMRUwEwYDVQQKDAwyIEJ1Y2sgQ2h1Y2sxEDAOBgNVBAsMB1ZpbnRu +ZXIxGzAZBgNVBAMMEnR3by1idWNrLWNodWNrLnh5ejB2MBAGByqGSM49AgEGBSuB +BAAiA2IABBpeouUcSK/buu0ybgZJqnMzrO1+ei788OcF7U5hsY8NFzoC3w8DLzO4 +vei9FcDZ/59M8z2V3eOA7MmQNg4BzIqUki/cvJzW/qeW77HFFALx4KyFwtB4iZ+F +FgP1DC8u8KNTMFEwHQYDVR0OBBYEFBWUcaVoaltx+m48gvu9entY0WFRMB8GA1Ud +IwQYMBaAFBWUcaVoaltx+m48gvu9entY0WFRMA8GA1UdEwEB/wQFMAMBAf8wCgYI +KoZIzj0EAwMDaQAwZgIxAOm8mrvPP+hrBVL42svpUbIn6oR7jaGiR6Eg3nudmhCv +nOFSWHXpTZ1kRavbwgfB7gIxAIzHW7oljiS6xShGA/FB6FoU9voP2mbwjIu96F0W +ADIfk5v+dX8gSZz98c7MXVhcwQ== +-----END CERTIFICATE----- +` + +const CosmostationSubscriberCA = `-----BEGIN CERTIFICATE----- +MIIC4DCCAmagAwIBAgIUJcVZEz/992d79MrF68xLlDlaJWcwCgYIKoZIzj0EAwMw +gaYxCzAJBgNVBAYTAmtyMQ4wDAYDVQQIDAVzZW91bDEOMAwGA1UEBwwFc2VvdWwx +EDAOBgNVBAoMB3N0YW1wZXIxFTATBgNVBAsMDGNvc21vc3RhdGlvbjEqMCgGA1UE +Awwhc3Rld2FyZC5zb21tZWxpZXIuY29zbW9zdGF0aW9uLmlvMSIwIAYJKoZIhvcN +AQkBFhNqaHBAc3RhbXBlci5uZXR3b3JrMB4XDTIyMDkxMjE3NTM0M1oXDTI0MDkx +MTE3NTM0M1owgaYxCzAJBgNVBAYTAmtyMQ4wDAYDVQQIDAVzZW91bDEOMAwGA1UE +BwwFc2VvdWwxEDAOBgNVBAoMB3N0YW1wZXIxFTATBgNVBAsMDGNvc21vc3RhdGlv +bjEqMCgGA1UEAwwhc3Rld2FyZC5zb21tZWxpZXIuY29zbW9zdGF0aW9uLmlvMSIw +IAYJKoZIhvcNAQkBFhNqaHBAc3RhbXBlci5uZXR3b3JrMHYwEAYHKoZIzj0CAQYF +K4EEACIDYgAE5WNSh0qrkdUdDN6mM/gTI18ZQR5/vaIaXwsz52Seq7v/t332tSfJ +kIAlISo3upB/25xwA5e8YPkhv+aFp2xwLSpSWa4bHGxp/tADof0wcekvc/iraLCf +HHqEfNzl2MSjo1MwUTAdBgNVHQ4EFgQU59JtqB5qeXJlYEZeg8LwlQ3zO2AwHwYD +VR0jBBgwFoAU59JtqB5qeXJlYEZeg8LwlQ3zO2AwDwYDVR0TAQH/BAUwAwEB/zAK +BggqhkjOPQQDAwNoADBlAjEAtnfI51s/kGRVFNMko6u1xNFqLRM/4X6x32ZnlgMy +KHoSDLQF5PQ4HpxHU0QJRWyVAjAGy0nC3Eu6gKEwLlWA8iwPQNkHvtdkPx4cRp1n +8JBvc7RZYuJIlj1pFJKotq5aPjY= +-----END CERTIFICATE----- +` + +const MCBSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICrzCCAjagAwIBAgIUG1YKz0sRvAN+S9IhqXU3HB+hJXgwCgYIKoZIzj0EAwMw +gY4xCzAJBgNVBAYTAlRSMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJ +bnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQxHjAcBgNVBAMMFXNvbW1lbGllci5tY2Ju +b2RlLmNvbTEnMCUGCSqGSIb3DQEJARYYYWxpcG9zdGFjaTIwMDJAZ21haWwuY29t +MB4XDTIyMDkxMzE1MTgyMFoXDTI0MDkxMjE1MTgyMFowgY4xCzAJBgNVBAYTAlRS +MRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRz +IFB0eSBMdGQxHjAcBgNVBAMMFXNvbW1lbGllci5tY2Jub2RlLmNvbTEnMCUGCSqG +SIb3DQEJARYYYWxpcG9zdGFjaTIwMDJAZ21haWwuY29tMHYwEAYHKoZIzj0CAQYF +K4EEACIDYgAEgFYPLQ66ZdzR6G6XDOj+TjbkleU11DE+4XrFgvHg+MdDFxHPBMbv +a/rlzkxksSN4igGfFUeJdfL7T86wILnb9xFVoOshNj1eQP3+5iv1sxtnlMr7736c +cwt043ctEuXEo1MwUTAdBgNVHQ4EFgQU57p0chL+kfqniazKYK+yBj/GjpswHwYD +VR0jBBgwFoAU57p0chL+kfqniazKYK+yBj/GjpswDwYDVR0TAQH/BAUwAwEB/zAK +BggqhkjOPQQDAwNnADBkAjBuin50vjaxpVSvxDkcM+9MkxvPbviikLfzPocLQuIV +HkS3a7xGgSZ1jjEQ0vqaWcwCMEWFo3vNDl9sQIjcqMjkgXp4J6utSE9Y6/OqepDC +RkvwN2Y05FeXKRAAXTU8LFaFww== +-----END CERTIFICATE----- +` + +const PolychainSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICITCCAaigAwIBAgIUFWbRTNdAc8z1c3RE/L2TAA5NaYIwCgYIKoZIzj0EAwMw +SDESMBAGA1UECgwJUG9seWNoYWluMRIwEAYDVQQLDAlQb2x5Y2hhaW4xHjAcBgNV +BAMMFXNvbW1lbGllci51bml0NDEwLmNvbTAeFw0yMjA5MTkxMzQ2MDFaFw0yNDA5 +MTgxMzQ2MDFaMEgxEjAQBgNVBAoMCVBvbHljaGFpbjESMBAGA1UECwwJUG9seWNo +YWluMR4wHAYDVQQDDBVzb21tZWxpZXIudW5pdDQxMC5jb20wdjAQBgcqhkjOPQIB +BgUrgQQAIgNiAAT3Bauu2PpZLd9B2cODPsGpxUmxdbL0SKxZ9c6fD5FMvdz8zqX8 +qKYqp1kQKB/Xlafm9PsKQRpaDK6Ig4uVLU9pjgPeCui7s1I6PNeqCPUeF+tjadIT +VxIn4u1EZhs5EZGjUzBRMB0GA1UdDgQWBBQI5gnmFumLGAEV4zsYshhOxmzBLDAf +BgNVHSMEGDAWgBQI5gnmFumLGAEV4zsYshhOxmzBLDAPBgNVHRMBAf8EBTADAQH/ +MAoGCCqGSM49BAMDA2cAMGQCMGhuqnTUPr5CsJgE1jZxd0v2VparzRnWtNtKyXzm +kilvyvpYJ+W3pr1FH6sWXVUangIwYSIX/V6rl/fv0GVv2XCZGKlbQBTkktYqHjM9 +Iwfsl0+dmrxQjQGp1sjVRINI5aCh +-----END CERTIFICATE----- +` + +const KingSuperSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICXDCCAeKgAwIBAgIUS9oqAt/1SHtSknLPcrKuOEHg61AwCgYIKoZIzj0EAwMw +ZTELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAoMCUtp +bmdTdXBlcjEtMCsGA1UEAwwkc29tbWVsaWVyLXN0ZXdhcmQua2luZ3N1cGVyLnNl +cnZpY2VzMB4XDTIyMTIwOTEzMDgwNFoXDTI0MTIwODEzMDgwNFowZTELMAkGA1UE +BhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxEjAQBgNVBAoMCUtpbmdTdXBlcjEt +MCsGA1UEAwwkc29tbWVsaWVyLXN0ZXdhcmQua2luZ3N1cGVyLnNlcnZpY2VzMHYw +EAYHKoZIzj0CAQYFK4EEACIDYgAEkhXcptFkLziwhrnFNbk6YGWqznGgRse3ATkb +8nVFyEllFF2d+TcOAp8+ZSKfGJpdWbDH8AtGar8bCL2vgdrnbiFmntQXiV4WrdW4 +y3T3+8R7vklQhhsPYAMH0UgBpKdgo1MwUTAdBgNVHQ4EFgQUZSsOTSTIamzodSzy +qheSxilNigMwHwYDVR0jBBgwFoAUZSsOTSTIamzodSzyqheSxilNigMwDwYDVR0T +AQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEAwZW3l12yezPJCjgqHrQdnJkP +nz79NmyIjr2CLDWky+yXOY3f0hzzBaF6IpnLQOiOAjBhkXbOFEpBxrLC28OkhiCp +9TPgdYtwbimW1gvklpVyo3R0x3uV3+Cvnm36dzSfYaA= +-----END CERTIFICATE----- +` + +const ChillValidationSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICjzCCAhagAwIBAgIUQo3gqDMnItT/j2Advvz2+6jWwbIwCgYIKoZIzj0EAwMw +fzELMAkGA1UEBhMCQVUxEzARBgNVBAgMClNvbWUtU3RhdGUxGTAXBgNVBAoMEENo +aWxsIFZhbGlkYXRpb24xGTAXBgNVBAsMEENoaWxsIFZhbGlkYXRpb24xJTAjBgNV +BAMMHHN0ZXdhcmQwLmNoaWxsdmFsaWRhdGlvbi5jb20wHhcNMjIwNTExMTk0MDAw +WhcNMjQwNTEwMTk0MDAwWjB/MQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1T +dGF0ZTEZMBcGA1UECgwQQ2hpbGwgVmFsaWRhdGlvbjEZMBcGA1UECwwQQ2hpbGwg +VmFsaWRhdGlvbjElMCMGA1UEAwwcc3Rld2FyZDAuY2hpbGx2YWxpZGF0aW9uLmNv +bTB2MBAGByqGSM49AgEGBSuBBAAiA2IABPrjqlnjrQbX6i1Pg4GEeVPcOvU58kbL +L5uzQWgKdebF9uPK4ZgkWG+m0uFprXdheYDnhxb8XbyuXlzP9/XkUYV5H58i8onW +EChF+B2wHtS7X/CXUHqWZMhRmvfSmbl+pqNTMFEwHQYDVR0OBBYEFN+fJLjRFOy+ +oJshVYJVIfqK+kFLMB8GA1UdIwQYMBaAFN+fJLjRFOy+oJshVYJVIfqK+kFLMA8G +A1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwMDZwAwZAIwCEGXsCLNjeZkN6pPPxFm +Yq/G4pdo5pLgiwjs6NWsagDdPyJf6ECrout/ey7NCtSKAjBIjrNquroiygiMvy5D +vV350cotQ7exnFORUvktxX4c5cD57jG5/YKxkD9UcC941ws= +-----END CERTIFICATE----- +` + +const ChainnodesSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICtTCCAjygAwIBAgIUPwHC5ZWW0uiixgJhdjihn+uwF+AwCgYIKoZIzj0EAwMw +gZExCzAJBgNVBAYTAklOMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApD +aGFpbm5vZGVzMRIwEAYDVQQLDAlWYWxpZGF0b3IxHzAdBgNVBAMMFnN0ZXdhcmQu +Y2hhaW5ub2Rlcy5uZXQxIzAhBgkqhkiG9w0BCQEWFGFkbWluQGNoYWlubm9kZXMu +bmV0MB4XDTIyMDkyNjE4MDAxNVoXDTI0MDkyNTE4MDAxNVowgZExCzAJBgNVBAYT +AklOMRMwEQYDVQQIDApTb21lLVN0YXRlMRMwEQYDVQQKDApDaGFpbm5vZGVzMRIw +EAYDVQQLDAlWYWxpZGF0b3IxHzAdBgNVBAMMFnN0ZXdhcmQuY2hhaW5ub2Rlcy5u +ZXQxIzAhBgkqhkiG9w0BCQEWFGFkbWluQGNoYWlubm9kZXMubmV0MHYwEAYHKoZI +zj0CAQYFK4EEACIDYgAEWx5yoQhMOS2D+X6gXE6rZ+zJfqhGeusV7Dbd5OziI5AM +Nkh9z/i04oRADtJLS9+Vz7ratbZfwH6U7DoH/ipmwhwBV43KEWFgsdNFk9W0dKlM +zY8VZ6YbwxJAQTSs36Kvo1MwUTAdBgNVHQ4EFgQUW+eeO9Qhdk+6AMEn6y8Z3uvq +hoEwHwYDVR0jBBgwFoAUW+eeO9Qhdk+6AMEn6y8Z3uvqhoEwDwYDVR0TAQH/BAUw +AwEB/zAKBggqhkjOPQQDAwNnADBkAjB3goXF5si6LXLJHzUZzCS87dBeHNYTBiqE +aDVyNtI76m468xADG693yvtji/KUC0oCMDEVoLGmMSpCyQ1+/uwJq76rdiUT8wbB +1JTxEIKJu/HNjxkgB96c8YuUl5HTm4ks7Q== +-----END CERTIFICATE----- +` + +const SevenSeasSubscriberCA = `-----BEGIN CERTIFICATE----- +MIICnDCCAiKgAwIBAgIUSKjVXB4CFNCeBK/OoTYdHxT2TwgwCgYIKoZIzj0EAwMw +gYQxCzAJBgNVBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQKDAU3 +U2VhczEoMCYGA1UEAwwfc3Rld2FyZC5zb21tZWxpZXIuN3NlYXMuY2FwaXRhbDEm +MCQGCSqGSIb3DQEJARYXdmFsaWRhdG9yQDdzZWFzLmNhcGl0YWwwHhcNMjMwMjAy +MjEyNTI5WhcNMjUwMjAxMjEyNTI5WjCBhDELMAkGA1UEBhMCQVUxEzARBgNVBAgM +ClNvbWUtU3RhdGUxDjAMBgNVBAoMBTdTZWFzMSgwJgYDVQQDDB9zdGV3YXJkLnNv +bW1lbGllci43c2Vhcy5jYXBpdGFsMSYwJAYJKoZIhvcNAQkBFhd2YWxpZGF0b3JA +N3NlYXMuY2FwaXRhbDB2MBAGByqGSM49AgEGBSuBBAAiA2IABB/DCjJuwHmSTf5d +swbMlT2Ymfezd0PK0O7uh1SIDoeDlB5+OhvsHAs3wd62qVWymerknG0FdtwBEh6q +6JSh2qCzSE48Ffpjw1VkOp+9NIFVEKTbYpxZnFINoctpuE+koaNTMFEwHQYDVR0O +BBYEFJvy0Kyy3LNrANv6N6juZKqdOw03MB8GA1UdIwQYMBaAFJvy0Kyy3LNrANv6 +N6juZKqdOw03MA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwMDaAAwZQIwc7wP +4jZ6MCq1QIlrTGW+aFGtg5Xo21AVPxY7QU2F+Z2C1n8Dh/8ICnyChCsrs+sFAjEA ++8beG8Zyz8+MC8geQT/pOBFjYMo+zS0/WqxiuXWCHGLDedOApOWAv3xwiuaHfvRX +-----END CERTIFICATE----- +` diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go new file mode 100644 index 00000000..d6cb898b --- /dev/null +++ b/app/upgrades/v7/upgrades.go @@ -0,0 +1,322 @@ +package v7 + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" + auctionkeeper "github.com/peggyjv/sommelier/v7/x/auction/keeper" + auctiontypes "github.com/peggyjv/sommelier/v7/x/auction/types" + cellarfeeskeeper "github.com/peggyjv/sommelier/v7/x/cellarfees/keeper" + cellarfeestypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" + pubsubkeeper "github.com/peggyjv/sommelier/v7/x/pubsub/keeper" + pubsubtypes "github.com/peggyjv/sommelier/v7/x/pubsub/types" +) + +func CreateUpgradeHandler( + mm *module.Manager, + configurator module.Configurator, + auctionKeeper auctionkeeper.Keeper, + cellarfeesKeeper cellarfeeskeeper.Keeper, + pubsubKeeper pubsubkeeper.Keeper, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) { + ctx.Logger().Info("v7 upgrade: entering handler") + + // We must manually run InitGenesis for incentives, pubsub, and auctions so we can adjust their values + // during the upgrade process. RunMigrations will migrate to the new cork version. Setting the consensus + // version to 1 prevents RunMigrations from running InitGenesis itself. + fromVM[auctiontypes.ModuleName] = mm.Modules[auctiontypes.ModuleName].ConsensusVersion() + fromVM[pubsubtypes.ModuleName] = mm.Modules[pubsubtypes.ModuleName].ConsensusVersion() + + // Params values were introduced in this upgrade but no migration was necessary, so we initialize the + // new values to their defaults + ctx.Logger().Info("v7 upgrading: setting cellarfees default params") + cellarfeesKeeper.SetParams(ctx, cellarfeestypes.DefaultParams()) + + ctx.Logger().Info("v7 upgrade: initializing auction genesis state") + auctionInitGenesis(ctx, auctionKeeper) + + ctx.Logger().Info("v7 upgrade: initializing pubsub genesis state") + pubsubInitGenesis(ctx, pubsubKeeper) + + ctx.Logger().Info("v7 upgrade: running migrations and exiting handler") + return mm.RunMigrations(ctx, configurator, fromVM) + } +} + +// Initialize the auction module with prices for some stablecoins and SOMM. +func auctionInitGenesis(ctx sdk.Context, auctionKeeper auctionkeeper.Keeper) { + genesisState := auctiontypes.DefaultGenesisState() + + usomm52WeekLow := sdk.MustNewDecFromStr("0.079151") + oneDollar := sdk.MustNewDecFromStr("1.0") + // TODO(bolten): update LastUpdatedBlock to the upgrade height when finalized + usommPrice := auctiontypes.TokenPrice{ + Denom: "usomm", + UsdPrice: usomm52WeekLow, + Exponent: 6, + LastUpdatedBlock: 1, + } + + // setting stables to 1 dollar + usdcPrice := auctiontypes.TokenPrice{ + Denom: "gravity0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + UsdPrice: oneDollar, + Exponent: 6, + LastUpdatedBlock: 1, + } + + usdtPrice := auctiontypes.TokenPrice{ + Denom: "gravity0xdAC17F958D2ee523a2206206994597C13D831ec7", + UsdPrice: oneDollar, + Exponent: 6, + LastUpdatedBlock: 1, + } + + daiPrice := auctiontypes.TokenPrice{ + Denom: "gravity0x6B175474E89094C44Da98b954EedeAC495271d0F", + UsdPrice: oneDollar, + Exponent: 18, + LastUpdatedBlock: 1, + } + + genesisState.TokenPrices = []*auctiontypes.TokenPrice{&usommPrice, &usdcPrice, &usdtPrice, &daiPrice} + + auctionkeeper.InitGenesis(ctx, auctionKeeper, genesisState) +} + +// Set up the initial pubsub state to mirror what is currently used in practice already, with 7seas as the +// first publisher using its existing CA certificate, its default subscriptions as the already launched cellars, +// and the subscribers as reflected in the steward-registry repo. +func pubsubInitGenesis(ctx sdk.Context, pubsubKeeper pubsubkeeper.Keeper) { + genesisState := pubsubtypes.DefaultGenesisState() + + // Initialize the 7seas publisher. + publisher := pubsubtypes.Publisher{ + Address: "somm14zsm5frvjuqxk3f9377altc6xq368dglhmkxmp", + Domain: SevenSeasDomain, + CaCert: SevenSeasPublisherCA, + } + publishers := []*pubsubtypes.Publisher{&publisher} + + // TODO(bolten): update the cellars list with the current total cellars + cellars := []string{ + "0x7bAD5DF5E11151Dc5Ee1a648800057C5c934c0d5", // Aave V2 + "0x6b7f87279982d919bbf85182ddeab179b366d8f2", // ETH-BTC Trend + "0x6e2dac3b9e9adc0cbbae2d0b9fd81952a8d33872", // ETH-BTC Momentum + "0x3F07A84eCdf494310D397d24c1C78B041D2fa622", // Steady ETH + "0x4986fD36b6b16f49b43282Ee2e24C5cF90ed166d", // Steady BTC + "0x05641a27C82799AaF22b436F20A3110410f29652", // Steady MATIC + "0x6f069f711281618467dae7873541ecc082761b33", // Steady UNI + "0x97e6E0a40a3D02F12d1cEC30ebfbAE04e37C119E", // Real Yield USD + } + + // Set 7seas publisher intents for existing cellars + publisherIntents := make([]*pubsubtypes.PublisherIntent, 8) + for _, cellar := range cellars { + publisherIntents = append(publisherIntents, &pubsubtypes.PublisherIntent{ + SubscriptionId: cellar, + PublisherDomain: SevenSeasDomain, + Method: pubsubtypes.PublishMethod_PUSH, + AllowedSubscribers: pubsubtypes.AllowedSubscribers_VALIDATORS, + }) + } + + // Set default subscriptions for 7seas as the publisher for existing cellars + defaultSubscriptions := make([]*pubsubtypes.DefaultSubscription, 8) + for _, cellar := range cellars { + defaultSubscriptions = append(defaultSubscriptions, &pubsubtypes.DefaultSubscription{ + SubscriptionId: cellar, + PublisherDomain: SevenSeasDomain, + }) + } + + // Create subscribers and intents for existing validators + subscribers := createSubscribers() + subscriberIntents := make([]*pubsubtypes.SubscriberIntent, 208) + for _, subscriber := range subscribers { + for _, cellar := range cellars { + subscriberIntents = append(subscriberIntents, &pubsubtypes.SubscriberIntent{ + SubscriptionId: cellar, + SubscriberAddress: subscriber.Address, + PublisherDomain: SevenSeasDomain, + }) + } + } + + genesisState.Publishers = publishers + genesisState.PublisherIntents = publisherIntents + genesisState.DefaultSubscriptions = defaultSubscriptions + genesisState.Subscribers = subscribers + genesisState.SubscriberIntents = subscriberIntents + + pubsubkeeper.InitGenesis(ctx, pubsubKeeper, genesisState) +} + +// TODO(bolten): update the validators in the registry +// Addresses are from the validator's delegate orchestrator key and certs/URLs captured from the +// steward-registry repo. +// query to get orchestrator key: sommelier query gravity delegate-keys-by-validator sommvaloper +// See source data at: https://github.com/PeggyJV/steward-registry +// data captured at commit cdee05a8bf97f264353e10ab65752710bfb85dc9 +func createSubscribers() []*pubsubtypes.Subscriber { + subscribers := make([]*pubsubtypes.Subscriber, 26) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1s2q8avjykkztudpl8k60f0ns4v5mvnjp5t366c", + CaCert: FigmentSubscriberCA, + PushUrl: "sommelier-steward.staking.production.figment.io:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm148a27t9usz9u5xzzjnkt2u8fergs48935dzdnt", + CaCert: StandardCryptoSubscriberCA, + PushUrl: "steward.sommelier.standardcryptovc.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1kfzuvra3ym8nxffwdlyj0xvkky87qc0ywh9d42", + CaCert: RockawaySubscriberCA, + PushUrl: "steward-01.rbf.systems:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1tznv6agw8pdzv34ykdpau243kdwyvf9lz4dedh", + CaCert: BlockscapeSubscriberCA, + PushUrl: "steward.blockscape.network:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1p7vn9hajt44fxwn4ecfxjs2r469l0tgmjlqzmp", + CaCert: SimplySubscriberCA, + PushUrl: "sommelier-steward.simply-vc.com.mt:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1lxktamk5tw30cksdlafyzr47vc5cdm76u4tkjm", + CaCert: PupmosSubscriberCA, + PushUrl: "steward.sommelier.pupmos.network:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1yrcqnv7xvfztuh0020vxrnuhgc6dghv3kxvvnk", + CaCert: LavenderFiveSubscriberCA, + PushUrl: "steward.lavenderfive.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1y0yvuwnk7g3at6yvl6ctgsvzuxaeqjkw53tduu", + CaCert: PolkachuSubscriberCA, + PushUrl: "steward.polkachu.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm10qfl0f55vruhcuqwnqg00uykkdpnl4g3fzx2m7", + CaCert: StakecitoSubscriberCA, + PushUrl: "steward.stakesandstone.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm19ts4umurauutumqdcu5n8x73fn9dfwwshhf8a4", + CaCert: ChorusOneSubscriberCA, + PushUrl: "sommelier-steward.chorus.one:443", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1p7tskps8hya4ldeu8qfghxwq72g5fzp6aekap7", + CaCert: ImperatorSubscriberCA, + PushUrl: "steward.imperator.co:30812", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1h0df0k7wlzzg53wnglayftwnv6du74ggdu28fz", + CaCert: TekuSubscriberCA, + PushUrl: "sommelier.teku.network:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1tj8echy75u4z0f04z4vda3jzgx4x02de9umhv9", + CaCert: ForboleSubscriberCA, + PushUrl: "steward.sommelier.forbole.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm15h8ls6mwt8k709wc8f48ycxa80vcu690j6rnwy", + CaCert: BoubouSubscriberCA, + PushUrl: "sommelier-steward.boubounode.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1pajq6rx0vgxjzdccukyh3h403rqprfhcsvhrat", + CaCert: SleepyKittenSubscriberCA, + PushUrl: "steward.sommelier.sleepykitten.info:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm17qlejm42fz4re8cskz5hlah4hh3s8w9y2yxgu6", + CaCert: EverstakeSubscriberCA, + PushUrl: "sommelier-steward.everstake.one:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1zqklnhsp0q0rew352akcg35a45ruq3vn2c7fym", + CaCert: TesselatedSubscriberCA, + PushUrl: "sommelier.tessageo.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1z3jzvtxplxh2c7qn8j4teq63vsngkf0488w3uj", + CaCert: ZtakeSubscriberCA, + PushUrl: "sommelier.ztake.org:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1ydtvj3ruqqq7zxkz9w5lze5ecylh82v03h5udg", + CaCert: TwoBuckChuckSubscriberCA, + PushUrl: "tastings.two-buck-chuck.xyz:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1xvfdclzyw03ye5mfskw6lvvmervexx8hx58823", + CaCert: CosmostationSubscriberCA, + PushUrl: "steward.sommelier.cosmostation.io:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1ge3qxg5ydd25huhf4v8nge8kjsgyps83qvw775", + CaCert: MCBSubscriberCA, + PushUrl: "sommelier.mcbnode.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm19e4mx2geplpm6ksexxex8dg4dr4a5p7utl4y8z", + CaCert: PolychainSubscriberCA, + PushUrl: "steward.sommelier.unit410.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1v78rxsl5ycptaq2dq5mu6ftzqcgk2aqtfx4ryr", + CaCert: KingSuperSubscriberCA, + PushUrl: "sommelier-steward.kingsuper.services:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1rs4hcjr0jgw9ah8ml5p84cvc0yxcvf8krer8wu", + CaCert: ChillValidationSubscriberCA, + PushUrl: "steward0.chillvalidation.com:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm1g7kwsxw5khxg2zftpfcla8x4pz7zjukzc6luqy", + CaCert: ChainnodesSubscriberCA, + PushUrl: "steward.chainnodes.net:5734", + }) + + subscribers = append(subscribers, &pubsubtypes.Subscriber{ + Address: "somm13d6vkp03nelzu7aq4v6n88nw0tye2ht7j9xern", + CaCert: SevenSeasSubscriberCA, + PushUrl: "steward.sommelier.7seas.capital:5734", + }) + + return subscribers +} diff --git a/clean_slate.sh b/clean_slate.sh new file mode 100755 index 00000000..e00d2075 --- /dev/null +++ b/clean_slate.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +set -e + +echo Cleaning up test environment +docker rm --force \ + $(docker ps -qa --filter="name=ethereum") \ + $(docker ps -qa --filter="name=sommelier") \ + $(docker ps -qa --filter="name=orchestrator") \ + 1>/dev/null \ + 2>/dev/null \ + || true +docker wait \ + $(docker ps -qa --filter="name=ethereum") \ + $(docker ps -qa --filter="name=sommelier") \ + $(docker ps -qa --filter="name=orchestrator") \ + 1>/dev/null \ + 2>/dev/null \ + || true +docker network prune --force 1>/dev/null 2>/dev/null || true +cd integration_tests && go test -c +cd - diff --git a/cmd/sommelier/cmd/root.go b/cmd/sommelier/cmd/root.go index 2daf91c5..adec32e8 100644 --- a/cmd/sommelier/cmd/root.go +++ b/cmd/sommelier/cmd/root.go @@ -30,9 +30,9 @@ import ( "github.com/tendermint/tendermint/libs/log" dbm "github.com/tendermint/tm-db" - bridgecmd "github.com/peggyjv/gravity-bridge/module/v2/cmd/gravity/cmd" - "github.com/peggyjv/sommelier/v4/app" - "github.com/peggyjv/sommelier/v4/app/params" + bridgecmd "github.com/peggyjv/gravity-bridge/module/v3/cmd/gravity/cmd" + "github.com/peggyjv/sommelier/v7/app" + "github.com/peggyjv/sommelier/v7/app/params" ) // NewRootCmd creates a new root command for simd. It is called once in the diff --git a/cmd/sommelier/cmd/testnet.go b/cmd/sommelier/cmd/testnet.go index 6ca93bf0..d434ef16 100644 --- a/cmd/sommelier/cmd/testnet.go +++ b/cmd/sommelier/cmd/testnet.go @@ -11,6 +11,8 @@ import ( "path/filepath" ccrypto "github.com/cosmos/cosmos-sdk/crypto/types" + "github.com/cosmos/cosmos-sdk/server" + "github.com/cosmos/cosmos-sdk/testutil" "github.com/spf13/cobra" tmconfig "github.com/tendermint/tendermint/config" tmos "github.com/tendermint/tendermint/libs/os" @@ -23,7 +25,6 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/cosmos/cosmos-sdk/server" srvconfig "github.com/cosmos/cosmos-sdk/server/config" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -175,7 +176,7 @@ func InitTestnet( return err } - addr, secret, err := server.GenerateSaveCoinKey(kb, nodeDirName, true, algo) + addr, secret, err := testutil.GenerateSaveCoinKey(kb, nodeDirName, "", true, algo) if err != nil { _ = os.RemoveAll(outputDir) return err diff --git a/cmd/sommelier/main.go b/cmd/sommelier/main.go index a831fbff..79afc282 100644 --- a/cmd/sommelier/main.go +++ b/cmd/sommelier/main.go @@ -5,8 +5,8 @@ import ( "github.com/cosmos/cosmos-sdk/server" scmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/peggyjv/sommelier/v4/app" - "github.com/peggyjv/sommelier/v4/cmd/sommelier/cmd" + "github.com/peggyjv/sommelier/v7/app" + "github.com/peggyjv/sommelier/v7/cmd/sommelier/cmd" ) func main() { diff --git a/go.mod b/go.mod index 078bbccc..42ef0729 100644 --- a/go.mod +++ b/go.mod @@ -1,42 +1,172 @@ -module github.com/peggyjv/sommelier/v4 +module github.com/peggyjv/sommelier/v7 -go 1.15 +go 1.18 require ( - github.com/StackExchange/wmi v1.2.1 // indirect - github.com/cosmos/cosmos-sdk v0.44.5-patch + github.com/cosmos/cosmos-sdk v0.45.10 github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/ibc-go/v2 v2.0.0 - github.com/ethereum/go-ethereum v1.10.11 + github.com/cosmos/ibc-go/v3 v3.4.0 + github.com/ethereum/go-ethereum v1.10.22 github.com/gogo/protobuf v1.3.3 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 - github.com/google/go-cmp v0.5.7 // indirect - github.com/google/uuid v1.2.0 // indirect github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/miguelmota/go-ethereum-hdwallet v0.1.1 - github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect - github.com/ory/dockertest/v3 v3.8.1 - github.com/peggyjv/gravity-bridge/module/v2 v2.0.2 + github.com/ory/dockertest/v3 v3.10.0 + github.com/peggyjv/gravity-bridge/module/v3 v3.0.0-20230425134518-c0644797435c github.com/rakyll/statik v0.1.7 github.com/regen-network/cosmos-proto v0.3.1 - github.com/spf13/cast v1.4.1 - github.com/spf13/cobra v1.2.1 - github.com/spf13/viper v1.10.1 - github.com/stretchr/testify v1.8.0 - github.com/tendermint/tendermint v0.34.14 - github.com/tendermint/tm-db v0.6.4 - github.com/tklauser/go-sysconf v0.3.7 // indirect - github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect - golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect - google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a - google.golang.org/grpc v1.44.0 + github.com/spf13/cast v1.5.0 + github.com/spf13/cobra v1.6.1 + github.com/spf13/viper v1.14.0 + github.com/stretchr/testify v1.8.1 + github.com/tendermint/tendermint v0.34.22 + github.com/tendermint/tm-db v0.6.7 + google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 + google.golang.org/grpc v1.52.0 gopkg.in/yaml.v2 v2.4.0 ) +require ( + filippo.io/edwards25519 v1.0.0-beta.2 // indirect + github.com/99designs/keyring v1.1.6 // indirect + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d // indirect + github.com/DataDog/zstd v1.4.5 // indirect + github.com/Microsoft/go-winio v0.6.0 // indirect + github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect + github.com/StackExchange/wmi v1.2.1 // indirect + github.com/Workiva/go-datastructures v1.0.53 // indirect + github.com/armon/go-metrics v0.4.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/bgentry/speakeasy v0.1.0 // indirect + github.com/btcsuite/btcd v0.22.1 // indirect + github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect + github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 // indirect + github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect + github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cespare/xxhash v1.1.0 // indirect + github.com/cespare/xxhash/v2 v2.1.2 // indirect + github.com/coinbase/rosetta-sdk-go v0.7.0 // indirect + github.com/confio/ics23/go v0.8.0 // indirect + github.com/containerd/continuity v0.3.0 // indirect + github.com/cosmos/btcutil v1.0.4 // indirect + github.com/cosmos/gorocksdb v1.2.0 // indirect + github.com/cosmos/iavl v0.19.3 // indirect + github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect + github.com/cosmos/ledger-go v0.9.2 // indirect + github.com/creachadair/taskgroup v0.3.2 // indirect + github.com/danieljoos/wincred v1.1.0 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/deckarep/golang-set v1.8.0 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect + github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect + github.com/dgraph-io/badger/v2 v2.2007.2 // indirect + github.com/dgraph-io/ristretto v0.0.3 // indirect + github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect + github.com/docker/cli v20.10.17+incompatible // indirect + github.com/docker/docker v20.10.17+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/dvsekhvalnov/jose2go v0.0.0-20200901110807-248326c1351b // indirect + github.com/felixge/httpsnoop v1.0.2 // indirect + github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/go-kit/kit v0.12.0 // indirect + github.com/go-kit/log v0.2.1 // indirect + github.com/go-logfmt/logfmt v0.5.1 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-stack/stack v1.8.0 // indirect + github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect + github.com/gogo/gateway v1.1.0 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/google/orderedcode v0.0.1 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/gorilla/handlers v1.5.1 // indirect + github.com/gorilla/websocket v1.5.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect + github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect + github.com/gtank/merlin v0.1.1 // indirect + github.com/gtank/ristretto255 v0.1.2 // indirect + github.com/hashicorp/go-immutable-radix v1.3.1 // indirect + github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/improbable-eng/grpc-web v0.14.1 // indirect + github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/jmhodges/levigo v1.0.0 // indirect + github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d // indirect + github.com/klauspost/compress v1.15.9 // indirect + github.com/lib/pq v1.10.6 // indirect + github.com/libp2p/go-buffer-pool v0.1.0 // indirect + github.com/magiconair/properties v1.8.6 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.16 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect + github.com/minio/highwayhash v1.0.2 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect + github.com/mtibben/percent v0.2.1 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 // indirect + github.com/opencontainers/runc v1.1.5 // indirect + github.com/pelletier/go-toml v1.9.5 // indirect + github.com/pelletier/go-toml/v2 v2.0.5 // indirect + github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.12.2 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.34.0 // indirect + github.com/prometheus/procfs v0.7.3 // indirect + github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/rjeczalik/notify v0.9.1 // indirect + github.com/rs/cors v1.8.2 // indirect + github.com/rs/zerolog v1.27.0 // indirect + github.com/sasha-s/go-deadlock v0.3.1 // indirect + github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect + github.com/sirupsen/logrus v1.9.0 // indirect + github.com/spf13/afero v1.9.2 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/subosito/gotenv v1.4.1 // indirect + github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // indirect + github.com/tendermint/btcd v0.1.1 // indirect + github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 // indirect + github.com/tendermint/go-amino v0.16.0 // indirect + github.com/tklauser/go-sysconf v0.3.9 // indirect + github.com/tklauser/numcpus v0.3.0 // indirect + github.com/tyler-smith/go-bip39 v1.0.2 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/zondax/hid v0.9.0 // indirect + go.etcd.io/bbolt v1.3.6 // indirect + golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect + golang.org/x/mod v0.9.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.7.0 // indirect + golang.org/x/term v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect + golang.org/x/tools v0.7.0 // indirect + google.golang.org/protobuf v1.28.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + nhooyr.io/websocket v1.8.6 // indirect +) + 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/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.22 + replace github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 diff --git a/go.sum b/go.sum index df3e6cb7..85d753ad 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ -bazil.org/fuse v0.0.0-20160811212531-371fbbdaa898/go.mod h1:Xbm+BRKSBEpa4q4hTSxohYNQpsxXPbPry4JJWOB3LB8= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= cloud.google.com/go v0.43.0/go.mod h1:BOSR3VbTLkk6FDC/TcffxP4NF/FFBGA5ku+jvKOP7pg= cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= @@ -17,17 +17,7 @@ cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOY cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= -cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= -cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= -cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= -cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY= -cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM= -cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY= -cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ= -cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI= -cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4= -cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc= -cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA= +cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY= cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= @@ -37,8 +27,6 @@ cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM7 cloud.google.com/go/bigtable v1.2.0/go.mod h1:JcVAOl45lrTmQfLj7T6TxyMzIN/3FGGcFm+2xVAli2o= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY= cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= @@ -48,6 +36,7 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= collectd.org v0.3.0/go.mod h1:A/8DzQBkF6abtvrT2j/AU/4tiBgJWYyh0y/oB/4MlWE= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= filippo.io/edwards25519 v1.0.0-beta.2 h1:/BZRNzm8N4K4eWfK28dL4yescorxtO7YG1yun8fy+pI= @@ -57,7 +46,6 @@ github.com/99designs/keyring v1.1.6/go.mod h1:16e0ds7LGQQcT59QqkTg72Hh5ShM51Byv5 github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= github.com/Azure/azure-pipeline-go v0.2.2/go.mod h1:4rQ/NZncSvGqNkkOsNpOU1tgoNuIlp9AfUH5G1tvCHc= github.com/Azure/azure-storage-blob-go v0.7.0/go.mod h1:f9YQKtsG1nMisotuTPpO0tjNuEjKRYAcJU8/ydDI++4= -github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8= github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E= github.com/Azure/go-autorest/autorest v0.9.0/go.mod h1:xyHB1BMZT0cuDHU7I0+g046+BFDTQ8rEZB0s4Yfa6bI= @@ -80,10 +68,8 @@ github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= -github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA= -github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Microsoft/go-winio v0.5.1 h1:aPJp2QD7OOrhO5tQXqQoGSJc+DjDtWTGLOmNyAm6FgY= -github.com/Microsoft/go-winio v0.5.1/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= +github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= +github.com/Microsoft/go-winio v0.6.0/go.mod h1:cTAf44im0RAYeL23bpB+fzCyDH2MJiz2BO69KH/soAE= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= github.com/OneOfOne/xxhash v1.2.2 h1:KMrpdQIwFcEqXDklaen+P1axHaj9BSKzvpUUfnHldSE= @@ -98,11 +84,10 @@ github.com/VictoriaMetrics/fastcache v1.6.0 h1:C/3Oi3EiBCqufydp1neRZkqcwmEiuRT9c github.com/VictoriaMetrics/fastcache v1.6.0/go.mod h1:0qHz5QP0GMX4pfmMA/zt5RgfNuXJrTP0zS7DqpHGGTw= github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE= github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g= -github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI= -github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA= +github.com/Workiva/go-datastructures v1.0.53 h1:J6Y/52yX10Xc5JjXmGtWoSSxs3mZnGSaq37xZZh7Yig= +github.com/Workiva/go-datastructures v1.0.53/go.mod h1:1yZL+zfsztete+ePzZz/Zb1/t5BnDuE2Ya2MMGhzP6A= github.com/Zilliqa/gozilliqa-sdk v1.2.1-0.20201201074141-dd0ecada1be6/go.mod h1:eSYp2T6f0apnuW8TzhV3f6Aff2SE8Dwio++U4ha4yEM= -github.com/adlio/schema v1.1.13 h1:LeNMVg5Z1FX+Qgz8tJUijBLRdcpbFUElz+d1489On98= -github.com/adlio/schema v1.1.13/go.mod h1:L5Z7tw+7lRK1Fnpi/LT/ooCP1elkXn0krMWBQHUhEDE= +github.com/adlio/schema v1.3.3 h1:oBJn8I02PyTB466pZO1UZEn1TV5XLlifBSyMrmHl/1I= github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII= github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5/go.mod h1:SkGFH1ia65gfNATL8TAiHDNxPzPdmEL5uirI2Uyuz6c= github.com/ajstarks/svgo v0.0.0-20180226025133-644b8db467af/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= @@ -112,7 +97,6 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= github.com/allegro/bigcache v1.2.1-0.20190218064605-e24eb225f156/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= -github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc= github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM= github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo29Kk6CurOXKm700vrz8f0KW0JNfpkRJY/8= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= @@ -123,11 +107,9 @@ github.com/aristanetworks/goarista v0.0.0-20170210015632-ea17b1a17847/go.mod h1: github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-metrics v0.3.9/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= -github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8Uo= -github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= +github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= +github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.25.48/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= @@ -148,9 +130,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0 h1:ByYyxL9InA1OWqxJqqp2A5pYHUrCiAL6K3J+LKSsQkY= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/btcsuite/btcd v0.0.0-20171128150713-2e60448ffcc6/go.mod h1:Dmm/EzmjnCiweXmzRIAiUWCInVmPgjkzgv5k4tVyXiQ= @@ -158,8 +137,12 @@ github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d/go.mod h1:d3C0AkH6BR github.com/btcsuite/btcd v0.0.0-20190315201642-aa6e0f35703c/go.mod h1:DrZx5ec/dmnfpw9KyYoQyYo7d0KEvTkk/5M/vbZjAr8= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= github.com/btcsuite/btcd v0.21.0-beta/go.mod h1:ZSWyehm27aAuS9bvkATT+Xte3hjHZ+MRgMY/8NJ7K94= -github.com/btcsuite/btcd v0.22.0-beta h1:LTDpDKUM5EeOFBPM8IXpinEcmZ6FWfNZbE3lfrfdnWo= -github.com/btcsuite/btcd v0.22.0-beta/go.mod h1:9n5ntfhhHQBIhUvlhDvD3Qg6fRUj4jkN0VB8L8svzOA= +github.com/btcsuite/btcd v0.22.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= +github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd/btcec/v2 v2.2.0 h1:fzn1qaOt32TuLjFlkzYSsBC35Q3KUjT1SwPxiMSCF5k= +github.com/btcsuite/btcd/btcec/v2 v2.2.0/go.mod h1:U7MHm051Al6XmscBQ0BoNydpOTsFAn707034b5nY8zU= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= github.com/btcsuite/btcutil v0.0.0-20180706230648-ab6388e0c60a/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= @@ -178,10 +161,9 @@ github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOC github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= -github.com/cenkalti/backoff/v4 v4.1.2 h1:6Yo7N8UP2K6LWZnW94DLVSSrbobcWdVzAYOisuDPIFo= -github.com/cenkalti/backoff/v4 v4.1.2/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= +github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -189,88 +171,81 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= +github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA= github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag= github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I= github.com/clbanning/x2j v0.0.0-20191024224557-825249438eec/go.mod h1:jMjuTZXRI4dUb/I5gc9Hdhagfvm9+RyrPryS/auMzxE= github.com/cloudflare/cloudflare-go v0.10.2-0.20190916151808-a80f83b9add9/go.mod h1:1MxXX1Ux4x6mqPmjkUgTP1CdXIBXKX7T+Jk9Gxrmx+U= github.com/cloudflare/cloudflare-go v0.14.0/go.mod h1:EnwdgGMaFOruiPZRFSgn+TsQ3hQ7C/YWzIGLeu5c304= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= -github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= -github.com/coinbase/rosetta-sdk-go v0.6.10 h1:rgHD/nHjxLh0lMEdfGDqpTtlvtSBwULqrrZ2qPdNaCM= -github.com/coinbase/rosetta-sdk-go v0.6.10/go.mod h1:J/JFMsfcePrjJZkwQFLh+hJErkAmdm9Iyy3D5Y0LfXo= +github.com/coinbase/rosetta-sdk-go v0.7.0 h1:lmTO/JEpCvZgpbkOITL95rA80CPKb5CtMzLaqF2mCNg= +github.com/coinbase/rosetta-sdk-go v0.7.0/go.mod h1:7nD3oBPIiHqhRprqvMgPoGxe/nyq3yftRmpsy29coWE= github.com/consensys/bavard v0.1.8-0.20210406032232-f3452dc9b572/go.mod h1:Bpd0/3mZuaj6Sj+PqrmIquiOKy397AKGThQPaGzNXAQ= github.com/consensys/gnark-crypto v0.4.1-0.20210426202927-39ac3d4b3f1f/go.mod h1:815PAHg3wvysy0SyIqanF8gZ0Y1wjk/hrDHD/iT88+Q= -github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/continuity v0.0.0-20190827140505-75bee3e2ccb6/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= -github.com/containerd/continuity v0.1.0 h1:UFRRY5JemiAhPZrr/uE0n8fMTLcZsUvySPr1+D7pgr8= -github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= +github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= +github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/go-systemd/v22 v22.3.3-0.20220203105225-a9a7ef127534/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.4 h1:n7C2ngKXo7UC9gNyMNLbzqz7Asuf+7Qv4gnX/rOdQ44= github.com/cosmos/btcutil v1.0.4/go.mod h1:Ffqc8Hn6TJUdDgHBwIZLtrLQC1KdJ9jGJl/TvgUaxbU= -github.com/cosmos/cosmos-sdk v0.44.3/go.mod h1:bA3+VenaR/l/vDiYzaiwbWvRPWHMBX2jG0ygiFtiBp0= -github.com/cosmos/cosmos-sdk v0.44.5-patch h1:7B++kwRpcUsU0emDpQbnpHsq3NRxGCrs6mNEf0GFAkY= -github.com/cosmos/cosmos-sdk v0.44.5-patch/go.mod h1:gC8OZvf75wKEaOA1WTd+p2sKt04Hggi+0m+6DT0dYv8= +github.com/cosmos/cosmos-sdk v0.45.10 h1:YRf1N6C7OFCc8FJ5wuhcnDDySJNDn5DxSscVgbeXgz4= +github.com/cosmos/cosmos-sdk v0.45.10/go.mod h1:CbfWNs4PuxxsvRD/snQuSBDwIhtsD7rIDTVQyYMKTa0= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 h1:iKclrn3YEOwk4jQHT2ulgzuXyxmzmPczUalMwW4XH9k= github.com/cosmos/cosmos-sdk/ics23/go v0.8.0/go.mod h1:2a4dBq88TUoqoWAU5eu0lGvpFP3wWDPgdHPargtyw30= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= 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/go.mod h1:OLjQiAQ4fGD2KDZooyJG9yz+p2ao2IAYSbke8mVvSA4= -github.com/cosmos/iavl v0.17.1/go.mod h1:7aisPZK8yCpQdy3PMvKeO+bhq1NwDjUwjzxwwROUxFk= -github.com/cosmos/iavl v0.17.3 h1:s2N819a2olOmiauVa0WAhoIJq9EhSXE9HDBAoR9k+8Y= -github.com/cosmos/iavl v0.17.3/go.mod h1:prJoErZFABYZGDHka1R6Oay4z9PrNeFFiMKHDAMOi4w= -github.com/cosmos/ibc-go/v2 v2.0.0 h1:BMRg73JcdV9wGPI51j89ihm7VBZQsDLkqQ+tmzdeA9Y= -github.com/cosmos/ibc-go/v2 v2.0.0/go.mod h1:n53VhNSUxCtMLysvgyNhwrGHL8OW+318LMjtSmaVe9Q= +github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= +github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= +github.com/cosmos/iavl v0.19.3 h1:cESO0OwTTxQm5rmyESKW+zESheDUYI7CcZDWWDwnuxg= +github.com/cosmos/iavl v0.19.3/go.mod h1:X9PKD3J0iFxdmgNLa7b2LYWdsGd90ToV5cAONApkEPw= +github.com/cosmos/ibc-go/v3 v3.4.0 h1:ha3cqEG36pqMWqA1D+kxDWBTZXpeFMd/aZIQF7I0xro= +github.com/cosmos/ibc-go/v3 v3.4.0/go.mod h1:VwB/vWu4ysT5DN2aF78d17LYmx3omSAdq6gpKvM7XRA= 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= github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= +github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= +github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/creachadair/taskgroup v0.3.2 h1:zlfutDS+5XG40AOxcHDSThxKzns8Tnr9jnr6VqkYlkM= +github.com/creachadair/taskgroup v0.3.2/go.mod h1:wieWwecHVzsidg2CsUnFinW1faVN4+kq+TDlRJQ0Wbk= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= -github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= -github.com/danieljoos/wincred v1.0.2 h1:zf4bhty2iLuwgjgpraD2E9UbvO+fe54XXGJbOwe23fU= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/danieljoos/wincred v1.0.2/go.mod h1:SnuYRW9lp1oJrZX/dXJqr0cPK5gYXqx3EJbmjhLdK9U= +github.com/danieljoos/wincred v1.1.0 h1:3RNcEpBg4IhIChZdFRSdlQt1QjCp1sMAPIrOnm7Yf8g= +github.com/danieljoos/wincred v1.1.0/go.mod h1:XYlo+eRTsVA9aHGp7NGjFkPla4m+DCL7hqDjlFjiygg= github.com/dave/jennifer v1.2.0/go.mod h1:fIb+770HOpJ2fmN9EPPKOqm1vMGhB+TwXKMZhrIygKg= github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea h1:j4317fAZh7X6GqbFowYdYdI0L9bwxL07jyPZIdepyZ0= github.com/deckarep/golang-set v0.0.0-20180603214616-504e848d77ea/go.mod h1:93vsz/8Wt4joVM7c2AVqh+YRMiUSc14yDtF28KmMOgQ= +github.com/deckarep/golang-set v1.8.0 h1:sk9/l/KqpunDwP7pSjUg0keiOOLEnOBHzykLrsPppp4= +github.com/deckarep/golang-set v1.8.0/go.mod h1:5nI87KwE7wgsBU1F4GKAw2Qod7p5kyS383rP6+o6qqo= +github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= +github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218= -github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= -github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f h1:U5y3Y5UE0w7amNe7Z5G/twsBW0KEalRQXZzf8ufSh9I= github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f/go.mod h1:xH/i4TFMt8koVQZ6WFms69WAsDWr2XsYL3Hkl7jkoLE= -github.com/dgraph-io/badger/v2 v2.2007.1/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/badger/v2 v2.2007.2 h1:EjjK0KqwaFMlPin1ajhP943VPENHJdEz1KLIegjaI3k= github.com/dgraph-io/badger/v2 v2.2007.2/go.mod h1:26P/7fbL4kUZVEVKLAKXkBXKOydDmM2p1e+NhhnBCAE= github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E= @@ -283,19 +258,16 @@ github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WA github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/dlclark/regexp2 v1.2.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= -github.com/docker/cli v20.10.11+incompatible h1:tXU1ezXcruZQRrMP8RN2z9N91h+6egZTS1gsPsKantc= -github.com/docker/cli v20.10.11+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v20.10.17+incompatible h1:eO2KS7ZFeov5UJeaDmIs1NFEDRf32PaqRpvoEkKBy5M= +github.com/docker/cli v20.10.17+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/docker v1.4.2-0.20180625184442-8e610b2b55bf/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= -github.com/docker/docker v20.10.7+incompatible h1:Z6O9Nhsjv+ayUEeI1IojKbYcsGdgYSNqxe1s2MYzUhQ= -github.com/docker/docker v20.10.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.17+incompatible h1:JYCuMrWaVNophQTOrMMoSwudOVEfcegoZZrleKc1xwE= +github.com/docker/docker v20.10.17+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/dop251/goja v0.0.0-20200721192441-a695b0cdd498/go.mod h1:Mw6PkjjMXWbTj+nnj4s3QPXq1jaT0s5pC0iFD4+BOAA= -github.com/dop251/goja v0.0.0-20211011172007-d99e4b8cbf48/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk= -github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= @@ -309,45 +281,36 @@ github.com/eclipse/paho.mqtt.golang v1.2.0/go.mod h1:H9keYFcgq3Qr5OUJm/JZI/i6U7j github.com/edsrzf/mmap-go v0.0.0-20160512033002-935e0e8a636c/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/enigmampc/btcutil v1.0.3-0.20200723161021-e2fb6adb2a25/go.mod h1:hTr8+TLQmkUkgcuh3mcr5fjrT9c64ZzsBCdCEC6UppY= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws= github.com/ethereum/go-ethereum v1.9.25/go.mod h1:vMkFiYLHI4tgPw4k2j4MHKoovchFE8plZ0M9VMk4/oM= github.com/ethereum/go-ethereum v1.10.4/go.mod h1:nEE0TP5MtxGzOMd7egIrbPJMQBnhVU3ELNxhBglIzhg= -github.com/ethereum/go-ethereum v1.10.11 h1:KKIcwpmur9iTaVbR2dxlHu+peHVhU+/KX//NWvT1n9U= -github.com/ethereum/go-ethereum v1.10.11/go.mod h1:W3yfrFyL9C1pHcwY5hmRHVDaorTiQxhYBkKyu5mEDHw= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= +github.com/ethereum/go-ethereum v1.10.22 h1:HbEgsDo1YTGIf4KB/NNpn+XH+PiNJXUZ9ksRxiqWyMc= +github.com/ethereum/go-ethereum v1.10.22/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= +github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= -github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= +github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= github.com/fatih/color v1.3.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= -github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU= github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= -github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +github.com/felixge/httpsnoop v1.0.2 h1:+nS9g82KMXccJ/wp0zyRW9ZBHFETmMGtkk+2CTTrW4o= +github.com/felixge/httpsnoop v1.0.2/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5 h1:FtmdgXiUlNeRsoNMFlKLDt+S+6hbjVMEW6RGQ7aUf7c= github.com/fjl/memsize v0.0.0-20190710130421-bcb5799ab5e5/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= -github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= github.com/franela/goreq v0.0.0-20171204163338-bcd34c9993f8/go.mod h1:ZhphrRTfi2rbfLwlschooIH4+wKKDR4Pdxhh+TRoA20= github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI= -github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU= +github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= +github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff h1:tY80oXqGNY4FhTFhk+o9oFHGINQ/+vhlm8HFzi6znCI= github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww= -github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= -github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -355,39 +318,40 @@ github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14= github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20190410193231-58a59202ab31/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= -github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.10.0 h1:dXFJfIHVvUcpSgDOV+Ne6t7jXri8Tfv2uOLHUZ2XNuo= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= +github.com/go-kit/kit v0.12.0 h1:e4o3o3IsBfAKQh5Qbbiqyfu97Ku7jrO/JbohvztANh4= +github.com/go-kit/kit v0.12.0/go.mod h1:lHd+EkCZPIwYItmGDDRdhinkzX2A1sj+M9biaEaizzs= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= +github.com/go-kit/log v0.2.1 h1:MRVx0/zhvdseW+Gza6N9rVzU/IVzaeE1SFI4raAhmBU= +github.com/go-kit/log v0.2.1/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0 h1:TrB8swr/68K7m9CcGut2g3UOihhbcbiMAYiuTXdEih4= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-ole/go-ole v1.2.1/go.mod h1:7FAglXiTm7HKlQRDeOQ6ZNUHidzCWXuZWq/1dTyBNF8= -github.com/go-ole/go-ole v1.2.5 h1:t4MGB5xEDZvXI+0rMjjsfBsD7yAgp/s9ZDkL1JndXwY= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= -github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY= github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI= +github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= github.com/go-sourcemap/sourcemap v2.1.2+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= -github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= @@ -397,25 +361,24 @@ github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/E github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/gofrs/uuid v3.3.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM= github.com/gogo/gateway v1.1.0 h1:u0SuhL9+Il+UbjM9VIE3ntfRujKbvVpFvNB4HbjeVQ0= github.com/gogo/gateway v1.1.0/go.mod h1:S7rR8FRQyG3QFESeSv4l2WnsyzlCLG0CzBbUUo/mbic= +github.com/golang-jwt/jwt/v4 v4.3.0 h1:kHL1vqdqWNfATmA0FNMdmZNMyZI1U6O31X4rlIPoBog= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/geo v0.0.0-20190916061304-5b978397cfec/go.mod h1:QZ0nwyI2jOfgRAoBvP+ab5aRr7c9x7lhGEJrKvBwjWI= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= -github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -434,7 +397,6 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= @@ -443,10 +405,10 @@ github.com/golang/snappy v0.0.3-0.20201103224600-674baa8c7fc3/go.mod h1:/XxbfmMg github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= github.com/google/flatbuffers v1.11.0/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -456,12 +418,9 @@ github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= -github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa h1:Q75Upo5UN4JbPFURXZ8nLKYUvF85dyFRop/vQ0Rv+64= @@ -469,7 +428,6 @@ github.com/google/gofuzz v1.1.1-0.20200604201612-c04b05f3adfa/go.mod h1:dBl0BpW6 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= github.com/google/orderedcode v0.0.1 h1:UzfcAexk9Vhv8+9pNOgRu41f16lHq725vPwnSeiG/Us= github.com/google/orderedcode v0.0.1/go.mod h1:iVyU4/qPKHY5h/wSd6rZZCDcLJNxiWO6dvsYES2Sb20= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= @@ -481,11 +439,7 @@ github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= -github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= @@ -493,14 +447,12 @@ github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+ github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.5/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0= -github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM= +github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/gordonklaus/ineffassign v0.0.0-20200309095847-7953dde2c7bf/go.mod h1:cuNKsD1zp2v6XfE/orVX2QE1LC+i254ceGcVeDT3pTU= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH4= github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q= @@ -509,26 +461,20 @@ github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2z github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v0.0.0-20170926233335-4201258b820c/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1-0.20190629185528-ae1634f6a989/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gotestyourself/gotestyourself v2.2.0+incompatible h1:AQwinXlbQR2HvPjQZOmDhRqsv5mZf+Jb1RnSLxcqZcI= -github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/graph-gophers/graphql-go v0.0.0-20191115155744-f33e81362277/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/graph-gophers/graphql-go v0.0.0-20201113091052-beb923fada29/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-middleware v1.2.1/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.2.2/go.mod h1:EaizFBKfUKtMIF5iaDEhniwNedqGo9FuLFzppDr3uwI= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/grpc-ecosystem/grpc-gateway v1.14.7/go.mod h1:oYZKL012gGh6LMyg/xA7Q2yq6j8bu0wa+9w14EEthWU= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= @@ -538,29 +484,19 @@ github.com/gtank/merlin v0.1.1 h1:eQ90iG7K9pOhtereWsmyRJ6RAwcP4tHTDBHXNg+u5is= github.com/gtank/merlin v0.1.1/go.mod h1:T86dnYJhcGOh5BjZFCJWTDeTK7XW8uE+E21Cy/bIQ+s= github.com/gtank/ristretto255 v0.1.2 h1:JEqUCPA1NvLq5DwYtuzigd7ss8fwbYay9fi4/5uMzcc= github.com/gtank/ristretto255 v0.1.2/go.mod h1:Ph5OpO6c7xKUGROZfWVLiJf9icMDwUeIvY4OmlYW69o= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/api v1.3.0/go.mod h1:MmDNSzIMUjNpY/mQ398R4bk2FnqQLoPndWW5VkKPlCE= -github.com/hashicorp/consul/api v1.12.0/go.mod h1:6pVBMo0ebnYdt2S3H87XhekM/HHrUoTD2XXb/VrZVy0= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/consul/sdk v0.3.0/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= -github.com/hashicorp/go-bexpr v0.1.10/go.mod h1:oxlubA2vC/gFVfX1A6JGp7ls7uCDlfJn732ehYYg+g0= github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48= -github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= -github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ= github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-immutable-radix v1.3.1 h1:DKHmCUm2hRBK510BaiZlwvpD40f8bJFeZnpfm2KLowc= github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA= github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs= github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8= github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= @@ -577,11 +513,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc= github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE= github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= -github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87 h1:uUjLpLt6bVvZ72SQc/B4dXcPBw4Vgd7soowdRl52qEM= github.com/hdevalence/ed25519consensus v0.0.0-20210204194344-59a8610d2b87/go.mod h1:XGsKKeXxeRr95aEOgipvluMPlgjr7dGlk9ZTWOjcUcg= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= @@ -593,38 +526,35 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= github.com/huin/goupnp v1.0.0/go.mod h1:n9v9KO1tAxYH82qOn+UTIFQDmx5n1Zxd/ClZDMX7Bnc= github.com/huin/goupnp v1.0.1-0.20210310174557-0ca763054c88/go.mod h1:nNs7wvRfN1eKaMknBydLNQU6146XQim8t4h+q90biWo= -github.com/huin/goupnp v1.0.2 h1:RfGLP+h3mvisuWEyybxNq5Eft3NWhHLPeUN72kpKZoI= -github.com/huin/goupnp v1.0.2/go.mod h1:0dxJBVBHqTMjIUMkESDTNgOOx/Mw5wYIfyFmdzSamkM= +github.com/huin/goupnp v1.0.3 h1:N8No57ls+MnjlB+JPiCVSOyy/ot7MJTqlo7rn+NYSqQ= github.com/huin/goutil v0.0.0-20170803182201-1ca381bf3150/go.mod h1:PpLOETDnJ0o3iZrZfqZzyLl6l7F3c6L1oWn7OICBi6o= -github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/improbable-eng/grpc-web v0.14.1 h1:NrN4PY71A6tAz2sKDvC5JCauENWp0ykG8Oq1H3cpFvw= github.com/improbable-eng/grpc-web v0.14.1/go.mod h1:zEjGHa8DAlkoOXmswrNvhUGEYQA9UI7DhrGeHR1DMGU= -github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= +github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.2.3-0.20180221223340-01288bdb0883/go.mod h1:qZna6X/4elxqT3yI9iZYdZrWWdeFOOprn86kgg4+IzY= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= -github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/influxdata/influxql v1.1.1-0.20200828144457-65d3ef77d385/go.mod h1:gHp9y86a/pxhjJ+zMjNXiQAA197Xk9wLxaz+fGG+kWk= github.com/influxdata/line-protocol v0.0.0-20180522152040-32c6aa80de5e/go.mod h1:4kt73NQhadE3daL3WhR5EJ/J2ocX0PZzwxQ0gXJ7oFE= -github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= -github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/influxdata/promql/v2 v2.12.0/go.mod h1:fxOPu+DY0bqCTCECchSRtWfc+0X19ybifQhZoQNF5D8= github.com/influxdata/roaring v0.4.13-0.20180809181101-fc520f41fab6/go.mod h1:bSgUQ7q5ZLSO+bKBGqJiCBGAl+9DxyW63zLTujjUlOE= github.com/influxdata/tdigest v0.0.0-20181121200506-bf2b5ad3c0a9/go.mod h1:Js0mqiSBE6Ffsg94weZZ2c+v/ciT8QRHFOap7EKDrR0= github.com/influxdata/usage-client v0.0.0-20160829180054-6d3895376368/go.mod h1:Wbbw6tYNvwa5dlB6304Sd+82Z3f7PmVZHVKU637d4po= -github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458 h1:6OvNmYgJyexcZ3pYbTI9jWx5tHo1Dee/tWbLMfPe2TA= +github.com/informalsystems/tendermint v0.34.22 h1:Ww7cBQwiBhCAboiKp/MaNqVdcd47CNKSIEK4YxtfPkk= +github.com/informalsystems/tendermint v0.34.22/go.mod h1:YpP5vBEAKUT4g6oyfjKgFeZmdB/GjkJAxfF+cgmJg6Y= github.com/jackpal/go-nat-pmp v1.0.2-0.20160603034137-1fa385a6f458/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= +github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jedisct1/go-minisign v0.0.0-20190909160543-45766022959e/go.mod h1:G1CVv03EnqU1wYL2dFwXxW2An0az9JTl/ZsqXQeBlkU= github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jhump/protoreflect v1.9.0 h1:npqHz788dryJiR/l6K/RUQAyh2SwV91+d1dnh4RjO9w= -github.com/jhump/protoreflect v1.9.0/go.mod h1:7GcYQDdMU/O/BBrl/cX6PNHpXh6cenjd8pneu5yW7Tg= +github.com/jhump/protoreflect v1.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= @@ -651,17 +581,16 @@ github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8 github.com/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jwilder/encoding v0.0.0-20170811194829-b4e1701a28ef/go.mod h1:Ct9fl0F6iIOGgxJ5npU/IUOhOhqlVrGjyIZc8/MagT0= github.com/karalabe/usb v0.0.0-20190919080040-51dc0efba356/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/karalabe/usb v0.0.0-20211005121534-4c5740d64559/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d h1:Z+RDyXzjKE0i2sTjZ/b1uxiGtPhFy34Ou/Tk0qwN0kM= github.com/keybase/go-keychain v0.0.0-20190712205309-48d3d31d256d/go.mod h1:JJNrCn9otv/2QP4D7SMJBgaleKpOf66PnW6F5WGNRIc= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4= -github.com/kkdai/bstream v1.0.0/go.mod h1:FDnDOHt5Yx4p3FaHcioFT0QjDOtgUpvjeZqAs+NVZZA= github.com/klauspost/compress v1.4.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.10.3/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= -github.com/klauspost/compress v1.11.7 h1:0hzRabrMN4tSTvMfnL3SCv1ZGeAP23ynzodBgaHeMeg= github.com/klauspost/compress v1.11.7/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs= +github.com/klauspost/compress v1.15.9 h1:wKRjX6JRtDdrE9qwa4b/Cip7ACOshUI4smpCQanqjSY= +github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= github.com/klauspost/cpuid v0.0.0-20170728055534-ae7887de9fa5/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/crc32 v0.0.0-20161016154125-cb6bfca970f6/go.mod h1:+ZoRqAPRLkC4NPOvfYeR5KNOrY6TD+/sAC3HXPZgDYg= github.com/klauspost/pgzip v1.0.2-0.20170402124221-0bf5dcad4ada/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs= @@ -671,58 +600,41 @@ github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= -github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= -github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= -github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= -github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/libp2p/go-buffer-pool v0.0.2 h1:QNK2iAFa8gjAe1SPz6mHSMuCcjs+X1wlHzeOSqcmlfs= -github.com/libp2p/go-buffer-pool v0.0.2/go.mod h1:MvaB6xw5vOrDl8rYZGLFdKAuk/hRoRZd1Vi32+RXyFM= +github.com/lib/pq v1.10.6 h1:jbk+ZieJ0D7EVGJYpL9QTz7/YW6UHbmdnZWYyK5cdBs= +github.com/lib/pq v1.10.6/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= +github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= +github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= 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/lucasjones/reggen v0.0.0-20180717132126-cdb49ff09d77/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= -github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w= 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.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= -github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= -github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ= +github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= +github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.0/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc= github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.5-0.20180830101745-3fb116b82035/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= -github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= -github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -730,19 +642,18 @@ github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/Qd github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= +github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= -github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI= github.com/miguelmota/go-ethereum-hdwallet v0.1.1 h1:zdXGlHao7idpCBjEGTXThVAtMKs+IxAgivZ75xqkWK0= github.com/miguelmota/go-ethereum-hdwallet v0.1.1/go.mod h1:f9m9uXokAHA6WNoYOPjj4AqjJS5pquQRiYYj/XSyPYc= -github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 h1:hLDRPB66XQT/8+wG9WsDpiCvZf1yKO7sz7scAjSlBa0= github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= -github.com/minio/highwayhash v1.0.1 h1:dZ6IIu8Z14VlC0VpfKofAhCy74wu/Qb5gcn52yWoz/0= -github.com/minio/highwayhash v1.0.1/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= +github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 h1:QRUSJEgZn2Snx0EmT/QLXibWjSUDjKWvXIT19NBVp94= +github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0/go.mod h1:43+3pMjjKimDBf5Kr4ZFNGbLql1zKkbImw+fZbw3geM= +github.com/minio/highwayhash v1.0.2 h1:Aak5U0nElisjDCfPSG79Tgzkn2gl66NxOMspRrKnA/g= +github.com/minio/highwayhash v1.0.2/go.mod h1:BQskDq+xkJ12lmlUUi7U0M5Swg3EWR+dLTk+kldvVxY= github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI= github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -752,16 +663,12 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.3.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= -github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= +github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/pointerstructure v1.2.0 h1:O+i9nHnXS3l/9Wu7r4NrEdwA2VFTicjUEN1uBnDo34A= -github.com/mitchellh/pointerstructure v1.2.0/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4= -github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= -github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc= -github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= +github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI= +github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -787,11 +694,8 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/neilotoole/errgroup v0.1.5/go.mod h1:Q2nLGf+594h0CLBs/Mbg6qOr7GtqDK7C2S41udRnToE= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/predeclared v0.0.0-20200524104333-86fad755b4d3/go.mod h1:nt3d53pc1VYcphSCIaYAJtnPYnr3Zyn8fMq2wvPGPso= +github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -803,28 +707,22 @@ github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= -github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E= -github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= -github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1 h1:o0+MgICZLuZ7xjH7Vx6zS/zcu93/BEp1VwkIW1mEXCE= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= -github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= -github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/opencontainers/go-digest v1.0.0-rc1/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= -github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.0.2 h1:9yCKha/T5XdGtO0q9Q9a6T5NUCsTn/DrBg0D7ufOcFM= -github.com/opencontainers/image-spec v1.0.2/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.2 h1:opHZMaswlyxz1OuGpBE53Dwe4/xF7EZTY0A2L/FpCOg= -github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799 h1:rc3tiVYb5z54aKaDfakKn0dDjIyPpTtszkjuMzyt7ec= +github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= +github.com/opencontainers/runc v1.1.5 h1:L44KXEpKmfWDcS02aeGm8QNTFXTo2D+8MYGDIJ/GDEs= +github.com/opencontainers/runc v1.1.5/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= +github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis= github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74= github.com/opentracing/opentracing-go v1.0.2/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= @@ -835,17 +733,9 @@ github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJ github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4= github.com/ory/dockertest v3.3.5+incompatible h1:iLLK6SQwIhcbrG783Dghaaa3WPzGc+4Emza6EbVUUGA= -github.com/ory/dockertest v3.3.5+incompatible/go.mod h1:1vX4m9wsvi00u5bseYwXaSnhNrne+V0E6LAcBILJdPs= -github.com/ory/dockertest/v3 v3.8.1 h1:vU/8d1We4qIad2YM0kOwRVtnyue7ExvacPiw1yDm17g= -github.com/ory/dockertest/v3 v3.8.1/go.mod h1:wSRQ3wmkz+uSARYMk7kVJFDBGm8x5gSxIhI7NDc+BAQ= +github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4aNE4= +github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg= github.com/otiai10/copy v1.6.0 h1:IinKAryFFuPONZ7cm6T6E2QX/vcJwSnlaA5lfoaXIiQ= -github.com/otiai10/copy v1.6.0/go.mod h1:XWfuS3CrI0R6IE0FbgHsEazaXO8G0LpMp9o8tos0x4E= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0 h1:TJIWdbX0B+kpNagQrjgq8bCMrbhiuX73M2XwgtDMoOI= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.2 h1:VYWnrP5fXmz1MXvjuUvcBrXSjGE6xjON+axB/UrpO3E= -github.com/otiai10/mint v1.3.2/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= @@ -853,18 +743,20 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T github.com/paulbellamy/ratecounter v0.2.0/go.mod h1:Hfx1hDpSGoqxkVVpBi/IlYD7kChlfo5C6hzIHwPqfFE= github.com/pborman/uuid v0.0.0-20170112150404-1b00554d8222/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34= github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k= -github.com/peggyjv/gravity-bridge/module/v2 v2.0.2 h1:8PiwAPbmeItQu/QbRDzcZUz84ce56NLYmqSSXuLxesY= -github.com/peggyjv/gravity-bridge/module/v2 v2.0.2/go.mod h1:gKOqaz8xccgMEmWaH53n6uCIvRxqPFgya4aHrMi78Fs= +github.com/peggyjv/gravity-bridge/module/v3 v3.0.0-20230425134518-c0644797435c h1:G/CujtUj/t5H3XCiUBK8ao+6n0T8pqsUX9amrIXwhCk= +github.com/peggyjv/gravity-bridge/module/v3 v3.0.0-20230425134518-c0644797435c/go.mod h1:6hJ61P6sBw3dVBBt+qMCXj2SJjq1Qf/1miKOtDaYWEI= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM= -github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= +github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= +github.com/pelletier/go-toml/v2 v2.0.5/go.mod h1:OMHamSCAODeSsVrwwvcJOaoN0LIUIaFVNZzmWyNfXas= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= github.com/peterh/liner v1.0.1-0.20180619022028-8c1271fcf47f/go.mod h1:xIteQHvHuaLYG9IFj6mSxM0fCKrs34IrEQUhOYuGPHc= github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ= github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= +github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pierrec/lz4 v1.0.2-0.20190131084431-473cd7ce01a1/go.mod h1:3/3N9NVKO0jef7pBehbT1qWhCMrIgbYNnFAZCqQ5LRc= github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -872,22 +764,21 @@ github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= -github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg= github.com/pkg/term v0.0.0-20180730021639-bffc007b7fd5/go.mod h1:eCbImbZ95eXtAUIbLAuAVnBnwf83mjf6QIVH8SHYwqQ= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.8.0/go.mod h1:O9VU6huf47PktckDQfMTX0Y8tY0/7TSWwj+ITvv0TnM= -github.com/prometheus/client_golang v1.11.0 h1:HNkLOAEQMIDv/K+04rukrLx6ch7msSRwf3/SASFAGtQ= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.2 h1:51L9cDoUHVrXx4zWYlcLQIZ+d+VXHgqnYKkIuq4g/34= +github.com/prometheus/client_golang v1.12.2/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -897,35 +788,33 @@ github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.6.0/go.mod h1:eBmuwkDJBwy6iBfxCBob6t6dR6ENT/y+J+Zk0j9GMYc= github.com/prometheus/common v0.7.0/go.mod h1:DjGbpBbp5NYNiECxcL/VnbXCCaQpKd3tt26CguLLsqA= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.14.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.15.0/go.mod h1:U+gB1OBLb1lF3O42bTCL+FK18tX9Oar16Clt/msog/s= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.29.0 h1:3jqPBvKT4OHAbje2Ql7KeaaSicDBCxMYwEJU1zRJceE= -github.com/prometheus/common v0.29.0/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.34.0 h1:RBmGO9d/FVjqHT0yUGQwBJhkwKV+wPCn7KGpvfab0uE= +github.com/prometheus/common v0.34.0/go.mod h1:gB3sOl7P0TvJabZpLY5uQMpUqRCPPCyRLCZYc7JZTNE= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.2.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= +github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/tsdb v0.6.2-0.20190402121629-4f204dcbc150/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/prometheus/tsdb v0.7.1 h1:YZcsG11NqnK4czYLrWd9mpEuAJIHVQLwdrleYfszMAA= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0 h1:MkV+77GLUNo5oJ0jf870itWm3D0Sjh7+Za9gazKc5LQ= -github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= +github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= @@ -936,23 +825,26 @@ github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRr github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k= github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= -github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= +github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= +github.com/rs/cors v1.8.2/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= github.com/rs/xhandler v0.0.0-20160618193221-ed27b6fd6521/go.mod h1:RvLn4FgxWubrpZHtQLnOf6EwhN2hEMusxZOhcW9H3UQ= -github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= -github.com/rs/zerolog v1.23.0 h1:UskrK+saS9P9Y789yNNulYKdARjPZuS35B8gJF2x60g= -github.com/rs/zerolog v1.23.0/go.mod h1:6c7hFfxPOy7TacJc4Fcdi24/J0NKYGzjG8FWRI916Qo= +github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= +github.com/rs/zerolog v1.27.0 h1:1T7qCieN22GVc8S4Q2yuexzBb1EqjbgjSH9RohbMjKs= +github.com/rs/zerolog v1.27.0/go.mod h1:7frBqO0oezxmnO7GF86FY++uy8I0Tk/If5ni1G9Qc0U= +github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/crypt v0.4.0/go.mod h1:ALv2SRj7GxYV4HO9elxH9nS6M9gW+xDNxqmyJ6RfDFM= github.com/samuel/go-zookeeper v0.0.0-20190923202752-2cc03de413da/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= -github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa h1:0U2s5loxrTy6/VgfVoLuVLFJcURKLH49ie0zSch7gh4= -github.com/sasha-s/go-deadlock v0.2.1-0.20190427202633-1595213edefa/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= +github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0= +github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo= +github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg= github.com/segmentio/fasthash v1.0.3/go.mod h1:waKX8l2N8yckOgmSsXJi7x1ZfdKZ4x7KRMzBtS3oedY= github.com/segmentio/kafka-go v0.1.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= github.com/segmentio/kafka-go v0.2.0/go.mod h1:X6itGqS9L4jDletMsxZ7Dz+JFWxM6JHfPOCvTvk+EJo= @@ -962,34 +854,29 @@ github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1 github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= +github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa/go.mod h1:oJyF+mSPHbB5mVY2iO9KV3pTt/QbIkGaO8gQ2WrDbP4= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJOjmxWY= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= -github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/afero v1.9.2 h1:j49Hj62F0n+DaZ1dDCvhABaPNSGNkt32oRFxI33IEMw= +github.com/spf13/afero v1.9.2/go.mod h1:iUV7ddyEEZPO5gA3zD4fJt6iStLlL+Lg4m2cihcDf8Y= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA= -github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= +github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= -github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= +github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -998,12 +885,8 @@ github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnIn github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= -github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.7.1/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= -github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk= -github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU= +github.com/spf13/viper v1.14.0 h1:Rg7d3Lo706X9tHsJMUjdiwMpHB7W8WnSVOssIY+JElU= +github.com/spf13/viper v1.14.0/go.mod h1:WT//axPky3FdvXHzGw33dNdXXXfFQqmEalje+egj8As= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4 h1:Gb2Tyox57NRNuZ2d3rmvB3pcmbu7O1RS3m8WRx7ilrg= github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/steakknife/bloomfilter v0.0.0-20180922174646-6819c0d2a570/go.mod h1:8OR4w3TdeIHIh1g6EMY5p0gVNOovcWC+1vpc7naMuAw= @@ -1014,8 +897,9 @@ github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5J github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= -github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= @@ -1024,71 +908,60 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs= +github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0= github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954/go.mod h1:u2MKkTVTVJWe5D1rCvame8WqhBd88EuIwODJZ1VHCPM= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 h1:epCh84lMvA70Z7CTTCmYQn2CKbY8j86K7/FAIr141uY= github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c h1:g+WoO5jjkqGAzHWCjJB1zZfXPIAaDpzXIEJ0eS6B5Ok= -github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c/go.mod h1:ahpPrc7HpcfEWDQRZEmnXMzHY03mLDYMCxeDzy46i+8= github.com/tendermint/btcd v0.1.1 h1:0VcxPfflS2zZ3RiOAHkBiFUcPvbtRj5O7zHmcJWHV7s= github.com/tendermint/btcd v0.1.1/go.mod h1:DC6/m53jtQzr/NFmMNEu0rxf18/ktVoVtMrnDD5pN+U= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15 h1:hqAk8riJvK4RMWx1aInLzndwxKalgi5rTqgfXxOxbEI= github.com/tendermint/crypto v0.0.0-20191022145703-50d29ede1e15/go.mod h1:z4YtwM70uOnk8h0pjJYlj3zdYwi9l03By6iAIF5j/Pk= github.com/tendermint/go-amino v0.16.0 h1:GyhmgQKvqF82e2oZeuMSp9JTN0N09emoSZlb2lyGa2E= github.com/tendermint/go-amino v0.16.0/go.mod h1:TQU0M1i/ImAo+tYpZi73AU3V/dKeCoMC9Sphe2ZwGME= -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.13/go.mod h1:6RVVRBqwtKhA+H59APKumO+B7Nye4QXSFc6+TYxAxCI= -github.com/tendermint/tendermint v0.34.14 h1:GCXmlS8Bqd2Ix3TQCpwYLUNHe+Y+QyJsm5YE+S/FkPo= -github.com/tendermint/tendermint v0.34.14/go.mod h1:FrwVm3TvsVicI9Z7FlucHV6Znfd5KBc/Lpp69cCwtk0= -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/tendermint/tm-db v0.6.7 h1:fE00Cbl0jayAoqlExN6oyQJ7fR/ZtoVOmvPJ//+shu8= +github.com/tendermint/tm-db v0.6.7/go.mod h1:byQDzFkZV1syXr/ReXS808NxA2xvyuuVgXOJ/088L6I= github.com/tidwall/gjson v1.6.7/go.mod h1:zeFuBCIqD4sN/gmqBzZ4j7Jd6UcA2Fc56x7QFsv+8fI= github.com/tidwall/match v1.0.3/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/sjson v1.1.4/go.mod h1:wXpKXu8CtDjKAZ+3DrKY5ROCorDFahq8l0tey/Lx1fg= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= +github.com/tinylib/msgp v1.1.5/go.mod h1:eQsjooMTnV42mHu917E26IogZ2930nFyBQdofk10Udg= github.com/tklauser/go-sysconf v0.3.5/go.mod h1:MkWzOF4RMCshBAMXuhXJs64Rte09mITnppBXY/rYEFI= -github.com/tklauser/go-sysconf v0.3.7 h1:HT7h4+536gjqeq1ZIJPgOl1rg1XFatQGVZWp7Py53eg= -github.com/tklauser/go-sysconf v0.3.7/go.mod h1:JZIdXh4RmBvZDBZ41ld2bGxRV3n4daiiqA3skYhAoQ4= +github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo= +github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= -github.com/tklauser/numcpus v0.2.3 h1:nQ0QYpiritP6ViFhrKYsiv6VVxOpum2Gks5GhnJbS/8= -github.com/tklauser/numcpus v0.2.3/go.mod h1:vpEPS/JC+oZGGQ/My/vJnNsvMDQL6PwOqt8dsCw5j+E= +github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ= +github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= 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= +github.com/ttacon/chalk v0.0.0-20160626202418-22c06c80ed31/go.mod h1:onvgF043R+lC5RZ8IT9rBXDaEDnpnw/Cl+HFiw+v/7Q= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/tyler-smith/go-bip39 v1.0.1-0.20181017060643-dbb3b84ba2ef/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= github.com/tyler-smith/go-bip39 v1.0.2 h1:+t3w+KwLXO6154GNJY+qUtIxLTmFjfUmpguQT1OlOT8= github.com/tyler-smith/go-bip39 v1.0.2/go.mod h1:sJ5fKU0s6JVwZjjcUEX2zFOnvq0ASQ2K9Zr6cf67kNs= -github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/urfave/cli v1.22.1 h1:+mkCCcOFKPnCmVYVcURKps1Xe+3zP90gSYGNfRkjoIY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= -github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/urfave/cli/v2 v2.10.2 h1:x3p8awjp/2arX+Nl/G2040AZpOCHS/eMJJ1/a+mye4Y= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vmihailenco/msgpack/v5 v5.1.4/go.mod h1:C5gboKD0TJPqWDTVTtrQNfRbiBwHZGo8UTqP/9/XvLI= github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/wsddn/go-ecdh v0.0.0-20161211032359-48726bab9208/go.mod h1:IotVbo4F+mw0EzQ08zFqg7pK3FebNXpaMsRy2RT+Ees= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= @@ -1096,6 +969,7 @@ github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQ github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg= github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU= github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1104,17 +978,10 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zondax/hid v0.9.0 h1:eiT3P6vNxAEVxXMw66eZUAAnU2zD33JBkfG/EnfAKl8= github.com/zondax/hid v0.9.0/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWpEM= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0= -go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= -go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= -go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= -go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs= go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.20.2/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -1123,20 +990,15 @@ go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= -go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= -go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= -go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1146,24 +1008,19 @@ golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190909091759-094676da4a83/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 h1:HWj/xjIHfjYU5nVXpTM0s39J9CbLn7Cc5a7IC5rwsMQ= -golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c= +golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1179,6 +1036,8 @@ golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= golang.org/x/exp v0.0.0-20200331195152-e8c3332aa8e5/go.mod h1:4M0jN8W1tt0AVLNr8HDosyJCDCDuyL9N9+3m7wDWgKw= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= @@ -1192,7 +1051,6 @@ golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRu golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mobile v0.0.0-20200801112145-973feb4309de/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4= @@ -1206,7 +1064,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1222,15 +1081,12 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190813141303-74dc4d7220e7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -1251,23 +1107,16 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20200904194848-62affa334b73/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210220033124-5f55cee0dc0d/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= -golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= -golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= -golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20210903162142-ad29c8ab022f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1277,15 +1126,8 @@ golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1296,8 +1138,8 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1308,7 +1150,6 @@ golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5h golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190130150945-aca44879d564/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1320,15 +1161,11 @@ golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1340,7 +1177,6 @@ golang.org/x/sys v0.0.0-20200107162124-548cf772de50/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1358,52 +1194,43 @@ golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200824131525-c12d262b63d8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200909081042-eff7692f9009/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201015000850-e3ed0017c211/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210316164454-77fc1eacc6aa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210324051608-47abb6519492/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210903071746-97244b99971b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e h1:fLOSk5Q00efkSvAm+4xcoXD+RRmLmmulPn5I3Y9F2EM= +golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= +golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU= +golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1412,15 +1239,15 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE= -golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20220609170525-579cf78fd858 h1:Dpdu/EMxGMFgq0CeYMh4fazTD2vtlZRYE7wyynxJb9U= golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190206041539-40960b6deb8e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -1437,12 +1264,10 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1467,31 +1292,28 @@ golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWc golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200522201501-cb1345f3a375/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200717024301-6ddee64345a6/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= -golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk= gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.0.0-20181121035319-3f7ecaa7e8ca/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo= gonum.org/v1/gonum v0.6.0/go.mod h1:9mxDZsDKxgMAuccQkewq682L+0eCu4dCN2yonUJTCLU= @@ -1518,20 +1340,6 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513 google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= -google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= -google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= -google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= -google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo= -google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4= -google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw= -google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU= -google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k= -google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE= -google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI= -google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU= -google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I= -google.golang.org/api v0.63.0/go.mod h1:gs4ij2ffTRXwuzzgJl/56BdwJaA194ijkfn++9tDuPo= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1577,43 +1385,16 @@ google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201119123407-9b1e624d6bc4/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210126160654-44e461bb6506/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= -google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A= -google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= -google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= -google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k= -google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= -google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w= -google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY= -google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a h1:uqouglH745GoGeZ1YFZbPBiu961tgi/9Qm5jaorajjQ= -google.golang.org/genproto v0.0.0-20220302033224-9aa15565e42a/go.mod h1:kGP+zUP2Ddo0ayMi4YuN7C3WZyJvGLZRh8Z5wnAqvEI= +google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 h1:a2S6M0+660BgMNl++4JPlcAO/CjkqYItDEZwkoDQK7c= +google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= google.golang.org/grpc v1.33.2 h1:EQyQC3sa8M+p6Ulc8yy9SWSS2GVwyRc83gAbG8lrl4o= google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= -google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1624,35 +1405,28 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.25.1-0.20200805231151-a709e31e5d12/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/cheggaaa/pb.v1 v1.0.25/go.mod h1:V/YB90LKu/1FcN3WVnfiiE5oMCibMjukxqG/qStrOgw= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/gcfg.v1 v1.2.3/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI= -gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA= +gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce h1:+JknDZhAj8YMt7GC73Ei8pv4MzjDUNPHgQWJdtMAaDU= gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce/go.mod h1:5AcXVHNjg+BDxry382+8OKon8SEWiKktQR07RKPsv1c= gopkg.in/olebedev/go-duktape.v3 v3.0.0-20200619000410-60c24ae608a6/go.mod h1:uAJfkITjFhyEEuUfm7bsmCZRbW5WRq8s9EY8HZ6hCns= gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/urfave/cli.v1 v1.20.0 h1:NdAVW6RYxDif9DhDHaAortIu956m2c0v+09AZBPTbE0= gopkg.in/urfave/cli.v1 v1.20.0/go.mod h1:vuBzUtMdQeixQj8LVd+/98pzhxNGQoyuPBlsXHOQNO0= gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= @@ -1672,8 +1446,7 @@ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= -gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= -gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= +gotest.tools/v3 v3.3.0 h1:MfDY1b1/0xN1CyMlQDac0ziEy9zJQd9CXBRRDHw2jJo= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/integration_tests/auction_test.go b/integration_tests/auction_test.go index 06cc908f..fdbde39a 100644 --- a/integration_tests/auction_test.go +++ b/integration_tests/auction_test.go @@ -8,8 +8,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/peggyjv/sommelier/v4/x/auction/types" - cellarfees "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" + cellarfees "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) func (s *IntegrationTestSuite) TestAuctionModule() { @@ -45,14 +45,17 @@ func (s *IntegrationTestSuite) TestAuctionModule() { TokenPrices: []*types.ProposedTokenPrice{ { Denom: "gravity0x3506424f91fd33084466f402d5d97f05f8e3b4af", + Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("1.0"), }, { Denom: "gravity0x5a98fcbea516cf06857215779fd812ca3bef1b32", + Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.25"), }, { Denom: testDenom, + Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.5"), }, }, diff --git a/integration_tests/cellarfees_test.go b/integration_tests/cellarfees_test.go index aa57e332..cd40708f 100644 --- a/integration_tests/cellarfees_test.go +++ b/integration_tests/cellarfees_test.go @@ -11,9 +11,9 @@ import ( "github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" - auctiontypes "github.com/peggyjv/sommelier/v4/x/auction/types" - cellarfeestypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" - corktypes "github.com/peggyjv/sommelier/v4/x/cork/types" + auctiontypes "github.com/peggyjv/sommelier/v7/x/auction/types" + cellarfeestypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" + corktypes "github.com/peggyjv/sommelier/v7/x/cork/types" ) func (s *IntegrationTestSuite) TestCellarFees() { diff --git a/integration_tests/chain.go b/integration_tests/chain.go index 33ca19ab..f8191067 100644 --- a/integration_tests/chain.go +++ b/integration_tests/chain.go @@ -2,11 +2,10 @@ package integration_tests import ( "fmt" - "io/ioutil" "os" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - corktypes "github.com/peggyjv/sommelier/v4/x/cork/types" + corktypes "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" @@ -24,9 +23,9 @@ import ( sdkTx "github.com/cosmos/cosmos-sdk/x/auth/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - "github.com/peggyjv/sommelier/v4/app" - "github.com/peggyjv/sommelier/v4/app/params" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + "github.com/peggyjv/sommelier/v7/app" + "github.com/peggyjv/sommelier/v7/app/params" tmrand "github.com/tendermint/tendermint/libs/rand" rpchttp "github.com/tendermint/tendermint/rpc/client/http" ) @@ -78,7 +77,7 @@ func newChain() (*chain, error) { } } - tmpDir, err := ioutil.TempDir(dir, "somm-e2e-testnet") + tmpDir, err := os.MkdirTemp(dir, "somm-e2e-testnet") if err != nil { return nil, err } diff --git a/integration_tests/ethereum.go b/integration_tests/ethereum.go index e84cedcf..fb04af4d 100644 --- a/integration_tests/ethereum.go +++ b/integration_tests/ethereum.go @@ -15,7 +15,7 @@ import ( ethereumtypes "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethclient" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" ) type EthereumConfig struct { diff --git a/integration_tests/incentives_test.go b/integration_tests/incentives_test.go index 8a84492e..467c497f 100644 --- a/integration_tests/incentives_test.go +++ b/integration_tests/incentives_test.go @@ -13,8 +13,8 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramsproposal "github.com/cosmos/cosmos-sdk/x/params/types/proposal" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/peggyjv/sommelier/v4/app/params" - incentivestypes "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/app/params" + incentivestypes "github.com/peggyjv/sommelier/v7/x/incentives/types" ) func (s *IntegrationTestSuite) TestIncentives() { diff --git a/integration_tests/io.go b/integration_tests/io.go index a2491f5d..e829e6d9 100644 --- a/integration_tests/io.go +++ b/integration_tests/io.go @@ -3,7 +3,6 @@ package integration_tests import ( "fmt" "io" - "io/ioutil" "os" ) @@ -39,5 +38,5 @@ func writeFile(path string, body []byte) error { return err } - return ioutil.WriteFile(path, body, 0600) + return os.WriteFile(path, body, 0600) } diff --git a/integration_tests/scheduled_cork_test.go b/integration_tests/scheduled_cork_test.go index dc081dd8..7b50e808 100644 --- a/integration_tests/scheduled_cork_test.go +++ b/integration_tests/scheduled_cork_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/ethereum/go-ethereum/common" - gbtypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - "github.com/peggyjv/sommelier/v4/x/cork/types" + gbtypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" ) func (s *IntegrationTestSuite) TestScheduledCork() { diff --git a/integration_tests/setup_test.go b/integration_tests/setup_test.go index 76edf8fb..738d08d7 100644 --- a/integration_tests/setup_test.go +++ b/integration_tests/setup_test.go @@ -17,12 +17,12 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" disttypes "github.com/cosmos/cosmos-sdk/x/distribution/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/peggyjv/sommelier/v4/app/params" - auctiontypes "github.com/peggyjv/sommelier/v4/x/auction/types" - cellarfeestypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" - corktypes "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/app/params" + auctiontypes "github.com/peggyjv/sommelier/v7/x/auction/types" + cellarfeestypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" + corktypes "github.com/peggyjv/sommelier/v7/x/cork/types" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/ethclient" @@ -376,16 +376,19 @@ func (s *IntegrationTestSuite) initGenesis() { s.Require().NoError(cdc.UnmarshalJSON(appGenState[auctiontypes.ModuleName], &auctionGenState)) auctionGenState.TokenPrices = append(auctionGenState.TokenPrices, &auctiontypes.TokenPrice{ Denom: alphaFeeDenom, + Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("1.0"), LastUpdatedBlock: 0, }) auctionGenState.TokenPrices = append(auctionGenState.TokenPrices, &auctiontypes.TokenPrice{ Denom: betaFeeDenom, + Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("5.0"), LastUpdatedBlock: 0, }) auctionGenState.TokenPrices = append(auctionGenState.TokenPrices, &auctiontypes.TokenPrice{ Denom: testDenom, + Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.5"), LastUpdatedBlock: 0, }) diff --git a/integration_tests/validator.go b/integration_tests/validator.go index 8a3ea691..33068e55 100644 --- a/integration_tests/validator.go +++ b/integration_tests/validator.go @@ -22,8 +22,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - "github.com/peggyjv/sommelier/v4/app" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + "github.com/peggyjv/sommelier/v7/app" tmcfg "github.com/tendermint/tendermint/config" tmos "github.com/tendermint/tendermint/libs/os" "github.com/tendermint/tendermint/p2p" diff --git a/prost_build/Cargo.lock b/prost_build/Cargo.lock index 63948604..a1e3dcde 100644 --- a/prost_build/Cargo.lock +++ b/prost_build/Cargo.lock @@ -597,7 +597,7 @@ dependencies = [ [[package]] name = "somme_prost_build" -version = "0.1.0" +version = "5.0.0" dependencies = [ "prost", "prost-build", diff --git a/prost_build/Cargo.toml b/prost_build/Cargo.toml index 453ff27e..e8f3913e 100644 --- a/prost_build/Cargo.toml +++ b/prost_build/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "somme_prost_build" -version = "0.1.0" +version = "5.0.0" authors = ["PeggyJV","Justin Kilpatrick "] edition = "2018" diff --git a/prost_build/src/main.rs b/prost_build/src/main.rs index 86d5e954..f7f24563 100644 --- a/prost_build/src/main.rs +++ b/prost_build/src/main.rs @@ -44,17 +44,27 @@ fn compile_protos(out_dir: &Path, tmp_dir: &Path) { // this gives us the repo root by going up two levels from the module root let root = root.parent().unwrap().to_path_buf(); - let mut allocation_proto_dir = root.clone(); - allocation_proto_dir.push("proto/allocation/v1"); + let mut cellarfees_proto_dir = root.clone(); + cellarfees_proto_dir.push("proto/cellarfees/v1"); let mut cork_proto_dir = root.clone(); cork_proto_dir.push("proto/cork/v2"); + let mut incentives_proto_dir = root.clone(); + incentives_proto_dir.push("proto/incentives/v1"); + let mut auction_proto_dir = root.clone(); + auction_proto_dir.push("proto/auction/v1"); + let mut somm_proto_include_dir = root.clone(); somm_proto_include_dir.push("proto"); let mut third_party_proto_include_dir = root; third_party_proto_include_dir.push("third_party/proto"); // Paths - let proto_paths = [allocation_proto_dir, cork_proto_dir]; + let proto_paths = [ + cellarfees_proto_dir, + cork_proto_dir, + incentives_proto_dir, + auction_proto_dir, + ]; // we need to have an include which is just the folder of our protos to satisfy protoc // which insists that any passed file be included in a directory passed as an include let proto_include_paths = [somm_proto_include_dir, third_party_proto_include_dir]; diff --git a/proto/auction/v1/auction.proto b/proto/auction/v1/auction.proto index ea08ee76..269a16b8 100644 --- a/proto/auction/v1/auction.proto +++ b/proto/auction/v1/auction.proto @@ -5,7 +5,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/auction/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/auction/types"; message Auction { uint32 id = 1; @@ -51,19 +51,22 @@ message Bid { uint64 block_height = 9; } +// USD price is the value for one non-fractional token (smallest unit of the token * 10^exponent) message TokenPrice { string denom = 1; - string usd_price = 2 [ + uint64 exponent = 2; + string usd_price = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; - uint64 last_updated_block = 3; + uint64 last_updated_block = 4; } message ProposedTokenPrice { string denom = 1; - string usd_price = 2 [ + uint64 exponent = 2; + string usd_price = 3 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; -} +} \ No newline at end of file diff --git a/proto/auction/v1/genesis.proto b/proto/auction/v1/genesis.proto index 589162cf..8d1dcd4b 100644 --- a/proto/auction/v1/genesis.proto +++ b/proto/auction/v1/genesis.proto @@ -5,7 +5,7 @@ import "auction/v1/tx.proto"; import "auction/v1/auction.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/auction/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/auction/types"; message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; @@ -19,8 +19,12 @@ message GenesisState { message Params { uint64 price_max_block_age = 1; uint64 minimum_bid_in_usomm = 2; - uint64 auction_max_block_age = 3; - string auction_price_decrease_acceleration_rate = 4 [ + string minimum_sale_tokens_usd_value = 3 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", + (gogoproto.nullable) = false + ]; + uint64 auction_max_block_age = 4; + string auction_price_decrease_acceleration_rate = 5 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; diff --git a/proto/auction/v1/proposal.proto b/proto/auction/v1/proposal.proto index 0ccf7a94..5886e3ff 100644 --- a/proto/auction/v1/proposal.proto +++ b/proto/auction/v1/proposal.proto @@ -4,7 +4,7 @@ package auction.v1; import "cosmos_proto/cosmos.proto"; import "auction/v1/auction.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/auction/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/auction/types"; message SetTokenPricesProposal { string title = 1; diff --git a/proto/auction/v1/query.proto b/proto/auction/v1/query.proto index dc1d74c8..c4b4c84a 100644 --- a/proto/auction/v1/query.proto +++ b/proto/auction/v1/query.proto @@ -8,7 +8,7 @@ import "auction/v1/auction.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/auction/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/auction/types"; service Query { rpc QueryParams(QueryParamsRequest) returns (QueryParamsResponse) { diff --git a/proto/auction/v1/tx.proto b/proto/auction/v1/tx.proto index c0dbf61b..b63823b6 100644 --- a/proto/auction/v1/tx.proto +++ b/proto/auction/v1/tx.proto @@ -6,7 +6,7 @@ import "cosmos/base/v1beta1/coin.proto"; import "cosmos_proto/cosmos.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/auction/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/auction/types"; service Msg { rpc SubmitBid (MsgSubmitBidRequest) returns (MsgSubmitBidResponse); diff --git a/proto/cellarfees/v1/cellarfees.proto b/proto/cellarfees/v1/cellarfees.proto index 235e6d18..2c184cf1 100644 --- a/proto/cellarfees/v1/cellarfees.proto +++ b/proto/cellarfees/v1/cellarfees.proto @@ -3,7 +3,7 @@ package cellarfees.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/cellarfees/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cellarfees/types"; message FeeAccrualCounter { string denom = 1; diff --git a/proto/cellarfees/v1/genesis.proto b/proto/cellarfees/v1/genesis.proto index b387182e..6bb6a291 100644 --- a/proto/cellarfees/v1/genesis.proto +++ b/proto/cellarfees/v1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "cellarfees/v1/params.proto"; import "cellarfees/v1/cellarfees.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/cellarfees/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cellarfees/types"; // GenesisState defines the cellarfees module's genesis state. message GenesisState { diff --git a/proto/cellarfees/v1/params.proto b/proto/cellarfees/v1/params.proto index a714472e..4de08ba4 100644 --- a/proto/cellarfees/v1/params.proto +++ b/proto/cellarfees/v1/params.proto @@ -3,7 +3,7 @@ package cellarfees.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/cellarfees/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cellarfees/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/cellarfees/v1/query.proto b/proto/cellarfees/v1/query.proto index 0176b6e2..eecbce6f 100644 --- a/proto/cellarfees/v1/query.proto +++ b/proto/cellarfees/v1/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cellarfees/v1/params.proto"; import "cellarfees/v1/cellarfees.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/cellarfees/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cellarfees/types"; service Query { rpc QueryParams(QueryParamsRequest) returns (QueryParamsResponse) { diff --git a/proto/cork/v1/cork.proto b/proto/cork/v1/cork.proto deleted file mode 100644 index 290e9b4b..00000000 --- a/proto/cork/v1/cork.proto +++ /dev/null @@ -1,28 +0,0 @@ -syntax = "proto3"; -package cork.v1; - -import "cosmos_proto/cosmos.proto"; - -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; - -message Cork { - // call body containing the ABI encoded bytes to send to the contract - bytes encoded_contract_call = 1; - // address of the contract to send the call - string target_contract_address = 2; -} - -message ValidatorCork { - Cork cork = 1; - string validator = 2; -} - -message ScheduledCork { - Cork cork = 1; - uint64 block_height = 2; - string validator = 3; -} - -message CellarIDSet { - repeated string ids = 1; -} diff --git a/proto/cork/v1/genesis.proto b/proto/cork/v1/genesis.proto deleted file mode 100644 index 837a5a6a..00000000 --- a/proto/cork/v1/genesis.proto +++ /dev/null @@ -1,35 +0,0 @@ -syntax = "proto3"; -package cork.v1; - -import "cork/v1/tx.proto"; -import "cork/v1/cork.proto"; -import "gogoproto/gogo.proto"; - -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; - - -// GenesisState - all cork state that must be provided at genesis -message GenesisState { - Params params = 1 [ - (gogoproto.nullable) = false - ]; - CellarIDSet cellar_ids = 2 [ - (gogoproto.nullable) = false - ]; - uint64 invalidation_nonce = 3; - repeated ValidatorCork corks = 4; - repeated ScheduledCork scheduled_corks = 5; -} - -// Params cork parameters -message Params { - // VotePeriod defines the number of blocks to wait for votes before attempting to tally - int64 vote_period = 1 [(gogoproto.moretags) = "yaml:\"vote_period\""]; - - // VoteThreshold defines the percentage of bonded stake required to vote each period - string vote_threshold = 2 [ - (gogoproto.moretags) = "yaml:\"vote_threshold\"", - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", - (gogoproto.nullable) = false - ]; -} diff --git a/proto/cork/v1/proposal.proto b/proto/cork/v1/proposal.proto deleted file mode 100644 index 25308f45..00000000 --- a/proto/cork/v1/proposal.proto +++ /dev/null @@ -1,35 +0,0 @@ -syntax = "proto3"; -package cork.v1; - -import "cosmos_proto/cosmos.proto"; -import "cork/v1/cork.proto"; - -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; - -message AddManagedCellarIDsProposal { - string title = 1; - string description = 2; - CellarIDSet cellar_ids = 3; -} - -// AddManagedCellarIDsProposalWithDeposit is a specific definition for CLI commands -message AddManagedCellarIDsProposalWithDeposit { - string title = 1; - string description = 2; - repeated string cellar_ids = 3; - string deposit = 4; -} - -message RemoveManagedCellarIDsProposal { - string title = 1; - string description = 2; - CellarIDSet cellar_ids = 3; -} - -// RemoveManagedCellarIDsProposalWithDeposit is a specific definition for CLI commands -message RemoveManagedCellarIDsProposalWithDeposit { - string title = 1; - string description = 2; - repeated string cellar_ids = 3; - string deposit = 4; -} diff --git a/proto/cork/v1/query.proto b/proto/cork/v1/query.proto deleted file mode 100644 index 7bf94f52..00000000 --- a/proto/cork/v1/query.proto +++ /dev/null @@ -1,111 +0,0 @@ -syntax = "proto3"; -package cork.v1; - -import "gogoproto/gogo.proto"; -import "google/api/annotations.proto"; -import "cork/v1/genesis.proto"; -import "cork/v1/cork.proto"; -import "cosmos_proto/cosmos.proto"; -import "cosmos/base/query/v1beta1/pagination.proto"; - -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; - -// Query defines the gRPC query service for the cork module. -service Query { - // QueryParams queries the allocation module parameters. - rpc QueryParams(QueryParamsRequest) returns (QueryParamsResponse) { - option (google.api.http).get = "/sommelier/cork/v1/params"; - } - // QuerySubmittedCorks queries the submitted corks awaiting vote - rpc QuerySubmittedCorks(QuerySubmittedCorksRequest) returns (QuerySubmittedCorksResponse) { - option (google.api.http).get = "/sommelier/cork/v1/submitted"; - } - // QueryCommitPeriod queries the heights for the current voting period (current, start and end) - rpc QueryCommitPeriod(QueryCommitPeriodRequest) returns (QueryCommitPeriodResponse) { - option (google.api.http).get = "/sommelier/cork/v1/commit_period"; - } - // QueryCellarIDs returns all cellars and current tick ranges - rpc QueryCellarIDs(QueryCellarIDsRequest) returns (QueryCellarIDsResponse) { - option (google.api.http).get = "/sommelier/cork/v1/cellar_ids"; - } - // QueryScheduledCorks returns all scheduled corks - rpc QueryScheduledCorks(QueryScheduledCorksRequest) returns (QueryScheduledCorksResponse) { - option (google.api.http).get = "/sommelier/cork/v1/scheduled_corks"; - } - // QueryScheduledBlockHeights returns all scheduled block heights - rpc QueryScheduledBlockHeights(QueryScheduledBlockHeightsRequest) returns (QueryScheduledBlockHeightsResponse) { - option (google.api.http).get = "/sommelier/cork/v1/scheduled_block_heights"; - } - - // QueryScheduledCorks returns all scheduled corks at a block height - rpc QueryScheduledCorksByBlockHeight(QueryScheduledCorksByBlockHeightRequest) returns (QueryScheduledCorksByBlockHeightResponse) { - option (google.api.http).get = "/sommelier/cork/v1/scheduled_corks_by_block_height/{block_height}"; - } -} - -// QueryParamsRequest is the request type for the Query/Params gRPC method. -message QueryParamsRequest {} - -// QueryParamsRequest is the response type for the Query/Params gRPC method. -message QueryParamsResponse { - // allocation parameters - Params params = 1 [(gogoproto.nullable) = false]; -} - -// QuerySubmittedCorksRequest is the request type for the Query/QuerySubmittedCorks gRPC query method. -message QuerySubmittedCorksRequest {} - -// QuerySubmittedCorksResponse is the response type for the Query/QuerySubmittedCorks gRPC query method. -message QuerySubmittedCorksResponse { - // corks in keeper awaiting vote - repeated Cork corks = 1; -} - - -// QueryCommitPeriodRequest is the request type for the Query/QueryCommitPeriod gRPC method. -message QueryCommitPeriodRequest {} - -// QueryCommitPeriodResponse is the response type for the Query/QueryCommitPeriod gRPC method. -message QueryCommitPeriodResponse { - // block height at which the query was processed - int64 current_height = 1; - // latest vote period start block height - int64 vote_period_start = 2; - // block height at which the current voting period ends - int64 vote_period_end = 3; -} - - -// QueryCellarIDsRequest is the request type for Query/QueryCellarIDs gRPC method. -message QueryCellarIDsRequest {} - -// QueryCellarIDsResponse is the response type for Query/QueryCellars gRPC method. -message QueryCellarIDsResponse { - repeated string cellar_ids = 1; -} - -// QueryScheduledCorksRequest -message QueryScheduledCorksRequest {} - -// QueryScheduledCorksResponse -message QueryScheduledCorksResponse { - repeated ScheduledCork corks = 1; -} - -// QueryScheduledBlockHeightsRequest -message QueryScheduledBlockHeightsRequest {} - -// QueryScheduledBlockHeightsResponse -message QueryScheduledBlockHeightsResponse { - repeated uint64 block_heights = 1; -} - -// QueryScheduledCorksByBlockHeightRequest -message QueryScheduledCorksByBlockHeightRequest { - uint64 block_height = 1; -} - -// QueryScheduledCorksByBlockHeightResponse -message QueryScheduledCorksByBlockHeightResponse { - repeated ScheduledCork corks = 1; -} \ No newline at end of file diff --git a/proto/cork/v1/tx.proto b/proto/cork/v1/tx.proto deleted file mode 100644 index 0407126c..00000000 --- a/proto/cork/v1/tx.proto +++ /dev/null @@ -1,36 +0,0 @@ -syntax = "proto3"; -package cork.v1; - -import "cosmos_proto/cosmos.proto"; -import "google/protobuf/any.proto"; -import "cork/v1/cork.proto"; - -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; - -// MsgService defines the msgs that the cork module handles -service Msg { - rpc SubmitCork (MsgSubmitCorkRequest) returns (MsgSubmitCorkResponse); - rpc ScheduleCork (MsgScheduleCorkRequest) returns (MsgScheduleCorkResponse); -} - -// MsgSubmitCorkRequest - sdk.Msg for submitting calls to Ethereum through the gravity bridge contract -message MsgSubmitCorkRequest { - // the cork to send across the bridge - Cork cork = 1; - // signer account address - string signer = 2; -} - -message MsgSubmitCorkResponse {} - -// MsgScheduleCorkRequest - sdk.Msg for scheduling a cork request for on or after a specific block height -message MsgScheduleCorkRequest { - // the scheduled cork - Cork cork = 1; - // the block height that must be reached - uint64 block_height = 2; - // signer account address - string signer = 3; -} - -message MsgScheduleCorkResponse {} \ No newline at end of file diff --git a/proto/cork/v2/cork.proto b/proto/cork/v2/cork.proto index 4d692c7e..b42e8711 100644 --- a/proto/cork/v2/cork.proto +++ b/proto/cork/v2/cork.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package cork.v2; -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cork/types"; message Cork { // call body containing the ABI encoded bytes to send to the contract diff --git a/proto/cork/v2/genesis.proto b/proto/cork/v2/genesis.proto index 0aea1e53..18595106 100644 --- a/proto/cork/v2/genesis.proto +++ b/proto/cork/v2/genesis.proto @@ -4,7 +4,7 @@ package cork.v2; import "cork/v2/cork.proto"; import "gogoproto/gogo.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cork/types"; // GenesisState - all cork state that must be provided at genesis diff --git a/proto/cork/v2/proposal.proto b/proto/cork/v2/proposal.proto index e80ffb24..d94840c0 100644 --- a/proto/cork/v2/proposal.proto +++ b/proto/cork/v2/proposal.proto @@ -3,7 +3,7 @@ package cork.v2; import "cork/v2/cork.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cork/types"; message AddManagedCellarIDsProposal { string title = 1; diff --git a/proto/cork/v2/query.proto b/proto/cork/v2/query.proto index 9171fd0e..e3812e8e 100644 --- a/proto/cork/v2/query.proto +++ b/proto/cork/v2/query.proto @@ -6,7 +6,7 @@ import "google/api/annotations.proto"; import "cork/v2/genesis.proto"; import "cork/v2/cork.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cork/types"; // Query defines the gRPC query service for the cork module. service Query { diff --git a/proto/cork/v2/tx.proto b/proto/cork/v2/tx.proto index 4953bbd9..00ac7d4b 100644 --- a/proto/cork/v2/tx.proto +++ b/proto/cork/v2/tx.proto @@ -3,7 +3,7 @@ package cork.v2; import "cork/v2/cork.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/cork/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/cork/types"; // MsgService defines the msgs that the cork module handles service Msg { diff --git a/proto/incentives/v1/genesis.proto b/proto/incentives/v1/genesis.proto index a5d2717a..66a33234 100644 --- a/proto/incentives/v1/genesis.proto +++ b/proto/incentives/v1/genesis.proto @@ -1,12 +1,10 @@ syntax = "proto3"; package incentives.v1; - import "gogoproto/gogo.proto"; import "cosmos/base/v1beta1/coin.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/incentives/types"; - +option go_package = "github.com/peggyjv/sommelier/v7/x/incentives/types"; message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; diff --git a/proto/incentives/v1/query.proto b/proto/incentives/v1/query.proto index 2bb6b6bc..05962f12 100644 --- a/proto/incentives/v1/query.proto +++ b/proto/incentives/v1/query.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "google/api/annotations.proto"; import "incentives/v1/genesis.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/incentives/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/incentives/types"; // Query defines the gRPC query service for the cork module. service Query { diff --git a/proto/pubsub/v1/genesis.proto b/proto/pubsub/v1/genesis.proto index 42356987..41e4f439 100644 --- a/proto/pubsub/v1/genesis.proto +++ b/proto/pubsub/v1/genesis.proto @@ -5,7 +5,7 @@ import "gogoproto/gogo.proto"; import "pubsub/v1/params.proto"; import "pubsub/v1/pubsub.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/pubsub/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/pubsub/types"; // GenesisState defines the pubsub module's genesis state. message GenesisState { diff --git a/proto/pubsub/v1/params.proto b/proto/pubsub/v1/params.proto index 09ea3848..13aa57ee 100644 --- a/proto/pubsub/v1/params.proto +++ b/proto/pubsub/v1/params.proto @@ -3,7 +3,7 @@ package pubsub.v1; import "gogoproto/gogo.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/pubsub/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/pubsub/types"; // Params defines the parameters for the module. message Params { diff --git a/proto/pubsub/v1/pubsub.proto b/proto/pubsub/v1/pubsub.proto index 751ee950..c11060e5 100644 --- a/proto/pubsub/v1/pubsub.proto +++ b/proto/pubsub/v1/pubsub.proto @@ -1,7 +1,7 @@ syntax = "proto3"; package pubsub.v1; -option go_package = "github.com/peggyjv/sommelier/v4/x/pubsub/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/pubsub/types"; // represents a publisher, which are added via governance message Publisher { @@ -20,13 +20,13 @@ message Subscriber { // unique key, account address representation of either an account or a validator string address = 1; - // the below fields are optional, and only required if the subscriber wants to use "push" subscriptions - - // FQDN of the subscriber, max length of 256 - string domain = 2; + // the below fields are optional, and only required if the subscriber wants to use "push" PublisherIntents // the subscriber's self-signed CA cert PEM file, expecting TLS 1.3 compatible ECDSA certificates, max length 4096 - string ca_cert = 3; + string ca_cert = 2; + + // max length of 512 + string push_url = 3; } // for a given PublisherIntent, whether or not it is pulled or pushed @@ -86,9 +86,6 @@ message SubscriberIntent { // FQDN of the publisher, max length of 256 string publisher_domain = 3; - - // optional, only needs to be set if the PublisherIntent for this subscription uses the PUSH method, max length of 512 - string push_url = 4; } // represents a default subscription voted in by governance that can be overridden by a subscriber diff --git a/proto/pubsub/v1/query.proto b/proto/pubsub/v1/query.proto index 504fd4d1..ab0c97a7 100644 --- a/proto/pubsub/v1/query.proto +++ b/proto/pubsub/v1/query.proto @@ -7,7 +7,7 @@ import "cosmos/base/query/v1beta1/pagination.proto"; import "pubsub/v1/params.proto"; import "pubsub/v1/pubsub.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/pubsub/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/pubsub/types"; service Query { rpc Params(QueryParamsRequest) returns (QueryParamsResponse) { diff --git a/proto/pubsub/v1/tx.proto b/proto/pubsub/v1/tx.proto index 81149092..99ec72e1 100644 --- a/proto/pubsub/v1/tx.proto +++ b/proto/pubsub/v1/tx.proto @@ -3,7 +3,7 @@ package pubsub.v1; import "pubsub/v1/pubsub.proto"; -option go_package = "github.com/peggyjv/sommelier/v4/x/pubsub/types"; +option go_package = "github.com/peggyjv/sommelier/v7/x/pubsub/types"; service Msg { rpc RemovePublisher (MsgRemovePublisherRequest) returns (MsgRemovePublisherResponse); diff --git a/somm_proto/Cargo.lock b/somm_proto/Cargo.lock index 6a0beffb..b0d95ee3 100644 --- a/somm_proto/Cargo.lock +++ b/somm_proto/Cargo.lock @@ -607,7 +607,7 @@ dependencies = [ [[package]] name = "somm_proto" -version = "0.1.0" +version = "5.0.0" dependencies = [ "bytes", "cosmos-sdk-proto", diff --git a/somm_proto/Cargo.toml b/somm_proto/Cargo.toml index 6a4d03a0..33a511bb 100644 --- a/somm_proto/Cargo.toml +++ b/somm_proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "somm_proto" -version = "0.1.0" +version = "5.0.0" authors = ["PeggyJV"] edition = "2018" @@ -10,6 +10,6 @@ edition = "2018" prost = "0.7" prost-types = "0.7" bytes = "1" -cosmos-sdk-proto = "0.6.0" +cosmos-sdk-proto = {git="http://github.com/cosmos/cosmos-rust", branch="main"} tonic = "0.4" serde = "1.0" diff --git a/somm_proto/src/prost/auction.v1.rs b/somm_proto/src/prost/auction.v1.rs new file mode 100644 index 00000000..03835f2b --- /dev/null +++ b/somm_proto/src/prost/auction.v1.rs @@ -0,0 +1,418 @@ +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct Auction { + #[prost(uint32, tag = "1")] + pub id: u32, + #[prost(message, optional, tag = "2")] + pub starting_tokens_for_sale: ::core::option::Option, + #[prost(uint64, tag = "3")] + pub start_block: u64, + #[prost(uint64, tag = "4")] + pub end_block: u64, + #[prost(string, tag = "5")] + pub initial_price_decrease_rate: ::prost::alloc::string::String, + #[prost(string, tag = "6")] + pub current_price_decrease_rate: ::prost::alloc::string::String, + #[prost(uint64, tag = "7")] + pub price_decrease_block_interval: u64, + #[prost(string, tag = "8")] + pub initial_unit_price_in_usomm: ::prost::alloc::string::String, + #[prost(string, tag = "9")] + pub current_unit_price_in_usomm: ::prost::alloc::string::String, + #[prost(message, optional, tag = "10")] + pub remaining_tokens_for_sale: + ::core::option::Option, + #[prost(string, tag = "11")] + pub funding_module_account: ::prost::alloc::string::String, + #[prost(string, tag = "12")] + pub proceeds_module_account: ::prost::alloc::string::String, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct Bid { + #[prost(uint64, tag = "1")] + pub id: u64, + #[prost(uint32, tag = "2")] + pub auction_id: u32, + #[prost(string, tag = "3")] + pub bidder: ::prost::alloc::string::String, + #[prost(message, optional, tag = "4")] + pub max_bid_in_usomm: ::core::option::Option, + #[prost(message, optional, tag = "5")] + pub sale_token_minimum_amount: + ::core::option::Option, + #[prost(message, optional, tag = "6")] + pub total_fulfilled_sale_tokens: + ::core::option::Option, + #[prost(string, tag = "7")] + pub sale_token_unit_price_in_usomm: ::prost::alloc::string::String, + #[prost(message, optional, tag = "8")] + pub total_usomm_paid: ::core::option::Option, + #[prost(uint64, tag = "9")] + pub block_height: u64, +} +/// USD price is the value for one non-fractional token (smallest unit of the token * 10^exponent) +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct TokenPrice { + #[prost(string, tag = "1")] + pub denom: ::prost::alloc::string::String, + #[prost(uint64, tag = "2")] + pub exponent: u64, + #[prost(string, tag = "3")] + pub usd_price: ::prost::alloc::string::String, + #[prost(uint64, tag = "4")] + pub last_updated_block: u64, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct ProposedTokenPrice { + #[prost(string, tag = "1")] + pub denom: ::prost::alloc::string::String, + #[prost(uint64, tag = "2")] + pub exponent: u64, + #[prost(string, tag = "3")] + pub usd_price: ::prost::alloc::string::String, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct MsgSubmitBidRequest { + #[prost(uint32, tag = "1")] + pub auction_id: u32, + #[prost(string, tag = "2")] + pub signer: ::prost::alloc::string::String, + #[prost(message, optional, tag = "3")] + pub max_bid_in_usomm: ::core::option::Option, + #[prost(message, optional, tag = "4")] + pub sale_token_minimum_amount: + ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct MsgSubmitBidResponse { + #[prost(message, optional, tag = "1")] + pub bid: ::core::option::Option, +} +#[doc = r" Generated client implementations."] +pub mod msg_client { + #![allow(unused_variables, dead_code, missing_docs)] + use tonic::codegen::*; + pub struct MsgClient { + inner: tonic::client::Grpc, + } + impl MsgClient { + #[doc = r" Attempt to create a new client by connecting to a given endpoint."] + pub async fn connect(dst: D) -> Result + where + D: std::convert::TryInto, + D::Error: Into, + { + let conn = tonic::transport::Endpoint::new(dst)?.connect().await?; + Ok(Self::new(conn)) + } + } + impl MsgClient + where + T: tonic::client::GrpcService, + T::ResponseBody: Body + HttpBody + Send + 'static, + T::Error: Into, + ::Error: Into + Send, + { + pub fn new(inner: T) -> Self { + let inner = tonic::client::Grpc::new(inner); + Self { inner } + } + pub fn with_interceptor(inner: T, interceptor: impl Into) -> Self { + let inner = tonic::client::Grpc::with_interceptor(inner, interceptor); + Self { inner } + } + pub async fn submit_bid( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/auction.v1.Msg/SubmitBid"); + self.inner.unary(request.into_request(), path, codec).await + } + } + impl Clone for MsgClient { + fn clone(&self) -> Self { + Self { + inner: self.inner.clone(), + } + } + } + impl std::fmt::Debug for MsgClient { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "MsgClient {{ ... }}") + } + } +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct GenesisState { + #[prost(message, optional, tag = "1")] + pub params: ::core::option::Option, + #[prost(message, repeated, tag = "2")] + pub auctions: ::prost::alloc::vec::Vec, + #[prost(message, repeated, tag = "3")] + pub bids: ::prost::alloc::vec::Vec, + #[prost(message, repeated, tag = "4")] + pub token_prices: ::prost::alloc::vec::Vec, + #[prost(uint32, tag = "5")] + pub last_auction_id: u32, + #[prost(uint64, tag = "6")] + pub last_bid_id: u64, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct Params { + #[prost(uint64, tag = "1")] + pub price_max_block_age: u64, + #[prost(uint64, tag = "2")] + pub minimum_bid_in_usomm: u64, + #[prost(string, tag = "3")] + pub minimum_sale_tokens_usd_value: ::prost::alloc::string::String, + #[prost(uint64, tag = "4")] + pub auction_max_block_age: u64, + #[prost(string, tag = "5")] + pub auction_price_decrease_acceleration_rate: ::prost::alloc::string::String, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryParamsRequest {} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryParamsResponse { + #[prost(message, optional, tag = "1")] + pub params: ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryActiveAuctionRequest { + #[prost(uint32, tag = "1")] + pub auction_id: u32, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryActiveAuctionResponse { + #[prost(message, optional, tag = "1")] + pub auction: ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryEndedAuctionRequest { + #[prost(uint32, tag = "1")] + pub auction_id: u32, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryEndedAuctionResponse { + #[prost(message, optional, tag = "1")] + pub auction: ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryActiveAuctionsRequest {} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryActiveAuctionsResponse { + #[prost(message, repeated, tag = "1")] + pub auctions: ::prost::alloc::vec::Vec, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryEndedAuctionsRequest { + #[prost(message, optional, tag = "1")] + pub pagination: ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryEndedAuctionsResponse { + #[prost(message, repeated, tag = "1")] + pub auctions: ::prost::alloc::vec::Vec, + #[prost(message, optional, tag = "2")] + pub pagination: + ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryBidRequest { + #[prost(uint64, tag = "1")] + pub bid_id: u64, + #[prost(uint32, tag = "2")] + pub auction_id: u32, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryBidResponse { + #[prost(message, optional, tag = "1")] + pub bid: ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryBidsByAuctionRequest { + #[prost(uint32, tag = "1")] + pub auction_id: u32, + #[prost(message, optional, tag = "2")] + pub pagination: ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryBidsByAuctionResponse { + #[prost(message, repeated, tag = "1")] + pub bids: ::prost::alloc::vec::Vec, + #[prost(message, optional, tag = "2")] + pub pagination: + ::core::option::Option, +} +#[doc = r" Generated client implementations."] +pub mod query_client { + #![allow(unused_variables, dead_code, missing_docs)] + use tonic::codegen::*; + pub struct QueryClient { + inner: tonic::client::Grpc, + } + impl QueryClient { + #[doc = r" Attempt to create a new client by connecting to a given endpoint."] + pub async fn connect(dst: D) -> Result + where + D: std::convert::TryInto, + D::Error: Into, + { + let conn = tonic::transport::Endpoint::new(dst)?.connect().await?; + Ok(Self::new(conn)) + } + } + impl QueryClient + where + T: tonic::client::GrpcService, + T::ResponseBody: Body + HttpBody + Send + 'static, + T::Error: Into, + ::Error: Into + Send, + { + pub fn new(inner: T) -> Self { + let inner = tonic::client::Grpc::new(inner); + Self { inner } + } + pub fn with_interceptor(inner: T, interceptor: impl Into) -> Self { + let inner = tonic::client::Grpc::with_interceptor(inner, interceptor); + Self { inner } + } + pub async fn query_params( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/auction.v1.Query/QueryParams"); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_active_auction( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/auction.v1.Query/QueryActiveAuction"); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_ended_auction( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/auction.v1.Query/QueryEndedAuction"); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_active_auctions( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = + http::uri::PathAndQuery::from_static("/auction.v1.Query/QueryActiveAuctions"); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_ended_auctions( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/auction.v1.Query/QueryEndedAuctions"); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_bid( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/auction.v1.Query/QueryBid"); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_bids_by_auction( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/auction.v1.Query/QueryBidsByAuction"); + self.inner.unary(request.into_request(), path, codec).await + } + } + impl Clone for QueryClient { + fn clone(&self) -> Self { + Self { + inner: self.inner.clone(), + } + } + } + impl std::fmt::Debug for QueryClient { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "QueryClient {{ ... }}") + } + } +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct SetTokenPricesProposal { + #[prost(string, tag = "1")] + pub title: ::prost::alloc::string::String, + #[prost(string, tag = "2")] + pub description: ::prost::alloc::string::String, + #[prost(message, repeated, tag = "3")] + pub token_prices: ::prost::alloc::vec::Vec, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct SetTokenPricesProposalWithDeposit { + #[prost(string, tag = "1")] + pub title: ::prost::alloc::string::String, + #[prost(string, tag = "2")] + pub description: ::prost::alloc::string::String, + #[prost(message, repeated, tag = "3")] + pub token_prices: ::prost::alloc::vec::Vec, + #[prost(string, tag = "4")] + pub deposit: ::prost::alloc::string::String, +} diff --git a/somm_proto/src/prost/cellarfees.v1.rs b/somm_proto/src/prost/cellarfees.v1.rs new file mode 100644 index 00000000..707aef00 --- /dev/null +++ b/somm_proto/src/prost/cellarfees.v1.rs @@ -0,0 +1,198 @@ +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct FeeAccrualCounter { + #[prost(string, tag = "1")] + pub denom: ::prost::alloc::string::String, + #[prost(uint64, tag = "2")] + pub count: u64, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct FeeAccrualCounters { + #[prost(message, repeated, tag = "1")] + pub counters: ::prost::alloc::vec::Vec, +} +/// Params defines the parameters for the module. +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct Params { + /// The number of fee accruals after which an auction should be started + #[prost(uint64, tag = "1")] + pub fee_accrual_auction_threshold: u64, + /// Emission rate factor. Specifically, the number of blocks over which to distribute + /// some amount of staking rewards. + #[prost(uint64, tag = "2")] + pub reward_emission_period: u64, + /// The initial rate at which auctions should decrease their denom's price in SOMM + #[prost(string, tag = "3")] + pub initial_price_decrease_rate: ::prost::alloc::string::String, + /// Number of blocks between auction price decreases + #[prost(uint64, tag = "4")] + pub price_decrease_block_interval: u64, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryParamsRequest {} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryParamsResponse { + #[prost(message, optional, tag = "1")] + pub params: ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryModuleAccountsRequest {} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryModuleAccountsResponse { + #[prost(string, tag = "1")] + pub fees_address: ::prost::alloc::string::String, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryLastRewardSupplyPeakRequest {} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryLastRewardSupplyPeakResponse { + #[prost(string, tag = "1")] + pub last_reward_supply_peak: ::prost::alloc::string::String, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryFeeAccrualCountersRequest {} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryFeeAccrualCountersResponse { + #[prost(message, optional, tag = "1")] + pub fee_accrual_counters: ::core::option::Option, +} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryApyRequest {} +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryApyResponse { + #[prost(string, tag = "1")] + pub apy: ::prost::alloc::string::String, +} +#[doc = r" Generated client implementations."] +pub mod query_client { + #![allow(unused_variables, dead_code, missing_docs)] + use tonic::codegen::*; + pub struct QueryClient { + inner: tonic::client::Grpc, + } + impl QueryClient { + #[doc = r" Attempt to create a new client by connecting to a given endpoint."] + pub async fn connect(dst: D) -> Result + where + D: std::convert::TryInto, + D::Error: Into, + { + let conn = tonic::transport::Endpoint::new(dst)?.connect().await?; + Ok(Self::new(conn)) + } + } + impl QueryClient + where + T: tonic::client::GrpcService, + T::ResponseBody: Body + HttpBody + Send + 'static, + T::Error: Into, + ::Error: Into + Send, + { + pub fn new(inner: T) -> Self { + let inner = tonic::client::Grpc::new(inner); + Self { inner } + } + pub fn with_interceptor(inner: T, interceptor: impl Into) -> Self { + let inner = tonic::client::Grpc::with_interceptor(inner, interceptor); + Self { inner } + } + pub async fn query_params( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/cellarfees.v1.Query/QueryParams"); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_module_accounts( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = + http::uri::PathAndQuery::from_static("/cellarfees.v1.Query/QueryModuleAccounts"); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_last_reward_supply_peak( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> + { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static( + "/cellarfees.v1.Query/QueryLastRewardSupplyPeak", + ); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_fee_accrual_counters( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> + { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static( + "/cellarfees.v1.Query/QueryFeeAccrualCounters", + ); + self.inner.unary(request.into_request(), path, codec).await + } + pub async fn query_apy( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/cellarfees.v1.Query/QueryAPY"); + self.inner.unary(request.into_request(), path, codec).await + } + } + impl Clone for QueryClient { + fn clone(&self) -> Self { + Self { + inner: self.inner.clone(), + } + } + } + impl std::fmt::Debug for QueryClient { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "QueryClient {{ ... }}") + } + } +} +/// GenesisState defines the cellarfees module's genesis state. +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct GenesisState { + #[prost(message, optional, tag = "1")] + pub params: ::core::option::Option, + #[prost(message, optional, tag = "2")] + pub fee_accrual_counters: ::core::option::Option, + #[prost(string, tag = "3")] + pub last_reward_supply_peak: ::prost::alloc::string::String, +} diff --git a/somm_proto/src/prost/cork.v2.rs b/somm_proto/src/prost/cork.v2.rs index 15258e24..13f0ffac 100644 --- a/somm_proto/src/prost/cork.v2.rs +++ b/somm_proto/src/prost/cork.v2.rs @@ -132,6 +132,7 @@ pub struct GenesisState { /// Params cork parameters #[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] pub struct Params { + /// Deprecated /// VoteThreshold defines the percentage of bonded stake required to vote for a scheduled cork to be approved #[prost(string, tag = "1")] pub vote_threshold: ::prost::alloc::string::String, diff --git a/somm_proto/src/prost/incentives.v1.rs b/somm_proto/src/prost/incentives.v1.rs new file mode 100644 index 00000000..7616eaf0 --- /dev/null +++ b/somm_proto/src/prost/incentives.v1.rs @@ -0,0 +1,113 @@ +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct GenesisState { + #[prost(message, optional, tag = "1")] + pub params: ::core::option::Option, +} +/// Params incentives parameters +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct Params { + /// DistributionPerBlock defines the coin to be sent to the distribution module from the community pool every block + #[prost(message, optional, tag = "1")] + pub distribution_per_block: ::core::option::Option, + /// IncentivesCutoffHeight defines the block height after which the incentives module will stop sending coins to the distribution module from + /// the community pool + #[prost(uint64, tag = "2")] + pub incentives_cutoff_height: u64, +} +/// QueryParamsRequest is the request type for the QueryParams gRPC method. +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryParamsRequest {} +/// QueryParamsRequest is the response type for the QueryParams gRPC method. +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryParamsResponse { + /// allocation parameters + #[prost(message, optional, tag = "1")] + pub params: ::core::option::Option, +} +/// QueryAPYRequest is the request type for the QueryAPY gRPC method. +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryApyRequest {} +/// QueryAPYRequest is the response type for the QueryAPY gRPC method. +#[derive(serde::Deserialize, serde::Serialize, Clone, PartialEq, ::prost::Message)] +pub struct QueryApyResponse { + #[prost(string, tag = "1")] + pub apy: ::prost::alloc::string::String, +} +#[doc = r" Generated client implementations."] +pub mod query_client { + #![allow(unused_variables, dead_code, missing_docs)] + use tonic::codegen::*; + #[doc = " Query defines the gRPC query service for the cork module."] + pub struct QueryClient { + inner: tonic::client::Grpc, + } + impl QueryClient { + #[doc = r" Attempt to create a new client by connecting to a given endpoint."] + pub async fn connect(dst: D) -> Result + where + D: std::convert::TryInto, + D::Error: Into, + { + let conn = tonic::transport::Endpoint::new(dst)?.connect().await?; + Ok(Self::new(conn)) + } + } + impl QueryClient + where + T: tonic::client::GrpcService, + T::ResponseBody: Body + HttpBody + Send + 'static, + T::Error: Into, + ::Error: Into + Send, + { + pub fn new(inner: T) -> Self { + let inner = tonic::client::Grpc::new(inner); + Self { inner } + } + pub fn with_interceptor(inner: T, interceptor: impl Into) -> Self { + let inner = tonic::client::Grpc::with_interceptor(inner, interceptor); + Self { inner } + } + #[doc = " QueryParams queries the allocation module parameters."] + pub async fn query_params( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/incentives.v1.Query/QueryParams"); + self.inner.unary(request.into_request(), path, codec).await + } + #[doc = " QueryAPY queries the APY returned from the incentives module."] + pub async fn query_apy( + &mut self, + request: impl tonic::IntoRequest, + ) -> Result, tonic::Status> { + self.inner.ready().await.map_err(|e| { + tonic::Status::new( + tonic::Code::Unknown, + format!("Service was not ready: {}", e.into()), + ) + })?; + let codec = tonic::codec::ProstCodec::default(); + let path = http::uri::PathAndQuery::from_static("/incentives.v1.Query/QueryAPY"); + self.inner.unary(request.into_request(), path, codec).await + } + } + impl Clone for QueryClient { + fn clone(&self) -> Self { + Self { + inner: self.inner.clone(), + } + } + } + impl std::fmt::Debug for QueryClient { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { + write!(f, "QueryClient {{ ... }}") + } + } +} diff --git a/x/auction/client/cli/query.go b/x/auction/client/cli/query.go index 32c37ca6..61412ccd 100644 --- a/x/auction/client/cli/query.go +++ b/x/auction/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" "github.com/spf13/cobra" ) diff --git a/x/auction/client/cli/tx.go b/x/auction/client/cli/tx.go index 3b46c4f7..b86d9e3d 100644 --- a/x/auction/client/cli/tx.go +++ b/x/auction/client/cli/tx.go @@ -12,7 +12,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - types "github.com/peggyjv/sommelier/v4/x/auction/types" + types "github.com/peggyjv/sommelier/v7/x/auction/types" "github.com/spf13/cobra" ) @@ -26,6 +26,10 @@ func GetTxCmd() *cobra.Command { RunE: client.ValidateCmd, } + auctionTxCmd.AddCommand([]*cobra.Command{ + GetCmdSubmitBid(), + }...) + return auctionTxCmd } @@ -47,8 +51,8 @@ Where proposal.json contains: { "title": "Best token price proposal ever", "description": "Add the guac", - "token_prices": [ { denom: "usomm", usd_price: 1000000 }, { denom: "gravity0xdac17f958d2ee523a2206206994597c13d831ec7", usd_price: 0.12501 } ], - "deposit": "10000usommm" + "token_prices": [ { denom: "usomm", exponent: 6, usd_price: 10 }, { denom: "gravity0xdac17f958d2ee523a2206206994597c13d831ec7", exponent: 6, usd_price: 0.12501 } ], + "deposit": "10000000usomm" } `, version.AppName, @@ -75,19 +79,16 @@ Where proposal.json contains: return err } - for _, tokenPrice := range proposal.GetTokenPrices() { - err := tokenPrice.ValidateBasic() - if err != nil { - return err - } - } - content := types.NewSetTokenPricesProposal( proposal.Title, proposal.Description, proposal.TokenPrices, ) + if err = content.ValidateBasic(); err != nil { + return err + } + from := clientCtx.GetFromAddress() msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from) if err != nil { diff --git a/x/auction/client/cli/tx_test.go b/x/auction/client/cli/tx_test.go index 0f6faaa8..a966bc4e 100644 --- a/x/auction/client/cli/tx_test.go +++ b/x/auction/client/cli/tx_test.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/simapp/params" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" "github.com/cosmos/cosmos-sdk/testutil" "github.com/stretchr/testify/require" diff --git a/x/auction/client/proposal_handler.go b/x/auction/client/proposal_handler.go index 836f4fb7..66c9c4ed 100644 --- a/x/auction/client/proposal_handler.go +++ b/x/auction/client/proposal_handler.go @@ -2,8 +2,8 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/peggyjv/sommelier/v4/x/auction/client/cli" - "github.com/peggyjv/sommelier/v4/x/auction/client/rest" + "github.com/peggyjv/sommelier/v7/x/auction/client/cli" + "github.com/peggyjv/sommelier/v7/x/auction/client/rest" ) var ( diff --git a/x/auction/client/rest/rest.go b/x/auction/client/rest/rest.go index 30149b18..5b47285f 100644 --- a/x/auction/client/rest/rest.go +++ b/x/auction/client/rest/rest.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/rest" govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" ) // SetProposalRESTHandler returns a ProposalRESTHandler that exposes the set token price update REST handler with a given sub-route. diff --git a/x/auction/client/rest/utils.go b/x/auction/client/rest/utils.go index fa53534a..9cabfdb4 100644 --- a/x/auction/client/rest/utils.go +++ b/x/auction/client/rest/utils.go @@ -3,7 +3,7 @@ package rest import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/rest" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" ) type ( diff --git a/x/auction/handler.go b/x/auction/handler.go index a4bd9460..f7eff268 100644 --- a/x/auction/handler.go +++ b/x/auction/handler.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/auction/keeper" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/keeper" + "github.com/peggyjv/sommelier/v7/x/auction/types" ) // NewHandler returns a handler for "auction" type messages. diff --git a/x/auction/keeper/abci.go b/x/auction/keeper/abci.go index 705eb38e..72b13180 100644 --- a/x/auction/keeper/abci.go +++ b/x/auction/keeper/abci.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" ) // BeginBlocker is called at the beginning of every block diff --git a/x/auction/keeper/abci_test.go b/x/auction/keeper/abci_test.go index 65064786..cded4f12 100644 --- a/x/auction/keeper/abci_test.go +++ b/x/auction/keeper/abci_test.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/peggyjv/sommelier/v4/app/params" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/app/params" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" ) // Tests abci @@ -21,11 +21,11 @@ func (suite *KeeperTestSuite) TestAbci() { require.NotPanics(func() { auctionKeeper.EndBlocker(ctx) }) // Create an auction - sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} + sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} /* #nosec */ saleToken := "gravity0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE" - saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} + saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} auctionedSaleTokens := sdk.NewCoin(saleToken, sdk.NewInt(10000)) auctionKeeper.setTokenPrice(ctx, sommPrice) @@ -97,7 +97,7 @@ func (suite *KeeperTestSuite) TestAbci() { require.Equal(expectedAuction, foundAuction) // Run EndBlocker with block interval ~sufficient~ to induce decrease to a ~negative~ price, and thus the auction must finish - // Since we expect auction to end here without ever transfering any funds to bidders, we need to mock bank balance checks & transfers + // Since we expect auction to end here without ever transferring any funds to bidders, we need to mock bank balance checks & transfers // back to funding module finalCtx := ctx.WithBlockHeight(ctx.BlockHeight() + int64(blockDecreaseInterval)) suite.mockGetBalance(finalCtx, authtypes.NewModuleAddress(auctionTypes.ModuleName), saleToken, auctionedSaleTokens) diff --git a/x/auction/keeper/genesis.go b/x/auction/keeper/genesis.go index 927c49fb..0dc71387 100644 --- a/x/auction/keeper/genesis.go +++ b/x/auction/keeper/genesis.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" ) // InitGenesis initializes the module's state from a provided genesis diff --git a/x/auction/keeper/genesis_test.go b/x/auction/keeper/genesis_test.go index cffb7788..30ee9965 100644 --- a/x/auction/keeper/genesis_test.go +++ b/x/auction/keeper/genesis_test.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/app/params" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/app/params" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" ) // Tests Importing of as empty a genesis as possible diff --git a/x/auction/keeper/keeper.go b/x/auction/keeper/keeper.go index 811fe697..3f958e6d 100644 --- a/x/auction/keeper/keeper.go +++ b/x/auction/keeper/keeper.go @@ -12,8 +12,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/peggyjv/sommelier/v4/app/params" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/app/params" + "github.com/peggyjv/sommelier/v7/x/auction/types" "github.com/tendermint/tendermint/libs/log" ) @@ -214,9 +214,14 @@ func (k Keeper) BeginAuction(ctx sdk.Context, return sdkerrors.Wrap(types.ErrLastSommTokenPriceTooOld, params.BaseCoinUnit) } - // Calculate somm per sale token price - // Starting price is amount of usomm required for 1 of starting denom - saleTokenPriceInUsomm := lastSaleTokenPrice.UsdPrice.Quo(lastUsommTokenPrice.UsdPrice) + // Calculate usomm per sale token price + // Starting price is amount of usomm required for 1 of starting denom minimum unit -- we take the USD prices per normalized + // units provided by governance and calculate the USD price per minimum unit for the sale token and usomm + saleTokenMinUnitValue := lastSaleTokenPrice.UsdPrice.Quo(sdk.MustNewDecFromStr("10.0").Power(lastSaleTokenPrice.Exponent)) + // technically the somm token price has an exponent set in it, but we know what our exponent is meant to be, so use it + usommMinUnitValue := lastUsommTokenPrice.UsdPrice.Quo(sdk.MustNewDecFromStr("10.0").Power(params.CoinExponent)) + // determine how many usomm each sale token min unit costs + saleTokenPriceInUsomm := saleTokenMinUnitValue.Quo(usommMinUnitValue) auctionID := k.GetLastAuctionID(ctx) + 1 auction := types.Auction{ diff --git a/x/auction/keeper/keeper_test.go b/x/auction/keeper/keeper_test.go index 11f48252..945b5c32 100644 --- a/x/auction/keeper/keeper_test.go +++ b/x/auction/keeper/keeper_test.go @@ -13,13 +13,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/peggyjv/sommelier/v4/app/params" - moduletestutil "github.com/peggyjv/sommelier/v4/testutil" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/app/params" + moduletestutil "github.com/peggyjv/sommelier/v7/testutil" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" - auctiontestutil "github.com/peggyjv/sommelier/v4/x/auction/testutil" + auctiontestutil "github.com/peggyjv/sommelier/v7/x/auction/testutil" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" ) @@ -111,11 +111,11 @@ func (suite *KeeperTestSuite) TestHappyPathBeginAuction() { auctionParams := auctionTypes.DefaultParams() auctionKeeper.setParams(ctx, auctionParams) - sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} + sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} /* #nosec */ saleToken := "gravity0xdac17f958d2ee523a2206206994597c13d831ec7" - saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, UsdPrice: sdk.MustNewDecFromStr("0.02"), LastUpdatedBlock: 5} + saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.02"), LastUpdatedBlock: 5} auctionedSaleTokens := sdk.NewCoin(saleToken, sdk.NewInt(10000)) auctionKeeper.setTokenPrice(ctx, sommPrice) @@ -162,11 +162,11 @@ func (suite *KeeperTestSuite) TestHappyPathFinishAuction() { auctionParams := auctionTypes.DefaultParams() auctionKeeper.setParams(ctx, auctionParams) - sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, UsdPrice: sdk.MustNewDecFromStr("0.02"), LastUpdatedBlock: 2} + sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.02"), LastUpdatedBlock: 2} /* #nosec */ saleToken := "gravity0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48" - saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 2} + saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 2} auctionedSaleTokens := sdk.NewCoin(saleToken, sdk.NewInt(10000)) auctionKeeper.setTokenPrice(ctx, sommPrice) @@ -260,11 +260,11 @@ func (suite *KeeperTestSuite) TestUnhappyPathsForBeginAuction() { auctionKeeper.setParams(ctx, auctionParams) // Setup some token prices - sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 2} + sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 2} /* #nosec */ saleToken := "gravity0xaaaebe6fe48e54f431b0c390cfaf0b017d09d42d" - saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} + saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} auctionedSaleTokens := sdk.NewCoin(saleToken, sdk.NewInt(10000)) tests := []struct { @@ -365,7 +365,7 @@ func (suite *KeeperTestSuite) TestUnhappyPathsForBeginAuction() { fundingModuleAccount: permissionedFunder.GetName(), proceedsModuleAccount: permissionedReciever.GetName(), }, - expectedError: sdkerrors.Wrapf(auctionTypes.ErrInvalidInitialDecreaseRate, "Inital price decrease rate 0.000000000000000000"), + expectedError: sdkerrors.Wrapf(auctionTypes.ErrInvalidInitialDecreaseRate, "Initial price decrease rate 0.000000000000000000"), runsBefore: func() {}, }, { @@ -378,7 +378,7 @@ func (suite *KeeperTestSuite) TestUnhappyPathsForBeginAuction() { fundingModuleAccount: permissionedFunder.GetName(), proceedsModuleAccount: permissionedReciever.GetName(), }, - expectedError: sdkerrors.Wrapf(auctionTypes.ErrInvalidInitialDecreaseRate, "Inital price decrease rate 1.000000000000000000"), + expectedError: sdkerrors.Wrapf(auctionTypes.ErrInvalidInitialDecreaseRate, "Initial price decrease rate 1.000000000000000000"), runsBefore: func() {}, }, { diff --git a/x/auction/keeper/msg_server.go b/x/auction/keeper/msg_server.go index aea00340..35df65a9 100644 --- a/x/auction/keeper/msg_server.go +++ b/x/auction/keeper/msg_server.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/peggyjv/sommelier/v4/app/params" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/app/params" + "github.com/peggyjv/sommelier/v7/x/auction/types" ) var _ types.MsgServer = Keeper{} @@ -16,7 +16,6 @@ var _ types.MsgServer = Keeper{} // SubmitBid implements types.MsgServer func (k Keeper) SubmitBid(c context.Context, msg *types.MsgSubmitBidRequest) (*types.MsgSubmitBidResponse, error) { ctx := sdk.UnwrapSDKContext(c) - signer := msg.MustGetSigner() // Verify auction @@ -106,7 +105,7 @@ func (k Keeper) SubmitBid(c context.Context, msg *types.MsgSubmitBidRequest) (*t // Transfer purchase to bidder if err := k.bankKeeper.SendCoinsFromModuleToAccount(ctx, types.ModuleName, signer, sdk.NewCoins(totalFulfilledSaleTokens)); err != nil { - panic(fmt.Sprintf("funds taken from bidder but purchased tokens not transfered for bid: %s,\n err: %s", bid.String(), err.Error())) + panic(fmt.Sprintf("funds taken from bidder but purchased tokens not transferred for bid: %s,\n err: %s", bid.String(), err.Error())) } // Update amount remaining in auction diff --git a/x/auction/keeper/msg_server_test.go b/x/auction/keeper/msg_server_test.go index a84c5d70..1d2a72ae 100644 --- a/x/auction/keeper/msg_server_test.go +++ b/x/auction/keeper/msg_server_test.go @@ -8,8 +8,8 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/peggyjv/sommelier/v4/app/params" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/app/params" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" ) type runsBeforeWrapper func() @@ -23,11 +23,11 @@ func (suite *KeeperTestSuite) TestHappyPathSubmitBidAndFulfillFully() { auctionParams := auctionTypes.DefaultParams() auctionKeeper.setParams(ctx, auctionParams) - sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} + sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} /* #nosec */ saleToken := "gravity0xdac17f958d2ee523a2206206994597c13d831ec7" - saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, UsdPrice: sdk.MustNewDecFromStr("0.02"), LastUpdatedBlock: 5} + saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.02"), LastUpdatedBlock: 5} auctionedSaleTokens := sdk.NewCoin(saleToken, sdk.NewInt(10000000000)) auctionKeeper.setTokenPrice(ctx, sommPrice) @@ -119,7 +119,7 @@ func (suite *KeeperTestSuite) TestHappyPathSubmitBidAndFulfillFully() { suite.mockSendCoinsFromAccountToModule(ctx, newBidderAcc, auctionTypes.ModuleName, sdk.NewCoins(paidAmt)) suite.mockSendCoinsFromModuleToAccount(ctx, auctionTypes.ModuleName, newBidderAcc, sdk.NewCoins(newFulfilledAmt)) - // Mock out final keeper calls necessary to finish the auction due to bid draining the availible supply + // Mock out final keeper calls necessary to finish the auction due to bid draining the available supply suite.mockGetBalance(ctx, authtypes.NewModuleAddress(auctionTypes.ModuleName), saleToken, sdk.NewCoin(saleToken, sdk.NewInt(0))) totalUsommExpected := sdk.NewCoin(params.BaseCoinUnit, sdk.NewInt(20000000000)) suite.mockSendCoinsFromModuleToModule(ctx, auctionTypes.ModuleName, permissionedReciever.GetName(), sdk.NewCoins(totalUsommExpected)) @@ -172,11 +172,11 @@ func (suite *KeeperTestSuite) TestUnhappyPathsForSubmitBid() { auctionParams := auctionTypes.DefaultParams() auctionKeeper.setParams(ctx, auctionParams) - sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} + sommPrice := auctionTypes.TokenPrice{Denom: params.BaseCoinUnit, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.01"), LastUpdatedBlock: 5} /* #nosec */ saleToken := "gravity0x853d955acef822db058eb8505911ed77f175b99e" - saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, UsdPrice: sdk.MustNewDecFromStr("0.02"), LastUpdatedBlock: 5} + saleTokenPrice := auctionTypes.TokenPrice{Denom: saleToken, Exponent: 6, UsdPrice: sdk.MustNewDecFromStr("0.02"), LastUpdatedBlock: 5} auctionedSaleTokens := sdk.NewCoin(saleToken, sdk.NewInt(1000000)) auctionKeeper.setTokenPrice(ctx, sommPrice) diff --git a/x/auction/keeper/proposal_handler.go b/x/auction/keeper/proposal_handler.go index 89951d5a..521cf507 100644 --- a/x/auction/keeper/proposal_handler.go +++ b/x/auction/keeper/proposal_handler.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" ) // HandleSetTokenPricesProposal is a handler for executing a passed community token price update proposal diff --git a/x/auction/keeper/proposal_handler_test.go b/x/auction/keeper/proposal_handler_test.go index 0339e714..742f291a 100644 --- a/x/auction/keeper/proposal_handler_test.go +++ b/x/auction/keeper/proposal_handler_test.go @@ -7,8 +7,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govTypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/peggyjv/sommelier/v4/app/params" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/app/params" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" ) // Happy path test for proposal handler diff --git a/x/auction/keeper/query_server.go b/x/auction/keeper/query_server.go index bcb82b70..0954533d 100644 --- a/x/auction/keeper/query_server.go +++ b/x/auction/keeper/query_server.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/auction/keeper/query_server_test.go b/x/auction/keeper/query_server_test.go index ece6702e..a6f57744 100644 --- a/x/auction/keeper/query_server_test.go +++ b/x/auction/keeper/query_server_test.go @@ -6,8 +6,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/peggyjv/sommelier/v4/app/params" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/app/params" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" ) // Happy path test for query server functions diff --git a/x/auction/keeper/sdk_module_mocks_test.go b/x/auction/keeper/sdk_module_mocks_test.go index 65480a09..37170200 100644 --- a/x/auction/keeper/sdk_module_mocks_test.go +++ b/x/auction/keeper/sdk_module_mocks_test.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" ) func (suite *KeeperTestSuite) mockGetModuleAccount(ctx sdk.Context) { diff --git a/x/auction/module.go b/x/auction/module.go index 7e2c2731..23efaa86 100644 --- a/x/auction/module.go +++ b/x/auction/module.go @@ -13,9 +13,9 @@ import ( sim "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/peggyjv/sommelier/v4/x/auction/client/cli" - "github.com/peggyjv/sommelier/v4/x/auction/keeper" - "github.com/peggyjv/sommelier/v4/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/auction/client/cli" + "github.com/peggyjv/sommelier/v7/x/auction/keeper" + "github.com/peggyjv/sommelier/v7/x/auction/types" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/auction/types/auction.go b/x/auction/types/auction.go index 97ba8d61..b4f9f6ee 100644 --- a/x/auction/types/auction.go +++ b/x/auction/types/auction.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - "github.com/peggyjv/sommelier/v4/app/params" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + "github.com/peggyjv/sommelier/v7/app/params" ) func (a *Auction) ValidateBasic() error { @@ -27,7 +27,7 @@ func (a *Auction) ValidateBasic() error { } if a.InitialPriceDecreaseRate.LTE(sdk.NewDec(0)) || a.InitialPriceDecreaseRate.GTE(sdk.NewDec(1)) { - return sdkerrors.Wrapf(ErrInvalidInitialDecreaseRate, "Inital price decrease rate %s", a.InitialPriceDecreaseRate.String()) + return sdkerrors.Wrapf(ErrInvalidInitialDecreaseRate, "Initial price decrease rate %s", a.InitialPriceDecreaseRate.String()) } if a.CurrentPriceDecreaseRate.LTE(sdk.NewDec(0)) || a.CurrentPriceDecreaseRate.GTE(sdk.NewDec(1)) { @@ -126,6 +126,10 @@ func (t *TokenPrice) ValidateBasic() error { return sdkerrors.Wrapf(ErrInvalidTokenPriceDenom, "denom: %s", t.Denom) } + if t.Exponent > 18 { + return sdkerrors.Wrapf(ErrTokenPriceExponentTooHigh, "exponent: %d", t.Exponent) + } + return nil } @@ -142,5 +146,9 @@ func (t *ProposedTokenPrice) ValidateBasic() error { return sdkerrors.Wrapf(ErrInvalidTokenPriceDenom, "denom: %s", t.Denom) } + if t.Exponent > 18 { + return sdkerrors.Wrapf(ErrTokenPriceExponentTooHigh, "exponent: %d", t.Exponent) + } + return nil } diff --git a/x/auction/types/auction.pb.go b/x/auction/types/auction.pb.go index 88560016..77b7bc5d 100644 --- a/x/auction/types/auction.pb.go +++ b/x/auction/types/auction.pb.go @@ -231,10 +231,12 @@ func (m *Bid) GetBlockHeight() uint64 { return 0 } +// USD price is the value for one non-fractional token (smallest unit of the token * 10^exponent) type TokenPrice struct { Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` - UsdPrice github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=usd_price,json=usdPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"usd_price"` - LastUpdatedBlock uint64 `protobuf:"varint,3,opt,name=last_updated_block,json=lastUpdatedBlock,proto3" json:"last_updated_block,omitempty"` + Exponent uint64 `protobuf:"varint,2,opt,name=exponent,proto3" json:"exponent,omitempty"` + UsdPrice github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=usd_price,json=usdPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"usd_price"` + LastUpdatedBlock uint64 `protobuf:"varint,4,opt,name=last_updated_block,json=lastUpdatedBlock,proto3" json:"last_updated_block,omitempty"` } func (m *TokenPrice) Reset() { *m = TokenPrice{} } @@ -277,6 +279,13 @@ func (m *TokenPrice) GetDenom() string { return "" } +func (m *TokenPrice) GetExponent() uint64 { + if m != nil { + return m.Exponent + } + return 0 +} + func (m *TokenPrice) GetLastUpdatedBlock() uint64 { if m != nil { return m.LastUpdatedBlock @@ -286,7 +295,8 @@ func (m *TokenPrice) GetLastUpdatedBlock() uint64 { type ProposedTokenPrice struct { Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"` - UsdPrice github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,2,opt,name=usd_price,json=usdPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"usd_price"` + Exponent uint64 `protobuf:"varint,2,opt,name=exponent,proto3" json:"exponent,omitempty"` + UsdPrice github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=usd_price,json=usdPrice,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"usd_price"` } func (m *ProposedTokenPrice) Reset() { *m = ProposedTokenPrice{} } @@ -329,6 +339,13 @@ func (m *ProposedTokenPrice) GetDenom() string { return "" } +func (m *ProposedTokenPrice) GetExponent() uint64 { + if m != nil { + return m.Exponent + } + return 0 +} + func init() { proto.RegisterType((*Auction)(nil), "auction.v1.Auction") proto.RegisterType((*Bid)(nil), "auction.v1.Bid") @@ -339,56 +356,57 @@ func init() { func init() { proto.RegisterFile("auction/v1/auction.proto", fileDescriptor_efe336ece9e41ddd) } var fileDescriptor_efe336ece9e41ddd = []byte{ - // 781 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0xcd, 0x4e, 0xeb, 0x46, - 0x14, 0x8e, 0x21, 0x04, 0x32, 0x01, 0x84, 0x46, 0xfc, 0x38, 0x20, 0x4c, 0x9a, 0x45, 0x95, 0x45, - 0x1b, 0x2b, 0x2d, 0xea, 0x3e, 0x29, 0x42, 0x44, 0x15, 0x12, 0x32, 0x45, 0xaa, 0x58, 0x74, 0x34, - 0xf1, 0x4c, 0xc2, 0x14, 0x7b, 0xc6, 0xf5, 0x8c, 0x53, 0x78, 0x8b, 0xbe, 0x40, 0x9f, 0xa2, 0x2f, - 0xc1, 0x92, 0xe5, 0xd5, 0x5d, 0xa0, 0x2b, 0x78, 0x89, 0xbb, 0xbc, 0xf2, 0xcc, 0x18, 0x02, 0x64, - 0x91, 0x9b, 0xc5, 0x5d, 0x25, 0xe7, 0x7c, 0x3e, 0xdf, 0x77, 0xce, 0xa7, 0x73, 0x6c, 0xe0, 0xe2, - 0x2c, 0x54, 0x4c, 0x70, 0x7f, 0xdc, 0xf1, 0xed, 0xdf, 0x76, 0x92, 0x0a, 0x25, 0x20, 0x28, 0xc2, - 0x71, 0x67, 0xd7, 0x0b, 0x85, 0x8c, 0x85, 0xf4, 0x07, 0x58, 0x52, 0x7f, 0xdc, 0x19, 0x50, 0x85, - 0x3b, 0x7e, 0x28, 0x98, 0x7d, 0x76, 0xb7, 0x6e, 0x70, 0xa4, 0x23, 0xdf, 0x04, 0x16, 0xda, 0x1c, - 0x89, 0x91, 0x30, 0xf9, 0xfc, 0x9f, 0xc9, 0x36, 0x3f, 0x57, 0xc0, 0x72, 0xd7, 0xf0, 0xc3, 0x75, - 0xb0, 0xc0, 0x88, 0xeb, 0x34, 0x9c, 0xd6, 0x5a, 0xb0, 0xc0, 0x08, 0xfc, 0x03, 0xb8, 0x52, 0xe1, - 0x54, 0x31, 0x3e, 0x42, 0x4a, 0x5c, 0x53, 0x2e, 0xd1, 0x50, 0xa4, 0x48, 0xe2, 0x88, 0xba, 0x0b, - 0x0d, 0xa7, 0x55, 0xfb, 0xa9, 0xde, 0xb6, 0x12, 0x79, 0x3f, 0x6d, 0xdb, 0x4f, 0xfb, 0x57, 0xc1, - 0x78, 0xaf, 0x7c, 0xf7, 0x70, 0x50, 0x0a, 0xb6, 0x0a, 0x82, 0xdf, 0x75, 0xfd, 0xb1, 0x48, 0xcf, - 0x71, 0x44, 0xe1, 0x01, 0xa8, 0x69, 0x00, 0x0d, 0x22, 0x11, 0x5e, 0xbb, 0x8b, 0x0d, 0xa7, 0x55, - 0x0e, 0x80, 0x4e, 0xf5, 0xf2, 0x0c, 0xdc, 0x03, 0x55, 0xca, 0x89, 0x85, 0xcb, 0x1a, 0x5e, 0xa1, - 0x9c, 0x18, 0x30, 0x06, 0x7b, 0x8c, 0x33, 0xc5, 0x70, 0x84, 0x92, 0x94, 0x85, 0x14, 0x11, 0x1a, - 0xa6, 0x14, 0x4b, 0x8a, 0x52, 0xac, 0xa8, 0xbb, 0xd4, 0x70, 0x5a, 0xd5, 0x5e, 0x3b, 0xd7, 0xff, - 0xf8, 0x70, 0xf0, 0xfd, 0x88, 0xa9, 0xab, 0x6c, 0xd0, 0x0e, 0x45, 0x6c, 0xfd, 0xb0, 0x3f, 0x3f, - 0x4a, 0x72, 0xed, 0xab, 0xdb, 0x84, 0xca, 0xf6, 0x11, 0x0d, 0x03, 0xd7, 0x52, 0x9e, 0xe5, 0x8c, - 0x47, 0x96, 0x30, 0xc0, 0x8a, 0xe6, 0x72, 0x61, 0x96, 0xa6, 0x94, 0xab, 0xa9, 0x72, 0x95, 0xf9, - 0xe4, 0x2c, 0xe5, 0x7b, 0xb9, 0x2e, 0xd8, 0x7f, 0x23, 0xa3, 0x5d, 0x40, 0x8c, 0x2b, 0x9a, 0x8e, - 0x71, 0xe4, 0x2e, 0x6b, 0x3b, 0x76, 0x93, 0xc9, 0x4a, 0x6d, 0x4c, 0xdf, 0x3e, 0x01, 0xa3, 0x17, - 0x83, 0x32, 0xce, 0x8a, 0xb6, 0x19, 0x47, 0x99, 0x14, 0x71, 0xec, 0xae, 0xcc, 0xd5, 0xf1, 0x8e, - 0xa5, 0xbc, 0xe0, 0xcc, 0x74, 0xdd, 0xe7, 0x17, 0x39, 0x5d, 0xae, 0x56, 0xf8, 0x33, 0x4d, 0xad, - 0x3a, 0x9f, 0x9a, 0xa5, 0x7c, 0xa7, 0x76, 0x09, 0xea, 0x29, 0x8d, 0x31, 0xe3, 0xd3, 0xb6, 0x12, - 0xcc, 0xb6, 0x95, 0xdb, 0xcf, 0x0c, 0xaf, 0xd7, 0xf2, 0x10, 0x6c, 0x0f, 0x33, 0x4e, 0x72, 0xe6, - 0x58, 0x90, 0x2c, 0xa2, 0x08, 0x87, 0xa1, 0xc8, 0xb8, 0x72, 0x6b, 0xf9, 0x10, 0xc1, 0xa6, 0x45, - 0x4f, 0x35, 0xd8, 0x35, 0x18, 0xfc, 0x05, 0xec, 0x24, 0xa9, 0x08, 0x29, 0x25, 0xf2, 0x6d, 0xd9, - 0xaa, 0x2e, 0xdb, 0x2a, 0xe0, 0x57, 0x75, 0xcd, 0xff, 0xcb, 0x60, 0xb1, 0xc7, 0xc8, 0xc4, 0xd9, - 0x95, 0xf5, 0xd9, 0xed, 0x83, 0xe2, 0xe2, 0x11, 0x23, 0xfa, 0xd0, 0xd6, 0x82, 0xaa, 0xcd, 0xf4, - 0x09, 0xdc, 0x06, 0x95, 0x01, 0x23, 0x84, 0xa6, 0xfa, 0x6c, 0xaa, 0x81, 0x8d, 0xe0, 0x09, 0xd8, - 0x88, 0xf1, 0x0d, 0x1a, 0x30, 0xf2, 0xe2, 0x7d, 0x79, 0x36, 0x3f, 0xd6, 0x62, 0x7c, 0xd3, 0x63, - 0x64, 0xc2, 0xe2, 0xdc, 0x4d, 0xe3, 0x2e, 0x8a, 0x19, 0x67, 0x71, 0x16, 0x23, 0x1c, 0xeb, 0x91, - 0x96, 0x66, 0xb4, 0x38, 0x67, 0xd0, 0xee, 0x9e, 0x9a, 0xfa, 0xae, 0x2e, 0x87, 0x7f, 0x82, 0x3d, - 0x25, 0x14, 0x8e, 0xd0, 0x30, 0x8b, 0x86, 0x2c, 0x8a, 0x28, 0x41, 0x2f, 0x5a, 0x52, 0x1f, 0xd3, - 0x0c, 0xec, 0xae, 0xe6, 0x38, 0x2e, 0x28, 0xce, 0x0b, 0x2d, 0x09, 0xff, 0x06, 0xde, 0x44, 0xef, - 0xd3, 0xf6, 0x71, 0x79, 0xae, 0x7d, 0xac, 0x3f, 0xcf, 0xf3, 0x6e, 0x23, 0xfb, 0x60, 0xc3, 0x8c, - 0xa4, 0xf9, 0x51, 0x82, 0x19, 0xd1, 0x27, 0x36, 0xc3, 0x1c, 0xeb, 0xba, 0x50, 0xd3, 0x9c, 0x61, - 0x46, 0xe0, 0x77, 0x60, 0xd5, 0x1c, 0xfb, 0x15, 0x65, 0xa3, 0x2b, 0xa5, 0x6f, 0xa7, 0x1c, 0xd4, - 0x74, 0xee, 0x44, 0xa7, 0x9a, 0xff, 0x39, 0x00, 0xe8, 0x3e, 0x74, 0x0f, 0x70, 0x13, 0x2c, 0x11, - 0xca, 0x45, 0xac, 0xf7, 0xa7, 0x1a, 0x98, 0x00, 0xfe, 0x06, 0xaa, 0x99, 0x24, 0x66, 0x72, 0xbd, - 0x41, 0x5f, 0x3f, 0xf0, 0x4a, 0x26, 0x89, 0x91, 0xf8, 0x01, 0xc0, 0x08, 0x4b, 0x85, 0xb2, 0x84, - 0x60, 0x45, 0xc9, 0xab, 0x77, 0xf6, 0x46, 0x8e, 0x5c, 0x18, 0x40, 0xbf, 0x83, 0x9a, 0xff, 0x00, - 0x78, 0x96, 0x8a, 0x44, 0x48, 0x4a, 0xbe, 0x69, 0x9b, 0xbd, 0xfe, 0xdd, 0xa3, 0xe7, 0xdc, 0x3f, - 0x7a, 0xce, 0xa7, 0x47, 0xcf, 0xf9, 0xf7, 0xc9, 0x2b, 0xdd, 0x3f, 0x79, 0xa5, 0x0f, 0x4f, 0x5e, - 0xe9, 0xd2, 0x9f, 0xe0, 0x4a, 0xe8, 0x68, 0x74, 0xfb, 0xd7, 0xd8, 0xcf, 0x2d, 0xa7, 0x11, 0xa3, - 0xa9, 0x3f, 0x3e, 0xf4, 0x6f, 0x8a, 0x2f, 0xae, 0x21, 0x1e, 0x54, 0xf4, 0xb7, 0xf1, 0xe7, 0x2f, - 0x01, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x53, 0x28, 0x36, 0x94, 0x07, 0x00, 0x00, + // 799 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0x41, 0x6f, 0xdb, 0x36, + 0x14, 0xb6, 0x52, 0xc7, 0xb1, 0xe9, 0xa6, 0x08, 0x88, 0x34, 0x95, 0x1d, 0x54, 0xf1, 0x7c, 0x18, + 0x7c, 0xd8, 0x2c, 0x78, 0x1b, 0xb6, 0xb3, 0xbd, 0xa2, 0xa8, 0x31, 0x14, 0x08, 0xd4, 0x05, 0x18, + 0x7a, 0x18, 0x41, 0x8b, 0xcf, 0x0e, 0x17, 0x89, 0xd4, 0x44, 0xca, 0x70, 0xff, 0xc5, 0x80, 0xfd, + 0x94, 0x9d, 0xf6, 0x0f, 0x7a, 0xec, 0x71, 0xd8, 0xa1, 0x18, 0x92, 0x3f, 0xb1, 0xe3, 0x20, 0x92, + 0x6a, 0x9c, 0xc6, 0x07, 0xcf, 0xa7, 0x9e, 0x2c, 0xbe, 0x4f, 0xef, 0xfb, 0xde, 0xfb, 0xfc, 0x1e, + 0x85, 0x7c, 0x5a, 0xc4, 0x9a, 0x4b, 0x11, 0x2e, 0x47, 0xa1, 0x7b, 0x1c, 0x66, 0xb9, 0xd4, 0x12, + 0xa3, 0xea, 0xb8, 0x1c, 0x75, 0x83, 0x58, 0xaa, 0x54, 0xaa, 0x70, 0x46, 0x15, 0x84, 0xcb, 0xd1, + 0x0c, 0x34, 0x1d, 0x85, 0xb1, 0xe4, 0xee, 0xdd, 0x6e, 0xc7, 0xe2, 0xc4, 0x9c, 0x42, 0x7b, 0x70, + 0xd0, 0xf1, 0x42, 0x2e, 0xa4, 0x8d, 0x97, 0x4f, 0x36, 0xda, 0xff, 0xb7, 0x81, 0x0e, 0xc6, 0x96, + 0x1f, 0x3f, 0x42, 0x7b, 0x9c, 0xf9, 0x5e, 0xcf, 0x1b, 0x1c, 0x46, 0x7b, 0x9c, 0xe1, 0x9f, 0x90, + 0xaf, 0x34, 0xcd, 0x35, 0x17, 0x0b, 0xa2, 0xe5, 0x15, 0x08, 0x45, 0xe6, 0x32, 0x27, 0x8a, 0x26, + 0xe0, 0xef, 0xf5, 0xbc, 0x41, 0xfb, 0xab, 0xce, 0xd0, 0x49, 0x94, 0xf5, 0x0c, 0x5d, 0x3d, 0xc3, + 0xef, 0x25, 0x17, 0x93, 0xfa, 0xdb, 0xf7, 0x67, 0xb5, 0xe8, 0x71, 0x45, 0xf0, 0xa3, 0xc9, 0x7f, + 0x2e, 0xf3, 0x57, 0x34, 0x01, 0x7c, 0x86, 0xda, 0x06, 0x20, 0xb3, 0x44, 0xc6, 0x57, 0xfe, 0x83, + 0x9e, 0x37, 0xa8, 0x47, 0xc8, 0x84, 0x26, 0x65, 0x04, 0x9f, 0xa2, 0x16, 0x08, 0xe6, 0xe0, 0xba, + 0x81, 0x9b, 0x20, 0x98, 0x05, 0x53, 0x74, 0xca, 0x05, 0xd7, 0x9c, 0x26, 0x24, 0xcb, 0x79, 0x0c, + 0x84, 0x41, 0x9c, 0x03, 0x55, 0x40, 0x72, 0xaa, 0xc1, 0xdf, 0xef, 0x79, 0x83, 0xd6, 0x64, 0x58, + 0xea, 0xff, 0xfd, 0xfe, 0xec, 0xf3, 0x05, 0xd7, 0x97, 0xc5, 0x6c, 0x18, 0xcb, 0xd4, 0xf9, 0xe1, + 0x7e, 0xbe, 0x54, 0xec, 0x2a, 0xd4, 0x6f, 0x32, 0x50, 0xc3, 0x67, 0x10, 0x47, 0xbe, 0xa3, 0x3c, + 0x2f, 0x19, 0x9f, 0x39, 0xc2, 0x88, 0x6a, 0x28, 0xe5, 0xe2, 0x22, 0xcf, 0x41, 0xe8, 0x8d, 0x72, + 0x8d, 0xdd, 0xe4, 0x1c, 0xe5, 0x7d, 0xb9, 0x31, 0x7a, 0xfa, 0x91, 0x8c, 0x71, 0x81, 0x70, 0xa1, + 0x21, 0x5f, 0xd2, 0xc4, 0x3f, 0x30, 0x76, 0x74, 0xb3, 0xf5, 0x4c, 0x63, 0xcc, 0xd4, 0xbd, 0x81, + 0x93, 0x5b, 0x83, 0x0a, 0xc1, 0xab, 0xb2, 0xb9, 0x20, 0x85, 0x92, 0x69, 0xea, 0x37, 0x77, 0xaa, + 0xf8, 0x89, 0xa3, 0xbc, 0x10, 0xdc, 0x56, 0x3d, 0x15, 0x17, 0x25, 0x5d, 0xa9, 0x56, 0xf9, 0xb3, + 0x49, 0xad, 0xb5, 0x9b, 0x9a, 0xa3, 0xbc, 0xa7, 0xf6, 0x1a, 0x75, 0x72, 0x48, 0x29, 0x17, 0x9b, + 0xa6, 0x12, 0x6d, 0x37, 0x95, 0x27, 0x1f, 0x18, 0xee, 0x8e, 0xe5, 0x37, 0xe8, 0x64, 0x5e, 0x08, + 0x56, 0x32, 0xa7, 0x92, 0x15, 0x09, 0x10, 0x1a, 0xc7, 0xb2, 0x10, 0xda, 0x6f, 0x97, 0x4d, 0x44, + 0xc7, 0x0e, 0x7d, 0x69, 0xc0, 0xb1, 0xc5, 0xf0, 0xb7, 0xe8, 0x49, 0x96, 0xcb, 0x18, 0x80, 0xa9, + 0x8f, 0xd3, 0x1e, 0x9a, 0xb4, 0xc7, 0x15, 0x7c, 0x27, 0xaf, 0xff, 0x47, 0x1d, 0x3d, 0x98, 0x70, + 0xb6, 0xb6, 0x76, 0x75, 0xb3, 0x76, 0x4f, 0x51, 0xb5, 0xf1, 0x84, 0x33, 0xb3, 0x68, 0x87, 0x51, + 0xcb, 0x45, 0xa6, 0x0c, 0x9f, 0xa0, 0xc6, 0x8c, 0x33, 0x06, 0xb9, 0x59, 0x9b, 0x56, 0xe4, 0x4e, + 0xf8, 0x05, 0x3a, 0x4a, 0xe9, 0x8a, 0xcc, 0x38, 0xbb, 0xf5, 0xbe, 0xbe, 0x9d, 0x1f, 0x87, 0x29, + 0x5d, 0x4d, 0x38, 0x5b, 0xb3, 0xb8, 0x74, 0xd3, 0xba, 0x4b, 0x52, 0x2e, 0x78, 0x5a, 0xa4, 0x84, + 0xa6, 0xa6, 0xa5, 0xfd, 0x2d, 0x2d, 0x2e, 0x19, 0x8c, 0xbb, 0x2f, 0x6d, 0xfe, 0xd8, 0xa4, 0xe3, + 0x9f, 0xd1, 0xa9, 0x96, 0x9a, 0x26, 0x64, 0x5e, 0x24, 0x73, 0x9e, 0x24, 0xc0, 0xc8, 0xad, 0x96, + 0x32, 0xcb, 0xb4, 0x05, 0xbb, 0x6f, 0x38, 0x9e, 0x57, 0x14, 0xaf, 0x2a, 0x2d, 0x85, 0x7f, 0x45, + 0xc1, 0x5a, 0xed, 0x9b, 0xe6, 0xf1, 0x60, 0xa7, 0x79, 0xec, 0x7c, 0xe8, 0xe7, 0xde, 0x44, 0x4e, + 0xd1, 0x91, 0x6d, 0xc9, 0xf0, 0x93, 0x8c, 0x72, 0x66, 0x56, 0x6c, 0x8b, 0x3e, 0x1e, 0x99, 0x44, + 0x43, 0x73, 0x4e, 0x39, 0xc3, 0x9f, 0xa1, 0x87, 0x76, 0xd9, 0x2f, 0x81, 0x2f, 0x2e, 0xb5, 0xd9, + 0x9d, 0x7a, 0xd4, 0x36, 0xb1, 0x17, 0x26, 0xd4, 0xff, 0xd3, 0x43, 0xc8, 0xd4, 0x61, 0x6a, 0xc0, + 0xc7, 0x68, 0x9f, 0x81, 0x90, 0xa9, 0x99, 0x9f, 0x56, 0x64, 0x0f, 0xb8, 0x8b, 0x9a, 0xb0, 0xca, + 0xa4, 0x00, 0xa1, 0xcd, 0x00, 0x95, 0xb7, 0xa7, 0x3b, 0xe3, 0x1f, 0x50, 0xab, 0x50, 0xcc, 0xba, + 0x62, 0x47, 0xe8, 0x7f, 0x9b, 0xd1, 0x2c, 0x14, 0xb3, 0xf2, 0x5f, 0x20, 0x9c, 0x50, 0xa5, 0x49, + 0x91, 0x31, 0xaa, 0xe1, 0xee, 0x85, 0x7d, 0x54, 0x22, 0x17, 0x16, 0x30, 0xf7, 0x53, 0xff, 0x77, + 0x0f, 0xe1, 0xf3, 0x5c, 0x66, 0x52, 0x01, 0xfb, 0x64, 0x7a, 0x98, 0x4c, 0xdf, 0x5e, 0x07, 0xde, + 0xbb, 0xeb, 0xc0, 0xfb, 0xe7, 0x3a, 0xf0, 0x7e, 0xbb, 0x09, 0x6a, 0xef, 0x6e, 0x82, 0xda, 0x5f, + 0x37, 0x41, 0xed, 0x75, 0xb8, 0xc6, 0x95, 0xc1, 0x62, 0xf1, 0xe6, 0x97, 0x65, 0x58, 0xfe, 0x57, + 0x90, 0x70, 0xc8, 0xc3, 0xe5, 0x77, 0xe1, 0xaa, 0xfa, 0x54, 0x5b, 0xe2, 0x59, 0xc3, 0x7c, 0x54, + 0xbf, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x68, 0x28, 0x79, 0x9e, 0xcd, 0x07, 0x00, 0x00, } func (m *Auction) Marshal() (dAtA []byte, err error) { @@ -626,7 +644,7 @@ func (m *TokenPrice) MarshalToSizedBuffer(dAtA []byte) (int, error) { if m.LastUpdatedBlock != 0 { i = encodeVarintAuction(dAtA, i, uint64(m.LastUpdatedBlock)) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x20 } { size := m.UsdPrice.Size() @@ -637,7 +655,12 @@ func (m *TokenPrice) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintAuction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a + if m.Exponent != 0 { + i = encodeVarintAuction(dAtA, i, uint64(m.Exponent)) + i-- + dAtA[i] = 0x10 + } if len(m.Denom) > 0 { i -= len(m.Denom) copy(dAtA[i:], m.Denom) @@ -677,7 +700,12 @@ func (m *ProposedTokenPrice) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintAuction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a + if m.Exponent != 0 { + i = encodeVarintAuction(dAtA, i, uint64(m.Exponent)) + i-- + dAtA[i] = 0x10 + } if len(m.Denom) > 0 { i -= len(m.Denom) copy(dAtA[i:], m.Denom) @@ -782,6 +810,9 @@ func (m *TokenPrice) Size() (n int) { if l > 0 { n += 1 + l + sovAuction(uint64(l)) } + if m.Exponent != 0 { + n += 1 + sovAuction(uint64(m.Exponent)) + } l = m.UsdPrice.Size() n += 1 + l + sovAuction(uint64(l)) if m.LastUpdatedBlock != 0 { @@ -800,6 +831,9 @@ func (m *ProposedTokenPrice) Size() (n int) { if l > 0 { n += 1 + l + sovAuction(uint64(l)) } + if m.Exponent != 0 { + n += 1 + sovAuction(uint64(m.Exponent)) + } l = m.UsdPrice.Size() n += 1 + l + sovAuction(uint64(l)) return n @@ -1570,6 +1604,25 @@ func (m *TokenPrice) Unmarshal(dAtA []byte) error { m.Denom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Exponent", wireType) + } + m.Exponent = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAuction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Exponent |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field UsdPrice", wireType) } @@ -1603,7 +1656,7 @@ func (m *TokenPrice) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 3: + case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field LastUpdatedBlock", wireType) } @@ -1705,6 +1758,25 @@ func (m *ProposedTokenPrice) Unmarshal(dAtA []byte) error { m.Denom = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Exponent", wireType) + } + m.Exponent = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowAuction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Exponent |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field UsdPrice", wireType) } diff --git a/x/auction/types/auction_test.go b/x/auction/types/auction_test.go index 68dabce4..91ac8d7b 100644 --- a/x/auction/types/auction_test.go +++ b/x/auction/types/auction_test.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/peggyjv/sommelier/v4/app/params" + "github.com/peggyjv/sommelier/v7/app/params" "github.com/stretchr/testify/require" ) @@ -133,7 +133,7 @@ func TestAuctionValidate(t *testing.T) { ProceedsModuleAccount: "someModule", }, expPass: false, - err: sdkerrors.Wrapf(ErrInvalidInitialDecreaseRate, "Inital price decrease rate %s", sdk.MustNewDecFromStr("0.0").String()), + err: sdkerrors.Wrapf(ErrInvalidInitialDecreaseRate, "Initial price decrease rate %s", sdk.MustNewDecFromStr("0.0").String()), }, { name: "Initial decrease rate cannot be >= 0", @@ -152,7 +152,7 @@ func TestAuctionValidate(t *testing.T) { ProceedsModuleAccount: "someModule", }, expPass: false, - err: sdkerrors.Wrapf(ErrInvalidInitialDecreaseRate, "Inital price decrease rate %s", sdk.MustNewDecFromStr("1.0").String()), + err: sdkerrors.Wrapf(ErrInvalidInitialDecreaseRate, "Initial price decrease rate %s", sdk.MustNewDecFromStr("1.0").String()), }, { name: "Current decrease rate cannot be <= 0", @@ -212,7 +212,7 @@ func TestAuctionValidate(t *testing.T) { err: sdkerrors.Wrapf(ErrInvalidBlockDecreaseInterval, "price decrease block interval: 0"), }, { - name: "Initial unit price in usomm must be postive", + name: "Initial unit price in usomm must be positive", auction: Auction{ Id: uint32(1), StartingTokensForSale: sdk.NewCoin("gravity0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", sdk.NewIntFromUint64(1000)), @@ -231,7 +231,7 @@ func TestAuctionValidate(t *testing.T) { err: sdkerrors.Wrapf(ErrPriceMustBePositive, "initial unit price in usomm: %s", sdk.MustNewDecFromStr("0.0").String()), }, { - name: "Current unit price in usomm must be postive", + name: "Current unit price in usomm must be positive", auction: Auction{ Id: uint32(1), StartingTokensForSale: sdk.NewCoin("gravity0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", sdk.NewIntFromUint64(1000)), diff --git a/x/auction/types/errors.go b/x/auction/types/errors.go index 629373d0..efce96cd 100644 --- a/x/auction/types/errors.go +++ b/x/auction/types/errors.go @@ -6,7 +6,7 @@ import ( // x/auction module sentinel errors var ( - ErrCouldNotFindSaleTokenPrice = sdkerrors.Register(ModuleName, 2, "could not find sale token price, need to resubmit token prices and try agian") + ErrCouldNotFindSaleTokenPrice = sdkerrors.Register(ModuleName, 2, "could not find sale token price, need to resubmit token prices and try again") ErrCouldNotFindSommTokenPrice = sdkerrors.Register(ModuleName, 3, "could not find usomm token price, need to resubmit token prices and try again") ErrLastSaleTokenPriceTooOld = sdkerrors.Register(ModuleName, 4, "last sale token price update too long ago, need to resubmit token prices and try again") ErrLastSommTokenPriceTooOld = sdkerrors.Register(ModuleName, 5, "last usomm token price update too long ago, need to resubmit token prices and try again") @@ -47,4 +47,7 @@ var ( ErrMinimumBidParam = sdkerrors.Register(ModuleName, 40, "invalid minimum bid param") ErrInvalidAuctionMaxBlockAgeParam = sdkerrors.Register(ModuleName, 41, "invalid auction max block age param") ErrInvalidAuctionPriceDecreaseAccelerationRateParam = sdkerrors.Register(ModuleName, 42, "invalid auction price decrease acceleration rate param") + ErrTokenPriceExponentTooHigh = sdkerrors.Register(ModuleName, 43, "token price exponent too high, maximum precision of 18") + ErrInvalidMinimumSaleTokensUSDValue = sdkerrors.Register(ModuleName, 44, "invalid minimum sale tokens USD value") + ErrAuctionBelowMinimumUSDValue = sdkerrors.Register(ModuleName, 45, "auction USD value below minimum") ) diff --git a/x/auction/types/genesis.pb.go b/x/auction/types/genesis.pb.go index 8b840c5c..f2f52270 100644 --- a/x/auction/types/genesis.pb.go +++ b/x/auction/types/genesis.pb.go @@ -111,8 +111,9 @@ func (m *GenesisState) GetLastBidId() uint64 { type Params struct { PriceMaxBlockAge uint64 `protobuf:"varint,1,opt,name=price_max_block_age,json=priceMaxBlockAge,proto3" json:"price_max_block_age,omitempty"` MinimumBidInUsomm uint64 `protobuf:"varint,2,opt,name=minimum_bid_in_usomm,json=minimumBidInUsomm,proto3" json:"minimum_bid_in_usomm,omitempty"` - AuctionMaxBlockAge uint64 `protobuf:"varint,3,opt,name=auction_max_block_age,json=auctionMaxBlockAge,proto3" json:"auction_max_block_age,omitempty"` - AuctionPriceDecreaseAccelerationRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,4,opt,name=auction_price_decrease_acceleration_rate,json=auctionPriceDecreaseAccelerationRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"auction_price_decrease_acceleration_rate"` + MinimumSaleTokensUsdValue github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,3,opt,name=minimum_sale_tokens_usd_value,json=minimumSaleTokensUsdValue,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"minimum_sale_tokens_usd_value"` + AuctionMaxBlockAge uint64 `protobuf:"varint,4,opt,name=auction_max_block_age,json=auctionMaxBlockAge,proto3" json:"auction_max_block_age,omitempty"` + AuctionPriceDecreaseAccelerationRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=auction_price_decrease_acceleration_rate,json=auctionPriceDecreaseAccelerationRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"auction_price_decrease_acceleration_rate"` } func (m *Params) Reset() { *m = Params{} } @@ -177,37 +178,40 @@ func init() { func init() { proto.RegisterFile("auction/v1/genesis.proto", fileDescriptor_a762e9d6ba7af420) } var fileDescriptor_a762e9d6ba7af420 = []byte{ - // 478 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x92, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xe3, 0xc4, 0x44, 0xf4, 0xd2, 0xaa, 0x70, 0x29, 0xc8, 0xea, 0xe0, 0x5a, 0x05, 0x55, - 0x5e, 0xea, 0x23, 0x85, 0x85, 0x31, 0x56, 0x25, 0x94, 0x01, 0xa9, 0x32, 0xb0, 0xb0, 0x58, 0x67, - 0xfb, 0xc9, 0x1c, 0x89, 0x7d, 0x96, 0xef, 0x12, 0xa5, 0xff, 0x00, 0x33, 0x2b, 0x3b, 0x7f, 0x4c, - 0xc7, 0x8e, 0x88, 0xa1, 0x42, 0xc9, 0x3f, 0x82, 0xee, 0x47, 0x82, 0x99, 0xf2, 0x74, 0x9f, 0xcf, - 0x7b, 0xdf, 0xe7, 0xcb, 0x21, 0x8f, 0x2e, 0x73, 0xc9, 0x78, 0x4d, 0x56, 0x13, 0x52, 0x42, 0x0d, - 0x82, 0x89, 0xa8, 0x69, 0xb9, 0xe4, 0x18, 0x59, 0x12, 0xad, 0x26, 0xa7, 0xe3, 0x8e, 0x25, 0xd7, - 0x46, 0x38, 0xed, 0xb6, 0xee, 0x5c, 0x43, 0x4e, 0x4a, 0x5e, 0x72, 0x5d, 0x12, 0x55, 0x99, 0xd3, - 0xf3, 0x1f, 0x7d, 0x74, 0xf8, 0xce, 0x44, 0x7c, 0x90, 0x54, 0x02, 0x7e, 0x85, 0x86, 0x0d, 0x6d, - 0x69, 0x25, 0x3c, 0x27, 0x70, 0xc2, 0xd1, 0x15, 0x8e, 0xfe, 0x45, 0x46, 0x37, 0x9a, 0xc4, 0xee, - 0xdd, 0xc3, 0x59, 0x2f, 0xb1, 0x1e, 0x26, 0xe8, 0xb1, 0x55, 0x84, 0xd7, 0x0f, 0x06, 0xe1, 0xe8, - 0x6a, 0xdc, 0xed, 0x99, 0x9a, 0x32, 0xd9, 0x4b, 0xf8, 0x05, 0x72, 0x33, 0x56, 0x08, 0x6f, 0xa0, - 0xe5, 0xe3, 0xae, 0x1c, 0xb3, 0x22, 0xd1, 0x10, 0xbf, 0x45, 0x87, 0x92, 0xcf, 0xa1, 0x4e, 0x9b, - 0x96, 0xe5, 0x20, 0x3c, 0x57, 0xcb, 0xcf, 0xbb, 0xf2, 0x47, 0xc5, 0x6f, 0x14, 0x4e, 0x46, 0x72, - 0x5f, 0x0b, 0x7c, 0x81, 0x8e, 0x17, 0x54, 0xc8, 0xd4, 0xaa, 0x29, 0x2b, 0xbc, 0x47, 0x81, 0x13, - 0x1e, 0x25, 0x47, 0xea, 0xd8, 0xee, 0x33, 0x2b, 0xb0, 0x8f, 0x46, 0xda, 0xcb, 0x58, 0xa1, 0x9c, - 0x61, 0xe0, 0x84, 0x6e, 0x72, 0xa0, 0x8e, 0x62, 0x56, 0xcc, 0x8a, 0xf3, 0x9f, 0x7d, 0x34, 0x34, - 0x5f, 0x8c, 0x2f, 0xd1, 0x58, 0xef, 0x91, 0x56, 0x74, 0x9d, 0x66, 0x0b, 0x9e, 0xcf, 0x53, 0x5a, - 0x82, 0xbe, 0x22, 0x37, 0x79, 0xa2, 0xd1, 0x7b, 0xba, 0x8e, 0x15, 0x98, 0x96, 0x80, 0x09, 0x3a, - 0xa9, 0x58, 0xcd, 0xaa, 0x65, 0x65, 0x86, 0xd7, 0xe9, 0x52, 0xf0, 0xaa, 0xf2, 0xfa, 0xda, 0x7f, - 0x6a, 0x99, 0x4a, 0xa9, 0x3f, 0x29, 0x80, 0x27, 0xe8, 0xd9, 0x6e, 0xdb, 0xff, 0x13, 0x06, 0xba, - 0x03, 0x5b, 0xd8, 0xcd, 0xf8, 0xe6, 0xa0, 0x70, 0xd7, 0x63, 0x76, 0x2b, 0x20, 0x6f, 0x81, 0x0a, - 0x48, 0x69, 0x9e, 0xc3, 0x02, 0x5a, 0xaa, 0x59, 0x4b, 0x25, 0x78, 0x6e, 0xe0, 0x84, 0x07, 0x71, - 0xa4, 0xfe, 0xb7, 0xdf, 0x0f, 0x67, 0x17, 0x25, 0x93, 0x5f, 0x96, 0x59, 0x94, 0xf3, 0x8a, 0xe4, - 0x5c, 0x54, 0x5c, 0xd8, 0x9f, 0x4b, 0x51, 0xcc, 0x89, 0xbc, 0x6d, 0x40, 0x44, 0xd7, 0x90, 0x27, - 0x2f, 0xed, 0x7c, 0x7d, 0xaf, 0xd7, 0x76, 0xfa, 0xb4, 0x33, 0x3c, 0xa1, 0x12, 0xe2, 0xd9, 0xdd, - 0xc6, 0x77, 0xee, 0x37, 0xbe, 0xf3, 0x67, 0xe3, 0x3b, 0xdf, 0xb7, 0x7e, 0xef, 0x7e, 0xeb, 0xf7, - 0x7e, 0x6d, 0xfd, 0xde, 0x67, 0xd2, 0xc9, 0x69, 0xa0, 0x2c, 0x6f, 0xbf, 0xae, 0x88, 0xfa, 0x5c, - 0x58, 0x30, 0x68, 0xc9, 0xea, 0x0d, 0x59, 0xef, 0xde, 0xa8, 0x09, 0xcd, 0x86, 0xfa, 0x51, 0xbe, - 0xfe, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x6d, 0x9b, 0x04, 0xc0, 0x01, 0x03, 0x00, 0x00, + // 518 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0x4f, 0x6b, 0xd4, 0x40, + 0x18, 0xc6, 0x37, 0xdd, 0xb8, 0xd8, 0xd9, 0x96, 0xea, 0xb4, 0x4a, 0x2c, 0x98, 0x2e, 0x55, 0x4a, + 0x2e, 0x4d, 0xdc, 0x7a, 0x10, 0x8f, 0x1b, 0x0a, 0xb2, 0x07, 0xa1, 0xa4, 0xd6, 0x83, 0x97, 0x61, + 0x36, 0xf3, 0x12, 0xc7, 0x4d, 0x32, 0x21, 0x33, 0x59, 0xb6, 0x5f, 0xc0, 0xb3, 0x27, 0xc1, 0x6f, + 0xd4, 0x63, 0x8f, 0xe2, 0xa1, 0xc8, 0xee, 0x17, 0x91, 0x99, 0xcc, 0xd6, 0x78, 0xf4, 0x94, 0x97, + 0xf7, 0xf9, 0xbd, 0xff, 0x9e, 0x30, 0xc8, 0xa3, 0x4d, 0xaa, 0xb8, 0x28, 0xa3, 0xc5, 0x38, 0xca, + 0xa0, 0x04, 0xc9, 0x65, 0x58, 0xd5, 0x42, 0x09, 0x8c, 0xac, 0x12, 0x2e, 0xc6, 0x87, 0xfb, 0x1d, + 0x4a, 0x2d, 0x5b, 0xe0, 0xb0, 0x5b, 0xba, 0x61, 0x5b, 0xe5, 0x20, 0x13, 0x99, 0x30, 0x61, 0xa4, + 0xa3, 0x36, 0x7b, 0xfc, 0x63, 0x0b, 0xed, 0xbc, 0x6b, 0x47, 0x5c, 0x2a, 0xaa, 0x00, 0xbf, 0x42, + 0x83, 0x8a, 0xd6, 0xb4, 0x90, 0x9e, 0x33, 0x72, 0x82, 0xe1, 0x19, 0x0e, 0xff, 0x8e, 0x0c, 0x2f, + 0x8c, 0x12, 0xbb, 0x37, 0x77, 0x47, 0xbd, 0xc4, 0x72, 0x38, 0x42, 0x0f, 0x2d, 0x22, 0xbd, 0xad, + 0x51, 0x3f, 0x18, 0x9e, 0xed, 0x77, 0x6b, 0x26, 0x6d, 0x98, 0xdc, 0x43, 0xf8, 0x05, 0x72, 0x67, + 0x9c, 0x49, 0xaf, 0x6f, 0xe0, 0xbd, 0x2e, 0x1c, 0x73, 0x96, 0x18, 0x11, 0xbf, 0x45, 0x3b, 0x4a, + 0xcc, 0xa1, 0x24, 0x55, 0xcd, 0x53, 0x90, 0x9e, 0x6b, 0xe0, 0xa7, 0x5d, 0xf8, 0x83, 0xd6, 0x2f, + 0xb4, 0x9c, 0x0c, 0xd5, 0x7d, 0x2c, 0xf1, 0x09, 0xda, 0xcb, 0xa9, 0x54, 0xc4, 0xa2, 0x84, 0x33, + 0xef, 0xc1, 0xc8, 0x09, 0x76, 0x93, 0x5d, 0x9d, 0xb6, 0xfb, 0x4c, 0x19, 0xf6, 0xd1, 0xd0, 0x70, + 0x33, 0xce, 0x34, 0x33, 0x18, 0x39, 0x81, 0x9b, 0x6c, 0xeb, 0x54, 0xcc, 0xd9, 0x94, 0x1d, 0x7f, + 0xef, 0xa3, 0x41, 0x7b, 0x31, 0x3e, 0x45, 0xfb, 0x66, 0x0f, 0x52, 0xd0, 0x25, 0x99, 0xe5, 0x22, + 0x9d, 0x13, 0x9a, 0x81, 0xb1, 0xc8, 0x4d, 0x1e, 0x19, 0xe9, 0x3d, 0x5d, 0xc6, 0x5a, 0x98, 0x64, + 0x80, 0x23, 0x74, 0x50, 0xf0, 0x92, 0x17, 0x4d, 0xd1, 0x36, 0x2f, 0x49, 0x23, 0x45, 0x51, 0x78, + 0x5b, 0x86, 0x7f, 0x6c, 0x35, 0x3d, 0xa5, 0xbc, 0xd2, 0x02, 0xae, 0xd0, 0xf3, 0x4d, 0x81, 0xa4, + 0x39, 0x10, 0x73, 0x8e, 0x24, 0x8d, 0x64, 0x64, 0x41, 0xf3, 0x06, 0xbc, 0xfe, 0xc8, 0x09, 0xb6, + 0xe3, 0x50, 0x1b, 0xff, 0xeb, 0xee, 0xe8, 0x24, 0xe3, 0xea, 0x73, 0x33, 0x0b, 0x53, 0x51, 0x44, + 0xa9, 0x90, 0x85, 0x90, 0xf6, 0x73, 0x2a, 0xd9, 0x3c, 0x52, 0xd7, 0x15, 0xc8, 0xf0, 0x1c, 0xd2, + 0xe4, 0x99, 0x6d, 0x7a, 0x49, 0x73, 0x30, 0x6e, 0xc9, 0x2b, 0xc9, 0x3e, 0xea, 0x86, 0x78, 0x8c, + 0x9e, 0x6c, 0xfc, 0xf9, 0xf7, 0x26, 0xd7, 0xec, 0x88, 0xad, 0xd8, 0xbd, 0xea, 0xab, 0x83, 0x82, + 0x4d, 0x4d, 0xeb, 0x06, 0x83, 0xb4, 0x06, 0x2a, 0x81, 0xd0, 0x34, 0x85, 0x1c, 0x6a, 0x6a, 0xb4, + 0x9a, 0x2a, 0x30, 0x8e, 0xff, 0xff, 0xc2, 0x2f, 0x6d, 0x7f, 0xf3, 0x27, 0xcf, 0x6d, 0xf7, 0x49, + 0xa7, 0x79, 0x42, 0x15, 0xc4, 0xd3, 0x9b, 0x95, 0xef, 0xdc, 0xae, 0x7c, 0xe7, 0xf7, 0xca, 0x77, + 0xbe, 0xad, 0xfd, 0xde, 0xed, 0xda, 0xef, 0xfd, 0x5c, 0xfb, 0xbd, 0x4f, 0x51, 0x67, 0x4e, 0x05, + 0x59, 0x76, 0xfd, 0x65, 0x11, 0x69, 0x83, 0x21, 0xe7, 0x50, 0x47, 0x8b, 0x37, 0xd1, 0x72, 0xf3, + 0x2a, 0xda, 0xa1, 0xb3, 0x81, 0x79, 0x06, 0xaf, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x58, 0xd5, + 0x3b, 0x11, 0x73, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -324,12 +328,22 @@ func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenesis(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a if m.AuctionMaxBlockAge != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.AuctionMaxBlockAge)) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x20 } + { + size := m.MinimumSaleTokensUsdValue.Size() + i -= size + if _, err := m.MinimumSaleTokensUsdValue.MarshalTo(dAtA[i:]); err != nil { + return 0, err + } + i = encodeVarintGenesis(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a if m.MinimumBidInUsomm != 0 { i = encodeVarintGenesis(dAtA, i, uint64(m.MinimumBidInUsomm)) i-- @@ -401,6 +415,8 @@ func (m *Params) Size() (n int) { if m.MinimumBidInUsomm != 0 { n += 1 + sovGenesis(uint64(m.MinimumBidInUsomm)) } + l = m.MinimumSaleTokensUsdValue.Size() + n += 1 + l + sovGenesis(uint64(l)) if m.AuctionMaxBlockAge != 0 { n += 1 + sovGenesis(uint64(m.AuctionMaxBlockAge)) } @@ -706,6 +722,40 @@ func (m *Params) Unmarshal(dAtA []byte) error { } } case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MinimumSaleTokensUsdValue", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.MinimumSaleTokensUsdValue.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field AuctionMaxBlockAge", wireType) } @@ -724,7 +774,7 @@ func (m *Params) Unmarshal(dAtA []byte) error { break } } - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field AuctionPriceDecreaseAccelerationRate", wireType) } diff --git a/x/auction/types/msgs.go b/x/auction/types/msgs.go index 0392b824..17e20d4f 100644 --- a/x/auction/types/msgs.go +++ b/x/auction/types/msgs.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/peggyjv/sommelier/v4/app/params" + "github.com/peggyjv/sommelier/v7/app/params" ) var ( diff --git a/x/auction/types/params.go b/x/auction/types/params.go index 66bd4714..ddaa7e39 100644 --- a/x/auction/types/params.go +++ b/x/auction/types/params.go @@ -10,6 +10,7 @@ import ( var ( KeyPriceMaxBlockAge = []byte("PriceMaxBlockAge") KeyMinimumBidInUsomm = []byte("MinimumBidInUsomm") + KeyMinimumSaleTokensUSDValue = []byte("MinimumSaleTokensUSDValue") KeyAuctionMaxBlockAge = []byte("AuctionMaxBlockAge") KeyAuctionPriceDecreaseAccelerationRate = []byte("AuctionPriceDecreaseAccelerationRate") ) @@ -26,6 +27,7 @@ func DefaultParams() Params { return Params{ PriceMaxBlockAge: 403200, // roughly four weeks based on 6 second blocks MinimumBidInUsomm: 1000000, // 1 somm + MinimumSaleTokensUsdValue: sdk.MustNewDecFromStr("1.0"), // minimum value of sale tokens to consider starting an auction AuctionMaxBlockAge: 864000, // roughly 60 days based on 6 second blocks AuctionPriceDecreaseAccelerationRate: sdk.MustNewDecFromStr("0.001"), // 0.1% } @@ -36,6 +38,7 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { return paramtypes.ParamSetPairs{ paramtypes.NewParamSetPair(KeyPriceMaxBlockAge, &p.PriceMaxBlockAge, validatePriceMaxBlockAge), paramtypes.NewParamSetPair(KeyMinimumBidInUsomm, &p.MinimumBidInUsomm, validateMinimumBidInUsomm), + paramtypes.NewParamSetPair(KeyMinimumSaleTokensUSDValue, &p.MinimumSaleTokensUsdValue, validateMinimumSaleTokensUSDValue), paramtypes.NewParamSetPair(KeyAuctionMaxBlockAge, &p.AuctionMaxBlockAge, validateAuctionMaxBlockAge), paramtypes.NewParamSetPair(KeyAuctionPriceDecreaseAccelerationRate, &p.AuctionPriceDecreaseAccelerationRate, validateAuctionPriceDecreaseAccelerationRate), } @@ -84,6 +87,20 @@ func validateMinimumBidInUsomm(i interface{}) error { return nil } +func validateMinimumSaleTokensUSDValue(i interface{}) error { + minimumSaleTokensUsdValue, ok := i.(sdk.Dec) + if !ok { + return sdkerrors.Wrapf(ErrInvalidMinimumSaleTokensUSDValue, "invalid minimum sale tokens USD value parameter type: %T", i) + } + + if minimumSaleTokensUsdValue.LT(sdk.MustNewDecFromStr("1.0")) { + // Setting this to a minimum of 1.0 USD to ensure we can realistically charge a non-fractional usomm value + return sdkerrors.Wrapf(ErrInvalidMinimumSaleTokensUSDValue, "minimum sale tokens USD value must be at least 1.0") + } + + return nil +} + func validateAuctionMaxBlockAge(i interface{}) error { _, ok := i.(uint64) if !ok { @@ -101,7 +118,7 @@ func validateAuctionPriceDecreaseAccelerationRate(i interface{}) error { if auctionPriceDecreaseAccelerationRate.LT(sdk.MustNewDecFromStr("0")) || auctionPriceDecreaseAccelerationRate.GT(sdk.MustNewDecFromStr("1.0")) { // Acceleration rates could in theory be more than 100% if need be, but we are establishing this as a bound for now - return sdkerrors.Wrapf(ErrInvalidAuctionPriceDecreaseAccelerationRateParam, "auction price decrease acceleration rate must be betwen 0 and 1 inclusive (0%% to 100%%)") + return sdkerrors.Wrapf(ErrInvalidAuctionPriceDecreaseAccelerationRateParam, "auction price decrease acceleration rate must be between 0 and 1 inclusive (0%% to 100%%)") } return nil diff --git a/x/auction/types/params_test.go b/x/auction/types/params_test.go index e9c04fb3..f98c38e9 100644 --- a/x/auction/types/params_test.go +++ b/x/auction/types/params_test.go @@ -52,7 +52,7 @@ func TestParamsValidate(t *testing.T) { AuctionPriceDecreaseAccelerationRate: sdk.MustNewDecFromStr("-0.01"), }, expPass: false, - err: sdkerrors.Wrapf(ErrInvalidAuctionPriceDecreaseAccelerationRateParam, "auction price decrease acceleration rate must be betwen 0 and 1 inclusive (0%% to 100%%)"), + err: sdkerrors.Wrapf(ErrInvalidAuctionPriceDecreaseAccelerationRateParam, "auction price decrease acceleration rate must be between 0 and 1 inclusive (0%% to 100%%)"), }, { name: "Auction price decrease acceleration rate bounds check upper end", @@ -63,7 +63,7 @@ func TestParamsValidate(t *testing.T) { AuctionPriceDecreaseAccelerationRate: sdk.MustNewDecFromStr("1.1"), }, expPass: false, - err: sdkerrors.Wrapf(ErrInvalidAuctionPriceDecreaseAccelerationRateParam, "auction price decrease acceleration rate must be betwen 0 and 1 inclusive (0%% to 100%%)"), + err: sdkerrors.Wrapf(ErrInvalidAuctionPriceDecreaseAccelerationRateParam, "auction price decrease acceleration rate must be between 0 and 1 inclusive (0%% to 100%%)"), }, } diff --git a/x/auction/types/proposal.pb.go b/x/auction/types/proposal.pb.go index 767f16e4..220cf140 100644 --- a/x/auction/types/proposal.pb.go +++ b/x/auction/types/proposal.pb.go @@ -176,8 +176,8 @@ var fileDescriptor_b838951ecd76ffbc = []byte{ 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, 0x0b, 0x52, 0xd3, 0xd3, 0x2b, 0xb3, 0xca, 0xf4, 0x8b, 0xf3, 0x73, 0x73, 0x53, 0x73, 0x32, 0x53, 0x8b, 0xf4, 0xcb, - 0x4c, 0xf4, 0x2b, 0x60, 0x71, 0xa3, 0x5f, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x22, - 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xfd, 0xe7, 0x7c, 0x00, 0x02, 0x00, 0x00, + 0xcc, 0xf5, 0x2b, 0x60, 0x71, 0xa3, 0x5f, 0x52, 0x59, 0x90, 0x5a, 0x9c, 0xc4, 0x06, 0x8e, 0x22, + 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x85, 0x4b, 0x0a, 0x49, 0x00, 0x02, 0x00, 0x00, } func (m *SetTokenPricesProposal) Marshal() (dAtA []byte, err error) { diff --git a/x/auction/types/query.pb.go b/x/auction/types/query.pb.go index 7192d778..333e7ceb 100644 --- a/x/auction/types/query.pb.go +++ b/x/auction/types/query.pb.go @@ -686,52 +686,52 @@ var fileDescriptor_73c48d70714d6628 = []byte{ // 762 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4d, 0x4f, 0x13, 0x41, 0x18, 0xee, 0x96, 0x0f, 0x71, 0x88, 0x41, 0x5f, 0xd0, 0x40, 0xa9, 0x8b, 0xae, 0x7c, 0x18, 0x23, - 0x3b, 0xb4, 0x60, 0x22, 0x78, 0xa2, 0x89, 0x21, 0xf8, 0x15, 0xec, 0xd1, 0x0b, 0xd9, 0xed, 0x4e, - 0xd6, 0x31, 0x74, 0x77, 0xe9, 0x6e, 0x1b, 0x1b, 0xc2, 0xc5, 0x13, 0x47, 0x8c, 0x7a, 0x52, 0xe3, - 0xdf, 0xe1, 0x48, 0xe2, 0xc5, 0x93, 0x31, 0xe0, 0x0f, 0x31, 0x3b, 0xfb, 0x6e, 0xbb, 0xdb, 0x4e, - 0x2d, 0xa0, 0x37, 0x76, 0xde, 0x67, 0xde, 0xe7, 0x79, 0x3f, 0xe6, 0xa1, 0xe4, 0x86, 0x51, 0xaf, - 0x04, 0xdc, 0x75, 0x68, 0xa3, 0x40, 0x77, 0xeb, 0xac, 0xd6, 0xd4, 0xbd, 0x9a, 0x1b, 0xb8, 0x40, - 0xf0, 0x5c, 0x6f, 0x14, 0x72, 0x13, 0xb6, 0x6b, 0xbb, 0xe2, 0x98, 0x86, 0x7f, 0x45, 0x88, 0x5c, - 0xde, 0x76, 0x5d, 0x7b, 0x87, 0x51, 0xc3, 0xe3, 0xd4, 0x70, 0x1c, 0x37, 0x30, 0x42, 0xbc, 0x8f, - 0xd1, 0xc9, 0x44, 0x5e, 0x9b, 0x39, 0xcc, 0xe7, 0xb2, 0x48, 0x4c, 0x12, 0x45, 0xa6, 0x2a, 0xae, - 0x5f, 0x75, 0xfd, 0xed, 0x88, 0x2a, 0xfa, 0xc0, 0xd0, 0xbd, 0xe8, 0x8b, 0x9a, 0x86, 0xcf, 0x22, - 0x9d, 0xb4, 0x51, 0x30, 0x59, 0x60, 0x14, 0xa8, 0x67, 0xd8, 0xdc, 0x31, 0xda, 0x69, 0xb4, 0x09, - 0x02, 0x2f, 0x43, 0xc4, 0x96, 0x51, 0x33, 0xaa, 0x7e, 0x99, 0xed, 0xd6, 0x99, 0x1f, 0x68, 0x1b, - 0x64, 0x3c, 0x75, 0xea, 0x7b, 0xae, 0xe3, 0x33, 0x58, 0x22, 0xc3, 0x9e, 0x38, 0x99, 0x54, 0x6e, - 0x29, 0x77, 0x47, 0x8b, 0xa0, 0xb7, 0x0b, 0xd7, 0x23, 0x6c, 0x69, 0xf0, 0xe8, 0xe7, 0x4c, 0xa6, - 0x8c, 0x38, 0x6d, 0x8d, 0x4c, 0x89, 0x44, 0xeb, 0x95, 0x80, 0x37, 0xd8, 0x7a, 0x84, 0x46, 0x16, - 0xb8, 0x49, 0xe2, 0xc6, 0x6d, 0x73, 0x4b, 0xa4, 0xbc, 0x52, 0xbe, 0x8c, 0x27, 0x9b, 0x96, 0xf6, - 0x94, 0xe4, 0x64, 0x77, 0x51, 0xcb, 0x22, 0xb9, 0x84, 0x50, 0x14, 0x33, 0x9e, 0x14, 0x13, 0xa3, - 0x63, 0x8c, 0xb6, 0x4a, 0x26, 0x45, 0xb2, 0xc7, 0x8e, 0xc5, 0xac, 0xf3, 0xe9, 0x78, 0x82, 0x35, - 0xa4, 0xaf, 0x5e, 0x4c, 0x46, 0x5e, 0x56, 0x53, 0xab, 0xed, 0x2f, 0xc8, 0xb4, 0x34, 0x8a, 0x5c, - 0x94, 0x8c, 0x60, 0x9e, 0x70, 0x00, 0x03, 0xbd, 0xc8, 0x5a, 0x20, 0x8d, 0x4b, 0x94, 0xc7, 0x64, - 0xf0, 0x8c, 0x90, 0xf6, 0x36, 0xa0, 0xf8, 0x79, 0x1d, 0x17, 0x29, 0x5c, 0x1d, 0x3d, 0x5a, 0x71, - 0x5c, 0x1d, 0x7d, 0xcb, 0xb0, 0x19, 0xde, 0xc5, 0x21, 0x27, 0xee, 0x6b, 0x5f, 0x14, 0xac, 0xac, - 0x83, 0xeb, 0x82, 0xd2, 0xe1, 0x79, 0x4a, 0x5d, 0x56, 0xa8, 0x5b, 0xe8, 0xab, 0x2e, 0x62, 0x93, - 0xc8, 0xdb, 0x20, 0x63, 0x42, 0x5d, 0x89, 0x5b, 0x71, 0xfd, 0xd7, 0xc9, 0xb0, 0xc9, 0xad, 0x78, - 0xe2, 0x83, 0xe5, 0x21, 0x93, 0x5b, 0x9b, 0x56, 0xc7, 0x32, 0x64, 0x3b, 0x97, 0xe1, 0x01, 0xb9, - 0xda, 0x4e, 0x84, 0xc5, 0xdd, 0x26, 0x03, 0x26, 0xa6, 0x19, 0x2d, 0x8e, 0x25, 0xeb, 0x0a, 0x51, - 0x61, 0x4c, 0x3b, 0x50, 0x70, 0x14, 0x25, 0x6e, 0xf9, 0xa5, 0xe6, 0xb9, 0x16, 0xb0, 0x63, 0x52, - 0xd9, 0x7f, 0x9c, 0xd4, 0x61, 0x3c, 0xa9, 0x0e, 0x29, 0x58, 0xcc, 0x1d, 0x32, 0x68, 0x72, 0x2b, - 0x9e, 0x52, 0x57, 0x35, 0x22, 0xf8, 0x9f, 0xa7, 0x53, 0xfc, 0x38, 0x42, 0x86, 0x84, 0x24, 0x08, - 0xc8, 0x68, 0xc2, 0x78, 0x40, 0x4d, 0xd2, 0x77, 0xfb, 0x54, 0x6e, 0xa6, 0x67, 0x3c, 0xe2, 0xd2, - 0x66, 0xdf, 0x7d, 0xff, 0xfd, 0x21, 0xab, 0x42, 0x9e, 0xfa, 0x6e, 0xb5, 0xca, 0x76, 0x38, 0xab, - 0xd1, 0x84, 0xa5, 0x46, 0x2e, 0x05, 0xdf, 0x14, 0x74, 0xc1, 0xd4, 0xc3, 0x83, 0xb9, 0xae, 0xec, - 0x32, 0x1b, 0xcb, 0xcd, 0xf7, 0x83, 0xa1, 0x96, 0x35, 0xa1, 0x65, 0x05, 0x8a, 0x72, 0x2d, 0x86, - 0xb8, 0xb4, 0x1d, 0xbf, 0x00, 0xba, 0xd7, 0x5e, 0x89, 0x7d, 0xf8, 0xac, 0x90, 0x6b, 0x5d, 0xcf, - 0x0b, 0x66, 0xbb, 0x98, 0x25, 0xf6, 0x96, 0x9b, 0xeb, 0x83, 0x42, 0x79, 0xab, 0x42, 0xde, 0x32, + 0x3b, 0xb4, 0x68, 0x14, 0x3c, 0xd1, 0xc4, 0x10, 0xfc, 0x0a, 0xf6, 0xe8, 0x85, 0xec, 0x76, 0x27, + 0xeb, 0x18, 0xba, 0xbb, 0x74, 0xb7, 0x8d, 0x0d, 0xe1, 0xe2, 0x89, 0x23, 0x46, 0x3d, 0xa9, 0xf1, + 0xef, 0x70, 0x24, 0xf1, 0xe2, 0xc9, 0x18, 0xf0, 0x87, 0x98, 0x9d, 0x7d, 0xb7, 0xdd, 0x6d, 0xa7, + 0x16, 0xd0, 0x1b, 0x3b, 0xef, 0x33, 0xef, 0xf3, 0xbc, 0x1f, 0xf3, 0x50, 0x72, 0xcd, 0xa8, 0x57, + 0x02, 0xee, 0x3a, 0xb4, 0x51, 0xa0, 0x3b, 0x75, 0x56, 0x6b, 0xea, 0x5e, 0xcd, 0x0d, 0x5c, 0x20, + 0x78, 0xae, 0x37, 0x0a, 0xb9, 0x09, 0xdb, 0xb5, 0x5d, 0x71, 0x4c, 0xc3, 0xbf, 0x22, 0x44, 0x2e, + 0x6f, 0xbb, 0xae, 0xbd, 0xcd, 0xa8, 0xe1, 0x71, 0x6a, 0x38, 0x8e, 0x1b, 0x18, 0x21, 0xde, 0xc7, + 0xe8, 0x64, 0x22, 0xaf, 0xcd, 0x1c, 0xe6, 0x73, 0x59, 0x24, 0x26, 0x89, 0x22, 0x53, 0x15, 0xd7, + 0xaf, 0xba, 0xfe, 0x56, 0x44, 0x15, 0x7d, 0x60, 0xe8, 0x4e, 0xf4, 0x45, 0x4d, 0xc3, 0x67, 0x91, + 0x4e, 0xda, 0x28, 0x98, 0x2c, 0x30, 0x0a, 0xd4, 0x33, 0x6c, 0xee, 0x18, 0xed, 0x34, 0xda, 0x04, + 0x81, 0x97, 0x21, 0x62, 0xd3, 0xa8, 0x19, 0x55, 0xbf, 0xcc, 0x76, 0xea, 0xcc, 0x0f, 0xb4, 0x75, + 0x32, 0x9e, 0x3a, 0xf5, 0x3d, 0xd7, 0xf1, 0x19, 0x2c, 0x91, 0x61, 0x4f, 0x9c, 0x4c, 0x2a, 0x37, + 0x94, 0xdb, 0xa3, 0x45, 0xd0, 0xdb, 0x85, 0xeb, 0x11, 0xb6, 0x34, 0x78, 0xf8, 0x73, 0x26, 0x53, + 0x46, 0x9c, 0xb6, 0x4a, 0xa6, 0x44, 0xa2, 0xb5, 0x4a, 0xc0, 0x1b, 0x6c, 0x2d, 0x42, 0x23, 0x0b, + 0x5c, 0x27, 0x71, 0xe3, 0xb6, 0xb8, 0x25, 0x52, 0x5e, 0x2a, 0x5f, 0xc4, 0x93, 0x0d, 0x4b, 0x7b, + 0x4a, 0x72, 0xb2, 0xbb, 0xa8, 0x65, 0x91, 0x5c, 0x40, 0x28, 0x8a, 0x19, 0x4f, 0x8a, 0x89, 0xd1, + 0x31, 0x46, 0x5b, 0x21, 0x93, 0x22, 0xd9, 0x63, 0xc7, 0x62, 0xd6, 0xd9, 0x74, 0x3c, 0xc1, 0x1a, + 0xd2, 0x57, 0xcf, 0x27, 0x23, 0x2f, 0xab, 0xa9, 0xd5, 0xf6, 0x17, 0x64, 0x5a, 0x1a, 0x45, 0x2e, + 0x4a, 0x46, 0x30, 0x4f, 0x38, 0x80, 0x81, 0x5e, 0x64, 0x2d, 0x90, 0xc6, 0x25, 0xca, 0x63, 0x32, + 0x78, 0x46, 0x48, 0x7b, 0x1b, 0x50, 0xfc, 0xbc, 0x8e, 0x8b, 0x14, 0xae, 0x8e, 0x1e, 0xad, 0x38, + 0xae, 0x8e, 0xbe, 0x69, 0xd8, 0x0c, 0xef, 0xe2, 0x90, 0x13, 0xf7, 0xb5, 0x2f, 0x0a, 0x56, 0xd6, + 0xc1, 0x75, 0x4e, 0xe9, 0xf0, 0x3c, 0xa5, 0x2e, 0x2b, 0xd4, 0x2d, 0xf4, 0x55, 0x17, 0xb1, 0x49, + 0xe4, 0xad, 0x93, 0x31, 0xa1, 0xae, 0xc4, 0xad, 0xb8, 0xfe, 0xab, 0x64, 0xd8, 0xe4, 0x56, 0x3c, + 0xf1, 0xc1, 0xf2, 0x90, 0xc9, 0xad, 0x0d, 0xab, 0x63, 0x19, 0xb2, 0x9d, 0xcb, 0x70, 0x9f, 0x5c, + 0x6e, 0x27, 0xc2, 0xe2, 0x6e, 0x92, 0x01, 0x13, 0xd3, 0x8c, 0x16, 0xc7, 0x92, 0x75, 0x85, 0xa8, + 0x30, 0xa6, 0xed, 0x2b, 0x38, 0x8a, 0x12, 0xb7, 0xfc, 0x52, 0xf3, 0x4c, 0x0b, 0xd8, 0x31, 0xa9, + 0xec, 0x3f, 0x4e, 0xea, 0x20, 0x9e, 0x54, 0x87, 0x14, 0x2c, 0xe6, 0x16, 0x19, 0x34, 0xb9, 0x15, + 0x4f, 0xa9, 0xab, 0x1a, 0x11, 0xfc, 0xcf, 0xd3, 0x29, 0x7e, 0x1c, 0x21, 0x43, 0x42, 0x12, 0x04, + 0x64, 0x34, 0x61, 0x3c, 0xa0, 0x26, 0xe9, 0xbb, 0x7d, 0x2a, 0x37, 0xd3, 0x33, 0x1e, 0x71, 0x69, + 0xb3, 0xef, 0xbe, 0xff, 0xfe, 0x90, 0x55, 0x21, 0x4f, 0x7d, 0xb7, 0x5a, 0x65, 0xdb, 0x9c, 0xd5, + 0x68, 0xc2, 0x52, 0x23, 0x97, 0x82, 0x6f, 0x0a, 0xba, 0x60, 0xea, 0xe1, 0xc1, 0x5c, 0x57, 0x76, + 0x99, 0x8d, 0xe5, 0xe6, 0xfb, 0xc1, 0x50, 0xcb, 0xaa, 0xd0, 0x72, 0x0f, 0x8a, 0x72, 0x2d, 0x86, + 0xb8, 0xb4, 0x15, 0xbf, 0x00, 0xba, 0xdb, 0x5e, 0x89, 0x3d, 0xf8, 0xac, 0x90, 0x2b, 0x5d, 0xcf, + 0x0b, 0x66, 0xbb, 0x98, 0x25, 0xf6, 0x96, 0x9b, 0xeb, 0x83, 0x42, 0x79, 0x2b, 0x42, 0xde, 0x32, 0x14, 0xe4, 0xf2, 0x58, 0x78, 0xa7, 0x87, 0xba, 0x4f, 0x0a, 0xfe, 0xbf, 0x48, 0x1b, 0x17, 0xf4, - 0xe9, 0x4c, 0x6b, 0x8c, 0x0b, 0x7d, 0x71, 0xa8, 0x71, 0x51, 0x68, 0x5c, 0x80, 0xb9, 0x33, 0xb5, + 0xe9, 0x4c, 0x6b, 0x8c, 0x0b, 0x7d, 0x71, 0xa8, 0x71, 0x51, 0x68, 0x5c, 0x80, 0xb9, 0x53, 0xb5, 0x10, 0xde, 0xc7, 0x73, 0x4d, 0x99, 0x12, 0xfc, 0xbd, 0x21, 0x7e, 0xef, 0xb9, 0x4a, 0xbd, 0x4d, - 0xbb, 0x2f, 0x44, 0xcd, 0xc3, 0xec, 0x59, 0x1a, 0x07, 0x07, 0x0a, 0x19, 0x89, 0x9f, 0x1f, 0x4c, - 0x77, 0x51, 0xb4, 0x0d, 0x2a, 0x97, 0x97, 0x07, 0x91, 0x75, 0x5d, 0xb0, 0x3e, 0x82, 0xd5, 0x1e, - 0xad, 0x90, 0x0d, 0x8a, 0x86, 0x8f, 0x97, 0xee, 0x45, 0xb6, 0xb7, 0x0f, 0x5f, 0xe3, 0xf6, 0xa4, + 0xbb, 0x2b, 0x44, 0xcd, 0xc3, 0xec, 0x69, 0x1a, 0x07, 0xfb, 0x0a, 0x19, 0x89, 0x9f, 0x1f, 0x4c, + 0x77, 0x51, 0xb4, 0x0d, 0x2a, 0x97, 0x97, 0x07, 0x91, 0x75, 0x4d, 0xb0, 0x3e, 0x82, 0x95, 0x1e, + 0xad, 0x90, 0x0d, 0x8a, 0x86, 0x8f, 0x97, 0xee, 0x46, 0xb6, 0xb7, 0x07, 0x5f, 0xe3, 0xf6, 0xa4, 0x9c, 0x40, 0xd2, 0x1e, 0x99, 0x69, 0x49, 0xda, 0x23, 0x35, 0x14, 0xed, 0xa1, 0x10, 0x5a, 0x84, - 0xa5, 0xf3, 0x0a, 0x2d, 0x6d, 0x1e, 0x9d, 0xa8, 0xca, 0xf1, 0x89, 0xaa, 0xfc, 0x3a, 0x51, 0x95, - 0xc3, 0x53, 0x35, 0x73, 0x7c, 0xaa, 0x66, 0x7e, 0x9c, 0xaa, 0x99, 0x57, 0xd4, 0xe6, 0xc1, 0xeb, - 0xba, 0xa9, 0x57, 0xdc, 0x2a, 0xf5, 0x98, 0x6d, 0x37, 0xdf, 0x34, 0x12, 0xd9, 0x1b, 0x2b, 0xf4, - 0x6d, 0x8b, 0x22, 0x68, 0x7a, 0xcc, 0x37, 0x87, 0xc5, 0xaf, 0x9d, 0xe5, 0x3f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0xce, 0x73, 0xf8, 0x3b, 0xc2, 0x09, 0x00, 0x00, + 0xa5, 0xb3, 0x0a, 0x2d, 0x6d, 0x1c, 0x1e, 0xab, 0xca, 0xd1, 0xb1, 0xaa, 0xfc, 0x3a, 0x56, 0x95, + 0x83, 0x13, 0x35, 0x73, 0x74, 0xa2, 0x66, 0x7e, 0x9c, 0xa8, 0x99, 0x57, 0xd4, 0xe6, 0xc1, 0xeb, + 0xba, 0xa9, 0x57, 0xdc, 0x2a, 0xf5, 0x98, 0x6d, 0x37, 0xdf, 0x34, 0x12, 0xd9, 0x1b, 0x0f, 0xe8, + 0xdb, 0x16, 0x45, 0xd0, 0xf4, 0x98, 0x6f, 0x0e, 0x8b, 0x5f, 0x3b, 0xcb, 0x7f, 0x02, 0x00, 0x00, + 0xff, 0xff, 0x9d, 0xc5, 0x15, 0x0e, 0xc2, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/auction/types/tx.pb.go b/x/auction/types/tx.pb.go index 04a282ea..54d1fe75 100644 --- a/x/auction/types/tx.pb.go +++ b/x/auction/types/tx.pb.go @@ -150,32 +150,32 @@ func init() { func init() { proto.RegisterFile("auction/v1/tx.proto", fileDescriptor_a60fe804de30894a) } var fileDescriptor_a60fe804de30894a = []byte{ - // 391 bytes of a gzipped FileDescriptorProto + // 392 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x52, 0xcd, 0x8e, 0xd3, 0x30, 0x10, 0x8e, 0xe9, 0x6a, 0xa5, 0x7a, 0xb5, 0x02, 0x79, 0x57, 0xab, 0xb4, 0x12, 0xd9, 0xb0, 0xa7, - 0x9e, 0x6c, 0xa5, 0x70, 0xe1, 0x48, 0xb8, 0xd0, 0x43, 0x39, 0x04, 0x7a, 0xe9, 0xc5, 0xca, 0x8f, - 0x65, 0x0c, 0xb5, 0x1d, 0x6a, 0x27, 0x4a, 0xdf, 0x82, 0xc7, 0xea, 0xb1, 0x47, 0x4e, 0x08, 0xb5, - 0x6f, 0xc0, 0x13, 0x20, 0xe7, 0x07, 0x8a, 0x04, 0x12, 0xb7, 0xcc, 0xf7, 0x33, 0xf9, 0x66, 0xc6, - 0xf0, 0x26, 0xad, 0x72, 0x2b, 0xb4, 0x22, 0x75, 0x44, 0x6c, 0x83, 0xcb, 0xad, 0xb6, 0x1a, 0xc1, - 0x1e, 0xc4, 0x75, 0x34, 0xf5, 0xcf, 0x04, 0x03, 0xdc, 0xaa, 0xa6, 0x41, 0xae, 0x8d, 0xd4, 0x86, - 0x64, 0xa9, 0x61, 0xa4, 0x8e, 0x32, 0x66, 0xd3, 0x88, 0xe4, 0x5a, 0x0c, 0xfc, 0xa4, 0xe3, 0x69, - 0x5b, 0x91, 0xae, 0xe8, 0xa9, 0x5b, 0xae, 0xb9, 0xee, 0x70, 0xf7, 0xd5, 0xa1, 0x0f, 0x3f, 0x00, - 0xbc, 0x59, 0x1a, 0xfe, 0xae, 0xca, 0xa4, 0xb0, 0xb1, 0x28, 0x12, 0xf6, 0xb9, 0x62, 0xc6, 0xa2, - 0xa7, 0x70, 0x08, 0x44, 0x45, 0xe1, 0x83, 0x10, 0xcc, 0xae, 0x93, 0x71, 0x8f, 0x2c, 0x0a, 0x74, - 0x07, 0x2f, 0x8d, 0xe0, 0x8a, 0x6d, 0xfd, 0x47, 0x21, 0x98, 0x8d, 0x93, 0xbe, 0x42, 0x6f, 0xe0, - 0x13, 0x99, 0x36, 0x34, 0x13, 0x05, 0x15, 0x8a, 0x56, 0x46, 0x4b, 0xe9, 0x8f, 0x42, 0x30, 0xbb, - 0x9a, 0x4f, 0x70, 0x9f, 0xc6, 0x45, 0xc7, 0x7d, 0x74, 0xfc, 0x5a, 0x0b, 0x15, 0x5f, 0xec, 0xbf, - 0xdd, 0x7b, 0xc9, 0xb5, 0x4c, 0x9b, 0x58, 0x14, 0x0b, 0xb5, 0x72, 0x2e, 0xb4, 0x86, 0x13, 0x93, - 0x6e, 0x18, 0xb5, 0xfa, 0x13, 0x53, 0x54, 0x0a, 0x25, 0x64, 0x25, 0x69, 0x2a, 0x75, 0xa5, 0xac, - 0x7f, 0xf1, 0x7f, 0x2d, 0xef, 0x5c, 0x87, 0xf7, 0xae, 0xc1, 0xb2, 0xf3, 0xbf, 0x6a, 0xed, 0x0f, - 0x2f, 0xe1, 0xed, 0x9f, 0x33, 0x9b, 0x52, 0x2b, 0xc3, 0xd0, 0x33, 0x38, 0xca, 0xfa, 0x69, 0xaf, - 0xe6, 0x8f, 0xf1, 0xef, 0x8b, 0x60, 0xa7, 0x72, 0xdc, 0x7c, 0x05, 0x47, 0x4b, 0xc3, 0xd1, 0x5b, - 0x38, 0xfe, 0x65, 0x47, 0xf7, 0xe7, 0xca, 0xbf, 0x2c, 0x73, 0x1a, 0xfe, 0x5b, 0xd0, 0xfd, 0x39, - 0x5e, 0xec, 0x8f, 0x01, 0x38, 0x1c, 0x03, 0xf0, 0xfd, 0x18, 0x80, 0x2f, 0xa7, 0xc0, 0x3b, 0x9c, - 0x02, 0xef, 0xeb, 0x29, 0xf0, 0xd6, 0x84, 0x0b, 0xfb, 0xa1, 0xca, 0x70, 0xae, 0x25, 0x29, 0x19, - 0xe7, 0xbb, 0x8f, 0x35, 0x71, 0x0b, 0x62, 0x1b, 0xc1, 0xb6, 0xa4, 0x7e, 0x41, 0x9a, 0xe1, 0x89, - 0x10, 0xbb, 0x2b, 0x99, 0xc9, 0x2e, 0xdb, 0xc3, 0x3e, 0xff, 0x19, 0x00, 0x00, 0xff, 0xff, 0x1a, - 0x2b, 0x32, 0x4e, 0x66, 0x02, 0x00, 0x00, + 0x9e, 0x6c, 0xa5, 0x1c, 0x10, 0x47, 0xc2, 0x85, 0x1e, 0xca, 0x21, 0xd0, 0x4b, 0x2f, 0x56, 0x7e, + 0x2c, 0x63, 0xa8, 0xed, 0x50, 0x3b, 0x51, 0xfa, 0x16, 0x3c, 0x56, 0x8f, 0x3d, 0x72, 0x42, 0xa8, + 0x7d, 0x03, 0x9e, 0x00, 0x39, 0x3f, 0x50, 0x24, 0x90, 0xb8, 0x65, 0xbe, 0x9f, 0xc9, 0x37, 0x33, + 0x86, 0x37, 0x69, 0x95, 0x5b, 0xa1, 0x15, 0xa9, 0x23, 0x62, 0x1b, 0x5c, 0x6e, 0xb5, 0xd5, 0x08, + 0xf6, 0x20, 0xae, 0xa3, 0xa9, 0x7f, 0x26, 0x18, 0xe0, 0x56, 0x35, 0x0d, 0x72, 0x6d, 0xa4, 0x36, + 0x24, 0x4b, 0x0d, 0x23, 0x75, 0x94, 0x31, 0x9b, 0x46, 0x24, 0xd7, 0x62, 0xe0, 0x27, 0x1d, 0x4f, + 0xdb, 0x8a, 0x74, 0x45, 0x4f, 0xdd, 0x72, 0xcd, 0x75, 0x87, 0xbb, 0xaf, 0x0e, 0x7d, 0xf8, 0x01, + 0xe0, 0xcd, 0xd2, 0xf0, 0x77, 0x55, 0x26, 0x85, 0x8d, 0x45, 0x91, 0xb0, 0xcf, 0x15, 0x33, 0x16, + 0x3d, 0x85, 0x43, 0x20, 0x2a, 0x0a, 0x1f, 0x84, 0x60, 0x76, 0x9d, 0x8c, 0x7b, 0x64, 0x51, 0xa0, + 0x3b, 0x78, 0x69, 0x04, 0x57, 0x6c, 0xeb, 0x3f, 0x0a, 0xc1, 0x6c, 0x9c, 0xf4, 0x15, 0x7a, 0x03, + 0x9f, 0xc8, 0xb4, 0xa1, 0x99, 0x28, 0xa8, 0x50, 0xb4, 0x32, 0x5a, 0x4a, 0x7f, 0x14, 0x82, 0xd9, + 0xd5, 0x7c, 0x82, 0xfb, 0x34, 0x2e, 0x3a, 0xee, 0xa3, 0xe3, 0xd7, 0x5a, 0xa8, 0xf8, 0x62, 0xff, + 0xed, 0xde, 0x4b, 0xae, 0x65, 0xda, 0xc4, 0xa2, 0x58, 0xa8, 0x95, 0x73, 0xa1, 0x35, 0x9c, 0x98, + 0x74, 0xc3, 0xa8, 0xd5, 0x9f, 0x98, 0xa2, 0x52, 0x28, 0x21, 0x2b, 0x49, 0x53, 0xa9, 0x2b, 0x65, + 0xfd, 0x8b, 0xff, 0x6b, 0x79, 0xe7, 0x3a, 0xbc, 0x77, 0x0d, 0x96, 0x9d, 0xff, 0x55, 0x6b, 0x7f, + 0x78, 0x09, 0x6f, 0xff, 0x9c, 0xd9, 0x94, 0x5a, 0x19, 0x86, 0x9e, 0xc1, 0x51, 0xd6, 0x4f, 0x7b, + 0x35, 0x7f, 0x8c, 0x7f, 0x5f, 0x04, 0x3b, 0x95, 0xe3, 0xe6, 0x2b, 0x38, 0x5a, 0x1a, 0x8e, 0xde, + 0xc2, 0xf1, 0x2f, 0x3b, 0xba, 0x3f, 0x57, 0xfe, 0x65, 0x99, 0xd3, 0xf0, 0xdf, 0x82, 0xee, 0xcf, + 0xf1, 0x62, 0x7f, 0x0c, 0xc0, 0xe1, 0x18, 0x80, 0xef, 0xc7, 0x00, 0x7c, 0x39, 0x05, 0xde, 0xe1, + 0x14, 0x78, 0x5f, 0x4f, 0x81, 0xb7, 0x26, 0x5c, 0xd8, 0x0f, 0x55, 0x86, 0x73, 0x2d, 0x49, 0xc9, + 0x38, 0xdf, 0x7d, 0xac, 0x89, 0x5b, 0x10, 0xdb, 0x08, 0xb6, 0x25, 0xf5, 0x0b, 0xd2, 0x0c, 0x4f, + 0x84, 0xd8, 0x5d, 0xc9, 0x4c, 0x76, 0xd9, 0x1e, 0xf6, 0xf9, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x49, 0x9d, 0xdf, 0x7b, 0x66, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cellarfees/client/cli/query.go b/x/cellarfees/client/cli/query.go index 2f0c03b8..9f4eb7ea 100644 --- a/x/cellarfees/client/cli/query.go +++ b/x/cellarfees/client/cli/query.go @@ -14,7 +14,7 @@ import ( // "github.com/cosmos/cosmos-sdk/client/flags" // sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/cellarfees/client/cli/tx.go b/x/cellarfees/client/cli/tx.go index 86d9b311..486775ab 100644 --- a/x/cellarfees/client/cli/tx.go +++ b/x/cellarfees/client/cli/tx.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" // "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) var ( diff --git a/x/cellarfees/handler.go b/x/cellarfees/handler.go index eaa6ce0a..655a2713 100644 --- a/x/cellarfees/handler.go +++ b/x/cellarfees/handler.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cellarfees/keeper" + "github.com/peggyjv/sommelier/v7/x/cellarfees/keeper" ) // NewHandler returns a handler for "cellarfees" type messages. diff --git a/x/cellarfees/keeper/abci.go b/x/cellarfees/keeper/abci.go index e466216d..f81b607d 100644 --- a/x/cellarfees/keeper/abci.go +++ b/x/cellarfees/keeper/abci.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/peggyjv/sommelier/v4/app/params" + "github.com/peggyjv/sommelier/v7/app/params" ) // BeginBlocker emits rewards each block they are available by sending them to the distribution module's fee collector diff --git a/x/cellarfees/keeper/abci_test.go b/x/cellarfees/keeper/abci_test.go index 2e73395f..e1954ff5 100644 --- a/x/cellarfees/keeper/abci_test.go +++ b/x/cellarfees/keeper/abci_test.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" - appParams "github.com/peggyjv/sommelier/v4/app/params" - cellarfeesTypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + appParams "github.com/peggyjv/sommelier/v7/app/params" + cellarfeesTypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) func (suite *KeeperTestSuite) TestBeginBlockerZeroRewardsBalance() { diff --git a/x/cellarfees/keeper/auction.go b/x/cellarfees/keeper/auction.go index c917670b..ea4e4ab9 100644 --- a/x/cellarfees/keeper/auction.go +++ b/x/cellarfees/keeper/auction.go @@ -2,8 +2,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - auctiontypes "github.com/peggyjv/sommelier/v4/x/auction/types" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + auctiontypes "github.com/peggyjv/sommelier/v7/x/auction/types" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) // Attempts to start an auction for the provided denom diff --git a/x/cellarfees/keeper/auction_test.go b/x/cellarfees/keeper/auction_test.go index ea315252..075c0e73 100644 --- a/x/cellarfees/keeper/auction_test.go +++ b/x/cellarfees/keeper/auction_test.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/golang/mock/gomock" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" - cellarfeesTypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" + cellarfeesTypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) const feeDenom = "testdenom" diff --git a/x/cellarfees/keeper/cellarfees.go b/x/cellarfees/keeper/cellarfees.go index cda64c97..c683442b 100644 --- a/x/cellarfees/keeper/cellarfees.go +++ b/x/cellarfees/keeper/cellarfees.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/peggyjv/sommelier/v4/app/params" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/app/params" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) // Getter for module account that holds the fee pool funds diff --git a/x/cellarfees/keeper/genesis.go b/x/cellarfees/keeper/genesis.go index 553f9393..bfcab030 100644 --- a/x/cellarfees/keeper/genesis.go +++ b/x/cellarfees/keeper/genesis.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) // InitGenesis initializes the module's state from a provided genesis diff --git a/x/cellarfees/keeper/genesis_test.go b/x/cellarfees/keeper/genesis_test.go index 5d71240a..e5ff6dbd 100644 --- a/x/cellarfees/keeper/genesis_test.go +++ b/x/cellarfees/keeper/genesis_test.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - cellarfeesTypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + cellarfeesTypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) func (suite *KeeperTestSuite) TestImportingEmptyGenesis() { diff --git a/x/cellarfees/keeper/hooks.go b/x/cellarfees/keeper/hooks.go index 6ef520ec..dae214d6 100644 --- a/x/cellarfees/keeper/hooks.go +++ b/x/cellarfees/keeper/hooks.go @@ -5,9 +5,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - "github.com/peggyjv/sommelier/v4/app/params" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + "github.com/peggyjv/sommelier/v7/app/params" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) type Hooks struct { diff --git a/x/cellarfees/keeper/hooks_test.go b/x/cellarfees/keeper/hooks_test.go index 8d5631c4..c5efeab5 100644 --- a/x/cellarfees/keeper/hooks_test.go +++ b/x/cellarfees/keeper/hooks_test.go @@ -4,9 +4,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/ethereum/go-ethereum/common" "github.com/golang/mock/gomock" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - auctionTypes "github.com/peggyjv/sommelier/v4/x/auction/types" - cellarfeesTypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + auctionTypes "github.com/peggyjv/sommelier/v7/x/auction/types" + cellarfeesTypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) const gravityFeeDenom = "gravity0x1111111111111111111111111111111111111111" diff --git a/x/cellarfees/keeper/keeper.go b/x/cellarfees/keeper/keeper.go index 2d823d63..b1cba0ba 100644 --- a/x/cellarfees/keeper/keeper.go +++ b/x/cellarfees/keeper/keeper.go @@ -9,8 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/peggyjv/sommelier/v4/app/params" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/app/params" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) type Keeper struct { diff --git a/x/cellarfees/keeper/keeper_test.go b/x/cellarfees/keeper/keeper_test.go index 147e61d8..f9243167 100644 --- a/x/cellarfees/keeper/keeper_test.go +++ b/x/cellarfees/keeper/keeper_test.go @@ -11,11 +11,11 @@ import ( minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" "github.com/golang/mock/gomock" - "github.com/peggyjv/sommelier/v4/app/params" - cellarfeestestutil "github.com/peggyjv/sommelier/v4/x/cellarfees/testutil" + "github.com/peggyjv/sommelier/v7/app/params" + cellarfeestestutil "github.com/peggyjv/sommelier/v7/x/cellarfees/testutil" - moduletestutil "github.com/peggyjv/sommelier/v4/testutil" - cellarfeesTypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + moduletestutil "github.com/peggyjv/sommelier/v7/testutil" + cellarfeesTypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/cellarfees/keeper/query_server.go b/x/cellarfees/keeper/query_server.go index 3e712c96..d78e3713 100644 --- a/x/cellarfees/keeper/query_server.go +++ b/x/cellarfees/keeper/query_server.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/cellarfees/keeper/query_server_test.go b/x/cellarfees/keeper/query_server_test.go index 8ad8aed3..f4cb0c14 100644 --- a/x/cellarfees/keeper/query_server_test.go +++ b/x/cellarfees/keeper/query_server_test.go @@ -4,8 +4,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/golang/mock/gomock" - "github.com/peggyjv/sommelier/v4/app/params" - cellarfeesTypes "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/app/params" + cellarfeesTypes "github.com/peggyjv/sommelier/v7/x/cellarfees/types" ) func (suite *KeeperTestSuite) TestQueriesHappyPath() { diff --git a/x/cellarfees/module.go b/x/cellarfees/module.go index 5d794429..a270c9d0 100644 --- a/x/cellarfees/module.go +++ b/x/cellarfees/module.go @@ -13,9 +13,9 @@ import ( sim "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/peggyjv/sommelier/v4/x/cellarfees/client/cli" - "github.com/peggyjv/sommelier/v4/x/cellarfees/keeper" - "github.com/peggyjv/sommelier/v4/x/cellarfees/types" + "github.com/peggyjv/sommelier/v7/x/cellarfees/client/cli" + "github.com/peggyjv/sommelier/v7/x/cellarfees/keeper" + "github.com/peggyjv/sommelier/v7/x/cellarfees/types" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/cellarfees/testutil/expected_keepers_mocks.go b/x/cellarfees/testutil/expected_keepers_mocks.go index 8e9c5931..e38696d5 100644 --- a/x/cellarfees/testutil/expected_keepers_mocks.go +++ b/x/cellarfees/testutil/expected_keepers_mocks.go @@ -12,7 +12,7 @@ import ( types1 "github.com/cosmos/cosmos-sdk/x/mint/types" common "github.com/ethereum/go-ethereum/common" gomock "github.com/golang/mock/gomock" - types2 "github.com/peggyjv/sommelier/v4/x/auction/types" + types2 "github.com/peggyjv/sommelier/v7/x/auction/types" ) // MockAccountKeeper is a mock of AccountKeeper interface. diff --git a/x/cellarfees/types/cellarfees.pb.go b/x/cellarfees/types/cellarfees.pb.go index 1b704147..61e7010a 100644 --- a/x/cellarfees/types/cellarfees.pb.go +++ b/x/cellarfees/types/cellarfees.pb.go @@ -140,9 +140,9 @@ var fileDescriptor_34c89ca12b610c1b = []byte{ 0x9f, 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, 0x4a, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x2f, 0x48, 0x4d, 0x4f, 0xaf, 0xcc, 0x2a, 0xd3, 0x2f, - 0xce, 0xcf, 0xcd, 0x4d, 0xcd, 0xc9, 0x4c, 0x2d, 0xd2, 0x2f, 0x33, 0xd1, 0xaf, 0x40, 0x0a, 0x0d, + 0xce, 0xcf, 0xcd, 0x4d, 0xcd, 0xc9, 0x4c, 0x2d, 0xd2, 0x2f, 0x33, 0xd7, 0xaf, 0x40, 0x0a, 0x0d, 0xfd, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x7f, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xb8, 0x32, 0x38, 0x95, 0x36, 0x01, 0x00, 0x00, + 0xff, 0x9f, 0x35, 0xe6, 0x97, 0x36, 0x01, 0x00, 0x00, } func (m *FeeAccrualCounter) Marshal() (dAtA []byte, err error) { diff --git a/x/cellarfees/types/expected_keepers.go b/x/cellarfees/types/expected_keepers.go index f94a3118..1e034a61 100644 --- a/x/cellarfees/types/expected_keepers.go +++ b/x/cellarfees/types/expected_keepers.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" "github.com/ethereum/go-ethereum/common" - auctiontypes "github.com/peggyjv/sommelier/v4/x/auction/types" + auctiontypes "github.com/peggyjv/sommelier/v7/x/auction/types" ) // AccountKeeper defines the expected account keeper. diff --git a/x/cellarfees/types/genesis.pb.go b/x/cellarfees/types/genesis.pb.go index c20118be..5c23e81b 100644 --- a/x/cellarfees/types/genesis.pb.go +++ b/x/cellarfees/types/genesis.pb.go @@ -86,11 +86,11 @@ func init() { proto.RegisterFile("cellarfees/v1/genesis.proto", fileDescriptor_8 var fileDescriptor_856aa03b4cb6eca9 = []byte{ // 326 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0xd0, 0xc1, 0x4e, 0x2a, 0x31, - 0x14, 0x06, 0xe0, 0x19, 0xee, 0x0d, 0x89, 0xa3, 0x6e, 0x26, 0x18, 0xc9, 0x98, 0x14, 0x74, 0x61, - 0xd8, 0xd8, 0x06, 0xf0, 0x05, 0xc4, 0x44, 0x63, 0xe2, 0x82, 0xc0, 0x4a, 0x37, 0x93, 0x52, 0x0e, - 0x15, 0xe9, 0xd0, 0xa6, 0xed, 0x8c, 0xf2, 0x00, 0xee, 0x7d, 0x2c, 0x96, 0x2c, 0x8d, 0x0b, 0x62, - 0xe0, 0x45, 0x0c, 0x9d, 0x49, 0x04, 0x5d, 0xb5, 0xc9, 0xff, 0xf7, 0x3b, 0xcd, 0x09, 0x4e, 0x18, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0xd0, 0x31, 0x4f, 0x32, 0x31, + 0x18, 0x07, 0xf0, 0x3b, 0xde, 0x37, 0x24, 0x9e, 0xba, 0x5c, 0x30, 0x92, 0x33, 0x29, 0xe8, 0x60, + 0x58, 0x6c, 0x03, 0x0c, 0xce, 0x62, 0xa2, 0x31, 0x71, 0x20, 0x30, 0xe9, 0x72, 0x29, 0xe5, 0xa1, + 0x22, 0x3d, 0xda, 0xb4, 0xbd, 0x53, 0x3e, 0x80, 0xbb, 0x1f, 0x8b, 0x91, 0xd1, 0x38, 0x10, 0x03, + 0x5f, 0xc4, 0xd0, 0xbb, 0x44, 0xd0, 0xa9, 0x4d, 0xfe, 0xff, 0xfe, 0x9e, 0xe6, 0x09, 0x4e, 0x18, 0x08, 0x41, 0xf5, 0x08, 0xc0, 0x90, 0xac, 0x49, 0x38, 0x4c, 0xc1, 0x8c, 0x0d, 0x56, 0x5a, 0x5a, 0x19, 0x1e, 0xfe, 0x84, 0x38, 0x6b, 0x46, 0x15, 0x2e, 0xb9, 0x74, 0x09, 0xd9, 0xdc, 0xf2, 0x52, 0x14, 0xed, 0x0a, 0x8a, 0x6a, 0x9a, 0x14, 0x40, 0x84, 0x76, 0xb3, 0x2d, 0xce, 0xe5, 0x67, 0x6f, @@ -105,8 +105,8 @@ var fileDescriptor_856aa03b4cb6eca9 = []byte{ 0xe7, 0xb4, 0xbe, 0xc3, 0xba, 0x40, 0x27, 0x9d, 0xfb, 0xf9, 0x0a, 0xf9, 0x8b, 0x15, 0xf2, 0xbf, 0x56, 0xc8, 0x7f, 0x5f, 0x23, 0x6f, 0xb1, 0x46, 0xde, 0xc7, 0x1a, 0x79, 0x8f, 0xad, 0x2d, 0x57, 0x01, 0xe7, 0xb3, 0xe7, 0x8c, 0x18, 0x99, 0x24, 0x20, 0xc6, 0xa0, 0x49, 0x76, 0x49, 0x5e, 0xb7, - 0xb6, 0x9a, 0xcf, 0x19, 0x94, 0xdd, 0x72, 0xdb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5b, 0x94, - 0xd2, 0xf4, 0xdc, 0x01, 0x00, 0x00, + 0xb6, 0x9a, 0xcf, 0x19, 0x94, 0xdd, 0x72, 0xdb, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x7c, 0x93, + 0x0c, 0xf6, 0xdc, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/cellarfees/types/params.go b/x/cellarfees/types/params.go index 26ae77f3..4dc63923 100644 --- a/x/cellarfees/types/params.go +++ b/x/cellarfees/types/params.go @@ -36,7 +36,6 @@ func ParamKeyTable() paramtypes.KeyTable { // DefaultParams returns default cellarfees parameters func DefaultParams() Params { - return Params{ FeeAccrualAuctionThreshold: DefaultFeeAccrualAuctionThreshold, RewardEmissionPeriod: DefaultRewardEmissionPeriod, diff --git a/x/cellarfees/types/params.pb.go b/x/cellarfees/types/params.pb.go index a964a251..5b4ba493 100644 --- a/x/cellarfees/types/params.pb.go +++ b/x/cellarfees/types/params.pb.go @@ -100,26 +100,26 @@ var fileDescriptor_f3220ed6f8663c98 = []byte{ // 351 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x91, 0xbd, 0x4a, 0x33, 0x41, 0x14, 0x86, 0x77, 0xf3, 0x85, 0xc0, 0xb7, 0x60, 0xb3, 0x04, 0x59, 0x22, 0x6e, 0x82, 0x85, 0xa4, - 0x71, 0x87, 0x68, 0x2a, 0xbb, 0x84, 0x58, 0x08, 0x16, 0x21, 0x58, 0xd9, 0x0c, 0x93, 0xd9, 0x93, - 0xcd, 0x98, 0x99, 0xcc, 0x30, 0x33, 0x59, 0xcd, 0x5d, 0x58, 0x5a, 0x7a, 0x1b, 0xde, 0x41, 0xca, - 0x94, 0x62, 0x11, 0x24, 0xb9, 0x11, 0xd9, 0x1f, 0x71, 0xb1, 0xda, 0x85, 0xe7, 0x79, 0xdf, 0x39, - 0x87, 0xe3, 0xb5, 0x28, 0x70, 0x4e, 0xf4, 0x0c, 0xc0, 0xa0, 0xb4, 0x87, 0x14, 0xd1, 0x44, 0x98, - 0x48, 0x69, 0x69, 0xa5, 0x7f, 0xf4, 0xcb, 0xa2, 0xb4, 0xd7, 0x6a, 0x26, 0x32, 0x91, 0x39, 0x41, - 0xd9, 0x5f, 0x21, 0x9d, 0xbd, 0xd7, 0xbc, 0xc6, 0x38, 0x4f, 0xf9, 0x03, 0xef, 0x74, 0x06, 0x80, - 0x09, 0xa5, 0x7a, 0x45, 0x38, 0x26, 0x2b, 0x6a, 0x99, 0x5c, 0x62, 0x3b, 0xd7, 0x60, 0xe6, 0x92, - 0xc7, 0x81, 0xdb, 0x71, 0xbb, 0xf5, 0x49, 0x6b, 0x06, 0x30, 0x28, 0x9c, 0x41, 0xa1, 0xdc, 0xff, - 0x18, 0x7e, 0xdf, 0x3b, 0xd6, 0xf0, 0x44, 0x74, 0x8c, 0x41, 0x30, 0x63, 0xb2, 0xb8, 0x02, 0xcd, - 0x64, 0x1c, 0xd4, 0xf2, 0x6c, 0xb3, 0xa0, 0x37, 0x25, 0x1c, 0xe7, 0xcc, 0x17, 0xde, 0x09, 0x5b, - 0x32, 0xcb, 0x08, 0xc7, 0x4a, 0x33, 0x0a, 0x38, 0x06, 0xaa, 0x81, 0x18, 0xc0, 0x9a, 0x58, 0x08, - 0xfe, 0x75, 0xdc, 0xee, 0xff, 0x61, 0xb4, 0xd9, 0xb5, 0x9d, 0xcf, 0x5d, 0xfb, 0x3c, 0x61, 0x76, - 0xbe, 0x9a, 0x46, 0x54, 0x0a, 0x44, 0xa5, 0x11, 0xd2, 0x94, 0x9f, 0x0b, 0x13, 0x2f, 0x90, 0x5d, - 0x2b, 0x30, 0xd1, 0x08, 0xe8, 0x24, 0x28, 0x2b, 0xc7, 0x59, 0xe3, 0xa8, 0x2c, 0x9c, 0x10, 0x0b, - 0xd9, 0x9e, 0x7f, 0x9e, 0x99, 0x72, 0x49, 0x17, 0x98, 0x2d, 0x2d, 0xe8, 0x94, 0xf0, 0xa0, 0x5e, - 0xec, 0xa9, 0xaa, 0xc9, 0x61, 0xa6, 0xdc, 0x96, 0xc6, 0x75, 0xfd, 0xf5, 0xad, 0xed, 0x0c, 0xef, - 0x36, 0xfb, 0xd0, 0xdd, 0xee, 0x43, 0xf7, 0x6b, 0x1f, 0xba, 0x2f, 0x87, 0xd0, 0xd9, 0x1e, 0x42, - 0xe7, 0xe3, 0x10, 0x3a, 0x0f, 0x97, 0x95, 0x21, 0x15, 0x24, 0xc9, 0xfa, 0x31, 0x45, 0x46, 0x0a, - 0x01, 0x9c, 0x81, 0x46, 0x69, 0x1f, 0x3d, 0xa3, 0xca, 0xe1, 0xf2, 0xa1, 0xa7, 0x8d, 0xfc, 0x20, - 0x57, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x65, 0xb3, 0xf9, 0xe1, 0xd3, 0x01, 0x00, 0x00, + 0x71, 0x87, 0xa8, 0x20, 0xd8, 0x25, 0xc4, 0x42, 0xb0, 0x08, 0xc1, 0xca, 0x66, 0x98, 0xcc, 0x9e, + 0x6c, 0xc6, 0xcc, 0x64, 0x86, 0x99, 0xc9, 0x6a, 0xee, 0xc2, 0xd2, 0xd2, 0xdb, 0xf0, 0x0e, 0x52, + 0xa6, 0x14, 0x8b, 0x20, 0xc9, 0x8d, 0xc8, 0xfe, 0x88, 0x8b, 0xd5, 0x2e, 0x3c, 0xcf, 0xfb, 0xce, + 0x39, 0x1c, 0xaf, 0x45, 0x81, 0x73, 0xa2, 0xa7, 0x00, 0x06, 0xa5, 0x3d, 0xa4, 0x88, 0x26, 0xc2, + 0x44, 0x4a, 0x4b, 0x2b, 0xfd, 0x83, 0x5f, 0x16, 0xa5, 0xbd, 0x56, 0x33, 0x91, 0x89, 0xcc, 0x09, + 0xca, 0xfe, 0x0a, 0xe9, 0xe4, 0xbd, 0xe6, 0x35, 0x46, 0x79, 0xca, 0xef, 0x7b, 0xc7, 0x53, 0x00, + 0x4c, 0x28, 0xd5, 0x4b, 0xc2, 0x31, 0x59, 0x52, 0xcb, 0xe4, 0x02, 0xdb, 0x99, 0x06, 0x33, 0x93, + 0x3c, 0x0e, 0xdc, 0x8e, 0xdb, 0xad, 0x8f, 0x5b, 0x53, 0x80, 0x7e, 0xe1, 0xf4, 0x0b, 0xe5, 0xfe, + 0xc7, 0xf0, 0x2f, 0xbd, 0x43, 0x0d, 0x4f, 0x44, 0xc7, 0x18, 0x04, 0x33, 0x26, 0x8b, 0x2b, 0xd0, + 0x4c, 0xc6, 0x41, 0x2d, 0xcf, 0x36, 0x0b, 0x7a, 0x53, 0xc2, 0x51, 0xce, 0x7c, 0xe1, 0x1d, 0xb1, + 0x05, 0xb3, 0x8c, 0x70, 0xac, 0x34, 0xa3, 0x80, 0x63, 0xa0, 0x1a, 0x88, 0x01, 0xac, 0x89, 0x85, + 0xe0, 0x5f, 0xc7, 0xed, 0xfe, 0x1f, 0x44, 0xeb, 0x6d, 0xdb, 0xf9, 0xdc, 0xb6, 0x4f, 0x13, 0x66, + 0x67, 0xcb, 0x49, 0x44, 0xa5, 0x40, 0x54, 0x1a, 0x21, 0x4d, 0xf9, 0x39, 0x33, 0xf1, 0x1c, 0xd9, + 0x95, 0x02, 0x13, 0x0d, 0x81, 0x8e, 0x83, 0xb2, 0x72, 0x94, 0x35, 0x0e, 0xcb, 0xc2, 0x31, 0xb1, + 0x90, 0xed, 0xf9, 0xe7, 0x99, 0x09, 0x97, 0x74, 0x8e, 0xd9, 0xc2, 0x82, 0x4e, 0x09, 0x0f, 0xea, + 0xc5, 0x9e, 0xaa, 0x9a, 0x1c, 0x64, 0xca, 0x6d, 0x69, 0x5c, 0xd7, 0x5f, 0xdf, 0xda, 0xce, 0xe0, + 0x6e, 0xbd, 0x0b, 0xdd, 0xcd, 0x2e, 0x74, 0xbf, 0x76, 0xa1, 0xfb, 0xb2, 0x0f, 0x9d, 0xcd, 0x3e, + 0x74, 0x3e, 0xf6, 0xa1, 0xf3, 0x70, 0x5e, 0x19, 0x52, 0x41, 0x92, 0xac, 0x1e, 0x53, 0x64, 0xa4, + 0x10, 0xc0, 0x19, 0x68, 0x94, 0x5e, 0xa1, 0x67, 0x54, 0x39, 0x5c, 0x3e, 0xf4, 0xa4, 0x91, 0x1f, + 0xe4, 0xe2, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x42, 0xb4, 0x27, 0xe3, 0xd3, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/cellarfees/types/query.pb.go b/x/cellarfees/types/query.pb.go index 7839f6fd..d9c3a281 100644 --- a/x/cellarfees/types/query.pb.go +++ b/x/cellarfees/types/query.pb.go @@ -442,7 +442,7 @@ var fileDescriptor_6f4742d3026cf20c = []byte{ // 625 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0x41, 0x8f, 0xd2, 0x4c, 0x1c, 0xc6, 0xe9, 0xfb, 0x2a, 0xd1, 0x41, 0xe3, 0x3a, 0x62, 0xd6, 0xad, 0xa4, 0x40, 0xb3, 0xd1, - 0x75, 0x13, 0x3a, 0x2c, 0xab, 0x89, 0x47, 0xc1, 0xc4, 0x44, 0xb3, 0x26, 0x88, 0xa7, 0xf5, 0xd2, + 0x75, 0x13, 0x3a, 0x2c, 0x1b, 0xa3, 0x47, 0xc1, 0xc4, 0x44, 0xb3, 0x26, 0x88, 0xa7, 0xf5, 0xd2, 0xcc, 0x96, 0xa1, 0x22, 0x6d, 0x67, 0xe8, 0xb4, 0x68, 0x13, 0xbd, 0x78, 0x31, 0xf1, 0x64, 0xe2, 0xdd, 0xaf, 0xe0, 0xd5, 0x8f, 0xb0, 0xc7, 0x4d, 0xbc, 0x18, 0x0f, 0x1b, 0x03, 0x7e, 0x10, 0xd3, 0xe9, 0xb0, 0xc0, 0xd2, 0x12, 0x4e, 0x34, 0xf3, 0x3c, 0xfd, 0x3f, 0xbf, 0x61, 0x9e, 0x0e, 0xd8, @@ -472,13 +472,13 @@ var fileDescriptor_6f4742d3026cf20c = []byte{ 0x77, 0xd7, 0xb1, 0x4a, 0xae, 0xba, 0xe0, 0xda, 0x85, 0x3b, 0x99, 0x5c, 0xae, 0x78, 0x31, 0x3e, 0xad, 0x04, 0xe4, 0x87, 0x02, 0xb6, 0x32, 0xfb, 0x08, 0x51, 0x5a, 0xf6, 0x8a, 0x7a, 0xab, 0xf5, 0xf5, 0x5f, 0x90, 0xc8, 0x0f, 0x05, 0x72, 0x03, 0xd6, 0x33, 0x91, 0x33, 0xbe, 0x04, 0xf8, 0x5d, - 0x01, 0x9b, 0x19, 0xe5, 0x84, 0xb5, 0x34, 0x8e, 0xcc, 0x9a, 0xab, 0xc6, 0xba, 0x76, 0x09, 0xfd, - 0x40, 0x40, 0x23, 0x58, 0xcb, 0x84, 0x4e, 0xfb, 0x24, 0xe0, 0x10, 0x5c, 0x9a, 0x96, 0x17, 0x6a, + 0x01, 0x9b, 0x19, 0xe5, 0x84, 0xb5, 0x34, 0x8e, 0xcc, 0x9a, 0xab, 0xc6, 0xba, 0x76, 0x09, 0x7d, + 0x5f, 0x40, 0x23, 0x58, 0xcb, 0x84, 0x4e, 0xfb, 0x24, 0xe0, 0x10, 0x5c, 0x9a, 0x96, 0x17, 0x6a, 0x69, 0x91, 0xb3, 0xa2, 0xab, 0xe5, 0x4c, 0x5d, 0x32, 0x6c, 0x0b, 0x06, 0x0d, 0x96, 0x32, 0x19, 0x30, 0x8b, 0x5a, 0x07, 0xc7, 0x63, 0x4d, 0x39, 0x19, 0x6b, 0xca, 0x9f, 0xb1, 0xa6, 0x7c, 0x99, 0x68, 0xb9, 0x93, 0x89, 0x96, 0xfb, 0x35, 0xd1, 0x72, 0xaf, 0x1a, 0x73, 0x57, 0x07, 0x23, 0xb6, - 0x1d, 0xbd, 0x19, 0xcd, 0x4d, 0x1a, 0xdd, 0x47, 0xef, 0xe6, 0xc7, 0x89, 0xab, 0xe4, 0x28, 0x2f, - 0xae, 0xea, 0xfd, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x49, 0xe7, 0xe3, 0x9e, 0x46, 0x06, 0x00, + 0x1d, 0xbd, 0x19, 0xcd, 0x4d, 0x1a, 0x3d, 0x40, 0xef, 0xe6, 0xc7, 0x89, 0xab, 0xe4, 0x28, 0x2f, + 0xae, 0xea, 0xfd, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xe0, 0x3d, 0x9c, 0x46, 0x06, 0x00, 0x00, } diff --git a/x/cork/client/cli/query.go b/x/cork/client/cli/query.go index 05b33553..13c30396 100644 --- a/x/cork/client/cli/query.go +++ b/x/cork/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/spf13/cobra" ) diff --git a/x/cork/client/cli/tx.go b/x/cork/client/cli/tx.go index 797500f8..c5591d5e 100644 --- a/x/cork/client/cli/tx.go +++ b/x/cork/client/cli/tx.go @@ -3,6 +3,7 @@ package cli import ( "fmt" "io/ioutil" + "os" "strings" "github.com/cosmos/cosmos-sdk/client" @@ -11,7 +12,7 @@ import ( "github.com/cosmos/cosmos-sdk/version" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" "github.com/ethereum/go-ethereum/common" - types "github.com/peggyjv/sommelier/v4/x/cork/types" + types "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/spf13/cobra" ) @@ -62,7 +63,7 @@ Where proposal.json contains: } proposal := types.AddManagedCellarIDsProposalWithDeposit{} - contents, err := ioutil.ReadFile(args[0]) + contents, err := os.ReadFile(args[0]) if err != nil { return err } @@ -132,7 +133,7 @@ Where proposal.json contains: } proposal := types.RemoveManagedCellarIDsProposalWithDeposit{} - contents, err := ioutil.ReadFile(args[0]) + contents, err := os.ReadFile(args[0]) if err != nil { return err } diff --git a/x/cork/client/cli/tx_test.go b/x/cork/client/cli/tx_test.go index 0c56b7ff..fd2ada92 100644 --- a/x/cork/client/cli/tx_test.go +++ b/x/cork/client/cli/tx_test.go @@ -2,10 +2,11 @@ package cli import ( "io/ioutil" + "os" "testing" "github.com/cosmos/cosmos-sdk/simapp/params" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/cosmos/cosmos-sdk/testutil" "github.com/stretchr/testify/require" @@ -24,7 +25,7 @@ func TestParseAddManagedCellarsProposal(t *testing.T) { `) proposal := types.AddManagedCellarIDsProposalWithDeposit{} - contents, err := ioutil.ReadFile(okJSON.Name()) + contents, err := os.ReadFile(okJSON.Name()) require.NoError(t, err) err = encodingConfig.Marshaler.UnmarshalJSON(contents, &proposal) @@ -50,7 +51,7 @@ func TestParseRemoveManagedCellarsProposal(t *testing.T) { `) proposal := types.RemoveManagedCellarIDsProposalWithDeposit{} - contents, err := ioutil.ReadFile(okJSON.Name()) + contents, err := os.ReadFile(okJSON.Name()) require.NoError(t, err) err = encodingConfig.Marshaler.UnmarshalJSON(contents, &proposal) diff --git a/x/cork/client/proposal_handler.go b/x/cork/client/proposal_handler.go index f03aaf79..1f880d87 100644 --- a/x/cork/client/proposal_handler.go +++ b/x/cork/client/proposal_handler.go @@ -2,8 +2,8 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/peggyjv/sommelier/v4/x/cork/client/cli" - "github.com/peggyjv/sommelier/v4/x/cork/client/rest" + "github.com/peggyjv/sommelier/v7/x/cork/client/cli" + "github.com/peggyjv/sommelier/v7/x/cork/client/rest" ) var ( diff --git a/x/cork/client/rest/rest.go b/x/cork/client/rest/rest.go index ca73979b..4e06f63e 100644 --- a/x/cork/client/rest/rest.go +++ b/x/cork/client/rest/rest.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/rest" govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" ) // AddProposalRESTHandler returns a ProposalRESTHandler that exposes add managed cellar IDs REST handler with a given sub-route. diff --git a/x/cork/handler.go b/x/cork/handler.go index 756ee8d1..4eb7242c 100644 --- a/x/cork/handler.go +++ b/x/cork/handler.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cork/keeper" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/keeper" + "github.com/peggyjv/sommelier/v7/x/cork/types" ) // NewHandler returns a handler for "cork" type messages. diff --git a/x/cork/keeper/abci.go b/x/cork/keeper/abci.go index 2630ef11..f33dcefb 100644 --- a/x/cork/keeper/abci.go +++ b/x/cork/keeper/abci.go @@ -6,8 +6,8 @@ import ( "github.com/ethereum/go-ethereum/common" sdk "github.com/cosmos/cosmos-sdk/types" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - "github.com/peggyjv/sommelier/v4/x/cork/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" ) // BeginBlocker is called at the beginning of every block diff --git a/x/cork/keeper/genesis.go b/x/cork/keeper/genesis.go index 0b5133e0..a8d8584d 100644 --- a/x/cork/keeper/genesis.go +++ b/x/cork/keeper/genesis.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" ) // InitGenesis initialize default parameters diff --git a/x/cork/keeper/hooks.go b/x/cork/keeper/hooks.go index 3e354ef1..6db3df00 100644 --- a/x/cork/keeper/hooks.go +++ b/x/cork/keeper/hooks.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" ) type Hooks struct { diff --git a/x/cork/keeper/keeper.go b/x/cork/keeper/keeper.go index f9deb39a..f9f504c8 100644 --- a/x/cork/keeper/keeper.go +++ b/x/cork/keeper/keeper.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/tendermint/tendermint/libs/log" ) diff --git a/x/cork/keeper/keeper_test.go b/x/cork/keeper/keeper_test.go index e9337401..3b879cea 100644 --- a/x/cork/keeper/keeper_test.go +++ b/x/cork/keeper/keeper_test.go @@ -11,9 +11,9 @@ import ( paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" "github.com/ethereum/go-ethereum/common" "github.com/golang/mock/gomock" - moduletestutil "github.com/peggyjv/sommelier/v4/testutil" - corktestutil "github.com/peggyjv/sommelier/v4/x/cork/testutil" - "github.com/peggyjv/sommelier/v4/x/cork/types" + moduletestutil "github.com/peggyjv/sommelier/v7/testutil" + corktestutil "github.com/peggyjv/sommelier/v7/x/cork/testutil" + "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/cork/keeper/msg_server.go b/x/cork/keeper/msg_server.go index d26db05d..4806e9a4 100644 --- a/x/cork/keeper/msg_server.go +++ b/x/cork/keeper/msg_server.go @@ -9,7 +9,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" ) var _ types.MsgServer = Keeper{} diff --git a/x/cork/keeper/proposal_handler.go b/x/cork/keeper/proposal_handler.go index 5ab5c02c..fe900296 100644 --- a/x/cork/keeper/proposal_handler.go +++ b/x/cork/keeper/proposal_handler.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" ) // HandleAddManagedCellarsProposal is a handler for executing a passed community cellar addition proposal diff --git a/x/cork/keeper/query_server.go b/x/cork/keeper/query_server.go index aa24cdaf..b923e2fd 100644 --- a/x/cork/keeper/query_server.go +++ b/x/cork/keeper/query_server.go @@ -7,7 +7,7 @@ import ( "github.com/ethereum/go-ethereum/common" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) @@ -92,7 +92,7 @@ func (k Keeper) QueryScheduledCorksByID(c context.Context, req *types.QuerySched ctx := sdk.UnwrapSDKContext(c) id, err := hex.DecodeString(req.Id) if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "Failed to decode %s from hexidecimal to bytes", req.Id) + return nil, status.Errorf(codes.InvalidArgument, "Failed to decode %s from hexadecimal to bytes", req.Id) } response := types.QueryScheduledCorksByIDResponse{} @@ -108,7 +108,7 @@ func (k Keeper) QueryCorkResult(c context.Context, req *types.QueryCorkResultReq ctx := sdk.UnwrapSDKContext(c) id, err := hex.DecodeString(req.Id) if err != nil { - return nil, status.Errorf(codes.InvalidArgument, "Failed to decode %s from hexidecimal to bytes", req.Id) + return nil, status.Errorf(codes.InvalidArgument, "Failed to decode %s from hexadecimal to bytes", req.Id) } response := types.QueryCorkResultResponse{} diff --git a/x/cork/keeper/query_server_test.go b/x/cork/keeper/query_server_test.go index ee1ce4d6..e13b0536 100644 --- a/x/cork/keeper/query_server_test.go +++ b/x/cork/keeper/query_server_test.go @@ -4,7 +4,7 @@ import ( "encoding/hex" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" ) func (suite *KeeperTestSuite) TestQueriesHappyPath() { diff --git a/x/cork/keeper/setup_unit_test.go b/x/cork/keeper/setup_unit_test.go index 7fffeb26..de1dcf93 100644 --- a/x/cork/keeper/setup_unit_test.go +++ b/x/cork/keeper/setup_unit_test.go @@ -13,8 +13,8 @@ import ( "github.com/golang/mock/gomock" - "github.com/peggyjv/sommelier/v4/x/cork/mock" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/mock" + "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/x/cork/keeper/test_common.go b/x/cork/keeper/test_common.go index af9768bd..e01b3fe7 100644 --- a/x/cork/keeper/test_common.go +++ b/x/cork/keeper/test_common.go @@ -49,10 +49,10 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" gethcommon "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v2/x/gravity" - gravitykeeper "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/keeper" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/gravity-bridge/module/v3/x/gravity" + gravitykeeper "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/keeper" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" + "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/stretchr/testify/require" "github.com/tendermint/tendermint/libs/log" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" diff --git a/x/cork/migrations/v1/store.go b/x/cork/migrations/v1/store.go index f7fa7491..39c5e541 100644 --- a/x/cork/migrations/v1/store.go +++ b/x/cork/migrations/v1/store.go @@ -8,7 +8,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/cork/migrations/v1/types" + "github.com/peggyjv/sommelier/v7/x/cork/migrations/v1/types" ) func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, cdc codec.BinaryCodec) error { diff --git a/x/cork/mock/mocks.go b/x/cork/mock/mocks.go index 4e980eb0..8954cf8c 100644 --- a/x/cork/mock/mocks.go +++ b/x/cork/mock/mocks.go @@ -18,7 +18,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" common "github.com/ethereum/go-ethereum/common" gomock "github.com/golang/mock/gomock" - gravitytypes "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" + gravitytypes "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" bytes "github.com/tendermint/tendermint/libs/bytes" ) diff --git a/x/cork/module.go b/x/cork/module.go index 3bea2323..02e68df9 100644 --- a/x/cork/module.go +++ b/x/cork/module.go @@ -13,9 +13,9 @@ import ( sim "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/peggyjv/sommelier/v4/x/cork/client/cli" - "github.com/peggyjv/sommelier/v4/x/cork/keeper" - "github.com/peggyjv/sommelier/v4/x/cork/types" + "github.com/peggyjv/sommelier/v7/x/cork/client/cli" + "github.com/peggyjv/sommelier/v7/x/cork/keeper" + "github.com/peggyjv/sommelier/v7/x/cork/types" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/cork/testutil/expected_keepers_mocks.go b/x/cork/testutil/expected_keepers_mocks.go index d5883c2b..0cf36fa2 100644 --- a/x/cork/testutil/expected_keepers_mocks.go +++ b/x/cork/testutil/expected_keepers_mocks.go @@ -11,7 +11,7 @@ import ( types0 "github.com/cosmos/cosmos-sdk/x/staking/types" common "github.com/ethereum/go-ethereum/common" gomock "github.com/golang/mock/gomock" - types1 "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" + types1 "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" bytes "github.com/tendermint/tendermint/libs/bytes" ) diff --git a/x/cork/types/cork.pb.go b/x/cork/types/cork.pb.go index 4b904ec5..37d4f65a 100644 --- a/x/cork/types/cork.pb.go +++ b/x/cork/types/cork.pb.go @@ -266,31 +266,31 @@ func init() { func init() { proto.RegisterFile("cork/v2/cork.proto", fileDescriptor_1219f78116b242b2) } var fileDescriptor_1219f78116b242b2 = []byte{ - // 372 bytes of a gzipped FileDescriptorProto + // 373 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x92, 0xcf, 0x8a, 0xdb, 0x30, 0x10, 0x87, 0xa3, 0xc4, 0xb4, 0xb1, 0x92, 0x94, 0xa2, 0x10, 0x6a, 0x4a, 0x71, 0x13, 0x9f, 0x72, - 0x28, 0x16, 0xb8, 0xa5, 0xf7, 0xd6, 0xa5, 0xb4, 0xb7, 0xe2, 0xdc, 0x7a, 0x31, 0x8a, 0x34, 0xd8, - 0x5e, 0x2b, 0x91, 0x91, 0x15, 0xb3, 0x39, 0xef, 0x0b, 0xec, 0x1b, 0xec, 0xeb, 0xec, 0x31, 0xc7, - 0x3d, 0x2e, 0xc9, 0x8b, 0x2c, 0x56, 0xfe, 0xbd, 0xc0, 0x9e, 0x3c, 0xfe, 0x7d, 0xcc, 0xcc, 0x27, - 0x18, 0x4c, 0xb8, 0xd2, 0x25, 0x6d, 0x22, 0xda, 0x7e, 0xc3, 0x4a, 0x2b, 0xa3, 0xc8, 0x5b, 0x5b, - 0x37, 0x51, 0xa0, 0xb1, 0x13, 0x2b, 0x5d, 0x92, 0x08, 0x4f, 0x60, 0xcd, 0x95, 0x00, 0x91, 0x72, - 0xb5, 0x36, 0x9a, 0x71, 0x93, 0x72, 0x26, 0xa5, 0x87, 0xa6, 0x68, 0x3e, 0x4c, 0xc6, 0x27, 0x18, - 0x9f, 0x58, 0xcc, 0xa4, 0x24, 0xdf, 0xf1, 0x07, 0xc3, 0x74, 0x06, 0xe6, 0xda, 0xc2, 0x84, 0xd0, - 0x50, 0xd7, 0x5e, 0x77, 0x8a, 0xe6, 0x6e, 0x32, 0x39, 0xe2, 0x73, 0xd3, 0x8f, 0x23, 0x0c, 0xee, - 0x10, 0x1e, 0x2d, 0x78, 0x0e, 0x62, 0x23, 0xdb, 0x89, 0xba, 0x24, 0x33, 0xec, 0xb4, 0x42, 0x76, - 0xd9, 0x20, 0x1a, 0x85, 0x27, 0xbb, 0xb0, 0x85, 0x89, 0x45, 0x64, 0x86, 0x87, 0x4b, 0xa9, 0x78, - 0x99, 0xe6, 0x50, 0x64, 0xb9, 0xb1, 0x1b, 0x9c, 0x64, 0x60, 0xb3, 0x3f, 0x36, 0x22, 0x9f, 0xb0, - 0xdb, 0x30, 0x59, 0x08, 0x66, 0x94, 0xf6, 0x7a, 0xd6, 0xe0, 0x1a, 0x90, 0x77, 0xb8, 0x5b, 0x08, - 0xcf, 0xb1, 0xcf, 0xe9, 0x16, 0x22, 0x78, 0x40, 0x18, 0xdb, 0xf9, 0x50, 0x6f, 0xa4, 0x79, 0x25, - 0x85, 0x8f, 0xb8, 0xcf, 0xaa, 0x4a, 0xab, 0x06, 0x84, 0x35, 0xe8, 0x27, 0x97, 0x7f, 0x42, 0xf1, - 0xf8, 0x58, 0x33, 0x99, 0x56, 0xa0, 0x39, 0xac, 0x0d, 0xcb, 0xc0, 0x1a, 0xb9, 0x09, 0x39, 0xa3, - 0x7f, 0x17, 0x12, 0x7c, 0xc6, 0x83, 0x18, 0xa4, 0x64, 0xfa, 0xef, 0xaf, 0x05, 0x18, 0xf2, 0x1e, - 0xf7, 0x0a, 0x51, 0x7b, 0x68, 0xda, 0x9b, 0xbb, 0x49, 0x5b, 0xfe, 0xfc, 0xfd, 0xb8, 0xf7, 0xd1, - 0x6e, 0xef, 0xa3, 0xe7, 0xbd, 0x8f, 0xee, 0x0f, 0x7e, 0x67, 0x77, 0xf0, 0x3b, 0x4f, 0x07, 0xbf, - 0xf3, 0xff, 0x4b, 0x56, 0x98, 0x7c, 0xb3, 0x0c, 0xb9, 0x5a, 0xd1, 0x0a, 0xb2, 0x6c, 0x7b, 0xd3, - 0xd0, 0x5a, 0xad, 0x56, 0x20, 0x0b, 0xd0, 0xb4, 0xf9, 0x46, 0x6f, 0xed, 0x35, 0x50, 0xb3, 0xad, - 0xa0, 0x5e, 0xbe, 0xb1, 0x47, 0xf1, 0xf5, 0x25, 0x00, 0x00, 0xff, 0xff, 0xee, 0x6d, 0x5a, 0xf7, - 0x2a, 0x02, 0x00, 0x00, + 0x28, 0x16, 0xb8, 0xd0, 0x9e, 0x5b, 0x97, 0xd2, 0xde, 0x8a, 0x73, 0xeb, 0xc5, 0x28, 0xd2, 0x60, + 0x7b, 0xad, 0x44, 0x46, 0x56, 0xcc, 0xe6, 0xbc, 0x2f, 0xb0, 0x6f, 0xb0, 0xaf, 0xb3, 0xc7, 0x1c, + 0xf7, 0xb8, 0x24, 0x2f, 0xb2, 0x58, 0xf9, 0xf7, 0x02, 0x7b, 0xf2, 0xf8, 0xf7, 0x31, 0x33, 0x9f, + 0x60, 0x30, 0xe1, 0x4a, 0x97, 0xb4, 0x89, 0x68, 0xfb, 0x0d, 0x2b, 0xad, 0x8c, 0x22, 0x6f, 0x6d, + 0xdd, 0x44, 0x81, 0xc6, 0x4e, 0xac, 0x74, 0x49, 0x22, 0x3c, 0x81, 0x35, 0x57, 0x02, 0x44, 0xca, + 0xd5, 0xda, 0x68, 0xc6, 0x4d, 0xca, 0x99, 0x94, 0x1e, 0x9a, 0xa2, 0xf9, 0x30, 0x19, 0x9f, 0x60, + 0x7c, 0x62, 0x31, 0x93, 0x92, 0x7c, 0xc3, 0x1f, 0x0c, 0xd3, 0x19, 0x98, 0x6b, 0x0b, 0x13, 0x42, + 0x43, 0x5d, 0x7b, 0xdd, 0x29, 0x9a, 0xbb, 0xc9, 0xe4, 0x88, 0xcf, 0x4d, 0x3f, 0x8e, 0x30, 0xb8, + 0x43, 0x78, 0xb4, 0xe0, 0x39, 0x88, 0x8d, 0x6c, 0x27, 0xea, 0x92, 0xcc, 0xb0, 0xd3, 0x0a, 0xd9, + 0x65, 0x83, 0x68, 0x14, 0x9e, 0xec, 0xc2, 0x16, 0x26, 0x16, 0x91, 0x19, 0x1e, 0x2e, 0xa5, 0xe2, + 0x65, 0x9a, 0x43, 0x91, 0xe5, 0xc6, 0x6e, 0x70, 0x92, 0x81, 0xcd, 0xfe, 0xd8, 0x88, 0x7c, 0xc2, + 0x6e, 0xc3, 0x64, 0x21, 0x98, 0x51, 0xda, 0xeb, 0x59, 0x83, 0x6b, 0x40, 0xde, 0xe1, 0x6e, 0x21, + 0x3c, 0xc7, 0x3e, 0xa7, 0x5b, 0x88, 0xe0, 0x01, 0x61, 0x6c, 0xe7, 0x43, 0xbd, 0x91, 0xe6, 0x95, + 0x14, 0x3e, 0xe2, 0x3e, 0xab, 0x2a, 0xad, 0x1a, 0x10, 0xd6, 0xa0, 0x9f, 0x5c, 0xfe, 0x09, 0xc5, + 0xe3, 0x63, 0xcd, 0x64, 0x5a, 0x81, 0xe6, 0xb0, 0x36, 0x2c, 0x03, 0x6b, 0xe4, 0x26, 0xe4, 0x8c, + 0xfe, 0x5d, 0x48, 0xf0, 0x19, 0x0f, 0x62, 0x90, 0x92, 0xe9, 0xbf, 0xbf, 0x16, 0x60, 0xc8, 0x7b, + 0xdc, 0x2b, 0x44, 0xed, 0xa1, 0x69, 0x6f, 0xee, 0x26, 0x6d, 0xf9, 0xf3, 0xf7, 0xe3, 0xde, 0x47, + 0xbb, 0xbd, 0x8f, 0x9e, 0xf7, 0x3e, 0xba, 0x3f, 0xf8, 0x9d, 0xdd, 0xc1, 0xef, 0x3c, 0x1d, 0xfc, + 0xce, 0xff, 0x2f, 0x59, 0x61, 0xf2, 0xcd, 0x32, 0xe4, 0x6a, 0x45, 0x2b, 0xc8, 0xb2, 0xed, 0x4d, + 0x43, 0x6b, 0xb5, 0x5a, 0x81, 0x2c, 0x40, 0xd3, 0xe6, 0x3b, 0xbd, 0xb5, 0xd7, 0x40, 0xcd, 0xb6, + 0x82, 0x7a, 0xf9, 0xc6, 0x1e, 0xc5, 0xd7, 0x97, 0x00, 0x00, 0x00, 0xff, 0xff, 0xae, 0xc0, 0x22, + 0xce, 0x2a, 0x02, 0x00, 0x00, } func (m *Cork) Marshal() (dAtA []byte, err error) { diff --git a/x/cork/types/expected_keepers.go b/x/cork/types/expected_keepers.go index 6e9e27e7..d0393217 100644 --- a/x/cork/types/expected_keepers.go +++ b/x/cork/types/expected_keepers.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common" - "github.com/peggyjv/gravity-bridge/module/v2/x/gravity/types" + "github.com/peggyjv/gravity-bridge/module/v3/x/gravity/types" tmbytes "github.com/tendermint/tendermint/libs/bytes" ) diff --git a/x/cork/types/genesis.pb.go b/x/cork/types/genesis.pb.go index f6a618f9..34016d13 100644 --- a/x/cork/types/genesis.pb.go +++ b/x/cork/types/genesis.pb.go @@ -103,6 +103,7 @@ func (m *GenesisState) GetCorkResults() []*CorkResult { // Params cork parameters type Params struct { + // Deprecated // VoteThreshold defines the percentage of bonded stake required to vote for a scheduled cork to be approved VoteThreshold github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,1,opt,name=vote_threshold,json=voteThreshold,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"vote_threshold" yaml:"vote_threshold"` } @@ -151,7 +152,7 @@ var fileDescriptor_41a8de26c4f93490 = []byte{ // 406 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xc1, 0x6e, 0xd3, 0x40, 0x10, 0x86, 0xe3, 0x36, 0x04, 0x75, 0x53, 0x5a, 0xb1, 0xb4, 0xc8, 0xea, 0xc1, 0x89, 0x72, 0x40, - 0x39, 0x10, 0xaf, 0x64, 0x10, 0x12, 0x5c, 0x90, 0xd2, 0x8a, 0xaa, 0x17, 0x84, 0x1c, 0x4e, 0x5c, + 0x39, 0x10, 0xaf, 0x64, 0x24, 0x10, 0x5c, 0x90, 0xd2, 0x8a, 0xaa, 0x17, 0x84, 0x1c, 0x4e, 0x5c, 0x2c, 0x77, 0x3d, 0xb2, 0x4d, 0xd6, 0x5e, 0x6b, 0x67, 0x63, 0x35, 0x6f, 0xc1, 0x23, 0xf0, 0x38, 0x3d, 0xf6, 0x88, 0x38, 0x44, 0x28, 0x79, 0x03, 0x9e, 0x00, 0xed, 0xda, 0x09, 0xe9, 0xc9, 0xb3, 0xff, 0x37, 0xff, 0xfc, 0xde, 0x1d, 0x72, 0xce, 0xa5, 0x9a, 0xb3, 0x3a, 0x60, 0x29, 0x94, 0x80, @@ -164,7 +165,7 @@ var fileDescriptor_41a8de26c4f93490 = []byte{ 0x97, 0x75, 0x2c, 0xf2, 0x24, 0xd6, 0xb9, 0x2c, 0xa3, 0x52, 0x96, 0x1c, 0xdc, 0xc3, 0xa1, 0x33, 0xee, 0x86, 0xcf, 0xf7, 0xc9, 0x67, 0x03, 0xe8, 0x47, 0x72, 0x8a, 0x3c, 0x83, 0x64, 0x21, 0x20, 0x89, 0x4c, 0x00, 0xba, 0xdd, 0xe1, 0xe1, 0xb8, 0x1f, 0xbc, 0xdc, 0xc5, 0xcd, 0xb6, 0xfc, 0x52, - 0xaa, 0x79, 0x78, 0x82, 0xfb, 0x47, 0xa4, 0xef, 0xc8, 0xb1, 0x69, 0x8c, 0x14, 0xe0, 0x42, 0x68, + 0xaa, 0x79, 0x78, 0x82, 0xfb, 0x47, 0xa4, 0x6f, 0xc9, 0xb1, 0x69, 0x8c, 0x14, 0xe0, 0x42, 0x68, 0x74, 0x9f, 0x58, 0xf7, 0x8b, 0xff, 0x3f, 0x6b, 0x4c, 0x96, 0x85, 0x7d, 0xbe, 0xab, 0x71, 0x74, 0x47, 0x7a, 0xcd, 0xd5, 0x69, 0x49, 0x4e, 0x6a, 0xa9, 0x21, 0xd2, 0x99, 0x02, 0xcc, 0xa4, 0x48, 0xec, 0x1b, 0x1d, 0x4d, 0xaf, 0xcd, 0xd5, 0x7e, 0xaf, 0x06, 0xaf, 0xd2, 0x5c, 0x67, 0x8b, 0x5b, @@ -172,9 +173,9 @@ var fileDescriptor_41a8de26c4f93490 = []byte{ 0xaf, 0x80, 0xff, 0x5d, 0x0d, 0xce, 0x97, 0x71, 0x21, 0x3e, 0x8c, 0x1e, 0x4f, 0x1b, 0x85, 0xcf, 0x8c, 0xf0, 0x75, 0x7b, 0x9e, 0x7e, 0xba, 0x5f, 0x7b, 0xce, 0xc3, 0xda, 0x73, 0xfe, 0xac, 0x3d, 0xe7, 0xc7, 0xc6, 0xeb, 0x3c, 0x6c, 0xbc, 0xce, 0xaf, 0x8d, 0xd7, 0xf9, 0xf6, 0x7a, 0x2f, 0xa9, - 0x82, 0x34, 0x5d, 0x7e, 0xaf, 0x19, 0xca, 0xa2, 0x00, 0x91, 0x83, 0x62, 0xf5, 0x5b, 0x76, 0x67, - 0x57, 0xdf, 0x64, 0xde, 0xf6, 0xec, 0xae, 0xdf, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x58, 0x01, - 0x74, 0x77, 0x37, 0x02, 0x00, 0x00, + 0x82, 0x34, 0x5d, 0x7e, 0xaf, 0x19, 0xca, 0xa2, 0x00, 0x91, 0x83, 0x62, 0xf5, 0x3b, 0x76, 0x67, + 0x57, 0xdf, 0x64, 0xde, 0xf6, 0xec, 0xae, 0xdf, 0xfc, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x18, 0xac, + 0x0c, 0x4e, 0x37, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/cork/types/proposal.pb.go b/x/cork/types/proposal.pb.go index d4882bc1..3c67e3e9 100644 --- a/x/cork/types/proposal.pb.go +++ b/x/cork/types/proposal.pb.go @@ -291,20 +291,21 @@ type ScheduledCorkProposal struct { Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` BlockHeight uint64 `protobuf:"varint,3,opt,name=block_height,json=blockHeight,proto3" json:"block_height,omitempty"` TargetContractAddress string `protobuf:"bytes,4,opt,name=target_contract_address,json=targetContractAddress,proto3" json:"target_contract_address,omitempty"` + // // The JSON representation of a ScheduleRequest defined in the Steward protos // // Example: The following is the JSON form of a ScheduleRequest containing a steward.v2.cellar_v1.TrustPosition // message, which maps to the `trustPosition(address)` function of the the V1 Cellar contract. // - // { - // "cellar_id": "0x1234567890000000000000000000000000000000", - // "cellar_v1": { - // "trust_position": { - // "erc20_address": "0x1234567890000000000000000000000000000000" - // } - // }, - // "block_height": 1000000 - // } + // { + // "cellar_id": "0x1234567890000000000000000000000000000000", + // "cellar_v1": { + // "trust_position": { + // "erc20_address": "0x1234567890000000000000000000000000000000" + // } + // }, + // "block_height": 1000000 + // } // // You can use the Steward CLI to generate the required JSON rather than constructing it by hand https://github.com/peggyjv/steward ContractCallProtoJson string `protobuf:"bytes,5,opt,name=contract_call_proto_json,json=contractCallProtoJson,proto3" json:"contract_call_proto_json,omitempty"` @@ -478,31 +479,31 @@ var fileDescriptor_e01dea5e2496e85f = []byte{ // 430 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0x4f, 0x6b, 0xd4, 0x40, 0x18, 0xc6, 0x77, 0xfa, 0x97, 0x9d, 0xf5, 0x34, 0xb4, 0x1a, 0x14, 0x43, 0xcc, 0x41, 0x56, 0x90, - 0x04, 0xb6, 0xa2, 0xe7, 0x9a, 0x22, 0x56, 0x10, 0x4a, 0x7a, 0x10, 0xbc, 0x84, 0xd9, 0x99, 0x97, - 0x64, 0xba, 0x93, 0x4c, 0x98, 0x99, 0x06, 0xfb, 0x0d, 0x44, 0x10, 0xbc, 0x0a, 0x7e, 0x20, 0x8f, - 0x3d, 0x7a, 0x94, 0xcd, 0x17, 0x91, 0x4e, 0x12, 0x59, 0x45, 0x7a, 0x50, 0xa1, 0x7b, 0x9c, 0xe7, - 0x99, 0x77, 0xde, 0xdf, 0xfb, 0xbc, 0x24, 0xf8, 0x36, 0x53, 0x7a, 0x11, 0x37, 0xb3, 0xb8, 0xd6, - 0xaa, 0x56, 0x86, 0xca, 0xa8, 0xd6, 0xca, 0x2a, 0xb2, 0x7b, 0xa5, 0x47, 0xcd, 0xec, 0x2e, 0x19, - 0x2e, 0x38, 0xc1, 0x99, 0xe1, 0x07, 0x84, 0xef, 0x1d, 0x72, 0xfe, 0x9a, 0x56, 0x34, 0x07, 0x9e, - 0x80, 0x94, 0x54, 0x1f, 0x1f, 0x99, 0x93, 0xfe, 0x09, 0xb2, 0x87, 0xb7, 0xad, 0xb0, 0x12, 0x3c, - 0x14, 0xa0, 0xe9, 0x38, 0xed, 0x0e, 0x24, 0xc0, 0x13, 0x0e, 0x86, 0x69, 0x51, 0x5b, 0xa1, 0x2a, - 0x6f, 0xc3, 0x79, 0xab, 0x12, 0x39, 0xc0, 0x98, 0xb9, 0xc7, 0x32, 0xc1, 0x8d, 0xb7, 0x19, 0xa0, - 0xe9, 0x64, 0xb6, 0x17, 0xf5, 0x24, 0xd1, 0xd0, 0xe7, 0x14, 0x6c, 0x3a, 0xee, 0xee, 0x1d, 0x73, - 0x13, 0x7e, 0x46, 0xf8, 0xe1, 0x35, 0x30, 0x6f, 0x84, 0x2d, 0x8e, 0xa0, 0x56, 0x46, 0xd8, 0xbf, - 0xe6, 0xba, 0xff, 0x1b, 0xd7, 0xe6, 0x74, 0xbc, 0x42, 0x40, 0x3c, 0xbc, 0xcb, 0xbb, 0x0e, 0xde, - 0x96, 0x2b, 0x1e, 0x8e, 0xe1, 0x47, 0x84, 0xfd, 0x14, 0x4a, 0xd5, 0xc0, 0x7a, 0x64, 0xf5, 0x05, - 0xe1, 0x47, 0xd7, 0xf3, 0xdc, 0x68, 0x5c, 0x2d, 0xc2, 0xfb, 0xa7, 0xac, 0x00, 0x7e, 0x2e, 0x81, - 0x27, 0x4a, 0x2f, 0xfe, 0x39, 0xa5, 0x07, 0xf8, 0xd6, 0x5c, 0x2a, 0xb6, 0xc8, 0x0a, 0x10, 0x79, - 0x61, 0x5d, 0x4e, 0x5b, 0xe9, 0xc4, 0x69, 0x2f, 0x9d, 0x44, 0x9e, 0xe2, 0x3b, 0x96, 0xea, 0x1c, - 0x6c, 0xc6, 0x54, 0x65, 0x35, 0x65, 0x36, 0xa3, 0x9c, 0x6b, 0x30, 0xa6, 0xc7, 0xdb, 0xef, 0xec, - 0xa4, 0x77, 0x0f, 0x3b, 0x93, 0x3c, 0xc3, 0xde, 0xcf, 0x02, 0x46, 0xa5, 0xcc, 0xdc, 0xb7, 0x91, - 0x9d, 0x19, 0x55, 0x79, 0xdb, 0x5d, 0xe1, 0xe0, 0x27, 0x54, 0xca, 0x93, 0x2b, 0xf7, 0x95, 0x51, + 0x04, 0xb6, 0x60, 0xcf, 0x35, 0x45, 0xac, 0x20, 0x94, 0xf4, 0x20, 0x78, 0x09, 0xb3, 0x33, 0x2f, + 0xc9, 0x74, 0x27, 0x99, 0x30, 0x33, 0x0d, 0xf6, 0x1b, 0x88, 0x20, 0x78, 0x15, 0xfc, 0x40, 0x1e, + 0x7b, 0xf4, 0x28, 0x9b, 0x2f, 0x22, 0x9d, 0x24, 0xb2, 0x8a, 0xf4, 0xa0, 0x42, 0xf7, 0x38, 0xcf, + 0x33, 0xef, 0xbc, 0xbf, 0xf7, 0x79, 0x49, 0xf0, 0x5d, 0xa6, 0xf4, 0x22, 0x6e, 0x66, 0x71, 0xad, + 0x55, 0xad, 0x0c, 0x95, 0x51, 0xad, 0x95, 0x55, 0x64, 0xf7, 0x5a, 0x8f, 0x9a, 0xd9, 0x7d, 0x32, + 0x5c, 0x70, 0x82, 0x33, 0xc3, 0x0f, 0x08, 0x3f, 0x38, 0xe2, 0xfc, 0x35, 0xad, 0x68, 0x0e, 0x3c, + 0x01, 0x29, 0xa9, 0x3e, 0x39, 0x36, 0xa7, 0xfd, 0x13, 0x64, 0x0f, 0x6f, 0x5b, 0x61, 0x25, 0x78, + 0x28, 0x40, 0xd3, 0x71, 0xda, 0x1d, 0x48, 0x80, 0x27, 0x1c, 0x0c, 0xd3, 0xa2, 0xb6, 0x42, 0x55, + 0xde, 0x86, 0xf3, 0x56, 0x25, 0x72, 0x80, 0x31, 0x73, 0x8f, 0x65, 0x82, 0x1b, 0x6f, 0x33, 0x40, + 0xd3, 0xc9, 0x6c, 0x2f, 0xea, 0x49, 0xa2, 0xa1, 0xcf, 0x19, 0xd8, 0x74, 0xdc, 0xdd, 0x3b, 0xe1, + 0x26, 0xfc, 0x8c, 0xf0, 0xe3, 0x1b, 0x60, 0xde, 0x08, 0x5b, 0x1c, 0x43, 0xad, 0x8c, 0xb0, 0x7f, + 0xcd, 0xf5, 0xf0, 0x37, 0xae, 0xcd, 0xe9, 0x78, 0x85, 0x80, 0x78, 0x78, 0x97, 0x77, 0x1d, 0xbc, + 0x2d, 0x57, 0x3c, 0x1c, 0xc3, 0x8f, 0x08, 0xfb, 0x29, 0x94, 0xaa, 0x81, 0xf5, 0xc8, 0xea, 0x0b, + 0xc2, 0x4f, 0x6e, 0xe6, 0xb9, 0xd5, 0xb8, 0x5a, 0x84, 0xf7, 0xcf, 0x58, 0x01, 0xfc, 0x42, 0x02, + 0x4f, 0x94, 0x5e, 0xfc, 0x73, 0x4a, 0x8f, 0xf0, 0x9d, 0xb9, 0x54, 0x6c, 0x91, 0x15, 0x20, 0xf2, + 0xc2, 0xba, 0x9c, 0xb6, 0xd2, 0x89, 0xd3, 0x5e, 0x3a, 0x89, 0x3c, 0xc3, 0xf7, 0x2c, 0xd5, 0x39, + 0xd8, 0x8c, 0xa9, 0xca, 0x6a, 0xca, 0x6c, 0x46, 0x39, 0xd7, 0x60, 0x4c, 0x8f, 0xb7, 0xdf, 0xd9, + 0x49, 0xef, 0x1e, 0x75, 0x26, 0x39, 0xc4, 0xde, 0xcf, 0x02, 0x46, 0xa5, 0xcc, 0xdc, 0xb7, 0x91, + 0x9d, 0x1b, 0x55, 0x79, 0xdb, 0x5d, 0xe1, 0xe0, 0x27, 0x54, 0xca, 0xd3, 0x6b, 0xf7, 0x95, 0x51, 0x55, 0xf8, 0x7e, 0x03, 0x07, 0x7f, 0x9c, 0xf2, 0x7f, 0x64, 0xbf, 0x86, 0x03, 0xaf, 0x2e, 0x7c, - 0xe7, 0x97, 0x85, 0x3f, 0x7f, 0xf1, 0x75, 0xe9, 0xa3, 0xcb, 0xa5, 0x8f, 0xbe, 0x2f, 0x7d, 0xf4, - 0xa9, 0xf5, 0x47, 0x97, 0xad, 0x3f, 0xfa, 0xd6, 0xfa, 0xa3, 0xb7, 0x8f, 0x73, 0x61, 0x8b, 0xf3, - 0x79, 0xc4, 0x54, 0x19, 0xd7, 0x90, 0xe7, 0x17, 0x67, 0x4d, 0x6c, 0x54, 0x59, 0x82, 0x14, 0xa0, - 0xe3, 0xe6, 0x49, 0xfc, 0xce, 0xfd, 0x90, 0x62, 0x7b, 0x51, 0x83, 0x99, 0xef, 0x38, 0x94, 0x83, - 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x5f, 0x97, 0x54, 0x11, 0xce, 0x04, 0x00, 0x00, + 0xe7, 0x97, 0x85, 0x3f, 0x7f, 0xf1, 0x75, 0xe9, 0xa3, 0xab, 0xa5, 0x8f, 0xbe, 0x2f, 0x7d, 0xf4, + 0xa9, 0xf5, 0x47, 0x57, 0xad, 0x3f, 0xfa, 0xd6, 0xfa, 0xa3, 0xb7, 0x4f, 0x73, 0x61, 0x8b, 0x8b, + 0x79, 0xc4, 0x54, 0x19, 0xd7, 0x90, 0xe7, 0x97, 0xe7, 0x4d, 0x6c, 0x54, 0x59, 0x82, 0x14, 0xa0, + 0xe3, 0xe6, 0x30, 0x7e, 0xe7, 0x7e, 0x48, 0xb1, 0xbd, 0xac, 0xc1, 0xcc, 0x77, 0x1c, 0xca, 0xc1, + 0x8f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1f, 0x3a, 0x2c, 0x28, 0xce, 0x04, 0x00, 0x00, } func (m *AddManagedCellarIDsProposal) Marshal() (dAtA []byte, err error) { diff --git a/x/cork/types/query.pb.go b/x/cork/types/query.pb.go index 3a0fb503..72b9b729 100644 --- a/x/cork/types/query.pb.go +++ b/x/cork/types/query.pb.go @@ -735,52 +735,52 @@ var fileDescriptor_5f2ffa9107b7d7f7 = []byte{ // 761 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x96, 0xcf, 0x4e, 0xdb, 0x58, 0x14, 0xc6, 0x63, 0x06, 0x18, 0xe5, 0x84, 0x81, 0xd1, 0xe1, 0xbf, 0x01, 0x87, 0x18, 0x66, 0x88, - 0x68, 0x88, 0x69, 0x28, 0xea, 0xba, 0x01, 0x55, 0x8d, 0x5a, 0xb5, 0x25, 0xdd, 0x54, 0xdd, 0x44, - 0x49, 0x7c, 0xe5, 0xb8, 0xf9, 0x73, 0x83, 0xed, 0x44, 0x44, 0x08, 0xa9, 0x62, 0xdd, 0x45, 0xa5, - 0x3e, 0x42, 0x57, 0x95, 0xfa, 0x20, 0x2c, 0x51, 0xbb, 0xe9, 0xaa, 0xaa, 0xa0, 0x0f, 0x52, 0xf9, - 0xfa, 0xda, 0xd8, 0x8e, 0x93, 0x50, 0x76, 0xc9, 0x39, 0xdf, 0xfd, 0xbe, 0x9f, 0x9d, 0x7b, 0x8e, - 0x02, 0xb3, 0x55, 0x6a, 0xd4, 0x95, 0x6e, 0x4e, 0x39, 0xee, 0x10, 0xa3, 0x97, 0x6d, 0x1b, 0xd4, - 0xa2, 0xf8, 0xb7, 0x5d, 0xcc, 0x76, 0x73, 0xe2, 0x9c, 0x46, 0x35, 0xca, 0x6a, 0x8a, 0xfd, 0xc9, - 0x69, 0x8b, 0xab, 0x1a, 0xa5, 0x5a, 0x83, 0x28, 0xe5, 0xb6, 0xae, 0x94, 0x5b, 0x2d, 0x6a, 0x95, - 0x2d, 0x9d, 0xb6, 0x4c, 0xde, 0x9d, 0x77, 0x1d, 0x35, 0xd2, 0x22, 0xa6, 0xee, 0x96, 0xd1, 0x2d, - 0x33, 0x6f, 0x56, 0x93, 0xe7, 0x00, 0x8f, 0xec, 0xd8, 0x97, 0x65, 0xa3, 0xdc, 0x34, 0x8b, 0xe4, - 0xb8, 0x43, 0x4c, 0x4b, 0x3e, 0x84, 0xd9, 0x40, 0xd5, 0x6c, 0xd3, 0x96, 0x49, 0x70, 0x07, 0x26, - 0xdb, 0xac, 0xb2, 0x24, 0xac, 0x0b, 0xe9, 0x44, 0x6e, 0x26, 0xcb, 0x29, 0xb3, 0x8e, 0x30, 0x3f, - 0x7e, 0xf1, 0x23, 0x19, 0x2b, 0x72, 0x91, 0xbc, 0x08, 0xf3, 0xcc, 0xe5, 0x80, 0x34, 0x1a, 0x65, - 0xa3, 0x70, 0xe8, 0xd9, 0x3f, 0x84, 0x85, 0x70, 0x83, 0x27, 0xac, 0x01, 0x54, 0x59, 0xb1, 0xa4, - 0xab, 0x76, 0xca, 0x5f, 0xe9, 0x78, 0x31, 0xee, 0x54, 0x0a, 0xaa, 0x29, 0xaf, 0x82, 0xc8, 0x0e, - 0xbe, 0xaa, 0xd6, 0x88, 0xda, 0x69, 0x10, 0xf5, 0x80, 0x1a, 0x75, 0xcf, 0xf6, 0x29, 0xac, 0x44, - 0x76, 0xb9, 0x77, 0x06, 0x26, 0x6c, 0x5c, 0xc7, 0x36, 0x91, 0x5b, 0xf0, 0xe0, 0x03, 0xfa, 0xa2, - 0x23, 0x92, 0x37, 0x20, 0x15, 0x34, 0xcb, 0x37, 0x68, 0xb5, 0xfe, 0x84, 0xe8, 0x5a, 0xcd, 0xf2, - 0x12, 0x0b, 0x20, 0x0f, 0x13, 0xf1, 0xe0, 0x0d, 0xf8, 0xa7, 0x62, 0xd7, 0x4b, 0x35, 0xa7, 0xc1, - 0x00, 0xc6, 0x8b, 0x53, 0x15, 0x9f, 0x58, 0x7e, 0x06, 0x5b, 0x11, 0xf0, 0xf9, 0x9e, 0xcf, 0x91, - 0xa7, 0x62, 0x0a, 0xa6, 0xfc, 0x7e, 0xec, 0xc7, 0x18, 0x2f, 0x26, 0x7c, 0x76, 0xf2, 0x6b, 0x48, - 0x8f, 0x76, 0xbb, 0xd3, 0x7b, 0xd9, 0x05, 0x29, 0xd2, 0xb9, 0x70, 0xe8, 0xe2, 0x4d, 0xc3, 0x98, - 0xae, 0x32, 0xa8, 0x78, 0x71, 0x4c, 0x57, 0xe5, 0x17, 0x90, 0x1c, 0x78, 0xe2, 0x4e, 0x08, 0x69, - 0xf7, 0xfa, 0xd8, 0x35, 0x62, 0x76, 0x1a, 0xd6, 0xa0, 0xe8, 0xe7, 0xb0, 0xd8, 0xa7, 0xe4, 0x91, - 0x7b, 0x00, 0x55, 0xaf, 0xca, 0xef, 0xf3, 0xac, 0x97, 0xeb, 0x3b, 0xe0, 0x93, 0xc9, 0xcb, 0x7d, - 0x7e, 0xde, 0x55, 0x38, 0x82, 0xa5, 0xfe, 0x16, 0xcf, 0xda, 0x87, 0xc4, 0x8d, 0x89, 0xfb, 0x90, - 0x91, 0x61, 0x7e, 0x5d, 0xee, 0x4b, 0x1c, 0x26, 0x98, 0x27, 0xd6, 0x21, 0xe1, 0x9b, 0x47, 0x5c, - 0xf1, 0x8e, 0xf6, 0xcf, 0xae, 0xb8, 0x1a, 0xdd, 0x74, 0x50, 0xe4, 0xd4, 0xf9, 0xb7, 0x5f, 0x1f, - 0xc7, 0x56, 0x70, 0x59, 0x31, 0x69, 0xb3, 0x49, 0x1a, 0x3a, 0x31, 0x14, 0x77, 0x2d, 0x38, 0x63, - 0x8b, 0x27, 0x30, 0x1d, 0x9c, 0x4e, 0x94, 0x82, 0x96, 0xe1, 0x79, 0x16, 0x93, 0x03, 0xfb, 0x3c, - 0xf5, 0x3f, 0x96, 0x9a, 0xc4, 0xb5, 0x88, 0xd4, 0x9b, 0x79, 0xc7, 0xf7, 0x02, 0xdf, 0x3b, 0xc1, - 0xab, 0x82, 0x1b, 0x41, 0xff, 0xc8, 0xe9, 0x17, 0x37, 0x87, 0x8b, 0x38, 0xc9, 0x36, 0x23, 0xd9, - 0x44, 0x39, 0x82, 0xc4, 0x74, 0x8f, 0x94, 0xd8, 0x3d, 0xc3, 0xcf, 0x42, 0x78, 0xdd, 0xf8, 0xc7, - 0x1b, 0xb7, 0x07, 0x04, 0x46, 0x2c, 0x0a, 0xf1, 0xde, 0xad, 0xb4, 0x9c, 0x31, 0xc7, 0x18, 0x33, - 0xb8, 0x3d, 0x94, 0x31, 0xb0, 0x52, 0xf0, 0xab, 0x00, 0xeb, 0xa3, 0x26, 0x1e, 0x77, 0x87, 0xbd, - 0xa2, 0xa8, 0x55, 0x23, 0xde, 0xff, 0x83, 0x13, 0x9c, 0xbe, 0xc0, 0xe8, 0x0f, 0xf0, 0xd1, 0xe8, - 0x37, 0x5c, 0xaa, 0xf4, 0x02, 0x8f, 0xa1, 0x9c, 0xfa, 0xbf, 0x9d, 0xe1, 0x27, 0x81, 0xcf, 0x5b, - 0xff, 0xea, 0xc0, 0xad, 0xe1, 0x64, 0xde, 0x3a, 0x12, 0xd3, 0xa3, 0x85, 0x9c, 0x7c, 0x9f, 0x91, - 0x2b, 0xb8, 0x73, 0x3b, 0x72, 0x5d, 0x55, 0x4e, 0x75, 0xf5, 0x0c, 0xcf, 0x05, 0x98, 0x09, 0x8d, - 0x3e, 0x86, 0x27, 0x22, 0xbc, 0xa9, 0xc4, 0xf5, 0xc1, 0x02, 0x4e, 0x93, 0x61, 0x34, 0xff, 0xe3, - 0x66, 0xd4, 0xcc, 0x50, 0xa3, 0x5e, 0x32, 0x9c, 0x35, 0xe1, 0x40, 0xbc, 0x13, 0xe0, 0xdf, 0xf0, - 0xfe, 0xc1, 0x81, 0x21, 0xde, 0xbd, 0x4c, 0x0d, 0x51, 0x70, 0x8e, 0x2d, 0xc6, 0x91, 0xc2, 0xe4, - 0x08, 0x8e, 0xfc, 0xe3, 0x8b, 0x2b, 0x49, 0xb8, 0xbc, 0x92, 0x84, 0x9f, 0x57, 0x92, 0xf0, 0xe1, - 0x5a, 0x8a, 0x5d, 0x5e, 0x4b, 0xb1, 0xef, 0xd7, 0x52, 0xec, 0x4d, 0x46, 0xd3, 0xad, 0x5a, 0xa7, - 0x92, 0xad, 0xd2, 0xa6, 0xd2, 0x26, 0x9a, 0xd6, 0x7b, 0xdb, 0xf5, 0x99, 0x75, 0x1f, 0x28, 0x27, - 0x8e, 0xa3, 0xd5, 0x6b, 0x13, 0xb3, 0x32, 0xc9, 0xfe, 0x99, 0xec, 0xfd, 0x0e, 0x00, 0x00, 0xff, - 0xff, 0x0f, 0x00, 0x0f, 0xfd, 0x18, 0x09, 0x00, 0x00, + 0x68, 0x88, 0x69, 0x10, 0x62, 0xdd, 0x80, 0xaa, 0x46, 0xad, 0xda, 0x92, 0x6e, 0xaa, 0x6e, 0xa2, + 0x24, 0xbe, 0x72, 0xdc, 0xfc, 0xb9, 0xc1, 0x76, 0x22, 0x22, 0x84, 0x54, 0xb1, 0xee, 0xa2, 0x52, + 0x1f, 0xa1, 0xab, 0x4a, 0x7d, 0x10, 0x96, 0xa8, 0xdd, 0x74, 0x55, 0x55, 0xd0, 0x07, 0xa9, 0x7c, + 0x7d, 0x6d, 0x6c, 0xc7, 0x49, 0x28, 0xbb, 0xe4, 0x9c, 0xef, 0x7e, 0xdf, 0xcf, 0xce, 0x3d, 0x47, + 0x81, 0xd9, 0x2a, 0x35, 0xea, 0x4a, 0x37, 0xa7, 0x9c, 0x74, 0x88, 0xd1, 0xcb, 0xb6, 0x0d, 0x6a, + 0x51, 0xfc, 0xdb, 0x2e, 0x66, 0xbb, 0x39, 0x71, 0x4e, 0xa3, 0x1a, 0x65, 0x35, 0xc5, 0xfe, 0xe4, + 0xb4, 0xc5, 0x55, 0x8d, 0x52, 0xad, 0x41, 0x94, 0x72, 0x5b, 0x57, 0xca, 0xad, 0x16, 0xb5, 0xca, + 0x96, 0x4e, 0x5b, 0x26, 0xef, 0xce, 0xbb, 0x8e, 0x1a, 0x69, 0x11, 0x53, 0x77, 0xcb, 0xe8, 0x96, + 0x99, 0x37, 0xab, 0xc9, 0x73, 0x80, 0xc7, 0x76, 0xec, 0xcb, 0xb2, 0x51, 0x6e, 0x9a, 0x45, 0x72, + 0xd2, 0x21, 0xa6, 0x25, 0x1f, 0xc1, 0x6c, 0xa0, 0x6a, 0xb6, 0x69, 0xcb, 0x24, 0xb8, 0x03, 0x93, + 0x6d, 0x56, 0x59, 0x12, 0xd6, 0x85, 0x74, 0x22, 0x37, 0x93, 0xe5, 0x94, 0x59, 0x47, 0x98, 0x1f, + 0xbf, 0xfc, 0x91, 0x8c, 0x15, 0xb9, 0x48, 0x5e, 0x84, 0x79, 0xe6, 0x72, 0x48, 0x1a, 0x8d, 0xb2, + 0x51, 0x38, 0xf2, 0xec, 0x0f, 0x60, 0x21, 0xdc, 0xe0, 0x09, 0x6b, 0x00, 0x55, 0x56, 0x2c, 0xe9, + 0xaa, 0x9d, 0xf2, 0x57, 0x3a, 0x5e, 0x8c, 0x3b, 0x95, 0x82, 0x6a, 0xca, 0xab, 0x20, 0xb2, 0x83, + 0xaf, 0xaa, 0x35, 0xa2, 0x76, 0x1a, 0x44, 0x3d, 0xa4, 0x46, 0xdd, 0xb3, 0x7d, 0x0a, 0x2b, 0x91, + 0x5d, 0xee, 0x9d, 0x81, 0x09, 0x1b, 0xd7, 0xb1, 0x4d, 0xe4, 0x16, 0x3c, 0xf8, 0x80, 0xbe, 0xe8, + 0x88, 0xe4, 0x0d, 0x48, 0x05, 0xcd, 0xf2, 0x0d, 0x5a, 0xad, 0x3f, 0x21, 0xba, 0x56, 0xb3, 0xbc, + 0xc4, 0x02, 0xc8, 0xc3, 0x44, 0x3c, 0x78, 0x03, 0xfe, 0xa9, 0xd8, 0xf5, 0x52, 0xcd, 0x69, 0x30, + 0x80, 0xf1, 0xe2, 0x54, 0xc5, 0x27, 0x96, 0x9f, 0xc1, 0x56, 0x04, 0x7c, 0xbe, 0xe7, 0x73, 0xe4, + 0xa9, 0x98, 0x82, 0x29, 0xbf, 0x1f, 0xfb, 0x31, 0xc6, 0x8b, 0x09, 0x9f, 0x9d, 0xfc, 0x1a, 0xd2, + 0xa3, 0xdd, 0xee, 0xf5, 0x5e, 0x76, 0x41, 0x8a, 0x74, 0x2e, 0x1c, 0xb9, 0x78, 0xd3, 0x30, 0xa6, + 0xab, 0x0c, 0x2a, 0x5e, 0x1c, 0xd3, 0x55, 0xf9, 0x05, 0x24, 0x07, 0x9e, 0xb8, 0x17, 0x42, 0xda, + 0xbd, 0x3e, 0x76, 0x8d, 0x98, 0x9d, 0x86, 0x35, 0x28, 0xfa, 0x39, 0x2c, 0xf6, 0x29, 0x79, 0xe4, + 0x1e, 0x40, 0xd5, 0xab, 0xf2, 0xfb, 0x3c, 0xeb, 0xe5, 0xfa, 0x0e, 0xf8, 0x64, 0xf2, 0x72, 0x9f, + 0x9f, 0x77, 0x15, 0x8e, 0x61, 0xa9, 0xbf, 0xc5, 0xb3, 0xf6, 0x21, 0x71, 0x6b, 0xe2, 0x3e, 0x64, + 0x64, 0x98, 0x5f, 0x97, 0xfb, 0x12, 0x87, 0x09, 0xe6, 0x89, 0x75, 0x48, 0xf8, 0xe6, 0x11, 0x57, + 0xbc, 0xa3, 0xfd, 0xb3, 0x2b, 0xae, 0x46, 0x37, 0x1d, 0x14, 0x39, 0x75, 0xf1, 0xed, 0xd7, 0xc7, + 0xb1, 0x15, 0x5c, 0x56, 0x4c, 0xda, 0x6c, 0x92, 0x86, 0x4e, 0x0c, 0xc5, 0x5d, 0x0b, 0xce, 0xd8, + 0xe2, 0x29, 0x4c, 0x07, 0xa7, 0x13, 0xa5, 0xa0, 0x65, 0x78, 0x9e, 0xc5, 0xe4, 0xc0, 0x3e, 0x4f, + 0xfd, 0x8f, 0xa5, 0x26, 0x71, 0x2d, 0x22, 0xf5, 0x76, 0xde, 0xf1, 0xbd, 0xc0, 0xf7, 0x4e, 0xf0, + 0xaa, 0xe0, 0x46, 0xd0, 0x3f, 0x72, 0xfa, 0xc5, 0xcd, 0xe1, 0x22, 0x4e, 0xb2, 0xcd, 0x48, 0x36, + 0x51, 0x8e, 0x20, 0x31, 0xdd, 0x23, 0x25, 0x76, 0xcf, 0xf0, 0xb3, 0x10, 0x5e, 0x37, 0xfe, 0xf1, + 0xc6, 0xed, 0x01, 0x81, 0x11, 0x8b, 0x42, 0x7c, 0x70, 0x27, 0x2d, 0x67, 0xcc, 0x31, 0xc6, 0x0c, + 0x6e, 0x0f, 0x65, 0x0c, 0xac, 0x14, 0xfc, 0x2a, 0xc0, 0xfa, 0xa8, 0x89, 0xc7, 0xdd, 0x61, 0xaf, + 0x28, 0x6a, 0xd5, 0x88, 0x0f, 0xff, 0xe0, 0x04, 0xa7, 0x2f, 0x30, 0xfa, 0x43, 0x7c, 0x34, 0xfa, + 0x0d, 0x97, 0x2a, 0xbd, 0xc0, 0x63, 0x28, 0x67, 0xfe, 0x6f, 0xe7, 0xf8, 0x49, 0xe0, 0xf3, 0xd6, + 0xbf, 0x3a, 0x70, 0x6b, 0x38, 0x99, 0xb7, 0x8e, 0xc4, 0xf4, 0x68, 0x21, 0x27, 0xdf, 0x67, 0xe4, + 0x0a, 0xee, 0xdc, 0x8d, 0x5c, 0x57, 0x95, 0x33, 0x5d, 0x3d, 0xc7, 0x0b, 0x01, 0x66, 0x42, 0xa3, + 0x8f, 0xe1, 0x89, 0x08, 0x6f, 0x2a, 0x71, 0x7d, 0xb0, 0x80, 0xd3, 0x64, 0x18, 0xcd, 0xff, 0xb8, + 0x19, 0x35, 0x33, 0xd4, 0xa8, 0x97, 0x0c, 0x67, 0x4d, 0x38, 0x10, 0xef, 0x04, 0xf8, 0x37, 0xbc, + 0x7f, 0x70, 0x60, 0x88, 0x77, 0x2f, 0x53, 0x43, 0x14, 0x9c, 0x63, 0x8b, 0x71, 0xa4, 0x30, 0x39, + 0x82, 0x23, 0xff, 0xf8, 0xf2, 0x5a, 0x12, 0xae, 0xae, 0x25, 0xe1, 0xe7, 0xb5, 0x24, 0x7c, 0xb8, + 0x91, 0x62, 0x57, 0x37, 0x52, 0xec, 0xfb, 0x8d, 0x14, 0x7b, 0x93, 0xd1, 0x74, 0xab, 0xd6, 0xa9, + 0x64, 0xab, 0xb4, 0xa9, 0xb4, 0x89, 0xa6, 0xf5, 0xde, 0x76, 0x7d, 0x66, 0xdd, 0x03, 0xe5, 0xd4, + 0x71, 0xb4, 0x7a, 0x6d, 0x62, 0x56, 0x26, 0xd9, 0x3f, 0x93, 0xbd, 0xdf, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x4f, 0xad, 0x77, 0xc4, 0x18, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/cork/types/tx.pb.go b/x/cork/types/tx.pb.go index 88cc6f05..6708f7bb 100644 --- a/x/cork/types/tx.pb.go +++ b/x/cork/types/tx.pb.go @@ -147,22 +147,22 @@ var fileDescriptor_271bdc677f232222 = []byte{ // 280 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x90, 0xc1, 0x4a, 0xc3, 0x30, 0x1c, 0xc6, 0x9b, 0x6e, 0x4c, 0x96, 0x4d, 0x91, 0x1c, 0x66, 0xd9, 0x21, 0x76, 0x3b, 0x55, 0x90, - 0x06, 0xaa, 0x4f, 0xa0, 0x20, 0x5e, 0x76, 0xb0, 0x5e, 0xc4, 0x8b, 0xd0, 0xf6, 0x4f, 0x1a, 0xdb, - 0x2e, 0xb5, 0x49, 0xcb, 0xf6, 0x16, 0x3e, 0x96, 0xc7, 0x1d, 0x3d, 0x4a, 0xfb, 0x22, 0xb2, 0x38, - 0x45, 0xd0, 0x1d, 0xf3, 0xfb, 0x7e, 0xe4, 0x4b, 0x3e, 0x7c, 0x1c, 0xcb, 0x2a, 0x63, 0x4d, 0xc0, - 0xf4, 0xca, 0x2f, 0x2b, 0xa9, 0x25, 0x39, 0xd8, 0x12, 0xbf, 0x09, 0xa6, 0xe4, 0x3b, 0x32, 0xc0, - 0x84, 0xf3, 0x06, 0x4f, 0x16, 0x8a, 0xdf, 0xc7, 0x29, 0x24, 0x75, 0x0e, 0xd7, 0xb2, 0xca, 0x42, - 0x78, 0xa9, 0x41, 0x69, 0x32, 0xc3, 0xfd, 0xad, 0xe7, 0x20, 0x17, 0x79, 0xa3, 0xe0, 0xd0, 0xdf, - 0xdd, 0xe2, 0x1b, 0xc7, 0x44, 0x64, 0x86, 0xc7, 0x51, 0x2e, 0xe3, 0xec, 0x29, 0x05, 0xc1, 0x53, - 0xed, 0xd8, 0x2e, 0xf2, 0xfa, 0xe1, 0xc8, 0xb0, 0x5b, 0x83, 0xc8, 0x04, 0x0f, 0x94, 0xe0, 0x4b, - 0xa8, 0x9c, 0x9e, 0x8b, 0xbc, 0x61, 0xb8, 0x3b, 0xcd, 0xcf, 0xf0, 0xc9, 0x9f, 0x5e, 0x55, 0xca, - 0xa5, 0x02, 0x72, 0x84, 0x6d, 0x91, 0x98, 0xda, 0x61, 0x68, 0x8b, 0x24, 0x78, 0xc0, 0xbd, 0x85, - 0xe2, 0xe4, 0x0e, 0x8f, 0x7f, 0xeb, 0xe4, 0xf4, 0xe7, 0x45, 0xff, 0x7f, 0x60, 0xea, 0xee, 0x17, - 0xbe, 0x9a, 0xae, 0x6e, 0xde, 0x5a, 0x8a, 0x36, 0x2d, 0x45, 0x1f, 0x2d, 0x45, 0xaf, 0x1d, 0xb5, - 0x36, 0x1d, 0xb5, 0xde, 0x3b, 0x6a, 0x3d, 0x9e, 0x73, 0xa1, 0xd3, 0x3a, 0xf2, 0x63, 0x59, 0xb0, - 0x12, 0x38, 0x5f, 0x3f, 0x37, 0x4c, 0xc9, 0xa2, 0x80, 0x5c, 0x40, 0xc5, 0x9a, 0x4b, 0xb6, 0x32, - 0x23, 0x32, 0xbd, 0x2e, 0x41, 0x45, 0x03, 0xb3, 0xe5, 0xc5, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x21, 0x64, 0x2a, 0x01, 0x7c, 0x01, 0x00, 0x00, + 0x06, 0xea, 0xc1, 0xbb, 0x82, 0x78, 0xd9, 0xc1, 0x7a, 0x11, 0x2f, 0x42, 0xdb, 0x3f, 0x69, 0x6c, + 0xbb, 0xd4, 0x26, 0x2d, 0xdb, 0x5b, 0xf8, 0x58, 0x1e, 0x77, 0xf4, 0x28, 0xed, 0x8b, 0xc8, 0xe2, + 0x14, 0x41, 0x77, 0xcc, 0xef, 0xfb, 0x91, 0x2f, 0xf9, 0xf0, 0x71, 0x2c, 0xab, 0x8c, 0x35, 0x01, + 0xd3, 0x2b, 0xbf, 0xac, 0xa4, 0x96, 0xe4, 0x60, 0x4b, 0xfc, 0x26, 0x98, 0x92, 0xef, 0xc8, 0x00, + 0x13, 0xce, 0x1b, 0x3c, 0x59, 0x28, 0x7e, 0x1f, 0xa7, 0x90, 0xd4, 0x39, 0x5c, 0xcb, 0x2a, 0x0b, + 0xe1, 0xa5, 0x06, 0xa5, 0xc9, 0x0c, 0xf7, 0xb7, 0x9e, 0x83, 0x5c, 0xe4, 0x8d, 0x82, 0x43, 0x7f, + 0x77, 0x8b, 0x6f, 0x1c, 0x13, 0x91, 0x19, 0x1e, 0x47, 0xb9, 0x8c, 0xb3, 0xa7, 0x14, 0x04, 0x4f, + 0xb5, 0x63, 0xbb, 0xc8, 0xeb, 0x87, 0x23, 0xc3, 0x6e, 0x0d, 0x22, 0x13, 0x3c, 0x50, 0x82, 0x2f, + 0xa1, 0x72, 0x7a, 0x2e, 0xf2, 0x86, 0xe1, 0xee, 0x34, 0x3f, 0xc3, 0x27, 0x7f, 0x7a, 0x55, 0x29, + 0x97, 0x0a, 0xc8, 0x11, 0xb6, 0x45, 0x62, 0x6a, 0x87, 0xa1, 0x2d, 0x92, 0xe0, 0x01, 0xf7, 0x16, + 0x8a, 0x93, 0x3b, 0x3c, 0xfe, 0xad, 0x93, 0xd3, 0x9f, 0x17, 0xfd, 0xff, 0x81, 0xa9, 0xbb, 0x5f, + 0xf8, 0x6a, 0xba, 0xba, 0x79, 0x6b, 0x29, 0xda, 0xb4, 0x14, 0x7d, 0xb4, 0x14, 0xbd, 0x76, 0xd4, + 0xda, 0x74, 0xd4, 0x7a, 0xef, 0xa8, 0xf5, 0x78, 0xce, 0x85, 0x4e, 0xeb, 0xc8, 0x8f, 0x65, 0xc1, + 0x4a, 0xe0, 0x7c, 0xfd, 0xdc, 0x30, 0x25, 0x8b, 0x02, 0x72, 0x01, 0x15, 0x6b, 0x2e, 0xd9, 0xca, + 0x8c, 0xc8, 0xf4, 0xba, 0x04, 0x15, 0x0d, 0xcc, 0x96, 0x17, 0x9f, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x61, 0xc9, 0x52, 0x38, 0x7c, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/incentives/client/cli/query.go b/x/incentives/client/cli/query.go index 49b0a61d..b6e1a576 100644 --- a/x/incentives/client/cli/query.go +++ b/x/incentives/client/cli/query.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/x/incentives/types" "github.com/spf13/cobra" ) diff --git a/x/incentives/handler.go b/x/incentives/handler.go index 693c07f3..eea54a8e 100644 --- a/x/incentives/handler.go +++ b/x/incentives/handler.go @@ -5,13 +5,13 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/incentives/keeper" + "github.com/peggyjv/sommelier/v7/x/incentives/keeper" ) // NewHandler returns a handler for "incentive" type messages. func NewHandler(k keeper.Keeper) sdk.Handler { return func(ctx sdk.Context, msg sdk.Msg) (*sdk.Result, error) { - ctx = ctx.WithEventManager(sdk.NewEventManager()) + _ = ctx.WithEventManager(sdk.NewEventManager()) switch msg := msg.(type) { default: return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unrecognized incentives message type: %T", msg) diff --git a/x/incentives/keeper/abci_test.go b/x/incentives/keeper/abci_test.go index 1c3403cf..39d1745f 100644 --- a/x/incentives/keeper/abci_test.go +++ b/x/incentives/keeper/abci_test.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" distributionTypes "github.com/cosmos/cosmos-sdk/x/distribution/types" - "github.com/peggyjv/sommelier/v4/app/params" - incentivesTypes "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/app/params" + incentivesTypes "github.com/peggyjv/sommelier/v7/x/incentives/types" ) func (suite *KeeperTestSuite) TestEndBlockerIncentivesDisabledDoesNothing() { diff --git a/x/incentives/keeper/genesis.go b/x/incentives/keeper/genesis.go index 549ba649..c02fd684 100644 --- a/x/incentives/keeper/genesis.go +++ b/x/incentives/keeper/genesis.go @@ -2,7 +2,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/x/incentives/types" ) // InitGenesis initialize default parameters diff --git a/x/incentives/keeper/keeper.go b/x/incentives/keeper/keeper.go index a32924e7..93375580 100644 --- a/x/incentives/keeper/keeper.go +++ b/x/incentives/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/x/incentives/types" "github.com/tendermint/tendermint/libs/log" ) diff --git a/x/incentives/keeper/keeper_test.go b/x/incentives/keeper/keeper_test.go index 0bec0d7b..1c05fdfe 100644 --- a/x/incentives/keeper/keeper_test.go +++ b/x/incentives/keeper/keeper_test.go @@ -9,10 +9,10 @@ import ( mintTypes "github.com/cosmos/cosmos-sdk/x/mint/types" paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper" "github.com/golang/mock/gomock" - "github.com/peggyjv/sommelier/v4/app/params" - moduletestutil "github.com/peggyjv/sommelier/v4/testutil" - incentivestestutil "github.com/peggyjv/sommelier/v4/x/incentives/testutil" - incentivesTypes "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/app/params" + moduletestutil "github.com/peggyjv/sommelier/v7/testutil" + incentivestestutil "github.com/peggyjv/sommelier/v7/x/incentives/testutil" + incentivesTypes "github.com/peggyjv/sommelier/v7/x/incentives/types" "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" tmtime "github.com/tendermint/tendermint/types/time" diff --git a/x/incentives/keeper/query_server.go b/x/incentives/keeper/query_server.go index bde1ea88..2b528abf 100644 --- a/x/incentives/keeper/query_server.go +++ b/x/incentives/keeper/query_server.go @@ -4,7 +4,7 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/x/incentives/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/incentives/keeper/query_server_test.go b/x/incentives/keeper/query_server_test.go index cd97d45a..58ef86f4 100644 --- a/x/incentives/keeper/query_server_test.go +++ b/x/incentives/keeper/query_server_test.go @@ -1,8 +1,8 @@ package keeper import ( - "github.com/peggyjv/sommelier/v4/app/params" - "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/app/params" + "github.com/peggyjv/sommelier/v7/x/incentives/types" sdk "github.com/cosmos/cosmos-sdk/types" mintTypes "github.com/cosmos/cosmos-sdk/x/mint/types" diff --git a/x/incentives/module.go b/x/incentives/module.go index 2adfbcaf..ddeffedc 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -13,9 +13,9 @@ import ( sim "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" - "github.com/peggyjv/sommelier/v4/x/incentives/client/cli" - "github.com/peggyjv/sommelier/v4/x/incentives/keeper" - "github.com/peggyjv/sommelier/v4/x/incentives/types" + "github.com/peggyjv/sommelier/v7/x/incentives/client/cli" + "github.com/peggyjv/sommelier/v7/x/incentives/keeper" + "github.com/peggyjv/sommelier/v7/x/incentives/types" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" ) diff --git a/x/incentives/types/expected_keepers.go b/x/incentives/types/expected_keepers.go index cfb81c7d..25c148c2 100644 --- a/x/incentives/types/expected_keepers.go +++ b/x/incentives/types/expected_keepers.go @@ -1,4 +1,4 @@ -//go:generate mockgen -destination=../testutil/expected_keepers_mocks.go -package=keeper github.com/peggyjv/sommelier/v4/x/incentives/types AccountKeeper,DistributionKeeper,BankKeeper,MintKeeper +//go:generate mockgen -destination=../testutil/expected_keepers_mocks.go -package=keeper github.com/peggyjv/sommelier/v7/x/incentives/types AccountKeeper,DistributionKeeper,BankKeeper,MintKeeper package types diff --git a/x/incentives/types/genesis.pb.go b/x/incentives/types/genesis.pb.go index ccaa6d5f..9a7af1f9 100644 --- a/x/incentives/types/genesis.pb.go +++ b/x/incentives/types/genesis.pb.go @@ -135,7 +135,7 @@ var fileDescriptor_179cfb82d3e2b395 = []byte{ // 309 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0xb1, 0x4f, 0x3a, 0x31, 0x14, 0x07, 0xf0, 0xeb, 0x2f, 0x84, 0xe1, 0x7e, 0xba, 0x5c, 0x90, 0x20, 0x26, 0x95, 0x30, 0x31, - 0xb5, 0x39, 0x70, 0x70, 0x86, 0x41, 0x07, 0x07, 0x82, 0x71, 0x71, 0xb9, 0xdc, 0xd5, 0x47, 0xa9, + 0xb5, 0x39, 0x18, 0x74, 0x86, 0x41, 0x07, 0x07, 0x82, 0x71, 0x71, 0xb9, 0xdc, 0xd5, 0x47, 0xa9, 0x72, 0x7d, 0x97, 0xb6, 0x34, 0xf2, 0x5f, 0xb8, 0xfa, 0x1f, 0x31, 0x32, 0x3a, 0x19, 0x03, 0xff, 0x88, 0xe1, 0xee, 0x12, 0x70, 0x6b, 0xf2, 0x79, 0xef, 0xdb, 0x6f, 0x5e, 0x78, 0xa5, 0xb4, 0x00, 0xed, 0x94, 0x07, 0xcb, 0x7d, 0xcc, 0x25, 0x68, 0xb0, 0xca, 0xb2, 0xc2, 0xa0, 0xc3, 0xe8, 0xfc, @@ -151,8 +151,8 @@ var fileDescriptor_179cfb82d3e2b395 = []byte{ 0x3f, 0x6c, 0x76, 0x94, 0x6c, 0x77, 0x94, 0xfc, 0xec, 0x28, 0xf9, 0xd8, 0xd3, 0x60, 0xbb, 0xa7, 0xc1, 0xd7, 0x9e, 0x06, 0xcf, 0x43, 0xa9, 0xdc, 0x62, 0x95, 0x31, 0x81, 0x39, 0x2f, 0x40, 0xca, 0xf5, 0xab, 0xe7, 0x16, 0xf3, 0x1c, 0x96, 0x0a, 0x0c, 0xf7, 0x37, 0xfc, 0x9d, 0x9f, 0x9c, 0xdf, - 0xad, 0x0b, 0xb0, 0x59, 0xb3, 0xbc, 0xda, 0xe8, 0x37, 0x00, 0x00, 0xff, 0xff, 0x86, 0x6f, 0x5d, - 0x07, 0x99, 0x01, 0x00, 0x00, + 0xad, 0x0b, 0xb0, 0x59, 0xb3, 0xbc, 0xda, 0xe8, 0x37, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x68, 0x83, + 0x05, 0x99, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/incentives/types/params.go b/x/incentives/types/params.go index a28aa8c6..b7704d13 100644 --- a/x/incentives/types/params.go +++ b/x/incentives/types/params.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/peggyjv/sommelier/v4/app/params" + "github.com/peggyjv/sommelier/v7/app/params" ) // Parameter keys diff --git a/x/incentives/types/query.pb.go b/x/incentives/types/query.pb.go index ebd32c1c..0588d2e0 100644 --- a/x/incentives/types/query.pb.go +++ b/x/incentives/types/query.pb.go @@ -204,29 +204,29 @@ func init() { func init() { proto.RegisterFile("incentives/v1/query.proto", fileDescriptor_a3d66b0ba5a24e28) } var fileDescriptor_a3d66b0ba5a24e28 = []byte{ - // 346 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xcd, 0x4e, 0x3a, 0x31, - 0x14, 0xc5, 0x67, 0xfe, 0x1f, 0x44, 0x4b, 0x8c, 0x58, 0x31, 0xd1, 0x91, 0x14, 0x99, 0x90, 0xe8, - 0x6a, 0x1a, 0xc0, 0x17, 0x90, 0xa5, 0x71, 0x81, 0xec, 0x74, 0x57, 0x48, 0x53, 0x6b, 0x98, 0xb6, - 0x4c, 0xcb, 0xc4, 0x59, 0xb8, 0xf1, 0x09, 0x4c, 0x7c, 0x29, 0x96, 0x24, 0x6e, 0x5c, 0x19, 0x03, - 0xbe, 0x84, 0x3b, 0x43, 0x67, 0x08, 0x8c, 0x8a, 0xbb, 0x9b, 0x7b, 0x4e, 0x7e, 0xe7, 0x9e, 0x16, - 0x1c, 0x70, 0xd1, 0xa7, 0xc2, 0xf0, 0x98, 0x6a, 0x1c, 0x37, 0xf0, 0x70, 0x44, 0xa3, 0x24, 0x50, - 0x91, 0x34, 0x12, 0x6e, 0x2d, 0xa5, 0x20, 0x6e, 0x78, 0x65, 0x26, 0x99, 0xb4, 0x0a, 0x9e, 0x4f, - 0xa9, 0xc9, 0xab, 0x30, 0x29, 0xd9, 0x80, 0x62, 0xa2, 0x38, 0x26, 0x42, 0x48, 0x43, 0x0c, 0x97, - 0x42, 0x67, 0xea, 0x61, 0x9e, 0xce, 0xa8, 0xa0, 0x9a, 0x67, 0xa2, 0x5f, 0x06, 0xf0, 0x72, 0x1e, - 0xd7, 0x21, 0x11, 0x09, 0x75, 0x97, 0x0e, 0x47, 0x54, 0x1b, 0xff, 0x1c, 0xec, 0xe6, 0xb6, 0x5a, - 0x49, 0xa1, 0x29, 0x6c, 0x81, 0x82, 0xb2, 0x9b, 0x7d, 0xf7, 0xc8, 0x3d, 0x29, 0x36, 0xf7, 0x82, - 0xdc, 0x75, 0x41, 0x6a, 0x6f, 0xff, 0x1b, 0xbf, 0x56, 0x9d, 0x6e, 0x66, 0xf5, 0x77, 0xc0, 0xb6, - 0x65, 0x9d, 0x75, 0xae, 0x16, 0xf8, 0x3a, 0x28, 0x2d, 0x57, 0x19, 0xbb, 0x04, 0xfe, 0x12, 0x95, - 0x58, 0xf0, 0x66, 0x77, 0x3e, 0x36, 0x3f, 0x5c, 0xf0, 0xdf, 0xda, 0xe0, 0x3d, 0x28, 0xae, 0x9c, - 0x03, 0x6b, 0x5f, 0x62, 0xbf, 0x17, 0xf0, 0xfc, 0xdf, 0x2c, 0x69, 0xa2, 0x7f, 0xfc, 0xf0, 0xfc, - 0xfe, 0xf4, 0xa7, 0x06, 0xab, 0x58, 0xcb, 0x30, 0xa4, 0x03, 0x4e, 0x23, 0x9c, 0x7f, 0xaa, 0xb4, - 0x01, 0x1c, 0x82, 0x8d, 0xc5, 0xb9, 0x10, 0xfd, 0x04, 0x5e, 0x56, 0xf3, 0xaa, 0x6b, 0xf5, 0x2c, - 0xb5, 0x6e, 0x53, 0x11, 0xac, 0xac, 0x4d, 0x25, 0x2a, 0x69, 0x5f, 0x8c, 0xa7, 0xc8, 0x9d, 0x4c, - 0x91, 0xfb, 0x36, 0x45, 0xee, 0xe3, 0x0c, 0x39, 0x93, 0x19, 0x72, 0x5e, 0x66, 0xc8, 0xb9, 0x6e, - 0x32, 0x6e, 0x6e, 0x46, 0xbd, 0xa0, 0x2f, 0x43, 0xac, 0x28, 0x63, 0xc9, 0x6d, 0xbc, 0x42, 0x8a, - 0x4f, 0xf1, 0xdd, 0x2a, 0xce, 0x24, 0x8a, 0xea, 0x5e, 0xc1, 0xfe, 0x75, 0xeb, 0x33, 0x00, 0x00, - 0xff, 0xff, 0x67, 0x60, 0x77, 0x53, 0x68, 0x02, 0x00, 0x00, + // 347 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0x3f, 0x4f, 0x3a, 0x31, + 0x1c, 0xc6, 0xef, 0x7e, 0x7f, 0x88, 0x96, 0x18, 0xb1, 0x62, 0xa2, 0x27, 0x29, 0x72, 0x21, 0xd1, + 0xe9, 0x1a, 0x60, 0x70, 0x96, 0xd1, 0x38, 0x20, 0x9b, 0x6e, 0x85, 0x34, 0xb5, 0x86, 0x6b, 0xcb, + 0xb5, 0x5c, 0xbc, 0xc1, 0xc5, 0x57, 0x60, 0xe2, 0x9b, 0x62, 0x24, 0x71, 0x71, 0x32, 0x06, 0x7c, + 0x13, 0x6e, 0x86, 0xde, 0x11, 0x38, 0x15, 0xb7, 0x6f, 0xbe, 0xcf, 0x93, 0xcf, 0xf3, 0x7d, 0x5a, + 0x70, 0xc0, 0x45, 0x9f, 0x0a, 0xc3, 0x63, 0xaa, 0x71, 0xdc, 0xc0, 0xc3, 0x11, 0x8d, 0x92, 0x40, + 0x45, 0xd2, 0x48, 0xb8, 0xb5, 0x94, 0x82, 0xb8, 0xe1, 0x95, 0x99, 0x64, 0xd2, 0x2a, 0x78, 0x3e, + 0xa5, 0x26, 0xaf, 0xc2, 0xa4, 0x64, 0x03, 0x8a, 0x89, 0xe2, 0x98, 0x08, 0x21, 0x0d, 0x31, 0x5c, + 0x0a, 0x9d, 0xa9, 0x87, 0x79, 0x3a, 0xa3, 0x82, 0x6a, 0x9e, 0x89, 0x7e, 0x19, 0xc0, 0xcb, 0x79, + 0x5c, 0x87, 0x44, 0x24, 0xd4, 0x5d, 0x3a, 0x1c, 0x51, 0x6d, 0xfc, 0x73, 0xb0, 0x9b, 0xdb, 0x6a, + 0x25, 0x85, 0xa6, 0xb0, 0x05, 0x0a, 0xca, 0x6e, 0xf6, 0xdd, 0x23, 0xf7, 0xa4, 0xd8, 0xdc, 0x0b, + 0x72, 0xd7, 0x05, 0xa9, 0xbd, 0xfd, 0x6f, 0xfc, 0x5a, 0x75, 0xba, 0x99, 0xd5, 0xdf, 0x01, 0xdb, + 0x96, 0x75, 0xd6, 0xb9, 0x5a, 0xe0, 0xeb, 0xa0, 0xb4, 0x5c, 0x65, 0xec, 0x12, 0xf8, 0x4b, 0x54, + 0x62, 0xc1, 0x9b, 0xdd, 0xf9, 0xd8, 0xfc, 0x70, 0xc1, 0x7f, 0x6b, 0x83, 0xf7, 0xa0, 0xb8, 0x72, + 0x0e, 0xac, 0x7d, 0x89, 0xfd, 0x5e, 0xc0, 0xf3, 0x7f, 0xb3, 0xa4, 0x89, 0xfe, 0xf1, 0xc3, 0xf3, + 0xfb, 0xd3, 0x9f, 0x1a, 0xac, 0x62, 0x2d, 0xc3, 0x90, 0x0e, 0x38, 0x8d, 0x70, 0xfe, 0xa9, 0xd2, + 0x06, 0x70, 0x08, 0x36, 0x16, 0xe7, 0x42, 0xf4, 0x13, 0x78, 0x59, 0xcd, 0xab, 0xae, 0xd5, 0xb3, + 0xd4, 0xba, 0x4d, 0x45, 0xb0, 0xb2, 0x36, 0x95, 0xa8, 0xa4, 0x7d, 0x31, 0x9e, 0x22, 0x77, 0x32, + 0x45, 0xee, 0xdb, 0x14, 0xb9, 0x8f, 0x33, 0xe4, 0x4c, 0x66, 0xc8, 0x79, 0x99, 0x21, 0xe7, 0xba, + 0xc9, 0xb8, 0xb9, 0x19, 0xf5, 0x82, 0xbe, 0x0c, 0xb1, 0xa2, 0x8c, 0x25, 0xb7, 0xf1, 0x0a, 0x29, + 0x3e, 0xc5, 0x77, 0xab, 0x38, 0x93, 0x28, 0xaa, 0x7b, 0x05, 0xfb, 0xd7, 0xad, 0xcf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x40, 0x67, 0xa9, 0x51, 0x68, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/pubsub/client/cli/query.go b/x/pubsub/client/cli/query.go index 754ff3bc..38f467c0 100644 --- a/x/pubsub/client/cli/query.go +++ b/x/pubsub/client/cli/query.go @@ -2,23 +2,17 @@ package cli import ( "fmt" - // "strings" - - "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - // "github.com/cosmos/cosmos-sdk/client/flags" - // sdk "github.com/cosmos/cosmos-sdk/types" - - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" + "github.com/spf13/cobra" ) -// TODO(bolten): add query CLI commands - // GetQueryCmd returns the cli query commands for this module func GetQueryCmd(queryRoute string) *cobra.Command { // Group pubsub queries under a subcommand - cmd := &cobra.Command{ + pubsubQueryCmd := &cobra.Command{ Use: types.ModuleName, Short: fmt.Sprintf("Querying commands for the %s module", types.ModuleName), DisableFlagParsing: true, @@ -26,7 +20,494 @@ func GetQueryCmd(queryRoute string) *cobra.Command { RunE: client.ValidateCmd, } - cmd.AddCommand(CmdQueryParams()) + pubsubQueryCmd.AddCommand([]*cobra.Command{ + CmdQueryParams(), + CmdQueryPublisher(), + CmdQueryPublishers(), + CmdQuerySubscriber(), + CmdQuerySubscribers(), + CmdQueryPublisherIntent(), + CmdQueryPublisherIntents(), + CmdQueryPublisherIntentsByPublisherDomain(), + CmdQueryPublisherIntentsBySubscriptionID(), + CmdQuerySubscriberIntent(), + CmdQuerySubscriberIntents(), + CmdQuerySubscriberIntentsBySubscriberAddress(), + CmdQuerySubscriberIntentsBySubscriptionID(), + CmdQuerySubscriberIntentsByPublisherDomain(), + CmdQueryDefaultSubscription(), + CmdQueryDefaultSubscriptions(), + }...) + + return pubsubQueryCmd +} + +func CmdQueryParams() *cobra.Command { + cmd := &cobra.Command{ + Use: "params", + Args: cobra.NoArgs, + Short: "Query pubsub params", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryParamsRequest{} + + res, err := queryClient.Params(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQueryPublisher() *cobra.Command { + cmd := &cobra.Command{ + Use: "publisher", + Args: cobra.ExactArgs(1), + Short: "Query publisher by publisher domain", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryPublisherRequest{ + PublisherDomain: args[0], + } + + res, err := queryClient.QueryPublisher(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQueryPublishers() *cobra.Command { + cmd := &cobra.Command{ + Use: "publishers", + Args: cobra.NoArgs, + Short: "Query publishers", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryPublishersRequest{} + + res, err := queryClient.QueryPublishers(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQuerySubscriber() *cobra.Command { + cmd := &cobra.Command{ + Use: "subscriber", + Args: cobra.ExactArgs(1), + Short: "Query subscriber by subscriber address", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QuerySubscriberRequest{ + SubscriberAddress: args[0], + } + + res, err := queryClient.QuerySubscriber(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQuerySubscribers() *cobra.Command { + cmd := &cobra.Command{ + Use: "subscribers", + Args: cobra.NoArgs, + Short: "Query subscribers", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QuerySubscribersRequest{} + + res, err := queryClient.QuerySubscribers(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQueryPublisherIntent() *cobra.Command { + cmd := &cobra.Command{ + Use: "publisher-intent", + Args: cobra.ExactArgs(2), + Short: "Query publisher intent by publisher domain and subscription ID", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryPublisherIntentRequest{ + PublisherDomain: args[0], + SubscriptionId: args[1], + } + + res, err := queryClient.QueryPublisherIntent(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQueryPublisherIntents() *cobra.Command { + cmd := &cobra.Command{ + Use: "publisher-intents", + Args: cobra.NoArgs, + Short: "Query publisher intents", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryPublisherIntentsRequest{} + + res, err := queryClient.QueryPublisherIntents(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQueryPublisherIntentsByPublisherDomain() *cobra.Command { + cmd := &cobra.Command{ + Use: "publisher-intents-by-publisher-domain", + Args: cobra.ExactArgs(1), + Short: "Query publisher intents by publisher domain", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryPublisherIntentsByPublisherDomainRequest{ + PublisherDomain: args[0], + } + + res, err := queryClient.QueryPublisherIntentsByPublisherDomain(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQueryPublisherIntentsBySubscriptionID() *cobra.Command { + cmd := &cobra.Command{ + Use: "publisher-intents-by-subscription-id", + Args: cobra.ExactArgs(1), + Short: "Query publisher intents by subscription ID", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryPublisherIntentsBySubscriptionIDRequest{ + SubscriptionId: args[0], + } + + res, err := queryClient.QueryPublisherIntentsBySubscriptionID(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQuerySubscriberIntent() *cobra.Command { + cmd := &cobra.Command{ + Use: "subscriber-intent", + Args: cobra.ExactArgs(2), + Short: "Query subscriber intent by subscriber address and subscription ID", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QuerySubscriberIntentRequest{ + SubscriberAddress: args[0], + SubscriptionId: args[1], + } + + res, err := queryClient.QuerySubscriberIntent(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQuerySubscriberIntents() *cobra.Command { + cmd := &cobra.Command{ + Use: "subscriber-intents", + Args: cobra.NoArgs, + Short: "Query subscriber intents", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QuerySubscriberIntentsRequest{} + + res, err := queryClient.QuerySubscriberIntents(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQuerySubscriberIntentsBySubscriberAddress() *cobra.Command { + cmd := &cobra.Command{ + Use: "subscriber-intents-by-subscriber-address", + Args: cobra.ExactArgs(1), + Short: "Query subscriber intents by subscriber address", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QuerySubscriberIntentsBySubscriberAddressRequest{ + SubscriberAddress: args[0], + } + + res, err := queryClient.QuerySubscriberIntentsBySubscriberAddress(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQuerySubscriberIntentsBySubscriptionID() *cobra.Command { + cmd := &cobra.Command{ + Use: "subscriber-intents-by-subscription-id", + Args: cobra.ExactArgs(1), + Short: "Query subscriber intents by subscription ID", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QuerySubscriberIntentsBySubscriptionIDRequest{ + SubscriptionId: args[0], + } + + res, err := queryClient.QuerySubscriberIntentsBySubscriptionID(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQuerySubscriberIntentsByPublisherDomain() *cobra.Command { + cmd := &cobra.Command{ + Use: "subscriber-intents-by-publisher-domain", + Args: cobra.ExactArgs(1), + Short: "Query subscriber intents by publisher domain", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QuerySubscriberIntentsByPublisherDomainRequest{ + PublisherDomain: args[0], + } + + res, err := queryClient.QuerySubscriberIntentsByPublisherDomain(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQueryDefaultSubscription() *cobra.Command { + cmd := &cobra.Command{ + Use: "default-subscription", + Args: cobra.ExactArgs(1), + Short: "Query default subscription by subscription ID", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryDefaultSubscriptionRequest{ + SubscriptionId: args[0], + } + + res, err := queryClient.QueryDefaultSubscription(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) + + return cmd +} + +func CmdQueryDefaultSubscriptions() *cobra.Command { + cmd := &cobra.Command{ + Use: "default-subscriptions", + Args: cobra.NoArgs, + Short: "Query default subscriptions", + RunE: func(cmd *cobra.Command, args []string) error { + ctx, err := client.GetClientQueryContext(cmd) + if err != nil { + return err + } + + queryClient := types.NewQueryClient(ctx) + req := &types.QueryDefaultSubscriptionsRequest{} + + res, err := queryClient.QueryDefaultSubscriptions(cmd.Context(), req) + if err != nil { + return err + } + + return ctx.PrintProto(res) + }, + } + + flags.AddQueryFlagsToCmd(cmd) return cmd } diff --git a/x/pubsub/client/cli/query_params.go b/x/pubsub/client/cli/query_params.go deleted file mode 100644 index 16fa705d..00000000 --- a/x/pubsub/client/cli/query_params.go +++ /dev/null @@ -1,34 +0,0 @@ -package cli - -import ( - "context" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" - "github.com/spf13/cobra" -) - -func CmdQueryParams() *cobra.Command { - cmd := &cobra.Command{ - Use: "params", - Short: "shows the parameters of the module", - Args: cobra.NoArgs, - RunE: func(cmd *cobra.Command, args []string) error { - clientCtx := client.GetClientContextFromCmd(cmd) - - queryClient := types.NewQueryClient(clientCtx) - - res, err := queryClient.Params(context.Background(), &types.QueryParamsRequest{}) - if err != nil { - return err - } - - return clientCtx.PrintProto(res) - }, - } - - flags.AddQueryFlagsToCmd(cmd) - - return cmd -} diff --git a/x/pubsub/client/cli/tx.go b/x/pubsub/client/cli/tx.go index 4ea02bee..be6d733c 100644 --- a/x/pubsub/client/cli/tx.go +++ b/x/pubsub/client/cli/tx.go @@ -2,40 +2,686 @@ package cli import ( "fmt" + "io/ioutil" + "strings" "github.com/spf13/cobra" "github.com/cosmos/cosmos-sdk/client" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/version" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" ) -// TODO(bolten): fill out tx commands - // GetTxCmd returns the transaction commands for this module func GetTxCmd() *cobra.Command { - cmd := &cobra.Command{ + pubsubTxCommand := &cobra.Command{ Use: types.ModuleName, - Short: fmt.Sprintf("%s transactions subcommands", types.ModuleName), + Short: fmt.Sprintf("%s transaction subcommands", types.ModuleName), DisableFlagParsing: true, SuggestionsMinimumDistance: 2, RunE: client.ValidateCmd, } - return cmd + pubsubTxCommand.AddCommand([]*cobra.Command{ + GetCmdAddPublisherPullIntent(), + GetCmdAddPublisherPushIntent(), + GetCmdAddSubscriberIntent(), + GetCmdAddSubscriber(), + GetCmdRemovePublisherIntent(), + GetCmdRemoveSubscriberIntent(), + GetCmdRemoveSubscriber(), + GetCmdRemovePublisher(), + }...) + + return pubsubTxCommand } func GetCmdSubmitAddPublisherProposal() *cobra.Command { - return nil + cmd := &cobra.Command{ + Use: "add-publisher [proposal-file]", + Args: cobra.ExactArgs(1), + Short: "Submit an add publisher proposal", + Long: strings.TrimSpace( + fmt.Sprintf(`Submit an add publisher proposal along with an initial deposit. +The proposal details must be supplied via a JSON file. + +Example: +$ %s tx gov submit-proposal add-publisher --from= + +Where proposal.json contains: + +{ + "title": "Add us as a publisher", + "description": "We do strategies", + "domain": "sommelier.example.com", + "address": "somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0", + "proof_url": "https://sommelier.example.com/somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0/cacert.pem", + "ca_cert": "", + "deposit": "10000000usomm" +} +`, + version.AppName, + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + proposal := types.AddPublisherProposalWithDeposit{} + contents, err := ioutil.ReadFile(args[0]) + if err != nil { + return err + } + + if err = clientCtx.Codec.UnmarshalJSON(contents, &proposal); err != nil { + return err + } + + deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit) + if err != nil { + return err + } + + content := types.NewAddPublisherProposal( + proposal.Title, + proposal.Description, + proposal.Domain, + proposal.Address, + proposal.ProofUrl, + proposal.CaCert, + ) + + if err = content.ValidateBasic(); err != nil { + return err + } + + from := clientCtx.GetFromAddress() + msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + return cmd } func GetCmdSubmitRemovePublisherProposal() *cobra.Command { - return nil + cmd := &cobra.Command{ + Use: "remove-publisher [proposal-file]", + Args: cobra.ExactArgs(1), + Short: "Submit a remove publisher proposal", + Long: strings.TrimSpace( + fmt.Sprintf(`Submit a remove publisher proposal along with an initial deposit. +The proposal details must be supplied via a JSON file. + +Example: +$ %s tx gov submit-proposal remove-publisher --from= + +Where proposal.json contains: + +{ + "title": "Remove this publisher", + "description": "Get rid of them", + "domain": "sommelier.example.com", + "deposit": "10000000usomm" +} +`, + version.AppName, + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + proposal := types.RemovePublisherProposalWithDeposit{} + contents, err := ioutil.ReadFile(args[0]) + if err != nil { + return err + } + + if err = clientCtx.Codec.UnmarshalJSON(contents, &proposal); err != nil { + return err + } + + deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit) + if err != nil { + return err + } + + content := types.NewRemovePublisherProposal( + proposal.Title, + proposal.Description, + proposal.Domain, + ) + + if err = content.ValidateBasic(); err != nil { + return err + } + + from := clientCtx.GetFromAddress() + msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + return cmd } func GetCmdSubmitAddDefaultSubscriptionProposal() *cobra.Command { - return nil + cmd := &cobra.Command{ + Use: "add-default-subscription [proposal-file]", + Args: cobra.ExactArgs(1), + Short: "Submit an add default subscription proposal", + Long: strings.TrimSpace( + fmt.Sprintf(`Submit an add default subscription proposal along with an initial deposit. +The proposal details must be supplied via a JSON file. + +Example: +$ %s tx gov submit-proposal add-default-subscription --from= + +Where proposal.json contains: + +{ + "title": "Add this default subscription", + "description": "Use this publisher unless you override it", + "subscription_id": "0x123801a7D398351b8bE11C439e05C5B3259aeC9B", + "publisher_domain": "sommelier.example.com", + "deposit": "10000000usomm" +} +`, + version.AppName, + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + proposal := types.AddDefaultSubscriptionProposalWithDeposit{} + contents, err := ioutil.ReadFile(args[0]) + if err != nil { + return err + } + + if err = clientCtx.Codec.UnmarshalJSON(contents, &proposal); err != nil { + return err + } + + deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit) + if err != nil { + return err + } + + content := types.NewAddDefaultSubscriptionProposal( + proposal.Title, + proposal.Description, + proposal.SubscriptionId, + proposal.PublisherDomain, + ) + + if err = content.ValidateBasic(); err != nil { + return err + } + + from := clientCtx.GetFromAddress() + msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + return cmd } func GetCmdSubmitRemoveDefaultSubscriptionProposal() *cobra.Command { - return nil + cmd := &cobra.Command{ + Use: "remove-default-subscription [proposal-file]", + Args: cobra.ExactArgs(1), + Short: "Submit a remove default subscription proposal", + Long: strings.TrimSpace( + fmt.Sprintf(`Submit a remove default subscription proposal along with an initial deposit. +The proposal details must be supplied via a JSON file. + +Example: +$ %s tx gov submit-proposal add-default-subscription --from= + +Where proposal.json contains: + +{ + "title": "Remove this default subscription", + "description": "Remove the defeault for this subscription ID", + "subscription_id": "0x123801a7D398351b8bE11C439e05C5B3259aeC9B", + "deposit": "10000000usomm" +} +`, + version.AppName, + ), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + proposal := types.RemoveDefaultSubscriptionProposalWithDeposit{} + contents, err := ioutil.ReadFile(args[0]) + if err != nil { + return err + } + + if err = clientCtx.Codec.UnmarshalJSON(contents, &proposal); err != nil { + return err + } + + deposit, err := sdk.ParseCoinsNormalized(proposal.Deposit) + if err != nil { + return err + } + + content := types.NewRemoveDefaultSubscriptionProposal( + proposal.Title, + proposal.Description, + proposal.SubscriptionId, + ) + + if err = content.ValidateBasic(); err != nil { + return err + } + + from := clientCtx.GetFromAddress() + msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + return cmd +} + +func GetCmdAddPublisherPullIntent() *cobra.Command { + cmd := &cobra.Command{ + Use: "add-publisher-pull-intent [subscription-id] [publisher-domain] [pull-url] [ANY|VALIDATORS|LIST] ", + Args: cobra.MinimumNArgs(4), + Short: "Add a publisher intent with a pull URL", + Long: strings.TrimSpace( + fmt.Sprintf(`Examples: +$ %s tx pubsub add-publisher-pull-intent 0x123801a7D398351b8bE11C439e05C5B3259aeC9B sommelier.example.com "https://sommelier.example.com/pull" VALIDATORS --from= +$ %s tx pubsub add-publisher-pull-intent 0x123801a7D398351b8bE11C439e05C5B3259aeC9B sommelier.example.com "https://sommelier.example.com/pull" LIST somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0,somm18ld4633yswcyjdklej3att6aw93nhlf7596qkk --from= +`, version.AppName, version.AppName), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + if len(args) > 5 { + return fmt.Errorf("too many arguments") + } + + signer := clientCtx.GetFromAddress() + if signer == nil { + return fmt.Errorf("must include `--from` flag") + } + + allowedSubscribers, err := parseAllowedSubscribers(args[3]) + if err != nil { + return err + } + + allowedAddresses := []string{} + if len(args) == 5 { + allowedAddresses = strings.Split(args[4], ",") + } + + publisherIntent := types.PublisherIntent{ + SubscriptionId: args[0], + PublisherDomain: args[1], + Method: types.PublishMethod_PULL, + PullUrl: args[2], + AllowedSubscribers: allowedSubscribers, + AllowedAddresses: allowedAddresses, + } + + msg, err := types.NewMsgAddPublisherIntentRequest(publisherIntent, signer) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} + +func GetCmdAddPublisherPushIntent() *cobra.Command { + cmd := &cobra.Command{ + Use: "add-publisher-push-intent [subscription-id] [publisher-domain] [ANY|VALIDATORS|LIST] ", + Args: cobra.MinimumNArgs(3), + Short: "Add a publisher intent that will push", + Long: strings.TrimSpace( + fmt.Sprintf(`Examples: +$ %s tx pubsub add-publisher-push-intent 0x123801a7D398351b8bE11C439e05C5B3259aeC9B sommelier.example.com VALIDATORS --from= +$ %s tx pubsub add-publisher-push-intent 0x123801a7D398351b8bE11C439e05C5B3259aeC9B sommelier.example.com LIST somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0,somm18ld4633yswcyjdklej3att6aw93nhlf7596qkk --from= +`, version.AppName, version.AppName), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + if len(args) > 4 { + return fmt.Errorf("too many arguments") + } + + signer := clientCtx.GetFromAddress() + if signer == nil { + return fmt.Errorf("must include `--from` flag") + } + + allowedSubscribers, err := parseAllowedSubscribers(args[2]) + if err != nil { + return err + } + + allowedAddresses := []string{} + if len(args) == 4 { + allowedAddresses = strings.Split(args[3], ",") + } + + publisherIntent := types.PublisherIntent{ + SubscriptionId: args[0], + PublisherDomain: args[1], + Method: types.PublishMethod_PUSH, + PullUrl: "", + AllowedSubscribers: allowedSubscribers, + AllowedAddresses: allowedAddresses, + } + + msg, err := types.NewMsgAddPublisherIntentRequest(publisherIntent, signer) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} + +func GetCmdAddSubscriberIntent() *cobra.Command { + cmd := &cobra.Command{ + Use: "add-subscriber-intent [subscription-id] [subscriber-address] [publisher-domain]", + Args: cobra.ExactArgs(3), + Short: "Add a subscriber intent", + Long: strings.TrimSpace( + fmt.Sprintf(`Examples: +$ %s tx pubsub add-subscriber-intent 0x123801a7D398351b8bE11C439e05C5B3259aeC9B somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0 pullpublisher.example.com --from= +`, version.AppName), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + signer := clientCtx.GetFromAddress() + if signer == nil { + return fmt.Errorf("must include `--from` flag") + } + + subscriberIntent := types.SubscriberIntent{ + SubscriptionId: args[0], + SubscriberAddress: args[1], + PublisherDomain: args[2], + } + + msg, err := types.NewMsgAddSubscriberIntentRequest(subscriberIntent, signer) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} + +func GetCmdAddSubscriber() *cobra.Command { + cmd := &cobra.Command{ + Use: "add-subscriber [address] ", + Args: cobra.MinimumNArgs(1), + Short: "Add a subscriber", + Long: strings.TrimSpace( + fmt.Sprintf(`Examples: +$ %s tx pubsub add-subscriber somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0 --from= +$ %s tx pubsub add-subscriber somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0 "sommvalidator.example.com:5734" --from= +`, version.AppName, version.AppName), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + if len(args) > 3 { + return fmt.Errorf("too many arguments") + } + + signer := clientCtx.GetFromAddress() + if signer == nil { + return fmt.Errorf("must include `--from` flag") + } + + if len(args) > 1 && len(args) != 3 { + return fmt.Errorf("must include both CA cert path and push URL for push subscriptions") + } + + caCert := "" + pushURL := "" + + if len(args) == 3 { + caCertContent, err := ioutil.ReadFile(args[1]) + if err != nil { + return fmt.Errorf("cannot read CA cert: %s", err) + } + caCert = string(caCertContent) + pushURL = args[2] + } + + subscriber := types.Subscriber{ + Address: args[0], + CaCert: caCert, + PushUrl: pushURL, + } + + msg, err := types.NewMsgAddSubscriberRequest(subscriber, signer) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} + +func GetCmdRemovePublisherIntent() *cobra.Command { + cmd := &cobra.Command{ + Use: "remove-publisher-intent [subscription-id] [publisher-domain]", + Args: cobra.ExactArgs(2), + Short: "Remove a publisher intent", + Long: strings.TrimSpace( + fmt.Sprintf(`Examples: +$ %s tx pubsub remove-publisher-intent 0x123801a7D398351b8bE11C439e05C5B3259aeC9B pushpublisher.example.com --from= +`, version.AppName), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + signer := clientCtx.GetFromAddress() + if signer == nil { + return fmt.Errorf("must include `--from` flag") + } + + msg, err := types.NewMsgRemovePublisherIntentRequest(args[0], args[1], signer) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} + +func GetCmdRemoveSubscriberIntent() *cobra.Command { + cmd := &cobra.Command{ + Use: "remove-subscriber-intent [subscription-id] [subscriber-address]", + Args: cobra.ExactArgs(2), + Short: "Remove a subcriber intent", + Long: strings.TrimSpace( + fmt.Sprintf(`Examples: +$ %s tx pubsub remove-subscriber-intent 0x123801a7D398351b8bE11C439e05C5B3259aeC9B somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0 --from= +`, version.AppName), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + signer := clientCtx.GetFromAddress() + if signer == nil { + return fmt.Errorf("must include `--from` flag") + } + + msg, err := types.NewMsgRemoveSubscriberIntentRequest(args[0], args[1], signer) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} + +func GetCmdRemoveSubscriber() *cobra.Command { + cmd := &cobra.Command{ + Use: "remove-subscriber [subscriber-address]", + Args: cobra.ExactArgs(1), + Short: "Remove a subcriber", + Long: strings.TrimSpace( + fmt.Sprintf(`Examples: +$ %s tx pubsub remove-subscriber somm1y6d5kasehecexf09ka6y0ggl0pxzt6dg6n8lw0 --from= +`, version.AppName), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + signer := clientCtx.GetFromAddress() + if signer == nil { + return fmt.Errorf("must include `--from` flag") + } + + msg, err := types.NewMsgRemoveSubscriberRequest(args[0], signer) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} + +func GetCmdRemovePublisher() *cobra.Command { + cmd := &cobra.Command{ + Use: "remove-publisher [publisher-domain]", + Args: cobra.ExactArgs(1), + Short: "Remove a publisher", + Long: strings.TrimSpace( + fmt.Sprintf(`Examples: +$ %s tx pubsub remove-publisher publisher.example.com --from= +`, version.AppName), + ), + RunE: func(cmd *cobra.Command, args []string) error { + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + signer := clientCtx.GetFromAddress() + if signer == nil { + return fmt.Errorf("must include `--from` flag") + } + + msg, err := types.NewMsgRemovePublisherRequest(args[0], signer) + if err != nil { + return err + } + + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + return cmd +} + +func parseAllowedSubscribers(allowedSubscribers string) (types.AllowedSubscribers, error) { + switch allowedSubscribers { + case types.AllowedSubscribers_ANY.String(): + return types.AllowedSubscribers_ANY, nil + case types.AllowedSubscribers_VALIDATORS.String(): + return types.AllowedSubscribers_VALIDATORS, nil + case types.AllowedSubscribers_LIST.String(): + return types.AllowedSubscribers_LIST, nil + default: + return types.AllowedSubscribers_ANY, fmt.Errorf("invalid allowed subcribers selection, choose ANY, VALIDATORS, or LIST: %s", allowedSubscribers) + } } diff --git a/x/pubsub/client/proposal_handler.go b/x/pubsub/client/proposal_handler.go index 5e5dcd9e..762874dc 100644 --- a/x/pubsub/client/proposal_handler.go +++ b/x/pubsub/client/proposal_handler.go @@ -2,8 +2,8 @@ package client import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" - "github.com/peggyjv/sommelier/v4/x/pubsub/client/cli" - "github.com/peggyjv/sommelier/v4/x/pubsub/client/rest" + "github.com/peggyjv/sommelier/v7/x/pubsub/client/cli" + "github.com/peggyjv/sommelier/v7/x/pubsub/client/rest" ) var ( diff --git a/x/pubsub/client/rest/rest.go b/x/pubsub/client/rest/rest.go index 31b0f289..06345c4c 100644 --- a/x/pubsub/client/rest/rest.go +++ b/x/pubsub/client/rest/rest.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/rest" govrest "github.com/cosmos/cosmos-sdk/x/gov/client/rest" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" ) // AddPublisherProposalRESTHandler returns a ProposalRESTHandler that exposes an add publisher REST handler with a given sub-route. diff --git a/x/pubsub/handler.go b/x/pubsub/handler.go index d0c334cd..e405d5a6 100644 --- a/x/pubsub/handler.go +++ b/x/pubsub/handler.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/peggyjv/sommelier/v4/x/pubsub/keeper" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/keeper" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" ) // NewHandler returns a handler for "pubsub" type messages diff --git a/x/pubsub/keeper/genesis.go b/x/pubsub/keeper/genesis.go index 317db9a1..935e1b17 100644 --- a/x/pubsub/keeper/genesis.go +++ b/x/pubsub/keeper/genesis.go @@ -4,7 +4,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" ) // InitGenesis initializes the module's state from a provided genesis diff --git a/x/pubsub/keeper/genesis_test.go b/x/pubsub/keeper/genesis_test.go index c9aabcb4..bc29408a 100644 --- a/x/pubsub/keeper/genesis_test.go +++ b/x/pubsub/keeper/genesis_test.go @@ -3,7 +3,7 @@ package keeper import ( "testing" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" "github.com/stretchr/testify/require" ) diff --git a/x/pubsub/keeper/keeper.go b/x/pubsub/keeper/keeper.go index 00a34827..a3fd289a 100644 --- a/x/pubsub/keeper/keeper.go +++ b/x/pubsub/keeper/keeper.go @@ -9,7 +9,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" ) type Keeper struct { diff --git a/x/pubsub/keeper/msg_server.go b/x/pubsub/keeper/msg_server.go index c8a00cf3..d44a81e8 100644 --- a/x/pubsub/keeper/msg_server.go +++ b/x/pubsub/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" ) var _ types.MsgServer = Keeper{} @@ -68,6 +68,12 @@ func (k Keeper) AddSubscriberIntent(c context.Context, msg *types.MsgAddSubscrib subscriberAddress := subscriberIntent.SubscriberAddress publisherDomain := subscriberIntent.PublisherDomain + signer := msg.MustGetSigner() + signerAddress := signer.String() + if signerAddress != subscriberIntent.SubscriberAddress { + return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "registered subscriber address must be signer: %s", subscriberIntent.SubscriberAddress) + } + // ValidateBasic will confirm this is already correctly formatted subscriberAccAddress, _ := sdk.AccAddressFromBech32(subscriberIntent.SubscriberAddress) subscriber, found := k.GetSubscriber(ctx, subscriberAccAddress) @@ -75,12 +81,6 @@ func (k Keeper) AddSubscriberIntent(c context.Context, msg *types.MsgAddSubscrib return nil, sdkerrors.Wrapf(sdkerrors.ErrNotFound, "no subscriber found with address: %s", subscriberAddress) } - signer := msg.MustGetSigner() - signerAddress := signer.String() - if signerAddress != subscriber.Address { - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "registered subscriber address must be signer: %s", subscriber.Address) - } - _, found = k.GetSubscriberIntent(ctx, subscriberIntent.SubscriptionId, subscriberAccAddress) if found { return nil, sdkerrors.Wrapf(types.ErrAlreadyExists, "subscriber already has intent for this subscription ID, must be removed first") @@ -91,6 +91,10 @@ func (k Keeper) AddSubscriberIntent(c context.Context, msg *types.MsgAddSubscrib return nil, sdkerrors.Wrapf(sdkerrors.ErrNotFound, "no publisher intent for domain %s and subscription ID %s found", publisherDomain, subscriptionID) } + if publisherIntent.Method == types.PublishMethod_PUSH && subscriber.PushUrl == "" { + return nil, sdkerrors.Wrapf(types.ErrInvalid, "publisher intent for subscription %s requires PushUrl set on subscriber", publisherIntent.SubscriptionId) + } + if publisherIntent.AllowedSubscribers == types.AllowedSubscribers_VALIDATORS { // TODO(bolten): this implementation ends up making the module sort of non-generic but is necessary to allow // orchestrator keys to manipulate subscriptions @@ -148,6 +152,11 @@ func (k Keeper) AddSubscriber(c context.Context, msg *types.MsgAddSubscriberRequ return nil, sdkerrors.Wrapf(types.ErrInvalid, "invalid subscriber: %s", err.Error()) } + signer := msg.MustGetSigner() + if signer.String() != subscriber.Address { + return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "subscriber address must be signer: %s", subscriber.Address) + } + // ValidateBasic will confirm this is already correctly formatted subscriberAccAddress, _ := sdk.AccAddressFromBech32(subscriber.Address) _, found := k.GetSubscriber(ctx, subscriberAccAddress) @@ -155,11 +164,6 @@ func (k Keeper) AddSubscriber(c context.Context, msg *types.MsgAddSubscriberRequ return nil, sdkerrors.Wrapf(types.ErrAlreadyExists, "subscriber already exists, must be removed first") } - signer := msg.MustGetSigner() - if signer.String() != subscriber.Address { - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "subscriber address must be signer: %s", subscriber.Address) - } - k.SetSubscriber(ctx, subscriberAccAddress, *subscriber) ctx.EventManager().EmitEvents( @@ -289,18 +293,18 @@ func (k Keeper) RemoveSubscriber(c context.Context, msg *types.MsgRemoveSubscrib return nil, sdkerrors.Wrap(sdkerrors.ErrInvalidAddress, fmt.Sprintf("invalid subscriber address: %s", err.Error())) } + signer := msg.MustGetSigner() + if signer.String() != subscriberAddress { + return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "registered subscriber address must be signer: %s", subscriberAddress) + } + // ValidateAddress will confirm this is already correctly formatted subscriberAccAddress, _ := sdk.AccAddressFromBech32(subscriberAddress) - subscriber, found := k.GetSubscriber(ctx, subscriberAccAddress) + _, found := k.GetSubscriber(ctx, subscriberAccAddress) if !found { return nil, sdkerrors.Wrapf(sdkerrors.ErrNotFound, "no subscriber found with address: %s", subscriberAddress) } - signer := msg.MustGetSigner() - if signer.String() != subscriber.Address { - return nil, sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "registered subscriber address must be signer: %s", subscriber.Address) - } - k.DeleteSubscriber(ctx, subscriberAccAddress) ctx.EventManager().EmitEvents( diff --git a/x/pubsub/keeper/proposal_handler.go b/x/pubsub/keeper/proposal_handler.go index 21731b74..29453862 100644 --- a/x/pubsub/keeper/proposal_handler.go +++ b/x/pubsub/keeper/proposal_handler.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" ) // HandleAddPublisherProposal is a handler for executing a passed community publisher addition proposal diff --git a/x/pubsub/keeper/query_server.go b/x/pubsub/keeper/query_server.go index 025be88f..33c6d968 100644 --- a/x/pubsub/keeper/query_server.go +++ b/x/pubsub/keeper/query_server.go @@ -5,7 +5,7 @@ import ( "fmt" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" ) diff --git a/x/pubsub/module.go b/x/pubsub/module.go index 59bbc06f..9a72378e 100644 --- a/x/pubsub/module.go +++ b/x/pubsub/module.go @@ -18,9 +18,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" sim "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/peggyjv/sommelier/v4/x/pubsub/client/cli" - "github.com/peggyjv/sommelier/v4/x/pubsub/keeper" - "github.com/peggyjv/sommelier/v4/x/pubsub/types" + "github.com/peggyjv/sommelier/v7/x/pubsub/client/cli" + "github.com/peggyjv/sommelier/v7/x/pubsub/keeper" + "github.com/peggyjv/sommelier/v7/x/pubsub/types" ) var ( diff --git a/x/pubsub/types/genesis.pb.go b/x/pubsub/types/genesis.pb.go index 9955bb0e..0bef269a 100644 --- a/x/pubsub/types/genesis.pb.go +++ b/x/pubsub/types/genesis.pb.go @@ -118,16 +118,16 @@ var fileDescriptor_0c358cacca624823 = []byte{ // 342 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x41, 0x4f, 0xe2, 0x40, 0x18, 0x86, 0xdb, 0x85, 0x25, 0xd9, 0x61, 0x0f, 0xcb, 0x04, 0xd6, 0x06, 0x93, 0x91, 0x78, 0xe2, - 0xd4, 0x09, 0x48, 0xe2, 0x9d, 0x98, 0xa0, 0x9e, 0x4c, 0x7b, 0xf3, 0x42, 0x3a, 0x30, 0x96, 0x31, + 0xd4, 0x09, 0x68, 0xc2, 0x9d, 0x98, 0xa0, 0x9e, 0x4c, 0x7b, 0xf3, 0x42, 0x3a, 0x30, 0x96, 0x31, 0xb4, 0x33, 0xe9, 0x37, 0x6d, 0xe4, 0x5f, 0x78, 0xf4, 0x27, 0x71, 0xe4, 0xe8, 0xc9, 0x18, 0xf8, 0x23, 0x86, 0x69, 0x2d, 0x55, 0xb9, 0x35, 0xef, 0xfb, 0x3e, 0xcf, 0xd7, 0x64, 0xd0, 0x89, 0x4a, 0x19, 0xa4, 0x8c, 0x66, 0x03, 0x1a, 0xf2, 0x98, 0x83, 0x00, 0x57, 0x25, 0x52, 0x4b, 0xfc, 0x27, 0x2f, 0xdc, 0x6c, 0xd0, 0x6d, 0x87, 0x32, 0x94, 0x26, 0xa5, 0xfb, 0xaf, 0x7c, 0xd0, 0xfd, 0x7f, 0x20, 0x55, 0x90, 0x04, 0x11, 0x1c, 0xc9, 0x73, 0x85, 0xc9, 0xcf, 0x5f, 0x6a, 0xe8, 0xef, 0x24, 0x3f, 0xe1, 0xeb, 0x40, 0x73, 0x4c, 0x51, 0x23, 0x07, 0x1d, 0xbb, 0x67, 0xf7, 0x9b, 0xc3, 0x96, - 0x5b, 0x9e, 0x74, 0xef, 0x4c, 0x31, 0xae, 0xaf, 0xdf, 0xce, 0x2c, 0xaf, 0x98, 0xe1, 0x11, 0x42, - 0x2a, 0x65, 0x4b, 0x01, 0x0b, 0x9e, 0x80, 0xf3, 0xab, 0x57, 0xeb, 0x37, 0x87, 0xed, 0x2a, 0xf4, - 0x59, 0x7a, 0x95, 0x1d, 0xbe, 0x44, 0x4d, 0x48, 0x19, 0xcc, 0x12, 0xc1, 0xf6, 0x58, 0xcd, 0x60, + 0x5b, 0x9e, 0x74, 0xef, 0x4c, 0x31, 0xae, 0xaf, 0xdf, 0xce, 0x2c, 0xaf, 0x98, 0xe1, 0x4b, 0x84, + 0x54, 0xca, 0x96, 0x02, 0x16, 0x3c, 0x01, 0xe7, 0x57, 0xaf, 0xd6, 0x6f, 0x0e, 0xdb, 0x55, 0xe8, + 0xb3, 0xf4, 0x2a, 0x3b, 0x3c, 0x42, 0x4d, 0x48, 0x19, 0xcc, 0x12, 0xc1, 0xf6, 0x58, 0xcd, 0x60, 0x9d, 0x0a, 0xe6, 0x97, 0xad, 0x57, 0x5d, 0xe2, 0x09, 0x6a, 0x95, 0x9a, 0xa9, 0x88, 0x35, 0x8f, 0x35, 0x38, 0x75, 0x83, 0x77, 0x8f, 0x5d, 0xbd, 0x31, 0x13, 0xef, 0x9f, 0xfa, 0x1a, 0x00, 0xbe, 0x45, 0xf8, 0xe0, 0x2d, 0x4d, 0xbf, 0x8d, 0xe9, 0xf4, 0xe8, 0x8f, 0x14, 0xaa, 0x16, 0x7c, 0x4b, @@ -136,8 +136,8 @@ var fileDescriptor_0c358cacca624823 = []byte{ 0xbd, 0xde, 0x12, 0x7b, 0xb3, 0x25, 0xf6, 0xfb, 0x96, 0xd8, 0xcf, 0x3b, 0x62, 0x6d, 0x76, 0xc4, 0x7a, 0xdd, 0x11, 0xeb, 0xde, 0x0d, 0x85, 0x5e, 0xa4, 0xcc, 0x9d, 0xc9, 0x88, 0x2a, 0x1e, 0x86, 0xab, 0xc7, 0x8c, 0x82, 0x8c, 0x22, 0xbe, 0x14, 0x3c, 0xa1, 0xd9, 0x88, 0x3e, 0x15, 0x8f, 0x4c, - 0xf5, 0x4a, 0x71, 0x60, 0x0d, 0xf3, 0xd6, 0x17, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x61, 0x7b, - 0xa4, 0x20, 0x57, 0x02, 0x00, 0x00, + 0xf5, 0x4a, 0x71, 0x60, 0x0d, 0xf3, 0xd6, 0x17, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x49, 0xd2, + 0xba, 0x78, 0x57, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/pubsub/types/msgs.go b/x/pubsub/types/msgs.go index 0e2d7b4f..27b89fae 100644 --- a/x/pubsub/types/msgs.go +++ b/x/pubsub/types/msgs.go @@ -140,7 +140,7 @@ func (m *MsgAddSubscriberIntentRequest) MustGetSigner() sdk.AccAddress { ///////////////////////////// // NewMsgAddSubscriberRequest returns a new MsgAddSubscriberRequest -func NewMsgAddSubscriber(subscriber Subscriber, signer sdk.AccAddress) (*MsgAddSubscriberRequest, error) { +func NewMsgAddSubscriberRequest(subscriber Subscriber, signer sdk.AccAddress) (*MsgAddSubscriberRequest, error) { if signer == nil { return nil, fmt.Errorf("no signer provided") } @@ -194,7 +194,7 @@ func (m *MsgAddSubscriberRequest) MustGetSigner() sdk.AccAddress { ///////////////////////////////////// // NewMsgRemovePublisherIntentRequest returns a new MsgRemovePublisherIntentRequest -func NewMsgRemovePublisherIntent(subscriptionID string, publisherDomain string, signer sdk.AccAddress) (*MsgRemovePublisherIntentRequest, error) { +func NewMsgRemovePublisherIntentRequest(subscriptionID string, publisherDomain string, signer sdk.AccAddress) (*MsgRemovePublisherIntentRequest, error) { if signer == nil { return nil, fmt.Errorf("no signer provided") } @@ -253,14 +253,14 @@ func (m *MsgRemovePublisherIntentRequest) MustGetSigner() sdk.AccAddress { ////////////////////////////////////// // NewMsgRemoveSubscriberIntentRequest returns a new MsgRemoveSubscriberIntentRequest -func NewMsgRemoveSubscriberIntentRequest(subscriptionID string, subscriberAddress sdk.AccAddress, signer sdk.AccAddress) (*MsgRemoveSubscriberIntentRequest, error) { +func NewMsgRemoveSubscriberIntentRequest(subscriptionID string, subscriberAddress string, signer sdk.AccAddress) (*MsgRemoveSubscriberIntentRequest, error) { if signer == nil { return nil, fmt.Errorf("no signer provided") } return &MsgRemoveSubscriberIntentRequest{ SubscriptionId: subscriptionID, - SubscriberAddress: subscriberAddress.String(), + SubscriberAddress: subscriberAddress, Signer: signer.String(), }, nil } @@ -312,13 +312,13 @@ func (m *MsgRemoveSubscriberIntentRequest) MustGetSigner() sdk.AccAddress { //////////////////////////////// // NewMsgRemoveSubscriberRequest returns a new MsgRemoveSubscriberRequest -func NewMsgRemoveSubscriber(subscriberAddress sdk.AccAddress, signer sdk.AccAddress) (*MsgRemoveSubscriberRequest, error) { +func NewMsgRemoveSubscriberRequest(subscriberAddress string, signer sdk.AccAddress) (*MsgRemoveSubscriberRequest, error) { if signer == nil { return nil, fmt.Errorf("no signer provided") } return &MsgRemoveSubscriberRequest{ - SubscriberAddress: subscriberAddress.String(), + SubscriberAddress: subscriberAddress, Signer: signer.String(), }, nil } @@ -366,7 +366,7 @@ func (m *MsgRemoveSubscriberRequest) MustGetSigner() sdk.AccAddress { /////////////////////////////// // NewMsgRemovePublisherRequest returns a new MsgRemovePublisherRequest -func NewMsgRemovePublisher(publisherDomain string, signer sdk.AccAddress) (*MsgRemovePublisherRequest, error) { +func NewMsgRemovePublisherRequest(publisherDomain string, signer sdk.AccAddress) (*MsgRemovePublisherRequest, error) { if signer == nil { return nil, fmt.Errorf("no signer provided") } diff --git a/x/pubsub/types/params.pb.go b/x/pubsub/types/params.pb.go index ef8de08c..8cdf592b 100644 --- a/x/pubsub/types/params.pb.go +++ b/x/pubsub/types/params.pb.go @@ -74,9 +74,9 @@ var fileDescriptor_e023d277dcf562c9 = []byte{ 0x0b, 0xe4, 0x19, 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, 0xbf, 0x20, 0x35, 0x3d, 0xbd, - 0x32, 0xab, 0x4c, 0xbf, 0x38, 0x3f, 0x37, 0x37, 0x35, 0x27, 0x33, 0xb5, 0x48, 0xbf, 0xcc, 0x44, + 0x32, 0xab, 0x4c, 0xbf, 0x38, 0x3f, 0x37, 0x37, 0x35, 0x27, 0x33, 0xb5, 0x48, 0xbf, 0xcc, 0x5c, 0xbf, 0x42, 0x1f, 0xea, 0x88, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, 0x05, 0xc6, 0x80, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xcd, 0xdb, 0x39, 0x9b, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0xff, 0xff, 0xce, 0x64, 0xc5, 0x61, 0x9b, 0x00, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/pubsub/types/pubsub.go b/x/pubsub/types/pubsub.go index fca7d6ac..aad315ca 100644 --- a/x/pubsub/types/pubsub.go +++ b/x/pubsub/types/pubsub.go @@ -44,21 +44,23 @@ func (s *Subscriber) ValidateBasic() error { return fmt.Errorf("invalid address: %s", err.Error()) } - // if a subcsriber does not provide a domain and ca_cert, they will not be able to + // if a subcsriber does not provide a CA cert and push URL, they will not be able to // subscribe to any publisher intents that use the PUSH method - if s.Domain != "" { - if err := ValidateDomain(s.Domain); err != nil { - return fmt.Errorf("invalid domain: %s", err.Error()) - } - } - if s.CaCert != "" { if err := ValidateCaCertificate(s.CaCert); err != nil { return fmt.Errorf("invalid CA certificate: %s", err.Error()) } } + // PushUrl is optional, but SubscriberIntents will be rejected if the PublisherIntent is using + // the PUSH method and this is missing + if s.PushUrl != "" { + if err := ValidateGenericURL(s.PushUrl); err != nil { + return fmt.Errorf("invalid push URL: %s", err.Error()) + } + } + return nil } @@ -127,14 +129,6 @@ func (si *SubscriberIntent) ValidateBasic() error { return fmt.Errorf("invalid publisher domain: %s", err.Error()) } - // PushUrl is optional, but the SubscriberIntent will be rejected if the publisher intent is using - // the PUSH method - if si.PushUrl != "" { - if err := ValidateGenericURL(si.PushUrl); err != nil { - return fmt.Errorf("invalid push URL: %s", err.Error()) - } - } - return nil } diff --git a/x/pubsub/types/pubsub.pb.go b/x/pubsub/types/pubsub.pb.go index 3ba2df1a..267ed480 100644 --- a/x/pubsub/types/pubsub.pb.go +++ b/x/pubsub/types/pubsub.pb.go @@ -150,10 +150,10 @@ func (m *Publisher) GetCaCert() string { type Subscriber struct { // unique key, account address representation of either an account or a validator Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` - // FQDN of the subscriber, max length of 256 - Domain string `protobuf:"bytes,2,opt,name=domain,proto3" json:"domain,omitempty"` // the subscriber's self-signed CA cert PEM file, expecting TLS 1.3 compatible ECDSA certificates, max length 4096 - CaCert string `protobuf:"bytes,3,opt,name=ca_cert,json=caCert,proto3" json:"ca_cert,omitempty"` + CaCert string `protobuf:"bytes,2,opt,name=ca_cert,json=caCert,proto3" json:"ca_cert,omitempty"` + // max length of 512 + PushUrl string `protobuf:"bytes,3,opt,name=push_url,json=pushUrl,proto3" json:"push_url,omitempty"` } func (m *Subscriber) Reset() { *m = Subscriber{} } @@ -196,16 +196,16 @@ func (m *Subscriber) GetAddress() string { return "" } -func (m *Subscriber) GetDomain() string { +func (m *Subscriber) GetCaCert() string { if m != nil { - return m.Domain + return m.CaCert } return "" } -func (m *Subscriber) GetCaCert() string { +func (m *Subscriber) GetPushUrl() string { if m != nil { - return m.CaCert + return m.PushUrl } return "" } @@ -309,8 +309,6 @@ type SubscriberIntent struct { SubscriberAddress string `protobuf:"bytes,2,opt,name=subscriber_address,json=subscriberAddress,proto3" json:"subscriber_address,omitempty"` // FQDN of the publisher, max length of 256 PublisherDomain string `protobuf:"bytes,3,opt,name=publisher_domain,json=publisherDomain,proto3" json:"publisher_domain,omitempty"` - // optional, only needs to be set if the PublisherIntent for this subscription uses the PUSH method, max length of 512 - PushUrl string `protobuf:"bytes,4,opt,name=push_url,json=pushUrl,proto3" json:"push_url,omitempty"` } func (m *SubscriberIntent) Reset() { *m = SubscriberIntent{} } @@ -367,13 +365,6 @@ func (m *SubscriberIntent) GetPublisherDomain() string { return "" } -func (m *SubscriberIntent) GetPushUrl() string { - if m != nil { - return m.PushUrl - } - return "" -} - // represents a default subscription voted in by governance that can be overridden by a subscriber type DefaultSubscription struct { // arbitary string representing a subscription, max length of 128 @@ -1042,49 +1033,49 @@ func init() { func init() { proto.RegisterFile("pubsub/v1/pubsub.proto", fileDescriptor_3164155f25b3675d) } var fileDescriptor_3164155f25b3675d = []byte{ - // 662 bytes of a gzipped FileDescriptorProto + // 669 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xcd, 0x36, 0x5f, 0xcd, 0x20, 0x5a, 0x77, 0x5b, 0xb5, 0x46, 0x08, 0x53, 0xcc, 0x81, 0xb6, - 0x40, 0x4c, 0x01, 0x89, 0xb3, 0x21, 0x87, 0x46, 0x0a, 0xa5, 0x4a, 0xfa, 0x21, 0xb8, 0x44, 0x76, - 0x76, 0xdb, 0x18, 0x39, 0x59, 0x6b, 0x77, 0x1d, 0xe8, 0x9d, 0x33, 0xe2, 0x6f, 0x20, 0x21, 0xc1, - 0x89, 0xdf, 0xc0, 0xb1, 0xdc, 0x90, 0xb8, 0xa0, 0xf6, 0x8f, 0xa0, 0xd8, 0x9b, 0xc4, 0x56, 0x53, - 0x3e, 0x44, 0x03, 0xdc, 0x3c, 0x33, 0xde, 0x79, 0x6f, 0xdf, 0xcc, 0x93, 0x0d, 0x8b, 0x41, 0xe8, - 0x8a, 0xd0, 0xb5, 0x7a, 0xeb, 0x56, 0xfc, 0x54, 0x0e, 0x38, 0x93, 0x0c, 0x97, 0x54, 0xd4, 0x5b, - 0x37, 0x77, 0xa1, 0xb4, 0x15, 0xba, 0xbe, 0x27, 0xda, 0x94, 0x63, 0x1d, 0x8a, 0x0e, 0x21, 0x9c, - 0x0a, 0xa1, 0xa3, 0x65, 0xb4, 0x52, 0xaa, 0x0f, 0x42, 0xbc, 0x08, 0x05, 0xc2, 0x3a, 0x8e, 0xd7, - 0xd5, 0xa7, 0xa2, 0x82, 0x8a, 0xf0, 0x12, 0x14, 0x5b, 0x4e, 0xb3, 0x45, 0xb9, 0xd4, 0xb3, 0x71, - 0xa1, 0xe5, 0x3c, 0xa2, 0x5c, 0x9a, 0x7b, 0x00, 0x8d, 0xd0, 0x15, 0x2d, 0xee, 0xb9, 0xe7, 0xdb, - 0xf8, 0xfd, 0x14, 0xcc, 0x0e, 0x19, 0x57, 0xbb, 0x92, 0x76, 0x25, 0xbe, 0x01, 0xb3, 0x22, 0x06, - 0x0b, 0xa4, 0xc7, 0xba, 0x4d, 0x8f, 0x28, 0x98, 0x99, 0x64, 0xba, 0x4a, 0xf0, 0x2a, 0x68, 0xc1, - 0xe0, 0x6c, 0x33, 0x85, 0x3b, 0x3b, 0xcc, 0x57, 0x62, 0x02, 0x77, 0xa0, 0xd0, 0xa1, 0xb2, 0xcd, - 0x48, 0x84, 0x3f, 0x73, 0x57, 0x2f, 0x0f, 0x45, 0x2b, 0x2b, 0xfc, 0xc7, 0x51, 0xbd, 0xae, 0xde, - 0xc3, 0x97, 0x60, 0x3a, 0x08, 0x7d, 0xbf, 0x19, 0x72, 0x5f, 0xcf, 0xc5, 0xb7, 0xec, 0xc7, 0x3b, - 0xdc, 0xc7, 0x9b, 0x30, 0xef, 0xf8, 0x3e, 0x7b, 0x41, 0x49, 0x53, 0x0c, 0x55, 0x11, 0x7a, 0x3e, - 0xea, 0x7c, 0x25, 0xd1, 0xd9, 0x8e, 0xdf, 0x1a, 0x49, 0x27, 0xea, 0xd8, 0x39, 0x95, 0xc3, 0x37, - 0x61, 0x6e, 0xd0, 0x4f, 0x09, 0x49, 0x85, 0x5e, 0x58, 0xce, 0xae, 0x94, 0xea, 0x9a, 0x2a, 0xd8, - 0x83, 0xbc, 0xf9, 0x01, 0x81, 0x36, 0x3a, 0xfc, 0xbb, 0x92, 0xdd, 0x06, 0x3c, 0xa2, 0x3c, 0x40, - 0x53, 0xa2, 0xcd, 0x8d, 0x2a, 0x0a, 0x6e, 0xac, 0xc2, 0xd9, 0xf1, 0x0a, 0x47, 0x7a, 0x89, 0x76, - 0x5a, 0x2f, 0xd1, 0xde, 0xe1, 0xbe, 0xe9, 0xc1, 0x7c, 0x85, 0xee, 0x3b, 0xa1, 0x2f, 0x1b, 0x09, - 0x36, 0x93, 0x98, 0xb3, 0xf9, 0x11, 0xc1, 0x82, 0x4d, 0xc8, 0x70, 0xa5, 0xb6, 0x38, 0x0b, 0x98, - 0x70, 0x7c, 0xbc, 0x00, 0x79, 0xe9, 0x49, 0x9f, 0x2a, 0x88, 0x38, 0xc0, 0xcb, 0x70, 0x81, 0xd0, - 0x21, 0x94, 0x6a, 0x9a, 0x4c, 0x25, 0x36, 0x3a, 0x9b, 0xda, 0xe8, 0x84, 0x07, 0x72, 0x69, 0x0f, - 0x5c, 0x86, 0x52, 0xc0, 0x19, 0xdb, 0x8f, 0x94, 0xc8, 0x47, 0xb5, 0xe9, 0x28, 0xd1, 0x5f, 0x9d, - 0x84, 0x11, 0x0a, 0x29, 0x23, 0x7c, 0x45, 0x70, 0x75, 0x1c, 0xf1, 0x3d, 0x4f, 0xb6, 0x2b, 0x34, - 0x60, 0xc2, 0x93, 0xff, 0xfb, 0x1d, 0xfa, 0xfd, 0x48, 0x4c, 0x55, 0x2f, 0xc6, 0xfd, 0x54, 0x68, - 0x7a, 0xb0, 0x54, 0xa7, 0x1d, 0xd6, 0xa3, 0x13, 0x1f, 0x8c, 0xf9, 0x1a, 0x81, 0x79, 0x06, 0xd6, - 0x84, 0xb5, 0x1c, 0xdc, 0x3d, 0x97, 0xbe, 0xfb, 0x3b, 0x04, 0x86, 0x4d, 0xc8, 0x18, 0x07, 0xfc, - 0xb1, 0x06, 0x63, 0x1c, 0x94, 0xfd, 0x65, 0x07, 0xe5, 0xc6, 0x3b, 0xe8, 0x33, 0x82, 0xd5, 0x1f, - 0xd3, 0x3d, 0x0f, 0x19, 0x27, 0xc0, 0x3c, 0x39, 0x82, 0x7c, 0x7a, 0x04, 0xaf, 0x10, 0x5c, 0x8b, - 0x77, 0xe2, 0x5f, 0x4e, 0xc1, 0x7c, 0x8b, 0xe0, 0xd6, 0x4f, 0x69, 0xfc, 0x55, 0x75, 0xcf, 0xdc, - 0xda, 0xb5, 0xeb, 0x70, 0x31, 0xf5, 0x5d, 0xc4, 0xd3, 0x90, 0xdb, 0xda, 0xa9, 0xd5, 0xb4, 0x4c, - 0xfc, 0xd4, 0xd8, 0xd0, 0xd0, 0xda, 0x03, 0xc0, 0xa7, 0x3f, 0x71, 0xb8, 0x08, 0x59, 0x7b, 0xf3, - 0xa9, 0x96, 0xc1, 0x33, 0x00, 0xbb, 0x76, 0xad, 0x5a, 0xb1, 0xb7, 0x9f, 0xd4, 0x1b, 0x1a, 0xea, - 0x1f, 0xac, 0x55, 0x1b, 0xdb, 0xda, 0xd4, 0xc3, 0x8d, 0x4f, 0xc7, 0x06, 0x3a, 0x3a, 0x36, 0xd0, - 0xb7, 0x63, 0x03, 0xbd, 0x39, 0x31, 0x32, 0x47, 0x27, 0x46, 0xe6, 0xcb, 0x89, 0x91, 0x79, 0x56, - 0x3e, 0xf0, 0x64, 0x3b, 0x74, 0xcb, 0x2d, 0xd6, 0xb1, 0x02, 0x7a, 0x70, 0x70, 0xf8, 0xbc, 0x67, - 0x09, 0xd6, 0xe9, 0x50, 0xdf, 0xa3, 0xdc, 0xea, 0xdd, 0xb7, 0x5e, 0xaa, 0x9f, 0x1f, 0x4b, 0x1e, - 0x06, 0x54, 0xb8, 0x85, 0xe8, 0x1f, 0xe8, 0xde, 0xf7, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4a, 0x9b, - 0x05, 0xe0, 0x1d, 0x09, 0x00, 0x00, + 0x10, 0xcd, 0xe6, 0xb3, 0x19, 0x44, 0xeb, 0x6e, 0xab, 0xd6, 0x08, 0x61, 0x8a, 0x39, 0xd0, 0x16, + 0x88, 0x29, 0x1c, 0x7a, 0x36, 0xe4, 0xd0, 0x48, 0xa1, 0x54, 0x49, 0x5b, 0x44, 0x2f, 0x91, 0x1d, + 0x6f, 0x1b, 0xa3, 0x4d, 0xd6, 0xf2, 0xae, 0x03, 0xbd, 0x73, 0x46, 0x5c, 0xf8, 0x11, 0x48, 0x48, + 0xdc, 0xf8, 0x0d, 0x1c, 0xcb, 0x0d, 0x89, 0x0b, 0x6a, 0xfe, 0x08, 0x8a, 0xbd, 0x4e, 0x6c, 0x35, + 0x2d, 0x20, 0x08, 0x70, 0xf3, 0xcc, 0x78, 0xdf, 0x7b, 0xfb, 0x66, 0x46, 0x36, 0x2c, 0x79, 0x81, + 0xcd, 0x03, 0xdb, 0xe8, 0x6f, 0x18, 0xd1, 0x53, 0xc5, 0xf3, 0x99, 0x60, 0xb8, 0x2c, 0xa3, 0xfe, + 0x86, 0xbe, 0x0f, 0xe5, 0x9d, 0xc0, 0xa6, 0x2e, 0xef, 0x10, 0x1f, 0xab, 0x50, 0xb2, 0x1c, 0xc7, + 0x27, 0x9c, 0xab, 0x68, 0x05, 0xad, 0x96, 0x1b, 0x71, 0x88, 0x97, 0xa0, 0xe8, 0xb0, 0xae, 0xe5, + 0xf6, 0xd4, 0x6c, 0x58, 0x90, 0x11, 0x5e, 0x86, 0x52, 0xdb, 0x6a, 0xb5, 0x89, 0x2f, 0xd4, 0x5c, + 0x54, 0x68, 0x5b, 0x8f, 0x88, 0x2f, 0xf4, 0x03, 0x80, 0x66, 0x60, 0xf3, 0xb6, 0xef, 0xda, 0x17, + 0x02, 0x27, 0x00, 0xb2, 0x49, 0x00, 0x7c, 0x05, 0x66, 0xbc, 0x80, 0x77, 0x5a, 0x81, 0x4f, 0x25, + 0x74, 0x69, 0x18, 0xef, 0xf9, 0x54, 0xff, 0x90, 0x85, 0xb9, 0x91, 0xe8, 0x5a, 0x4f, 0x90, 0x9e, + 0xc0, 0xb7, 0x60, 0x8e, 0x47, 0x7c, 0x9e, 0x70, 0x59, 0xaf, 0xe5, 0x3a, 0x92, 0x69, 0x36, 0x99, + 0xae, 0x39, 0x78, 0x0d, 0x14, 0x2f, 0x3e, 0xdb, 0x4a, 0xdd, 0x69, 0x6e, 0x94, 0xaf, 0x46, 0x97, + 0xbb, 0x07, 0xc5, 0x2e, 0x11, 0x1d, 0xe6, 0x84, 0x02, 0x66, 0xef, 0xab, 0x95, 0x91, 0x6f, 0x15, + 0xc9, 0xff, 0x38, 0xac, 0x37, 0xe4, 0x7b, 0x91, 0x68, 0x4a, 0x43, 0xd1, 0xf9, 0x58, 0x34, 0xa5, + 0x7b, 0x3e, 0xc5, 0xdb, 0xb0, 0x60, 0x51, 0xca, 0x5e, 0x10, 0xa7, 0xc5, 0x47, 0xc6, 0x70, 0xb5, + 0x10, 0x22, 0x5f, 0x4b, 0x20, 0x9b, 0xd1, 0x5b, 0x63, 0xf7, 0x78, 0x03, 0x5b, 0x67, 0x72, 0xf8, + 0x36, 0xcc, 0xc7, 0x78, 0xd2, 0x4b, 0xc2, 0xd5, 0xe2, 0x4a, 0x6e, 0xb5, 0xdc, 0x50, 0x64, 0xc1, + 0x8c, 0xf3, 0xfa, 0x5b, 0x04, 0xca, 0xf8, 0xf0, 0xaf, 0x5a, 0x76, 0x17, 0xf0, 0x58, 0x72, 0xcc, + 0x26, 0x4d, 0x9b, 0x1f, 0x57, 0x24, 0xdd, 0x44, 0x87, 0x73, 0x13, 0x1d, 0xd6, 0x5d, 0x58, 0xa8, + 0x92, 0x43, 0x2b, 0xa0, 0xa2, 0x99, 0xa0, 0x9c, 0x46, 0x33, 0xf5, 0x8f, 0x08, 0x16, 0x4d, 0xc7, + 0x19, 0xcd, 0xcd, 0x8e, 0xcf, 0x3c, 0xc6, 0x2d, 0x8a, 0x17, 0xa1, 0x20, 0x5c, 0x41, 0x89, 0xa4, + 0x88, 0x02, 0xbc, 0x02, 0x97, 0x1c, 0x32, 0xa2, 0x92, 0xa0, 0xc9, 0x54, 0x62, 0x25, 0x72, 0xa9, + 0x95, 0x48, 0xcc, 0x7a, 0x3e, 0x3d, 0xeb, 0x57, 0xa1, 0xec, 0xf9, 0x8c, 0x1d, 0x86, 0xe3, 0x51, + 0x08, 0x6b, 0x33, 0x61, 0x62, 0x38, 0x1f, 0x89, 0x45, 0x28, 0xa6, 0x36, 0xe9, 0x2b, 0x82, 0xeb, + 0x93, 0x84, 0x3f, 0x75, 0x45, 0xa7, 0x4a, 0x3c, 0xc6, 0x5d, 0xf1, 0xbf, 0xdf, 0x61, 0x88, 0xe7, + 0x44, 0x52, 0xd5, 0x52, 0x84, 0x27, 0x43, 0xdd, 0x85, 0xe5, 0x06, 0xe9, 0xb2, 0x3e, 0x99, 0x7a, + 0x63, 0xf4, 0xd7, 0x08, 0xf4, 0x73, 0xb8, 0xa6, 0xec, 0x65, 0x7c, 0xf7, 0x7c, 0xfa, 0xee, 0xef, + 0x11, 0x68, 0xa6, 0xe3, 0x4c, 0xd8, 0x80, 0xdf, 0xf6, 0x60, 0xc2, 0x06, 0xe5, 0x7e, 0x7a, 0x83, + 0xf2, 0x93, 0x37, 0xe8, 0x33, 0x82, 0xb5, 0x8b, 0xe5, 0xfe, 0x09, 0x1b, 0xa7, 0xa0, 0x3c, 0xd9, + 0x82, 0x42, 0xba, 0x05, 0xaf, 0x10, 0xdc, 0x88, 0x66, 0xe2, 0x5f, 0x76, 0x41, 0x7f, 0x87, 0xe0, + 0xce, 0x0f, 0x65, 0xfc, 0x55, 0x77, 0xcf, 0x9d, 0xda, 0xf5, 0x9b, 0x70, 0x39, 0xf5, 0xf1, 0xc3, + 0x33, 0x90, 0xdf, 0xd9, 0xab, 0xd7, 0x95, 0x4c, 0xf4, 0xd4, 0xdc, 0x52, 0xd0, 0xfa, 0x26, 0xe0, + 0xb3, 0xdf, 0x31, 0x5c, 0x82, 0x9c, 0xb9, 0xfd, 0x4c, 0xc9, 0xe0, 0x59, 0x80, 0x7d, 0xb3, 0x5e, + 0xab, 0x9a, 0xbb, 0x4f, 0x1a, 0x4d, 0x05, 0x0d, 0x0f, 0xd6, 0x6b, 0xcd, 0x5d, 0x25, 0xfb, 0x70, + 0xeb, 0xd3, 0xa9, 0x86, 0x4e, 0x4e, 0x35, 0xf4, 0xed, 0x54, 0x43, 0x6f, 0x06, 0x5a, 0xe6, 0x64, + 0xa0, 0x65, 0xbe, 0x0c, 0xb4, 0xcc, 0x41, 0xe5, 0xc8, 0x15, 0x9d, 0xc0, 0xae, 0xb4, 0x59, 0xd7, + 0xf0, 0xc8, 0xd1, 0xd1, 0xf1, 0xf3, 0xbe, 0xc1, 0x59, 0xb7, 0x4b, 0xa8, 0x4b, 0x7c, 0xa3, 0xbf, + 0x69, 0xbc, 0x94, 0x3f, 0x39, 0x86, 0x38, 0xf6, 0x08, 0xb7, 0x8b, 0xe1, 0xbf, 0xce, 0x83, 0xef, + 0x01, 0x00, 0x00, 0xff, 0xff, 0x01, 0xf6, 0x8b, 0x39, 0x05, 0x09, 0x00, 0x00, } func (m *Publisher) Marshal() (dAtA []byte, err error) { @@ -1151,18 +1142,18 @@ func (m *Subscriber) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.PushUrl) > 0 { + i -= len(m.PushUrl) + copy(dAtA[i:], m.PushUrl) + i = encodeVarintPubsub(dAtA, i, uint64(len(m.PushUrl))) + i-- + dAtA[i] = 0x1a + } if len(m.CaCert) > 0 { i -= len(m.CaCert) copy(dAtA[i:], m.CaCert) i = encodeVarintPubsub(dAtA, i, uint64(len(m.CaCert))) i-- - dAtA[i] = 0x1a - } - if len(m.Domain) > 0 { - i -= len(m.Domain) - copy(dAtA[i:], m.Domain) - i = encodeVarintPubsub(dAtA, i, uint64(len(m.Domain))) - i-- dAtA[i] = 0x12 } if len(m.Address) > 0 { @@ -1258,13 +1249,6 @@ func (m *SubscriberIntent) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.PushUrl) > 0 { - i -= len(m.PushUrl) - copy(dAtA[i:], m.PushUrl) - i = encodeVarintPubsub(dAtA, i, uint64(len(m.PushUrl))) - i-- - dAtA[i] = 0x22 - } if len(m.PublisherDomain) > 0 { i -= len(m.PublisherDomain) copy(dAtA[i:], m.PublisherDomain) @@ -1804,11 +1788,11 @@ func (m *Subscriber) Size() (n int) { if l > 0 { n += 1 + l + sovPubsub(uint64(l)) } - l = len(m.Domain) + l = len(m.CaCert) if l > 0 { n += 1 + l + sovPubsub(uint64(l)) } - l = len(m.CaCert) + l = len(m.PushUrl) if l > 0 { n += 1 + l + sovPubsub(uint64(l)) } @@ -1866,10 +1850,6 @@ func (m *SubscriberIntent) Size() (n int) { if l > 0 { n += 1 + l + sovPubsub(uint64(l)) } - l = len(m.PushUrl) - if l > 0 { - n += 1 + l + sovPubsub(uint64(l)) - } return n } @@ -2321,7 +2301,7 @@ func (m *Subscriber) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Domain", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field CaCert", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2349,11 +2329,11 @@ func (m *Subscriber) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Domain = string(dAtA[iNdEx:postIndex]) + m.CaCert = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field CaCert", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field PushUrl", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2381,7 +2361,7 @@ func (m *Subscriber) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.CaCert = string(dAtA[iNdEx:postIndex]) + m.PushUrl = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -2745,38 +2725,6 @@ func (m *SubscriberIntent) Unmarshal(dAtA []byte) error { } m.PublisherDomain = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PushUrl", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowPubsub - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthPubsub - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthPubsub - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PushUrl = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipPubsub(dAtA[iNdEx:]) diff --git a/x/pubsub/types/query.pb.go b/x/pubsub/types/query.pb.go index d57bd107..0d720002 100644 --- a/x/pubsub/types/query.pb.go +++ b/x/pubsub/types/query.pb.go @@ -1486,82 +1486,82 @@ func init() { proto.RegisterFile("pubsub/v1/query.proto", fileDescriptor_1eae429 var fileDescriptor_1eae429cdae9f3b6 = []byte{ // 1233 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0x4b, 0x6f, 0x1c, 0x45, - 0x10, 0xf6, 0x04, 0xb0, 0xe4, 0x8a, 0x14, 0xdb, 0x95, 0x75, 0xe2, 0xac, 0xe3, 0xb1, 0xdd, 0x11, - 0x7e, 0xe1, 0xec, 0x60, 0xe3, 0xc8, 0x79, 0x81, 0x14, 0xcb, 0x90, 0x07, 0x21, 0x38, 0x36, 0x02, + 0x10, 0xf6, 0x04, 0x88, 0xe4, 0x8a, 0x14, 0xdb, 0x95, 0x75, 0xe2, 0xac, 0xe3, 0xb1, 0xdd, 0x11, + 0x7e, 0xe1, 0xec, 0x60, 0x93, 0xc8, 0x79, 0x81, 0x14, 0xcb, 0x90, 0x07, 0x21, 0x38, 0x36, 0x02, 0x14, 0x0e, 0xab, 0x19, 0xef, 0xb0, 0x1e, 0xb4, 0xbb, 0x33, 0xde, 0x9e, 0x5d, 0xd9, 0x0a, 0x16, 0x02, 0x89, 0x33, 0x20, 0x0e, 0x48, 0x1c, 0xf8, 0x01, 0xfc, 0x03, 0x24, 0x4e, 0x9c, 0x72, 0x8c, 0xc4, 0x85, 0x13, 0x8a, 0x6c, 0x8e, 0x48, 0x1c, 0xb8, 0x70, 0x44, 0xee, 0xe9, 0x79, 0xec, 0x4c, - 0xf7, 0x4e, 0x7b, 0x13, 0xdf, 0xac, 0xea, 0xea, 0xaa, 0xef, 0xab, 0xae, 0xaa, 0xfd, 0x3c, 0x30, - 0xe2, 0xb5, 0x2c, 0xda, 0xb2, 0x8c, 0xf6, 0xa2, 0xb1, 0xd3, 0xb2, 0x9b, 0x7b, 0x25, 0xaf, 0xe9, - 0xfa, 0x2e, 0x0e, 0x04, 0xe6, 0x52, 0x7b, 0xb1, 0x58, 0xa8, 0xba, 0x55, 0x97, 0x59, 0x8d, 0xa3, - 0xbf, 0x02, 0x87, 0xe2, 0xc5, 0xaa, 0xeb, 0x56, 0x6b, 0xb6, 0x61, 0x7a, 0x8e, 0x61, 0x36, 0x1a, - 0xae, 0x6f, 0xfa, 0x8e, 0xdb, 0xa0, 0xfc, 0x74, 0x7e, 0xcb, 0xa5, 0x75, 0x97, 0x1a, 0x96, 0x49, - 0xed, 0x20, 0xae, 0xd1, 0x5e, 0xb4, 0x6c, 0xdf, 0x5c, 0x34, 0x3c, 0xb3, 0xea, 0x34, 0x98, 0x33, - 0xf7, 0x3d, 0x17, 0x23, 0xf0, 0xcc, 0xa6, 0x59, 0xa7, 0x02, 0x7b, 0x00, 0x86, 0xd9, 0x49, 0x01, - 0xf0, 0xe1, 0x51, 0xc4, 0x75, 0xe6, 0xbc, 0x61, 0xef, 0xb4, 0x6c, 0xea, 0x93, 0x77, 0xe0, 0x6c, - 0x87, 0x95, 0x7a, 0x6e, 0x83, 0xda, 0x68, 0x40, 0x7f, 0x10, 0x74, 0x54, 0x9b, 0xd4, 0x66, 0x4f, - 0x2f, 0x0d, 0x97, 0x22, 0x62, 0xa5, 0xc0, 0x75, 0xf5, 0xe5, 0x27, 0x7f, 0x4e, 0xf4, 0x6d, 0x70, - 0x37, 0xb2, 0x0a, 0x23, 0x41, 0x9c, 0x96, 0x55, 0x73, 0xe8, 0xb6, 0xdd, 0xe4, 0x09, 0x70, 0x0e, - 0x86, 0xbc, 0xd0, 0x56, 0xae, 0xb8, 0x75, 0xd3, 0x69, 0xb0, 0x98, 0x03, 0x1b, 0x83, 0x91, 0x7d, - 0x8d, 0x99, 0xc9, 0x7d, 0x38, 0x97, 0x8e, 0xc1, 0xe1, 0x2c, 0xc1, 0x40, 0xe4, 0xcc, 0x11, 0x15, - 0x92, 0x88, 0xa2, 0x0b, 0xb1, 0x1b, 0x19, 0x4d, 0x47, 0x8b, 0x38, 0xbf, 0x0f, 0xe7, 0x33, 0x27, - 0x3c, 0xd1, 0x32, 0x40, 0x14, 0xe1, 0x88, 0xfb, 0x4b, 0xd2, 0x4c, 0x09, 0x3f, 0x72, 0x9b, 0xa7, - 0xda, 0x6c, 0x59, 0x74, 0xab, 0xe9, 0x58, 0x31, 0xfb, 0xcb, 0x80, 0x34, 0x32, 0x96, 0xcd, 0x4a, - 0xa5, 0x69, 0x53, 0xca, 0xf9, 0x0f, 0xc7, 0x27, 0xb7, 0x82, 0x03, 0xb2, 0xce, 0x91, 0x25, 0x03, - 0x71, 0x64, 0x57, 0x00, 0x62, 0x7f, 0x5e, 0x83, 0x91, 0x04, 0xb2, 0xc4, 0x95, 0x84, 0x23, 0xb9, - 0x90, 0x89, 0x18, 0x95, 0x61, 0x13, 0x46, 0xb3, 0x47, 0x3c, 0xdb, 0x0a, 0x9c, 0x8e, 0x83, 0x84, - 0x85, 0x90, 0xa4, 0x4b, 0x7a, 0x92, 0x1d, 0x18, 0xeb, 0xac, 0xed, 0xdd, 0x86, 0x6f, 0x37, 0xfc, - 0xe3, 0x77, 0x03, 0xce, 0xc0, 0x20, 0x0f, 0xec, 0x1d, 0x75, 0x7d, 0xd9, 0xa9, 0x8c, 0x9e, 0x62, - 0x9e, 0x67, 0x92, 0xe6, 0xbb, 0x15, 0x62, 0xc3, 0x45, 0x71, 0x4a, 0xce, 0xe5, 0xed, 0x64, 0x4e, - 0x87, 0x9d, 0xf1, 0xfa, 0x15, 0x45, 0x2f, 0xcb, 0x6f, 0xc7, 0x78, 0x02, 0x03, 0xd1, 0xc5, 0x69, - 0xa2, 0x72, 0x6e, 0xc3, 0xb8, 0xe4, 0x9c, 0xe3, 0xb8, 0x0d, 0xc3, 0x69, 0x1c, 0x61, 0x65, 0xbb, - 0x01, 0x19, 0x4a, 0x01, 0xa1, 0xe4, 0x11, 0x5c, 0x16, 0x66, 0x5a, 0x8d, 0x2d, 0x41, 0x0d, 0x7b, - 0x98, 0xc1, 0x3d, 0x28, 0xa9, 0xc6, 0x7e, 0xd1, 0xb4, 0x3e, 0x82, 0x05, 0x49, 0xea, 0xcd, 0xe4, - 0x83, 0xaf, 0x85, 0xac, 0x04, 0x0d, 0xa2, 0x09, 0x1b, 0x64, 0x57, 0x5a, 0xaf, 0x74, 0xe0, 0x17, - 0x4d, 0xa9, 0xcd, 0x7b, 0x26, 0x9e, 0x96, 0xce, 0x71, 0x38, 0xde, 0x7a, 0x50, 0x1f, 0x09, 0x87, - 0xf7, 0x62, 0x36, 0x2f, 0x67, 0x78, 0x07, 0x12, 0xe1, 0x3b, 0x87, 0x62, 0x4c, 0x38, 0xe5, 0x21, - 0x45, 0x9a, 0xb2, 0x90, 0x09, 0x49, 0xaa, 0x68, 0x2e, 0x6a, 0xa0, 0xcb, 0x1c, 0x38, 0x98, 0x7b, - 0x1d, 0x55, 0xe8, 0xac, 0x77, 0x57, 0x34, 0xc3, 0x69, 0x34, 0x94, 0x98, 0xf0, 0xba, 0x38, 0xdb, - 0x6a, 0xc2, 0xc4, 0xeb, 0xd9, 0xe3, 0x92, 0xfe, 0x02, 0x16, 0x8f, 0x91, 0xe2, 0x04, 0x38, 0x7e, - 0xcc, 0xfb, 0x59, 0x0e, 0xa0, 0xd7, 0x49, 0xf9, 0x9c, 0x4f, 0xbf, 0x42, 0xe4, 0x13, 0xe0, 0xf5, - 0x89, 0x3c, 0xfb, 0xf3, 0x2f, 0xb6, 0x7d, 0x30, 0x94, 0x83, 0x9f, 0x00, 0xb7, 0x7b, 0x30, 0xc1, - 0xd2, 0xaf, 0xd9, 0x9f, 0x9a, 0xad, 0x9a, 0x9f, 0xac, 0xe6, 0xb1, 0x5f, 0xa9, 0x05, 0x93, 0xf2, - 0x58, 0x1c, 0xfb, 0x43, 0x28, 0x54, 0x82, 0xe3, 0x72, 0xf2, 0x36, 0x9f, 0x71, 0x3d, 0x81, 0x5e, - 0x14, 0xe5, 0x6c, 0x25, 0x6b, 0x24, 0x44, 0x9e, 0x36, 0x1a, 0xf6, 0x5d, 0x98, 0xea, 0xe2, 0xc3, - 0xb1, 0x6d, 0xc2, 0x88, 0x08, 0x5b, 0x58, 0xda, 0x3c, 0x70, 0x05, 0x01, 0x38, 0xba, 0xf4, 0xcd, - 0x79, 0x78, 0x85, 0xa5, 0xc6, 0x1a, 0xf4, 0x07, 0x12, 0x15, 0xc7, 0x13, 0x91, 0xb2, 0xda, 0xb7, - 0xa8, 0xcb, 0x8e, 0x03, 0x9c, 0xe4, 0xd2, 0x57, 0xbf, 0xff, 0xf5, 0xfd, 0xa9, 0x71, 0x1c, 0x33, - 0xa8, 0x5b, 0xaf, 0xdb, 0x35, 0xc7, 0x6e, 0x1a, 0x69, 0xd1, 0x8d, 0xdf, 0x69, 0x70, 0xa6, 0xf3, - 0xd7, 0x05, 0x27, 0x33, 0x71, 0x53, 0xa2, 0xb8, 0x38, 0xd5, 0xc5, 0x83, 0x27, 0xbf, 0xce, 0x92, - 0x2f, 0xe3, 0x92, 0x38, 0x79, 0x24, 0x3e, 0x8d, 0xc7, 0xe9, 0x09, 0xd8, 0xc7, 0x2f, 0x35, 0x18, - 0x4c, 0x29, 0x5c, 0x94, 0xa7, 0x8c, 0xea, 0x41, 0xba, 0xb9, 0x70, 0x58, 0x33, 0x0c, 0xd6, 0x14, - 0x4e, 0xe4, 0xc0, 0xc2, 0x1f, 0x42, 0x0c, 0xf1, 0x74, 0x64, 0x31, 0x64, 0x04, 0x73, 0x16, 0x43, - 0x56, 0x0a, 0x93, 0x37, 0x19, 0x86, 0x15, 0xbc, 0x22, 0xc4, 0x90, 0x50, 0xa3, 0xc6, 0xe3, 0xec, - 0x5e, 0xdf, 0xc7, 0xaf, 0x35, 0x18, 0x4a, 0x0b, 0x5f, 0xec, 0x92, 0x37, 0xaa, 0xcf, 0xa5, 0xae, - 0x3e, 0x1c, 0xdc, 0x2c, 0x03, 0x47, 0x70, 0x32, 0x0f, 0x1c, 0xfe, 0xaa, 0x41, 0x41, 0xa4, 0x4b, - 0x70, 0x5a, 0xfa, 0x0e, 0x1d, 0xea, 0xa1, 0x38, 0x93, 0xeb, 0xc7, 0x31, 0x6d, 0x32, 0x4c, 0xef, - 0xe1, 0xbb, 0xdd, 0x1f, 0x2d, 0x5c, 0x71, 0x82, 0x96, 0x8a, 0x2a, 0x19, 0xae, 0xa6, 0x7d, 0xfc, - 0x51, 0x4b, 0xff, 0xcb, 0xc7, 0x77, 0x1d, 0xe6, 0xe1, 0x8a, 0x0a, 0x3a, 0x9b, 0xef, 0xc8, 0x19, - 0x94, 0x18, 0x83, 0x59, 0x9c, 0x56, 0x63, 0x80, 0xcf, 0x34, 0x98, 0x56, 0xd3, 0xb1, 0x78, 0x35, - 0x0f, 0x84, 0xec, 0xd7, 0xa7, 0x78, 0xad, 0x87, 0x9b, 0x9c, 0xcf, 0x2d, 0xc6, 0xe7, 0x06, 0x5e, - 0xeb, 0xf9, 0x45, 0xf0, 0x1f, 0x0d, 0x5e, 0x55, 0x92, 0xb5, 0xb8, 0x92, 0x8f, 0x53, 0xa8, 0x1b, - 0x8a, 0x57, 0x8f, 0x7f, 0xb1, 0xb7, 0x8e, 0x2b, 0x5b, 0x7b, 0xe5, 0x54, 0x83, 0x09, 0x3a, 0xee, + 0xf7, 0x4e, 0xef, 0x26, 0xbe, 0x59, 0xd5, 0xd5, 0x55, 0xdf, 0x57, 0x5d, 0x55, 0xfb, 0x79, 0x60, + 0xd4, 0x6b, 0x59, 0xb4, 0x65, 0x19, 0xed, 0x25, 0x63, 0xa7, 0x65, 0x37, 0xf7, 0x4a, 0x5e, 0xd3, + 0xf5, 0x5d, 0x1c, 0x0c, 0xcc, 0xa5, 0xf6, 0x52, 0xb1, 0x50, 0x75, 0xab, 0x2e, 0xb3, 0x1a, 0x47, + 0x7f, 0x05, 0x0e, 0xc5, 0x0b, 0x55, 0xd7, 0xad, 0xd6, 0x6c, 0xc3, 0xf4, 0x1c, 0xc3, 0x6c, 0x34, + 0x5c, 0xdf, 0xf4, 0x1d, 0xb7, 0x41, 0xf9, 0xe9, 0xc2, 0x96, 0x4b, 0xeb, 0x2e, 0x35, 0x2c, 0x93, + 0xda, 0x41, 0x5c, 0xa3, 0xbd, 0x64, 0xd9, 0xbe, 0xb9, 0x64, 0x78, 0x66, 0xd5, 0x69, 0x30, 0x67, + 0xee, 0x7b, 0x36, 0x46, 0xe0, 0x99, 0x4d, 0xb3, 0x4e, 0x05, 0xf6, 0x00, 0x0c, 0xb3, 0x93, 0x02, + 0xe0, 0xc3, 0xa3, 0x88, 0xeb, 0xcc, 0x79, 0xc3, 0xde, 0x69, 0xd9, 0xd4, 0x27, 0xef, 0xc0, 0x99, + 0x0e, 0x2b, 0xf5, 0xdc, 0x06, 0xb5, 0xd1, 0x80, 0x93, 0x41, 0xd0, 0x31, 0x6d, 0x4a, 0x9b, 0x3b, + 0xb5, 0x3c, 0x52, 0x8a, 0x88, 0x95, 0x02, 0xd7, 0xd5, 0x97, 0x9f, 0xfc, 0x39, 0x39, 0xb0, 0xc1, + 0xdd, 0xc8, 0x2a, 0x8c, 0x06, 0x71, 0x5a, 0x56, 0xcd, 0xa1, 0xdb, 0x76, 0x93, 0x27, 0xc0, 0x79, + 0x18, 0xf6, 0x42, 0x5b, 0xb9, 0xe2, 0xd6, 0x4d, 0xa7, 0xc1, 0x62, 0x0e, 0x6e, 0x0c, 0x45, 0xf6, + 0x35, 0x66, 0x26, 0xf7, 0xe1, 0x6c, 0x3a, 0x06, 0x87, 0xb3, 0x0c, 0x83, 0x91, 0x33, 0x47, 0x54, + 0x48, 0x22, 0x8a, 0x2e, 0xc4, 0x6e, 0x64, 0x2c, 0x1d, 0x2d, 0xe2, 0xfc, 0x3e, 0x9c, 0xcb, 0x9c, + 0xf0, 0x44, 0x97, 0x01, 0xa2, 0x08, 0x47, 0xdc, 0x5f, 0x92, 0x66, 0x4a, 0xf8, 0x91, 0xdb, 0x3c, + 0xd5, 0x66, 0xcb, 0xa2, 0x5b, 0x4d, 0xc7, 0x8a, 0xd9, 0x5f, 0x02, 0xa4, 0x91, 0xb1, 0x6c, 0x56, + 0x2a, 0x4d, 0x9b, 0x52, 0xce, 0x7f, 0x24, 0x3e, 0xb9, 0x15, 0x1c, 0x90, 0x75, 0x8e, 0x2c, 0x19, + 0x88, 0x23, 0xbb, 0x02, 0x10, 0xfb, 0xf3, 0x1a, 0x8c, 0x26, 0x90, 0x25, 0xae, 0x24, 0x1c, 0xc9, + 0xf9, 0x4c, 0xc4, 0xa8, 0x0c, 0x9b, 0x30, 0x96, 0x3d, 0xe2, 0xd9, 0x56, 0xe0, 0x54, 0x1c, 0x24, + 0x2c, 0x84, 0x24, 0x5d, 0xd2, 0x93, 0xec, 0xc0, 0x78, 0x67, 0x6d, 0xef, 0x36, 0x7c, 0xbb, 0xe1, + 0xf7, 0xde, 0x0d, 0x38, 0x0b, 0x43, 0x3c, 0xb0, 0x77, 0xd4, 0xf5, 0x65, 0xa7, 0x32, 0x76, 0x82, + 0x79, 0x9e, 0x4e, 0x9a, 0xef, 0x56, 0x88, 0x0d, 0x17, 0xc4, 0x29, 0x39, 0x97, 0xb7, 0x93, 0x39, + 0x1d, 0x76, 0xc6, 0xeb, 0x57, 0x14, 0xbd, 0x2c, 0xbf, 0x1d, 0xe3, 0x09, 0x0c, 0x44, 0x17, 0xa7, + 0x89, 0xca, 0xb9, 0x0d, 0x13, 0x92, 0x73, 0x8e, 0xe3, 0x36, 0x8c, 0xa4, 0x71, 0x84, 0x95, 0xed, + 0x06, 0x64, 0x38, 0x05, 0x84, 0x92, 0x47, 0x70, 0x49, 0x98, 0x69, 0x35, 0xb6, 0x04, 0x35, 0xec, + 0x63, 0x06, 0xf7, 0xa0, 0xa4, 0x1a, 0xfb, 0x45, 0xd3, 0xfa, 0x08, 0x16, 0x25, 0xa9, 0x37, 0x93, + 0x0f, 0xbe, 0x16, 0xb2, 0x12, 0x34, 0x88, 0x26, 0x6c, 0x90, 0x5d, 0x69, 0xbd, 0xd2, 0x81, 0x5f, + 0x34, 0xa5, 0x36, 0xef, 0x99, 0x78, 0x5a, 0x3a, 0xc7, 0xa1, 0xb7, 0xf5, 0xa0, 0x3e, 0x12, 0x0e, + 0xef, 0xc5, 0x6c, 0x5e, 0xce, 0xf0, 0x0e, 0x24, 0xc2, 0x77, 0x0e, 0xc5, 0xb8, 0x70, 0xca, 0x43, + 0x8a, 0x34, 0x65, 0x21, 0x93, 0x92, 0x54, 0xd1, 0x5c, 0xd4, 0x40, 0x97, 0x39, 0x70, 0x30, 0xf7, + 0x3a, 0xaa, 0xd0, 0x59, 0xef, 0xae, 0x68, 0x46, 0xd2, 0x68, 0x28, 0x31, 0xe1, 0x75, 0x71, 0xb6, + 0xd5, 0x84, 0x89, 0xd7, 0xb3, 0xcf, 0x25, 0xfd, 0x05, 0x2c, 0xf5, 0x90, 0xe2, 0x18, 0x38, 0x7e, + 0xcc, 0xfb, 0x59, 0x0e, 0xa0, 0xdf, 0x49, 0xf9, 0x9c, 0x4f, 0xbf, 0x42, 0xe4, 0x63, 0xe0, 0xf5, + 0x89, 0x3c, 0xfb, 0xf3, 0x2f, 0xb6, 0x7d, 0x30, 0x94, 0x83, 0x1f, 0x03, 0xb7, 0x7b, 0x30, 0xc9, + 0xd2, 0xaf, 0xd9, 0x9f, 0x9a, 0xad, 0x9a, 0x9f, 0xac, 0x66, 0xcf, 0xaf, 0xd4, 0x82, 0x29, 0x79, + 0x2c, 0x8e, 0xfd, 0x21, 0x14, 0x2a, 0xc1, 0x71, 0x39, 0x79, 0x9b, 0xcf, 0xb8, 0x9e, 0x40, 0x2f, + 0x8a, 0x72, 0xa6, 0x92, 0x35, 0x12, 0x22, 0x4f, 0x1b, 0x0d, 0xfb, 0x2e, 0x4c, 0x77, 0xf1, 0xe1, + 0xd8, 0x36, 0x61, 0x54, 0x84, 0x2d, 0x2c, 0x6d, 0x1e, 0xb8, 0x82, 0x00, 0x1c, 0x5d, 0xfe, 0xe6, + 0x1c, 0xbc, 0xc2, 0x52, 0x63, 0x0d, 0x4e, 0x06, 0x12, 0x15, 0x27, 0x12, 0x91, 0xb2, 0xda, 0xb7, + 0xa8, 0xcb, 0x8e, 0x03, 0x9c, 0xe4, 0xe2, 0x57, 0xbf, 0xff, 0xf5, 0xfd, 0x89, 0x09, 0x1c, 0x37, + 0xa8, 0x5b, 0xaf, 0xdb, 0x35, 0xc7, 0x6e, 0x1a, 0x69, 0xd1, 0x8d, 0xdf, 0x69, 0x70, 0xba, 0xf3, + 0xd7, 0x05, 0xa7, 0x32, 0x71, 0x53, 0xa2, 0xb8, 0x38, 0xdd, 0xc5, 0x83, 0x27, 0xbf, 0xce, 0x92, + 0x5f, 0xc6, 0x65, 0x71, 0xf2, 0x48, 0x7c, 0x1a, 0x8f, 0xd3, 0x13, 0xb0, 0x8f, 0x5f, 0x6a, 0x30, + 0x94, 0x52, 0xb8, 0x28, 0x4f, 0x19, 0xd5, 0x83, 0x74, 0x73, 0xe1, 0xb0, 0x66, 0x19, 0xac, 0x69, + 0x9c, 0xcc, 0x81, 0x85, 0x3f, 0x84, 0x18, 0xe2, 0xe9, 0xc8, 0x62, 0xc8, 0x08, 0xe6, 0x2c, 0x86, + 0xac, 0x14, 0x26, 0x6f, 0x32, 0x0c, 0x2b, 0x78, 0x45, 0x88, 0x21, 0xa1, 0x46, 0x8d, 0xc7, 0xd9, + 0xbd, 0xbe, 0x8f, 0x5f, 0x6b, 0x30, 0x9c, 0x16, 0xbe, 0xd8, 0x25, 0x6f, 0x54, 0x9f, 0x8b, 0x5d, + 0x7d, 0x38, 0xb8, 0x39, 0x06, 0x8e, 0xe0, 0x54, 0x1e, 0x38, 0xfc, 0x55, 0x83, 0x82, 0x48, 0x97, + 0xe0, 0x8c, 0xf4, 0x1d, 0x3a, 0xd4, 0x43, 0x71, 0x36, 0xd7, 0x8f, 0x63, 0xda, 0x64, 0x98, 0xde, + 0xc3, 0x77, 0xbb, 0x3f, 0x5a, 0xb8, 0xe2, 0x04, 0x2d, 0x15, 0x55, 0x32, 0x5c, 0x4d, 0xfb, 0xf8, + 0xa3, 0x96, 0xfe, 0x97, 0x8f, 0xef, 0x3a, 0xcc, 0xc3, 0x15, 0x15, 0x74, 0x2e, 0xdf, 0x91, 0x33, + 0x28, 0x31, 0x06, 0x73, 0x38, 0xa3, 0xc6, 0x00, 0x9f, 0x69, 0x30, 0xa3, 0xa6, 0x63, 0xf1, 0x6a, + 0x1e, 0x08, 0xd9, 0xaf, 0x4f, 0xf1, 0x5a, 0x1f, 0x37, 0x39, 0x9f, 0x5b, 0x8c, 0xcf, 0x0d, 0xbc, + 0xd6, 0xf7, 0x8b, 0xe0, 0x3f, 0x1a, 0xbc, 0xaa, 0x24, 0x6b, 0x71, 0x25, 0x1f, 0xa7, 0x50, 0x37, + 0x14, 0xaf, 0xf6, 0x7e, 0xb1, 0xbf, 0x8e, 0x2b, 0x5b, 0x7b, 0xe5, 0x54, 0x83, 0x09, 0x3a, 0xee, 0xb7, 0xb0, 0xe3, 0xd2, 0x3f, 0xb8, 0xd9, 0x8e, 0x93, 0x08, 0xee, 0x6c, 0xc7, 0xc9, 0x14, 0x32, 0xf9, 0x90, 0x31, 0x58, 0xc7, 0x07, 0x39, 0x73, 0x1c, 0x3f, 0x91, 0x60, 0xd7, 0x08, 0x48, 0xfc, - 0xa4, 0x65, 0x3e, 0x16, 0x84, 0x73, 0x93, 0x0b, 0x2e, 0x1a, 0x9c, 0x39, 0x05, 0x4f, 0xce, 0xc3, - 0x60, 0x3c, 0xe6, 0x70, 0x46, 0x91, 0x07, 0xfe, 0xad, 0xc1, 0x9c, 0xb2, 0xbe, 0xc5, 0x1b, 0xb9, - 0x48, 0xe4, 0xc2, 0xbb, 0x78, 0xb3, 0xb7, 0xcb, 0x9c, 0xd9, 0x1a, 0x63, 0xf6, 0x16, 0xde, 0x7c, + 0xa4, 0x65, 0x3e, 0x16, 0x84, 0x73, 0x93, 0x0b, 0x2e, 0x1a, 0x9c, 0x79, 0x05, 0x4f, 0xce, 0xc3, + 0x60, 0x3c, 0xe6, 0x71, 0x56, 0x91, 0x07, 0xfe, 0xad, 0xc1, 0xbc, 0xb2, 0xbe, 0xc5, 0x1b, 0xb9, + 0x48, 0xe4, 0xc2, 0xbb, 0x78, 0xb3, 0xbf, 0xcb, 0x9c, 0xd9, 0x1a, 0x63, 0xf6, 0x16, 0xde, 0x7c, 0x9e, 0x17, 0xc2, 0x7f, 0xc3, 0x4d, 0x91, 0xab, 0x79, 0xb3, 0x9b, 0x42, 0x55, 0x80, 0x67, 0x37, 0x85, 0xb2, 0xc0, 0x26, 0x1f, 0x30, 0x96, 0x0f, 0xf0, 0xbe, 0x22, 0x4b, 0xb5, 0x51, 0xfa, 0x4f, - 0x83, 0x19, 0x45, 0x39, 0x8c, 0x2a, 0xe0, 0x25, 0x1b, 0xf2, 0x7a, 0x2f, 0x57, 0x7b, 0x1c, 0xc0, - 0x23, 0xe2, 0xe9, 0x2d, 0x29, 0xda, 0x9b, 0xbf, 0x68, 0xfc, 0xbb, 0x97, 0x40, 0x5b, 0xe2, 0x7c, + 0x83, 0x59, 0x45, 0x39, 0x8c, 0x2a, 0xe0, 0x25, 0x1b, 0xf2, 0x7a, 0x3f, 0x57, 0xfb, 0x1c, 0xc0, + 0x23, 0xe2, 0xe9, 0x2d, 0x29, 0xda, 0x9b, 0xbf, 0x68, 0xfc, 0xbb, 0x97, 0x40, 0x5b, 0xe2, 0x42, 0x1a, 0xb0, 0x5c, 0xaf, 0x17, 0x5f, 0x53, 0xf2, 0x55, 0x6a, 0x56, 0xa1, 0x1c, 0x16, 0x3c, 0xdb, - 0xcf, 0x1a, 0x5c, 0x90, 0xea, 0x6b, 0x54, 0x01, 0x14, 0xcd, 0xde, 0x82, 0x9a, 0x33, 0x87, 0xbf, - 0xc4, 0xe0, 0x2f, 0xe0, 0xbc, 0x3a, 0xfc, 0xd5, 0x3b, 0x4f, 0x0e, 0x74, 0xed, 0xe9, 0x81, 0xae, - 0x3d, 0x3b, 0xd0, 0xb5, 0x6f, 0x0f, 0xf5, 0xbe, 0xa7, 0x87, 0x7a, 0xdf, 0x1f, 0x87, 0x7a, 0xdf, + 0xcf, 0x1a, 0x9c, 0x97, 0xea, 0x6b, 0x54, 0x01, 0x14, 0xcd, 0xde, 0xa2, 0x9a, 0x33, 0x87, 0xbf, + 0xcc, 0xe0, 0x2f, 0xe2, 0x82, 0x3a, 0xfc, 0xd5, 0x3b, 0x4f, 0x0e, 0x74, 0xed, 0xe9, 0x81, 0xae, + 0x3d, 0x3b, 0xd0, 0xb5, 0x6f, 0x0f, 0xf5, 0x81, 0xa7, 0x87, 0xfa, 0xc0, 0x1f, 0x87, 0xfa, 0xc0, 0xa3, 0x52, 0xd5, 0xf1, 0xb7, 0x5b, 0x56, 0x69, 0xcb, 0xad, 0x1b, 0x9e, 0x5d, 0xad, 0xee, 0x7d, - 0xd6, 0x4e, 0xc4, 0x6d, 0x2f, 0x1b, 0xbb, 0x61, 0x70, 0x7f, 0xcf, 0xb3, 0xa9, 0xd5, 0xcf, 0xbe, - 0x60, 0xbf, 0xf1, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x12, 0x41, 0x6e, 0xff, 0x75, 0x17, 0x00, + 0xd6, 0x4e, 0xc4, 0x6d, 0xaf, 0x18, 0xbb, 0x61, 0x70, 0x7f, 0xcf, 0xb3, 0xa9, 0x75, 0x92, 0x7d, + 0xc1, 0x7e, 0xe3, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3a, 0xe8, 0x70, 0xa7, 0x75, 0x17, 0x00, 0x00, } diff --git a/x/pubsub/types/tx.pb.go b/x/pubsub/types/tx.pb.go index fc7e5c7e..c20f0646 100644 --- a/x/pubsub/types/tx.pb.go +++ b/x/pubsub/types/tx.pb.go @@ -682,40 +682,40 @@ var fileDescriptor_de188e882df4c8a7 = []byte{ // 574 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xcf, 0x6e, 0xd3, 0x40, 0x10, 0xc6, 0xeb, 0x54, 0x54, 0xea, 0x20, 0x48, 0x58, 0xd4, 0x10, 0xdc, 0xd6, 0x0d, 0x2e, 0xd0, - 0x94, 0x82, 0xad, 0x16, 0x78, 0x80, 0x22, 0x90, 0xda, 0x43, 0x24, 0x14, 0x2e, 0x88, 0x43, 0xa3, - 0x38, 0x5e, 0x39, 0xae, 0xea, 0x3f, 0x78, 0x6d, 0xab, 0x3d, 0x70, 0xe0, 0x01, 0x90, 0x10, 0x4f, - 0xc5, 0xb1, 0x47, 0x4e, 0x08, 0x25, 0x2f, 0x82, 0x64, 0x4f, 0x62, 0x6f, 0xbc, 0xb6, 0x73, 0xcc, - 0xec, 0xb7, 0xfb, 0xfd, 0xf6, 0x9b, 0xd9, 0x18, 0x88, 0x1f, 0x19, 0x2c, 0x32, 0xf4, 0xf8, 0x58, - 0x0f, 0xaf, 0x35, 0x3f, 0xf0, 0x42, 0x8f, 0x6c, 0xa6, 0x35, 0x2d, 0x3e, 0x96, 0xdb, 0xd9, 0x32, - 0x16, 0x13, 0x89, 0x7a, 0x01, 0x8f, 0xfb, 0xcc, 0x1a, 0x50, 0xc7, 0x8b, 0xe9, 0xc7, 0xc8, 0xb8, - 0xb2, 0xd9, 0x84, 0x06, 0x03, 0xfa, 0x35, 0xa2, 0x2c, 0x24, 0x87, 0xd0, 0xf2, 0xe7, 0xb5, 0xa1, - 0xe9, 0x39, 0x23, 0xdb, 0xed, 0x48, 0x5d, 0xa9, 0xb7, 0x39, 0x68, 0x2e, 0xea, 0xef, 0x93, 0x32, - 0x69, 0xc3, 0x06, 0xb3, 0x2d, 0x97, 0x06, 0x9d, 0x46, 0x22, 0xc0, 0x5f, 0xea, 0x0e, 0xc8, 0xa2, - 0xf3, 0x99, 0xef, 0xb9, 0x8c, 0xaa, 0x13, 0x78, 0xd4, 0x67, 0xd6, 0xa9, 0x69, 0x7e, 0x8a, 0x0c, - 0x36, 0x0e, 0x6c, 0x23, 0xf3, 0x7e, 0x0b, 0xc0, 0x16, 0xc5, 0xc4, 0xf5, 0xee, 0xc9, 0x96, 0xb6, - 0xb8, 0x90, 0x96, 0xdb, 0x91, 0x13, 0x96, 0x72, 0xc8, 0xd0, 0x29, 0x3a, 0x21, 0xc5, 0x38, 0xc7, - 0x58, 0x04, 0x79, 0x05, 0x24, 0x3b, 0x7f, 0x38, 0x32, 0xcd, 0x80, 0x32, 0x86, 0x31, 0x3c, 0xc8, - 0x56, 0x4e, 0xd3, 0x85, 0x52, 0x80, 0x5d, 0xd8, 0x16, 0x9a, 0x20, 0xc3, 0x37, 0xd8, 0x49, 0xf9, - 0x16, 0x21, 0x9d, 0xbb, 0x21, 0x75, 0xc3, 0x39, 0xc5, 0x87, 0x7c, 0x2b, 0xec, 0x64, 0x09, 0x43, - 0x91, 0x73, 0xa1, 0x2c, 0x6f, 0xce, 0xda, 0x94, 0x16, 0x4a, 0xe9, 0xf6, 0x60, 0xb7, 0xc4, 0x1e, - 0xf9, 0x7e, 0x48, 0xb0, 0x57, 0x6c, 0x24, 0xcf, 0x78, 0x00, 0x4d, 0xcc, 0xc3, 0x0f, 0x6d, 0xcf, - 0x1d, 0xda, 0x26, 0xc6, 0x74, 0x3f, 0x5f, 0x3e, 0x37, 0x85, 0x73, 0xd5, 0xa8, 0x9b, 0xab, 0x75, - 0x0e, 0x58, 0x85, 0x6e, 0x39, 0x0e, 0x32, 0x7f, 0x97, 0xe6, 0xb7, 0xca, 0x02, 0xe7, 0x89, 0xcf, - 0x20, 0xd7, 0x41, 0x3e, 0xd6, 0x6d, 0xe1, 0xac, 0xe1, 0xf6, 0x16, 0x5b, 0xaa, 0x94, 0x06, 0xdb, - 0x05, 0xa5, 0x0c, 0x01, 0x29, 0x7f, 0x49, 0xb9, 0xab, 0x94, 0x81, 0xae, 0x1c, 0xad, 0x78, 0x5a, - 0x1b, 0xf5, 0xd3, 0xca, 0xc7, 0xbb, 0x0f, 0x4f, 0x2a, 0x98, 0x52, 0xf2, 0x93, 0xbf, 0x77, 0x60, - 0xbd, 0xcf, 0x2c, 0x72, 0x01, 0xcd, 0xa5, 0x46, 0x90, 0xa7, 0xb9, 0xf4, 0x4a, 0xff, 0x5f, 0xe4, - 0x67, 0x35, 0xaa, 0xd4, 0x87, 0x7c, 0x86, 0x7b, 0x5c, 0x80, 0x44, 0xe5, 0xf7, 0x89, 0xfe, 0x3f, - 0xe4, 0xfd, 0x4a, 0x0d, 0x9e, 0x3c, 0x82, 0xd6, 0xf2, 0x1d, 0x89, 0x10, 0xaa, 0x78, 0xfe, 0xf3, - 0x3a, 0x19, 0x5a, 0x58, 0x40, 0x8a, 0xcf, 0x8a, 0x1c, 0x14, 0xe8, 0xc4, 0x6f, 0x4a, 0xee, 0xd5, - 0x0b, 0xd1, 0xc8, 0x87, 0x2d, 0xe1, 0x73, 0x20, 0x2f, 0x2a, 0x53, 0xe6, 0xed, 0x8e, 0x56, 0xd2, - 0xa2, 0xe3, 0x25, 0x3c, 0x14, 0x0c, 0x36, 0xe9, 0x55, 0x24, 0xcf, 0xbb, 0x1d, 0xae, 0xa0, 0x44, - 0x2f, 0x06, 0x6d, 0xf1, 0x34, 0x92, 0xa3, 0xea, 0x46, 0xf0, 0x8e, 0x2f, 0x57, 0x13, 0xa7, 0xa6, - 0xef, 0xce, 0x7e, 0x4f, 0x15, 0xe9, 0x76, 0xaa, 0x48, 0xff, 0xa6, 0x8a, 0xf4, 0x73, 0xa6, 0xac, - 0xdd, 0xce, 0x94, 0xb5, 0x3f, 0x33, 0x65, 0xed, 0x8b, 0x66, 0xd9, 0xe1, 0x24, 0x32, 0xb4, 0xb1, - 0xe7, 0xe8, 0x3e, 0xb5, 0xac, 0x9b, 0xcb, 0x58, 0x67, 0x9e, 0xe3, 0xd0, 0x2b, 0x9b, 0x06, 0x7a, - 0xfc, 0x46, 0xbf, 0xc6, 0xcf, 0xac, 0x1e, 0xde, 0xf8, 0x94, 0x19, 0x1b, 0xc9, 0xd7, 0xf6, 0xf5, - 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0x48, 0x81, 0xac, 0x89, 0xa6, 0x07, 0x00, 0x00, + 0x94, 0x82, 0xad, 0x16, 0x21, 0xce, 0x45, 0x20, 0xb5, 0x87, 0x48, 0x28, 0x5c, 0x10, 0x87, 0x46, + 0x71, 0xbc, 0x72, 0x5c, 0xd5, 0x7f, 0xf0, 0xda, 0x56, 0x7b, 0xe0, 0xc0, 0x03, 0x20, 0x21, 0x9e, + 0x8a, 0x63, 0x8f, 0x9c, 0x10, 0x4a, 0x5e, 0x04, 0xc9, 0x9e, 0xc4, 0xde, 0x78, 0x6d, 0xe7, 0x98, + 0xd9, 0x6f, 0xf7, 0xfb, 0xed, 0x37, 0xb3, 0x31, 0x10, 0x3f, 0x32, 0x58, 0x64, 0xe8, 0xf1, 0xb1, + 0x1e, 0x5e, 0x6b, 0x7e, 0xe0, 0x85, 0x1e, 0xd9, 0x4c, 0x6b, 0x5a, 0x7c, 0x2c, 0xb7, 0xb3, 0x65, + 0x2c, 0x26, 0x12, 0xf5, 0x02, 0x1e, 0xf7, 0x99, 0x35, 0xa0, 0x8e, 0x17, 0xd3, 0x8f, 0x91, 0x71, + 0x65, 0xb3, 0x09, 0x0d, 0x06, 0xf4, 0x6b, 0x44, 0x59, 0x48, 0x0e, 0xa1, 0xe5, 0xcf, 0x6b, 0x43, + 0xd3, 0x73, 0x46, 0xb6, 0xdb, 0x91, 0xba, 0x52, 0x6f, 0x73, 0xd0, 0x5c, 0xd4, 0xdf, 0x27, 0x65, + 0xd2, 0x86, 0x0d, 0x66, 0x5b, 0x2e, 0x0d, 0x3a, 0x8d, 0x44, 0x80, 0xbf, 0xd4, 0x1d, 0x90, 0x45, + 0xe7, 0x33, 0xdf, 0x73, 0x19, 0x55, 0x27, 0xf0, 0xa8, 0xcf, 0xac, 0x53, 0xd3, 0xfc, 0x14, 0x19, + 0x6c, 0x1c, 0xd8, 0x46, 0xe6, 0xfd, 0x06, 0x80, 0x2d, 0x8a, 0x89, 0xeb, 0xdd, 0x93, 0x2d, 0x6d, + 0x71, 0x21, 0x2d, 0xb7, 0x23, 0x27, 0x2c, 0xe5, 0x90, 0xa1, 0x53, 0x74, 0x42, 0x8a, 0x71, 0x8e, + 0xb1, 0x08, 0xf2, 0x0a, 0x48, 0x76, 0xfe, 0x70, 0x64, 0x9a, 0x01, 0x65, 0x0c, 0x63, 0x78, 0x90, + 0xad, 0x9c, 0xa6, 0x0b, 0xa5, 0x00, 0xbb, 0xb0, 0x2d, 0x34, 0x41, 0x86, 0x6f, 0xb0, 0x93, 0xf2, + 0x2d, 0x42, 0x3a, 0x77, 0x43, 0xea, 0x86, 0x73, 0x8a, 0x0f, 0xf9, 0x56, 0xd8, 0xc9, 0x12, 0x86, + 0x22, 0xe7, 0x42, 0x59, 0xde, 0x9c, 0xb5, 0x29, 0x2d, 0x94, 0xd2, 0xed, 0xc1, 0x6e, 0x89, 0x3d, + 0xf2, 0xfd, 0x90, 0x60, 0xaf, 0xd8, 0x48, 0x9e, 0xf1, 0x00, 0x9a, 0x98, 0x87, 0x1f, 0xda, 0x9e, + 0x3b, 0xb4, 0x4d, 0x8c, 0xe9, 0x7e, 0xbe, 0x7c, 0x6e, 0x0a, 0xe7, 0xaa, 0x51, 0x37, 0x57, 0xeb, + 0x1c, 0xb0, 0x0a, 0xdd, 0x72, 0x1c, 0x64, 0xfe, 0x2e, 0xcd, 0x6f, 0x95, 0x05, 0xce, 0x13, 0x9f, + 0x41, 0xae, 0x83, 0x7c, 0xac, 0xdb, 0xc2, 0x59, 0xc3, 0xed, 0x2d, 0xb6, 0x54, 0x29, 0x0d, 0xb6, + 0x0b, 0x4a, 0x19, 0x02, 0x52, 0xfe, 0x92, 0x72, 0x57, 0x29, 0x03, 0x5d, 0x39, 0x5a, 0xf1, 0xb4, + 0x36, 0xea, 0xa7, 0x95, 0x8f, 0x77, 0x1f, 0x9e, 0x54, 0x30, 0xa5, 0xe4, 0x27, 0x7f, 0xef, 0xc0, + 0x7a, 0x9f, 0x59, 0xe4, 0x02, 0x9a, 0x4b, 0x8d, 0x20, 0x4f, 0x73, 0xe9, 0x95, 0xfe, 0xbf, 0xc8, + 0xcf, 0x6a, 0x54, 0xa9, 0x0f, 0xf9, 0x0c, 0xf7, 0xb8, 0x00, 0x89, 0xca, 0xef, 0x13, 0xfd, 0x7f, + 0xc8, 0xfb, 0x95, 0x1a, 0x3c, 0x79, 0x04, 0xad, 0xe5, 0x3b, 0x12, 0x21, 0x54, 0xf1, 0xfc, 0xe7, + 0x75, 0x32, 0xb4, 0xb0, 0x80, 0x14, 0x9f, 0x15, 0x39, 0x28, 0xd0, 0x89, 0xdf, 0x94, 0xdc, 0xab, + 0x17, 0xa2, 0x91, 0x0f, 0x5b, 0xc2, 0xe7, 0x40, 0x5e, 0x54, 0xa6, 0xcc, 0xdb, 0x1d, 0xad, 0xa4, + 0x45, 0xc7, 0x4b, 0x78, 0x28, 0x18, 0x6c, 0xd2, 0xab, 0x48, 0x9e, 0x77, 0x3b, 0x5c, 0x41, 0x89, + 0x5e, 0x0c, 0xda, 0xe2, 0x69, 0x24, 0x47, 0xd5, 0x8d, 0xe0, 0x1d, 0x5f, 0xae, 0x26, 0x4e, 0x4d, + 0xdf, 0x9d, 0xfd, 0x9e, 0x2a, 0xd2, 0xed, 0x54, 0x91, 0xfe, 0x4d, 0x15, 0xe9, 0xe7, 0x4c, 0x59, + 0xbb, 0x9d, 0x29, 0x6b, 0x7f, 0x66, 0xca, 0xda, 0x17, 0xcd, 0xb2, 0xc3, 0x49, 0x64, 0x68, 0x63, + 0xcf, 0xd1, 0x7d, 0x6a, 0x59, 0x37, 0x97, 0xb1, 0xce, 0x3c, 0xc7, 0xa1, 0x57, 0x36, 0x0d, 0xf4, + 0xf8, 0xad, 0x7e, 0x8d, 0x9f, 0x59, 0x3d, 0xbc, 0xf1, 0x29, 0x33, 0x36, 0x92, 0xaf, 0xed, 0xeb, + 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x60, 0x28, 0xb2, 0xd1, 0xa6, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used.