diff --git a/CHANGELOG.md b/CHANGELOG.md index 4a02cf014a6..d96001b3e8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [#7250](https://github.com/osmosis-labs/osmosis/pull/7250) Further filter spam gauges from epoch distribution. * [#7472](https://github.com/osmosis-labs/osmosis/pull/7472) Refactor TWAP keys to only require a single key format. Significantly lowers TWAP-caused writes * [#7499](https://github.com/osmosis-labs/osmosis/pull/7499) Slight speed/gas improvements to CL CreatePosition and AddToPosition +* [#7508](https://github.com/osmosis-labs/osmosis/pull/7508) Improve protorev performance by removing iterator and storing base denoms as a single object rather than an array. * [#7562](https://github.com/osmosis-labs/osmosis/pull/7562) Speedup Protorev estimation logic by removing unnecessary taker fee simulations. ## v23.0.0 diff --git a/app/upgrades/v24/upgrades.go b/app/upgrades/v24/upgrades.go index 2771fa577c5..4a0bd361219 100644 --- a/app/upgrades/v24/upgrades.go +++ b/app/upgrades/v24/upgrades.go @@ -23,6 +23,18 @@ func CreateUpgradeHandler( return nil, err } + // We no longer use the base denoms array and instead use the repeated base denoms field for performance reasons. + // We retrieve the old base denoms array from the KVStore, delete the array from the KVStore, and set them as a repeated field in the new KVStore. + baseDenoms, err := keepers.ProtoRevKeeper.DeprecatedGetAllBaseDenoms(ctx) + if err != nil { + return nil, err + } + keepers.ProtoRevKeeper.DeprecatedDeleteBaseDenoms(ctx) + err = keepers.ProtoRevKeeper.SetBaseDenoms(ctx, baseDenoms) + if err != nil { + return nil, err + } + // Now that the TWAP keys are refactored, we can delete all time indexed TWAPs // since we only need the pool indexed TWAPs. keepers.TwapKeeper.DeleteAllHistoricalTimeIndexedTWAPs(ctx) diff --git a/app/upgrades/v24/upgrades_test.go b/app/upgrades/v24/upgrades_test.go index c6186cd785c..978f3ac97e3 100644 --- a/app/upgrades/v24/upgrades_test.go +++ b/app/upgrades/v24/upgrades_test.go @@ -16,6 +16,7 @@ import ( "github.com/osmosis-labs/osmosis/osmoutils" "github.com/osmosis-labs/osmosis/v23/app/apptesting" + protorevtypes "github.com/osmosis-labs/osmosis/v23/x/protorev/types" "github.com/osmosis-labs/osmosis/v23/x/twap/types" twaptypes "github.com/osmosis-labs/osmosis/v23/x/twap/types" ) @@ -37,6 +38,9 @@ func TestUpgradeTestSuite(t *testing.T) { func (s *UpgradeTestSuite) TestUpgrade() { s.Setup() + // TWAP Setup + // + // Manually set up TWAP records indexed by both pool ID and time. twapStoreKey := s.App.GetKey(twaptypes.ModuleName) store := s.Ctx.KVStore(twapStoreKey) @@ -75,11 +79,35 @@ func (s *UpgradeTestSuite) TestUpgrade() { s.Require().Len(twapRecords, 1) s.Require().Equal(twap, twapRecords[0]) + // PROTOREV Setup + // + + // Set the old KVStore base denoms + s.App.ProtoRevKeeper.DeprecatedSetBaseDenoms(s.Ctx, []protorevtypes.BaseDenom{ + {Denom: protorevtypes.OsmosisDenomination, StepSize: osmomath.NewInt(1_000_000)}, + {Denom: "atom", StepSize: osmomath.NewInt(1_000_000)}, + {Denom: "weth", StepSize: osmomath.NewInt(1_000_000)}}) + oldBaseDenoms, err := s.App.ProtoRevKeeper.DeprecatedGetAllBaseDenoms(s.Ctx) + s.Require().NoError(err) + s.Require().Equal(3, len(oldBaseDenoms)) + s.Require().Equal(oldBaseDenoms[0].Denom, protorevtypes.OsmosisDenomination) + s.Require().Equal(oldBaseDenoms[1].Denom, "atom") + s.Require().Equal(oldBaseDenoms[2].Denom, "weth") + + // The new KVStore should be set to the default + newBaseDenoms, err := s.App.ProtoRevKeeper.GetAllBaseDenoms(s.Ctx) + s.Require().NoError(err) + s.Require().Equal(protorevtypes.DefaultBaseDenoms, newBaseDenoms) + + // Run the upgrade dummyUpgrade(s) s.Require().NotPanics(func() { s.App.BeginBlocker(s.Ctx, abci.RequestBeginBlock{}) }) + // TWAP Tests + // + // TWAP records indexed by time should be completely removed. twapRecords, err = osmoutils.GatherValuesFromStorePrefix(store, []byte(HistoricalTWAPTimeIndexPrefix), types.ParseTwapFromBz) s.Require().NoError(err) @@ -90,6 +118,19 @@ func (s *UpgradeTestSuite) TestUpgrade() { s.Require().NoError(err) s.Require().Len(twapRecords, 1) s.Require().Equal(twap, twapRecords[0]) + + // PROTOREV Tests + // + + // The new KVStore should return the old KVStore values + newBaseDenoms, err = s.App.ProtoRevKeeper.GetAllBaseDenoms(s.Ctx) + s.Require().NoError(err) + s.Require().Equal(oldBaseDenoms, newBaseDenoms) + + // The old KVStore base denoms should be deleted + oldBaseDenoms, err = s.App.ProtoRevKeeper.DeprecatedGetAllBaseDenoms(s.Ctx) + s.Require().NoError(err) + s.Require().Empty(oldBaseDenoms) } func dummyUpgrade(s *UpgradeTestSuite) { diff --git a/proto/osmosis/protorev/v1beta1/genesis.proto b/proto/osmosis/protorev/v1beta1/genesis.proto index 1df1f0d5a3c..3d25ca9c9a9 100644 --- a/proto/osmosis/protorev/v1beta1/genesis.proto +++ b/proto/osmosis/protorev/v1beta1/genesis.proto @@ -25,15 +25,10 @@ message GenesisState { (gogoproto.nullable) = false, (gogoproto.moretags) = "yaml:\"base_denoms\"" ]; - // The pool weights that are being used to calculate the weight (compute cost) - // of each route. - // - // DEPRECATED: This field is deprecated and will be removed in the next - // release. It is replaced by the `info_by_pool_type` field. - PoolWeights pool_weights = 4 [ - (gogoproto.nullable) = false, - (gogoproto.moretags) = "yaml:\"pool_weights\"" - ]; + // DEPRECATED: pool_weights are weights that are being used to calculate the + // compute cost of each route. This field is deprecated. + // It is replaced by the `info_by_pool_type` field. + reserved 4; // The number of days since module genesis. uint64 days_since_module_genesis = 5 [ (gogoproto.moretags) = "yaml:\"days_since_module_genesis\"" ]; diff --git a/proto/osmosis/protorev/v1beta1/protorev.proto b/proto/osmosis/protorev/v1beta1/protorev.proto index ab014b251a3..cf2339349e8 100644 --- a/proto/osmosis/protorev/v1beta1/protorev.proto +++ b/proto/osmosis/protorev/v1beta1/protorev.proto @@ -184,6 +184,15 @@ message BaseDenom { ]; } +// BaseDenoms represents all of the base denoms that the module uses for its +// arbitrage trades. +message BaseDenoms { + repeated BaseDenom base_denoms = 1 [ + (gogoproto.nullable) = false, + (gogoproto.moretags) = "yaml:\"base_denoms\"" + ]; +} + message AllProtocolRevenue { osmosis.poolmanager.v1beta1.TakerFeesTracker taker_fees_tracker = 1 [ (gogoproto.moretags) = "yaml:\"taker_fees_tracker\"", diff --git a/x/protorev/keeper/msg_server.go b/x/protorev/keeper/msg_server.go index 02345a3c0a0..b01feb6eed3 100644 --- a/x/protorev/keeper/msg_server.go +++ b/x/protorev/keeper/msg_server.go @@ -149,9 +149,6 @@ func (m MsgServer) SetBaseDenoms(c context.Context, msg *types.MsgSetBaseDenoms) m.k.DeleteAllPoolsForBaseDenom(ctx, baseDenom.Denom) } - // Delete the old base denoms - m.k.DeleteBaseDenoms(ctx) - if err := m.k.SetBaseDenoms(ctx, msg.BaseDenoms); err != nil { return nil, err } diff --git a/x/protorev/keeper/protorev.go b/x/protorev/keeper/protorev.go index 153ec7b4843..1412cd2d79a 100644 --- a/x/protorev/keeper/protorev.go +++ b/x/protorev/keeper/protorev.go @@ -76,12 +76,13 @@ func (k Keeper) DeleteAllTokenPairArbRoutes(ctx sdk.Context) { k.DeleteAllEntriesForKeyPrefix(ctx, types.KeyPrefixTokenPairRoutes) } -// GetAllBaseDenoms returns all of the base denoms (sorted by priority in descending order) used to build cyclic arbitrage routes -func (k Keeper) GetAllBaseDenoms(ctx sdk.Context) ([]types.BaseDenom, error) { +// DeprecatedGetAllBaseDenoms returns all of the base denoms (sorted by priority in descending order) used to build cyclic arbitrage routes +// After v24 upgrade, this method should be deleted. We now use the param store. +func (k Keeper) DeprecatedGetAllBaseDenoms(ctx sdk.Context) ([]types.BaseDenom, error) { baseDenoms := make([]types.BaseDenom, 0) store := ctx.KVStore(k.storeKey) - iterator := sdk.KVStorePrefixIterator(store, types.KeyPrefixBaseDenoms) + iterator := sdk.KVStorePrefixIterator(store, types.KeyPrefixDeprecatedBaseDenoms) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { @@ -97,13 +98,14 @@ func (k Keeper) GetAllBaseDenoms(ctx sdk.Context) ([]types.BaseDenom, error) { return baseDenoms, nil } -// SetBaseDenoms sets all of the base denoms used to build cyclic arbitrage routes. The base denoms priority +// DeprecatedSetBaseDenoms sets all of the base denoms used to build cyclic arbitrage routes. The base denoms priority // order is going to match the order of the base denoms in the slice. -func (k Keeper) SetBaseDenoms(ctx sdk.Context, baseDenoms []types.BaseDenom) error { - store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixBaseDenoms) +// After v24 upgrade, this method should be deleted. We now use the param store. +func (k Keeper) DeprecatedSetBaseDenoms(ctx sdk.Context, baseDenoms []types.BaseDenom) error { + store := prefix.NewStore(ctx.KVStore(k.storeKey), types.KeyPrefixDeprecatedBaseDenoms) for i, baseDenom := range baseDenoms { - key := types.GetKeyPrefixBaseDenom(uint64(i)) + key := types.DeprecatedGetKeyPrefixBaseDenom(uint64(i)) bz, err := baseDenom.Marshal() if err != nil { @@ -115,9 +117,36 @@ func (k Keeper) SetBaseDenoms(ctx sdk.Context, baseDenoms []types.BaseDenom) err return nil } -// DeleteBaseDenoms deletes all of the base denoms -func (k Keeper) DeleteBaseDenoms(ctx sdk.Context) { - k.DeleteAllEntriesForKeyPrefix(ctx, types.KeyPrefixBaseDenoms) +// DeprecatedDeleteBaseDenoms deletes all of the base denoms. +// After v24 upgrade, this method should be deleted. We now use the param store. +func (k Keeper) DeprecatedDeleteBaseDenoms(ctx sdk.Context) { + k.DeleteAllEntriesForKeyPrefix(ctx, types.KeyPrefixDeprecatedBaseDenoms) +} + +// GetAllBaseDenoms returns all of the base denoms (sorted by priority in descending order) used to build cyclic arbitrage routes +func (k Keeper) GetAllBaseDenoms(ctx sdk.Context) ([]types.BaseDenom, error) { + store := ctx.KVStore(k.storeKey) + bz := store.Get(types.KeyPrefixBaseDenoms) + baseDenoms := types.BaseDenoms{} + err := baseDenoms.Unmarshal(bz) + if err != nil { + return []types.BaseDenom{}, err + } + return baseDenoms.BaseDenoms, nil +} + +// SetBaseDenoms sets all of the base denoms used to build cyclic arbitrage routes. The base denoms priority +// order is going to match the order of the base denoms in the slice. +func (k Keeper) SetBaseDenoms(ctx sdk.Context, baseDenoms []types.BaseDenom) error { + newBaseDenoms := types.BaseDenoms{BaseDenoms: baseDenoms} + store := ctx.KVStore(k.storeKey) + test, err := newBaseDenoms.Marshal() + if err != nil { + return err + } + + store.Set(types.KeyPrefixBaseDenoms, test) + return nil } // GetPoolForDenomPair returns the id of the highest liquidity pool between the base denom and the denom to match diff --git a/x/protorev/keeper/protorev_test.go b/x/protorev/keeper/protorev_test.go index 62e2fa827e8..eb3f8315464 100644 --- a/x/protorev/keeper/protorev_test.go +++ b/x/protorev/keeper/protorev_test.go @@ -67,12 +67,6 @@ func (s *KeeperTestSuite) TestGetAllBaseDenoms() { s.Require().Equal(baseDenoms[1].Denom, "Atom") s.Require().Equal(baseDenoms[2].Denom, "ibc/0CD3A0285E1341859B5E86B6AB7682F023D03E97607CCC1DC95706411D866DF7") - // Should be able to delete all base denoms - s.App.ProtoRevKeeper.DeleteBaseDenoms(s.Ctx) - baseDenoms, err = s.App.ProtoRevKeeper.GetAllBaseDenoms(s.Ctx) - s.Require().NoError(err) - s.Require().Equal(0, len(baseDenoms)) - // Should be able to set the base denoms err = s.App.ProtoRevKeeper.SetBaseDenoms(s.Ctx, []types.BaseDenom{{Denom: "osmo"}, {Denom: "atom"}, {Denom: "weth"}}) s.Require().NoError(err) diff --git a/x/protorev/types/genesis.pb.go b/x/protorev/types/genesis.pb.go index 49bf3913ad7..689a68228b3 100644 --- a/x/protorev/types/genesis.pb.go +++ b/x/protorev/types/genesis.pb.go @@ -34,12 +34,6 @@ type GenesisState struct { // The base denominations being used to create cyclic arbitrage routes via the // highest liquidity method. BaseDenoms []BaseDenom `protobuf:"bytes,3,rep,name=base_denoms,json=baseDenoms,proto3" json:"base_denoms" yaml:"base_denoms"` - // The pool weights that are being used to calculate the weight (compute cost) - // of each route. - // - // DEPRECATED: This field is deprecated and will be removed in the next - // release. It is replaced by the `info_by_pool_type` field. - PoolWeights PoolWeights `protobuf:"bytes,4,opt,name=pool_weights,json=poolWeights,proto3" json:"pool_weights" yaml:"pool_weights"` // The number of days since module genesis. DaysSinceModuleGenesis uint64 `protobuf:"varint,5,opt,name=days_since_module_genesis,json=daysSinceModuleGenesis,proto3" json:"days_since_module_genesis,omitempty" yaml:"days_since_module_genesis"` // The fees the developer account has accumulated over time. @@ -118,13 +112,6 @@ func (m *GenesisState) GetBaseDenoms() []BaseDenom { return nil } -func (m *GenesisState) GetPoolWeights() PoolWeights { - if m != nil { - return m.PoolWeights - } - return PoolWeights{} -} - func (m *GenesisState) GetDaysSinceModuleGenesis() uint64 { if m != nil { return m.DaysSinceModuleGenesis @@ -204,56 +191,54 @@ func init() { } var fileDescriptor_3c77fc2da5752af2 = []byte{ - // 771 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0xcf, 0x4e, 0xe3, 0x46, - 0x18, 0x8f, 0x0b, 0x85, 0x32, 0x81, 0x08, 0x86, 0x06, 0x39, 0x69, 0x71, 0x5c, 0x17, 0xda, 0xa8, - 0x2a, 0xb6, 0x80, 0x9e, 0x7a, 0xa8, 0x84, 0xa9, 0x68, 0xab, 0xaa, 0x28, 0x32, 0xa9, 0x2a, 0xb5, - 0x52, 0xa7, 0x63, 0x67, 0x12, 0x2c, 0x6c, 0x8f, 0xe5, 0x99, 0x84, 0xe4, 0x01, 0x7a, 0xef, 0xc3, - 0xf4, 0x21, 0x38, 0xa2, 0xbd, 0xec, 0x9e, 0xa2, 0x15, 0xbc, 0x41, 0x9e, 0x60, 0xe5, 0x99, 0x49, - 0x02, 0x21, 0xde, 0xbd, 0x79, 0xbe, 0xef, 0xf7, 0xe7, 0xfb, 0xcd, 0x1f, 0x83, 0xaf, 0x28, 0x8b, - 0x29, 0x0b, 0x99, 0x93, 0x66, 0x94, 0xd3, 0x8c, 0x0c, 0x9c, 0xc1, 0xb1, 0x4f, 0x38, 0x3e, 0x76, - 0x7a, 0x24, 0x21, 0x2c, 0x64, 0xb6, 0x68, 0x40, 0x5d, 0xe1, 0xec, 0x29, 0xce, 0x56, 0xb8, 0xfa, - 0xa7, 0x3d, 0xda, 0xa3, 0xa2, 0xea, 0xe4, 0x5f, 0x12, 0x50, 0xff, 0xba, 0x50, 0x77, 0x26, 0x20, - 0x81, 0x87, 0xc5, 0x40, 0x9c, 0xe1, 0x58, 0x19, 0xd6, 0x6b, 0x81, 0xc0, 0x21, 0x69, 0x24, 0x17, - 0xaa, 0x65, 0xc8, 0x95, 0xe3, 0x63, 0x46, 0x66, 0xe4, 0x80, 0x86, 0x89, 0xec, 0x5b, 0xaf, 0x01, - 0xd8, 0xfc, 0x49, 0x86, 0xb9, 0xe2, 0x98, 0x13, 0xf8, 0x03, 0x58, 0x93, 0xda, 0xba, 0x66, 0x6a, - 0xcd, 0xf2, 0x89, 0x69, 0x17, 0x85, 0xb3, 0x5b, 0x02, 0xe7, 0xae, 0xde, 0x8d, 0x1b, 0x25, 0x4f, - 0xb1, 0xe0, 0xbf, 0x1a, 0xa8, 0x72, 0x7a, 0x43, 0x12, 0x94, 0xe2, 0x30, 0x43, 0x38, 0xf3, 0x51, - 0x46, 0xfb, 0x9c, 0x30, 0xfd, 0x23, 0x73, 0xa5, 0x59, 0x3e, 0xf9, 0xb6, 0x58, 0xaf, 0x9d, 0xd3, - 0x5a, 0x38, 0xcc, 0xce, 0x32, 0xdf, 0x13, 0x1c, 0xf7, 0x20, 0xd7, 0x9e, 0x8c, 0x1b, 0x9f, 0x8f, - 0x70, 0x1c, 0x7d, 0x6f, 0x2d, 0x15, 0xb6, 0x3c, 0xc8, 0x5f, 0x30, 0xe1, 0x3f, 0xa0, 0x9c, 0x67, - 0x46, 0x1d, 0x92, 0xd0, 0x98, 0xe9, 0x2b, 0xc2, 0xfc, 0xcb, 0x62, 0x73, 0x17, 0x33, 0xf2, 0x63, - 0x8e, 0x75, 0xeb, 0xca, 0x13, 0x4a, 0xcf, 0x27, 0x2a, 0x96, 0x07, 0xfc, 0x29, 0x8c, 0x41, 0x02, - 0x36, 0x53, 0x4a, 0x23, 0x74, 0x4b, 0xc2, 0xde, 0x35, 0x67, 0xfa, 0xaa, 0xd8, 0xaf, 0xc3, 0xf7, - 0xec, 0x17, 0xa5, 0xd1, 0x1f, 0x12, 0xec, 0x7e, 0xa6, 0x4c, 0x76, 0xa5, 0xc9, 0x53, 0x21, 0xcb, - 0x2b, 0xa7, 0x73, 0x24, 0x44, 0xa0, 0xd6, 0xc1, 0x23, 0x86, 0x58, 0x98, 0x04, 0x04, 0xc5, 0xb4, - 0xd3, 0x8f, 0x08, 0x52, 0xf7, 0x4f, 0xff, 0xd8, 0xd4, 0x9a, 0xab, 0xee, 0xc1, 0x64, 0xdc, 0x30, - 0xa5, 0x50, 0x21, 0xd4, 0xf2, 0xf6, 0xf2, 0xde, 0x55, 0xde, 0xfa, 0x4d, 0x74, 0xd4, 0xb1, 0x43, - 0x04, 0x2a, 0x1d, 0x32, 0x20, 0x11, 0x4d, 0x49, 0x86, 0xba, 0x84, 0x30, 0x7d, 0x4d, 0x6c, 0x56, - 0xcd, 0x56, 0x37, 0x29, 0xcf, 0x3c, 0x0b, 0x71, 0x4e, 0xc3, 0xc4, 0xdd, 0x57, 0xd3, 0x57, 0x95, - 0xe9, 0x33, 0xba, 0xe5, 0x6d, 0xcd, 0x0a, 0x17, 0x84, 0x30, 0x78, 0x09, 0x76, 0x23, 0xcc, 0x09, - 0xe3, 0xc8, 0x8f, 0x68, 0x70, 0x83, 0xae, 0x45, 0x32, 0x7d, 0x5d, 0xcc, 0x6e, 0x4c, 0xc6, 0x8d, - 0xba, 0x94, 0x59, 0x02, 0xb2, 0xbc, 0x1d, 0x59, 0x75, 0xf3, 0xe2, 0xcf, 0xa2, 0x06, 0xff, 0x02, - 0x3b, 0x73, 0x47, 0xdc, 0xe9, 0x64, 0x84, 0x31, 0xfd, 0x13, 0x53, 0x6b, 0x6e, 0xb8, 0xf6, 0x64, - 0xdc, 0xd0, 0x17, 0x87, 0x52, 0x10, 0xeb, 0xd5, 0xff, 0x47, 0x15, 0x15, 0xe9, 0x4c, 0x96, 0xbc, - 0xed, 0x19, 0x4a, 0x55, 0xe0, 0xdf, 0xa0, 0x16, 0xe3, 0x21, 0x12, 0x07, 0x92, 0xd2, 0x30, 0xe1, - 0x0c, 0xe5, 0x1a, 0x62, 0x28, 0x7d, 0x63, 0x71, 0xbb, 0x0b, 0xa1, 0x96, 0x57, 0x8d, 0xf1, 0x30, - 0x3f, 0xf1, 0x96, 0xe8, 0xb4, 0x48, 0x26, 0x22, 0xc0, 0xdf, 0xc1, 0xde, 0x32, 0x12, 0x1f, 0xea, - 0x40, 0x88, 0x7f, 0x31, 0x19, 0x37, 0xf6, 0x8b, 0xc5, 0xf9, 0xd0, 0xf2, 0xe0, 0xa2, 0x72, 0x7b, - 0x08, 0xaf, 0x40, 0x55, 0xa0, 0x50, 0x40, 0xfb, 0x09, 0x47, 0x5d, 0x3a, 0x1d, 0xb9, 0x2c, 0x54, - 0xcd, 0xf9, 0x1b, 0x5a, 0x0a, 0xb3, 0x3c, 0x28, 0xea, 0xe7, 0x79, 0xf9, 0x82, 0xaa, 0x59, 0x7f, - 0x05, 0xeb, 0x69, 0x46, 0xbb, 0x21, 0x67, 0xfa, 0xe6, 0x87, 0xae, 0xc4, 0x9e, 0xba, 0x12, 0x15, - 0xe5, 0x22, 0x79, 0x96, 0x37, 0x55, 0x80, 0x7d, 0xb0, 0x13, 0x26, 0x5d, 0x8a, 0xfc, 0x91, 0x0c, - 0xc5, 0x47, 0x29, 0xd1, 0xb7, 0xc4, 0x9b, 0x69, 0x16, 0xbf, 0x99, 0x5f, 0x92, 0x2e, 0x75, 0x47, - 0x79, 0xda, 0xf6, 0x28, 0x25, 0xae, 0xa9, 0x5c, 0xd4, 0x19, 0xbf, 0x10, 0xb4, 0xbc, 0x4a, 0xf8, - 0x8c, 0x01, 0x6f, 0x01, 0x0c, 0x46, 0x41, 0x14, 0x06, 0xe2, 0x8f, 0xc1, 0x33, 0x1c, 0xdc, 0x90, - 0x4c, 0xaf, 0x08, 0xdf, 0x6f, 0x8a, 0x7d, 0xcf, 0x05, 0xe7, 0x2c, 0xf3, 0xdb, 0x92, 0xe1, 0xee, - 0x4f, 0xc6, 0x8d, 0x9a, 0x74, 0x7d, 0xa9, 0x67, 0x79, 0xdb, 0xc1, 0x22, 0xe1, 0xf2, 0xee, 0xc1, - 0xd0, 0xee, 0x1f, 0x0c, 0xed, 0xed, 0x83, 0xa1, 0xfd, 0xf7, 0x68, 0x94, 0xee, 0x1f, 0x8d, 0xd2, - 0x9b, 0x47, 0xa3, 0xf4, 0xe7, 0x77, 0xbd, 0x90, 0x5f, 0xf7, 0x7d, 0x3b, 0xa0, 0xb1, 0xa3, 0x06, - 0x38, 0x8a, 0xb0, 0xcf, 0xa6, 0x0b, 0x67, 0x70, 0x72, 0xea, 0x0c, 0xe7, 0xff, 0xfc, 0x3c, 0x18, - 0xf3, 0xd7, 0xc4, 0xfa, 0xf4, 0x5d, 0x00, 0x00, 0x00, 0xff, 0xff, 0x1d, 0xaa, 0x99, 0x66, 0x95, - 0x06, 0x00, 0x00, + // 744 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x4d, 0x6f, 0xdb, 0x36, + 0x18, 0xb6, 0x16, 0xe7, 0x8b, 0x4e, 0x8c, 0x84, 0x9b, 0x03, 0xd9, 0x58, 0x64, 0x4d, 0xcb, 0x36, + 0x63, 0x58, 0x24, 0x24, 0xd9, 0x69, 0x87, 0x01, 0x51, 0x86, 0xec, 0x0b, 0x0b, 0x0c, 0xc5, 0xbb, + 0xb4, 0x40, 0x59, 0x4a, 0xa6, 0x1d, 0x21, 0x92, 0x28, 0x88, 0xb4, 0x6b, 0xff, 0x80, 0xde, 0xfb, + 0x63, 0xfa, 0x23, 0x72, 0x0c, 0x7a, 0xea, 0xc9, 0x28, 0x92, 0x7f, 0xe0, 0x43, 0xcf, 0x85, 0x48, + 0xda, 0x69, 0x1c, 0x0b, 0xbd, 0x99, 0xef, 0xfb, 0x7c, 0xbc, 0x8f, 0xf9, 0x52, 0xe0, 0x47, 0xca, + 0x62, 0xca, 0x42, 0xe6, 0xa4, 0x19, 0xe5, 0x34, 0x23, 0x43, 0x67, 0x78, 0xe4, 0x13, 0x8e, 0x8f, + 0x9c, 0x3e, 0x49, 0x08, 0x0b, 0x99, 0x2d, 0x1a, 0x50, 0x57, 0x38, 0x7b, 0x86, 0xb3, 0x15, 0xae, + 0xf1, 0x4d, 0x9f, 0xf6, 0xa9, 0xa8, 0x3a, 0xf9, 0x2f, 0x09, 0x68, 0xfc, 0x54, 0xa8, 0x3b, 0x17, + 0x90, 0xc0, 0x1f, 0x8a, 0x81, 0x38, 0xc3, 0xb1, 0x32, 0x6c, 0xd4, 0x03, 0x81, 0x43, 0xd2, 0x48, + 0x1e, 0x54, 0xcb, 0x90, 0x27, 0xc7, 0xc7, 0x8c, 0xcc, 0xc9, 0x01, 0x0d, 0x13, 0xd9, 0xb7, 0x3e, + 0x6e, 0x82, 0xad, 0x3f, 0x65, 0x98, 0x4b, 0x8e, 0x39, 0x81, 0xbf, 0x83, 0x35, 0xa9, 0xad, 0x6b, + 0xa6, 0xd6, 0xaa, 0x1c, 0x9b, 0x76, 0x51, 0x38, 0xbb, 0x2d, 0x70, 0x6e, 0xf9, 0x66, 0xd2, 0x2c, + 0x79, 0x8a, 0x05, 0x5f, 0x6b, 0xa0, 0xc6, 0xe9, 0x35, 0x49, 0x50, 0x8a, 0xc3, 0x0c, 0xe1, 0xcc, + 0x47, 0x19, 0x1d, 0x70, 0xc2, 0xf4, 0xaf, 0xcc, 0x95, 0x56, 0xe5, 0xf8, 0x97, 0x62, 0xbd, 0x4e, + 0x4e, 0x6b, 0xe3, 0x30, 0x3b, 0xcd, 0x7c, 0x4f, 0x70, 0xdc, 0x83, 0x5c, 0x7b, 0x3a, 0x69, 0x7e, + 0x3b, 0xc6, 0x71, 0xf4, 0x9b, 0xb5, 0x54, 0xd8, 0xf2, 0x20, 0x7f, 0xc2, 0x84, 0x2f, 0x41, 0x25, + 0xcf, 0x8c, 0xba, 0x24, 0xa1, 0x31, 0xd3, 0x57, 0x84, 0xf9, 0xf7, 0xc5, 0xe6, 0x2e, 0x66, 0xe4, + 0x8f, 0x1c, 0xeb, 0x36, 0x94, 0x27, 0x94, 0x9e, 0x9f, 0xa9, 0x58, 0x1e, 0xf0, 0x67, 0x30, 0x06, + 0x11, 0xa8, 0x77, 0xf1, 0x98, 0x21, 0x16, 0x26, 0x01, 0x41, 0x31, 0xed, 0x0e, 0x22, 0x82, 0xd4, + 0x62, 0xe8, 0xab, 0xa6, 0xd6, 0x2a, 0xbb, 0x07, 0xd3, 0x49, 0xd3, 0x94, 0x32, 0x85, 0x50, 0xcb, + 0xdb, 0xcb, 0x7b, 0x97, 0x79, 0xeb, 0x3f, 0xd1, 0x51, 0xf7, 0x01, 0x11, 0xa8, 0x76, 0xc9, 0x90, + 0x44, 0x34, 0x25, 0x19, 0xea, 0x11, 0xc2, 0xf4, 0x35, 0x91, 0xa2, 0x6e, 0xab, 0x2b, 0xce, 0x87, + 0x99, 0x07, 0x38, 0xa3, 0x61, 0xe2, 0xee, 0xab, 0xd9, 0x6b, 0xca, 0xf4, 0x11, 0xdd, 0xf2, 0xb6, + 0xe7, 0x85, 0x73, 0x42, 0x18, 0xbc, 0x00, 0x5f, 0x47, 0x98, 0x13, 0xc6, 0x91, 0x1f, 0xd1, 0xe0, + 0x1a, 0x5d, 0x91, 0xb0, 0x7f, 0xc5, 0xf5, 0x75, 0x31, 0xbb, 0x31, 0x9d, 0x34, 0x1b, 0x52, 0x66, + 0x09, 0xc8, 0xf2, 0x76, 0x65, 0xd5, 0xcd, 0x8b, 0x7f, 0x89, 0x1a, 0x7c, 0x0e, 0x76, 0x1f, 0x1c, + 0x71, 0xb7, 0x9b, 0x11, 0xc6, 0xf4, 0x0d, 0x53, 0x6b, 0x6d, 0xba, 0xf6, 0x74, 0xd2, 0xd4, 0x17, + 0x87, 0x52, 0x10, 0xeb, 0xdd, 0xdb, 0xc3, 0xaa, 0x8a, 0x74, 0x2a, 0x4b, 0xde, 0xce, 0x1c, 0xa5, + 0x2a, 0xf0, 0x05, 0xa8, 0xc7, 0x78, 0x84, 0x52, 0x4a, 0x23, 0x94, 0xd2, 0x30, 0xe1, 0x0c, 0xe5, + 0x1a, 0x62, 0x28, 0x7d, 0x73, 0xf1, 0xef, 0x2e, 0x84, 0x5a, 0x5e, 0x2d, 0xc6, 0xa3, 0x36, 0xa5, + 0x51, 0x5b, 0x74, 0xda, 0x24, 0x13, 0x11, 0xe0, 0xff, 0x60, 0x6f, 0x19, 0x89, 0x8f, 0x74, 0x20, + 0xc4, 0xbf, 0x9b, 0x4e, 0x9a, 0xfb, 0xc5, 0xe2, 0x7c, 0x64, 0x79, 0x70, 0x51, 0xb9, 0x33, 0x82, + 0x97, 0xa0, 0x26, 0x50, 0x28, 0xa0, 0x83, 0x84, 0xa3, 0x1e, 0x9d, 0x8d, 0x5c, 0x11, 0xaa, 0xe6, + 0xc3, 0x72, 0x2f, 0x85, 0x59, 0x1e, 0x14, 0xf5, 0xb3, 0xbc, 0x7c, 0x4e, 0xd5, 0xac, 0xff, 0x82, + 0xf5, 0x34, 0xa3, 0xbd, 0x90, 0x33, 0x7d, 0xeb, 0x4b, 0x2b, 0xb1, 0xa7, 0x56, 0xa2, 0xaa, 0x5c, + 0x24, 0xcf, 0xf2, 0x66, 0x0a, 0x70, 0x00, 0x76, 0xc3, 0xa4, 0x47, 0x91, 0x3f, 0x96, 0xa1, 0xf8, + 0x38, 0x25, 0xfa, 0xb6, 0x78, 0xfc, 0xad, 0xe2, 0xf7, 0xf2, 0x77, 0xd2, 0xa3, 0xee, 0x38, 0x4f, + 0xdb, 0x19, 0xa7, 0xc4, 0x35, 0x95, 0x8b, 0xba, 0xe3, 0x27, 0x82, 0x96, 0x57, 0x0d, 0x1f, 0x31, + 0xe0, 0x2b, 0x00, 0x83, 0x71, 0x10, 0x85, 0x81, 0x78, 0xca, 0x3c, 0xc3, 0xc1, 0x35, 0xc9, 0xf4, + 0xaa, 0xf0, 0xfd, 0xb9, 0xd8, 0xf7, 0x4c, 0x70, 0x4e, 0x33, 0xbf, 0x23, 0x19, 0xee, 0xfe, 0x74, + 0xd2, 0xac, 0x4b, 0xd7, 0xa7, 0x7a, 0x96, 0xb7, 0x13, 0x2c, 0x10, 0xfe, 0x29, 0x6f, 0x94, 0x77, + 0x56, 0xdd, 0x8b, 0x9b, 0x3b, 0x43, 0xbb, 0xbd, 0x33, 0xb4, 0x0f, 0x77, 0x86, 0xf6, 0xe6, 0xde, + 0x28, 0xdd, 0xde, 0x1b, 0xa5, 0xf7, 0xf7, 0x46, 0xe9, 0xd9, 0xaf, 0xfd, 0x90, 0x5f, 0x0d, 0x7c, + 0x3b, 0xa0, 0xb1, 0xa3, 0xc6, 0x38, 0x8c, 0xb0, 0xcf, 0x66, 0x07, 0x67, 0x78, 0x7c, 0xe2, 0x8c, + 0x1e, 0x3e, 0xc9, 0x79, 0x3c, 0xe6, 0xaf, 0x89, 0xf3, 0xc9, 0xa7, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xbf, 0x75, 0x74, 0x5b, 0x34, 0x06, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -358,16 +343,6 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x28 } - { - size, err := m.PoolWeights.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0x22 if len(m.BaseDenoms) > 0 { for iNdEx := len(m.BaseDenoms) - 1; iNdEx >= 0; iNdEx-- { { @@ -440,8 +415,6 @@ func (m *GenesisState) Size() (n int) { n += 1 + l + sovGenesis(uint64(l)) } } - l = m.PoolWeights.Size() - n += 1 + l + sovGenesis(uint64(l)) if m.DaysSinceModuleGenesis != 0 { n += 1 + sovGenesis(uint64(m.DaysSinceModuleGenesis)) } @@ -618,39 +591,6 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PoolWeights", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if err := m.PoolWeights.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field DaysSinceModuleGenesis", wireType) diff --git a/x/protorev/types/keys.go b/x/protorev/types/keys.go index a1d78808335..4630d20ed8e 100644 --- a/x/protorev/types/keys.go +++ b/x/protorev/types/keys.go @@ -22,7 +22,7 @@ const ( const ( prefixTokenPairRoutes = iota + 1 prefixDenomPairToPool - prefixBaseDenoms + prefixDeprecatedBaseDenoms prefixNumberOfTrades prefixProfitsByDenom prefixTradesByRoute @@ -38,6 +38,7 @@ const ( prefixSwapsToBackrun prefixcyclicArbTracker prefixcyclicArbTrackerStartHeight + prefixBaseDenoms ) var ( @@ -48,8 +49,8 @@ var ( // KeyPrefixDenomPairToPool is the prefix that is used to store the pool id for a given denom pair (baseDenom, otherDenom) KeyPrefixDenomPairToPool = []byte{prefixDenomPairToPool} - // KeyPrefixBaseDenoms is the prefix that is used to store the base denoms that are used to create cyclic arbitrage routes - KeyPrefixBaseDenoms = []byte{prefixBaseDenoms} + // DEPRECATED: KeyPrefixDeprecatedBaseDenoms is the prefix that is used to store the base denoms that are used to create cyclic arbitrage routes + KeyPrefixDeprecatedBaseDenoms = []byte{prefixDeprecatedBaseDenoms} // -------------- Keys for statistics stores -------------- // // KeyPrefixNumberOfTrades is the prefix for the store that keeps track of the number of trades executed @@ -97,6 +98,9 @@ var ( // KeyCyclicArbTracker is the prefix for store that keeps track of the height we began tracking cyclic arbitrage KeyCyclicArbTrackerStartHeight = []byte{prefixcyclicArbTrackerStartHeight} + + // KeyPrefixBaseDenoms is the prefix that is used to store the base denoms that are used to create cyclic arbitrage routes + KeyPrefixBaseDenoms = []byte{prefixBaseDenoms} ) // Returns the key needed to fetch the pool id for a given denom @@ -105,8 +109,8 @@ func GetKeyPrefixDenomPairToPool(baseDenom, matchDenom string) []byte { } // Returns the key needed to fetch info about base denoms -func GetKeyPrefixBaseDenom(priority uint64) []byte { - return append(KeyPrefixBaseDenoms, sdk.Uint64ToBigEndian(priority)...) +func DeprecatedGetKeyPrefixBaseDenom(priority uint64) []byte { + return append(KeyPrefixDeprecatedBaseDenoms, sdk.Uint64ToBigEndian(priority)...) } // Returns the key needed to fetch the tokenPair routes for a given pair of tokens diff --git a/x/protorev/types/protorev.pb.go b/x/protorev/types/protorev.pb.go index f038bd07f87..0b6a18a57b5 100644 --- a/x/protorev/types/protorev.pb.go +++ b/x/protorev/types/protorev.pb.go @@ -723,6 +723,52 @@ func (m *BaseDenom) GetDenom() string { return "" } +// BaseDenoms represents all of the base denoms that the module uses for its +// arbitrage trades. +type BaseDenoms struct { + BaseDenoms []BaseDenom `protobuf:"bytes,1,rep,name=base_denoms,json=baseDenoms,proto3" json:"base_denoms" yaml:"base_denoms"` +} + +func (m *BaseDenoms) Reset() { *m = BaseDenoms{} } +func (m *BaseDenoms) String() string { return proto.CompactTextString(m) } +func (*BaseDenoms) ProtoMessage() {} +func (*BaseDenoms) Descriptor() ([]byte, []int) { + return fileDescriptor_1e9f2391fd9fec01, []int{12} +} +func (m *BaseDenoms) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *BaseDenoms) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_BaseDenoms.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 *BaseDenoms) XXX_Merge(src proto.Message) { + xxx_messageInfo_BaseDenoms.Merge(m, src) +} +func (m *BaseDenoms) XXX_Size() int { + return m.Size() +} +func (m *BaseDenoms) XXX_DiscardUnknown() { + xxx_messageInfo_BaseDenoms.DiscardUnknown(m) +} + +var xxx_messageInfo_BaseDenoms proto.InternalMessageInfo + +func (m *BaseDenoms) GetBaseDenoms() []BaseDenom { + if m != nil { + return m.BaseDenoms + } + return nil +} + type AllProtocolRevenue struct { TakerFeesTracker types1.TakerFeesTracker `protobuf:"bytes,1,opt,name=taker_fees_tracker,json=takerFeesTracker,proto3" json:"taker_fees_tracker" yaml:"taker_fees_tracker"` CyclicArbTracker CyclicArbTracker `protobuf:"bytes,3,opt,name=cyclic_arb_tracker,json=cyclicArbTracker,proto3" json:"cyclic_arb_tracker" yaml:"cyclic_arb_tracker"` @@ -732,7 +778,7 @@ func (m *AllProtocolRevenue) Reset() { *m = AllProtocolRevenue{} } func (m *AllProtocolRevenue) String() string { return proto.CompactTextString(m) } func (*AllProtocolRevenue) ProtoMessage() {} func (*AllProtocolRevenue) Descriptor() ([]byte, []int) { - return fileDescriptor_1e9f2391fd9fec01, []int{12} + return fileDescriptor_1e9f2391fd9fec01, []int{13} } func (m *AllProtocolRevenue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -784,7 +830,7 @@ func (m *CyclicArbTracker) Reset() { *m = CyclicArbTracker{} } func (m *CyclicArbTracker) String() string { return proto.CompactTextString(m) } func (*CyclicArbTracker) ProtoMessage() {} func (*CyclicArbTracker) Descriptor() ([]byte, []int) { - return fileDescriptor_1e9f2391fd9fec01, []int{13} + return fileDescriptor_1e9f2391fd9fec01, []int{14} } func (m *CyclicArbTracker) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -840,6 +886,7 @@ func init() { proto.RegisterType((*CosmwasmPoolInfo)(nil), "osmosis.protorev.v1beta1.CosmwasmPoolInfo") proto.RegisterType((*WeightMap)(nil), "osmosis.protorev.v1beta1.WeightMap") proto.RegisterType((*BaseDenom)(nil), "osmosis.protorev.v1beta1.BaseDenom") + proto.RegisterType((*BaseDenoms)(nil), "osmosis.protorev.v1beta1.BaseDenoms") proto.RegisterType((*AllProtocolRevenue)(nil), "osmosis.protorev.v1beta1.AllProtocolRevenue") proto.RegisterType((*CyclicArbTracker)(nil), "osmosis.protorev.v1beta1.CyclicArbTracker") } @@ -849,80 +896,81 @@ func init() { } var fileDescriptor_1e9f2391fd9fec01 = []byte{ - // 1156 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x1b, 0xc5, - 0x1b, 0xce, 0xc6, 0x4e, 0x1a, 0x8f, 0x53, 0xdb, 0x99, 0xa4, 0xad, 0xe3, 0xfe, 0x7e, 0xde, 0x30, - 0xad, 0xc0, 0x45, 0xaa, 0xad, 0xa4, 0x1c, 0x50, 0x51, 0x91, 0xb2, 0x41, 0x11, 0x01, 0x91, 0x44, - 0x13, 0x4b, 0x15, 0x5c, 0x96, 0xd9, 0xf5, 0xd8, 0x59, 0xd9, 0xbb, 0x63, 0xed, 0x8c, 0xf3, 0xa7, - 0x48, 0xbd, 0x70, 0xe4, 0xc2, 0x85, 0x1b, 0x07, 0x6e, 0x70, 0xe1, 0x33, 0x70, 0xed, 0xb1, 0xc7, - 0x8a, 0xc3, 0x0a, 0x25, 0x17, 0xc4, 0xd1, 0x9f, 0x00, 0xed, 0xcc, 0xec, 0xda, 0x71, 0xe2, 0x86, - 0x48, 0x88, 0xdb, 0xce, 0xfb, 0x3e, 0xcf, 0xf3, 0xce, 0xfb, 0xbc, 0xb3, 0xb3, 0x0b, 0xde, 0x63, - 0xdc, 0x67, 0xdc, 0xe3, 0x8d, 0x7e, 0xc8, 0x04, 0x0b, 0xe9, 0x51, 0xe3, 0x68, 0xdd, 0xa1, 0x82, - 0xac, 0xa7, 0x81, 0xba, 0x7c, 0x80, 0x65, 0x0d, 0xac, 0xa7, 0x71, 0x0d, 0xac, 0xac, 0xba, 0x32, - 0x65, 0xcb, 0x44, 0x43, 0x2d, 0x14, 0xaa, 0xb2, 0xd2, 0x61, 0x1d, 0xa6, 0xe2, 0xf1, 0x93, 0x8e, - 0x56, 0x15, 0xa6, 0xe1, 0x10, 0x4e, 0xd3, 0x72, 0x2e, 0xf3, 0x02, 0x9d, 0x7f, 0x94, 0xee, 0x89, - 0xb1, 0x9e, 0x4f, 0x02, 0xd2, 0xa1, 0x61, 0x8a, 0xeb, 0xd0, 0x80, 0xa6, 0xdb, 0xa8, 0x3c, 0x4c, - 0xa0, 0xe2, 0xa4, 0x4d, 0x29, 0xbf, 0x1a, 0x85, 0xde, 0x18, 0x00, 0x36, 0x59, 0x97, 0x06, 0xfb, - 0xc4, 0x0b, 0x37, 0x43, 0x07, 0xb3, 0x81, 0xa0, 0x1c, 0x7e, 0x09, 0x00, 0x09, 0x1d, 0x3b, 0x94, - 0xab, 0xb2, 0xb1, 0x96, 0xa9, 0xe5, 0x37, 0xcc, 0xfa, 0xb4, 0x3e, 0xeb, 0x92, 0x65, 0xad, 0xbe, - 0x8a, 0xcc, 0x99, 0x61, 0x64, 0x2e, 0x9d, 0x12, 0xbf, 0xf7, 0x14, 0x8d, 0x04, 0x10, 0xce, 0x91, - 0x54, 0xba, 0x0e, 0x16, 0x44, 0x5c, 0xd0, 0xf6, 0x82, 0xf2, 0xec, 0x9a, 0x51, 0xcb, 0x59, 0xcb, - 0xc3, 0xc8, 0x2c, 0x2a, 0x4e, 0x92, 0x41, 0xf8, 0x96, 0x7c, 0xdc, 0x09, 0xe0, 0x3a, 0xc8, 0xa9, - 0x28, 0x1b, 0x88, 0x72, 0x46, 0x12, 0x56, 0x86, 0x91, 0x59, 0x1a, 0x27, 0xb0, 0x81, 0x40, 0x58, - 0xc9, 0xee, 0x0d, 0xc4, 0xd3, 0xec, 0x9f, 0x3f, 0x99, 0x06, 0xfa, 0xd5, 0x00, 0x73, 0xb2, 0x26, - 0xdc, 0x05, 0xf3, 0x22, 0x24, 0xad, 0x7f, 0xd2, 0x49, 0x33, 0xc6, 0x59, 0x77, 0x74, 0x27, 0xb7, - 0x75, 0x11, 0x49, 0x46, 0x58, 0xab, 0xc0, 0x5d, 0x90, 0xe3, 0x82, 0xf6, 0x6d, 0xee, 0xbd, 0xa0, - 0xba, 0x87, 0xf5, 0x98, 0xf1, 0x7b, 0x64, 0xde, 0x51, 0x03, 0xe4, 0xad, 0x6e, 0xdd, 0x63, 0x0d, - 0x9f, 0x88, 0xc3, 0xfa, 0x4e, 0x20, 0x46, 0xfb, 0x4d, 0x79, 0x08, 0x2f, 0xc4, 0xcf, 0x07, 0xde, - 0x0b, 0xaa, 0xf7, 0xfb, 0x83, 0x01, 0xe6, 0x64, 0x79, 0xf8, 0x00, 0x64, 0xe3, 0xf9, 0x96, 0x8d, - 0x35, 0xa3, 0x96, 0xb5, 0x8a, 0xc3, 0xc8, 0xcc, 0x2b, 0x76, 0x1c, 0x45, 0x58, 0x26, 0xff, 0x3b, - 0x1f, 0xff, 0x32, 0x40, 0x51, 0xfa, 0x78, 0x20, 0x88, 0xf0, 0xb8, 0xf0, 0x5c, 0x0e, 0x3f, 0x07, - 0xb7, 0xfa, 0x21, 0x6b, 0x7b, 0x22, 0xb1, 0x74, 0xb5, 0xae, 0x4f, 0x77, 0x7c, 0x72, 0x53, 0x37, - 0xb7, 0x98, 0x17, 0x58, 0x77, 0xb5, 0x99, 0x05, 0xdd, 0x83, 0xe2, 0x21, 0x9c, 0x28, 0x40, 0x07, - 0x94, 0x82, 0x81, 0xef, 0xd0, 0xd0, 0x66, 0x6d, 0x5b, 0x0f, 0x4a, 0x75, 0xf4, 0xe1, 0x75, 0xae, - 0xde, 0x53, 0x9a, 0x93, 0x74, 0x84, 0x0b, 0x2a, 0xb4, 0xd7, 0x6e, 0xaa, 0x91, 0xbd, 0x0b, 0xe6, - 0xe4, 0x59, 0x2c, 0x67, 0xd6, 0x32, 0xb5, 0xac, 0x55, 0x1a, 0x46, 0xe6, 0xa2, 0xe2, 0xca, 0x30, - 0xc2, 0x2a, 0x8d, 0x7e, 0x9e, 0x05, 0xf9, 0x7d, 0xc6, 0x7a, 0xcf, 0xa9, 0xd7, 0x39, 0x14, 0x1c, - 0x3e, 0x03, 0xb7, 0xb9, 0x20, 0x4e, 0x8f, 0xda, 0xc7, 0x32, 0xa2, 0x67, 0x52, 0x1e, 0x46, 0xe6, - 0x4a, 0x32, 0xd1, 0xb1, 0x34, 0xc2, 0x8b, 0x6a, 0xad, 0xf8, 0x70, 0x0b, 0x14, 0x1d, 0xd2, 0x23, - 0x81, 0x4b, 0xc3, 0x44, 0x60, 0x56, 0x0a, 0x54, 0x86, 0x91, 0x79, 0x57, 0x09, 0x4c, 0x00, 0x10, - 0x2e, 0x24, 0x11, 0x2d, 0xb2, 0x07, 0x96, 0x5d, 0x16, 0xb8, 0x34, 0x10, 0x21, 0x11, 0xb4, 0x95, - 0x08, 0x65, 0xa4, 0x50, 0x75, 0x18, 0x99, 0x15, 0x25, 0x74, 0x05, 0x08, 0x61, 0x38, 0x1e, 0x1d, - 0xed, 0x2a, 0x36, 0xf4, 0x98, 0x70, 0x3f, 0x11, 0xcb, 0x4e, 0xee, 0x6a, 0x02, 0x80, 0x70, 0x21, - 0x89, 0x28, 0x11, 0xf4, 0x63, 0x06, 0x14, 0x76, 0x82, 0x36, 0xb3, 0x4e, 0x63, 0xbf, 0x9a, 0xa7, - 0x7d, 0x0a, 0x9f, 0x83, 0x79, 0xd5, 0xbd, 0x74, 0x29, 0xbf, 0x51, 0x9b, 0xfe, 0x9e, 0x1d, 0x48, - 0x5c, 0xcc, 0x94, 0x1a, 0x13, 0x2f, 0x9c, 0x52, 0x41, 0x58, 0xcb, 0x41, 0x1b, 0x2c, 0x24, 0x9e, - 0x48, 0xff, 0xf2, 0x1b, 0xef, 0x4f, 0x97, 0xb6, 0x34, 0x32, 0x15, 0xbf, 0xa7, 0xc5, 0x8b, 0x17, - 0xfd, 0x46, 0x38, 0x15, 0x85, 0x0c, 0x2c, 0x8e, 0xfb, 0x24, 0xbd, 0xcd, 0x6f, 0xd4, 0xa7, 0x17, - 0xd9, 0x1a, 0x43, 0xa7, 0x85, 0xee, 0xeb, 0x42, 0xcb, 0x97, 0xe7, 0x81, 0xf0, 0x85, 0x02, 0x71, - 0x47, 0x89, 0x9f, 0xd2, 0xfb, 0xb7, 0x76, 0xb4, 0xa5, 0x91, 0xd3, 0x3a, 0x4a, 0x94, 0x10, 0x4e, - 0x45, 0xd1, 0x47, 0xa0, 0x70, 0xd1, 0x63, 0xf8, 0x08, 0xcc, 0x5f, 0x38, 0xc3, 0x4b, 0x23, 0xbf, - 0x93, 0x19, 0x6b, 0x00, 0x7a, 0x06, 0x4a, 0x93, 0x2e, 0xde, 0x84, 0xfe, 0x9d, 0x01, 0x56, 0xae, - 0x32, 0xe8, 0x06, 0x1a, 0xf0, 0x53, 0xb0, 0xe4, 0x93, 0x13, 0x5b, 0x78, 0x6e, 0x97, 0xdb, 0x6e, - 0xc8, 0x38, 0xa7, 0x2d, 0xfd, 0xee, 0xfc, 0x6f, 0x18, 0x99, 0x65, 0xc5, 0xba, 0x04, 0x41, 0xb8, - 0xe8, 0x93, 0x93, 0x66, 0x1c, 0xda, 0xd2, 0x11, 0x01, 0x4a, 0x93, 0x06, 0xc2, 0xaf, 0x41, 0x5e, - 0xd5, 0xb1, 0x7d, 0xd2, 0x4f, 0xee, 0xb0, 0x07, 0xd3, 0x27, 0xa0, 0xce, 0xfc, 0x17, 0xa4, 0x6f, - 0x55, 0xb4, 0xf5, 0x70, 0x7c, 0xdb, 0x52, 0x05, 0x61, 0x70, 0x9c, 0xc0, 0x38, 0x7a, 0x09, 0x72, - 0x29, 0xe9, 0x26, 0x7d, 0x6f, 0x83, 0x92, 0xcb, 0x62, 0xdf, 0x5c, 0x61, 0x93, 0x56, 0x2b, 0xa4, - 0x3c, 0xb9, 0x0c, 0xef, 0x8f, 0xee, 0xbb, 0x49, 0x04, 0xc2, 0xc5, 0x24, 0xb4, 0xa9, 0x23, 0xdf, - 0x1a, 0x20, 0x67, 0x11, 0x4e, 0x3f, 0xa1, 0x01, 0xf3, 0xe3, 0xeb, 0xaf, 0x15, 0x3f, 0xc8, 0xfa, - 0xb9, 0xf1, 0xeb, 0x4f, 0x86, 0x11, 0x56, 0xe9, 0x7f, 0xfb, 0xcb, 0x86, 0x7e, 0x99, 0x05, 0x70, - 0xb3, 0xd7, 0xdb, 0x8f, 0xfd, 0x74, 0x59, 0x0f, 0xd3, 0x23, 0x1a, 0x0c, 0x28, 0x7c, 0x09, 0xa0, - 0x20, 0x5d, 0x1a, 0xda, 0xf1, 0x9f, 0x49, 0x7c, 0x67, 0xbb, 0x5d, 0x1a, 0xea, 0x4b, 0xe3, 0xf1, - 0x68, 0x0a, 0xa3, 0x7f, 0x9c, 0xd1, 0xf7, 0x39, 0xa6, 0x6d, 0x53, 0xca, 0x9b, 0x8a, 0x64, 0xbd, - 0xa3, 0xe7, 0xb1, 0xaa, 0xbf, 0x63, 0x97, 0x64, 0x11, 0x2e, 0x89, 0x09, 0x12, 0xfc, 0x06, 0x40, - 0xf7, 0xd4, 0xed, 0x79, 0xae, 0x1d, 0xff, 0xa4, 0x24, 0xf5, 0x33, 0xd7, 0xbe, 0x87, 0x92, 0xb3, - 0x19, 0x3a, 0x53, 0x8a, 0x5f, 0xd6, 0x44, 0xb8, 0xe4, 0x4e, 0x90, 0x3e, 0xcb, 0x2e, 0xcc, 0x96, - 0x32, 0xb8, 0x28, 0x4e, 0x2e, 0x6e, 0xf3, 0x37, 0x03, 0x94, 0x26, 0x0b, 0xc0, 0x8f, 0x01, 0x18, - 0x89, 0x5e, 0xff, 0xa9, 0xcd, 0xc6, 0xfb, 0xc1, 0xb9, 0xb4, 0x24, 0xec, 0x82, 0xff, 0x1f, 0xaa, - 0x13, 0x4a, 0x5c, 0x97, 0x0d, 0x02, 0xe1, 0x05, 0x1d, 0x9b, 0x0b, 0x12, 0x0a, 0x6e, 0xb7, 0x43, - 0xe6, 0xcb, 0x19, 0x67, 0xac, 0xda, 0x30, 0x32, 0x1f, 0xaa, 0x1e, 0xde, 0x0a, 0x47, 0xb8, 0xa2, - 0xf2, 0x9b, 0x69, 0xfa, 0x40, 0x66, 0xb7, 0x43, 0xe6, 0x5b, 0xbb, 0xaf, 0xce, 0xaa, 0xc6, 0xeb, - 0xb3, 0xaa, 0xf1, 0xc7, 0x59, 0xd5, 0xf8, 0xfe, 0xbc, 0x3a, 0xf3, 0xfa, 0xbc, 0x3a, 0xf3, 0xe6, - 0xbc, 0x3a, 0xf3, 0xd5, 0x07, 0x1d, 0x4f, 0x1c, 0x0e, 0x9c, 0xba, 0xcb, 0xfc, 0x86, 0x76, 0xf7, - 0x71, 0x8f, 0x38, 0x3c, 0x59, 0x34, 0x8e, 0x36, 0x9e, 0x34, 0x4e, 0x46, 0x3f, 0xda, 0xe2, 0xb4, - 0x4f, 0xb9, 0x33, 0x2f, 0xd7, 0x4f, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xe2, 0x27, 0xf6, 0x6c, - 0x89, 0x0b, 0x00, 0x00, + // 1180 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xce, 0xc6, 0x6e, 0x1a, 0x8f, 0x5b, 0xdb, 0x9d, 0xa6, 0xad, 0xe3, 0x82, 0x37, 0x4c, 0x2b, + 0x70, 0x91, 0x6a, 0x2b, 0x29, 0x07, 0x54, 0x54, 0xa4, 0x6c, 0x50, 0x45, 0x41, 0xb4, 0xd5, 0xc4, + 0x52, 0x05, 0x97, 0x65, 0x76, 0x3d, 0x76, 0x56, 0xf6, 0xee, 0x58, 0x3b, 0xe3, 0x34, 0x29, 0x52, + 0x2f, 0x1c, 0xb9, 0x70, 0xe1, 0xc6, 0x81, 0x1b, 0x5c, 0xf8, 0x1b, 0xb8, 0xf6, 0xd8, 0x63, 0xc5, + 0x61, 0x85, 0xda, 0x0b, 0xe2, 0xe8, 0xbf, 0x00, 0xcd, 0x8f, 0x5d, 0x3b, 0x9b, 0xba, 0x69, 0x24, + 0xc4, 0x6d, 0xf7, 0xbd, 0xef, 0xfb, 0xde, 0x7b, 0xdf, 0xcc, 0xce, 0x0e, 0xf8, 0x80, 0xf1, 0x90, + 0xf1, 0x80, 0x77, 0xc6, 0x31, 0x13, 0x2c, 0xa6, 0xfb, 0x9d, 0xfd, 0x4d, 0x8f, 0x0a, 0xb2, 0x99, + 0x05, 0xda, 0xea, 0x01, 0xd6, 0x0d, 0xb0, 0x9d, 0xc5, 0x0d, 0xb0, 0xb1, 0xee, 0xab, 0x94, 0xab, + 0x12, 0x1d, 0xfd, 0xa2, 0x51, 0x8d, 0xb5, 0x01, 0x1b, 0x30, 0x1d, 0x97, 0x4f, 0x26, 0xda, 0xd4, + 0x98, 0x8e, 0x47, 0x38, 0xcd, 0xca, 0xf9, 0x2c, 0x88, 0x4c, 0xfe, 0x46, 0xd6, 0x13, 0x63, 0xa3, + 0x90, 0x44, 0x64, 0x40, 0xe3, 0x0c, 0x37, 0xa0, 0x11, 0xcd, 0xda, 0x68, 0x5c, 0x4f, 0xa1, 0xe2, + 0xa0, 0x4f, 0x29, 0x7f, 0x3d, 0x0a, 0xbd, 0xb0, 0x00, 0xec, 0xb2, 0x21, 0x8d, 0x1e, 0x92, 0x20, + 0xde, 0x8e, 0x3d, 0xcc, 0x26, 0x82, 0x72, 0xf8, 0x35, 0x00, 0x24, 0xf6, 0xdc, 0x58, 0xbd, 0xd5, + 0xad, 0x8d, 0x42, 0xab, 0xbc, 0x65, 0xb7, 0x17, 0xcd, 0xd9, 0x56, 0x2c, 0x67, 0xfd, 0x59, 0x62, + 0x2f, 0x4d, 0x13, 0xfb, 0xc2, 0x21, 0x09, 0x47, 0xb7, 0xd1, 0x4c, 0x00, 0xe1, 0x12, 0xc9, 0xa4, + 0xdb, 0x60, 0x55, 0xc8, 0x82, 0x6e, 0x10, 0xd5, 0x97, 0x37, 0xac, 0x56, 0xc9, 0xb9, 0x38, 0x4d, + 0xec, 0xaa, 0xe6, 0xa4, 0x19, 0x84, 0xcf, 0xaa, 0xc7, 0x7b, 0x11, 0xdc, 0x04, 0x25, 0x1d, 0x65, + 0x13, 0x51, 0x2f, 0x28, 0xc2, 0xda, 0x34, 0xb1, 0x6b, 0xf3, 0x04, 0x36, 0x11, 0x08, 0x6b, 0xd9, + 0x07, 0x13, 0x71, 0xbb, 0xf8, 0xf7, 0x2f, 0xb6, 0x85, 0x7e, 0xb7, 0xc0, 0x19, 0x55, 0x13, 0xde, + 0x07, 0x2b, 0x22, 0x26, 0xbd, 0xb7, 0x99, 0xa4, 0x2b, 0x71, 0xce, 0x25, 0x33, 0xc9, 0x79, 0x53, + 0x44, 0x91, 0x11, 0x36, 0x2a, 0xf0, 0x3e, 0x28, 0x71, 0x41, 0xc7, 0x2e, 0x0f, 0x9e, 0x50, 0x33, + 0xc3, 0xa6, 0x64, 0xfc, 0x99, 0xd8, 0x97, 0xf4, 0x02, 0xf2, 0xde, 0xb0, 0x1d, 0xb0, 0x4e, 0x48, + 0xc4, 0x5e, 0xfb, 0x5e, 0x24, 0x66, 0xfd, 0x66, 0x3c, 0x84, 0x57, 0xe5, 0xf3, 0x6e, 0xf0, 0x84, + 0x9a, 0x7e, 0x7f, 0xb2, 0xc0, 0x19, 0x55, 0x1e, 0x5e, 0x03, 0x45, 0xb9, 0xbe, 0x75, 0x6b, 0xc3, + 0x6a, 0x15, 0x9d, 0xea, 0x34, 0xb1, 0xcb, 0x9a, 0x2d, 0xa3, 0x08, 0xab, 0xe4, 0xff, 0xe7, 0xe3, + 0x3f, 0x16, 0xa8, 0x2a, 0x1f, 0x77, 0x05, 0x11, 0x01, 0x17, 0x81, 0xcf, 0xe1, 0x97, 0xe0, 0xec, + 0x38, 0x66, 0xfd, 0x40, 0xa4, 0x96, 0xae, 0xb7, 0xcd, 0xee, 0x96, 0x3b, 0x37, 0x73, 0x73, 0x87, + 0x05, 0x91, 0x73, 0xd9, 0x98, 0x59, 0x31, 0x33, 0x68, 0x1e, 0xc2, 0xa9, 0x02, 0xf4, 0x40, 0x2d, + 0x9a, 0x84, 0x1e, 0x8d, 0x5d, 0xd6, 0x77, 0xcd, 0x42, 0xe9, 0x89, 0x3e, 0x3e, 0xc9, 0xd5, 0x2b, + 0x5a, 0x33, 0x4f, 0x47, 0xb8, 0xa2, 0x43, 0x0f, 0xfa, 0x5d, 0xbd, 0x64, 0xef, 0x83, 0x33, 0x6a, + 0x2f, 0xd6, 0x0b, 0x1b, 0x85, 0x56, 0xd1, 0xa9, 0x4d, 0x13, 0xfb, 0x9c, 0xe6, 0xaa, 0x30, 0xc2, + 0x3a, 0x8d, 0x7e, 0x5d, 0x06, 0xe5, 0x87, 0x8c, 0x8d, 0x1e, 0xd1, 0x60, 0xb0, 0x27, 0x38, 0xbc, + 0x03, 0xce, 0x73, 0x41, 0xbc, 0x11, 0x75, 0x1f, 0xab, 0x88, 0x59, 0x93, 0xfa, 0x34, 0xb1, 0xd7, + 0xd2, 0x15, 0x9d, 0x4b, 0x23, 0x7c, 0x4e, 0xbf, 0x6b, 0x3e, 0xdc, 0x01, 0x55, 0x8f, 0x8c, 0x48, + 0xe4, 0xd3, 0x38, 0x15, 0x58, 0x56, 0x02, 0x8d, 0x69, 0x62, 0x5f, 0xd6, 0x02, 0x39, 0x00, 0xc2, + 0x95, 0x34, 0x62, 0x44, 0x1e, 0x80, 0x8b, 0x3e, 0x8b, 0x7c, 0x1a, 0x89, 0x98, 0x08, 0xda, 0x4b, + 0x85, 0x0a, 0x4a, 0xa8, 0x39, 0x4d, 0xec, 0x86, 0x16, 0x7a, 0x0d, 0x08, 0x61, 0x38, 0x1f, 0x9d, + 0x75, 0x25, 0x0d, 0x7d, 0x4c, 0x78, 0x98, 0x8a, 0x15, 0xf3, 0x5d, 0xe5, 0x00, 0x08, 0x57, 0xd2, + 0x88, 0x16, 0x41, 0x3f, 0x17, 0x40, 0xe5, 0x5e, 0xd4, 0x67, 0xce, 0xa1, 0xf4, 0xab, 0x7b, 0x38, + 0xa6, 0xf0, 0x11, 0x58, 0xd1, 0xd3, 0x2b, 0x97, 0xca, 0x5b, 0xad, 0xc5, 0xdf, 0xd9, 0xae, 0xc2, + 0x49, 0xa6, 0xd2, 0xc8, 0x7d, 0x70, 0x5a, 0x05, 0x61, 0x23, 0x07, 0x5d, 0xb0, 0x9a, 0x7a, 0xa2, + 0xfc, 0x2b, 0x6f, 0x7d, 0xb8, 0x58, 0xda, 0x31, 0xc8, 0x4c, 0xfc, 0x8a, 0x11, 0xaf, 0x1e, 0xf5, + 0x1b, 0xe1, 0x4c, 0x14, 0x32, 0x70, 0x6e, 0xde, 0x27, 0xe5, 0x6d, 0x79, 0xab, 0xbd, 0xb8, 0xc8, + 0xce, 0x1c, 0x3a, 0x2b, 0x74, 0xd5, 0x14, 0xba, 0x78, 0x7c, 0x3d, 0x10, 0x3e, 0x52, 0x40, 0x4e, + 0x94, 0xfa, 0xa9, 0xbc, 0x7f, 0xe3, 0x44, 0x3b, 0x06, 0xb9, 0x68, 0xa2, 0x54, 0x09, 0xe1, 0x4c, + 0x14, 0x7d, 0x02, 0x2a, 0x47, 0x3d, 0x86, 0x37, 0xc0, 0xca, 0x91, 0x3d, 0x7c, 0x61, 0xe6, 0x77, + 0xba, 0xc6, 0x06, 0x80, 0xee, 0x80, 0x5a, 0xde, 0xc5, 0xd3, 0xd0, 0x7f, 0xb0, 0xc0, 0xda, 0xeb, + 0x0c, 0x3a, 0x85, 0x06, 0xfc, 0x1c, 0x5c, 0x08, 0xc9, 0x81, 0x2b, 0x02, 0x7f, 0xc8, 0x5d, 0x3f, + 0x66, 0x9c, 0xd3, 0x9e, 0xf9, 0x76, 0xde, 0x99, 0x26, 0x76, 0x5d, 0xb3, 0x8e, 0x41, 0x10, 0xae, + 0x86, 0xe4, 0xa0, 0x2b, 0x43, 0x3b, 0x26, 0x22, 0x40, 0x2d, 0x6f, 0x20, 0xfc, 0x16, 0x94, 0x75, + 0x1d, 0x37, 0x24, 0xe3, 0xf4, 0x0c, 0xbb, 0xb6, 0x78, 0x05, 0xf4, 0x9e, 0xff, 0x8a, 0x8c, 0x9d, + 0x86, 0xb1, 0x1e, 0xce, 0xb7, 0xad, 0x54, 0x10, 0x06, 0x8f, 0x53, 0x18, 0x47, 0x4f, 0x41, 0x29, + 0x23, 0x9d, 0x66, 0xee, 0xbb, 0xa0, 0xe6, 0x33, 0xe9, 0x9b, 0x2f, 0x5c, 0xd2, 0xeb, 0xc5, 0x94, + 0xa7, 0x87, 0xe1, 0xd5, 0xd9, 0x79, 0x97, 0x47, 0x20, 0x5c, 0x4d, 0x43, 0xdb, 0x26, 0xf2, 0xbd, + 0x05, 0x4a, 0x0e, 0xe1, 0xf4, 0x33, 0x1a, 0xb1, 0x50, 0x1e, 0x7f, 0x3d, 0xf9, 0xa0, 0xea, 0x97, + 0xe6, 0x8f, 0x3f, 0x15, 0x46, 0x58, 0xa7, 0xff, 0xeb, 0x3f, 0x1b, 0x8a, 0x00, 0xc8, 0x9a, 0xe0, + 0xd2, 0x75, 0xf9, 0x7b, 0x70, 0x55, 0xad, 0xb7, 0x70, 0x3d, 0xa3, 0xe6, 0x5d, 0x9f, 0x53, 0x41, + 0x18, 0x78, 0x59, 0x05, 0xf4, 0xdb, 0x32, 0x80, 0xdb, 0xa3, 0xd1, 0x43, 0xa9, 0xe4, 0xb3, 0x11, + 0xa6, 0xfb, 0x34, 0x9a, 0x50, 0xf8, 0x14, 0x40, 0x41, 0x86, 0x34, 0x76, 0xe5, 0x4d, 0x48, 0xfe, + 0x23, 0xfc, 0x21, 0x8d, 0xcd, 0x21, 0x75, 0x73, 0x56, 0x7f, 0x76, 0xa7, 0x9a, 0xdd, 0x07, 0x24, + 0xed, 0x2e, 0xa5, 0xbc, 0xab, 0x49, 0xce, 0x7b, 0xa6, 0x93, 0x75, 0xf3, 0xdf, 0x3c, 0x26, 0x8b, + 0x70, 0x4d, 0xe4, 0x48, 0xf0, 0x3b, 0x00, 0xfd, 0x43, 0x7f, 0x14, 0xf8, 0xae, 0xbc, 0x14, 0xa5, + 0xf5, 0x0b, 0x27, 0x7e, 0xf7, 0x8a, 0xb3, 0x1d, 0x7b, 0x0b, 0x8a, 0x1f, 0xd7, 0x44, 0xb8, 0xe6, + 0xe7, 0x48, 0x5f, 0x14, 0x57, 0x97, 0x6b, 0x05, 0x5c, 0x15, 0x07, 0x47, 0xdb, 0xfc, 0xc3, 0x02, + 0xb5, 0x7c, 0x01, 0xf8, 0x29, 0x00, 0x33, 0xd1, 0x93, 0x7f, 0xed, 0x45, 0xd9, 0x0f, 0x2e, 0x65, + 0x25, 0xe1, 0x10, 0xbc, 0xbb, 0xa7, 0xbf, 0x08, 0xe2, 0xfb, 0x6c, 0x12, 0x89, 0x20, 0x1a, 0xb8, + 0x5c, 0x90, 0x58, 0x70, 0xb7, 0x1f, 0xb3, 0x50, 0xed, 0xa9, 0x82, 0xd3, 0x9a, 0x26, 0xf6, 0x75, + 0x3d, 0xc3, 0x1b, 0xe1, 0x08, 0x37, 0x74, 0x7e, 0x3b, 0x4b, 0xef, 0xaa, 0xec, 0xdd, 0x98, 0x85, + 0xce, 0xfd, 0x67, 0x2f, 0x9b, 0xd6, 0xf3, 0x97, 0x4d, 0xeb, 0xaf, 0x97, 0x4d, 0xeb, 0xc7, 0x57, + 0xcd, 0xa5, 0xe7, 0xaf, 0x9a, 0x4b, 0x2f, 0x5e, 0x35, 0x97, 0xbe, 0xf9, 0x68, 0x10, 0x88, 0xbd, + 0x89, 0xd7, 0xf6, 0x59, 0xd8, 0x31, 0xee, 0xde, 0x1c, 0x11, 0x8f, 0xa7, 0x2f, 0x9d, 0xfd, 0xad, + 0x5b, 0x9d, 0x83, 0xd9, 0xc5, 0x5e, 0x1c, 0x8e, 0x29, 0xf7, 0x56, 0xd4, 0xfb, 0xad, 0x7f, 0x03, + 0x00, 0x00, 0xff, 0xff, 0xfd, 0x90, 0xd6, 0x07, 0xf9, 0x0b, 0x00, 0x00, } func (this *TokenPairArbRoutes) Equal(that interface{}) bool { @@ -1534,6 +1582,43 @@ func (m *BaseDenom) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *BaseDenoms) 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 *BaseDenoms) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *BaseDenoms) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.BaseDenoms) > 0 { + for iNdEx := len(m.BaseDenoms) - 1; iNdEx >= 0; iNdEx-- { + { + size, err := m.BaseDenoms[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintProtorev(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + func (m *AllProtocolRevenue) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1837,6 +1922,21 @@ func (m *BaseDenom) Size() (n int) { return n } +func (m *BaseDenoms) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.BaseDenoms) > 0 { + for _, e := range m.BaseDenoms { + l = e.Size() + n += 1 + l + sovProtorev(uint64(l)) + } + } + return n +} + func (m *AllProtocolRevenue) Size() (n int) { if m == nil { return 0 @@ -3302,6 +3402,90 @@ func (m *BaseDenom) Unmarshal(dAtA []byte) error { } return nil } +func (m *BaseDenoms) 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 ErrIntOverflowProtorev + } + 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: BaseDenoms: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: BaseDenoms: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field BaseDenoms", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowProtorev + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthProtorev + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthProtorev + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.BaseDenoms = append(m.BaseDenoms, BaseDenom{}) + if err := m.BaseDenoms[len(m.BaseDenoms)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipProtorev(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthProtorev + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *AllProtocolRevenue) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0