From 2ea06238e969c6a3312c53ff6bfe2786e34f58ea Mon Sep 17 00:00:00 2001 From: izyak <76203436+izyak@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:13:26 +0545 Subject: [PATCH] feat: merge relayer (#94) * Flush query should include begin and end block events (#1125) * Include begin and end block events * disable flushing when termination condition is set * Still flush for FlushLifecycle * Add sort for flush logging to avoid confusion * pre_init messages (#1131) * Wire initial messages into path processor caches so that retry logic will occur * Fix counterparty keys * Remove debug log * fix default coin type (#1134) * fix slip44 default * Add test case * build: bump to Go 1.20 + bump deps (#1132) * build: bump to Go 1.20 + bump deps This bumps the Go version to 1.20 and also bumps the SDK version to 0.47.0 and ibc-go to v7.0.0 * chore: update GH workflows to use Go 1.20 + update interchaintest deps * chore: update missing deps in go.sum + use 1.20 in dockerfiles * chore: bump to `setup-go/v4` and remove caching step * chore: bump to `checkout/v3` and remove caching step * chore: bump 1.20.2 * Fix flushing acks (#1139) * Fix ordered channel closure (#1142) * Fix ordered channel closure * Increase timeout for scenarios test * Fix tracking of init messages when IDs aren't the same * bump interchaintest to include explicit port bindings * Fix flush termination condition (#1141) * bump to main sha (#1143) * Pre-filter flush channels (#1146) * Add channel close correlation (#1145) * Add channel close correlation * Switch to pre-close key * make tx channel-close cli command work, add test coverage * more sweet code removals * update comment * Fix flush on ordered channels (#1150) * Fix flush on ordered channels * Queue all packets at nextseqrecv or above * Now that we have periodic flushing, skip blocks if they can't be queried (#1154) * Lock config file for all write operations (#1156) * Lock config file for all write operations * Fix linter errs * tidy * more tidy * Penumbra support v2 (#1144) * Penumbra buf go gen * Use go prefix override * wip: penumbra relayer provider remove copied-over cosmos provider tests, rename processor cosmos -> penumbra rename ccp -> pcp reformat into new relayer dir structure update penumbra types to point to buf.build building again * fix penumbra * fix: implement MsgSubmitMisbehaviour * fix: remove unnecessary proto file + fix msg type cast * chore: add removal of penumbra client protos in protocgen * working penumbra relayer functionality wip: unbase64? wip: multiple messages per penumbra tx wip: stub SendMessages impl wip: attempt to split out common method wip: use random anchor and work around path renaming wip: improve logging wip: changes during pairing https://www.youtube.com/watch?v=RYonSOkZ5ZE clean up logs skip height bug workaround drop debug panic * update penumbra chain processor connection and channel message processing * cleanup logging statements for review Responding to review comments, honoring the style guide for logging, and removing some unused reference code that was commented out while debugging. --------- Co-authored-by: Andrew Gouin Co-authored-by: Ava Howell Co-authored-by: jtieri Co-authored-by: Ava Howell Co-authored-by: Conor Schaefer Co-authored-by: Justin Tieri <37750742+jtieri@users.noreply.github.com> * --time-threshold example use cases (#1155) * Make ICA waits more explicit (#1157) * Make ICA waits more explicit * poll for timeout * poll for channel close confirm * Comment out sqlite db file for scenarios tests * Bump github.com/docker/docker in /interchaintest (#1160) Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.19+incompatible to 20.10.24+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v20.10.19...v20.10.24) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * bump version in docs (#1158) * Bump github.com/opencontainers/runc in /interchaintest (#1153) Bumps [github.com/opencontainers/runc](https://github.com/opencontainers/runc) from 1.1.3 to 1.1.5. - [Release notes](https://github.com/opencontainers/runc/releases) - [Changelog](https://github.com/opencontainers/runc/blob/v1.1.5/CHANGELOG.md) - [Commits](https://github.com/opencontainers/runc/compare/v1.1.3...v1.1.5) --- updated-dependencies: - dependency-name: github.com/opencontainers/runc dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Andrew Gouin * Fix QueryConnectionsUsingClient for cosmos (#1162) * Make min query loop duration configurable (#1164) * penumbra provider: update generated protos (#1168) * Add sr25519 support (#1120) * Migrate to cometbft * Additional replaces * Register comet proto types * Add sr25519 support * bump ictest * Add keys test * Update supported algos comment * penumbra: update protos (#1170) Updating the generated protos for Penumbra support. After lightly editing the `scripts/protocgen.sh` script, I ran `make proto-gen` and then committed the changes `relayer/chains/penumbra/`. Other automatically updated protos I intentionally excluded from this PR, to avoid side-effects. Co-authored-by: Conor Schaefer * chore: add path name to logs in message processor (#1171) * Fix multiple conn open init (#1173) * allow register with extra_codecs (#1175) * Harry/fee middleware (#1174) * Register Counterparty relayer cmd and fee middleware test * debugging the command * debugging and finalizing the fee_middleware_test. * debugging and finalizing the fee_middleware_test. * merged with updated repo * clear out some commanded code * nits and suggestions post review * more nits * added one val no fullnode as chainspec --------- Co-authored-by: Harry * fix: nil receiver initiate for path (#1177) * fix nil receiver initiate for path ensure path get written to config * add change doc * feat: add max-gas-amount parameter in chain configs (#1178) * add max fee * add test * add change doc * Update cregistry/chain_info.go * dep: bump sdk from v0.47.0 to v0.47.2 (#1180) * bump sdk from v0.47.0 to v0.47.2 fix btcutil dep * fix dep of hdkeychain * Harry/rly tx channel (#1183) * made a new method "logChannelOpenMessage" to log the newly opened channel into info level * added fields * some changes --------- Co-authored-by: Harry * Harry/rly tx transfer (#1184) * made a new method "logChannelOpenMessage" to log the newly opened channel into info level * added fields * some changes * recreated issue 1151, added logs --------- Co-authored-by: Harry Co-authored-by: Andrew Gouin * Better Error Messaging when failing to query the Block Height (#1189) * better block data errors * remove redundant field * penumbra: update protos (#1181) Matches the latest protos shipped with the Penumbra Testnet 52. Co-authored-by: Conor Schaefer Co-authored-by: Justin Tieri <37750742+jtieri@users.noreply.github.com> * Neutron launch fixes and optimizations (#1185) * pipe max msgs through path processor * only apply max msgs to packet msgs * multiple msgs simultaneously on ordered chans * flush should be more frequent if it fails or does not complete * fix legacy * handle feedback * Problem: fixes in ibc-go v7.0.1 are not included (#1205) * Problem: fixes in ibc-go v7.0.1 are not included * add change doc * Harry/rly address (#1204) * added addresCmd to root and keys.go * nicks * nick * made a common method "showAddressByChainAndKey" to be used by both addressCmd and keysShowCmd --------- Co-authored-by: Harry Co-authored-by: Andrew Gouin * deps: update to ibc-go v7.1.0-rc0 (#1207) * Export wallet address for Prometheus metrics (#1206) * export relayer address for pro * address in updateFeesSpent * make error messages consistent * log error rather than return * handle 0 balance * chore: fix issue * fix: connection key include * chore: comment out flush * fix: remove SET method from providerConfig * chore: replace static naming with constant * chore: packet timeout after relayer update --------- Signed-off-by: dependabot[bot] Co-authored-by: Andrew Gouin Co-authored-by: Justin Tieri <37750742+jtieri@users.noreply.github.com> Co-authored-by: Henry de Valence Co-authored-by: Ava Howell Co-authored-by: jtieri Co-authored-by: Ava Howell Co-authored-by: Conor Schaefer Co-authored-by: Dan Kanefsky <56059752+boojamya@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Conor Schaefer Co-authored-by: mmsqe Co-authored-by: Cosmos-Harry <110472914+Cosmos-Harry@users.noreply.github.com> Co-authored-by: Harry Co-authored-by: mmsqe Co-authored-by: Keefer Taylor | Tessellated Co-authored-by: izyak Co-authored-by: viveksharmapoudel --- .github/workflows/interchaintest.yml | 20 +- .github/workflows/release.yml | 2 +- CHANGELOG.md | 5 - README.md | 6 +- cmd/appstate.go | 266 +- cmd/config.go | 10 +- cmd/tx.go | 58 +- cregistry/chain_info.go | 6 +- go.mod | 41 +- go.sum | 112 +- interchaintest/fee_middleware_test.go | 10 +- interchaintest/go.mod | 78 +- interchaintest/go.sum | 190 +- interchaintest/ica_channel_close_test.go | 8 +- interchaintest/interchain_accounts_test.go | 4 +- interchaintest/relayer.go | 16 +- proto/cosmos/crypto/sr25519/keys.proto | 9 +- relayer/chains/archway/helper_debug_msg.go | 1 - relayer/chains/archway/keys.go | 6 +- relayer/chains/archway/provider.go | 9 +- relayer/chains/archway/query.go | 2 +- relayer/chains/archway/tx.go | 8 +- relayer/chains/cosmos/codec.go | 8 +- .../chains/cosmos/cosmos_chain_processor.go | 8 +- relayer/chains/cosmos/keys/sr25519/keys.pb.go | 2 +- relayer/chains/cosmos/message_handlers.go | 2 +- relayer/chains/cosmos/module/app_module.go | 1 - relayer/chains/cosmos/msg.go | 1 + relayer/chains/cosmos/provider.go | 67 +- relayer/chains/cosmos/tx.go | 33 +- relayer/chains/icon/keys.go | 4 +- relayer/chains/icon/provider.go | 15 +- relayer/chains/icon/provider_test.go | 1 + relayer/chains/penumbra/codec.go | 8 +- .../penumbra/core/chain/v1alpha1/chain.pb.go | 534 +++- .../core/crypto/v1alpha1/crypto.pb.go | 811 +++--- .../penumbra/core/dex/v1alpha1/dex.pb.go | 1045 ++++---- .../core/governance/v1alpha1/governance.pb.go | 302 +-- .../penumbra/core/ibc/v1alpha1/ibc.pb.go | 242 +- .../penumbra/core/stake/v1alpha1/stake.pb.go | 299 +-- .../transaction/v1alpha1/transaction.pb.go | 1656 +++--------- relayer/chains/penumbra/log.go | 13 - relayer/chains/penumbra/message_handlers.go | 8 +- relayer/chains/penumbra/msg.go | 2 +- .../penumbra/penumbra_chain_processor.go | 5 +- relayer/chains/penumbra/provider.go | 51 +- relayer/chains/penumbra/query.go | 23 - relayer/chains/penumbra/tx.go | 155 +- .../chains/penumbra/view/v1alpha1/view.pb.go | 2359 +++-------------- relayer/channel.go | 24 +- relayer/codecs/ethermint/codec.go | 7 +- relayer/processor/metrics.go | 30 +- relayer/processor/path_end_runtime.go | 20 +- relayer/processor/path_processor.go | 14 +- relayer/processor/path_processor_internal.go | 566 ++-- relayer/processor/types_internal.go | 18 +- relayer/processor/utils.go | 7 +- relayer/provider/provider.go | 3 +- relayer/strategies.go | 5 +- scripts/protocgen.sh | 1 - 60 files changed, 3401 insertions(+), 5816 deletions(-) diff --git a/.github/workflows/interchaintest.yml b/.github/workflows/interchaintest.yml index 4d5725255..67d04c385 100644 --- a/.github/workflows/interchaintest.yml +++ b/.github/workflows/interchaintest.yml @@ -10,9 +10,10 @@ jobs: runs-on: self-hosted steps: - name: Set up Go 1.20 - uses: actions/setup-go@v4 + uses: actions/setup-go@v1 with: - go-version: '1.20' + go-version: 1.20 + id: go - name: checkout relayer uses: actions/checkout@v2 @@ -31,9 +32,10 @@ jobs: runs-on: self-hosted steps: - name: Set up Go 1.20 - uses: actions/setup-go@v4 + uses: actions/setup-go@v1 with: - go-version: '1.20' + go-version: 1.20 + id: go - name: checkout relayer uses: actions/checkout@v2 @@ -52,9 +54,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go 1.20 - uses: actions/setup-go@v4 + uses: actions/setup-go@v1 with: - go-version: '1.20' + go-version: 1.20 + id: go - name: checkout relayer uses: actions/checkout@v2 @@ -136,9 +139,10 @@ jobs: runs-on: ubuntu-latest steps: - name: Set up Go 1.20 - uses: actions/setup-go@v4 + uses: actions/setup-go@v1 with: - go-version: '1.20' + go-version: 1.20 + id: go - name: checkout relayer uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 97ca73ced..a9464f16b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: '1.20' + go-version: 1.20 - run: echo https://github.com/cosmos/relayer/blob/${GITHUB_REF#refs/tags/}/CHANGELOG.md#${GITHUB_REF#refs/tags/} > ../release_notes.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 93f9f9358..41ee0c40b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,11 +17,6 @@ * [\#1178](https://github.com/cosmos/relayer/pull/1178) Add max-gas-amount parameter in chain configs. * [\#1180](https://github.com/cosmos/relayer/pull/1180) Update SDK from v0.47.0 to v0.47.2. * [\#1205](https://github.com/cosmos/relayer/pull/1205) Update ibc-go to v7.0.1. -* [\#1179](https://github.com/cosmos/relayer/pull/1179) Add extension-options parameter in chain configs and update SDK to v0.47.3. -* [\#1208](https://github.com/cosmos/relayer/pull/1208) Replace gogo/protobuf to cosmos/gogoproto. -* [\#1221](https://github.com/cosmos/relayer/pull/1221) Update cometbft to v0.37.2 and ibc-go to v7.2.0. -* [\#1226](https://github.com/cosmos/relayer/pull/1226) Avoid invalid Bech32 prefix error in parallel tests when sdk Config get overwritten by each other in single process. -* [\#1231](https://github.com/cosmos/relayer/pull/1231) Reduce get bech32 prefix when get signer. ## v0.9.3 diff --git a/README.md b/README.md index 4b392a764..de9c5a153 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Additional information on how IBC works can be found [here](https://ibc.cosmos.n ```shell $ git clone https://github.com/cosmos/relayer.git - $ cd relayer && git checkout v2.4.0 + $ cd relayer && git checkout v2.3.0 $ make install ``` @@ -59,7 +59,7 @@ Additional information on how IBC works can be found [here](https://ibc.cosmos.n ``` **Default config file location:** `~/.relayer/config/config.yaml` - By default, transactions will be relayed with a memo of `rly(VERSION)` e.g. `rly(v2.4.0)`. + By default, transactions will be relayed with a memo of `rly(VERSION)` e.g. `rly(v2.3.0)`. To customize the memo for all relaying, use the `--memo` flag when initializing the configuration. @@ -67,7 +67,7 @@ Additional information on how IBC works can be found [here](https://ibc.cosmos.n $ rly config init --memo "My custom memo" ``` - Custom memos will have `rly(VERSION)` appended. For example, a memo of `My custom memo` running on relayer version `v2.4.0` would result in a transaction memo of `My custom memo | rly(v2.4.0)`. + Custom memos will have `rly(VERSION)` appended. For example, a memo of `My custom memo` running on relayer version `v2.3.0` would result in a transaction memo of `My custom memo | rly(v2.3.0)`. The `--memo` flag is also available for other `rly` commands also that involve sending transactions such as `rly tx link` and `rly start`. It can be passed there to override the `config.yaml` value if desired. diff --git a/cmd/appstate.go b/cmd/appstate.go index 09dfec092..7f26557f3 100644 --- a/cmd/appstate.go +++ b/cmd/appstate.go @@ -13,7 +13,6 @@ import ( "github.com/gofrs/flock" "github.com/spf13/viper" "go.uber.org/zap" - "golang.org/x/sync/errgroup" "gopkg.in/yaml.v3" ) @@ -194,10 +193,9 @@ func (a *appState) performConfigLockingOperation(ctx context.Context, operation return fmt.Errorf("failed to initialize config from file: %w", err) } - path, ok := a.Config.Paths[pathName] - - if !ok { - return fmt.Errorf("config does not exist for that path: %s", pathName) + // perform the operation that requires config flock. + if err := operation(); err != nil { + return err } // validate config after changes have been made. @@ -217,12 +215,13 @@ func (a *appState) performConfigLockingOperation(ctx context.Context, operation if err := os.WriteFile(cfgPath, out, 0600); err != nil { return fmt.Errorf("failed to write config file at %s: %w", cfgPath, err) } + return nil } func (a *appState) GetConfigProviderNameFromChainId(chainId string) (string, error) { - chains := a.Config.Chains + chains := a.config.Chains for k, v := range chains { if v.ChainID() == chainId { return k, nil @@ -233,7 +232,7 @@ func (a *appState) GetConfigProviderNameFromChainId(chainId string) (string, err } func (a *appState) CheckIfProviderType(providerName string, providerType string) bool { - providers := a.Config.Wrapped() + providers := a.config.Wrapped() for p, v := range providers.ProviderConfigs { if p == providerName && v.Type == providerType { return true @@ -242,119 +241,152 @@ func (a *appState) CheckIfProviderType(providerName string, providerType string) return false } -func (a *appState) UpdateConfigsIfContainIcon(cmd *cobra.Command, src *relayer.Chain, dst *relayer.Chain) error { - - ctx := context.Background() - eg, egCtx := errgroup.WithContext(ctx) +// func (a *appState) UpdateConfigsIfContainIcon(cmd *cobra.Command, src *relayer.Chain, dst *relayer.Chain) error { + +// ctx := context.Background() +// eg, egCtx := errgroup.WithContext(ctx) + +// eg.Go(func() error { +// var err error +// err = a.UpdateProviderIfIcon(cmd, egCtx, src) +// if err != nil { +// return err +// } + +// return nil + +// }) +// eg.Go(func() error { +// var err error +// err = a.UpdateProviderIfIcon(cmd, egCtx, dst) +// if err != nil { +// return err +// } +// return nil + +// }) + +// if err := eg.Wait(); err != nil { +// return err +// } + +// return nil + +// } + +// func (a *appState) UpdateProviderIfIcon(cmd *cobra.Command, ctx context.Context, chain *relayer.Chain) error { + +// providerName, err := a.GetConfigProviderNameFromChainId(chain.ChainID()) +// if err != nil { +// return err +// } + +// if !a.CheckIfProviderType(providerName, "icon") { +// return nil +// } +// // height, err := chain.ChainProvider.QueryLatestHeight(ctx) +// // if err != nil { +// // return errors.New(fmt.Sprintf("Error fetching chain latest height %s ", chain.ChainID())) +// // } + +// // err = a.OverwriteChainConfig(cmd, providerName, "btpHeight", height) +// // if err != nil { +// // return errors.New(fmt.Sprintf("Error updating BTPHeight of config of chain %s ", chain.ChainID())) +// // } +// return nil +// } + +// func (a *appState) OverwriteChainConfig( +// cmd *cobra.Command, +// providerName string, +// fieldName string, +// fieldValue interface{}, +// ) error { + +// // use lock file to guard concurrent access to config.yaml +// lockFilePath := path.Join(a.homePath, "config", "config.lock") +// fileLock := flock.New(lockFilePath) +// err := fileLock.Lock() +// if err != nil { +// return fmt.Errorf("failed to acquire config lock: %w", err) +// } +// defer func() { +// if err := fileLock.Unlock(); err != nil { +// a.Log.Error("error unlocking config file lock, please manually delete", +// zap.String("filepath", lockFilePath), +// ) +// } +// }() + +// if err := initConfig(cmd, a); err != nil { +// return fmt.Errorf("failed to initialize config from file: %w", err) +// } + +// wrappedConfig := a.config.Wrapped() +// err = setProviderConfigField(wrappedConfig, providerName, fieldName, fieldValue) +// if err != nil { +// return err +// } + +// out, err := yaml.Marshal(wrappedConfig) +// if err != nil { +// return err +// } + +// cfgPath := a.viper.ConfigFileUsed() + +// // Overwrite the config file. +// if err := os.WriteFile(cfgPath, out, 0600); err != nil { +// return fmt.Errorf("failed to write config file at %s: %w", cfgPath, err) +// } + +// return nil +// } + +// func setProviderConfigField(cfg *ConfigOutputWrapper, providerName string, fieldToChange string, newValue interface{}) error { +// providerConfigs := cfg.ProviderConfigs +// providerConfigWrapper, ok := providerConfigs[providerName] +// if !ok { +// return fmt.Errorf("ProviderConfigWrapper %s not found", providerName) +// } +// providerConfigValue := providerConfigWrapper.Value +// if err := providerConfigValue.Set(fieldToChange, newValue); err != nil { +// return err +// } +// providerConfigWrapper.Value = providerConfigValue + +// return nil +// } + +// updatePathConfig overwrites the config file concurrently, +// locking to read, modify, then write the config. +func (a *appState) updatePathConfig( + ctx context.Context, + pathName string, + clientSrc, clientDst string, + connectionSrc, connectionDst string, +) error { + if pathName == "" { + return errors.New("empty path name not allowed") + } - eg.Go(func() error { - var err error - err = a.UpdateProviderIfIcon(cmd, egCtx, src) - if err != nil { - return err + return a.performConfigLockingOperation(ctx, func() error { + path, ok := a.config.Paths[pathName] + if !ok { + return fmt.Errorf("config does not exist for that path: %s", pathName) } - - return nil - - }) - eg.Go(func() error { - var err error - err = a.UpdateProviderIfIcon(cmd, egCtx, dst) - if err != nil { - return err + if clientSrc != "" { + path.Src.ClientID = clientSrc + } + if clientDst != "" { + path.Dst.ClientID = clientDst + } + if connectionSrc != "" { + path.Src.ConnectionID = connectionSrc + } + if connectionDst != "" { + path.Dst.ConnectionID = connectionDst } return nil - }) - - if err := eg.Wait(); err != nil { - return err - } - - return nil - -} - -func (a *appState) UpdateProviderIfIcon(cmd *cobra.Command, ctx context.Context, chain *relayer.Chain) error { - - providerName, err := a.GetConfigProviderNameFromChainId(chain.ChainID()) - if err != nil { - return err - } - - if !a.CheckIfProviderType(providerName, "icon") { - return nil - } - height, err := chain.ChainProvider.QueryLatestHeight(ctx) - if err != nil { - return errors.New(fmt.Sprintf("Error fetching chain latest height %s ", chain.ChainID())) - } - - err = a.OverwriteChainConfig(cmd, providerName, "btpHeight", height) - if err != nil { - return errors.New(fmt.Sprintf("Error updating BTPHeight of config of chain %s ", chain.ChainID())) - } - return nil -} - -func (a *appState) OverwriteChainConfig( - cmd *cobra.Command, - providerName string, - fieldName string, - fieldValue interface{}, -) error { - - // use lock file to guard concurrent access to config.yaml - lockFilePath := path.Join(a.HomePath, "config", "config.lock") - fileLock := flock.New(lockFilePath) - err := fileLock.Lock() - if err != nil { - return fmt.Errorf("failed to acquire config lock: %w", err) - } - defer func() { - if err := fileLock.Unlock(); err != nil { - a.Log.Error("error unlocking config file lock, please manually delete", - zap.String("filepath", lockFilePath), - ) - } - }() - - if err := initConfig(cmd, a); err != nil { - return fmt.Errorf("failed to initialize config from file: %w", err) - } - - wrappedConfig := a.Config.Wrapped() - err = setProviderConfigField(wrappedConfig, providerName, fieldName, fieldValue) - if err != nil { - return err - } - - out, err := yaml.Marshal(wrappedConfig) - if err != nil { - return err - } - - cfgPath := a.Viper.ConfigFileUsed() - - // Overwrite the config file. - if err := os.WriteFile(cfgPath, out, 0600); err != nil { - return fmt.Errorf("failed to write config file at %s: %w", cfgPath, err) - } - - return nil -} - -func setProviderConfigField(cfg *ConfigOutputWrapper, providerName string, fieldToChange string, newValue interface{}) error { - providerConfigs := cfg.ProviderConfigs - providerConfigWrapper, ok := providerConfigs[providerName] - if !ok { - return fmt.Errorf("ProviderConfigWrapper %s not found", providerName) - } - providerConfigValue := providerConfigWrapper.Value - if err := providerConfigValue.Set(fieldToChange, newValue); err != nil { - return err - } - providerConfigWrapper.Value = providerConfigValue - - return nil } diff --git a/cmd/config.go b/cmd/config.go index 754faaebf..467c876c4 100644 --- a/cmd/config.go +++ b/cmd/config.go @@ -34,6 +34,7 @@ import ( archway "github.com/cosmos/relayer/v2/relayer/chains/archway" "github.com/cosmos/relayer/v2/relayer/chains/cosmos" "github.com/cosmos/relayer/v2/relayer/chains/icon" + "github.com/cosmos/relayer/v2/relayer/chains/penumbra" "github.com/cosmos/relayer/v2/relayer/provider" "github.com/spf13/cobra" "go.uber.org/zap" @@ -376,9 +377,10 @@ type ProviderConfigYAMLWrapper struct { // NOTE: Add new ProviderConfig types in the map here with the key set equal to the type of ChainProvider (e.g. cosmos, substrate, etc.) func (pcw *ProviderConfigWrapper) UnmarshalJSON(data []byte) error { customTypes := map[string]reflect.Type{ - "cosmos": reflect.TypeOf(cosmos.CosmosProviderConfig{}), - "icon": reflect.TypeOf(icon.IconProviderConfig{}), - "archway": reflect.TypeOf(archway.ArchwayProviderConfig{}), + "cosmos": reflect.TypeOf(cosmos.CosmosProviderConfig{}), + "icon": reflect.TypeOf(icon.IconProviderConfig{}), + "archway": reflect.TypeOf(archway.ArchwayProviderConfig{}), + "penumbra": reflect.TypeOf(penumbra.PenumbraProviderConfig{}), } val, err := UnmarshalJSONProviderConfig(data, customTypes) if err != nil { @@ -439,6 +441,8 @@ func (iw *ProviderConfigYAMLWrapper) UnmarshalYAML(n *yaml.Node) error { iw.Value = new(icon.IconProviderConfig) case "archway": iw.Value = new(archway.ArchwayProviderConfig) + case "penumbra": + iw.Value = new(penumbra.PenumbraProviderConfig) default: return fmt.Errorf("%s is an invalid chain type, check your config file", iw.Type) } diff --git a/cmd/tx.go b/cmd/tx.go index a50aa5acf..f57c4cb36 100644 --- a/cmd/tx.go +++ b/cmd/tx.go @@ -105,7 +105,7 @@ func createClientsCmd(a *appState) *cobra.Command { return fmt.Errorf("key %s not found on dst chain %s", c[dst].ChainProvider.Key(), c[dst].ChainID()) } - clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.Config.memo(cmd), iconStartHeight) + clientSrc, clientDst, err := c[src].CreateClients(cmd.Context(), c[dst], allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight) if err != nil { return err } @@ -124,10 +124,10 @@ func createClientsCmd(a *appState) *cobra.Command { }, } - cmd = clientParameterFlags(a.Viper, cmd) - cmd = overrideFlag(a.Viper, cmd) - cmd = memoFlag(a.Viper, cmd) - cmd = iconStartHeightFlag(a.Viper, cmd) + cmd = clientParameterFlags(a.viper, cmd) + cmd = overrideFlag(a.viper, cmd) + cmd = memoFlag(a.viper, cmd) + cmd = iconStartHeightFlag(a.viper, cmd) return cmd } @@ -236,7 +236,7 @@ func createClientCmd(a *appState) *cobra.Command { return err } - clientID, err := relayer.CreateClient(cmd.Context(), src, dst, srcUpdateHeader, dstUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.Config.memo(cmd), iconStartHeight) + clientID, err := relayer.CreateClient(cmd.Context(), src, dst, srcUpdateHeader, dstUpdateHeader, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour, override, customClientTrustingPeriod, a.config.memo(cmd), iconStartHeight) if err != nil { return err } @@ -256,10 +256,10 @@ func createClientCmd(a *appState) *cobra.Command { }, } - cmd = clientParameterFlags(a.Viper, cmd) - cmd = overrideFlag(a.Viper, cmd) - cmd = memoFlag(a.Viper, cmd) - cmd = iconStartHeightFlag(a.Viper, cmd) + cmd = clientParameterFlags(a.viper, cmd) + cmd = overrideFlag(a.viper, cmd) + cmd = memoFlag(a.viper, cmd) + cmd = iconStartHeightFlag(a.viper, cmd) return cmd } @@ -440,13 +440,13 @@ $ %s tx conn demo-path --timeout 5s`, }, } - cmd = timeoutFlag(a.Viper, cmd) - cmd = retryFlag(a.Viper, cmd) - cmd = clientParameterFlags(a.Viper, cmd) - cmd = overrideFlag(a.Viper, cmd) - cmd = memoFlag(a.Viper, cmd) - cmd = initBlockFlag(a.Viper, cmd) - cmd = iconStartHeightFlag(a.Viper, cmd) + cmd = timeoutFlag(a.viper, cmd) + cmd = retryFlag(a.viper, cmd) + cmd = clientParameterFlags(a.viper, cmd) + cmd = overrideFlag(a.viper, cmd) + cmd = memoFlag(a.viper, cmd) + cmd = initBlockFlag(a.viper, cmd) + cmd = iconStartHeightFlag(a.viper, cmd) return cmd } @@ -517,12 +517,7 @@ $ %s tx chan demo-path --timeout 5s --max-retries 10`, } // create channel if it isn't already created - err = c[src].CreateOpenChannels(cmd.Context(), c[dst], retries, to, srcPort, dstPort, order, version, override, a.Config.memo(cmd), pathName) - if err != nil { - return err - } - - return nil + return c[src].CreateOpenChannels(cmd.Context(), c[dst], retries, to, srcPort, dstPort, order, version, override, a.config.memo(cmd), pathName) }, } @@ -723,14 +718,14 @@ $ %s tx connect demo-path --src-port mock --dst-port mock --order unordered --ve return c[src].CreateOpenChannels(cmd.Context(), c[dst], retries, to, srcPort, dstPort, order, version, override, memo, pathName) }, } - cmd = timeoutFlag(a.Viper, cmd) - cmd = retryFlag(a.Viper, cmd) - cmd = clientParameterFlags(a.Viper, cmd) - cmd = channelParameterFlags(a.Viper, cmd) - cmd = overrideFlag(a.Viper, cmd) - cmd = memoFlag(a.Viper, cmd) - cmd = initBlockFlag(a.Viper, cmd) - cmd = iconStartHeightFlag(a.Viper, cmd) + cmd = timeoutFlag(a.viper, cmd) + cmd = retryFlag(a.viper, cmd) + cmd = clientParameterFlags(a.viper, cmd) + cmd = channelParameterFlags(a.viper, cmd) + cmd = overrideFlag(a.viper, cmd) + cmd = memoFlag(a.viper, cmd) + cmd = initBlockFlag(a.viper, cmd) + cmd = iconStartHeightFlag(a.viper, cmd) return cmd } @@ -775,7 +770,6 @@ $ %s tx link-then-start demo-path --timeout 5s`, appName, appName)), cmd = initBlockFlag(a.viper, cmd) cmd = processorFlag(a.viper, cmd) cmd = updateTimeFlags(a.viper, cmd) - cmd = flushIntervalFlag(a.viper, cmd) return cmd } diff --git a/cregistry/chain_info.go b/cregistry/chain_info.go index 7309296e2..359c46e56 100644 --- a/cregistry/chain_info.go +++ b/cregistry/chain_info.go @@ -84,9 +84,8 @@ type ChainInfo struct { Provider string `json:"provider"` } `json:"rest"` } `json:"apis"` - MaxGasAmount uint64 `json:"max_gas_amount"` - ExtraCodecs []string `json:"extra_codecs"` - ExtensionOptions []provider.ExtensionOption `json:"extension_options"` + ExtraCodecs []string `json:"extra_codecs"` + MaxGasAmount uint64 `json:"max_gas_amount"` } // NewChainInfo returns a ChainInfo that is uninitialized other than the provided zap.Logger. @@ -272,6 +271,5 @@ func (c ChainInfo) GetChainConfig(ctx context.Context, name string) (*cosmos.Cos SigningAlgorithm: c.SigningAlgorithm, ExtraCodecs: c.ExtraCodecs, MaxGasAmount: c.MaxGasAmount, - ExtensionOptions: c.ExtensionOptions, }, nil } diff --git a/go.mod b/go.mod index 1133e61ed..4ae25f160 100644 --- a/go.mod +++ b/go.mod @@ -5,18 +5,19 @@ go 1.20 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/errors v1.0.0-beta.7 - cosmossdk.io/math v1.0.0 - github.com/CosmWasm/wasmd v1.0.0 + cosmossdk.io/math v1.0.1 + github.com/CosmWasm/wasmd v0.0.0-00010101000000-000000000000 github.com/avast/retry-go/v4 v4.3.3 - github.com/btcsuite/btcd v0.22.1 - github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce + github.com/btcsuite/btcd v0.23.4 + github.com/btcsuite/btcd/btcutil v1.1.3 github.com/cometbft/cometbft v0.37.1 github.com/cosmos/cosmos-proto v1.0.0-beta.2 - github.com/cosmos/cosmos-sdk v0.47.1 + github.com/cosmos/cosmos-sdk v0.47.3 github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/gogoproto v1.4.8 - github.com/cosmos/ibc-go/v7 v7.0.0 - github.com/ethereum/go-ethereum v1.11.4 + github.com/cosmos/gogoproto v1.4.10 + github.com/cosmos/ibc-go/v7 v7.1.0-rc0 + github.com/cosmos/ics23/go v0.10.0 + github.com/ethereum/go-ethereum v1.10.26 github.com/gofrs/flock v0.8.1 github.com/gogo/protobuf v1.3.3 github.com/google/go-cmp v0.5.9 @@ -38,9 +39,8 @@ require ( golang.org/x/crypto v0.8.0 golang.org/x/mod v0.10.0 golang.org/x/sync v0.1.0 - golang.org/x/term v0.7.0 golang.org/x/text v0.9.0 - google.golang.org/grpc v1.54.0 + google.golang.org/grpc v1.55.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 @@ -54,6 +54,7 @@ require ( cloud.google.com/go/storage v1.29.0 // indirect cosmossdk.io/core v0.5.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect + cosmossdk.io/log v1.1.0 // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect @@ -80,8 +81,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0 // indirect - github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect - github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect + github.com/cosmos/ledger-cosmos-go v0.12.1 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect github.com/creachadair/taskgroup v0.4.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -97,7 +97,6 @@ require ( github.com/evalphobia/logrus_fluent v0.5.4 // indirect github.com/felixge/httpsnoop v1.0.2 // indirect github.com/fluent/fluent-logger-golang v1.4.0 // indirect - github.com/frankban/quicktest v1.14.4 // 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 @@ -159,16 +158,16 @@ require ( github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/pelletier/go-toml/v2 v2.0.7 // indirect - github.com/petermattis/goid v0.0.0-20221215004737-a150e88a970d // indirect - github.com/philhofer/fwd v1.1.1 // indirect + github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect + github.com/philhofer/fwd v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect - github.com/rivo/uniseg v0.4.4 // indirect github.com/rs/cors v1.8.3 // indirect + github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/sirupsen/logrus v1.9.0 // indirect github.com/spf13/afero v1.9.3 // indirect @@ -179,8 +178,7 @@ require ( github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect github.com/tendermint/go-amino v0.16.0 // indirect github.com/tidwall/btree v1.6.0 // indirect - github.com/tinylib/msgp v1.1.5 // indirect - github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tinylib/msgp v1.1.2 // indirect github.com/ulikunitz/xz v0.5.11 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.1 // indirect @@ -191,14 +189,15 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.10.0 // indirect - golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/net v0.9.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect + golang.org/x/oauth2 v0.6.0 // indirect golang.org/x/sys v0.7.0 // indirect + golang.org/x/term v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect + google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect diff --git a/go.sum b/go.sum index b675a25a4..57c88a62a 100644 --- a/go.sum +++ b/go.sum @@ -122,6 +122,7 @@ cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= +cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -202,8 +203,10 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= -cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= -cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= +cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= +cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= +cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= +cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= cosmossdk.io/tools/rosetta v0.2.1/go.mod h1:Pqdc1FdvkNV3LcNIkYWt2RQY6IP1ge6YWZk8MhhO9Hw= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -241,7 +244,6 @@ github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= -github.com/DataDog/zstd v1.5.2 h1:vUG4lAyuPCXO0TLbXvPv7EB7cNK1QV/luu55UHLrrn8= github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0= github.com/Kubuxu/go-os-helper v0.0.1/go.mod h1:N8B+I7vPCT80IcP58r50u4+gEEcsZETFUpAzWW2ep1Y= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= @@ -337,19 +339,25 @@ github.com/btcsuite/btcd v0.0.0-20190523000118-16327141da8c/go.mod h1:3J08xEfcug github.com/btcsuite/btcd v0.0.0-20190824003749-130ea5bddde3/go.mod h1:3J08xEfcugPacsc34/LKRU2yO7YmuT8yt28J8k2+rrI= 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.1 h1:CnwP9LM/M9xuRrGSCGeMVs9iv09uMqwsVX7EeIpgV2c= -github.com/btcsuite/btcd v0.22.1/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y= +github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M= +github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= +github.com/btcsuite/btcd v0.23.4 h1:IzV6qqkfwbItOS/sg/aDfPDsjPP8twrCOE2R93hxMlQ= +github.com/btcsuite/btcd v0.23.4/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY= +github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA= +github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE= github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= -github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= +github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A= +github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE= +github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ= +github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0= +github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= 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-20190207003914-4c204d697803/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg= github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ= -github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o= github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg= github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY= github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I= @@ -357,6 +365,7 @@ github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc= github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY= github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs= +github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= github.com/c-bata/go-prompt v0.2.2/go.mod h1:VzqtzE2ksDBcdln8G7mk2RX9QyGjH+OVqOCSiVIqS34= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= @@ -402,10 +411,6 @@ github.com/cockroachdb/apd/v2 v2.0.2 h1:weh8u7Cneje73dDh+2tEVLUvyBc89iwepWCD8b80 github.com/cockroachdb/apd/v2 v2.0.2/go.mod h1:DDxRlzC2lo3/vSlmSoS7JkqbbrARPuFOGr0B9pvN3Gw= github.com/cockroachdb/apd/v3 v3.1.0 h1:MK3Ow7LH0W8zkd5GMKA1PvS9qG3bWFI95WaVNfyZJ/w= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= -github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= -github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE= -github.com/cockroachdb/pebble v0.0.0-20230209160836-829675f94811 h1:ytcWPaNPhNoGMWEhDvS3zToKcDpRsLuRolQJBVGdozk= -github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= github.com/coinbase/rosetta-sdk-go v0.4.6/go.mod h1:Luv0AhzZH81eul2hYZ3w0hBGwmFPiexwbntYxihEZck= github.com/coinbase/rosetta-sdk-go/types v1.0.0 h1:jpVIwLcPoOeCR6o1tU+Xv7r5bMONNbHU7MuEHboiFuA= @@ -427,30 +432,31 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee 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.5.0/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.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.1 h1:HnaCYtaAMWZp1SdlwwE1mPJ8kFlZ/TuEJ/ciNXH6Uno= -github.com/cosmos/cosmos-sdk v0.47.1/go.mod h1:14tO5KQaTrl2q3OxBnDRfue7TRN9zkXS0cLutrSqkOo= +github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= +github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= 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/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.8 h1:BrHKc6WFZt8+jRV71vKSQE+JrfF+JAnzrKo2VP7wIZ4= -github.com/cosmos/gogoproto v1.4.8/go.mod h1:hnb0DIEWTv+wdNzNcqus5xCQXq5+CXauq1FJuurRfVY= +github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= +github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go/v7 v7.0.0 h1:j4kyywlG0hhDmT9FmSaR5iCIka7Pz7kJTxGWY1nlV9Q= -github.com/cosmos/ibc-go/v7 v7.0.0/go.mod h1:BFh8nKWjr5zeR2OZfhkzdgDzj1+KjRn3aJLpwapStj8= -github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab h1:I9ialKTQo7248V827Bba4OuKPmk+FPzmTVHsLXaIJWw= -github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab/go.mod h1:2CwqasX5dSD7Hbp/9b6lhK6BwoBDCBldx7gPKRukR60= -github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= -github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= +github.com/cosmos/ibc-go/v7 v7.1.0-rc0 h1:b78+/74AJDp0Sc7utMO1l4nI/u4ERnyta1nqooqQrGI= +github.com/cosmos/ibc-go/v7 v7.1.0-rc0/go.mod h1:7MptlWeIyqmDiuJeRAFqBvXKY8Hybd+rF8vMSmGd2zg= +github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= +github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= +github.com/cosmos/ledger-cosmos-go v0.12.1 h1:sMBxza5p/rNK/06nBSNmsI/WDqI0pVJFVNihy1Y984w= +github.com/cosmos/ledger-cosmos-go v0.12.1/go.mod h1:dhO6kj+Y+AHIOgAe4L9HL/6NDdyyth4q238I9yFpD2g= github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= github.com/cosmos/rosetta-sdk-go v0.10.0/go.mod h1:SImAZkb96YbwvoRkzSMQB6noNJXFgWl/ENIznEoYQI4= github.com/cosmwasm/wasmd v0.40.0-rc.1.0.20230424144037-55647a1fd1f9 h1:JCkKi1yHPIlBAKAeKQrBJIWmWAwScA1z9mLd3vVQGX0= @@ -549,8 +555,8 @@ github.com/ethereum/go-ethereum v1.4.0/go.mod h1:PwpWDrCLZrV+tfrhqqF6kPknbISMHaJ github.com/ethereum/go-ethereum v1.9.21/go.mod h1:RXAVzbGrSGmDkDnHymruTAIEjUR3E4TX0EOpaj702sI= github.com/ethereum/go-ethereum v1.9.23/go.mod h1:JIfVb6esrqALTExdz9hRYvrP0xBDf6wCncIu1hNwHpM= github.com/ethereum/go-ethereum v1.10.16/go.mod h1:Anj6cxczl+AHy63o4X9O8yWNHuN5wMpfb8MAnHkWn7Y= -github.com/ethereum/go-ethereum v1.11.4 h1:KG81SnUHXWk8LJB3mBcHg/E2yLvXoiPmRMCIRxgx3cE= -github.com/ethereum/go-ethereum v1.11.4/go.mod h1:it7x0DWnTDMfVFdXcU6Ti4KEFQynLHVRarcSlPr0HBo= +github.com/ethereum/go-ethereum v1.10.26 h1:i/7d9RBBwiXCEuyduBQzJw/mKmnvzsN14jqBmytw72s= +github.com/ethereum/go-ethereum v1.10.26/go.mod h1:EYFyF19u3ezGLD4RqOkLq+ZCXzYbLoNDdZlMt7kyKFg= github.com/evalphobia/logrus_fluent v0.5.4 h1:G4BSBTm7+L+oanWfFtA/A5Y3pvL2OMxviczyZPYO5xc= github.com/evalphobia/logrus_fluent v0.5.4/go.mod h1:hasyj+CXm3BDP1YhFk/rnTcjlegyqvkokV9A25cQsaA= github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= @@ -573,8 +579,7 @@ github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= 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.14.4 h1:g2rn0vABPOOXmZUj+vbmUp0lPoXEMuhTpIluN0XL9UY= -github.com/frankban/quicktest v1.14.4/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fsnotify/fsnotify v1.4.3-0.20170329110642-4da3e2cfbabc/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= 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= @@ -586,12 +591,11 @@ github.com/garyburd/redigo v1.1.1-0.20170914051019-70e1b1943d4f/go.mod h1:NR3MbY 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/getsentry/sentry-go v0.18.0 h1:MtBW5H9QgdcJabtZcuJG80BMOwaBpkRDZkxRkNC1sN0= 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= +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/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= 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-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= @@ -624,11 +628,10 @@ github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3yg 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.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY= -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/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= +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.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= 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= @@ -659,9 +662,9 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= 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/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= @@ -1016,7 +1019,7 @@ github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZl 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.12.1-0.20220721211354-060cc04fc18b h1:izTof8BKh/nE1wrKOrloNA5q4odOarjf+Xpe+4qow98= +github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= @@ -1075,13 +1078,11 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= 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 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= 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/echo/v4 v4.6.1/go.mod h1:RnjgMWNDB9g/HucVWhQYNQP9PvbYf6adqftqryo7s9k= @@ -1092,8 +1093,8 @@ github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw= -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/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= 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.7 h1:p7ZhMD+KsSRozJr34udlUrhboJwWAgCg34+/ZZNvZZw= @@ -1286,6 +1287,7 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc 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.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +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= @@ -1487,14 +1489,12 @@ github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9 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/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= -github.com/petermattis/goid v0.0.0-20221215004737-a150e88a970d h1:htwtWgtQo8YS6JFWWi2DNgY0RwSGJ1ruMoxY6CUUclk= -github.com/petermattis/goid v0.0.0-20221215004737-a150e88a970d/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 h1:hDSdbBuw3Lefr6R18ax0tZ2BJeNB3NehB3trOwYBsdU= +github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08/go.mod h1:pxMtw7cyUw6B2bRH0ZBANSPg+AoSud1I1iyJHI69jH4= +github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= -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/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= @@ -1549,6 +1549,7 @@ github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4O github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= 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/quasilyte/go-consistent v0.0.0-20190521200055-c6f3937de18c/go.mod h1:5STLWrekHfjyYwxBRVRXNOSewLJ3PWfDJd1VyTS21fI= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= @@ -1562,8 +1563,7 @@ github.com/regen-network/gocuke v0.6.2 h1:pHviZ0kKAq2U2hN2q3smKNxct6hS0mGByFMHGn github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/retailnext/hllpp v1.0.1-0.20180308014038-101a6d2f8b52/go.mod h1:RDpi1RftBQPUCDRw6SmxeaREsAaRKnOclghuzp/WRzc= -github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis= -github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= +github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw= github.com/rjeczalik/notify v0.9.1/go.mod h1:rKwnCoCGeuQnwBtTSPL9Dad03Vh2n40ePRrjvIXnJho= github.com/rjeczalik/notify v0.9.2/go.mod h1:aErll2f0sUX9PXZnVNyeiObbmTlk5jnMoCa4QEjJeqM= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= @@ -1573,14 +1573,16 @@ github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE github.com/rogpeppe/go-internal v1.6.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/cors v0.0.0-20160617231935-a62a804a8a00/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.3 h1:O+qNyWn7Z+F9M0ILBHgMVPuB1xTOucVd5gtaYyXBpRo= github.com/rs/cors v1.8.3/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/xid v1.4.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/rs/zerolog v1.18.0/go.mod h1:9nvC1axdVrAHcu/s9taAVfBuIdTZLVQmKQyvrUjF5+I= +github.com/rs/zerolog v1.29.1 h1:cO+d60CHkknCbvzEWxP0S9K6KqyTjrCNUy1LdQLCGPc= +github.com/rs/zerolog v1.29.1/go.mod h1:Le6ESbR7hc+DP6Lt1THiV8CQSdkkNrd3R0XbEgp3ZBU= 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/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -1701,18 +1703,15 @@ github.com/tidwall/sjson v1.1.1/go.mod h1:yvVuSnpEQv5cYIrO+AT6kw4QVfd5SDZoGIS7/5 github.com/timakin/bodyclose v0.0.0-20190930140734-f7f2e9bca95e/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= +github.com/tinylib/msgp v1.1.2 h1:gWmO7n0Ys2RBEb7GPYB9Ujq8Mk5p2U08lRnmMcGy6BQ= github.com/tinylib/msgp v1.1.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.5 h1:2gXmtWueD2HefZHQe1QOy9HVzmFrLOVvsXwXBQ0ayy0= -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.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= +github.com/tklauser/numcpus v0.2.2 h1:oyhllyrScuYI6g+h/zUvNXNp1wy7x8qQy3t/piefldA= github.com/tklauser/numcpus v0.2.2/go.mod h1:x3qojaO3uyYt0i56EW/VUYs7uBvdl2fkfZFu0T9wgjM= -github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= -github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= 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/tommy-muehle/go-mnd v1.1.1/go.mod h1:dSUh0FtTP8VhvkL1S+gUR1OKd9ZnSaozuI6r3m6wOig= -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.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= @@ -1863,8 +1862,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-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= -golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc h1:mCRnTeVUjcrhlRmO0VK8a6k6Rrf6TF9htwo2pJVSjIU= +golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= 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= @@ -1996,8 +1995,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= +golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20170517211232-f52d1811a629/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= 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= @@ -2241,7 +2240,6 @@ golang.org/x/tools v0.0.0-20200731060945-b5fad4ed8dd6/go.mod h1:njjCfa9FT2d7l9Bc 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= @@ -2446,8 +2444,8 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 h1:EfLuoKW5WfkgVdDy7dTK8qSbH37AX5mj/MFh+bGPz14= -google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44/go.mod h1:8B0gmkoRebU8ukX6HP+4wrVQUY1+6PkQ44BSyIlflHA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA= +google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s= google.golang.org/grpc v1.2.1-0.20170921194603-d4b75ebd4f9f/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= @@ -2491,8 +2489,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= -google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= 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= diff --git a/interchaintest/fee_middleware_test.go b/interchaintest/fee_middleware_test.go index 850fe27d7..71d65d616 100644 --- a/interchaintest/fee_middleware_test.go +++ b/interchaintest/fee_middleware_test.go @@ -16,11 +16,13 @@ import ( "go.uber.org/zap/zaptest" ) -func TestRelayerFeeMiddleware(t *testing.T) { +func TestScenarioFeeMiddleware(t *testing.T) { if testing.Short() { t.Skip() } + t.Parallel() + nv := 1 nf := 0 @@ -71,13 +73,11 @@ func TestRelayerFeeMiddleware(t *testing.T) { SkipPathCreation: false, })) - t.Parallel() - t.Cleanup(func() { _ = ic.Close() }) - err = testutil.WaitForBlocks(ctx, 5, chainA, chainB) + err = testutil.WaitForBlocks(ctx, 10, chainA, chainB) require.NoError(t, err) // ChainID of ChainA @@ -180,7 +180,7 @@ func TestRelayerFeeMiddleware(t *testing.T) { ) // Wait for relayer to run - err = testutil.WaitForBlocks(ctx, 10, chainA, chainB) + err = testutil.WaitForBlocks(ctx, 5, chainA, chainB) require.NoError(t, err) // Assigning denom diff --git a/interchaintest/go.mod b/interchaintest/go.mod index 2137b8415..ebd518e79 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -4,19 +4,15 @@ go 1.20 require ( cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462 - github.com/avast/retry-go/v4 v4.3.4 - github.com/cometbft/cometbft v0.37.2 - github.com/cosmos/cosmos-sdk v0.47.5 - github.com/cosmos/go-bip39 v1.0.0 - github.com/cosmos/gogoproto v1.4.10 - github.com/cosmos/ibc-go/v7 v7.3.0 + github.com/cometbft/cometbft v0.37.0 + github.com/cosmos/cosmos-sdk v0.47.1 + github.com/cosmos/ibc-go/v7 v7.0.0 github.com/cosmos/relayer/v2 v2.0.0 - github.com/docker/docker v24.0.1+incompatible - github.com/google/uuid v1.3.0 + github.com/docker/docker v20.10.24+incompatible github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 - github.com/moby/moby v24.0.2+incompatible - github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230608002938-79172615eed0 - github.com/stretchr/testify v1.8.4 + github.com/moby/moby v20.10.22+incompatible + github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230405184655-2e6d60073e71 + github.com/stretchr/testify v1.8.2 go.uber.org/zap v1.24.0 golang.org/x/sync v0.2.0 ) @@ -29,15 +25,14 @@ require ( cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/api v0.3.1 // indirect cosmossdk.io/core v0.5.1 // indirect - cosmossdk.io/depinject v1.0.0-alpha.4 // indirect - cosmossdk.io/errors v1.0.0 // indirect - cosmossdk.io/log v1.2.1 // indirect - cosmossdk.io/math v1.1.2 // indirect - cosmossdk.io/tools/rosetta v0.2.1 // indirect + cosmossdk.io/depinject v1.0.0-alpha.3 // indirect + cosmossdk.io/errors v1.0.0-beta.7 // indirect + cosmossdk.io/math v1.0.0 // indirect + // cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.2 // indirect - github.com/BurntSushi/toml v1.3.0 // indirect + github.com/BurntSushi/toml v1.2.1 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/ChainSafe/go-schnorrkel/1 v0.0.0-00010101000000-000000000000 // indirect github.com/ComposableFi/go-subkey/v2 v2.0.0-tm03420 // indirect @@ -46,6 +41,7 @@ require ( github.com/Microsoft/go-winio v0.6.0 // indirect github.com/StirlingMarketingGroup/go-namecase v1.0.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect + github.com/avast/retry-go/v4 v4.3.3 // indirect github.com/aws/aws-sdk-go v1.44.203 // indirect github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -55,6 +51,7 @@ require ( github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.12 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect @@ -69,9 +66,9 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect + github.com/cosmos/gogoproto v1.4.6 // indirect github.com/cosmos/iavl v0.20.0 // indirect - github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1 // indirect - github.com/cosmos/ics23/go v0.10.0 // indirect + github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab // indirect github.com/cosmos/ledger-cosmos-go v0.12.2 // indirect github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect github.com/creachadair/taskgroup v0.4.2 // indirect @@ -143,17 +140,14 @@ require ( github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/klauspost/compress v1.16.3 // indirect github.com/klauspost/cpuid/v2 v2.2.3 // indirect - github.com/kr/pretty v0.3.1 // indirect - github.com/kr/text v0.2.0 // indirect github.com/lib/pq v1.10.7 // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-libp2p v0.22.0 // indirect + github.com/libp2p/go-libp2p-core v0.20.1 // indirect github.com/libp2p/go-openssl v0.1.0 // indirect - github.com/linxGnu/grocksdb v1.7.16 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect + github.com/mattn/go-isatty v0.0.17 // indirect github.com/mattn/go-pointer v0.0.1 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20220103164710-9a04d6ca976b // indirect @@ -176,7 +170,7 @@ require ( github.com/multiformats/go-varint v0.0.6 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/opencontainers/image-spec v1.1.0-rc2 // indirect - github.com/opencontainers/runc v1.1.3 // 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.8 // indirect github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect @@ -190,7 +184,6 @@ require ( github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect - github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.8.3 // indirect github.com/rs/zerolog v1.30.0 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect @@ -215,24 +208,22 @@ require ( go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect go.uber.org/atomic v1.10.0 // indirect - go.uber.org/multierr v1.11.0 // indirect - golang.org/x/crypto v0.11.0 // indirect - golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb // indirect - golang.org/x/mod v0.11.0 // indirect - golang.org/x/net v0.12.0 // indirect - golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sys v0.11.0 // indirect - golang.org/x/term v0.10.0 // indirect - golang.org/x/text v0.12.0 // indirect - golang.org/x/tools v0.9.3 // indirect + go.uber.org/multierr v1.8.0 // indirect + golang.org/x/crypto v0.7.0 // indirect + golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect + golang.org/x/mod v0.9.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/oauth2 v0.5.0 // indirect + golang.org/x/sys v0.6.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 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/grpc v1.56.2 // indirect - google.golang.org/protobuf v1.31.0 // indirect + google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect + google.golang.org/grpc v1.54.0 // indirect + google.golang.org/protobuf v1.29.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect @@ -241,11 +232,11 @@ require ( lukechampine.com/uint128 v1.2.0 // indirect modernc.org/cc/v3 v3.40.0 // indirect modernc.org/ccgo/v3 v3.16.13 // indirect - modernc.org/libc v1.22.5 // indirect + modernc.org/libc v1.22.3 // indirect modernc.org/mathutil v1.5.0 // indirect modernc.org/memory v1.5.0 // indirect modernc.org/opt v0.1.3 // indirect - modernc.org/sqlite v1.23.0 // indirect + modernc.org/sqlite v1.21.1 // indirect modernc.org/strutil v1.1.3 // indirect modernc.org/token v1.0.1 // indirect nhooyr.io/websocket v1.8.6 // indirect @@ -262,4 +253,5 @@ replace ( github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7 + ) diff --git a/interchaintest/go.sum b/interchaintest/go.sum index 9b8edc8d3..02c4bf2a9 100644 --- a/interchaintest/go.sum +++ b/interchaintest/go.sum @@ -191,14 +191,12 @@ cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= -cosmossdk.io/depinject v1.0.0-alpha.4 h1:PLNp8ZYAMPTUKyG9IK2hsbciDWqna2z1Wsl98okJopc= -cosmossdk.io/depinject v1.0.0-alpha.4/go.mod h1:HeDk7IkR5ckZ3lMGs/o91AVUc7E596vMaOmslGFM3yU= -cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= -cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= -cosmossdk.io/log v1.2.1 h1:Xc1GgTCicniwmMiKwDxUjO4eLhPxoVdI9vtMW8Ti/uk= -cosmossdk.io/log v1.2.1/go.mod h1:GNSCc/6+DhFIj1aLn/j7Id7PaO8DzNylUZoOYBL9+I4= -cosmossdk.io/math v1.1.2 h1:ORZetZCTyWkI5GlZ6CZS28fMHi83ZYf+A2vVnHNzZBM= -cosmossdk.io/math v1.1.2/go.mod h1:l2Gnda87F0su8a/7FEKJfFdJrM0JZRXQaohlgJeyQh0= +cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= +cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= +cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= +cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= +cosmossdk.io/math v1.0.0 h1:ro9w7eKx23om2tZz/VM2Pf+z2WAbGX1yDQQOJ6iGeJw= +cosmossdk.io/math v1.0.0/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462 h1:g8muUHnXL8vhld2Sjilyhb1UQObc+x9GVuDK43TYZns= cosmossdk.io/simapp v0.0.0-20230224204036-a6adb0821462/go.mod h1:4Dd3NLoLYoN90kZ0uyHoTHzVVk9+J0v4HhZRBNTAq2c= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -210,7 +208,8 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMb github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0= github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk= -github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8 h1:V8krnnfGj4pV65YLUm3C0/8bl7V5Nry2Pwvy3ru/wLc= +github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= +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/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.0 h1:Ws8e5YmnrGEHzZEzg0YvK/7COGYtTC5PbaH9oSSbgfA= @@ -260,8 +259,9 @@ github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJ github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/aryann/difflib v0.0.0-20170710044230-e206f873d14a/go.mod h1:DAHtR1m6lCRdSC2Tm3DSWRPvIPr6xNKyeHdqDQSQT+A= -github.com/avast/retry-go/v4 v4.3.4 h1:pHLkL7jvCvP317I8Ge+Km2Yhntv3SdkJm7uekkqbKhM= -github.com/avast/retry-go/v4 v4.3.4/go.mod h1:rv+Nla6Vk3/ilU0H51VHddWHiwimzX66yZ0JT6T+UvE= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/avast/retry-go/v4 v4.3.3 h1:G56Bp6mU0b5HE1SkaoVjscZjlQb0oy4mezwY/cGH19w= +github.com/avast/retry-go/v4 v4.3.3/go.mod h1:rg6XFaiuFYII0Xu3RDbZQkxCofFwruZKW8oEF1jpWiU= github.com/aws/aws-lambda-go v1.13.3/go.mod h1:4UKl9IzQMoD+QF79YdCuzCwp8VbmG4VAQwij/eHl5CU= github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= @@ -307,6 +307,8 @@ github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInq 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/centrifuge/go-substrate-rpc-client/v4 v4.0.12 h1:DCYWIBOalB0mKKfUg2HhtGgIkBbMA1fnlnkZp7fHB18= +github.com/centrifuge/go-substrate-rpc-client/v4 v4.0.12/go.mod h1:5g1oM4Zu3BOaLpsKQ+O8PAv2kNuq+kPcA1VzFbsSqxE= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -372,24 +374,22 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= -github.com/cosmos/cosmos-sdk v0.47.5 h1:n1+WjP/VM/gAEOx3TqU2/Ny734rj/MX1kpUnn7zVJP8= -github.com/cosmos/cosmos-sdk v0.47.5/go.mod h1:EHwCeN9IXonsjKcjpS12MqeStdZvIdxt3VYXhus3G3c= +github.com/cosmos/cosmos-sdk v0.47.1 h1:HnaCYtaAMWZp1SdlwwE1mPJ8kFlZ/TuEJ/ciNXH6Uno= +github.com/cosmos/cosmos-sdk v0.47.1/go.mod h1:14tO5KQaTrl2q3OxBnDRfue7TRN9zkXS0cLutrSqkOo= 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/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogogateway v1.2.0/go.mod h1:iQpLkGWxYcnCdz5iAdLcRBSw3h7NXeOkZ4GUkT+tbFI= github.com/cosmos/gogoproto v1.4.2/go.mod h1:cLxOsn1ljAHSV527CHOtaIP91kK6cCrZETRBrkzItWU= -github.com/cosmos/gogoproto v1.4.10 h1:QH/yT8X+c0F4ZDacDv3z+xE3WU1P1Z3wQoLMBRJoKuI= -github.com/cosmos/gogoproto v1.4.10/go.mod h1:3aAZzeRWpAwr+SS/LLkICX2/kDFyaYVzckBDzygIxek= +github.com/cosmos/gogoproto v1.4.6 h1:Ee7z15dWJaGlgM2rWrK8N2IX7PQcuccu8oG68jp5RL4= +github.com/cosmos/gogoproto v1.4.6/go.mod h1:VS/ASYmPgv6zkPKLjR9EB91lwbLHOzaGCirmKKhncfI= github.com/cosmos/iavl v0.20.0 h1:fTVznVlepH0KK8NyKq8w+U7c2L6jofa27aFX6YGlm38= github.com/cosmos/iavl v0.20.0/go.mod h1:WO7FyvaZJoH65+HFOsDir7xU9FWk2w9cHXNW1XHcl7A= -github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1 h1:BvSKnPFKxL+TTSLxGKwJN4x0ndCZj0yfXhSvmsQztSA= -github.com/cosmos/ibc-go/modules/capability v1.0.0-rc1/go.mod h1:A+CxAQdn2j6ihDTbClpEEBdHthWgAUAcHbRAQPY8sl4= -github.com/cosmos/ibc-go/v7 v7.3.0 h1:QtGeVMi/3JeLWuvEuC60sBHpAF40Oenx/y+bP8+wRRw= -github.com/cosmos/ibc-go/v7 v7.3.0/go.mod h1:mUmaHFXpXrEdcxfdXyau+utZf14pGKVUiXwYftRZZfQ= -github.com/cosmos/ics23/go v0.10.0 h1:iXqLLgp2Lp+EdpIuwXTYIQU+AiHj9mOC2X9ab++bZDM= -github.com/cosmos/ics23/go v0.10.0/go.mod h1:ZfJSmng/TBNTBkFemHHHj5YY7VAU/MBU980F4VU1NG0= +github.com/cosmos/ibc-go/v7 v7.0.0 h1:j4kyywlG0hhDmT9FmSaR5iCIka7Pz7kJTxGWY1nlV9Q= +github.com/cosmos/ibc-go/v7 v7.0.0/go.mod h1:BFh8nKWjr5zeR2OZfhkzdgDzj1+KjRn3aJLpwapStj8= +github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab h1:I9ialKTQo7248V827Bba4OuKPmk+FPzmTVHsLXaIJWw= +github.com/cosmos/ics23/go v0.9.1-0.20221207100636-b1abd8678aab/go.mod h1:2CwqasX5dSD7Hbp/9b6lhK6BwoBDCBldx7gPKRukR60= github.com/cosmos/ledger-cosmos-go v0.12.2 h1:/XYaBlE2BJxtvpkHiBm97gFGSGmYGKunKyF3nNqAXZA= github.com/cosmos/ledger-cosmos-go v0.12.2/go.mod h1:ZcqYgnfNJ6lAXe4HPtWgarNEY+B74i+2/8MhZw4ziiI= github.com/cosmos/rosetta-sdk-go v0.10.0 h1:E5RhTruuoA7KTIXUcMicL76cffyeoyvNybzUGSKFTcM= @@ -433,10 +433,18 @@ github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZm github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 h1:fAjc9m62+UWV/WAFKLNi6ZS0675eEUC9y3AlwSbQu1Y= github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= -github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= -github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v24.0.1+incompatible h1:NxN81beIxDlUaVt46iUQrYHD9/W3u9EGl52r86O/IGw= -github.com/docker/docker v24.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E= +github.com/docker/cli v0.0.0-20191017083524-a8ff7f821017/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY= +github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/distribution v2.8.1+incompatible h1:Q50tZOPR6T/hjNsyc9g8/syEs6bk8XXApsHjKukMl68= +github.com/docker/distribution v2.8.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v1.4.2-0.20190924003213-a8608b5b67c7/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v20.10.24+incompatible h1:Ugvxm7a8+Gz6vqQYQQ2W7GYq5EUPaAiuPgIfVyI3dYE= +github.com/docker/docker v20.10.24+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y= 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/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= @@ -739,6 +747,7 @@ github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLf github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/ipfs/go-cid v0.2.0 h1:01JTiihFq9en9Vz0lc0VDWvZe/uBonGpzo4THP0vcQ0= github.com/ipfs/go-cid v0.2.0/go.mod h1:P+HXFDF4CVhaVayiEb4wkAy7zBHxBwsJyt0Y5U6MLro= +github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= 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.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= @@ -800,6 +809,8 @@ github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/libp2p/go-libp2p v0.22.0 h1:2Tce0kHOp5zASFKJbNzRElvh0iZwdtG5uZheNW8chIw= github.com/libp2p/go-libp2p v0.22.0/go.mod h1:UDolmweypBSjQb2f7xutPnwZ/fxioLbMBxSjRksxxU4= +github.com/libp2p/go-libp2p-core v0.20.1 h1:fQz4BJyIFmSZAiTbKV8qoYhEH5Dtv/cVhZbG3Ib/+Cw= +github.com/libp2p/go-libp2p-core v0.20.1/go.mod h1:6zR8H7CvQWgYLsbG4on6oLNSGcyKaYFSEYyDt51+bIY= github.com/libp2p/go-openssl v0.1.0 h1:LBkKEcUv6vtZIQLVTegAil8jbNpJErQ9AnT+bWV+Ooo= github.com/libp2p/go-openssl v0.1.0/go.mod h1:OiOxwPpL3n4xlenjx2h7AwSGaFSC/KZvf6gNdOBQMtc= github.com/lightstep/lightstep-tracer-common/golang/gogo v0.0.0-20190605223551-bc2310a04743/go.mod h1:qklhhLq1aX+mtWk9cPHPzaBjWImj5ULL6C7HFJtXQMM= @@ -819,15 +830,15 @@ github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovk 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.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-pointer v0.0.1 h1:n+XhsuGeVO6MEAp7xyEukFINEa+Quek5psIR/ylA6o0= github.com/mattn/go-pointer v0.0.1/go.mod h1:2zXcozF6qYGgmsG+SeTZz3oAbFLdD3OWqnUbNvJZAlc= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU= +github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= +github.com/mattn/go-shellwords v1.0.6/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= @@ -870,6 +881,7 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lN github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A= +github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc= github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o= github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= @@ -928,8 +940,19 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= -github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w= -github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg= +github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= +github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= +github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= +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 v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.2-0.20190207185410-29686dbc5559/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= 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= @@ -1071,10 +1094,14 @@ 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.16.0 h1:rGGH0XDZhdUOryiDWjmIvUSWpbNqisK8Wk0Vyefw8hc= -github.com/spf13/viper v1.16.0/go.mod h1:yg78JgCJcbrQOvV9YLXgkLaZqUidkY9K+Dd1FofRzQg= -github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230608002938-79172615eed0 h1:WoRj3il7OqGknKxf3IRwGTY65AVbTnDjKAgezpEHM3E= -github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230608002938-79172615eed0/go.mod h1:RG6EsHW08mfwJQmZykqzkAQwAmVojcrqujjFBFPIHcY= +github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= +github.com/spf13/viper v1.15.0 h1:js3yy885G8xwJa6iOISGFwd+qlUo5AvyXb7CiihdtiU= +github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jHOQLA= +github.com/stefanberger/go-pkcs11uri v0.0.0-20201008174630-78d3cae3a980/go.mod h1:AO3tvPzVZ/ayst6UlUKUv6rcPQInYe3IknH3jYhAKu8= +github.com/strangelove-ventures/go-subkey v1.0.7 h1:cOP/Lajg3uxV/tvspu0m6+0Cu+DJgygkEAbx/s+f35I= +github.com/strangelove-ventures/go-subkey v1.0.7/go.mod h1:E34izOIEm+sZ1YmYawYRquqBQWeZBjVB4pF7bMuhc1c= +github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230405184655-2e6d60073e71 h1:bbhg6Iol/5UR65+4kPaki+3mNUgyvcQe+ZHrleorKKY= +github.com/strangelove-ventures/interchaintest/v7 v7.0.0-20230405184655-2e6d60073e71/go.mod h1:tkBlI3o0Z1jgkZIkckOLIHJuR+S0LbGoBEGg4NQ4Aa8= github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/amqp v0.0.0-20190827072141-edfb9018d271/go.mod h1:AZpEONHx3DKn8O/DFsRAY58/XVQiIPMTMB1SddzLXVw= github.com/streadway/handy v0.0.0-20190108123426-d5acb3125c2a/go.mod h1:qNTQ5P5JnDBl6z3cMAg/SywNDC5ABu5ApDIw6lUbRmI= @@ -1141,6 +1168,8 @@ github.com/zondax/hid v0.9.1/go.mod h1:l5wttcP0jwtdLjqjMMWFVEE7d1zO0jvSPA9OPZxWp github.com/zondax/ledger-go v0.14.1 h1:Pip65OOl4iJ84WTpA4BKChvOufMhhbxED3BaihoZN4c= github.com/zondax/ledger-go v0.14.1/go.mod h1:fZ3Dqg6qcdXWSOJFKMG8GCTnD7slO/RL2feOQv8K320= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ= go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= @@ -1184,12 +1213,13 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.7.0 h1:AvwMYaRytfdeVt3u6mLaxYtErKYjxA2OXjJ1HHq6t3A= +golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1201,8 +1231,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-20230711153332-06a737ee72cb h1:xIApU0ow1zwMa2uL1VDNeQlNVFTWMQxZUZCMDy0Q4Us= -golang.org/x/exp v0.0.0-20230711153332-06a737ee72cb/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug= +golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc= 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= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1229,9 +1259,8 @@ 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.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU= -golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +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-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1294,8 +1323,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +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= @@ -1418,7 +1447,6 @@ golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/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-20210908233432-aa78b53d3365/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-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-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -1445,14 +1473,13 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= -golang.org/x/sys v0.11.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/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +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= @@ -1464,8 +1491,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc= -golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +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= @@ -1532,8 +1559,8 @@ 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.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM= -golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +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= @@ -1759,8 +1786,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= 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= @@ -1777,8 +1804,9 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8= -google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= +google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= 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= @@ -1822,8 +1850,36 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -launchpad.net/gocheck v0.0.0-20140225173054-000000000087 h1:Izowp2XBH6Ya6rv+hqbceQyw/gSGoXfH/UPoTGduL54= -launchpad.net/gocheck v0.0.0-20140225173054-000000000087/go.mod h1:hj7XX3B/0A+80Vse0e+BUHsHMTEhd0O4cpUHr/e/BUM= +k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= +k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= +k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= +k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU= +k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc= +k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU= +k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM= +k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q= +k8s.io/client-go v0.20.1/go.mod h1:/zcHdt1TeWSd5HoUe6elJmHSQ6uLLgp4bIJHVEuy+/Y= +k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k= +k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0= +k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0= +k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk= +k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI= +k8s.io/component-base v0.20.6/go.mod h1:6f1MPBAeI+mvuts3sIdtpjljHWBQ2cIy38oBIWMYnrM= +k8s.io/cri-api v0.17.3/go.mod h1:X1sbHmuXhwaHs9xxYffLqJogVsnI+f6cPRcgPel7ywM= +k8s.io/cri-api v0.20.1/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/cri-api v0.20.4/go.mod h1:2JRbKt+BFLTjtrILYVqQK5jqhI+XNdF6UiGMgczeBCI= +k8s.io/cri-api v0.20.6/go.mod h1:ew44AjNXwyn1s0U4xCKGodU7J1HzBeZ1MpGrpa5r8Yc= +k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= +k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= +k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= +k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= lukechampine.com/blake3 v1.1.7 h1:GgRMhmdsuK8+ii6UZFDL8Nb+VyMwadAgcJyfYHxG6n0= lukechampine.com/blake3 v1.1.7/go.mod h1:tkKEOtDkNtklkXtLNEOGNq5tcV90tJiA1vAA12R78LA= lukechampine.com/uint128 v1.2.0 h1:mBi/5l91vocEN8otkC5bDLhi2KdCticRiwbdB0O+rjI= @@ -1834,22 +1890,22 @@ modernc.org/ccgo/v3 v3.16.13 h1:Mkgdzl46i5F/CNR/Kj80Ri59hC8TKAhZrYSaqvkwzUw= modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY= modernc.org/ccorpus v1.11.6 h1:J16RXiiqiCgua6+ZvQot4yUuUy8zxgqbqEEUuGPlISk= modernc.org/httpfs v1.0.6 h1:AAgIpFZRXuYnkjftxTAZwMIiwEqAfk8aVB2/oA6nAeM= -modernc.org/libc v1.22.5 h1:91BNch/e5B0uPbJFgqbxXuOnxBQjlS//icfQEGmvyjE= -modernc.org/libc v1.22.5/go.mod h1:jj+Z7dTNX8fBScMVNRAYZ/jF91K8fdT2hYMThc3YjBY= +modernc.org/libc v1.22.3 h1:D/g6O5ftAfavceqlLOFwaZuA5KYafKwmr30A6iSqoyY= +modernc.org/libc v1.22.3/go.mod h1:MQrloYP209xa2zHome2a8HLiLm6k0UT8CoHpV74tOFw= modernc.org/mathutil v1.5.0 h1:rV0Ko/6SfM+8G+yKiyI830l3Wuz1zRutdslNoQ0kfiQ= modernc.org/mathutil v1.5.0/go.mod h1:mZW8CKdRPY1v87qxC/wUdX5O1qDzXMP5TH3wjfpga6E= modernc.org/memory v1.5.0 h1:N+/8c5rE6EqugZwHii4IFsaJ7MUhoWX07J5tC/iI5Ds= modernc.org/memory v1.5.0/go.mod h1:PkUhL0Mugw21sHPeskwZW4D6VscE/GQJOnIpCnW6pSU= modernc.org/opt v0.1.3 h1:3XOZf2yznlhC+ibLltsDGzABUGVx8J6pnFMS3E4dcq4= modernc.org/opt v0.1.3/go.mod h1:WdSiB5evDcignE70guQKxYUl14mgWtbClRi5wmkkTX0= -modernc.org/sqlite v1.23.0 h1:MWTFBI5H1WLnXpNBh/BTruBVqzzoh28DA0iOnlkkRaM= -modernc.org/sqlite v1.23.0/go.mod h1:OrDj17Mggn6MhE+iPbBNf7RGKODDE9NFT0f3EwDzJqk= +modernc.org/sqlite v1.21.1 h1:GyDFqNnESLOhwwDRaHGdp2jKLDzpyT/rNLglX3ZkMSU= +modernc.org/sqlite v1.21.1/go.mod h1:XwQ0wZPIh1iKb5mkvCJ3szzbhk+tykC8ZWqTRTgYRwI= modernc.org/strutil v1.1.3 h1:fNMm+oJklMGYfU9Ylcywl0CO5O6nTfaowNsh2wpPjzY= modernc.org/strutil v1.1.3/go.mod h1:MEHNA7PdEnEwLvspRMtWTNnp2nnyvMfkimT1NKNAGbw= -modernc.org/tcl v1.15.2 h1:C4ybAYCGJw968e+Me18oW55kD/FexcHbqH2xak1ROSY= +modernc.org/tcl v1.15.1 h1:mOQwiEK4p7HruMZcwKTZPw/aqtGM4aY00uzWhlKKYws= modernc.org/token v1.0.1 h1:A3qvTqOwexpfZZeyI0FeGPDlSWX5pjZu9hF4lU+EKWg= modernc.org/token v1.0.1/go.mod h1:UGzOrNV1mAFSEB63lOFHIpNRUVMvYTc6yu1SMY/XTDM= -modernc.org/z v1.7.3 h1:zDJf6iHjrnB+WRD88stbXokugjyc0/pB91ri1gO6LZY= +modernc.org/z v1.7.0 h1:xkDw/KepgEjeizO2sNco+hqYkU12taxQFqPEmgm1GWE= nhooyr.io/websocket v1.8.6 h1:s+C3xAMLwGmlI31Nyn/eAehUlZPwfYZu2JXM621Q5/k= nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= diff --git a/interchaintest/ica_channel_close_test.go b/interchaintest/ica_channel_close_test.go index 6eac44b64..b21a41c32 100644 --- a/interchaintest/ica_channel_close_test.go +++ b/interchaintest/ica_channel_close_test.go @@ -26,6 +26,8 @@ func TestScenarioICAChannelClose(t *testing.T) { t.Skip("skipping in short mode") } + t.Parallel() + client, network := interchaintest.DockerSetup(t) rep := testreporter.NewNopReporter() @@ -91,8 +93,6 @@ func TestScenarioICAChannelClose(t *testing.T) { // BlockDatabaseFile: interchaintest.DefaultBlockDatabaseFilepath(), })) - t.Parallel() - // Fund a user account on chain1 and chain2 const userFunds = int64(10_000_000_000) users := interchaintest.GetAndFundTestUsers(t, ctx, t.Name(), userFunds, chain1, chain2) @@ -244,7 +244,7 @@ func TestScenarioICAChannelClose(t *testing.T) { // Wait for ack _, err = cosmos.PollForMessage(ctx, chain1, ir, - c1h, c1h+25, ackFound) + c1h, c1h+10, ackFound) require.NoError(t, err) // Assert that the funds have been received by the user account on chain2 @@ -311,7 +311,7 @@ func TestScenarioICAChannelClose(t *testing.T) { // Wait for channel open confirm _, err = cosmos.PollForMessage(ctx, chain2, ir, - c2h, c2h+40, channelFound) + c2h, c2h+30, channelFound) require.NoError(t, err) // Assert that a new channel has been opened and the same ICA is in use diff --git a/interchaintest/interchain_accounts_test.go b/interchaintest/interchain_accounts_test.go index 0ec0a1df5..0185b2bc2 100644 --- a/interchaintest/interchain_accounts_test.go +++ b/interchaintest/interchain_accounts_test.go @@ -27,6 +27,8 @@ func TestScenarioInterchainAccounts(t *testing.T) { t.Skip("skipping in short mode") } + t.Parallel() + client, network := interchaintest.DockerSetup(t) rep := testreporter.NewNopReporter() @@ -92,8 +94,6 @@ func TestScenarioInterchainAccounts(t *testing.T) { // BlockDatabaseFile: interchaintest.DefaultBlockDatabaseFilepath(), })) - t.Parallel() - // Fund a user account on chain1 and chain2 const userFunds = int64(10_000_000_000) users := interchaintest.GetAndFundTestUsers(t, ctx, t.Name(), userFunds, chain1, chain2) diff --git a/interchaintest/relayer.go b/interchaintest/relayer.go index 8641830bc..f5f74e997 100644 --- a/interchaintest/relayer.go +++ b/interchaintest/relayer.go @@ -9,7 +9,6 @@ import ( "testing" "github.com/cosmos/cosmos-sdk/crypto/keyring" - "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/relayer/v2/cmd" "github.com/cosmos/relayer/v2/internal/relayertest" "github.com/cosmos/relayer/v2/relayer" @@ -88,8 +87,8 @@ func (r *Relayer) AddChainConfiguration(ctx context.Context, _ ibc.RelayerExecRe return nil } -func (r *Relayer) AddKey(ctx context.Context, _ ibc.RelayerExecReporter, chainID, keyName, coinType string) (ibc.Wallet, error) { - res := r.sys().RunC(ctx, r.log(), "keys", "add", chainID, keyName, "--coin-type", coinType) +func (r *Relayer) AddKey(ctx context.Context, _ ibc.RelayerExecReporter, chainID, keyName, coinType, signingAlgorithm string) (ibc.Wallet, error) { + res := r.sys().RunC(ctx, r.log(), "keys", "add", chainID, keyName, "--coin-type", coinType, "--signing-algorithm", signingAlgorithm) if res.Err != nil { return nil, res.Err } @@ -102,8 +101,8 @@ func (r *Relayer) AddKey(ctx context.Context, _ ibc.RelayerExecReporter, chainID return w, nil } -func (r *Relayer) RestoreKey(ctx context.Context, _ ibc.RelayerExecReporter, cfg ibc.ChainConfig, keyName, mnemonic string) error { - res := r.sys().RunC(ctx, r.log(), "keys", "restore", cfg.ChainID, keyName, mnemonic, "--coin-type", cfg.CoinType) +func (r *Relayer) RestoreKey(ctx context.Context, _ ibc.RelayerExecReporter, chainID, keyName, coinType, signingAlgorithm, mnemonic string) error { + res := r.sys().RunC(ctx, r.log(), "keys", "restore", chainID, keyName, mnemonic, "--coin-type", coinType, "--signing-algorithm", signingAlgorithm) if res.Err != nil { return res.Err } @@ -352,10 +351,3 @@ func (r *Relayer) GetWallet(chainID string) (ibc.Wallet, bool) { } return rly.NewWallet(keyName, address, ""), true } - -// SetClientContractHash sets the wasm client contract hash in the chain's config if the counterparty chain in a path used 08-wasm -// to instantiate the client. -func (r *Relayer) SetClientContractHash(ctx context.Context, rep ibc.RelayerExecReporter, cfg ibc.ChainConfig, hash string) error { - //TODO implement me - panic("implement me") -} diff --git a/proto/cosmos/crypto/sr25519/keys.proto b/proto/cosmos/crypto/sr25519/keys.proto index 384cafe3a..eed481375 100644 --- a/proto/cosmos/crypto/sr25519/keys.proto +++ b/proto/cosmos/crypto/sr25519/keys.proto @@ -8,14 +8,13 @@ import "gogoproto/gogo.proto"; // Originally github.com/cosmos/cosmos-sdk/crypto/keys/sr25519 option go_package = "github.com/cosmos/relayer/v2/relayer/chains/cosmos/keys/sr25519"; -option (gogoproto.messagename_all) = true; +option (gogoproto.messagename_all) = true; option (gogoproto.goproto_stringer_all) = false; -option (gogoproto.goproto_getters_all) = false; +option (gogoproto.goproto_getters_all) = false; // PubKey defines a sr25519 ECDSA public key. message PubKey { - option (gogoproto.goproto_stringer) = false; + option (gogoproto.goproto_stringer) = false; - bytes key = 1 [ (gogoproto.casttype) = - "github.com/cometbft/cometbft/crypto/sr25519.PubKey" ]; + bytes key = 1 [(gogoproto.casttype) = "github.com/cometbft/cometbft/crypto/sr25519.PubKey"]; } diff --git a/relayer/chains/archway/helper_debug_msg.go b/relayer/chains/archway/helper_debug_msg.go index 953a8fb12..6b56179de 100644 --- a/relayer/chains/archway/helper_debug_msg.go +++ b/relayer/chains/archway/helper_debug_msg.go @@ -29,7 +29,6 @@ func jsonDumpDataFile(filename string, bufs interface{}) { os.Exit(1) } - fmt.Printf("Successfully created or appended JSON in %s \n", filename) } func readExistingData(filename string, opPointer interface{}) error { diff --git a/relayer/chains/archway/keys.go b/relayer/chains/archway/keys.go index 0bb844d6c..061a6434c 100644 --- a/relayer/chains/archway/keys.go +++ b/relayer/chains/archway/keys.go @@ -58,8 +58,8 @@ func (cc *ArchwayProvider) KeystoreCreated(path string) bool { // AddKey generates a new mnemonic which is then converted to a private key and BIP-39 HD Path and persists it to the keystore. // It fails if there is an existing key with the same address. -func (cc *ArchwayProvider) AddKey(name string, coinType uint32) (output *provider.KeyOutput, err error) { - ko, err := cc.KeyAddOrRestore(name, coinType) +func (cc *ArchwayProvider) AddKey(name string, coinType uint32, signingAlgorithm string) (output *provider.KeyOutput, err error) { + ko, err := cc.KeyAddOrRestore(name, coinType, signingAlgorithm) if err != nil { return nil, err } @@ -68,7 +68,7 @@ func (cc *ArchwayProvider) AddKey(name string, coinType uint32) (output *provide // RestoreKey converts a mnemonic to a private key and BIP-39 HD Path and persists it to the keystore. // It fails if there is an existing key with the same address. -func (cc *ArchwayProvider) RestoreKey(name, mnemonic string, coinType uint32) (address string, err error) { +func (cc *ArchwayProvider) RestoreKey(name, mnemonic string, coinType uint32, signingAlgorithm string) (address string, err error) { ko, err := cc.KeyAddOrRestore(name, coinType, mnemonic) if err != nil { return "", err diff --git a/relayer/chains/archway/provider.go b/relayer/chains/archway/provider.go index d37894f03..c4faf750a 100644 --- a/relayer/chains/archway/provider.go +++ b/relayer/chains/archway/provider.go @@ -191,11 +191,6 @@ func (pp *ArchwayProviderConfig) Validate() error { return nil } -func (pp *ArchwayProviderConfig) Set(field string, value interface{}) error { - // TODO: implement - return nil -} - func (pp *ArchwayProviderConfig) getRPCAddr() string { return pp.RPCAddr } @@ -452,6 +447,10 @@ func (ap *ArchwayProvider) updateNextAccountSequence(seq uint64) { } } +func (app *ArchwayProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayeeAddr string) (provider.RelayerMessage, error) { + return nil, fmt.Errorf("Not implemented for Icon") +} + // keysDir returns a string representing the path on the local filesystem where the keystore will be initialized. func keysDir(home, chainID string) string { return path.Join(home, "keys", chainID) diff --git a/relayer/chains/archway/query.go b/relayer/chains/archway/query.go index 9aacf27e4..e6185c103 100644 --- a/relayer/chains/archway/query.go +++ b/relayer/chains/archway/query.go @@ -765,7 +765,7 @@ func (ap *ArchwayProvider) QueryPacketReceipt(ctx context.Context, height int64, } pktReceipt, err := ap.QueryIBCHandlerContract(ctx, pktReceiptParams) - if err != nil && !strings.Contains(err.Error(), "PacketCommitmentNotFound") { + if err != nil && !strings.Contains(err.Error(), "PacketReceiptNotFound") { return nil, err } diff --git a/relayer/chains/archway/tx.go b/relayer/chains/archway/tx.go index 0b1895774..bf09b55d5 100644 --- a/relayer/chains/archway/tx.go +++ b/relayer/chains/archway/tx.go @@ -763,6 +763,9 @@ func (ap *ArchwayProvider) SendMessagesToMempool( ap.BroadcastTx(cliCtx, txBytes, []provider.RelayerMessage{msg}, asyncCtx, defaultBroadcastWaitTimeout, asyncCallback, false) } + //uncomment for saving msg + SaveMsgToFile(ArchwayDebugMessagePath, msgs) + return nil } @@ -1004,6 +1007,8 @@ func (ap *ArchwayProvider) BroadcastTx( ap.log.Info("Submitted transaction", zap.String("chain_id", ap.PCfg.ChainID), zap.String("txHash", res.TxHash), + zap.Int64("Height", res.Height), + zap.Any("Methods called", msgTypesField(msgs)), ) if shouldWait { @@ -1046,9 +1051,6 @@ func (ap *ArchwayProvider) waitForTx( return } - //uncomment for saving msg - SaveMsgToFile(ArchwayDebugMessagePath, msgs) - rlyResp := &provider.RelayerTxResponse{ Height: res.Height, TxHash: res.TxHash, diff --git a/relayer/chains/cosmos/codec.go b/relayer/chains/cosmos/codec.go index 16cdaa16f..bfeb42425 100644 --- a/relayer/chains/cosmos/codec.go +++ b/relayer/chains/cosmos/codec.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/tx" authz "github.com/cosmos/cosmos-sdk/x/authz/module" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/cosmos/cosmos-sdk/x/crisis" + "github.com/cosmos/cosmos-sdk/x/capability" "github.com/cosmos/cosmos-sdk/x/distribution" feegrant "github.com/cosmos/cosmos-sdk/x/feegrant/module" "github.com/cosmos/cosmos-sdk/x/gov" @@ -20,9 +20,7 @@ import ( paramsclient "github.com/cosmos/cosmos-sdk/x/params/client" "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/cosmos-sdk/x/upgrade" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" - "github.com/cosmos/ibc-go/modules/capability" ibcfee "github.com/cosmos/ibc-go/v7/modules/apps/29-fee" "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibc "github.com/cosmos/ibc-go/v7/modules/core" @@ -47,14 +45,14 @@ var ModuleBasics = []module.AppModuleBasic{ upgradeclient.LegacyCancelProposalHandler, }, ), - crisis.AppModuleBasic{}, + // crisis.AppModuleBasic{}, distribution.AppModuleBasic{}, feegrant.AppModuleBasic{}, mint.AppModuleBasic{}, params.AppModuleBasic{}, slashing.AppModuleBasic{}, staking.AppModuleBasic{}, - upgrade.AppModuleBasic{}, + // upgrade.AppModuleBasic{}, transfer.AppModuleBasic{}, ibc.AppModuleBasic{}, cosmosmodule.AppModuleBasic{}, diff --git a/relayer/chains/cosmos/cosmos_chain_processor.go b/relayer/chains/cosmos/cosmos_chain_processor.go index ad2d56c6c..beb04e42e 100644 --- a/relayer/chains/cosmos/cosmos_chain_processor.go +++ b/relayer/chains/cosmos/cosmos_chain_processor.go @@ -404,11 +404,11 @@ func (ccp *CosmosChainProcessor) queryCycle(ctx context.Context, persistence *qu }) if err := eg.Wait(); err != nil { - ccp.log.Debug( - "Error querying block data", + ccp.log.Warn( + "Could not query block data. Consider checking if your RPC node is online, and that transaction indexing is enabled.", zap.Int64("height", i), - zap.Error(err), ) + ccp.log.Debug("Error querying block data", zap.Error(err)) persistence.retriesAtLatestQueriedBlock++ if persistence.retriesAtLatestQueriedBlock >= blockMaxRetries { @@ -558,6 +558,6 @@ func (ccp *CosmosChainProcessor) CurrentRelayerBalance(ctx context.Context) { bal := relayerWalletBalances.AmountOf(gasDenom.Denom) // Convert to a big float to get a float64 for metrics f, _ := big.NewFloat(0.0).SetInt(bal.BigInt()).Float64() - ccp.metrics.SetWalletBalance(ccp.chainProvider.ChainId(), ccp.chainProvider.PCfg.GasPrices, ccp.chainProvider.Key(), address, gasDenom.Denom, f) + ccp.metrics.SetWalletBalance(ccp.chainProvider.ChainId(), ccp.chainProvider.Key(), address, gasDenom.Denom, f) } } diff --git a/relayer/chains/cosmos/keys/sr25519/keys.pb.go b/relayer/chains/cosmos/keys/sr25519/keys.pb.go index 9d6762141..49a3599b7 100644 --- a/relayer/chains/cosmos/keys/sr25519/keys.pb.go +++ b/relayer/chains/cosmos/keys/sr25519/keys.pb.go @@ -8,8 +8,8 @@ package sr25519 import ( fmt "fmt" github_com_cometbft_cometbft_crypto_sr25519 "github.com/cometbft/cometbft/crypto/sr25519" - _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" + _ "github.com/gogo/protobuf/gogoproto" io "io" math "math" math_bits "math/bits" diff --git a/relayer/chains/cosmos/message_handlers.go b/relayer/chains/cosmos/message_handlers.go index 029ddd652..4c73f2f1d 100644 --- a/relayer/chains/cosmos/message_handlers.go +++ b/relayer/chains/cosmos/message_handlers.go @@ -85,7 +85,7 @@ func (ccp *CosmosChainProcessor) handleChannelMessage(eventType string, ci provi case chantypes.EventTypeChannelOpenTry: ccp.channelStateCache.SetOpen(channelKey, false, ci.Order) case chantypes.EventTypeChannelOpenAck, chantypes.EventTypeChannelOpenConfirm: - ccp.channelStateCache.SetOpen(channelKey, true, ci.Order) + ccp.channelStateCache[channelKey] = true ccp.logChannelOpenMessage(eventType, ci) case chantypes.EventTypeChannelCloseConfirm: for k := range ccp.channelStateCache { diff --git a/relayer/chains/cosmos/module/app_module.go b/relayer/chains/cosmos/module/app_module.go index 39e6ea36b..511ca3859 100644 --- a/relayer/chains/cosmos/module/app_module.go +++ b/relayer/chains/cosmos/module/app_module.go @@ -27,7 +27,6 @@ func (AppModuleBasic) RegisterLegacyAminoCodec(*codec.LegacyAmino) {} func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) { tmlightclient.RegisterInterfaces(registry) solomachine.RegisterInterfaces(registry) - localhost.RegisterInterfaces(registry) } // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the ibc module. diff --git a/relayer/chains/cosmos/msg.go b/relayer/chains/cosmos/msg.go index 61e7c1c35..bb43b88a5 100644 --- a/relayer/chains/cosmos/msg.go +++ b/relayer/chains/cosmos/msg.go @@ -8,6 +8,7 @@ import ( "go.uber.org/zap/zapcore" ) + type CosmosMessage struct { Msg sdk.Msg SetSigner func(string) //callback to update the Msg Signer field diff --git a/relayer/chains/cosmos/provider.go b/relayer/chains/cosmos/provider.go index 98547f66d..8c5da98fe 100644 --- a/relayer/chains/cosmos/provider.go +++ b/relayer/chains/cosmos/provider.go @@ -35,46 +35,28 @@ var ( const cometEncodingThreshold = "v0.37.0-alpha" type CosmosProviderConfig struct { - KeyDirectory string `json:"key-directory" yaml:"key-directory"` - Key string `json:"key" yaml:"key"` - ChainName string `json:"-" yaml:"-"` - ChainID string `json:"chain-id" yaml:"chain-id"` - RPCAddr string `json:"rpc-addr" yaml:"rpc-addr"` - AccountPrefix string `json:"account-prefix" yaml:"account-prefix"` - KeyringBackend string `json:"keyring-backend" yaml:"keyring-backend"` - GasAdjustment float64 `json:"gas-adjustment" yaml:"gas-adjustment"` - GasPrices string `json:"gas-prices" yaml:"gas-prices"` - MinGasAmount uint64 `json:"min-gas-amount" yaml:"min-gas-amount"` - MaxGasAmount uint64 `json:"max-gas-amount" yaml:"max-gas-amount"` - Debug bool `json:"debug" yaml:"debug"` - Timeout string `json:"timeout" yaml:"timeout"` - BlockTimeout string `json:"block-timeout" yaml:"block-timeout"` - OutputFormat string `json:"output-format" yaml:"output-format"` - SignModeStr string `json:"sign-mode" yaml:"sign-mode"` - ExtraCodecs []string `json:"extra-codecs" yaml:"extra-codecs"` - Modules []module.AppModuleBasic `json:"-" yaml:"-"` - Slip44 *int `json:"coin-type" yaml:"coin-type"` - SigningAlgorithm string `json:"signing-algorithm" yaml:"signing-algorithm"` - Broadcast provider.BroadcastMode `json:"broadcast-mode" yaml:"broadcast-mode"` - MinLoopDuration time.Duration `json:"min-loop-duration" yaml:"min-loop-duration"` - ExtensionOptions []provider.ExtensionOption `json:"extension-options" yaml:"extension-options"` - - //If FeeGrantConfiguration is set, TXs submitted by the ChainClient will be signed by the FeeGrantees in a round-robin fashion by default. - FeeGrants *FeeGrantConfiguration `json:"feegrants" yaml:"feegrants"` -} - -// By default, TXs will be signed by the feegrantees 'ManagedGrantees' keys in a round robin fashion. -// Clients can use other signing keys by invoking 'tx.SendMsgsWith' and specifying the signing key. -type FeeGrantConfiguration struct { - GranteesWanted int `json:"num_grantees" yaml:"num_grantees"` - //Normally this is the default ChainClient key - GranterKey string `json:"granter" yaml:"granter"` - //List of keys (by name) that this FeeGranter manages - ManagedGrantees []string `json:"grantees" yaml:"grantees"` - //Last checked on chain (0 means grants never checked and may not exist) - BlockHeightVerified int64 `json:"block_last_verified" yaml:"block_last_verified"` - //Index of the last ManagedGrantee used as a TX signer - GranteeLastSignerIndex int + KeyDirectory string `json:"key-directory" yaml:"key-directory"` + Key string `json:"key" yaml:"key"` + ChainName string `json:"-" yaml:"-"` + ChainID string `json:"chain-id" yaml:"chain-id"` + RPCAddr string `json:"rpc-addr" yaml:"rpc-addr"` + AccountPrefix string `json:"account-prefix" yaml:"account-prefix"` + KeyringBackend string `json:"keyring-backend" yaml:"keyring-backend"` + GasAdjustment float64 `json:"gas-adjustment" yaml:"gas-adjustment"` + GasPrices string `json:"gas-prices" yaml:"gas-prices"` + MinGasAmount uint64 `json:"min-gas-amount" yaml:"min-gas-amount"` + MaxGasAmount uint64 `json:"max-gas-amount" yaml:"max-gas-amount"` + Debug bool `json:"debug" yaml:"debug"` + Timeout string `json:"timeout" yaml:"timeout"` + BlockTimeout string `json:"block-timeout" yaml:"block-timeout"` + OutputFormat string `json:"output-format" yaml:"output-format"` + SignModeStr string `json:"sign-mode" yaml:"sign-mode"` + ExtraCodecs []string `json:"extra-codecs" yaml:"extra-codecs"` + Modules []module.AppModuleBasic `json:"-" yaml:"-"` + Slip44 *int `json:"coin-type" yaml:"coin-type"` + SigningAlgorithm string `json:"signing-algorithm" yaml:"signing-algorithm"` + Broadcast provider.BroadcastMode `json:"broadcast-mode" yaml:"broadcast-mode"` + MinLoopDuration time.Duration `json:"min-loop-duration" yaml:"min-loop-duration"` } func (pc CosmosProviderConfig) Validate() error { @@ -84,11 +66,6 @@ func (pc CosmosProviderConfig) Validate() error { return nil } -func (pc CosmosProviderConfig) Set(field string, value interface{}) error { - // TODO: - return nil -} - func (pc CosmosProviderConfig) BroadcastMode() provider.BroadcastMode { return pc.Broadcast } diff --git a/relayer/chains/cosmos/tx.go b/relayer/chains/cosmos/tx.go index bae33b268..f4b180057 100644 --- a/relayer/chains/cosmos/tx.go +++ b/relayer/chains/cosmos/tx.go @@ -1613,14 +1613,14 @@ func (cc *CosmosProvider) UpdateFeesSpent(chain, key, address string, fees sdk.C for _, fee := range cc.TotalFees { // Convert to a big float to get a float64 for metrics f, _ := big.NewFloat(0.0).SetInt(fee.Amount.BigInt()).Float64() - cc.metrics.SetFeesSpent(chain, cc.PCfg.GasPrices, key, address, fee.GetDenom(), f) + cc.metrics.SetFeesSpent(chain, key, address, fee.GetDenom(), f) } } // MsgRegisterCounterpartyPayee creates an sdk.Msg to broadcast the counterparty address func (cc *CosmosProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayee string) (provider.RelayerMessage, error) { msg := feetypes.NewMsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayee) - return NewCosmosMessage(msg, nil), nil + return NewCosmosMessage(msg), nil } // PrepareFactory mutates the tx factory with the appropriate account number, sequence number, and min gas settings. @@ -1710,35 +1710,6 @@ func (cc *CosmosProvider) AdjustEstimatedGas(gasUsed uint64) (uint64, error) { return uint64(gas), nil } -// SetWithExtensionOptions sets the dynamic fee extension options on the given -// transaction factory using the configuration options from the CosmosProvider. -// The function creates an extension option for each configuration option and -// serializes it into a byte slice before adding it to the list of extension -// options. The function returns the updated transaction factory with the new -// extension options or an error if the serialization fails or an invalid option -// value is encountered. -func (cc *CosmosProvider) SetWithExtensionOptions(txf tx.Factory) (tx.Factory, error) { - extOpts := make([]*types.Any, 0, len(cc.PCfg.ExtensionOptions)) - for _, opt := range cc.PCfg.ExtensionOptions { - max, ok := sdk.NewIntFromString(opt.Value) - if !ok { - return txf, fmt.Errorf("invalid opt value") - } - extensionOption := ethermint.ExtensionOptionDynamicFeeTx{ - MaxPriorityPrice: max, - } - extBytes, err := extensionOption.Marshal() - if err != nil { - return txf, err - } - extOpts = append(extOpts, &types.Any{ - TypeUrl: "/ethermint.types.v1.ExtensionOptionDynamicFeeTx", - Value: extBytes, - }) - } - return txf.WithExtensionOptions(extOpts...), nil -} - // CalculateGas simulates a tx to generate the appropriate gas settings before broadcasting a tx. func (cc *CosmosProvider) CalculateGas(ctx context.Context, txf tx.Factory, signingKey string, msgs ...sdk.Msg) (txtypes.SimulateResponse, uint64, error) { keyInfo, err := cc.Keybase.Key(signingKey) diff --git a/relayer/chains/icon/keys.go b/relayer/chains/icon/keys.go index dff67ab1e..9bfda64a6 100644 --- a/relayer/chains/icon/keys.go +++ b/relayer/chains/icon/keys.go @@ -20,11 +20,11 @@ func (cp *IconProvider) KeystoreCreated(path string) bool { return false } -func (cp *IconProvider) AddKey(name string, coinType uint32) (output *provider.KeyOutput, err error) { +func (cp *IconProvider) AddKey(name string, coinType uint32, signingAlgorithm string) (output *provider.KeyOutput, err error) { return nil, fmt.Errorf("Not implemented on icon") } -func (cp *IconProvider) RestoreKey(name, mnemonic string, coinType uint32) (address string, err error) { +func (cp *IconProvider) RestoreKey(name, mnemonic string, coinType uint32, signingAlgorithm string) (address string, err error) { return "", fmt.Errorf("Not implemented on icon") } diff --git a/relayer/chains/icon/provider.go b/relayer/chains/icon/provider.go index 941699388..d1afed8f7 100644 --- a/relayer/chains/icon/provider.go +++ b/relayer/chains/icon/provider.go @@ -77,17 +77,6 @@ func (pp *IconProviderConfig) Validate() error { return nil } -func (pp *IconProviderConfig) Set(field string, value interface{}) error { - switch field { - case "btpHeight": - pp.BTPHeight = value.(int64) - default: - return fmt.Errorf("unknown field or not allowed to set %s", field) - } - return nil - -} - // NewProvider should provide a new Icon provider // NewProvider should provide a new Icon provider func (pp *IconProviderConfig) NewProvider(log *zap.Logger, homepath string, debug bool, chainName string) (provider.ChainProvider, error) { @@ -578,3 +567,7 @@ func (icp *IconProvider) GetCurrentBtpNetworkStartHeight() (int64, error) { } return info.StartHeight.Value() } + +func (icp *IconProvider) MsgRegisterCounterpartyPayee(portID, channelID, relayerAddr, counterpartyPayeeAddr string) (provider.RelayerMessage, error) { + return nil, fmt.Errorf("Not implemented for Icon") +} diff --git a/relayer/chains/icon/provider_test.go b/relayer/chains/icon/provider_test.go index d10e7fab1..7bc8d94be 100644 --- a/relayer/chains/icon/provider_test.go +++ b/relayer/chains/icon/provider_test.go @@ -55,6 +55,7 @@ func GetMockIconProvider(network_id int, contractAddress string) *IconProvider { iconProvider, _ := p.(*IconProvider) return iconProvider + } func TestNetworkSectionHashCheck(t *testing.T) { diff --git a/relayer/chains/penumbra/codec.go b/relayer/chains/penumbra/codec.go index ac075741c..5f6911696 100644 --- a/relayer/chains/penumbra/codec.go +++ b/relayer/chains/penumbra/codec.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/auth/tx" authz "github.com/cosmos/cosmos-sdk/x/authz/module" "github.com/cosmos/cosmos-sdk/x/bank" - "github.com/cosmos/cosmos-sdk/x/crisis" + "github.com/cosmos/cosmos-sdk/x/capability" "github.com/cosmos/cosmos-sdk/x/distribution" feegrant "github.com/cosmos/cosmos-sdk/x/feegrant/module" "github.com/cosmos/cosmos-sdk/x/gov" @@ -20,9 +20,7 @@ import ( paramsclient "github.com/cosmos/cosmos-sdk/x/params/client" "github.com/cosmos/cosmos-sdk/x/slashing" "github.com/cosmos/cosmos-sdk/x/staking" - "github.com/cosmos/cosmos-sdk/x/upgrade" upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" - "github.com/cosmos/ibc-go/modules/capability" "github.com/cosmos/ibc-go/v7/modules/apps/transfer" ibc "github.com/cosmos/ibc-go/v7/modules/core" @@ -44,14 +42,14 @@ var moduleBasics = []module.AppModuleBasic{ upgradeclient.LegacyCancelProposalHandler, }, ), - crisis.AppModuleBasic{}, + // crisis.AppModuleBasic{}, distribution.AppModuleBasic{}, feegrant.AppModuleBasic{}, mint.AppModuleBasic{}, params.AppModuleBasic{}, slashing.AppModuleBasic{}, staking.AppModuleBasic{}, - upgrade.AppModuleBasic{}, + // upgrade.AppModuleBasic{}, transfer.AppModuleBasic{}, ibc.AppModuleBasic{}, cosmosmodule.AppModuleBasic{}, diff --git a/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go b/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go index 16e8fe13e..1a6f00258 100644 --- a/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go +++ b/relayer/chains/penumbra/core/chain/v1alpha1/chain.pb.go @@ -334,6 +334,77 @@ func (m *FmdParameters) GetAsOfBlockHeight() uint64 { return 0 } +// TODO: delete with legacy code +// Information about a given asset at a given time (as specified by block +// height). Currently this only contains the total supply. +type AssetInfo struct { + AssetId *v1alpha1.AssetId `protobuf:"bytes,1,opt,name=asset_id,json=assetId,proto3" json:"asset_id,omitempty"` + Denom *v1alpha1.Denom `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` + AsOfBlockHeight uint64 `protobuf:"varint,3,opt,name=as_of_block_height,json=asOfBlockHeight,proto3" json:"as_of_block_height,omitempty"` + TotalSupply uint64 `protobuf:"varint,4,opt,name=total_supply,json=totalSupply,proto3" json:"total_supply,omitempty"` +} + +func (m *AssetInfo) Reset() { *m = AssetInfo{} } +func (m *AssetInfo) String() string { return proto.CompactTextString(m) } +func (*AssetInfo) ProtoMessage() {} +func (*AssetInfo) Descriptor() ([]byte, []int) { + return fileDescriptor_b0cedb8b84ba3224, []int{3} +} +func (m *AssetInfo) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *AssetInfo) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_AssetInfo.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *AssetInfo) XXX_Merge(src proto.Message) { + xxx_messageInfo_AssetInfo.Merge(m, src) +} +func (m *AssetInfo) XXX_Size() int { + return m.Size() +} +func (m *AssetInfo) XXX_DiscardUnknown() { + xxx_messageInfo_AssetInfo.DiscardUnknown(m) +} + +var xxx_messageInfo_AssetInfo proto.InternalMessageInfo + +func (m *AssetInfo) GetAssetId() *v1alpha1.AssetId { + if m != nil { + return m.AssetId + } + return nil +} + +func (m *AssetInfo) GetDenom() *v1alpha1.Denom { + if m != nil { + return m.Denom + } + return nil +} + +func (m *AssetInfo) GetAsOfBlockHeight() uint64 { + if m != nil { + return m.AsOfBlockHeight + } + return 0 +} + +func (m *AssetInfo) GetTotalSupply() uint64 { + if m != nil { + return m.TotalSupply + } + return 0 +} + // Contains the minimum data needed to update client state. type CompactBlock struct { Height uint64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` @@ -359,7 +430,7 @@ func (m *CompactBlock) Reset() { *m = CompactBlock{} } func (m *CompactBlock) String() string { return proto.CompactTextString(m) } func (*CompactBlock) ProtoMessage() {} func (*CompactBlock) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{3} + return fileDescriptor_b0cedb8b84ba3224, []int{4} } func (m *CompactBlock) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -463,7 +534,7 @@ func (m *StatePayload) Reset() { *m = StatePayload{} } func (m *StatePayload) String() string { return proto.CompactTextString(m) } func (*StatePayload) ProtoMessage() {} func (*StatePayload) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{4} + return fileDescriptor_b0cedb8b84ba3224, []int{5} } func (m *StatePayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -557,7 +628,7 @@ func (m *StatePayload_RolledUp) Reset() { *m = StatePayload_RolledUp{} } func (m *StatePayload_RolledUp) String() string { return proto.CompactTextString(m) } func (*StatePayload_RolledUp) ProtoMessage() {} func (*StatePayload_RolledUp) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{4, 0} + return fileDescriptor_b0cedb8b84ba3224, []int{5, 0} } func (m *StatePayload_RolledUp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -602,7 +673,7 @@ func (m *StatePayload_Note) Reset() { *m = StatePayload_Note{} } func (m *StatePayload_Note) String() string { return proto.CompactTextString(m) } func (*StatePayload_Note) ProtoMessage() {} func (*StatePayload_Note) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{4, 1} + return fileDescriptor_b0cedb8b84ba3224, []int{5, 1} } func (m *StatePayload_Note) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -654,7 +725,7 @@ func (m *StatePayload_Swap) Reset() { *m = StatePayload_Swap{} } func (m *StatePayload_Swap) String() string { return proto.CompactTextString(m) } func (*StatePayload_Swap) ProtoMessage() {} func (*StatePayload_Swap) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{4, 2} + return fileDescriptor_b0cedb8b84ba3224, []int{5, 2} } func (m *StatePayload_Swap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -698,14 +769,14 @@ func (m *StatePayload_Swap) GetSwap() *v1alpha11.SwapPayload { } type KnownAssets struct { - Assets []*v1alpha1.DenomMetadata `protobuf:"bytes,1,rep,name=assets,proto3" json:"assets,omitempty"` + Assets []*v1alpha1.Asset `protobuf:"bytes,1,rep,name=assets,proto3" json:"assets,omitempty"` } func (m *KnownAssets) Reset() { *m = KnownAssets{} } func (m *KnownAssets) String() string { return proto.CompactTextString(m) } func (*KnownAssets) ProtoMessage() {} func (*KnownAssets) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{5} + return fileDescriptor_b0cedb8b84ba3224, []int{6} } func (m *KnownAssets) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -734,7 +805,7 @@ func (m *KnownAssets) XXX_DiscardUnknown() { var xxx_messageInfo_KnownAssets proto.InternalMessageInfo -func (m *KnownAssets) GetAssets() []*v1alpha1.DenomMetadata { +func (m *KnownAssets) GetAssets() []*v1alpha1.Asset { if m != nil { return m.Assets } @@ -750,7 +821,7 @@ func (m *NoteSource) Reset() { *m = NoteSource{} } func (m *NoteSource) String() string { return proto.CompactTextString(m) } func (*NoteSource) ProtoMessage() {} func (*NoteSource) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{6} + return fileDescriptor_b0cedb8b84ba3224, []int{7} } func (m *NoteSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -796,7 +867,7 @@ func (m *SpendInfo) Reset() { *m = SpendInfo{} } func (m *SpendInfo) String() string { return proto.CompactTextString(m) } func (*SpendInfo) ProtoMessage() {} func (*SpendInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{7} + return fileDescriptor_b0cedb8b84ba3224, []int{8} } func (m *SpendInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -849,7 +920,7 @@ func (m *GenesisAppState) Reset() { *m = GenesisAppState{} } func (m *GenesisAppState) String() string { return proto.CompactTextString(m) } func (*GenesisAppState) ProtoMessage() {} func (*GenesisAppState) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{8} + return fileDescriptor_b0cedb8b84ba3224, []int{9} } func (m *GenesisAppState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -909,7 +980,7 @@ func (m *GenesisAppState_Allocation) Reset() { *m = GenesisAppState_Allo func (m *GenesisAppState_Allocation) String() string { return proto.CompactTextString(m) } func (*GenesisAppState_Allocation) ProtoMessage() {} func (*GenesisAppState_Allocation) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{8, 0} + return fileDescriptor_b0cedb8b84ba3224, []int{9, 0} } func (m *GenesisAppState_Allocation) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -968,7 +1039,7 @@ func (m *Epoch) Reset() { *m = Epoch{} } func (m *Epoch) String() string { return proto.CompactTextString(m) } func (*Epoch) ProtoMessage() {} func (*Epoch) Descriptor() ([]byte, []int) { - return fileDescriptor_b0cedb8b84ba3224, []int{9} + return fileDescriptor_b0cedb8b84ba3224, []int{10} } func (m *Epoch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1015,6 +1086,7 @@ func init() { proto.RegisterType((*ChainParameters)(nil), "penumbra.core.chain.v1alpha1.ChainParameters") proto.RegisterType((*Ratio)(nil), "penumbra.core.chain.v1alpha1.Ratio") proto.RegisterType((*FmdParameters)(nil), "penumbra.core.chain.v1alpha1.FmdParameters") + proto.RegisterType((*AssetInfo)(nil), "penumbra.core.chain.v1alpha1.AssetInfo") proto.RegisterType((*CompactBlock)(nil), "penumbra.core.chain.v1alpha1.CompactBlock") proto.RegisterType((*StatePayload)(nil), "penumbra.core.chain.v1alpha1.StatePayload") proto.RegisterType((*StatePayload_RolledUp)(nil), "penumbra.core.chain.v1alpha1.StatePayload.RolledUp") @@ -1033,101 +1105,105 @@ func init() { } var fileDescriptor_b0cedb8b84ba3224 = []byte{ - // 1498 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4b, 0x6f, 0x1c, 0xc7, - 0x11, 0xe6, 0xf2, 0xcd, 0x5a, 0xbe, 0xd2, 0x12, 0xa9, 0x11, 0xc3, 0x50, 0x9b, 0x45, 0x94, 0xac, - 0xa4, 0x64, 0x37, 0xa2, 0x84, 0x44, 0xa0, 0xa0, 0x80, 0xcf, 0x90, 0x44, 0x44, 0x69, 0x35, 0x54, - 0x98, 0x40, 0x60, 0x30, 0xe8, 0x9d, 0x69, 0x72, 0x1b, 0x9a, 0xe9, 0x9e, 0x4c, 0xf7, 0xf0, 0x71, - 0x4f, 0x00, 0x1f, 0xfd, 0x1b, 0xec, 0x9b, 0x0f, 0x06, 0xfc, 0x2f, 0x0c, 0x9f, 0x74, 0xf4, 0xd1, - 0xa0, 0x6e, 0x3e, 0xf9, 0xe0, 0x1f, 0x60, 0x74, 0xf5, 0xcc, 0xec, 0x72, 0x65, 0x2c, 0x4d, 0xc3, - 0xb7, 0xe9, 0xaa, 0xef, 0xfb, 0xba, 0xba, 0xba, 0xaa, 0xbb, 0x07, 0x6a, 0x31, 0x13, 0x69, 0xd4, - 0x4a, 0x68, 0xc3, 0x97, 0x09, 0x6b, 0xf8, 0x6d, 0xca, 0x45, 0xe3, 0xe4, 0x21, 0x0d, 0xe3, 0x36, - 0x7d, 0x68, 0x87, 0xf5, 0x38, 0x91, 0x5a, 0x92, 0xc5, 0x1c, 0x59, 0x37, 0xc8, 0xba, 0x75, 0xe5, - 0xc8, 0x85, 0xfb, 0x3d, 0x3a, 0xc9, 0x79, 0xac, 0x65, 0x97, 0x10, 0x8e, 0xad, 0xd2, 0x42, 0xcf, - 0x9c, 0x4a, 0xd3, 0xb7, 0xac, 0x03, 0xc5, 0x61, 0x86, 0xfc, 0xdd, 0x65, 0x64, 0xc0, 0xce, 0x3a, - 0xb8, 0x80, 0x9d, 0x59, 0x54, 0xf5, 0xfb, 0x31, 0x98, 0xd9, 0x30, 0xe1, 0x34, 0x69, 0x42, 0x23, - 0xa6, 0x59, 0xa2, 0xc8, 0x6d, 0x18, 0xc7, 0x08, 0x3d, 0x1e, 0x38, 0xa5, 0x4a, 0xa9, 0x36, 0xe1, - 0x8e, 0xe1, 0x78, 0x37, 0x20, 0x77, 0x61, 0x9a, 0xc5, 0xd2, 0x6f, 0x7b, 0x41, 0x9a, 0x50, 0xcd, - 0xa5, 0x70, 0x06, 0x2b, 0xa5, 0xda, 0xb0, 0x3b, 0x85, 0xd6, 0xcd, 0xcc, 0x48, 0xee, 0xc1, 0x6c, - 0x2a, 0x5a, 0x52, 0x04, 0x5c, 0x1c, 0x7b, 0xe8, 0x52, 0xce, 0x10, 0x02, 0x67, 0x0a, 0xfb, 0x16, - 0x9a, 0xc9, 0x63, 0x98, 0xa7, 0xbe, 0xe6, 0x27, 0xcc, 0x3b, 0xa1, 0x21, 0x0f, 0xa8, 0x96, 0x89, - 0x17, 0xf2, 0x88, 0x6b, 0x67, 0x18, 0x09, 0x37, 0xad, 0xf7, 0x20, 0x77, 0x3e, 0x37, 0x3e, 0x52, - 0x83, 0xd9, 0x16, 0x55, 0xcc, 0x4b, 0xd8, 0x29, 0x4d, 0x02, 0x2f, 0xa1, 0x9a, 0x39, 0x13, 0x88, - 0x9f, 0x36, 0x76, 0x17, 0xcd, 0x2e, 0xd5, 0x8c, 0xac, 0xc2, 0xa2, 0x0a, 0xa9, 0x6a, 0x9b, 0x48, - 0x62, 0x26, 0x68, 0xa8, 0xcf, 0xbd, 0x88, 0xab, 0x16, 0x6b, 0xd3, 0x13, 0x2e, 0x13, 0x67, 0x04, - 0x59, 0x0b, 0x39, 0xa6, 0x69, 0x21, 0x7b, 0x1d, 0x04, 0x59, 0x81, 0xdb, 0x1f, 0x28, 0x04, 0xf2, - 0x54, 0x68, 0x1e, 0x31, 0x07, 0x90, 0x7e, 0xab, 0x87, 0xbe, 0x99, 0xb9, 0xc9, 0x5f, 0xc1, 0x51, - 0xfc, 0x58, 0xb0, 0xc0, 0x6b, 0x85, 0xd2, 0x7f, 0xab, 0xbc, 0x53, 0x2e, 0x02, 0x79, 0xea, 0x85, - 0x4c, 0x38, 0x65, 0xa4, 0xce, 0x59, 0xff, 0x3a, 0xba, 0xff, 0x85, 0xde, 0xe7, 0x4c, 0x90, 0x65, - 0x98, 0x8b, 0xb8, 0x52, 0x1d, 0x62, 0x44, 0xcf, 0x78, 0x94, 0x46, 0xce, 0x24, 0xb2, 0x6e, 0x58, - 0xa7, 0x65, 0xed, 0x59, 0x17, 0xb9, 0x03, 0x65, 0xde, 0xf2, 0x3d, 0x26, 0x68, 0x2b, 0x64, 0x81, - 0x33, 0x5a, 0x29, 0xd5, 0xc6, 0x5d, 0xe0, 0x2d, 0x7f, 0xcb, 0x5a, 0xc8, 0x16, 0xdc, 0xe1, 0xa2, - 0x25, 0x53, 0x11, 0x78, 0xdc, 0x57, 0xcb, 0x7f, 0xf6, 0x74, 0x42, 0x85, 0x3a, 0x62, 0x89, 0x2a, - 0x48, 0x63, 0x48, 0x5a, 0xcc, 0x60, 0xbb, 0x06, 0xf5, 0x3a, 0x07, 0xe5, 0x32, 0xdb, 0x50, 0x91, - 0xa9, 0xee, 0xaf, 0x33, 0x8e, 0x3a, 0xbf, 0xc9, 0x71, 0x3f, 0x2e, 0xf4, 0x18, 0xe6, 0xe3, 0x44, - 0xc6, 0x52, 0xd1, 0xd0, 0x3b, 0x91, 0xda, 0x24, 0xd8, 0xae, 0xd6, 0xb9, 0x69, 0xf7, 0x3e, 0xf7, - 0x1e, 0xa0, 0xd3, 0xae, 0x96, 0xfc, 0x07, 0x6e, 0x15, 0xac, 0x80, 0xc5, 0x52, 0x71, 0xed, 0xd1, - 0x48, 0xa6, 0x42, 0x3b, 0x73, 0x95, 0x52, 0xad, 0xbc, 0x7c, 0xb7, 0xde, 0xd3, 0x6e, 0xb6, 0x81, - 0xf2, 0xea, 0xaf, 0xaf, 0x21, 0xd8, 0x9d, 0xcb, 0x55, 0x36, 0xad, 0x88, 0x35, 0x9b, 0xcc, 0x77, - 0x82, 0x32, 0x55, 0xe7, 0xfd, 0x37, 0x95, 0x49, 0x1a, 0x39, 0xf3, 0xd8, 0x0a, 0x37, 0x8a, 0x98, - 0x8c, 0xef, 0x15, 0xba, 0xc8, 0x5f, 0xba, 0x42, 0x8a, 0xa9, 0x52, 0x9e, 0x6e, 0x27, 0x4c, 0xb5, - 0x65, 0x18, 0x38, 0xb7, 0x90, 0x55, 0x48, 0x36, 0xa9, 0x52, 0xaf, 0x73, 0x27, 0x79, 0x02, 0x4e, - 0xc1, 0xc3, 0x12, 0xea, 0x22, 0x3a, 0x48, 0x2c, 0x12, 0xb4, 0x6f, 0xdc, 0x1d, 0xe6, 0x33, 0xf8, - 0x75, 0x40, 0xa5, 0xa7, 0x62, 0x26, 0x02, 0x2f, 0xc7, 0x74, 0xd2, 0x7f, 0x1b, 0xd3, 0xef, 0x04, - 0x54, 0xee, 0x1b, 0x44, 0x33, 0x07, 0x64, 0x99, 0xaf, 0x6e, 0xc3, 0x88, 0x6b, 0x5a, 0x95, 0x2c, - 0xc2, 0x84, 0x48, 0x23, 0x96, 0x98, 0xd6, 0xc2, 0x66, 0x1f, 0x76, 0x3b, 0x06, 0x52, 0x81, 0x72, - 0xc0, 0x84, 0x8c, 0xb8, 0x40, 0xbf, 0xed, 0xf5, 0x6e, 0x53, 0xd5, 0x87, 0xa9, 0xbf, 0x47, 0x41, - 0xd7, 0xe1, 0x71, 0x17, 0xa6, 0xe3, 0x84, 0xf9, 0x5c, 0x71, 0x29, 0xbc, 0x16, 0xd7, 0x0a, 0x55, - 0xa7, 0xdc, 0xa9, 0xc2, 0xba, 0xce, 0xb5, 0x22, 0x0f, 0x80, 0x50, 0xe5, 0xc9, 0x23, 0xbb, 0xe1, - 0x5e, 0x9b, 0xf1, 0xe3, 0xb6, 0xce, 0x26, 0x98, 0xa1, 0xea, 0xe5, 0x11, 0x6e, 0xf6, 0x0e, 0x9a, - 0xab, 0xff, 0x1b, 0x81, 0xc9, 0x0d, 0x19, 0xc5, 0xd4, 0xd7, 0x68, 0x26, 0xf3, 0x30, 0x9a, 0x31, - 0x6c, 0xc8, 0xd9, 0x88, 0xbc, 0x82, 0x69, 0xa5, 0xa9, 0x66, 0x5e, 0x4c, 0xcf, 0x43, 0x49, 0x03, - 0xe5, 0x0c, 0x56, 0x86, 0x6a, 0xe5, 0xe5, 0xfb, 0xf5, 0x7e, 0x07, 0x70, 0x7d, 0xdf, 0x70, 0x9a, - 0x96, 0xe2, 0x4e, 0xa9, 0xae, 0x91, 0x22, 0x3b, 0x00, 0x22, 0x0d, 0x43, 0x7e, 0xc4, 0x59, 0x62, - 0x0e, 0x31, 0x23, 0x57, 0xbb, 0xa2, 0xc0, 0x5e, 0xe4, 0x04, 0xb7, 0x8b, 0x6b, 0x94, 0xec, 0x62, - 0x13, 0x29, 0xed, 0xe9, 0x56, 0x5e, 0xbe, 0x77, 0x85, 0xd2, 0x1e, 0x4b, 0xde, 0x86, 0xcc, 0x95, - 0x52, 0xbb, 0x13, 0x48, 0x36, 0x9f, 0x46, 0xc9, 0x9e, 0xc2, 0xa8, 0xf4, 0xab, 0x6b, 0x2b, 0x21, - 0x19, 0x95, 0xee, 0xc1, 0x6c, 0xa7, 0x00, 0x35, 0x4d, 0x34, 0x0b, 0xb0, 0xf7, 0xc6, 0xdd, 0x99, - 0xa2, 0xf0, 0xac, 0x99, 0xb8, 0x30, 0x7d, 0x14, 0x05, 0x5e, 0x5c, 0x6c, 0xb5, 0x13, 0xe0, 0xc4, - 0x0f, 0xfa, 0xe7, 0xf6, 0x52, 0x75, 0xb8, 0x53, 0x47, 0x97, 0x8a, 0xc5, 0x85, 0x49, 0x75, 0x4a, - 0x63, 0x4f, 0xa6, 0x3a, 0x4e, 0xb5, 0x72, 0x46, 0x30, 0xbd, 0x8d, 0x1e, 0x45, 0x73, 0x5b, 0x15, - 0x7a, 0xeb, 0x54, 0xfb, 0xed, 0xfd, 0x53, 0x1a, 0xbf, 0x44, 0xce, 0x26, 0xd5, 0xd4, 0x2d, 0xab, - 0x62, 0xac, 0xc8, 0xbf, 0x61, 0xd6, 0xde, 0x5e, 0x5d, 0x91, 0x8e, 0x62, 0xa4, 0x7f, 0xea, 0x1f, - 0x69, 0xcf, 0x35, 0xe8, 0xce, 0xf8, 0x97, 0x0d, 0xd5, 0xef, 0x86, 0x61, 0xb2, 0xbb, 0x54, 0x88, - 0x0b, 0x13, 0x89, 0x0c, 0x43, 0x16, 0x78, 0x69, 0x8c, 0x95, 0x58, 0x5e, 0x7e, 0xf4, 0xd3, 0x2b, - 0xad, 0xee, 0x22, 0xf7, 0x9f, 0xf1, 0xce, 0x80, 0x3b, 0x9e, 0x64, 0xdf, 0x64, 0x0b, 0x86, 0x85, - 0xd4, 0x0c, 0x5b, 0xe1, 0xc3, 0x54, 0xf4, 0x93, 0x7b, 0x21, 0x35, 0xdb, 0x19, 0x70, 0x91, 0x6e, - 0x64, 0x4c, 0x52, 0xf0, 0xd6, 0xbd, 0x9e, 0x8c, 0xc9, 0xad, 0x91, 0x31, 0xf4, 0x85, 0x37, 0x30, - 0x9e, 0x47, 0x49, 0x5e, 0x00, 0xf8, 0x32, 0x8a, 0xb8, 0x8e, 0x98, 0xd0, 0xd9, 0x72, 0xeb, 0x57, - 0x54, 0x1d, 0x2a, 0x6f, 0x14, 0x2c, 0xb7, 0x4b, 0x61, 0xe1, 0xa3, 0x12, 0x0c, 0x9b, 0x98, 0xc9, - 0x2a, 0x8c, 0x2a, 0x99, 0x26, 0x3e, 0xcb, 0x44, 0x6b, 0xfd, 0xa3, 0x35, 0x9c, 0x7d, 0xc4, 0xbb, - 0x19, 0x8f, 0xfc, 0xed, 0x52, 0xd2, 0xee, 0x5f, 0xd5, 0x9e, 0xb2, 0xd3, 0xed, 0xc8, 0x5b, 0xf8, - 0x7f, 0x09, 0x86, 0xcd, 0xba, 0x7f, 0x81, 0x50, 0x9e, 0x66, 0x89, 0xb7, 0xa1, 0xfc, 0xa1, 0x5f, - 0x29, 0x9b, 0x19, 0x8b, 0x38, 0x0c, 0x69, 0x7d, 0x06, 0xa6, 0x2e, 0x9d, 0x5f, 0xd5, 0x7d, 0x28, - 0xff, 0x43, 0xc8, 0x53, 0xb1, 0xa6, 0x14, 0xd3, 0x8a, 0x6c, 0xc2, 0x28, 0xc5, 0x2f, 0xa7, 0x84, - 0x9d, 0xf2, 0xc7, 0x2b, 0x56, 0xba, 0x69, 0x4e, 0xea, 0x3d, 0xa6, 0x69, 0x60, 0xda, 0x24, 0xe3, - 0x56, 0xab, 0x00, 0x9d, 0xc0, 0xc9, 0x4d, 0x18, 0xe1, 0x42, 0x30, 0x7b, 0xfa, 0x4f, 0xba, 0x76, - 0x50, 0x3d, 0x87, 0x09, 0xbc, 0x39, 0x76, 0xc5, 0x91, 0x24, 0xbb, 0x50, 0x36, 0x69, 0xf2, 0x7e, - 0x66, 0x6a, 0x40, 0x74, 0x66, 0xfb, 0x2d, 0x4c, 0xda, 0x3b, 0xeb, 0xd2, 0x89, 0x5f, 0x46, 0x5b, - 0x76, 0xda, 0x7f, 0x3e, 0x04, 0x33, 0xdb, 0x4c, 0x30, 0xc5, 0xd5, 0x5a, 0x1c, 0x63, 0x05, 0x91, - 0x26, 0x4c, 0x76, 0x35, 0xb5, 0xca, 0x42, 0xb8, 0x66, 0x43, 0x97, 0x3b, 0x0d, 0xad, 0xc8, 0x36, - 0x40, 0xf1, 0xe0, 0xcc, 0xaf, 0x89, 0xde, 0xdd, 0xb2, 0xcf, 0xe9, 0x42, 0xaf, 0x78, 0x83, 0xba, - 0x5d, 0x54, 0xf2, 0x06, 0xca, 0x34, 0x0c, 0xa5, 0x8f, 0x2f, 0xdf, 0xfc, 0x86, 0x78, 0xd2, 0x3f, - 0xb2, 0x9e, 0xe5, 0xd5, 0xd7, 0x0a, 0x01, 0xb7, 0x5b, 0x6c, 0xe1, 0xd3, 0x12, 0x40, 0xc7, 0x47, - 0x9e, 0xc1, 0x68, 0xf6, 0xd0, 0x29, 0x5d, 0xe7, 0xa1, 0x93, 0x91, 0xcc, 0x4e, 0xe3, 0xd5, 0x8d, - 0x49, 0x9f, 0x70, 0xed, 0x80, 0xac, 0xc2, 0x18, 0x0d, 0x82, 0x84, 0x29, 0x95, 0x1d, 0x16, 0xbf, - 0xbf, 0x4a, 0xd5, 0xa2, 0xdd, 0x9c, 0x56, 0x5d, 0x85, 0x11, 0x7c, 0xcc, 0xdb, 0x52, 0x0a, 0xd8, - 0x59, 0x76, 0x2b, 0xdb, 0x01, 0x6e, 0xb9, 0xb9, 0x43, 0x7a, 0xb7, 0xdc, 0xd8, 0xec, 0x96, 0xaf, - 0x7f, 0x31, 0xf8, 0xe5, 0xc5, 0x52, 0xe9, 0xdd, 0xc5, 0x52, 0xe9, 0x9b, 0x8b, 0xa5, 0xd2, 0xc7, - 0xef, 0x97, 0x06, 0xde, 0xbd, 0x5f, 0x1a, 0xf8, 0xfa, 0xfd, 0xd2, 0x00, 0x54, 0x7c, 0x19, 0xf5, - 0x4d, 0xe6, 0x3a, 0xd8, 0x7d, 0x36, 0xbf, 0x33, 0xcd, 0xd2, 0x9b, 0x83, 0x63, 0xae, 0xdb, 0x69, - 0xab, 0xee, 0xcb, 0xa8, 0xe1, 0x4b, 0x15, 0x49, 0xd5, 0x48, 0x58, 0x48, 0xcf, 0x59, 0xd2, 0x38, - 0x59, 0x2e, 0x3e, 0x51, 0x42, 0x35, 0xfa, 0xfd, 0xc0, 0x3d, 0xc5, 0x61, 0x3e, 0xfa, 0x64, 0x70, - 0xa8, 0xb9, 0xb1, 0xf1, 0xd9, 0xe0, 0x62, 0x33, 0x0f, 0x65, 0xc3, 0x84, 0x82, 0x53, 0xd7, 0x0f, - 0x32, 0xd0, 0x57, 0x1d, 0xf7, 0xa1, 0x71, 0x1f, 0xa2, 0xfb, 0x30, 0x77, 0x5f, 0x0c, 0xd6, 0xfa, - 0xb9, 0x0f, 0xb7, 0x9b, 0xeb, 0x79, 0xaf, 0x7e, 0x3b, 0x78, 0x27, 0x87, 0xae, 0xac, 0x18, 0xec, - 0xca, 0x0a, 0x82, 0x57, 0x56, 0x72, 0x74, 0x6b, 0x14, 0x7f, 0xe0, 0x1e, 0xfd, 0x10, 0x00, 0x00, - 0xff, 0xff, 0xd1, 0xb8, 0x41, 0x47, 0x86, 0x0e, 0x00, 0x00, + // 1561 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4b, 0x8f, 0x24, 0x47, + 0x11, 0x9e, 0x9e, 0x77, 0x47, 0xf7, 0xcc, 0x2c, 0xe9, 0x7d, 0xd4, 0x0e, 0xc3, 0x6c, 0xbb, 0xe5, + 0x85, 0xde, 0xb5, 0xe8, 0xc6, 0x6d, 0x0b, 0xac, 0x36, 0x46, 0x3b, 0x8f, 0x65, 0x76, 0x65, 0xef, + 0xba, 0x9d, 0x63, 0x16, 0xb4, 0x5a, 0x54, 0xca, 0xae, 0xca, 0x99, 0x4e, 0x6d, 0x55, 0x66, 0x51, + 0x99, 0x35, 0x8f, 0x3b, 0x48, 0x1c, 0xf9, 0x0d, 0x70, 0xe3, 0x80, 0xc4, 0xbf, 0x40, 0x9c, 0x7c, + 0x44, 0x9c, 0xd0, 0xec, 0x8d, 0x13, 0x07, 0x7e, 0x00, 0xca, 0xc8, 0x7a, 0xf4, 0x34, 0xa6, 0xc7, + 0x83, 0x7c, 0xab, 0x8c, 0xf8, 0xbe, 0x2f, 0xa3, 0x22, 0x32, 0x32, 0xaa, 0xa0, 0x93, 0x70, 0x99, + 0xc5, 0xa3, 0x94, 0xf5, 0x02, 0x95, 0xf2, 0x5e, 0x30, 0x66, 0x42, 0xf6, 0x4e, 0xde, 0x63, 0x51, + 0x32, 0x66, 0xef, 0xb9, 0x65, 0x37, 0x49, 0x95, 0x51, 0x64, 0xab, 0x40, 0x76, 0x2d, 0xb2, 0xeb, + 0x5c, 0x05, 0x72, 0xf3, 0xe1, 0x94, 0x4e, 0x7a, 0x9e, 0x18, 0x35, 0x21, 0x84, 0x6b, 0xa7, 0xb4, + 0x39, 0xb5, 0xa7, 0x36, 0xec, 0x35, 0xaf, 0xa0, 0xb8, 0xcc, 0x91, 0xef, 0x5c, 0x46, 0x86, 0xfc, + 0xac, 0xc2, 0x85, 0xfc, 0xcc, 0xa1, 0xda, 0xff, 0x5e, 0x81, 0x8d, 0x3d, 0x1b, 0xce, 0x90, 0xa5, + 0x2c, 0xe6, 0x86, 0xa7, 0x9a, 0xdc, 0x85, 0x55, 0x8c, 0xd0, 0x17, 0xa1, 0x57, 0x6b, 0xd5, 0x3a, + 0x75, 0xba, 0x82, 0xeb, 0xa7, 0x21, 0xb9, 0x0f, 0xeb, 0x3c, 0x51, 0xc1, 0xd8, 0x0f, 0xb3, 0x94, + 0x19, 0xa1, 0xa4, 0x37, 0xdf, 0xaa, 0x75, 0x16, 0xe9, 0x1a, 0x5a, 0xf7, 0x73, 0x23, 0x79, 0x00, + 0x37, 0x32, 0x39, 0x52, 0x32, 0x14, 0xf2, 0xd8, 0x47, 0x97, 0xf6, 0x16, 0x10, 0xb8, 0x51, 0xda, + 0x1f, 0xa3, 0x99, 0x7c, 0x00, 0xb7, 0x59, 0x60, 0xc4, 0x09, 0xf7, 0x4f, 0x58, 0x24, 0x42, 0x66, + 0x54, 0xea, 0x47, 0x22, 0x16, 0xc6, 0x5b, 0x44, 0xc2, 0x4d, 0xe7, 0x7d, 0x51, 0x38, 0x3f, 0xb5, + 0x3e, 0xd2, 0x81, 0x1b, 0x23, 0xa6, 0xb9, 0x9f, 0xf2, 0x53, 0x96, 0x86, 0x7e, 0xca, 0x0c, 0xf7, + 0xea, 0x88, 0x5f, 0xb7, 0x76, 0x8a, 0x66, 0xca, 0x0c, 0x27, 0x8f, 0x60, 0x4b, 0x47, 0x4c, 0x8f, + 0x6d, 0x24, 0x09, 0x97, 0x2c, 0x32, 0xe7, 0x7e, 0x2c, 0xf4, 0x88, 0x8f, 0xd9, 0x89, 0x50, 0xa9, + 0xb7, 0x84, 0xac, 0xcd, 0x02, 0x33, 0x74, 0x90, 0x67, 0x15, 0x82, 0x0c, 0xe0, 0xee, 0x7f, 0x29, + 0x84, 0xea, 0x54, 0x1a, 0x11, 0x73, 0x0f, 0x90, 0x7e, 0x67, 0x8a, 0xbe, 0x9f, 0xbb, 0xc9, 0x8f, + 0xc0, 0xd3, 0xe2, 0x58, 0xf2, 0xd0, 0x1f, 0x45, 0x2a, 0x78, 0xad, 0xfd, 0x53, 0x21, 0x43, 0x75, + 0xea, 0x47, 0x5c, 0x7a, 0x0d, 0xa4, 0xde, 0x72, 0xfe, 0x5d, 0x74, 0xff, 0x1c, 0xbd, 0x9f, 0x72, + 0x49, 0xfa, 0x70, 0x2b, 0x16, 0x5a, 0x57, 0xc4, 0x98, 0x9d, 0x89, 0x38, 0x8b, 0xbd, 0x26, 0xb2, + 0xde, 0x72, 0x4e, 0xc7, 0x7a, 0xe6, 0x5c, 0xe4, 0x1e, 0x34, 0xc4, 0x28, 0xf0, 0xb9, 0x64, 0xa3, + 0x88, 0x87, 0xde, 0x72, 0xab, 0xd6, 0x59, 0xa5, 0x20, 0x46, 0xc1, 0x63, 0x67, 0x21, 0x8f, 0xe1, + 0x9e, 0x90, 0x23, 0x95, 0xc9, 0xd0, 0x17, 0x81, 0xee, 0xff, 0xc0, 0x37, 0x29, 0x93, 0xfa, 0x88, + 0xa7, 0xba, 0x24, 0xad, 0x20, 0x69, 0x2b, 0x87, 0x3d, 0xb5, 0xa8, 0x2f, 0x0a, 0x50, 0x21, 0x73, + 0x00, 0x2d, 0x95, 0x99, 0xd9, 0x3a, 0xab, 0xa8, 0xf3, 0x9d, 0x02, 0xf7, 0xd5, 0x42, 0x1f, 0xc0, + 0xed, 0x24, 0x55, 0x89, 0xd2, 0x2c, 0xf2, 0x4f, 0x94, 0xb1, 0x09, 0x76, 0x6f, 0xeb, 0xdd, 0x74, + 0xb5, 0x2f, 0xbc, 0x2f, 0xd0, 0xe9, 0xde, 0x96, 0xfc, 0x12, 0xee, 0x94, 0xac, 0x90, 0x27, 0x4a, + 0x0b, 0xe3, 0xb3, 0x58, 0x65, 0xd2, 0x78, 0xb7, 0x5a, 0xb5, 0x4e, 0xa3, 0x7f, 0xbf, 0x3b, 0xd5, + 0x6e, 0xae, 0x81, 0x8a, 0xd3, 0xdf, 0xdd, 0x41, 0x30, 0xbd, 0x55, 0xa8, 0xec, 0x3b, 0x11, 0x67, + 0xb6, 0x99, 0xaf, 0x82, 0xb2, 0xa7, 0xce, 0xff, 0x55, 0xa6, 0xd2, 0x2c, 0xf6, 0x6e, 0x63, 0x2b, + 0xbc, 0x55, 0xc6, 0x64, 0x7d, 0x9f, 0xa3, 0x8b, 0xfc, 0x70, 0x22, 0xa4, 0x84, 0x69, 0xed, 0x9b, + 0x71, 0xca, 0xf5, 0x58, 0x45, 0xa1, 0x77, 0x07, 0x59, 0xa5, 0xe4, 0x90, 0x69, 0xfd, 0x45, 0xe1, + 0x24, 0x1f, 0x82, 0x57, 0xf2, 0xf0, 0x08, 0x4d, 0x10, 0x3d, 0x24, 0x96, 0x09, 0x3a, 0xb4, 0xee, + 0x8a, 0xf9, 0x31, 0x7c, 0x3b, 0x64, 0xca, 0xd7, 0x09, 0x97, 0xa1, 0x5f, 0x60, 0xaa, 0xf4, 0xdf, + 0xc5, 0xf4, 0x7b, 0x21, 0x53, 0x87, 0x16, 0x31, 0x2c, 0x00, 0x79, 0xe6, 0xdb, 0x07, 0xb0, 0x44, + 0x6d, 0xab, 0x92, 0x2d, 0xa8, 0xcb, 0x2c, 0xe6, 0xa9, 0x6d, 0x2d, 0x6c, 0xf6, 0x45, 0x5a, 0x19, + 0x48, 0x0b, 0x1a, 0x21, 0x97, 0x2a, 0x16, 0x12, 0xfd, 0xae, 0xd7, 0x27, 0x4d, 0xed, 0x00, 0xd6, + 0x7e, 0x1a, 0x87, 0x13, 0x97, 0xc7, 0x7d, 0x58, 0x4f, 0x52, 0x1e, 0x08, 0x2d, 0x94, 0xf4, 0x47, + 0xc2, 0x68, 0x54, 0x5d, 0xa3, 0x6b, 0xa5, 0x75, 0x57, 0x18, 0x4d, 0xde, 0x05, 0xc2, 0xb4, 0xaf, + 0x8e, 0x5c, 0xc1, 0xfd, 0x31, 0x17, 0xc7, 0x63, 0x93, 0x6f, 0xb0, 0xc1, 0xf4, 0x67, 0x47, 0x58, + 0xec, 0x27, 0x68, 0x6e, 0xff, 0xbd, 0x06, 0xf5, 0x1d, 0xad, 0xb9, 0x79, 0x2a, 0x8f, 0x14, 0xd9, + 0x81, 0x55, 0x66, 0x17, 0xc5, 0xf5, 0xd4, 0xe8, 0x7f, 0xf7, 0xaa, 0x82, 0x23, 0x37, 0xa4, 0x2b, + 0xcc, 0x3d, 0x90, 0x01, 0x2c, 0xe1, 0x4b, 0xe0, 0x86, 0x8d, 0xfe, 0x3b, 0x57, 0xf0, 0xf7, 0x2d, + 0x96, 0x3a, 0xca, 0xff, 0x88, 0x7c, 0xe1, 0x2b, 0x23, 0x27, 0x6f, 0x43, 0xd3, 0x28, 0x63, 0xab, + 0x9b, 0x25, 0x49, 0x74, 0x9e, 0xdf, 0x69, 0x0d, 0xb4, 0x1d, 0xa2, 0xa9, 0xfd, 0xeb, 0x25, 0x68, + 0xee, 0xa9, 0x38, 0x61, 0x81, 0x41, 0x26, 0xb9, 0x0d, 0xcb, 0xb9, 0xa8, 0xab, 0x47, 0xbe, 0x22, + 0x9f, 0xc3, 0xba, 0x36, 0xcc, 0x70, 0x3f, 0x61, 0xe7, 0x91, 0x62, 0xa1, 0xf6, 0xe6, 0x5b, 0x0b, + 0x9d, 0x46, 0xff, 0x61, 0x77, 0xd6, 0x74, 0xe9, 0x1e, 0x5a, 0xce, 0xd0, 0x51, 0xe8, 0x9a, 0x9e, + 0x58, 0x69, 0xf2, 0x04, 0x40, 0x66, 0x51, 0x24, 0x8e, 0x04, 0x4f, 0xed, 0x0d, 0x6d, 0xe5, 0x3a, + 0x57, 0x24, 0xe3, 0x79, 0x41, 0xa0, 0x13, 0x5c, 0xab, 0xe4, 0xf2, 0x91, 0x2a, 0xe5, 0xae, 0xee, + 0x46, 0xff, 0xc1, 0x15, 0x4a, 0xcf, 0x78, 0xfa, 0x3a, 0xe2, 0x54, 0x29, 0x43, 0xeb, 0x48, 0xb6, + 0x8f, 0x56, 0xc9, 0x8d, 0x18, 0x54, 0xfa, 0xd6, 0xb5, 0x95, 0x90, 0x8c, 0x4a, 0x0f, 0xe0, 0x46, + 0xd5, 0x5d, 0x86, 0xa5, 0x86, 0x87, 0x78, 0xb1, 0xac, 0xd2, 0x8d, 0xb2, 0xab, 0x9c, 0x99, 0x50, + 0x58, 0x3f, 0x8a, 0x43, 0x3f, 0x29, 0xcf, 0xb1, 0x17, 0xe2, 0xc6, 0xef, 0xce, 0xce, 0xed, 0xa5, + 0xa3, 0x4f, 0xd7, 0x8e, 0x2e, 0x75, 0x02, 0x85, 0xa6, 0x3e, 0x65, 0x89, 0xaf, 0x32, 0x93, 0x64, + 0x46, 0x7b, 0x4b, 0x98, 0xde, 0xde, 0x94, 0xa2, 0x1d, 0xc5, 0xa5, 0xde, 0x2e, 0x33, 0xc1, 0xf8, + 0xf0, 0x94, 0x25, 0x9f, 0x21, 0x67, 0x9f, 0x19, 0x46, 0x1b, 0xba, 0x5c, 0x6b, 0xf2, 0x0b, 0xb8, + 0xe1, 0x46, 0xf3, 0x44, 0xa4, 0xcb, 0x18, 0xe9, 0xf7, 0x67, 0x47, 0x3a, 0x35, 0xe3, 0xe9, 0x46, + 0x70, 0xd9, 0xd0, 0xfe, 0xd7, 0x22, 0x34, 0x27, 0x8f, 0x0a, 0xa1, 0x50, 0x4f, 0x55, 0x14, 0xf1, + 0xd0, 0xcf, 0x92, 0xbc, 0xcf, 0xde, 0xff, 0xfa, 0x27, 0xad, 0x4b, 0x91, 0xfb, 0xb3, 0xe4, 0xc9, + 0x1c, 0x5d, 0x4d, 0xf3, 0x67, 0xf2, 0x18, 0x16, 0xa5, 0x32, 0x3c, 0x6f, 0xbb, 0xde, 0x35, 0xe4, + 0x9e, 0x2b, 0xc3, 0x9f, 0xcc, 0x51, 0xa4, 0x5b, 0x19, 0x9b, 0x14, 0x6c, 0xba, 0xeb, 0xc9, 0xd8, + 0xdc, 0x5a, 0x19, 0x4b, 0xdf, 0x7c, 0x09, 0xab, 0x45, 0x94, 0xe4, 0x39, 0x40, 0xa0, 0xe2, 0x58, + 0x98, 0x98, 0x4b, 0x93, 0xbf, 0x6e, 0xf7, 0x8a, 0x53, 0x87, 0xca, 0x7b, 0x25, 0x8b, 0x4e, 0x28, + 0x6c, 0xfe, 0xb6, 0x06, 0x8b, 0x36, 0x66, 0xf2, 0x08, 0x96, 0xb5, 0xca, 0xd2, 0x80, 0xe7, 0xa2, + 0x9d, 0xd9, 0xd1, 0x5a, 0xce, 0x21, 0xe2, 0x69, 0xce, 0x23, 0x3f, 0xb9, 0x94, 0xb4, 0x87, 0x57, + 0xb5, 0xa7, 0xaa, 0xba, 0x1d, 0x79, 0x9b, 0xbf, 0xa9, 0xc1, 0xa2, 0x7d, 0xef, 0x6f, 0x20, 0x94, + 0x8f, 0xf2, 0xc4, 0xbb, 0x50, 0xbe, 0x37, 0xeb, 0x28, 0xdb, 0x1d, 0xcb, 0x38, 0x2c, 0x69, 0x77, + 0x03, 0xd6, 0x2e, 0xdd, 0x5f, 0xed, 0x4f, 0xa0, 0xf1, 0x89, 0x54, 0xa7, 0x12, 0xaf, 0x67, 0x4d, + 0x7e, 0x0c, 0xcb, 0x78, 0x3f, 0xdb, 0x89, 0xb1, 0xf0, 0x35, 0x6e, 0x65, 0xa4, 0xd1, 0x9c, 0xd3, + 0x6e, 0x03, 0x54, 0x01, 0x93, 0x9b, 0xb0, 0x24, 0xa4, 0xe4, 0x6e, 0xa4, 0x35, 0xa9, 0x5b, 0xb4, + 0xcf, 0xa1, 0x8e, 0xe3, 0x10, 0xc7, 0xc8, 0x53, 0x68, 0xd8, 0xf4, 0xf8, 0xff, 0x67, 0x4a, 0x40, + 0x56, 0xbb, 0xbd, 0x0d, 0x4d, 0x37, 0x88, 0x2f, 0x8d, 0xb1, 0x06, 0xda, 0xf2, 0x11, 0xf6, 0xa7, + 0x05, 0xd8, 0x38, 0xe0, 0x92, 0x6b, 0xa1, 0x77, 0x92, 0x04, 0x4f, 0x0e, 0x19, 0x42, 0x73, 0xa2, + 0x99, 0x75, 0x1e, 0xc2, 0x35, 0x1b, 0xb9, 0x51, 0x35, 0xb2, 0x26, 0x07, 0x00, 0xe5, 0x57, 0x74, + 0x31, 0x1e, 0xa6, 0xab, 0xe4, 0xfe, 0x11, 0x4a, 0xbd, 0xf2, 0xc3, 0x9a, 0x4e, 0x50, 0xc9, 0x4b, + 0x68, 0xb0, 0x28, 0x52, 0x01, 0x7e, 0xce, 0x17, 0x93, 0xe1, 0xc3, 0xd9, 0x91, 0x4d, 0xbd, 0x5e, + 0x77, 0xa7, 0x14, 0xa0, 0x93, 0x62, 0x9b, 0x7f, 0xa8, 0x01, 0x54, 0x3e, 0xf2, 0x31, 0x2c, 0xe7, + 0x5f, 0x6f, 0xb5, 0xeb, 0x7c, 0xbd, 0xe5, 0x24, 0x5b, 0xe9, 0x6a, 0x94, 0xd7, 0x8b, 0x21, 0xfd, + 0x08, 0x56, 0x58, 0x18, 0xa6, 0x5c, 0xeb, 0xfc, 0x92, 0xb8, 0xf2, 0x13, 0xc1, 0xa1, 0x69, 0x41, + 0x6b, 0x3f, 0x82, 0x25, 0xfc, 0x43, 0x71, 0x47, 0x29, 0xe4, 0x67, 0xf9, 0x34, 0x76, 0x0b, 0x2c, + 0xb9, 0x9d, 0x1d, 0xd3, 0x25, 0xb7, 0x36, 0x57, 0xf2, 0xdd, 0x3f, 0xcf, 0xff, 0xe5, 0x62, 0xbb, + 0xf6, 0xe5, 0xc5, 0x76, 0xed, 0x1f, 0x17, 0xdb, 0xb5, 0xdf, 0xbd, 0xd9, 0x9e, 0xfb, 0xf2, 0xcd, + 0xf6, 0xdc, 0xdf, 0xde, 0x6c, 0xcf, 0x41, 0x2b, 0x50, 0xf1, 0xcc, 0x64, 0xee, 0x82, 0xab, 0xb3, + 0xfd, 0x47, 0x1b, 0xd6, 0x5e, 0xbe, 0x38, 0x16, 0x66, 0x9c, 0x8d, 0xba, 0x81, 0x8a, 0x7b, 0x81, + 0xd2, 0xb1, 0xd2, 0xbd, 0x94, 0x47, 0xec, 0x9c, 0xa7, 0xbd, 0x93, 0x7e, 0xf9, 0x88, 0x12, 0xba, + 0x37, 0xeb, 0xaf, 0xf4, 0x23, 0x5c, 0x16, 0xab, 0xdf, 0xcf, 0x2f, 0x0c, 0xf7, 0xf6, 0xfe, 0x38, + 0xbf, 0x35, 0x2c, 0x42, 0xd9, 0xb3, 0xa1, 0xe0, 0xd6, 0xdd, 0x17, 0x39, 0xe8, 0xaf, 0x95, 0xfb, + 0x95, 0x75, 0xbf, 0x42, 0xf7, 0xab, 0xc2, 0x7d, 0x31, 0xdf, 0x99, 0xe5, 0x7e, 0x75, 0x30, 0xdc, + 0x7d, 0xc6, 0x0d, 0x0b, 0x99, 0x61, 0xff, 0x9c, 0xbf, 0x57, 0x40, 0x07, 0x03, 0x8b, 0x1d, 0x0c, + 0x10, 0x3c, 0x18, 0x14, 0xe8, 0xd1, 0x32, 0xfe, 0x95, 0xbe, 0xff, 0x9f, 0x00, 0x00, 0x00, 0xff, + 0xff, 0x6a, 0x54, 0x2e, 0xcf, 0x5b, 0x0f, 0x00, 0x00, } func (m *ChainParameters) Marshal() (dAtA []byte, err error) { @@ -1356,6 +1432,63 @@ func (m *FmdParameters) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *AssetInfo) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *AssetInfo) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *AssetInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.TotalSupply != 0 { + i = encodeVarintChain(dAtA, i, uint64(m.TotalSupply)) + i-- + dAtA[i] = 0x20 + } + if m.AsOfBlockHeight != 0 { + i = encodeVarintChain(dAtA, i, uint64(m.AsOfBlockHeight)) + i-- + dAtA[i] = 0x18 + } + if m.Denom != nil { + { + size, err := m.Denom.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintChain(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.AssetId != nil { + { + size, err := m.AssetId.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintChain(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *CompactBlock) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2080,6 +2213,29 @@ func (m *FmdParameters) Size() (n int) { return n } +func (m *AssetInfo) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.AssetId != nil { + l = m.AssetId.Size() + n += 1 + l + sovChain(uint64(l)) + } + if m.Denom != nil { + l = m.Denom.Size() + n += 1 + l + sovChain(uint64(l)) + } + if m.AsOfBlockHeight != 0 { + n += 1 + sovChain(uint64(m.AsOfBlockHeight)) + } + if m.TotalSupply != 0 { + n += 1 + sovChain(uint64(m.TotalSupply)) + } + return n +} + func (m *CompactBlock) Size() (n int) { if m == nil { return 0 @@ -2976,6 +3132,166 @@ func (m *FmdParameters) Unmarshal(dAtA []byte) error { } return nil } +func (m *AssetInfo) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: AssetInfo: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: AssetInfo: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AssetId", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthChain + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthChain + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.AssetId == nil { + m.AssetId = &v1alpha1.AssetId{} + } + if err := m.AssetId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthChain + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthChain + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Denom == nil { + m.Denom = &v1alpha1.Denom{} + } + if err := m.Denom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AsOfBlockHeight", wireType) + } + m.AsOfBlockHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.AsOfBlockHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TotalSupply", wireType) + } + m.TotalSupply = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowChain + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TotalSupply |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipChain(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthChain + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *CompactBlock) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -3854,7 +4170,7 @@ func (m *KnownAssets) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Assets = append(m.Assets, &v1alpha1.DenomMetadata{}) + m.Assets = append(m.Assets, &v1alpha1.Asset{}) if err := m.Assets[len(m.Assets)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go index 088785c8e..344a9012a 100644 --- a/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go +++ b/relayer/chains/penumbra/core/crypto/v1alpha1/crypto.pb.go @@ -78,20 +78,8 @@ func (m *Fee) GetAssetId() *AssetId { return nil } -// A Penumbra address. An address in Penumbra is a Bech32m-encoded -// string, with the human-readable prefix (HRP) `penumbrav2t`. type Address struct { - // The bytes of the address. Must be represented as a series of - // `uint8` (i.e. values 0 through 255), with a length of 80 elements. Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` - // Alternatively, a Bech32m-encoded string representation of the `inner` - // bytes. - // - // NOTE: implementations are not required to support parsing this field. - // Implementations should prefer to encode the bytes in all messages they - // produce. Implementations must not accept messages with both `inner` and - // `alt_bech32m` set. - AltBech32M string `protobuf:"bytes,2,opt,name=alt_bech32m,json=altBech32m,proto3" json:"alt_bech32m,omitempty"` } func (m *Address) Reset() { *m = Address{} } @@ -134,13 +122,6 @@ func (m *Address) GetInner() []byte { return nil } -func (m *Address) GetAltBech32M() string { - if m != nil { - return m.AltBech32M - } - return "" -} - type AddressView struct { // Types that are valid to be assigned to AddressView: // @@ -691,25 +672,8 @@ func (m *BalanceCommitment) GetInner() []byte { return nil } -// A Penumbra asset ID. type AssetId struct { - // The bytes of the asset ID. Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` - // Alternatively, a Bech32m-encoded string representation of the `inner` - // bytes. - // - // NOTE: implementations are not required to support parsing this field. - // Implementations should prefer to encode the `inner` bytes in all messages they - // produce. Implementations must not accept messages with both `inner` and - // `alt_bech32m` set. This field exists for convenience of RPC users. - AltBech32M string `protobuf:"bytes,2,opt,name=alt_bech32m,json=altBech32m,proto3" json:"alt_bech32m,omitempty"` - // Alternatively, a base denomination string which should be hashed to obtain the asset ID. - // - // NOTE: implementations are not required to support parsing this field. - // Implementations should prefer to encode the bytes in all messages they - // produce. Implementations must not accept messages with both `inner` and - // `alt_base_denom` set. This field exists for convenience of RPC users. - AltBaseDenom string `protobuf:"bytes,3,opt,name=alt_base_denom,json=altBaseDenom,proto3" json:"alt_base_denom,omitempty"` } func (m *AssetId) Reset() { *m = AssetId{} } @@ -752,25 +716,6 @@ func (m *AssetId) GetInner() []byte { return nil } -func (m *AssetId) GetAltBech32M() string { - if m != nil { - return m.AltBech32M - } - return "" -} - -func (m *AssetId) GetAltBaseDenom() string { - if m != nil { - return m.AltBaseDenom - } - return "" -} - -// The quantity of a particular Asset. Represented as a 128-bit unsigned integer, -// split over two fields, `lo` and `hi`, representing the low- and high-order bytes -// of the 128-bit value, respectively. Clients must assemble these bits in their -// implementation into a `uint128` or comparable data structure, in order to model -// the Amount accurately. type Amount struct { Lo uint64 `protobuf:"varint,1,opt,name=lo,proto3" json:"lo,omitempty"` Hi uint64 `protobuf:"varint,2,opt,name=hi,proto3" json:"hi,omitempty"` @@ -1351,6 +1296,58 @@ func (m *MerkleRoot) GetInner() []byte { return nil } +type Asset struct { + Id *AssetId `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Denom *Denom `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` +} + +func (m *Asset) Reset() { *m = Asset{} } +func (m *Asset) String() string { return proto.CompactTextString(m) } +func (*Asset) ProtoMessage() {} +func (*Asset) Descriptor() ([]byte, []int) { + return fileDescriptor_5c23a0b4440af102, []int{19} +} +func (m *Asset) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Asset) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Asset.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Asset) XXX_Merge(src proto.Message) { + xxx_messageInfo_Asset.Merge(m, src) +} +func (m *Asset) XXX_Size() int { + return m.Size() +} +func (m *Asset) XXX_DiscardUnknown() { + xxx_messageInfo_Asset.DiscardUnknown(m) +} + +var xxx_messageInfo_Asset proto.InternalMessageInfo + +func (m *Asset) GetId() *AssetId { + if m != nil { + return m.Id + } + return nil +} + +func (m *Asset) GetDenom() *Denom { + if m != nil { + return m.Denom + } + return nil +} + // A validator's identity key (decaf377-rdsa spendauth verification key). type IdentityKey struct { Ik []byte `protobuf:"bytes,1,opt,name=ik,proto3" json:"ik,omitempty"` @@ -1360,7 +1357,7 @@ func (m *IdentityKey) Reset() { *m = IdentityKey{} } func (m *IdentityKey) String() string { return proto.CompactTextString(m) } func (*IdentityKey) ProtoMessage() {} func (*IdentityKey) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{19} + return fileDescriptor_5c23a0b4440af102, []int{20} } func (m *IdentityKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1405,7 +1402,7 @@ func (m *GovernanceKey) Reset() { *m = GovernanceKey{} } func (m *GovernanceKey) String() string { return proto.CompactTextString(m) } func (*GovernanceKey) ProtoMessage() {} func (*GovernanceKey) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{20} + return fileDescriptor_5c23a0b4440af102, []int{21} } func (m *GovernanceKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1449,7 +1446,7 @@ func (m *ConsensusKey) Reset() { *m = ConsensusKey{} } func (m *ConsensusKey) String() string { return proto.CompactTextString(m) } func (*ConsensusKey) ProtoMessage() {} func (*ConsensusKey) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{21} + return fileDescriptor_5c23a0b4440af102, []int{22} } func (m *ConsensusKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1495,7 +1492,7 @@ func (m *Note) Reset() { *m = Note{} } func (m *Note) String() string { return proto.CompactTextString(m) } func (*Note) ProtoMessage() {} func (*Note) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{22} + return fileDescriptor_5c23a0b4440af102, []int{23} } func (m *Note) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1555,7 +1552,7 @@ func (m *NoteView) Reset() { *m = NoteView{} } func (m *NoteView) String() string { return proto.CompactTextString(m) } func (*NoteView) ProtoMessage() {} func (*NoteView) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{23} + return fileDescriptor_5c23a0b4440af102, []int{24} } func (m *NoteView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1615,7 +1612,7 @@ func (m *NoteCiphertext) Reset() { *m = NoteCiphertext{} } func (m *NoteCiphertext) String() string { return proto.CompactTextString(m) } func (*NoteCiphertext) ProtoMessage() {} func (*NoteCiphertext) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{24} + return fileDescriptor_5c23a0b4440af102, []int{25} } func (m *NoteCiphertext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1659,7 +1656,7 @@ func (m *Nullifier) Reset() { *m = Nullifier{} } func (m *Nullifier) String() string { return proto.CompactTextString(m) } func (*Nullifier) ProtoMessage() {} func (*Nullifier) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{25} + return fileDescriptor_5c23a0b4440af102, []int{26} } func (m *Nullifier) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1703,7 +1700,7 @@ func (m *SpendAuthSignature) Reset() { *m = SpendAuthSignature{} } func (m *SpendAuthSignature) String() string { return proto.CompactTextString(m) } func (*SpendAuthSignature) ProtoMessage() {} func (*SpendAuthSignature) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{26} + return fileDescriptor_5c23a0b4440af102, []int{27} } func (m *SpendAuthSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1747,7 +1744,7 @@ func (m *BindingSignature) Reset() { *m = BindingSignature{} } func (m *BindingSignature) String() string { return proto.CompactTextString(m) } func (*BindingSignature) ProtoMessage() {} func (*BindingSignature) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{27} + return fileDescriptor_5c23a0b4440af102, []int{28} } func (m *BindingSignature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1799,7 +1796,7 @@ func (m *NotePayload) Reset() { *m = NotePayload{} } func (m *NotePayload) String() string { return proto.CompactTextString(m) } func (*NotePayload) ProtoMessage() {} func (*NotePayload) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{28} + return fileDescriptor_5c23a0b4440af102, []int{29} } func (m *NotePayload) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1860,7 +1857,7 @@ func (m *StateCommitmentProof) Reset() { *m = StateCommitmentProof{} } func (m *StateCommitmentProof) String() string { return proto.CompactTextString(m) } func (*StateCommitmentProof) ProtoMessage() {} func (*StateCommitmentProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{29} + return fileDescriptor_5c23a0b4440af102, []int{30} } func (m *StateCommitmentProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1921,7 +1918,7 @@ func (m *MerklePathChunk) Reset() { *m = MerklePathChunk{} } func (m *MerklePathChunk) String() string { return proto.CompactTextString(m) } func (*MerklePathChunk) ProtoMessage() {} func (*MerklePathChunk) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{30} + return fileDescriptor_5c23a0b4440af102, []int{31} } func (m *MerklePathChunk) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1980,7 +1977,7 @@ func (m *Clue) Reset() { *m = Clue{} } func (m *Clue) String() string { return proto.CompactTextString(m) } func (*Clue) ProtoMessage() {} func (*Clue) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{31} + return fileDescriptor_5c23a0b4440af102, []int{32} } func (m *Clue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2025,7 +2022,7 @@ func (m *EffectHash) Reset() { *m = EffectHash{} } func (m *EffectHash) String() string { return proto.CompactTextString(m) } func (*EffectHash) ProtoMessage() {} func (*EffectHash) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{32} + return fileDescriptor_5c23a0b4440af102, []int{33} } func (m *EffectHash) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2070,7 +2067,7 @@ func (m *ZKOutputProof) Reset() { *m = ZKOutputProof{} } func (m *ZKOutputProof) String() string { return proto.CompactTextString(m) } func (*ZKOutputProof) ProtoMessage() {} func (*ZKOutputProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{33} + return fileDescriptor_5c23a0b4440af102, []int{34} } func (m *ZKOutputProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2115,7 +2112,7 @@ func (m *ZKSpendProof) Reset() { *m = ZKSpendProof{} } func (m *ZKSpendProof) String() string { return proto.CompactTextString(m) } func (*ZKSpendProof) ProtoMessage() {} func (*ZKSpendProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{34} + return fileDescriptor_5c23a0b4440af102, []int{35} } func (m *ZKSpendProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2160,7 +2157,7 @@ func (m *ZKSwapProof) Reset() { *m = ZKSwapProof{} } func (m *ZKSwapProof) String() string { return proto.CompactTextString(m) } func (*ZKSwapProof) ProtoMessage() {} func (*ZKSwapProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{35} + return fileDescriptor_5c23a0b4440af102, []int{36} } func (m *ZKSwapProof) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2196,51 +2193,6 @@ func (m *ZKSwapProof) GetInner() []byte { return nil } -// A Penumbra ZK swap claim proof. -type ZKSwapClaimProof struct { - Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` -} - -func (m *ZKSwapClaimProof) Reset() { *m = ZKSwapClaimProof{} } -func (m *ZKSwapClaimProof) String() string { return proto.CompactTextString(m) } -func (*ZKSwapClaimProof) ProtoMessage() {} -func (*ZKSwapClaimProof) Descriptor() ([]byte, []int) { - return fileDescriptor_5c23a0b4440af102, []int{36} -} -func (m *ZKSwapClaimProof) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *ZKSwapClaimProof) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_ZKSwapClaimProof.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *ZKSwapClaimProof) XXX_Merge(src proto.Message) { - xxx_messageInfo_ZKSwapClaimProof.Merge(m, src) -} -func (m *ZKSwapClaimProof) XXX_Size() int { - return m.Size() -} -func (m *ZKSwapClaimProof) XXX_DiscardUnknown() { - xxx_messageInfo_ZKSwapClaimProof.DiscardUnknown(m) -} - -var xxx_messageInfo_ZKSwapClaimProof proto.InternalMessageInfo - -func (m *ZKSwapClaimProof) GetInner() []byte { - if m != nil { - return m.Inner - } - return nil -} - // A Penumbra ZK undelegate claim proof. type ZKUndelegateClaimProof struct { Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` @@ -2400,6 +2352,7 @@ func init() { proto.RegisterType((*ValueView_KnownDenom)(nil), "penumbra.core.crypto.v1alpha1.ValueView.KnownDenom") proto.RegisterType((*ValueView_UnknownDenom)(nil), "penumbra.core.crypto.v1alpha1.ValueView.UnknownDenom") proto.RegisterType((*MerkleRoot)(nil), "penumbra.core.crypto.v1alpha1.MerkleRoot") + proto.RegisterType((*Asset)(nil), "penumbra.core.crypto.v1alpha1.Asset") proto.RegisterType((*IdentityKey)(nil), "penumbra.core.crypto.v1alpha1.IdentityKey") proto.RegisterType((*GovernanceKey)(nil), "penumbra.core.crypto.v1alpha1.GovernanceKey") proto.RegisterType((*ConsensusKey)(nil), "penumbra.core.crypto.v1alpha1.ConsensusKey") @@ -2417,7 +2370,6 @@ func init() { proto.RegisterType((*ZKOutputProof)(nil), "penumbra.core.crypto.v1alpha1.ZKOutputProof") proto.RegisterType((*ZKSpendProof)(nil), "penumbra.core.crypto.v1alpha1.ZKSpendProof") proto.RegisterType((*ZKSwapProof)(nil), "penumbra.core.crypto.v1alpha1.ZKSwapProof") - proto.RegisterType((*ZKSwapClaimProof)(nil), "penumbra.core.crypto.v1alpha1.ZKSwapClaimProof") proto.RegisterType((*ZKUndelegateClaimProof)(nil), "penumbra.core.crypto.v1alpha1.ZKUndelegateClaimProof") proto.RegisterType((*ZKDelegatorVoteProof)(nil), "penumbra.core.crypto.v1alpha1.ZKDelegatorVoteProof") proto.RegisterType((*ZKNullifierDerivationProof)(nil), "penumbra.core.crypto.v1alpha1.ZKNullifierDerivationProof") @@ -2428,97 +2380,96 @@ func init() { } var fileDescriptor_5c23a0b4440af102 = []byte{ - // 1437 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6e, 0x1b, 0xb7, - 0x16, 0xf6, 0x48, 0xb6, 0x25, 0x1f, 0xc9, 0xb2, 0x43, 0x18, 0x81, 0xae, 0xef, 0xb5, 0xe3, 0x4c, - 0x1c, 0x5f, 0x27, 0x37, 0x57, 0x86, 0x65, 0x74, 0xe3, 0xa2, 0x45, 0x2c, 0xb9, 0x89, 0x5d, 0x21, - 0x89, 0x30, 0x6e, 0x9c, 0x42, 0x30, 0x20, 0xd0, 0x33, 0xb4, 0x86, 0xd0, 0x0c, 0x39, 0x9d, 0x1f, - 0x39, 0xea, 0x0b, 0x14, 0x5d, 0x35, 0xeb, 0x2e, 0xbb, 0xe8, 0xa2, 0x6f, 0xd0, 0x5d, 0x97, 0x45, - 0x57, 0x59, 0x66, 0xd9, 0x3a, 0x8b, 0x02, 0x5d, 0x75, 0xd1, 0x07, 0x28, 0xc8, 0xe1, 0xc8, 0xb2, - 0x61, 0xfd, 0x24, 0x41, 0xd1, 0xee, 0x78, 0x78, 0xbe, 0xf3, 0xf1, 0xe3, 0x39, 0xe4, 0x1c, 0x4a, - 0x70, 0xd7, 0x23, 0x2c, 0x72, 0x8f, 0x7d, 0xbc, 0x61, 0x72, 0x9f, 0x6c, 0x98, 0x7e, 0xd7, 0x0b, - 0xf9, 0x46, 0x67, 0x13, 0x3b, 0x9e, 0x8d, 0x37, 0x95, 0x5d, 0xf2, 0x7c, 0x1e, 0x72, 0xb4, 0x94, - 0x60, 0x4b, 0x02, 0x5b, 0x52, 0xbe, 0x04, 0xab, 0x7f, 0xa1, 0x41, 0xfa, 0x01, 0x21, 0xe8, 0x03, - 0x98, 0xc6, 0x2e, 0x8f, 0x58, 0x58, 0xd4, 0x56, 0xb4, 0xf5, 0x5c, 0xf9, 0x76, 0x69, 0x68, 0x5c, - 0x69, 0x47, 0x82, 0x0d, 0x15, 0x84, 0x76, 0x20, 0x8b, 0x83, 0x80, 0x84, 0x4d, 0x6a, 0x15, 0x53, - 0x92, 0x60, 0x6d, 0x14, 0x81, 0x80, 0xef, 0x5b, 0x46, 0x06, 0xc7, 0x03, 0xfd, 0x3e, 0x64, 0x76, - 0x2c, 0xcb, 0x27, 0x41, 0x80, 0x16, 0x60, 0x8a, 0x32, 0x46, 0x7c, 0xa9, 0x25, 0x6f, 0xc4, 0x06, - 0xba, 0x01, 0x39, 0xec, 0x84, 0xcd, 0x63, 0x62, 0xda, 0x5b, 0x65, 0x57, 0x2e, 0x33, 0x63, 0x00, - 0x76, 0xc2, 0x4a, 0x3c, 0xa3, 0xff, 0x9e, 0x86, 0x9c, 0xa2, 0x38, 0xa4, 0xe4, 0x14, 0x3d, 0x86, - 0x4c, 0x87, 0x06, 0xf4, 0xd8, 0x21, 0x6a, 0x53, 0xe5, 0x51, 0x9a, 0xce, 0x83, 0x4b, 0x87, 0x71, - 0xe4, 0xde, 0x84, 0x91, 0x90, 0xa0, 0x1a, 0x4c, 0x73, 0x0f, 0x7f, 0x16, 0x11, 0xb5, 0xc5, 0xcd, - 0x37, 0xa0, 0x7b, 0x22, 0x03, 0xf7, 0x26, 0x0c, 0x45, 0xb1, 0xf8, 0xab, 0x06, 0x19, 0xb5, 0x06, - 0xba, 0x0f, 0x19, 0x1c, 0x63, 0x95, 0xd0, 0xb5, 0xf1, 0x98, 0x8d, 0x24, 0x0c, 0xed, 0x88, 0x8c, - 0x59, 0xe4, 0xb9, 0x52, 0xf6, 0xbf, 0xf1, 0xe2, 0xf7, 0x45, 0x88, 0x11, 0x47, 0xa2, 0x67, 0x30, - 0x8f, 0x4d, 0x53, 0x54, 0xb3, 0xd9, 0xf2, 0x79, 0xe4, 0x89, 0x52, 0xa6, 0x25, 0xdb, 0xff, 0x47, - 0xb1, 0xc5, 0x61, 0x0f, 0x45, 0xd4, 0xbe, 0x65, 0x14, 0xf0, 0x05, 0x7b, 0xf1, 0x63, 0x98, 0x8e, - 0x77, 0xff, 0xee, 0xfb, 0xac, 0x14, 0x20, 0xaf, 0x86, 0xcd, 0x0e, 0x25, 0xa7, 0xfa, 0x0a, 0x64, - 0x0f, 0x3c, 0xc2, 0xac, 0x1a, 0xe9, 0x5e, 0x7d, 0x6a, 0xf4, 0x7b, 0xb0, 0x20, 0x11, 0x87, 0xc4, - 0xa7, 0x27, 0xd4, 0xc4, 0x21, 0xe5, 0x6c, 0x30, 0x7a, 0x0d, 0x0a, 0x0f, 0x22, 0xc7, 0x11, 0x25, - 0xa3, 0xac, 0x35, 0x14, 0x77, 0x71, 0xd7, 0x03, 0x70, 0xb7, 0x20, 0xb7, 0x4b, 0x3b, 0xc4, 0x0f, - 0xe8, 0x09, 0x25, 0xfe, 0x00, 0xd0, 0x1e, 0xe4, 0xfb, 0x0b, 0x82, 0x8a, 0x90, 0x51, 0x29, 0x94, - 0xe5, 0x9c, 0x35, 0x12, 0x13, 0x2d, 0x03, 0xf8, 0x98, 0x59, 0xdc, 0xa5, 0x9f, 0x13, 0x5f, 0x56, - 0x27, 0x6f, 0xf4, 0xcd, 0xe8, 0xff, 0x85, 0xb9, 0x83, 0x10, 0x87, 0xa4, 0xca, 0x5d, 0x97, 0x86, - 0x2e, 0x61, 0xe1, 0x80, 0x25, 0xef, 0xc0, 0xb5, 0x0a, 0x76, 0x30, 0x33, 0x47, 0x43, 0x4f, 0x20, - 0xa3, 0xee, 0xea, 0x5b, 0xde, 0x4b, 0xb4, 0x0a, 0x05, 0x09, 0xc0, 0x01, 0x69, 0x5a, 0x84, 0x71, - 0x57, 0x2a, 0x9f, 0x31, 0xf2, 0x02, 0x83, 0x03, 0xb2, 0x2b, 0xe6, 0xf4, 0x75, 0x98, 0x8e, 0x3f, - 0x2a, 0xa8, 0x00, 0x29, 0x87, 0xcb, 0x35, 0x26, 0x8d, 0x94, 0xc3, 0x85, 0x6d, 0x53, 0xc9, 0x3b, - 0x69, 0xa4, 0x6c, 0xaa, 0x2f, 0xc1, 0x94, 0x0c, 0x11, 0x7a, 0x62, 0x3e, 0x4d, 0xf2, 0xc5, 0x86, - 0xfe, 0x2a, 0x05, 0xb3, 0xd2, 0xff, 0x88, 0x84, 0xd8, 0xc2, 0x21, 0x46, 0x2b, 0x90, 0xb3, 0x48, - 0x60, 0xfa, 0xd4, 0x13, 0xd5, 0x57, 0xe8, 0xfe, 0x29, 0xb4, 0x2f, 0x10, 0x8c, 0xbb, 0xcd, 0x88, - 0xd1, 0x30, 0x28, 0xa6, 0x56, 0xd2, 0xeb, 0xb9, 0xf2, 0xfa, 0x88, 0xd3, 0x29, 0x17, 0x79, 0xca, - 0x68, 0x68, 0x80, 0x95, 0x0c, 0x03, 0x84, 0x60, 0x52, 0xec, 0x54, 0xed, 0x51, 0x8e, 0x45, 0x45, - 0x2d, 0x1a, 0x78, 0x0e, 0xee, 0x16, 0x27, 0xe5, 0x74, 0x62, 0x0a, 0x34, 0xc3, 0x2e, 0x29, 0x4e, - 0xc5, 0x68, 0x31, 0x46, 0xd7, 0x61, 0x3a, 0xe8, 0xba, 0xc7, 0xdc, 0x29, 0x4e, 0xcb, 0x59, 0x65, - 0xa1, 0x79, 0x48, 0x47, 0x3e, 0x2d, 0x66, 0xe4, 0xa4, 0x18, 0xa2, 0x7f, 0x41, 0x36, 0xf2, 0x69, - 0xd3, 0xc6, 0x81, 0x5d, 0xcc, 0xc6, 0xc4, 0x91, 0x4f, 0xf7, 0x70, 0x60, 0xa3, 0x03, 0xb8, 0x96, - 0xa8, 0x6f, 0xf6, 0x3e, 0xcd, 0x3f, 0xcc, 0xbd, 0xd1, 0xb7, 0x79, 0x2e, 0x81, 0xa9, 0x09, 0xfd, - 0x19, 0xcc, 0xf4, 0x36, 0x7d, 0x75, 0xf6, 0xd1, 0x22, 0x64, 0xc9, 0x73, 0x8f, 0x33, 0xd2, 0x3b, - 0xbd, 0x3d, 0x5b, 0x1e, 0x6c, 0x87, 0xe2, 0x80, 0x04, 0xc5, 0xf4, 0x4a, 0x5a, 0xa8, 0x55, 0xa6, - 0xfe, 0xa5, 0x06, 0x53, 0x87, 0xd8, 0x89, 0xfe, 0x09, 0x8d, 0xe8, 0x8f, 0x34, 0xcc, 0x48, 0x2d, - 0xb2, 0x89, 0x1c, 0x42, 0xae, 0xcd, 0xf8, 0x29, 0x6b, 0x9e, 0xef, 0x35, 0x57, 0xde, 0x1a, 0xc1, - 0xd9, 0x0b, 0x2f, 0xd5, 0x44, 0xac, 0xcc, 0xd9, 0xde, 0x84, 0x01, 0xed, 0x9e, 0x85, 0x8e, 0x60, - 0x36, 0x62, 0xfd, 0xcc, 0xb1, 0xda, 0xf7, 0xc6, 0x66, 0x7e, 0xca, 0xda, 0xfd, 0xdc, 0xf9, 0xa8, - 0xcf, 0x5e, 0xfc, 0x4a, 0x03, 0x38, 0x5f, 0xfa, 0x5d, 0x93, 0x5a, 0x49, 0x2a, 0x1d, 0x6b, 0xbc, - 0x37, 0xce, 0xbd, 0x48, 0x2e, 0x9f, 0x3a, 0x17, 0x8b, 0x2f, 0x34, 0xc8, 0xf7, 0x4b, 0xfe, 0xfb, - 0x0b, 0x5d, 0xc9, 0x03, 0x74, 0x44, 0x3a, 0xe3, 0x56, 0xa2, 0x03, 0x3c, 0x22, 0x7e, 0xdb, 0x21, - 0x06, 0xe7, 0x83, 0xbe, 0x85, 0x4b, 0x90, 0xdb, 0xb7, 0x08, 0x0b, 0x69, 0xd8, 0x15, 0xbd, 0xa1, - 0x00, 0x29, 0xda, 0x56, 0x88, 0x14, 0x6d, 0xeb, 0x37, 0x60, 0xf6, 0x21, 0xef, 0x10, 0x9f, 0x89, - 0x0f, 0xab, 0x02, 0xb4, 0x7a, 0x80, 0x56, 0x5b, 0x5f, 0x85, 0x7c, 0x95, 0xb3, 0x80, 0xb0, 0x20, - 0x0a, 0x06, 0x37, 0x97, 0xaf, 0x35, 0x98, 0x7c, 0xcc, 0x43, 0x82, 0xb6, 0x61, 0x4a, 0x0a, 0x54, - 0x19, 0x5a, 0x1d, 0xe7, 0x6c, 0x18, 0x71, 0x88, 0xa0, 0xf6, 0x03, 0x42, 0xe2, 0xe4, 0xe4, 0x8d, - 0xd8, 0xe8, 0xef, 0xc0, 0xe9, 0xb7, 0xea, 0xc0, 0xfa, 0xb7, 0x1a, 0x64, 0x85, 0x38, 0x79, 0x39, - 0x3e, 0xbc, 0x28, 0x70, 0x7d, 0xdc, 0xc3, 0x3b, 0x5c, 0xe4, 0xee, 0x65, 0x91, 0x77, 0xc7, 0x7f, - 0x68, 0x9d, 0x0b, 0x5d, 0x83, 0x82, 0xd0, 0x59, 0xa5, 0x9e, 0x4d, 0xfc, 0x90, 0x3c, 0x1f, 0x54, - 0xd3, 0x9b, 0x30, 0xf3, 0x38, 0x72, 0x9c, 0x61, 0x0d, 0xfa, 0x2e, 0x20, 0xf9, 0x86, 0xd8, 0x89, - 0x42, 0xfb, 0x80, 0xb6, 0x18, 0x0e, 0x23, 0x9f, 0x0c, 0xc0, 0xae, 0xc3, 0x7c, 0x85, 0x32, 0x8b, - 0xb2, 0xd6, 0x28, 0xe4, 0x2f, 0x1a, 0xe4, 0x84, 0xc2, 0x3a, 0xee, 0x3a, 0x1c, 0x5b, 0xe8, 0x19, - 0xcc, 0x31, 0x1e, 0x92, 0xa6, 0xd9, 0xeb, 0xc8, 0x2a, 0xad, 0xa5, 0x11, 0xdb, 0xbf, 0xd4, 0xf2, - 0x8d, 0x82, 0xa0, 0xe9, 0xeb, 0xeb, 0xb7, 0x60, 0x96, 0x78, 0x36, 0x71, 0x89, 0x8f, 0x9d, 0x66, - 0x9b, 0x74, 0x55, 0xb6, 0xf3, 0xbd, 0x49, 0x71, 0x14, 0x3f, 0x81, 0x02, 0x61, 0x92, 0x99, 0x58, - 0x4d, 0x41, 0x30, 0xe6, 0xe3, 0xef, 0x62, 0x8e, 0x8d, 0xd9, 0x1e, 0x89, 0x70, 0xe8, 0xaf, 0x34, - 0x58, 0xb8, 0x24, 0xaf, 0xee, 0x73, 0x7e, 0xf2, 0xd7, 0x6d, 0x76, 0x11, 0xb2, 0x1e, 0x0f, 0xa8, - 0x6c, 0xf4, 0xf1, 0x93, 0xa1, 0x67, 0xa3, 0x1a, 0xcc, 0xe0, 0x28, 0xb4, 0x9b, 0x1e, 0x0e, 0x6d, - 0xd9, 0x81, 0x46, 0x2f, 0x17, 0x7f, 0x12, 0xea, 0x38, 0xb4, 0xab, 0x76, 0xc4, 0xda, 0x46, 0x56, - 0x10, 0x08, 0x53, 0xb7, 0x61, 0xee, 0x92, 0x13, 0xfd, 0x1b, 0x66, 0xc4, 0x83, 0x9e, 0xb2, 0x56, - 0x73, 0x53, 0xd5, 0x3a, 0xab, 0x26, 0x36, 0xfb, 0x9d, 0x65, 0x55, 0x81, 0xc4, 0x59, 0xee, 0x77, - 0x6e, 0xa9, 0x77, 0x5d, 0xe2, 0xdc, 0xd2, 0xff, 0x03, 0x93, 0x55, 0x75, 0x5b, 0xae, 0x38, 0x46, - 0x3a, 0xc0, 0x47, 0x27, 0x27, 0xc4, 0x0c, 0x65, 0xdb, 0xbf, 0x1a, 0x73, 0x1b, 0x66, 0x1b, 0xb5, - 0x27, 0x51, 0xe8, 0x45, 0x2a, 0xfd, 0x57, 0xc3, 0x56, 0x21, 0xdf, 0xa8, 0xc9, 0x93, 0x3e, 0x0c, - 0x75, 0x0b, 0x72, 0x8d, 0xda, 0xc1, 0x29, 0xf6, 0x86, 0x81, 0xd6, 0x61, 0x3e, 0x06, 0x55, 0x1d, - 0x4c, 0xdd, 0x61, 0xc8, 0x12, 0x5c, 0x6f, 0xd4, 0x9e, 0x32, 0x8b, 0x38, 0xa4, 0x25, 0x4a, 0x3b, - 0x0a, 0x7f, 0x0f, 0x16, 0x1a, 0xb5, 0xdd, 0x18, 0xcd, 0xfd, 0x43, 0x71, 0x81, 0x86, 0xa0, 0xcb, - 0xb0, 0xd8, 0xa8, 0xf5, 0xee, 0xf7, 0x2e, 0xf1, 0x69, 0x47, 0xfe, 0x04, 0x18, 0x12, 0x53, 0xf9, - 0x3e, 0xf5, 0xe3, 0xd9, 0xb2, 0xf6, 0xf2, 0x6c, 0x59, 0xfb, 0xf9, 0x6c, 0x59, 0x7b, 0xf1, 0x7a, - 0x79, 0xe2, 0xe5, 0xeb, 0xe5, 0x89, 0x57, 0xaf, 0x97, 0x27, 0xe0, 0xa6, 0xc9, 0xdd, 0xe1, 0x27, - 0xa6, 0x92, 0xab, 0xca, 0x89, 0xba, 0xf8, 0xf5, 0x5d, 0xd7, 0x1a, 0x9f, 0xb6, 0x68, 0x68, 0x47, - 0xc7, 0x25, 0x93, 0xbb, 0x1b, 0x26, 0x0f, 0x5c, 0x1e, 0x6c, 0xf8, 0xc4, 0xc1, 0x5d, 0xe2, 0x6f, - 0x74, 0xca, 0xbd, 0xa1, 0x69, 0x63, 0xca, 0x82, 0x8d, 0xa1, 0xbf, 0xeb, 0xdf, 0x8f, 0xed, 0xc4, - 0xfc, 0x26, 0x95, 0xae, 0x57, 0xab, 0xdf, 0xa5, 0x96, 0xea, 0x89, 0x9c, 0xaa, 0x90, 0x13, 0xaf, - 0x5e, 0x3a, 0x54, 0xa8, 0x9f, 0xce, 0xfd, 0x47, 0xc2, 0x7f, 0x14, 0xfb, 0x8f, 0x12, 0xff, 0x59, - 0xea, 0xce, 0x50, 0xff, 0xd1, 0xc3, 0x7a, 0x25, 0x69, 0xe5, 0xbf, 0xa5, 0x56, 0x12, 0xec, 0xf6, - 0xb6, 0x00, 0x6f, 0x6f, 0xc7, 0xe8, 0xed, 0xed, 0x04, 0x7e, 0x3c, 0x2d, 0xff, 0x75, 0xd8, 0xfa, - 0x33, 0x00, 0x00, 0xff, 0xff, 0x88, 0xb9, 0x8c, 0xd5, 0xa3, 0x10, 0x00, 0x00, + // 1416 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0xae, 0xf3, 0xc3, 0x79, 0x76, 0x9c, 0x76, 0x14, 0x55, 0xfe, 0xe6, 0x4b, 0xd2, 0x74, + 0x9b, 0x86, 0xb4, 0x14, 0x47, 0x71, 0x04, 0x87, 0x20, 0x10, 0xb1, 0x43, 0x9b, 0x60, 0xb5, 0xb5, + 0x36, 0xd4, 0x45, 0x56, 0x24, 0x6b, 0xe2, 0x9d, 0x78, 0x47, 0xde, 0x9d, 0x59, 0xf6, 0x87, 0x53, + 0xc3, 0x1f, 0x80, 0x38, 0xd1, 0x33, 0x47, 0x0e, 0x1c, 0xf8, 0x0f, 0xb8, 0x71, 0x44, 0x9c, 0x7a, + 0xec, 0x11, 0xd2, 0x03, 0x12, 0x27, 0x0e, 0xfc, 0x01, 0x68, 0x66, 0x67, 0x1d, 0x27, 0x8a, 0x7f, + 0x94, 0x0a, 0xc1, 0x6d, 0xde, 0xbc, 0xcf, 0x7b, 0xf3, 0x99, 0xf7, 0xde, 0xcc, 0x9b, 0x5d, 0xb8, + 0xe3, 0x11, 0x16, 0xb9, 0x47, 0x3e, 0xde, 0x68, 0x72, 0x9f, 0x6c, 0x34, 0xfd, 0xae, 0x17, 0xf2, + 0x8d, 0xce, 0x26, 0x76, 0x3c, 0x1b, 0x6f, 0x2a, 0xb9, 0xe0, 0xf9, 0x3c, 0xe4, 0x68, 0x29, 0xc1, + 0x16, 0x04, 0xb6, 0xa0, 0x74, 0x09, 0xd6, 0xf8, 0x52, 0x83, 0xd4, 0x3d, 0x42, 0xd0, 0xfb, 0x30, + 0x8d, 0x5d, 0x1e, 0xb1, 0x30, 0xaf, 0xad, 0x68, 0xeb, 0x99, 0xe2, 0xad, 0xc2, 0x50, 0xbb, 0xc2, + 0x8e, 0x04, 0x9b, 0xca, 0x08, 0xed, 0x40, 0x1a, 0x07, 0x01, 0x09, 0x1b, 0xd4, 0xca, 0xeb, 0xd2, + 0xc1, 0xda, 0x28, 0x07, 0x02, 0xbe, 0x6f, 0x99, 0x33, 0x38, 0x1e, 0x18, 0xd7, 0x61, 0x66, 0xc7, + 0xb2, 0x7c, 0x12, 0x04, 0x68, 0x01, 0xa6, 0x28, 0x63, 0xc4, 0x97, 0x5c, 0xb2, 0x66, 0x2c, 0x18, + 0x7f, 0xa4, 0x20, 0xa3, 0x10, 0x35, 0x4a, 0x4e, 0xd0, 0x43, 0x98, 0xe9, 0xd0, 0x80, 0x1e, 0x39, + 0x44, 0x71, 0x2e, 0x8e, 0x5a, 0xf2, 0xcc, 0xb8, 0x50, 0x8b, 0x2d, 0xf7, 0x26, 0xcc, 0xc4, 0x09, + 0xaa, 0xc0, 0x34, 0xf7, 0xf0, 0x67, 0x11, 0x51, 0x3b, 0xd8, 0x7c, 0x05, 0x77, 0x8f, 0xa4, 0xe1, + 0xde, 0x84, 0xa9, 0x5c, 0x2c, 0xfe, 0xa6, 0xc1, 0x8c, 0x5a, 0x03, 0x7d, 0x08, 0x33, 0x38, 0xc6, + 0x2a, 0xa2, 0x6b, 0xe3, 0x79, 0x36, 0x13, 0x33, 0xb4, 0x23, 0x02, 0x62, 0x91, 0xa7, 0x8a, 0xd9, + 0x5b, 0xe3, 0xd9, 0xef, 0x0b, 0x13, 0x33, 0xb6, 0x44, 0x4f, 0xe0, 0x0a, 0x6e, 0x36, 0x45, 0xb2, + 0x1a, 0x2d, 0x9f, 0x47, 0x9e, 0xc8, 0x54, 0x4a, 0x7a, 0x7b, 0x7b, 0x94, 0xb7, 0xd8, 0xec, 0xbe, + 0xb0, 0xda, 0xb7, 0xcc, 0x1c, 0x3e, 0x27, 0x2f, 0x7e, 0x0c, 0xd3, 0xf1, 0xee, 0x5f, 0x7f, 0x9f, + 0xa5, 0x1c, 0x64, 0xd5, 0xb0, 0xd1, 0xa1, 0xe4, 0xc4, 0x58, 0x81, 0xf4, 0x81, 0x47, 0x98, 0x55, + 0x21, 0xdd, 0x01, 0x45, 0x71, 0x17, 0x16, 0x24, 0xa2, 0x46, 0x7c, 0x7a, 0x4c, 0x9b, 0x38, 0xa4, + 0x9c, 0x0d, 0x46, 0xaf, 0x41, 0xee, 0x5e, 0xe4, 0x38, 0x22, 0x65, 0x94, 0xb5, 0x86, 0xe2, 0xce, + 0xef, 0x7a, 0x00, 0xee, 0x26, 0x64, 0x76, 0x69, 0x87, 0xf8, 0x01, 0x3d, 0xa6, 0xc4, 0x1f, 0x00, + 0xda, 0x83, 0x6c, 0x7f, 0x42, 0x50, 0x1e, 0x66, 0x54, 0x08, 0x65, 0x3a, 0xe7, 0xcc, 0x44, 0x44, + 0xcb, 0x00, 0x3e, 0x66, 0x16, 0x77, 0xe9, 0xe7, 0xc4, 0x97, 0xd9, 0xc9, 0x9a, 0x7d, 0x33, 0xc6, + 0x9b, 0x30, 0x7f, 0x10, 0xe2, 0x90, 0x94, 0xb9, 0xeb, 0xd2, 0xd0, 0x25, 0x2c, 0x1c, 0xb0, 0xe4, + 0x6d, 0xb8, 0x5a, 0xc2, 0x0e, 0x66, 0xcd, 0xd1, 0x50, 0x71, 0xec, 0xe2, 0x13, 0x38, 0x00, 0xb0, + 0x0e, 0xd3, 0xf1, 0x61, 0x47, 0x39, 0xd0, 0x1d, 0x2e, 0x95, 0x93, 0xa6, 0xee, 0x70, 0x21, 0xdb, + 0x54, 0xee, 0x61, 0xd2, 0xd4, 0x6d, 0x6a, 0x2c, 0xc1, 0xd4, 0x2e, 0x61, 0xdc, 0x15, 0x8e, 0x2c, + 0x31, 0x90, 0xd8, 0x59, 0x33, 0x16, 0x8c, 0x17, 0x3a, 0xcc, 0x49, 0xfd, 0x03, 0x12, 0x62, 0x0b, + 0x87, 0x18, 0xad, 0x40, 0xc6, 0x22, 0x41, 0xd3, 0xa7, 0x9e, 0x48, 0x9b, 0x42, 0xf7, 0x4f, 0xa1, + 0x7d, 0x81, 0x60, 0xdc, 0x6d, 0x44, 0x8c, 0x86, 0x41, 0x5e, 0x5f, 0x49, 0xad, 0x67, 0x8a, 0xeb, + 0x23, 0xca, 0x4a, 0x2e, 0xf2, 0x98, 0xd1, 0xd0, 0x04, 0x2b, 0x19, 0x06, 0x08, 0xc1, 0xe4, 0x11, + 0x0e, 0x88, 0x0c, 0xeb, 0xac, 0x29, 0xc7, 0x22, 0x15, 0x16, 0x0d, 0x3c, 0x07, 0x77, 0xf3, 0x93, + 0x72, 0x3a, 0x11, 0x05, 0x9a, 0x61, 0x97, 0xe4, 0xa7, 0x62, 0xb4, 0x18, 0xa3, 0x6b, 0x30, 0x1d, + 0x74, 0xdd, 0x23, 0xee, 0xe4, 0xa7, 0xe5, 0xac, 0x92, 0xd0, 0x15, 0x48, 0x45, 0x3e, 0xcd, 0xcf, + 0xc8, 0x49, 0x31, 0x44, 0xff, 0x83, 0x74, 0xe4, 0xd3, 0x86, 0x8d, 0x03, 0x3b, 0x9f, 0x8e, 0x1d, + 0x47, 0x3e, 0xdd, 0xc3, 0x81, 0x8d, 0x0e, 0xe0, 0x6a, 0xc2, 0xbe, 0xd1, 0xbb, 0x32, 0x7f, 0x9c, + 0x7f, 0xa5, 0x3b, 0x73, 0x3e, 0x81, 0xa9, 0x09, 0xe3, 0x09, 0xcc, 0xf6, 0x36, 0x7d, 0x79, 0xf4, + 0xd1, 0x22, 0xa4, 0xc9, 0x53, 0x8f, 0x33, 0xd2, 0x2b, 0xbb, 0x9e, 0x2c, 0x2b, 0xd2, 0xa1, 0x38, + 0x20, 0x41, 0x3e, 0xb5, 0x92, 0x12, 0x6c, 0x95, 0x68, 0x7c, 0xa5, 0xc1, 0x54, 0x0d, 0x3b, 0xd1, + 0x7f, 0xa1, 0x41, 0xfc, 0x99, 0x82, 0x59, 0xc9, 0x45, 0xde, 0xfe, 0x35, 0xc8, 0xb4, 0x19, 0x3f, + 0x61, 0x8d, 0xb3, 0xbd, 0x66, 0x8a, 0x5b, 0x23, 0x7c, 0xf6, 0xcc, 0x0b, 0x15, 0x61, 0x2b, 0x63, + 0xb6, 0x37, 0x61, 0x42, 0xbb, 0x27, 0xa1, 0x43, 0x98, 0x8b, 0x58, 0xbf, 0xe7, 0x98, 0xed, 0x3b, + 0x63, 0x7b, 0x7e, 0xcc, 0xda, 0xfd, 0xbe, 0xb3, 0x51, 0x9f, 0xbc, 0xf8, 0xb5, 0x06, 0x70, 0xb6, + 0xf4, 0xeb, 0x06, 0xb5, 0x94, 0x64, 0x3a, 0xe6, 0x78, 0x77, 0x9c, 0x73, 0x91, 0x1c, 0x3e, 0x55, + 0x17, 0x8b, 0xcf, 0x34, 0xc8, 0xf6, 0x53, 0xfe, 0xf7, 0x13, 0x5d, 0xca, 0x02, 0x74, 0x44, 0x38, + 0xe3, 0x1e, 0x60, 0x00, 0x3c, 0x20, 0x7e, 0xdb, 0x21, 0x26, 0xe7, 0x83, 0x2e, 0xb1, 0x2f, 0x60, + 0x4a, 0x7a, 0x41, 0xef, 0x82, 0x4e, 0xad, 0x71, 0xbb, 0x8f, 0x5a, 0x57, 0xa7, 0x16, 0xda, 0x3e, + 0x1f, 0xc9, 0xd5, 0x71, 0x22, 0x99, 0xdc, 0x6b, 0x4b, 0x90, 0xd9, 0xb7, 0x08, 0x0b, 0x69, 0xd8, + 0x15, 0x1d, 0x25, 0x07, 0x3a, 0x6d, 0x2b, 0x7a, 0x3a, 0x6d, 0x1b, 0xd7, 0x61, 0xee, 0x3e, 0xef, + 0x10, 0x9f, 0x89, 0xeb, 0x58, 0x01, 0x5a, 0x3d, 0x40, 0xab, 0x6d, 0xac, 0x42, 0xb6, 0xcc, 0x59, + 0x40, 0x58, 0x10, 0x05, 0x83, 0x5b, 0xd2, 0x37, 0x1a, 0x4c, 0x3e, 0xe4, 0x21, 0x11, 0x54, 0x65, + 0x74, 0xd4, 0x2e, 0x57, 0xc7, 0x29, 0x4c, 0x33, 0x36, 0x11, 0xae, 0xfd, 0x80, 0x90, 0x38, 0x33, + 0x59, 0x33, 0x16, 0xfa, 0xfb, 0x76, 0xea, 0x6f, 0xf5, 0x6d, 0xe3, 0x3b, 0x0d, 0xd2, 0x82, 0x9c, + 0x3c, 0x99, 0x1f, 0x9c, 0x27, 0xb8, 0x3e, 0xee, 0xc9, 0x19, 0x4e, 0x72, 0xf7, 0x22, 0xc9, 0x3b, + 0xe3, 0x3f, 0xcf, 0xce, 0x88, 0xae, 0x41, 0x4e, 0xf0, 0x2c, 0x53, 0xcf, 0x26, 0x7e, 0x48, 0x9e, + 0x0e, 0x2a, 0xa8, 0x1b, 0x30, 0xfb, 0x30, 0x72, 0x9c, 0x61, 0x6d, 0xfd, 0x0e, 0x20, 0xf9, 0xf2, + 0xd8, 0x89, 0x42, 0xfb, 0x80, 0xb6, 0x18, 0x0e, 0x23, 0x9f, 0x0c, 0xec, 0xa1, 0x57, 0x4a, 0x94, + 0x59, 0x94, 0xb5, 0x46, 0x21, 0x7f, 0xd5, 0x20, 0x23, 0x18, 0x56, 0x71, 0xd7, 0xe1, 0xd8, 0x42, + 0x4f, 0x60, 0x9e, 0xf1, 0x90, 0x34, 0x9a, 0xbd, 0x3e, 0xae, 0xc2, 0x5a, 0x18, 0xb1, 0xfd, 0x0b, + 0x0f, 0x05, 0x33, 0x27, 0xdc, 0xf4, 0xbd, 0x06, 0x6e, 0xc2, 0x1c, 0xf1, 0x6c, 0xe2, 0x12, 0x1f, + 0x3b, 0x8d, 0x36, 0xe9, 0xaa, 0x68, 0x67, 0x7b, 0x93, 0xa2, 0x14, 0x3f, 0x81, 0x1c, 0x61, 0xd2, + 0x33, 0xb1, 0x1a, 0xc2, 0xc1, 0x98, 0x4f, 0xc6, 0xf3, 0x31, 0x36, 0xe7, 0x7a, 0x4e, 0x84, 0xc2, + 0x78, 0xa1, 0xc1, 0xc2, 0x05, 0x7a, 0x55, 0x9f, 0xf3, 0xe3, 0x7f, 0x6e, 0xb3, 0x8b, 0x90, 0xf6, + 0x78, 0x40, 0xe5, 0x2b, 0x23, 0x7e, 0xaf, 0xf4, 0x64, 0x54, 0x81, 0x59, 0x1c, 0x85, 0x76, 0xc3, + 0xc3, 0xa1, 0x2d, 0xdb, 0xdf, 0xe8, 0xe5, 0xe2, 0xfb, 0xa8, 0x8a, 0x43, 0xbb, 0x6c, 0x47, 0xac, + 0x6d, 0xa6, 0x85, 0x03, 0x21, 0x1a, 0x36, 0xcc, 0x5f, 0x50, 0xa2, 0xff, 0xc3, 0xac, 0xf8, 0x0c, + 0xa0, 0xac, 0xd5, 0xd8, 0x54, 0xb9, 0x4e, 0xab, 0x89, 0xcd, 0x7e, 0x65, 0x51, 0x65, 0x20, 0x51, + 0x16, 0xfb, 0x95, 0x5b, 0xea, 0x35, 0x98, 0x28, 0xb7, 0x8c, 0x37, 0x60, 0xb2, 0xac, 0x4e, 0xcb, + 0x25, 0x65, 0x64, 0x00, 0x7c, 0x74, 0x7c, 0x4c, 0x9a, 0xa1, 0x7c, 0x73, 0x5c, 0x8e, 0xb9, 0x05, + 0x73, 0xf5, 0xca, 0xa3, 0x28, 0xf4, 0x22, 0x15, 0xfe, 0xcb, 0x61, 0xab, 0x90, 0xad, 0x57, 0x64, + 0xa5, 0x0f, 0x43, 0xdd, 0x84, 0x4c, 0xbd, 0x72, 0x70, 0x82, 0xbd, 0x61, 0xa0, 0x02, 0x5c, 0xab, + 0x57, 0x1e, 0x33, 0x8b, 0x38, 0xa4, 0x25, 0x12, 0xe6, 0x60, 0xea, 0x0e, 0xc3, 0xdf, 0x85, 0x85, + 0x7a, 0x65, 0x37, 0x46, 0x73, 0xbf, 0x26, 0x8e, 0xc5, 0x10, 0x74, 0x11, 0x16, 0xeb, 0x95, 0xde, + 0xa9, 0xdd, 0x25, 0x3e, 0xed, 0xc8, 0xcf, 0x81, 0x21, 0x36, 0xa5, 0x1f, 0xf4, 0x9f, 0x4e, 0x97, + 0xb5, 0xe7, 0xa7, 0xcb, 0xda, 0x2f, 0xa7, 0xcb, 0xda, 0xb3, 0x97, 0xcb, 0x13, 0xcf, 0x5f, 0x2e, + 0x4f, 0xbc, 0x78, 0xb9, 0x3c, 0x01, 0x37, 0x9a, 0xdc, 0x1d, 0x5e, 0x07, 0xa5, 0x4c, 0x59, 0x4e, + 0x54, 0xc5, 0x87, 0x76, 0x55, 0xab, 0x7f, 0xda, 0xa2, 0xa1, 0x1d, 0x1d, 0x15, 0x9a, 0xdc, 0xdd, + 0x68, 0xf2, 0xc0, 0xe5, 0xc1, 0x86, 0x4f, 0x1c, 0xdc, 0x25, 0xfe, 0x46, 0xa7, 0xd8, 0x1b, 0x36, + 0x6d, 0x4c, 0x59, 0xb0, 0x31, 0xf4, 0x13, 0xfe, 0xbd, 0x58, 0x4e, 0xc4, 0x6f, 0xf5, 0x54, 0xb5, + 0x5c, 0xfe, 0x5e, 0x5f, 0xaa, 0x26, 0x74, 0xca, 0x82, 0x4e, 0xbc, 0x7a, 0xa1, 0xa6, 0x50, 0x3f, + 0x9f, 0xe9, 0x0f, 0x85, 0xfe, 0x30, 0xd6, 0x1f, 0x26, 0xfa, 0x53, 0xfd, 0xf6, 0x50, 0xfd, 0xe1, + 0xfd, 0x6a, 0x29, 0x79, 0x1d, 0xfc, 0xae, 0xaf, 0x24, 0xd8, 0xed, 0x6d, 0x01, 0xde, 0xde, 0x8e, + 0xd1, 0xdb, 0xdb, 0x09, 0xfc, 0x68, 0x5a, 0xfe, 0x60, 0xd8, 0xfa, 0x2b, 0x00, 0x00, 0xff, 0xff, + 0xfa, 0xd5, 0x1e, 0x48, 0x8e, 0x10, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { @@ -2588,13 +2539,6 @@ func (m *Address) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.AltBech32M) > 0 { - i -= len(m.AltBech32M) - copy(dAtA[i:], m.AltBech32M) - i = encodeVarintCrypto(dAtA, i, uint64(len(m.AltBech32M))) - i-- - dAtA[i] = 0x12 - } if len(m.Inner) > 0 { i -= len(m.Inner) copy(dAtA[i:], m.Inner) @@ -3038,20 +2982,6 @@ func (m *AssetId) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.AltBaseDenom) > 0 { - i -= len(m.AltBaseDenom) - copy(dAtA[i:], m.AltBaseDenom) - i = encodeVarintCrypto(dAtA, i, uint64(len(m.AltBaseDenom))) - i-- - dAtA[i] = 0x1a - } - if len(m.AltBech32M) > 0 { - i -= len(m.AltBech32M) - copy(dAtA[i:], m.AltBech32M) - i = encodeVarintCrypto(dAtA, i, uint64(len(m.AltBech32M))) - i-- - dAtA[i] = 0x12 - } if len(m.Inner) > 0 { i -= len(m.Inner) copy(dAtA[i:], m.Inner) @@ -3514,6 +3444,53 @@ func (m *MerkleRoot) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *Asset) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Asset) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Asset) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Denom != nil { + { + size, err := m.Denom.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if m.Id != nil { + { + size, err := m.Id.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintCrypto(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *IdentityKey) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4134,36 +4111,6 @@ func (m *ZKSwapProof) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *ZKSwapClaimProof) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *ZKSwapClaimProof) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *ZKSwapClaimProof) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.Inner) > 0 { - i -= len(m.Inner) - copy(dAtA[i:], m.Inner) - i = encodeVarintCrypto(dAtA, i, uint64(len(m.Inner))) - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *ZKUndelegateClaimProof) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4292,10 +4239,6 @@ func (m *Address) Size() (n int) { if l > 0 { n += 1 + l + sovCrypto(uint64(l)) } - l = len(m.AltBech32M) - if l > 0 { - n += 1 + l + sovCrypto(uint64(l)) - } return n } @@ -4486,14 +4429,6 @@ func (m *AssetId) Size() (n int) { if l > 0 { n += 1 + l + sovCrypto(uint64(l)) } - l = len(m.AltBech32M) - if l > 0 { - n += 1 + l + sovCrypto(uint64(l)) - } - l = len(m.AltBaseDenom) - if l > 0 { - n += 1 + l + sovCrypto(uint64(l)) - } return n } @@ -4694,6 +4629,23 @@ func (m *MerkleRoot) Size() (n int) { return n } +func (m *Asset) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Id != nil { + l = m.Id.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + if m.Denom != nil { + l = m.Denom.Size() + n += 1 + l + sovCrypto(uint64(l)) + } + return n +} + func (m *IdentityKey) Size() (n int) { if m == nil { return 0 @@ -4956,19 +4908,6 @@ func (m *ZKSwapProof) Size() (n int) { return n } -func (m *ZKSwapClaimProof) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - l = len(m.Inner) - if l > 0 { - n += 1 + l + sovCrypto(uint64(l)) - } - return n -} - func (m *ZKUndelegateClaimProof) Size() (n int) { if m == nil { return 0 @@ -5199,38 +5138,6 @@ func (m *Address) Unmarshal(dAtA []byte) error { m.Inner = []byte{} } iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AltBech32M", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCrypto - } - 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 ErrInvalidLengthCrypto - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCrypto - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AltBech32M = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCrypto(dAtA[iNdEx:]) @@ -6370,70 +6277,6 @@ func (m *AssetId) Unmarshal(dAtA []byte) error { m.Inner = []byte{} } iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AltBech32M", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCrypto - } - 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 ErrInvalidLengthCrypto - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCrypto - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AltBech32M = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AltBaseDenom", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCrypto - } - 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 ErrInvalidLengthCrypto - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthCrypto - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AltBaseDenom = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipCrypto(dAtA[iNdEx:]) @@ -7672,6 +7515,128 @@ func (m *MerkleRoot) Unmarshal(dAtA []byte) error { } return nil } +func (m *Asset) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Asset: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Asset: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Id == nil { + m.Id = &AssetId{} + } + if err := m.Id.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrypto + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthCrypto + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthCrypto + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Denom == nil { + m.Denom = &Denom{} + } + if err := m.Denom.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipCrypto(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthCrypto + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *IdentityKey) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -9439,90 +9404,6 @@ func (m *ZKSwapProof) Unmarshal(dAtA []byte) error { } return nil } -func (m *ZKSwapClaimProof) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCrypto - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: ZKSwapClaimProof: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: ZKSwapClaimProof: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Inner", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCrypto - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthCrypto - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthCrypto - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Inner = append(m.Inner[:0], dAtA[iNdEx:postIndex]...) - if m.Inner == nil { - m.Inner = []byte{} - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipCrypto(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthCrypto - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *ZKUndelegateClaimProof) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go index 9456bbbb2..0fa502019 100644 --- a/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go +++ b/relayer/chains/penumbra/core/dex/v1alpha1/dex.pb.go @@ -62,13 +62,18 @@ func (x PositionState_PositionStateEnum) String() string { } func (PositionState_PositionStateEnum) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{18, 0} + return fileDescriptor_d1eba752ca2f0d70, []int{19, 0} } // A transaction action that submits a swap to the dex. type Swap struct { // Contains the Swap proof. Proof *v1alpha1.ZKSwapProof `protobuf:"bytes,1,opt,name=proof,proto3" json:"proof,omitempty"` + // MockFlowCiphertext dropped until flow encryption/ABCI++ available + // // Encrypted amount of asset 1 of the trading pair. + // MockFlowCiphertext enc_amount_1 = 2; + // // Encrypted amount of asset 2 of the trading pair. + // MockFlowCiphertext enc_amount_2 = 3; // Encapsulates the authorized fields of the Swap action, used in signing. Body *SwapBody `protobuf:"bytes,4,opt,name=body,proto3" json:"body,omitempty"` } @@ -496,22 +501,63 @@ func (m *SwapPlaintext) GetRseed() []byte { return nil } +type MockFlowCiphertext struct { + // Represents this transaction's contribution to flow's value. + Value *v1alpha1.Amount `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` +} + +func (m *MockFlowCiphertext) Reset() { *m = MockFlowCiphertext{} } +func (m *MockFlowCiphertext) String() string { return proto.CompactTextString(m) } +func (*MockFlowCiphertext) ProtoMessage() {} +func (*MockFlowCiphertext) Descriptor() ([]byte, []int) { + return fileDescriptor_d1eba752ca2f0d70, []int{6} +} +func (m *MockFlowCiphertext) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MockFlowCiphertext) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MockFlowCiphertext.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MockFlowCiphertext) XXX_Merge(src proto.Message) { + xxx_messageInfo_MockFlowCiphertext.Merge(m, src) +} +func (m *MockFlowCiphertext) XXX_Size() int { + return m.Size() +} +func (m *MockFlowCiphertext) XXX_DiscardUnknown() { + xxx_messageInfo_MockFlowCiphertext.DiscardUnknown(m) +} + +var xxx_messageInfo_MockFlowCiphertext proto.InternalMessageInfo + +func (m *MockFlowCiphertext) GetValue() *v1alpha1.Amount { + if m != nil { + return m.Value + } + return nil +} + type SwapPlan struct { // The plaintext version of the swap to be performed. SwapPlaintext *SwapPlaintext `protobuf:"bytes,1,opt,name=swap_plaintext,json=swapPlaintext,proto3" json:"swap_plaintext,omitempty"` // The blinding factor for the fee commitment. The fee in the SwapPlan is private to prevent linkability with the SwapClaim. FeeBlinding []byte `protobuf:"bytes,2,opt,name=fee_blinding,json=feeBlinding,proto3" json:"fee_blinding,omitempty"` - // The first blinding factor to use for the ZK swap proof. - ProofBlindingR []byte `protobuf:"bytes,3,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` - // The second blinding factor to use for the ZK swap proof. - ProofBlindingS []byte `protobuf:"bytes,4,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *SwapPlan) Reset() { *m = SwapPlan{} } func (m *SwapPlan) String() string { return proto.CompactTextString(m) } func (*SwapPlan) ProtoMessage() {} func (*SwapPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{6} + return fileDescriptor_d1eba752ca2f0d70, []int{7} } func (m *SwapPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -554,20 +600,6 @@ func (m *SwapPlan) GetFeeBlinding() []byte { return nil } -func (m *SwapPlan) GetProofBlindingR() []byte { - if m != nil { - return m.ProofBlindingR - } - return nil -} - -func (m *SwapPlan) GetProofBlindingS() []byte { - if m != nil { - return m.ProofBlindingS - } - return nil -} - type SwapClaimPlan struct { // The plaintext version of the swap to be performed. SwapPlaintext *SwapPlaintext `protobuf:"bytes,1,opt,name=swap_plaintext,json=swapPlaintext,proto3" json:"swap_plaintext,omitempty"` @@ -577,17 +609,13 @@ type SwapClaimPlan struct { OutputData *BatchSwapOutputData `protobuf:"bytes,3,opt,name=output_data,json=outputData,proto3" json:"output_data,omitempty"` // The epoch duration, used in proving. EpochDuration uint64 `protobuf:"varint,4,opt,name=epoch_duration,json=epochDuration,proto3" json:"epoch_duration,omitempty"` - // The first blinding factor to use for the ZK swap claim proof. - ProofBlindingR []byte `protobuf:"bytes,5,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` - // The second blinding factor to use for the ZK swap claim proof. - ProofBlindingS []byte `protobuf:"bytes,6,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *SwapClaimPlan) Reset() { *m = SwapClaimPlan{} } func (m *SwapClaimPlan) String() string { return proto.CompactTextString(m) } func (*SwapClaimPlan) ProtoMessage() {} func (*SwapClaimPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{7} + return fileDescriptor_d1eba752ca2f0d70, []int{8} } func (m *SwapClaimPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -644,23 +672,8 @@ func (m *SwapClaimPlan) GetEpochDuration() uint64 { return 0 } -func (m *SwapClaimPlan) GetProofBlindingR() []byte { - if m != nil { - return m.ProofBlindingR - } - return nil -} - -func (m *SwapClaimPlan) GetProofBlindingS() []byte { - if m != nil { - return m.ProofBlindingS - } - return nil -} - type SwapView struct { // Types that are valid to be assigned to SwapView: - // // *SwapView_Visible_ // *SwapView_Opaque_ SwapView isSwapView_SwapView `protobuf_oneof:"swap_view"` @@ -670,7 +683,7 @@ func (m *SwapView) Reset() { *m = SwapView{} } func (m *SwapView) String() string { return proto.CompactTextString(m) } func (*SwapView) ProtoMessage() {} func (*SwapView) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{8} + return fileDescriptor_d1eba752ca2f0d70, []int{9} } func (m *SwapView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -753,7 +766,7 @@ func (m *SwapView_Visible) Reset() { *m = SwapView_Visible{} } func (m *SwapView_Visible) String() string { return proto.CompactTextString(m) } func (*SwapView_Visible) ProtoMessage() {} func (*SwapView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{8, 0} + return fileDescriptor_d1eba752ca2f0d70, []int{9, 0} } func (m *SwapView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -804,7 +817,7 @@ func (m *SwapView_Opaque) Reset() { *m = SwapView_Opaque{} } func (m *SwapView_Opaque) String() string { return proto.CompactTextString(m) } func (*SwapView_Opaque) ProtoMessage() {} func (*SwapView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{8, 1} + return fileDescriptor_d1eba752ca2f0d70, []int{9, 1} } func (m *SwapView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -852,7 +865,7 @@ func (m *SwapClaimView) Reset() { *m = SwapClaimView{} } func (m *SwapClaimView) String() string { return proto.CompactTextString(m) } func (*SwapClaimView) ProtoMessage() {} func (*SwapClaimView) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{9} + return fileDescriptor_d1eba752ca2f0d70, []int{10} } func (m *SwapClaimView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -936,7 +949,7 @@ func (m *SwapClaimView_Visible) Reset() { *m = SwapClaimView_Visible{} } func (m *SwapClaimView_Visible) String() string { return proto.CompactTextString(m) } func (*SwapClaimView_Visible) ProtoMessage() {} func (*SwapClaimView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{9, 0} + return fileDescriptor_d1eba752ca2f0d70, []int{10, 0} } func (m *SwapClaimView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -994,7 +1007,7 @@ func (m *SwapClaimView_Opaque) Reset() { *m = SwapClaimView_Opaque{} } func (m *SwapClaimView_Opaque) String() string { return proto.CompactTextString(m) } func (*SwapClaimView_Opaque) ProtoMessage() {} func (*SwapClaimView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{9, 1} + return fileDescriptor_d1eba752ca2f0d70, []int{10, 1} } func (m *SwapClaimView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1044,7 +1057,7 @@ func (m *TradingPair) Reset() { *m = TradingPair{} } func (m *TradingPair) String() string { return proto.CompactTextString(m) } func (*TradingPair) ProtoMessage() {} func (*TradingPair) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{10} + return fileDescriptor_d1eba752ca2f0d70, []int{11} } func (m *TradingPair) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1100,7 +1113,7 @@ func (m *DirectedTradingPair) Reset() { *m = DirectedTradingPair{} } func (m *DirectedTradingPair) String() string { return proto.CompactTextString(m) } func (*DirectedTradingPair) ProtoMessage() {} func (*DirectedTradingPair) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{11} + return fileDescriptor_d1eba752ca2f0d70, []int{12} } func (m *DirectedTradingPair) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1165,14 +1178,14 @@ type BatchSwapOutputData struct { // The trading pair associated with the batch swap. TradingPair *TradingPair `protobuf:"bytes,8,opt,name=trading_pair,json=tradingPair,proto3" json:"trading_pair,omitempty"` // The starting block height of the epoch for which the batch swap data is valid. - EpochStartingHeight uint64 `protobuf:"varint,9,opt,name=epoch_starting_height,json=epochStartingHeight,proto3" json:"epoch_starting_height,omitempty"` + EpochHeight uint64 `protobuf:"varint,9,opt,name=epoch_height,json=epochHeight,proto3" json:"epoch_height,omitempty"` } func (m *BatchSwapOutputData) Reset() { *m = BatchSwapOutputData{} } func (m *BatchSwapOutputData) String() string { return proto.CompactTextString(m) } func (*BatchSwapOutputData) ProtoMessage() {} func (*BatchSwapOutputData) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{12} + return fileDescriptor_d1eba752ca2f0d70, []int{13} } func (m *BatchSwapOutputData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1257,9 +1270,9 @@ func (m *BatchSwapOutputData) GetTradingPair() *TradingPair { return nil } -func (m *BatchSwapOutputData) GetEpochStartingHeight() uint64 { +func (m *BatchSwapOutputData) GetEpochHeight() uint64 { if m != nil { - return m.EpochStartingHeight + return m.EpochHeight } return 0 } @@ -1277,7 +1290,7 @@ func (m *TradingFunction) Reset() { *m = TradingFunction{} } func (m *TradingFunction) String() string { return proto.CompactTextString(m) } func (*TradingFunction) ProtoMessage() {} func (*TradingFunction) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{13} + return fileDescriptor_d1eba752ca2f0d70, []int{14} } func (m *TradingFunction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1337,7 +1350,7 @@ func (m *BareTradingFunction) Reset() { *m = BareTradingFunction{} } func (m *BareTradingFunction) String() string { return proto.CompactTextString(m) } func (*BareTradingFunction) ProtoMessage() {} func (*BareTradingFunction) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{14} + return fileDescriptor_d1eba752ca2f0d70, []int{15} } func (m *BareTradingFunction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1402,7 +1415,7 @@ func (m *Reserves) Reset() { *m = Reserves{} } func (m *Reserves) String() string { return proto.CompactTextString(m) } func (*Reserves) ProtoMessage() {} func (*Reserves) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{15} + return fileDescriptor_d1eba752ca2f0d70, []int{16} } func (m *Reserves) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1456,16 +1469,13 @@ type Position struct { Nonce []byte `protobuf:"bytes,2,opt,name=nonce,proto3" json:"nonce,omitempty"` State *PositionState `protobuf:"bytes,3,opt,name=state,proto3" json:"state,omitempty"` Reserves *Reserves `protobuf:"bytes,4,opt,name=reserves,proto3" json:"reserves,omitempty"` - // / If set to true, the position is a limit-order and will be closed - // / immediately after being filled. - CloseOnFill bool `protobuf:"varint,5,opt,name=close_on_fill,json=closeOnFill,proto3" json:"close_on_fill,omitempty"` } func (m *Position) Reset() { *m = Position{} } func (m *Position) String() string { return proto.CompactTextString(m) } func (*Position) ProtoMessage() {} func (*Position) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{16} + return fileDescriptor_d1eba752ca2f0d70, []int{17} } func (m *Position) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1522,32 +1532,16 @@ func (m *Position) GetReserves() *Reserves { return nil } -func (m *Position) GetCloseOnFill() bool { - if m != nil { - return m.CloseOnFill - } - return false -} - // A hash of a `Position`. type PositionId struct { - // The bytes of the position ID. Inner []byte `protobuf:"bytes,1,opt,name=inner,proto3" json:"inner,omitempty"` - // Alternatively, a Bech32m-encoded string representation of the `inner` - // bytes. - // - // NOTE: implementations are not required to support parsing this field. - // Implementations should prefer to encode the bytes in all messages they - // produce. Implementations must not accept messages with both `inner` and - // `alt_bech32m` set. - AltBech32M string `protobuf:"bytes,2,opt,name=alt_bech32m,json=altBech32m,proto3" json:"alt_bech32m,omitempty"` } func (m *PositionId) Reset() { *m = PositionId{} } func (m *PositionId) String() string { return proto.CompactTextString(m) } func (*PositionId) ProtoMessage() {} func (*PositionId) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{17} + return fileDescriptor_d1eba752ca2f0d70, []int{18} } func (m *PositionId) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1583,13 +1577,6 @@ func (m *PositionId) GetInner() []byte { return nil } -func (m *PositionId) GetAltBech32M() string { - if m != nil { - return m.AltBech32M - } - return "" -} - // The state of a position. type PositionState struct { State PositionState_PositionStateEnum `protobuf:"varint,1,opt,name=state,proto3,enum=penumbra.core.dex.v1alpha1.PositionState_PositionStateEnum" json:"state,omitempty"` @@ -1599,7 +1586,7 @@ func (m *PositionState) Reset() { *m = PositionState{} } func (m *PositionState) String() string { return proto.CompactTextString(m) } func (*PositionState) ProtoMessage() {} func (*PositionState) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{18} + return fileDescriptor_d1eba752ca2f0d70, []int{19} } func (m *PositionState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1659,7 +1646,7 @@ func (m *LpNft) Reset() { *m = LpNft{} } func (m *LpNft) String() string { return proto.CompactTextString(m) } func (*LpNft) ProtoMessage() {} func (*LpNft) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{19} + return fileDescriptor_d1eba752ca2f0d70, []int{20} } func (m *LpNft) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1718,7 +1705,7 @@ func (m *PositionOpen) Reset() { *m = PositionOpen{} } func (m *PositionOpen) String() string { return proto.CompactTextString(m) } func (*PositionOpen) ProtoMessage() {} func (*PositionOpen) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{20} + return fileDescriptor_d1eba752ca2f0d70, []int{21} } func (m *PositionOpen) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1771,7 +1758,7 @@ func (m *PositionClose) Reset() { *m = PositionClose{} } func (m *PositionClose) String() string { return proto.CompactTextString(m) } func (*PositionClose) ProtoMessage() {} func (*PositionClose) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{21} + return fileDescriptor_d1eba752ca2f0d70, []int{22} } func (m *PositionClose) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1824,7 +1811,7 @@ func (m *PositionWithdraw) Reset() { *m = PositionWithdraw{} } func (m *PositionWithdraw) String() string { return proto.CompactTextString(m) } func (*PositionWithdraw) ProtoMessage() {} func (*PositionWithdraw) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{22} + return fileDescriptor_d1eba752ca2f0d70, []int{23} } func (m *PositionWithdraw) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1884,7 +1871,7 @@ func (m *PositionRewardClaim) Reset() { *m = PositionRewardClaim{} } func (m *PositionRewardClaim) String() string { return proto.CompactTextString(m) } func (*PositionRewardClaim) ProtoMessage() {} func (*PositionRewardClaim) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{23} + return fileDescriptor_d1eba752ca2f0d70, []int{24} } func (m *PositionRewardClaim) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1927,20 +1914,78 @@ func (m *PositionRewardClaim) GetRewardsCommitment() *v1alpha1.BalanceCommitment return nil } +// Contains a path for a trade, including the trading pair (with direction), the trading +// function defining their relationship, and the route taken between the two assets. +type Path struct { + Pair *DirectedTradingPair `protobuf:"bytes,1,opt,name=pair,proto3" json:"pair,omitempty"` + Route []*v1alpha1.AssetId `protobuf:"bytes,2,rep,name=route,proto3" json:"route,omitempty"` + Phi *BareTradingFunction `protobuf:"bytes,3,opt,name=phi,proto3" json:"phi,omitempty"` +} + +func (m *Path) Reset() { *m = Path{} } +func (m *Path) String() string { return proto.CompactTextString(m) } +func (*Path) ProtoMessage() {} +func (*Path) Descriptor() ([]byte, []int) { + return fileDescriptor_d1eba752ca2f0d70, []int{25} +} +func (m *Path) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Path) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Path.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *Path) XXX_Merge(src proto.Message) { + xxx_messageInfo_Path.Merge(m, src) +} +func (m *Path) XXX_Size() int { + return m.Size() +} +func (m *Path) XXX_DiscardUnknown() { + xxx_messageInfo_Path.DiscardUnknown(m) +} + +var xxx_messageInfo_Path proto.InternalMessageInfo + +func (m *Path) GetPair() *DirectedTradingPair { + if m != nil { + return m.Pair + } + return nil +} + +func (m *Path) GetRoute() []*v1alpha1.AssetId { + if m != nil { + return m.Route + } + return nil +} + +func (m *Path) GetPhi() *BareTradingFunction { + if m != nil { + return m.Phi + } + return nil +} + // Contains the entire execution of a particular swap. type SwapExecution struct { Traces []*SwapExecution_Trace `protobuf:"bytes,1,rep,name=traces,proto3" json:"traces,omitempty"` - // The total input amount for this execution. - Input *v1alpha1.Value `protobuf:"bytes,2,opt,name=input,proto3" json:"input,omitempty"` - // The total output amount for this execution. - Output *v1alpha1.Value `protobuf:"bytes,3,opt,name=output,proto3" json:"output,omitempty"` } func (m *SwapExecution) Reset() { *m = SwapExecution{} } func (m *SwapExecution) String() string { return proto.CompactTextString(m) } func (*SwapExecution) ProtoMessage() {} func (*SwapExecution) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{24} + return fileDescriptor_d1eba752ca2f0d70, []int{26} } func (m *SwapExecution) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1976,20 +2021,6 @@ func (m *SwapExecution) GetTraces() []*SwapExecution_Trace { return nil } -func (m *SwapExecution) GetInput() *v1alpha1.Value { - if m != nil { - return m.Input - } - return nil -} - -func (m *SwapExecution) GetOutput() *v1alpha1.Value { - if m != nil { - return m.Output - } - return nil -} - // Contains all individual steps consisting of a trade trace. type SwapExecution_Trace struct { // Each step in the trade trace. @@ -2000,7 +2031,7 @@ func (m *SwapExecution_Trace) Reset() { *m = SwapExecution_Trace{} } func (m *SwapExecution_Trace) String() string { return proto.CompactTextString(m) } func (*SwapExecution_Trace) ProtoMessage() {} func (*SwapExecution_Trace) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{24, 0} + return fileDescriptor_d1eba752ca2f0d70, []int{26, 0} } func (m *SwapExecution_Trace) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2047,7 +2078,7 @@ func (m *PositionWithdrawPlan) Reset() { *m = PositionWithdrawPlan{} } func (m *PositionWithdrawPlan) String() string { return proto.CompactTextString(m) } func (*PositionWithdrawPlan) ProtoMessage() {} func (*PositionWithdrawPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{25} + return fileDescriptor_d1eba752ca2f0d70, []int{27} } func (m *PositionWithdrawPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2106,7 +2137,7 @@ func (m *PositionRewardClaimPlan) Reset() { *m = PositionRewardClaimPlan func (m *PositionRewardClaimPlan) String() string { return proto.CompactTextString(m) } func (*PositionRewardClaimPlan) ProtoMessage() {} func (*PositionRewardClaimPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_d1eba752ca2f0d70, []int{26} + return fileDescriptor_d1eba752ca2f0d70, []int{28} } func (m *PositionRewardClaimPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2150,6 +2181,7 @@ func init() { proto.RegisterType((*SwapBody)(nil), "penumbra.core.dex.v1alpha1.SwapBody") proto.RegisterType((*SwapPayload)(nil), "penumbra.core.dex.v1alpha1.SwapPayload") proto.RegisterType((*SwapPlaintext)(nil), "penumbra.core.dex.v1alpha1.SwapPlaintext") + proto.RegisterType((*MockFlowCiphertext)(nil), "penumbra.core.dex.v1alpha1.MockFlowCiphertext") proto.RegisterType((*SwapPlan)(nil), "penumbra.core.dex.v1alpha1.SwapPlan") proto.RegisterType((*SwapClaimPlan)(nil), "penumbra.core.dex.v1alpha1.SwapClaimPlan") proto.RegisterType((*SwapView)(nil), "penumbra.core.dex.v1alpha1.SwapView") @@ -2172,6 +2204,7 @@ func init() { proto.RegisterType((*PositionClose)(nil), "penumbra.core.dex.v1alpha1.PositionClose") proto.RegisterType((*PositionWithdraw)(nil), "penumbra.core.dex.v1alpha1.PositionWithdraw") proto.RegisterType((*PositionRewardClaim)(nil), "penumbra.core.dex.v1alpha1.PositionRewardClaim") + proto.RegisterType((*Path)(nil), "penumbra.core.dex.v1alpha1.Path") proto.RegisterType((*SwapExecution)(nil), "penumbra.core.dex.v1alpha1.SwapExecution") proto.RegisterType((*SwapExecution_Trace)(nil), "penumbra.core.dex.v1alpha1.SwapExecution.Trace") proto.RegisterType((*PositionWithdrawPlan)(nil), "penumbra.core.dex.v1alpha1.PositionWithdrawPlan") @@ -2183,121 +2216,119 @@ func init() { } var fileDescriptor_d1eba752ca2f0d70 = []byte{ - // 1824 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x2e, 0x29, 0x8a, 0x7c, 0xa4, 0x14, 0x79, 0x94, 0xb6, 0x02, 0x8b, 0xc8, 0xce, 0xd6, - 0x4e, 0xdc, 0xa4, 0xa0, 0xc2, 0x75, 0x0a, 0x04, 0x72, 0x12, 0x47, 0xfc, 0x90, 0xc5, 0x24, 0xa2, - 0xd8, 0x91, 0x62, 0x17, 0xa9, 0xd1, 0xc5, 0x68, 0x77, 0x64, 0x2e, 0xb0, 0xdc, 0x5d, 0xef, 0x0e, - 0x25, 0xea, 0x5a, 0xf4, 0xe3, 0x54, 0xb4, 0x39, 0xf5, 0x54, 0x14, 0xe9, 0xb1, 0x7f, 0x43, 0x3f, - 0xae, 0x45, 0x4e, 0x06, 0x7a, 0x68, 0x4f, 0x45, 0x61, 0x1f, 0x0a, 0xf4, 0x2f, 0xe8, 0xa1, 0x87, - 0x62, 0x66, 0x67, 0xc8, 0x95, 0x44, 0x99, 0xa4, 0xac, 0x5e, 0x7a, 0xe3, 0xcc, 0xbc, 0xdf, 0x6f, - 0xdf, 0xd7, 0xbc, 0xf7, 0x76, 0x09, 0x37, 0x43, 0xea, 0xf7, 0x7b, 0x07, 0x11, 0x59, 0xb7, 0x83, - 0x88, 0xae, 0x3b, 0x74, 0xb0, 0x7e, 0x54, 0x25, 0x5e, 0xd8, 0x25, 0x55, 0xbe, 0xa8, 0x84, 0x51, - 0xc0, 0x02, 0x54, 0x56, 0x52, 0x15, 0x2e, 0x55, 0xe1, 0x07, 0x4a, 0xaa, 0xfc, 0xd6, 0x69, 0x06, - 0x3b, 0x3a, 0x09, 0x59, 0x30, 0x22, 0x49, 0xd6, 0x09, 0x8f, 0xf1, 0x23, 0x0d, 0xb2, 0x7b, 0xc7, - 0x24, 0x44, 0x1f, 0xc1, 0x7c, 0x18, 0x05, 0xc1, 0xe1, 0xaa, 0x76, 0x43, 0xbb, 0x5d, 0x34, 0xdf, - 0xaa, 0x9c, 0x7e, 0x80, 0x04, 0x29, 0x92, 0xca, 0xe7, 0x9f, 0x70, 0x54, 0x87, 0x23, 0x70, 0x02, - 0x44, 0xef, 0x41, 0xf6, 0x20, 0x70, 0x4e, 0x56, 0xb3, 0x82, 0xe0, 0x66, 0xe5, 0x62, 0x0d, 0x2b, - 0x1c, 0x5b, 0x0b, 0x9c, 0x13, 0x2c, 0x10, 0xc6, 0xcf, 0x34, 0x28, 0xf0, 0xad, 0xba, 0x47, 0xdc, - 0x1e, 0x7a, 0x35, 0xad, 0x49, 0x49, 0xb1, 0x7f, 0x20, 0xd9, 0x75, 0xc1, 0xfe, 0xed, 0x49, 0xec, - 0x82, 0x6a, 0xf4, 0x08, 0x74, 0x0b, 0x96, 0x68, 0x18, 0xd8, 0x5d, 0xcb, 0xe9, 0x47, 0x84, 0xb9, - 0x81, 0xbf, 0xba, 0x70, 0x43, 0xbb, 0x9d, 0xc5, 0x8b, 0x62, 0xb7, 0x21, 0x37, 0x8d, 0xdf, 0x64, - 0x60, 0xf1, 0x14, 0x1c, 0x6d, 0x41, 0xc1, 0xef, 0x7b, 0x9e, 0x7b, 0xe8, 0xd2, 0x48, 0xfa, 0xe6, - 0xf6, 0x04, 0xdf, 0xb4, 0x95, 0x3c, 0x1e, 0x41, 0xd1, 0xbb, 0x90, 0x39, 0xa4, 0x54, 0xaa, 0x6f, - 0x4c, 0x60, 0xd8, 0xa2, 0x14, 0x73, 0x71, 0xf4, 0x43, 0x58, 0x09, 0xfa, 0x2c, 0xec, 0x33, 0xab, - 0x6a, 0xd9, 0x41, 0xaf, 0xe7, 0xb2, 0x1e, 0xf5, 0xd9, 0x6a, 0x46, 0xb0, 0x54, 0x26, 0xb0, 0xec, - 0x31, 0xc2, 0x68, 0x7d, 0x88, 0xc2, 0xd7, 0x12, 0xaa, 0xea, 0x68, 0x2b, 0xc5, 0x6f, 0xa6, 0xf9, - 0xb3, 0x2f, 0xc3, 0x6f, 0xa6, 0xf8, 0x3b, 0x50, 0x94, 0xfc, 0x0e, 0x61, 0x64, 0x35, 0x27, 0x78, - 0xd7, 0x5f, 0x14, 0xbc, 0x1a, 0x61, 0x76, 0x97, 0x87, 0x60, 0x57, 0xe0, 0x1a, 0x84, 0x11, 0x0c, - 0xc1, 0xf0, 0xb7, 0xf1, 0x6f, 0x1d, 0xf2, 0x2a, 0x7d, 0xd0, 0xc7, 0x50, 0x62, 0x11, 0x71, 0x5c, - 0xff, 0xb1, 0x15, 0x12, 0x57, 0xc5, 0xe7, 0xcd, 0x17, 0xf1, 0xef, 0x27, 0xf2, 0x1d, 0xe2, 0x46, - 0xb8, 0xc8, 0x46, 0x0b, 0xb4, 0x09, 0x05, 0x87, 0x7a, 0x8c, 0x58, 0x55, 0xcb, 0x95, 0x61, 0xba, - 0x35, 0xc1, 0x01, 0x9b, 0xbd, 0xa0, 0xef, 0x33, 0xbc, 0x20, 0x70, 0xd5, 0xd6, 0x88, 0xc2, 0xb4, - 0x5c, 0x19, 0xa3, 0x99, 0x28, 0xcc, 0x16, 0x7a, 0x08, 0x4b, 0x87, 0x94, 0x9e, 0x8f, 0xc5, 0x3b, - 0x13, 0x78, 0x6a, 0xc4, 0x23, 0xbe, 0x9d, 0x8e, 0xc6, 0xe2, 0x21, 0x4d, 0x2d, 0xd1, 0x26, 0x2c, - 0x84, 0xe4, 0xc4, 0x0b, 0x88, 0xb3, 0x3a, 0x3f, 0xd9, 0x4b, 0xe2, 0x72, 0x27, 0xe2, 0x58, 0xe1, - 0x8c, 0x1f, 0x6b, 0x50, 0x4c, 0x1d, 0xa0, 0x36, 0x40, 0x4a, 0x4f, 0xed, 0x52, 0x39, 0x93, 0x62, - 0x10, 0x77, 0xd4, 0x17, 0x00, 0xea, 0x58, 0xf1, 0x31, 0x09, 0x45, 0x18, 0x4a, 0x78, 0x71, 0xb8, - 0xcb, 0x9f, 0x6e, 0xfc, 0x44, 0xde, 0xd1, 0x8e, 0x47, 0x5c, 0x9f, 0xd1, 0x01, 0xfb, 0x3f, 0x4c, - 0x83, 0x7b, 0x50, 0xb0, 0x79, 0x09, 0xb2, 0x78, 0xcd, 0xc8, 0x4e, 0x5d, 0x33, 0xf2, 0x02, 0xb4, - 0x45, 0x29, 0xfa, 0x04, 0x16, 0x13, 0x02, 0xe2, 0x38, 0x11, 0x8d, 0x63, 0x19, 0xf4, 0x37, 0x26, - 0xe9, 0x91, 0x48, 0xe3, 0x92, 0x00, 0xcb, 0x15, 0xaf, 0xc8, 0x51, 0x4c, 0xa9, 0x23, 0xee, 0x6f, - 0x09, 0x27, 0x0b, 0xe3, 0x2f, 0x5a, 0x72, 0x13, 0x3b, 0x1e, 0xf1, 0x51, 0x07, 0x96, 0x78, 0xc4, - 0xac, 0x50, 0x05, 0x45, 0x06, 0x61, 0x62, 0xa1, 0x1e, 0x46, 0x11, 0x2f, 0xc6, 0xa7, 0x82, 0xfa, - 0x3a, 0x94, 0xf8, 0x4d, 0x38, 0xf0, 0x5c, 0x9f, 0x07, 0x47, 0xe6, 0x42, 0xf1, 0x90, 0xd2, 0x9a, - 0xdc, 0x42, 0xb7, 0x61, 0x59, 0x34, 0x87, 0xa1, 0x90, 0x15, 0x09, 0x7f, 0x97, 0xf0, 0x92, 0xd8, - 0x57, 0x82, 0x78, 0x8c, 0x64, 0x2c, 0xdc, 0x7a, 0x56, 0x72, 0xcf, 0xf8, 0x4a, 0x4f, 0x75, 0x80, - 0xff, 0x91, 0x69, 0x65, 0xc8, 0x87, 0x41, 0xec, 0x8a, 0x36, 0xa4, 0x8b, 0x36, 0x34, 0x5c, 0x9f, - 0xad, 0x98, 0x99, 0x97, 0xae, 0x98, 0x63, 0x5a, 0x5f, 0x76, 0x4c, 0xeb, 0x1b, 0xeb, 0xcc, 0xf9, - 0xa9, 0x9d, 0x99, 0x1b, 0xeb, 0xcc, 0xff, 0xc8, 0x62, 0xfd, 0xc0, 0xa5, 0xc7, 0x68, 0x1b, 0x16, - 0x8e, 0xdc, 0xd8, 0x3d, 0xf0, 0xa8, 0x74, 0xe0, 0x77, 0x26, 0x39, 0x90, 0xc3, 0x2a, 0x0f, 0x12, - 0xcc, 0xf6, 0x1c, 0x56, 0x70, 0xd4, 0x84, 0x5c, 0x10, 0x92, 0x27, 0x7d, 0xd5, 0x4e, 0xdf, 0x9e, - 0x8a, 0x68, 0x57, 0x40, 0xb6, 0xe7, 0xb0, 0x04, 0x97, 0xbf, 0xd0, 0x60, 0x41, 0xb2, 0xa3, 0x77, - 0x21, 0x2b, 0x2a, 0x4e, 0xa2, 0xd9, 0x8d, 0x49, 0x84, 0x58, 0x48, 0x8f, 0x49, 0x8d, 0xcc, 0xcb, - 0xa5, 0x46, 0xf9, 0x43, 0xc8, 0x25, 0x7a, 0x5e, 0x4e, 0xa3, 0x5a, 0x11, 0x0a, 0x42, 0xa3, 0x23, - 0x97, 0x1e, 0x1b, 0xff, 0x4c, 0x4f, 0x33, 0x22, 0x06, 0x3b, 0x67, 0x63, 0x50, 0x9d, 0x6a, 0x90, - 0xba, 0x28, 0x10, 0x1f, 0x9f, 0x09, 0xc4, 0x3b, 0xd3, 0xb3, 0x9d, 0x8b, 0xc6, 0x5f, 0x53, 0xd1, - 0x68, 0x00, 0x08, 0x2b, 0x44, 0x15, 0x92, 0x9a, 0xde, 0x9a, 0x8a, 0x1b, 0x0b, 0xf3, 0x93, 0x41, - 0xb2, 0x06, 0x79, 0x35, 0x3c, 0x49, 0xfd, 0xde, 0x9c, 0x34, 0xb9, 0x05, 0x8c, 0x72, 0xed, 0xf0, - 0x82, 0x1c, 0x95, 0x52, 0x1c, 0xa6, 0x8c, 0xed, 0xac, 0x1c, 0x66, 0xb9, 0x3d, 0x8c, 0xe9, 0x95, - 0xd8, 0x55, 0xbb, 0x06, 0xaf, 0x8c, 0x58, 0x92, 0x48, 0xff, 0x42, 0x83, 0x62, 0xaa, 0xa5, 0xa1, - 0x7b, 0xb0, 0x40, 0xe2, 0x98, 0x72, 0xcb, 0xb5, 0xe9, 0x0a, 0x3f, 0x97, 0x6e, 0x39, 0x38, 0x27, - 0x60, 0xd5, 0x11, 0x81, 0x29, 0x5d, 0x37, 0x1b, 0x81, 0x69, 0xfc, 0x5c, 0x83, 0x95, 0x86, 0x1b, - 0x51, 0x9b, 0x51, 0x27, 0xad, 0xd9, 0xfb, 0x30, 0x1f, 0x33, 0x12, 0xb1, 0x19, 0xf5, 0x4a, 0x40, - 0xe8, 0x3d, 0xc8, 0x50, 0xdf, 0x99, 0x51, 0x25, 0x0e, 0x31, 0xfe, 0x90, 0x85, 0x95, 0x31, 0x95, - 0x12, 0x7d, 0x08, 0x0b, 0xb2, 0xdf, 0x5f, 0x10, 0x8f, 0x0b, 0x5a, 0x75, 0x2e, 0xe9, 0xf6, 0x23, - 0xbc, 0x39, 0xdb, 0xb4, 0x90, 0xe0, 0x4d, 0xf4, 0x11, 0xe4, 0x3d, 0xd2, 0x3b, 0x70, 0xb8, 0x02, - 0xb3, 0xcd, 0x0a, 0x09, 0xac, 0x9a, 0x62, 0x30, 0xe5, 0xa8, 0x30, 0x1b, 0x83, 0xc9, 0xd3, 0xb2, - 0xef, 0x1f, 0xba, 0x9e, 0x47, 0x1d, 0xab, 0x2a, 0x27, 0x85, 0x29, 0x39, 0x0a, 0x0a, 0x58, 0x3d, - 0xc5, 0x62, 0xca, 0x51, 0x7f, 0x56, 0x16, 0x13, 0x7d, 0x1d, 0x72, 0x5d, 0xea, 0x3e, 0xee, 0x32, - 0xf9, 0x82, 0x26, 0x57, 0xe7, 0x66, 0xbc, 0xfc, 0x4b, 0xcc, 0x78, 0x26, 0x7c, 0x2d, 0xe9, 0x88, - 0x22, 0xa9, 0x38, 0xa5, 0x7c, 0x64, 0x41, 0x3c, 0x72, 0x45, 0x1c, 0xee, 0xc9, 0xb3, 0x6d, 0x71, - 0x64, 0xfc, 0x5a, 0x83, 0x57, 0x24, 0xe1, 0x56, 0xdf, 0xb7, 0x45, 0xcb, 0xdc, 0x81, 0x82, 0x1d, - 0xf4, 0xc2, 0xc0, 0x1f, 0xcd, 0xbf, 0x13, 0x3a, 0x75, 0x44, 0xcf, 0x70, 0xe0, 0x11, 0x03, 0xba, - 0x0b, 0x59, 0x61, 0x9a, 0x3e, 0x9b, 0x69, 0x02, 0x64, 0x7c, 0xa1, 0xf1, 0xfc, 0x3e, 0xc7, 0x8f, - 0x96, 0x93, 0xf7, 0x4e, 0xae, 0xdd, 0x62, 0xf2, 0x4e, 0x79, 0x07, 0xb4, 0x70, 0xb6, 0x5c, 0xd5, - 0x42, 0x0e, 0x7a, 0x32, 0x5b, 0x7e, 0x6a, 0x4f, 0x8c, 0x01, 0xe4, 0x31, 0x8d, 0x69, 0x74, 0x44, - 0x63, 0xf4, 0x5d, 0xd0, 0xa3, 0x19, 0xaf, 0x98, 0x1e, 0x55, 0x05, 0x6c, 0xc6, 0x9b, 0xa5, 0x47, - 0xa6, 0xf1, 0x53, 0x1d, 0xf2, 0x1d, 0x35, 0x52, 0x7d, 0x00, 0x99, 0xb0, 0xeb, 0xca, 0x67, 0xbf, - 0x3d, 0x85, 0x5b, 0x87, 0xc1, 0xe1, 0x38, 0x3e, 0xfd, 0xfa, 0x81, 0x6f, 0x53, 0x39, 0x81, 0x26, - 0x0b, 0x74, 0x4f, 0xd4, 0x31, 0x46, 0xa7, 0xe9, 0xf8, 0x4a, 0x13, 0xf1, 0xf2, 0x83, 0x13, 0x1c, - 0xbf, 0xb6, 0x91, 0x74, 0xce, 0x34, 0x9f, 0x4c, 0x94, 0x23, 0xf1, 0x10, 0x85, 0x0c, 0x3e, 0xe3, - 0x07, 0x31, 0xb5, 0x02, 0xdf, 0xe2, 0xd7, 0x47, 0xdc, 0xdc, 0x3c, 0x2e, 0x8a, 0xcd, 0x5d, 0x7f, - 0xcb, 0xf5, 0x3c, 0xa3, 0x0e, 0xa0, 0x9e, 0xde, 0x72, 0xb8, 0x29, 0xae, 0xef, 0xcb, 0x0f, 0x19, - 0x25, 0x9c, 0x2c, 0xd0, 0x75, 0x28, 0x12, 0x8f, 0x59, 0x07, 0xd4, 0xee, 0xde, 0x31, 0x7b, 0xc2, - 0xcc, 0x02, 0x06, 0xe2, 0xb1, 0x5a, 0xb2, 0x63, 0x7c, 0xa9, 0xc3, 0xe2, 0x29, 0x1b, 0xd0, 0xf7, - 0x94, 0xf5, 0x9c, 0x68, 0xc9, 0xbc, 0x3b, 0xb5, 0xf5, 0xa7, 0x57, 0x4d, 0xbf, 0xdf, 0x93, 0xfe, - 0x30, 0x7e, 0xaf, 0xc1, 0xb5, 0x73, 0x87, 0xe8, 0x5b, 0x70, 0xbd, 0xb3, 0xbb, 0xd7, 0xda, 0x6f, - 0xed, 0xb6, 0xad, 0xbd, 0xfd, 0xcd, 0xfd, 0xa6, 0xd5, 0x6c, 0x7f, 0xb6, 0x63, 0x7d, 0xd6, 0xde, - 0xeb, 0x34, 0xeb, 0xad, 0xad, 0x56, 0xb3, 0xb1, 0x3c, 0x87, 0xd6, 0xa0, 0x3c, 0x4e, 0x68, 0xb7, - 0xd3, 0x6c, 0x37, 0x1b, 0xcb, 0xda, 0x45, 0xe7, 0xf5, 0x4f, 0x77, 0xf7, 0x9a, 0x8d, 0x65, 0x1d, - 0xbd, 0x0e, 0xaf, 0x8d, 0x3b, 0x7f, 0xd8, 0xda, 0xdf, 0x6e, 0xe0, 0xcd, 0x87, 0xed, 0xe5, 0x0c, - 0xba, 0x0e, 0xdf, 0x1c, 0x4f, 0xb1, 0xd9, 0xda, 0x69, 0x36, 0x96, 0xb3, 0xfc, 0xfe, 0xcd, 0x7f, - 0x1a, 0xb6, 0x0f, 0x19, 0xba, 0x0f, 0x45, 0x35, 0xcd, 0x5b, 0xae, 0x73, 0x41, 0x9f, 0x1b, 0xeb, - 0xa1, 0x96, 0x83, 0x21, 0x1c, 0x45, 0x6b, 0x98, 0x62, 0xfa, 0xe5, 0x52, 0xcc, 0xe8, 0x40, 0x49, - 0xed, 0xef, 0x86, 0xd4, 0xe7, 0x29, 0x37, 0x7c, 0xef, 0xd0, 0x26, 0xa7, 0x9c, 0xc2, 0x8e, 0xde, - 0x4e, 0x8c, 0xef, 0x8f, 0x12, 0xa1, 0xce, 0xb3, 0xec, 0xca, 0x8c, 0x35, 0xfe, 0xa8, 0xc1, 0xb2, - 0x3a, 0x7a, 0xe8, 0xb2, 0xae, 0x13, 0x91, 0xe3, 0xab, 0x73, 0x25, 0x81, 0x15, 0x75, 0x6d, 0xd2, - 0xdf, 0x56, 0xf4, 0x4b, 0x7e, 0x5b, 0x41, 0x8a, 0x6c, 0xb4, 0x67, 0xfc, 0x49, 0x83, 0x95, 0xa1, - 0xc7, 0xe8, 0x31, 0x89, 0x9c, 0x64, 0x0a, 0xbd, 0x32, 0x1b, 0x2c, 0x40, 0x91, 0xe0, 0xbd, 0x12, - 0x13, 0xae, 0x49, 0xae, 0x94, 0x05, 0xbf, 0x92, 0xaf, 0xbe, 0xcd, 0x01, 0xb5, 0xfb, 0xa2, 0x72, - 0xde, 0x87, 0x1c, 0x8b, 0x88, 0x4d, 0xe3, 0x55, 0xed, 0x46, 0x66, 0x52, 0x77, 0x3b, 0x05, 0xe5, - 0xa5, 0xd4, 0xa6, 0x58, 0xc2, 0xd1, 0x06, 0x2f, 0x3c, 0x61, 0x5f, 0xa9, 0x7b, 0x73, 0x82, 0xba, - 0x0f, 0x88, 0xd7, 0xa7, 0x38, 0x81, 0xa0, 0xf7, 0x21, 0x97, 0x4c, 0xd2, 0xb2, 0xd4, 0x4e, 0x07, - 0x96, 0x98, 0x72, 0x1d, 0xe6, 0x85, 0x2a, 0x5c, 0x85, 0x23, 0x7e, 0x22, 0x4d, 0x99, 0x52, 0x05, - 0x01, 0x31, 0xfe, 0xae, 0xc1, 0xab, 0x67, 0x93, 0x53, 0x7c, 0x1b, 0x48, 0x17, 0x71, 0xed, 0x52, - 0x45, 0xfc, 0x4c, 0x7a, 0xe8, 0x97, 0x4e, 0x0f, 0x35, 0x3d, 0x64, 0x2e, 0x33, 0x3d, 0xfc, 0x00, - 0xbe, 0x31, 0x26, 0x77, 0xaf, 0xc6, 0xc4, 0xda, 0x97, 0xfa, 0x9f, 0x9f, 0xad, 0x69, 0x4f, 0x9f, - 0xad, 0x69, 0xff, 0x78, 0xb6, 0xa6, 0xfd, 0xf2, 0xf9, 0xda, 0xdc, 0xd3, 0xe7, 0x6b, 0x73, 0x7f, - 0x7b, 0xbe, 0x36, 0x07, 0x6b, 0x76, 0xd0, 0x7b, 0x01, 0x5b, 0x2d, 0xdf, 0xa0, 0x83, 0x4e, 0x14, - 0xb0, 0xa0, 0xa3, 0x7d, 0x8e, 0x1f, 0xbb, 0xac, 0xdb, 0x3f, 0xa8, 0xd8, 0x41, 0x6f, 0xdd, 0x0e, - 0xe2, 0x5e, 0x10, 0xaf, 0x47, 0xd4, 0x23, 0x27, 0x34, 0x5a, 0x3f, 0x32, 0x87, 0x3f, 0xed, 0x2e, - 0x71, 0xfd, 0x78, 0xfd, 0xe2, 0x3f, 0x51, 0xee, 0x3a, 0x74, 0xa0, 0x7e, 0xff, 0x56, 0xcf, 0x74, - 0xea, 0x8d, 0xdf, 0xe9, 0xe5, 0x8e, 0x52, 0xa1, 0xce, 0x55, 0x68, 0xd0, 0x41, 0xe5, 0x81, 0x14, - 0xf9, 0x6a, 0x74, 0xf8, 0x88, 0x1f, 0x3e, 0x6a, 0xd0, 0xc1, 0x23, 0x75, 0xf8, 0x4c, 0x7f, 0xe3, - 0xe2, 0xc3, 0x47, 0xf7, 0x3b, 0xb5, 0x1d, 0xca, 0x88, 0x43, 0x18, 0xf9, 0x97, 0xfe, 0x9a, 0x12, - 0xdc, 0xd8, 0xe0, 0x92, 0x1b, 0x1b, 0x0d, 0x3a, 0xd8, 0xd8, 0x50, 0xb2, 0x07, 0x39, 0xf1, 0x77, - 0xcc, 0x9d, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x37, 0xdb, 0x43, 0xeb, 0xfe, 0x19, 0x00, 0x00, + // 1781 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0x4f, 0x6f, 0xe3, 0xc6, + 0x15, 0x37, 0x29, 0xd9, 0x96, 0x9f, 0xe4, 0x8d, 0x77, 0x1c, 0xb4, 0x86, 0x8a, 0x38, 0xbb, 0x6c, + 0xfe, 0x6c, 0x93, 0x42, 0x8a, 0x98, 0x14, 0x08, 0xbc, 0x4d, 0x36, 0xd6, 0x1f, 0xaf, 0x95, 0xc4, + 0x32, 0x43, 0x3b, 0xbb, 0x45, 0xba, 0x28, 0x31, 0x26, 0xc7, 0x2b, 0xa2, 0x14, 0xc9, 0x25, 0x47, + 0xb6, 0x7c, 0x2a, 0x50, 0xb4, 0xe8, 0xa9, 0x68, 0xf3, 0x01, 0x8a, 0x22, 0x3d, 0x16, 0xfd, 0x08, + 0x45, 0x7b, 0x2d, 0x8a, 0x1e, 0x72, 0x6b, 0x4f, 0x45, 0xe1, 0x3d, 0x14, 0xe8, 0x07, 0x28, 0x7a, + 0xe8, 0xa1, 0x98, 0xe1, 0x8c, 0x48, 0xdb, 0xf2, 0x4a, 0xf4, 0xba, 0x97, 0xdc, 0x34, 0x33, 0xef, + 0xf7, 0xe3, 0x7b, 0xf3, 0xfe, 0x92, 0x82, 0x57, 0x42, 0xe2, 0x0f, 0x07, 0x07, 0x11, 0xae, 0xdb, + 0x41, 0x44, 0xea, 0x0e, 0x19, 0xd5, 0x8f, 0x1a, 0xd8, 0x0b, 0xfb, 0xb8, 0xc1, 0x16, 0xb5, 0x30, + 0x0a, 0x68, 0x80, 0xaa, 0x52, 0xaa, 0xc6, 0xa4, 0x6a, 0xec, 0x40, 0x4a, 0x55, 0xdf, 0x38, 0xcb, + 0x60, 0x47, 0x27, 0x21, 0x0d, 0x52, 0x92, 0x64, 0x9d, 0xf0, 0x68, 0x3f, 0x56, 0xa0, 0xb8, 0x77, + 0x8c, 0x43, 0xf4, 0x01, 0xcc, 0x87, 0x51, 0x10, 0x1c, 0xae, 0x29, 0xb7, 0x94, 0x3b, 0x65, 0xfd, + 0x8d, 0xda, 0xd9, 0x07, 0x08, 0x90, 0x24, 0xa9, 0x7d, 0xf6, 0x11, 0x43, 0x19, 0x0c, 0x61, 0x26, + 0x40, 0xf4, 0x2e, 0x14, 0x0f, 0x02, 0xe7, 0x64, 0xad, 0xc8, 0x09, 0x5e, 0xa9, 0x5d, 0xae, 0x61, + 0x8d, 0x61, 0x9b, 0x81, 0x73, 0x62, 0x72, 0x84, 0xf6, 0x33, 0x05, 0x96, 0xd8, 0x56, 0xcb, 0xc3, + 0xee, 0x00, 0xbd, 0x98, 0xd5, 0xa4, 0x22, 0xd9, 0xdf, 0x13, 0xec, 0x2a, 0x67, 0xff, 0xd6, 0x34, + 0x76, 0x4e, 0x95, 0x3e, 0x02, 0xbd, 0x0a, 0x37, 0x48, 0x18, 0xd8, 0x7d, 0xcb, 0x19, 0x46, 0x98, + 0xba, 0x81, 0xbf, 0xb6, 0x78, 0x4b, 0xb9, 0x53, 0x34, 0x97, 0xf9, 0x6e, 0x5b, 0x6c, 0x6a, 0xbf, + 0x2e, 0xc0, 0xf2, 0x19, 0x38, 0xda, 0x82, 0x25, 0x7f, 0xe8, 0x79, 0xee, 0xa1, 0x4b, 0x22, 0x71, + 0x37, 0x77, 0xa6, 0xdc, 0x4d, 0x4f, 0xca, 0x9b, 0x29, 0x14, 0xbd, 0x03, 0x85, 0x43, 0x42, 0x84, + 0xfa, 0xda, 0x14, 0x86, 0x2d, 0x42, 0x4c, 0x26, 0x8e, 0x7e, 0x00, 0xab, 0xc1, 0x90, 0x86, 0x43, + 0x6a, 0x35, 0x2c, 0x3b, 0x18, 0x0c, 0x5c, 0x3a, 0x20, 0x3e, 0x5d, 0x2b, 0x70, 0x96, 0xda, 0x14, + 0x96, 0x3d, 0x8a, 0x29, 0x69, 0x8d, 0x51, 0xe6, 0xcd, 0x84, 0xaa, 0x91, 0x6e, 0x65, 0xf8, 0xf5, + 0x2c, 0x7f, 0xf1, 0x79, 0xf8, 0xf5, 0x0c, 0xbf, 0x01, 0x65, 0xc1, 0xef, 0x60, 0x8a, 0xd7, 0x16, + 0x38, 0x6f, 0xfd, 0x59, 0xce, 0x6b, 0x62, 0x6a, 0xf7, 0x99, 0x0b, 0x76, 0x39, 0xae, 0x8d, 0x29, + 0x36, 0x21, 0x18, 0xff, 0xd6, 0xfe, 0xa3, 0x42, 0x49, 0x86, 0x0f, 0xfa, 0x10, 0x2a, 0x34, 0xc2, + 0x8e, 0xeb, 0x3f, 0xb6, 0x42, 0xec, 0x4a, 0xff, 0xbc, 0xfe, 0x2c, 0xfe, 0xfd, 0x44, 0xde, 0xc0, + 0x6e, 0x64, 0x96, 0x69, 0xba, 0x40, 0x9b, 0xb0, 0xe4, 0x10, 0x8f, 0x62, 0xab, 0x61, 0xb9, 0xc2, + 0x4d, 0xaf, 0x4e, 0xb9, 0x80, 0xcd, 0x41, 0x30, 0xf4, 0xa9, 0xb9, 0xc8, 0x71, 0x8d, 0x6e, 0x4a, + 0xa1, 0x5b, 0xae, 0xf0, 0x51, 0x2e, 0x0a, 0xbd, 0x8b, 0x1e, 0xc2, 0x8d, 0x43, 0x42, 0x2e, 0xfa, + 0xe2, 0xad, 0x29, 0x3c, 0x4d, 0xec, 0x61, 0xdf, 0xce, 0x7a, 0x63, 0xf9, 0x90, 0x64, 0x96, 0x68, + 0x13, 0x16, 0x43, 0x7c, 0xe2, 0x05, 0xd8, 0x59, 0x9b, 0x9f, 0x7e, 0x4b, 0x3c, 0xb9, 0x13, 0x71, + 0x53, 0xe2, 0xb4, 0x9f, 0x28, 0x50, 0xce, 0x1c, 0xa0, 0x1e, 0x40, 0x46, 0x4f, 0xe5, 0x4a, 0x31, + 0x93, 0x61, 0xe0, 0x39, 0xea, 0x73, 0x00, 0x71, 0xac, 0xf8, 0x18, 0x87, 0xdc, 0x0d, 0x15, 0x73, + 0x79, 0xbc, 0xcb, 0x9e, 0xae, 0xfd, 0x54, 0xe4, 0xa8, 0xe1, 0x61, 0xd7, 0xa7, 0x64, 0x44, 0xbf, + 0x82, 0x61, 0x70, 0x0f, 0x96, 0x6c, 0x56, 0x82, 0x2c, 0x56, 0x33, 0x8a, 0x33, 0xd7, 0x8c, 0x12, + 0x07, 0x6d, 0x11, 0x82, 0x3e, 0x82, 0xe5, 0x84, 0x00, 0x3b, 0x4e, 0x44, 0xe2, 0x58, 0x38, 0xfd, + 0xb5, 0x69, 0x7a, 0x24, 0xd2, 0x66, 0x85, 0x83, 0xc5, 0x8a, 0x55, 0xe4, 0x28, 0x26, 0xc4, 0xe1, + 0xf9, 0x5b, 0x31, 0x93, 0x85, 0xf6, 0x09, 0xa0, 0x9d, 0xc0, 0xfe, 0xe1, 0x96, 0x17, 0x1c, 0xb7, + 0xdc, 0xb0, 0x4f, 0x22, 0xee, 0x8b, 0xbb, 0x30, 0x7f, 0x84, 0xbd, 0x21, 0x11, 0x4e, 0x98, 0xd1, + 0xf0, 0x04, 0xa3, 0xfd, 0x28, 0xc9, 0x6d, 0xc3, 0xc3, 0x3e, 0x32, 0xe0, 0x06, 0x8b, 0x01, 0x2b, + 0x94, 0x6e, 0x16, 0x8c, 0x53, 0x4b, 0xff, 0x38, 0x2e, 0xcc, 0xe5, 0xf8, 0x4c, 0x98, 0xdc, 0x86, + 0x0a, 0xcb, 0xad, 0x03, 0xcf, 0xf5, 0x99, 0xbb, 0x45, 0x74, 0x95, 0x0f, 0x09, 0x69, 0x8a, 0x2d, + 0xed, 0xdf, 0x4a, 0xa6, 0xfe, 0xff, 0x9f, 0xd4, 0xa8, 0x42, 0x29, 0x0c, 0x62, 0x97, 0x37, 0x21, + 0x95, 0x37, 0xa1, 0xf1, 0xfa, 0x7c, 0xbd, 0x2c, 0x3c, 0x77, 0xbd, 0x9c, 0xd0, 0xf8, 0x8a, 0x93, + 0x1a, 0xdf, 0x7f, 0x45, 0x59, 0x7d, 0xe0, 0x92, 0x63, 0xb4, 0x0d, 0x8b, 0x47, 0x6e, 0xec, 0x1e, + 0x78, 0xd2, 0x8b, 0xdf, 0x9e, 0x66, 0x2c, 0x83, 0xd5, 0x1e, 0x24, 0x98, 0xed, 0x39, 0x53, 0xc2, + 0x51, 0x07, 0x16, 0x82, 0x10, 0x3f, 0x19, 0xca, 0xc6, 0xf7, 0xe6, 0x4c, 0x44, 0xbb, 0x1c, 0xb2, + 0x3d, 0x67, 0x0a, 0x70, 0xf5, 0x73, 0x05, 0x16, 0x05, 0x3b, 0x7a, 0x07, 0x8a, 0xbc, 0x36, 0x24, + 0x9a, 0xdd, 0x9a, 0x46, 0x68, 0x72, 0xe9, 0x09, 0x6e, 0x2c, 0x3c, 0x9f, 0x1b, 0xab, 0xef, 0xc3, + 0x42, 0xa2, 0xe7, 0xd5, 0x34, 0x6a, 0x96, 0x61, 0x89, 0x6b, 0x74, 0xe4, 0x92, 0x63, 0xed, 0x9f, + 0xd9, 0xb9, 0x83, 0xfb, 0x60, 0xe7, 0xbc, 0x0f, 0x1a, 0x33, 0x8d, 0x3c, 0x97, 0x39, 0xe2, 0xc3, + 0x73, 0x8e, 0x78, 0x6b, 0x76, 0xb6, 0x0b, 0xde, 0xf8, 0x6b, 0xc6, 0x1b, 0x6d, 0x00, 0x6e, 0x05, + 0xaf, 0x17, 0x97, 0xe4, 0xfc, 0x64, 0x6e, 0x93, 0x9b, 0x9f, 0x8c, 0x7c, 0x4d, 0x28, 0xc9, 0x31, + 0x47, 0xe8, 0xf7, 0xfa, 0xb4, 0x19, 0x2b, 0xa0, 0x84, 0x69, 0x67, 0x2e, 0x8a, 0xa1, 0x26, 0xc3, + 0xa1, 0x0b, 0xdf, 0xe6, 0xe5, 0xd0, 0xab, 0xbd, 0xb1, 0x4f, 0xaf, 0xc5, 0xae, 0xe6, 0x4d, 0x78, + 0x21, 0x65, 0x49, 0x3c, 0xfd, 0x0b, 0x05, 0xca, 0x99, 0xe6, 0x83, 0xee, 0xc1, 0x22, 0x8e, 0x63, + 0xc2, 0x2c, 0x57, 0x66, 0x2b, 0xd1, 0x4c, 0xba, 0xeb, 0x98, 0x0b, 0x1c, 0xd6, 0x48, 0x09, 0x74, + 0x71, 0x75, 0xf9, 0x08, 0x74, 0xed, 0xe7, 0x0a, 0xac, 0xb6, 0xdd, 0x88, 0xd8, 0x94, 0x38, 0x59, + 0xcd, 0xbe, 0x0b, 0xf3, 0x31, 0xc5, 0x11, 0xcd, 0xa9, 0x57, 0x02, 0x42, 0xef, 0x42, 0x81, 0xf8, + 0x4e, 0x4e, 0x95, 0x18, 0x44, 0xfb, 0x5d, 0x11, 0x56, 0x27, 0x54, 0x35, 0xf4, 0x3e, 0x2c, 0x8a, + 0xce, 0x9c, 0xaf, 0xb7, 0x2c, 0x24, 0x7d, 0x39, 0xc5, 0xeb, 0xf9, 0xfa, 0x7a, 0x82, 0xd7, 0xd1, + 0x07, 0x50, 0xf2, 0xf0, 0xe0, 0xc0, 0x61, 0x0a, 0xe4, 0xeb, 0xea, 0x09, 0xac, 0x91, 0x61, 0xd0, + 0x45, 0x53, 0xcf, 0xc7, 0xa0, 0xb3, 0xb0, 0x1c, 0xfa, 0x87, 0xae, 0xe7, 0x11, 0xc7, 0x6a, 0x88, + 0x9e, 0x3e, 0x23, 0xc7, 0x92, 0x04, 0x36, 0xce, 0xb0, 0xe8, 0x62, 0x28, 0xcf, 0xcb, 0xa2, 0xa3, + 0xaf, 0xc1, 0x42, 0x9f, 0xb8, 0x8f, 0xfb, 0x54, 0xbc, 0x4a, 0x89, 0xd5, 0x85, 0x69, 0xac, 0xf4, + 0x1c, 0xd3, 0xd8, 0x6d, 0xa8, 0x24, 0xdd, 0x4b, 0x3c, 0x69, 0x89, 0x3f, 0xa9, 0xcc, 0xf7, 0xb6, + 0xf9, 0x96, 0xf6, 0x2b, 0x05, 0x5e, 0x10, 0xf8, 0xad, 0xa1, 0x6f, 0xf3, 0x36, 0xba, 0x03, 0x4b, + 0x76, 0x30, 0x08, 0x03, 0x3f, 0x1d, 0x4c, 0xa7, 0x34, 0xd1, 0x88, 0x9c, 0xe3, 0x30, 0x53, 0x06, + 0x74, 0x17, 0x8a, 0xdc, 0x12, 0x35, 0x9f, 0x25, 0x1c, 0xa4, 0x7d, 0xae, 0xb0, 0x70, 0xbe, 0xc0, + 0x8f, 0x56, 0x92, 0x17, 0x42, 0xa6, 0xdd, 0x72, 0xf2, 0xb2, 0xf7, 0x36, 0x28, 0x61, 0xbe, 0xd0, + 0x54, 0x42, 0x06, 0x7a, 0x92, 0x2f, 0x1c, 0x95, 0x27, 0xda, 0x08, 0x4a, 0x26, 0x89, 0x49, 0x74, + 0x44, 0x62, 0xf4, 0x1d, 0x50, 0xa3, 0x9c, 0x19, 0xa5, 0x46, 0x0d, 0x0e, 0xcb, 0x99, 0x48, 0x6a, + 0xa4, 0x6b, 0xa7, 0x0a, 0x94, 0x0c, 0x39, 0xed, 0xbc, 0x07, 0x85, 0xb0, 0xef, 0x8a, 0x67, 0xbf, + 0x39, 0xc3, 0xb5, 0x8e, 0x9d, 0xc3, 0x70, 0x6c, 0x2c, 0xf5, 0x03, 0xdf, 0x26, 0x62, 0x90, 0x4b, + 0x16, 0xe8, 0x1e, 0x2f, 0x5b, 0x94, 0xcc, 0xd2, 0xe0, 0xa5, 0x26, 0xfc, 0xad, 0xc4, 0x4c, 0x70, + 0x2c, 0x4b, 0x23, 0x71, 0x39, 0xb3, 0x7c, 0xcb, 0x90, 0x17, 0x69, 0x8e, 0x51, 0x9a, 0x06, 0x20, + 0x99, 0xbb, 0x0e, 0x53, 0xd3, 0xf5, 0x7d, 0xf1, 0xf5, 0xa0, 0x62, 0x26, 0x0b, 0xed, 0x0b, 0x15, + 0x96, 0xcf, 0x3c, 0x1e, 0x7d, 0x22, 0x15, 0x67, 0x72, 0x37, 0xf4, 0xbb, 0x33, 0x2b, 0x7e, 0x76, + 0xd5, 0xf1, 0x87, 0x03, 0x61, 0x8a, 0xf6, 0x7b, 0x05, 0x6e, 0x5e, 0x38, 0x44, 0xdf, 0x84, 0x97, + 0x8d, 0xdd, 0xbd, 0xee, 0x7e, 0x77, 0xb7, 0x67, 0xed, 0xed, 0x6f, 0xee, 0x77, 0xac, 0x4e, 0xef, + 0xd3, 0x1d, 0xeb, 0xd3, 0xde, 0x9e, 0xd1, 0x69, 0x75, 0xb7, 0xba, 0x9d, 0xf6, 0xca, 0x1c, 0x5a, + 0x87, 0xea, 0x24, 0xa1, 0x5d, 0xa3, 0xd3, 0xeb, 0xb4, 0x57, 0x94, 0xcb, 0xce, 0x5b, 0x1f, 0xef, + 0xee, 0x75, 0xda, 0x2b, 0x2a, 0xba, 0x0d, 0x2f, 0x4d, 0x3a, 0x7f, 0xd8, 0xdd, 0xdf, 0x6e, 0x9b, + 0x9b, 0x0f, 0x7b, 0x2b, 0x05, 0xf4, 0x32, 0x7c, 0x63, 0x32, 0xc5, 0x66, 0x77, 0xa7, 0xd3, 0x5e, + 0x29, 0xb2, 0xd4, 0x99, 0xff, 0x38, 0xec, 0x1d, 0x52, 0x74, 0x1f, 0xca, 0x72, 0x46, 0xb6, 0x5c, + 0xe7, 0x92, 0x8e, 0x34, 0xf1, 0x86, 0xba, 0x8e, 0x09, 0x61, 0xea, 0x8c, 0x71, 0x74, 0xa8, 0x57, + 0x8b, 0x0e, 0xcd, 0x80, 0x8a, 0xdc, 0xdf, 0x0d, 0x89, 0xcf, 0xa2, 0x65, 0x3c, 0xcd, 0x2b, 0xd3, + 0xa3, 0x45, 0x62, 0xd3, 0x99, 0x5f, 0xfb, 0x5e, 0x1a, 0x08, 0x2d, 0x2f, 0x88, 0xc9, 0xb5, 0x19, + 0xab, 0xfd, 0x41, 0x81, 0x15, 0x79, 0xf4, 0xd0, 0xa5, 0x7d, 0x27, 0xc2, 0xc7, 0xd7, 0x77, 0x95, + 0x18, 0x56, 0x65, 0xc4, 0x67, 0xbf, 0x57, 0xa8, 0x57, 0xfc, 0x5e, 0x81, 0x24, 0x59, 0xba, 0xa7, + 0xfd, 0x51, 0x81, 0xd5, 0xf1, 0x8d, 0x91, 0x63, 0x1c, 0x39, 0xc9, 0xbc, 0x78, 0x6d, 0x36, 0x58, + 0x80, 0x22, 0xce, 0x7b, 0x2d, 0x26, 0xdc, 0x14, 0x5c, 0x19, 0x0b, 0xfe, 0xa2, 0x40, 0xd1, 0xc0, + 0xb4, 0x8f, 0x5a, 0xa2, 0x87, 0xcc, 0xd0, 0x8d, 0x26, 0x0c, 0x63, 0x49, 0x2f, 0x61, 0x23, 0x59, + 0x14, 0x0c, 0x79, 0xf4, 0x16, 0xf2, 0x8c, 0x64, 0x1c, 0x84, 0x36, 0x93, 0x72, 0x5b, 0xb8, 0x5a, + 0x3f, 0x64, 0x58, 0xd6, 0x6c, 0xf9, 0x7b, 0x4a, 0x67, 0x44, 0xec, 0x21, 0xaf, 0xe1, 0xf7, 0x61, + 0x81, 0x46, 0xd8, 0x26, 0xf1, 0x9a, 0xc2, 0x75, 0xaa, 0x4f, 0x1b, 0x92, 0xc7, 0x50, 0x56, 0xd4, + 0x6d, 0x62, 0x0a, 0x78, 0xb5, 0x05, 0xf3, 0x7c, 0x03, 0x6d, 0xa4, 0x5f, 0x10, 0x0a, 0x13, 0xd2, + 0xe9, 0xbc, 0x91, 0x0f, 0x98, 0xac, 0xfc, 0x80, 0xf0, 0x77, 0x05, 0x5e, 0x3c, 0x1f, 0xf1, 0xfc, + 0x35, 0x3e, 0x5b, 0xd4, 0x95, 0xab, 0x14, 0xf5, 0xf3, 0x31, 0xa7, 0x5e, 0x39, 0xe6, 0xe4, 0x34, + 0x51, 0xb8, 0xca, 0x34, 0xf1, 0x7d, 0xf8, 0xfa, 0x84, 0x84, 0xb8, 0x1e, 0x13, 0x9b, 0x5f, 0xa8, + 0x7f, 0x3a, 0x5d, 0x57, 0xbe, 0x3c, 0x5d, 0x57, 0xfe, 0x71, 0xba, 0xae, 0xfc, 0xf2, 0xe9, 0xfa, + 0xdc, 0x97, 0x4f, 0xd7, 0xe7, 0xfe, 0xf6, 0x74, 0x7d, 0x0e, 0xd6, 0xed, 0x60, 0xf0, 0x0c, 0xb6, + 0x66, 0xa9, 0x4d, 0x46, 0x46, 0x14, 0xd0, 0xc0, 0x50, 0x3e, 0x33, 0x1f, 0xbb, 0xb4, 0x3f, 0x3c, + 0xa8, 0xd9, 0xc1, 0xa0, 0x6e, 0x07, 0xf1, 0x20, 0x88, 0xeb, 0x11, 0xf1, 0xf0, 0x09, 0x89, 0xea, + 0x47, 0xfa, 0xf8, 0xa7, 0xdd, 0xc7, 0xae, 0x1f, 0xd7, 0x2f, 0xff, 0xb7, 0xe3, 0xae, 0x43, 0x46, + 0xf2, 0xf7, 0x6f, 0xd4, 0x82, 0xd1, 0x6a, 0xff, 0x56, 0xad, 0x1a, 0x52, 0x85, 0x16, 0x53, 0xa1, + 0x4d, 0x46, 0xb5, 0x07, 0x42, 0xe4, 0xcf, 0xe9, 0xe1, 0x23, 0x76, 0xf8, 0xa8, 0x4d, 0x46, 0x8f, + 0xe4, 0xe1, 0xa9, 0xfa, 0xda, 0xe5, 0x87, 0x8f, 0xee, 0x1b, 0xcd, 0x1d, 0x42, 0xb1, 0x83, 0x29, + 0xfe, 0x97, 0xfa, 0x92, 0x14, 0xdc, 0xd8, 0x60, 0x92, 0x1b, 0x1b, 0x6d, 0x32, 0xda, 0xd8, 0x90, + 0xb2, 0x07, 0x0b, 0xfc, 0x7f, 0x93, 0xb7, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x95, 0x49, 0x5f, + 0xa1, 0xa7, 0x19, 0x00, 0x00, } func (m *Swap) Marshal() (dAtA []byte, err error) { @@ -2692,7 +2723,7 @@ func (m *SwapPlaintext) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *SwapPlan) Marshal() (dAtA []byte, err error) { +func (m *MockFlowCiphertext) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2702,30 +2733,51 @@ func (m *SwapPlan) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SwapPlan) MarshalTo(dAtA []byte) (int, error) { +func (m *MockFlowCiphertext) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SwapPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MockFlowCiphertext) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.ProofBlindingS) > 0 { - i -= len(m.ProofBlindingS) - copy(dAtA[i:], m.ProofBlindingS) - i = encodeVarintDex(dAtA, i, uint64(len(m.ProofBlindingS))) + if m.Value != nil { + { + size, err := m.Value.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } i-- - dAtA[i] = 0x22 + dAtA[i] = 0xa } - if len(m.ProofBlindingR) > 0 { - i -= len(m.ProofBlindingR) - copy(dAtA[i:], m.ProofBlindingR) - i = encodeVarintDex(dAtA, i, uint64(len(m.ProofBlindingR))) - i-- - dAtA[i] = 0x1a + return len(dAtA) - i, nil +} + +func (m *SwapPlan) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *SwapPlan) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SwapPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l if len(m.FeeBlinding) > 0 { i -= len(m.FeeBlinding) copy(dAtA[i:], m.FeeBlinding) @@ -2768,20 +2820,6 @@ func (m *SwapClaimPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ProofBlindingS) > 0 { - i -= len(m.ProofBlindingS) - copy(dAtA[i:], m.ProofBlindingS) - i = encodeVarintDex(dAtA, i, uint64(len(m.ProofBlindingS))) - i-- - dAtA[i] = 0x32 - } - if len(m.ProofBlindingR) > 0 { - i -= len(m.ProofBlindingR) - copy(dAtA[i:], m.ProofBlindingR) - i = encodeVarintDex(dAtA, i, uint64(len(m.ProofBlindingR))) - i-- - dAtA[i] = 0x2a - } if m.EpochDuration != 0 { i = encodeVarintDex(dAtA, i, uint64(m.EpochDuration)) i-- @@ -3257,8 +3295,8 @@ func (m *BatchSwapOutputData) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.EpochStartingHeight != 0 { - i = encodeVarintDex(dAtA, i, uint64(m.EpochStartingHeight)) + if m.EpochHeight != 0 { + i = encodeVarintDex(dAtA, i, uint64(m.EpochHeight)) i-- dAtA[i] = 0x48 } @@ -3520,16 +3558,6 @@ func (m *Position) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.CloseOnFill { - i-- - if m.CloseOnFill { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x28 - } if m.Reserves != nil { { size, err := m.Reserves.MarshalToSizedBuffer(dAtA[:i]) @@ -3596,13 +3624,6 @@ func (m *PositionId) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.AltBech32M) > 0 { - i -= len(m.AltBech32M) - copy(dAtA[i:], m.AltBech32M) - i = encodeVarintDex(dAtA, i, uint64(len(m.AltBech32M))) - i-- - dAtA[i] = 0x12 - } if len(m.Inner) > 0 { i -= len(m.Inner) copy(dAtA[i:], m.Inner) @@ -3852,7 +3873,7 @@ func (m *PositionRewardClaim) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *SwapExecution) Marshal() (dAtA []byte, err error) { +func (m *Path) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -3862,19 +3883,19 @@ func (m *SwapExecution) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *SwapExecution) MarshalTo(dAtA []byte) (int, error) { +func (m *Path) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *SwapExecution) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *Path) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Output != nil { + if m.Phi != nil { { - size, err := m.Output.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Phi.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3884,9 +3905,23 @@ func (m *SwapExecution) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - if m.Input != nil { + if len(m.Route) > 0 { + for iNdEx := len(m.Route) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.Route[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintDex(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + } + if m.Pair != nil { { - size, err := m.Input.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Pair.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3894,8 +3929,31 @@ func (m *SwapExecution) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintDex(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *SwapExecution) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err } + return dAtA[:n], nil +} + +func (m *SwapExecution) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *SwapExecution) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l if len(m.Traces) > 0 { for iNdEx := len(m.Traces) - 1; iNdEx >= 0; iNdEx-- { { @@ -4200,6 +4258,19 @@ func (m *SwapPlaintext) Size() (n int) { return n } +func (m *MockFlowCiphertext) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Value != nil { + l = m.Value.Size() + n += 1 + l + sovDex(uint64(l)) + } + return n +} + func (m *SwapPlan) Size() (n int) { if m == nil { return 0 @@ -4214,14 +4285,6 @@ func (m *SwapPlan) Size() (n int) { if l > 0 { n += 1 + l + sovDex(uint64(l)) } - l = len(m.ProofBlindingR) - if l > 0 { - n += 1 + l + sovDex(uint64(l)) - } - l = len(m.ProofBlindingS) - if l > 0 { - n += 1 + l + sovDex(uint64(l)) - } return n } @@ -4245,14 +4308,6 @@ func (m *SwapClaimPlan) Size() (n int) { if m.EpochDuration != 0 { n += 1 + sovDex(uint64(m.EpochDuration)) } - l = len(m.ProofBlindingR) - if l > 0 { - n += 1 + l + sovDex(uint64(l)) - } - l = len(m.ProofBlindingS) - if l > 0 { - n += 1 + l + sovDex(uint64(l)) - } return n } @@ -4463,8 +4518,8 @@ func (m *BatchSwapOutputData) Size() (n int) { l = m.TradingPair.Size() n += 1 + l + sovDex(uint64(l)) } - if m.EpochStartingHeight != 0 { - n += 1 + sovDex(uint64(m.EpochStartingHeight)) + if m.EpochHeight != 0 { + n += 1 + sovDex(uint64(m.EpochHeight)) } return n } @@ -4545,9 +4600,6 @@ func (m *Position) Size() (n int) { l = m.Reserves.Size() n += 1 + l + sovDex(uint64(l)) } - if m.CloseOnFill { - n += 2 - } return n } @@ -4561,10 +4613,6 @@ func (m *PositionId) Size() (n int) { if l > 0 { n += 1 + l + sovDex(uint64(l)) } - l = len(m.AltBech32M) - if l > 0 { - n += 1 + l + sovDex(uint64(l)) - } return n } @@ -4657,25 +4705,40 @@ func (m *PositionRewardClaim) Size() (n int) { return n } -func (m *SwapExecution) Size() (n int) { +func (m *Path) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.Traces) > 0 { - for _, e := range m.Traces { + if m.Pair != nil { + l = m.Pair.Size() + n += 1 + l + sovDex(uint64(l)) + } + if len(m.Route) > 0 { + for _, e := range m.Route { l = e.Size() n += 1 + l + sovDex(uint64(l)) } } - if m.Input != nil { - l = m.Input.Size() + if m.Phi != nil { + l = m.Phi.Size() n += 1 + l + sovDex(uint64(l)) } - if m.Output != nil { - l = m.Output.Size() - n += 1 + l + sovDex(uint64(l)) + return n +} + +func (m *SwapExecution) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Traces) > 0 { + for _, e := range m.Traces { + l = e.Size() + n += 1 + l + sovDex(uint64(l)) + } } return n } @@ -5840,7 +5903,7 @@ func (m *SwapPlaintext) Unmarshal(dAtA []byte) error { } return nil } -func (m *SwapPlan) Unmarshal(dAtA []byte) error { +func (m *MockFlowCiphertext) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5863,15 +5926,15 @@ func (m *SwapPlan) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SwapPlan: wiretype end group for non-group") + return fmt.Errorf("proto: MockFlowCiphertext: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SwapPlan: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MockFlowCiphertext: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SwapPlaintext", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Value", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5898,52 +5961,68 @@ func (m *SwapPlan) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.SwapPlaintext == nil { - m.SwapPlaintext = &SwapPlaintext{} + if m.Value == nil { + m.Value = &v1alpha1.Amount{} } - if err := m.SwapPlaintext.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Value.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field FeeBlinding", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDex - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } + default: + iNdEx = preIndex + skippy, err := skipDex(dAtA[iNdEx:]) + if err != nil { + return err } - if byteLen < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthDex } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthDex + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF } - if postIndex > l { + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SwapPlan) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { return io.ErrUnexpectedEOF } - m.FeeBlinding = append(m.FeeBlinding[:0], dAtA[iNdEx:postIndex]...) - if m.FeeBlinding == nil { - m.FeeBlinding = []byte{} + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break } - iNdEx = postIndex - case 3: + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SwapPlan: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SwapPlan: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SwapPlaintext", wireType) } - var byteLen int + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -5953,29 +6032,31 @@ func (m *SwapPlan) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + if msglen < 0 { return ErrInvalidLengthDex } - postIndex := iNdEx + byteLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthDex } if postIndex > l { return io.ErrUnexpectedEOF } - m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingR == nil { - m.ProofBlindingR = []byte{} + if m.SwapPlaintext == nil { + m.SwapPlaintext = &SwapPlaintext{} + } + if err := m.SwapPlaintext.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } iNdEx = postIndex - case 4: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FeeBlinding", wireType) } var byteLen int for shift := uint(0); ; shift += 7 { @@ -6002,9 +6083,9 @@ func (m *SwapPlan) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingS == nil { - m.ProofBlindingS = []byte{} + m.FeeBlinding = append(m.FeeBlinding[:0], dAtA[iNdEx:postIndex]...) + if m.FeeBlinding == nil { + m.FeeBlinding = []byte{} } iNdEx = postIndex default: @@ -6167,74 +6248,6 @@ func (m *SwapClaimPlan) Unmarshal(dAtA []byte) error { break } } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDex - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthDex - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthDex - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingR == nil { - m.ProofBlindingR = []byte{} - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDex - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthDex - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthDex - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingS == nil { - m.ProofBlindingS = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDex(dAtA[iNdEx:]) @@ -7494,9 +7507,9 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 9: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EpochStartingHeight", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EpochHeight", wireType) } - m.EpochStartingHeight = 0 + m.EpochHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowDex @@ -7506,7 +7519,7 @@ func (m *BatchSwapOutputData) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.EpochStartingHeight |= uint64(b&0x7F) << shift + m.EpochHeight |= uint64(b&0x7F) << shift if b < 0x80 { break } @@ -8088,26 +8101,6 @@ func (m *Position) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field CloseOnFill", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDex - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.CloseOnFill = bool(v != 0) default: iNdEx = preIndex skippy, err := skipDex(dAtA[iNdEx:]) @@ -8192,38 +8185,6 @@ func (m *PositionId) Unmarshal(dAtA []byte) error { m.Inner = []byte{} } iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AltBech32M", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowDex - } - 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 ErrInvalidLengthDex - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthDex - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.AltBech32M = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDex(dAtA[iNdEx:]) @@ -8852,7 +8813,7 @@ func (m *PositionRewardClaim) Unmarshal(dAtA []byte) error { } return nil } -func (m *SwapExecution) Unmarshal(dAtA []byte) error { +func (m *Path) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8875,15 +8836,15 @@ func (m *SwapExecution) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: SwapExecution: wiretype end group for non-group") + return fmt.Errorf("proto: Path: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: SwapExecution: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Path: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Traces", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Pair", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8910,14 +8871,16 @@ func (m *SwapExecution) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Traces = append(m.Traces, &SwapExecution_Trace{}) - if err := m.Traces[len(m.Traces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if m.Pair == nil { + m.Pair = &DirectedTradingPair{} + } + if err := m.Pair.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Input", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Route", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8944,16 +8907,14 @@ func (m *SwapExecution) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Input == nil { - m.Input = &v1alpha1.Value{} - } - if err := m.Input.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.Route = append(m.Route, &v1alpha1.AssetId{}) + if err := m.Route[len(m.Route)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Output", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Phi", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8980,10 +8941,94 @@ func (m *SwapExecution) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Output == nil { - m.Output = &v1alpha1.Value{} + if m.Phi == nil { + m.Phi = &BareTradingFunction{} } - if err := m.Output.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Phi.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipDex(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthDex + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *SwapExecution) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: SwapExecution: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: SwapExecution: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Traces", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDex + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthDex + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthDex + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Traces = append(m.Traces, &SwapExecution_Trace{}) + if err := m.Traces[len(m.Traces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex diff --git a/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go b/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go index 80977b8d4..51a916c78 100644 --- a/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go +++ b/relayer/chains/penumbra/core/governance/v1alpha1/governance.pb.go @@ -531,10 +531,6 @@ type DelegatorVotePlan struct { UnbondedAmount *v1alpha1.Amount `protobuf:"bytes,6,opt,name=unbonded_amount,json=unbondedAmount,proto3" json:"unbonded_amount,omitempty"` // The randomizer to use for the proof of spend capability. Randomizer []byte `protobuf:"bytes,7,opt,name=randomizer,proto3" json:"randomizer,omitempty"` - // The first blinding factor to use for the ZK delegator vote proof. - ProofBlindingR []byte `protobuf:"bytes,8,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` - // The second blinding factor to use for the ZK delegator vote proof. - ProofBlindingS []byte `protobuf:"bytes,9,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *DelegatorVotePlan) Reset() { *m = DelegatorVotePlan{} } @@ -619,20 +615,6 @@ func (m *DelegatorVotePlan) GetRandomizer() []byte { return nil } -func (m *DelegatorVotePlan) GetProofBlindingR() []byte { - if m != nil { - return m.ProofBlindingR - } - return nil -} - -func (m *DelegatorVotePlan) GetProofBlindingS() []byte { - if m != nil { - return m.ProofBlindingS - } - return nil -} - type DaoDeposit struct { // The value to deposit into the DAO. Value *v1alpha1.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` @@ -1829,104 +1811,102 @@ func init() { } var fileDescriptor_1bc89f5bf0aed114 = []byte{ - // 1546 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x5d, 0x6f, 0x1b, 0x45, - 0x17, 0xf6, 0x3a, 0x8e, 0x3f, 0x4e, 0x12, 0xc7, 0x9d, 0x37, 0x6f, 0xe5, 0xd7, 0x2f, 0x44, 0xa9, - 0xdb, 0x42, 0x54, 0xa8, 0x4d, 0x53, 0x50, 0xa9, 0x7b, 0x41, 0x63, 0xe7, 0x53, 0x6d, 0x13, 0x77, - 0x1d, 0x52, 0x28, 0x91, 0x96, 0xb1, 0x77, 0x62, 0xaf, 0xb2, 0x9e, 0xb1, 0x76, 0xc7, 0x89, 0xcc, - 0x2f, 0x80, 0xbb, 0x4a, 0xfc, 0x03, 0x24, 0x84, 0xc4, 0x7f, 0xe0, 0x1e, 0x21, 0x01, 0xbd, 0x2c, - 0x77, 0x28, 0xb9, 0xe3, 0x92, 0x5f, 0x80, 0x66, 0x76, 0xf6, 0x23, 0x1f, 0xd4, 0x75, 0x42, 0xc5, - 0xdd, 0x9c, 0xe3, 0xf3, 0x3c, 0xe7, 0x63, 0xce, 0xcc, 0x1c, 0x2f, 0x2c, 0xf4, 0x08, 0xed, 0x77, - 0x9b, 0x0e, 0x2e, 0xb7, 0x98, 0x43, 0xca, 0x6d, 0xb6, 0x4f, 0x1c, 0x8a, 0x69, 0x8b, 0x94, 0xf7, - 0x6f, 0x61, 0xbb, 0xd7, 0xc1, 0xb7, 0x22, 0xba, 0x52, 0xcf, 0x61, 0x9c, 0xa1, 0x2b, 0x3e, 0xa6, - 0x24, 0x30, 0xa5, 0xc8, 0xef, 0x3e, 0xa6, 0xf0, 0xbf, 0x36, 0x63, 0x6d, 0x9b, 0x94, 0x25, 0xa0, - 0xd9, 0xdf, 0x2d, 0x63, 0x3a, 0xf0, 0xd0, 0x85, 0x1b, 0xc7, 0x3d, 0xb6, 0x9c, 0x41, 0x8f, 0xb3, - 0xd0, 0x9b, 0x27, 0x2b, 0xdb, 0xf9, 0x13, 0xb6, 0x1d, 0x6c, 0xd1, 0x88, 0xa9, 0x10, 0x3d, 0xcb, - 0xe2, 0x77, 0x1a, 0x64, 0xeb, 0x0e, 0xeb, 0x31, 0x17, 0xdb, 0x8d, 0x7e, 0xb3, 0x6b, 0x71, 0xb4, - 0x0a, 0xe9, 0x9e, 0xd2, 0xe4, 0xb5, 0x39, 0x6d, 0x7e, 0x62, 0xe1, 0x9d, 0xd2, 0xd0, 0xc8, 0x4b, - 0x3e, 0x89, 0x1e, 0x80, 0xd1, 0x43, 0xc8, 0x9a, 0xa4, 0xc7, 0x5c, 0x8b, 0x1b, 0xb8, 0xcb, 0xfa, - 0x94, 0xe7, 0xc7, 0x24, 0xdd, 0xf5, 0x13, 0x74, 0x2a, 0xf4, 0x80, 0x6a, 0x51, 0x1a, 0xeb, 0x53, - 0x0a, 0xec, 0x89, 0xc5, 0x15, 0xc8, 0xf9, 0x3e, 0x9e, 0x58, 0xbc, 0x63, 0x3a, 0xf8, 0x00, 0x15, - 0x4e, 0x84, 0x9a, 0x88, 0x78, 0xbf, 0x0c, 0x49, 0x87, 0x60, 0x97, 0xd1, 0x7c, 0x7c, 0x4e, 0x9b, - 0xcf, 0xe8, 0x4a, 0x2a, 0xfe, 0xa2, 0xc1, 0x8c, 0x4f, 0xb4, 0xe4, 0x79, 0xa8, 0xd9, 0xd8, 0xea, - 0xbe, 0x94, 0xec, 0x74, 0x2a, 0xf1, 0xf3, 0xa7, 0x82, 0x1e, 0x42, 0x8a, 0xf5, 0x79, 0x8b, 0x75, - 0x89, 0xaa, 0xc8, 0xc2, 0x08, 0x05, 0xde, 0xf4, 0x90, 0xba, 0x4f, 0x21, 0xb6, 0x70, 0x6a, 0x1b, - 0xdb, 0x96, 0x89, 0x39, 0x73, 0xb6, 0x19, 0x27, 0x68, 0x0d, 0x12, 0x4d, 0x66, 0x0e, 0xd4, 0xee, - 0xbd, 0xff, 0x0a, 0xe4, 0xc7, 0xf0, 0x55, 0x66, 0x0e, 0x74, 0xc9, 0x80, 0x1e, 0x42, 0x1a, 0xf7, - 0x79, 0xc7, 0x70, 0xad, 0xb6, 0xca, 0xf8, 0xd6, 0x90, 0x8c, 0x1b, 0x3d, 0x42, 0xcd, 0xc5, 0x3e, - 0xef, 0x34, 0xac, 0x36, 0xc5, 0xbc, 0xef, 0x10, 0x3d, 0x85, 0x3d, 0xb1, 0xf8, 0x2c, 0x0e, 0x97, - 0x4e, 0x79, 0x7a, 0x69, 0xdd, 0xef, 0x41, 0x62, 0x9f, 0x71, 0xa2, 0x7c, 0xbf, 0xfd, 0x2a, 0x99, - 0x30, 0x4e, 0x74, 0x09, 0x42, 0x8f, 0x60, 0xd2, 0x32, 0x09, 0xe5, 0x16, 0x1f, 0x18, 0x7b, 0x64, - 0xa0, 0x6a, 0x7d, 0x63, 0x48, 0x02, 0xeb, 0x0a, 0xf2, 0x80, 0x0c, 0xf4, 0x09, 0x2b, 0x14, 0x50, - 0x03, 0xb2, 0xa1, 0x43, 0x49, 0x98, 0x90, 0x84, 0xef, 0x0e, 0x21, 0x5c, 0x0d, 0x40, 0x82, 0x72, - 0xaa, 0x1d, 0x15, 0x8b, 0x7f, 0x6a, 0x30, 0xb5, 0x44, 0x6c, 0xd2, 0xbe, 0xc0, 0xe6, 0x1d, 0xc3, - 0xbf, 0xae, 0xcd, 0x43, 0xeb, 0x30, 0xde, 0x73, 0x18, 0xdb, 0x55, 0x65, 0xbc, 0x3d, 0x84, 0xea, - 0xe9, 0x83, 0x63, 0x61, 0xd5, 0x05, 0x54, 0xf7, 0x18, 0x8a, 0x3f, 0xc7, 0xe1, 0xd2, 0xa9, 0xa0, - 0x5f, 0xda, 0x07, 0xd7, 0x21, 0xeb, 0x72, 0xec, 0x70, 0x43, 0x1e, 0x23, 0x4b, 0x1d, 0xea, 0x84, - 0x3e, 0x25, 0xb5, 0x75, 0xa5, 0x0c, 0xda, 0x65, 0xec, 0x3c, 0xed, 0x52, 0x81, 0xf1, 0x7d, 0x6c, - 0xf7, 0x89, 0xda, 0xd6, 0x6b, 0x43, 0x12, 0xdc, 0x16, 0xb6, 0xba, 0x07, 0x41, 0x1b, 0x30, 0xdd, - 0xa7, 0x4d, 0x46, 0x4d, 0x62, 0xfa, 0x17, 0xc4, 0xf8, 0x28, 0x17, 0x44, 0xd6, 0x47, 0xab, 0x1b, - 0xe2, 0x0d, 0xc8, 0xd0, 0xbe, 0x6d, 0x5b, 0xbb, 0x16, 0x71, 0xf2, 0xc9, 0x39, 0x6d, 0x7e, 0x52, - 0x0f, 0x15, 0x28, 0x0b, 0x71, 0x67, 0x2f, 0x9f, 0x92, 0xea, 0xb8, 0xb3, 0x57, 0xfc, 0x75, 0xec, - 0x44, 0x3d, 0xeb, 0x36, 0xa6, 0xff, 0x7a, 0x3d, 0x97, 0x60, 0xc2, 0xe5, 0x78, 0x8f, 0x98, 0x06, - 0x15, 0x1c, 0x5e, 0x55, 0xaf, 0x0e, 0xa9, 0xc7, 0x86, 0xc0, 0x83, 0x87, 0x13, 0x6b, 0xf4, 0x1e, - 0xcc, 0x44, 0x58, 0xc2, 0x78, 0xc7, 0x65, 0xbc, 0x28, 0xb4, 0x0c, 0x82, 0x3e, 0x63, 0x2f, 0x92, - 0x17, 0xd9, 0x8b, 0x59, 0x00, 0x07, 0x53, 0x93, 0x75, 0xad, 0x2f, 0x88, 0xa3, 0xaa, 0x1e, 0xd1, - 0xa0, 0x79, 0xc8, 0xc9, 0xb6, 0x36, 0x9a, 0xb6, 0x45, 0x4d, 0x8b, 0xb6, 0x0d, 0x27, 0x9f, 0x96, - 0x56, 0x59, 0xa9, 0xaf, 0x2a, 0xb5, 0x7e, 0x86, 0xa5, 0x9b, 0xcf, 0x9c, 0x61, 0xd9, 0x28, 0xae, - 0x01, 0x2c, 0x61, 0xa6, 0x9e, 0xa7, 0xb0, 0x33, 0xb5, 0x91, 0x3b, 0xb3, 0xb8, 0x02, 0xe9, 0x25, - 0xcc, 0xe4, 0xc1, 0xbe, 0x10, 0xcf, 0x57, 0x1a, 0x64, 0x96, 0x30, 0xdb, 0xec, 0xf3, 0x5e, 0xff, - 0x42, 0x11, 0xa1, 0xfb, 0x90, 0xc2, 0xa6, 0xe9, 0x10, 0xd7, 0x55, 0xb7, 0xd2, 0x5b, 0xc3, 0xf6, - 0xc5, 0xb3, 0xd6, 0x7d, 0x58, 0xf1, 0x6b, 0x0d, 0x12, 0xf2, 0xae, 0xbc, 0xaf, 0xfa, 0x53, 0x44, - 0x91, 0x3d, 0x75, 0x11, 0xff, 0x5d, 0x7f, 0x46, 0x9a, 0xb4, 0xb8, 0xae, 0x98, 0x66, 0x20, 0xb7, - 0xbd, 0xb9, 0xb5, 0x6c, 0x7c, 0xbc, 0xd1, 0xa8, 0x2f, 0xd7, 0xd6, 0x57, 0xd6, 0x97, 0x97, 0x72, - 0x31, 0x94, 0x83, 0x49, 0xa9, 0x5d, 0xac, 0x36, 0xb6, 0x16, 0xd7, 0x37, 0x72, 0x1a, 0x9a, 0x84, - 0xb4, 0xd4, 0x7c, 0xba, 0xdc, 0xc8, 0xc5, 0xd1, 0x04, 0xa4, 0xa4, 0xb4, 0xb1, 0x99, 0x1b, 0x2b, - 0xbe, 0x48, 0xc0, 0x54, 0x30, 0x4a, 0x71, 0xcc, 0x09, 0x7a, 0x0c, 0xc9, 0x7d, 0xc6, 0x2d, 0xea, - 0x5f, 0xbf, 0x77, 0x46, 0x78, 0xe6, 0x25, 0x83, 0x88, 0xd4, 0xa2, 0xed, 0xb5, 0x98, 0xae, 0x88, - 0xd0, 0x53, 0xc8, 0x1c, 0xa8, 0xe9, 0x87, 0xaa, 0x63, 0x59, 0x19, 0x99, 0xd5, 0x9f, 0x9f, 0xe8, - 0x5a, 0x4c, 0x0f, 0xe9, 0xd0, 0x13, 0x48, 0xef, 0x5a, 0xd4, 0x72, 0x3b, 0xc4, 0x54, 0xa7, 0xf5, - 0xee, 0xc8, 0xd4, 0x2b, 0x8a, 0x60, 0x2d, 0xa6, 0x07, 0x64, 0x68, 0x0b, 0x52, 0x2d, 0x31, 0x62, - 0x11, 0x53, 0xdd, 0x8a, 0x1f, 0x8e, 0xcc, 0x5b, 0xf3, 0xf0, 0x6b, 0x31, 0xdd, 0xa7, 0x2a, 0xa4, - 0x21, 0xe9, 0x95, 0xa7, 0x70, 0x15, 0x32, 0x41, 0x4a, 0x91, 0xb9, 0x4f, 0x8b, 0xce, 0x7d, 0x85, - 0x4f, 0x20, 0xed, 0x07, 0x17, 0x1d, 0xc0, 0xb4, 0x0b, 0x0f, 0x60, 0x85, 0x27, 0x90, 0x52, 0xe1, - 0xfd, 0xb3, 0xc4, 0xd5, 0x14, 0x8c, 0xbb, 0x22, 0xfb, 0xe2, 0xd1, 0x18, 0x4c, 0x9f, 0xb0, 0x42, - 0x0d, 0x48, 0xf6, 0xb0, 0xeb, 0x12, 0x53, 0x79, 0xba, 0x3b, 0xba, 0xa7, 0x52, 0x5d, 0x12, 0x88, - 0xf6, 0xf2, 0xa8, 0x04, 0xe9, 0x2e, 0xb6, 0x6c, 0x62, 0xaa, 0x8e, 0x3d, 0x0f, 0xe9, 0x8a, 0x24, - 0x10, 0xa4, 0x1e, 0x15, 0xda, 0x86, 0x94, 0x6b, 0x63, 0xd9, 0x56, 0xa3, 0x77, 0xac, 0xcf, 0xda, - 0xf0, 0x18, 0x44, 0x03, 0x28, 0x32, 0xd1, 0x00, 0x5e, 0x02, 0x85, 0xcf, 0x20, 0xe9, 0x79, 0x45, - 0x77, 0xe0, 0xbf, 0x41, 0x43, 0x1b, 0x62, 0x65, 0x44, 0x9b, 0x61, 0x2d, 0xa6, 0xff, 0x27, 0xf8, - 0x59, 0xb4, 0x8c, 0x2e, 0x7f, 0xfc, 0x52, 0xd3, 0xaa, 0x79, 0xb8, 0x6c, 0x9c, 0x89, 0x2c, 0xec, - 0x40, 0x4a, 0x39, 0x7f, 0x0d, 0xec, 0xd5, 0x4c, 0xd0, 0x31, 0xc5, 0x1a, 0x8c, 0x6f, 0x61, 0xdb, - 0x1e, 0xa0, 0x1c, 0x8c, 0x0d, 0x88, 0xab, 0x1e, 0x6d, 0xb1, 0x14, 0x2f, 0x3e, 0x65, 0xea, 0x8d, - 0x8e, 0x53, 0x86, 0xf2, 0x90, 0xc2, 0x4d, 0x97, 0x63, 0xcb, 0xbb, 0x04, 0x12, 0xba, 0x2f, 0x16, - 0xbf, 0x4d, 0x42, 0xda, 0xaf, 0x9d, 0x80, 0x59, 0xde, 0x59, 0x4e, 0xe8, 0x71, 0xcb, 0x44, 0x33, - 0x30, 0xce, 0x2d, 0x6e, 0x13, 0x75, 0x34, 0x3c, 0x01, 0xcd, 0xc1, 0x84, 0x49, 0xdc, 0x96, 0x63, - 0xf5, 0x82, 0x49, 0x20, 0xa3, 0x47, 0x55, 0xa8, 0x01, 0x19, 0x57, 0x4c, 0x84, 0xb6, 0xb8, 0xcb, - 0xbc, 0x23, 0xfc, 0xc1, 0x08, 0x7b, 0x58, 0x6a, 0xf8, 0x60, 0x3d, 0xe4, 0x11, 0xa4, 0xa4, 0x4b, - 0x9c, 0x36, 0xa1, 0xad, 0x81, 0x7a, 0xa1, 0x47, 0x22, 0x5d, 0xf6, 0xc1, 0x7a, 0xc8, 0x83, 0x76, - 0x21, 0xd7, 0xc3, 0x0e, 0xee, 0x12, 0x4e, 0x1c, 0xa3, 0xd5, 0xc1, 0xb4, 0x4d, 0xe4, 0x93, 0x3d, - 0xb1, 0x70, 0x6f, 0x14, 0xee, 0xba, 0xcf, 0x51, 0x93, 0x14, 0xfa, 0x74, 0xef, 0xb8, 0x02, 0x3d, - 0x86, 0x8c, 0x89, 0x99, 0xe1, 0x8a, 0x77, 0x55, 0xbe, 0xf6, 0xaf, 0x36, 0xaa, 0x07, 0x0e, 0xfc, - 0x37, 0x59, 0x4f, 0x9b, 0x6a, 0x55, 0xb8, 0x0d, 0x99, 0xa0, 0x4e, 0xe8, 0xff, 0x90, 0x6c, 0xb1, - 0x6e, 0xd7, 0xe2, 0x41, 0x6b, 0x29, 0x59, 0x74, 0x53, 0x06, 0x52, 0x86, 0x27, 0x15, 0x6e, 0x40, - 0x26, 0xa8, 0x03, 0x7a, 0x13, 0xa0, 0x83, 0x6d, 0x6e, 0xc8, 0x3f, 0xf8, 0x12, 0x98, 0xd6, 0x33, - 0x42, 0x53, 0x13, 0x8a, 0xc2, 0x0f, 0x1a, 0x4c, 0x9f, 0x48, 0x0c, 0x6d, 0x41, 0x96, 0xd9, 0xa6, - 0x11, 0xa4, 0xe7, 0xaa, 0xdb, 0xe4, 0xe6, 0xc9, 0x37, 0x59, 0x7e, 0x33, 0x08, 0xf2, 0x90, 0x84, - 0x01, 0x97, 0xab, 0x4f, 0x31, 0xdb, 0x0c, 0x45, 0xc1, 0x4a, 0xc9, 0x41, 0x94, 0x35, 0x7e, 0x2e, - 0x56, 0x4a, 0x0e, 0x42, 0xb1, 0xf0, 0x20, 0x32, 0xca, 0x7c, 0x04, 0x39, 0xee, 0x60, 0xea, 0xe2, - 0x96, 0x68, 0x50, 0xa3, 0x67, 0x63, 0xaa, 0x7c, 0xcc, 0x94, 0xbc, 0x6f, 0x28, 0x25, 0xff, 0x1b, - 0x4a, 0x69, 0x91, 0x0e, 0xf4, 0xe9, 0x88, 0xb5, 0x98, 0x8e, 0xab, 0xbf, 0xc5, 0x7f, 0x3c, 0x9c, - 0xd5, 0x9e, 0x1f, 0xce, 0x6a, 0xbf, 0x1f, 0xce, 0x6a, 0xcf, 0x8e, 0x66, 0x63, 0xcf, 0x8f, 0x66, - 0x63, 0x2f, 0x8e, 0x66, 0x63, 0x70, 0xbd, 0xc5, 0xba, 0xc3, 0xf7, 0xb2, 0x3a, 0x1d, 0xfe, 0xb1, - 0xab, 0x0b, 0x57, 0x75, 0xed, 0xe9, 0xe7, 0x6d, 0x8b, 0x77, 0xfa, 0xcd, 0x52, 0x8b, 0x75, 0xcb, - 0x2d, 0xe6, 0x76, 0x99, 0x5b, 0x76, 0x88, 0x8d, 0x07, 0xc4, 0x29, 0xef, 0x2f, 0x04, 0x4b, 0x99, - 0xb5, 0x5b, 0x1e, 0xfa, 0x05, 0xe9, 0x5e, 0xa8, 0xf3, 0x55, 0xdf, 0xc4, 0xc7, 0xea, 0xb5, 0xd5, - 0xef, 0xe3, 0x57, 0xea, 0x7e, 0x78, 0x35, 0x11, 0x5e, 0x18, 0x49, 0x69, 0x5b, 0x59, 0xfe, 0x14, - 0xda, 0xec, 0x08, 0x9b, 0x9d, 0xd0, 0x66, 0xc7, 0xb7, 0x39, 0x8c, 0xdf, 0x1c, 0x6a, 0xb3, 0xb3, - 0x5a, 0xaf, 0x3e, 0x22, 0x1c, 0x9b, 0x98, 0xe3, 0x3f, 0xe2, 0xd7, 0x7c, 0xfb, 0x4a, 0x45, 0x00, - 0x2a, 0x95, 0x10, 0x51, 0xa9, 0xf8, 0x90, 0x66, 0x52, 0x96, 0xfe, 0xf6, 0x5f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x07, 0xf0, 0xab, 0xae, 0x25, 0x13, 0x00, 0x00, + // 1512 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0x1b, 0x45, + 0x14, 0xf7, 0x3a, 0x8e, 0x3f, 0x5e, 0x12, 0xc7, 0x1d, 0x42, 0x65, 0x0c, 0x44, 0xe9, 0xb6, 0x85, + 0xa8, 0x50, 0x9b, 0xa6, 0xa0, 0x52, 0xf7, 0x40, 0x63, 0xe7, 0x53, 0x6d, 0x13, 0x77, 0x1d, 0x52, + 0x28, 0x91, 0x96, 0xb1, 0x77, 0x62, 0xaf, 0xb2, 0x9e, 0x59, 0xed, 0x8e, 0x13, 0x99, 0xbf, 0x00, + 0x6e, 0x95, 0xf8, 0x0f, 0x90, 0x10, 0x12, 0xff, 0x03, 0x77, 0x84, 0x04, 0xea, 0xb1, 0xdc, 0x50, + 0x72, 0xe3, 0xc8, 0x95, 0x0b, 0x9a, 0xdd, 0xd9, 0x8f, 0x24, 0xa5, 0xae, 0x13, 0x2a, 0x6e, 0xfb, + 0xde, 0xbe, 0xdf, 0xef, 0x7d, 0xcc, 0x9b, 0x99, 0xb7, 0x0b, 0x0b, 0x36, 0xa1, 0xfd, 0x5e, 0xcb, + 0xc1, 0x95, 0x36, 0x73, 0x48, 0xa5, 0xc3, 0xf6, 0x89, 0x43, 0x31, 0x6d, 0x93, 0xca, 0xfe, 0x0d, + 0x6c, 0xd9, 0x5d, 0x7c, 0x23, 0xa6, 0x2b, 0xdb, 0x0e, 0xe3, 0x0c, 0x5d, 0x0a, 0x30, 0x65, 0x81, + 0x29, 0xc7, 0xde, 0x07, 0x98, 0xd2, 0x1b, 0x1d, 0xc6, 0x3a, 0x16, 0xa9, 0x78, 0x80, 0x56, 0x7f, + 0xb7, 0x82, 0xe9, 0xc0, 0x47, 0x97, 0xae, 0x1d, 0xf7, 0xd8, 0x76, 0x06, 0x36, 0x67, 0x91, 0x37, + 0x5f, 0x96, 0xb6, 0xf3, 0x27, 0x6c, 0xbb, 0xd8, 0xa4, 0x31, 0x53, 0x21, 0xfa, 0x96, 0xea, 0x0f, + 0x0a, 0xe4, 0x1b, 0x0e, 0xb3, 0x99, 0x8b, 0xad, 0x66, 0xbf, 0xd5, 0x33, 0x39, 0x5a, 0x85, 0xac, + 0x2d, 0x35, 0x45, 0x65, 0x4e, 0x99, 0x9f, 0x58, 0x78, 0xaf, 0x3c, 0x34, 0xf2, 0x72, 0x40, 0xa2, + 0x85, 0x60, 0x74, 0x1f, 0xf2, 0x06, 0xb1, 0x99, 0x6b, 0x72, 0x1d, 0xf7, 0x58, 0x9f, 0xf2, 0xe2, + 0x98, 0x47, 0x77, 0xf5, 0x04, 0x9d, 0x0c, 0x3d, 0xa4, 0x5a, 0xf4, 0x8c, 0xb5, 0x29, 0x09, 0xf6, + 0x45, 0x75, 0x05, 0x0a, 0x81, 0x8f, 0x47, 0x26, 0xef, 0x1a, 0x0e, 0x3e, 0x40, 0xa5, 0x13, 0xa1, + 0xa6, 0x62, 0xde, 0x2f, 0x42, 0xda, 0x21, 0xd8, 0x65, 0xb4, 0x98, 0x9c, 0x53, 0xe6, 0x73, 0x9a, + 0x94, 0xd4, 0xdf, 0x14, 0x98, 0x09, 0x88, 0x96, 0x7c, 0x0f, 0x75, 0x0b, 0x9b, 0xbd, 0x17, 0x92, + 0x9d, 0x4e, 0x25, 0x79, 0xf6, 0x54, 0xd0, 0x7d, 0xc8, 0xb0, 0x3e, 0x6f, 0xb3, 0x1e, 0x91, 0x15, + 0x59, 0x18, 0xa1, 0xc0, 0x9b, 0x3e, 0x52, 0x0b, 0x28, 0xc4, 0x12, 0x4e, 0x6d, 0x63, 0xcb, 0x34, + 0x30, 0x67, 0xce, 0x36, 0xe3, 0x04, 0xad, 0x41, 0xaa, 0xc5, 0x8c, 0x81, 0x5c, 0xbd, 0x0f, 0x5f, + 0x82, 0xfc, 0x18, 0xbe, 0xc6, 0x8c, 0x81, 0xe6, 0x31, 0xa0, 0xfb, 0x90, 0xc5, 0x7d, 0xde, 0xd5, + 0x5d, 0xb3, 0x23, 0x33, 0xbe, 0x31, 0x24, 0xe3, 0xa6, 0x4d, 0xa8, 0xb1, 0xd8, 0xe7, 0xdd, 0xa6, + 0xd9, 0xa1, 0x98, 0xf7, 0x1d, 0xa2, 0x65, 0xb0, 0x2f, 0xaa, 0x4f, 0x92, 0x70, 0xe1, 0x94, 0xa7, + 0x17, 0xd6, 0xfd, 0x0e, 0xa4, 0xf6, 0x19, 0x27, 0xd2, 0xf7, 0xbb, 0x2f, 0x93, 0x09, 0xe3, 0x44, + 0xf3, 0x40, 0xe8, 0x01, 0x4c, 0x9a, 0x06, 0xa1, 0xdc, 0xe4, 0x03, 0x7d, 0x8f, 0x0c, 0x64, 0xad, + 0xaf, 0x0d, 0x49, 0x60, 0x5d, 0x42, 0xee, 0x91, 0x81, 0x36, 0x61, 0x46, 0x02, 0x6a, 0x42, 0x3e, + 0x72, 0xe8, 0x11, 0xa6, 0x3c, 0xc2, 0xf7, 0x87, 0x10, 0xae, 0x86, 0x20, 0x41, 0x39, 0xd5, 0x89, + 0x8b, 0xea, 0x5f, 0x0a, 0x4c, 0x2d, 0x11, 0x8b, 0x74, 0xce, 0xb1, 0x78, 0xc7, 0xf0, 0xaf, 0x6a, + 0xf1, 0xd0, 0x3a, 0x8c, 0xdb, 0x0e, 0x63, 0xbb, 0xb2, 0x8c, 0x37, 0x87, 0x50, 0x3d, 0xbe, 0x77, + 0x2c, 0xac, 0x86, 0x80, 0x6a, 0x3e, 0x83, 0xfa, 0x6b, 0x12, 0x2e, 0x9c, 0x0a, 0xfa, 0x85, 0x7d, + 0x70, 0x15, 0xf2, 0x2e, 0xc7, 0x0e, 0xd7, 0xbd, 0x6d, 0x64, 0xca, 0x4d, 0x9d, 0xd2, 0xa6, 0x3c, + 0x6d, 0x43, 0x2a, 0xc3, 0x76, 0x19, 0x3b, 0x4b, 0xbb, 0x54, 0x61, 0x7c, 0x1f, 0x5b, 0x7d, 0x22, + 0x97, 0xf5, 0xca, 0x90, 0x04, 0xb7, 0x85, 0xad, 0xe6, 0x43, 0xd0, 0x06, 0x4c, 0xf7, 0x69, 0x8b, + 0x51, 0x83, 0x18, 0xc1, 0x01, 0x31, 0x3e, 0xca, 0x01, 0x91, 0x0f, 0xd0, 0xf2, 0x84, 0x78, 0x0b, + 0x72, 0xb4, 0x6f, 0x59, 0xe6, 0xae, 0x49, 0x9c, 0x62, 0x7a, 0x4e, 0x99, 0x9f, 0xd4, 0x22, 0x05, + 0xca, 0x43, 0xd2, 0xd9, 0x2b, 0x66, 0x3c, 0x75, 0xd2, 0xd9, 0x53, 0xff, 0x3e, 0x59, 0xcf, 0x86, + 0x85, 0xe9, 0xff, 0x5e, 0xcf, 0x25, 0x98, 0x70, 0x39, 0xde, 0x23, 0x86, 0x4e, 0x05, 0x87, 0x5f, + 0xd5, 0xcb, 0x43, 0xea, 0xb1, 0x21, 0xf0, 0xe0, 0xe3, 0xc4, 0x33, 0xfa, 0x00, 0x66, 0x62, 0x2c, + 0x51, 0xbc, 0xe3, 0x5e, 0xbc, 0x28, 0xb2, 0x0c, 0x83, 0x7e, 0xce, 0x5a, 0xa4, 0xcf, 0xb3, 0x16, + 0xb3, 0x00, 0x0e, 0xa6, 0x06, 0xeb, 0x99, 0x5f, 0x11, 0x47, 0x56, 0x3d, 0xa6, 0x51, 0xd7, 0x00, + 0x96, 0x30, 0x93, 0x57, 0x49, 0xd4, 0x45, 0xca, 0xc8, 0x5d, 0xa4, 0xae, 0x40, 0x76, 0x09, 0x33, + 0x6f, 0x13, 0x9e, 0x8b, 0xe7, 0x1b, 0x05, 0x72, 0x4b, 0x98, 0x6d, 0xf6, 0xb9, 0xdd, 0x3f, 0x57, + 0x44, 0xe8, 0x2e, 0x64, 0xb0, 0x61, 0x38, 0xc4, 0x75, 0xe5, 0x09, 0xf2, 0xce, 0xb0, 0x1a, 0xfa, + 0xd6, 0x5a, 0x00, 0x53, 0xbf, 0x55, 0x20, 0xe5, 0x9d, 0x6b, 0x77, 0x65, 0x2f, 0x89, 0x28, 0xf2, + 0xa7, 0x0e, 0xcd, 0x7f, 0xeb, 0xa5, 0x58, 0x43, 0xa9, 0xeb, 0x92, 0x69, 0x06, 0x0a, 0xdb, 0x9b, + 0x5b, 0xcb, 0xfa, 0xa7, 0x1b, 0xcd, 0xc6, 0x72, 0x7d, 0x7d, 0x65, 0x7d, 0x79, 0xa9, 0x90, 0x40, + 0x05, 0x98, 0xf4, 0xb4, 0x8b, 0xb5, 0xe6, 0xd6, 0xe2, 0xfa, 0x46, 0x41, 0x41, 0x93, 0x90, 0xf5, + 0x34, 0x9f, 0x2f, 0x37, 0x0b, 0x49, 0x34, 0x01, 0x19, 0x4f, 0xda, 0xd8, 0x2c, 0x8c, 0xa9, 0xcf, + 0x52, 0x30, 0x15, 0x8e, 0x3d, 0x1c, 0x73, 0x82, 0x1e, 0x42, 0x7a, 0x9f, 0x71, 0x93, 0x06, 0x47, + 0xe5, 0xad, 0x11, 0xae, 0x64, 0x8f, 0x41, 0x44, 0x6a, 0xd2, 0xce, 0x5a, 0x42, 0x93, 0x44, 0xe8, + 0x31, 0xe4, 0x0e, 0xe4, 0xa4, 0x42, 0xe5, 0x16, 0xaa, 0x8e, 0xcc, 0x1a, 0xcc, 0x3a, 0x74, 0x2d, + 0xa1, 0x45, 0x74, 0xe8, 0x11, 0x64, 0x77, 0x4d, 0x6a, 0xba, 0x5d, 0x62, 0xc8, 0x9d, 0x75, 0x7b, + 0x64, 0xea, 0x15, 0x49, 0xb0, 0x96, 0xd0, 0x42, 0x32, 0xb4, 0x05, 0x99, 0xb6, 0x18, 0x87, 0x88, + 0x21, 0x4f, 0xb0, 0x8f, 0x47, 0xe6, 0xad, 0xfb, 0xf8, 0xb5, 0x84, 0x16, 0x50, 0x95, 0xb2, 0x90, + 0xf6, 0xcb, 0x53, 0xba, 0x0c, 0xb9, 0x30, 0xa5, 0xd8, 0x8c, 0xa6, 0xc4, 0x67, 0xb4, 0xd2, 0x67, + 0x90, 0x0d, 0x82, 0x8b, 0x0f, 0x4b, 0xca, 0xb9, 0x87, 0xa5, 0xd2, 0x23, 0xc8, 0xc8, 0xf0, 0xfe, + 0x5b, 0xe2, 0x5a, 0x06, 0xc6, 0x5d, 0x91, 0xbd, 0x7a, 0x34, 0x06, 0xd3, 0x27, 0xac, 0x50, 0x13, + 0xd2, 0x36, 0x76, 0x5d, 0x62, 0x48, 0x4f, 0xb7, 0x47, 0xf7, 0x54, 0x6e, 0x78, 0x04, 0xa2, 0xbd, + 0x7c, 0x2a, 0x41, 0xba, 0x8b, 0x4d, 0x8b, 0x18, 0xb2, 0x63, 0xcf, 0x42, 0xba, 0xe2, 0x11, 0x08, + 0x52, 0x9f, 0x0a, 0x6d, 0x43, 0xc6, 0xb5, 0xb0, 0xd7, 0x56, 0xa3, 0x77, 0x6c, 0xc0, 0xda, 0xf4, + 0x19, 0x44, 0x03, 0x48, 0x32, 0xd1, 0x00, 0x7e, 0x02, 0xa5, 0x2f, 0x20, 0xed, 0x7b, 0x45, 0xb7, + 0xe0, 0xf5, 0xb0, 0xa1, 0x75, 0xf1, 0xa4, 0xc7, 0x9b, 0x61, 0x2d, 0xa1, 0xbd, 0x16, 0xbe, 0x16, + 0x2d, 0xa3, 0x79, 0x2f, 0xbf, 0x56, 0x94, 0x5a, 0x11, 0x2e, 0xea, 0xcf, 0x45, 0x96, 0x76, 0x20, + 0x23, 0x9d, 0xbf, 0x02, 0xf6, 0x5a, 0x2e, 0xec, 0x18, 0xb5, 0x0e, 0xe3, 0x5b, 0xd8, 0xb2, 0x06, + 0xa8, 0x00, 0x63, 0x03, 0xe2, 0xca, 0x0b, 0x56, 0x3c, 0x8a, 0xdb, 0x99, 0x32, 0x79, 0x9f, 0x26, + 0x29, 0x43, 0x45, 0xc8, 0xe0, 0x96, 0xcb, 0xb1, 0xe9, 0x1f, 0x02, 0x29, 0x2d, 0x10, 0xd5, 0xef, + 0xd3, 0x90, 0x0d, 0x6a, 0x27, 0x60, 0xa6, 0xbf, 0x97, 0x53, 0x5a, 0xd2, 0x34, 0xd0, 0x0c, 0x8c, + 0x73, 0x93, 0x5b, 0x44, 0x6e, 0x0d, 0x5f, 0x40, 0x73, 0x30, 0x61, 0x10, 0xb7, 0xed, 0x98, 0x76, + 0x78, 0x6b, 0xe7, 0xb4, 0xb8, 0x0a, 0x35, 0x21, 0xe7, 0x8a, 0xe9, 0xcd, 0x12, 0x67, 0x99, 0xbf, + 0x85, 0x3f, 0x1a, 0x61, 0x0d, 0xcb, 0xcd, 0x00, 0xac, 0x45, 0x3c, 0x82, 0x94, 0xf4, 0x88, 0xd3, + 0x21, 0xb4, 0x3d, 0x90, 0xb7, 0xe9, 0x48, 0xa4, 0xcb, 0x01, 0x58, 0x8b, 0x78, 0xd0, 0x2e, 0x14, + 0x6c, 0xec, 0xe0, 0x1e, 0xe1, 0xc4, 0xd1, 0xdb, 0x5d, 0x4c, 0x3b, 0xc4, 0xbb, 0x5e, 0x27, 0x16, + 0xee, 0x8c, 0xc2, 0xdd, 0x08, 0x38, 0xea, 0x1e, 0x85, 0x36, 0x6d, 0x1f, 0x57, 0xa0, 0x87, 0x90, + 0x33, 0x30, 0xd3, 0x5d, 0x71, 0xaf, 0x16, 0xb3, 0x2f, 0x3d, 0x56, 0x87, 0x0e, 0x82, 0x3b, 0x59, + 0xcb, 0x1a, 0xf2, 0xa9, 0x74, 0x13, 0x72, 0x61, 0x9d, 0xd0, 0x9b, 0x90, 0x6e, 0xb3, 0x5e, 0xcf, + 0xe4, 0x61, 0x6b, 0x49, 0x59, 0x74, 0x53, 0x0e, 0x32, 0xba, 0x2f, 0x95, 0xae, 0x41, 0x2e, 0xac, + 0x03, 0x7a, 0x1b, 0xa0, 0x8b, 0x2d, 0xae, 0x7b, 0x1f, 0xe3, 0x1e, 0x30, 0xab, 0xe5, 0x84, 0xa6, + 0x2e, 0x14, 0xa5, 0x9f, 0x14, 0x98, 0x3e, 0x91, 0x18, 0xda, 0x82, 0x3c, 0xb3, 0x0c, 0x3d, 0x4c, + 0xcf, 0x95, 0xa7, 0xc9, 0xf5, 0x93, 0x77, 0xb2, 0xf7, 0x7d, 0x1f, 0xe6, 0xe1, 0x11, 0x86, 0x5c, + 0xae, 0x36, 0xc5, 0x2c, 0x23, 0x12, 0x05, 0x2b, 0x25, 0x07, 0x71, 0xd6, 0xe4, 0x99, 0x58, 0x29, + 0x39, 0x88, 0xc4, 0xd2, 0xbd, 0xd8, 0x28, 0xf3, 0x09, 0x14, 0xb8, 0x83, 0xa9, 0x8b, 0xdb, 0xa2, + 0x41, 0x75, 0xdb, 0xc2, 0x54, 0xfa, 0x98, 0x29, 0xfb, 0xff, 0x3b, 0xca, 0xc1, 0xff, 0x8e, 0xf2, + 0x22, 0x1d, 0x68, 0xd3, 0x31, 0x6b, 0x31, 0xc9, 0xd6, 0x7e, 0x4f, 0xfe, 0x7c, 0x38, 0xab, 0x3c, + 0x3d, 0x9c, 0x55, 0xfe, 0x38, 0x9c, 0x55, 0x9e, 0x1c, 0xcd, 0x26, 0x9e, 0x1e, 0xcd, 0x26, 0x9e, + 0x1d, 0xcd, 0x26, 0xe0, 0x6a, 0x9b, 0xf5, 0x86, 0xaf, 0x65, 0x6d, 0x3a, 0xfa, 0x08, 0x6b, 0x08, + 0x57, 0x0d, 0xe5, 0xf1, 0x97, 0x1d, 0x93, 0x77, 0xfb, 0xad, 0x72, 0x9b, 0xf5, 0x2a, 0x6d, 0xe6, + 0xf6, 0x98, 0x5b, 0x71, 0x88, 0x85, 0x07, 0xc4, 0xa9, 0xec, 0x2f, 0x84, 0x8f, 0x5e, 0xd6, 0x6e, + 0x65, 0xe8, 0xdf, 0x9e, 0x3b, 0x91, 0x2e, 0x50, 0x7d, 0x97, 0x1c, 0x6b, 0xd4, 0x57, 0x7f, 0x4c, + 0x5e, 0x6a, 0x04, 0xe1, 0xd5, 0x45, 0x78, 0x51, 0x24, 0xe5, 0x6d, 0x69, 0xf9, 0x4b, 0x64, 0xb3, + 0x23, 0x6c, 0x76, 0x22, 0x9b, 0x9d, 0xc0, 0xe6, 0x30, 0x79, 0x7d, 0xa8, 0xcd, 0xce, 0x6a, 0xa3, + 0xf6, 0x80, 0x70, 0x6c, 0x60, 0x8e, 0xff, 0x4c, 0x5e, 0x09, 0xec, 0xab, 0x55, 0x01, 0xa8, 0x56, + 0x23, 0x44, 0xb5, 0x1a, 0x40, 0x5a, 0x69, 0xaf, 0xf4, 0x37, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, + 0x57, 0x45, 0x3e, 0x65, 0xd1, 0x12, 0x00, 0x00, } func (m *ProposalSubmit) Marshal() (dAtA []byte, err error) { @@ -2336,20 +2316,6 @@ func (m *DelegatorVotePlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ProofBlindingS) > 0 { - i -= len(m.ProofBlindingS) - copy(dAtA[i:], m.ProofBlindingS) - i = encodeVarintGovernance(dAtA, i, uint64(len(m.ProofBlindingS))) - i-- - dAtA[i] = 0x4a - } - if len(m.ProofBlindingR) > 0 { - i -= len(m.ProofBlindingR) - copy(dAtA[i:], m.ProofBlindingR) - i = encodeVarintGovernance(dAtA, i, uint64(len(m.ProofBlindingR))) - i-- - dAtA[i] = 0x42 - } if len(m.Randomizer) > 0 { i -= len(m.Randomizer) copy(dAtA[i:], m.Randomizer) @@ -3486,14 +3452,6 @@ func (m *DelegatorVotePlan) Size() (n int) { if l > 0 { n += 1 + l + sovGovernance(uint64(l)) } - l = len(m.ProofBlindingR) - if l > 0 { - n += 1 + l + sovGovernance(uint64(l)) - } - l = len(m.ProofBlindingS) - if l > 0 { - n += 1 + l + sovGovernance(uint64(l)) - } return n } @@ -5198,74 +5156,6 @@ func (m *DelegatorVotePlan) Unmarshal(dAtA []byte) error { m.Randomizer = []byte{} } iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGovernance - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthGovernance - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthGovernance - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingR == nil { - m.ProofBlindingR = []byte{} - } - iNdEx = postIndex - case 9: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGovernance - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthGovernance - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthGovernance - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingS == nil { - m.ProofBlindingS = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGovernance(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go b/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go index 8bf6ff767..9f95c7e73 100644 --- a/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go +++ b/relayer/chains/penumbra/core/ibc/v1alpha1/ibc.pb.go @@ -168,23 +168,27 @@ func (m *FungibleTokenPacketData) GetReceiver() string { } type Ics20Withdrawal struct { - Amount *v1alpha1.Amount `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` - Denom *v1alpha1.Denom `protobuf:"bytes,2,opt,name=denom,proto3" json:"denom,omitempty"` + // the chain ID of the destination chain for this ICS20 transfer + DestinationChainId string `protobuf:"bytes,1,opt,name=destination_chain_id,json=destinationChainId,proto3" json:"destination_chain_id,omitempty"` + Amount *v1alpha1.Amount `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount,omitempty"` + Denom *v1alpha1.Denom `protobuf:"bytes,3,opt,name=denom,proto3" json:"denom,omitempty"` // the address on the destination chain to send the transfer to - DestinationChainAddress string `protobuf:"bytes,3,opt,name=destination_chain_address,json=destinationChainAddress,proto3" json:"destination_chain_address,omitempty"` + DestinationChainAddress string `protobuf:"bytes,4,opt,name=destination_chain_address,json=destinationChainAddress,proto3" json:"destination_chain_address,omitempty"` // a "sender" penumbra address to use to return funds from this withdrawal. // this should be an ephemeral address - ReturnAddress *v1alpha1.Address `protobuf:"bytes,4,opt,name=return_address,json=returnAddress,proto3" json:"return_address,omitempty"` + ReturnAddress *v1alpha1.Address `protobuf:"bytes,5,opt,name=return_address,json=returnAddress,proto3" json:"return_address,omitempty"` // the height (on Penumbra) at which this transfer expires (and funds are sent // back to the sender address?). NOTE: if funds are sent back to the sender, // we MUST verify a nonexistence proof before accepting the timeout, to // prevent relayer censorship attacks. The core IBC implementation does this // in its handling of validation of timeouts. - TimeoutHeight uint64 `protobuf:"varint,5,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height,omitempty"` + TimeoutHeight uint64 `protobuf:"varint,6,opt,name=timeout_height,json=timeoutHeight,proto3" json:"timeout_height,omitempty"` // the timestamp at which this transfer expires. - TimeoutTime uint64 `protobuf:"varint,6,opt,name=timeout_time,json=timeoutTime,proto3" json:"timeout_time,omitempty"` + TimeoutTime uint64 `protobuf:"varint,7,opt,name=timeout_time,json=timeoutTime,proto3" json:"timeout_time,omitempty"` + // the source port that identifies the channel used for the withdrawal + SourcePort string `protobuf:"bytes,8,opt,name=source_port,json=sourcePort,proto3" json:"source_port,omitempty"` // the source channel used for the withdrawal - SourceChannel string `protobuf:"bytes,7,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"` + SourceChannel string `protobuf:"bytes,9,opt,name=source_channel,json=sourceChannel,proto3" json:"source_channel,omitempty"` } func (m *Ics20Withdrawal) Reset() { *m = Ics20Withdrawal{} } @@ -220,6 +224,13 @@ func (m *Ics20Withdrawal) XXX_DiscardUnknown() { var xxx_messageInfo_Ics20Withdrawal proto.InternalMessageInfo +func (m *Ics20Withdrawal) GetDestinationChainId() string { + if m != nil { + return m.DestinationChainId + } + return "" +} + func (m *Ics20Withdrawal) GetAmount() *v1alpha1.Amount { if m != nil { return m.Amount @@ -262,6 +273,13 @@ func (m *Ics20Withdrawal) GetTimeoutTime() uint64 { return 0 } +func (m *Ics20Withdrawal) GetSourcePort() string { + if m != nil { + return m.SourcePort + } + return "" +} + func (m *Ics20Withdrawal) GetSourceChannel() string { if m != nil { return m.SourceChannel @@ -574,56 +592,58 @@ func init() { } var fileDescriptor_6509740287584c65 = []byte{ - // 773 bytes of a gzipped FileDescriptorProto + // 803 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x41, 0x8f, 0x1b, 0x35, - 0x14, 0xde, 0x49, 0xd2, 0xdd, 0x8d, 0xd3, 0x24, 0x74, 0x54, 0xd1, 0x69, 0x10, 0x21, 0x8c, 0xda, - 0x6a, 0x8b, 0xc4, 0x0c, 0x49, 0x41, 0x48, 0x83, 0x2a, 0x91, 0x9d, 0x8a, 0x32, 0x87, 0x8a, 0x68, - 0xa8, 0x8a, 0x84, 0x22, 0x45, 0x1e, 0x8f, 0x9b, 0x58, 0x9b, 0xb1, 0x23, 0xdb, 0x93, 0x55, 0xc4, - 0x1f, 0xe0, 0xc8, 0x5f, 0x80, 0x23, 0x67, 0x7e, 0x04, 0xe2, 0xb4, 0x47, 0x8e, 0x28, 0x7b, 0xe3, - 0x57, 0x20, 0xdb, 0xe3, 0x64, 0x57, 0x62, 0xbb, 0xa7, 0xf8, 0x7d, 0xef, 0x7b, 0x2f, 0xdf, 0xf7, - 0xde, 0xd8, 0xe0, 0xd1, 0x0a, 0xd3, 0xb2, 0xc8, 0x38, 0x0c, 0x11, 0xe3, 0x38, 0x24, 0x19, 0x0a, - 0xd7, 0x43, 0xb8, 0x5c, 0x2d, 0xe0, 0x50, 0x05, 0xc1, 0x8a, 0x33, 0xc9, 0xdc, 0x9e, 0x65, 0x05, - 0x8a, 0x15, 0xa8, 0x84, 0x65, 0xf5, 0x3e, 0xb9, 0xde, 0x01, 0xf1, 0xcd, 0x4a, 0xb2, 0x7d, 0x13, - 0x13, 0x9b, 0x3e, 0xbd, 0x8f, 0x54, 0x7f, 0x43, 0x5b, 0x12, 0x4c, 0x65, 0xb8, 0x1e, 0x56, 0xa7, - 0x8a, 0xf0, 0x70, 0xce, 0xd8, 0x7c, 0x89, 0x43, 0x1d, 0x65, 0xe5, 0xdb, 0x10, 0xd2, 0x8d, 0x49, - 0xf9, 0x5f, 0x83, 0x66, 0x92, 0xa1, 0x31, 0x92, 0x84, 0x51, 0xf7, 0x19, 0x00, 0x1c, 0x9e, 0xcf, - 0xa0, 0x8e, 0x3c, 0x67, 0xe0, 0x9c, 0xb4, 0x46, 0xf7, 0x03, 0x53, 0x1c, 0xd8, 0xe2, 0x60, 0x4c, - 0x37, 0x69, 0x93, 0xc3, 0x73, 0x53, 0xe4, 0xff, 0x04, 0x1e, 0x7c, 0x53, 0xd2, 0x39, 0xc9, 0x96, - 0xf8, 0x35, 0x3b, 0xc3, 0x74, 0x02, 0xd1, 0x19, 0x96, 0x2f, 0xa0, 0x84, 0xee, 0x7d, 0x70, 0x27, - 0xc7, 0x94, 0x15, 0xba, 0x55, 0x33, 0x35, 0x81, 0xfb, 0x3e, 0x38, 0x84, 0x05, 0x2b, 0xa9, 0xf4, - 0x6a, 0x1a, 0xae, 0x22, 0x85, 0x0b, 0x4c, 0x73, 0xcc, 0xbd, 0xba, 0xc1, 0x4d, 0xe4, 0xf6, 0xc0, - 0x31, 0xc7, 0x08, 0x93, 0x35, 0xe6, 0x5e, 0x43, 0x67, 0x76, 0xb1, 0xff, 0x73, 0x1d, 0x74, 0x13, - 0x24, 0x46, 0x9f, 0xfd, 0x40, 0xe4, 0x22, 0xe7, 0xf0, 0x1c, 0x2e, 0xdd, 0xe7, 0xbb, 0xfe, 0xc6, - 0xc1, 0xe3, 0xe0, 0xfa, 0x9c, 0xab, 0xd9, 0xd9, 0x59, 0x06, 0x63, 0x4d, 0xde, 0xc9, 0x88, 0xac, - 0xe8, 0x9a, 0xae, 0x7e, 0x74, 0x4b, 0xf5, 0x0b, 0xc5, 0xb5, 0xd6, 0x22, 0xf0, 0x30, 0xc7, 0x42, - 0x12, 0x0a, 0xd5, 0x68, 0x66, 0x68, 0x01, 0x09, 0x9d, 0xc1, 0x3c, 0xe7, 0x58, 0x88, 0xca, 0xd5, - 0x83, 0x2b, 0x84, 0x58, 0xe5, 0xc7, 0x26, 0xed, 0xbe, 0x02, 0x1d, 0x8e, 0x65, 0xc9, 0xf7, 0x05, - 0x0d, 0x2d, 0xe0, 0xc9, 0x6d, 0xf2, 0x0d, 0x3b, 0x6d, 0x9b, 0x6a, 0xdb, 0xee, 0x31, 0xe8, 0x48, - 0x52, 0x60, 0x56, 0xca, 0xd9, 0x02, 0x93, 0xf9, 0x42, 0x7a, 0x77, 0x06, 0xce, 0x49, 0x23, 0x6d, - 0x57, 0xe8, 0xb7, 0x1a, 0x74, 0x3f, 0x06, 0x77, 0x2d, 0x4d, 0xfd, 0x7a, 0x87, 0x9a, 0xd4, 0xaa, - 0xb0, 0xd7, 0xa4, 0xc0, 0xaa, 0x93, 0x60, 0x25, 0x47, 0x58, 0xf9, 0xa1, 0x14, 0x2f, 0xbd, 0x23, - 0xed, 0xa4, 0x6d, 0xd0, 0xd8, 0x80, 0xfe, 0x1f, 0x0e, 0x00, 0xb1, 0xfe, 0xea, 0xf4, 0xee, 0x3f, - 0x00, 0x4d, 0xf3, 0x0d, 0xce, 0x48, 0x5e, 0xed, 0xff, 0xd8, 0x00, 0x49, 0xee, 0x7e, 0x09, 0xee, - 0x56, 0x49, 0x21, 0xa1, 0xc4, 0xd5, 0xa8, 0xff, 0xff, 0x53, 0x6b, 0x19, 0xe6, 0xf7, 0x8a, 0xa8, - 0xb4, 0xac, 0x38, 0x43, 0x58, 0x08, 0x9c, 0x1b, 0xc1, 0x66, 0xaa, 0xed, 0x1d, 0xaa, 0x25, 0x3f, - 0x05, 0xef, 0xed, 0x69, 0x95, 0xfd, 0x86, 0x76, 0xd6, 0xdd, 0xe1, 0x66, 0x00, 0xfe, 0x53, 0xd0, - 0x36, 0xaa, 0x63, 0xb5, 0x7d, 0xcc, 0x5d, 0x0f, 0x1c, 0x21, 0x73, 0xd4, 0xb2, 0x1b, 0xa9, 0x0d, - 0xfd, 0xef, 0x40, 0x27, 0x66, 0x54, 0x60, 0x2a, 0x4a, 0x61, 0xe4, 0x3c, 0x07, 0x5d, 0x64, 0x91, - 0xca, 0xca, 0xbb, 0x6e, 0x4d, 0x07, 0x5d, 0x2b, 0xf7, 0x5f, 0x82, 0xee, 0x1b, 0xcc, 0xc9, 0x5b, - 0x62, 0xd5, 0x08, 0xf7, 0x73, 0x70, 0x64, 0xf4, 0x0a, 0xcf, 0x19, 0xd4, 0x4f, 0x5a, 0xa3, 0x9e, - 0x7e, 0x17, 0xcc, 0xe6, 0xcd, 0x9d, 0x5e, 0x0f, 0x03, 0xc3, 0x4e, 0x2d, 0xd5, 0xff, 0x14, 0xdc, - 0x8b, 0x19, 0xa5, 0x58, 0xdf, 0xc8, 0xdb, 0x8d, 0x7c, 0x01, 0xee, 0x59, 0xcf, 0xb6, 0x48, 0xb8, - 0x03, 0xd0, 0x42, 0xfb, 0x50, 0xff, 0x7b, 0x33, 0xbd, 0x0a, 0x9d, 0xfe, 0x5a, 0xfb, 0x73, 0xdb, - 0x77, 0x2e, 0xb6, 0x7d, 0xe7, 0x9f, 0x6d, 0xdf, 0xf9, 0xe5, 0xb2, 0x7f, 0x70, 0x71, 0xd9, 0x3f, - 0xf8, 0xfb, 0xb2, 0x7f, 0x00, 0xfa, 0x88, 0x15, 0xc1, 0xcd, 0xcf, 0xd9, 0xe9, 0x71, 0x92, 0xa1, - 0x89, 0x1a, 0xc5, 0xc4, 0xf9, 0x31, 0x9d, 0x13, 0xb9, 0x28, 0xb3, 0x00, 0xb1, 0x22, 0x44, 0x4c, - 0x14, 0x4c, 0x84, 0x1c, 0x2f, 0xe1, 0x06, 0xf3, 0x70, 0x3d, 0xda, 0x1d, 0xf5, 0xdd, 0x11, 0xe1, - 0xcd, 0x0f, 0xe9, 0x57, 0x24, 0x43, 0xf6, 0xfc, 0x5b, 0xad, 0x3e, 0x89, 0x93, 0xdf, 0x6b, 0xbd, - 0x89, 0x95, 0x10, 0x2b, 0x09, 0x49, 0x86, 0x82, 0x37, 0x15, 0xe5, 0xaf, 0x7d, 0x72, 0xaa, 0x92, - 0xd3, 0x24, 0x43, 0x53, 0x9b, 0xdc, 0xd6, 0x9e, 0xdc, 0x9c, 0x9c, 0xbe, 0x9c, 0x9c, 0xbe, 0xc2, - 0x12, 0xe6, 0x50, 0xc2, 0x7f, 0x6b, 0x1f, 0x5a, 0x62, 0x14, 0x29, 0x66, 0x14, 0x25, 0x19, 0x8a, - 0x22, 0xcb, 0xcd, 0x0e, 0xf5, 0xc2, 0x9f, 0xfd, 0x17, 0x00, 0x00, 0xff, 0xff, 0x1b, 0x2a, 0x21, - 0xe0, 0x02, 0x06, 0x00, 0x00, + 0x14, 0xde, 0x49, 0xb6, 0xbb, 0x1b, 0xa7, 0x49, 0xe8, 0x68, 0x45, 0xa7, 0x41, 0xa4, 0x61, 0xd4, + 0x56, 0x5b, 0x24, 0x66, 0x9a, 0x14, 0x84, 0x34, 0xa8, 0x12, 0xd9, 0xa9, 0x28, 0x73, 0xa8, 0x88, + 0x86, 0xaa, 0x48, 0x28, 0x52, 0xe4, 0xf1, 0xb8, 0x89, 0xd5, 0x8c, 0x1d, 0xd9, 0x9e, 0xac, 0x22, + 0xfe, 0x04, 0x7f, 0x01, 0x8e, 0x9c, 0xf9, 0x11, 0x88, 0x53, 0x8f, 0x48, 0x5c, 0x50, 0xf6, 0xc6, + 0xaf, 0x40, 0xb6, 0xc7, 0x49, 0x03, 0x6c, 0xf7, 0x14, 0xbf, 0xef, 0xfb, 0xde, 0xcb, 0xf7, 0x9e, + 0xdf, 0x18, 0xdc, 0x5b, 0x62, 0x5a, 0x16, 0x19, 0x87, 0x21, 0x62, 0x1c, 0x87, 0x24, 0x43, 0xe1, + 0x6a, 0x00, 0x17, 0xcb, 0x39, 0x1c, 0xa8, 0x20, 0x58, 0x72, 0x26, 0x99, 0xdb, 0xb5, 0xaa, 0x40, + 0xa9, 0x02, 0x45, 0x58, 0x55, 0xf7, 0xe3, 0xfd, 0x0a, 0x88, 0xaf, 0x97, 0x92, 0xed, 0x8a, 0x98, + 0xd8, 0xd4, 0xe9, 0xde, 0x55, 0xf5, 0x8d, 0x6c, 0x41, 0x30, 0x95, 0xe1, 0x6a, 0x50, 0x9d, 0x2a, + 0xc1, 0x9d, 0x19, 0x63, 0xb3, 0x05, 0x0e, 0x75, 0x94, 0x95, 0xaf, 0x42, 0x48, 0xd7, 0x86, 0xf2, + 0xbf, 0x04, 0x8d, 0x24, 0x43, 0x23, 0x24, 0x09, 0xa3, 0xee, 0x63, 0x00, 0x38, 0xbc, 0x98, 0x42, + 0x1d, 0x79, 0x4e, 0xdf, 0x39, 0x6b, 0x0e, 0x4f, 0x03, 0x93, 0x1c, 0xd8, 0xe4, 0x60, 0x44, 0xd7, + 0x69, 0x83, 0xc3, 0x0b, 0x93, 0xe4, 0xff, 0x00, 0x6e, 0x7f, 0x55, 0xd2, 0x19, 0xc9, 0x16, 0xf8, + 0x05, 0x7b, 0x8d, 0xe9, 0x18, 0xa2, 0xd7, 0x58, 0x3e, 0x85, 0x12, 0xba, 0xa7, 0xe0, 0x46, 0x8e, + 0x29, 0x2b, 0x74, 0xa9, 0x46, 0x6a, 0x02, 0xf7, 0x7d, 0x70, 0x04, 0x0b, 0x56, 0x52, 0xe9, 0xd5, + 0x34, 0x5c, 0x45, 0x0a, 0x17, 0x98, 0xe6, 0x98, 0x7b, 0x75, 0x83, 0x9b, 0xc8, 0xed, 0x82, 0x13, + 0x8e, 0x11, 0x26, 0x2b, 0xcc, 0xbd, 0x43, 0xcd, 0x6c, 0x63, 0xff, 0xcf, 0x3a, 0xe8, 0x24, 0x48, + 0x0c, 0x1f, 0x7d, 0x47, 0xe4, 0x3c, 0xe7, 0xf0, 0x02, 0x2e, 0xdc, 0x47, 0xe0, 0x34, 0xc7, 0x42, + 0x12, 0x0a, 0x95, 0xbf, 0x29, 0x9a, 0x43, 0x42, 0xa7, 0x24, 0xaf, 0x4c, 0xb8, 0x6f, 0x71, 0xb1, + 0xa2, 0x92, 0xdc, 0x7d, 0xb2, 0xe7, 0xa8, 0x39, 0xbc, 0x1f, 0xec, 0xdf, 0x4c, 0x35, 0x6d, 0x3b, + 0xfd, 0x60, 0xa4, 0xc5, 0x5b, 0xe3, 0x91, 0x6d, 0xb3, 0xae, 0xb3, 0xef, 0x5d, 0x93, 0xfd, 0x54, + 0x69, 0xed, 0x30, 0x22, 0x70, 0xe7, 0xbf, 0x66, 0x61, 0x9e, 0x73, 0x2c, 0x44, 0xd5, 0xed, 0xed, + 0x7f, 0x3b, 0x1e, 0x19, 0xda, 0x7d, 0x0e, 0xda, 0x1c, 0xcb, 0x92, 0xef, 0x12, 0x6e, 0x68, 0x03, + 0x0f, 0xae, 0xb3, 0x6f, 0xd4, 0x69, 0xcb, 0x64, 0xdb, 0x72, 0xf7, 0x41, 0x5b, 0x92, 0x02, 0xb3, + 0x52, 0x4e, 0xe7, 0x98, 0xcc, 0xe6, 0xd2, 0x3b, 0xea, 0x3b, 0x67, 0x87, 0x69, 0xab, 0x42, 0xbf, + 0xd6, 0xa0, 0xfb, 0x11, 0xb8, 0x69, 0x65, 0xea, 0xd7, 0x3b, 0xd6, 0xa2, 0x66, 0x85, 0xbd, 0x20, + 0x05, 0x76, 0xef, 0x82, 0xa6, 0x60, 0x25, 0x47, 0x78, 0xba, 0x64, 0x5c, 0x7a, 0x27, 0xba, 0x0d, + 0x60, 0xa0, 0x31, 0xe3, 0x52, 0xfd, 0x55, 0x25, 0x40, 0x73, 0x48, 0x29, 0x5e, 0x78, 0x0d, 0xad, + 0x69, 0x19, 0x34, 0x36, 0xa0, 0xff, 0xab, 0x03, 0x40, 0xac, 0x17, 0x59, 0xaf, 0xd3, 0x07, 0xa0, + 0x61, 0xd6, 0x7a, 0x77, 0x9b, 0x27, 0x06, 0x48, 0x72, 0xf7, 0x73, 0x70, 0xb3, 0x22, 0x85, 0x84, + 0x12, 0x57, 0x37, 0xf9, 0xff, 0xdb, 0xdb, 0x34, 0xca, 0x6f, 0x95, 0x50, 0x79, 0x59, 0x72, 0x86, + 0xb0, 0x10, 0x38, 0x37, 0x1d, 0x99, 0xf5, 0x6b, 0x6d, 0x51, 0xdd, 0xd3, 0x43, 0xf0, 0xde, 0x4e, + 0x56, 0xcd, 0xe7, 0x50, 0xb7, 0xde, 0xd9, 0xe2, 0x66, 0x42, 0xfe, 0x43, 0xd0, 0x32, 0xae, 0x63, + 0xb5, 0x1e, 0x98, 0xbb, 0x1e, 0x38, 0x46, 0xe6, 0xa8, 0x6d, 0x1f, 0xa6, 0x36, 0xf4, 0xbf, 0x01, + 0xed, 0x98, 0x51, 0x81, 0xa9, 0x28, 0x85, 0xb1, 0xf3, 0x04, 0x74, 0x90, 0x45, 0xaa, 0x56, 0xde, + 0xf5, 0x21, 0xb6, 0xd1, 0x5e, 0xba, 0xff, 0x0c, 0x74, 0x5e, 0x62, 0x4e, 0x5e, 0x11, 0xeb, 0x46, + 0xb8, 0x9f, 0x82, 0x63, 0xe3, 0x57, 0x78, 0x4e, 0xbf, 0x7e, 0xd6, 0x1c, 0x76, 0xf5, 0x53, 0x63, + 0x56, 0xc3, 0x3c, 0x13, 0xab, 0x41, 0x60, 0xd4, 0xa9, 0x95, 0xfa, 0x9f, 0x80, 0x5b, 0x31, 0xa3, + 0x14, 0xeb, 0x8f, 0xfc, 0xfa, 0x46, 0x3e, 0x03, 0xb7, 0x6c, 0xcf, 0x36, 0x49, 0xb8, 0x7d, 0xd0, + 0x44, 0xbb, 0x50, 0xff, 0x7b, 0x23, 0x7d, 0x1b, 0x3a, 0xff, 0xa9, 0xf6, 0xdb, 0xa6, 0xe7, 0xbc, + 0xd9, 0xf4, 0x9c, 0xbf, 0x36, 0x3d, 0xe7, 0xc7, 0xcb, 0xde, 0xc1, 0x9b, 0xcb, 0xde, 0xc1, 0x1f, + 0x97, 0xbd, 0x03, 0xd0, 0x43, 0xac, 0x08, 0xae, 0x7e, 0x21, 0xcf, 0x4f, 0x92, 0x0c, 0x8d, 0xd5, + 0x28, 0xc6, 0xce, 0xf7, 0xe9, 0x8c, 0xc8, 0x79, 0x99, 0x05, 0x88, 0x15, 0x21, 0x62, 0xa2, 0x60, + 0x22, 0xe4, 0x78, 0x01, 0xd7, 0x98, 0x87, 0xab, 0xe1, 0xf6, 0xa8, 0x3f, 0x2e, 0x11, 0x5e, 0xfd, + 0x36, 0x7f, 0x41, 0x32, 0x64, 0xcf, 0x3f, 0xd7, 0xea, 0xe3, 0x38, 0xf9, 0xa5, 0xd6, 0x1d, 0x5b, + 0x0b, 0xb1, 0xb2, 0x90, 0x64, 0x28, 0x78, 0x59, 0x49, 0x7e, 0xdf, 0x91, 0x13, 0x45, 0x4e, 0x92, + 0x0c, 0x4d, 0x2c, 0xb9, 0xa9, 0x3d, 0xb8, 0x9a, 0x9c, 0x3c, 0x1b, 0x9f, 0x3f, 0xc7, 0x12, 0xe6, + 0x50, 0xc2, 0xbf, 0x6b, 0x1f, 0x5a, 0x61, 0x14, 0x29, 0x65, 0x14, 0x25, 0x19, 0x8a, 0x22, 0xab, + 0xcd, 0x8e, 0xf4, 0x85, 0x3f, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0x7d, 0x96, 0x37, 0xa5, 0x55, + 0x06, 0x00, 0x00, } func (m *IbcAction) Marshal() (dAtA []byte, err error) { @@ -737,17 +757,24 @@ func (m *Ics20Withdrawal) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.SourceChannel) i = encodeVarintIbc(dAtA, i, uint64(len(m.SourceChannel))) i-- - dAtA[i] = 0x3a + dAtA[i] = 0x4a + } + if len(m.SourcePort) > 0 { + i -= len(m.SourcePort) + copy(dAtA[i:], m.SourcePort) + i = encodeVarintIbc(dAtA, i, uint64(len(m.SourcePort))) + i-- + dAtA[i] = 0x42 } if m.TimeoutTime != 0 { i = encodeVarintIbc(dAtA, i, uint64(m.TimeoutTime)) i-- - dAtA[i] = 0x30 + dAtA[i] = 0x38 } if m.TimeoutHeight != 0 { i = encodeVarintIbc(dAtA, i, uint64(m.TimeoutHeight)) i-- - dAtA[i] = 0x28 + dAtA[i] = 0x30 } if m.ReturnAddress != nil { { @@ -759,14 +786,14 @@ func (m *Ics20Withdrawal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintIbc(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 + dAtA[i] = 0x2a } if len(m.DestinationChainAddress) > 0 { i -= len(m.DestinationChainAddress) copy(dAtA[i:], m.DestinationChainAddress) i = encodeVarintIbc(dAtA, i, uint64(len(m.DestinationChainAddress))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } if m.Denom != nil { { @@ -778,7 +805,7 @@ func (m *Ics20Withdrawal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintIbc(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a } if m.Amount != nil { { @@ -790,6 +817,13 @@ func (m *Ics20Withdrawal) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintIbc(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x12 + } + if len(m.DestinationChainId) > 0 { + i -= len(m.DestinationChainId) + copy(dAtA[i:], m.DestinationChainId) + i = encodeVarintIbc(dAtA, i, uint64(len(m.DestinationChainId))) + i-- dAtA[i] = 0xa } return len(dAtA) - i, nil @@ -1064,6 +1098,10 @@ func (m *Ics20Withdrawal) Size() (n int) { } var l int _ = l + l = len(m.DestinationChainId) + if l > 0 { + n += 1 + l + sovIbc(uint64(l)) + } if m.Amount != nil { l = m.Amount.Size() n += 1 + l + sovIbc(uint64(l)) @@ -1086,6 +1124,10 @@ func (m *Ics20Withdrawal) Size() (n int) { if m.TimeoutTime != 0 { n += 1 + sovIbc(uint64(m.TimeoutTime)) } + l = len(m.SourcePort) + if l > 0 { + n += 1 + l + sovIbc(uint64(l)) + } l = len(m.SourceChannel) if l > 0 { n += 1 + l + sovIbc(uint64(l)) @@ -1484,6 +1526,38 @@ func (m *Ics20Withdrawal) Unmarshal(dAtA []byte) error { } switch fieldNum { case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DestinationChainId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowIbc + } + 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 ErrInvalidLengthIbc + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthIbc + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DestinationChainId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) } @@ -1519,7 +1593,7 @@ func (m *Ics20Withdrawal) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 2: + case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Denom", wireType) } @@ -1555,7 +1629,7 @@ func (m *Ics20Withdrawal) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 3: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field DestinationChainAddress", wireType) } @@ -1587,7 +1661,7 @@ func (m *Ics20Withdrawal) Unmarshal(dAtA []byte) error { } m.DestinationChainAddress = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 4: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field ReturnAddress", wireType) } @@ -1623,7 +1697,7 @@ func (m *Ics20Withdrawal) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 6: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field TimeoutHeight", wireType) } @@ -1642,7 +1716,7 @@ func (m *Ics20Withdrawal) Unmarshal(dAtA []byte) error { break } } - case 6: + case 7: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field TimeoutTime", wireType) } @@ -1661,7 +1735,39 @@ func (m *Ics20Withdrawal) Unmarshal(dAtA []byte) error { break } } - case 7: + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SourcePort", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowIbc + } + 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 ErrInvalidLengthIbc + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthIbc + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SourcePort = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field SourceChannel", wireType) } diff --git a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go index 690e79f23..2228a0a81 100644 --- a/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go +++ b/relayer/chains/penumbra/core/stake/v1alpha1/stake.pb.go @@ -1184,10 +1184,6 @@ type UndelegateClaimPlan struct { UnbondingAmount *v1alpha1.Amount `protobuf:"bytes,5,opt,name=unbonding_amount,json=unbondingAmount,proto3" json:"unbonding_amount,omitempty"` // The blinding factor to use for the balance commitment. BalanceBlinding []byte `protobuf:"bytes,6,opt,name=balance_blinding,json=balanceBlinding,proto3" json:"balance_blinding,omitempty"` - // The first blinding factor to use for the ZK undelegate claim proof. - ProofBlindingR []byte `protobuf:"bytes,7,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` - // The second blinding factor to use for the ZK undelegate claim proof. - ProofBlindingS []byte `protobuf:"bytes,8,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *UndelegateClaimPlan) Reset() { *m = UndelegateClaimPlan{} } @@ -1258,20 +1254,6 @@ func (m *UndelegateClaimPlan) GetBalanceBlinding() []byte { return nil } -func (m *UndelegateClaimPlan) GetProofBlindingR() []byte { - if m != nil { - return m.ProofBlindingR - } - return nil -} - -func (m *UndelegateClaimPlan) GetProofBlindingS() []byte { - if m != nil { - return m.ProofBlindingS - } - return nil -} - // A list of pending delegations and undelegations. type DelegationChanges struct { Delegations []*Delegate `protobuf:"bytes,1,rep,name=delegations,proto3" json:"delegations,omitempty"` @@ -1508,106 +1490,105 @@ func init() { } var fileDescriptor_022d012c8e7b3ca5 = []byte{ - // 1578 bytes of a gzipped FileDescriptorProto + // 1554 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0x23, 0x49, 0x15, 0x4f, 0x3b, 0x76, 0x12, 0x3f, 0x7f, 0xa6, 0x66, 0x01, 0xcf, 0x30, 0x93, 0x78, 0x7b, 0x81, 0x35, 0x33, 0x83, 0xc3, 0x04, 0xc1, 0x21, 0x7b, 0x58, 0xdc, 0xb6, 0x77, 0xe2, 0xdd, 0xc4, 0xf1, 0xb6, 0x9d, 0x48, 0xa0, 0x48, 0xad, 0xb2, 0xbb, 0x62, 0x37, 0x63, 0x57, 0x99, 0xae, 0x72, 0xb2, - 0xfe, 0x0b, 0xe0, 0xc8, 0x71, 0xcf, 0x1c, 0x38, 0xac, 0x04, 0x12, 0x27, 0x4e, 0x70, 0x46, 0x9c, - 0x96, 0x1b, 0x47, 0x94, 0x91, 0x40, 0xe2, 0xaf, 0x40, 0x55, 0xdd, 0xd5, 0xfe, 0xc8, 0xd7, 0x64, - 0x35, 0x42, 0xcb, 0xad, 0xdf, 0x7b, 0xbf, 0xf7, 0xea, 0xbd, 0x5f, 0xd5, 0xab, 0x8f, 0x86, 0xd2, - 0x98, 0xd0, 0xc9, 0xa8, 0xeb, 0xe3, 0x9d, 0x1e, 0xf3, 0xc9, 0x0e, 0x17, 0xf8, 0x15, 0xd9, 0x39, - 0x7f, 0x81, 0x87, 0xe3, 0x01, 0x7e, 0x11, 0x88, 0xe5, 0xb1, 0xcf, 0x04, 0x43, 0x8f, 0x35, 0xb2, - 0x2c, 0x91, 0xe5, 0xc0, 0xa4, 0x91, 0x8f, 0x9e, 0x2e, 0xc6, 0xe9, 0xf9, 0xd3, 0xb1, 0x60, 0xb3, - 0x40, 0x81, 0x1c, 0x44, 0x32, 0xff, 0xbc, 0x0a, 0xc9, 0x13, 0x3c, 0xf4, 0x5c, 0x2c, 0x98, 0x8f, - 0x0e, 0x21, 0xed, 0xb9, 0x84, 0x0a, 0x4f, 0x4c, 0x9d, 0x57, 0x64, 0x5a, 0x30, 0x8a, 0x46, 0x29, - 0xb5, 0xfb, 0xb4, 0xbc, 0x38, 0x5c, 0x18, 0x40, 0x07, 0x2c, 0x37, 0x42, 0x97, 0x4f, 0xc8, 0xd4, - 0x4e, 0x79, 0x33, 0x01, 0xbd, 0x07, 0x99, 0x1e, 0xa3, 0x9c, 0x50, 0x3e, 0xe1, 0x2a, 0x5e, 0xac, - 0x68, 0x94, 0xd2, 0x76, 0x3a, 0x52, 0x4a, 0x10, 0x82, 0x38, 0xc5, 0x23, 0x52, 0x58, 0x2d, 0x1a, - 0xa5, 0xa4, 0xad, 0xbe, 0x51, 0x01, 0xd6, 0x2f, 0x48, 0x97, 0x7b, 0x82, 0x14, 0xe2, 0x4a, 0xad, - 0x45, 0x54, 0x84, 0x94, 0x4b, 0x78, 0xcf, 0xf7, 0xc6, 0xc2, 0x63, 0xb4, 0x90, 0x50, 0xd6, 0x79, - 0x95, 0xf4, 0x25, 0x14, 0x77, 0x87, 0xc4, 0x2d, 0x6c, 0x14, 0x8d, 0xd2, 0x86, 0xad, 0x45, 0xd4, - 0x81, 0xdc, 0xd9, 0x84, 0xba, 0x1e, 0xed, 0x3b, 0x5c, 0xf8, 0x04, 0x8f, 0x78, 0x61, 0xad, 0xb8, - 0x5a, 0x4a, 0xed, 0x3e, 0x2b, 0xdf, 0xc6, 0x67, 0xf9, 0xa3, 0xc0, 0xa9, 0xad, 0x7c, 0xec, 0xec, - 0xd9, 0xbc, 0xc8, 0xd1, 0xfb, 0x90, 0xe3, 0xe4, 0x97, 0x13, 0x42, 0x7b, 0xc4, 0x91, 0x41, 0x88, - 0x5f, 0x58, 0x2f, 0x1a, 0xa5, 0x8c, 0x9d, 0xd5, 0xea, 0xa6, 0xd2, 0xa2, 0x36, 0x64, 0xfb, 0xec, - 0x9c, 0xf8, 0x14, 0x4b, 0xa8, 0xa4, 0x23, 0xa9, 0xe8, 0x7d, 0x7e, 0x07, 0xbd, 0x2f, 0x23, 0x27, - 0x49, 0x70, 0xa6, 0x3f, 0x2f, 0x9a, 0x5d, 0xc8, 0x44, 0xd3, 0x77, 0xe0, 0x71, 0x81, 0x3e, 0x85, - 0xec, 0xb9, 0x56, 0xc8, 0x41, 0x78, 0xc1, 0x50, 0x35, 0xde, 0x67, 0x12, 0x33, 0x51, 0x84, 0x4f, - 0xc8, 0x94, 0x9b, 0xbf, 0x8b, 0x41, 0x66, 0x81, 0x03, 0x74, 0x02, 0x20, 0x98, 0x83, 0x5d, 0xd7, - 0x27, 0x9c, 0x87, 0xab, 0xe4, 0xc7, 0xf7, 0x20, 0xb1, 0xdc, 0x61, 0x95, 0xc0, 0x79, 0x7f, 0xc5, - 0x4e, 0x0a, 0x2d, 0xa0, 0x8f, 0x61, 0x4d, 0x30, 0xc7, 0xc5, 0x4c, 0xad, 0x94, 0xd4, 0xee, 0x8b, - 0xfb, 0xc5, 0xac, 0x61, 0xb6, 0xbf, 0x62, 0x27, 0x84, 0xfc, 0x78, 0xf4, 0x53, 0x48, 0x46, 0xa3, - 0xc8, 0x45, 0x31, 0x9f, 0x6d, 0xd2, 0xd6, 0x22, 0x7a, 0x08, 0x1b, 0x3e, 0x16, 0xc4, 0xe9, 0x8e, - 0xb9, 0x1a, 0x34, 0x63, 0xaf, 0x4b, 0xd9, 0x1a, 0xf3, 0x47, 0x26, 0x24, 0x54, 0xcc, 0x5b, 0x30, - 0x56, 0x0a, 0x92, 0x3e, 0xe9, 0x79, 0x63, 0x8f, 0x50, 0x61, 0xfe, 0xcb, 0x80, 0x0d, 0x1b, 0x0b, - 0x52, 0xc3, 0x02, 0xbf, 0xed, 0x5e, 0xda, 0x86, 0x14, 0x19, 0xb3, 0xde, 0xc0, 0xf1, 0xa8, 0x4b, - 0x3e, 0x53, 0x69, 0xc4, 0x6d, 0x50, 0xaa, 0x86, 0xd4, 0xa0, 0x5d, 0xf8, 0xc6, 0x6c, 0xe2, 0x7d, - 0x72, 0x81, 0x7d, 0xd7, 0x91, 0x59, 0xaa, 0x0e, 0x8a, 0xdb, 0x0f, 0x22, 0xa3, 0xad, 0x6c, 0x32, - 0x4f, 0xf4, 0x13, 0xf8, 0xd6, 0xcc, 0x87, 0x7c, 0xd6, 0x1b, 0x60, 0xda, 0x27, 0x81, 0x57, 0x42, - 0x79, 0xcd, 0x42, 0xd6, 0x43, 0xab, 0xf4, 0x33, 0x7f, 0x65, 0x40, 0xda, 0xc2, 0x9c, 0x44, 0xc5, - 0x2e, 0x65, 0x67, 0x5c, 0xc9, 0xae, 0x04, 0xf9, 0x2e, 0xe6, 0x64, 0x21, 0xb1, 0xa0, 0x86, 0xac, - 0xd4, 0xcf, 0xe5, 0xf4, 0x1c, 0x90, 0x42, 0x2e, 0xa6, 0xb3, 0xaa, 0xb0, 0x2a, 0xc6, 0x42, 0x26, - 0x9f, 0xc7, 0x20, 0x17, 0x35, 0x40, 0x5b, 0x60, 0x31, 0xe1, 0x6f, 0x9b, 0x79, 0x0b, 0x12, 0x5c, - 0xe8, 0x7c, 0xaf, 0xb6, 0xeb, 0xd2, 0x9a, 0x5c, 0x48, 0x86, 0xd8, 0x81, 0x2b, 0x7a, 0x17, 0xd2, - 0xe7, 0x4c, 0xc8, 0x9d, 0x67, 0xcc, 0x2e, 0x88, 0x1f, 0x96, 0x93, 0x0a, 0x74, 0x2d, 0xa9, 0x42, - 0x47, 0x90, 0xe9, 0x32, 0xbd, 0x3b, 0xe9, 0x79, 0xbb, 0x9a, 0xf6, 0xd2, 0x70, 0x16, 0x0b, 0x5b, - 0x40, 0x0e, 0x96, 0xee, 0xce, 0x49, 0xe6, 0x5f, 0x62, 0x90, 0x9e, 0x37, 0xa3, 0x4f, 0x75, 0x21, - 0x92, 0x90, 0xec, 0xee, 0x07, 0x6f, 0x1e, 0x79, 0x41, 0xa8, 0xd3, 0xc9, 0x48, 0xd7, 0xf5, 0x1c, - 0x72, 0x13, 0xaa, 0xd3, 0x56, 0xd3, 0x1d, 0xcc, 0xea, 0xfe, 0x8a, 0x9d, 0x8d, 0x0c, 0x75, 0xa9, - 0xff, 0xb5, 0x61, 0x98, 0x9f, 0x1b, 0x90, 0x5f, 0x8e, 0x84, 0x4c, 0xd8, 0xb2, 0x8e, 0x9a, 0xb5, - 0x46, 0xf3, 0xa5, 0xd3, 0xee, 0x54, 0x3a, 0x75, 0xa7, 0xde, 0x3c, 0x3e, 0x74, 0x8e, 0x9b, 0xed, - 0x56, 0xbd, 0xda, 0xf8, 0xa8, 0x51, 0xaf, 0xe5, 0x57, 0xd0, 0x13, 0x78, 0x78, 0x0d, 0x46, 0xaa, - 0xea, 0xb5, 0xbc, 0x81, 0x8a, 0xf0, 0xf8, 0xda, 0x10, 0xa1, 0x32, 0x1f, 0x43, 0xdb, 0xf0, 0xed, - 0x1b, 0x11, 0xf5, 0x5a, 0x7e, 0xd5, 0x42, 0x90, 0x77, 0x96, 0x2a, 0x31, 0xff, 0x1e, 0x83, 0xec, - 0xe2, 0x74, 0xa2, 0xe3, 0x45, 0x0a, 0x3f, 0xbc, 0xcf, 0x5a, 0x58, 0x12, 0xe7, 0x68, 0x34, 0xff, - 0x6d, 0x00, 0xba, 0x6a, 0x45, 0xdf, 0x81, 0xe2, 0x49, 0xe5, 0xa0, 0x51, 0xab, 0x74, 0x8e, 0xec, - 0x9b, 0xc9, 0x79, 0x17, 0x9e, 0x5c, 0x8b, 0x6a, 0x34, 0x2b, 0xd5, 0x4e, 0xe3, 0xa4, 0x9e, 0x37, - 0x64, 0xf9, 0xd7, 0x42, 0x42, 0x40, 0xec, 0x46, 0xc0, 0xc7, 0x95, 0xc6, 0x81, 0xe4, 0x07, 0xbd, - 0x07, 0xdb, 0xd7, 0x02, 0x3a, 0x47, 0x87, 0x56, 0xbb, 0x73, 0xd4, 0xac, 0xd7, 0xf2, 0xf1, 0x1b, - 0x33, 0xa9, 0x35, 0xda, 0x15, 0x4b, 0xc6, 0x49, 0x98, 0x97, 0xc6, 0xdc, 0x81, 0xd5, 0xa0, 0x67, - 0x0c, 0xd5, 0x21, 0x19, 0x6d, 0x32, 0x61, 0xab, 0xbe, 0xff, 0x86, 0xb4, 0xda, 0x33, 0x4f, 0x54, - 0x87, 0x35, 0xae, 0xda, 0x3f, 0x6c, 0xd3, 0x1f, 0xdc, 0x63, 0x6a, 0x26, 0xdc, 0x0e, 0x9d, 0x51, - 0x15, 0x92, 0x6a, 0xab, 0x77, 0xb1, 0xc0, 0xaa, 0x4b, 0x53, 0xbb, 0xdf, 0xbb, 0x3d, 0x92, 0xde, - 0x03, 0x6d, 0x75, 0x46, 0xc8, 0x2f, 0xf3, 0x02, 0x1e, 0x44, 0xf1, 0x6b, 0xe4, 0xcc, 0xa3, 0x9e, - 0xba, 0x99, 0xbc, 0xa5, 0x4a, 0x1f, 0xc2, 0x06, 0x9e, 0x88, 0x81, 0xc3, 0xbd, 0x7e, 0x78, 0xa1, - 0x5a, 0x97, 0x72, 0xdb, 0xeb, 0x9b, 0x5f, 0xc4, 0x60, 0xa3, 0x46, 0x86, 0xa4, 0x2f, 0xd7, 0xea, - 0xcf, 0x00, 0xcd, 0x36, 0x77, 0xbd, 0xa1, 0x7d, 0x85, 0xcd, 0x70, 0x33, 0x8a, 0xa2, 0xb5, 0x77, - 0x1f, 0x46, 0x4d, 0xbd, 0x2f, 0x10, 0xd7, 0xc1, 0x23, 0x36, 0xa1, 0x22, 0x24, 0xf3, 0xbb, 0x77, - 0x0c, 0x5c, 0x51, 0x60, 0xbd, 0x79, 0x10, 0x37, 0x90, 0x91, 0x0d, 0x9b, 0x6e, 0x50, 0x97, 0xc7, - 0xa8, 0x8e, 0x18, 0xbf, 0x4f, 0xc4, 0xfc, 0xcc, 0x3f, 0xd0, 0x98, 0x7f, 0x8a, 0x01, 0x1c, 0x53, - 0xf7, 0x7f, 0x40, 0xd7, 0x53, 0xd8, 0xe4, 0x02, 0xfb, 0xc2, 0xb9, 0x4a, 0x5a, 0x4e, 0x19, 0xea, - 0xff, 0x5f, 0xcc, 0x51, 0xc8, 0xcd, 0x88, 0xab, 0x0e, 0xb1, 0x37, 0x42, 0x75, 0x88, 0x77, 0x99, - 0xab, 0xf9, 0xba, 0xe3, 0xde, 0xb6, 0xe4, 0x6c, 0x31, 0x77, 0x6a, 0x2b, 0x77, 0xf4, 0x0e, 0x24, - 0xc6, 0x3e, 0x63, 0x67, 0xe1, 0xc2, 0x0e, 0x04, 0x79, 0x92, 0x3d, 0xb8, 0xc6, 0xe7, 0xeb, 0x32, - 0x65, 0x1f, 0xc2, 0xfa, 0x98, 0x50, 0x3c, 0x14, 0xd3, 0x1b, 0xa6, 0x6a, 0xa9, 0xfc, 0x56, 0x00, - 0xb6, 0xb5, 0x17, 0x72, 0xe4, 0x95, 0x67, 0xa8, 0x9e, 0x05, 0x3d, 0x36, 0x1a, 0x79, 0x62, 0x44, - 0xa2, 0x49, 0xfa, 0xe1, 0x1d, 0x75, 0x58, 0x81, 0x63, 0x35, 0xf2, 0xb3, 0x37, 0xbb, 0xcb, 0x2a, - 0xf3, 0x0f, 0xab, 0x57, 0x08, 0x6c, 0x0d, 0x31, 0xfd, 0x1a, 0x12, 0x18, 0xff, 0x4a, 0x04, 0xb6, - 0x20, 0x3f, 0x3b, 0xbc, 0xc3, 0x35, 0x9e, 0xb8, 0xcf, 0x1a, 0x9f, 0xdd, 0x62, 0xc2, 0xb6, 0xf9, - 0xbe, 0xbc, 0xaf, 0x06, 0x53, 0xd2, 0x1d, 0x7a, 0xca, 0x52, 0x58, 0x53, 0x6b, 0x32, 0x17, 0xea, - 0xad, 0x50, 0x2d, 0xaf, 0xb6, 0x6a, 0x99, 0x46, 0x40, 0x27, 0x78, 0x01, 0xa6, 0xed, 0xac, 0xd2, - 0x6b, 0xa0, 0x7d, 0x0d, 0x92, 0xab, 0x37, 0xea, 0x32, 0xb2, 0x6d, 0xfe, 0xde, 0x80, 0xcd, 0x5a, - 0xd4, 0x76, 0x55, 0x75, 0xdf, 0xe5, 0x68, 0x5f, 0x3e, 0x7e, 0xb5, 0x52, 0x3f, 0xec, 0xee, 0x38, - 0x9e, 0xf4, 0x71, 0x60, 0xcf, 0xbb, 0xa2, 0x26, 0x64, 0x26, 0x74, 0x3e, 0x56, 0x4c, 0xc5, 0x2a, - 0xbd, 0x69, 0xdf, 0xda, 0x8b, 0xee, 0xe6, 0x10, 0xd6, 0x8e, 0xc7, 0xc2, 0x1b, 0x11, 0xf4, 0x0c, - 0x10, 0xe6, 0x8e, 0xaa, 0x91, 0xf5, 0x5e, 0x39, 0x03, 0xe2, 0xf5, 0x07, 0x22, 0x7c, 0x10, 0xe4, - 0x30, 0x3f, 0x3a, 0xb3, 0xa4, 0x7e, 0x5f, 0xa9, 0xd1, 0x13, 0x80, 0x0b, 0x8f, 0xba, 0xec, 0xc2, - 0x19, 0x12, 0x1a, 0x3e, 0xad, 0x92, 0x81, 0xe6, 0x80, 0x50, 0xf4, 0x4d, 0x58, 0xeb, 0x7a, 0xe2, - 0x9c, 0xf4, 0x54, 0x5f, 0xa5, 0xed, 0x50, 0x32, 0x7f, 0x01, 0xef, 0x54, 0x27, 0xbe, 0x4f, 0xa8, - 0xa8, 0xce, 0xfd, 0x49, 0xe0, 0xc8, 0x86, 0xec, 0xc2, 0xff, 0x06, 0x4d, 0xd1, 0xb3, 0x3b, 0x16, - 0xc1, 0x7c, 0x14, 0x3b, 0x33, 0xff, 0x77, 0x82, 0x9b, 0xdb, 0xb0, 0x1e, 0x2e, 0x37, 0xb9, 0x39, - 0x79, 0x94, 0x12, 0x3f, 0xac, 0x26, 0x10, 0xac, 0x3f, 0xc6, 0xfe, 0x7a, 0xb9, 0x65, 0x7c, 0x79, - 0xb9, 0x65, 0xfc, 0xf3, 0x72, 0xcb, 0xf8, 0xcd, 0xeb, 0xad, 0x95, 0x2f, 0x5f, 0x6f, 0xad, 0xfc, - 0xe3, 0xf5, 0xd6, 0x0a, 0x14, 0x7b, 0x6c, 0x74, 0x2b, 0xa3, 0x16, 0xb4, 0xa5, 0xdc, 0xf2, 0x99, - 0x60, 0x2d, 0xe3, 0xe7, 0x27, 0x7d, 0x4f, 0x0c, 0x26, 0xdd, 0x72, 0x8f, 0x8d, 0x76, 0x7a, 0x8c, - 0x8f, 0x18, 0xdf, 0xf1, 0xc9, 0x10, 0x4f, 0x89, 0xbf, 0x73, 0xbe, 0x1b, 0x7d, 0xf6, 0x06, 0xd8, - 0xa3, 0x7c, 0xe7, 0xb6, 0x9f, 0x45, 0x1f, 0x28, 0x51, 0x4b, 0xbf, 0x8d, 0xad, 0xb6, 0xaa, 0xed, - 0x2f, 0x62, 0x8f, 0x5b, 0x3a, 0x95, 0xaa, 0x4c, 0x45, 0x0d, 0x5d, 0x3e, 0x09, 0x41, 0x7f, 0x9b, - 0x99, 0x4f, 0xa5, 0xf9, 0x54, 0x99, 0x4f, 0xb5, 0xf9, 0x32, 0x56, 0xba, 0xcd, 0x7c, 0xfa, 0xb2, - 0x65, 0x1d, 0x12, 0x81, 0xe5, 0xb5, 0xe9, 0x3f, 0xb1, 0x6d, 0x0d, 0xdd, 0xdb, 0x93, 0xd8, 0xbd, - 0x3d, 0x05, 0xde, 0xdb, 0xd3, 0xe8, 0xee, 0x9a, 0xfa, 0xf9, 0xf4, 0xa3, 0xff, 0x06, 0x00, 0x00, - 0xff, 0xff, 0x34, 0xe3, 0xd1, 0x50, 0xf2, 0x12, 0x00, 0x00, + 0xfe, 0x0b, 0xe0, 0xc8, 0x71, 0xcf, 0x1c, 0x38, 0xac, 0xc4, 0x81, 0x13, 0x27, 0x38, 0x23, 0x4e, + 0xcb, 0x0d, 0x71, 0x42, 0x19, 0x09, 0x24, 0xfe, 0x0a, 0x54, 0xd5, 0x5d, 0xed, 0x8f, 0x7c, 0x4d, + 0x56, 0x23, 0xb4, 0xdc, 0xfa, 0x7d, 0xfd, 0xea, 0xbd, 0xdf, 0xab, 0x57, 0x5d, 0xdd, 0x50, 0x1a, + 0x13, 0x3a, 0x19, 0x75, 0x7d, 0xbc, 0xd3, 0x63, 0x3e, 0xd9, 0xe1, 0x02, 0xbf, 0x22, 0x3b, 0xe7, + 0x2f, 0xf0, 0x70, 0x3c, 0xc0, 0x2f, 0x02, 0xb1, 0x3c, 0xf6, 0x99, 0x60, 0xe8, 0xb1, 0xf6, 0x2c, + 0x4b, 0xcf, 0x72, 0x60, 0xd2, 0x9e, 0x8f, 0x9e, 0x2e, 0xe2, 0xf4, 0xfc, 0xe9, 0x58, 0xb0, 0x19, + 0x50, 0x20, 0x07, 0x48, 0xe6, 0x9f, 0x56, 0x21, 0x79, 0x82, 0x87, 0x9e, 0x8b, 0x05, 0xf3, 0xd1, + 0x21, 0xa4, 0x3d, 0x97, 0x50, 0xe1, 0x89, 0xa9, 0xf3, 0x8a, 0x4c, 0x0b, 0x46, 0xd1, 0x28, 0xa5, + 0x76, 0x9f, 0x96, 0x17, 0x97, 0x0b, 0x01, 0x34, 0x60, 0xb9, 0x11, 0x86, 0x7c, 0x42, 0xa6, 0x76, + 0xca, 0x9b, 0x09, 0xe8, 0x3d, 0xc8, 0xf4, 0x18, 0xe5, 0x84, 0xf2, 0x09, 0x57, 0x78, 0xb1, 0xa2, + 0x51, 0x4a, 0xdb, 0xe9, 0x48, 0x29, 0x9d, 0x10, 0xc4, 0x29, 0x1e, 0x91, 0xc2, 0x6a, 0xd1, 0x28, + 0x25, 0x6d, 0xf5, 0x8c, 0x0a, 0xb0, 0x7e, 0x41, 0xba, 0xdc, 0x13, 0xa4, 0x10, 0x57, 0x6a, 0x2d, + 0xa2, 0x22, 0xa4, 0x5c, 0xc2, 0x7b, 0xbe, 0x37, 0x16, 0x1e, 0xa3, 0x85, 0x84, 0xb2, 0xce, 0xab, + 0x64, 0x2c, 0xa1, 0xb8, 0x3b, 0x24, 0x6e, 0x61, 0xa3, 0x68, 0x94, 0x36, 0x6c, 0x2d, 0xa2, 0x0e, + 0xe4, 0xce, 0x26, 0xd4, 0xf5, 0x68, 0xdf, 0xe1, 0xc2, 0x27, 0x78, 0xc4, 0x0b, 0x6b, 0xc5, 0xd5, + 0x52, 0x6a, 0xf7, 0x59, 0xf9, 0x36, 0x3e, 0xcb, 0x1f, 0x05, 0x41, 0x6d, 0x15, 0x63, 0x67, 0xcf, + 0xe6, 0x45, 0x8e, 0xde, 0x87, 0x1c, 0x27, 0xbf, 0x9c, 0x10, 0xda, 0x23, 0x8e, 0x04, 0x21, 0x7e, + 0x61, 0xbd, 0x68, 0x94, 0x32, 0x76, 0x56, 0xab, 0x9b, 0x4a, 0x8b, 0xda, 0x90, 0xed, 0xb3, 0x73, + 0xe2, 0x53, 0x2c, 0x5d, 0x25, 0x1d, 0x49, 0x45, 0xef, 0xf3, 0x3b, 0xe8, 0x7d, 0x19, 0x05, 0x49, + 0x82, 0x33, 0xfd, 0x79, 0xd1, 0xec, 0x42, 0x26, 0x6a, 0xdf, 0x81, 0xc7, 0x05, 0xfa, 0x14, 0xb2, + 0xe7, 0x5a, 0x21, 0x17, 0xe1, 0x05, 0x43, 0xd5, 0x78, 0x9f, 0x26, 0x66, 0x22, 0x84, 0x4f, 0xc8, + 0x94, 0x9b, 0xbf, 0x8b, 0x41, 0x66, 0x81, 0x03, 0x74, 0x02, 0x20, 0x98, 0x83, 0x5d, 0xd7, 0x27, + 0x9c, 0x87, 0xbb, 0xe4, 0xc7, 0xf7, 0x20, 0xb1, 0xdc, 0x61, 0x95, 0x20, 0x78, 0x7f, 0xc5, 0x4e, + 0x0a, 0x2d, 0xa0, 0x8f, 0x61, 0x4d, 0x30, 0xc7, 0xc5, 0x4c, 0xed, 0x94, 0xd4, 0xee, 0x8b, 0xfb, + 0x61, 0xd6, 0x30, 0xdb, 0x5f, 0xb1, 0x13, 0x42, 0x3e, 0x3c, 0xfa, 0x29, 0x24, 0xa3, 0x55, 0xe4, + 0xa6, 0x98, 0xcf, 0x36, 0x69, 0x6b, 0x11, 0x3d, 0x84, 0x0d, 0x1f, 0x0b, 0xe2, 0x74, 0xc7, 0x5c, + 0x2d, 0x9a, 0xb1, 0xd7, 0xa5, 0x6c, 0x8d, 0xf9, 0x23, 0x13, 0x12, 0x0a, 0xf3, 0x16, 0x1f, 0x2b, + 0x05, 0x49, 0x9f, 0xf4, 0xbc, 0xb1, 0x47, 0xa8, 0x30, 0xff, 0x65, 0xc0, 0x86, 0x8d, 0x05, 0xa9, + 0x61, 0x81, 0xdf, 0xf6, 0x2c, 0x6d, 0x43, 0x8a, 0x8c, 0x59, 0x6f, 0xe0, 0x78, 0xd4, 0x25, 0x9f, + 0xa9, 0x34, 0xe2, 0x36, 0x28, 0x55, 0x43, 0x6a, 0xd0, 0x2e, 0x7c, 0x63, 0xd6, 0x78, 0x9f, 0x5c, + 0x60, 0xdf, 0x75, 0x64, 0x96, 0x6a, 0x82, 0xe2, 0xf6, 0x83, 0xc8, 0x68, 0x2b, 0x9b, 0xcc, 0x13, + 0xfd, 0x04, 0xbe, 0x35, 0x8b, 0x21, 0x9f, 0xf5, 0x06, 0x98, 0xf6, 0x49, 0x10, 0x95, 0x50, 0x51, + 0x33, 0xc8, 0x7a, 0x68, 0x95, 0x71, 0xe6, 0xaf, 0x0c, 0x48, 0x5b, 0x98, 0x93, 0xa8, 0xd8, 0xa5, + 0xec, 0x8c, 0x2b, 0xd9, 0x95, 0x20, 0xdf, 0xc5, 0x9c, 0x2c, 0x24, 0x16, 0xd4, 0x90, 0x95, 0xfa, + 0xb9, 0x9c, 0x9e, 0x03, 0x52, 0x9e, 0x8b, 0xe9, 0xac, 0x2a, 0x5f, 0x85, 0xb1, 0x90, 0xc9, 0xe7, + 0x31, 0xc8, 0x45, 0x03, 0xd0, 0x16, 0x58, 0x4c, 0xf8, 0xdb, 0x66, 0xde, 0x82, 0x04, 0x17, 0x3a, + 0xdf, 0xab, 0xe3, 0xba, 0xb4, 0x27, 0x17, 0x92, 0x21, 0x76, 0x10, 0x8a, 0xde, 0x85, 0xf4, 0x39, + 0x13, 0xf2, 0xe4, 0x19, 0xb3, 0x0b, 0xe2, 0x87, 0xe5, 0xa4, 0x02, 0x5d, 0x4b, 0xaa, 0xd0, 0x11, + 0x64, 0xba, 0x4c, 0x9f, 0x4e, 0xba, 0x6f, 0x57, 0xd3, 0x5e, 0x5a, 0xce, 0x62, 0xe1, 0x08, 0xc8, + 0xc5, 0xd2, 0xdd, 0x39, 0xc9, 0xfc, 0x73, 0x0c, 0xd2, 0xf3, 0x66, 0xf4, 0xa9, 0x2e, 0x44, 0x12, + 0x92, 0xdd, 0xfd, 0xe0, 0xcd, 0x91, 0x17, 0x84, 0x3a, 0x9d, 0x8c, 0x74, 0x5d, 0xcf, 0x21, 0x37, + 0xa1, 0x3a, 0x6d, 0xd5, 0xee, 0xa0, 0xab, 0xfb, 0x2b, 0x76, 0x36, 0x32, 0xd4, 0xa5, 0xfe, 0xd7, + 0x86, 0x61, 0x7e, 0x6e, 0x40, 0x7e, 0x19, 0x09, 0x99, 0xb0, 0x65, 0x1d, 0x35, 0x6b, 0x8d, 0xe6, + 0x4b, 0xa7, 0xdd, 0xa9, 0x74, 0xea, 0x4e, 0xbd, 0x79, 0x7c, 0xe8, 0x1c, 0x37, 0xdb, 0xad, 0x7a, + 0xb5, 0xf1, 0x51, 0xa3, 0x5e, 0xcb, 0xaf, 0xa0, 0x27, 0xf0, 0xf0, 0x1a, 0x1f, 0xa9, 0xaa, 0xd7, + 0xf2, 0x06, 0x2a, 0xc2, 0xe3, 0x6b, 0x21, 0x42, 0x65, 0x3e, 0x86, 0xb6, 0xe1, 0xdb, 0x37, 0x7a, + 0xd4, 0x6b, 0xf9, 0x55, 0x0b, 0x41, 0xde, 0x59, 0xaa, 0xc4, 0xfc, 0x5b, 0x0c, 0xb2, 0x8b, 0xed, + 0x44, 0xc7, 0x8b, 0x14, 0x7e, 0x78, 0x9f, 0xbd, 0xb0, 0x24, 0xce, 0xd1, 0x68, 0xfe, 0xdb, 0x00, + 0x74, 0xd5, 0x8a, 0xbe, 0x03, 0xc5, 0x93, 0xca, 0x41, 0xa3, 0x56, 0xe9, 0x1c, 0xd9, 0x37, 0x93, + 0xf3, 0x2e, 0x3c, 0xb9, 0xd6, 0xab, 0xd1, 0xac, 0x54, 0x3b, 0x8d, 0x93, 0x7a, 0xde, 0x90, 0xe5, + 0x5f, 0xeb, 0x12, 0x3a, 0xc4, 0x6e, 0x74, 0xf8, 0xb8, 0xd2, 0x38, 0x90, 0xfc, 0xa0, 0xf7, 0x60, + 0xfb, 0x5a, 0x87, 0xce, 0xd1, 0xa1, 0xd5, 0xee, 0x1c, 0x35, 0xeb, 0xb5, 0x7c, 0xfc, 0xc6, 0x4c, + 0x6a, 0x8d, 0x76, 0xc5, 0x92, 0x38, 0x09, 0xf3, 0xd2, 0x98, 0x7b, 0x61, 0x35, 0xe8, 0x19, 0x43, + 0x75, 0x48, 0x46, 0x87, 0x4c, 0x38, 0xaa, 0xef, 0xbf, 0x21, 0xad, 0xf6, 0x2c, 0x12, 0xd5, 0x61, + 0x8d, 0xab, 0xf1, 0x0f, 0xc7, 0xf4, 0x07, 0xf7, 0x68, 0xcd, 0x84, 0xdb, 0x61, 0x30, 0xaa, 0x42, + 0x52, 0x1d, 0xf5, 0x2e, 0x16, 0x58, 0x4d, 0x69, 0x6a, 0xf7, 0x7b, 0xb7, 0x23, 0xe9, 0x33, 0xd0, + 0x56, 0xef, 0x08, 0xf9, 0x64, 0x5e, 0xc0, 0x83, 0x08, 0xbf, 0x46, 0xce, 0x3c, 0xea, 0xa9, 0x9b, + 0xc9, 0x5b, 0xaa, 0xf4, 0x21, 0x6c, 0xe0, 0x89, 0x18, 0x38, 0xdc, 0xeb, 0x87, 0x17, 0xaa, 0x75, + 0x29, 0xb7, 0xbd, 0xbe, 0xf9, 0x45, 0x0c, 0x36, 0x6a, 0x64, 0x48, 0xfa, 0x72, 0xaf, 0xfe, 0x0c, + 0xd0, 0xec, 0x70, 0xd7, 0x07, 0xda, 0x57, 0x38, 0x0c, 0x37, 0x23, 0x14, 0xad, 0xbd, 0xfb, 0x65, + 0xd4, 0xd4, 0xe7, 0x02, 0x71, 0x1d, 0x3c, 0x62, 0x13, 0x2a, 0x42, 0x32, 0xbf, 0x7b, 0xc7, 0xc2, + 0x15, 0xe5, 0xac, 0x0f, 0x0f, 0xe2, 0x06, 0x32, 0xb2, 0x61, 0xd3, 0x0d, 0xea, 0xf2, 0x18, 0xd5, + 0x88, 0xf1, 0xfb, 0x20, 0xe6, 0x67, 0xf1, 0x81, 0xc6, 0xfc, 0x63, 0x0c, 0xe0, 0x98, 0xba, 0xff, + 0x03, 0xba, 0x9e, 0xc2, 0x26, 0x17, 0xd8, 0x17, 0xce, 0x55, 0xd2, 0x72, 0xca, 0x50, 0xff, 0xff, + 0x62, 0x8e, 0x42, 0x6e, 0x46, 0x5c, 0x75, 0x88, 0xbd, 0x11, 0xaa, 0x43, 0xbc, 0xcb, 0x5c, 0xcd, + 0xd7, 0x1d, 0xf7, 0xb6, 0xa5, 0x60, 0x8b, 0xb9, 0x53, 0x5b, 0x85, 0xa3, 0x77, 0x20, 0x31, 0xf6, + 0x19, 0x3b, 0x0b, 0x37, 0x76, 0x20, 0xc8, 0x37, 0xd9, 0x83, 0x6b, 0x62, 0xbe, 0x2e, 0x2d, 0xfb, + 0x10, 0xd6, 0xc7, 0x84, 0xe2, 0xa1, 0x98, 0xde, 0xd0, 0xaa, 0xa5, 0xf2, 0x5b, 0x81, 0xb3, 0xad, + 0xa3, 0x90, 0x23, 0xaf, 0x3c, 0x43, 0xf5, 0x59, 0xd0, 0x63, 0xa3, 0x91, 0x27, 0x46, 0x24, 0x6a, + 0xd2, 0x0f, 0xef, 0xa8, 0xc3, 0x0a, 0x02, 0xab, 0x51, 0x9c, 0xbd, 0xd9, 0x5d, 0x56, 0x99, 0xff, + 0xb8, 0x4a, 0x60, 0x6b, 0x88, 0xe9, 0xd7, 0x90, 0xc0, 0xf8, 0x57, 0x22, 0xb0, 0x05, 0xf9, 0xd9, + 0xcb, 0x3b, 0xdc, 0xe3, 0x89, 0xfb, 0xec, 0xf1, 0xd9, 0x2d, 0x26, 0x1c, 0x9b, 0xef, 0xcb, 0xfb, + 0x6a, 0xd0, 0x92, 0xee, 0xd0, 0x53, 0x96, 0xc2, 0x9a, 0xda, 0x93, 0xb9, 0x50, 0x6f, 0x85, 0x6a, + 0xf3, 0xf7, 0x06, 0x6c, 0xd6, 0xa2, 0x11, 0xa9, 0xaa, 0xbb, 0x29, 0x47, 0xfb, 0xf2, 0x43, 0x55, + 0x2b, 0xf5, 0x47, 0xd8, 0x1d, 0xaf, 0x12, 0x7d, 0x74, 0xdb, 0xf3, 0xa1, 0xa8, 0x09, 0x99, 0x09, + 0x9d, 0xc7, 0x8a, 0x29, 0xac, 0xd2, 0x9b, 0xce, 0x98, 0xbd, 0x18, 0x6e, 0x0e, 0x61, 0xed, 0x78, + 0x2c, 0xbc, 0x11, 0x41, 0xcf, 0x00, 0x61, 0xee, 0xb0, 0x33, 0xa7, 0x3b, 0x64, 0xbd, 0x57, 0xce, + 0x80, 0x78, 0xfd, 0x81, 0x08, 0x2f, 0xef, 0x39, 0xcc, 0x8f, 0xce, 0x2c, 0xa9, 0xdf, 0x57, 0x6a, + 0xf4, 0x04, 0xe0, 0xc2, 0xa3, 0x2e, 0xbb, 0x70, 0x86, 0x84, 0x86, 0x9f, 0x41, 0xc9, 0x40, 0x73, + 0x40, 0x28, 0xfa, 0x26, 0xac, 0x75, 0x3d, 0x71, 0x4e, 0x7a, 0x6a, 0x06, 0xd2, 0x76, 0x28, 0x99, + 0xbf, 0x80, 0x77, 0xaa, 0x13, 0xdf, 0x27, 0x54, 0x54, 0xe7, 0xbe, 0xfa, 0x39, 0xb2, 0x21, 0xbb, + 0xf0, 0x6f, 0x40, 0x53, 0xf4, 0xec, 0x8e, 0x86, 0xcd, 0xa3, 0xd8, 0x99, 0xf9, 0x3f, 0x09, 0xdc, + 0xdc, 0x86, 0xf5, 0x70, 0x6b, 0xc8, 0x83, 0xc4, 0xa3, 0x94, 0xf8, 0x61, 0x35, 0x81, 0x60, 0xfd, + 0x21, 0xf6, 0x97, 0xcb, 0x2d, 0xe3, 0xcb, 0xcb, 0x2d, 0xe3, 0x9f, 0x97, 0x5b, 0xc6, 0x6f, 0x5e, + 0x6f, 0xad, 0x7c, 0xf9, 0x7a, 0x6b, 0xe5, 0xef, 0xaf, 0xb7, 0x56, 0xa0, 0xd8, 0x63, 0xa3, 0x5b, + 0x19, 0xb5, 0xa0, 0x2d, 0xe5, 0x96, 0xcf, 0x04, 0x6b, 0x19, 0x3f, 0x3f, 0xe9, 0x7b, 0x62, 0x30, + 0xe9, 0x96, 0x7b, 0x6c, 0xb4, 0xd3, 0x63, 0x7c, 0xc4, 0xf8, 0x8e, 0x4f, 0x86, 0x78, 0x4a, 0xfc, + 0x9d, 0xf3, 0xdd, 0xe8, 0xb1, 0x37, 0xc0, 0x1e, 0xe5, 0x3b, 0xb7, 0xfd, 0xd8, 0xf9, 0x40, 0x89, + 0x5a, 0xfa, 0x6d, 0x6c, 0xb5, 0x55, 0x6d, 0x7f, 0x11, 0x7b, 0xdc, 0xd2, 0xa9, 0x54, 0x65, 0x2a, + 0x6a, 0xe9, 0xf2, 0x49, 0xe8, 0xf4, 0xd7, 0x99, 0xf9, 0x54, 0x9a, 0x4f, 0x95, 0xf9, 0x54, 0x9b, + 0x2f, 0x63, 0xa5, 0xdb, 0xcc, 0xa7, 0x2f, 0x5b, 0xd6, 0x21, 0x11, 0x58, 0x5e, 0x71, 0xfe, 0x13, + 0xdb, 0xd6, 0xae, 0x7b, 0x7b, 0xd2, 0x77, 0x6f, 0x4f, 0x39, 0xef, 0xed, 0x69, 0xef, 0xee, 0x9a, + 0xfa, 0x51, 0xf4, 0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xba, 0x77, 0x8b, 0xfc, 0x9e, 0x12, + 0x00, 0x00, } func (m *Validator) Marshal() (dAtA []byte, err error) { @@ -2472,20 +2453,6 @@ func (m *UndelegateClaimPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ProofBlindingS) > 0 { - i -= len(m.ProofBlindingS) - copy(dAtA[i:], m.ProofBlindingS) - i = encodeVarintStake(dAtA, i, uint64(len(m.ProofBlindingS))) - i-- - dAtA[i] = 0x42 - } - if len(m.ProofBlindingR) > 0 { - i -= len(m.ProofBlindingR) - copy(dAtA[i:], m.ProofBlindingR) - i = encodeVarintStake(dAtA, i, uint64(len(m.ProofBlindingR))) - i-- - dAtA[i] = 0x3a - } if len(m.BalanceBlinding) > 0 { i -= len(m.BalanceBlinding) copy(dAtA[i:], m.BalanceBlinding) @@ -3080,14 +3047,6 @@ func (m *UndelegateClaimPlan) Size() (n int) { if l > 0 { n += 1 + l + sovStake(uint64(l)) } - l = len(m.ProofBlindingR) - if l > 0 { - n += 1 + l + sovStake(uint64(l)) - } - l = len(m.ProofBlindingS) - if l > 0 { - n += 1 + l + sovStake(uint64(l)) - } return n } @@ -5567,74 +5526,6 @@ func (m *UndelegateClaimPlan) Unmarshal(dAtA []byte) error { m.BalanceBlinding = []byte{} } iNdEx = postIndex - case 7: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStake - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStake - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingR == nil { - m.ProofBlindingR = []byte{} - } - iNdEx = postIndex - case 8: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowStake - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthStake - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthStake - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingS == nil { - m.ProofBlindingS = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipStake(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go index c22d6f2ae..027751ff9 100644 --- a/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go +++ b/relayer/chains/penumbra/core/transaction/v1alpha1/transaction.pb.go @@ -184,14 +184,20 @@ func (m *EffectHash) GetInner() []byte { type TransactionBody struct { // A list of actions (state changes) performed by this transaction. Actions []*Action `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - // Parameters determining if a transaction should be accepted by this chain. - TransactionParameters *TransactionParameters `protobuf:"bytes,2,opt,name=transaction_parameters,json=transactionParameters,proto3" json:"transaction_parameters,omitempty"` + // The maximum height that this transaction can be included in the chain. + // + // If zero, there is no maximum. + ExpiryHeight uint64 `protobuf:"varint,2,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` + // The chain this transaction is intended for. Including this prevents + // replaying a transaction on one chain onto a different chain. + ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` // The transaction fee. - Fee *v1alpha1.Fee `protobuf:"bytes,3,opt,name=fee,proto3" json:"fee,omitempty"` - // Detection data for use with Fuzzy Message Detection - DetectionData *DetectionData `protobuf:"bytes,4,opt,name=detection_data,json=detectionData,proto3" json:"detection_data,omitempty"` - // Sub-message containing memo ciphertext if a memo was added to the transaction. - MemoData *MemoData `protobuf:"bytes,5,opt,name=memo_data,json=memoData,proto3" json:"memo_data,omitempty"` + Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` + // A list of clues for use with Fuzzy Message Detection. + FmdClues []*v1alpha1.Clue `protobuf:"bytes,5,rep,name=fmd_clues,json=fmdClues,proto3" json:"fmd_clues,omitempty"` + // Types that are valid to be assigned to XEncryptedMemo: + // *TransactionBody_EncryptedMemo + XEncryptedMemo isTransactionBody_XEncryptedMemo `protobuf_oneof:"_encrypted_memo"` } func (m *TransactionBody) Reset() { *m = TransactionBody{} } @@ -227,218 +233,74 @@ func (m *TransactionBody) XXX_DiscardUnknown() { var xxx_messageInfo_TransactionBody proto.InternalMessageInfo -func (m *TransactionBody) GetActions() []*Action { - if m != nil { - return m.Actions - } - return nil -} - -func (m *TransactionBody) GetTransactionParameters() *TransactionParameters { - if m != nil { - return m.TransactionParameters - } - return nil -} - -func (m *TransactionBody) GetFee() *v1alpha1.Fee { - if m != nil { - return m.Fee - } - return nil -} - -func (m *TransactionBody) GetDetectionData() *DetectionData { - if m != nil { - return m.DetectionData - } - return nil -} - -func (m *TransactionBody) GetMemoData() *MemoData { - if m != nil { - return m.MemoData - } - return nil -} - -// Represents the encrypted memo data. -type MemoData struct { - // Types that are valid to be assigned to XEncryptedMemo: - // *MemoData_EncryptedMemo - XEncryptedMemo isMemoData_XEncryptedMemo `protobuf_oneof:"_encrypted_memo"` -} - -func (m *MemoData) Reset() { *m = MemoData{} } -func (m *MemoData) String() string { return proto.CompactTextString(m) } -func (*MemoData) ProtoMessage() {} -func (*MemoData) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{4} -} -func (m *MemoData) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *MemoData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_MemoData.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *MemoData) XXX_Merge(src proto.Message) { - xxx_messageInfo_MemoData.Merge(m, src) -} -func (m *MemoData) XXX_Size() int { - return m.Size() -} -func (m *MemoData) XXX_DiscardUnknown() { - xxx_messageInfo_MemoData.DiscardUnknown(m) -} - -var xxx_messageInfo_MemoData proto.InternalMessageInfo - -type isMemoData_XEncryptedMemo interface { - isMemoData_XEncryptedMemo() +type isTransactionBody_XEncryptedMemo interface { + isTransactionBody_XEncryptedMemo() MarshalTo([]byte) (int, error) Size() int } -type MemoData_EncryptedMemo struct { - EncryptedMemo []byte `protobuf:"bytes,1,opt,name=encrypted_memo,json=encryptedMemo,proto3,oneof" json:"encrypted_memo,omitempty"` +type TransactionBody_EncryptedMemo struct { + EncryptedMemo []byte `protobuf:"bytes,6,opt,name=encrypted_memo,json=encryptedMemo,proto3,oneof" json:"encrypted_memo,omitempty"` } -func (*MemoData_EncryptedMemo) isMemoData_XEncryptedMemo() {} +func (*TransactionBody_EncryptedMemo) isTransactionBody_XEncryptedMemo() {} -func (m *MemoData) GetXEncryptedMemo() isMemoData_XEncryptedMemo { +func (m *TransactionBody) GetXEncryptedMemo() isTransactionBody_XEncryptedMemo { if m != nil { return m.XEncryptedMemo } return nil } -func (m *MemoData) GetEncryptedMemo() []byte { - if x, ok := m.GetXEncryptedMemo().(*MemoData_EncryptedMemo); ok { - return x.EncryptedMemo +func (m *TransactionBody) GetActions() []*Action { + if m != nil { + return m.Actions } return nil } -// XXX_OneofWrappers is for the internal use of the proto package. -func (*MemoData) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*MemoData_EncryptedMemo)(nil), - } -} - -// The parameters determining if a transaction should be accepted by the chain. -type TransactionParameters struct { - // The maximum height that this transaction can be included in the chain. - // - // If zero, there is no maximum. - ExpiryHeight uint64 `protobuf:"varint,1,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` - // The chain this transaction is intended for. Including this prevents - // replaying a transaction on one chain onto a different chain. - ChainId string `protobuf:"bytes,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` -} - -func (m *TransactionParameters) Reset() { *m = TransactionParameters{} } -func (m *TransactionParameters) String() string { return proto.CompactTextString(m) } -func (*TransactionParameters) ProtoMessage() {} -func (*TransactionParameters) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{5} -} -func (m *TransactionParameters) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TransactionParameters) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TransactionParameters.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TransactionParameters) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionParameters.Merge(m, src) -} -func (m *TransactionParameters) XXX_Size() int { - return m.Size() -} -func (m *TransactionParameters) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionParameters.DiscardUnknown(m) -} - -var xxx_messageInfo_TransactionParameters proto.InternalMessageInfo - -func (m *TransactionParameters) GetExpiryHeight() uint64 { +func (m *TransactionBody) GetExpiryHeight() uint64 { if m != nil { return m.ExpiryHeight } return 0 } -func (m *TransactionParameters) GetChainId() string { +func (m *TransactionBody) GetChainId() string { if m != nil { return m.ChainId } return "" } -// Detection data used by a detection server performing Fuzzy Message Detection. -type DetectionData struct { - // A list of clues for use with Fuzzy Message Detection. - FmdClues []*v1alpha1.Clue `protobuf:"bytes,4,rep,name=fmd_clues,json=fmdClues,proto3" json:"fmd_clues,omitempty"` -} - -func (m *DetectionData) Reset() { *m = DetectionData{} } -func (m *DetectionData) String() string { return proto.CompactTextString(m) } -func (*DetectionData) ProtoMessage() {} -func (*DetectionData) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{6} -} -func (m *DetectionData) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *DetectionData) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_DetectionData.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil +func (m *TransactionBody) GetFee() *v1alpha1.Fee { + if m != nil { + return m.Fee } + return nil } -func (m *DetectionData) XXX_Merge(src proto.Message) { - xxx_messageInfo_DetectionData.Merge(m, src) -} -func (m *DetectionData) XXX_Size() int { - return m.Size() -} -func (m *DetectionData) XXX_DiscardUnknown() { - xxx_messageInfo_DetectionData.DiscardUnknown(m) -} - -var xxx_messageInfo_DetectionData proto.InternalMessageInfo -func (m *DetectionData) GetFmdClues() []*v1alpha1.Clue { +func (m *TransactionBody) GetFmdClues() []*v1alpha1.Clue { if m != nil { return m.FmdClues } return nil } +func (m *TransactionBody) GetEncryptedMemo() []byte { + if x, ok := m.GetXEncryptedMemo().(*TransactionBody_EncryptedMemo); ok { + return x.EncryptedMemo + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*TransactionBody) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*TransactionBody_EncryptedMemo)(nil), + } +} + // A state change performed by a transaction. type Action struct { // Types that are valid to be assigned to Action: @@ -471,7 +333,7 @@ func (m *Action) Reset() { *m = Action{} } func (m *Action) String() string { return proto.CompactTextString(m) } func (*Action) ProtoMessage() {} func (*Action) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{7} + return fileDescriptor_cd20ea79758052c4, []int{4} } func (m *Action) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -805,7 +667,7 @@ func (m *TransactionPerspective) Reset() { *m = TransactionPerspective{} func (m *TransactionPerspective) String() string { return proto.CompactTextString(m) } func (*TransactionPerspective) ProtoMessage() {} func (*TransactionPerspective) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{8} + return fileDescriptor_cd20ea79758052c4, []int{5} } func (m *TransactionPerspective) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -884,7 +746,7 @@ func (m *PayloadKey) Reset() { *m = PayloadKey{} } func (m *PayloadKey) String() string { return proto.CompactTextString(m) } func (*PayloadKey) ProtoMessage() {} func (*PayloadKey) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{9} + return fileDescriptor_cd20ea79758052c4, []int{6} } func (m *PayloadKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -929,7 +791,7 @@ func (m *PayloadKeyWithCommitment) Reset() { *m = PayloadKeyWithCommitme func (m *PayloadKeyWithCommitment) String() string { return proto.CompactTextString(m) } func (*PayloadKeyWithCommitment) ProtoMessage() {} func (*PayloadKeyWithCommitment) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{10} + return fileDescriptor_cd20ea79758052c4, []int{7} } func (m *PayloadKeyWithCommitment) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -981,7 +843,7 @@ func (m *NullifierWithNote) Reset() { *m = NullifierWithNote{} } func (m *NullifierWithNote) String() string { return proto.CompactTextString(m) } func (*NullifierWithNote) ProtoMessage() {} func (*NullifierWithNote) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{11} + return fileDescriptor_cd20ea79758052c4, []int{8} } func (m *NullifierWithNote) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1039,7 +901,7 @@ func (m *TransactionView) Reset() { *m = TransactionView{} } func (m *TransactionView) String() string { return proto.CompactTextString(m) } func (*TransactionView) ProtoMessage() {} func (*TransactionView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{12} + return fileDescriptor_cd20ea79758052c4, []int{9} } func (m *TransactionView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1092,14 +954,17 @@ func (m *TransactionView) GetAnchor() *v1alpha1.MerkleRoot { type TransactionBodyView struct { // A list views into of actions (state changes) performed by this transaction. ActionViews []*ActionView `protobuf:"bytes,1,rep,name=action_views,json=actionViews,proto3" json:"action_views,omitempty"` - // Transaction parameters. - TransactionParameters *TransactionParameters `protobuf:"bytes,2,opt,name=transaction_parameters,json=transactionParameters,proto3" json:"transaction_parameters,omitempty"` - // The transaction fee. - Fee *v1alpha1.Fee `protobuf:"bytes,3,opt,name=fee,proto3" json:"fee,omitempty"` - // Types that are valid to be assigned to XDetectionData: + // The maximum height that this transaction can be included in the chain. // - // *TransactionBodyView_DetectionData - XDetectionData isTransactionBodyView_XDetectionData `protobuf_oneof:"_detection_data"` + // If zero, there is no maximum. + ExpiryHeight uint64 `protobuf:"varint,2,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` + // The chain this transaction is intended for. Including this prevents + // replaying a transaction on one chain onto a different chain. + ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + // The transaction fee. + Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` + // A list of clues for use with Fuzzy Message Detection. + FmdClues []*v1alpha1.Clue `protobuf:"bytes,5,rep,name=fmd_clues,json=fmdClues,proto3" json:"fmd_clues,omitempty"` // Types that are valid to be assigned to XMemoView: // // *TransactionBodyView_MemoView @@ -1110,7 +975,7 @@ func (m *TransactionBodyView) Reset() { *m = TransactionBodyView{} } func (m *TransactionBodyView) String() string { return proto.CompactTextString(m) } func (*TransactionBodyView) ProtoMessage() {} func (*TransactionBodyView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{13} + return fileDescriptor_cd20ea79758052c4, []int{10} } func (m *TransactionBodyView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1139,33 +1004,18 @@ func (m *TransactionBodyView) XXX_DiscardUnknown() { var xxx_messageInfo_TransactionBodyView proto.InternalMessageInfo -type isTransactionBodyView_XDetectionData interface { - isTransactionBodyView_XDetectionData() - MarshalTo([]byte) (int, error) - Size() int -} type isTransactionBodyView_XMemoView interface { isTransactionBodyView_XMemoView() MarshalTo([]byte) (int, error) Size() int } -type TransactionBodyView_DetectionData struct { - DetectionData *DetectionData `protobuf:"bytes,4,opt,name=detection_data,json=detectionData,proto3,oneof" json:"detection_data,omitempty"` -} type TransactionBodyView_MemoView struct { - MemoView *MemoView `protobuf:"bytes,5,opt,name=memo_view,json=memoView,proto3,oneof" json:"memo_view,omitempty"` + MemoView *MemoView `protobuf:"bytes,6,opt,name=memo_view,json=memoView,proto3,oneof" json:"memo_view,omitempty"` } -func (*TransactionBodyView_DetectionData) isTransactionBodyView_XDetectionData() {} -func (*TransactionBodyView_MemoView) isTransactionBodyView_XMemoView() {} +func (*TransactionBodyView_MemoView) isTransactionBodyView_XMemoView() {} -func (m *TransactionBodyView) GetXDetectionData() isTransactionBodyView_XDetectionData { - if m != nil { - return m.XDetectionData - } - return nil -} func (m *TransactionBodyView) GetXMemoView() isTransactionBodyView_XMemoView { if m != nil { return m.XMemoView @@ -1180,11 +1030,18 @@ func (m *TransactionBodyView) GetActionViews() []*ActionView { return nil } -func (m *TransactionBodyView) GetTransactionParameters() *TransactionParameters { +func (m *TransactionBodyView) GetExpiryHeight() uint64 { if m != nil { - return m.TransactionParameters + return m.ExpiryHeight } - return nil + return 0 +} + +func (m *TransactionBodyView) GetChainId() string { + if m != nil { + return m.ChainId + } + return "" } func (m *TransactionBodyView) GetFee() *v1alpha1.Fee { @@ -1194,9 +1051,9 @@ func (m *TransactionBodyView) GetFee() *v1alpha1.Fee { return nil } -func (m *TransactionBodyView) GetDetectionData() *DetectionData { - if x, ok := m.GetXDetectionData().(*TransactionBodyView_DetectionData); ok { - return x.DetectionData +func (m *TransactionBodyView) GetFmdClues() []*v1alpha1.Clue { + if m != nil { + return m.FmdClues } return nil } @@ -1211,7 +1068,6 @@ func (m *TransactionBodyView) GetMemoView() *MemoView { // XXX_OneofWrappers is for the internal use of the proto package. func (*TransactionBodyView) XXX_OneofWrappers() []interface{} { return []interface{}{ - (*TransactionBodyView_DetectionData)(nil), (*TransactionBodyView_MemoView)(nil), } } @@ -1249,7 +1105,7 @@ func (m *ActionView) Reset() { *m = ActionView{} } func (m *ActionView) String() string { return proto.CompactTextString(m) } func (*ActionView) ProtoMessage() {} func (*ActionView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{14} + return fileDescriptor_cd20ea79758052c4, []int{11} } func (m *ActionView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1575,7 +1431,7 @@ func (m *SpendView) Reset() { *m = SpendView{} } func (m *SpendView) String() string { return proto.CompactTextString(m) } func (*SpendView) ProtoMessage() {} func (*SpendView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{15} + return fileDescriptor_cd20ea79758052c4, []int{12} } func (m *SpendView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1658,7 +1514,7 @@ func (m *SpendView_Visible) Reset() { *m = SpendView_Visible{} } func (m *SpendView_Visible) String() string { return proto.CompactTextString(m) } func (*SpendView_Visible) ProtoMessage() {} func (*SpendView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{15, 0} + return fileDescriptor_cd20ea79758052c4, []int{12, 0} } func (m *SpendView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1709,7 +1565,7 @@ func (m *SpendView_Opaque) Reset() { *m = SpendView_Opaque{} } func (m *SpendView_Opaque) String() string { return proto.CompactTextString(m) } func (*SpendView_Opaque) ProtoMessage() {} func (*SpendView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{15, 1} + return fileDescriptor_cd20ea79758052c4, []int{12, 1} } func (m *SpendView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1757,7 +1613,7 @@ func (m *DelegatorVoteView) Reset() { *m = DelegatorVoteView{} } func (m *DelegatorVoteView) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView) ProtoMessage() {} func (*DelegatorVoteView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{16} + return fileDescriptor_cd20ea79758052c4, []int{13} } func (m *DelegatorVoteView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1840,7 +1696,7 @@ func (m *DelegatorVoteView_Visible) Reset() { *m = DelegatorVoteView_Vis func (m *DelegatorVoteView_Visible) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView_Visible) ProtoMessage() {} func (*DelegatorVoteView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{16, 0} + return fileDescriptor_cd20ea79758052c4, []int{13, 0} } func (m *DelegatorVoteView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1891,7 +1747,7 @@ func (m *DelegatorVoteView_Opaque) Reset() { *m = DelegatorVoteView_Opaq func (m *DelegatorVoteView_Opaque) String() string { return proto.CompactTextString(m) } func (*DelegatorVoteView_Opaque) ProtoMessage() {} func (*DelegatorVoteView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{16, 1} + return fileDescriptor_cd20ea79758052c4, []int{13, 1} } func (m *DelegatorVoteView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1939,7 +1795,7 @@ func (m *OutputView) Reset() { *m = OutputView{} } func (m *OutputView) String() string { return proto.CompactTextString(m) } func (*OutputView) ProtoMessage() {} func (*OutputView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{17} + return fileDescriptor_cd20ea79758052c4, []int{14} } func (m *OutputView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2023,7 +1879,7 @@ func (m *OutputView_Visible) Reset() { *m = OutputView_Visible{} } func (m *OutputView_Visible) String() string { return proto.CompactTextString(m) } func (*OutputView_Visible) ProtoMessage() {} func (*OutputView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{17, 0} + return fileDescriptor_cd20ea79758052c4, []int{14, 0} } func (m *OutputView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2081,7 +1937,7 @@ func (m *OutputView_Opaque) Reset() { *m = OutputView_Opaque{} } func (m *OutputView_Opaque) String() string { return proto.CompactTextString(m) } func (*OutputView_Opaque) ProtoMessage() {} func (*OutputView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{17, 1} + return fileDescriptor_cd20ea79758052c4, []int{14, 1} } func (m *OutputView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2131,7 +1987,7 @@ func (m *Spend) Reset() { *m = Spend{} } func (m *Spend) String() string { return proto.CompactTextString(m) } func (*Spend) ProtoMessage() {} func (*Spend) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{18} + return fileDescriptor_cd20ea79758052c4, []int{15} } func (m *Spend) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2197,7 +2053,7 @@ func (m *SpendBody) Reset() { *m = SpendBody{} } func (m *SpendBody) String() string { return proto.CompactTextString(m) } func (*SpendBody) ProtoMessage() {} func (*SpendBody) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{19} + return fileDescriptor_cd20ea79758052c4, []int{16} } func (m *SpendBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2259,7 +2115,7 @@ func (m *Output) Reset() { *m = Output{} } func (m *Output) String() string { return proto.CompactTextString(m) } func (*Output) ProtoMessage() {} func (*Output) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{20} + return fileDescriptor_cd20ea79758052c4, []int{17} } func (m *Output) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2321,7 +2177,7 @@ func (m *OutputBody) Reset() { *m = OutputBody{} } func (m *OutputBody) String() string { return proto.CompactTextString(m) } func (*OutputBody) ProtoMessage() {} func (*OutputBody) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{21} + return fileDescriptor_cd20ea79758052c4, []int{18} } func (m *OutputBody) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2394,7 +2250,7 @@ func (m *AuthorizationData) Reset() { *m = AuthorizationData{} } func (m *AuthorizationData) String() string { return proto.CompactTextString(m) } func (*AuthorizationData) ProtoMessage() {} func (*AuthorizationData) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{22} + return fileDescriptor_cd20ea79758052c4, []int{19} } func (m *AuthorizationData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2457,7 +2313,7 @@ func (m *WitnessData) Reset() { *m = WitnessData{} } func (m *WitnessData) String() string { return proto.CompactTextString(m) } func (*WitnessData) ProtoMessage() {} func (*WitnessData) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{23} + return fileDescriptor_cd20ea79758052c4, []int{20} } func (m *WitnessData) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2500,27 +2356,21 @@ func (m *WitnessData) GetStateCommitmentProofs() []*v1alpha1.StateCommitmentProo return nil } -// Describes a planned transaction. Permits clients to prepare a transaction -// prior submission, so that a user can review it prior to authorizing its execution. +// Describes a planned transaction. type TransactionPlan struct { - // The planner interface(s) for Actions to be performed, such as a Spend, Swap, - // or Delegation. See the ActionPlan docs for a full list of options. - Actions []*ActionPlan `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` - // Time, as block height, after which TransactionPlan should be considered invalid. - ExpiryHeight uint64 `protobuf:"varint,2,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` - // The name of the network for which this TransactionPlan was built. - ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` - Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` - CluePlans []*CluePlan `protobuf:"bytes,5,rep,name=clue_plans,json=cluePlans,proto3" json:"clue_plans,omitempty"` - // Planning interface for constructing an optional Memo for the Transaction. - MemoPlan *MemoPlan `protobuf:"bytes,6,opt,name=memo_plan,json=memoPlan,proto3" json:"memo_plan,omitempty"` + Actions []*ActionPlan `protobuf:"bytes,1,rep,name=actions,proto3" json:"actions,omitempty"` + ExpiryHeight uint64 `protobuf:"varint,2,opt,name=expiry_height,json=expiryHeight,proto3" json:"expiry_height,omitempty"` + ChainId string `protobuf:"bytes,3,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` + Fee *v1alpha1.Fee `protobuf:"bytes,4,opt,name=fee,proto3" json:"fee,omitempty"` + CluePlans []*CluePlan `protobuf:"bytes,5,rep,name=clue_plans,json=cluePlans,proto3" json:"clue_plans,omitempty"` + MemoPlan *MemoPlan `protobuf:"bytes,6,opt,name=memo_plan,json=memoPlan,proto3" json:"memo_plan,omitempty"` } func (m *TransactionPlan) Reset() { *m = TransactionPlan{} } func (m *TransactionPlan) String() string { return proto.CompactTextString(m) } func (*TransactionPlan) ProtoMessage() {} func (*TransactionPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{24} + return fileDescriptor_cd20ea79758052c4, []int{21} } func (m *TransactionPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2627,7 +2477,7 @@ func (m *ActionPlan) Reset() { *m = ActionPlan{} } func (m *ActionPlan) String() string { return proto.CompactTextString(m) } func (*ActionPlan) ProtoMessage() {} func (*ActionPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{25} + return fileDescriptor_cd20ea79758052c4, []int{22} } func (m *ActionPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2955,7 +2805,7 @@ func (m *CluePlan) Reset() { *m = CluePlan{} } func (m *CluePlan) String() string { return proto.CompactTextString(m) } func (*CluePlan) ProtoMessage() {} func (*CluePlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{26} + return fileDescriptor_cd20ea79758052c4, []int{23} } func (m *CluePlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3017,7 +2867,7 @@ func (m *MemoPlan) Reset() { *m = MemoPlan{} } func (m *MemoPlan) String() string { return proto.CompactTextString(m) } func (*MemoPlan) ProtoMessage() {} func (*MemoPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{27} + return fileDescriptor_cd20ea79758052c4, []int{24} } func (m *MemoPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3068,7 +2918,7 @@ func (m *MemoCiphertext) Reset() { *m = MemoCiphertext{} } func (m *MemoCiphertext) String() string { return proto.CompactTextString(m) } func (*MemoCiphertext) ProtoMessage() {} func (*MemoCiphertext) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{28} + return fileDescriptor_cd20ea79758052c4, []int{25} } func (m *MemoCiphertext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3113,7 +2963,7 @@ func (m *MemoPlaintext) Reset() { *m = MemoPlaintext{} } func (m *MemoPlaintext) String() string { return proto.CompactTextString(m) } func (*MemoPlaintext) ProtoMessage() {} func (*MemoPlaintext) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{29} + return fileDescriptor_cd20ea79758052c4, []int{26} } func (m *MemoPlaintext) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3168,7 +3018,7 @@ func (m *MemoView) Reset() { *m = MemoView{} } func (m *MemoView) String() string { return proto.CompactTextString(m) } func (*MemoView) ProtoMessage() {} func (*MemoView) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{30} + return fileDescriptor_cd20ea79758052c4, []int{27} } func (m *MemoView) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3251,7 +3101,7 @@ func (m *MemoView_Visible) Reset() { *m = MemoView_Visible{} } func (m *MemoView_Visible) String() string { return proto.CompactTextString(m) } func (*MemoView_Visible) ProtoMessage() {} func (*MemoView_Visible) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{30, 0} + return fileDescriptor_cd20ea79758052c4, []int{27, 0} } func (m *MemoView_Visible) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3302,7 +3152,7 @@ func (m *MemoView_Opaque) Reset() { *m = MemoView_Opaque{} } func (m *MemoView_Opaque) String() string { return proto.CompactTextString(m) } func (*MemoView_Opaque) ProtoMessage() {} func (*MemoView_Opaque) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{30, 1} + return fileDescriptor_cd20ea79758052c4, []int{27, 1} } func (m *MemoView_Opaque) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3347,17 +3197,13 @@ type SpendPlan struct { Randomizer []byte `protobuf:"bytes,3,opt,name=randomizer,proto3" json:"randomizer,omitempty"` // The blinding factor to use for the value commitment. ValueBlinding []byte `protobuf:"bytes,4,opt,name=value_blinding,json=valueBlinding,proto3" json:"value_blinding,omitempty"` - // The first blinding factor to use for the ZK spend proof. - ProofBlindingR []byte `protobuf:"bytes,5,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` - // The second blinding factor to use for the ZK spend proof. - ProofBlindingS []byte `protobuf:"bytes,6,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *SpendPlan) Reset() { *m = SpendPlan{} } func (m *SpendPlan) String() string { return proto.CompactTextString(m) } func (*SpendPlan) ProtoMessage() {} func (*SpendPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{31} + return fileDescriptor_cd20ea79758052c4, []int{28} } func (m *SpendPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3414,20 +3260,6 @@ func (m *SpendPlan) GetValueBlinding() []byte { return nil } -func (m *SpendPlan) GetProofBlindingR() []byte { - if m != nil { - return m.ProofBlindingR - } - return nil -} - -func (m *SpendPlan) GetProofBlindingS() []byte { - if m != nil { - return m.ProofBlindingS - } - return nil -} - type OutputPlan struct { // The value to send to this output. Value *v1alpha1.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` @@ -3437,17 +3269,13 @@ type OutputPlan struct { Rseed []byte `protobuf:"bytes,3,opt,name=rseed,proto3" json:"rseed,omitempty"` // The blinding factor to use for the value commitment. ValueBlinding []byte `protobuf:"bytes,4,opt,name=value_blinding,json=valueBlinding,proto3" json:"value_blinding,omitempty"` - // The first blinding factor to use for the ZK output proof. - ProofBlindingR []byte `protobuf:"bytes,5,opt,name=proof_blinding_r,json=proofBlindingR,proto3" json:"proof_blinding_r,omitempty"` - // The second blinding factor to use for the ZK output proof. - ProofBlindingS []byte `protobuf:"bytes,6,opt,name=proof_blinding_s,json=proofBlindingS,proto3" json:"proof_blinding_s,omitempty"` } func (m *OutputPlan) Reset() { *m = OutputPlan{} } func (m *OutputPlan) String() string { return proto.CompactTextString(m) } func (*OutputPlan) ProtoMessage() {} func (*OutputPlan) Descriptor() ([]byte, []int) { - return fileDescriptor_cd20ea79758052c4, []int{32} + return fileDescriptor_cd20ea79758052c4, []int{29} } func (m *OutputPlan) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3504,28 +3332,11 @@ func (m *OutputPlan) GetValueBlinding() []byte { return nil } -func (m *OutputPlan) GetProofBlindingR() []byte { - if m != nil { - return m.ProofBlindingR - } - return nil -} - -func (m *OutputPlan) GetProofBlindingS() []byte { - if m != nil { - return m.ProofBlindingS - } - return nil -} - func init() { proto.RegisterType((*Transaction)(nil), "penumbra.core.transaction.v1alpha1.Transaction") proto.RegisterType((*Id)(nil), "penumbra.core.transaction.v1alpha1.Id") proto.RegisterType((*EffectHash)(nil), "penumbra.core.transaction.v1alpha1.EffectHash") proto.RegisterType((*TransactionBody)(nil), "penumbra.core.transaction.v1alpha1.TransactionBody") - proto.RegisterType((*MemoData)(nil), "penumbra.core.transaction.v1alpha1.MemoData") - proto.RegisterType((*TransactionParameters)(nil), "penumbra.core.transaction.v1alpha1.TransactionParameters") - proto.RegisterType((*DetectionData)(nil), "penumbra.core.transaction.v1alpha1.DetectionData") proto.RegisterType((*Action)(nil), "penumbra.core.transaction.v1alpha1.Action") proto.RegisterType((*TransactionPerspective)(nil), "penumbra.core.transaction.v1alpha1.TransactionPerspective") proto.RegisterType((*PayloadKey)(nil), "penumbra.core.transaction.v1alpha1.PayloadKey") @@ -3567,182 +3378,173 @@ func init() { } var fileDescriptor_cd20ea79758052c4 = []byte{ - // 2795 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0xcf, 0x6f, 0xe3, 0xc6, - 0xf5, 0x17, 0x25, 0xdb, 0x6b, 0x3f, 0xc9, 0x5a, 0x7b, 0xf6, 0x47, 0xf4, 0x35, 0xbe, 0x70, 0x16, - 0x4c, 0xb2, 0xf5, 0x6e, 0x12, 0x39, 0xeb, 0xdd, 0x4d, 0x50, 0x27, 0x6d, 0x63, 0xd9, 0xd9, 0xc8, - 0xbb, 0xf1, 0x5a, 0xa1, 0x53, 0xbb, 0x49, 0x9d, 0xb0, 0x23, 0x72, 0x6c, 0x11, 0x96, 0x48, 0x96, - 0xa4, 0xe4, 0x75, 0xfe, 0x81, 0xa6, 0x97, 0x22, 0x05, 0x7a, 0x28, 0x7a, 0x29, 0x50, 0xe4, 0xd4, - 0x43, 0xff, 0x80, 0x16, 0x3d, 0x37, 0x68, 0x2f, 0x01, 0x7a, 0x29, 0x10, 0x14, 0x48, 0x37, 0xa7, - 0xfe, 0xb8, 0xf4, 0xdc, 0x4b, 0x31, 0x3f, 0x38, 0x24, 0x25, 0x7a, 0x45, 0xd9, 0x4e, 0x83, 0xfc, - 0x38, 0x99, 0xf3, 0xfc, 0xde, 0x67, 0x66, 0xde, 0x7b, 0x33, 0xf3, 0xde, 0x9b, 0x11, 0xdc, 0x72, - 0x89, 0xdd, 0xed, 0x34, 0x3d, 0xbc, 0x68, 0x38, 0x1e, 0x59, 0x0c, 0x3c, 0x6c, 0xfb, 0xd8, 0x08, - 0x2c, 0xc7, 0x5e, 0xec, 0xdd, 0xc0, 0x6d, 0xb7, 0x85, 0x6f, 0xc4, 0x89, 0x55, 0xd7, 0x73, 0x02, - 0x07, 0xa9, 0xa1, 0x54, 0x95, 0x4a, 0x55, 0xe3, 0x0c, 0xa1, 0xd4, 0xdc, 0xf5, 0x24, 0xb2, 0xe1, - 0x1d, 0xb9, 0x81, 0x13, 0x81, 0xf2, 0x36, 0xc7, 0x9b, 0x5b, 0x48, 0xf2, 0xfa, 0x01, 0x3e, 0x20, - 0x11, 0x2b, 0x6b, 0x0a, 0xce, 0x27, 0x93, 0x9c, 0x56, 0xd3, 0x88, 0xf8, 0xac, 0xa6, 0x91, 0xce, - 0x65, 0x92, 0x07, 0x11, 0x97, 0x49, 0x1e, 0x08, 0xae, 0xa5, 0x24, 0xd7, 0xbe, 0xd3, 0x23, 0x9e, - 0x8d, 0x6d, 0x23, 0xd6, 0x75, 0x44, 0xe3, 0x32, 0xea, 0x6f, 0x15, 0x28, 0xbe, 0x11, 0x4d, 0x17, - 0xbd, 0x0a, 0x63, 0x4d, 0xc7, 0x3c, 0xaa, 0x28, 0x57, 0x94, 0x85, 0xe2, 0xd2, 0xcd, 0xea, 0x70, - 0xc5, 0x54, 0x63, 0xe2, 0x35, 0xc7, 0x3c, 0xd2, 0x18, 0x00, 0x7a, 0x1c, 0x8a, 0x4d, 0xcb, 0x36, - 0x2d, 0x7b, 0x5f, 0xf7, 0xad, 0xfd, 0x4a, 0xfe, 0x8a, 0xb2, 0x50, 0xd2, 0x40, 0x90, 0xb6, 0xac, - 0x7d, 0xb4, 0x02, 0x13, 0xd8, 0x36, 0x5a, 0x8e, 0x57, 0x29, 0xb0, 0xbe, 0xae, 0xf5, 0xf5, 0x25, - 0x14, 0x2a, 0xbb, 0xd9, 0x20, 0xde, 0x41, 0x9b, 0x68, 0x8e, 0x13, 0x68, 0x42, 0x50, 0xad, 0x40, - 0x7e, 0xdd, 0x44, 0x08, 0xc6, 0x5a, 0xd8, 0x6f, 0xb1, 0x21, 0x97, 0x34, 0xf6, 0xad, 0xaa, 0x00, - 0xaf, 0xec, 0xed, 0x11, 0x23, 0xa8, 0x63, 0xbf, 0x85, 0x2e, 0xc2, 0xb8, 0x65, 0xdb, 0xc4, 0x13, - 0x2c, 0xbc, 0xa1, 0x7e, 0x50, 0x80, 0xf3, 0x7d, 0x63, 0x47, 0x6b, 0x70, 0x8e, 0xb7, 0xfc, 0x8a, - 0x72, 0xa5, 0xb0, 0x50, 0x5c, 0xba, 0x9e, 0x45, 0x03, 0x2b, 0xac, 0xad, 0x85, 0xa2, 0xc8, 0x85, - 0xcb, 0x31, 0x3e, 0xdd, 0xc5, 0x1e, 0xee, 0x90, 0x80, 0x78, 0x3e, 0x53, 0x43, 0x71, 0xe9, 0x9b, - 0x23, 0xaa, 0xb5, 0x21, 0x01, 0xb4, 0x4b, 0x41, 0x1a, 0x19, 0xdd, 0x82, 0xc2, 0x1e, 0x21, 0x42, - 0x93, 0xea, 0x10, 0x4d, 0xde, 0x21, 0x44, 0xa3, 0xec, 0xe8, 0x7b, 0x50, 0x36, 0x49, 0x40, 0xf8, - 0x28, 0x4d, 0x1c, 0xe0, 0xca, 0x18, 0x03, 0xb8, 0x91, 0x65, 0x7c, 0x6b, 0xa1, 0xe4, 0x1a, 0x0e, - 0xb0, 0x36, 0x6d, 0xc6, 0x9b, 0x68, 0x1d, 0xa6, 0x3a, 0xa4, 0xe3, 0x70, 0xd0, 0x71, 0x06, 0xfa, - 0x4c, 0x16, 0xd0, 0x0d, 0xd2, 0x71, 0x18, 0xde, 0x64, 0x47, 0x7c, 0xa9, 0xeb, 0x30, 0x19, 0x52, - 0xd1, 0x75, 0x28, 0x13, 0x9b, 0x4d, 0x87, 0x98, 0x3a, 0xe5, 0xe0, 0x16, 0xad, 0xe7, 0xb4, 0x69, - 0x49, 0xa7, 0xcc, 0xef, 0x29, 0x4a, 0x6d, 0x16, 0xce, 0xeb, 0x49, 0x66, 0x75, 0x07, 0x2e, 0xa5, - 0x6a, 0x15, 0x3d, 0x01, 0xd3, 0xe4, 0x81, 0x6b, 0x79, 0x47, 0x7a, 0x8b, 0x58, 0xfb, 0xad, 0x80, - 0xc1, 0x8e, 0x69, 0x25, 0x4e, 0xac, 0x33, 0x1a, 0xfa, 0x3f, 0x98, 0x34, 0x5a, 0xd8, 0xb2, 0x75, - 0xcb, 0x64, 0x76, 0x9c, 0xd2, 0xce, 0xb1, 0xf6, 0xba, 0xa9, 0xbe, 0x0e, 0xd3, 0x09, 0x75, 0xa0, - 0x97, 0x61, 0x6a, 0xaf, 0x63, 0xea, 0x46, 0xbb, 0x4b, 0xfc, 0xca, 0x18, 0xf3, 0xa4, 0x27, 0x86, - 0x58, 0x65, 0xb5, 0xdd, 0x25, 0xda, 0xe4, 0x5e, 0xc7, 0xa4, 0x1f, 0xbe, 0xfa, 0xe7, 0x32, 0x4c, - 0x70, 0xbf, 0x42, 0x2b, 0x30, 0xee, 0xbb, 0xc4, 0x36, 0xc5, 0xa2, 0xbc, 0x96, 0x45, 0x91, 0x5b, - 0x54, 0xa0, 0x9e, 0xd3, 0xb8, 0x24, 0x5a, 0x83, 0x09, 0xa7, 0x1b, 0xb8, 0xdd, 0x40, 0x78, 0x60, - 0x26, 0xb7, 0xde, 0x64, 0x12, 0xf5, 0x9c, 0x26, 0x64, 0xd1, 0xf3, 0x30, 0xe6, 0x1f, 0x62, 0x57, - 0xb8, 0xd9, 0x95, 0x3e, 0x0c, 0xba, 0x11, 0x45, 0xfd, 0x1f, 0x62, 0xb7, 0x9e, 0xd3, 0x18, 0x3f, - 0xba, 0x03, 0x40, 0xff, 0xea, 0x46, 0x1b, 0x5b, 0x1d, 0xe1, 0x63, 0x4f, 0x0d, 0x93, 0x5e, 0xa5, - 0xcc, 0xf5, 0x9c, 0x36, 0xe5, 0x87, 0x0d, 0xb4, 0x07, 0x17, 0x7b, 0xb8, 0x6d, 0x99, 0x38, 0x70, - 0x3c, 0xdd, 0x24, 0x7b, 0x96, 0x6d, 0xd1, 0x11, 0x57, 0x66, 0x52, 0xbd, 0x96, 0x6f, 0xb3, 0x12, - 0x73, 0x3b, 0x94, 0x5c, 0x93, 0x82, 0xf5, 0x9c, 0x76, 0xa1, 0x37, 0x48, 0xa6, 0xe3, 0xb5, 0x9a, - 0x86, 0xce, 0xf5, 0x51, 0x99, 0x4d, 0x1d, 0x2f, 0xdd, 0x9c, 0x25, 0xf6, 0x7a, 0xd3, 0xe0, 0xb6, - 0xa2, 0xe3, 0xb5, 0xc2, 0x06, 0xda, 0x85, 0xf3, 0xae, 0xe7, 0xb8, 0x8e, 0x8f, 0xdb, 0xba, 0xdf, - 0x6d, 0x76, 0xac, 0xa0, 0x82, 0x52, 0x87, 0x1a, 0xdb, 0x96, 0x25, 0x66, 0x43, 0x48, 0x6e, 0x31, - 0xc1, 0x7a, 0x4e, 0x2b, 0xbb, 0x09, 0x0a, 0x6a, 0xc2, 0xac, 0x44, 0x3f, 0xb4, 0x82, 0x96, 0xe9, - 0xe1, 0xc3, 0xca, 0x85, 0xd4, 0x7d, 0xfb, 0x51, 0xf8, 0x3b, 0x42, 0xb4, 0x9e, 0xd3, 0x66, 0xdc, - 0x3e, 0x1a, 0x7a, 0x13, 0xca, 0x91, 0xc6, 0x7b, 0x4e, 0x40, 0x2a, 0x17, 0x59, 0x07, 0xcf, 0x65, - 0xe8, 0x40, 0x2a, 0x7c, 0xdb, 0x09, 0x08, 0x5d, 0xa2, 0xbd, 0x38, 0x81, 0x42, 0x9b, 0xa4, 0x4d, - 0xf6, 0x23, 0xe8, 0x4b, 0x99, 0xa1, 0xd7, 0x42, 0xc1, 0x10, 0xda, 0x8c, 0x13, 0x90, 0x03, 0x97, - 0xa5, 0x66, 0x4c, 0xe2, 0x3a, 0xbe, 0x15, 0x08, 0xdf, 0xbb, 0xcc, 0xba, 0x78, 0x61, 0x04, 0xf5, - 0xac, 0x71, 0xf9, 0xd0, 0x1b, 0x2f, 0xba, 0x29, 0x74, 0xb4, 0x09, 0xd3, 0xac, 0x45, 0xf7, 0x51, - 0xc7, 0x25, 0x76, 0x65, 0x9e, 0xf5, 0xb3, 0xf0, 0x28, 0x1f, 0x6f, 0x08, 0x81, 0x4d, 0x97, 0x50, - 0xb7, 0x29, 0xb9, 0xb1, 0x36, 0xd2, 0xa0, 0x2c, 0x01, 0x8d, 0xb6, 0xe3, 0x93, 0xca, 0xe3, 0xa9, - 0x6b, 0x3f, 0x15, 0x71, 0x95, 0x0a, 0x50, 0xad, 0xb8, 0x71, 0x02, 0xfa, 0x3e, 0xcc, 0x4a, 0x4c, - 0xe9, 0x2f, 0x57, 0x52, 0xf7, 0xe6, 0x54, 0xd8, 0x84, 0xa3, 0xf4, 0xd1, 0x10, 0x81, 0x4b, 0x12, - 0xdc, 0x23, 0x87, 0xd8, 0x33, 0x85, 0xc6, 0x55, 0xd6, 0xc1, 0x62, 0x96, 0x0e, 0x34, 0x26, 0x17, - 0x6a, 0xfa, 0x82, 0x3b, 0x48, 0x46, 0x6b, 0x30, 0x29, 0x4c, 0x4d, 0x2a, 0x0b, 0x0c, 0xf9, 0xea, - 0xa3, 0x57, 0xbd, 0xf0, 0x14, 0xaa, 0x0e, 0x29, 0x89, 0xee, 0x02, 0x74, 0x6d, 0x89, 0x73, 0x2d, - 0xd5, 0x56, 0x7d, 0x38, 0xdf, 0x95, 0xfc, 0xf5, 0x9c, 0x16, 0x93, 0x46, 0x6f, 0xc1, 0x4c, 0xd4, - 0x12, 0x73, 0xbe, 0xce, 0x10, 0x9f, 0xcd, 0x8a, 0x18, 0xce, 0xf8, 0x7c, 0x37, 0x49, 0x42, 0x77, - 0x61, 0xca, 0xc4, 0x8e, 0xce, 0x37, 0xff, 0x25, 0x06, 0xfa, 0x74, 0x96, 0xd5, 0x81, 0x9d, 0x70, - 0xfb, 0x9f, 0x34, 0xc5, 0x37, 0xda, 0x00, 0xa0, 0x58, 0xe2, 0x14, 0xb8, 0x99, 0x6a, 0xf6, 0x63, - 0xc0, 0xe4, 0x39, 0x40, 0x47, 0xc3, 0x1b, 0xa8, 0x01, 0x45, 0x0a, 0x27, 0x56, 0x57, 0xe5, 0x56, - 0xea, 0x8c, 0x8f, 0xc1, 0x13, 0x4b, 0x87, 0x2a, 0xd2, 0x94, 0x2d, 0xf4, 0x26, 0xcc, 0x58, 0x86, - 0xbf, 0xf4, 0x9c, 0xf4, 0x4d, 0xdc, 0xae, 0x7c, 0xa8, 0xa4, 0x4e, 0x3a, 0xb9, 0xf7, 0x52, 0xa1, - 0x1d, 0x29, 0x43, 0xf5, 0x68, 0x25, 0x49, 0xb5, 0x49, 0x98, 0xe0, 0x7b, 0xb9, 0xfa, 0xe3, 0x31, - 0xb8, 0x1c, 0x0f, 0x01, 0x88, 0xe7, 0xbb, 0xf4, 0xd8, 0xee, 0x11, 0xa4, 0x43, 0xc9, 0xc5, 0x47, - 0x6d, 0x07, 0x9b, 0xfa, 0x01, 0x39, 0x0a, 0xe3, 0xbf, 0x97, 0xb2, 0x1c, 0x94, 0x0d, 0x2e, 0x77, - 0x8f, 0x1c, 0xd1, 0x4e, 0x57, 0x9d, 0x4e, 0xc7, 0x0a, 0x3a, 0xc4, 0x0e, 0xb4, 0xa2, 0x2b, 0xff, - 0xe3, 0xa3, 0x1f, 0xc0, 0x0c, 0xb3, 0xa4, 0x6e, 0x77, 0xdb, 0x6d, 0x6b, 0xcf, 0xe2, 0xf1, 0x20, - 0xed, 0xe4, 0x76, 0x96, 0x4e, 0xee, 0x87, 0x52, 0xb4, 0x8f, 0xfb, 0x4e, 0x40, 0xb4, 0xf3, 0x0c, - 0x4e, 0xd2, 0x7d, 0x74, 0x07, 0x4a, 0xd8, 0xec, 0x59, 0x06, 0xd1, 0x6d, 0x27, 0x20, 0x7e, 0xa5, - 0x90, 0x29, 0xf0, 0x60, 0x58, 0x45, 0x2e, 0x48, 0xbf, 0x7d, 0xba, 0x9d, 0x61, 0xd3, 0xf4, 0x88, - 0xef, 0xeb, 0x3d, 0x8b, 0x1c, 0x86, 0x11, 0xcc, 0xf5, 0x21, 0x40, 0x2b, 0x5c, 0x66, 0xdb, 0x22, - 0x87, 0x5a, 0x09, 0x47, 0x0d, 0x9f, 0x86, 0x1f, 0x26, 0xb1, 0x9d, 0x8e, 0x5f, 0x19, 0x67, 0x48, - 0xcf, 0x0c, 0x41, 0x5a, 0xa3, 0xcc, 0x1b, 0x24, 0xc0, 0x34, 0x7e, 0xd4, 0x84, 0x2c, 0xda, 0x80, - 0x72, 0x3c, 0xac, 0xb6, 0xcc, 0xca, 0x44, 0xea, 0x16, 0x90, 0xaa, 0xbe, 0x75, 0x53, 0x9b, 0x8e, - 0xfd, 0x63, 0xdd, 0xa4, 0x39, 0x42, 0x64, 0xb8, 0x63, 0x72, 0x84, 0xdf, 0x29, 0x50, 0x39, 0xce, - 0xba, 0x68, 0x13, 0x8a, 0x31, 0x8f, 0x11, 0xd1, 0x59, 0x75, 0x34, 0x87, 0xd1, 0x20, 0x72, 0x11, - 0x74, 0x1f, 0xc0, 0x90, 0xf0, 0x22, 0x52, 0xab, 0x0e, 0x51, 0xd5, 0x56, 0x40, 0xb7, 0x8b, 0xc8, - 0xe5, 0x62, 0x08, 0xea, 0xcf, 0x14, 0x98, 0x1d, 0x70, 0x1b, 0x74, 0x07, 0xa6, 0xa4, 0x07, 0x8a, - 0x41, 0x2f, 0x0c, 0x73, 0x91, 0x90, 0x5f, 0x8b, 0x44, 0xd1, 0x0b, 0x30, 0x46, 0xdd, 0x4c, 0x8c, - 0x33, 0x93, 0x97, 0x31, 0x01, 0xf5, 0x4f, 0x4a, 0x22, 0xf1, 0xa2, 0x2e, 0x82, 0xde, 0x80, 0x29, - 0x9a, 0x36, 0x32, 0x7f, 0x13, 0x83, 0x7a, 0xe1, 0x04, 0xc9, 0x27, 0xf3, 0xbd, 0xc9, 0xa6, 0xf8, - 0xfa, 0x9f, 0x24, 0xa1, 0x9f, 0x14, 0xe0, 0x42, 0xca, 0x28, 0xd0, 0xeb, 0x50, 0x12, 0x8e, 0xca, - 0xd7, 0x10, 0xdf, 0x4f, 0xaa, 0xd9, 0xf3, 0x49, 0x36, 0x97, 0x62, 0xa4, 0xa3, 0x2f, 0x4e, 0x5e, - 0xf9, 0xf6, 0x99, 0xe5, 0x95, 0x3c, 0xb6, 0x8b, 0x11, 0xde, 0x53, 0x14, 0x74, 0x5f, 0x24, 0x97, - 0xcc, 0x57, 0x46, 0x4c, 0x2e, 0xa9, 0x22, 0xeb, 0x0a, 0x4f, 0x2f, 0xe9, 0x77, 0x98, 0x29, 0x26, - 0xc7, 0x5b, 0x2b, 0x01, 0xe8, 0xb2, 0x0f, 0xf5, 0xdf, 0x65, 0x80, 0xc8, 0x26, 0xe8, 0x95, 0x64, - 0x3e, 0xf6, 0x6c, 0xe6, 0x7c, 0x8c, 0x75, 0x2e, 0x73, 0xb2, 0x7a, 0x5f, 0x4e, 0x56, 0xcd, 0x9e, - 0x93, 0x09, 0xa0, 0x30, 0x2f, 0x5b, 0x4e, 0xe4, 0x65, 0x4f, 0x0e, 0xcb, 0xac, 0x84, 0x34, 0xcf, - 0xcd, 0xee, 0xa6, 0xe4, 0x66, 0xd7, 0x32, 0xe5, 0x66, 0x02, 0xe6, 0xeb, 0xfc, 0xec, 0xcb, 0x99, - 0x9f, 0xbd, 0x73, 0x4c, 0x7e, 0x76, 0x3b, 0xdb, 0x22, 0x8e, 0xe5, 0x63, 0xc2, 0x51, 0xbe, 0x4e, - 0xd2, 0xbe, 0x82, 0x49, 0xda, 0xb5, 0x33, 0x4a, 0xd2, 0xae, 0x9f, 0x2a, 0x49, 0xfb, 0x4a, 0x25, - 0x52, 0x69, 0x19, 0xe9, 0xd3, 0x67, 0x94, 0x91, 0x7e, 0x86, 0x49, 0xda, 0x34, 0x14, 0x63, 0xf1, - 0x92, 0xfa, 0xd3, 0x02, 0x4c, 0xc9, 0x43, 0x13, 0xbd, 0x0e, 0xe7, 0x7a, 0x96, 0x6f, 0x35, 0xdb, - 0x44, 0x1c, 0xba, 0xb7, 0x47, 0x3a, 0x74, 0xab, 0xdb, 0x5c, 0xb8, 0x9e, 0xd3, 0x42, 0x1c, 0x74, - 0x1f, 0x26, 0x1c, 0x17, 0xff, 0xb0, 0x1b, 0x06, 0xb0, 0xb7, 0x46, 0x43, 0xdc, 0x64, 0xb2, 0xec, - 0x10, 0x66, 0x5f, 0x73, 0x3f, 0x52, 0xe0, 0x9c, 0xe8, 0x06, 0x7d, 0xe7, 0xa4, 0x15, 0xdb, 0x30, - 0x36, 0x78, 0x31, 0x11, 0x5b, 0x7f, 0x23, 0x43, 0x6c, 0xcd, 0xa2, 0x45, 0x26, 0x34, 0xb7, 0x0e, - 0x13, 0x7c, 0x74, 0xa7, 0x1e, 0x07, 0x8d, 0x83, 0x78, 0xce, 0xca, 0x6c, 0xf2, 0xd7, 0x02, 0xcc, - 0x0e, 0xec, 0xec, 0xe8, 0xcd, 0x7e, 0xdb, 0x7c, 0xeb, 0x44, 0x27, 0x44, 0x9a, 0x8d, 0xb6, 0xfb, - 0x6c, 0xf4, 0xd2, 0xc9, 0x90, 0x07, 0x6c, 0xf5, 0xcb, 0x98, 0xad, 0x76, 0x06, 0xce, 0x39, 0xe5, - 0x64, 0x75, 0xc8, 0xfe, 0x03, 0xee, 0x54, 0x36, 0xc4, 0xd2, 0x86, 0x9f, 0xd5, 0xf8, 0x6a, 0x33, - 0xfd, 0xc0, 0xea, 0xbf, 0x0a, 0x00, 0x51, 0x80, 0x89, 0xb4, 0x7e, 0xc3, 0x3e, 0x3f, 0x5a, 0x84, - 0x9a, 0x66, 0xd1, 0xcd, 0x3e, 0x8b, 0xde, 0x1e, 0x11, 0x72, 0xc0, 0x94, 0x1f, 0xc7, 0x4c, 0x59, - 0x93, 0x11, 0xb5, 0x32, 0xea, 0x2d, 0x87, 0x8c, 0xa5, 0x4f, 0x63, 0xb5, 0xfe, 0x8a, 0x40, 0xe1, - 0xb4, 0x15, 0x81, 0xb9, 0xd7, 0xa4, 0x1b, 0x9c, 0xc1, 0xdc, 0xe8, 0x16, 0xcb, 0xbf, 0xf8, 0x72, - 0xfe, 0x58, 0x81, 0x71, 0x7e, 0xa6, 0xad, 0x24, 0x6e, 0x7d, 0xb3, 0x27, 0x34, 0xb1, 0xfb, 0xde, - 0xd7, 0x60, 0x12, 0x77, 0x83, 0x96, 0xcc, 0xb3, 0x07, 0x83, 0xe8, 0x81, 0xca, 0x05, 0x45, 0x58, - 0xe9, 0x06, 0xad, 0x2d, 0x6b, 0xdf, 0xc6, 0x41, 0xd7, 0x23, 0xda, 0x39, 0xcc, 0x9b, 0x68, 0x05, - 0xc6, 0x5d, 0xcf, 0x71, 0xf6, 0x84, 0x0a, 0x9f, 0x1e, 0x02, 0xf5, 0xd6, 0x3d, 0x06, 0xd6, 0xa0, - 0x22, 0x1a, 0x97, 0x54, 0x7f, 0xa1, 0x88, 0x03, 0x84, 0x5d, 0xec, 0xea, 0x80, 0x9a, 0xb8, 0x4d, - 0x57, 0x87, 0x1e, 0x2b, 0xb1, 0xa4, 0xaf, 0xa4, 0x7e, 0xf4, 0x1a, 0x17, 0x8c, 0x15, 0x59, 0x66, - 0x9b, 0xfd, 0x24, 0xf4, 0xff, 0xf1, 0xaa, 0x4a, 0x81, 0x15, 0x1a, 0x62, 0xb5, 0x92, 0x32, 0xe4, - 0xbd, 0x03, 0x96, 0x5d, 0x95, 0xb4, 0xbc, 0x77, 0xa0, 0xbe, 0xaf, 0xc0, 0x84, 0x08, 0x00, 0x6a, - 0x09, 0xdd, 0x8f, 0x90, 0x04, 0xc6, 0x94, 0x5f, 0x0b, 0xd5, 0x95, 0x4f, 0x0d, 0x47, 0x06, 0xd5, - 0xc5, 0x11, 0x12, 0xfa, 0xfa, 0x49, 0x3e, 0x5c, 0xfc, 0x4c, 0x61, 0x1b, 0x50, 0xa2, 0x2e, 0xad, - 0x0b, 0x67, 0x3c, 0xc6, 0xeb, 0xd2, 0xd6, 0x83, 0x70, 0x65, 0xad, 0x68, 0x47, 0x8d, 0x63, 0xf4, - 0x9f, 0x3f, 0x3b, 0xfd, 0x2f, 0xc0, 0xcc, 0xa1, 0x87, 0x5d, 0x57, 0xdc, 0xf5, 0xca, 0xf5, 0x57, - 0xd2, 0xca, 0x82, 0x4e, 0xd3, 0xff, 0x7b, 0xe4, 0x08, 0x5d, 0x85, 0xf3, 0x4e, 0xef, 0x40, 0x0f, - 0xb9, 0x29, 0x23, 0x37, 0xcc, 0xb4, 0xd3, 0x3b, 0xd8, 0xe1, 0xd4, 0x7b, 0xe4, 0x48, 0xfd, 0x79, - 0x1e, 0x66, 0xa9, 0x7b, 0x3a, 0x9e, 0xf5, 0x2e, 0x96, 0x37, 0xbb, 0x77, 0xa1, 0x48, 0xd8, 0xcb, - 0x02, 0x5d, 0x3e, 0x3a, 0x18, 0x5e, 0x36, 0x8a, 0xde, 0x22, 0x68, 0x40, 0xa2, 0x77, 0x09, 0x1a, - 0x14, 0xf9, 0xe9, 0x4a, 0xdd, 0x3e, 0x2c, 0x06, 0x9f, 0x60, 0xd9, 0xf0, 0x33, 0x9a, 0xd2, 0x7c, - 0x64, 0xc0, 0xc5, 0xe4, 0xae, 0x2e, 0xc0, 0x0b, 0x27, 0x05, 0x47, 0x89, 0x53, 0x83, 0x75, 0xa2, - 0xfe, 0x5e, 0x81, 0xe2, 0x8e, 0x15, 0xd8, 0xc4, 0xf7, 0x99, 0x52, 0xa2, 0x32, 0x9a, 0x72, 0xc2, - 0x32, 0x1a, 0x3a, 0x80, 0xc7, 0xfc, 0x80, 0x05, 0xac, 0xd2, 0xa6, 0x3a, 0x73, 0xcc, 0x50, 0x2f, - 0x37, 0x47, 0x2b, 0x84, 0x72, 0xdf, 0xbe, 0xe4, 0xa7, 0x50, 0x7d, 0xf5, 0xef, 0xf9, 0x44, 0x05, - 0xb2, 0xd1, 0xc6, 0x36, 0xaa, 0xf7, 0x3f, 0xfd, 0x18, 0xa1, 0x54, 0x47, 0x01, 0xa2, 0xe7, 0x1f, - 0x03, 0xaf, 0x09, 0xf2, 0x43, 0x5e, 0x13, 0x14, 0x12, 0xaf, 0x09, 0xc2, 0xa2, 0xdb, 0xd8, 0x68, - 0x45, 0xb7, 0x7b, 0x00, 0x46, 0xbb, 0x4b, 0x74, 0xb7, 0x8d, 0xed, 0xe3, 0xea, 0xec, 0xa9, 0x53, - 0x58, 0x6d, 0x77, 0x09, 0x9b, 0xc0, 0x94, 0x21, 0xbe, 0x7c, 0xf9, 0x7e, 0x83, 0x82, 0x89, 0x2a, - 0x7b, 0xe6, 0x12, 0x1b, 0xc3, 0x62, 0x05, 0x36, 0xfa, 0xa5, 0xfe, 0x53, 0x16, 0xcf, 0x98, 0x9a, - 0x4f, 0x5c, 0x3c, 0xa3, 0xd2, 0x67, 0x52, 0x3c, 0x13, 0x40, 0x27, 0x2c, 0x9e, 0x09, 0xe9, 0xd3, - 0x16, 0xcf, 0x04, 0xcc, 0xd7, 0xc5, 0xb3, 0x2f, 0x67, 0xf1, 0xec, 0xed, 0x63, 0x8a, 0x67, 0xb7, - 0x46, 0x0d, 0xda, 0x85, 0x9f, 0x7c, 0xde, 0xb5, 0xb3, 0x0d, 0x80, 0x58, 0xc6, 0xff, 0xd8, 0x49, - 0x12, 0xfe, 0x18, 0xc0, 0x17, 0xa3, 0x14, 0xa7, 0x1f, 0x5f, 0x8a, 0x7b, 0x6e, 0x94, 0x52, 0x9c, - 0x30, 0xe1, 0x60, 0x39, 0xce, 0x7a, 0x74, 0x39, 0xee, 0xe6, 0x88, 0xe5, 0x38, 0xd1, 0xcf, 0x17, - 0xe4, 0xdd, 0xc4, 0x3b, 0xc7, 0xbe, 0x9b, 0xb8, 0x31, 0x52, 0x95, 0x4a, 0xcc, 0xfa, 0x2b, 0xfd, - 0x76, 0x22, 0xfe, 0xc0, 0x41, 0x81, 0xc9, 0xf0, 0x40, 0x47, 0x2f, 0xc3, 0x39, 0x71, 0x0d, 0x2f, - 0x4e, 0xdb, 0xab, 0xd9, 0x6e, 0xf0, 0xb5, 0x50, 0x0c, 0x5d, 0x84, 0x71, 0xcf, 0x27, 0xc4, 0x14, - 0x57, 0xa7, 0xbc, 0x81, 0x9e, 0x82, 0xb2, 0xeb, 0x11, 0xc3, 0xf2, 0xa9, 0xe7, 0x36, 0xad, 0xc0, - 0x67, 0x87, 0xe7, 0x98, 0x36, 0x2d, 0xa9, 0x35, 0x2b, 0xf0, 0xd5, 0x0e, 0x7f, 0xb9, 0xc9, 0x86, - 0xb2, 0x09, 0x53, 0x6e, 0x1b, 0x5b, 0x76, 0x40, 0x1e, 0x84, 0x69, 0xd7, 0x8d, 0x11, 0x02, 0x0a, - 0x2e, 0xa8, 0x45, 0x18, 0x68, 0x06, 0x0a, 0x34, 0x72, 0xe7, 0xe3, 0xa2, 0x9f, 0xea, 0x55, 0x28, - 0x53, 0xee, 0x55, 0xcb, 0x6d, 0x11, 0x8f, 0xf1, 0xa4, 0xdf, 0xe9, 0x1b, 0x30, 0x9d, 0x40, 0x45, - 0xdf, 0x86, 0x09, 0x9f, 0xd8, 0xa6, 0xbc, 0x0d, 0xcf, 0xaa, 0x25, 0x21, 0x85, 0x10, 0x8c, 0xb1, - 0x69, 0xf1, 0x47, 0xa1, 0xec, 0x5b, 0xfd, 0x43, 0x81, 0x4f, 0x9e, 0x15, 0x52, 0x1a, 0xfd, 0x85, - 0x94, 0x5b, 0xa3, 0x5c, 0x57, 0xa6, 0x95, 0x51, 0x36, 0xfa, 0xca, 0x28, 0x37, 0x47, 0x02, 0x1c, - 0x28, 0xa2, 0xfc, 0x26, 0x56, 0x44, 0xd1, 0x00, 0x0c, 0xa9, 0x42, 0x31, 0xde, 0xa5, 0xac, 0xf0, - 0x91, 0xf2, 0xb5, 0x18, 0x4a, 0xd2, 0xfa, 0xf9, 0xd3, 0x5b, 0x7f, 0x6e, 0x57, 0xd6, 0x45, 0x3e, - 0x83, 0xe1, 0xd6, 0x8a, 0xb1, 0x0b, 0x66, 0xf5, 0x3f, 0x61, 0x1d, 0x81, 0xf9, 0x71, 0xf8, 0xe8, - 0x41, 0x19, 0xf1, 0xd1, 0x03, 0x9a, 0x83, 0xc9, 0x70, 0x63, 0x16, 0xf9, 0x80, 0x6c, 0xa3, 0x79, - 0x00, 0x0f, 0xdb, 0xa6, 0xd3, 0xb1, 0xde, 0x95, 0xc5, 0x83, 0x18, 0x85, 0xae, 0xb7, 0x1e, 0xa6, - 0xb1, 0x7d, 0xb3, 0xcd, 0x9f, 0x2e, 0x84, 0x09, 0x2b, 0xa3, 0xd6, 0x04, 0x91, 0xa6, 0xc0, 0x2c, - 0x63, 0x92, 0x6c, 0xba, 0xc7, 0xae, 0xc7, 0x4b, 0x2c, 0xba, 0x72, 0xf6, 0x42, 0x46, 0x2d, 0x85, - 0xd3, 0x67, 0x51, 0x7e, 0x3f, 0xe7, 0x96, 0xfa, 0x81, 0xac, 0x0a, 0xb0, 0xe9, 0x2f, 0xc3, 0x38, - 0xeb, 0x53, 0xcc, 0xff, 0xc9, 0x21, 0xf3, 0xdf, 0xa6, 0xbc, 0x1a, 0x17, 0x41, 0xeb, 0x50, 0x32, - 0x89, 0x1f, 0xe8, 0xe1, 0x96, 0x94, 0x1f, 0x69, 0xb1, 0x15, 0xa9, 0xec, 0x4a, 0xff, 0xb6, 0x54, - 0xe8, 0xdb, 0x96, 0x3e, 0x27, 0x35, 0xd5, 0xfe, 0x96, 0xff, 0xf0, 0xe1, 0xbc, 0xf2, 0xd1, 0xc3, - 0x79, 0xe5, 0x93, 0x87, 0xf3, 0xca, 0xfb, 0x9f, 0xce, 0xe7, 0x3e, 0xfa, 0x74, 0x3e, 0xf7, 0x97, - 0x4f, 0xe7, 0x73, 0x70, 0xd5, 0x70, 0x3a, 0x19, 0xfc, 0xb1, 0x36, 0x13, 0x4f, 0x48, 0x3d, 0x27, - 0x70, 0x1a, 0xca, 0x5b, 0xcd, 0x7d, 0x2b, 0x68, 0x75, 0x9b, 0x55, 0xc3, 0xe9, 0x2c, 0x1a, 0x8e, - 0xdf, 0x71, 0xfc, 0x45, 0x8f, 0xb4, 0xf1, 0x11, 0xf1, 0x16, 0x7b, 0x4b, 0xf2, 0x93, 0xe5, 0x8d, - 0xfe, 0xe2, 0xf0, 0x5f, 0xbe, 0xbc, 0x18, 0x23, 0x86, 0xb4, 0x5f, 0xe5, 0x0b, 0x8d, 0xd5, 0x37, - 0x7e, 0x9d, 0x57, 0x1b, 0xe1, 0x10, 0x57, 0xe9, 0x10, 0x63, 0x83, 0xa9, 0x6e, 0x0b, 0xd6, 0x3f, - 0x46, 0x4c, 0xbb, 0x94, 0x69, 0x37, 0xc6, 0xb4, 0x1b, 0x32, 0x3d, 0xcc, 0x57, 0x87, 0x33, 0xed, - 0xbe, 0xda, 0xa8, 0x85, 0xcf, 0xbb, 0xfe, 0x91, 0x7f, 0x2a, 0x14, 0x58, 0x5e, 0xa6, 0x12, 0xcb, - 0xcb, 0x31, 0x91, 0xe5, 0xe5, 0x50, 0xa6, 0x39, 0xc1, 0x7e, 0xb1, 0x72, 0xf3, 0xbf, 0x01, 0x00, - 0x00, 0xff, 0xff, 0x96, 0xcf, 0xfa, 0xae, 0xe3, 0x33, 0x00, 0x00, + // 2656 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5b, 0x4f, 0x6f, 0x1c, 0x49, + 0x15, 0x9f, 0x9e, 0xb1, 0xc7, 0xf6, 0x9b, 0xf1, 0xbf, 0x8a, 0x93, 0x1d, 0x2c, 0xe4, 0x8d, 0x7a, + 0x93, 0xe0, 0x24, 0xbb, 0xe3, 0xc4, 0x76, 0x36, 0x92, 0x77, 0x81, 0xf5, 0xd8, 0x9b, 0x1d, 0x27, + 0xeb, 0x78, 0xb6, 0x13, 0x1c, 0x25, 0x98, 0x6d, 0x6a, 0xba, 0xcb, 0x9e, 0x96, 0x7b, 0xba, 0x9b, + 0xee, 0x9e, 0x71, 0xbc, 0x5f, 0x00, 0xb8, 0xa0, 0x45, 0xe2, 0x80, 0xb8, 0x20, 0x71, 0x41, 0xe2, + 0xc0, 0x07, 0x00, 0x71, 0x66, 0x05, 0x12, 0x8a, 0xc4, 0x05, 0x69, 0x85, 0x04, 0xc9, 0x89, 0x3f, + 0x17, 0xbe, 0x00, 0x42, 0x55, 0x5d, 0xfd, 0x77, 0xda, 0x99, 0x1e, 0x3b, 0x61, 0x95, 0x4d, 0x4e, + 0xae, 0x7a, 0xf3, 0xde, 0xaf, 0xaa, 0xde, 0x7b, 0x55, 0xf5, 0xde, 0xab, 0x36, 0x2c, 0x5b, 0xc4, + 0xe8, 0xb4, 0x9b, 0x36, 0x5e, 0x50, 0x4c, 0x9b, 0x2c, 0xb8, 0x36, 0x36, 0x1c, 0xac, 0xb8, 0x9a, + 0x69, 0x2c, 0x74, 0xaf, 0x62, 0xdd, 0x6a, 0xe1, 0xab, 0x51, 0x62, 0xd5, 0xb2, 0x4d, 0xd7, 0x44, + 0xa2, 0x2f, 0x55, 0xa5, 0x52, 0xd5, 0x28, 0x83, 0x2f, 0x35, 0x7b, 0x29, 0x8e, 0xac, 0xd8, 0x87, + 0x96, 0x6b, 0x86, 0xa0, 0x5e, 0xdf, 0xc3, 0x9b, 0x9d, 0x8f, 0xf3, 0x3a, 0x2e, 0xde, 0x27, 0x21, + 0x2b, 0xeb, 0x72, 0xce, 0x73, 0x71, 0x4e, 0xad, 0xa9, 0x84, 0x7c, 0x5a, 0x53, 0x49, 0xe7, 0x52, + 0xc9, 0xc3, 0x90, 0x4b, 0x25, 0x0f, 0x39, 0xd7, 0x62, 0x9c, 0x6b, 0xcf, 0xec, 0x12, 0xdb, 0xc0, + 0x86, 0x12, 0x19, 0x3a, 0xa4, 0x79, 0x32, 0xe2, 0x6f, 0x04, 0x28, 0xdd, 0x0d, 0x97, 0x8b, 0x3e, + 0x80, 0xa1, 0xa6, 0xa9, 0x1e, 0x56, 0x84, 0xb3, 0xc2, 0x7c, 0x69, 0x71, 0xa9, 0xda, 0x5f, 0x31, + 0xd5, 0x88, 0x78, 0xcd, 0x54, 0x0f, 0x25, 0x06, 0x80, 0x5e, 0x87, 0x52, 0x53, 0x33, 0x54, 0xcd, + 0xd8, 0x93, 0x1d, 0x6d, 0xaf, 0x92, 0x3f, 0x2b, 0xcc, 0x97, 0x25, 0xe0, 0xa4, 0x3b, 0xda, 0x1e, + 0x5a, 0x85, 0x22, 0x36, 0x94, 0x96, 0x69, 0x57, 0x0a, 0x6c, 0xac, 0x8b, 0x89, 0xb1, 0xb8, 0x42, + 0x83, 0x61, 0x36, 0x89, 0xbd, 0xaf, 0x13, 0xc9, 0x34, 0x5d, 0x89, 0x0b, 0x8a, 0x15, 0xc8, 0x6f, + 0xa8, 0x08, 0xc1, 0x50, 0x0b, 0x3b, 0x2d, 0x36, 0xe5, 0xb2, 0xc4, 0xda, 0xa2, 0x08, 0xf0, 0xfe, + 0xee, 0x2e, 0x51, 0xdc, 0x3a, 0x76, 0x5a, 0x68, 0x06, 0x86, 0x35, 0xc3, 0x20, 0x36, 0x67, 0xf1, + 0x3a, 0xe2, 0x9f, 0xf2, 0x30, 0x99, 0x98, 0x3b, 0x5a, 0x87, 0x11, 0xaf, 0xe7, 0x54, 0x84, 0xb3, + 0x85, 0xf9, 0xd2, 0xe2, 0xa5, 0x2c, 0x1a, 0x58, 0x65, 0x7d, 0xc9, 0x17, 0x45, 0x6f, 0xc0, 0x38, + 0x79, 0x68, 0x69, 0xf6, 0xa1, 0xdc, 0x22, 0xda, 0x5e, 0xcb, 0x65, 0xab, 0x1f, 0x92, 0xca, 0x1e, + 0xb1, 0xce, 0x68, 0xe8, 0x2b, 0x30, 0xaa, 0xb4, 0xb0, 0x66, 0xc8, 0x9a, 0xca, 0x34, 0x30, 0x26, + 0x8d, 0xb0, 0xfe, 0x86, 0x8a, 0x96, 0xa1, 0xb0, 0x4b, 0x48, 0x65, 0x88, 0xe9, 0x45, 0xec, 0xa3, + 0x97, 0x1b, 0x84, 0x48, 0x94, 0x1d, 0xbd, 0x07, 0x63, 0xbb, 0x6d, 0x55, 0x56, 0xf4, 0x0e, 0x71, + 0x2a, 0xc3, 0x6c, 0xf6, 0x6f, 0xf4, 0x91, 0x5d, 0xd3, 0x3b, 0x44, 0x1a, 0xdd, 0x6d, 0xab, 0xb4, + 0xe1, 0xa0, 0x4b, 0x30, 0x41, 0x0c, 0xc6, 0x43, 0x54, 0xb9, 0x4d, 0xda, 0x66, 0xa5, 0x48, 0x15, + 0x56, 0xcf, 0x49, 0xe3, 0x01, 0x7d, 0x93, 0xb4, 0xcd, 0x1f, 0x08, 0x42, 0x6d, 0x1a, 0x26, 0xe5, + 0x38, 0xb3, 0xf8, 0xe7, 0x09, 0x28, 0x7a, 0xaa, 0x40, 0xab, 0x30, 0xec, 0x58, 0xc4, 0x50, 0xb9, + 0x1f, 0x5d, 0xcc, 0xa2, 0xc5, 0x3b, 0x54, 0xa0, 0x9e, 0x93, 0x3c, 0x49, 0xb4, 0x0e, 0x45, 0xb3, + 0xe3, 0x5a, 0x1d, 0x4f, 0x7b, 0x19, 0x2d, 0xb1, 0xc5, 0x24, 0xea, 0x39, 0x89, 0xcb, 0xa2, 0xb7, + 0x61, 0xc8, 0x39, 0xc0, 0x16, 0xf7, 0xb1, 0xb3, 0x09, 0x0c, 0xba, 0x77, 0xc2, 0xf1, 0x0f, 0xb0, + 0x55, 0xcf, 0x49, 0x8c, 0x1f, 0xdd, 0x00, 0xa0, 0x7f, 0x65, 0x45, 0xc7, 0x5a, 0x9b, 0x5b, 0xe2, + 0x7c, 0x3f, 0xe9, 0x35, 0xca, 0x5c, 0xcf, 0x49, 0x63, 0x8e, 0xdf, 0x41, 0xbb, 0x30, 0xd3, 0xc5, + 0xba, 0xa6, 0x62, 0xd7, 0xb4, 0x65, 0x95, 0xec, 0x6a, 0x86, 0x46, 0x67, 0x5c, 0x99, 0x62, 0x88, + 0x57, 0x13, 0x88, 0xde, 0xc9, 0x10, 0x60, 0x6e, 0xfb, 0x92, 0xeb, 0x81, 0x60, 0x3d, 0x27, 0x9d, + 0xea, 0xf6, 0x92, 0xe9, 0x7c, 0xb5, 0xa6, 0x22, 0x7b, 0xfa, 0xa8, 0x4c, 0xa7, 0xce, 0x97, 0x9e, + 0x27, 0x01, 0xf6, 0x46, 0x53, 0xf1, 0x6c, 0x45, 0xe7, 0xab, 0xf9, 0x1d, 0xb4, 0x03, 0x93, 0x96, + 0x6d, 0x5a, 0xa6, 0x83, 0x75, 0xd9, 0xe9, 0x34, 0xdb, 0x9a, 0x5b, 0x41, 0xa9, 0x53, 0x8d, 0x9c, + 0x24, 0x01, 0x66, 0x83, 0x4b, 0xde, 0x61, 0x82, 0xf5, 0x9c, 0x34, 0x61, 0xc5, 0x28, 0xa8, 0x09, + 0xd3, 0x01, 0xfa, 0x81, 0xe6, 0xb6, 0x54, 0x1b, 0x1f, 0x54, 0x4e, 0xa5, 0x1e, 0x35, 0x4f, 0xc3, + 0xbf, 0xc7, 0x45, 0xeb, 0x39, 0x69, 0xca, 0x4a, 0xd0, 0xd0, 0x7d, 0x98, 0x08, 0x35, 0xde, 0x35, + 0x5d, 0x52, 0x99, 0x61, 0x03, 0x5c, 0xc9, 0x30, 0x40, 0xa0, 0xf0, 0x6d, 0xd3, 0x25, 0xd4, 0xed, + 0xbb, 0x51, 0x02, 0x85, 0x56, 0x89, 0x4e, 0xf6, 0x42, 0xe8, 0xd3, 0x99, 0xa1, 0xd7, 0x7d, 0x41, + 0x1f, 0x5a, 0x8d, 0x12, 0x90, 0x09, 0x67, 0x02, 0xcd, 0xa8, 0xc4, 0x32, 0x1d, 0xcd, 0xe5, 0xbe, + 0x77, 0x86, 0x0d, 0x71, 0x7d, 0x00, 0xf5, 0xac, 0x7b, 0xf2, 0xbe, 0x37, 0xce, 0x58, 0x29, 0x74, + 0xb4, 0x05, 0xe3, 0xac, 0xa7, 0x99, 0x86, 0x6c, 0x5a, 0xc4, 0xa8, 0xcc, 0xb1, 0x71, 0xe6, 0x9f, + 0xe6, 0xe3, 0x0d, 0x2e, 0xb0, 0x65, 0x11, 0xea, 0x36, 0x65, 0x2b, 0xd2, 0x47, 0x12, 0x4c, 0x04, + 0x80, 0x8a, 0x6e, 0x3a, 0xa4, 0xf2, 0x7a, 0xea, 0xde, 0x4f, 0x45, 0x5c, 0xa3, 0x02, 0x54, 0x2b, + 0x56, 0x94, 0x80, 0xbe, 0x0d, 0xd3, 0x01, 0x66, 0xe0, 0x2f, 0x67, 0x19, 0xec, 0x9b, 0x59, 0x60, + 0x63, 0x8e, 0x92, 0xa0, 0x21, 0x02, 0xa7, 0x03, 0x70, 0x9b, 0x1c, 0x60, 0x5b, 0xe5, 0x1a, 0x17, + 0xd9, 0x00, 0x0b, 0x59, 0x06, 0x90, 0x98, 0x9c, 0xaf, 0xe9, 0x53, 0x56, 0x2f, 0x19, 0xad, 0xc3, + 0x28, 0x37, 0x35, 0xa9, 0xcc, 0x33, 0xe4, 0x0b, 0x4f, 0xdf, 0xf5, 0xdc, 0x53, 0xa8, 0x3a, 0x02, + 0x49, 0x74, 0x13, 0xa0, 0x63, 0x04, 0x38, 0x17, 0x53, 0x6d, 0x95, 0xc0, 0xf9, 0x56, 0xc0, 0x5f, + 0xcf, 0x49, 0x11, 0x69, 0xf4, 0x00, 0xa6, 0xc2, 0x1e, 0x5f, 0xf3, 0x25, 0x86, 0xf8, 0x56, 0x56, + 0x44, 0x7f, 0xc5, 0x93, 0x9d, 0x38, 0x09, 0xdd, 0x84, 0x31, 0x15, 0x9b, 0xb2, 0x77, 0xf8, 0x2f, + 0x32, 0xd0, 0xcb, 0x59, 0x76, 0x07, 0x36, 0xfd, 0xe3, 0x7f, 0x54, 0xe5, 0x6d, 0xb4, 0x09, 0x40, + 0xb1, 0xf8, 0x2d, 0xb0, 0x94, 0x6a, 0xf6, 0x23, 0xc0, 0x82, 0x7b, 0x80, 0xce, 0xc6, 0xeb, 0xa0, + 0x06, 0x94, 0x28, 0x1c, 0xdf, 0x5d, 0x95, 0xe5, 0xd4, 0x15, 0x1f, 0x81, 0xc7, 0xb7, 0x0e, 0x55, + 0xa4, 0x1a, 0xf4, 0xd0, 0x7d, 0x98, 0xd2, 0x14, 0x67, 0xf1, 0x4a, 0xe0, 0x9b, 0x58, 0xaf, 0x7c, + 0x26, 0xa4, 0x2e, 0x3a, 0x7e, 0xf6, 0x52, 0xa1, 0x7b, 0x81, 0x0c, 0xd5, 0xa3, 0x16, 0x27, 0xd5, + 0x46, 0xa1, 0xe8, 0x9d, 0xe5, 0xe2, 0x0f, 0x87, 0xe0, 0x4c, 0x24, 0x4c, 0x69, 0x10, 0xdb, 0xb1, + 0x88, 0xe2, 0x6a, 0x5d, 0x82, 0x64, 0x28, 0x5b, 0xf8, 0x50, 0x37, 0xb1, 0x2a, 0xef, 0x93, 0x43, + 0x3f, 0x64, 0x79, 0x37, 0xcb, 0x45, 0xd9, 0xf0, 0xe4, 0x6e, 0x91, 0x43, 0x3a, 0xe8, 0x9a, 0xd9, + 0x6e, 0x6b, 0x6e, 0x9b, 0x18, 0xae, 0x54, 0xb2, 0x82, 0x5f, 0x1c, 0xf4, 0x5d, 0x98, 0x62, 0x96, + 0x94, 0x8d, 0x8e, 0xae, 0x6b, 0xbb, 0x1a, 0xb1, 0x9d, 0x4a, 0x9e, 0x0d, 0x72, 0x2d, 0xcb, 0x20, + 0xb7, 0x7d, 0x29, 0x3a, 0xc6, 0x6d, 0xd3, 0x25, 0xd2, 0x24, 0x83, 0x0b, 0xe8, 0x0e, 0xba, 0x01, + 0x65, 0xac, 0x76, 0x35, 0x85, 0xc8, 0x86, 0xe9, 0x12, 0xa7, 0x52, 0xc8, 0x14, 0xb7, 0x30, 0xac, + 0x92, 0x27, 0x48, 0xdb, 0x0e, 0x3d, 0xce, 0xb0, 0xaa, 0xda, 0xc4, 0x71, 0xe4, 0xae, 0x46, 0x0e, + 0x9c, 0xca, 0x50, 0x6a, 0xf8, 0x96, 0x04, 0x5a, 0xf5, 0x64, 0xb6, 0x35, 0x72, 0x20, 0x95, 0x71, + 0xd8, 0x71, 0x68, 0xf8, 0xa1, 0x12, 0xc3, 0x6c, 0xfb, 0xa1, 0xd4, 0x9b, 0x7d, 0x90, 0xd6, 0x29, + 0xf3, 0x26, 0x71, 0xb1, 0x8a, 0x5d, 0x2c, 0x71, 0x59, 0xb4, 0x09, 0x13, 0x11, 0xcd, 0xd0, 0x50, + 0xaf, 0x98, 0x7a, 0x04, 0xa4, 0xaa, 0x6f, 0x43, 0x95, 0xc6, 0x23, 0x3f, 0x6c, 0xa8, 0x34, 0xac, + 0x0d, 0x0d, 0x77, 0x44, 0x58, 0xfb, 0x5b, 0x01, 0x2a, 0x47, 0x59, 0x17, 0x6d, 0x41, 0x29, 0xe2, + 0x31, 0x3c, 0x3a, 0xab, 0x0e, 0xe6, 0x30, 0x12, 0x84, 0x2e, 0x82, 0x6e, 0x03, 0x28, 0x01, 0x3c, + 0x8f, 0xd4, 0xaa, 0x7d, 0x54, 0x75, 0xc7, 0xa5, 0xc7, 0x45, 0xe8, 0x72, 0x11, 0x04, 0xf1, 0x27, + 0x02, 0x4c, 0xf7, 0xb8, 0x0d, 0xba, 0x01, 0x63, 0x81, 0x07, 0xf2, 0x49, 0xcf, 0xf7, 0x73, 0x11, + 0x9f, 0x5f, 0x0a, 0x45, 0xd1, 0x75, 0x18, 0xa2, 0x6e, 0xc6, 0xe7, 0x99, 0xc9, 0xcb, 0x98, 0x80, + 0xf8, 0x47, 0x21, 0x96, 0x2b, 0x50, 0x17, 0x41, 0x77, 0x61, 0x8c, 0x66, 0x3a, 0xcc, 0xdf, 0xf8, + 0xa4, 0xae, 0x1f, 0x23, 0x5f, 0x62, 0xbe, 0x37, 0xda, 0xe4, 0xad, 0xff, 0x4b, 0xde, 0xf4, 0xdf, + 0x3c, 0x9c, 0x4a, 0x99, 0x05, 0xfa, 0x08, 0xca, 0xdc, 0x51, 0xbd, 0x3d, 0xe4, 0x9d, 0x27, 0xd5, + 0xec, 0x29, 0x10, 0x5b, 0x4b, 0x29, 0xd4, 0xd1, 0x8b, 0x9b, 0x0a, 0xdd, 0x86, 0x31, 0x9a, 0xd3, + 0x78, 0xc6, 0x2d, 0xa6, 0x5e, 0x3d, 0xa9, 0x7a, 0xa0, 0xe9, 0x11, 0x5d, 0x39, 0xbd, 0xc8, 0xda, + 0xbc, 0x4d, 0xd3, 0xa5, 0x32, 0x80, 0x1c, 0x00, 0x8a, 0xff, 0x99, 0x00, 0x08, 0x35, 0x86, 0xde, + 0x8f, 0x67, 0x4b, 0x6f, 0x65, 0xce, 0x96, 0xf8, 0x48, 0x3c, 0x63, 0xaa, 0x27, 0x32, 0xa6, 0x6a, + 0xf6, 0x8c, 0x89, 0x03, 0xf9, 0x59, 0xd3, 0x4a, 0x2c, 0x6b, 0x3a, 0xd7, 0x2f, 0xef, 0xe1, 0xd2, + 0x5e, 0xe6, 0x74, 0x33, 0x25, 0x73, 0xba, 0x98, 0x29, 0x73, 0xe2, 0x30, 0xaf, 0xb2, 0xa7, 0x2f, + 0x67, 0xf6, 0xf4, 0xf1, 0x11, 0xd9, 0x53, 0xa6, 0x50, 0x22, 0x96, 0x3e, 0x71, 0x47, 0x79, 0x95, + 0x42, 0xbd, 0x84, 0x29, 0xd4, 0xc5, 0x67, 0x94, 0x42, 0x5d, 0x3a, 0x51, 0x0a, 0xf5, 0x52, 0xa5, + 0x39, 0x69, 0xf9, 0xe2, 0xe5, 0x67, 0x94, 0x2f, 0x3e, 0xc7, 0x14, 0x6a, 0x1c, 0x4a, 0x91, 0x68, + 0x46, 0xfc, 0x71, 0x01, 0xc6, 0x82, 0x4b, 0x13, 0x7d, 0x04, 0x23, 0x5d, 0xcd, 0xd1, 0x9a, 0x3a, + 0xe1, 0x97, 0xee, 0xb5, 0x81, 0x2e, 0xdd, 0xea, 0xb6, 0x27, 0x5c, 0xcf, 0x49, 0x3e, 0x0e, 0xba, + 0x0d, 0x45, 0xd3, 0xc2, 0xdf, 0xeb, 0xf8, 0xe1, 0xe5, 0xf2, 0x60, 0x88, 0x5b, 0x4c, 0x96, 0x5d, + 0xc2, 0xac, 0x35, 0xfb, 0x7d, 0x01, 0x46, 0xf8, 0x30, 0xe8, 0x9b, 0xc7, 0xad, 0xa7, 0xfa, 0xb1, + 0xc1, 0x3b, 0xb1, 0xc8, 0xf7, 0x6b, 0x19, 0x22, 0x5f, 0x16, 0xcb, 0x31, 0xa1, 0xd9, 0x0d, 0x28, + 0x7a, 0xb3, 0x3b, 0xf1, 0x3c, 0x68, 0x1c, 0xe4, 0x65, 0x94, 0xcc, 0x26, 0x7f, 0x2d, 0xc0, 0x74, + 0xcf, 0xc9, 0x8e, 0xee, 0x27, 0x6d, 0xf3, 0xf5, 0x63, 0xdd, 0x10, 0x69, 0x36, 0xda, 0x4e, 0xd8, + 0xe8, 0xdd, 0xe3, 0x21, 0xf7, 0xd8, 0xea, 0xe7, 0x11, 0x5b, 0xdd, 0xeb, 0xb9, 0xe7, 0x84, 0xe3, + 0x55, 0x09, 0x93, 0x17, 0xdc, 0x89, 0x6c, 0x88, 0x03, 0x1b, 0x3e, 0xaf, 0xf9, 0xd5, 0xa6, 0x92, + 0xc0, 0xe2, 0xbf, 0x0b, 0x00, 0x61, 0x80, 0x89, 0xa4, 0xa4, 0x61, 0xdf, 0x1e, 0x2c, 0x42, 0x4d, + 0xb3, 0xe8, 0x56, 0xc2, 0xa2, 0xd7, 0x06, 0x84, 0xec, 0x31, 0xe5, 0xe7, 0x11, 0x53, 0xd6, 0x82, + 0x88, 0x5a, 0x18, 0xf4, 0x0d, 0x22, 0x88, 0xa5, 0x4f, 0x62, 0xb5, 0x64, 0xbe, 0x5e, 0x38, 0x69, + 0xbe, 0x3e, 0xfb, 0x61, 0xe0, 0x06, 0xcf, 0x60, 0x6d, 0xf4, 0x88, 0xf5, 0x5a, 0xde, 0x76, 0xfe, + 0x5c, 0x80, 0x61, 0xef, 0x4e, 0x5b, 0x8d, 0x3d, 0x23, 0x66, 0x4f, 0x68, 0x22, 0x0f, 0x88, 0x1f, + 0xc2, 0x28, 0xee, 0xb8, 0xad, 0x20, 0x0b, 0xee, 0x0d, 0xa2, 0x7b, 0xea, 0x0a, 0x14, 0x61, 0xb5, + 0xe3, 0xb6, 0xee, 0x68, 0x7b, 0x06, 0x76, 0x3b, 0x36, 0x91, 0x46, 0xb0, 0xd7, 0x45, 0xab, 0x30, + 0x6c, 0xd9, 0xa6, 0xb9, 0xcb, 0x55, 0x78, 0xb9, 0x0f, 0xd4, 0x83, 0x5b, 0x0c, 0xac, 0x41, 0x45, + 0x24, 0x4f, 0x52, 0xfc, 0x99, 0xc0, 0x2f, 0x10, 0xf6, 0x52, 0x28, 0x03, 0x6a, 0x62, 0x9d, 0xee, + 0x0e, 0x39, 0x52, 0x00, 0x49, 0xdf, 0x49, 0x49, 0xf4, 0x9a, 0x27, 0x18, 0x29, 0x81, 0x4c, 0x37, + 0x93, 0x24, 0xf4, 0xd5, 0x68, 0xcd, 0xa3, 0xc0, 0xca, 0x00, 0x91, 0x4a, 0xc6, 0x04, 0xe4, 0xed, + 0x7d, 0x96, 0x5d, 0x95, 0xa5, 0xbc, 0xbd, 0x2f, 0x7e, 0x2a, 0x40, 0x91, 0x07, 0x00, 0xb5, 0x98, + 0xee, 0x07, 0x48, 0x02, 0x23, 0xca, 0xaf, 0xf9, 0xea, 0xca, 0xa7, 0x86, 0x23, 0xbd, 0xea, 0xf2, + 0x10, 0x62, 0xfa, 0xfa, 0x51, 0xde, 0xdf, 0xfc, 0x4c, 0x61, 0x9b, 0x50, 0xa6, 0x2e, 0x2d, 0x73, + 0x67, 0x3c, 0xc2, 0xeb, 0xd2, 0xf6, 0x03, 0x77, 0x65, 0xa9, 0x64, 0x84, 0x9d, 0x23, 0xf4, 0x9f, + 0x7f, 0x76, 0xfa, 0x9f, 0x87, 0xa9, 0x03, 0x1b, 0x5b, 0x16, 0x7f, 0xdd, 0x0c, 0xf6, 0x5f, 0x59, + 0x9a, 0xe0, 0x74, 0x9a, 0xeb, 0xdf, 0x22, 0x87, 0xe8, 0x02, 0x4c, 0x9a, 0xdd, 0x7d, 0xd9, 0xe7, + 0xa6, 0x8c, 0x9e, 0x61, 0xc6, 0xcd, 0xee, 0xfe, 0x3d, 0x8f, 0x7a, 0x8b, 0x1c, 0x8a, 0x3f, 0xcd, + 0xc3, 0x34, 0x75, 0x4f, 0xd3, 0xd6, 0x3e, 0xc1, 0xd4, 0x00, 0xeb, 0xd8, 0xc5, 0xe8, 0x26, 0x94, + 0x08, 0x7b, 0xaa, 0x96, 0x83, 0x57, 0xec, 0xfe, 0x45, 0x9d, 0xf0, 0x71, 0x5b, 0x02, 0x12, 0x3e, + 0x74, 0x4b, 0x50, 0xf2, 0x6e, 0x57, 0xea, 0xf6, 0x7e, 0xa9, 0xf6, 0x18, 0xdb, 0xc6, 0xbb, 0xa3, + 0x29, 0xcd, 0x41, 0x0a, 0xcc, 0xc4, 0x4f, 0x75, 0x0e, 0x5e, 0x38, 0x2e, 0x38, 0x8a, 0xdd, 0x1a, + 0x6c, 0x10, 0xf1, 0x77, 0x02, 0x94, 0xee, 0x69, 0xae, 0x41, 0x1c, 0x87, 0x29, 0x25, 0x2c, 0x72, + 0x09, 0xc7, 0x2c, 0x72, 0xa1, 0x7d, 0x78, 0xcd, 0x71, 0x59, 0xc0, 0x1a, 0xd8, 0x54, 0x66, 0x8e, + 0xe9, 0xeb, 0x65, 0x69, 0xb0, 0x32, 0xa5, 0xe7, 0xdb, 0xa7, 0x9d, 0x14, 0xaa, 0x23, 0xfe, 0x23, + 0xfe, 0x2d, 0x41, 0x43, 0xc7, 0x06, 0xaa, 0x27, 0xbf, 0x25, 0x18, 0xa0, 0x90, 0x46, 0x01, 0xbe, + 0xe8, 0xef, 0x09, 0x6e, 0x01, 0x28, 0x7a, 0x87, 0xc8, 0x96, 0x8e, 0x8d, 0xa3, 0xaa, 0xe0, 0xa9, + 0x4b, 0x58, 0xd3, 0x3b, 0x84, 0x2d, 0x60, 0x4c, 0xe1, 0x2d, 0x07, 0x6d, 0xf0, 0x7a, 0x1a, 0x05, + 0x1b, 0xb4, 0x9e, 0xc6, 0xb0, 0x58, 0x35, 0x8d, 0xb6, 0xc4, 0x7f, 0x05, 0xc5, 0x33, 0xa6, 0xe6, + 0x63, 0x17, 0xcf, 0xa8, 0xf4, 0x33, 0x29, 0x9e, 0x71, 0xa0, 0x63, 0x16, 0xcf, 0xb8, 0xf4, 0x49, + 0x8b, 0x67, 0x1c, 0xe6, 0x55, 0xf1, 0xec, 0xcb, 0x59, 0x3c, 0xfb, 0xce, 0x11, 0xc5, 0xb3, 0xe5, + 0x41, 0x83, 0x76, 0xee, 0x27, 0x5f, 0x74, 0xed, 0x6c, 0x13, 0x20, 0x92, 0xf1, 0xbf, 0x76, 0x9c, + 0x84, 0x3f, 0x02, 0xf0, 0x62, 0x94, 0xe2, 0xe4, 0xa3, 0x4b, 0x71, 0x57, 0x06, 0x29, 0xc5, 0x71, + 0x13, 0xf6, 0x96, 0xe3, 0xb4, 0xa7, 0x97, 0xe3, 0x96, 0x06, 0x2c, 0xc7, 0xf1, 0x71, 0x5e, 0x90, + 0xaf, 0x1a, 0x3e, 0x3e, 0xf2, 0xab, 0x86, 0xab, 0x03, 0x55, 0xa9, 0xf8, 0xaa, 0x5f, 0xea, 0x2f, + 0x1b, 0xa2, 0x9f, 0x1f, 0x08, 0x30, 0xea, 0x5f, 0xe8, 0xe8, 0x3d, 0x18, 0xe1, 0x8f, 0xe4, 0xfc, + 0xb6, 0xbd, 0x90, 0xed, 0x7d, 0x5d, 0xf2, 0xc5, 0xd0, 0x0c, 0x0c, 0xdb, 0x0e, 0x21, 0x2a, 0x7f, + 0xd8, 0xf4, 0x3a, 0xe8, 0x3c, 0x4c, 0x58, 0x36, 0x51, 0x34, 0x87, 0x7a, 0x6e, 0x53, 0x73, 0x1d, + 0x76, 0x79, 0x0e, 0x49, 0xe3, 0x01, 0xb5, 0xa6, 0xb9, 0x8e, 0xd8, 0x86, 0x51, 0x3f, 0x1e, 0x40, + 0x5b, 0x30, 0x66, 0xe9, 0x58, 0x33, 0x5c, 0xf2, 0xd0, 0x4f, 0xbb, 0xae, 0x0e, 0x10, 0x50, 0x78, + 0x82, 0x52, 0x88, 0x81, 0xa6, 0xa0, 0x40, 0x23, 0x77, 0x6f, 0x5e, 0xb4, 0x29, 0x5e, 0x80, 0x09, + 0xca, 0xbd, 0xa6, 0x59, 0x2d, 0x62, 0x33, 0x9e, 0xf4, 0x17, 0x77, 0x05, 0xc6, 0x63, 0xa8, 0xe8, + 0x1b, 0x50, 0x74, 0x88, 0xa1, 0x06, 0x6f, 0xd5, 0x59, 0xb5, 0xc4, 0xa5, 0x10, 0x82, 0x21, 0xb6, + 0xac, 0x3c, 0x0b, 0xe3, 0x58, 0x5b, 0xfc, 0x7d, 0xc1, 0x5b, 0x3c, 0x2b, 0xa4, 0x34, 0x92, 0x85, + 0x94, 0xe5, 0x41, 0xde, 0x26, 0xd3, 0xca, 0x28, 0x9b, 0x89, 0x32, 0xca, 0xd2, 0x40, 0x80, 0x3d, + 0x45, 0x94, 0x5f, 0x47, 0x8a, 0x28, 0x12, 0x80, 0x12, 0xa8, 0x90, 0xcf, 0x77, 0x31, 0x2b, 0x7c, + 0xa8, 0x7c, 0x29, 0x82, 0x12, 0xb7, 0x7e, 0xfe, 0xe4, 0xd6, 0x9f, 0xdd, 0x09, 0xea, 0x22, 0xcf, + 0x61, 0xba, 0xb5, 0x52, 0xe4, 0x35, 0x59, 0xfc, 0xa5, 0x5f, 0x47, 0x60, 0x7e, 0xec, 0x7f, 0x92, + 0x20, 0x0c, 0xf8, 0x49, 0x02, 0x9a, 0x85, 0x51, 0xff, 0x60, 0xe6, 0xf9, 0x40, 0xd0, 0x47, 0x73, + 0x00, 0x36, 0x36, 0x54, 0xb3, 0xad, 0x7d, 0x12, 0x14, 0x0f, 0x22, 0x14, 0xba, 0xdf, 0xba, 0x98, + 0xc6, 0xf6, 0x4d, 0xdd, 0xfb, 0xb0, 0xc0, 0x4f, 0x58, 0x19, 0xb5, 0xc6, 0x89, 0xe2, 0x23, 0xc1, + 0xcf, 0xe0, 0xd9, 0x54, 0x57, 0x60, 0x98, 0xfd, 0xce, 0xe7, 0x7a, 0xae, 0xcf, 0x5c, 0xb7, 0x29, + 0xaf, 0xe4, 0x89, 0xa0, 0x0d, 0x28, 0xab, 0xc4, 0x71, 0x65, 0xff, 0xf8, 0xc8, 0x0f, 0xb4, 0x31, + 0x4a, 0x54, 0x76, 0x35, 0x79, 0x84, 0x14, 0x12, 0x47, 0x48, 0x86, 0x25, 0xd5, 0xfe, 0x9e, 0xff, + 0xec, 0xf1, 0x9c, 0xf0, 0xe8, 0xf1, 0x9c, 0xf0, 0xb7, 0xc7, 0x73, 0xc2, 0xa7, 0x4f, 0xe6, 0x72, + 0x8f, 0x9e, 0xcc, 0xe5, 0xfe, 0xf2, 0x64, 0x2e, 0x07, 0x17, 0x14, 0xb3, 0x9d, 0xc1, 0xce, 0xb5, + 0xa9, 0x68, 0xa2, 0x67, 0x9b, 0xae, 0xd9, 0x10, 0x1e, 0x34, 0xf7, 0x34, 0xb7, 0xd5, 0x69, 0x56, + 0x15, 0xb3, 0xbd, 0xa0, 0x98, 0x4e, 0xdb, 0x74, 0x16, 0x6c, 0xa2, 0xe3, 0x43, 0x62, 0x2f, 0x74, + 0x17, 0x83, 0x26, 0xcb, 0xc7, 0x9c, 0x85, 0xfe, 0xff, 0xa2, 0xf0, 0x4e, 0x84, 0xe8, 0xd3, 0x7e, + 0x91, 0x2f, 0x34, 0xd6, 0xee, 0xfe, 0x2a, 0x2f, 0x36, 0xfc, 0x29, 0xae, 0xd1, 0x29, 0x46, 0x26, + 0x53, 0xdd, 0xe6, 0xac, 0x7f, 0x08, 0x99, 0x76, 0x28, 0xd3, 0x4e, 0x84, 0x69, 0xc7, 0x67, 0x7a, + 0x9c, 0xaf, 0xf6, 0x67, 0xda, 0xf9, 0xa0, 0x51, 0xf3, 0x3f, 0x6a, 0xfa, 0x67, 0xfe, 0xbc, 0x2f, + 0xb0, 0xb2, 0x42, 0x25, 0x56, 0x56, 0x22, 0x22, 0x2b, 0x2b, 0xbe, 0x4c, 0xb3, 0xc8, 0xfe, 0xb5, + 0x60, 0xe9, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xc0, 0x83, 0x14, 0xde, 0x8c, 0x31, 0x00, 0x00, } func (m *Transaction) Marshal() (dAtA []byte, err error) { @@ -3879,29 +3681,28 @@ func (m *TransactionBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.MemoData != nil { + if m.XEncryptedMemo != nil { { - size, err := m.MemoData.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { + size := m.XEncryptedMemo.Size() + i -= size + if _, err := m.XEncryptedMemo.MarshalTo(dAtA[i:]); err != nil { return 0, err } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) } - i-- - dAtA[i] = 0x2a } - if m.DetectionData != nil { - { - size, err := m.DetectionData.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if len(m.FmdClues) > 0 { + for iNdEx := len(m.FmdClues) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.FmdClues[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x2a } - i-- - dAtA[i] = 0x22 } if m.Fee != nil { { @@ -3913,19 +3714,19 @@ func (m *TransactionBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTransaction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } - if m.TransactionParameters != nil { - { - size, err := m.TransactionParameters.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) - } + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ChainId))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x1a + } + if m.ExpiryHeight != 0 { + i = encodeVarintTransaction(dAtA, i, uint64(m.ExpiryHeight)) + i-- + dAtA[i] = 0x10 } if len(m.Actions) > 0 { for iNdEx := len(m.Actions) - 1; iNdEx >= 0; iNdEx-- { @@ -3944,126 +3745,22 @@ func (m *TransactionBody) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MemoData) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *MemoData) MarshalTo(dAtA []byte) (int, error) { +func (m *TransactionBody_EncryptedMemo) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MemoData) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XEncryptedMemo != nil { - { - size := m.XEncryptedMemo.Size() - i -= size - if _, err := m.XEncryptedMemo.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - return len(dAtA) - i, nil -} - -func (m *MemoData_EncryptedMemo) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *MemoData_EncryptedMemo) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *TransactionBody_EncryptedMemo) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) if m.EncryptedMemo != nil { i -= len(m.EncryptedMemo) copy(dAtA[i:], m.EncryptedMemo) i = encodeVarintTransaction(dAtA, i, uint64(len(m.EncryptedMemo))) i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} -func (m *TransactionParameters) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TransactionParameters) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionParameters) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.ChainId) > 0 { - i -= len(m.ChainId) - copy(dAtA[i:], m.ChainId) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ChainId))) - i-- - dAtA[i] = 0x12 - } - if m.ExpiryHeight != 0 { - i = encodeVarintTransaction(dAtA, i, uint64(m.ExpiryHeight)) - i-- - dAtA[i] = 0x8 - } - return len(dAtA) - i, nil -} - -func (m *DetectionData) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *DetectionData) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *DetectionData) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.FmdClues) > 0 { - for iNdEx := len(m.FmdClues) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.FmdClues[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } + dAtA[i] = 0x32 } return len(dAtA) - i, nil } - func (m *Action) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4906,13 +4603,18 @@ func (m *TransactionBodyView) MarshalToSizedBuffer(dAtA []byte) (int, error) { } } } - if m.XDetectionData != nil { - { - size := m.XDetectionData.Size() - i -= size - if _, err := m.XDetectionData.MarshalTo(dAtA[i:]); err != nil { - return 0, err + if len(m.FmdClues) > 0 { + for iNdEx := len(m.FmdClues) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.FmdClues[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTransaction(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x2a } } if m.Fee != nil { @@ -4925,19 +4627,19 @@ func (m *TransactionBodyView) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTransaction(dAtA, i, uint64(size)) } i-- + dAtA[i] = 0x22 + } + if len(m.ChainId) > 0 { + i -= len(m.ChainId) + copy(dAtA[i:], m.ChainId) + i = encodeVarintTransaction(dAtA, i, uint64(len(m.ChainId))) + i-- dAtA[i] = 0x1a } - if m.TransactionParameters != nil { - { - size, err := m.TransactionParameters.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) - } + if m.ExpiryHeight != 0 { + i = encodeVarintTransaction(dAtA, i, uint64(m.ExpiryHeight)) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x10 } if len(m.ActionViews) > 0 { for iNdEx := len(m.ActionViews) - 1; iNdEx >= 0; iNdEx-- { @@ -4956,27 +4658,6 @@ func (m *TransactionBodyView) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *TransactionBodyView_DetectionData) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionBodyView_DetectionData) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.DetectionData != nil { - { - size, err := m.DetectionData.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTransaction(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 - } - return len(dAtA) - i, nil -} func (m *TransactionBodyView_MemoView) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) @@ -4994,7 +4675,7 @@ func (m *TransactionBodyView_MemoView) MarshalToSizedBuffer(dAtA []byte) (int, e i = encodeVarintTransaction(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x2a + dAtA[i] = 0x32 } return len(dAtA) - i, nil } @@ -7290,20 +6971,6 @@ func (m *SpendPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ProofBlindingS) > 0 { - i -= len(m.ProofBlindingS) - copy(dAtA[i:], m.ProofBlindingS) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ProofBlindingS))) - i-- - dAtA[i] = 0x32 - } - if len(m.ProofBlindingR) > 0 { - i -= len(m.ProofBlindingR) - copy(dAtA[i:], m.ProofBlindingR) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ProofBlindingR))) - i-- - dAtA[i] = 0x2a - } if len(m.ValueBlinding) > 0 { i -= len(m.ValueBlinding) copy(dAtA[i:], m.ValueBlinding) @@ -7358,20 +7025,6 @@ func (m *OutputPlan) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if len(m.ProofBlindingS) > 0 { - i -= len(m.ProofBlindingS) - copy(dAtA[i:], m.ProofBlindingS) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ProofBlindingS))) - i-- - dAtA[i] = 0x32 - } - if len(m.ProofBlindingR) > 0 { - i -= len(m.ProofBlindingR) - copy(dAtA[i:], m.ProofBlindingR) - i = encodeVarintTransaction(dAtA, i, uint64(len(m.ProofBlindingR))) - i-- - dAtA[i] = 0x2a - } if len(m.ValueBlinding) > 0 { i -= len(m.ValueBlinding) copy(dAtA[i:], m.ValueBlinding) @@ -7483,38 +7136,30 @@ func (m *TransactionBody) Size() (n int) { n += 1 + l + sovTransaction(uint64(l)) } } - if m.TransactionParameters != nil { - l = m.TransactionParameters.Size() + if m.ExpiryHeight != 0 { + n += 1 + sovTransaction(uint64(m.ExpiryHeight)) + } + l = len(m.ChainId) + if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } if m.Fee != nil { l = m.Fee.Size() n += 1 + l + sovTransaction(uint64(l)) } - if m.DetectionData != nil { - l = m.DetectionData.Size() - n += 1 + l + sovTransaction(uint64(l)) - } - if m.MemoData != nil { - l = m.MemoData.Size() - n += 1 + l + sovTransaction(uint64(l)) - } - return n -} - -func (m *MemoData) Size() (n int) { - if m == nil { - return 0 + if len(m.FmdClues) > 0 { + for _, e := range m.FmdClues { + l = e.Size() + n += 1 + l + sovTransaction(uint64(l)) + } } - var l int - _ = l if m.XEncryptedMemo != nil { n += m.XEncryptedMemo.Size() } return n } -func (m *MemoData_EncryptedMemo) Size() (n int) { +func (m *TransactionBody_EncryptedMemo) Size() (n int) { if m == nil { return 0 } @@ -7526,37 +7171,6 @@ func (m *MemoData_EncryptedMemo) Size() (n int) { } return n } -func (m *TransactionParameters) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.ExpiryHeight != 0 { - n += 1 + sovTransaction(uint64(m.ExpiryHeight)) - } - l = len(m.ChainId) - if l > 0 { - n += 1 + l + sovTransaction(uint64(l)) - } - return n -} - -func (m *DetectionData) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if len(m.FmdClues) > 0 { - for _, e := range m.FmdClues { - l = e.Size() - n += 1 + l + sovTransaction(uint64(l)) - } - } - return n -} - func (m *Action) Size() (n int) { if m == nil { return 0 @@ -7956,16 +7570,22 @@ func (m *TransactionBodyView) Size() (n int) { n += 1 + l + sovTransaction(uint64(l)) } } - if m.TransactionParameters != nil { - l = m.TransactionParameters.Size() + if m.ExpiryHeight != 0 { + n += 1 + sovTransaction(uint64(m.ExpiryHeight)) + } + l = len(m.ChainId) + if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } if m.Fee != nil { l = m.Fee.Size() n += 1 + l + sovTransaction(uint64(l)) } - if m.XDetectionData != nil { - n += m.XDetectionData.Size() + if len(m.FmdClues) > 0 { + for _, e := range m.FmdClues { + l = e.Size() + n += 1 + l + sovTransaction(uint64(l)) + } } if m.XMemoView != nil { n += m.XMemoView.Size() @@ -7973,18 +7593,6 @@ func (m *TransactionBodyView) Size() (n int) { return n } -func (m *TransactionBodyView_DetectionData) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.DetectionData != nil { - l = m.DetectionData.Size() - n += 1 + l + sovTransaction(uint64(l)) - } - return n -} func (m *TransactionBodyView_MemoView) Size() (n int) { if m == nil { return 0 @@ -9069,14 +8677,6 @@ func (m *SpendPlan) Size() (n int) { if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } - l = len(m.ProofBlindingR) - if l > 0 { - n += 1 + l + sovTransaction(uint64(l)) - } - l = len(m.ProofBlindingS) - if l > 0 { - n += 1 + l + sovTransaction(uint64(l)) - } return n } @@ -9102,14 +8702,6 @@ func (m *OutputPlan) Size() (n int) { if l > 0 { n += 1 + l + sovTransaction(uint64(l)) } - l = len(m.ProofBlindingR) - if l > 0 { - n += 1 + l + sovTransaction(uint64(l)) - } - l = len(m.ProofBlindingS) - if l > 0 { - n += 1 + l + sovTransaction(uint64(l)) - } return n } @@ -9507,10 +9099,10 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TransactionParameters", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType) } - var msglen int + m.ExpiryHeight = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -9520,33 +9112,16 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + m.ExpiryHeight |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.TransactionParameters == nil { - m.TransactionParameters = &TransactionParameters{} - } - if err := m.TransactionParameters.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -9556,67 +9131,27 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Fee == nil { - m.Fee = &v1alpha1.Fee{} - } - if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ChainId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DetectionData", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.DetectionData == nil { - m.DetectionData = &DetectionData{} - } - if err := m.DetectionData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field MemoData", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9628,263 +9163,29 @@ func (m *TransactionBody) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.MemoData == nil { - m.MemoData = &MemoData{} - } - if err := m.MemoData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTransaction(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTransaction - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *MemoData) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: MemoData: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: MemoData: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EncryptedMemo", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := make([]byte, postIndex-iNdEx) - copy(v, dAtA[iNdEx:postIndex]) - m.XEncryptedMemo = &MemoData_EncryptedMemo{v} - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTransaction(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTransaction - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *TransactionParameters) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: TransactionParameters: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: TransactionParameters: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType) - } - m.ExpiryHeight = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.ExpiryHeight |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= uint64(b&0x7F) << shift + msglen |= int(b&0x7F) << shift if b < 0x80 { break } } - intStringLen := int(stringLen) - if intStringLen < 0 { + if msglen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + intStringLen + postIndex := iNdEx + msglen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - m.ChainId = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipTransaction(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthTransaction - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *DetectionData) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF + if m.Fee == nil { + m.Fee = &v1alpha1.Fee{} } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break + if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: DetectionData: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: DetectionData: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 4: + iNdEx = postIndex + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field FmdClues", wireType) } @@ -9918,6 +9219,39 @@ func (m *DetectionData) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EncryptedMemo", wireType) + } + var byteLen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + byteLen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if byteLen < 0 { + return ErrInvalidLengthTransaction + } + postIndex := iNdEx + byteLen + if postIndex < 0 { + return ErrInvalidLengthTransaction + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + v := make([]byte, postIndex-iNdEx) + copy(v, dAtA[iNdEx:postIndex]) + m.XEncryptedMemo = &TransactionBody_EncryptedMemo{v} + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransaction(dAtA[iNdEx:]) @@ -11563,10 +10897,29 @@ func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { } iNdEx = postIndex case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ExpiryHeight", wireType) + } + m.ExpiryHeight = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTransaction + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ExpiryHeight |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TransactionParameters", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ChainId", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTransaction @@ -11576,29 +10929,25 @@ func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTransaction } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTransaction } if postIndex > l { return io.ErrUnexpectedEOF } - if m.TransactionParameters == nil { - m.TransactionParameters = &TransactionParameters{} - } - if err := m.TransactionParameters.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.ChainId = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) } @@ -11634,9 +10983,9 @@ func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: + case 5: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DetectionData", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field FmdClues", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11663,13 +11012,12 @@ func (m *TransactionBodyView) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &DetectionData{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.FmdClues = append(m.FmdClues, &v1alpha1.Clue{}) + if err := m.FmdClues[len(m.FmdClues)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } - m.XDetectionData = &TransactionBodyView_DetectionData{v} iNdEx = postIndex - case 5: + case 6: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MemoView", wireType) } @@ -16465,74 +15813,6 @@ func (m *SpendPlan) Unmarshal(dAtA []byte) error { m.ValueBlinding = []byte{} } iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingR == nil { - m.ProofBlindingR = []byte{} - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingS == nil { - m.ProofBlindingS = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransaction(dAtA[iNdEx:]) @@ -16723,74 +16003,6 @@ func (m *OutputPlan) Unmarshal(dAtA []byte) error { m.ValueBlinding = []byte{} } iNdEx = postIndex - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingR", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingR = append(m.ProofBlindingR[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingR == nil { - m.ProofBlindingR = []byte{} - } - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ProofBlindingS", wireType) - } - var byteLen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowTransaction - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - byteLen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if byteLen < 0 { - return ErrInvalidLengthTransaction - } - postIndex := iNdEx + byteLen - if postIndex < 0 { - return ErrInvalidLengthTransaction - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.ProofBlindingS = append(m.ProofBlindingS[:0], dAtA[iNdEx:postIndex]...) - if m.ProofBlindingS == nil { - m.ProofBlindingS = []byte{} - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTransaction(dAtA[iNdEx:]) diff --git a/relayer/chains/penumbra/log.go b/relayer/chains/penumbra/log.go index b1f110cf0..3c4661cc5 100644 --- a/relayer/chains/penumbra/log.go +++ b/relayer/chains/penumbra/log.go @@ -6,7 +6,6 @@ import ( "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" typestx "github.com/cosmos/cosmos-sdk/types/tx" - feetypes "github.com/cosmos/ibc-go/v7/modules/apps/29-fee/types" transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" clienttypes "github.com/cosmos/ibc-go/v7/modules/core/02-client/types" "github.com/cosmos/relayer/v2/relayer/provider" @@ -152,18 +151,6 @@ func getFeePayer(tx *typestx.Tx) string { case *clienttypes.MsgUpdateClient: // Same failure mode as MsgCreateClient. return firstMsg.Signer - case *clienttypes.MsgUpgradeClient: - return firstMsg.Signer - case *clienttypes.MsgSubmitMisbehaviour: - return firstMsg.Signer - case *feetypes.MsgRegisterPayee: - return firstMsg.Relayer - case *feetypes.MsgRegisterCounterpartyPayee: - return firstMsg.Relayer - case *feetypes.MsgPayPacketFee: - return firstMsg.Signer - case *feetypes.MsgPayPacketFeeAsync: - return firstMsg.PacketFee.RefundAddress default: return firstMsg.GetSigners()[0].String() } diff --git a/relayer/chains/penumbra/message_handlers.go b/relayer/chains/penumbra/message_handlers.go index 22b570eb6..69f3b3538 100644 --- a/relayer/chains/penumbra/message_handlers.go +++ b/relayer/chains/penumbra/message_handlers.go @@ -63,18 +63,18 @@ func (pcp *PenumbraChainProcessor) handleChannelMessage(eventType string, ci pro } } if !found { - pcp.channelStateCache.SetOpen(channelKey, false, ci.Order) + pcp.channelStateCache[channelKey] = false } } else { switch eventType { case chantypes.EventTypeChannelOpenTry: - pcp.channelStateCache.SetOpen(channelKey, false, ci.Order) + pcp.channelStateCache[channelKey] = false case chantypes.EventTypeChannelOpenAck, chantypes.EventTypeChannelOpenConfirm: - pcp.channelStateCache.SetOpen(channelKey, true, ci.Order) + pcp.channelStateCache[channelKey] = true case chantypes.EventTypeChannelCloseConfirm: for k := range pcp.channelStateCache { if k.PortID == ci.PortID && k.ChannelID == ci.ChannelID { - pcp.channelStateCache.SetOpen(channelKey, false, ci.Order) + pcp.channelStateCache[k] = false break } } diff --git a/relayer/chains/penumbra/msg.go b/relayer/chains/penumbra/msg.go index 951529b0a..689a3267d 100644 --- a/relayer/chains/penumbra/msg.go +++ b/relayer/chains/penumbra/msg.go @@ -5,10 +5,10 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/gogoproto/proto" chantypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types" "github.com/cosmos/relayer/v2/relayer/chains/cosmos" "github.com/cosmos/relayer/v2/relayer/provider" + "github.com/gogo/protobuf/proto" "go.uber.org/zap/zapcore" ) diff --git a/relayer/chains/penumbra/penumbra_chain_processor.go b/relayer/chains/penumbra/penumbra_chain_processor.go index 2f741d589..b140b87f5 100644 --- a/relayer/chains/penumbra/penumbra_chain_processor.go +++ b/relayer/chains/penumbra/penumbra_chain_processor.go @@ -257,13 +257,12 @@ func (pcp *PenumbraChainProcessor) initializeChannelState(ctx context.Context) e continue } pcp.channelConnections[ch.ChannelId] = ch.ConnectionHops[0] - k := processor.ChannelKey{ + pcp.channelStateCache[processor.ChannelKey{ ChannelID: ch.ChannelId, PortID: ch.PortId, CounterpartyChannelID: ch.Counterparty.ChannelId, CounterpartyPortID: ch.Counterparty.PortId, - } - pcp.channelStateCache.SetOpen(k, ch.State == chantypes.OPEN, ch.Ordering) + }] = ch.State == chantypes.OPEN } return nil } diff --git a/relayer/chains/penumbra/provider.go b/relayer/chains/penumbra/provider.go index 92918b3d0..4079f4d87 100644 --- a/relayer/chains/penumbra/provider.go +++ b/relayer/chains/penumbra/provider.go @@ -37,28 +37,27 @@ var ( const cometEncodingThreshold = "v0.37.0-alpha" type PenumbraProviderConfig struct { - KeyDirectory string `json:"key-directory" yaml:"key-directory"` - Key string `json:"key" yaml:"key"` - ChainName string `json:"-" yaml:"-"` - ChainID string `json:"chain-id" yaml:"chain-id"` - RPCAddr string `json:"rpc-addr" yaml:"rpc-addr"` - AccountPrefix string `json:"account-prefix" yaml:"account-prefix"` - KeyringBackend string `json:"keyring-backend" yaml:"keyring-backend"` - GasAdjustment float64 `json:"gas-adjustment" yaml:"gas-adjustment"` - GasPrices string `json:"gas-prices" yaml:"gas-prices"` - MinGasAmount uint64 `json:"min-gas-amount" yaml:"min-gas-amount"` - MaxGasAmount uint64 `json:"max-gas-amount" yaml:"max-gas-amount"` - Debug bool `json:"debug" yaml:"debug"` - Timeout string `json:"timeout" yaml:"timeout"` - BlockTimeout string `json:"block-timeout" yaml:"block-timeout"` - OutputFormat string `json:"output-format" yaml:"output-format"` - SignModeStr string `json:"sign-mode" yaml:"sign-mode"` - ExtraCodecs []string `json:"extra-codecs" yaml:"extra-codecs"` - Modules []module.AppModuleBasic `json:"-" yaml:"-"` - Slip44 int `json:"coin-type" yaml:"coin-type"` - Broadcast provider.BroadcastMode `json:"broadcast-mode" yaml:"broadcast-mode"` - MinLoopDuration time.Duration `json:"min-loop-duration" yaml:"min-loop-duration"` - ExtensionOptions []provider.ExtensionOption `json:"extension-options" yaml:"extension-options"` + KeyDirectory string `json:"key-directory" yaml:"key-directory"` + Key string `json:"key" yaml:"key"` + ChainName string `json:"-" yaml:"-"` + ChainID string `json:"chain-id" yaml:"chain-id"` + RPCAddr string `json:"rpc-addr" yaml:"rpc-addr"` + AccountPrefix string `json:"account-prefix" yaml:"account-prefix"` + KeyringBackend string `json:"keyring-backend" yaml:"keyring-backend"` + GasAdjustment float64 `json:"gas-adjustment" yaml:"gas-adjustment"` + GasPrices string `json:"gas-prices" yaml:"gas-prices"` + MinGasAmount uint64 `json:"min-gas-amount" yaml:"min-gas-amount"` + MaxGasAmount uint64 `json:"max-gas-amount" yaml:"max-gas-amount"` + Debug bool `json:"debug" yaml:"debug"` + Timeout string `json:"timeout" yaml:"timeout"` + BlockTimeout string `json:"block-timeout" yaml:"block-timeout"` + OutputFormat string `json:"output-format" yaml:"output-format"` + SignModeStr string `json:"sign-mode" yaml:"sign-mode"` + ExtraCodecs []string `json:"extra-codecs" yaml:"extra-codecs"` + Modules []module.AppModuleBasic `json:"-" yaml:"-"` + Slip44 int `json:"coin-type" yaml:"coin-type"` + Broadcast provider.BroadcastMode `json:"broadcast-mode" yaml:"broadcast-mode"` + MinLoopDuration time.Duration `json:"min-loop-duration" yaml:"min-loop-duration"` } func (pc PenumbraProviderConfig) Validate() error { @@ -131,6 +130,14 @@ func (h PenumbraIBCHeader) NextValidatorsHash() []byte { return h.SignedHeader.NextValidatorsHash } +func (h PenumbraIBCHeader) IsCompleteBlock() bool { + return true +} + +func (h PenumbraIBCHeader) ShouldUpdateWithZeroMessage() bool { + return false +} + type PenumbraProvider struct { log *zap.Logger diff --git a/relayer/chains/penumbra/query.go b/relayer/chains/penumbra/query.go index ce1f08ed6..da651ef93 100644 --- a/relayer/chains/penumbra/query.go +++ b/relayer/chains/penumbra/query.go @@ -702,29 +702,6 @@ func (cc *PenumbraProvider) QueryNextSeqRecv(ctx context.Context, height int64, }, nil } -// QueryNextSeqAck returns the next seqAck for a configured channel -func (cc *PenumbraProvider) QueryNextSeqAck(ctx context.Context, height int64, channelid, portid string) (recvRes *chantypes.QueryNextSequenceReceiveResponse, err error) { - key := host.NextSequenceAckKey(portid, channelid) - - value, proofBz, proofHeight, err := cc.QueryTendermintProof(ctx, height, key) - if err != nil { - return nil, err - } - - // check if next sequence receive exists - if len(value) == 0 { - return nil, sdkerrors.Wrapf(chantypes.ErrChannelNotFound, "portID (%s), channelID (%s)", portid, channelid) - } - - sequence := binary.BigEndian.Uint64(value) - - return &chantypes.QueryNextSequenceReceiveResponse{ - NextSequenceReceive: sequence, - Proof: proofBz, - ProofHeight: proofHeight, - }, nil -} - // QueryPacketCommitment returns the packet commitment proof at a given height func (cc *PenumbraProvider) QueryPacketCommitment(ctx context.Context, height int64, channelid, portid string, seq uint64) (comRes *chantypes.QueryPacketCommitmentResponse, err error) { key := host.PacketCommitmentKey(portid, channelid, seq) diff --git a/relayer/chains/penumbra/tx.go b/relayer/chains/penumbra/tx.go index dd90ac098..47e6ce81e 100644 --- a/relayer/chains/penumbra/tx.go +++ b/relayer/chains/penumbra/tx.go @@ -313,10 +313,8 @@ func (cc *PenumbraProvider) sendMessagesInner(ctx context.Context, msgs []provid // will have a signing protocol for this. txBody := penumbratypes.TransactionBody{ - Actions: make([]*penumbratypes.Action, 0), - Fee: &penumbracrypto.Fee{Amount: &penumbracrypto.Amount{Lo: 0, Hi: 0}}, - MemoData: &penumbratypes.MemoData{}, - TransactionParameters: &penumbratypes.TransactionParameters{}, + Actions: make([]*penumbratypes.Action, 0), + Fee: &penumbracrypto.Fee{Amount: &penumbracrypto.Amount{Lo: 0, Hi: 0}}, } for _, msg := range PenumbraMsgs(msgs...) { @@ -499,9 +497,7 @@ func (cc *PenumbraProvider) MsgUpdateClient(srcClientId string, dstHeader ibcexp Signer: acc, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) ConnectionOpenInit(srcClientId, dstClientId string, dstPrefix commitmenttypes.MerklePrefix, dstHeader ibcexported.ClientMessage) ([]provider.RelayerMessage, error) { @@ -534,9 +530,7 @@ func (cc *PenumbraProvider) ConnectionOpenInit(srcClientId, dstClientId string, Signer: acc, } - return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - })}, nil + return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg)}, nil } func (cc *PenumbraProvider) ConnectionOpenTry(ctx context.Context, dstQueryProvider provider.QueryProvider, dstHeader ibcexported.ClientMessage, dstPrefix commitmenttypes.MerklePrefix, srcClientId, dstClientId, srcConnId, dstConnId string) ([]provider.RelayerMessage, error) { @@ -601,9 +595,7 @@ func (cc *PenumbraProvider) ConnectionOpenTry(ctx context.Context, dstQueryProvi Signer: acc, } - return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - })}, nil + return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg)}, nil } func (cc *PenumbraProvider) ConnectionOpenAck(ctx context.Context, dstQueryProvider provider.QueryProvider, dstHeader ibcexported.ClientMessage, srcClientId, srcConnId, dstClientId, dstConnId string) ([]provider.RelayerMessage, error) { @@ -653,9 +645,7 @@ func (cc *PenumbraProvider) ConnectionOpenAck(ctx context.Context, dstQueryProvi Signer: acc, } - return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - })}, nil + return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg)}, nil } func (cc *PenumbraProvider) ConnectionOpenConfirm(ctx context.Context, dstQueryProvider provider.QueryProvider, dstHeader ibcexported.ClientMessage, dstConnId, srcClientId, srcConnId string) ([]provider.RelayerMessage, error) { @@ -688,9 +678,7 @@ func (cc *PenumbraProvider) ConnectionOpenConfirm(ctx context.Context, dstQueryP Signer: acc, } - return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - })}, nil + return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg)}, nil } func (cc *PenumbraProvider) ChannelOpenInit(srcClientId, srcConnId, srcPortId, srcVersion, dstPortId string, order chantypes.Order, dstHeader ibcexported.ClientMessage) ([]provider.RelayerMessage, error) { @@ -722,9 +710,7 @@ func (cc *PenumbraProvider) ChannelOpenInit(srcClientId, srcConnId, srcPortId, s Signer: acc, } - return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - })}, nil + return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg)}, nil } func (cc *PenumbraProvider) ChannelOpenTry(ctx context.Context, dstQueryProvider provider.QueryProvider, dstHeader ibcexported.ClientMessage, srcPortId, dstPortId, srcChanId, dstChanId, srcVersion, srcConnectionId, srcClientId string) ([]provider.RelayerMessage, error) { @@ -777,9 +763,7 @@ func (cc *PenumbraProvider) ChannelOpenTry(ctx context.Context, dstQueryProvider Signer: acc, } - return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - })}, nil + return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg)}, nil } func (cc *PenumbraProvider) ChannelOpenAck(ctx context.Context, dstQueryProvider provider.QueryProvider, dstHeader ibcexported.ClientMessage, srcClientId, srcPortId, srcChanId, dstChanId, dstPortId string) ([]provider.RelayerMessage, error) { @@ -816,9 +800,7 @@ func (cc *PenumbraProvider) ChannelOpenAck(ctx context.Context, dstQueryProvider Signer: acc, } - return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - })}, nil + return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg)}, nil } func (cc *PenumbraProvider) ChannelOpenConfirm(ctx context.Context, dstQueryProvider provider.QueryProvider, dstHeader ibcexported.ClientMessage, srcClientId, srcPortId, srcChanId, dstPortId, dstChanId string) ([]provider.RelayerMessage, error) { @@ -852,9 +834,7 @@ func (cc *PenumbraProvider) ChannelOpenConfirm(ctx context.Context, dstQueryProv Signer: acc, } - return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - })}, nil + return []provider.RelayerMessage{updateMsg, cosmos.NewCosmosMessage(msg)}, nil } func (cc *PenumbraProvider) ChannelCloseInit(srcPortId, srcChanId string) (provider.RelayerMessage, error) { @@ -872,9 +852,7 @@ func (cc *PenumbraProvider) ChannelCloseInit(srcPortId, srcChanId string) (provi Signer: acc, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) ChannelCloseConfirm(ctx context.Context, dstQueryProvider provider.QueryProvider, dsth int64, dstChanId, dstPortId, srcPortId, srcChanId string) (provider.RelayerMessage, error) { @@ -899,9 +877,7 @@ func (cc *PenumbraProvider) ChannelCloseConfirm(ctx context.Context, dstQueryPro Signer: acc, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) MsgUpgradeClient(srcClientId string, consRes *clienttypes.QueryConsensusStateResponse, clientRes *clienttypes.QueryClientStateResponse) (provider.RelayerMessage, error) { @@ -912,14 +888,9 @@ func (cc *PenumbraProvider) MsgUpgradeClient(srcClientId string, consRes *client if acc, err = cc.Address(); err != nil { return nil, err } - - msgUpgradeClient := &clienttypes.MsgUpgradeClient{ClientId: srcClientId, ClientState: clientRes.ClientState, + return cosmos.NewCosmosMessage(&clienttypes.MsgUpgradeClient{ClientId: srcClientId, ClientState: clientRes.ClientState, ConsensusState: consRes.ConsensusState, ProofUpgradeClient: consRes.GetProof(), - ProofUpgradeConsensusState: consRes.ConsensusState.Value, Signer: acc} - - return cosmos.NewCosmosMessage(msgUpgradeClient, func(signer string) { - msgUpgradeClient.Signer = signer - }), nil + ProofUpgradeConsensusState: consRes.ConsensusState.Value, Signer: acc}), nil } func (cc *PenumbraProvider) MsgSubmitMisbehaviour(clientID string, misbehaviour ibcexported.ClientMessage) (provider.RelayerMessage, error) { @@ -987,9 +958,7 @@ func (cc *PenumbraProvider) MsgRelayAcknowledgement(ctx context.Context, dst pro Signer: acc, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } } @@ -1017,9 +986,7 @@ func (cc *PenumbraProvider) MsgTransfer( msg.TimeoutHeight = info.TimeoutHeight } - msgTransfer := cosmos.NewCosmosMessage(msg, nil).(cosmos.CosmosMessage) - msgTransfer.FeegrantDisabled = true - return msgTransfer, nil + return cosmos.NewCosmosMessage(msg), nil } // MsgRelayTimeout constructs the MsgTimeout which is to be sent to the sending chain. @@ -1098,9 +1065,7 @@ func (cc *PenumbraProvider) orderedChannelTimeoutMsg( Signer: acc, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) unorderedChannelTimeoutMsg( @@ -1139,9 +1104,7 @@ func (cc *PenumbraProvider) unorderedChannelTimeoutMsg( NextSequenceRecv: packet.Seq(), Signer: acc, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } // MsgRelayRecvPacket constructs the MsgRecvPacket which is to be sent to the receiving chain. @@ -1180,9 +1143,7 @@ func (cc *PenumbraProvider) MsgRelayRecvPacket(ctx context.Context, dst provider Signer: acc, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } } @@ -1237,9 +1198,7 @@ func (cc *PenumbraProvider) MsgRecvPacket(msgTransfer provider.PacketInfo, proof Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) PacketAcknowledgement(ctx context.Context, msgRecvPacket provider.PacketInfo, height uint64) (provider.PacketProof, error) { @@ -1267,9 +1226,7 @@ func (cc *PenumbraProvider) MsgAcknowledgement(msgRecvPacket provider.PacketInfo Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) PacketReceipt(ctx context.Context, msgTransfer provider.PacketInfo, height uint64) (provider.PacketProof, error) { @@ -1298,9 +1255,7 @@ func (cc *PenumbraProvider) MsgTimeout(msgTransfer provider.PacketInfo, proof pr Signer: signer, } - return cosmos.NewCosmosMessage(assembled, func(signer string) { - assembled.Signer = signer - }), nil + return cosmos.NewCosmosMessage(assembled), nil } func (cc *PenumbraProvider) MsgTimeoutOnClose(msgTransfer provider.PacketInfo, proof provider.PacketProof) (provider.RelayerMessage, error) { @@ -1316,9 +1271,7 @@ func (cc *PenumbraProvider) MsgTimeoutOnClose(msgTransfer provider.PacketInfo, p Signer: signer, } - return cosmos.NewCosmosMessage(assembled, func(signer string) { - assembled.Signer = signer - }), nil + return cosmos.NewCosmosMessage(assembled), nil } func (cc *PenumbraProvider) MsgConnectionOpenInit(info provider.ConnectionInfo, proof provider.ConnectionProof) (provider.RelayerMessage, error) { @@ -1338,9 +1291,7 @@ func (cc *PenumbraProvider) MsgConnectionOpenInit(info provider.ConnectionInfo, Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) ConnectionHandshakeProof(ctx context.Context, msgOpenInit provider.ConnectionInfo, height uint64) (provider.ConnectionProof, error) { @@ -1398,9 +1349,7 @@ func (cc *PenumbraProvider) MsgConnectionOpenTry(msgOpenInit provider.Connection Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionInfo, proof provider.ConnectionProof) (provider.RelayerMessage, error) { @@ -1430,9 +1379,7 @@ func (cc *PenumbraProvider) MsgConnectionOpenAck(msgOpenTry provider.ConnectionI Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } // NextSeqRecv queries for the appropriate Tendermint proof required to prove the next expected packet sequence number @@ -1479,9 +1426,7 @@ func (cc *PenumbraProvider) MsgConnectionOpenConfirm(msgOpenAck provider.Connect Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) MsgChannelOpenInit(info provider.ChannelInfo, proof provider.ChannelProof) (provider.RelayerMessage, error) { @@ -1504,9 +1449,7 @@ func (cc *PenumbraProvider) MsgChannelOpenInit(info provider.ChannelInfo, proof Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) ChannelProof(ctx context.Context, msg provider.ChannelInfo, height uint64) (provider.ChannelProof, error) { @@ -1549,9 +1492,7 @@ func (cc *PenumbraProvider) MsgChannelOpenTry(msgOpenInit provider.ChannelInfo, Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) MsgChannelOpenAck(msgOpenTry provider.ChannelInfo, proof provider.ChannelProof) (provider.RelayerMessage, error) { @@ -1569,9 +1510,7 @@ func (cc *PenumbraProvider) MsgChannelOpenAck(msgOpenTry provider.ChannelInfo, p Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) MsgChannelOpenConfirm(msgOpenAck provider.ChannelInfo, proof provider.ChannelProof) (provider.RelayerMessage, error) { @@ -1587,9 +1526,7 @@ func (cc *PenumbraProvider) MsgChannelOpenConfirm(msgOpenAck provider.ChannelInf Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) MsgChannelCloseInit(info provider.ChannelInfo, proof provider.ChannelProof) (provider.RelayerMessage, error) { @@ -1603,9 +1540,7 @@ func (cc *PenumbraProvider) MsgChannelCloseInit(info provider.ChannelInfo, proof Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) MsgChannelCloseConfirm(msgCloseInit provider.ChannelInfo, proof provider.ChannelProof) (provider.RelayerMessage, error) { @@ -1621,9 +1556,7 @@ func (cc *PenumbraProvider) MsgChannelCloseConfirm(msgCloseInit provider.Channel Signer: signer, } - return cosmos.NewCosmosMessage(msg, func(signer string) { - msg.Signer = signer - }), nil + return cosmos.NewCosmosMessage(msg), nil } func (cc *PenumbraProvider) MsgUpdateClientHeader(latestHeader provider.IBCHeader, trustedHeight clienttypes.Height, trustedHeader provider.IBCHeader) (ibcexported.ClientMessage, error) { @@ -2008,13 +1941,12 @@ var JmtSpec = &ics23.ProofSpec{ Hash: ics23.HashOp_SHA256, ChildOrder: []int32{0, 1}, MinPrefixLength: 16, - MaxPrefixLength: 16, + MaxPrefixLength: 48, ChildSize: 32, - EmptyChild: []byte("SPARSE_MERKLE_PLACEHOLDER_HASH__"), + EmptyChild: nil, }, - MinDepth: 0, - MaxDepth: 64, - PrehashKeyBeforeComparison: true, + MinDepth: 0, + MaxDepth: 64, } var ApphashSpec = &ics23.ProofSpec{ @@ -2033,9 +1965,8 @@ var ApphashSpec = &ics23.ProofSpec{ ChildSize: 32, EmptyChild: nil, }, - MinDepth: 0, - MaxDepth: 1, - PrehashKeyBeforeComparison: true, + MinDepth: 0, + MaxDepth: 1, } var PenumbraProofSpecs = []*ics23.ProofSpec{JmtSpec, ApphashSpec} @@ -2296,7 +2227,7 @@ func (cc *PenumbraProvider) MsgSubmitQueryResponse(chainID string, queryID provi panic("implement me") } -func (cc *PenumbraProvider) SendMessagesToMempool(ctx context.Context, msgs []provider.RelayerMessage, memo string, asyncCtx context.Context, asyncCallback []func(*provider.RelayerTxResponse, error)) error { +func (cc *PenumbraProvider) SendMessagesToMempool(ctx context.Context, msgs []provider.RelayerMessage, memo string, asyncCtx context.Context, asyncCallback func(*provider.RelayerTxResponse, error)) error { sendRsp, err := cc.sendMessagesInner(ctx, msgs, memo) cc.log.Debug("Received response from sending messages", zap.Any("response", sendRsp), zap.Error(err)) return err @@ -2307,3 +2238,7 @@ func (cc *PenumbraProvider) MsgRegisterCounterpartyPayee(portID, channelID, rela //TODO implement me panic("implement me") } +func (cc *PenumbraProvider) MsgTimeoutRequest(msgTransfer provider.PacketInfo, proof provider.PacketProof) (provider.RelayerMessage, error) { + //TODO implement me + panic("implement me") +} diff --git a/relayer/chains/penumbra/view/v1alpha1/view.pb.go b/relayer/chains/penumbra/view/v1alpha1/view.pb.go index 35056567e..217129d5f 100644 --- a/relayer/chains/penumbra/view/v1alpha1/view.pb.go +++ b/relayer/chains/penumbra/view/v1alpha1/view.pb.go @@ -8,11 +8,10 @@ import ( fmt "fmt" grpc1 "github.com/cosmos/gogoproto/grpc" proto "github.com/cosmos/gogoproto/proto" - v1alpha14 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/chain/v1alpha1" + v1alpha13 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/chain/v1alpha1" v1alpha11 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/crypto/v1alpha1" - v1alpha15 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" + v1alpha14 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/dex/v1alpha1" v1alpha12 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/ibc/v1alpha1" - v1alpha13 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/stake/v1alpha1" v1alpha1 "github.com/cosmos/relayer/v2/relayer/chains/penumbra/core/transaction/v1alpha1" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -33,105 +32,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -type AuthorizeAndBuildRequest struct { - // The transaction plan to authorize and build. - TransactionPlan *v1alpha1.TransactionPlan `protobuf:"bytes,1,opt,name=transaction_plan,json=transactionPlan,proto3" json:"transaction_plan,omitempty"` - // The authorization data to use to authorize the transaction plan. - AuthorizationData *v1alpha1.AuthorizationData `protobuf:"bytes,2,opt,name=authorization_data,json=authorizationData,proto3" json:"authorization_data,omitempty"` -} - -func (m *AuthorizeAndBuildRequest) Reset() { *m = AuthorizeAndBuildRequest{} } -func (m *AuthorizeAndBuildRequest) String() string { return proto.CompactTextString(m) } -func (*AuthorizeAndBuildRequest) ProtoMessage() {} -func (*AuthorizeAndBuildRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{0} -} -func (m *AuthorizeAndBuildRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *AuthorizeAndBuildRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_AuthorizeAndBuildRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *AuthorizeAndBuildRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_AuthorizeAndBuildRequest.Merge(m, src) -} -func (m *AuthorizeAndBuildRequest) XXX_Size() int { - return m.Size() -} -func (m *AuthorizeAndBuildRequest) XXX_DiscardUnknown() { - xxx_messageInfo_AuthorizeAndBuildRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_AuthorizeAndBuildRequest proto.InternalMessageInfo - -func (m *AuthorizeAndBuildRequest) GetTransactionPlan() *v1alpha1.TransactionPlan { - if m != nil { - return m.TransactionPlan - } - return nil -} - -func (m *AuthorizeAndBuildRequest) GetAuthorizationData() *v1alpha1.AuthorizationData { - if m != nil { - return m.AuthorizationData - } - return nil -} - -type AuthorizeAndBuildResponse struct { - // The transaction that was built. - Transaction *v1alpha1.Transaction `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"` -} - -func (m *AuthorizeAndBuildResponse) Reset() { *m = AuthorizeAndBuildResponse{} } -func (m *AuthorizeAndBuildResponse) String() string { return proto.CompactTextString(m) } -func (*AuthorizeAndBuildResponse) ProtoMessage() {} -func (*AuthorizeAndBuildResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{1} -} -func (m *AuthorizeAndBuildResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *AuthorizeAndBuildResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_AuthorizeAndBuildResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *AuthorizeAndBuildResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_AuthorizeAndBuildResponse.Merge(m, src) -} -func (m *AuthorizeAndBuildResponse) XXX_Size() int { - return m.Size() -} -func (m *AuthorizeAndBuildResponse) XXX_DiscardUnknown() { - xxx_messageInfo_AuthorizeAndBuildResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_AuthorizeAndBuildResponse proto.InternalMessageInfo - -func (m *AuthorizeAndBuildResponse) GetTransaction() *v1alpha1.Transaction { - if m != nil { - return m.Transaction - } - return nil -} - type BroadcastTransactionRequest struct { // The transaction to broadcast. Transaction *v1alpha1.Transaction `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"` @@ -143,7 +43,7 @@ func (m *BroadcastTransactionRequest) Reset() { *m = BroadcastTransactio func (m *BroadcastTransactionRequest) String() string { return proto.CompactTextString(m) } func (*BroadcastTransactionRequest) ProtoMessage() {} func (*BroadcastTransactionRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{2} + return fileDescriptor_0aa947b204e6a7c2, []int{0} } func (m *BroadcastTransactionRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -198,7 +98,7 @@ func (m *BroadcastTransactionResponse) Reset() { *m = BroadcastTransacti func (m *BroadcastTransactionResponse) String() string { return proto.CompactTextString(m) } func (*BroadcastTransactionResponse) ProtoMessage() {} func (*BroadcastTransactionResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{3} + return fileDescriptor_0aa947b204e6a7c2, []int{1} } func (m *BroadcastTransactionResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -247,14 +147,13 @@ type TransactionPlannerRequest struct { // The fee for the requested TransactionPlan, if any. Fee *v1alpha11.Fee `protobuf:"bytes,2,opt,name=fee,proto3" json:"fee,omitempty"` // The memo for the requested TransactionPlan - Memo *v1alpha1.MemoPlaintext `protobuf:"bytes,3,opt,name=memo,proto3" json:"memo,omitempty"` + Memo string `protobuf:"bytes,3,opt,name=memo,proto3" json:"memo,omitempty"` // Types that are valid to be assigned to XAccountGroupId: // *TransactionPlannerRequest_AccountGroupId XAccountGroupId isTransactionPlannerRequest_XAccountGroupId `protobuf_oneof:"_account_group_id"` // Request contents Outputs []*TransactionPlannerRequest_Output `protobuf:"bytes,20,rep,name=outputs,proto3" json:"outputs,omitempty"` Swaps []*TransactionPlannerRequest_Swap `protobuf:"bytes,30,rep,name=swaps,proto3" json:"swaps,omitempty"` - SwapClaims []*TransactionPlannerRequest_SwapClaim `protobuf:"bytes,31,rep,name=swap_claims,json=swapClaims,proto3" json:"swap_claims,omitempty"` Delegations []*TransactionPlannerRequest_Delegate `protobuf:"bytes,40,rep,name=delegations,proto3" json:"delegations,omitempty"` Undelegations []*TransactionPlannerRequest_Undelegate `protobuf:"bytes,50,rep,name=undelegations,proto3" json:"undelegations,omitempty"` IbcActions []*v1alpha12.IbcAction `protobuf:"bytes,60,rep,name=ibc_actions,json=ibcActions,proto3" json:"ibc_actions,omitempty"` @@ -264,7 +163,7 @@ func (m *TransactionPlannerRequest) Reset() { *m = TransactionPlannerReq func (m *TransactionPlannerRequest) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest) ProtoMessage() {} func (*TransactionPlannerRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4} + return fileDescriptor_0aa947b204e6a7c2, []int{2} } func (m *TransactionPlannerRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -326,11 +225,11 @@ func (m *TransactionPlannerRequest) GetFee() *v1alpha11.Fee { return nil } -func (m *TransactionPlannerRequest) GetMemo() *v1alpha1.MemoPlaintext { +func (m *TransactionPlannerRequest) GetMemo() string { if m != nil { return m.Memo } - return nil + return "" } func (m *TransactionPlannerRequest) GetAccountGroupId() *v1alpha11.AccountGroupId { @@ -354,13 +253,6 @@ func (m *TransactionPlannerRequest) GetSwaps() []*TransactionPlannerRequest_Swap return nil } -func (m *TransactionPlannerRequest) GetSwapClaims() []*TransactionPlannerRequest_SwapClaim { - if m != nil { - return m.SwapClaims - } - return nil -} - func (m *TransactionPlannerRequest) GetDelegations() []*TransactionPlannerRequest_Delegate { if m != nil { return m.Delegations @@ -391,9 +283,7 @@ func (*TransactionPlannerRequest) XXX_OneofWrappers() []interface{} { // Request message subtypes type TransactionPlannerRequest_Output struct { - // The amount and denomination in which the Output is issued. - Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - // The address to which Output will be sent. + Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` Address *v1alpha11.Address `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` } @@ -401,7 +291,7 @@ func (m *TransactionPlannerRequest_Output) Reset() { *m = TransactionPla func (m *TransactionPlannerRequest_Output) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Output) ProtoMessage() {} func (*TransactionPlannerRequest_Output) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4, 0} + return fileDescriptor_0aa947b204e6a7c2, []int{2, 0} } func (m *TransactionPlannerRequest_Output) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -445,19 +335,16 @@ func (m *TransactionPlannerRequest_Output) GetAddress() *v1alpha11.Address { } type TransactionPlannerRequest_Swap struct { - // The amount and denomination to be traded in the Swap. - Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - // The denomination to be received as a Output of the Swap. + Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` TargetAsset *v1alpha11.AssetId `protobuf:"bytes,2,opt,name=target_asset,json=targetAsset,proto3" json:"target_asset,omitempty"` - // An optional fee to be paid for performing the Swap. - Fee *v1alpha11.Fee `protobuf:"bytes,3,opt,name=fee,proto3" json:"fee,omitempty"` + Fee *v1alpha11.Fee `protobuf:"bytes,3,opt,name=fee,proto3" json:"fee,omitempty"` } func (m *TransactionPlannerRequest_Swap) Reset() { *m = TransactionPlannerRequest_Swap{} } func (m *TransactionPlannerRequest_Swap) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Swap) ProtoMessage() {} func (*TransactionPlannerRequest_Swap) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4, 1} + return fileDescriptor_0aa947b204e6a7c2, []int{2, 1} } func (m *TransactionPlannerRequest_Swap) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -507,63 +394,16 @@ func (m *TransactionPlannerRequest_Swap) GetFee() *v1alpha11.Fee { return nil } -type TransactionPlannerRequest_SwapClaim struct { - // SwapCommitment to identify the Swap to be claimed. - // Use the commitment from the Swap message: - // penumbra.core.dex.v1alpha1.Swap.body.payload.commitment. - SwapCommitment *v1alpha11.StateCommitment `protobuf:"bytes,1,opt,name=swap_commitment,json=swapCommitment,proto3" json:"swap_commitment,omitempty"` -} - -func (m *TransactionPlannerRequest_SwapClaim) Reset() { *m = TransactionPlannerRequest_SwapClaim{} } -func (m *TransactionPlannerRequest_SwapClaim) String() string { return proto.CompactTextString(m) } -func (*TransactionPlannerRequest_SwapClaim) ProtoMessage() {} -func (*TransactionPlannerRequest_SwapClaim) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4, 2} -} -func (m *TransactionPlannerRequest_SwapClaim) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *TransactionPlannerRequest_SwapClaim) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_TransactionPlannerRequest_SwapClaim.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *TransactionPlannerRequest_SwapClaim) XXX_Merge(src proto.Message) { - xxx_messageInfo_TransactionPlannerRequest_SwapClaim.Merge(m, src) -} -func (m *TransactionPlannerRequest_SwapClaim) XXX_Size() int { - return m.Size() -} -func (m *TransactionPlannerRequest_SwapClaim) XXX_DiscardUnknown() { - xxx_messageInfo_TransactionPlannerRequest_SwapClaim.DiscardUnknown(m) -} - -var xxx_messageInfo_TransactionPlannerRequest_SwapClaim proto.InternalMessageInfo - -func (m *TransactionPlannerRequest_SwapClaim) GetSwapCommitment() *v1alpha11.StateCommitment { - if m != nil { - return m.SwapCommitment - } - return nil -} - type TransactionPlannerRequest_Delegate struct { - Amount *v1alpha11.Amount `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` - RateData *v1alpha13.RateData `protobuf:"bytes,3,opt,name=rate_data,json=rateData,proto3" json:"rate_data,omitempty"` + Amount *v1alpha11.Amount `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"` + IdentityKey *v1alpha11.IdentityKey `protobuf:"bytes,2,opt,name=identity_key,json=identityKey,proto3" json:"identity_key,omitempty"` } func (m *TransactionPlannerRequest_Delegate) Reset() { *m = TransactionPlannerRequest_Delegate{} } func (m *TransactionPlannerRequest_Delegate) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Delegate) ProtoMessage() {} func (*TransactionPlannerRequest_Delegate) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4, 3} + return fileDescriptor_0aa947b204e6a7c2, []int{2, 2} } func (m *TransactionPlannerRequest_Delegate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -599,23 +439,22 @@ func (m *TransactionPlannerRequest_Delegate) GetAmount() *v1alpha11.Amount { return nil } -func (m *TransactionPlannerRequest_Delegate) GetRateData() *v1alpha13.RateData { +func (m *TransactionPlannerRequest_Delegate) GetIdentityKey() *v1alpha11.IdentityKey { if m != nil { - return m.RateData + return m.IdentityKey } return nil } type TransactionPlannerRequest_Undelegate struct { - Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` - RateData *v1alpha13.RateData `protobuf:"bytes,2,opt,name=rate_data,json=rateData,proto3" json:"rate_data,omitempty"` + Value *v1alpha11.Value `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"` } func (m *TransactionPlannerRequest_Undelegate) Reset() { *m = TransactionPlannerRequest_Undelegate{} } func (m *TransactionPlannerRequest_Undelegate) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerRequest_Undelegate) ProtoMessage() {} func (*TransactionPlannerRequest_Undelegate) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{4, 4} + return fileDescriptor_0aa947b204e6a7c2, []int{2, 3} } func (m *TransactionPlannerRequest_Undelegate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -651,13 +490,6 @@ func (m *TransactionPlannerRequest_Undelegate) GetValue() *v1alpha11.Value { return nil } -func (m *TransactionPlannerRequest_Undelegate) GetRateData() *v1alpha13.RateData { - if m != nil { - return m.RateData - } - return nil -} - type TransactionPlannerResponse struct { Plan *v1alpha1.TransactionPlan `protobuf:"bytes,1,opt,name=plan,proto3" json:"plan,omitempty"` } @@ -666,7 +498,7 @@ func (m *TransactionPlannerResponse) Reset() { *m = TransactionPlannerRe func (m *TransactionPlannerResponse) String() string { return proto.CompactTextString(m) } func (*TransactionPlannerResponse) ProtoMessage() {} func (*TransactionPlannerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{5} + return fileDescriptor_0aa947b204e6a7c2, []int{3} } func (m *TransactionPlannerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -703,15 +535,14 @@ func (m *TransactionPlannerResponse) GetPlan() *v1alpha1.TransactionPlan { } type AddressByIndexRequest struct { - AddressIndex *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=address_index,json=addressIndex,proto3" json:"address_index,omitempty"` - DisplayConfirm bool `protobuf:"varint,2,opt,name=display_confirm,json=displayConfirm,proto3" json:"display_confirm,omitempty"` + AddressIndex *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=address_index,json=addressIndex,proto3" json:"address_index,omitempty"` } func (m *AddressByIndexRequest) Reset() { *m = AddressByIndexRequest{} } func (m *AddressByIndexRequest) String() string { return proto.CompactTextString(m) } func (*AddressByIndexRequest) ProtoMessage() {} func (*AddressByIndexRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{6} + return fileDescriptor_0aa947b204e6a7c2, []int{4} } func (m *AddressByIndexRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -747,13 +578,6 @@ func (m *AddressByIndexRequest) GetAddressIndex() *v1alpha11.AddressIndex { return nil } -func (m *AddressByIndexRequest) GetDisplayConfirm() bool { - if m != nil { - return m.DisplayConfirm - } - return false -} - type AddressByIndexResponse struct { Address *v1alpha11.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } @@ -762,7 +586,7 @@ func (m *AddressByIndexResponse) Reset() { *m = AddressByIndexResponse{} func (m *AddressByIndexResponse) String() string { return proto.CompactTextString(m) } func (*AddressByIndexResponse) ProtoMessage() {} func (*AddressByIndexResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{7} + return fileDescriptor_0aa947b204e6a7c2, []int{5} } func (m *AddressByIndexResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -806,7 +630,7 @@ func (m *IndexByAddressRequest) Reset() { *m = IndexByAddressRequest{} } func (m *IndexByAddressRequest) String() string { return proto.CompactTextString(m) } func (*IndexByAddressRequest) ProtoMessage() {} func (*IndexByAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{8} + return fileDescriptor_0aa947b204e6a7c2, []int{6} } func (m *IndexByAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -852,7 +676,7 @@ func (m *IndexByAddressResponse) Reset() { *m = IndexByAddressResponse{} func (m *IndexByAddressResponse) String() string { return proto.CompactTextString(m) } func (*IndexByAddressResponse) ProtoMessage() {} func (*IndexByAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{9} + return fileDescriptor_0aa947b204e6a7c2, []int{7} } func (m *IndexByAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -915,15 +739,14 @@ func (*IndexByAddressResponse) XXX_OneofWrappers() []interface{} { } type EphemeralAddressRequest struct { - AddressIndex *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=address_index,json=addressIndex,proto3" json:"address_index,omitempty"` - DisplayConfirm bool `protobuf:"varint,2,opt,name=display_confirm,json=displayConfirm,proto3" json:"display_confirm,omitempty"` + AddressIndex *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=address_index,json=addressIndex,proto3" json:"address_index,omitempty"` } func (m *EphemeralAddressRequest) Reset() { *m = EphemeralAddressRequest{} } func (m *EphemeralAddressRequest) String() string { return proto.CompactTextString(m) } func (*EphemeralAddressRequest) ProtoMessage() {} func (*EphemeralAddressRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{10} + return fileDescriptor_0aa947b204e6a7c2, []int{8} } func (m *EphemeralAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -959,13 +782,6 @@ func (m *EphemeralAddressRequest) GetAddressIndex() *v1alpha11.AddressIndex { return nil } -func (m *EphemeralAddressRequest) GetDisplayConfirm() bool { - if m != nil { - return m.DisplayConfirm - } - return false -} - type EphemeralAddressResponse struct { Address *v1alpha11.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } @@ -974,7 +790,7 @@ func (m *EphemeralAddressResponse) Reset() { *m = EphemeralAddressRespon func (m *EphemeralAddressResponse) String() string { return proto.CompactTextString(m) } func (*EphemeralAddressResponse) ProtoMessage() {} func (*EphemeralAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{11} + return fileDescriptor_0aa947b204e6a7c2, []int{9} } func (m *EphemeralAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1010,25 +826,22 @@ func (m *EphemeralAddressResponse) GetAddress() *v1alpha11.Address { return nil } -type BalancesRequest struct { - // If present, filter balances to only include the account specified by the `AddressIndex`. - AccountFilter *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=account_filter,json=accountFilter,proto3" json:"account_filter,omitempty"` - // If present, filter balances to only include the specified asset ID. - AssetIdFilter *v1alpha11.AssetId `protobuf:"bytes,2,opt,name=asset_id_filter,json=assetIdFilter,proto3" json:"asset_id_filter,omitempty"` +type BalanceByAddressRequest struct { + Address *v1alpha11.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *BalancesRequest) Reset() { *m = BalancesRequest{} } -func (m *BalancesRequest) String() string { return proto.CompactTextString(m) } -func (*BalancesRequest) ProtoMessage() {} -func (*BalancesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{12} +func (m *BalanceByAddressRequest) Reset() { *m = BalanceByAddressRequest{} } +func (m *BalanceByAddressRequest) String() string { return proto.CompactTextString(m) } +func (*BalanceByAddressRequest) ProtoMessage() {} +func (*BalanceByAddressRequest) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{10} } -func (m *BalancesRequest) XXX_Unmarshal(b []byte) error { +func (m *BalanceByAddressRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *BalancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *BalanceByAddressRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_BalancesRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_BalanceByAddressRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1038,49 +851,42 @@ func (m *BalancesRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, err return b[:n], nil } } -func (m *BalancesRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_BalancesRequest.Merge(m, src) +func (m *BalanceByAddressRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_BalanceByAddressRequest.Merge(m, src) } -func (m *BalancesRequest) XXX_Size() int { +func (m *BalanceByAddressRequest) XXX_Size() int { return m.Size() } -func (m *BalancesRequest) XXX_DiscardUnknown() { - xxx_messageInfo_BalancesRequest.DiscardUnknown(m) +func (m *BalanceByAddressRequest) XXX_DiscardUnknown() { + xxx_messageInfo_BalanceByAddressRequest.DiscardUnknown(m) } -var xxx_messageInfo_BalancesRequest proto.InternalMessageInfo - -func (m *BalancesRequest) GetAccountFilter() *v1alpha11.AddressIndex { - if m != nil { - return m.AccountFilter - } - return nil -} +var xxx_messageInfo_BalanceByAddressRequest proto.InternalMessageInfo -func (m *BalancesRequest) GetAssetIdFilter() *v1alpha11.AssetId { +func (m *BalanceByAddressRequest) GetAddress() *v1alpha11.Address { if m != nil { - return m.AssetIdFilter + return m.Address } return nil } -type BalancesResponse struct { - Account *v1alpha11.AddressIndex `protobuf:"bytes,1,opt,name=account,proto3" json:"account,omitempty"` - Balance *v1alpha11.Value `protobuf:"bytes,2,opt,name=balance,proto3" json:"balance,omitempty"` +type BalanceByAddressResponse struct { + Asset *v1alpha11.AssetId `protobuf:"bytes,1,opt,name=asset,proto3" json:"asset,omitempty"` + Amount *v1alpha11.Amount `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount,omitempty"` } -func (m *BalancesResponse) Reset() { *m = BalancesResponse{} } -func (m *BalancesResponse) String() string { return proto.CompactTextString(m) } -func (*BalancesResponse) ProtoMessage() {} -func (*BalancesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{13} +func (m *BalanceByAddressResponse) Reset() { *m = BalanceByAddressResponse{} } +func (m *BalanceByAddressResponse) String() string { return proto.CompactTextString(m) } +func (*BalanceByAddressResponse) ProtoMessage() {} +func (*BalanceByAddressResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_0aa947b204e6a7c2, []int{11} } -func (m *BalancesResponse) XXX_Unmarshal(b []byte) error { +func (m *BalanceByAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *BalancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *BalanceByAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_BalancesResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_BalanceByAddressResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -1090,28 +896,28 @@ func (m *BalancesResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, er return b[:n], nil } } -func (m *BalancesResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_BalancesResponse.Merge(m, src) +func (m *BalanceByAddressResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_BalanceByAddressResponse.Merge(m, src) } -func (m *BalancesResponse) XXX_Size() int { +func (m *BalanceByAddressResponse) XXX_Size() int { return m.Size() } -func (m *BalancesResponse) XXX_DiscardUnknown() { - xxx_messageInfo_BalancesResponse.DiscardUnknown(m) +func (m *BalanceByAddressResponse) XXX_DiscardUnknown() { + xxx_messageInfo_BalanceByAddressResponse.DiscardUnknown(m) } -var xxx_messageInfo_BalancesResponse proto.InternalMessageInfo +var xxx_messageInfo_BalanceByAddressResponse proto.InternalMessageInfo -func (m *BalancesResponse) GetAccount() *v1alpha11.AddressIndex { +func (m *BalanceByAddressResponse) GetAsset() *v1alpha11.AssetId { if m != nil { - return m.Account + return m.Asset } return nil } -func (m *BalancesResponse) GetBalance() *v1alpha11.Value { +func (m *BalanceByAddressResponse) GetAmount() *v1alpha11.Amount { if m != nil { - return m.Balance + return m.Amount } return nil } @@ -1125,7 +931,7 @@ func (m *ViewAuthToken) Reset() { *m = ViewAuthToken{} } func (m *ViewAuthToken) String() string { return proto.CompactTextString(m) } func (*ViewAuthToken) ProtoMessage() {} func (*ViewAuthToken) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{14} + return fileDescriptor_0aa947b204e6a7c2, []int{12} } func (m *ViewAuthToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1169,7 +975,7 @@ func (m *ViewAuthRequest) Reset() { *m = ViewAuthRequest{} } func (m *ViewAuthRequest) String() string { return proto.CompactTextString(m) } func (*ViewAuthRequest) ProtoMessage() {} func (*ViewAuthRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{15} + return fileDescriptor_0aa947b204e6a7c2, []int{13} } func (m *ViewAuthRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1213,7 +1019,7 @@ func (m *ViewAuthResponse) Reset() { *m = ViewAuthResponse{} } func (m *ViewAuthResponse) String() string { return proto.CompactTextString(m) } func (*ViewAuthResponse) ProtoMessage() {} func (*ViewAuthResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{16} + return fileDescriptor_0aa947b204e6a7c2, []int{14} } func (m *ViewAuthResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1260,7 +1066,7 @@ func (m *StatusRequest) Reset() { *m = StatusRequest{} } func (m *StatusRequest) String() string { return proto.CompactTextString(m) } func (*StatusRequest) ProtoMessage() {} func (*StatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{17} + return fileDescriptor_0aa947b204e6a7c2, []int{15} } func (m *StatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1334,7 +1140,7 @@ func (m *StatusResponse) Reset() { *m = StatusResponse{} } func (m *StatusResponse) String() string { return proto.CompactTextString(m) } func (*StatusResponse) ProtoMessage() {} func (*StatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{18} + return fileDescriptor_0aa947b204e6a7c2, []int{16} } func (m *StatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1388,7 +1194,7 @@ func (m *StatusStreamRequest) Reset() { *m = StatusStreamRequest{} } func (m *StatusStreamRequest) String() string { return proto.CompactTextString(m) } func (*StatusStreamRequest) ProtoMessage() {} func (*StatusStreamRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{19} + return fileDescriptor_0aa947b204e6a7c2, []int{17} } func (m *StatusStreamRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1460,7 +1266,7 @@ func (m *StatusStreamResponse) Reset() { *m = StatusStreamResponse{} } func (m *StatusStreamResponse) String() string { return proto.CompactTextString(m) } func (*StatusStreamResponse) ProtoMessage() {} func (*StatusStreamResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{20} + return fileDescriptor_0aa947b204e6a7c2, []int{18} } func (m *StatusStreamResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1527,7 +1333,7 @@ func (m *NotesRequest) Reset() { *m = NotesRequest{} } func (m *NotesRequest) String() string { return proto.CompactTextString(m) } func (*NotesRequest) ProtoMessage() {} func (*NotesRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{21} + return fileDescriptor_0aa947b204e6a7c2, []int{19} } func (m *NotesRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1632,7 +1438,7 @@ func (m *NotesForVotingRequest) Reset() { *m = NotesForVotingRequest{} } func (m *NotesForVotingRequest) String() string { return proto.CompactTextString(m) } func (*NotesForVotingRequest) ProtoMessage() {} func (*NotesForVotingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{22} + return fileDescriptor_0aa947b204e6a7c2, []int{20} } func (m *NotesForVotingRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1722,7 +1528,7 @@ func (m *WitnessRequest) Reset() { *m = WitnessRequest{} } func (m *WitnessRequest) String() string { return proto.CompactTextString(m) } func (*WitnessRequest) ProtoMessage() {} func (*WitnessRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{23} + return fileDescriptor_0aa947b204e6a7c2, []int{21} } func (m *WitnessRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1806,7 +1612,7 @@ func (m *WitnessResponse) Reset() { *m = WitnessResponse{} } func (m *WitnessResponse) String() string { return proto.CompactTextString(m) } func (*WitnessResponse) ProtoMessage() {} func (*WitnessResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{24} + return fileDescriptor_0aa947b204e6a7c2, []int{22} } func (m *WitnessResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1851,7 +1657,7 @@ func (m *WitnessAndBuildRequest) Reset() { *m = WitnessAndBuildRequest{} func (m *WitnessAndBuildRequest) String() string { return proto.CompactTextString(m) } func (*WitnessAndBuildRequest) ProtoMessage() {} func (*WitnessAndBuildRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{25} + return fileDescriptor_0aa947b204e6a7c2, []int{23} } func (m *WitnessAndBuildRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1902,7 +1708,7 @@ func (m *WitnessAndBuildResponse) Reset() { *m = WitnessAndBuildResponse func (m *WitnessAndBuildResponse) String() string { return proto.CompactTextString(m) } func (*WitnessAndBuildResponse) ProtoMessage() {} func (*WitnessAndBuildResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{26} + return fileDescriptor_0aa947b204e6a7c2, []int{24} } func (m *WitnessAndBuildResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1961,7 +1767,7 @@ func (m *AssetsRequest) Reset() { *m = AssetsRequest{} } func (m *AssetsRequest) String() string { return proto.CompactTextString(m) } func (*AssetsRequest) ProtoMessage() {} func (*AssetsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{27} + return fileDescriptor_0aa947b204e6a7c2, []int{25} } func (m *AssetsRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2041,14 +1847,14 @@ func (m *AssetsRequest) GetIncludeVotingReceiptTokens() bool { // Requests all assets known to the view service. type AssetsResponse struct { - DenomMetadata *v1alpha11.DenomMetadata `protobuf:"bytes,2,opt,name=denom_metadata,json=denomMetadata,proto3" json:"denom_metadata,omitempty"` + Asset *v1alpha11.Asset `protobuf:"bytes,1,opt,name=asset,proto3" json:"asset,omitempty"` } func (m *AssetsResponse) Reset() { *m = AssetsResponse{} } func (m *AssetsResponse) String() string { return proto.CompactTextString(m) } func (*AssetsResponse) ProtoMessage() {} func (*AssetsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{28} + return fileDescriptor_0aa947b204e6a7c2, []int{26} } func (m *AssetsResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2077,9 +1883,9 @@ func (m *AssetsResponse) XXX_DiscardUnknown() { var xxx_messageInfo_AssetsResponse proto.InternalMessageInfo -func (m *AssetsResponse) GetDenomMetadata() *v1alpha11.DenomMetadata { +func (m *AssetsResponse) GetAsset() *v1alpha11.Asset { if m != nil { - return m.DenomMetadata + return m.Asset } return nil } @@ -2092,7 +1898,7 @@ func (m *ChainParametersRequest) Reset() { *m = ChainParametersRequest{} func (m *ChainParametersRequest) String() string { return proto.CompactTextString(m) } func (*ChainParametersRequest) ProtoMessage() {} func (*ChainParametersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{29} + return fileDescriptor_0aa947b204e6a7c2, []int{27} } func (m *ChainParametersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2122,14 +1928,14 @@ func (m *ChainParametersRequest) XXX_DiscardUnknown() { var xxx_messageInfo_ChainParametersRequest proto.InternalMessageInfo type ChainParametersResponse struct { - Parameters *v1alpha14.ChainParameters `protobuf:"bytes,1,opt,name=parameters,proto3" json:"parameters,omitempty"` + Parameters *v1alpha13.ChainParameters `protobuf:"bytes,1,opt,name=parameters,proto3" json:"parameters,omitempty"` } func (m *ChainParametersResponse) Reset() { *m = ChainParametersResponse{} } func (m *ChainParametersResponse) String() string { return proto.CompactTextString(m) } func (*ChainParametersResponse) ProtoMessage() {} func (*ChainParametersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{30} + return fileDescriptor_0aa947b204e6a7c2, []int{28} } func (m *ChainParametersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2158,7 +1964,7 @@ func (m *ChainParametersResponse) XXX_DiscardUnknown() { var xxx_messageInfo_ChainParametersResponse proto.InternalMessageInfo -func (m *ChainParametersResponse) GetParameters() *v1alpha14.ChainParameters { +func (m *ChainParametersResponse) GetParameters() *v1alpha13.ChainParameters { if m != nil { return m.Parameters } @@ -2173,7 +1979,7 @@ func (m *FMDParametersRequest) Reset() { *m = FMDParametersRequest{} } func (m *FMDParametersRequest) String() string { return proto.CompactTextString(m) } func (*FMDParametersRequest) ProtoMessage() {} func (*FMDParametersRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{31} + return fileDescriptor_0aa947b204e6a7c2, []int{29} } func (m *FMDParametersRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2203,14 +2009,14 @@ func (m *FMDParametersRequest) XXX_DiscardUnknown() { var xxx_messageInfo_FMDParametersRequest proto.InternalMessageInfo type FMDParametersResponse struct { - Parameters *v1alpha14.FmdParameters `protobuf:"bytes,1,opt,name=parameters,proto3" json:"parameters,omitempty"` + Parameters *v1alpha13.FmdParameters `protobuf:"bytes,1,opt,name=parameters,proto3" json:"parameters,omitempty"` } func (m *FMDParametersResponse) Reset() { *m = FMDParametersResponse{} } func (m *FMDParametersResponse) String() string { return proto.CompactTextString(m) } func (*FMDParametersResponse) ProtoMessage() {} func (*FMDParametersResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{32} + return fileDescriptor_0aa947b204e6a7c2, []int{30} } func (m *FMDParametersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2239,7 +2045,7 @@ func (m *FMDParametersResponse) XXX_DiscardUnknown() { var xxx_messageInfo_FMDParametersResponse proto.InternalMessageInfo -func (m *FMDParametersResponse) GetParameters() *v1alpha14.FmdParameters { +func (m *FMDParametersResponse) GetParameters() *v1alpha13.FmdParameters { if m != nil { return m.Parameters } @@ -2259,7 +2065,7 @@ func (m *NoteByCommitmentRequest) Reset() { *m = NoteByCommitmentRequest func (m *NoteByCommitmentRequest) String() string { return proto.CompactTextString(m) } func (*NoteByCommitmentRequest) ProtoMessage() {} func (*NoteByCommitmentRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{33} + return fileDescriptor_0aa947b204e6a7c2, []int{31} } func (m *NoteByCommitmentRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2343,7 +2149,7 @@ func (m *NoteByCommitmentResponse) Reset() { *m = NoteByCommitmentRespon func (m *NoteByCommitmentResponse) String() string { return proto.CompactTextString(m) } func (*NoteByCommitmentResponse) ProtoMessage() {} func (*NoteByCommitmentResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{34} + return fileDescriptor_0aa947b204e6a7c2, []int{32} } func (m *NoteByCommitmentResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2392,7 +2198,7 @@ func (m *SwapByCommitmentRequest) Reset() { *m = SwapByCommitmentRequest func (m *SwapByCommitmentRequest) String() string { return proto.CompactTextString(m) } func (*SwapByCommitmentRequest) ProtoMessage() {} func (*SwapByCommitmentRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{35} + return fileDescriptor_0aa947b204e6a7c2, []int{33} } func (m *SwapByCommitmentRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2476,7 +2282,7 @@ func (m *SwapByCommitmentResponse) Reset() { *m = SwapByCommitmentRespon func (m *SwapByCommitmentResponse) String() string { return proto.CompactTextString(m) } func (*SwapByCommitmentResponse) ProtoMessage() {} func (*SwapByCommitmentResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{36} + return fileDescriptor_0aa947b204e6a7c2, []int{34} } func (m *SwapByCommitmentResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2524,7 +2330,7 @@ func (m *NullifierStatusRequest) Reset() { *m = NullifierStatusRequest{} func (m *NullifierStatusRequest) String() string { return proto.CompactTextString(m) } func (*NullifierStatusRequest) ProtoMessage() {} func (*NullifierStatusRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{37} + return fileDescriptor_0aa947b204e6a7c2, []int{35} } func (m *NullifierStatusRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2608,7 +2414,7 @@ func (m *NullifierStatusResponse) Reset() { *m = NullifierStatusResponse func (m *NullifierStatusResponse) String() string { return proto.CompactTextString(m) } func (*NullifierStatusResponse) ProtoMessage() {} func (*NullifierStatusResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{38} + return fileDescriptor_0aa947b204e6a7c2, []int{36} } func (m *NullifierStatusResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2653,7 +2459,7 @@ func (m *TransactionInfoByHashRequest) Reset() { *m = TransactionInfoByH func (m *TransactionInfoByHashRequest) String() string { return proto.CompactTextString(m) } func (*TransactionInfoByHashRequest) ProtoMessage() {} func (*TransactionInfoByHashRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{39} + return fileDescriptor_0aa947b204e6a7c2, []int{37} } func (m *TransactionInfoByHashRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2702,7 +2508,7 @@ func (m *TransactionInfoRequest) Reset() { *m = TransactionInfoRequest{} func (m *TransactionInfoRequest) String() string { return proto.CompactTextString(m) } func (*TransactionInfoRequest) ProtoMessage() {} func (*TransactionInfoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{40} + return fileDescriptor_0aa947b204e6a7c2, []int{38} } func (m *TransactionInfoRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2805,7 +2611,7 @@ func (m *TransactionInfo) Reset() { *m = TransactionInfo{} } func (m *TransactionInfo) String() string { return proto.CompactTextString(m) } func (*TransactionInfo) ProtoMessage() {} func (*TransactionInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{41} + return fileDescriptor_0aa947b204e6a7c2, []int{39} } func (m *TransactionInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2903,7 +2709,7 @@ func (m *TransactionInfoResponse) Reset() { *m = TransactionInfoResponse func (m *TransactionInfoResponse) String() string { return proto.CompactTextString(m) } func (*TransactionInfoResponse) ProtoMessage() {} func (*TransactionInfoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{42} + return fileDescriptor_0aa947b204e6a7c2, []int{40} } func (m *TransactionInfoResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2947,7 +2753,7 @@ func (m *TransactionInfoByHashResponse) Reset() { *m = TransactionInfoBy func (m *TransactionInfoByHashResponse) String() string { return proto.CompactTextString(m) } func (*TransactionInfoByHashResponse) ProtoMessage() {} func (*TransactionInfoByHashResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{43} + return fileDescriptor_0aa947b204e6a7c2, []int{41} } func (m *TransactionInfoByHashResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2991,7 +2797,7 @@ func (m *NotesResponse) Reset() { *m = NotesResponse{} } func (m *NotesResponse) String() string { return proto.CompactTextString(m) } func (*NotesResponse) ProtoMessage() {} func (*NotesResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{44} + return fileDescriptor_0aa947b204e6a7c2, []int{42} } func (m *NotesResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3036,7 +2842,7 @@ func (m *NotesForVotingResponse) Reset() { *m = NotesForVotingResponse{} func (m *NotesForVotingResponse) String() string { return proto.CompactTextString(m) } func (*NotesForVotingResponse) ProtoMessage() {} func (*NotesForVotingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{45} + return fileDescriptor_0aa947b204e6a7c2, []int{43} } func (m *NotesForVotingResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3097,14 +2903,14 @@ type SpendableNoteRecord struct { // The note position. Position uint64 `protobuf:"varint,7,opt,name=position,proto3" json:"position,omitempty"` // The source of the note (a tx hash or otherwise) - Source *v1alpha14.NoteSource `protobuf:"bytes,8,opt,name=source,proto3" json:"source,omitempty"` + Source *v1alpha13.NoteSource `protobuf:"bytes,8,opt,name=source,proto3" json:"source,omitempty"` } func (m *SpendableNoteRecord) Reset() { *m = SpendableNoteRecord{} } func (m *SpendableNoteRecord) String() string { return proto.CompactTextString(m) } func (*SpendableNoteRecord) ProtoMessage() {} func (*SpendableNoteRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{46} + return fileDescriptor_0aa947b204e6a7c2, []int{44} } func (m *SpendableNoteRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3201,7 +3007,7 @@ func (m *SpendableNoteRecord) GetPosition() uint64 { return 0 } -func (m *SpendableNoteRecord) GetSource() *v1alpha14.NoteSource { +func (m *SpendableNoteRecord) GetSource() *v1alpha13.NoteSource { if m != nil { return m.Source } @@ -3217,21 +3023,21 @@ func (*SpendableNoteRecord) XXX_OneofWrappers() []interface{} { type SwapRecord struct { SwapCommitment *v1alpha11.StateCommitment `protobuf:"bytes,1,opt,name=swap_commitment,json=swapCommitment,proto3" json:"swap_commitment,omitempty"` - Swap *v1alpha15.SwapPlaintext `protobuf:"bytes,2,opt,name=swap,proto3" json:"swap,omitempty"` + Swap *v1alpha14.SwapPlaintext `protobuf:"bytes,2,opt,name=swap,proto3" json:"swap,omitempty"` Position uint64 `protobuf:"varint,3,opt,name=position,proto3" json:"position,omitempty"` Nullifier *v1alpha11.Nullifier `protobuf:"bytes,4,opt,name=nullifier,proto3" json:"nullifier,omitempty"` - OutputData *v1alpha15.BatchSwapOutputData `protobuf:"bytes,5,opt,name=output_data,json=outputData,proto3" json:"output_data,omitempty"` + OutputData *v1alpha14.BatchSwapOutputData `protobuf:"bytes,5,opt,name=output_data,json=outputData,proto3" json:"output_data,omitempty"` // Types that are valid to be assigned to XHeightClaimed: // *SwapRecord_HeightClaimed XHeightClaimed isSwapRecord_XHeightClaimed `protobuf_oneof:"_height_claimed"` - Source *v1alpha14.NoteSource `protobuf:"bytes,7,opt,name=source,proto3" json:"source,omitempty"` + Source *v1alpha13.NoteSource `protobuf:"bytes,7,opt,name=source,proto3" json:"source,omitempty"` } func (m *SwapRecord) Reset() { *m = SwapRecord{} } func (m *SwapRecord) String() string { return proto.CompactTextString(m) } func (*SwapRecord) ProtoMessage() {} func (*SwapRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{47} + return fileDescriptor_0aa947b204e6a7c2, []int{45} } func (m *SwapRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -3286,7 +3092,7 @@ func (m *SwapRecord) GetSwapCommitment() *v1alpha11.StateCommitment { return nil } -func (m *SwapRecord) GetSwap() *v1alpha15.SwapPlaintext { +func (m *SwapRecord) GetSwap() *v1alpha14.SwapPlaintext { if m != nil { return m.Swap } @@ -3307,7 +3113,7 @@ func (m *SwapRecord) GetNullifier() *v1alpha11.Nullifier { return nil } -func (m *SwapRecord) GetOutputData() *v1alpha15.BatchSwapOutputData { +func (m *SwapRecord) GetOutputData() *v1alpha14.BatchSwapOutputData { if m != nil { return m.OutputData } @@ -3321,7 +3127,7 @@ func (m *SwapRecord) GetHeightClaimed() uint64 { return 0 } -func (m *SwapRecord) GetSource() *v1alpha14.NoteSource { +func (m *SwapRecord) GetSource() *v1alpha13.NoteSource { if m != nil { return m.Source } @@ -3335,157 +3141,12 @@ func (*SwapRecord) XXX_OneofWrappers() []interface{} { } } -type OwnedPositionIdsRequest struct { - // Types that are valid to be assigned to XPositionState: - // *OwnedPositionIdsRequest_PositionState - XPositionState isOwnedPositionIdsRequest_XPositionState `protobuf_oneof:"_position_state"` - // Types that are valid to be assigned to XTradingPair: - // *OwnedPositionIdsRequest_TradingPair - XTradingPair isOwnedPositionIdsRequest_XTradingPair `protobuf_oneof:"_trading_pair"` -} - -func (m *OwnedPositionIdsRequest) Reset() { *m = OwnedPositionIdsRequest{} } -func (m *OwnedPositionIdsRequest) String() string { return proto.CompactTextString(m) } -func (*OwnedPositionIdsRequest) ProtoMessage() {} -func (*OwnedPositionIdsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{48} -} -func (m *OwnedPositionIdsRequest) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *OwnedPositionIdsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_OwnedPositionIdsRequest.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *OwnedPositionIdsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_OwnedPositionIdsRequest.Merge(m, src) -} -func (m *OwnedPositionIdsRequest) XXX_Size() int { - return m.Size() -} -func (m *OwnedPositionIdsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_OwnedPositionIdsRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_OwnedPositionIdsRequest proto.InternalMessageInfo - -type isOwnedPositionIdsRequest_XPositionState interface { - isOwnedPositionIdsRequest_XPositionState() - MarshalTo([]byte) (int, error) - Size() int -} -type isOwnedPositionIdsRequest_XTradingPair interface { - isOwnedPositionIdsRequest_XTradingPair() - MarshalTo([]byte) (int, error) - Size() int -} - -type OwnedPositionIdsRequest_PositionState struct { - PositionState *v1alpha15.PositionState `protobuf:"bytes,1,opt,name=position_state,json=positionState,proto3,oneof" json:"position_state,omitempty"` -} -type OwnedPositionIdsRequest_TradingPair struct { - TradingPair *v1alpha15.TradingPair `protobuf:"bytes,2,opt,name=trading_pair,json=tradingPair,proto3,oneof" json:"trading_pair,omitempty"` -} - -func (*OwnedPositionIdsRequest_PositionState) isOwnedPositionIdsRequest_XPositionState() {} -func (*OwnedPositionIdsRequest_TradingPair) isOwnedPositionIdsRequest_XTradingPair() {} - -func (m *OwnedPositionIdsRequest) GetXPositionState() isOwnedPositionIdsRequest_XPositionState { - if m != nil { - return m.XPositionState - } - return nil -} -func (m *OwnedPositionIdsRequest) GetXTradingPair() isOwnedPositionIdsRequest_XTradingPair { - if m != nil { - return m.XTradingPair - } - return nil -} - -func (m *OwnedPositionIdsRequest) GetPositionState() *v1alpha15.PositionState { - if x, ok := m.GetXPositionState().(*OwnedPositionIdsRequest_PositionState); ok { - return x.PositionState - } - return nil -} - -func (m *OwnedPositionIdsRequest) GetTradingPair() *v1alpha15.TradingPair { - if x, ok := m.GetXTradingPair().(*OwnedPositionIdsRequest_TradingPair); ok { - return x.TradingPair - } - return nil -} - -// XXX_OneofWrappers is for the internal use of the proto package. -func (*OwnedPositionIdsRequest) XXX_OneofWrappers() []interface{} { - return []interface{}{ - (*OwnedPositionIdsRequest_PositionState)(nil), - (*OwnedPositionIdsRequest_TradingPair)(nil), - } -} - -type OwnedPositionIdsResponse struct { - PositionId *v1alpha15.PositionId `protobuf:"bytes,1,opt,name=position_id,json=positionId,proto3" json:"position_id,omitempty"` -} - -func (m *OwnedPositionIdsResponse) Reset() { *m = OwnedPositionIdsResponse{} } -func (m *OwnedPositionIdsResponse) String() string { return proto.CompactTextString(m) } -func (*OwnedPositionIdsResponse) ProtoMessage() {} -func (*OwnedPositionIdsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_0aa947b204e6a7c2, []int{49} -} -func (m *OwnedPositionIdsResponse) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *OwnedPositionIdsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_OwnedPositionIdsResponse.Marshal(b, m, deterministic) - } else { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil - } -} -func (m *OwnedPositionIdsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_OwnedPositionIdsResponse.Merge(m, src) -} -func (m *OwnedPositionIdsResponse) XXX_Size() int { - return m.Size() -} -func (m *OwnedPositionIdsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_OwnedPositionIdsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_OwnedPositionIdsResponse proto.InternalMessageInfo - -func (m *OwnedPositionIdsResponse) GetPositionId() *v1alpha15.PositionId { - if m != nil { - return m.PositionId - } - return nil -} - func init() { - proto.RegisterType((*AuthorizeAndBuildRequest)(nil), "penumbra.view.v1alpha1.AuthorizeAndBuildRequest") - proto.RegisterType((*AuthorizeAndBuildResponse)(nil), "penumbra.view.v1alpha1.AuthorizeAndBuildResponse") proto.RegisterType((*BroadcastTransactionRequest)(nil), "penumbra.view.v1alpha1.BroadcastTransactionRequest") proto.RegisterType((*BroadcastTransactionResponse)(nil), "penumbra.view.v1alpha1.BroadcastTransactionResponse") proto.RegisterType((*TransactionPlannerRequest)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest") proto.RegisterType((*TransactionPlannerRequest_Output)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.Output") proto.RegisterType((*TransactionPlannerRequest_Swap)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.Swap") - proto.RegisterType((*TransactionPlannerRequest_SwapClaim)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.SwapClaim") proto.RegisterType((*TransactionPlannerRequest_Delegate)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.Delegate") proto.RegisterType((*TransactionPlannerRequest_Undelegate)(nil), "penumbra.view.v1alpha1.TransactionPlannerRequest.Undelegate") proto.RegisterType((*TransactionPlannerResponse)(nil), "penumbra.view.v1alpha1.TransactionPlannerResponse") @@ -3495,8 +3156,8 @@ func init() { proto.RegisterType((*IndexByAddressResponse)(nil), "penumbra.view.v1alpha1.IndexByAddressResponse") proto.RegisterType((*EphemeralAddressRequest)(nil), "penumbra.view.v1alpha1.EphemeralAddressRequest") proto.RegisterType((*EphemeralAddressResponse)(nil), "penumbra.view.v1alpha1.EphemeralAddressResponse") - proto.RegisterType((*BalancesRequest)(nil), "penumbra.view.v1alpha1.BalancesRequest") - proto.RegisterType((*BalancesResponse)(nil), "penumbra.view.v1alpha1.BalancesResponse") + proto.RegisterType((*BalanceByAddressRequest)(nil), "penumbra.view.v1alpha1.BalanceByAddressRequest") + proto.RegisterType((*BalanceByAddressResponse)(nil), "penumbra.view.v1alpha1.BalanceByAddressResponse") proto.RegisterType((*ViewAuthToken)(nil), "penumbra.view.v1alpha1.ViewAuthToken") proto.RegisterType((*ViewAuthRequest)(nil), "penumbra.view.v1alpha1.ViewAuthRequest") proto.RegisterType((*ViewAuthResponse)(nil), "penumbra.view.v1alpha1.ViewAuthResponse") @@ -3531,202 +3192,181 @@ func init() { proto.RegisterType((*NotesForVotingResponse)(nil), "penumbra.view.v1alpha1.NotesForVotingResponse") proto.RegisterType((*SpendableNoteRecord)(nil), "penumbra.view.v1alpha1.SpendableNoteRecord") proto.RegisterType((*SwapRecord)(nil), "penumbra.view.v1alpha1.SwapRecord") - proto.RegisterType((*OwnedPositionIdsRequest)(nil), "penumbra.view.v1alpha1.OwnedPositionIdsRequest") - proto.RegisterType((*OwnedPositionIdsResponse)(nil), "penumbra.view.v1alpha1.OwnedPositionIdsResponse") } func init() { proto.RegisterFile("penumbra/view/v1alpha1/view.proto", fileDescriptor_0aa947b204e6a7c2) } var fileDescriptor_0aa947b204e6a7c2 = []byte{ - // 3002 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5b, 0xcd, 0x6f, 0x1b, 0xc7, - 0x15, 0xf7, 0x92, 0xfa, 0xf2, 0xa3, 0x48, 0xca, 0x63, 0x5b, 0xa2, 0x99, 0x44, 0x49, 0x37, 0xf1, - 0x47, 0x9c, 0x84, 0xb2, 0x15, 0x27, 0x4d, 0x95, 0xa4, 0x8d, 0x68, 0x45, 0x96, 0xe0, 0xd8, 0x56, - 0x57, 0xb6, 0xdc, 0xa4, 0x4a, 0x17, 0xa3, 0xdd, 0x91, 0xb4, 0x15, 0xb9, 0xbb, 0xd9, 0x1d, 0xea, - 0xa3, 0x3d, 0xa5, 0x08, 0x0a, 0x23, 0x40, 0x83, 0xa0, 0xe8, 0xa5, 0xd7, 0x1e, 0x8b, 0x5e, 0x73, - 0x2d, 0x0a, 0xf4, 0x52, 0xf4, 0x94, 0x63, 0x81, 0x02, 0x45, 0x60, 0xa3, 0x97, 0xf6, 0x5f, 0x28, - 0xd0, 0x62, 0xbe, 0x96, 0xbb, 0x4b, 0xae, 0x49, 0x4a, 0x32, 0x1c, 0xf4, 0x24, 0xce, 0xcc, 0x7b, - 0xbf, 0xf7, 0x31, 0x33, 0x6f, 0xde, 0xbc, 0x59, 0xc1, 0x77, 0x7c, 0xe2, 0xb6, 0x9a, 0x1b, 0x01, - 0x9e, 0xd9, 0x75, 0xc8, 0xde, 0xcc, 0xee, 0x55, 0xdc, 0xf0, 0xb7, 0xf1, 0x55, 0xde, 0xaa, 0xf9, - 0x81, 0x47, 0x3d, 0x34, 0xa9, 0x48, 0x6a, 0xbc, 0x53, 0x91, 0x54, 0x2f, 0x45, 0xac, 0x96, 0x17, - 0x90, 0x19, 0x6b, 0x1b, 0x3b, 0x6e, 0x1b, 0x80, 0x37, 0x05, 0x42, 0xf5, 0x72, 0x8a, 0x32, 0x38, - 0xf0, 0xa9, 0x17, 0x23, 0xe5, 0x6d, 0x49, 0xfb, 0x52, 0x92, 0xd6, 0x26, 0xfb, 0x6d, 0x42, 0x9b, - 0xec, 0x4b, 0xaa, 0x6b, 0x49, 0x2a, 0x1a, 0x60, 0x37, 0xc4, 0x16, 0x75, 0xbc, 0x98, 0x06, 0xb1, - 0xce, 0xee, 0xd8, 0xce, 0x86, 0xd5, 0xa6, 0x76, 0x36, 0x2c, 0x49, 0x95, 0xb2, 0x2b, 0xa4, 0x78, - 0x87, 0xb4, 0xe9, 0x78, 0x53, 0x50, 0xea, 0xdf, 0x68, 0x50, 0x99, 0x6f, 0xd1, 0x6d, 0x2f, 0x70, - 0x7e, 0x46, 0xe6, 0x5d, 0xbb, 0xde, 0x72, 0x1a, 0xb6, 0x41, 0x3e, 0x69, 0x91, 0x90, 0xa2, 0x9f, - 0xc0, 0x44, 0x4c, 0x03, 0xd3, 0x6f, 0x60, 0xb7, 0xa2, 0xbd, 0xa0, 0x5d, 0x2a, 0xcc, 0xbe, 0x5e, - 0x8b, 0x3c, 0xca, 0x24, 0xd4, 0xe2, 0x8a, 0x2a, 0x39, 0xb5, 0xbb, 0xed, 0xce, 0x95, 0x06, 0x76, - 0x8d, 0x32, 0x4d, 0x76, 0x20, 0x1b, 0x10, 0x96, 0xb2, 0x31, 0x97, 0x60, 0x63, 0x8a, 0x2b, 0x39, - 0x2e, 0xe1, 0x8d, 0x7e, 0x24, 0xcc, 0xc7, 0xb9, 0x17, 0x30, 0xc5, 0xc6, 0x29, 0x9c, 0xee, 0xd2, - 0x5d, 0x38, 0xd7, 0xc5, 0xc2, 0xd0, 0xf7, 0xdc, 0x90, 0xa0, 0x1f, 0x42, 0x21, 0x86, 0x2c, 0xad, - 0x9b, 0x19, 0xd0, 0x3a, 0x23, 0x8e, 0xa1, 0xff, 0x56, 0x83, 0x67, 0xea, 0x81, 0x87, 0x6d, 0x0b, - 0x87, 0x34, 0x4e, 0x25, 0xbd, 0x7a, 0xfc, 0x22, 0xd1, 0x45, 0x28, 0xe3, 0x3d, 0xec, 0x50, 0xd3, - 0x26, 0x94, 0x08, 0x58, 0xe6, 0xc5, 0x31, 0xa3, 0xc4, 0xbb, 0x17, 0x54, 0xaf, 0xfe, 0xa9, 0x06, - 0xcf, 0x76, 0xd7, 0x4d, 0xfa, 0xe3, 0x4d, 0xc8, 0x39, 0xb6, 0xd4, 0xe9, 0x42, 0x3f, 0x3a, 0x2d, - 0xdb, 0x46, 0xce, 0xb1, 0xd1, 0xcb, 0x30, 0x11, 0xc9, 0x36, 0xb7, 0x89, 0xb3, 0xb5, 0x4d, 0xb9, - 0x0a, 0x43, 0x46, 0x39, 0xea, 0x5f, 0xe2, 0xdd, 0xfa, 0x97, 0xe3, 0x70, 0x2e, 0xb5, 0x34, 0x5c, - 0x12, 0x28, 0xef, 0xbc, 0x08, 0x45, 0xb2, 0xef, 0x3b, 0xc1, 0x81, 0x42, 0xd1, 0x38, 0xca, 0xb8, - 0xe8, 0x14, 0x10, 0xe8, 0x1a, 0xe4, 0x37, 0x09, 0x91, 0x2b, 0x45, 0x4f, 0xa9, 0x29, 0xf7, 0x62, - 0xa4, 0xe1, 0x22, 0x21, 0x06, 0x23, 0x47, 0xef, 0xc3, 0x50, 0x93, 0x34, 0xbd, 0x4a, 0x9e, 0xb3, - 0x5d, 0xed, 0xc7, 0xba, 0x5b, 0xa4, 0xe9, 0xad, 0x34, 0xb0, 0xe3, 0x52, 0xb2, 0x4f, 0x0d, 0xce, - 0x8e, 0xd6, 0x61, 0x02, 0x5b, 0x96, 0xd7, 0x72, 0xa9, 0xb9, 0x15, 0x78, 0x2d, 0xdf, 0x74, 0xec, - 0x4a, 0x89, 0x43, 0xbe, 0xd6, 0x43, 0x93, 0x79, 0xc1, 0x76, 0x83, 0x71, 0x2d, 0xdb, 0x4b, 0x27, - 0x8c, 0x12, 0x4e, 0xf4, 0x3c, 0xd0, 0x34, 0x64, 0xc0, 0xa8, 0xd7, 0xa2, 0x7e, 0x8b, 0x86, 0x95, - 0x33, 0x2f, 0xe4, 0x2f, 0x15, 0x66, 0xdf, 0xaa, 0x75, 0x0f, 0x5e, 0xb5, 0x4c, 0x1f, 0xd6, 0xee, - 0x70, 0x00, 0x43, 0x01, 0xa1, 0x0f, 0x60, 0x38, 0xdc, 0xc3, 0x7e, 0x58, 0x99, 0xe6, 0x88, 0x6f, - 0x0e, 0x8e, 0xb8, 0xba, 0x87, 0x7d, 0x43, 0x80, 0xa0, 0x75, 0x28, 0xb0, 0x1f, 0xa6, 0xd5, 0xc0, - 0x4e, 0x33, 0xac, 0x3c, 0xcf, 0x31, 0xdf, 0x3e, 0x1c, 0xe6, 0x75, 0x86, 0x61, 0x40, 0xa8, 0x7e, - 0x72, 0x74, 0x9b, 0x34, 0xc8, 0x16, 0xdf, 0xbf, 0x61, 0xe5, 0x12, 0x47, 0x9f, 0x1b, 0x1c, 0x7d, - 0x41, 0x80, 0x10, 0x23, 0x0e, 0x87, 0x36, 0xa0, 0xd8, 0x72, 0xe3, 0xf8, 0xb3, 0x1c, 0xff, 0x9d, - 0xc1, 0xf1, 0xef, 0x29, 0x18, 0x62, 0x24, 0x21, 0xd1, 0x22, 0x14, 0x9c, 0x0d, 0xcb, 0x14, 0x5c, - 0x61, 0xe5, 0x1d, 0x2e, 0xe1, 0x7c, 0x6a, 0x69, 0xb0, 0x58, 0xdd, 0xde, 0x43, 0x1b, 0xd6, 0xbc, - 0xd8, 0x86, 0xe0, 0xa8, 0x9f, 0x61, 0xf5, 0x97, 0x1a, 0x8c, 0x88, 0x99, 0x44, 0x73, 0x30, 0xbc, - 0x8b, 0x1b, 0x2d, 0x22, 0x37, 0xe6, 0x4b, 0x3d, 0xd6, 0xd9, 0x1a, 0xa3, 0x35, 0x04, 0x0b, 0x7a, - 0x0f, 0x46, 0xb1, 0x6d, 0x07, 0x24, 0x0c, 0xe5, 0x7e, 0xb9, 0xd0, 0x6b, 0x95, 0x0a, 0x6a, 0x43, - 0xb1, 0x55, 0xff, 0xac, 0xc1, 0x10, 0x9b, 0xac, 0x23, 0xa9, 0xb1, 0x0c, 0xe3, 0x14, 0x07, 0x5b, - 0x84, 0x9a, 0x38, 0x0c, 0x09, 0xed, 0x57, 0x17, 0x46, 0xbb, 0x6c, 0x1b, 0x05, 0xc1, 0xcb, 0x9b, - 0x6a, 0xf7, 0xe7, 0x07, 0xda, 0xfd, 0x55, 0x1b, 0x4e, 0x46, 0x2b, 0x0e, 0xdd, 0x87, 0xb2, 0x58, - 0xc3, 0x5e, 0xb3, 0xe9, 0xd0, 0x26, 0x71, 0xa9, 0xb4, 0xa9, 0xd6, 0x03, 0x6e, 0x95, 0x62, 0x4a, - 0xae, 0x47, 0x5c, 0x46, 0x89, 0x2f, 0xdd, 0xa8, 0x5d, 0xfd, 0x42, 0x83, 0x31, 0xb5, 0xf4, 0xd0, - 0xbb, 0x30, 0x82, 0x9b, 0x6c, 0x7f, 0x4b, 0xf0, 0xf3, 0xbd, 0xac, 0xe5, 0xc4, 0x86, 0x64, 0x42, - 0xd7, 0xe1, 0x64, 0x80, 0x29, 0x11, 0xa7, 0x62, 0xbe, 0xab, 0xbf, 0xc4, 0x51, 0x1e, 0x01, 0x18, - 0x98, 0x12, 0x7e, 0x0c, 0x8e, 0x05, 0xf2, 0x57, 0xf5, 0x57, 0x1a, 0x40, 0x7b, 0xad, 0x1e, 0x69, - 0x0a, 0x13, 0xfa, 0xe4, 0x0e, 0xa7, 0x4f, 0xfd, 0x34, 0x9c, 0x32, 0xd3, 0xe1, 0x53, 0x27, 0x50, - 0xed, 0xb6, 0xd3, 0xe4, 0x99, 0x74, 0x03, 0x86, 0x8e, 0x9a, 0x7a, 0x70, 0x00, 0xfd, 0xd7, 0x1a, - 0x9c, 0x95, 0xab, 0xbb, 0x7e, 0xb0, 0xec, 0xda, 0x64, 0x5f, 0x9d, 0x3a, 0x2b, 0x50, 0x94, 0xab, - 0xdd, 0x74, 0x58, 0xbf, 0x94, 0xf5, 0x4a, 0x7f, 0x5b, 0x45, 0x40, 0x8d, 0xe3, 0x58, 0x8b, 0x1d, - 0xc9, 0xb6, 0x13, 0xfa, 0x0d, 0x7c, 0x60, 0x5a, 0x9e, 0xbb, 0xe9, 0x04, 0x4d, 0x75, 0x24, 0xcb, - 0xee, 0xeb, 0xa2, 0x57, 0xff, 0x08, 0x26, 0xd3, 0x3a, 0x49, 0xbb, 0x63, 0x3b, 0x57, 0x3b, 0xd4, - 0xce, 0xd5, 0x3f, 0x84, 0xb3, 0x1c, 0xb2, 0x7e, 0xa0, 0x86, 0xa4, 0xbd, 0x47, 0x87, 0xfe, 0x54, - 0x83, 0xc9, 0x34, 0xb6, 0xd4, 0xfb, 0xde, 0xd1, 0x9d, 0xb9, 0x74, 0x22, 0xe9, 0xce, 0x07, 0x9a, - 0x56, 0x9f, 0x80, 0x92, 0x99, 0xc0, 0xd5, 0x7f, 0xa3, 0xc1, 0xd4, 0xfb, 0xfe, 0x36, 0x69, 0x92, - 0x00, 0x37, 0x52, 0x16, 0x3e, 0xc5, 0x19, 0x5d, 0x87, 0x4a, 0xa7, 0x56, 0xc7, 0x36, 0xa7, 0x5f, - 0x69, 0x50, 0xae, 0xe3, 0x06, 0x76, 0x2d, 0x12, 0x19, 0x6b, 0x80, 0xca, 0x24, 0xcc, 0x4d, 0xa7, - 0x41, 0x49, 0x70, 0x18, 0x6b, 0x8b, 0x12, 0x62, 0x91, 0x23, 0xa0, 0xdb, 0x50, 0xe6, 0x91, 0xda, - 0x74, 0x6c, 0x05, 0x3a, 0x58, 0xcc, 0x2e, 0x62, 0xf1, 0x43, 0xe0, 0xb1, 0xb4, 0x78, 0xa2, 0xad, - 0xb7, 0x74, 0xc7, 0xfb, 0x30, 0x2a, 0xa5, 0x1e, 0x46, 0x63, 0xc5, 0x8b, 0xbe, 0x0f, 0xa3, 0x1b, - 0x02, 0x5a, 0xea, 0xd8, 0x5f, 0x5c, 0x53, 0x4c, 0xfa, 0x79, 0x28, 0xae, 0x39, 0x64, 0x8f, 0x5d, - 0x13, 0xee, 0x7a, 0x3b, 0xc4, 0x45, 0x67, 0x60, 0xd8, 0x61, 0x31, 0x88, 0x6b, 0x35, 0x6e, 0x88, - 0x86, 0x6e, 0x40, 0x59, 0x91, 0x29, 0xcf, 0xff, 0x00, 0xf2, 0x9b, 0xbb, 0x3b, 0x52, 0xf9, 0x5e, - 0xf9, 0xdf, 0x62, 0xab, 0xd1, 0x60, 0x00, 0x8e, 0xbb, 0x75, 0x93, 0x1c, 0x18, 0x8c, 0x53, 0xbf, - 0x03, 0x13, 0x6d, 0x4c, 0xe9, 0x95, 0xb7, 0x61, 0x98, 0x32, 0x35, 0x3a, 0x8f, 0x8d, 0x64, 0x76, - 0x92, 0xd0, 0xd9, 0x10, 0x3c, 0xfa, 0x2f, 0x34, 0x28, 0xb2, 0x53, 0xaa, 0x15, 0xad, 0x8e, 0x27, - 0x9a, 0xb0, 0x76, 0x0f, 0xe8, 0x06, 0x94, 0x94, 0x0e, 0xd2, 0xa6, 0xe7, 0xa1, 0x10, 0x1e, 0xb8, - 0x56, 0x32, 0xab, 0x07, 0xd6, 0x25, 0x73, 0xfa, 0xe7, 0xa1, 0x60, 0x61, 0x6a, 0x6d, 0x3b, 0xee, - 0x96, 0xd9, 0xf2, 0xe5, 0xd6, 0x02, 0xd5, 0x75, 0xcf, 0xd7, 0x1f, 0x68, 0x70, 0x5a, 0x80, 0xae, - 0xd2, 0x80, 0xe0, 0xe6, 0x53, 0x34, 0x2f, 0x80, 0x33, 0x49, 0x4d, 0xa4, 0x91, 0xdf, 0x83, 0x73, - 0x0d, 0x4c, 0x49, 0x48, 0xcd, 0x1d, 0xd7, 0xdb, 0x73, 0xcd, 0x8d, 0x86, 0x67, 0xed, 0x24, 0x4d, - 0x9e, 0x14, 0x04, 0x37, 0xd9, 0x78, 0x9d, 0x0d, 0xb7, 0xcd, 0x8f, 0xfb, 0x27, 0x97, 0xf6, 0x8f, - 0xfe, 0x79, 0x1e, 0xc6, 0x6f, 0x7b, 0xb4, 0xbd, 0xe9, 0x5f, 0x84, 0xa2, 0xe3, 0x5a, 0x8d, 0x96, - 0x4d, 0xcc, 0xd0, 0x67, 0x19, 0x8c, 0x70, 0xd9, 0xb8, 0xec, 0x5c, 0x65, 0x7d, 0x68, 0x1e, 0xc6, - 0xd4, 0x2e, 0xce, 0x48, 0x21, 0xb2, 0xb6, 0xef, 0xa8, 0xdc, 0xbe, 0x9d, 0x91, 0x74, 0xe8, 0xa8, - 0x91, 0xf4, 0x16, 0x94, 0x45, 0x8a, 0x63, 0x52, 0x8f, 0xeb, 0x6e, 0x57, 0x46, 0x06, 0x49, 0x90, - 0x8a, 0x82, 0xfb, 0xae, 0xc7, 0x6c, 0xb4, 0x9f, 0xc6, 0x02, 0x78, 0x90, 0x83, 0xb3, 0x7c, 0x32, - 0x16, 0xbd, 0x60, 0xcd, 0xa3, 0x8e, 0xbb, 0xa5, 0x66, 0xe5, 0x32, 0x9c, 0xda, 0xf5, 0x28, 0xde, - 0x68, 0x10, 0x13, 0xd3, 0xe4, 0xd4, 0x97, 0xe5, 0xc0, 0x3c, 0x95, 0x73, 0xde, 0xe1, 0xd9, 0xfc, - 0x51, 0x3d, 0xfb, 0x14, 0x5c, 0xf1, 0xc7, 0x1c, 0x94, 0xee, 0x3b, 0xd4, 0x8d, 0x9d, 0xbd, 0x1f, - 0xc2, 0x84, 0xeb, 0x51, 0x12, 0xcb, 0xae, 0xd9, 0xdd, 0x23, 0x7f, 0x88, 0xf4, 0xba, 0xcc, 0x70, - 0xda, 0xed, 0xb0, 0x6b, 0x49, 0x2a, 0x7f, 0x8c, 0x25, 0xa9, 0xa7, 0xe0, 0x40, 0x02, 0xe5, 0xc8, - 0x7f, 0x32, 0x8e, 0x18, 0x30, 0xbe, 0x27, 0xba, 0x44, 0xb2, 0x3d, 0x40, 0x8d, 0x48, 0x42, 0xf1, - 0xac, 0xbb, 0xb0, 0xd7, 0x6e, 0xe8, 0xff, 0xd0, 0x60, 0x52, 0x0e, 0xfe, 0x7f, 0xd6, 0xf9, 0x1a, - 0x30, 0xd5, 0x61, 0xdf, 0x93, 0xab, 0xf2, 0xfd, 0x21, 0x0f, 0x45, 0x1e, 0x2a, 0xa3, 0x55, 0x5f, - 0x85, 0x31, 0x91, 0x27, 0x11, 0x51, 0x40, 0x1b, 0x33, 0xa2, 0x36, 0xfa, 0x29, 0x4c, 0xc7, 0x62, - 0xb5, 0xe5, 0x6c, 0x3a, 0x96, 0x69, 0x13, 0xd7, 0x6b, 0x3a, 0xae, 0x2c, 0x44, 0x88, 0xfd, 0xd1, - 0x2b, 0x6f, 0x59, 0x60, 0x3c, 0xc6, 0xb3, 0xed, 0x10, 0xcf, 0xa1, 0x16, 0xe2, 0x48, 0x68, 0x0e, - 0xce, 0x29, 0x59, 0xed, 0xb2, 0x84, 0xc9, 0x93, 0x83, 0x90, 0xef, 0x95, 0x31, 0x63, 0x4a, 0x12, - 0x2c, 0x44, 0xe3, 0x3c, 0x85, 0x08, 0xd1, 0x5b, 0x50, 0x51, 0xbc, 0x2d, 0x77, 0xc3, 0x73, 0x6d, - 0x76, 0x1a, 0x4b, 0xd6, 0x21, 0xce, 0x3a, 0x29, 0xc7, 0xef, 0xa9, 0x61, 0xc9, 0x79, 0x01, 0xca, - 0x8a, 0xb3, 0xe1, 0x9b, 0xee, 0x26, 0x0d, 0x2b, 0xc3, 0x9c, 0x41, 0x1d, 0x52, 0x1f, 0xf8, 0xb7, - 0x37, 0x69, 0x88, 0x66, 0xe1, 0xac, 0xa2, 0xf3, 0x03, 0xcf, 0xf7, 0x42, 0xdc, 0x10, 0xd4, 0x23, - 0x9c, 0xfa, 0xb4, 0x1c, 0x5c, 0x91, 0x63, 0x9c, 0x67, 0x1e, 0x9e, 0x53, 0x3c, 0xbb, 0x3c, 0xd8, - 0x9a, 0x01, 0xb1, 0x88, 0xe3, 0x53, 0xa5, 0xda, 0x28, 0xe7, 0xad, 0x4a, 0x22, 0x15, 0x90, 0x39, - 0x89, 0x50, 0x4f, 0x27, 0x50, 0x52, 0xb3, 0x25, 0xd7, 0xc4, 0x2a, 0x94, 0xf8, 0x0c, 0x98, 0x4d, - 0x42, 0x71, 0x6c, 0x41, 0xbe, 0xda, 0xcf, 0x14, 0xdc, 0x92, 0x3c, 0x46, 0xd1, 0x8e, 0x37, 0xf5, - 0x0a, 0x4c, 0x5e, 0xdf, 0xc6, 0x8e, 0xbb, 0x82, 0x03, 0xdc, 0x24, 0x94, 0x04, 0x6a, 0x75, 0xe8, - 0xdb, 0x30, 0xd5, 0x31, 0x22, 0x35, 0xb9, 0x05, 0xe0, 0x47, 0xbd, 0x59, 0xa9, 0x24, 0x7f, 0x8b, - 0x88, 0x94, 0x48, 0x43, 0xc5, 0x00, 0xf4, 0x49, 0x38, 0xb3, 0x78, 0x6b, 0xa1, 0x53, 0x03, 0x1b, - 0xce, 0xa6, 0xfa, 0xa5, 0xfc, 0x9b, 0x5d, 0xe4, 0xbf, 0xf2, 0x78, 0xf9, 0x8b, 0x4d, 0x3b, 0x43, - 0xfa, 0x17, 0x39, 0x98, 0x62, 0x27, 0x63, 0xfd, 0x20, 0x16, 0xc6, 0xe5, 0x0e, 0xb9, 0x0f, 0xe5, - 0xd4, 0xb9, 0x20, 0x7d, 0x3e, 0x70, 0xd5, 0x25, 0x79, 0x2c, 0x74, 0xab, 0x7f, 0xe7, 0xbb, 0xd5, - 0xbf, 0x9f, 0x46, 0x78, 0x77, 0xa1, 0xd2, 0xe9, 0x8f, 0x28, 0xce, 0x97, 0x78, 0xfa, 0xc3, 0xd3, - 0x05, 0x66, 0x53, 0xa7, 0xf7, 0x93, 0x19, 0xff, 0xaa, 0xa2, 0x66, 0x90, 0x06, 0xb1, 0xbc, 0xc0, - 0x36, 0x8a, 0x61, 0xbc, 0x93, 0x4f, 0xc0, 0xea, 0x1e, 0xf6, 0x33, 0x26, 0x20, 0x5d, 0xf6, 0xca, - 0x1d, 0x47, 0xd9, 0xeb, 0x5b, 0x3d, 0x01, 0x06, 0x54, 0x3a, 0xfd, 0x11, 0x3d, 0x77, 0x0c, 0x31, - 0x4b, 0xa4, 0xdb, 0xf5, 0x4c, 0xb7, 0xef, 0x61, 0x5f, 0x7a, 0x9b, 0xd3, 0xeb, 0xff, 0xd1, 0x60, - 0xf2, 0x76, 0xab, 0xd1, 0x70, 0x36, 0x1d, 0x12, 0x24, 0x6f, 0x5b, 0x8b, 0x70, 0xd2, 0x55, 0x23, - 0xd2, 0xbb, 0x97, 0x7a, 0x98, 0x16, 0x21, 0x19, 0x6d, 0xd6, 0x6f, 0xb5, 0x4b, 0x67, 0x60, 0xaa, - 0xc3, 0x7a, 0xe9, 0xd1, 0x33, 0x30, 0x2c, 0x6e, 0x23, 0xe2, 0x08, 0x14, 0x0d, 0x7d, 0x0d, 0x9e, - 0x8d, 0x9d, 0xa4, 0xcb, 0xee, 0xa6, 0x57, 0x3f, 0x58, 0xc2, 0x61, 0x74, 0x8d, 0x16, 0xcf, 0x4e, - 0xb9, 0x41, 0x9f, 0x9d, 0xf4, 0xcf, 0x34, 0x98, 0x4c, 0x01, 0x2b, 0xc8, 0x0b, 0x30, 0x1e, 0x52, - 0x1c, 0x24, 0x73, 0xf0, 0xa5, 0x13, 0x46, 0x81, 0xf7, 0x8a, 0x0c, 0xfc, 0x81, 0xa6, 0x21, 0x1d, - 0x80, 0xb8, 0x76, 0xe2, 0xde, 0xb5, 0xa4, 0x19, 0x27, 0x89, 0x6b, 0x47, 0x34, 0xf5, 0x32, 0x14, - 0xcd, 0x38, 0x58, 0xbd, 0x08, 0x05, 0xb3, 0xcd, 0xa5, 0xff, 0x3b, 0x07, 0xe5, 0x94, 0x1a, 0xe8, - 0x19, 0x18, 0x49, 0x49, 0x96, 0x6d, 0x26, 0xf4, 0x90, 0xf6, 0xa6, 0x13, 0x99, 0xfc, 0x31, 0xbc, - 0x1d, 0xae, 0x43, 0xc1, 0x27, 0x01, 0xcb, 0x4a, 0xa8, 0xb3, 0x4b, 0xe4, 0xe5, 0x6e, 0x6e, 0xd0, - 0xbc, 0xaf, 0x8d, 0x60, 0xc4, 0xe1, 0xd0, 0x0d, 0x18, 0x62, 0x5b, 0x89, 0xe7, 0x02, 0x83, 0xa7, - 0x93, 0x6b, 0x0e, 0xd9, 0x33, 0x38, 0x40, 0xfd, 0x24, 0x8c, 0x2a, 0x6f, 0xff, 0x18, 0xa6, 0x3a, - 0xe6, 0xbc, 0x5d, 0x5e, 0xa3, 0xfb, 0xa6, 0xe3, 0x6e, 0x7a, 0x72, 0x4b, 0x5f, 0xec, 0xe3, 0x65, - 0x87, 0x23, 0x8c, 0xd0, 0x7d, 0xf6, 0x57, 0xc7, 0xf0, 0x5c, 0xc6, 0x4a, 0x3d, 0x36, 0x11, 0x1f, - 0x43, 0x51, 0x5e, 0xe4, 0x25, 0xe4, 0x07, 0x50, 0xe0, 0xe7, 0x62, 0xc0, 0x43, 0xcc, 0x61, 0xce, - 0x00, 0x70, 0xa3, 0xdf, 0xfa, 0x57, 0x2c, 0x36, 0xa5, 0xee, 0xa6, 0x4f, 0x42, 0x10, 0xba, 0x05, - 0xe3, 0x8e, 0x4d, 0x5c, 0xea, 0xd0, 0x03, 0x73, 0x87, 0x1c, 0xc8, 0xe5, 0x7c, 0xb9, 0x47, 0xd0, - 0x59, 0x96, 0x2c, 0x37, 0xc9, 0x81, 0x51, 0x70, 0xda, 0x0d, 0xfd, 0xbf, 0x79, 0x38, 0xdd, 0x45, - 0x64, 0xb7, 0xac, 0x41, 0x3b, 0x96, 0xac, 0xe1, 0xbb, 0x30, 0xc4, 0xcf, 0x5c, 0xa1, 0xf7, 0x8b, - 0xbd, 0x82, 0x34, 0xd3, 0x88, 0x33, 0x3c, 0x81, 0x7b, 0x7b, 0xe2, 0xd0, 0x18, 0x3a, 0xfc, 0xa1, - 0x71, 0x1e, 0x4a, 0x62, 0x93, 0x98, 0x56, 0x40, 0x30, 0x25, 0x36, 0xdf, 0x78, 0x43, 0x46, 0x51, - 0xf4, 0x5e, 0x17, 0x9d, 0x2c, 0x36, 0x4a, 0x32, 0x11, 0xab, 0x47, 0x54, 0x6c, 0x14, 0xbd, 0xbc, - 0x74, 0xc4, 0xc2, 0x54, 0x15, 0xc6, 0x7c, 0x2f, 0x74, 0x78, 0xac, 0x19, 0xe5, 0x40, 0x51, 0x1b, - 0xbd, 0x07, 0x23, 0xa1, 0xd7, 0x0a, 0x2c, 0x52, 0x19, 0xeb, 0xae, 0x6f, 0x32, 0x63, 0x64, 0xee, - 0x5b, 0xe5, 0xf4, 0x86, 0xe4, 0xe3, 0x51, 0x35, 0xae, 0x86, 0xfe, 0xf7, 0x3c, 0x40, 0xfb, 0xa8, - 0x7d, 0x62, 0x8f, 0x74, 0xe8, 0x5d, 0x79, 0xea, 0x8b, 0x89, 0x7f, 0x39, 0x85, 0x66, 0x93, 0xfd, - 0xe4, 0xc9, 0x1f, 0xfb, 0x00, 0x80, 0xb1, 0x25, 0xbc, 0x92, 0x4f, 0x79, 0xe5, 0xb8, 0x26, 0x72, - 0x05, 0x0a, 0xe2, 0xf5, 0x5e, 0xdc, 0x95, 0x87, 0xbb, 0x06, 0xfa, 0x84, 0xa6, 0x75, 0x4c, 0xad, - 0x6d, 0xa6, 0xae, 0x78, 0x33, 0xe6, 0xb7, 0x64, 0xf0, 0xa2, 0xdf, 0xe8, 0x72, 0x7b, 0x69, 0x34, - 0xb0, 0xd3, 0x24, 0x76, 0x34, 0xeb, 0x6a, 0x71, 0x88, 0x6e, 0x36, 0xef, 0xed, 0xb9, 0x1d, 0x3d, - 0xe4, 0xdc, 0x9e, 0x82, 0xb2, 0x99, 0x14, 0xa7, 0xff, 0x53, 0x83, 0xa9, 0x3b, 0x7b, 0x2e, 0xb1, - 0x57, 0xa4, 0xb3, 0x96, 0xed, 0x28, 0x69, 0xba, 0x07, 0x25, 0xe5, 0x42, 0x76, 0xd0, 0x46, 0x89, - 0xf0, 0x63, 0xe7, 0x46, 0xe1, 0xf0, 0xe9, 0x66, 0x76, 0xf8, 0xf1, 0x0e, 0x66, 0xc7, 0x1d, 0x18, - 0xa7, 0x01, 0xe6, 0x97, 0x58, 0x1f, 0x3b, 0x2a, 0x1d, 0xbb, 0xf8, 0x38, 0xd0, 0xbb, 0x82, 0x7e, - 0x05, 0x3b, 0xc1, 0x92, 0xc6, 0x4f, 0x4a, 0xd5, 0x64, 0x89, 0x00, 0x33, 0x2b, 0xa9, 0x28, 0x5f, - 0xc5, 0x71, 0x21, 0xba, 0x05, 0x95, 0x4e, 0x33, 0xa3, 0xa7, 0xcc, 0x42, 0xc4, 0x9e, 0xf9, 0x9d, - 0x4d, 0x57, 0x23, 0x97, 0x6d, 0x03, 0xfc, 0xe8, 0xf7, 0xec, 0x9f, 0x4e, 0xc3, 0x69, 0x76, 0x3a, - 0xae, 0x04, 0x1e, 0xf5, 0x2c, 0xaf, 0xb1, 0x4a, 0x82, 0x5d, 0xc7, 0x22, 0xe8, 0x3e, 0x8c, 0x88, - 0x84, 0x0c, 0x65, 0xbe, 0x1a, 0x24, 0xd2, 0xd5, 0xea, 0x85, 0x5e, 0x64, 0x52, 0xf3, 0x1d, 0x18, - 0x8f, 0x97, 0xbc, 0xd1, 0x2b, 0x8f, 0xe7, 0x4b, 0x94, 0xe8, 0xab, 0xaf, 0xf6, 0x47, 0x2c, 0x44, - 0x5d, 0xd1, 0xd0, 0x1a, 0x0c, 0xf3, 0x13, 0x0c, 0xbd, 0x94, 0xc5, 0x18, 0xaf, 0x84, 0x57, 0xcf, - 0xf7, 0xa0, 0x8a, 0x70, 0x3f, 0x81, 0x52, 0xf2, 0x64, 0x44, 0xaf, 0x3d, 0x96, 0x35, 0x5d, 0xdd, - 0xad, 0xd6, 0xfa, 0x25, 0x8f, 0x44, 0x7e, 0x04, 0xa3, 0xb2, 0x2a, 0x85, 0x32, 0x5d, 0x9d, 0x2c, - 0x9f, 0x56, 0x2f, 0xf6, 0xa4, 0x93, 0x73, 0x12, 0x44, 0x95, 0x43, 0x55, 0xf1, 0x42, 0xb5, 0x1e, - 0xbc, 0xa9, 0xd2, 0x5f, 0x75, 0xa6, 0x6f, 0x7a, 0x29, 0xf3, 0x43, 0x18, 0x11, 0x85, 0x94, 0xec, - 0x05, 0x96, 0x28, 0x8b, 0x65, 0x2f, 0xb0, 0x64, 0x3d, 0xe6, 0x8a, 0xc6, 0xcc, 0x49, 0xd5, 0x35, - 0xb2, 0xcd, 0xe9, 0x5e, 0x65, 0xc9, 0x36, 0x27, 0xab, 0xf6, 0xd2, 0x80, 0x62, 0xa2, 0x28, 0x82, - 0x32, 0x97, 0x6a, 0xb7, 0x9a, 0x4a, 0xf5, 0xb5, 0x3e, 0xa9, 0xa5, 0x34, 0x0f, 0x4a, 0xc9, 0xb7, - 0xfe, 0xec, 0xf5, 0xd7, 0xf5, 0x3b, 0x85, 0xec, 0xf5, 0x97, 0xf1, 0x09, 0x81, 0x07, 0xa5, 0xe4, - 0x23, 0x7d, 0xb6, 0xc0, 0xae, 0x1f, 0x0a, 0x64, 0x0b, 0xcc, 0x78, 0xfb, 0x6f, 0xc1, 0x44, 0xfa, - 0xed, 0x1b, 0x65, 0x4e, 0x4a, 0xc6, 0xdb, 0x7d, 0xf5, 0x4a, 0xff, 0x0c, 0x52, 0xac, 0x09, 0x63, - 0xea, 0x6d, 0x19, 0x65, 0x6e, 0x9f, 0xd4, 0xab, 0x79, 0xf5, 0x52, 0x6f, 0xc2, 0x68, 0x6d, 0xb6, - 0x60, 0x22, 0x5d, 0xc5, 0xc9, 0xb6, 0x2b, 0xa3, 0xfe, 0x95, 0x6d, 0x57, 0x66, 0x81, 0xa8, 0x05, - 0x13, 0xe9, 0xda, 0x45, 0xb6, 0xd8, 0x8c, 0xaa, 0x4f, 0xb6, 0xd8, 0xcc, 0xb2, 0x48, 0x00, 0xe5, - 0xd4, 0xfd, 0x3e, 0x7b, 0x27, 0x76, 0x2f, 0x83, 0x64, 0xef, 0xc4, 0xac, 0xc2, 0xc1, 0x67, 0x1a, - 0x9c, 0xed, 0x7a, 0xf3, 0x42, 0xd7, 0xfa, 0xbc, 0x60, 0x25, 0x4a, 0x0a, 0xd5, 0x37, 0x06, 0xe4, - 0x92, 0x6a, 0xd0, 0xce, 0x9b, 0x7c, 0xad, 0xdf, 0x0b, 0x5e, 0x2f, 0xd3, 0x33, 0x6e, 0xad, 0x57, - 0x34, 0xf4, 0x73, 0x40, 0x9d, 0x1f, 0x40, 0xa1, 0xab, 0x03, 0x7f, 0x96, 0x58, 0x9d, 0x1d, 0x84, - 0x45, 0x9a, 0xfc, 0xa9, 0x06, 0x67, 0xba, 0x7d, 0x14, 0x8c, 0x5e, 0xcf, 0xdc, 0x20, 0xd9, 0x9f, - 0x37, 0x57, 0xaf, 0x0d, 0xc6, 0x24, 0x75, 0xd8, 0x83, 0x89, 0x74, 0xd2, 0x94, 0xbd, 0xd0, 0x33, - 0xb2, 0xc8, 0xec, 0x85, 0x9e, 0x95, 0x8f, 0x5d, 0xd1, 0xd0, 0x3e, 0x9c, 0xea, 0xf8, 0x3a, 0x1c, - 0x65, 0x02, 0x65, 0x7d, 0x2a, 0x5f, 0xbd, 0x3a, 0x00, 0x87, 0x90, 0x3d, 0xeb, 0xb7, 0xbf, 0x26, - 0x51, 0xd9, 0xdb, 0xc7, 0x30, 0xa6, 0xba, 0xb2, 0xc3, 0x58, 0xea, 0x13, 0x94, 0xec, 0x30, 0x96, - 0xfe, 0xae, 0xa4, 0xfe, 0x79, 0xee, 0x2f, 0x0f, 0xa7, 0xb5, 0xaf, 0x1f, 0x4e, 0x6b, 0xdf, 0x3c, - 0x9c, 0xd6, 0xbe, 0x7c, 0x34, 0x7d, 0xe2, 0xeb, 0x47, 0xd3, 0x27, 0xfe, 0xf6, 0x68, 0xfa, 0x04, - 0x54, 0x2d, 0xaf, 0x99, 0x81, 0x53, 0x3f, 0x19, 0x25, 0x9a, 0x2b, 0xda, 0x47, 0x77, 0xb6, 0x1c, - 0xba, 0xdd, 0xda, 0xa8, 0x59, 0x5e, 0x73, 0xc6, 0xf2, 0xc2, 0xa6, 0x17, 0xce, 0x04, 0xa4, 0x81, - 0x0f, 0x48, 0x30, 0xb3, 0x3b, 0x1b, 0xfd, 0xe4, 0x17, 0x84, 0x70, 0xa6, 0xfb, 0x7f, 0x66, 0xbc, - 0xcd, 0x5a, 0xaa, 0xf1, 0xbb, 0x5c, 0x7e, 0x65, 0xed, 0x47, 0xbf, 0xcf, 0x4d, 0xae, 0x28, 0xe1, - 0x4c, 0x5a, 0x6d, 0x4d, 0x0e, 0xff, 0xb5, 0x3d, 0xb0, 0xce, 0x06, 0xd6, 0xd5, 0xc0, 0xc3, 0x9c, - 0xde, 0x7d, 0x60, 0xfd, 0xc6, 0x4a, 0x5d, 0xbd, 0xc7, 0xfc, 0x2b, 0x57, 0x51, 0x44, 0x73, 0x73, - 0x8c, 0x6a, 0x6e, 0x4e, 0x91, 0x6d, 0x8c, 0xf0, 0x7f, 0x80, 0x78, 0xfd, 0x7f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x8e, 0xb9, 0xe6, 0x1e, 0x3f, 0x32, 0x00, 0x00, + // 2695 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcd, 0x73, 0x23, 0x47, + 0x15, 0xf7, 0x48, 0xfe, 0x7c, 0xb2, 0x24, 0x6f, 0xaf, 0x3f, 0x14, 0x25, 0x71, 0x96, 0xc9, 0x7e, + 0x38, 0x1b, 0x22, 0x6f, 0x9c, 0x4d, 0x08, 0x4e, 0x52, 0xc4, 0x8a, 0xf1, 0xda, 0x95, 0xdd, 0xc4, + 0x8c, 0xb3, 0x0e, 0x49, 0x1c, 0xa6, 0xda, 0x33, 0x6d, 0x6b, 0xf0, 0x68, 0x66, 0x32, 0xd3, 0xb2, + 0x6c, 0x38, 0x85, 0x4a, 0x51, 0x5b, 0x39, 0x50, 0xdc, 0x80, 0x2b, 0x47, 0x8a, 0x2b, 0x57, 0x2e, + 0x5c, 0x28, 0x4e, 0x39, 0x52, 0x45, 0x41, 0x51, 0x9b, 0xe2, 0x02, 0xff, 0x02, 0x55, 0x50, 0xfd, + 0x31, 0xa3, 0x99, 0x91, 0x66, 0x25, 0xd9, 0xde, 0x5a, 0x38, 0x49, 0xdd, 0xfd, 0xde, 0xef, 0xbd, + 0x7e, 0xdd, 0xfd, 0xfa, 0xbd, 0xd7, 0x03, 0xdf, 0xf0, 0x88, 0xd3, 0x6a, 0xee, 0xfb, 0x78, 0xf9, + 0xd8, 0x22, 0xed, 0xe5, 0xe3, 0x97, 0xb1, 0xed, 0x35, 0xf0, 0xcb, 0xbc, 0x55, 0xf3, 0x7c, 0x97, + 0xba, 0x68, 0x3e, 0x24, 0xa9, 0xf1, 0xce, 0x90, 0xa4, 0xba, 0x14, 0xb1, 0x1a, 0xae, 0x4f, 0x96, + 0x8d, 0x06, 0xb6, 0x9c, 0x0e, 0x00, 0x6f, 0x0a, 0x84, 0xea, 0xcd, 0x14, 0xa5, 0x7f, 0xea, 0x51, + 0x37, 0x46, 0xca, 0xdb, 0x92, 0xf6, 0x6a, 0x92, 0xd6, 0x24, 0x27, 0x1d, 0x42, 0x93, 0x9c, 0x48, + 0xaa, 0xdb, 0x49, 0x2a, 0xea, 0x63, 0x27, 0xc0, 0x06, 0xb5, 0xdc, 0x98, 0x06, 0xb1, 0xce, 0xde, + 0xd8, 0xd6, 0xbe, 0xd1, 0xa1, 0xb6, 0xf6, 0x0d, 0x41, 0xa5, 0xfe, 0x4a, 0x81, 0xa7, 0xeb, 0xbe, + 0x8b, 0x4d, 0x03, 0x07, 0xf4, 0x83, 0x0e, 0x88, 0x46, 0x3e, 0x6b, 0x91, 0x80, 0xa2, 0xef, 0x41, + 0x21, 0x06, 0x5d, 0x51, 0xae, 0x28, 0x4b, 0x85, 0x95, 0xe5, 0x5a, 0x64, 0x25, 0x86, 0x5d, 0x8b, + 0x0b, 0x0f, 0x65, 0xd4, 0xe2, 0x60, 0x71, 0x0c, 0x74, 0x03, 0xca, 0xb8, 0x8d, 0x2d, 0xaa, 0x9b, + 0x84, 0x12, 0x01, 0x9b, 0xbb, 0xa2, 0x2c, 0x4d, 0x6a, 0x25, 0xde, 0xbd, 0x1e, 0xf6, 0xaa, 0x9f, + 0x2b, 0xf0, 0x4c, 0x6f, 0xdd, 0x02, 0xcf, 0x75, 0x02, 0x82, 0x5e, 0x83, 0x9c, 0x65, 0x4a, 0x9d, + 0xae, 0x0f, 0xa2, 0xd3, 0x96, 0xa9, 0xe5, 0x2c, 0x13, 0xbd, 0x00, 0x33, 0x91, 0x6c, 0xbd, 0x41, + 0xac, 0xc3, 0x06, 0xe5, 0x2a, 0x8c, 0x6a, 0xe5, 0xa8, 0x7f, 0x93, 0x77, 0xab, 0x7f, 0x9d, 0x82, + 0xa7, 0x62, 0xa2, 0xb7, 0x6d, 0xec, 0x38, 0xc4, 0x0f, 0xad, 0xf3, 0x3c, 0x14, 0xc9, 0x89, 0x67, + 0xf9, 0xa7, 0x21, 0x8a, 0xc2, 0x51, 0xa6, 0x45, 0xa7, 0x80, 0x40, 0xb7, 0x21, 0x7f, 0x40, 0x08, + 0x17, 0x50, 0x58, 0x51, 0x53, 0x6a, 0xca, 0xed, 0x10, 0x69, 0xb8, 0x41, 0x88, 0xc6, 0xc8, 0x11, + 0x82, 0xd1, 0x26, 0x69, 0xba, 0x95, 0xfc, 0x15, 0x65, 0x69, 0x4a, 0xe3, 0xff, 0xd1, 0x1e, 0xcc, + 0x60, 0xc3, 0x70, 0x5b, 0x0e, 0xd5, 0x0f, 0x7d, 0xb7, 0xe5, 0xe9, 0x96, 0x59, 0x29, 0x71, 0xd8, + 0x97, 0xfa, 0xc0, 0xae, 0x09, 0xb6, 0x3b, 0x8c, 0x6b, 0xcb, 0xdc, 0x1c, 0xd1, 0x4a, 0x38, 0xd1, + 0xf3, 0x40, 0x51, 0x90, 0x06, 0x13, 0x6e, 0x8b, 0x7a, 0x2d, 0x1a, 0x54, 0x66, 0xaf, 0xe4, 0x97, + 0x0a, 0x2b, 0xaf, 0xd7, 0x7a, 0x1f, 0x86, 0x5a, 0xa6, 0x41, 0x6a, 0xef, 0x73, 0x00, 0x2d, 0x04, + 0x42, 0x77, 0x61, 0x2c, 0x68, 0x63, 0x2f, 0xa8, 0x2c, 0x72, 0xc4, 0xd7, 0x86, 0x47, 0xdc, 0x69, + 0x63, 0x4f, 0x13, 0x20, 0x68, 0x0f, 0x0a, 0x26, 0xb1, 0xc9, 0x21, 0x66, 0x74, 0x41, 0x65, 0x89, + 0x63, 0xae, 0x0e, 0x8f, 0xb9, 0x2e, 0x40, 0x88, 0x16, 0x87, 0x43, 0xfb, 0x50, 0x6c, 0x39, 0x71, + 0xfc, 0x15, 0x8e, 0xff, 0xe6, 0xf0, 0xf8, 0xf7, 0x43, 0x18, 0xa2, 0x25, 0x21, 0xd1, 0x06, 0x14, + 0xac, 0x7d, 0x43, 0x17, 0x5c, 0x41, 0xe5, 0x4d, 0x2e, 0xe1, 0x5a, 0x6a, 0xf1, 0xd8, 0xe9, 0xec, + 0x6c, 0xd9, 0x7d, 0x63, 0x4d, 0xec, 0x7a, 0xb0, 0xc2, 0xbf, 0x41, 0xf5, 0xa7, 0x0a, 0x8c, 0x0b, + 0x5b, 0xa3, 0x55, 0x18, 0x3b, 0xc6, 0x76, 0x8b, 0xc8, 0x73, 0x70, 0xb5, 0xcf, 0x4e, 0xd8, 0x65, + 0xb4, 0x9a, 0x60, 0x41, 0x6f, 0xc3, 0x04, 0x36, 0x4d, 0x9f, 0x04, 0x81, 0xdc, 0x9e, 0xd7, 0xfb, + 0xed, 0x23, 0x41, 0xad, 0x85, 0x6c, 0xd5, 0x3f, 0x28, 0x30, 0xca, 0x96, 0xe8, 0x5c, 0x6a, 0x6c, + 0xc1, 0x34, 0xc5, 0xfe, 0x21, 0xa1, 0x3a, 0x0e, 0x02, 0x42, 0x07, 0xd5, 0x85, 0xd1, 0x6e, 0x99, + 0x5a, 0x41, 0xf0, 0xf2, 0x66, 0x78, 0xd8, 0xf2, 0x43, 0x1d, 0xb6, 0xea, 0x2f, 0x15, 0x98, 0x0c, + 0x37, 0x05, 0x7a, 0x0b, 0xc6, 0x71, 0x93, 0x9d, 0x0d, 0x39, 0x95, 0x6b, 0xfd, 0xf4, 0xe0, 0xc4, + 0x9a, 0x64, 0x42, 0xf7, 0x60, 0xda, 0x32, 0x89, 0x43, 0x2d, 0x7a, 0xaa, 0x1f, 0x91, 0x53, 0x39, + 0x99, 0x9b, 0x7d, 0x40, 0xb6, 0x24, 0xcb, 0xbb, 0xe4, 0x54, 0x2b, 0x58, 0x9d, 0x46, 0x75, 0x13, + 0xa0, 0xb3, 0x9d, 0xce, 0x63, 0xe5, 0xfa, 0x65, 0xb8, 0xa4, 0xa7, 0xdd, 0x87, 0x4a, 0xa0, 0xda, + 0x6b, 0x1f, 0x4b, 0x07, 0x7b, 0x07, 0x46, 0x3d, 0x1b, 0x87, 0x6e, 0xff, 0x95, 0x21, 0xdd, 0x3e, + 0x43, 0xd3, 0x38, 0x80, 0x6a, 0xc1, 0x9c, 0xdc, 0x3a, 0xf5, 0xd3, 0x2d, 0xc7, 0x24, 0x27, 0xa1, + 0x07, 0xdd, 0x86, 0xa2, 0xdc, 0x4a, 0xba, 0xc5, 0xfa, 0xa5, 0xa8, 0x17, 0x07, 0xdb, 0x87, 0x02, + 0x6a, 0x1a, 0xc7, 0x5a, 0xea, 0xc7, 0x30, 0x9f, 0x16, 0x25, 0x67, 0x13, 0xdb, 0xed, 0xca, 0x99, + 0x76, 0xbb, 0xfa, 0x11, 0xcc, 0x71, 0xc8, 0xfa, 0x69, 0x38, 0x24, 0xa7, 0x71, 0x7e, 0xe8, 0xcf, + 0x15, 0x98, 0x4f, 0x63, 0x4b, 0xbd, 0xef, 0x9f, 0xdf, 0x46, 0x9b, 0x23, 0x49, 0x2b, 0x3d, 0x50, + 0x94, 0xfa, 0x0c, 0x94, 0xf4, 0x04, 0xae, 0x7a, 0x04, 0x0b, 0xdf, 0xf5, 0x1a, 0xa4, 0x49, 0x7c, + 0x6c, 0xa7, 0x26, 0x78, 0xf1, 0xeb, 0xb4, 0x07, 0x95, 0x6e, 0x61, 0x17, 0xb6, 0x52, 0x9f, 0xc0, + 0x42, 0x1d, 0xdb, 0xd8, 0x31, 0xc8, 0x63, 0x58, 0xab, 0x5f, 0x28, 0x50, 0xe9, 0x46, 0x97, 0xba, + 0xbf, 0x09, 0x63, 0xc2, 0x8b, 0x29, 0x43, 0x79, 0x31, 0xc1, 0x14, 0x73, 0x3e, 0xb9, 0x33, 0x38, + 0x1f, 0xf5, 0x1a, 0x14, 0x77, 0x2d, 0xd2, 0x5e, 0x6b, 0xd1, 0xc6, 0x07, 0xee, 0x11, 0x71, 0xd0, + 0x2c, 0x8c, 0x59, 0xec, 0x48, 0x73, 0x6d, 0xa6, 0x35, 0xd1, 0x50, 0x35, 0x28, 0x87, 0x64, 0xa1, + 0x55, 0xbe, 0x03, 0xf9, 0x83, 0xe3, 0x23, 0xa9, 0x74, 0xbf, 0x70, 0x62, 0xa3, 0x65, 0xdb, 0x0c, + 0xc0, 0x72, 0x0e, 0x99, 0xc3, 0x62, 0x9c, 0xea, 0xfb, 0x30, 0xd3, 0xc1, 0x94, 0xb6, 0x78, 0x03, + 0xc6, 0x28, 0x53, 0xa3, 0xdb, 0x93, 0x26, 0xaf, 0xd2, 0x84, 0xce, 0x9a, 0xe0, 0x51, 0x7f, 0xa2, + 0x40, 0x71, 0x87, 0x62, 0xda, 0x8a, 0x56, 0xee, 0xb1, 0xc6, 0x3f, 0xbd, 0xfd, 0xa3, 0x06, 0xa5, + 0x50, 0x07, 0x39, 0xa7, 0xe7, 0xa0, 0x10, 0x9c, 0x3a, 0x46, 0x32, 0xe2, 0x03, 0xd6, 0x25, 0xe3, + 0xbd, 0xe7, 0xa0, 0x60, 0x60, 0x6a, 0x34, 0x2c, 0xe7, 0x50, 0x6f, 0x79, 0x32, 0xb6, 0x85, 0xb0, + 0xeb, 0xbe, 0xa7, 0x3e, 0x50, 0xe0, 0xb2, 0x00, 0xdd, 0xa1, 0x3e, 0xc1, 0xcd, 0x27, 0x38, 0x3d, + 0x1f, 0x66, 0x93, 0x9a, 0xc8, 0x49, 0x7e, 0x1b, 0x9e, 0xb2, 0x31, 0x25, 0x01, 0xd5, 0x8f, 0x1c, + 0xb7, 0xed, 0xe8, 0xfb, 0xb6, 0x6b, 0x1c, 0x25, 0xa7, 0x3c, 0x2f, 0x08, 0xde, 0x65, 0xe3, 0x75, + 0x36, 0xdc, 0x99, 0x7e, 0xdc, 0x3e, 0xb9, 0xb4, 0x7d, 0xd4, 0x2f, 0xf3, 0x30, 0xfd, 0x9e, 0x4b, + 0x49, 0x10, 0x8b, 0xa2, 0x2d, 0xc7, 0xb0, 0x5b, 0x26, 0xd1, 0x03, 0x8f, 0xc8, 0xad, 0x3f, 0xa9, + 0x4d, 0xcb, 0xce, 0x1d, 0xd6, 0x87, 0xd6, 0x60, 0x92, 0x9f, 0x10, 0x66, 0x94, 0xfc, 0x50, 0x27, + 0x6b, 0x02, 0x8b, 0x3f, 0xdd, 0x3e, 0x6c, 0xf4, 0x9c, 0x3e, 0x0c, 0xdd, 0x83, 0xb2, 0x38, 0x78, + 0x3a, 0x75, 0xb9, 0xee, 0x66, 0x65, 0x7c, 0x98, 0x63, 0x5b, 0x14, 0xdc, 0x1f, 0xb8, 0x6c, 0x8e, + 0xe6, 0x93, 0xd8, 0x00, 0x0f, 0x72, 0x30, 0xc7, 0x17, 0x63, 0xc3, 0xf5, 0x77, 0x5d, 0x6a, 0x39, + 0x87, 0xe1, 0xaa, 0xdc, 0x84, 0x4b, 0xc7, 0x2e, 0xc5, 0xfb, 0x36, 0xd1, 0x31, 0x4d, 0x2e, 0x7d, + 0x59, 0x0e, 0xac, 0x51, 0xb9, 0xe6, 0x5d, 0x96, 0xcd, 0x9f, 0xd7, 0xb2, 0x4f, 0xc0, 0x14, 0xbf, + 0xcf, 0x41, 0xe9, 0x43, 0x8b, 0x3a, 0xb1, 0xab, 0xe2, 0x23, 0x98, 0x71, 0x5c, 0x4a, 0x74, 0xc3, + 0x6d, 0x36, 0x2d, 0xda, 0x24, 0x0e, 0x65, 0x81, 0x32, 0x8b, 0xd9, 0x6b, 0x7d, 0xb4, 0x60, 0xa7, + 0x8a, 0xbc, 0x13, 0xb1, 0x69, 0x65, 0x86, 0xd3, 0x69, 0x07, 0xe8, 0x07, 0x30, 0x13, 0x8b, 0x9f, + 0x74, 0x1e, 0x66, 0xe5, 0xcf, 0x1e, 0x66, 0x95, 0x69, 0xb2, 0xe3, 0x49, 0x18, 0x90, 0x40, 0x39, + 0xb2, 0x9f, 0xf4, 0x23, 0x1a, 0x4c, 0xb7, 0x45, 0x97, 0x6e, 0x62, 0x8a, 0x87, 0xa9, 0x1f, 0x48, + 0xa8, 0x75, 0x4c, 0xb1, 0x56, 0x68, 0x77, 0x1a, 0xea, 0xdf, 0x14, 0x98, 0x97, 0x83, 0x6b, 0x8e, + 0x59, 0x6f, 0x59, 0xb6, 0x19, 0xae, 0x57, 0x2f, 0xa3, 0x2a, 0x17, 0x68, 0x54, 0x13, 0x10, 0x6e, + 0xd1, 0x86, 0xeb, 0x5b, 0x3f, 0xe2, 0x09, 0x9d, 0x98, 0x94, 0xb8, 0xa9, 0x5f, 0x1d, 0x44, 0xc2, + 0x5a, 0x9c, 0x9b, 0x4f, 0xed, 0x12, 0x4e, 0x77, 0xa9, 0x36, 0x2c, 0x74, 0xcd, 0x4f, 0xda, 0xf3, + 0xe2, 0xcb, 0x31, 0xea, 0x6f, 0xf3, 0x50, 0xe4, 0xae, 0x32, 0xda, 0xf5, 0x55, 0x98, 0x3c, 0xb0, + 0x6c, 0x4a, 0x7c, 0x22, 0x8a, 0x2b, 0x93, 0x5a, 0xd4, 0x46, 0x3f, 0x84, 0xc5, 0x98, 0xaf, 0x36, + 0xac, 0x03, 0xcb, 0xd0, 0x4d, 0xe2, 0xb8, 0x4d, 0xcb, 0x91, 0x59, 0xb3, 0x38, 0x1f, 0xfd, 0x32, + 0x93, 0x75, 0xc6, 0xa3, 0x3d, 0xd3, 0x71, 0xf1, 0x1c, 0x6a, 0x3d, 0x8e, 0x84, 0x56, 0xe1, 0xa9, + 0x50, 0x56, 0x27, 0x87, 0xd6, 0x79, 0x70, 0x10, 0xf0, 0xb3, 0x32, 0xa9, 0x2d, 0x48, 0x82, 0xf5, + 0x68, 0x9c, 0x87, 0x10, 0x01, 0x7a, 0x1d, 0x2a, 0x21, 0x6f, 0xcb, 0xd9, 0x77, 0x1d, 0x93, 0xdd, + 0xc6, 0x92, 0x75, 0x94, 0xb3, 0xce, 0xcb, 0xf1, 0xfb, 0xe1, 0xb0, 0xe4, 0xbc, 0x0e, 0xe5, 0x90, + 0xd3, 0xf6, 0x74, 0xe7, 0x80, 0x06, 0x95, 0x31, 0xce, 0x10, 0x5e, 0x52, 0x77, 0xbd, 0xf7, 0x0e, + 0x68, 0x80, 0x56, 0x60, 0x2e, 0xa4, 0xf3, 0x7c, 0xd7, 0x73, 0x03, 0x6c, 0x0b, 0xea, 0x71, 0x4e, + 0x7d, 0x59, 0x0e, 0x6e, 0xcb, 0x31, 0xce, 0xb3, 0x06, 0xcf, 0x86, 0x3c, 0xc7, 0xdc, 0xd9, 0xea, + 0x3e, 0x31, 0x88, 0xe5, 0xd1, 0x50, 0xb5, 0x09, 0xce, 0x5b, 0x95, 0x44, 0xa1, 0x43, 0xe6, 0x24, + 0x42, 0x3d, 0xf5, 0x2e, 0x94, 0xc2, 0xd5, 0x92, 0x7b, 0x62, 0x35, 0x19, 0x70, 0x5e, 0x1d, 0xe4, + 0x5a, 0x94, 0xe1, 0xa6, 0x5a, 0x81, 0xf9, 0x77, 0x1a, 0xd8, 0x72, 0xb6, 0xb1, 0x8f, 0x9b, 0x84, + 0x12, 0x3f, 0xdc, 0x04, 0x6a, 0x03, 0x16, 0xba, 0x46, 0xa4, 0xc0, 0x7b, 0x00, 0x5e, 0xd4, 0x9b, + 0x15, 0x31, 0xf2, 0x8a, 0x68, 0x24, 0x34, 0x0d, 0x15, 0x03, 0x50, 0xe7, 0x61, 0x76, 0xe3, 0xde, + 0x7a, 0xb7, 0x06, 0x26, 0xcc, 0xa5, 0xfa, 0xa5, 0xfc, 0x77, 0x7b, 0xc8, 0x7f, 0xf1, 0xd1, 0xf2, + 0x37, 0x9a, 0x66, 0x86, 0xf4, 0x9f, 0xe5, 0x60, 0x81, 0x5d, 0x80, 0xf5, 0xd3, 0x98, 0xb7, 0x96, + 0x07, 0xe1, 0x43, 0x28, 0xa7, 0xdc, 0xbf, 0x3c, 0xeb, 0xc3, 0x7a, 0xff, 0x52, 0xd2, 0xfb, 0xf7, + 0x2a, 0x81, 0xe6, 0x7b, 0x95, 0x40, 0x9f, 0x84, 0x17, 0x77, 0xa0, 0xd2, 0x6d, 0x8f, 0xc8, 0x9d, + 0x97, 0x78, 0x94, 0xc3, 0xa3, 0x02, 0x36, 0xa7, 0x6e, 0xeb, 0x27, 0x03, 0xfb, 0x9d, 0x90, 0x9a, + 0x41, 0x6a, 0xc4, 0x70, 0x7d, 0x53, 0x2b, 0x06, 0xf1, 0x4e, 0xbe, 0x00, 0x3b, 0x6d, 0xec, 0x65, + 0x2c, 0x40, 0xd0, 0xc6, 0xde, 0x05, 0x2c, 0x00, 0x83, 0xf9, 0x3f, 0x59, 0x00, 0x0d, 0x2a, 0xdd, + 0xf6, 0x88, 0x2a, 0xde, 0xa3, 0x6c, 0x26, 0xd2, 0xec, 0x6a, 0xa6, 0xd9, 0xdb, 0xd8, 0x93, 0xd6, + 0xe6, 0xf4, 0xea, 0xbf, 0x15, 0x98, 0x7f, 0xaf, 0x65, 0xdb, 0xd6, 0x81, 0x45, 0xfc, 0x64, 0x52, + 0xb5, 0x01, 0x53, 0x4e, 0x38, 0x22, 0xad, 0xbb, 0xd4, 0x67, 0x6a, 0x11, 0x92, 0xd6, 0x61, 0xfd, + 0x9f, 0x36, 0xe9, 0x32, 0x2c, 0x74, 0xcd, 0x5e, 0x5a, 0x74, 0x16, 0xc6, 0x44, 0xd2, 0x21, 0x6e, + 0x3a, 0xd1, 0x50, 0x77, 0xe1, 0x99, 0xd8, 0x85, 0xb9, 0xe5, 0x1c, 0xb8, 0xf5, 0xd3, 0x4d, 0x1c, + 0x44, 0xd9, 0xb2, 0x78, 0x79, 0xc8, 0x0d, 0xfb, 0xf2, 0xa0, 0x7e, 0xa1, 0xc0, 0x7c, 0x0a, 0x38, + 0x84, 0xbc, 0x0e, 0xd3, 0x01, 0xc5, 0x7e, 0x32, 0xd4, 0xde, 0x1c, 0xd1, 0x0a, 0xbc, 0x57, 0x04, + 0xda, 0x0f, 0x14, 0x05, 0xa9, 0x00, 0xc4, 0x31, 0x13, 0xe9, 0xd5, 0xa6, 0xa2, 0x4d, 0x11, 0xc7, + 0x8c, 0x68, 0xea, 0x65, 0x28, 0xea, 0x71, 0xb0, 0x7a, 0x11, 0x0a, 0x7a, 0x87, 0x4b, 0xfd, 0x57, + 0x0e, 0xca, 0x29, 0x35, 0xd0, 0xd3, 0x30, 0x9e, 0x92, 0x2c, 0xdb, 0x4c, 0xe8, 0x19, 0xe7, 0x9b, + 0x8e, 0x57, 0xf2, 0x17, 0xf0, 0x7c, 0xb4, 0x07, 0x05, 0x8f, 0xf8, 0x2c, 0xf8, 0xa0, 0xd6, 0x31, + 0x91, 0x39, 0xdc, 0xea, 0xb0, 0xe1, 0x5d, 0x07, 0x41, 0x8b, 0xc3, 0xa1, 0x3b, 0x30, 0xca, 0x8e, + 0x12, 0xbf, 0xf2, 0x87, 0x8f, 0x1a, 0x77, 0x2d, 0xd2, 0xd6, 0x38, 0x40, 0x7d, 0x0a, 0x26, 0x42, + 0x6b, 0x7f, 0x02, 0x0b, 0x5d, 0x6b, 0xde, 0x29, 0x74, 0xd1, 0x13, 0xdd, 0x72, 0x0e, 0x5c, 0x79, + 0xa4, 0x6f, 0x0c, 0xf0, 0xda, 0xc0, 0x11, 0xc6, 0xe9, 0x09, 0xfb, 0x55, 0x31, 0x3c, 0x9b, 0xb1, + 0x53, 0x2f, 0x4c, 0xc4, 0xa7, 0x50, 0x94, 0xf9, 0xba, 0x84, 0xbc, 0x0b, 0x05, 0x7e, 0x2f, 0xfa, + 0xdc, 0xc5, 0x9c, 0xe5, 0x0e, 0x00, 0x27, 0xfa, 0xaf, 0xfe, 0x8e, 0xf9, 0xa6, 0x54, 0x0a, 0xfa, + 0x38, 0x04, 0x5d, 0x70, 0x65, 0x5e, 0xfd, 0x4f, 0x1e, 0x2e, 0xf7, 0x10, 0xd9, 0x2b, 0x6a, 0x50, + 0x2e, 0x24, 0x6a, 0xf8, 0x16, 0x8c, 0xf2, 0x3b, 0x57, 0xe8, 0xfd, 0x7c, 0x3f, 0x27, 0xcd, 0x34, + 0xe2, 0x0c, 0x8f, 0x21, 0x3d, 0x4f, 0x5c, 0x1a, 0xa3, 0x67, 0xbf, 0x34, 0xae, 0x41, 0x49, 0x1c, + 0x12, 0xdd, 0xf0, 0x09, 0xa6, 0xc4, 0xe4, 0x07, 0x6f, 0x54, 0x2b, 0x8a, 0xde, 0x77, 0x44, 0x27, + 0xf3, 0x8d, 0x92, 0x4c, 0xf8, 0xea, 0xf1, 0xd0, 0x37, 0x8a, 0x5e, 0x5e, 0x21, 0x62, 0x6e, 0xaa, + 0x0a, 0x93, 0x9e, 0x1b, 0x58, 0xdc, 0xd7, 0x4c, 0x70, 0xa0, 0xa8, 0x8d, 0xde, 0x86, 0xf1, 0xc0, + 0x6d, 0xf9, 0x06, 0xa9, 0x4c, 0xf6, 0xd6, 0x37, 0x19, 0x31, 0x32, 0xf3, 0xed, 0x70, 0x7a, 0x4d, + 0xf2, 0x71, 0xaf, 0x1a, 0x57, 0x43, 0xfd, 0x4b, 0x1e, 0xa0, 0x73, 0xd5, 0xf6, 0x8a, 0x56, 0x94, + 0x0b, 0x89, 0x56, 0xde, 0x92, 0xb7, 0xbe, 0x58, 0xf8, 0x17, 0x52, 0x68, 0x26, 0x39, 0x49, 0xde, + 0xfc, 0xdb, 0x36, 0xb6, 0x1c, 0x4a, 0x4e, 0xa8, 0xb8, 0xfc, 0x13, 0x56, 0xc9, 0xa7, 0xac, 0x72, + 0x51, 0x0b, 0xb9, 0x0d, 0x05, 0xf1, 0xe6, 0x2b, 0x52, 0xe2, 0xb1, 0x9e, 0x8e, 0x3e, 0xa1, 0x69, + 0x1d, 0x53, 0xa3, 0xc1, 0xd4, 0x15, 0xef, 0x98, 0x3c, 0x19, 0x06, 0x37, 0xfa, 0x8f, 0x6e, 0x76, + 0xb6, 0x86, 0x8d, 0xad, 0x26, 0x31, 0xa3, 0x55, 0x0f, 0x37, 0x87, 0xe8, 0x66, 0xeb, 0xde, 0x59, + 0xdb, 0x89, 0x33, 0xae, 0xed, 0x25, 0x28, 0xeb, 0x49, 0x71, 0x2b, 0xff, 0xb8, 0x04, 0x97, 0x99, + 0x43, 0xdf, 0xf6, 0x5d, 0xea, 0x1a, 0xae, 0xbd, 0x43, 0xfc, 0x63, 0xcb, 0x20, 0xe8, 0x43, 0x18, + 0x17, 0x31, 0x04, 0xca, 0xac, 0x67, 0x27, 0x22, 0xac, 0xea, 0xf5, 0x7e, 0x64, 0xd2, 0xdb, 0x1d, + 0xc1, 0x74, 0xbc, 0x18, 0x8b, 0x5e, 0x7c, 0x34, 0x5f, 0xa2, 0x78, 0x5c, 0xfd, 0xe6, 0x60, 0xc4, + 0x42, 0xd4, 0x2d, 0x05, 0xed, 0xc2, 0x18, 0x77, 0xba, 0xe8, 0x6a, 0x16, 0x63, 0xbc, 0x46, 0x5b, + 0xbd, 0xd6, 0x87, 0x2a, 0xc2, 0xfd, 0x0c, 0x4a, 0x49, 0x67, 0x8e, 0x5e, 0x7a, 0x24, 0x6b, 0xba, + 0xee, 0x58, 0xad, 0x0d, 0x4a, 0x1e, 0x89, 0xfc, 0x18, 0x26, 0x64, 0xbd, 0x04, 0x65, 0x9a, 0x3a, + 0x59, 0xd8, 0xab, 0xde, 0xe8, 0x4b, 0x27, 0xd7, 0xc4, 0x8f, 0x6a, 0x5a, 0x61, 0x2d, 0x06, 0xd5, + 0xfa, 0xf0, 0xa6, 0x8a, 0x52, 0xd5, 0xe5, 0x81, 0xe9, 0xa5, 0xcc, 0x8f, 0x60, 0x5c, 0xa4, 0xf8, + 0xd9, 0x1b, 0x2c, 0x51, 0xb0, 0xc9, 0xde, 0x60, 0xc9, 0x4a, 0xc1, 0x2d, 0x85, 0x4d, 0x27, 0x95, + 0x8a, 0x67, 0x4f, 0xa7, 0x77, 0x61, 0x20, 0x7b, 0x3a, 0x59, 0xe5, 0x02, 0x1b, 0x8a, 0x89, 0x3c, + 0x1e, 0x65, 0x6e, 0xd5, 0x5e, 0x65, 0x80, 0xea, 0x4b, 0x03, 0x52, 0x4b, 0x69, 0x2e, 0x94, 0x92, + 0xcf, 0xbf, 0xd9, 0xfb, 0xaf, 0xe7, 0x8b, 0x74, 0xf6, 0xfe, 0xcb, 0x78, 0x55, 0x76, 0xa1, 0x94, + 0x7c, 0xb7, 0xcd, 0x16, 0xd8, 0xf3, 0xed, 0x38, 0x5b, 0x60, 0xc6, 0x73, 0x70, 0x0b, 0x66, 0xd2, + 0x0f, 0xa7, 0x28, 0x73, 0x51, 0x32, 0xde, 0x73, 0xab, 0xb7, 0x06, 0x67, 0x90, 0x62, 0xdb, 0x30, + 0x93, 0x7e, 0xf3, 0xcc, 0x16, 0x9b, 0xf1, 0xf6, 0x9a, 0x2d, 0x36, 0xeb, 0x39, 0xf5, 0x96, 0xc2, + 0xe6, 0x9b, 0x2e, 0x48, 0x64, 0x0b, 0xce, 0x28, 0xe5, 0x64, 0x0b, 0xce, 0xac, 0x75, 0xb4, 0x60, + 0x26, 0x9d, 0x86, 0x67, 0x8b, 0xcd, 0x28, 0x60, 0x64, 0x8b, 0xcd, 0xcc, 0xf0, 0x7d, 0x28, 0xa7, + 0x52, 0xd5, 0xec, 0x13, 0xda, 0x3b, 0xa3, 0xcf, 0x3e, 0xa1, 0x59, 0x39, 0xf0, 0x17, 0x0a, 0xcc, + 0xf5, 0x4c, 0x22, 0xd0, 0xed, 0x01, 0x73, 0x85, 0x44, 0x76, 0x5c, 0x7d, 0x75, 0x48, 0x2e, 0xa9, + 0x06, 0xed, 0x4e, 0x4a, 0x6b, 0x83, 0xe6, 0x2a, 0xfd, 0xa6, 0x9e, 0x91, 0x80, 0xdd, 0x52, 0xd0, + 0x8f, 0x01, 0x75, 0x7f, 0x01, 0x83, 0x5e, 0x1e, 0xfa, 0xab, 0xaf, 0xea, 0xca, 0x30, 0x2c, 0x72, + 0xca, 0x9f, 0x2b, 0x30, 0xdb, 0xeb, 0x13, 0x47, 0xf4, 0x4a, 0xe6, 0x41, 0xc9, 0xfe, 0x58, 0xb3, + 0x7a, 0x7b, 0x38, 0x26, 0xa1, 0xc3, 0x8a, 0xd7, 0xf9, 0x18, 0x20, 0x0c, 0x71, 0x3e, 0x85, 0xc9, + 0xb0, 0x0b, 0xdd, 0xe8, 0xf7, 0x68, 0x1f, 0x4a, 0x5f, 0xea, 0x4f, 0x28, 0x24, 0xd6, 0xbf, 0xcc, + 0xfd, 0xf1, 0xe1, 0xa2, 0xf2, 0xd5, 0xc3, 0x45, 0xe5, 0xef, 0x0f, 0x17, 0x95, 0x9f, 0x7f, 0xbd, + 0x38, 0xf2, 0xd5, 0xd7, 0x8b, 0x23, 0x7f, 0xfe, 0x7a, 0x71, 0x04, 0xaa, 0x86, 0xdb, 0xcc, 0xc0, + 0xa9, 0x4f, 0x45, 0xd1, 0xd8, 0xb6, 0xf2, 0xf1, 0xfb, 0x87, 0x16, 0x6d, 0xb4, 0xf6, 0x6b, 0x86, + 0xdb, 0x5c, 0x36, 0xdc, 0xa0, 0xe9, 0x06, 0xcb, 0x3e, 0xb1, 0xf1, 0x29, 0xf1, 0x97, 0x8f, 0x57, + 0xa2, 0xbf, 0x3c, 0xf0, 0x0b, 0x96, 0x7b, 0x7f, 0xf7, 0xfb, 0x06, 0x6b, 0x85, 0x8d, 0x5f, 0xe7, + 0xf2, 0xdb, 0xbb, 0xdf, 0xff, 0x4d, 0x6e, 0x7e, 0x3b, 0x14, 0xce, 0xa4, 0xd5, 0x76, 0xe5, 0xf0, + 0x9f, 0x3a, 0x03, 0x7b, 0x6c, 0x60, 0x2f, 0x1c, 0x78, 0x98, 0x53, 0x7b, 0x0f, 0xec, 0xdd, 0xd9, + 0xae, 0xdf, 0x23, 0x14, 0xb3, 0x78, 0xf8, 0x9f, 0xb9, 0x4a, 0x48, 0xb4, 0xba, 0xca, 0xa8, 0x56, + 0x57, 0x43, 0xb2, 0xfd, 0x71, 0xfe, 0x21, 0xee, 0x2b, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x30, + 0x99, 0x71, 0xd0, 0x9d, 0x2c, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3744,12 +3384,9 @@ type ViewProtocolServiceClient interface { // Get current status of chain sync Status(ctx context.Context, in *StatusRequest, opts ...grpc.CallOption) (*StatusResponse, error) // Stream sync status updates until the view service has caught up with the core.chain.v1alpha1. - // Returns a stream of `StatusStreamResponse`s. StatusStream(ctx context.Context, in *StatusStreamRequest, opts ...grpc.CallOption) (ViewProtocolService_StatusStreamClient, error) // Queries for notes that have been accepted by the core.chain.v1alpha1. - // Returns a stream of `NotesResponse`s. Notes(ctx context.Context, in *NotesRequest, opts ...grpc.CallOption) (ViewProtocolService_NotesClient, error) - // Returns a stream of `NotesForVotingResponse`s. NotesForVoting(ctx context.Context, in *NotesForVotingRequest, opts ...grpc.CallOption) (ViewProtocolService_NotesForVotingClient, error) // Returns authentication paths for the given note commitments. // @@ -3760,7 +3397,6 @@ type ViewProtocolServiceClient interface { Witness(ctx context.Context, in *WitnessRequest, opts ...grpc.CallOption) (*WitnessResponse, error) WitnessAndBuild(ctx context.Context, in *WitnessAndBuildRequest, opts ...grpc.CallOption) (*WitnessAndBuildResponse, error) // Queries for assets. - // Returns a stream of `AssetsResponse`s. Assets(ctx context.Context, in *AssetsRequest, opts ...grpc.CallOption) (ViewProtocolService_AssetsClient, error) // Query for the current chain parameters. ChainParameters(ctx context.Context, in *ChainParametersRequest, opts ...grpc.CallOption) (*ChainParametersResponse, error) @@ -3772,9 +3408,8 @@ type ViewProtocolServiceClient interface { IndexByAddress(ctx context.Context, in *IndexByAddressRequest, opts ...grpc.CallOption) (*IndexByAddressResponse, error) // Query for an ephemeral address EphemeralAddress(ctx context.Context, in *EphemeralAddressRequest, opts ...grpc.CallOption) (*EphemeralAddressResponse, error) - // Query for balance of a given address. - // Returns a stream of `BalancesResponses`. - Balances(ctx context.Context, in *BalancesRequest, opts ...grpc.CallOption) (ViewProtocolService_BalancesClient, error) + // Query for balance of a given address + BalanceByAddress(ctx context.Context, in *BalanceByAddressRequest, opts ...grpc.CallOption) (ViewProtocolService_BalanceByAddressClient, error) // Query for a note by its note commitment, optionally waiting until the note is detected. NoteByCommitment(ctx context.Context, in *NoteByCommitmentRequest, opts ...grpc.CallOption) (*NoteByCommitmentResponse, error) // Query for a swap by its swap commitment, optionally waiting until the swap is detected. @@ -3784,16 +3419,11 @@ type ViewProtocolServiceClient interface { // Query for a given transaction by its hash. TransactionInfoByHash(ctx context.Context, in *TransactionInfoByHashRequest, opts ...grpc.CallOption) (*TransactionInfoByHashResponse, error) // Query for the full transactions in the given range of blocks. - // Returns a stream of `TransactionInfoResponse`s. TransactionInfo(ctx context.Context, in *TransactionInfoRequest, opts ...grpc.CallOption) (ViewProtocolService_TransactionInfoClient, error) // Query for a transaction plan TransactionPlanner(ctx context.Context, in *TransactionPlannerRequest, opts ...grpc.CallOption) (*TransactionPlannerResponse, error) // Broadcast a transaction to the network, optionally waiting for full confirmation. BroadcastTransaction(ctx context.Context, in *BroadcastTransactionRequest, opts ...grpc.CallOption) (*BroadcastTransactionResponse, error) - // Query for owned position IDs for the given trading pair and in the given position state. - OwnedPositionIds(ctx context.Context, in *OwnedPositionIdsRequest, opts ...grpc.CallOption) (ViewProtocolService_OwnedPositionIdsClient, error) - // Authorize a transaction plan and build the transaction. - AuthorizeAndBuild(ctx context.Context, in *AuthorizeAndBuildRequest, opts ...grpc.CallOption) (*AuthorizeAndBuildResponse, error) } type viewProtocolServiceClient struct { @@ -4004,12 +3634,12 @@ func (c *viewProtocolServiceClient) EphemeralAddress(ctx context.Context, in *Ep return out, nil } -func (c *viewProtocolServiceClient) Balances(ctx context.Context, in *BalancesRequest, opts ...grpc.CallOption) (ViewProtocolService_BalancesClient, error) { - stream, err := c.cc.NewStream(ctx, &_ViewProtocolService_serviceDesc.Streams[4], "/penumbra.view.v1alpha1.ViewProtocolService/Balances", opts...) +func (c *viewProtocolServiceClient) BalanceByAddress(ctx context.Context, in *BalanceByAddressRequest, opts ...grpc.CallOption) (ViewProtocolService_BalanceByAddressClient, error) { + stream, err := c.cc.NewStream(ctx, &_ViewProtocolService_serviceDesc.Streams[4], "/penumbra.view.v1alpha1.ViewProtocolService/BalanceByAddress", opts...) if err != nil { return nil, err } - x := &viewProtocolServiceBalancesClient{stream} + x := &viewProtocolServiceBalanceByAddressClient{stream} if err := x.ClientStream.SendMsg(in); err != nil { return nil, err } @@ -4019,17 +3649,17 @@ func (c *viewProtocolServiceClient) Balances(ctx context.Context, in *BalancesRe return x, nil } -type ViewProtocolService_BalancesClient interface { - Recv() (*BalancesResponse, error) +type ViewProtocolService_BalanceByAddressClient interface { + Recv() (*BalanceByAddressResponse, error) grpc.ClientStream } -type viewProtocolServiceBalancesClient struct { +type viewProtocolServiceBalanceByAddressClient struct { grpc.ClientStream } -func (x *viewProtocolServiceBalancesClient) Recv() (*BalancesResponse, error) { - m := new(BalancesResponse) +func (x *viewProtocolServiceBalanceByAddressClient) Recv() (*BalanceByAddressResponse, error) { + m := new(BalanceByAddressResponse) if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err } @@ -4122,58 +3752,14 @@ func (c *viewProtocolServiceClient) BroadcastTransaction(ctx context.Context, in return out, nil } -func (c *viewProtocolServiceClient) OwnedPositionIds(ctx context.Context, in *OwnedPositionIdsRequest, opts ...grpc.CallOption) (ViewProtocolService_OwnedPositionIdsClient, error) { - stream, err := c.cc.NewStream(ctx, &_ViewProtocolService_serviceDesc.Streams[6], "/penumbra.view.v1alpha1.ViewProtocolService/OwnedPositionIds", opts...) - if err != nil { - return nil, err - } - x := &viewProtocolServiceOwnedPositionIdsClient{stream} - if err := x.ClientStream.SendMsg(in); err != nil { - return nil, err - } - if err := x.ClientStream.CloseSend(); err != nil { - return nil, err - } - return x, nil -} - -type ViewProtocolService_OwnedPositionIdsClient interface { - Recv() (*OwnedPositionIdsResponse, error) - grpc.ClientStream -} - -type viewProtocolServiceOwnedPositionIdsClient struct { - grpc.ClientStream -} - -func (x *viewProtocolServiceOwnedPositionIdsClient) Recv() (*OwnedPositionIdsResponse, error) { - m := new(OwnedPositionIdsResponse) - if err := x.ClientStream.RecvMsg(m); err != nil { - return nil, err - } - return m, nil -} - -func (c *viewProtocolServiceClient) AuthorizeAndBuild(ctx context.Context, in *AuthorizeAndBuildRequest, opts ...grpc.CallOption) (*AuthorizeAndBuildResponse, error) { - out := new(AuthorizeAndBuildResponse) - err := c.cc.Invoke(ctx, "/penumbra.view.v1alpha1.ViewProtocolService/AuthorizeAndBuild", in, out, opts...) - if err != nil { - return nil, err - } - return out, nil -} - // ViewProtocolServiceServer is the server API for ViewProtocolService service. type ViewProtocolServiceServer interface { // Get current status of chain sync Status(context.Context, *StatusRequest) (*StatusResponse, error) // Stream sync status updates until the view service has caught up with the core.chain.v1alpha1. - // Returns a stream of `StatusStreamResponse`s. StatusStream(*StatusStreamRequest, ViewProtocolService_StatusStreamServer) error // Queries for notes that have been accepted by the core.chain.v1alpha1. - // Returns a stream of `NotesResponse`s. Notes(*NotesRequest, ViewProtocolService_NotesServer) error - // Returns a stream of `NotesForVotingResponse`s. NotesForVoting(*NotesForVotingRequest, ViewProtocolService_NotesForVotingServer) error // Returns authentication paths for the given note commitments. // @@ -4184,7 +3770,6 @@ type ViewProtocolServiceServer interface { Witness(context.Context, *WitnessRequest) (*WitnessResponse, error) WitnessAndBuild(context.Context, *WitnessAndBuildRequest) (*WitnessAndBuildResponse, error) // Queries for assets. - // Returns a stream of `AssetsResponse`s. Assets(*AssetsRequest, ViewProtocolService_AssetsServer) error // Query for the current chain parameters. ChainParameters(context.Context, *ChainParametersRequest) (*ChainParametersResponse, error) @@ -4196,9 +3781,8 @@ type ViewProtocolServiceServer interface { IndexByAddress(context.Context, *IndexByAddressRequest) (*IndexByAddressResponse, error) // Query for an ephemeral address EphemeralAddress(context.Context, *EphemeralAddressRequest) (*EphemeralAddressResponse, error) - // Query for balance of a given address. - // Returns a stream of `BalancesResponses`. - Balances(*BalancesRequest, ViewProtocolService_BalancesServer) error + // Query for balance of a given address + BalanceByAddress(*BalanceByAddressRequest, ViewProtocolService_BalanceByAddressServer) error // Query for a note by its note commitment, optionally waiting until the note is detected. NoteByCommitment(context.Context, *NoteByCommitmentRequest) (*NoteByCommitmentResponse, error) // Query for a swap by its swap commitment, optionally waiting until the swap is detected. @@ -4208,16 +3792,11 @@ type ViewProtocolServiceServer interface { // Query for a given transaction by its hash. TransactionInfoByHash(context.Context, *TransactionInfoByHashRequest) (*TransactionInfoByHashResponse, error) // Query for the full transactions in the given range of blocks. - // Returns a stream of `TransactionInfoResponse`s. TransactionInfo(*TransactionInfoRequest, ViewProtocolService_TransactionInfoServer) error // Query for a transaction plan TransactionPlanner(context.Context, *TransactionPlannerRequest) (*TransactionPlannerResponse, error) // Broadcast a transaction to the network, optionally waiting for full confirmation. BroadcastTransaction(context.Context, *BroadcastTransactionRequest) (*BroadcastTransactionResponse, error) - // Query for owned position IDs for the given trading pair and in the given position state. - OwnedPositionIds(*OwnedPositionIdsRequest, ViewProtocolService_OwnedPositionIdsServer) error - // Authorize a transaction plan and build the transaction. - AuthorizeAndBuild(context.Context, *AuthorizeAndBuildRequest) (*AuthorizeAndBuildResponse, error) } // UnimplementedViewProtocolServiceServer can be embedded to have forward compatible implementations. @@ -4260,8 +3839,8 @@ func (*UnimplementedViewProtocolServiceServer) IndexByAddress(ctx context.Contex func (*UnimplementedViewProtocolServiceServer) EphemeralAddress(ctx context.Context, req *EphemeralAddressRequest) (*EphemeralAddressResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method EphemeralAddress not implemented") } -func (*UnimplementedViewProtocolServiceServer) Balances(req *BalancesRequest, srv ViewProtocolService_BalancesServer) error { - return status.Errorf(codes.Unimplemented, "method Balances not implemented") +func (*UnimplementedViewProtocolServiceServer) BalanceByAddress(req *BalanceByAddressRequest, srv ViewProtocolService_BalanceByAddressServer) error { + return status.Errorf(codes.Unimplemented, "method BalanceByAddress not implemented") } func (*UnimplementedViewProtocolServiceServer) NoteByCommitment(ctx context.Context, req *NoteByCommitmentRequest) (*NoteByCommitmentResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method NoteByCommitment not implemented") @@ -4284,12 +3863,6 @@ func (*UnimplementedViewProtocolServiceServer) TransactionPlanner(ctx context.Co func (*UnimplementedViewProtocolServiceServer) BroadcastTransaction(ctx context.Context, req *BroadcastTransactionRequest) (*BroadcastTransactionResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method BroadcastTransaction not implemented") } -func (*UnimplementedViewProtocolServiceServer) OwnedPositionIds(req *OwnedPositionIdsRequest, srv ViewProtocolService_OwnedPositionIdsServer) error { - return status.Errorf(codes.Unimplemented, "method OwnedPositionIds not implemented") -} -func (*UnimplementedViewProtocolServiceServer) AuthorizeAndBuild(ctx context.Context, req *AuthorizeAndBuildRequest) (*AuthorizeAndBuildResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method AuthorizeAndBuild not implemented") -} func RegisterViewProtocolServiceServer(s grpc1.Server, srv ViewProtocolServiceServer) { s.RegisterService(&_ViewProtocolService_serviceDesc, srv) @@ -4523,24 +4096,24 @@ func _ViewProtocolService_EphemeralAddress_Handler(srv interface{}, ctx context. return interceptor(ctx, in, info, handler) } -func _ViewProtocolService_Balances_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(BalancesRequest) +func _ViewProtocolService_BalanceByAddress_Handler(srv interface{}, stream grpc.ServerStream) error { + m := new(BalanceByAddressRequest) if err := stream.RecvMsg(m); err != nil { return err } - return srv.(ViewProtocolServiceServer).Balances(m, &viewProtocolServiceBalancesServer{stream}) + return srv.(ViewProtocolServiceServer).BalanceByAddress(m, &viewProtocolServiceBalanceByAddressServer{stream}) } -type ViewProtocolService_BalancesServer interface { - Send(*BalancesResponse) error +type ViewProtocolService_BalanceByAddressServer interface { + Send(*BalanceByAddressResponse) error grpc.ServerStream } -type viewProtocolServiceBalancesServer struct { +type viewProtocolServiceBalanceByAddressServer struct { grpc.ServerStream } -func (x *viewProtocolServiceBalancesServer) Send(m *BalancesResponse) error { +func (x *viewProtocolServiceBalanceByAddressServer) Send(m *BalanceByAddressResponse) error { return x.ServerStream.SendMsg(m) } @@ -4673,45 +4246,6 @@ func _ViewProtocolService_BroadcastTransaction_Handler(srv interface{}, ctx cont return interceptor(ctx, in, info, handler) } -func _ViewProtocolService_OwnedPositionIds_Handler(srv interface{}, stream grpc.ServerStream) error { - m := new(OwnedPositionIdsRequest) - if err := stream.RecvMsg(m); err != nil { - return err - } - return srv.(ViewProtocolServiceServer).OwnedPositionIds(m, &viewProtocolServiceOwnedPositionIdsServer{stream}) -} - -type ViewProtocolService_OwnedPositionIdsServer interface { - Send(*OwnedPositionIdsResponse) error - grpc.ServerStream -} - -type viewProtocolServiceOwnedPositionIdsServer struct { - grpc.ServerStream -} - -func (x *viewProtocolServiceOwnedPositionIdsServer) Send(m *OwnedPositionIdsResponse) error { - return x.ServerStream.SendMsg(m) -} - -func _ViewProtocolService_AuthorizeAndBuild_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(AuthorizeAndBuildRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(ViewProtocolServiceServer).AuthorizeAndBuild(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/penumbra.view.v1alpha1.ViewProtocolService/AuthorizeAndBuild", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(ViewProtocolServiceServer).AuthorizeAndBuild(ctx, req.(*AuthorizeAndBuildRequest)) - } - return interceptor(ctx, in, info, handler) -} - var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ ServiceName: "penumbra.view.v1alpha1.ViewProtocolService", HandlerType: (*ViewProtocolServiceServer)(nil), @@ -4772,10 +4306,6 @@ var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ MethodName: "BroadcastTransaction", Handler: _ViewProtocolService_BroadcastTransaction_Handler, }, - { - MethodName: "AuthorizeAndBuild", - Handler: _ViewProtocolService_AuthorizeAndBuild_Handler, - }, }, Streams: []grpc.StreamDesc{ { @@ -4799,8 +4329,8 @@ var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, { - StreamName: "Balances", - Handler: _ViewProtocolService_Balances_Handler, + StreamName: "BalanceByAddress", + Handler: _ViewProtocolService_BalanceByAddress_Handler, ServerStreams: true, }, { @@ -4808,11 +4338,6 @@ var _ViewProtocolService_serviceDesc = grpc.ServiceDesc{ Handler: _ViewProtocolService_TransactionInfo_Handler, ServerStreams: true, }, - { - StreamName: "OwnedPositionIds", - Handler: _ViewProtocolService_OwnedPositionIds_Handler, - ServerStreams: true, - }, }, Metadata: "penumbra/view/v1alpha1/view.proto", } @@ -4889,88 +4414,6 @@ var _ViewAuthService_serviceDesc = grpc.ServiceDesc{ Metadata: "penumbra/view/v1alpha1/view.proto", } -func (m *AuthorizeAndBuildRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *AuthorizeAndBuildRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *AuthorizeAndBuildRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.AuthorizationData != nil { - { - size, err := m.AuthorizationData.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.TransactionPlan != nil { - { - size, err := m.TransactionPlan.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - -func (m *AuthorizeAndBuildResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *AuthorizeAndBuildResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *AuthorizeAndBuildResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.Transaction != nil { - { - size, err := m.Transaction.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *BroadcastTransactionRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5124,22 +4567,6 @@ func (m *TransactionPlannerRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro dAtA[i] = 0xc2 } } - if len(m.SwapClaims) > 0 { - for iNdEx := len(m.SwapClaims) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.SwapClaims[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x1 - i-- - dAtA[i] = 0xfa - } - } if len(m.Swaps) > 0 { for iNdEx := len(m.Swaps) - 1; iNdEx >= 0; iNdEx-- { { @@ -5181,15 +4608,10 @@ func (m *TransactionPlannerRequest) MarshalToSizedBuffer(dAtA []byte) (int, erro } } } - if m.Memo != nil { - { - size, err := m.Memo.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } + if len(m.Memo) > 0 { + i -= len(m.Memo) + copy(dAtA[i:], m.Memo) + i = encodeVarintView(dAtA, i, uint64(len(m.Memo))) i-- dAtA[i] = 0x1a } @@ -5340,41 +4762,6 @@ func (m *TransactionPlannerRequest_Swap) MarshalToSizedBuffer(dAtA []byte) (int, return len(dAtA) - i, nil } -func (m *TransactionPlannerRequest_SwapClaim) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *TransactionPlannerRequest_SwapClaim) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *TransactionPlannerRequest_SwapClaim) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.SwapCommitment != nil { - { - size, err := m.SwapCommitment.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func (m *TransactionPlannerRequest_Delegate) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5395,9 +4782,9 @@ func (m *TransactionPlannerRequest_Delegate) MarshalToSizedBuffer(dAtA []byte) ( _ = i var l int _ = l - if m.RateData != nil { + if m.IdentityKey != nil { { - size, err := m.RateData.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.IdentityKey.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5405,7 +4792,7 @@ func (m *TransactionPlannerRequest_Delegate) MarshalToSizedBuffer(dAtA []byte) ( i = encodeVarintView(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 } if m.Amount != nil { { @@ -5442,18 +4829,6 @@ func (m *TransactionPlannerRequest_Undelegate) MarshalToSizedBuffer(dAtA []byte) _ = i var l int _ = l - if m.RateData != nil { - { - size, err := m.RateData.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } if m.Value != nil { { size, err := m.Value.MarshalToSizedBuffer(dAtA[:i]) @@ -5524,16 +4899,6 @@ func (m *AddressByIndexRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.DisplayConfirm { - i-- - if m.DisplayConfirm { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } if m.AddressIndex != nil { { size, err := m.AddressIndex.MarshalToSizedBuffer(dAtA[:i]) @@ -5692,16 +5057,6 @@ func (m *EphemeralAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) _ = i var l int _ = l - if m.DisplayConfirm { - i-- - if m.DisplayConfirm { - dAtA[i] = 1 - } else { - dAtA[i] = 0 - } - i-- - dAtA[i] = 0x10 - } if m.AddressIndex != nil { { size, err := m.AddressIndex.MarshalToSizedBuffer(dAtA[:i]) @@ -5752,7 +5107,7 @@ func (m *EphemeralAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *BalancesRequest) Marshal() (dAtA []byte, err error) { +func (m *BalanceByAddressRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -5762,31 +5117,19 @@ func (m *BalancesRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *BalancesRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *BalanceByAddressRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *BalancesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *BalanceByAddressRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.AssetIdFilter != nil { - { - size, err := m.AssetIdFilter.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - if m.AccountFilter != nil { + if m.Address != nil { { - size, err := m.AccountFilter.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Address.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5799,7 +5142,7 @@ func (m *BalancesRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *BalancesResponse) Marshal() (dAtA []byte, err error) { +func (m *BalanceByAddressResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -5809,19 +5152,19 @@ func (m *BalancesResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *BalancesResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *BalanceByAddressResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *BalancesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *BalanceByAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if m.Balance != nil { + if m.Amount != nil { { - size, err := m.Balance.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Amount.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -5831,9 +5174,9 @@ func (m *BalancesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x12 } - if m.Account != nil { + if m.Asset != nil { { - size, err := m.Account.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Asset.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -6605,9 +5948,9 @@ func (m *AssetsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.DenomMetadata != nil { + if m.Asset != nil { { - size, err := m.DenomMetadata.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.Asset.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -6615,7 +5958,7 @@ func (m *AssetsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintView(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x12 + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -7631,124 +6974,6 @@ func (m *SwapRecord_HeightClaimed) MarshalToSizedBuffer(dAtA []byte) (int, error dAtA[i] = 0x30 return len(dAtA) - i, nil } -func (m *OwnedPositionIdsRequest) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *OwnedPositionIdsRequest) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OwnedPositionIdsRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.XTradingPair != nil { - { - size := m.XTradingPair.Size() - i -= size - if _, err := m.XTradingPair.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - if m.XPositionState != nil { - { - size := m.XPositionState.Size() - i -= size - if _, err := m.XPositionState.MarshalTo(dAtA[i:]); err != nil { - return 0, err - } - } - } - return len(dAtA) - i, nil -} - -func (m *OwnedPositionIdsRequest_PositionState) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OwnedPositionIdsRequest_PositionState) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.PositionState != nil { - { - size, err := m.PositionState.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} -func (m *OwnedPositionIdsRequest_TradingPair) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OwnedPositionIdsRequest_TradingPair) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - if m.TradingPair != nil { - { - size, err := m.TradingPair.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x12 - } - return len(dAtA) - i, nil -} -func (m *OwnedPositionIdsResponse) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *OwnedPositionIdsResponse) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *OwnedPositionIdsResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if m.PositionId != nil { - { - size, err := m.PositionId.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintView(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil -} - func encodeVarintView(dAtA []byte, offset int, v uint64) int { offset -= sovView(v) base := offset @@ -7760,36 +6985,6 @@ func encodeVarintView(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *AuthorizeAndBuildRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.TransactionPlan != nil { - l = m.TransactionPlan.Size() - n += 1 + l + sovView(uint64(l)) - } - if m.AuthorizationData != nil { - l = m.AuthorizationData.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} - -func (m *AuthorizeAndBuildResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Transaction != nil { - l = m.Transaction.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} - func (m *BroadcastTransactionRequest) Size() (n int) { if m == nil { return 0 @@ -7835,8 +7030,8 @@ func (m *TransactionPlannerRequest) Size() (n int) { l = m.Fee.Size() n += 1 + l + sovView(uint64(l)) } - if m.Memo != nil { - l = m.Memo.Size() + l = len(m.Memo) + if l > 0 { n += 1 + l + sovView(uint64(l)) } if m.XAccountGroupId != nil { @@ -7854,12 +7049,6 @@ func (m *TransactionPlannerRequest) Size() (n int) { n += 2 + l + sovView(uint64(l)) } } - if len(m.SwapClaims) > 0 { - for _, e := range m.SwapClaims { - l = e.Size() - n += 2 + l + sovView(uint64(l)) - } - } if len(m.Delegations) > 0 { for _, e := range m.Delegations { l = e.Size() @@ -7931,19 +7120,6 @@ func (m *TransactionPlannerRequest_Swap) Size() (n int) { return n } -func (m *TransactionPlannerRequest_SwapClaim) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.SwapCommitment != nil { - l = m.SwapCommitment.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} - func (m *TransactionPlannerRequest_Delegate) Size() (n int) { if m == nil { return 0 @@ -7954,8 +7130,8 @@ func (m *TransactionPlannerRequest_Delegate) Size() (n int) { l = m.Amount.Size() n += 1 + l + sovView(uint64(l)) } - if m.RateData != nil { - l = m.RateData.Size() + if m.IdentityKey != nil { + l = m.IdentityKey.Size() n += 1 + l + sovView(uint64(l)) } return n @@ -7971,10 +7147,6 @@ func (m *TransactionPlannerRequest_Undelegate) Size() (n int) { l = m.Value.Size() n += 1 + l + sovView(uint64(l)) } - if m.RateData != nil { - l = m.RateData.Size() - n += 1 + l + sovView(uint64(l)) - } return n } @@ -8001,9 +7173,6 @@ func (m *AddressByIndexRequest) Size() (n int) { l = m.AddressIndex.Size() n += 1 + l + sovView(uint64(l)) } - if m.DisplayConfirm { - n += 2 - } return n } @@ -8067,9 +7236,6 @@ func (m *EphemeralAddressRequest) Size() (n int) { l = m.AddressIndex.Size() n += 1 + l + sovView(uint64(l)) } - if m.DisplayConfirm { - n += 2 - } return n } @@ -8086,35 +7252,31 @@ func (m *EphemeralAddressResponse) Size() (n int) { return n } -func (m *BalancesRequest) Size() (n int) { +func (m *BalanceByAddressRequest) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.AccountFilter != nil { - l = m.AccountFilter.Size() - n += 1 + l + sovView(uint64(l)) - } - if m.AssetIdFilter != nil { - l = m.AssetIdFilter.Size() + if m.Address != nil { + l = m.Address.Size() n += 1 + l + sovView(uint64(l)) } return n } -func (m *BalancesResponse) Size() (n int) { +func (m *BalanceByAddressResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if m.Account != nil { - l = m.Account.Size() + if m.Asset != nil { + l = m.Asset.Size() n += 1 + l + sovView(uint64(l)) } - if m.Balance != nil { - l = m.Balance.Size() + if m.Amount != nil { + l = m.Amount.Size() n += 1 + l + sovView(uint64(l)) } return n @@ -8423,8 +7585,8 @@ func (m *AssetsResponse) Size() (n int) { } var l int _ = l - if m.DenomMetadata != nil { - l = m.DenomMetadata.Size() + if m.Asset != nil { + l = m.Asset.Size() n += 1 + l + sovView(uint64(l)) } return n @@ -8835,57 +7997,6 @@ func (m *SwapRecord_HeightClaimed) Size() (n int) { n += 1 + sovView(uint64(m.HeightClaimed)) return n } -func (m *OwnedPositionIdsRequest) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.XPositionState != nil { - n += m.XPositionState.Size() - } - if m.XTradingPair != nil { - n += m.XTradingPair.Size() - } - return n -} - -func (m *OwnedPositionIdsRequest_PositionState) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.PositionState != nil { - l = m.PositionState.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} -func (m *OwnedPositionIdsRequest_TradingPair) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.TradingPair != nil { - l = m.TradingPair.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} -func (m *OwnedPositionIdsResponse) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.PositionId != nil { - l = m.PositionId.Size() - n += 1 + l + sovView(uint64(l)) - } - return n -} func sovView(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 @@ -8893,7 +8004,7 @@ func sovView(x uint64) (n int) { func sozView(x uint64) (n int) { return sovView(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *AuthorizeAndBuildRequest) Unmarshal(dAtA []byte) error { +func (m *BroadcastTransactionRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -8916,15 +8027,15 @@ func (m *AuthorizeAndBuildRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: AuthorizeAndBuildRequest: wiretype end group for non-group") + return fmt.Errorf("proto: BroadcastTransactionRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: AuthorizeAndBuildRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: BroadcastTransactionRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TransactionPlan", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Transaction", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -8951,18 +8062,18 @@ func (m *AuthorizeAndBuildRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.TransactionPlan == nil { - m.TransactionPlan = &v1alpha1.TransactionPlan{} + if m.Transaction == nil { + m.Transaction = &v1alpha1.Transaction{} } - if err := m.TransactionPlan.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Transaction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AuthorizationData", wireType) + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field AwaitDetection", wireType) } - var msglen int + var v int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -8972,28 +8083,12 @@ func (m *AuthorizeAndBuildRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + v |= int(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.AuthorizationData == nil { - m.AuthorizationData = &v1alpha1.AuthorizationData{} - } - if err := m.AuthorizationData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex + m.AwaitDetection = bool(v != 0) default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -9015,7 +8110,7 @@ func (m *AuthorizeAndBuildRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *AuthorizeAndBuildResponse) Unmarshal(dAtA []byte) error { +func (m *BroadcastTransactionResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9038,207 +8133,15 @@ func (m *AuthorizeAndBuildResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: AuthorizeAndBuildResponse: wiretype end group for non-group") + return fmt.Errorf("proto: BroadcastTransactionResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: AuthorizeAndBuildResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: BroadcastTransactionResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Transaction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Transaction == nil { - m.Transaction = &v1alpha1.Transaction{} - } - if err := m.Transaction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthView - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *BroadcastTransactionRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: BroadcastTransactionRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: BroadcastTransactionRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Transaction", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Transaction == nil { - m.Transaction = &v1alpha1.Transaction{} - } - if err := m.Transaction.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field AwaitDetection", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.AwaitDetection = bool(v != 0) - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthView - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *BroadcastTransactionResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: BroadcastTransactionResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: BroadcastTransactionResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Id", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -9400,7 +8303,7 @@ func (m *TransactionPlannerRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Memo", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowView @@ -9410,27 +8313,23 @@ func (m *TransactionPlannerRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthView } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthView } if postIndex > l { return io.ErrUnexpectedEOF } - if m.Memo == nil { - m.Memo = &v1alpha1.MemoPlaintext{} - } - if err := m.Memo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.Memo = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 14: if wireType != 2 { @@ -9535,40 +8434,6 @@ func (m *TransactionPlannerRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 31: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SwapClaims", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.SwapClaims = append(m.SwapClaims, &TransactionPlannerRequest_SwapClaim{}) - if err := m.SwapClaims[len(m.SwapClaims)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 40: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Delegations", wireType) @@ -9972,92 +8837,6 @@ func (m *TransactionPlannerRequest_Swap) Unmarshal(dAtA []byte) error { } return nil } -func (m *TransactionPlannerRequest_SwapClaim) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: SwapClaim: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: SwapClaim: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SwapCommitment", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.SwapCommitment == nil { - m.SwapCommitment = &v1alpha11.StateCommitment{} - } - if err := m.SwapCommitment.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthView - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *TransactionPlannerRequest_Delegate) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -10123,9 +8902,9 @@ func (m *TransactionPlannerRequest_Delegate) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 3: + case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RateData", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field IdentityKey", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -10152,10 +8931,10 @@ func (m *TransactionPlannerRequest_Delegate) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.RateData == nil { - m.RateData = &v1alpha13.RateData{} + if m.IdentityKey == nil { + m.IdentityKey = &v1alpha11.IdentityKey{} } - if err := m.RateData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.IdentityKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -10245,42 +9024,6 @@ func (m *TransactionPlannerRequest_Undelegate) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RateData", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.RateData == nil { - m.RateData = &v1alpha13.RateData{} - } - if err := m.RateData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -10446,33 +9189,13 @@ func (m *AddressByIndexRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.AddressIndex == nil { - m.AddressIndex = &v1alpha11.AddressIndex{} - } - if err := m.AddressIndex.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DisplayConfirm", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } + if m.AddressIndex == nil { + m.AddressIndex = &v1alpha11.AddressIndex{} + } + if err := m.AddressIndex.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err } - m.DisplayConfirm = bool(v != 0) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -10816,26 +9539,6 @@ func (m *EphemeralAddressRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 2: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field DisplayConfirm", wireType) - } - var v int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - v |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - m.DisplayConfirm = bool(v != 0) default: iNdEx = preIndex skippy, err := skipView(dAtA[iNdEx:]) @@ -10943,7 +9646,7 @@ func (m *EphemeralAddressResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *BalancesRequest) Unmarshal(dAtA []byte) error { +func (m *BalanceByAddressRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -10966,51 +9669,15 @@ func (m *BalancesRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: BalancesRequest: wiretype end group for non-group") + return fmt.Errorf("proto: BalanceByAddressRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: BalancesRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: BalanceByAddressRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AccountFilter", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.AccountFilter == nil { - m.AccountFilter = &v1alpha11.AddressIndex{} - } - if err := m.AccountFilter.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field AssetIdFilter", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11037,10 +9704,10 @@ func (m *BalancesRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.AssetIdFilter == nil { - m.AssetIdFilter = &v1alpha11.AssetId{} + if m.Address == nil { + m.Address = &v1alpha11.Address{} } - if err := m.AssetIdFilter.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -11065,7 +9732,7 @@ func (m *BalancesRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *BalancesResponse) Unmarshal(dAtA []byte) error { +func (m *BalanceByAddressResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -11088,15 +9755,15 @@ func (m *BalancesResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: BalancesResponse: wiretype end group for non-group") + return fmt.Errorf("proto: BalanceByAddressResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: BalancesResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: BalanceByAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Account", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Asset", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11123,16 +9790,16 @@ func (m *BalancesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Account == nil { - m.Account = &v1alpha11.AddressIndex{} + if m.Asset == nil { + m.Asset = &v1alpha11.AssetId{} } - if err := m.Account.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Asset.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Balance", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Amount", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -11159,10 +9826,10 @@ func (m *BalancesResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Balance == nil { - m.Balance = &v1alpha11.Value{} + if m.Amount == nil { + m.Amount = &v1alpha11.Amount{} } - if err := m.Balance.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Amount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -12825,9 +11492,9 @@ func (m *AssetsResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: AssetsResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 2: + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field DenomMetadata", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Asset", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -12854,10 +11521,10 @@ func (m *AssetsResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.DenomMetadata == nil { - m.DenomMetadata = &v1alpha11.DenomMetadata{} + if m.Asset == nil { + m.Asset = &v1alpha11.Asset{} } - if err := m.DenomMetadata.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.Asset.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -12991,7 +11658,7 @@ func (m *ChainParametersResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Parameters == nil { - m.Parameters = &v1alpha14.ChainParameters{} + m.Parameters = &v1alpha13.ChainParameters{} } if err := m.Parameters.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -13127,7 +11794,7 @@ func (m *FMDParametersResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Parameters == nil { - m.Parameters = &v1alpha14.FmdParameters{} + m.Parameters = &v1alpha13.FmdParameters{} } if err := m.Parameters.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -14850,7 +13517,7 @@ func (m *SpendableNoteRecord) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Source == nil { - m.Source = &v1alpha14.NoteSource{} + m.Source = &v1alpha13.NoteSource{} } if err := m.Source.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -14972,7 +13639,7 @@ func (m *SwapRecord) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Swap == nil { - m.Swap = &v1alpha15.SwapPlaintext{} + m.Swap = &v1alpha14.SwapPlaintext{} } if err := m.Swap.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -15063,7 +13730,7 @@ func (m *SwapRecord) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OutputData == nil { - m.OutputData = &v1alpha15.BatchSwapOutputData{} + m.OutputData = &v1alpha14.BatchSwapOutputData{} } if err := m.OutputData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -15119,7 +13786,7 @@ func (m *SwapRecord) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Source == nil { - m.Source = &v1alpha14.NoteSource{} + m.Source = &v1alpha13.NoteSource{} } if err := m.Source.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -15146,212 +13813,6 @@ func (m *SwapRecord) Unmarshal(dAtA []byte) error { } return nil } -func (m *OwnedPositionIdsRequest) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: OwnedPositionIdsRequest: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OwnedPositionIdsRequest: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PositionState", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &v1alpha15.PositionState{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XPositionState = &OwnedPositionIdsRequest_PositionState{v} - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TradingPair", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - v := &v1alpha15.TradingPair{} - if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - m.XTradingPair = &OwnedPositionIdsRequest_TradingPair{v} - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthView - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *OwnedPositionIdsResponse) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: OwnedPositionIdsResponse: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: OwnedPositionIdsResponse: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PositionId", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowView - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthView - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthView - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.PositionId == nil { - m.PositionId = &v1alpha15.PositionId{} - } - if err := m.PositionId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipView(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthView - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func skipView(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 diff --git a/relayer/channel.go b/relayer/channel.go index 37e091c32..2f3f32b64 100644 --- a/relayer/channel.go +++ b/relayer/channel.go @@ -173,24 +173,12 @@ func (c *Chain) CloseChannel( DefaultMaxMsgLength, )). WithInitialBlockHistory(0). - WithMessageLifecycle(&processor.ChannelMessageLifecycle{ - Initial: &processor.ChannelMessage{ - ChainID: c.PathEnd.ChainID, - EventType: chantypes.EventTypeChannelCloseInit, - Info: provider.ChannelInfo{ - PortID: srcPortID, - ChannelID: srcChanID, - ConnID: c.PathEnd.ConnectionID, - }, - }, - Termination: &processor.ChannelMessage{ - ChainID: dst.PathEnd.ChainID, - EventType: chantypes.EventTypeChannelCloseConfirm, - Info: provider.ChannelInfo{ - CounterpartyPortID: srcPortID, - CounterpartyChannelID: srcChanID, - }, - }, + WithMessageLifecycle(&processor.ChannelCloseLifecycle{ + SrcChainID: c.PathEnd.ChainID, + SrcChannelID: srcChanID, + SrcPortID: srcPortID, + SrcConnID: c.PathEnd.ConnectionID, + DstConnID: dst.PathEnd.ConnectionID, }). Build(). Run(ctx) diff --git a/relayer/codecs/ethermint/codec.go b/relayer/codecs/ethermint/codec.go index 65f4df8b9..d237adfe4 100644 --- a/relayer/codecs/ethermint/codec.go +++ b/relayer/codecs/ethermint/codec.go @@ -3,7 +3,6 @@ package ethermint import ( codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/types/tx" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/relayer/v2/relayer/ethermint" ) @@ -21,9 +20,5 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { (*authtypes.GenesisAccount)(nil), &EthAccount{}, ) - registry.RegisterImplementations( - (*tx.TxExtensionOptionI)(nil), - &ExtensionOptionsWeb3Tx{}, - ðermint.ExtensionOptionDynamicFeeTx{}, - ) + } diff --git a/relayer/processor/metrics.go b/relayer/processor/metrics.go index 1048eed1e..73a0a317b 100644 --- a/relayer/processor/metrics.go +++ b/relayer/processor/metrics.go @@ -32,38 +32,18 @@ func (m *PrometheusMetrics) SetLatestHeight(chain string, height int64) { m.LatestHeightGauge.WithLabelValues(chain).Set(float64(height)) } -func (m *PrometheusMetrics) SetWalletBalance(chain, gasPrice, key, address, denom string, balance float64) { - m.WalletBalance.WithLabelValues(chain, gasPrice, key, address, denom).Set(balance) +func (m *PrometheusMetrics) SetWalletBalance(chain, key, address, denom string, balance float64) { + m.WalletBalance.WithLabelValues(chain, key, address, denom).Set(balance) } -func (m *PrometheusMetrics) SetFeesSpent(chain, gasPrice, key, address, denom string, amount float64) { - m.FeesSpent.WithLabelValues(chain, gasPrice, key, address, denom).Set(amount) -} - -func (m *PrometheusMetrics) SetClientExpiration(pathName, chain, clientID, trustingPeriod string, timeToExpiration time.Duration) { - m.ClientExpiration.WithLabelValues(pathName, chain, clientID, trustingPeriod).Set(timeToExpiration.Seconds()) -} - -func (m *PrometheusMetrics) SetClientTrustingPeriod(pathName, chain, clientID string, trustingPeriod time.Duration) { - m.ClientTrustingPeriod.WithLabelValues(pathName, chain, clientID).Set(trustingPeriod.Abs().Seconds()) -} - -func (m *PrometheusMetrics) IncBlockQueryFailure(chain, err string) { - m.BlockQueryFailure.WithLabelValues(chain, err).Inc() -} - -func (m *PrometheusMetrics) IncTxFailure(pathName, chain, errDesc string) { - m.TxFailureError.WithLabelValues(pathName, chain, errDesc).Inc() +func (m *PrometheusMetrics) SetFeesSpent(chain, key, address, denom string, amount float64) { + m.FeesSpent.WithLabelValues(chain, key, address, denom).Set(amount) } func NewPrometheusMetrics() *PrometheusMetrics { packetLabels := []string{"path_name", "chain", "channel", "port", "type"} heightLabels := []string{"chain"} - txFailureLabels := []string{"path_name", "chain", "cause"} - blockQueryFailureLabels := []string{"chain", "type"} - walletLabels := []string{"chain", "gas_price", "key", "address", "denom"} - clientExpirationLables := []string{"path_name", "chain", "client_id", "trusting_period"} - clientTrustingPeriodLables := []string{"path_name", "chain", "client_id"} + walletLabels := []string{"chain", "key", "address", "denom"} registry := prometheus.NewRegistry() registerer := promauto.With(registry) return &PrometheusMetrics{ diff --git a/relayer/processor/path_end_runtime.go b/relayer/processor/path_end_runtime.go index f9da526cb..78f760698 100644 --- a/relayer/processor/path_end_runtime.go +++ b/relayer/processor/path_end_runtime.go @@ -454,7 +454,7 @@ func (pathEnd *pathEndRuntime) shouldSendPacketMessage(message packetIBCMessage, pathEndForHeight = pathEnd } - if strings.Contains(pathEnd.clientState.ClientID, "tendermint") && message.info.Height >= pathEndForHeight.latestBlock.Height { + if strings.Contains(pathEnd.chainProvider.Type(), common.IconModule) && message.info.Height >= pathEndForHeight.latestBlock.Height { pathEnd.log.Debug("Waiting to relay packet message until counterparty height has incremented", zap.String("event_type", eventType), zap.Uint64("sequence", sequence), @@ -550,10 +550,13 @@ func (pathEnd *pathEndRuntime) removePacketRetention( // It will also determine if the message needs to be given up on entirely and remove retention if so. func (pathEnd *pathEndRuntime) shouldSendConnectionMessage(message connectionIBCMessage, counterparty *pathEndRuntime) bool { eventType := message.eventType - k := connectionInfoConnectionKey(message.info).Counterparty() - pathEndForHeight := counterparty - if strings.Contains(pathEnd.clientState.ClientID, "tendermint") && message.info.Height >= pathEndForHeight.latestBlock.Height { + k := ConnectionInfoConnectionKey(message.info) + if eventType != conntypes.EventTypeConnectionOpenInit { + k = k.Counterparty() + } + + if strings.Contains(pathEnd.chainProvider.Type(), common.IconModule) && message.info.Height >= counterparty.latestBlock.Height { pathEnd.log.Debug("Waiting to relay connection message until counterparty height has incremented", zap.Inline(k), zap.String("event_type", eventType), @@ -624,11 +627,14 @@ func (pathEnd *pathEndRuntime) shouldSendConnectionMessage(message connectionIBC // shouldSendChannelMessage determines if the channel handshake message should be sent now. // It will also determine if the message needs to be given up on entirely and remove retention if so. func (pathEnd *pathEndRuntime) shouldSendChannelMessage(message channelIBCMessage, counterparty *pathEndRuntime) bool { + eventType := message.eventType - channelKey := channelInfoChannelKey(message.info).Counterparty() + channelKey := ChannelInfoChannelKey(message.info) + if eventType != chantypes.EventTypeChannelOpenInit { + channelKey = channelKey.Counterparty() + } - pathEndForHeight := counterparty - if strings.Contains(pathEnd.clientState.ClientID, "tendermint") && message.info.Height >= pathEndForHeight.latestBlock.Height { + if strings.Contains(pathEnd.chainProvider.Type(), common.IconModule) && message.info.Height >= counterparty.latestBlock.Height { pathEnd.log.Debug("Waiting to relay channel message until counterparty height has incremented", zap.Inline(channelKey), zap.String("event_type", eventType), diff --git a/relayer/processor/path_processor.go b/relayer/processor/path_processor.go index 86bb2ccb2..6e7185ca3 100644 --- a/relayer/processor/path_processor.go +++ b/relayer/processor/path_processor.go @@ -30,7 +30,7 @@ const ( interchainQueryTimeout = 60 * time.Second // Amount of time between flushes if the previous flush failed. - flushFailureRetry = 5 * time.Second + flushFailureRetry = 15 * time.Second // If message assembly fails from either proof query failure on the source // or assembling the message for the destination, how many blocks should pass @@ -76,9 +76,6 @@ type PathProcessor struct { sentInitialMsg bool - // true if this is a localhost IBC connection - isLocalhost bool - maxMsgs uint64 metrics *PrometheusMetrics @@ -106,8 +103,6 @@ func NewPathProcessor( flushInterval time.Duration, maxMsgs uint64, ) *PathProcessor { - isLocalhost := pathEnd1.ClientID == ibcexported.LocalhostClientID - pp := &PathProcessor{ log: log, pathEnd1: newPathEndRuntime(log, pathEnd1, metrics), @@ -117,7 +112,6 @@ func NewPathProcessor( clientUpdateThresholdTime: clientUpdateThresholdTime, flushInterval: flushInterval, metrics: metrics, - isLocalhost: isLocalhost, maxMsgs: maxMsgs, } if flushInterval == 0 { @@ -333,7 +327,7 @@ func (pp *PathProcessor) processAvailableSignals(ctx context.Context, cancel fun // No new data to merge in, just retry handling. case <-pp.flushTimer.C: // Periodic flush to clear out any old packets - // pp.flush(ctx) // TODO original not commented + pp.handleFlush(ctx) } return false } @@ -361,8 +355,8 @@ func (pp *PathProcessor) Run(ctx context.Context, cancel func()) { continue } - if !pp.initialFlushComplete { - // pp.flush(ctx) // TODO :: commented by icon-project + if pp.shouldFlush() && !pp.initialFlushComplete { + // pp.handleFlush(ctx) pp.initialFlushComplete = true } else if pp.shouldTerminateForFlushComplete() { cancel() diff --git a/relayer/processor/path_processor_internal.go b/relayer/processor/path_processor_internal.go index 36547c5a9..1fa6fc4be 100644 --- a/relayer/processor/path_processor_internal.go +++ b/relayer/processor/path_processor_internal.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "errors" + "fmt" "sort" "sync" @@ -20,8 +21,9 @@ import ( // i.e. a MsgConnectionOpenInit or a MsgChannelOpenInit should be broadcasted to start // the handshake if this key exists in the relevant cache. const ( - preInitKey = "pre_init" - preCloseKey = "pre_close" + preInitKey = "pre_init" + preCloseKey = "pre_close" + maxPacketsPerFlush = 10 ) // getMessagesToSend returns only the lowest sequence message (if it should be sent) for ordered channels, @@ -34,25 +36,12 @@ func (pp *PathProcessor) getMessagesToSend( if len(msgs) == 0 { return } + if msgs[0].info.ChannelOrder == chantypes.ORDERED.String() { - // for packet messages on ordered channels, only handle the lowest sequence number now. - sort.SliceStable(msgs, func(i, j int) bool { - return msgs[i].info.Sequence < msgs[j].info.Sequence - }) - firstMsg := msgs[0] - switch firstMsg.eventType { - case chantypes.EventTypeRecvPacket: - if dst.shouldSendPacketMessage(firstMsg, src) { - dstMsgs = append(dstMsgs, firstMsg) - } - case common.EventTimeoutRequest: - if dst.shouldSendPacketMessage(firstMsg, src) { - dstMsgs = append(dstMsgs, firstMsg) - } - default: - if src.shouldSendPacketMessage(firstMsg, dst) { - srcMsgs = append(srcMsgs, firstMsg) - } + eventMessages := make(map[string][]packetIBCMessage) + + for _, m := range msgs { + eventMessages[m.eventType] = append(eventMessages[m.eventType], m) } for e, m := range eventMessages { @@ -61,82 +50,53 @@ func (pp *PathProcessor) getMessagesToSend( return m[i].info.Sequence < m[j].info.Sequence }) - foundFirst := false - MsgLoop: - for _, msg := range m { - if e == chantypes.EventTypeRecvPacket || e == chantypes.EventTypeAcknowledgePacket { - if msg.info.Sequence < lowestSeq[e] { - // TODO prune these from caches - continue MsgLoop - } else if msg.info.Sequence > lowestSeq[e] && !foundFirst { - switch e { - case chantypes.EventTypeRecvPacket: - dst.log.Debug("Not yet ready to relay this recv sequence", - zap.String("channel_id", msg.info.DestChannel), - zap.String("port_id", msg.info.DestPort), - zap.Uint64("expected", lowestSeq[e]), - zap.Uint64("actual", msg.info.Sequence), - ) - case chantypes.EventTypeAcknowledgePacket: - src.log.Debug("Not yet ready to relay this ack sequence", - zap.String("channel_id", msg.info.SourceChannel), - zap.String("port_id", msg.info.SourcePort), - zap.Uint64("expected", lowestSeq[e]), - zap.Uint64("actual", msg.info.Sequence), - ) - } - - break MsgLoop - } + if e == chantypes.EventTypeRecvPacket { + dstChan, dstPort := m[0].info.DestChannel, m[0].info.DestPort + res, err := dst.chainProvider.QueryNextSeqRecv(ctx, 0, dstChan, dstPort) + if err != nil { + dst.log.Error("Failed to query next sequence recv", + zap.String("channel_id", dstChan), + zap.String("port_id", dstPort), + zap.Error(err), + ) + return + } + + if m[0].info.Sequence != res.NextSequenceReceive { + dst.log.Error("Unexpected next sequence recv", + zap.String("channel_id", m[0].info.DestChannel), + zap.String("port_id", m[0].info.DestChannel), + zap.Uint64("expected", res.NextSequenceReceive), + zap.Uint64("actual", m[0].info.Sequence), + ) + return + } + } + + for i, msg := range m { + // only handle consecutive sequences on ordered channels + if i > 0 && msg.info.Sequence-1 != m[i-1].info.Sequence { + dst.log.Error("Packets are not consecutive", + zap.String("channel_id", m[0].info.DestChannel), + zap.String("port_id", m[0].info.DestChannel), + zap.Uint64("seq", msg.info.Sequence), + zap.Uint64("prior_seq", m[i-1].info.Sequence), + ) + break } switch e { case chantypes.EventTypeRecvPacket: - if len(dstMsgs) > 0 && dstMsgs[len(dstMsgs)-1].eventType == e && dstMsgs[len(dstMsgs)-1].info.Sequence != msg.info.Sequence-1 { - dst.log.Debug("Skipping non-consecutive packet(s)", - zap.String("event_type", e), - zap.String("channel_id", msg.info.DestChannel), - zap.String("port_id", msg.info.DestChannel), - zap.Uint64("seq", msg.info.Sequence), - zap.Uint64("prior_seq", dstMsgs[len(dstMsgs)-1].info.Sequence), - ) - break MsgLoop + if uint64(len(dstMsgs)) <= pp.maxMsgs && dst.shouldSendPacketMessage(msg, src) { + dstMsgs = append(dstMsgs, msg) } + case common.EventTimeoutRequest: if uint64(len(dstMsgs)) <= pp.maxMsgs && dst.shouldSendPacketMessage(msg, src) { - dst.log.Debug("Appending packet", - zap.String("event_type", e), - zap.String("channel_id", msg.info.DestChannel), - zap.String("port_id", msg.info.DestChannel), - zap.Uint64("seq", msg.info.Sequence), - ) dstMsgs = append(dstMsgs, msg) - if e == chantypes.EventTypeRecvPacket && msg.info.Sequence == lowestSeq[e] { - foundFirst = true - } } default: - if len(srcMsgs) > 0 && srcMsgs[len(srcMsgs)-1].eventType == e && srcMsgs[len(srcMsgs)-1].info.Sequence != msg.info.Sequence-1 { - src.log.Debug("Skipping non-consecutive packet(s)", - zap.String("event_type", e), - zap.String("channel_id", msg.info.SourceChannel), - zap.String("port_id", msg.info.SourcePort), - zap.Uint64("seq", msg.info.Sequence), - zap.Uint64("prior_seq", srcMsgs[len(srcMsgs)-1].info.Sequence), - ) - break MsgLoop - } - if uint64(len(srcMsgs)) <= pp.maxMsgs && src.shouldSendPacketMessage(msg, dst) { - src.log.Debug("Appending packet", - zap.String("event_type", e), - zap.String("channel_id", msg.info.SourceChannel), - zap.String("port_id", msg.info.SourcePort), - zap.Uint64("seq", msg.info.Sequence), - ) srcMsgs = append(srcMsgs, msg) - if e == chantypes.EventTypeAcknowledgePacket && msg.info.Sequence == lowestSeq[e] { - foundFirst = true - } } } } @@ -222,70 +182,59 @@ func (pp *PathProcessor) unrelayedPacketFlowMessages( toDeleteSrc[chantypes.EventTypeAcknowledgePacket] = append(toDeleteSrc[chantypes.EventTypeAcknowledgePacket], seq) } - if pathEndPacketFlowMessages.Dst.shouldSendChannelMessage(closeChan, pathEndPacketFlowMessages.Src) { - res.DstChannelMessage = append(res.DstChannelMessage, closeChan) - } - } else { - // ordered channel, and we have a channel close confirm, so packet-flow and channel-close-flow is complete. - // remove all retention of this sequence number and this channel-close-confirm. - res.ToDeleteDstChannel[chantypes.EventTypeChannelCloseConfirm] = append(res.ToDeleteDstChannel[chantypes.EventTypeChannelCloseConfirm], pathEndPacketFlowMessages.ChannelKey.Counterparty()) - res.ToDeleteSrc[chantypes.EventTypeSendPacket] = append(res.ToDeleteSrc[chantypes.EventTypeSendPacket], transferSeq) - res.ToDeleteSrc[chantypes.EventTypeTimeoutPacket] = append(res.ToDeleteSrc[chantypes.EventTypeTimeoutPacket], transferSeq) - res.ToDeleteDst[common.EventTimeoutRequest] = append(res.ToDeleteDst[common.EventTimeoutRequest], transferSeq) - - } - } else { - // unordered channel, and we have a timeout for this packet, so packet flow is complete - // remove all retention of this sequence number - res.ToDeleteSrc[chantypes.EventTypeSendPacket] = append(res.ToDeleteSrc[chantypes.EventTypeSendPacket], transferSeq) - res.ToDeleteSrc[chantypes.EventTypeTimeoutPacket] = append(res.ToDeleteSrc[chantypes.EventTypeTimeoutPacket], transferSeq) - res.ToDeleteDst[common.EventTimeoutRequest] = append(res.ToDeleteDst[common.EventTimeoutRequest], transferSeq) - - } - continue MsgTransferLoop + for seq, info := range pathEndPacketFlowMessages.SrcMsgTimeout { + deletePreInitIfMatches(info) + toDeleteSrc[chantypes.EventTypeSendPacket] = append(toDeleteSrc[chantypes.EventTypeSendPacket], seq) + toDeleteSrc[chantypes.EventTypeTimeoutPacket] = append(toDeleteSrc[chantypes.EventTypeTimeoutPacket], seq) + toDeleteDst[common.EventTimeoutRequest] = append(toDeleteDst[common.EventTimeoutRequest], seq) + if info.ChannelOrder == chantypes.ORDERED.String() { + // Channel is now closed on src. + // enqueue channel close init observation to be handled by channel close correlation + if _, ok := pathEndPacketFlowMessages.Src.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit]; !ok { + pathEndPacketFlowMessages.Src.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit] = make(ChannelMessageCache) } - } - - for timeoutOnCloseSeq := range pathEndPacketFlowMessages.SrcMsgTimeoutOnClose { - if transferSeq == timeoutOnCloseSeq { - // we have a timeout for this packet, so packet flow is complete - // remove all retention of this sequence number - res.ToDeleteSrc[chantypes.EventTypeSendPacket] = append(res.ToDeleteSrc[chantypes.EventTypeSendPacket], transferSeq) - res.ToDeleteSrc[chantypes.EventTypeTimeoutPacketOnClose] = append(res.ToDeleteSrc[chantypes.EventTypeTimeoutPacketOnClose], transferSeq) - continue MsgTransferLoop + pathEndPacketFlowMessages.Src.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit][k] = provider.ChannelInfo{ + Height: info.Height, + PortID: info.SourcePort, + ChannelID: info.SourceChannel, + CounterpartyPortID: info.DestPort, + CounterpartyChannelID: info.DestChannel, + Order: orderFromString(info.ChannelOrder), } } + } - for requestTimeoutSeq, msgTimeoutRequest := range pathEndPacketFlowMessages.DstMsgRequestTimeout { - if transferSeq == requestTimeoutSeq { - timeoutMsg := packetIBCMessage{ - eventType: chantypes.EventTypeTimeoutPacket, - info: msgTimeoutRequest, - } - msgs = append(msgs, timeoutMsg) - continue MsgTransferLoop - } + processRemovals() + + for seq, info := range pathEndPacketFlowMessages.DstMsgRecvPacket { + deletePreInitIfMatches(info) + toDeleteSrc[chantypes.EventTypeSendPacket] = append(toDeleteSrc[chantypes.EventTypeSendPacket], seq) + + if len(info.Ack) == 0 { + // have recv_packet but not write_acknowledgement yet. skip for now. + continue } - for msgRecvSeq, msgAcknowledgement := range pathEndPacketFlowMessages.DstMsgRecvPacket { - if transferSeq == msgRecvSeq { - if len(msgAcknowledgement.Ack) == 0 { - // have recv_packet but not write_acknowledgement yet. skip for now. - continue MsgTransferLoop - } - // msg is received by dst chain, but no ack yet. Need to relay ack from dst to src! - ackMsg := packetIBCMessage{ - eventType: chantypes.EventTypeAcknowledgePacket, - info: msgAcknowledgement, - } - msgs = append(msgs, ackMsg) - continue MsgTransferLoop - } + // msg is received by dst chain, but no ack yet. Need to relay ack from dst to src! + ackMsg := packetIBCMessage{ + eventType: chantypes.EventTypeAcknowledgePacket, + info: info, } msgs = append(msgs, ackMsg) } processRemovals() + for seq, msgTimeoutRequest := range pathEndPacketFlowMessages.DstMsgRequestTimeout { + toDeleteSrc[chantypes.EventTypeSendPacket] = append(toDeleteSrc[chantypes.EventTypeSendPacket], seq) + toDeleteDst[common.EventTimeoutRequest] = append(toDeleteDst[common.EventTimeoutRequest], seq) + timeoutMsg := packetIBCMessage{ + eventType: chantypes.EventTypeTimeoutPacket, + info: msgTimeoutRequest, + } + msgs = append(msgs, timeoutMsg) + } + processRemovals() + for _, info := range pathEndPacketFlowMessages.SrcMsgTransfer { deletePreInitIfMatches(info) @@ -296,11 +245,12 @@ func (pp *PathProcessor) unrelayedPacketFlowMessages( var timeoutOnCloseErr *provider.TimeoutOnCloseError if pathEndPacketFlowMessages.Dst.chainProvider.Type() == common.IconModule { + switch { case errors.As(err, &timeoutHeightErr) || errors.As(err, &timeoutTimestampErr): timeoutRequestMsg := packetIBCMessage{ eventType: common.EventTimeoutRequest, - info: msgTransfer, + info: info, } msgs = append(msgs, timeoutRequestMsg) @@ -310,8 +260,7 @@ func (pp *PathProcessor) unrelayedPacketFlowMessages( zap.Error(err), ) } - continue MsgTransferLoop - + continue } switch { @@ -344,19 +293,10 @@ func (pp *PathProcessor) unrelayedPacketFlowMessages( processRemovals() - // now iterate through packet-flow-complete messages and remove any leftover messages if the MsgTransfer or MsgRecvPacket was in a previous block that we did not query - for ackSeq := range pathEndPacketFlowMessages.SrcMsgAcknowledgement { - res.ToDeleteSrc[chantypes.EventTypeSendPacket] = append(res.ToDeleteSrc[chantypes.EventTypeSendPacket], ackSeq) - res.ToDeleteDst[chantypes.EventTypeRecvPacket] = append(res.ToDeleteDst[chantypes.EventTypeRecvPacket], ackSeq) - res.ToDeleteDst[chantypes.EventTypeWriteAck] = append(res.ToDeleteDst[chantypes.EventTypeWriteAck], ackSeq) - res.ToDeleteSrc[chantypes.EventTypeAcknowledgePacket] = append(res.ToDeleteSrc[chantypes.EventTypeAcknowledgePacket], ackSeq) - } - for timeoutSeq, msgTimeout := range pathEndPacketFlowMessages.SrcMsgTimeout { - if msgTimeout.ChannelOrder != chantypes.ORDERED.String() { - res.ToDeleteSrc[chantypes.EventTypeSendPacket] = append(res.ToDeleteSrc[chantypes.EventTypeSendPacket], timeoutSeq) - res.ToDeleteSrc[chantypes.EventTypeTimeoutPacket] = append(res.ToDeleteSrc[chantypes.EventTypeTimeoutPacket], timeoutSeq) - res.ToDeleteDst[common.EventTimeoutRequest] = append(res.ToDeleteDst[common.EventTimeoutRequest], timeoutSeq) - + for _, info := range pathEndPacketFlowMessages.SrcPreTransfer { + msgTransfer := packetIBCMessage{ + eventType: chantypes.EventTypeSendPacket, + info: info, } msgs = append(msgs, msgTransfer) } @@ -517,74 +457,8 @@ func (pp *PathProcessor) unrelayedChannelHandshakeMessages( toDeleteDst = make(map[string][]ChannelKey) } -ConnectionHandshakeLoop: - for openInitKey, openInitMsg := range pathEndConnectionHandshakeMessages.SrcMsgConnectionOpenInit { - var foundOpenTry *provider.ConnectionInfo - - for openTryKey, openTryMsg := range pathEndConnectionHandshakeMessages.DstMsgConnectionOpenTry { - // MsgConnectionOpenInit does not have counterparty connection ID, so check if everything - // else matches for counterparty. If so, add counterparty connection ID for - // the checks later on in this function. - if openInitKey == openTryKey.Counterparty().MsgInitKey() { - openInitKey.CounterpartyConnID = openTryKey.ConnectionID - foundOpenTry = &openTryMsg - break - } - } - - if foundOpenTry == nil { - // need to send an open try to dst - msgOpenTry := connectionIBCMessage{ - eventType: conntypes.EventTypeConnectionOpenTry, - info: openInitMsg, - } - if pathEndConnectionHandshakeMessages.Dst.shouldSendConnectionMessage(msgOpenTry, pathEndConnectionHandshakeMessages.Src) { - res.DstMessages = append(res.DstMessages, msgOpenTry) - } - continue ConnectionHandshakeLoop - } - - var foundOpenAck *provider.ConnectionInfo - for openAckKey, openAckMsg := range pathEndConnectionHandshakeMessages.SrcMsgConnectionOpenAck { - if openInitKey == openAckKey { - foundOpenAck = &openAckMsg - break - } - } - - if foundOpenAck == nil { - // need to send an open ack to src - msgOpenAck := connectionIBCMessage{ - eventType: conntypes.EventTypeConnectionOpenAck, - info: *foundOpenTry, - } - if pathEndConnectionHandshakeMessages.Src.shouldSendConnectionMessage(msgOpenAck, pathEndConnectionHandshakeMessages.Dst) { - res.SrcMessages = append(res.SrcMessages, msgOpenAck) - } - continue ConnectionHandshakeLoop - } - var foundOpenConfirm *provider.ConnectionInfo - for openConfirmKey, openConfirmMsg := range pathEndConnectionHandshakeMessages.DstMsgConnectionOpenConfirm { - if openInitKey == openConfirmKey.Counterparty() { - foundOpenConfirm = &openConfirmMsg - break - } - } - if foundOpenConfirm == nil { - // need to send an open confirm to dst - msgOpenConfirm := connectionIBCMessage{ - eventType: conntypes.EventTypeConnectionOpenConfirm, - info: *foundOpenAck, - } - if pathEndConnectionHandshakeMessages.Dst.shouldSendConnectionMessage(msgOpenConfirm, pathEndConnectionHandshakeMessages.Src) { - res.DstMessages = append(res.DstMessages, msgOpenConfirm) - } - continue ConnectionHandshakeLoop - } - // handshake is complete for this connection, remove all retention. - res.ToDeleteDst[conntypes.EventTypeConnectionOpenTry] = append(res.ToDeleteDst[conntypes.EventTypeConnectionOpenTry], openInitKey) - res.ToDeleteSrc[conntypes.EventTypeConnectionOpenAck] = append(res.ToDeleteSrc[conntypes.EventTypeConnectionOpenAck], openInitKey) - res.ToDeleteDst[conntypes.EventTypeConnectionOpenConfirm] = append(res.ToDeleteDst[conntypes.EventTypeConnectionOpenConfirm], openInitKey) + for chanKey := range pathEndChannelHandshakeMessages.DstMsgChannelOpenConfirm { + // found open confirm, channel handshake complete. remove all retention counterpartyKey := chanKey.Counterparty() toDeleteDst[chantypes.EventTypeChannelOpenConfirm] = append( @@ -666,7 +540,6 @@ ConnectionHandshakeLoop: eventType: chantypes.EventTypeChannelOpenTry, info: info, } - if pathEndChannelHandshakeMessages.Dst.shouldSendChannelMessage( msgOpenTry, pathEndChannelHandshakeMessages.Src, ) { @@ -912,7 +785,7 @@ func (pp *PathProcessor) queuePreInitMessages(cancel func()) { pp.pathEnd2.messageCache.PacketFlow[channelKey][eventType][0] = m.Initial.Info } case *ConnectionMessageLifecycle: - + pp.sentInitialMsg = true if m.Initial == nil { return } @@ -920,7 +793,16 @@ func (pp *PathProcessor) queuePreInitMessages(cancel func()) { if !pp.IsRelevantClient(m.Initial.ChainID, m.Initial.Info.ClientID) { return } - + eventType, ok := observedEventTypeForDesiredMessage[m.Initial.EventType] + if !ok { + pp.log.Error( + "Failed to queue initial connection message, event type not handled", + zap.String("event_type", m.Initial.EventType), + ) + cancel() + return + } + connKey := ConnectionInfoConnectionKey(m.Initial.Info) if m.Initial.ChainID == pp.pathEnd1.info.ChainID { _, ok = pp.pathEnd1.messageCache.ConnectionHandshake[eventType] if !ok { @@ -943,20 +825,92 @@ func (pp *PathProcessor) queuePreInitMessages(cancel func()) { if !pp.IsRelevantConnection(m.Initial.ChainID, m.Initial.Info.ConnID) { return } - + eventType, ok := observedEventTypeForDesiredMessage[m.Initial.EventType] + if !ok { + pp.log.Error( + "Failed to queue initial channel message, event type not handled", + zap.String("event_type", m.Initial.EventType), + ) + cancel() + return + } + chanKey := ChannelInfoChannelKey(m.Initial.Info) if m.Initial.ChainID == pp.pathEnd1.info.ChainID { - pathEnd1Messages.channelMessages = append(pathEnd1Messages.channelMessages, channelIBCMessage{ - eventType: m.Initial.EventType, - info: m.Initial.Info, - }) + _, ok = pp.pathEnd1.messageCache.ChannelHandshake[eventType] + if !ok { + pp.pathEnd1.messageCache.ChannelHandshake[eventType] = make(ChannelMessageCache) + } + pp.pathEnd1.messageCache.ChannelHandshake[eventType][chanKey] = m.Initial.Info } else if m.Initial.ChainID == pp.pathEnd2.info.ChainID { + _, ok = pp.pathEnd2.messageCache.ChannelHandshake[eventType] + if !ok { + pp.pathEnd2.messageCache.ChannelHandshake[eventType] = make(ChannelMessageCache) + } + pp.pathEnd2.messageCache.ChannelHandshake[eventType][chanKey] = m.Initial.Info + } + case *ChannelCloseLifecycle: + pp.sentInitialMsg = true - pathEnd2Messages.channelMessages = append(pathEnd2Messages.channelMessages, channelIBCMessage{ - eventType: m.Initial.EventType, - info: m.Initial.Info, - }) + if !pp.IsRelevantConnection(pp.pathEnd1.info.ChainID, m.SrcConnID) { + return + } + + for k, open := range pp.pathEnd1.channelStateCache { + if k.ChannelID == m.SrcChannelID && k.PortID == m.SrcPortID && k.CounterpartyChannelID != "" && k.CounterpartyPortID != "" { + if open { + // channel is still open on pathEnd1 + break + } + if counterpartyOpen, ok := pp.pathEnd2.channelStateCache[k.Counterparty()]; ok && !counterpartyOpen { + pp.log.Info("Channel already closed on both sides") + cancel() + return + } + // queue channel close init on pathEnd1 + if _, ok := pp.pathEnd1.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit]; !ok { + pp.pathEnd1.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit] = make(ChannelMessageCache) + } + pp.pathEnd1.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit][k] = provider.ChannelInfo{ + PortID: k.PortID, + ChannelID: k.ChannelID, + CounterpartyPortID: k.CounterpartyPortID, + CounterpartyChannelID: k.CounterpartyChannelID, + ConnID: m.SrcConnID, + } + return + } + } + + for k, open := range pp.pathEnd2.channelStateCache { + if k.CounterpartyChannelID == m.SrcChannelID && k.CounterpartyPortID == m.SrcPortID && k.ChannelID != "" && k.PortID != "" { + if open { + // channel is still open on pathEnd2 + break + } + if counterpartyChanState, ok := pp.pathEnd1.channelStateCache[k.Counterparty()]; ok && !counterpartyChanState { + pp.log.Info("Channel already closed on both sides") + cancel() + return + } + // queue channel close init on pathEnd2 + if _, ok := pp.pathEnd2.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit]; !ok { + pp.pathEnd2.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit] = make(ChannelMessageCache) + } + pp.pathEnd2.messageCache.ChannelHandshake[chantypes.EventTypeChannelCloseInit][k] = provider.ChannelInfo{ + PortID: k.PortID, + ChannelID: k.ChannelID, + CounterpartyPortID: k.CounterpartyPortID, + CounterpartyChannelID: k.CounterpartyChannelID, + ConnID: m.DstConnID, + } + } } + pp.log.Error("This channel is unable to be closed. Channel must already be closed on one chain.", + zap.String("src_channel_id", m.SrcChannelID), + zap.String("src_port_id", m.SrcPortID), + ) + cancel() } } @@ -988,10 +942,8 @@ func (pp *PathProcessor) processLatestMessages(ctx context.Context, cancel func( SrcMsgConnectionOpenAck: pp.pathEnd2.messageCache.ConnectionHandshake[conntypes.EventTypeConnectionOpenAck], DstMsgConnectionOpenConfirm: pp.pathEnd1.messageCache.ConnectionHandshake[conntypes.EventTypeConnectionOpenConfirm], } - - pathEnd1ConnectionHandshakeRes := pp.getUnrelayedConnectionHandshakeMessagesAndToDelete(pathEnd1ConnectionHandshakeMessages) - - pathEnd2ConnectionHandshakeRes := pp.getUnrelayedConnectionHandshakeMessagesAndToDelete(pathEnd2ConnectionHandshakeMessages) + pathEnd1ConnectionHandshakeRes := pp.unrelayedConnectionHandshakeMessages(pathEnd1ConnectionHandshakeMessages) + pathEnd2ConnectionHandshakeRes := pp.unrelayedConnectionHandshakeMessages(pathEnd2ConnectionHandshakeMessages) pathEnd1ChannelHandshakeMessages := pathEndChannelHandshakeMessages{ Src: pp.pathEnd1, @@ -1012,9 +964,8 @@ func (pp *PathProcessor) processLatestMessages(ctx context.Context, cancel func( SrcMsgChannelOpenAck: pp.pathEnd2.messageCache.ChannelHandshake[chantypes.EventTypeChannelOpenAck], DstMsgChannelOpenConfirm: pp.pathEnd1.messageCache.ChannelHandshake[chantypes.EventTypeChannelOpenConfirm], } - - pathEnd1ChannelHandshakeRes := pp.getUnrelayedChannelHandshakeMessagesAndToDelete(pathEnd1ChannelHandshakeMessages) - pathEnd2ChannelHandshakeRes := pp.getUnrelayedChannelHandshakeMessagesAndToDelete(pathEnd2ChannelHandshakeMessages) + pathEnd1ChannelHandshakeRes := pp.unrelayedChannelHandshakeMessages(pathEnd1ChannelHandshakeMessages) + pathEnd2ChannelHandshakeRes := pp.unrelayedChannelHandshakeMessages(pathEnd2ChannelHandshakeMessages) // process the packet flows for both path ends to determine what needs to be relayed pathEnd1ProcessRes := make([]pathEndPacketFlowResponse, len(channelPairs)) @@ -1039,29 +990,29 @@ func (pp *PathProcessor) processLatestMessages(ctx context.Context, cancel func( } pathEnd1PacketFlowMessages := pathEndPacketFlowMessages{ - Src: pp.pathEnd1, - Dst: pp.pathEnd2, - ChannelKey: pair.pathEnd1ChannelKey, - SrcMsgTransfer: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][chantypes.EventTypeSendPacket], - DstMsgRecvPacket: pathEnd1DstMsgRecvPacket, - SrcMsgAcknowledgement: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][chantypes.EventTypeAcknowledgePacket], - SrcMsgTimeout: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][chantypes.EventTypeTimeoutPacket], - SrcMsgTimeoutOnClose: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][chantypes.EventTypeTimeoutPacketOnClose], - DstMsgChannelCloseConfirm: pathEnd2ChannelCloseConfirm, - DstMsgRequestTimeout: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][common.EventTimeoutRequest], + Src: pp.pathEnd1, + Dst: pp.pathEnd2, + ChannelKey: pair.pathEnd1ChannelKey, + SrcPreTransfer: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][preInitKey], + SrcMsgTransfer: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][chantypes.EventTypeSendPacket], + DstMsgRecvPacket: pathEnd1DstMsgRecvPacket, + SrcMsgAcknowledgement: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][chantypes.EventTypeAcknowledgePacket], + SrcMsgTimeout: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][chantypes.EventTypeTimeoutPacket], + SrcMsgTimeoutOnClose: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][chantypes.EventTypeTimeoutPacketOnClose], + DstMsgRequestTimeout: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][common.EventTimeoutRequest], } pathEnd2PacketFlowMessages := pathEndPacketFlowMessages{ - Src: pp.pathEnd2, - Dst: pp.pathEnd1, - ChannelKey: pair.pathEnd2ChannelKey, - SrcMsgTransfer: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][chantypes.EventTypeSendPacket], - DstMsgRecvPacket: pathEnd2DstMsgRecvPacket, - SrcMsgAcknowledgement: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][chantypes.EventTypeAcknowledgePacket], - SrcMsgTimeout: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][chantypes.EventTypeTimeoutPacket], - SrcMsgTimeoutOnClose: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][chantypes.EventTypeTimeoutPacketOnClose], - DstMsgChannelCloseConfirm: pathEnd1ChannelCloseConfirm, - DstMsgRequestTimeout: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][common.EventTimeoutRequest], + Src: pp.pathEnd2, + Dst: pp.pathEnd1, + ChannelKey: pair.pathEnd2ChannelKey, + SrcPreTransfer: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd1ChannelKey][preInitKey], + SrcMsgTransfer: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][chantypes.EventTypeSendPacket], + DstMsgRecvPacket: pathEnd2DstMsgRecvPacket, + SrcMsgAcknowledgement: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][chantypes.EventTypeAcknowledgePacket], + SrcMsgTimeout: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][chantypes.EventTypeTimeoutPacket], + SrcMsgTimeoutOnClose: pp.pathEnd2.messageCache.PacketFlow[pair.pathEnd2ChannelKey][chantypes.EventTypeTimeoutPacketOnClose], + DstMsgRequestTimeout: pp.pathEnd1.messageCache.PacketFlow[pair.pathEnd1ChannelKey][common.EventTimeoutRequest], } pathEnd1ProcessRes[i] = pp.unrelayedPacketFlowMessages(ctx, pathEnd1PacketFlowMessages) @@ -1247,13 +1198,7 @@ func queryPacketCommitments( } } -// skippedPackets is used to track the number of packets skipped during a flush. -type skippedPackets struct { - Recv uint64 - Ack uint64 -} - -// queuePendingRecvAndAcks returns the number of packets skipped during a flush (nil if none). +// queuePendingRecvAndAcks returns whether flush can be considered complete (none skipped). func (pp *PathProcessor) queuePendingRecvAndAcks( ctx context.Context, src, dst *pathEndRuntime, @@ -1263,36 +1208,32 @@ func (pp *PathProcessor) queuePendingRecvAndAcks( dstCache ChannelPacketMessagesCache, srcMu sync.Locker, dstMu sync.Locker, -) (*skippedPackets, error) { +) (bool, error) { if len(seqs) == 0 { src.log.Debug("Nothing to flush", zap.String("channel", k.ChannelID), zap.String("port", k.PortID)) - return nil, nil + return true, nil } dstChan, dstPort := k.CounterpartyChannelID, k.CounterpartyPortID unrecv, err := dst.chainProvider.QueryUnreceivedPackets(ctx, dst.latestBlock.Height, dstChan, dstPort, seqs) if err != nil { - return nil, err + return false, err } dstHeight := int64(dst.latestBlock.Height) - var order chantypes.Order - if len(unrecv) > 0 { channel, err := dst.chainProvider.QueryChannel(ctx, dstHeight, dstChan, dstPort) if err != nil { - return nil, err + return false, err } - order = channel.Channel.Ordering - if channel.Channel.Ordering == chantypes.ORDERED { nextSeqRecv, err := dst.chainProvider.QueryNextSeqRecv(ctx, dstHeight, dstChan, dstPort) if err != nil { - return nil, err + return false, err } var newUnrecv []uint64 @@ -1313,7 +1254,7 @@ func (pp *PathProcessor) queuePendingRecvAndAcks( var eg errgroup.Group - var skipped *skippedPackets + skipped := false for i, seq := range unrecv { srcMu.Lock() @@ -1322,11 +1263,8 @@ func (pp *PathProcessor) queuePendingRecvAndAcks( } srcMu.Unlock() - if i >= int(pp.maxMsgs) { - if skipped == nil { - skipped = new(skippedPackets) - } - skipped.Recv = uint64(len(unrecv) - i) + if i >= maxPacketsPerFlush { + skipped = true break } @@ -1361,7 +1299,7 @@ func (pp *PathProcessor) queuePendingRecvAndAcks( } if err := eg.Wait(); err != nil { - return skipped, err + return false, err } if len(unrecv) > 0 { @@ -1399,11 +1337,8 @@ SeqLoop: } dstMu.Unlock() - if i >= int(pp.maxMsgs) { - if skipped == nil { - skipped = new(skippedPackets) - } - skipped.Ack = uint64(len(unacked) - i) + if i >= maxPacketsPerFlush { + skipped = true break } @@ -1422,7 +1357,6 @@ SeqLoop: } ck := k.Counterparty() - recvPacket.ChannelOrder = order.String() dstMu.Lock() dstCache.Cache(chantypes.EventTypeRecvPacket, ck, seq, recvPacket) dstCache.Cache(chantypes.EventTypeWriteAck, ck, seq, recvPacket) @@ -1433,7 +1367,7 @@ SeqLoop: } if err := eg.Wait(); err != nil { - return skipped, err + return false, err } if len(unacked) > 0 { @@ -1450,7 +1384,7 @@ SeqLoop: ) } - return skipped, nil + return !skipped, nil } // flush runs queries to relay any pending messages which may have been @@ -1468,8 +1402,8 @@ func (pp *PathProcessor) flush(ctx context.Context) error { // Query remaining packet commitments on both chains var eg errgroup.Group - for k, cs := range pp.pathEnd1.channelStateCache { - if !cs.Open { + for k, open := range pp.pathEnd1.channelStateCache { + if !open { continue } if !pp.pathEnd1.info.ShouldRelayChannel(ChainChannelKey{ @@ -1481,8 +1415,8 @@ func (pp *PathProcessor) flush(ctx context.Context) error { } eg.Go(queryPacketCommitments(ctx, pp.pathEnd1, k, commitments1, &commitments1Mu)) } - for k, cs := range pp.pathEnd2.channelStateCache { - if !cs.Open { + for k, open := range pp.pathEnd2.channelStateCache { + if !open { continue } if !pp.pathEnd2.info.ShouldRelayChannel(ChainChannelKey{ @@ -1503,20 +1437,17 @@ func (pp *PathProcessor) flush(ctx context.Context) error { // 1. Packet commitment is on source, but MsgRecvPacket has not yet been relayed to destination // 2. Packet commitment is on source, and MsgRecvPacket has been relayed to destination, but MsgAcknowledgement has not been written to source to clear the packet commitment. // Based on above conditions, enqueue MsgRecvPacket and MsgAcknowledgement messages - skipped := make(map[string]map[ChannelKey]skippedPackets) + skipped := false for k, seqs := range commitments1 { k := k seqs := seqs eg.Go(func() error { - s, err := pp.queuePendingRecvAndAcks(ctx, pp.pathEnd1, pp.pathEnd2, k, seqs, pathEnd1Cache.PacketFlow, pathEnd2Cache.PacketFlow, &pathEnd1CacheMu, &pathEnd2CacheMu) + done, err := pp.queuePendingRecvAndAcks(ctx, pp.pathEnd1, pp.pathEnd2, k, seqs, pathEnd1Cache.PacketFlow, pathEnd2Cache.PacketFlow, &pathEnd1CacheMu, &pathEnd2CacheMu) if err != nil { return err } - if s != nil { - if _, ok := skipped[pp.pathEnd1.info.ChainID]; !ok { - skipped[pp.pathEnd1.info.ChainID] = make(map[ChannelKey]skippedPackets) - } - skipped[pp.pathEnd1.info.ChainID][k] = *s + if !done { + skipped = true } return nil }) @@ -1526,15 +1457,12 @@ func (pp *PathProcessor) flush(ctx context.Context) error { k := k seqs := seqs eg.Go(func() error { - s, err := pp.queuePendingRecvAndAcks(ctx, pp.pathEnd2, pp.pathEnd1, k, seqs, pathEnd2Cache.PacketFlow, pathEnd1Cache.PacketFlow, &pathEnd2CacheMu, &pathEnd1CacheMu) + done, err := pp.queuePendingRecvAndAcks(ctx, pp.pathEnd2, pp.pathEnd1, k, seqs, pathEnd2Cache.PacketFlow, pathEnd1Cache.PacketFlow, &pathEnd2CacheMu, &pathEnd1CacheMu) if err != nil { return err } - if s != nil { - if _, ok := skipped[pp.pathEnd2.info.ChainID]; !ok { - skipped[pp.pathEnd2.info.ChainID] = make(map[ChannelKey]skippedPackets) - } - skipped[pp.pathEnd2.info.ChainID][k] = *s + if !done { + skipped = true } return nil }) @@ -1547,20 +1475,8 @@ func (pp *PathProcessor) flush(ctx context.Context) error { pp.pathEnd1.mergeMessageCache(pathEnd1Cache, pp.pathEnd2.info.ChainID, pp.pathEnd2.inSync) pp.pathEnd2.mergeMessageCache(pathEnd2Cache, pp.pathEnd1.info.ChainID, pp.pathEnd1.inSync) - if len(skipped) > 0 { - skippedPacketsString := "" - for chainID, chainSkipped := range skipped { - for channelKey, skipped := range chainSkipped { - skippedPacketsString += fmt.Sprintf( - "{ %s %s %s recv: %d, ack: %d } ", - chainID, channelKey.ChannelID, channelKey.PortID, skipped.Recv, skipped.Ack, - ) - } - } - return fmt.Errorf( - "flush was successful, but packets are still pending. %s", - skippedPacketsString, - ) + if skipped { + return fmt.Errorf("flush was successful, but more packet sequences are still pending") } return nil @@ -1573,7 +1489,7 @@ func (pp *PathProcessor) shouldTerminateForFlushComplete() bool { return false } for k, packetMessagesCache := range pp.pathEnd1.messageCache.PacketFlow { - if cs, ok := pp.pathEnd1.channelStateCache[k]; !ok || !cs.Open { + if open, ok := pp.pathEnd1.channelStateCache[k]; !ok || !open { continue } for _, c := range packetMessagesCache { @@ -1597,7 +1513,7 @@ func (pp *PathProcessor) shouldTerminateForFlushComplete() bool { } } for k, packetMessagesCache := range pp.pathEnd2.messageCache.PacketFlow { - if cs, ok := pp.pathEnd1.channelStateCache[k]; !ok || !cs.Open { + if open, ok := pp.pathEnd1.channelStateCache[k]; !ok || !open { continue } for _, c := range packetMessagesCache { diff --git a/relayer/processor/types_internal.go b/relayer/processor/types_internal.go index d04207029..2879307d9 100644 --- a/relayer/processor/types_internal.go +++ b/relayer/processor/types_internal.go @@ -399,15 +399,15 @@ type clientICQProcessingCache map[provider.ClientICQQueryID]processingMessage // contains MsgRecvPacket from counterparty // entire packet flow type pathEndPacketFlowMessages struct { - Src *pathEndRuntime - Dst *pathEndRuntime - ChannelKey ChannelKey - SrcMsgTransfer PacketSequenceCache - DstMsgRecvPacket PacketSequenceCache - SrcMsgAcknowledgement PacketSequenceCache - SrcMsgTimeout PacketSequenceCache - SrcMsgTimeoutOnClose PacketSequenceCache - DstMsgChannelCloseConfirm *provider.ChannelInfo + Src *pathEndRuntime + Dst *pathEndRuntime + ChannelKey ChannelKey + SrcPreTransfer PacketSequenceCache + SrcMsgTransfer PacketSequenceCache + DstMsgRecvPacket PacketSequenceCache + SrcMsgAcknowledgement PacketSequenceCache + SrcMsgTimeout PacketSequenceCache + SrcMsgTimeoutOnClose PacketSequenceCache // Adding for Icon chain DstMsgRequestTimeout PacketSequenceCache diff --git a/relayer/processor/utils.go b/relayer/processor/utils.go index 185510b78..1a004c3f6 100644 --- a/relayer/processor/utils.go +++ b/relayer/processor/utils.go @@ -4,13 +4,12 @@ import ( "math" "strings" + "github.com/cosmos/relayer/v2/relayer/common" "github.com/cosmos/relayer/v2/relayer/provider" ) -const clientName = "iconclient" - func ClientIsIcon(cs provider.ClientState) bool { - if strings.Contains(cs.ClientID, clientName) { + if strings.Contains(cs.ClientID, common.IconLightClient) { return true } return false @@ -54,5 +53,3 @@ func nextIconIBCHeader(heightMap IBCHeaderCache, height uint64) (provider.IBCHea header, ok := heightMap[nextHeight] return header, ok } - -// The next header is { false [] 0} true diff --git a/relayer/provider/provider.go b/relayer/provider/provider.go index f317c8f69..0e429900f 100644 --- a/relayer/provider/provider.go +++ b/relayer/provider/provider.go @@ -31,7 +31,6 @@ type ProviderConfig interface { NewProvider(log *zap.Logger, homepath string, debug bool, chainName string) (ChainProvider, error) Validate() error BroadcastMode() BroadcastMode - Set(field string, value interface{}) error } type RelayerMessage interface { @@ -237,7 +236,7 @@ type ChainProvider interface { NewClientState(dstChainID string, dstIBCHeader IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool) (ibcexported.ClientState, error) // TODO: Remove later - NewClientStateMock(dstChainID string, dstIBCHeader IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool) (ibcexported.ClientState, error) + // NewClientStateMock(dstChainID string, dstIBCHeader IBCHeader, dstTrustingPeriod, dstUbdPeriod time.Duration, allowUpdateAfterExpiry, allowUpdateAfterMisbehaviour bool) (ibcexported.ClientState, error) MsgCreateClient(clientState ibcexported.ClientState, consensusState ibcexported.ConsensusState) (RelayerMessage, error) diff --git a/relayer/strategies.go b/relayer/strategies.go index 6fcf185f9..5537828b2 100644 --- a/relayer/strategies.go +++ b/relayer/strategies.go @@ -15,6 +15,7 @@ import ( "github.com/cosmos/relayer/v2/relayer/chains/archway" "github.com/cosmos/relayer/v2/relayer/chains/cosmos" "github.com/cosmos/relayer/v2/relayer/chains/icon" + penumbraprocessor "github.com/cosmos/relayer/v2/relayer/chains/penumbra" "github.com/cosmos/relayer/v2/relayer/processor" "go.uber.org/zap" ) @@ -29,7 +30,9 @@ const ( ProcessorEvents string = "events" ProcessorLegacy = "legacy" DefaultClientUpdateThreshold = 0 * time.Millisecond - DefaultFlushInterval = 60 * time.Minute + DefaultFlushInterval = 5 * time.Minute + DefaultMaxMsgLength = 5 + TwoMB = 2 * 1024 * 1024 ) // StartRelayer starts the main relaying loop and returns a channel that will contain any control-flow related errors. diff --git a/scripts/protocgen.sh b/scripts/protocgen.sh index ae4f20240..725d881a7 100755 --- a/scripts/protocgen.sh +++ b/scripts/protocgen.sh @@ -24,5 +24,4 @@ buf generate --template proto/buf.gen.penumbra.yaml buf.build/penumbra-zone/penu rm -r github.com/cosmos/relayer/v2/relayer/chains/penumbra/client rm -r github.com/cosmos/relayer/v2/relayer/chains/penumbra/narsil cp -r github.com/cosmos/relayer/v2/* ./ -cp -r github.com/cosmos/relayer/relayer/* relayer/ rm -rf github.com