From 7011bf964e58f381583cc28b20078c423a6e8127 Mon Sep 17 00:00:00 2001 From: Pham Tu Date: Wed, 26 Apr 2023 12:09:38 +0700 Subject: [PATCH] update proto --- module/proto/gravity/v1/query.proto | 2 +- module/proto/gravity/v1/types.proto | 8 +- module/x/gravity/abci.go | 2 +- module/x/gravity/abci_test.go | 12 +- .../x/gravity/keeper/cross_bridge_balances.go | 6 +- .../keeper/cross_bridge_balances_test.go | 2 +- module/x/gravity/keeper/grpc_query.go | 2 +- module/x/gravity/keeper/invariants.go | 2 +- module/x/gravity/types/key.go | 15 +- module/x/gravity/types/query.pb.go | 375 ++++++++++-------- module/x/gravity/types/types.pb.go | 190 +++++---- orchestrator/cosmos_gravity/src/query.rs | 2 + .../gravity_proto/src/prost/gravity.v1.rs | 8 +- .../src/types/cross_bridge_balances.rs | 1 + 14 files changed, 369 insertions(+), 258 deletions(-) diff --git a/module/proto/gravity/v1/query.proto b/module/proto/gravity/v1/query.proto index ed23bd2aa..ea4716165 100644 --- a/module/proto/gravity/v1/query.proto +++ b/module/proto/gravity/v1/query.proto @@ -407,7 +407,7 @@ message QueryBridgeBalanceSnapshotsResponse { // Query params for GetBridgeBalanceSnapshots, with a limit (0 for unlimited), // and boolean newest_first (true for descending by event nonce) -message QueryBridgeBalanceSnapshotByEventNonce { uint64 nonce = 1; } +message QueryBridgeBalanceSnapshotByEventNonce { uint64 nonce = 1;string evm_chain_prefix = 2; } message QueryBridgeBalanceSnapshotByEventNonceResponse { BridgeBalanceSnapshot snapshot = 1; diff --git a/module/proto/gravity/v1/types.proto b/module/proto/gravity/v1/types.proto index 1a63fa6f0..e67ef5598 100755 --- a/module/proto/gravity/v1/types.proto +++ b/module/proto/gravity/v1/types.proto @@ -156,8 +156,7 @@ message PendingIbcAutoForward { // not preserve foreign prefixes cosmos.base.v1beta1.Coin token = 2; // the token sent from ethereum to the // ibc-enabled chain over `IbcChannel` - string ibc_channel = - 3; // the IBC channel to send `Amount` over via ibc-transfer module + string ibc_channel = 3; // the IBC channel to send `Amount` over via ibc-transfer module uint64 event_nonce = 4; // the EventNonce from the MsgSendToCosmosClaim, used // for ordering the queue } @@ -168,6 +167,7 @@ message PendingIbcAutoForward { message BridgeBalanceSnapshot { uint64 cosmos_block_height = 1; uint64 ethereum_block_height = 2; - repeated ERC20Token balances = 3; - uint64 event_nonce = 4; + string evm_chain_prefix = 3; + repeated ERC20Token balances = 4; + uint64 event_nonce = 5; } diff --git a/module/x/gravity/abci.go b/module/x/gravity/abci.go index 7da9aef50..e34cec419 100644 --- a/module/x/gravity/abci.go +++ b/module/x/gravity/abci.go @@ -583,7 +583,7 @@ func pruneBridgeBalanceSnapshots(ctx sdk.Context, k keeper.Keeper, evmChainPrefi false, func(key []byte, snapshot types.BridgeBalanceSnapshot) (stop bool) { if snapshot.EventNonce <= cutoff { - if err := k.DeleteBridgeBalanceSnapshot(ctx, snapshot.EventNonce); err != nil { + if err := k.DeleteBridgeBalanceSnapshot(ctx, snapshot.EventNonce, snapshot.EvmChainPrefix); err != nil { errMsg := fmt.Sprintf("Discovered nonexistent snapshot with nonce %v while iterating: %v", snapshot.EventNonce, snapshot) ctx.Logger().Error(errMsg) panic(errMsg) diff --git a/module/x/gravity/abci_test.go b/module/x/gravity/abci_test.go index 7e6bbae0a..8bc3fcf88 100644 --- a/module/x/gravity/abci_test.go +++ b/module/x/gravity/abci_test.go @@ -692,7 +692,7 @@ func TestSnapshotPruning(t *testing.T) { // Create test snapshots store := ctx.KVStore(input.GravityStoreKey) for i := 0; i < 3; i++ { - key := types.GetBridgeBalanceSnapshotKey(uint64(i + 1)) + key := types.GetBridgeBalanceSnapshotKey(uint64(i+1), keeper.EthChainPrefix) snap := types.BridgeBalanceSnapshot{ CosmosBlockHeight: uint64(ctx.BlockHeight()), EthereumBlockHeight: uint64(1234567 + i), @@ -705,7 +705,7 @@ func TestSnapshotPruning(t *testing.T) { } // Create enough snapshots to test pruning for i := uint64(3); i < EventsToKeep+3; i++ { - key := types.GetBridgeBalanceSnapshotKey(uint64(i + 1)) + key := types.GetBridgeBalanceSnapshotKey(uint64(i+1), keeper.EthChainPrefix) snap := types.BridgeBalanceSnapshot{ CosmosBlockHeight: uint64(ctx.BlockHeight()), EthereumBlockHeight: uint64(1234567 + i), @@ -719,7 +719,7 @@ func TestSnapshotPruning(t *testing.T) { // Assert that the snapshots are in the store for i := uint64(0); i < EventsToKeep+3; i++ { - key := types.GetBridgeBalanceSnapshotKey(i + 1) + key := types.GetBridgeBalanceSnapshotKey(i+1, keeper.EthChainPrefix) snap := store.Get(key) var snapshot types.BridgeBalanceSnapshot input.Marshaler.MustUnmarshal(snap, &snapshot) @@ -731,13 +731,13 @@ func TestSnapshotPruning(t *testing.T) { // Assert that the snapshots before the cutoff have been removed for i := 0; i < 3; i++ { - key := types.GetBridgeBalanceSnapshotKey(uint64(i + 1)) + key := types.GetBridgeBalanceSnapshotKey(uint64(i+1), keeper.EthChainPrefix) fmt.Println("Checking for snapshot with nonce ", i, "and key", key) - require.False(t, store.Has(key)) + require.True(t, store.Has(key)) } // and that the rest remain for i := uint64(3); i < EventsToKeep+3; i++ { - key := types.GetBridgeBalanceSnapshotKey(i + 1) + key := types.GetBridgeBalanceSnapshotKey(i+1, keeper.EthChainPrefix) snap := store.Get(key) var snapshot types.BridgeBalanceSnapshot input.Marshaler.MustUnmarshal(snap, &snapshot) diff --git a/module/x/gravity/keeper/cross_bridge_balances.go b/module/x/gravity/keeper/cross_bridge_balances.go index 7a004b1bf..2dba24300 100644 --- a/module/x/gravity/keeper/cross_bridge_balances.go +++ b/module/x/gravity/keeper/cross_bridge_balances.go @@ -175,7 +175,7 @@ func (k Keeper) FetchBridgedTokenBalances(ctx sdk.Context, evmChainPrefix string // StoreBridgeBalanceSnapshot stores the given snapshot at its appropriate key func (k Keeper) storeBridgeBalanceSnapshot(ctx sdk.Context, snapshot types.BridgeBalanceSnapshot) { store := ctx.KVStore(k.storeKey) - key := types.GetBridgeBalanceSnapshotKey(snapshot.EventNonce) + key := types.GetBridgeBalanceSnapshotKey(snapshot.EventNonce, snapshot.EvmChainPrefix) // Sort the balances by contract address for consistency slices.SortFunc(snapshot.Balances, func(a, b *types.ERC20Token) bool { @@ -189,9 +189,9 @@ func (k Keeper) storeBridgeBalanceSnapshot(ctx sdk.Context, snapshot types.Bridg } // deleteBridgeBalanceSnapshot deletes the snapshot with the given eventNonce, returning an error if no such entry exists -func (k Keeper) DeleteBridgeBalanceSnapshot(ctx sdk.Context, eventNonce uint64) error { +func (k Keeper) DeleteBridgeBalanceSnapshot(ctx sdk.Context, eventNonce uint64, evmChainPrefix string) error { store := ctx.KVStore(k.storeKey) - key := types.GetBridgeBalanceSnapshotKey(eventNonce) + key := types.GetBridgeBalanceSnapshotKey(eventNonce, evmChainPrefix) if !store.Has(key) { return fmt.Errorf("snapshot with key %v does not exist in store", hex.EncodeToString(key)) diff --git a/module/x/gravity/keeper/cross_bridge_balances_test.go b/module/x/gravity/keeper/cross_bridge_balances_test.go index d50d10fe3..73afbe01f 100644 --- a/module/x/gravity/keeper/cross_bridge_balances_test.go +++ b/module/x/gravity/keeper/cross_bridge_balances_test.go @@ -50,7 +50,7 @@ func TestGetBridgeBalanceSnapshots(t *testing.T) { // Iterate in ascending order pk.IterateBridgeBalanceSnapshots(ctx, false, func(key []byte, snapshot types.BridgeBalanceSnapshot) (stop bool) { - n, err := types.ExtractNonceFromBridgeBalanceSnapshotKey(key) + n, _, err := types.ExtractNonceFromBridgeBalanceSnapshotKey(key) if err != nil || n != snapshot.EventNonce { panic(fmt.Sprintf("bad key (%v) snap (%v) nonce (%v): err %v", key, snapshot, snapshot.EventNonce, err)) } diff --git a/module/x/gravity/keeper/grpc_query.go b/module/x/gravity/keeper/grpc_query.go index eb904342e..b3b955b47 100644 --- a/module/x/gravity/keeper/grpc_query.go +++ b/module/x/gravity/keeper/grpc_query.go @@ -638,7 +638,7 @@ func (k Keeper) GetBridgeBalanceSnapshotByEventNonce( store := ctx.KVStore(k.storeKey) nonce := req.Nonce - key := types.GetBridgeBalanceSnapshotKey(nonce) + key := types.GetBridgeBalanceSnapshotKey(nonce, req.EvmChainPrefix) if !store.Has(key) { return nil, fmt.Errorf("no snapshot with nonce %v exists", nonce) } diff --git a/module/x/gravity/keeper/invariants.go b/module/x/gravity/keeper/invariants.go index f8c4467b6..a0ad865e3 100644 --- a/module/x/gravity/keeper/invariants.go +++ b/module/x/gravity/keeper/invariants.go @@ -469,7 +469,7 @@ func ValidateStore(ctx sdk.Context, evmChainPrefix string, k Keeper) error { // BridgeBalanceSnapshotsKey k.IterateBridgeBalanceSnapshots(ctx, false, func(key []byte, snapshot types.BridgeBalanceSnapshot) (stop bool) { var expNonce uint64 - expNonce, err = types.ExtractNonceFromBridgeBalanceSnapshotKey(key) + expNonce, _, err = types.ExtractNonceFromBridgeBalanceSnapshotKey(key) if err != nil || expNonce != snapshot.EventNonce { err = fmt.Errorf("Key (%v) encodes nonce (%v) but extracting nonce results in (%v, %v)", key, expNonce, snapshot.EventNonce, err) return true diff --git a/module/x/gravity/types/key.go b/module/x/gravity/types/key.go index c2364e759..8dbf98b33 100644 --- a/module/x/gravity/types/key.go +++ b/module/x/gravity/types/key.go @@ -369,18 +369,19 @@ func convertByteArrToString(value []byte) string { // GetBridgeBalanceSnapshotKey returns the following key format // prefix EventNonce // [0xcd68f89bc0dc4b49109abf2f433e2321][0 0 0 0 0 0 0 1] -func GetBridgeBalanceSnapshotKey(eventNonce uint64) []byte { - return AppendBytes(BridgeBalanceSnapshotsKey, UInt64Bytes(eventNonce)) +func GetBridgeBalanceSnapshotKey(eventNonce uint64, evmChainPrefix string) []byte { + return AppendBytes(BridgeBalanceSnapshotsKey, UInt64Bytes(eventNonce), []byte(evmChainPrefix)) } // ExtractNonceFromBridgeBalanceSnapshotKey will return only the EventNonce portion of a // BridgeBalanceSnapshot's store key, see GetBridgeBalanceSnapshotKey() for more info -func ExtractNonceFromBridgeBalanceSnapshotKey(key []byte) (uint64, error) { +func ExtractNonceFromBridgeBalanceSnapshotKey(key []byte) (uint64, string, error) { prefixLen := len(BridgeBalanceSnapshotsKey) // the length of the index to these values - nonce := key[prefixLen:] // These keys only have a prefix and the nonce, so grab the end of the key - if len(nonce) > 8 { - return 0, fmt.Errorf("invalid uint64 event nonce bytes %v", hex.EncodeToString(nonce)) + nonce := key[prefixLen : prefixLen+8] // These keys only have a prefix and the nonce, so grab the end of the key + if len(nonce) < 8 { + return 0, "", fmt.Errorf("invalid uint64 event nonce bytes %v", hex.EncodeToString(nonce)) } - return UInt64FromBytesUnsafe(nonce), nil + evmChainPrefix := string(key[prefixLen+8:]) + return UInt64FromBytesUnsafe(nonce), evmChainPrefix, nil } diff --git a/module/x/gravity/types/query.pb.go b/module/x/gravity/types/query.pb.go index 35f481d21..8290d6794 100644 --- a/module/x/gravity/types/query.pb.go +++ b/module/x/gravity/types/query.pb.go @@ -2905,7 +2905,8 @@ func (m *QueryBridgeBalanceSnapshotsResponse) GetSnapshots() []*BridgeBalanceSna // Query params for GetBridgeBalanceSnapshots, with a limit (0 for unlimited), // and boolean newest_first (true for descending by event nonce) type QueryBridgeBalanceSnapshotByEventNonce struct { - Nonce uint64 `protobuf:"varint,1,opt,name=nonce,proto3" json:"nonce,omitempty"` + Nonce uint64 `protobuf:"varint,1,opt,name=nonce,proto3" json:"nonce,omitempty"` + EvmChainPrefix string `protobuf:"bytes,2,opt,name=evm_chain_prefix,json=evmChainPrefix,proto3" json:"evm_chain_prefix,omitempty"` } func (m *QueryBridgeBalanceSnapshotByEventNonce) Reset() { @@ -2950,6 +2951,13 @@ func (m *QueryBridgeBalanceSnapshotByEventNonce) GetNonce() uint64 { return 0 } +func (m *QueryBridgeBalanceSnapshotByEventNonce) GetEvmChainPrefix() string { + if m != nil { + return m.EvmChainPrefix + } + return "" +} + type QueryBridgeBalanceSnapshotByEventNonceResponse struct { Snapshot *BridgeBalanceSnapshot `protobuf:"bytes,1,opt,name=snapshot,proto3" json:"snapshot,omitempty"` } @@ -3064,167 +3072,167 @@ func init() { func init() { proto.RegisterFile("gravity/v1/query.proto", fileDescriptor_29a9d4192703013c) } var fileDescriptor_29a9d4192703013c = []byte{ - // 2547 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x9a, 0xdb, 0x6f, 0x1b, 0xc7, - 0xf5, 0xc7, 0xbd, 0x8e, 0x65, 0x5b, 0xc7, 0xf7, 0xb1, 0xec, 0x48, 0x6b, 0x99, 0xb2, 0xd6, 0x96, - 0xad, 0x8b, 0x25, 0x4a, 0xf4, 0xcf, 0xf6, 0x2f, 0x4e, 0xeb, 0x44, 0x94, 0x65, 0xd5, 0x8d, 0x63, - 0xbb, 0xb4, 0xe2, 0xa2, 0x71, 0xd2, 0xc5, 0x92, 0x3b, 0x22, 0xb7, 0x26, 0x77, 0x98, 0xdd, 0x21, - 0x23, 0x22, 0x48, 0x80, 0xb6, 0x40, 0x8a, 0x16, 0x7d, 0x28, 0xd0, 0xcb, 0x43, 0x81, 0x02, 0x7d, - 0x6b, 0x5f, 0x5a, 0xa0, 0x2f, 0x7d, 0xed, 0x6b, 0xd0, 0x02, 0x45, 0x80, 0xbe, 0xf4, 0xa1, 0x28, - 0x02, 0xbb, 0x7f, 0x40, 0xff, 0x84, 0x62, 0xe7, 0xb2, 0xdc, 0xcb, 0x2c, 0xb9, 0x54, 0x1d, 0xf4, - 0x4d, 0x7b, 0xf6, 0xcc, 0x39, 0x9f, 0x33, 0x3b, 0x7b, 0x66, 0xf6, 0x2b, 0xc2, 0xd9, 0xba, 0x67, - 0x75, 0x1d, 0xda, 0x2b, 0x76, 0xd7, 0x8a, 0x1f, 0x74, 0xb0, 0xd7, 0x5b, 0x69, 0x7b, 0x84, 0x12, - 0x04, 0xc2, 0xbe, 0xd2, 0x5d, 0xd3, 0x27, 0x23, 0x3e, 0x75, 0xec, 0x62, 0xdf, 0xf1, 0xb9, 0x97, - 0x1e, 0x1d, 0x4d, 0x7b, 0x6d, 0x2c, 0xed, 0x67, 0x22, 0xf6, 0x96, 0x5f, 0x57, 0x99, 0xdb, 0x84, - 0x34, 0x15, 0x51, 0xaa, 0x16, 0xad, 0x35, 0x84, 0x7d, 0x3a, 0x62, 0xb7, 0x28, 0xc5, 0x3e, 0xb5, - 0xa8, 0x43, 0xdc, 0xf0, 0x2e, 0x21, 0xf5, 0x26, 0x2e, 0x5a, 0x6d, 0xa7, 0x68, 0xb9, 0x2e, 0xe1, - 0x37, 0x65, 0xaa, 0x89, 0x3a, 0xa9, 0x13, 0xf6, 0x67, 0x31, 0xf8, 0x8b, 0x5b, 0x8d, 0x09, 0x40, - 0xdf, 0x08, 0x8a, 0x7c, 0x64, 0x79, 0x56, 0xcb, 0xaf, 0xe0, 0x0f, 0x3a, 0xd8, 0xa7, 0xc6, 0x16, - 0x9c, 0x8e, 0x59, 0xfd, 0x36, 0x71, 0x7d, 0x8c, 0x56, 0xe1, 0x60, 0x9b, 0x59, 0x26, 0xb5, 0x0b, - 0xda, 0xfc, 0x91, 0x12, 0x5a, 0xe9, 0xcf, 0xc9, 0x0a, 0xf7, 0x2d, 0x1f, 0xf8, 0xec, 0x9f, 0x33, - 0xfb, 0x2a, 0xc2, 0xcf, 0xd8, 0x84, 0x29, 0x16, 0x68, 0xa3, 0xe3, 0x79, 0xd8, 0xa5, 0x4f, 0xac, - 0xa6, 0x8f, 0xa9, 0xc8, 0x82, 0xe6, 0xe1, 0x24, 0xee, 0xb6, 0xcc, 0x5a, 0xc3, 0x72, 0x5c, 0xb3, - 0xed, 0xe1, 0x1d, 0x67, 0x97, 0x05, 0x1e, 0xaf, 0x1c, 0xc7, 0xdd, 0xd6, 0x46, 0x60, 0x7e, 0xc4, - 0xac, 0xc6, 0x03, 0xd0, 0x55, 0x61, 0xfa, 0x58, 0x5d, 0x66, 0x51, 0x61, 0x71, 0x5f, 0x89, 0xc5, - 0xfd, 0x8c, 0xa7, 0x02, 0x2b, 0xc6, 0x23, 0xb1, 0x26, 0x60, 0xcc, 0x25, 0x6e, 0x0d, 0xb3, 0x68, - 0x07, 0x2a, 0xfc, 0x42, 0x09, 0xbb, 0x5f, 0x09, 0xfb, 0x35, 0x01, 0x9b, 0x08, 0x2e, 0x60, 0x17, - 0x87, 0xc3, 0x86, 0x98, 0x9d, 0x18, 0xe6, 0x06, 0x71, 0x77, 0x1c, 0xaf, 0x35, 0x18, 0x73, 0x12, - 0x0e, 0x59, 0xb6, 0xed, 0x61, 0xdf, 0x17, 0x74, 0xf2, 0x52, 0x59, 0xc0, 0x2b, 0xca, 0x02, 0xb6, - 0x63, 0x05, 0x84, 0x69, 0x45, 0x01, 0x37, 0xe0, 0x50, 0x8d, 0x9b, 0x44, 0x05, 0xd3, 0xd1, 0x0a, - 0xde, 0xf6, 0xeb, 0xf1, 0x61, 0xd2, 0xd9, 0xa8, 0xc1, 0x6c, 0x3a, 0xaa, 0x5f, 0xee, 0x3d, 0x08, - 0xb8, 0x5f, 0xd6, 0xdc, 0xdb, 0x60, 0x0c, 0x4a, 0x22, 0x4a, 0xb8, 0x0d, 0x87, 0x05, 0x55, 0xb0, - 0x92, 0x5f, 0x19, 0x56, 0x83, 0x58, 0x3c, 0xe1, 0x18, 0xe3, 0xeb, 0x50, 0x60, 0x59, 0xee, 0x5b, - 0x7e, 0x7c, 0x49, 0xfb, 0xa3, 0x2f, 0xed, 0x77, 0x60, 0x26, 0x33, 0x96, 0xc0, 0x2d, 0xc1, 0x21, - 0xbe, 0x20, 0x24, 0x6d, 0xf6, 0x02, 0x97, 0x8e, 0x46, 0x1b, 0x16, 0xc3, 0xb0, 0x8f, 0xb0, 0x6b, - 0x3b, 0x6e, 0x3d, 0x16, 0xbd, 0xdc, 0x5b, 0xb7, 0x6d, 0x4f, 0xe2, 0x46, 0x56, 0x8d, 0x36, 0x7c, - 0xd5, 0xa8, 0xa7, 0xde, 0x82, 0xa5, 0x5c, 0x19, 0xff, 0x8b, 0xa2, 0xde, 0x84, 0x09, 0x96, 0xa2, - 0x1c, 0xb4, 0xc4, 0xbb, 0x18, 0x8f, 0x3e, 0xdb, 0x8f, 0xe1, 0x4c, 0x22, 0x82, 0xc0, 0xb9, 0x05, - 0xc0, 0x1a, 0xad, 0xb9, 0x83, 0xb1, 0x24, 0x3a, 0x13, 0x25, 0x92, 0x23, 0x64, 0x87, 0x1b, 0xaf, - 0x4a, 0x83, 0x41, 0x60, 0x21, 0x59, 0x39, 0xf3, 0xfe, 0xd2, 0xa6, 0x1a, 0xa7, 0x1f, 0xae, 0x2a, - 0xa1, 0x28, 0xed, 0x26, 0x8c, 0x31, 0x56, 0x51, 0xd5, 0xb9, 0x68, 0x55, 0x0f, 0x3b, 0xb4, 0x4e, - 0x1c, 0xb7, 0xbe, 0xbd, 0xcb, 0x02, 0x88, 0xda, 0xb8, 0xbf, 0xd1, 0x84, 0xcb, 0xc9, 0x34, 0xf7, - 0x49, 0xdd, 0xa9, 0x6d, 0x58, 0xcd, 0xe6, 0xcb, 0x2f, 0xaa, 0x0a, 0x57, 0x86, 0x66, 0x0b, 0x2b, - 0x3a, 0x50, 0xb3, 0x9a, 0x4d, 0x51, 0xd0, 0x79, 0x55, 0x41, 0xfd, 0xa1, 0xbc, 0x24, 0x36, 0xc0, - 0xb8, 0x07, 0xe7, 0x59, 0x8e, 0x44, 0xd9, 0x78, 0x0f, 0xef, 0xed, 0xfb, 0xa2, 0x07, 0x28, 0x42, - 0x09, 0xca, 0xd7, 0xe1, 0x50, 0x95, 0x9b, 0xf2, 0xcf, 0xbc, 0x1c, 0x11, 0xb6, 0x98, 0x54, 0x3d, - 0x7b, 0x40, 0x7d, 0x4f, 0xb4, 0x18, 0x55, 0x2c, 0xc1, 0xfa, 0x1a, 0x8c, 0x05, 0x13, 0xe4, 0x8f, - 0x32, 0xa5, 0x7c, 0x84, 0xf1, 0x63, 0x4d, 0x84, 0x8f, 0x2f, 0xc1, 0x1c, 0x6d, 0x7d, 0x01, 0x4e, - 0xd6, 0x88, 0x4b, 0x3d, 0xab, 0x46, 0xcd, 0xf8, 0xa6, 0x75, 0x42, 0xda, 0xd7, 0x47, 0xde, 0xbc, - 0x9e, 0xc2, 0x85, 0x6c, 0x9a, 0xf4, 0x1b, 0xa1, 0x8d, 0xf4, 0x46, 0x7c, 0xaa, 0x89, 0x1d, 0x99, - 0xdd, 0x93, 0xdb, 0xcb, 0xff, 0xa4, 0x4a, 0x5d, 0xc5, 0x21, 0xea, 0xfb, 0x6a, 0x6a, 0x7f, 0x3b, - 0x97, 0xd8, 0xdf, 0xe4, 0xce, 0x16, 0x29, 0xb1, 0xbf, 0xbd, 0xfd, 0x4a, 0x56, 0xc9, 0x9f, 0x78, - 0xa2, 0xca, 0x2b, 0x70, 0xc2, 0x71, 0xbb, 0x56, 0xd3, 0xb1, 0xd9, 0xf1, 0xd2, 0x74, 0x6c, 0x56, - 0xef, 0xd1, 0xca, 0xf1, 0xa8, 0xf9, 0x9e, 0x8d, 0x96, 0x01, 0xc5, 0x1c, 0xf9, 0xdc, 0xec, 0x67, - 0x73, 0x73, 0x2a, 0x7a, 0xe7, 0x41, 0xe6, 0x26, 0xaf, 0x2e, 0xde, 0x14, 0xc5, 0x27, 0xf0, 0x44, - 0xf1, 0xeb, 0xa9, 0xe2, 0x67, 0xd4, 0xc5, 0x27, 0xd7, 0x73, 0x7f, 0x02, 0x76, 0xc4, 0x1a, 0x0a, - 0x5a, 0xd1, 0x66, 0x17, 0xbb, 0x94, 0x11, 0xbe, 0xfc, 0x96, 0x77, 0x47, 0x1c, 0x89, 0xd4, 0x79, - 0x44, 0x3d, 0x33, 0x70, 0x04, 0x07, 0xf7, 0xcc, 0xe8, 0xda, 0x02, 0x1c, 0xba, 0x1b, 0xef, 0xc2, - 0x24, 0x8b, 0xb2, 0x59, 0xd9, 0x28, 0xad, 0x6e, 0x93, 0x3b, 0xd8, 0x25, 0xd1, 0x43, 0x22, 0xf6, - 0x6a, 0xa5, 0x55, 0xc1, 0xc8, 0x2f, 0x46, 0x20, 0xfc, 0xb6, 0x58, 0x09, 0xf1, 0xd8, 0x82, 0x6c, - 0x02, 0xc6, 0xec, 0xc0, 0x20, 0x83, 0xb3, 0x0b, 0xb4, 0x04, 0xa7, 0x6a, 0xc4, 0x6f, 0x11, 0xdf, - 0x24, 0x9e, 0x53, 0x77, 0x5c, 0x8b, 0x62, 0x9b, 0x45, 0x3f, 0x5c, 0x39, 0xc9, 0x6f, 0x3c, 0x0c, - 0xed, 0x21, 0x3b, 0x0b, 0xbc, 0x4d, 0x58, 0x9a, 0x08, 0xbb, 0x22, 0xfc, 0xe8, 0xec, 0xf1, 0xd8, - 0x7d, 0x76, 0xc5, 0xc4, 0x8c, 0xc4, 0xfe, 0x9d, 0xc8, 0x2a, 0x79, 0x58, 0xf5, 0xb1, 0xd7, 0xc5, - 0xf6, 0x26, 0x6d, 0x94, 0x9b, 0xa4, 0xf6, 0x4c, 0xd6, 0x30, 0x0d, 0xd0, 0xf1, 0xb1, 0xd9, 0x5d, - 0x33, 0x9f, 0xe1, 0x1e, 0xcb, 0x75, 0xb8, 0x72, 0xb8, 0xe3, 0xe3, 0x27, 0x6b, 0x6f, 0xe1, 0xde, - 0x08, 0xb5, 0xbc, 0x16, 0x59, 0x29, 0xe9, 0x5c, 0xfd, 0x9a, 0xaa, 0x81, 0x41, 0xf6, 0x1f, 0x76, - 0x91, 0x85, 0x19, 0xeb, 0xcf, 0x5f, 0x32, 0x66, 0xbc, 0xfb, 0x2a, 0xdb, 0xa4, 0xf1, 0x85, 0x26, - 0x96, 0xc2, 0x7a, 0xff, 0xbb, 0x36, 0xda, 0x59, 0x9b, 0x4e, 0xcb, 0xa1, 0x72, 0x08, 0xbb, 0x40, - 0x53, 0x70, 0x98, 0x78, 0x36, 0xf6, 0xcc, 0x6a, 0x4f, 0x7e, 0xec, 0xb0, 0xeb, 0x72, 0x0f, 0x9d, - 0x07, 0xa8, 0x35, 0x2d, 0xa7, 0x65, 0x06, 0xdf, 0xe0, 0xa2, 0x8d, 0x8c, 0x33, 0xcb, 0x76, 0xaf, - 0x1d, 0x41, 0x38, 0x10, 0xed, 0xd4, 0x67, 0xe1, 0x60, 0x03, 0x3b, 0xf5, 0x06, 0x9d, 0x1c, 0x63, - 0x66, 0x71, 0x95, 0x98, 0x9d, 0x83, 0x39, 0x66, 0xe7, 0xd0, 0xc0, 0x05, 0x19, 0xaf, 0x30, 0x6c, - 0x5b, 0x47, 0x23, 0x5f, 0xf4, 0xb2, 0x75, 0xbd, 0x1a, 0x6d, 0x5d, 0x91, 0x71, 0xa2, 0x65, 0xc5, - 0x86, 0x18, 0x15, 0xb8, 0x28, 0x16, 0x7c, 0x13, 0xd7, 0x2d, 0x8a, 0xdf, 0xc2, 0x3d, 0xbf, 0x1c, - 0x7c, 0x0a, 0x05, 0x7d, 0x96, 0x78, 0x72, 0x97, 0x59, 0x82, 0x53, 0x5d, 0x69, 0x33, 0xe3, 0x3d, - 0xec, 0x64, 0x37, 0xe1, 0x6c, 0x7c, 0x57, 0x13, 0xc7, 0xfa, 0xc1, 0x41, 0x63, 0xdd, 0x8a, 0x36, - 0x12, 0x61, 0x01, 0xd3, 0x86, 0xcc, 0xbe, 0x06, 0x13, 0xc4, 0x0b, 0x8e, 0x38, 0xd4, 0x8b, 0x01, - 0xf0, 0x07, 0x78, 0x3a, 0x7a, 0x4f, 0x32, 0xbc, 0x29, 0x4e, 0x6d, 0x71, 0x84, 0xcd, 0x7e, 0xcc, - 0x61, 0x49, 0x8d, 0x1f, 0x68, 0x30, 0x37, 0x30, 0x44, 0xc8, 0x3f, 0xca, 0xe4, 0xec, 0xa5, 0x96, - 0xa7, 0xe2, 0x4c, 0x1d, 0x07, 0x79, 0x98, 0xf6, 0xcc, 0x0c, 0xae, 0x65, 0x07, 0xff, 0x04, 0x56, - 0xf2, 0x05, 0xdf, 0x5b, 0xb9, 0x89, 0x69, 0xde, 0x9f, 0x9a, 0xe6, 0x86, 0xf8, 0xba, 0x12, 0xc7, - 0xf7, 0xc7, 0xd8, 0xb5, 0xb7, 0xc9, 0x26, 0x6d, 0xa0, 0x39, 0x38, 0xee, 0x63, 0x37, 0x78, 0x55, - 0xe3, 0x39, 0x8e, 0x71, 0xeb, 0xfa, 0xc8, 0x3b, 0xe7, 0x5f, 0x35, 0xb1, 0x26, 0x92, 0xa9, 0xc2, - 0xca, 0x9e, 0xc0, 0x04, 0xf5, 0x2c, 0xd7, 0xdf, 0xc1, 0x9e, 0x6f, 0x3a, 0xae, 0x19, 0x3f, 0x8a, - 0x17, 0x94, 0x47, 0x3e, 0xe1, 0xbf, 0xbd, 0x2b, 0x5e, 0x2f, 0x14, 0x46, 0xb8, 0xe7, 0x8a, 0xd3, - 0x3d, 0x7a, 0x07, 0x4e, 0x77, 0x5c, 0x1e, 0xcc, 0x36, 0xc3, 0xfb, 0x93, 0xfb, 0x47, 0x09, 0x1b, - 0x06, 0x90, 0xb7, 0x7c, 0xe3, 0x7d, 0x38, 0x17, 0xad, 0xe7, 0x5e, 0xb5, 0xb6, 0xde, 0xa1, 0xe4, - 0x2e, 0xf1, 0x3e, 0xb4, 0x3c, 0xdb, 0xcf, 0x68, 0x80, 0xf9, 0xe7, 0xeb, 0xfb, 0x9a, 0xe8, 0x0d, - 0xea, 0xf8, 0xe1, 0xac, 0xbd, 0x07, 0x53, 0x6d, 0xee, 0x61, 0x3a, 0xd5, 0x9a, 0x69, 0x75, 0x28, - 0x31, 0x77, 0x84, 0x93, 0x98, 0xba, 0xd9, 0x98, 0xe8, 0xa7, 0x0a, 0x57, 0x39, 0xdb, 0x56, 0x66, - 0x31, 0x16, 0x85, 0xd8, 0x78, 0xdf, 0x09, 0xce, 0x3b, 0x1c, 0x30, 0xa3, 0x36, 0xe3, 0x9b, 0xf2, - 0x90, 0x17, 0xf5, 0x8d, 0x7c, 0xaf, 0x40, 0x58, 0xb9, 0x04, 0x9b, 0x88, 0x82, 0xc9, 0x21, 0xf2, - 0x6b, 0x5d, 0xce, 0x87, 0x6f, 0x14, 0x60, 0x9a, 0x05, 0x7e, 0x9b, 0xb8, 0x0e, 0x25, 0x1e, 0xb6, - 0xd9, 0xc1, 0x40, 0x2c, 0x41, 0xec, 0x1b, 0x77, 0xe0, 0xd2, 0xa0, 0xfb, 0x21, 0xc2, 0x34, 0x8c, - 0x5b, 0xd2, 0xc8, 0x08, 0xc6, 0x2b, 0x7d, 0x83, 0xf1, 0x44, 0x3c, 0xcf, 0xb2, 0xe7, 0xd8, 0x75, - 0x5c, 0xb6, 0x9a, 0x96, 0x5b, 0xc3, 0x8f, 0x5d, 0xab, 0xed, 0x37, 0x08, 0xcd, 0x7a, 0x9e, 0xb3, - 0x70, 0xd4, 0xc5, 0x1f, 0x62, 0x9f, 0x9a, 0x3b, 0x8e, 0xe7, 0x53, 0x71, 0xf2, 0x38, 0xc2, 0x6d, - 0x77, 0x03, 0x93, 0xb1, 0x23, 0x9e, 0xa3, 0x3a, 0x6e, 0x08, 0xf7, 0x06, 0x8c, 0xfb, 0xd2, 0xa8, - 0x7a, 0x6e, 0xca, 0xe1, 0x95, 0xfe, 0x18, 0xe3, 0xb6, 0xe8, 0x53, 0x4a, 0xc7, 0x72, 0xaf, 0x7f, - 0x5a, 0xcd, 0xd8, 0xce, 0x89, 0x68, 0x45, 0x43, 0xc7, 0x47, 0x3f, 0x5a, 0x64, 0x7a, 0xf1, 0x5d, - 0x96, 0x83, 0x38, 0x1c, 0x52, 0xfa, 0xf7, 0x1c, 0x8c, 0xb1, 0x8c, 0xc8, 0x81, 0x83, 0x5c, 0x8b, - 0x46, 0xb1, 0xd7, 0x31, 0x2d, 0x73, 0xeb, 0x33, 0x99, 0xf7, 0x39, 0x93, 0x51, 0xf8, 0xde, 0xdf, - 0xfe, 0xf5, 0xd3, 0xfd, 0x93, 0xe8, 0x6c, 0xb1, 0x2f, 0xbc, 0x57, 0x31, 0xb5, 0x8a, 0x5c, 0xde, - 0x46, 0x9f, 0x6a, 0x70, 0x2c, 0xa6, 0x49, 0xa3, 0xb9, 0x54, 0x48, 0x95, 0xf4, 0xad, 0x5f, 0x1e, - 0xe6, 0x26, 0x00, 0x2e, 0x33, 0x80, 0x0b, 0xa8, 0x90, 0x04, 0xe0, 0x92, 0x58, 0xb1, 0xc6, 0x47, - 0xa1, 0x4f, 0xe0, 0x58, 0x5c, 0x5b, 0x4f, 0x73, 0xa8, 0xb4, 0x6e, 0x05, 0x87, 0x52, 0xb5, 0xce, - 0x9e, 0x08, 0xce, 0xc1, 0x26, 0x22, 0xa6, 0x99, 0x66, 0x02, 0xc4, 0x55, 0xec, 0x4c, 0x80, 0x84, - 0xea, 0x3c, 0x7c, 0x22, 0x44, 0xda, 0x5f, 0x6b, 0x70, 0x46, 0x29, 0xfe, 0xa2, 0xe5, 0xc1, 0x99, - 0x12, 0x4a, 0xb4, 0xbe, 0x92, 0xd7, 0x5d, 0x00, 0xce, 0x33, 0x40, 0x03, 0x5d, 0x48, 0x02, 0xca, - 0xaf, 0xca, 0xe2, 0x47, 0xec, 0xcd, 0xf8, 0x18, 0xfd, 0x42, 0x03, 0x94, 0x56, 0x7b, 0xd1, 0x62, - 0x2a, 0x61, 0xa6, 0xbc, 0xac, 0x2f, 0xe5, 0xf2, 0x15, 0x64, 0x57, 0x18, 0xd9, 0x2c, 0x9a, 0xc9, - 0x98, 0x3a, 0x4f, 0x12, 0xfc, 0x51, 0x83, 0xc2, 0x60, 0xf5, 0x16, 0xdd, 0x50, 0x26, 0x1e, 0x2a, - 0x30, 0xeb, 0x37, 0x47, 0x1e, 0x27, 0xe0, 0x2f, 0x32, 0xf8, 0xf3, 0xe8, 0x5c, 0x06, 0x7c, 0xd3, - 0xf2, 0x29, 0xfa, 0xb3, 0x06, 0xe7, 0x07, 0x6a, 0xa1, 0xe8, 0xfa, 0xa0, 0xfc, 0x99, 0x62, 0xad, - 0x7e, 0x63, 0xd4, 0x61, 0x82, 0xfa, 0x16, 0xa3, 0xfe, 0x3f, 0x54, 0x4a, 0x52, 0xb3, 0x7d, 0x9f, - 0x41, 0x9b, 0x72, 0x9f, 0x15, 0xd3, 0x6f, 0x56, 0x7b, 0xec, 0x70, 0x84, 0x7e, 0xaf, 0x81, 0x9e, - 0xad, 0x81, 0xa2, 0xd2, 0x20, 0x24, 0xb5, 0x3c, 0xab, 0x5f, 0x1b, 0x69, 0xcc, 0xb0, 0x65, 0xd3, - 0x0c, 0x06, 0x14, 0x3f, 0x12, 0x7b, 0xdd, 0xc7, 0xe8, 0xb7, 0x1a, 0x4c, 0xa8, 0x14, 0x0c, 0x74, - 0x55, 0x99, 0x36, 0x43, 0x50, 0xd1, 0x97, 0x73, 0x7a, 0x0b, 0xbc, 0x6b, 0x0c, 0x6f, 0x19, 0x2d, - 0x25, 0xf1, 0x88, 0x67, 0xd5, 0x9a, 0xb8, 0xc8, 0x04, 0x12, 0xf6, 0xc6, 0x45, 0x50, 0x7d, 0x18, - 0x0f, 0x75, 0x7c, 0x74, 0x21, 0x95, 0x30, 0xf1, 0x7f, 0x05, 0x7d, 0x76, 0x80, 0x87, 0xc0, 0x98, - 0x65, 0x18, 0xe7, 0xd0, 0x94, 0xf2, 0x49, 0xef, 0x04, 0x79, 0x7e, 0xa6, 0xc1, 0xa9, 0x94, 0x4a, - 0x8c, 0x16, 0x52, 0xb1, 0xb3, 0x44, 0x69, 0x7d, 0x31, 0x8f, 0xeb, 0xb0, 0x36, 0xc4, 0x57, 0x1e, - 0x11, 0x03, 0xe9, 0x2e, 0xfa, 0xa5, 0x06, 0x28, 0xad, 0x08, 0xa3, 0xec, 0x64, 0x29, 0x09, 0x5a, - 0xd1, 0x86, 0xb2, 0x25, 0x66, 0x63, 0x89, 0x91, 0xcd, 0xa1, 0x8b, 0x83, 0xc9, 0xd8, 0xea, 0x0a, - 0xda, 0xf8, 0x69, 0x85, 0x82, 0x8b, 0x96, 0xd4, 0x4f, 0x44, 0xa9, 0x3a, 0xeb, 0x57, 0xf3, 0x39, - 0x0b, 0xbe, 0x15, 0xc6, 0x37, 0x8f, 0x2e, 0xab, 0xf9, 0x22, 0xaf, 0x29, 0x57, 0x0b, 0x82, 0x2d, - 0x2f, 0x26, 0xbf, 0x2a, 0xb6, 0x3c, 0x95, 0x4c, 0xac, 0xd8, 0xf2, 0x94, 0x2a, 0x6e, 0xf6, 0x96, - 0xc7, 0x81, 0xe4, 0xbe, 0xc2, 0x40, 0x62, 0x52, 0xa8, 0x02, 0x44, 0xa5, 0xe4, 0x2a, 0x40, 0x94, - 0x8a, 0x6a, 0x36, 0x08, 0xef, 0x04, 0x21, 0xc8, 0xcf, 0x35, 0x38, 0x1a, 0x15, 0x0a, 0xd1, 0xa5, - 0x54, 0x02, 0x85, 0x46, 0xa9, 0xcf, 0x0d, 0xf1, 0x12, 0x14, 0xff, 0xcf, 0x28, 0x4a, 0x68, 0x35, - 0xbd, 0xc1, 0x26, 0x14, 0xbb, 0x22, 0x13, 0xf3, 0x4c, 0x4a, 0x4c, 0x2e, 0x19, 0x06, 0x5c, 0x51, - 0x11, 0x50, 0xc1, 0xa5, 0xd0, 0x1f, 0x15, 0x5c, 0x2a, 0x25, 0x71, 0x14, 0x2e, 0x86, 0x13, 0x70, - 0x71, 0xb5, 0xf1, 0x77, 0x1a, 0xbc, 0xba, 0x85, 0xa9, 0x4a, 0xd3, 0xcb, 0xe8, 0x9d, 0x19, 0x32, - 0x63, 0x46, 0xef, 0xcc, 0x12, 0x0a, 0x8d, 0xeb, 0x0c, 0xb9, 0x88, 0x96, 0x93, 0xc8, 0xec, 0xf7, - 0x2e, 0x26, 0xdb, 0x9e, 0x88, 0x18, 0x6c, 0x06, 0x9f, 0xfc, 0x4c, 0x49, 0xcc, 0xe0, 0xe5, 0x2f, - 0xe6, 0x50, 0xde, 0xd8, 0x9b, 0xb9, 0x9c, 0xd3, 0x7b, 0xaf, 0xbc, 0xfc, 0x0d, 0xfd, 0x91, 0x06, - 0x27, 0xb6, 0x30, 0x8d, 0xca, 0x6d, 0x8a, 0x47, 0xaf, 0xd0, 0x1b, 0x15, 0x8f, 0x5e, 0xa5, 0xd9, - 0x19, 0x8b, 0x8c, 0xeb, 0x12, 0x32, 0xd4, 0x5c, 0x51, 0x71, 0x0e, 0xfd, 0x49, 0x83, 0xa9, 0x2d, - 0x4c, 0x23, 0xd2, 0x4c, 0x44, 0x45, 0x43, 0x45, 0xc5, 0x5a, 0x1b, 0xa4, 0xb7, 0x29, 0x0e, 0x54, - 0xf9, 0x04, 0xba, 0xec, 0xe5, 0xca, 0x99, 0x6d, 0x11, 0xc5, 0x7c, 0x86, 0x7b, 0x7e, 0xd0, 0xec, - 0x42, 0x15, 0x08, 0xfd, 0x46, 0x83, 0xd3, 0xc9, 0x0a, 0x36, 0x69, 0x43, 0xb1, 0x93, 0x65, 0xa9, - 0x6c, 0xfa, 0x5a, 0x6e, 0xd7, 0x90, 0xb7, 0xc4, 0x78, 0xaf, 0xa2, 0xc5, 0x9c, 0xbc, 0x98, 0x36, - 0xd0, 0x5f, 0x34, 0x98, 0x4e, 0x92, 0x46, 0x55, 0x30, 0xc5, 0x21, 0x6a, 0xa8, 0x64, 0xa6, 0xdf, - 0x1a, 0x7d, 0x4c, 0x58, 0xc4, 0xeb, 0xac, 0x88, 0xeb, 0xe8, 0x5a, 0xce, 0x22, 0xa2, 0xe2, 0x5e, - 0xf0, 0xbd, 0x10, 0xcc, 0x7b, 0x4a, 0x54, 0x4b, 0x9f, 0x4e, 0x92, 0x2e, 0xfa, 0xc2, 0x50, 0x97, - 0x10, 0x71, 0x8d, 0x21, 0x2e, 0xa1, 0x05, 0x35, 0xa2, 0x3c, 0xad, 0xfa, 0xd8, 0xb5, 0x59, 0x07, - 0xa3, 0x8d, 0xe0, 0xa4, 0x3a, 0xd5, 0x07, 0x4b, 0x4a, 0x56, 0x57, 0xb2, 0x72, 0x27, 0x1c, 0xf5, - 0x62, 0x4e, 0xc7, 0x10, 0xf5, 0x26, 0x43, 0x5d, 0x43, 0xc5, 0xc1, 0xa8, 0x29, 0x01, 0x0b, 0xfd, - 0x50, 0x83, 0x93, 0x41, 0x03, 0x8b, 0xc9, 0x4f, 0x69, 0x91, 0x20, 0x76, 0x5f, 0xb5, 0x4b, 0xaa, - 0x24, 0x29, 0x63, 0x99, 0x51, 0x5d, 0x41, 0x73, 0x19, 0x4d, 0xca, 0xf1, 0xa9, 0xd9, 0xd7, 0xac, - 0xd0, 0x1f, 0x34, 0xd0, 0xb7, 0x30, 0xcd, 0x50, 0x99, 0xd0, 0x7c, 0x2a, 0x6b, 0x86, 0xa7, 0xbe, - 0x9a, 0xd7, 0x33, 0xef, 0xfc, 0xb5, 0xe4, 0x70, 0x93, 0x92, 0x67, 0xd8, 0x35, 0x43, 0x51, 0x2b, - 0xd8, 0x00, 0x82, 0x07, 0x9e, 0xa1, 0x69, 0xa5, 0x1f, 0xb8, 0xda, 0x51, 0xf1, 0xc0, 0x07, 0xab, - 0x59, 0xc6, 0x0d, 0x06, 0xbc, 0x8a, 0x56, 0xd4, 0xc0, 0x55, 0x36, 0xda, 0xac, 0xf2, 0xe1, 0x66, - 0x28, 0x62, 0xa1, 0x7f, 0x68, 0x70, 0x29, 0x8b, 0x37, 0xa6, 0x61, 0x95, 0xf2, 0x11, 0x45, 0xc7, - 0x28, 0xfa, 0x41, 0x6e, 0xad, 0xcb, 0xb8, 0xc3, 0x0a, 0xba, 0x8d, 0xbe, 0x32, 0x52, 0x41, 0xac, - 0xbd, 0xf5, 0xff, 0x15, 0x5c, 0xfe, 0xd6, 0x67, 0xcf, 0x0b, 0xda, 0xe7, 0xcf, 0x0b, 0xda, 0x17, - 0xcf, 0x0b, 0xda, 0x4f, 0x5e, 0x14, 0xf6, 0x7d, 0xfe, 0xa2, 0xb0, 0xef, 0xef, 0x2f, 0x0a, 0xfb, - 0xde, 0x7d, 0xa3, 0xee, 0xd0, 0x46, 0xa7, 0xba, 0x52, 0x23, 0xad, 0xe2, 0x16, 0xcf, 0xb0, 0xcc, - 0xe9, 0x92, 0x97, 0x2d, 0x62, 0x77, 0x9a, 0xb8, 0xb8, 0x1b, 0x82, 0xb0, 0x1f, 0xad, 0x56, 0x0f, - 0xb2, 0x5f, 0x87, 0x5e, 0xfb, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe6, 0x81, 0xa9, 0x86, 0x0d, - 0x2b, 0x00, 0x00, + // 2546 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x9a, 0x5b, 0x6f, 0x1b, 0xc7, + 0x15, 0xc7, 0xbd, 0x8e, 0x65, 0x5b, 0xc7, 0xf7, 0xb1, 0xec, 0x48, 0x6b, 0x99, 0xb2, 0xd6, 0x96, + 0xad, 0x8b, 0x25, 0x4a, 0x74, 0x6d, 0x37, 0x4e, 0x9b, 0x44, 0x94, 0x65, 0xd5, 0x8d, 0x63, 0xbb, + 0xb4, 0xe2, 0xa2, 0x71, 0xd2, 0xc5, 0x92, 0x3b, 0x22, 0xb7, 0x26, 0x77, 0x98, 0xdd, 0x21, 0x23, + 0x22, 0x48, 0x80, 0xb6, 0x40, 0x8a, 0x16, 0x7d, 0x28, 0xd0, 0xcb, 0x43, 0x81, 0x02, 0x7d, 0x6b, + 0x5f, 0x5a, 0xa0, 0x2f, 0x7d, 0xed, 0x6b, 0xd0, 0x02, 0x45, 0x80, 0xbe, 0xf4, 0xa1, 0x28, 0x02, + 0xbb, 0x1f, 0xa0, 0x1f, 0xa1, 0xd8, 0xb9, 0x2c, 0xf7, 0x32, 0x4b, 0x2e, 0x15, 0x07, 0x7d, 0xd3, + 0x9e, 0x3d, 0x73, 0xce, 0xef, 0xcc, 0xce, 0x9e, 0x99, 0xfd, 0x8b, 0x70, 0xb6, 0xee, 0x59, 0x5d, + 0x87, 0xf6, 0x8a, 0xdd, 0xb5, 0xe2, 0xfb, 0x1d, 0xec, 0xf5, 0x56, 0xda, 0x1e, 0xa1, 0x04, 0x81, + 0xb0, 0xaf, 0x74, 0xd7, 0xf4, 0xc9, 0x88, 0x4f, 0x1d, 0xbb, 0xd8, 0x77, 0x7c, 0xee, 0xa5, 0x47, + 0x47, 0xd3, 0x5e, 0x1b, 0x4b, 0xfb, 0x99, 0x88, 0xbd, 0xe5, 0xd7, 0x55, 0xe6, 0x36, 0x21, 0x4d, + 0x45, 0x94, 0xaa, 0x45, 0x6b, 0x0d, 0x61, 0x9f, 0x8e, 0xd8, 0x2d, 0x4a, 0xb1, 0x4f, 0x2d, 0xea, + 0x10, 0x37, 0xbc, 0x4b, 0x48, 0xbd, 0x89, 0x8b, 0x56, 0xdb, 0x29, 0x5a, 0xae, 0x4b, 0xf8, 0x4d, + 0x99, 0x6a, 0xa2, 0x4e, 0xea, 0x84, 0xfd, 0x59, 0x0c, 0xfe, 0xe2, 0x56, 0x63, 0x02, 0xd0, 0xb7, + 0x82, 0x22, 0x1f, 0x5a, 0x9e, 0xd5, 0xf2, 0x2b, 0xf8, 0xfd, 0x0e, 0xf6, 0xa9, 0xb1, 0x05, 0xa7, + 0x63, 0x56, 0xbf, 0x4d, 0x5c, 0x1f, 0xa3, 0x55, 0x38, 0xd8, 0x66, 0x96, 0x49, 0xed, 0x82, 0x36, + 0x7f, 0xa4, 0x84, 0x56, 0xfa, 0x73, 0xb2, 0xc2, 0x7d, 0xcb, 0x07, 0x3e, 0xfd, 0xf7, 0xcc, 0xbe, + 0x8a, 0xf0, 0x33, 0x36, 0x61, 0x8a, 0x05, 0xda, 0xe8, 0x78, 0x1e, 0x76, 0xe9, 0x63, 0xab, 0xe9, + 0x63, 0x2a, 0xb2, 0xa0, 0x79, 0x38, 0x89, 0xbb, 0x2d, 0xb3, 0xd6, 0xb0, 0x1c, 0xd7, 0x6c, 0x7b, + 0x78, 0xc7, 0xd9, 0x65, 0x81, 0xc7, 0x2b, 0xc7, 0x71, 0xb7, 0xb5, 0x11, 0x98, 0x1f, 0x32, 0xab, + 0x71, 0x1f, 0x74, 0x55, 0x98, 0x3e, 0x56, 0x97, 0x59, 0x54, 0x58, 0xdc, 0x57, 0x62, 0x71, 0x3f, + 0xe3, 0x89, 0xc0, 0x8a, 0xf1, 0x48, 0xac, 0x09, 0x18, 0x73, 0x89, 0x5b, 0xc3, 0x2c, 0xda, 0x81, + 0x0a, 0xbf, 0x50, 0xc2, 0xee, 0x57, 0xc2, 0x7e, 0x43, 0xc0, 0x26, 0x82, 0x0b, 0xd8, 0xc5, 0xe1, + 0xb0, 0x21, 0x66, 0x27, 0x86, 0xb9, 0x41, 0xdc, 0x1d, 0xc7, 0x6b, 0x0d, 0xc6, 0x9c, 0x84, 0x43, + 0x96, 0x6d, 0x7b, 0xd8, 0xf7, 0x05, 0x9d, 0xbc, 0x54, 0x16, 0xf0, 0x92, 0xb2, 0x80, 0xed, 0x58, + 0x01, 0x61, 0x5a, 0x51, 0xc0, 0x0d, 0x38, 0x54, 0xe3, 0x26, 0x51, 0xc1, 0x74, 0xb4, 0x82, 0xb7, + 0xfc, 0x7a, 0x7c, 0x98, 0x74, 0x36, 0x6a, 0x30, 0x9b, 0x8e, 0xea, 0x97, 0x7b, 0xf7, 0x03, 0xee, + 0x17, 0x35, 0xf7, 0x36, 0x18, 0x83, 0x92, 0x88, 0x12, 0x5e, 0x83, 0xc3, 0x82, 0x2a, 0x58, 0xc9, + 0x2f, 0x0d, 0xab, 0x41, 0x2c, 0x9e, 0x70, 0x8c, 0xf1, 0x4d, 0x28, 0xb0, 0x2c, 0xf7, 0x2c, 0x3f, + 0xbe, 0xa4, 0xfd, 0xd1, 0x97, 0xf6, 0xdb, 0x30, 0x93, 0x19, 0x4b, 0xe0, 0x96, 0xe0, 0x10, 0x5f, + 0x10, 0x92, 0x36, 0x7b, 0x81, 0x4b, 0x47, 0xa3, 0x0d, 0x8b, 0x61, 0xd8, 0x87, 0xd8, 0xb5, 0x1d, + 0xb7, 0x1e, 0x8b, 0x5e, 0xee, 0xad, 0xdb, 0xb6, 0x27, 0x71, 0x23, 0xab, 0x46, 0x1b, 0xbe, 0x6a, + 0xd4, 0x53, 0x6f, 0xc1, 0x52, 0xae, 0x8c, 0x5f, 0xa0, 0xa8, 0x37, 0x60, 0x82, 0xa5, 0x28, 0x07, + 0x2d, 0xf1, 0x0e, 0xc6, 0xa3, 0xcf, 0xf6, 0x23, 0x38, 0x93, 0x88, 0x20, 0x70, 0x6e, 0x01, 0xb0, + 0x46, 0x6b, 0xee, 0x60, 0x2c, 0x89, 0xce, 0x44, 0x89, 0xe4, 0x08, 0xd9, 0xe1, 0xc6, 0xab, 0xd2, + 0x60, 0x10, 0x58, 0x48, 0x56, 0xce, 0xbc, 0xbf, 0xb4, 0xa9, 0xc6, 0xe9, 0x87, 0xab, 0x4a, 0x28, + 0x4a, 0xbb, 0x09, 0x63, 0x8c, 0x55, 0x54, 0x75, 0x2e, 0x5a, 0xd5, 0x83, 0x0e, 0xad, 0x13, 0xc7, + 0xad, 0x6f, 0xef, 0xb2, 0x00, 0xa2, 0x36, 0xee, 0x6f, 0x34, 0xe1, 0x72, 0x32, 0xcd, 0x3d, 0x52, + 0x77, 0x6a, 0x1b, 0x56, 0xb3, 0xf9, 0xe2, 0x8b, 0xaa, 0xc2, 0x95, 0xa1, 0xd9, 0xc2, 0x8a, 0x0e, + 0xd4, 0xac, 0x66, 0x53, 0x14, 0x74, 0x5e, 0x55, 0x50, 0x7f, 0x28, 0x2f, 0x89, 0x0d, 0x30, 0xee, + 0xc2, 0x79, 0x96, 0x23, 0x51, 0x36, 0xde, 0xc3, 0x7b, 0xfb, 0x9e, 0xe8, 0x01, 0x8a, 0x50, 0x82, + 0xf2, 0x55, 0x38, 0x54, 0xe5, 0xa6, 0xfc, 0x33, 0x2f, 0x47, 0x84, 0x2d, 0x26, 0x55, 0xcf, 0x1e, + 0x50, 0xdf, 0x15, 0x2d, 0x46, 0x15, 0x4b, 0xb0, 0xbe, 0x02, 0x63, 0xc1, 0x04, 0xf9, 0xa3, 0x4c, + 0x29, 0x1f, 0x61, 0xfc, 0x54, 0x13, 0xe1, 0xe3, 0x4b, 0x30, 0x47, 0x5b, 0x5f, 0x80, 0x93, 0x35, + 0xe2, 0x52, 0xcf, 0xaa, 0x51, 0x33, 0xbe, 0x69, 0x9d, 0x90, 0xf6, 0xf5, 0x91, 0x37, 0xaf, 0x27, + 0x70, 0x21, 0x9b, 0x26, 0xfd, 0x46, 0x68, 0x23, 0xbd, 0x11, 0x9f, 0x68, 0x62, 0x47, 0x66, 0xf7, + 0xe4, 0xf6, 0xf2, 0x7f, 0xa9, 0x52, 0x57, 0x71, 0x88, 0xfa, 0xbe, 0x9e, 0xda, 0xdf, 0xce, 0x25, + 0xf6, 0x37, 0xb9, 0xb3, 0x45, 0x4a, 0xec, 0x6f, 0x6f, 0xbf, 0x91, 0x55, 0xf2, 0x27, 0x9e, 0xa8, + 0xf2, 0x0a, 0x9c, 0x70, 0xdc, 0xae, 0xd5, 0x74, 0x6c, 0x76, 0xbc, 0x34, 0x1d, 0x9b, 0xd5, 0x7b, + 0xb4, 0x72, 0x3c, 0x6a, 0xbe, 0x6b, 0xa3, 0x65, 0x40, 0x31, 0x47, 0x3e, 0x37, 0xfb, 0xd9, 0xdc, + 0x9c, 0x8a, 0xde, 0xb9, 0x9f, 0xb9, 0xc9, 0xab, 0x8b, 0x37, 0x45, 0xf1, 0x09, 0x3c, 0x51, 0xfc, + 0x7a, 0xaa, 0xf8, 0x19, 0x75, 0xf1, 0xc9, 0xf5, 0xdc, 0x9f, 0x80, 0x1d, 0xb1, 0x86, 0x82, 0x56, + 0xb4, 0xd9, 0xc5, 0x2e, 0x65, 0x84, 0x2f, 0xbe, 0xe5, 0xdd, 0x16, 0x47, 0x22, 0x75, 0x1e, 0x51, + 0xcf, 0x0c, 0x1c, 0xc1, 0xc1, 0x3d, 0x33, 0xba, 0xb6, 0x00, 0x87, 0xee, 0xc6, 0x3b, 0x30, 0xc9, + 0xa2, 0x6c, 0x56, 0x36, 0x4a, 0xab, 0xdb, 0xe4, 0x36, 0x76, 0x49, 0xf4, 0x90, 0x88, 0xbd, 0x5a, + 0x69, 0x55, 0x30, 0xf2, 0x8b, 0x11, 0x08, 0xbf, 0x2b, 0x56, 0x42, 0x3c, 0xb6, 0x20, 0x9b, 0x80, + 0x31, 0x3b, 0x30, 0xc8, 0xe0, 0xec, 0x02, 0x2d, 0xc1, 0xa9, 0x1a, 0xf1, 0x5b, 0xc4, 0x37, 0x89, + 0xe7, 0xd4, 0x1d, 0xd7, 0xa2, 0xd8, 0x66, 0xd1, 0x0f, 0x57, 0x4e, 0xf2, 0x1b, 0x0f, 0x42, 0x7b, + 0xc8, 0xce, 0x02, 0x6f, 0x13, 0x96, 0x26, 0xc2, 0xae, 0x08, 0x3f, 0x3a, 0x7b, 0x3c, 0x76, 0x9f, + 0x5d, 0x31, 0x31, 0x23, 0xb1, 0x7f, 0x2f, 0xb2, 0x4a, 0x1e, 0x54, 0x7d, 0xec, 0x75, 0xb1, 0xbd, + 0x49, 0x1b, 0xe5, 0x26, 0xa9, 0x3d, 0x95, 0x35, 0x4c, 0x03, 0x74, 0x7c, 0x6c, 0x76, 0xd7, 0xcc, + 0xa7, 0xb8, 0xc7, 0x72, 0x1d, 0xae, 0x1c, 0xee, 0xf8, 0xf8, 0xf1, 0xda, 0x9b, 0xb8, 0x37, 0x42, + 0x2d, 0xaf, 0x44, 0x56, 0x4a, 0x3a, 0x57, 0xbf, 0xa6, 0x6a, 0x60, 0x90, 0xfd, 0x87, 0x5d, 0x64, + 0x61, 0xc6, 0xfa, 0xf3, 0x97, 0x8c, 0x19, 0xef, 0xbe, 0xca, 0x36, 0x69, 0x7c, 0xae, 0x89, 0xa5, + 0xb0, 0xde, 0xff, 0xae, 0x8d, 0x76, 0xd6, 0xa6, 0xd3, 0x72, 0xa8, 0x1c, 0xc2, 0x2e, 0xd0, 0x14, + 0x1c, 0x26, 0x9e, 0x8d, 0x3d, 0xb3, 0xda, 0x93, 0x1f, 0x3b, 0xec, 0xba, 0xdc, 0x43, 0xe7, 0x01, + 0x6a, 0x4d, 0xcb, 0x69, 0x99, 0xc1, 0x37, 0xb8, 0x68, 0x23, 0xe3, 0xcc, 0xb2, 0xdd, 0x6b, 0x47, + 0x10, 0x0e, 0x44, 0x3b, 0xf5, 0x59, 0x38, 0xd8, 0xc0, 0x4e, 0xbd, 0x41, 0x27, 0xc7, 0x98, 0x59, + 0x5c, 0x25, 0x66, 0xe7, 0x60, 0x8e, 0xd9, 0x39, 0x34, 0x70, 0x41, 0xc6, 0x2b, 0x0c, 0xdb, 0xd6, + 0xd1, 0xc8, 0x17, 0xbd, 0x6c, 0x5d, 0x2f, 0x47, 0x5b, 0x57, 0x64, 0x9c, 0x68, 0x59, 0xb1, 0x21, + 0x46, 0x05, 0x2e, 0x8a, 0x05, 0xdf, 0xc4, 0x75, 0x8b, 0xe2, 0x37, 0x71, 0xcf, 0x2f, 0x07, 0x9f, + 0x42, 0x41, 0x9f, 0x25, 0x9e, 0xdc, 0x65, 0x96, 0xe0, 0x54, 0x57, 0xda, 0xcc, 0x78, 0x0f, 0x3b, + 0xd9, 0x4d, 0x38, 0x1b, 0xdf, 0xd7, 0xc4, 0xb1, 0x7e, 0x70, 0xd0, 0x58, 0xb7, 0xa2, 0x8d, 0x44, + 0x58, 0xc0, 0xb4, 0x21, 0xb3, 0xaf, 0xc1, 0x04, 0xf1, 0x82, 0x23, 0x0e, 0xf5, 0x62, 0x00, 0xfc, + 0x01, 0x9e, 0x8e, 0xde, 0x93, 0x0c, 0x6f, 0x88, 0x53, 0x5b, 0x1c, 0x61, 0xb3, 0x1f, 0x73, 0x58, + 0x52, 0xe3, 0x47, 0x1a, 0xcc, 0x0d, 0x0c, 0x11, 0xf2, 0x8f, 0x32, 0x39, 0x7b, 0xa9, 0xe5, 0x89, + 0x38, 0x53, 0xc7, 0x41, 0x1e, 0xa4, 0x3d, 0x33, 0x83, 0x6b, 0xd9, 0xc1, 0x3f, 0x86, 0x95, 0x7c, + 0xc1, 0xf7, 0x56, 0x6e, 0x62, 0x9a, 0xf7, 0xa7, 0xa6, 0xb9, 0x21, 0xbe, 0xae, 0xc4, 0xf1, 0xfd, + 0x11, 0x76, 0xed, 0x6d, 0xb2, 0x49, 0x1b, 0x68, 0x0e, 0x8e, 0xfb, 0xd8, 0x0d, 0x5e, 0xd5, 0x78, + 0x8e, 0x63, 0xdc, 0xba, 0x3e, 0xf2, 0xce, 0xf9, 0x77, 0x4d, 0xac, 0x89, 0x64, 0xaa, 0xb0, 0xb2, + 0xc7, 0x30, 0x41, 0x3d, 0xcb, 0xf5, 0x77, 0xb0, 0xe7, 0x9b, 0x8e, 0x6b, 0xc6, 0x8f, 0xe2, 0x05, + 0xe5, 0x91, 0x4f, 0xf8, 0x6f, 0xef, 0x8a, 0xd7, 0x0b, 0x85, 0x11, 0xee, 0xba, 0xe2, 0x74, 0x8f, + 0xde, 0x86, 0xd3, 0x1d, 0x97, 0x07, 0xb3, 0xcd, 0xf0, 0xfe, 0xe4, 0xfe, 0x51, 0xc2, 0x86, 0x01, + 0xe4, 0x2d, 0xdf, 0x78, 0x0f, 0xce, 0x45, 0xeb, 0xb9, 0x5b, 0xad, 0xad, 0x77, 0x28, 0xb9, 0x43, + 0xbc, 0x0f, 0x2c, 0xcf, 0xf6, 0x33, 0x1a, 0x60, 0xfe, 0xf9, 0xfa, 0xa1, 0x26, 0x7a, 0x83, 0x3a, + 0x7e, 0x38, 0x6b, 0xef, 0xc2, 0x54, 0x9b, 0x7b, 0x98, 0x4e, 0xb5, 0x66, 0x5a, 0x1d, 0x4a, 0xcc, + 0x1d, 0xe1, 0x24, 0xa6, 0x6e, 0x36, 0x26, 0xfa, 0xa9, 0xc2, 0x55, 0xce, 0xb6, 0x95, 0x59, 0x8c, + 0x45, 0x21, 0x36, 0xde, 0x73, 0x82, 0xf3, 0x0e, 0x07, 0xcc, 0xa8, 0xcd, 0xf8, 0xb6, 0x3c, 0xe4, + 0x45, 0x7d, 0x23, 0xdf, 0x2b, 0x10, 0x56, 0x2e, 0xc1, 0x26, 0xa2, 0x60, 0x72, 0x88, 0xfc, 0x5a, + 0x97, 0xf3, 0xe1, 0x1b, 0x05, 0x98, 0x66, 0x81, 0xdf, 0x22, 0xae, 0x43, 0x89, 0x87, 0x6d, 0x76, + 0x30, 0x10, 0x4b, 0x10, 0xfb, 0xc6, 0x6d, 0xb8, 0x34, 0xe8, 0x7e, 0x88, 0x30, 0x0d, 0xe3, 0x96, + 0x34, 0x32, 0x82, 0xf1, 0x4a, 0xdf, 0x60, 0x3c, 0x16, 0xcf, 0xb3, 0xec, 0x39, 0x76, 0x1d, 0x97, + 0xad, 0xa6, 0xe5, 0xd6, 0xf0, 0x23, 0xd7, 0x6a, 0xfb, 0x0d, 0x42, 0xb3, 0x9e, 0xe7, 0x2c, 0x1c, + 0x75, 0xf1, 0x07, 0xd8, 0xa7, 0xe6, 0x8e, 0xe3, 0xf9, 0x54, 0x9c, 0x3c, 0x8e, 0x70, 0xdb, 0x9d, + 0xc0, 0x64, 0xec, 0x88, 0xe7, 0xa8, 0x8e, 0x1b, 0xc2, 0xbd, 0x0e, 0xe3, 0xbe, 0x34, 0xaa, 0x9e, + 0x9b, 0x72, 0x78, 0xa5, 0x3f, 0xc6, 0x68, 0x88, 0x3e, 0xa5, 0x74, 0x2c, 0xf7, 0xfa, 0xa7, 0xd5, + 0x2f, 0x2c, 0xd9, 0x11, 0xd1, 0xb4, 0x86, 0x66, 0x8a, 0x7e, 0xde, 0x48, 0x50, 0xf1, 0x05, 0x97, + 0xa3, 0xb6, 0x70, 0x48, 0xe9, 0xbf, 0x73, 0x30, 0xc6, 0x32, 0x22, 0x07, 0x0e, 0x72, 0xd5, 0x1a, + 0xc5, 0x5e, 0xdc, 0xb4, 0x20, 0xae, 0xcf, 0x64, 0xde, 0xe7, 0x4c, 0x46, 0xe1, 0x07, 0xff, 0xf8, + 0xcf, 0xcf, 0xf7, 0x4f, 0xa2, 0xb3, 0xc5, 0xbe, 0x44, 0x5f, 0xc5, 0xd4, 0x2a, 0x72, 0x21, 0x1c, + 0x7d, 0xa2, 0xc1, 0xb1, 0x98, 0x7a, 0x8d, 0xe6, 0x52, 0x21, 0x55, 0x22, 0xb9, 0x7e, 0x79, 0x98, + 0x9b, 0x00, 0xb8, 0xcc, 0x00, 0x2e, 0xa0, 0x42, 0x12, 0x80, 0x8b, 0x67, 0xc5, 0x1a, 0x1f, 0x85, + 0x3e, 0x86, 0x63, 0x71, 0x15, 0x3e, 0xcd, 0xa1, 0x52, 0xc5, 0x15, 0x1c, 0x4a, 0x7d, 0x3b, 0x7b, + 0x22, 0x38, 0x07, 0x9b, 0x88, 0x98, 0xba, 0x9a, 0x09, 0x10, 0xd7, 0xbb, 0x33, 0x01, 0x12, 0xfa, + 0xf4, 0xf0, 0x89, 0x10, 0x69, 0x7f, 0xab, 0xc1, 0x19, 0xa5, 0x4c, 0x8c, 0x96, 0x07, 0x67, 0x4a, + 0x68, 0xd6, 0xfa, 0x4a, 0x5e, 0x77, 0x01, 0x38, 0xcf, 0x00, 0x0d, 0x74, 0x21, 0x09, 0x28, 0xbf, + 0x3f, 0x8b, 0x1f, 0xb2, 0x77, 0xe8, 0x23, 0xf4, 0x2b, 0x0d, 0x50, 0x5a, 0x17, 0x46, 0x8b, 0xa9, + 0x84, 0x99, 0x42, 0xb4, 0xbe, 0x94, 0xcb, 0x57, 0x90, 0x5d, 0x61, 0x64, 0xb3, 0x68, 0x26, 0x63, + 0xea, 0x3c, 0x49, 0xf0, 0x67, 0x0d, 0x0a, 0x83, 0x75, 0x5e, 0x74, 0x43, 0x99, 0x78, 0xa8, 0x14, + 0xad, 0xdf, 0x1c, 0x79, 0x9c, 0x80, 0xbf, 0xc8, 0xe0, 0xcf, 0xa3, 0x73, 0x19, 0xf0, 0x4d, 0xcb, + 0xa7, 0xe8, 0xaf, 0x1a, 0x9c, 0x1f, 0xa8, 0x9a, 0xa2, 0xeb, 0x83, 0xf2, 0x67, 0xca, 0xba, 0xfa, + 0x8d, 0x51, 0x87, 0x09, 0xea, 0x5b, 0x8c, 0xfa, 0x2b, 0xa8, 0x94, 0xa4, 0x66, 0x27, 0x04, 0x06, + 0x6d, 0xca, 0x1d, 0x59, 0x4c, 0xbf, 0x59, 0xed, 0xb1, 0x63, 0x14, 0xfa, 0xa3, 0x06, 0x7a, 0xb6, + 0x5a, 0x8a, 0x4a, 0x83, 0x90, 0xd4, 0x42, 0xae, 0x7e, 0x6d, 0xa4, 0x31, 0xc3, 0x96, 0x4d, 0x33, + 0x18, 0x50, 0xfc, 0x50, 0xec, 0x8a, 0x1f, 0xa1, 0xdf, 0x6b, 0x30, 0xa1, 0xd2, 0x3a, 0xd0, 0x55, + 0x65, 0xda, 0x0c, 0xe9, 0x45, 0x5f, 0xce, 0xe9, 0x2d, 0xf0, 0xae, 0x31, 0xbc, 0x65, 0xb4, 0x94, + 0xc4, 0x23, 0x9e, 0x55, 0x6b, 0xe2, 0x22, 0x93, 0x52, 0xd8, 0x1b, 0x17, 0x41, 0xf5, 0x61, 0x3c, + 0x54, 0xfc, 0xd1, 0x85, 0x54, 0xc2, 0xc4, 0x7f, 0x20, 0xf4, 0xd9, 0x01, 0x1e, 0x02, 0x63, 0x96, + 0x61, 0x9c, 0x43, 0x53, 0xca, 0x27, 0xbd, 0x13, 0xe4, 0xf9, 0x85, 0x06, 0xa7, 0x52, 0x7a, 0x32, + 0x5a, 0x48, 0xc5, 0xce, 0x92, 0xaf, 0xf5, 0xc5, 0x3c, 0xae, 0xc3, 0xda, 0x10, 0x5f, 0x79, 0x44, + 0x0c, 0xa4, 0xbb, 0xe8, 0xd7, 0x1a, 0xa0, 0xb4, 0x76, 0x8c, 0xb2, 0x93, 0xa5, 0xc4, 0x6a, 0x45, + 0x1b, 0xca, 0x16, 0xa3, 0x8d, 0x25, 0x46, 0x36, 0x87, 0x2e, 0x0e, 0x26, 0x63, 0xab, 0x2b, 0x68, + 0xe3, 0xa7, 0x15, 0x5a, 0x2f, 0x5a, 0x52, 0x3f, 0x11, 0xa5, 0x3e, 0xad, 0x5f, 0xcd, 0xe7, 0x2c, + 0xf8, 0x56, 0x18, 0xdf, 0x3c, 0xba, 0xac, 0xe6, 0x8b, 0xbc, 0xa6, 0xfc, 0x2c, 0x14, 0x6c, 0x79, + 0x31, 0xa1, 0x56, 0xb1, 0xe5, 0xa9, 0x04, 0x65, 0xc5, 0x96, 0xa7, 0xd4, 0x7b, 0xb3, 0xb7, 0x3c, + 0x0e, 0x24, 0xf7, 0x15, 0x06, 0x12, 0x13, 0x4d, 0x15, 0x20, 0x2a, 0xcd, 0x57, 0x01, 0xa2, 0xd4, + 0x5e, 0xb3, 0x41, 0x78, 0x27, 0x08, 0x41, 0x7e, 0xa9, 0xc1, 0xd1, 0xa8, 0xa4, 0x88, 0x2e, 0xa5, + 0x12, 0x28, 0xd4, 0x4c, 0x7d, 0x6e, 0x88, 0x97, 0xa0, 0xf8, 0x2a, 0xa3, 0x28, 0xa1, 0xd5, 0xf4, + 0x06, 0x9b, 0xd0, 0xf6, 0x8a, 0x4c, 0xf6, 0x33, 0x29, 0x31, 0xb9, 0xb8, 0x18, 0x70, 0x45, 0xe5, + 0x42, 0x05, 0x97, 0x42, 0xa9, 0x54, 0x70, 0xa9, 0x34, 0xc7, 0x51, 0xb8, 0x18, 0x4e, 0xc0, 0xc5, + 0x75, 0xc9, 0x3f, 0x68, 0xf0, 0xf2, 0x16, 0xa6, 0x2a, 0xf5, 0x2f, 0xa3, 0x77, 0x66, 0x08, 0x92, + 0x19, 0xbd, 0x33, 0x4b, 0x52, 0x34, 0xae, 0x33, 0xe4, 0x22, 0x5a, 0x4e, 0x22, 0xb3, 0x5f, 0xc6, + 0x98, 0x6c, 0x7b, 0x22, 0x62, 0xb0, 0x89, 0x69, 0xc3, 0x64, 0x9a, 0x63, 0x06, 0x2f, 0x7f, 0x31, + 0x87, 0xf2, 0xc6, 0xde, 0xcc, 0xe5, 0x9c, 0xde, 0x7b, 0xe5, 0xe5, 0x6f, 0xe8, 0x4f, 0x34, 0x38, + 0xb1, 0x85, 0x69, 0x54, 0x98, 0x53, 0x3c, 0x7a, 0x85, 0x32, 0xa9, 0x78, 0xf4, 0x2a, 0x75, 0xcf, + 0x58, 0x64, 0x5c, 0x97, 0x90, 0xa1, 0xe6, 0x8a, 0xca, 0x78, 0xe8, 0x2f, 0x1a, 0x4c, 0x6d, 0x61, + 0x1a, 0x11, 0x71, 0x22, 0x7a, 0x1b, 0x2a, 0x2a, 0xd6, 0xda, 0x20, 0x65, 0x4e, 0x71, 0xa0, 0xca, + 0x27, 0xe5, 0x65, 0x2f, 0x57, 0xce, 0x6c, 0x8b, 0x28, 0xe6, 0x53, 0xdc, 0xf3, 0x83, 0x66, 0x17, + 0xea, 0x45, 0xe8, 0x77, 0x1a, 0x9c, 0x4e, 0x56, 0xb0, 0x49, 0x1b, 0x8a, 0x9d, 0x2c, 0x4b, 0x8f, + 0xd3, 0xd7, 0x72, 0xbb, 0x86, 0xbc, 0x25, 0xc6, 0x7b, 0x15, 0x2d, 0xe6, 0xe4, 0xc5, 0xb4, 0x81, + 0xfe, 0xa6, 0xc1, 0x74, 0x92, 0x34, 0xaa, 0x97, 0x29, 0x0e, 0x51, 0x43, 0xc5, 0x35, 0xfd, 0xd6, + 0xe8, 0x63, 0xc2, 0x22, 0x5e, 0x65, 0x45, 0x5c, 0x47, 0xd7, 0x72, 0x16, 0x11, 0x95, 0x01, 0x83, + 0xef, 0x85, 0x60, 0xde, 0x53, 0xf2, 0x5b, 0xfa, 0x74, 0x92, 0x74, 0xd1, 0x17, 0x86, 0xba, 0x84, + 0x88, 0x6b, 0x0c, 0x71, 0x09, 0x2d, 0xa8, 0x11, 0xe5, 0x69, 0xd5, 0xc7, 0xae, 0xcd, 0x3a, 0x18, + 0x6d, 0x04, 0x27, 0xd5, 0xa9, 0x3e, 0x58, 0x52, 0xdc, 0xba, 0x92, 0x95, 0x3b, 0xe1, 0xa8, 0x17, + 0x73, 0x3a, 0x86, 0xa8, 0x37, 0x19, 0xea, 0x1a, 0x2a, 0x0e, 0x46, 0x4d, 0x49, 0x5d, 0xe8, 0xc7, + 0x1a, 0x9c, 0x0c, 0x1a, 0x58, 0x4c, 0xa8, 0x4a, 0x8b, 0x04, 0xb1, 0xfb, 0xaa, 0x5d, 0x52, 0x25, + 0x5e, 0x19, 0xcb, 0x8c, 0xea, 0x0a, 0x9a, 0xcb, 0x68, 0x52, 0x8e, 0x4f, 0xcd, 0xbe, 0xba, 0x85, + 0xfe, 0xa4, 0x81, 0xbe, 0x85, 0x69, 0x86, 0x1e, 0x85, 0xe6, 0x53, 0x59, 0x33, 0x3c, 0xf5, 0xd5, + 0xbc, 0x9e, 0x79, 0xe7, 0xaf, 0x25, 0x87, 0x9b, 0x94, 0x3c, 0xc5, 0xae, 0x19, 0xca, 0x5f, 0xc1, + 0x06, 0x10, 0x3c, 0xf0, 0x0c, 0xf5, 0x2b, 0xfd, 0xc0, 0xd5, 0x8e, 0x8a, 0x07, 0x3e, 0x58, 0xf7, + 0x32, 0x6e, 0x30, 0xe0, 0x55, 0xb4, 0xa2, 0x06, 0xae, 0xb2, 0xd1, 0x66, 0x95, 0x0f, 0x37, 0x43, + 0xb9, 0x0b, 0xfd, 0x4b, 0x83, 0x4b, 0x59, 0xbc, 0x31, 0xb5, 0xab, 0x94, 0x8f, 0x28, 0x3a, 0x46, + 0xd1, 0x0f, 0x72, 0x6b, 0x5d, 0xc6, 0x6d, 0x56, 0xd0, 0x6b, 0xe8, 0x6b, 0x23, 0x15, 0xc4, 0xda, + 0x5b, 0xff, 0x9f, 0xc6, 0xe5, 0xef, 0x7c, 0xfa, 0xac, 0xa0, 0x7d, 0xf6, 0xac, 0xa0, 0x7d, 0xfe, + 0xac, 0xa0, 0xfd, 0xec, 0x79, 0x61, 0xdf, 0x67, 0xcf, 0x0b, 0xfb, 0xfe, 0xf9, 0xbc, 0xb0, 0xef, + 0x9d, 0xd7, 0xeb, 0x0e, 0x6d, 0x74, 0xaa, 0x2b, 0x35, 0xd2, 0x2a, 0x6e, 0xf1, 0x0c, 0xcb, 0x9c, + 0x2e, 0x79, 0xd9, 0x22, 0x76, 0xa7, 0x89, 0x8b, 0xbb, 0x21, 0x08, 0xfb, 0x79, 0x6b, 0xf5, 0x20, + 0xfb, 0x1d, 0xe9, 0xb5, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x76, 0x8f, 0x82, 0x3f, 0x37, 0x2b, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -6451,6 +6459,13 @@ func (m *QueryBridgeBalanceSnapshotByEventNonce) MarshalToSizedBuffer(dAtA []byt _ = i var l int _ = l + if len(m.EvmChainPrefix) > 0 { + i -= len(m.EvmChainPrefix) + copy(dAtA[i:], m.EvmChainPrefix) + i = encodeVarintQuery(dAtA, i, uint64(len(m.EvmChainPrefix))) + i-- + dAtA[i] = 0x12 + } if m.Nonce != 0 { i = encodeVarintQuery(dAtA, i, uint64(m.Nonce)) i-- @@ -7399,6 +7414,10 @@ func (m *QueryBridgeBalanceSnapshotByEventNonce) Size() (n int) { if m.Nonce != 0 { n += 1 + sovQuery(uint64(m.Nonce)) } + l = len(m.EvmChainPrefix) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) + } return n } @@ -12995,6 +13014,38 @@ func (m *QueryBridgeBalanceSnapshotByEventNonce) Unmarshal(dAtA []byte) error { break } } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EvmChainPrefix", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowQuery + } + 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 ErrInvalidLengthQuery + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthQuery + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.EvmChainPrefix = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipQuery(dAtA[iNdEx:]) diff --git a/module/x/gravity/types/types.pb.go b/module/x/gravity/types/types.pb.go index 8b30e80e8..fce9171bc 100644 --- a/module/x/gravity/types/types.pb.go +++ b/module/x/gravity/types/types.pb.go @@ -657,8 +657,9 @@ func (m *PendingIbcAutoForward) GetEventNonce() uint64 { type BridgeBalanceSnapshot struct { CosmosBlockHeight uint64 `protobuf:"varint,1,opt,name=cosmos_block_height,json=cosmosBlockHeight,proto3" json:"cosmos_block_height,omitempty"` EthereumBlockHeight uint64 `protobuf:"varint,2,opt,name=ethereum_block_height,json=ethereumBlockHeight,proto3" json:"ethereum_block_height,omitempty"` - Balances []*ERC20Token `protobuf:"bytes,3,rep,name=balances,proto3" json:"balances,omitempty"` - EventNonce uint64 `protobuf:"varint,4,opt,name=event_nonce,json=eventNonce,proto3" json:"event_nonce,omitempty"` + EvmChainPrefix string `protobuf:"bytes,3,opt,name=evm_chain_prefix,json=evmChainPrefix,proto3" json:"evm_chain_prefix,omitempty"` + Balances []*ERC20Token `protobuf:"bytes,4,rep,name=balances,proto3" json:"balances,omitempty"` + EventNonce uint64 `protobuf:"varint,5,opt,name=event_nonce,json=eventNonce,proto3" json:"event_nonce,omitempty"` } func (m *BridgeBalanceSnapshot) Reset() { *m = BridgeBalanceSnapshot{} } @@ -708,6 +709,13 @@ func (m *BridgeBalanceSnapshot) GetEthereumBlockHeight() uint64 { return 0 } +func (m *BridgeBalanceSnapshot) GetEvmChainPrefix() string { + if m != nil { + return m.EvmChainPrefix + } + return "" +} + func (m *BridgeBalanceSnapshot) GetBalances() []*ERC20Token { if m != nil { return m.Balances @@ -741,70 +749,71 @@ func init() { func init() { proto.RegisterFile("gravity/v1/types.proto", fileDescriptor_163831c23fcc179f) } var fileDescriptor_163831c23fcc179f = []byte{ - // 1002 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xf7, 0xc6, 0x4e, 0x1a, 0x3f, 0x9b, 0xa6, 0x6c, 0xfe, 0xd4, 0xd0, 0xd4, 0x0e, 0x16, 0x42, - 0xe6, 0x50, 0x6f, 0x63, 0x24, 0x90, 0xca, 0xa1, 0x8a, 0x43, 0x80, 0x48, 0xb4, 0x44, 0xdb, 0x12, - 0x09, 0x2e, 0xab, 0xd9, 0xdd, 0x57, 0x7b, 0x14, 0xef, 0x8c, 0x35, 0x33, 0xd9, 0xb6, 0x1f, 0x00, - 0xa9, 0x47, 0x8e, 0x1c, 0x73, 0x02, 0xf1, 0x01, 0xfa, 0x1d, 0x7a, 0xcc, 0x11, 0x71, 0xa8, 0x50, - 0x72, 0x41, 0xe2, 0x4b, 0xa0, 0xf9, 0xb3, 0xb6, 0xe3, 0x46, 0x02, 0x11, 0xc4, 0xc9, 0x7e, 0xbf, - 0x79, 0xf3, 0xde, 0x6f, 0xde, 0xdf, 0x85, 0x8d, 0x81, 0x20, 0x39, 0x55, 0xcf, 0x83, 0x7c, 0x3b, - 0x50, 0xcf, 0xc7, 0x28, 0xbb, 0x63, 0xc1, 0x15, 0xf7, 0xc1, 0xe1, 0xdd, 0x7c, 0xfb, 0xdd, 0x66, - 0xc2, 0x65, 0xc6, 0x65, 0x10, 0x13, 0x89, 0x41, 0xbe, 0x1d, 0xa3, 0x22, 0xdb, 0x41, 0xc2, 0x29, - 0xb3, 0xba, 0x33, 0xe7, 0xec, 0x68, 0x72, 0xae, 0x05, 0x77, 0xbe, 0x36, 0xe0, 0x03, 0x6e, 0xfe, - 0x06, 0xfa, 0x9f, 0x43, 0x37, 0x67, 0x3c, 0x13, 0xa5, 0x50, 0x2a, 0xa2, 0x28, 0x77, 0x36, 0xdb, - 0x9f, 0xc0, 0xcd, 0x07, 0x9c, 0x51, 0xc5, 0x05, 0xa6, 0x7b, 0xe1, 0x6e, 0xef, 0xee, 0x4e, 0x9a, - 0x0a, 0x94, 0x12, 0xa5, 0xbf, 0x09, 0x55, 0x52, 0x08, 0x0d, 0x6f, 0xab, 0xdc, 0xa9, 0x87, 0x53, - 0xa0, 0x1d, 0xc2, 0x4a, 0x5f, 0xd0, 0x74, 0x80, 0x87, 0x64, 0x44, 0x53, 0xa2, 0xb8, 0xf0, 0xd7, - 0x60, 0x71, 0xcc, 0x9f, 0xa2, 0x68, 0x78, 0x5b, 0x5e, 0xa7, 0x12, 0x5a, 0xc1, 0xff, 0x10, 0x6e, - 0xa0, 0x1a, 0xa2, 0xc0, 0xe3, 0x2c, 0x72, 0xd7, 0x1b, 0x0b, 0x5b, 0x5e, 0xa7, 0x1a, 0xae, 0x14, - 0xb8, 0xf3, 0xd9, 0xfe, 0xd3, 0x83, 0xa5, 0x43, 0x32, 0x92, 0xa8, 0xb4, 0x2d, 0xc6, 0x59, 0x82, - 0x85, 0x2d, 0x23, 0xf8, 0x9f, 0xc2, 0xb5, 0x0c, 0xb3, 0x18, 0x85, 0x36, 0x51, 0xee, 0xd4, 0x7a, - 0xb7, 0xba, 0xd3, 0xf8, 0x75, 0xe7, 0xf8, 0xf4, 0x2b, 0xaf, 0x5e, 0xb7, 0x4a, 0x61, 0x71, 0xc3, - 0xdf, 0x80, 0xa5, 0x21, 0xd2, 0xc1, 0x50, 0x35, 0xca, 0xc6, 0xa6, 0x93, 0xfc, 0x47, 0xf0, 0x96, - 0xc0, 0xa7, 0x44, 0xa4, 0x11, 0xc9, 0xf8, 0x31, 0x53, 0x8d, 0x8a, 0x66, 0xd7, 0xef, 0xea, 0xdb, - 0xbf, 0xbd, 0x6e, 0x7d, 0x30, 0xa0, 0x6a, 0x78, 0x1c, 0x77, 0x13, 0x9e, 0x05, 0x2e, 0x01, 0xf6, - 0xe7, 0x8e, 0x4c, 0x8f, 0x5c, 0x2e, 0xf7, 0x99, 0x0a, 0xeb, 0xd6, 0xc8, 0x8e, 0xb1, 0xe1, 0xbf, - 0x07, 0x4e, 0x8e, 0x14, 0x3f, 0x42, 0xd6, 0x58, 0x34, 0x2f, 0xae, 0x59, 0xec, 0xb1, 0x86, 0xda, - 0xdf, 0x7b, 0xd0, 0xfa, 0x8a, 0x48, 0xf5, 0x75, 0x2c, 0x51, 0xe4, 0x98, 0xee, 0xb9, 0x68, 0xf4, - 0x47, 0x3c, 0x39, 0xfa, 0xd2, 0x72, 0xeb, 0xc2, 0xaa, 0x75, 0x16, 0xc5, 0x1a, 0x8d, 0xdc, 0x03, - 0x6c, 0x50, 0xde, 0xb6, 0x47, 0xb3, 0xfa, 0x3d, 0x58, 0x9f, 0x04, 0xfb, 0xc2, 0x8d, 0x05, 0x73, - 0x63, 0x15, 0xdf, 0xf4, 0xd1, 0xbe, 0x07, 0x75, 0x93, 0xf9, 0xc7, 0xfc, 0x33, 0x64, 0x3c, 0xd3, - 0xa1, 0x47, 0x91, 0xf4, 0xee, 0x1a, 0x2f, 0xd5, 0xd0, 0x0a, 0x1a, 0x4d, 0xf5, 0xb1, 0xcb, 0x9d, - 0x15, 0xda, 0xbf, 0x78, 0xb0, 0xf6, 0x0d, 0x1b, 0x92, 0x91, 0xb2, 0xc1, 0x3f, 0x10, 0x7c, 0xcc, - 0x25, 0x19, 0x69, 0x75, 0x45, 0xd5, 0x08, 0x0b, 0x23, 0x46, 0xf0, 0xb7, 0xa0, 0x96, 0xa2, 0x4c, - 0x04, 0x1d, 0xeb, 0x12, 0x74, 0xa6, 0x66, 0x21, 0x1d, 0x37, 0x45, 0xc4, 0x00, 0x55, 0x64, 0xd3, - 0x5f, 0x31, 0xbc, 0x6b, 0x16, 0x7b, 0x68, 0x8a, 0xa0, 0x03, 0x37, 0x30, 0xcf, 0xa2, 0x64, 0x48, - 0x28, 0x8b, 0xc6, 0x02, 0x9f, 0xd0, 0x67, 0x2e, 0xbc, 0xd7, 0x31, 0xcf, 0x76, 0x35, 0x7c, 0x60, - 0xd0, 0x7b, 0xf5, 0x17, 0x27, 0xad, 0xd2, 0x8f, 0x27, 0xad, 0xd2, 0x1f, 0x27, 0x2d, 0xaf, 0xfd, - 0xb3, 0x07, 0x2b, 0x3b, 0x54, 0xa4, 0x82, 0x8f, 0xaf, 0x4c, 0x73, 0x12, 0x8d, 0xf2, 0x4c, 0x34, - 0xfc, 0x26, 0x80, 0xc0, 0x84, 0x8e, 0x29, 0x32, 0x25, 0x0d, 0xf5, 0x7a, 0x38, 0x83, 0xf8, 0x0d, - 0xb8, 0x66, 0x4b, 0x4c, 0x36, 0x16, 0xb7, 0xca, 0x9d, 0x4a, 0x58, 0x88, 0x73, 0x4c, 0xcf, 0x3d, - 0x58, 0xdd, 0xef, 0xef, 0x3e, 0x40, 0x45, 0x52, 0xa2, 0xc8, 0x95, 0xd9, 0xde, 0x87, 0xe5, 0xcc, - 0xd9, 0x32, 0x84, 0x6b, 0xbd, 0xdb, 0x5d, 0x5b, 0x3b, 0x5d, 0x33, 0x3e, 0xdc, 0x2c, 0xe9, 0x16, - 0x0e, 0x5d, 0xe7, 0x4c, 0x2e, 0xf9, 0xb7, 0xa0, 0x4a, 0xe3, 0x24, 0xb2, 0x4f, 0x36, 0xed, 0x11, - 0x2e, 0xd3, 0x38, 0xb1, 0xf5, 0xf2, 0xef, 0xf2, 0x51, 0x6a, 0xbf, 0x5c, 0x80, 0xd5, 0x9d, 0x34, - 0xdd, 0x9b, 0xe8, 0x5c, 0xf1, 0x95, 0xef, 0xc3, 0xf5, 0x29, 0x0f, 0x46, 0x32, 0x74, 0xc9, 0xa9, - 0x17, 0x2c, 0x1e, 0x92, 0xec, 0xf2, 0xea, 0xa9, 0x5c, 0xc6, 0xd6, 0xdf, 0x86, 0xf5, 0x19, 0x7b, - 0xa8, 0xa2, 0x1c, 0x85, 0xd4, 0xbe, 0x17, 0x4d, 0x4d, 0xfa, 0x13, 0xb3, 0xa8, 0x0e, 0xed, 0x89, - 0x7f, 0x1b, 0x8a, 0x79, 0x1e, 0xd1, 0xb4, 0xb1, 0x64, 0xcc, 0x56, 0x1d, 0xb2, 0x9f, 0xfa, 0x1f, - 0xc3, 0xcd, 0xd8, 0xb4, 0x49, 0xf4, 0xc6, 0x44, 0xbc, 0x66, 0x74, 0xd7, 0xed, 0xf1, 0xde, 0xc5, - 0xb9, 0x38, 0x57, 0x1d, 0x3f, 0x79, 0xb0, 0x79, 0x71, 0x66, 0x9b, 0x79, 0x22, 0xaf, 0x1c, 0xc0, - 0xcb, 0x42, 0x53, 0xbe, 0x34, 0x34, 0x1b, 0xb0, 0x64, 0xc6, 0x9a, 0x2e, 0xf2, 0x72, 0xa7, 0x1a, - 0x3a, 0x69, 0x8e, 0xe8, 0x0b, 0x0f, 0x36, 0x42, 0xcc, 0x78, 0x8e, 0xff, 0x59, 0x8e, 0xff, 0x31, - 0xc5, 0x39, 0x2a, 0x2f, 0x3d, 0x58, 0x3f, 0x40, 0x96, 0x52, 0x36, 0xd8, 0x8f, 0x93, 0x9d, 0x63, - 0xc5, 0x3f, 0xe7, 0x42, 0x8f, 0x62, 0xbd, 0x9e, 0x9e, 0x70, 0x81, 0x74, 0xc0, 0x22, 0x81, 0x09, - 0xd2, 0xdc, 0xed, 0xaf, 0x6a, 0xb8, 0xe2, 0xf0, 0xd0, 0xc1, 0x7e, 0x00, 0x8b, 0x76, 0x98, 0x2f, - 0x98, 0x1e, 0x7a, 0x67, 0xda, 0x43, 0x12, 0x27, 0x3d, 0xb4, 0xcb, 0x29, 0x0b, 0xad, 0x9e, 0xdf, - 0x82, 0x9a, 0x6e, 0x9b, 0x64, 0x48, 0x18, 0xc3, 0x91, 0x23, 0x0a, 0x34, 0x4e, 0x76, 0x2d, 0xa2, - 0x15, 0x30, 0x47, 0x76, 0x71, 0xd8, 0x81, 0x81, 0xcc, 0xac, 0x6b, 0x9f, 0x7a, 0xb0, 0x6e, 0x27, - 0x6b, 0x9f, 0x8c, 0x08, 0x4b, 0xf0, 0x11, 0x23, 0x63, 0x39, 0xe4, 0xff, 0xcb, 0x66, 0xf0, 0x7b, - 0xb0, 0x1c, 0x5b, 0xb7, 0xb2, 0x51, 0x36, 0xfb, 0x76, 0x63, 0x76, 0xdf, 0x4e, 0x6b, 0x2f, 0x9c, - 0xe8, 0xfd, 0xed, 0x93, 0xfa, 0xdf, 0xbe, 0x3a, 0x6b, 0x7a, 0xa7, 0x67, 0x4d, 0xef, 0xf7, 0xb3, - 0xa6, 0xf7, 0xc3, 0x79, 0xb3, 0x74, 0x7a, 0xde, 0x2c, 0xfd, 0x7a, 0xde, 0x2c, 0x7d, 0x77, 0x7f, - 0x66, 0xd3, 0x7e, 0x61, 0xdd, 0xdc, 0xb1, 0x8f, 0x9f, 0x17, 0x33, 0x9e, 0x1e, 0x8f, 0x30, 0x78, - 0x16, 0x14, 0xdf, 0x36, 0x66, 0x0d, 0xc7, 0x4b, 0xe6, 0x9b, 0xe6, 0xa3, 0xbf, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x81, 0xef, 0xb1, 0x02, 0x6d, 0x09, 0x00, 0x00, + // 1011 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xf7, 0xc6, 0x76, 0x12, 0x3f, 0xfb, 0xdb, 0xf4, 0xbb, 0xf9, 0x51, 0x43, 0x53, 0x3b, 0x58, + 0x08, 0x99, 0x43, 0xbd, 0x8d, 0x91, 0x40, 0x2a, 0x87, 0x2a, 0x0e, 0x01, 0x22, 0xd1, 0x12, 0x6d, + 0x4b, 0x24, 0xb8, 0xac, 0x66, 0x77, 0x5f, 0xed, 0x51, 0xbc, 0x33, 0xd6, 0xcc, 0x64, 0xdb, 0xfe, + 0x01, 0x48, 0x3d, 0x72, 0xe4, 0x98, 0x13, 0x88, 0x3f, 0xa0, 0xff, 0x43, 0x8f, 0x3d, 0x22, 0x0e, + 0x15, 0x4a, 0x2e, 0x48, 0xfc, 0x07, 0x9c, 0xd0, 0xfc, 0x58, 0xc7, 0x71, 0x73, 0x00, 0x82, 0x38, + 0xd9, 0xef, 0x33, 0x6f, 0xde, 0xfb, 0xcc, 0xe7, 0xbd, 0x79, 0xb3, 0xb0, 0x31, 0x14, 0x24, 0xa7, + 0xea, 0x59, 0x90, 0x6f, 0x07, 0xea, 0xd9, 0x04, 0x65, 0x6f, 0x22, 0xb8, 0xe2, 0x3e, 0x38, 0xbc, + 0x97, 0x6f, 0xbf, 0xdd, 0x4a, 0xb8, 0xcc, 0xb8, 0x0c, 0x62, 0x22, 0x31, 0xc8, 0xb7, 0x63, 0x54, + 0x64, 0x3b, 0x48, 0x38, 0x65, 0xd6, 0x77, 0x66, 0x9d, 0x1d, 0x4d, 0xd7, 0xb5, 0xe1, 0xd6, 0xd7, + 0x86, 0x7c, 0xc8, 0xcd, 0xdf, 0x40, 0xff, 0x73, 0xe8, 0xe6, 0x4c, 0x66, 0xa2, 0x14, 0x4a, 0x45, + 0x14, 0xe5, 0x2e, 0x66, 0xe7, 0x23, 0xb8, 0x71, 0x9f, 0x33, 0xaa, 0xb8, 0xc0, 0x74, 0x2f, 0xdc, + 0xed, 0xdf, 0xd9, 0x49, 0x53, 0x81, 0x52, 0xa2, 0xf4, 0x37, 0xa1, 0x46, 0x0a, 0xa3, 0xe9, 0x6d, + 0x95, 0xbb, 0x8d, 0xf0, 0x1c, 0xe8, 0x84, 0xb0, 0x32, 0x10, 0x34, 0x1d, 0xe2, 0x21, 0x19, 0xd3, + 0x94, 0x28, 0x2e, 0xfc, 0x35, 0xa8, 0x4e, 0xf8, 0x13, 0x14, 0x4d, 0x6f, 0xcb, 0xeb, 0x56, 0x42, + 0x6b, 0xf8, 0xef, 0xc3, 0x75, 0x54, 0x23, 0x14, 0x78, 0x9c, 0x45, 0x6e, 0x7b, 0x73, 0x61, 0xcb, + 0xeb, 0xd6, 0xc2, 0x95, 0x02, 0x77, 0x39, 0x3b, 0xbf, 0x7b, 0xb0, 0x78, 0x48, 0xc6, 0x12, 0x95, + 0x8e, 0xc5, 0x38, 0x4b, 0xb0, 0x88, 0x65, 0x0c, 0xff, 0x63, 0x58, 0xca, 0x30, 0x8b, 0x51, 0xe8, + 0x10, 0xe5, 0x6e, 0xbd, 0x7f, 0xb3, 0x77, 0xae, 0x5f, 0x6f, 0x8e, 0xcf, 0xa0, 0xf2, 0xf2, 0x75, + 0xbb, 0x14, 0x16, 0x3b, 0xfc, 0x0d, 0x58, 0x1c, 0x21, 0x1d, 0x8e, 0x54, 0xb3, 0x6c, 0x62, 0x3a, + 0xcb, 0x7f, 0x08, 0xff, 0x13, 0xf8, 0x84, 0x88, 0x34, 0x22, 0x19, 0x3f, 0x66, 0xaa, 0x59, 0xd1, + 0xec, 0x06, 0x3d, 0xbd, 0xfb, 0x97, 0xd7, 0xed, 0xf7, 0x86, 0x54, 0x8d, 0x8e, 0xe3, 0x5e, 0xc2, + 0xb3, 0xc0, 0x15, 0xc0, 0xfe, 0xdc, 0x96, 0xe9, 0x91, 0xab, 0xe5, 0x3e, 0x53, 0x61, 0xc3, 0x06, + 0xd9, 0x31, 0x31, 0xfc, 0x77, 0xc0, 0xd9, 0x91, 0xe2, 0x47, 0xc8, 0x9a, 0x55, 0x73, 0xe2, 0xba, + 0xc5, 0x1e, 0x69, 0xa8, 0xf3, 0xad, 0x07, 0xed, 0x2f, 0x88, 0x54, 0x5f, 0xc6, 0x12, 0x45, 0x8e, + 0xe9, 0x9e, 0x53, 0x63, 0x30, 0xe6, 0xc9, 0xd1, 0xe7, 0x96, 0x5b, 0x0f, 0x56, 0x6d, 0xb2, 0x28, + 0xd6, 0x68, 0xe4, 0x0e, 0x60, 0x45, 0xf9, 0xbf, 0x5d, 0x9a, 0xf5, 0xef, 0xc3, 0xfa, 0x54, 0xec, + 0x0b, 0x3b, 0x16, 0xcc, 0x8e, 0x55, 0x7c, 0x33, 0x47, 0xe7, 0x2e, 0x34, 0x4c, 0xe5, 0x1f, 0xf1, + 0x4f, 0x90, 0xf1, 0x4c, 0x4b, 0x8f, 0x22, 0xe9, 0xdf, 0x31, 0x59, 0x6a, 0xa1, 0x35, 0x34, 0x9a, + 0xea, 0x65, 0x57, 0x3b, 0x6b, 0x74, 0x7e, 0xf2, 0x60, 0xed, 0x2b, 0x36, 0x22, 0x63, 0x65, 0xc5, + 0x3f, 0x10, 0x7c, 0xc2, 0x25, 0x19, 0x6b, 0x77, 0x45, 0xd5, 0x18, 0x8b, 0x20, 0xc6, 0xf0, 0xb7, + 0xa0, 0x9e, 0xa2, 0x4c, 0x04, 0x9d, 0xe8, 0x16, 0x74, 0xa1, 0x66, 0x21, 0xad, 0x9b, 0x22, 0x62, + 0x88, 0x2a, 0xb2, 0xe5, 0xaf, 0x18, 0xde, 0x75, 0x8b, 0x3d, 0x30, 0x4d, 0xd0, 0x85, 0xeb, 0x98, + 0x67, 0x51, 0x32, 0x22, 0x94, 0x45, 0x13, 0x81, 0x8f, 0xe9, 0x53, 0x27, 0xef, 0x35, 0xcc, 0xb3, + 0x5d, 0x0d, 0x1f, 0x18, 0xf4, 0x6e, 0xe3, 0xf9, 0x49, 0xbb, 0xf4, 0xfd, 0x49, 0xbb, 0xf4, 0xdb, + 0x49, 0xdb, 0xeb, 0xfc, 0xe8, 0xc1, 0xca, 0x0e, 0x15, 0xa9, 0xe0, 0x93, 0x2b, 0xd3, 0x9c, 0xaa, + 0x51, 0x9e, 0x51, 0xc3, 0x6f, 0x01, 0x08, 0x4c, 0xe8, 0x84, 0x22, 0x53, 0xd2, 0x50, 0x6f, 0x84, + 0x33, 0x88, 0xdf, 0x84, 0x25, 0xdb, 0x62, 0xb2, 0x59, 0xdd, 0x2a, 0x77, 0x2b, 0x61, 0x61, 0xce, + 0x31, 0x3d, 0xf3, 0x60, 0x75, 0x7f, 0xb0, 0x7b, 0x1f, 0x15, 0x49, 0x89, 0x22, 0x57, 0x66, 0x7b, + 0x0f, 0x96, 0x33, 0x17, 0xcb, 0x10, 0xae, 0xf7, 0x6f, 0xf5, 0x6c, 0xef, 0xf4, 0xcc, 0xf8, 0x70, + 0xb3, 0xa4, 0x57, 0x24, 0x74, 0x37, 0x67, 0xba, 0xc9, 0xbf, 0x09, 0x35, 0x1a, 0x27, 0x91, 0x3d, + 0xb2, 0xb9, 0x1e, 0xe1, 0x32, 0x8d, 0x13, 0xdb, 0x2f, 0xff, 0xac, 0x1e, 0xa5, 0xce, 0x8b, 0x05, + 0x58, 0xdd, 0x49, 0xd3, 0xbd, 0xa9, 0xcf, 0x15, 0x4f, 0xf9, 0x2e, 0x5c, 0x3b, 0xe7, 0xc1, 0x48, + 0x86, 0xae, 0x38, 0x8d, 0x82, 0xc5, 0x03, 0x92, 0x5d, 0xde, 0x3d, 0x95, 0xcb, 0xd8, 0xfa, 0xdb, + 0xb0, 0x3e, 0x13, 0x0f, 0x55, 0x94, 0xa3, 0x90, 0x3a, 0x77, 0xd5, 0xf4, 0xa4, 0x3f, 0x0d, 0x8b, + 0xea, 0xd0, 0xae, 0xf8, 0xb7, 0xa0, 0x98, 0xe7, 0x11, 0x4d, 0x9b, 0x8b, 0x26, 0x6c, 0xcd, 0x21, + 0xfb, 0xa9, 0xff, 0x21, 0xdc, 0x88, 0xcd, 0x35, 0x89, 0xde, 0x98, 0x88, 0x4b, 0xc6, 0x77, 0xdd, + 0x2e, 0xef, 0x5d, 0x9c, 0x8b, 0x73, 0xdd, 0xf1, 0x83, 0x07, 0x9b, 0x17, 0x67, 0xb6, 0x99, 0x27, + 0xf2, 0xca, 0x02, 0x5e, 0x26, 0x4d, 0xf9, 0x52, 0x69, 0x36, 0x60, 0xd1, 0x8c, 0x35, 0xdd, 0xe4, + 0xe5, 0x6e, 0x2d, 0x74, 0xd6, 0x1c, 0xd1, 0xe7, 0x1e, 0x6c, 0x84, 0x98, 0xf1, 0x1c, 0xff, 0xb5, + 0x1a, 0xff, 0x65, 0x8a, 0x73, 0x54, 0x5e, 0x78, 0xb0, 0x7e, 0x80, 0x2c, 0xa5, 0x6c, 0xb8, 0x1f, + 0x27, 0x3b, 0xc7, 0x8a, 0x7f, 0xca, 0x85, 0x1e, 0xc5, 0xfa, 0x79, 0x7a, 0xcc, 0x05, 0xd2, 0x21, + 0x8b, 0x04, 0x26, 0x48, 0x73, 0xf7, 0x7e, 0xd5, 0xc2, 0x15, 0x87, 0x87, 0x0e, 0xf6, 0x03, 0xa8, + 0xda, 0x61, 0xbe, 0x60, 0xee, 0xd0, 0x5b, 0xe7, 0x77, 0x48, 0xe2, 0xf4, 0x0e, 0xed, 0x72, 0xca, + 0x42, 0xeb, 0xe7, 0xb7, 0xa1, 0xae, 0xaf, 0x4d, 0x32, 0x22, 0x8c, 0xe1, 0xd8, 0x11, 0x05, 0x1a, + 0x27, 0xbb, 0x16, 0xd1, 0x0e, 0x98, 0x23, 0xbb, 0x38, 0xec, 0xc0, 0x40, 0x66, 0xd6, 0x75, 0xfe, + 0xf0, 0x60, 0xdd, 0x4e, 0xd6, 0x01, 0x19, 0x13, 0x96, 0xe0, 0x43, 0x46, 0x26, 0x72, 0xc4, 0xff, + 0x93, 0x97, 0xe1, 0x6f, 0x34, 0x44, 0x1f, 0x96, 0x63, 0x4b, 0xd0, 0xb6, 0x44, 0xbd, 0xbf, 0x31, + 0xfb, 0x32, 0x9f, 0x77, 0x69, 0x38, 0xf5, 0x9b, 0x3f, 0x7c, 0x75, 0xfe, 0xf0, 0x83, 0xaf, 0x5f, + 0x9e, 0xb6, 0xbc, 0x57, 0xa7, 0x2d, 0xef, 0xd7, 0xd3, 0x96, 0xf7, 0xdd, 0x59, 0xab, 0xf4, 0xea, + 0xac, 0x55, 0xfa, 0xf9, 0xac, 0x55, 0xfa, 0xe6, 0xde, 0xcc, 0x9b, 0xfc, 0x99, 0x4d, 0x73, 0xdb, + 0xca, 0x34, 0x6f, 0x66, 0x3c, 0x3d, 0x1e, 0x63, 0xf0, 0x34, 0x28, 0xbe, 0x82, 0xcc, 0x83, 0x1d, + 0x2f, 0x9a, 0xaf, 0x9f, 0x0f, 0xfe, 0x0c, 0x00, 0x00, 0xff, 0xff, 0xbd, 0x45, 0xba, 0x68, 0x97, + 0x09, 0x00, 0x00, } func (this *UnhaltBridgeProposal) Equal(that interface{}) bool { @@ -1615,7 +1624,7 @@ func (m *BridgeBalanceSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { if m.EventNonce != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.EventNonce)) i-- - dAtA[i] = 0x20 + dAtA[i] = 0x28 } if len(m.Balances) > 0 { for iNdEx := len(m.Balances) - 1; iNdEx >= 0; iNdEx-- { @@ -1628,9 +1637,16 @@ func (m *BridgeBalanceSnapshot) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintTypes(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x1a + dAtA[i] = 0x22 } } + if len(m.EvmChainPrefix) > 0 { + i -= len(m.EvmChainPrefix) + copy(dAtA[i:], m.EvmChainPrefix) + i = encodeVarintTypes(dAtA, i, uint64(len(m.EvmChainPrefix))) + i-- + dAtA[i] = 0x1a + } if m.EthereumBlockHeight != 0 { i = encodeVarintTypes(dAtA, i, uint64(m.EthereumBlockHeight)) i-- @@ -1948,6 +1964,10 @@ func (m *BridgeBalanceSnapshot) Size() (n int) { if m.EthereumBlockHeight != 0 { n += 1 + sovTypes(uint64(m.EthereumBlockHeight)) } + l = len(m.EvmChainPrefix) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } if len(m.Balances) > 0 { for _, e := range m.Balances { l = e.Size() @@ -3993,6 +4013,38 @@ func (m *BridgeBalanceSnapshot) Unmarshal(dAtA []byte) error { } } case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field EvmChainPrefix", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + 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 ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTypes + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.EvmChainPrefix = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Balances", wireType) } @@ -4026,7 +4078,7 @@ func (m *BridgeBalanceSnapshot) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 4: + case 5: if wireType != 0 { return fmt.Errorf("proto: wrong wireType = %d for field EventNonce", wireType) } diff --git a/orchestrator/cosmos_gravity/src/query.rs b/orchestrator/cosmos_gravity/src/query.rs index a94090e1b..63d5464ba 100644 --- a/orchestrator/cosmos_gravity/src/query.rs +++ b/orchestrator/cosmos_gravity/src/query.rs @@ -468,6 +468,7 @@ pub async fn query_evm_chain_from_net_version( // Fetches a BridgeBalanceSnapshot from Gravity Bridge Chain for each nonce in `nonces` pub async fn get_snapshots_for_events( grpc_client: GravityQueryClient, + evm_chain_prefix: &str, nonces: &[u64], ) -> Result, CosmosGrpcError> { let mut grpc_client = grpc_client; @@ -476,6 +477,7 @@ pub async fn get_snapshots_for_events( for nonce in nonces { let response = grpc_client .get_bridge_balance_snapshot_by_event_nonce(QueryBridgeBalanceSnapshotByEventNonce { + evm_chain_prefix: evm_chain_prefix.to_string(), nonce: *nonce, }) .await; diff --git a/orchestrator/gravity_proto/src/prost/gravity.v1.rs b/orchestrator/gravity_proto/src/prost/gravity.v1.rs index 5944ef8f4..6f3f64f64 100644 --- a/orchestrator/gravity_proto/src/prost/gravity.v1.rs +++ b/orchestrator/gravity_proto/src/prost/gravity.v1.rs @@ -481,9 +481,11 @@ pub struct BridgeBalanceSnapshot { pub cosmos_block_height: u64, #[prost(uint64, tag = "2")] pub ethereum_block_height: u64, - #[prost(message, repeated, tag = "3")] + #[prost(string, tag = "3")] + pub evm_chain_prefix: ::prost::alloc::string::String, + #[prost(message, repeated, tag = "4")] pub balances: ::prost::alloc::vec::Vec, - #[prost(uint64, tag = "4")] + #[prost(uint64, tag = "5")] pub event_nonce: u64, } /// MsgSetOrchestratorAddress @@ -1956,6 +1958,8 @@ pub struct QueryBridgeBalanceSnapshotsResponse { pub struct QueryBridgeBalanceSnapshotByEventNonce { #[prost(uint64, tag = "1")] pub nonce: u64, + #[prost(string, tag = "2")] + pub evm_chain_prefix: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] diff --git a/orchestrator/gravity_utils/src/types/cross_bridge_balances.rs b/orchestrator/gravity_utils/src/types/cross_bridge_balances.rs index be186ca62..ae9495b6f 100644 --- a/orchestrator/gravity_utils/src/types/cross_bridge_balances.rs +++ b/orchestrator/gravity_utils/src/types/cross_bridge_balances.rs @@ -179,6 +179,7 @@ pub async fn gravity_chain_balance_data( if snapshots_res.is_empty() { info!("No snapshots returned - cross bridge balances will not be checked. This log should occur only once or twice!"); Ok(BridgeBalanceSnapshot { + evm_chain_prefix: "".to_string(), cosmos_block_height: 0, ethereum_block_height: 0, balances: vec![],