diff --git a/docs/openapi/openapi.swagger.yaml b/docs/openapi/openapi.swagger.yaml index 8a01e03539..eb2f4b0bc1 100644 --- a/docs/openapi/openapi.swagger.yaml +++ b/docs/openapi/openapi.swagger.yaml @@ -50609,6 +50609,10 @@ definitions: type: object crosschainMsgAddToOutTxTrackerResponse: type: object + properties: + is_removed: + type: boolean + title: if the tx was removed from the tracker due to no pending cctx crosschainMsgCreateTSSVoterResponse: type: object crosschainMsgGasPriceVoterResponse: diff --git a/docs/spec/crosschain/messages.md b/docs/spec/crosschain/messages.md index 7ad44e674e..f167df5c94 100644 --- a/docs/spec/crosschain/messages.md +++ b/docs/spec/crosschain/messages.md @@ -4,6 +4,7 @@ AddToOutTxTracker adds a new record to the outbound transaction tracker. only the admin policy account and the observer validators are authorized to broadcast this message without proof. +If no pending cctx is found, the tracker is removed, if there is an existed tracker with the nonce & chainID. ```proto message MsgAddToOutTxTracker { diff --git a/proto/crosschain/tx.proto b/proto/crosschain/tx.proto index b34fa2f47d..eabdbf19e1 100644 --- a/proto/crosschain/tx.proto +++ b/proto/crosschain/tx.proto @@ -75,7 +75,9 @@ message MsgAddToOutTxTracker { int64 tx_index = 7; } -message MsgAddToOutTxTrackerResponse {} +message MsgAddToOutTxTrackerResponse { + bool is_removed = 1; // if the tx was removed from the tracker due to no pending cctx +} message MsgRemoveFromOutTxTracker { string creator = 1; diff --git a/typescript/crosschain/tx_pb.d.ts b/typescript/crosschain/tx_pb.d.ts index 1e223c00da..98f7fd5c3a 100644 --- a/typescript/crosschain/tx_pb.d.ts +++ b/typescript/crosschain/tx_pb.d.ts @@ -322,6 +322,13 @@ export declare class MsgAddToOutTxTracker extends Message * @generated from message zetachain.zetacore.crosschain.MsgAddToOutTxTrackerResponse */ export declare class MsgAddToOutTxTrackerResponse extends Message { + /** + * if the tx was removed from the tracker due to no pending cctx + * + * @generated from field: bool is_removed = 1; + */ + isRemoved: boolean; + constructor(data?: PartialMessage); static readonly runtime: typeof proto3; diff --git a/x/crosschain/keeper/cctx_utils.go b/x/crosschain/keeper/cctx_utils.go index 63c30746e2..3bd7cf241b 100644 --- a/x/crosschain/keeper/cctx_utils.go +++ b/x/crosschain/keeper/cctx_utils.go @@ -121,3 +121,11 @@ func (k Keeper) GetRevertGasLimit(ctx sdk.Context, cctx types.CrossChainTx) (uin return 0, nil } + +func IsPending(cctx types.CrossChainTx) bool { + // pending inbound is not considered a "pending" state because it has not reached consensus yet + if cctx.CctxStatus.Status == types.CctxStatus_PendingOutbound || cctx.CctxStatus.Status == types.CctxStatus_PendingRevert { + return true + } + return false +} diff --git a/x/crosschain/keeper/keeper_cross_chain_tx.go b/x/crosschain/keeper/keeper_cross_chain_tx.go index a53c1159c4..3ceb63ada5 100644 --- a/x/crosschain/keeper/keeper_cross_chain_tx.go +++ b/x/crosschain/keeper/keeper_cross_chain_tx.go @@ -181,7 +181,7 @@ func (k Keeper) CctxAllPending(c context.Context, req *types.QueryAllCctxPending // now query the previous nonces up to 100 prior to find any pending cctx that we might have missed // need this logic because a confirmation of higher nonce will automatically update the p.NonceLow // therefore might mask some lower nonce cctx that is still pending. - startNonce := p.NonceLow - 100 + startNonce := p.NonceLow - 1000 if startNonce < 0 { startNonce = 0 } diff --git a/x/crosschain/keeper/msg_server_add_to_outtx_tracker.go b/x/crosschain/keeper/msg_server_add_to_outtx_tracker.go index c562f2344b..3c77f829b6 100644 --- a/x/crosschain/keeper/msg_server_add_to_outtx_tracker.go +++ b/x/crosschain/keeper/msg_server_add_to_outtx_tracker.go @@ -20,6 +20,7 @@ import ( // AddToOutTxTracker adds a new record to the outbound transaction tracker. // only the admin policy account and the observer validators are authorized to broadcast this message without proof. +// If no pending cctx is found, the tracker is removed, if there is an existed tracker with the nonce & chainID. func (k msgServer) AddToOutTxTracker(goCtx context.Context, msg *types.MsgAddToOutTxTracker) (*types.MsgAddToOutTxTrackerResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) chain := k.zetaObserverKeeper.GetParams(ctx).GetChainFromChainID(msg.ChainId) @@ -51,6 +52,18 @@ func (k msgServer) AddToOutTxTracker(goCtx context.Context, msg *types.MsgAddToO isProven = true } + cctx, err := k.CctxByNonce(ctx, &types.QueryGetCctxByNonceRequest{ + ChainID: msg.ChainId, + Nonce: msg.Nonce, + }) + if err != nil || cctx == nil || cctx.CrossChainTx == nil { + return nil, cosmoserrors.Wrap(types.ErrCannotFindCctx, "cannot add out tx: no corresponding cctx found") + } + if !IsPending(*cctx.CrossChainTx) { + k.RemoveOutTxTracker(ctx, msg.ChainId, msg.Nonce) + return &types.MsgAddToOutTxTrackerResponse{IsRemoved: true}, nil + } + tracker, found := k.GetOutTxTracker(ctx, msg.ChainId, msg.Nonce) hash := types.TxHashList{ TxHash: msg.TxHash, @@ -84,7 +97,7 @@ func (k msgServer) AddToOutTxTracker(goCtx context.Context, msg *types.MsgAddToO hash.Proved = true tracker.HashList = append([]*types.TxHashList{&hash}, tracker.HashList...) k.Logger(ctx).Info("Proof'd outbound transaction") - } else { + } else if len(tracker.HashList) < 2 { tracker.HashList = append(tracker.HashList, &hash) } k.SetOutTxTracker(ctx, tracker) diff --git a/x/crosschain/keeper/msg_server_add_to_outtx_tracker_test.go b/x/crosschain/keeper/msg_server_add_to_outtx_tracker_test.go index c43bd45ce8..2751a62c1d 100644 --- a/x/crosschain/keeper/msg_server_add_to_outtx_tracker_test.go +++ b/x/crosschain/keeper/msg_server_add_to_outtx_tracker_test.go @@ -25,7 +25,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) { txIndex, block, header, headerRLP, _, tx, err := sample.Proof() require.NoError(t, err) setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block) - setupTss(k, ctx) + setupTssAndNonceToCctx(k, ctx, chainID, 0) msgServer := keeper.NewMsgServerImpl(*k) _, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{ Creator: admin, @@ -47,7 +47,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) { txIndex, block, header, headerRLP, proof, tx, err := sample.Proof() require.NoError(t, err) setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block) - setupTss(k, ctx) + setupTssAndNonceToCctx(k, ctx, chainID, int64(tx.Nonce())) msgServer := keeper.NewMsgServerImpl(*k) _, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{ Creator: sample.AccAddress(), @@ -69,7 +69,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) { txIndex, block, header, headerRLP, proof, tx, err := sample.Proof() require.NoError(t, err) setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block) - setupTss(k, ctx) + setupTssAndNonceToCctx(k, ctx, chainID, 1) msgServer := keeper.NewMsgServerImpl(*k) _, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{ Creator: sample.AccAddress(), @@ -91,7 +91,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) { txIndex, block, header, headerRLP, proof, tx, err := sample.Proof() require.NoError(t, err) setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block) - setupTss(k, ctx) + setupTssAndNonceToCctx(k, ctx, chainID, int64(tx.Nonce())) msgServer := keeper.NewMsgServerImpl(*k) _, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{ Creator: sample.AccAddress(), @@ -113,7 +113,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) { txIndex, block, header, headerRLP, _, tx, err := sample.Proof() require.NoError(t, err) setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block) - setupTss(k, ctx) + setupTssAndNonceToCctx(k, ctx, chainID, int64(tx.Nonce())) msgServer := keeper.NewMsgServerImpl(*k) _, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{ Creator: sample.AccAddress(), @@ -134,7 +134,7 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) { txIndex, block, header, headerRLP, proof, tx, err := sample.Proof() require.NoError(t, err) setupVerificationParams(zk, ctx, txIndex, chainID, header, headerRLP, block) - setupTss(k, ctx) + setupTssAndNonceToCctx(k, ctx, chainID, int64(tx.Nonce())) msgServer := keeper.NewMsgServerImpl(*k) _, err = msgServer.AddToOutTxTracker(ctx, &types.MsgAddToOutTxTracker{ Creator: sample.AccAddress(), @@ -151,8 +151,22 @@ func TestMsgServer_AddToOutTxTracker(t *testing.T) { }) } -func setupTss(k *keeper.Keeper, ctx sdk.Context) { +func setupTssAndNonceToCctx(k *keeper.Keeper, ctx sdk.Context, chainId, nonce int64) { k.SetTSS(ctx, types.TSS{ TssPubkey: "zetapub1addwnpepq28c57cvcs0a2htsem5zxr6qnlvq9mzhmm76z3jncsnzz32rclangr2g35p", }) + cctx := types.CrossChainTx{ + Creator: "any", + Index: "0x123", + CctxStatus: &types.Status{ + Status: types.CctxStatus_PendingOutbound, + }, + } + k.SetCrossChainTx(ctx, cctx) + k.SetNonceToCctx(ctx, types.NonceToCctx{ + ChainId: chainId, + Nonce: nonce, + CctxIndex: "0x123", + Tss: "zetapub1addwnpepq28c57cvcs0a2htsem5zxr6qnlvq9mzhmm76z3jncsnzz32rclangr2g35p", + }) } diff --git a/x/crosschain/types/tx.pb.go b/x/crosschain/types/tx.pb.go index 279eeffffd..a5615c8450 100644 --- a/x/crosschain/types/tx.pb.go +++ b/x/crosschain/types/tx.pb.go @@ -573,6 +573,7 @@ func (m *MsgAddToOutTxTracker) GetTxIndex() int64 { } type MsgAddToOutTxTrackerResponse struct { + IsRemoved bool `protobuf:"varint,1,opt,name=is_removed,json=isRemoved,proto3" json:"is_removed,omitempty"` } func (m *MsgAddToOutTxTrackerResponse) Reset() { *m = MsgAddToOutTxTrackerResponse{} } @@ -608,6 +609,13 @@ func (m *MsgAddToOutTxTrackerResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgAddToOutTxTrackerResponse proto.InternalMessageInfo +func (m *MsgAddToOutTxTrackerResponse) GetIsRemoved() bool { + if m != nil { + return m.IsRemoved + } + return false +} + type MsgRemoveFromOutTxTracker struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` ChainId int64 `protobuf:"varint,2,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"` @@ -1467,100 +1475,101 @@ func init() { func init() { proto.RegisterFile("crosschain/tx.proto", fileDescriptor_81d6d611190b7635) } var fileDescriptor_81d6d611190b7635 = []byte{ - // 1487 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xdd, 0x4e, 0x1b, 0xc7, - 0x17, 0x67, 0xff, 0x80, 0xb1, 0x8f, 0x31, 0x81, 0x85, 0x84, 0xcd, 0x12, 0x0c, 0x59, 0xfe, 0x49, - 0x51, 0x15, 0xec, 0xc4, 0x69, 0xd5, 0x24, 0xed, 0x45, 0x03, 0x4a, 0x08, 0x4d, 0x0d, 0xd1, 0xe2, - 0xb4, 0x52, 0x6e, 0x56, 0xeb, 0xdd, 0x61, 0xbd, 0xc2, 0xbb, 0x63, 0xed, 0x8c, 0x91, 0x8d, 0x2a, - 0x55, 0xaa, 0xd4, 0x8b, 0xde, 0x55, 0x55, 0xa5, 0x56, 0x7d, 0x81, 0xbe, 0x4a, 0xee, 0x1a, 0xf5, - 0xaa, 0xe9, 0x45, 0xd4, 0x26, 0x4f, 0xd0, 0x3e, 0x41, 0xb5, 0x33, 0xb3, 0x8b, 0xd7, 0xe0, 0x2f, - 0xa2, 0x5c, 0x79, 0xce, 0xd9, 0xf9, 0x9d, 0xef, 0x33, 0x73, 0xc6, 0x30, 0x6f, 0x05, 0x98, 0x10, - 0xab, 0x66, 0xba, 0x7e, 0x91, 0xb6, 0x0a, 0x8d, 0x00, 0x53, 0x2c, 0x2f, 0x1f, 0x23, 0x6a, 0x32, - 0x5e, 0x81, 0xad, 0x70, 0x80, 0x0a, 0x27, 0xfb, 0xd4, 0x79, 0x0b, 0x7b, 0x1e, 0xf6, 0x8b, 0xfc, - 0x87, 0x63, 0xd4, 0x05, 0x07, 0x3b, 0x98, 0x2d, 0x8b, 0xe1, 0x8a, 0x73, 0xb5, 0x1f, 0x24, 0x90, - 0xcb, 0xc4, 0x29, 0xbb, 0x4e, 0x60, 0x52, 0x54, 0x21, 0xe4, 0x61, 0xd3, 0xb7, 0x89, 0xac, 0xc0, - 0x94, 0x15, 0x20, 0x93, 0xe2, 0x40, 0x91, 0x56, 0xa5, 0xf5, 0x8c, 0x1e, 0x91, 0xf2, 0x65, 0x48, - 0x33, 0x25, 0x86, 0x6b, 0x2b, 0xff, 0x5b, 0x95, 0xd6, 0xc7, 0xf5, 0x29, 0x46, 0xef, 0xd8, 0xf2, - 0x36, 0xa4, 0x4c, 0x0f, 0x37, 0x7d, 0xaa, 0x8c, 0x87, 0x98, 0xcd, 0xe2, 0xf3, 0x57, 0x2b, 0x63, - 0x7f, 0xbe, 0x5a, 0x79, 0xcf, 0x71, 0x69, 0xad, 0x59, 0x2d, 0x58, 0xd8, 0x2b, 0x5a, 0x98, 0x78, - 0x98, 0x88, 0x9f, 0x0d, 0x62, 0x1f, 0x16, 0x69, 0xbb, 0x81, 0x48, 0xe1, 0xa9, 0xeb, 0x53, 0x5d, - 0xc0, 0xb5, 0x2b, 0xa0, 0x9e, 0xb6, 0x49, 0x47, 0xa4, 0x81, 0x7d, 0x82, 0xb4, 0x7f, 0x24, 0x98, - 0x2f, 0x13, 0xe7, 0xbe, 0x6d, 0x57, 0xf0, 0x8e, 0x5f, 0x69, 0x55, 0x02, 0xd3, 0x3a, 0x44, 0xc1, - 0xf9, 0x6c, 0x5e, 0x84, 0x29, 0xda, 0x32, 0x6a, 0x26, 0xa9, 0x71, 0xa3, 0xf5, 0x14, 0x6d, 0x3d, - 0x32, 0x49, 0x4d, 0xde, 0x80, 0x8c, 0x85, 0x5d, 0xdf, 0x08, 0xcd, 0x53, 0x26, 0x56, 0xa5, 0xf5, - 0x99, 0xd2, 0x6c, 0x41, 0x04, 0x74, 0x0b, 0xbb, 0x7e, 0xa5, 0xdd, 0x40, 0x7a, 0xda, 0x12, 0x2b, - 0x79, 0x0d, 0x26, 0x1b, 0x01, 0xc6, 0x07, 0xca, 0xe4, 0xaa, 0xb4, 0x9e, 0x2d, 0xe5, 0xa2, 0xad, - 0x4f, 0x42, 0xa6, 0xce, 0xbf, 0xc9, 0xcb, 0x00, 0xd5, 0x3a, 0xb6, 0x0e, 0xb9, 0xbe, 0x14, 0xd3, - 0x97, 0x61, 0x1c, 0xa6, 0xf2, 0x32, 0xa4, 0x69, 0xcb, 0x70, 0x7d, 0x1b, 0xb5, 0x94, 0x29, 0x6e, - 0x26, 0x6d, 0xed, 0x84, 0xa4, 0xb6, 0x0c, 0x4b, 0x67, 0xb8, 0x1c, 0x87, 0x64, 0x97, 0x45, 0xe4, - 0x69, 0xc3, 0xe6, 0xf1, 0xba, 0x6f, 0xdb, 0x01, 0x22, 0xfd, 0xb2, 0xb8, 0x0c, 0x40, 0x09, 0x31, - 0x1a, 0xcd, 0xea, 0x21, 0x6a, 0xb3, 0x98, 0x64, 0xf4, 0x0c, 0x25, 0xe4, 0x09, 0x63, 0x08, 0x75, - 0xdd, 0xf2, 0x62, 0x75, 0xbf, 0x4b, 0x30, 0x57, 0x26, 0xce, 0x97, 0x35, 0x97, 0xa2, 0xba, 0x4b, - 0xe8, 0x03, 0x7d, 0xab, 0x74, 0xb3, 0x8f, 0xb6, 0x35, 0xc8, 0xa1, 0xc0, 0x2a, 0xdd, 0x34, 0x4c, - 0x2e, 0x48, 0x28, 0x9c, 0x66, 0xcc, 0xc8, 0xd8, 0xce, 0x24, 0x8d, 0x27, 0x93, 0x24, 0xc3, 0x84, - 0x6f, 0x7a, 0x3c, 0x0d, 0x19, 0x9d, 0xad, 0xe5, 0x4b, 0x90, 0x22, 0x6d, 0xaf, 0x8a, 0xeb, 0x2c, - 0xe2, 0x19, 0x5d, 0x50, 0xb2, 0x0a, 0x69, 0x1b, 0x59, 0xae, 0x67, 0xd6, 0x09, 0x8b, 0x70, 0x4e, - 0x8f, 0x69, 0x79, 0x09, 0x32, 0x8e, 0x49, 0x8c, 0xba, 0xeb, 0xb9, 0x54, 0x44, 0x38, 0xed, 0x98, - 0xe4, 0xf3, 0x90, 0xd6, 0x0c, 0xb8, 0x7c, 0xca, 0xa7, 0xc8, 0xe3, 0xd0, 0x83, 0xe3, 0x84, 0x07, - 0xdc, 0xc3, 0xe9, 0xe3, 0x4e, 0x0f, 0x96, 0x01, 0x2c, 0x2b, 0xce, 0xa0, 0x08, 0x6a, 0xc8, 0xe1, - 0x39, 0x7c, 0x29, 0xc1, 0x42, 0x94, 0xc4, 0xbd, 0x26, 0x7d, 0xcb, 0xc2, 0x5d, 0x80, 0x49, 0x1f, - 0xfb, 0x16, 0x62, 0xb1, 0x9a, 0xd0, 0x39, 0xd1, 0x59, 0xce, 0x13, 0x89, 0x72, 0x7e, 0xc7, 0xf5, - 0x99, 0x87, 0x2b, 0x67, 0xb9, 0x16, 0x57, 0xcc, 0x01, 0x0b, 0xae, 0x8e, 0x3c, 0x7c, 0x84, 0x1e, - 0x06, 0xd8, 0x7b, 0x47, 0xfe, 0x6b, 0x6b, 0x70, 0xb5, 0xa7, 0x9e, 0xd8, 0x98, 0x5f, 0x79, 0xf9, - 0x6e, 0x85, 0x4a, 0x50, 0x65, 0x7f, 0xff, 0x0b, 0x4c, 0xfb, 0x5a, 0xd1, 0xbf, 0x59, 0xe4, 0xf7, - 0x61, 0xf6, 0x10, 0xb5, 0xb7, 0x91, 0xff, 0x0c, 0x51, 0xf3, 0x11, 0x72, 0x9d, 0x1a, 0x15, 0x05, - 0x7c, 0x8a, 0x2f, 0x6f, 0x40, 0x8a, 0x50, 0x93, 0x36, 0x89, 0x38, 0x52, 0x2e, 0x46, 0x79, 0xd0, - 0x91, 0x85, 0xdc, 0x23, 0xb4, 0xcf, 0x3e, 0xea, 0x62, 0x93, 0xb6, 0xc4, 0xc2, 0x96, 0x34, 0x34, - 0x76, 0xe3, 0x67, 0x09, 0x66, 0xcb, 0xc4, 0xd9, 0x36, 0xc9, 0x93, 0xc0, 0xb5, 0xd0, 0x20, 0x2f, - 0xfa, 0xc7, 0xb2, 0x11, 0x8a, 0x88, 0x62, 0xc9, 0x08, 0xf9, 0x2a, 0x4c, 0xf3, 0x6a, 0xf0, 0x9b, - 0x5e, 0x15, 0x05, 0xcc, 0xe2, 0x09, 0x3d, 0xcb, 0x78, 0xbb, 0x8c, 0xc5, 0x9a, 0xb0, 0xd9, 0x68, - 0xd4, 0xdb, 0x71, 0x13, 0x32, 0x4a, 0x53, 0x41, 0xe9, 0xb6, 0x2c, 0x36, 0xfb, 0x19, 0xe4, 0xca, - 0xc4, 0xd9, 0x0d, 0xd3, 0xf5, 0x76, 0x26, 0x9f, 0x91, 0xfe, 0x45, 0xb8, 0x98, 0x90, 0x1d, 0x2b, - 0x7d, 0x39, 0xc9, 0x4e, 0xb4, 0x90, 0xb9, 0xe7, 0xef, 0x55, 0x09, 0x0a, 0x8e, 0x90, 0xbd, 0xd7, - 0xa4, 0x55, 0xdc, 0xf4, 0xed, 0x4a, 0xab, 0x8f, 0x0d, 0x4b, 0xc0, 0x5a, 0x98, 0xb7, 0x04, 0xcf, - 0x7d, 0x3a, 0x64, 0xb0, 0x8e, 0x28, 0xc0, 0x3c, 0x16, 0xc2, 0x0c, 0x1c, 0x96, 0x5a, 0xe7, 0x4d, - 0x32, 0x87, 0x4f, 0xf4, 0x54, 0xf8, 0xfe, 0x4f, 0x40, 0xed, 0xda, 0xcf, 0xbb, 0x8b, 0x17, 0x0d, - 0x0f, 0xb0, 0x92, 0x80, 0x6d, 0x9e, 0x7c, 0x97, 0x3f, 0x84, 0xc5, 0x2e, 0x74, 0x78, 0x9a, 0x35, - 0x09, 0xb2, 0x15, 0x60, 0xd0, 0x85, 0x04, 0x74, 0xdb, 0x24, 0x4f, 0x09, 0xb2, 0xe5, 0x63, 0xd0, - 0xba, 0x60, 0xe8, 0xe0, 0x00, 0x59, 0xd4, 0x3d, 0x42, 0x4c, 0x00, 0x4f, 0x7d, 0x96, 0x5d, 0xd9, - 0x05, 0x71, 0x65, 0x5f, 0x1f, 0xe2, 0xca, 0xde, 0xf1, 0xa9, 0x9e, 0x4f, 0x68, 0x7c, 0x10, 0xc9, - 0x8d, 0x32, 0x2f, 0x7f, 0x36, 0x40, 0x37, 0x3f, 0x8a, 0xa7, 0x99, 0xf5, 0xbd, 0x65, 0xb1, 0x03, - 0x5a, 0xc6, 0x30, 0x73, 0x64, 0xd6, 0x9b, 0xc8, 0x08, 0x78, 0xaf, 0xd8, 0xbc, 0xe8, 0x36, 0x1f, - 0x8d, 0x38, 0x66, 0xfc, 0xfb, 0x6a, 0xe5, 0x62, 0xdb, 0xf4, 0xea, 0xf7, 0xb4, 0xa4, 0x38, 0x4d, - 0xcf, 0x31, 0x86, 0x68, 0x45, 0xbb, 0xa3, 0x59, 0x53, 0x43, 0x34, 0xab, 0xbc, 0x02, 0x59, 0xee, - 0x22, 0xab, 0x51, 0x71, 0x42, 0x02, 0x63, 0x6d, 0x85, 0x1c, 0xf9, 0x3a, 0x5c, 0xe0, 0x1b, 0xc2, - 0xd3, 0x84, 0x57, 0x6f, 0x9a, 0x79, 0x9e, 0x63, 0xec, 0x0a, 0x21, 0xac, 0x72, 0x93, 0xa3, 0x47, - 0x66, 0xd0, 0xe8, 0xa1, 0x5d, 0x83, 0xb5, 0x3e, 0xa5, 0x1d, 0xb7, 0xc0, 0xdf, 0xe3, 0x6c, 0xaa, - 0x4a, 0xee, 0xdb, 0xf1, 0x07, 0x77, 0x40, 0xd8, 0xe4, 0xc8, 0xb7, 0x51, 0x20, 0xca, 0x5f, 0x50, - 0xa1, 0x3b, 0x7c, 0x65, 0x74, 0xdd, 0xdb, 0x39, 0xce, 0xde, 0x12, 0xad, 0xaa, 0x42, 0x5a, 0x84, - 0x38, 0x10, 0x97, 0x52, 0x4c, 0xcb, 0xd7, 0x60, 0x26, 0x5a, 0x8b, 0xb0, 0x4d, 0x72, 0x11, 0x11, - 0x97, 0x47, 0xee, 0x64, 0xb2, 0x4c, 0xbd, 0xd5, 0x64, 0x19, 0x7a, 0xe9, 0x21, 0x42, 0x4c, 0x87, - 0x87, 0x3e, 0xa3, 0x47, 0xa4, 0x7c, 0x05, 0x20, 0x0c, 0xb9, 0xe8, 0xe0, 0x0c, 0xb7, 0xd3, 0xf5, - 0x45, 0xe3, 0x5e, 0x87, 0x0b, 0xae, 0x6f, 0x88, 0xcb, 0x91, 0x77, 0x2b, 0x6f, 0xb9, 0x9c, 0xeb, - 0x77, 0xb6, 0x68, 0x62, 0xc2, 0xc8, 0xb2, 0x1d, 0xf1, 0x84, 0x91, 0xcc, 0xeb, 0xf4, 0xc0, 0x91, - 0x72, 0x09, 0x32, 0xb4, 0x65, 0xe0, 0xc0, 0x75, 0x5c, 0x5f, 0xc9, 0x71, 0x83, 0x68, 0x6b, 0x8f, - 0xd1, 0xe1, 0xf9, 0x67, 0x12, 0x82, 0xa8, 0x32, 0xc3, 0x3e, 0x70, 0x42, 0xfb, 0x3f, 0x68, 0xbd, - 0x53, 0x1c, 0x57, 0xc2, 0x77, 0x12, 0xcc, 0x94, 0x89, 0xb3, 0x8f, 0xe8, 0x2e, 0xb6, 0xd1, 0x63, - 0xd4, 0xee, 0x37, 0x29, 0x16, 0x21, 0xc3, 0x2f, 0xbe, 0x7d, 0x44, 0x59, 0x01, 0x64, 0x4b, 0x73, - 0xf1, 0xf0, 0xd0, 0xac, 0x3e, 0x66, 0x1f, 0xf4, 0x93, 0x3d, 0xf2, 0x0d, 0x90, 0xc3, 0xfa, 0x26, - 0xae, 0xe3, 0xa3, 0xc0, 0x10, 0xb3, 0x91, 0x38, 0x12, 0x67, 0x29, 0x21, 0xfb, 0xec, 0x83, 0xe0, - 0x6b, 0x0a, 0x5c, 0x4a, 0x9a, 0x12, 0x59, 0x59, 0xfa, 0x2d, 0x0b, 0xe3, 0x65, 0xe2, 0xc8, 0xdf, - 0x4a, 0x30, 0x77, 0x7a, 0x66, 0xba, 0x5d, 0xe8, 0xfb, 0x04, 0x2a, 0x9c, 0x35, 0x8d, 0xa8, 0x1f, - 0x9f, 0x03, 0x14, 0x8f, 0x80, 0xdf, 0x48, 0x30, 0x7b, 0xea, 0xcd, 0x51, 0x1a, 0x52, 0x62, 0x07, - 0x46, 0xbd, 0x37, 0x3a, 0x26, 0x36, 0xe2, 0x47, 0x09, 0x2e, 0xf5, 0x98, 0xa2, 0xee, 0x0c, 0x16, - 0x7b, 0x36, 0x52, 0xfd, 0xf4, 0xbc, 0xc8, 0xd8, 0xac, 0xaf, 0x60, 0xa6, 0x6b, 0x9a, 0xba, 0x39, - 0x58, 0x66, 0x12, 0xa1, 0xde, 0x19, 0x15, 0x11, 0x6b, 0x6f, 0x43, 0x2e, 0x39, 0x04, 0x15, 0x07, - 0x8b, 0x4a, 0x00, 0xd4, 0x8f, 0x46, 0x04, 0xc4, 0xaa, 0x1b, 0x00, 0x1d, 0x93, 0xcc, 0x8d, 0xc1, - 0x62, 0x4e, 0x76, 0xab, 0x1f, 0x8c, 0xb2, 0x3b, 0xd6, 0xf8, 0x8b, 0x04, 0x4a, 0xcf, 0x31, 0x66, - 0x88, 0xd2, 0xea, 0x85, 0x55, 0x37, 0xcf, 0x8f, 0x8d, 0x8d, 0xfb, 0x49, 0x82, 0xc5, 0x5e, 0x17, - 0xcc, 0xdd, 0x51, 0xe5, 0xc7, 0x50, 0xf5, 0xfe, 0xb9, 0xa1, 0x9d, 0x15, 0xda, 0xf5, 0x5c, 0x1d, - 0xa2, 0x42, 0x93, 0x88, 0x61, 0x2a, 0xb4, 0xc7, 0xf3, 0x31, 0x3c, 0x3b, 0x4e, 0xbd, 0xce, 0x87, - 0x38, 0x3b, 0xba, 0x31, 0xc3, 0x9c, 0x1d, 0xbd, 0x5e, 0xed, 0xf2, 0xd7, 0x70, 0xa1, 0xfb, 0x6f, - 0x9e, 0x5b, 0x83, 0xc5, 0x75, 0x41, 0xd4, 0xbb, 0x23, 0x43, 0x22, 0x03, 0x36, 0x1f, 0x3f, 0x7f, - 0x9d, 0x97, 0x5e, 0xbc, 0xce, 0x4b, 0x7f, 0xbd, 0xce, 0x4b, 0xdf, 0xbf, 0xc9, 0x8f, 0xbd, 0x78, - 0x93, 0x1f, 0xfb, 0xe3, 0x4d, 0x7e, 0xec, 0xd9, 0xad, 0x8e, 0x7b, 0x3c, 0x14, 0xba, 0xc1, 0xff, - 0xef, 0x8a, 0xe4, 0x17, 0x5b, 0xc5, 0xce, 0x7f, 0xc1, 0xc2, 0x6b, 0xbd, 0x9a, 0x62, 0xff, 0x5f, - 0xdd, 0xfe, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x49, 0x4b, 0x22, 0xc9, 0x20, 0x13, 0x00, 0x00, + // 1504 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6e, 0xdb, 0xc6, + 0x16, 0x36, 0xaf, 0x6d, 0x59, 0x3c, 0xb6, 0x1c, 0x9b, 0x76, 0x62, 0x86, 0x8e, 0x7f, 0x42, 0xdf, + 0xe4, 0x1a, 0x17, 0xb1, 0x94, 0x28, 0x2d, 0x9a, 0xa4, 0x2d, 0xd0, 0xd8, 0x48, 0x1c, 0x37, 0x95, + 0x1d, 0xd0, 0x4a, 0x0b, 0x64, 0x43, 0x50, 0xe4, 0x98, 0x22, 0x2c, 0x72, 0x04, 0xce, 0xc8, 0x90, + 0x8c, 0x02, 0x05, 0x0a, 0x74, 0xd1, 0x5d, 0x51, 0x14, 0x68, 0xd1, 0x17, 0xe8, 0xab, 0x64, 0xd7, + 0xa0, 0xab, 0xa6, 0x8b, 0xa0, 0x4d, 0x9e, 0xa0, 0x7d, 0x82, 0x82, 0x33, 0x43, 0x5a, 0x94, 0xad, + 0x3f, 0x07, 0x59, 0x69, 0xce, 0xe1, 0x7c, 0xe7, 0xff, 0xcc, 0x9c, 0x11, 0xcc, 0xd9, 0x21, 0x26, + 0xc4, 0xae, 0x5a, 0x5e, 0x50, 0xa0, 0xcd, 0x7c, 0x3d, 0xc4, 0x14, 0x2b, 0x4b, 0xc7, 0x88, 0x5a, + 0x8c, 0x97, 0x67, 0x2b, 0x1c, 0xa2, 0xfc, 0xc9, 0x3e, 0x6d, 0xce, 0xc6, 0xbe, 0x8f, 0x83, 0x02, + 0xff, 0xe1, 0x18, 0x6d, 0xde, 0xc5, 0x2e, 0x66, 0xcb, 0x42, 0xb4, 0xe2, 0x5c, 0xfd, 0x7b, 0x09, + 0x94, 0x12, 0x71, 0x4b, 0x9e, 0x1b, 0x5a, 0x14, 0x95, 0x09, 0x79, 0xd8, 0x08, 0x1c, 0xa2, 0xa8, + 0x30, 0x61, 0x87, 0xc8, 0xa2, 0x38, 0x54, 0xa5, 0x55, 0x69, 0x5d, 0x36, 0x62, 0x52, 0xb9, 0x0c, + 0x59, 0xa6, 0xc4, 0xf4, 0x1c, 0xf5, 0x3f, 0xab, 0xd2, 0xfa, 0xa8, 0x31, 0xc1, 0xe8, 0x1d, 0x47, + 0xd9, 0x86, 0x8c, 0xe5, 0xe3, 0x46, 0x40, 0xd5, 0xd1, 0x08, 0xb3, 0x59, 0x78, 0xfe, 0x6a, 0x65, + 0xe4, 0x8f, 0x57, 0x2b, 0xff, 0x73, 0x3d, 0x5a, 0x6d, 0x54, 0xf2, 0x36, 0xf6, 0x0b, 0x36, 0x26, + 0x3e, 0x26, 0xe2, 0x67, 0x83, 0x38, 0x87, 0x05, 0xda, 0xaa, 0x23, 0x92, 0x7f, 0xea, 0x05, 0xd4, + 0x10, 0x70, 0xfd, 0x0a, 0x68, 0xa7, 0x6d, 0x32, 0x10, 0xa9, 0xe3, 0x80, 0x20, 0xfd, 0x6f, 0x09, + 0xe6, 0x4a, 0xc4, 0xbd, 0xef, 0x38, 0x65, 0xbc, 0x13, 0x94, 0x9b, 0xe5, 0xd0, 0xb2, 0x0f, 0x51, + 0x78, 0x3e, 0x9b, 0x17, 0x60, 0x82, 0x36, 0xcd, 0xaa, 0x45, 0xaa, 0xdc, 0x68, 0x23, 0x43, 0x9b, + 0x8f, 0x2c, 0x52, 0x55, 0x36, 0x40, 0xb6, 0xb1, 0x17, 0x98, 0x91, 0x79, 0xea, 0xd8, 0xaa, 0xb4, + 0x3e, 0x5d, 0x9c, 0xc9, 0x8b, 0x80, 0x6e, 0x61, 0x2f, 0x28, 0xb7, 0xea, 0xc8, 0xc8, 0xda, 0x62, + 0xa5, 0xac, 0xc1, 0x78, 0x3d, 0xc4, 0xf8, 0x40, 0x1d, 0x5f, 0x95, 0xd6, 0x27, 0x8b, 0xb9, 0x78, + 0xeb, 0x93, 0x88, 0x69, 0xf0, 0x6f, 0xca, 0x12, 0x40, 0xa5, 0x86, 0xed, 0x43, 0xae, 0x2f, 0xc3, + 0xf4, 0xc9, 0x8c, 0xc3, 0x54, 0x5e, 0x86, 0x2c, 0x6d, 0x9a, 0x5e, 0xe0, 0xa0, 0xa6, 0x3a, 0xc1, + 0xcd, 0xa4, 0xcd, 0x9d, 0x88, 0xd4, 0x97, 0x60, 0xf1, 0x0c, 0x97, 0x93, 0x90, 0xec, 0xb2, 0x88, + 0x3c, 0xad, 0x3b, 0x3c, 0x5e, 0xf7, 0x1d, 0x27, 0x44, 0xa4, 0x57, 0x16, 0x97, 0x00, 0x28, 0x21, + 0x66, 0xbd, 0x51, 0x39, 0x44, 0x2d, 0x16, 0x13, 0xd9, 0x90, 0x29, 0x21, 0x4f, 0x18, 0x43, 0xa8, + 0xeb, 0x94, 0x97, 0xa8, 0xfb, 0x4d, 0x82, 0xd9, 0x12, 0x71, 0xbf, 0xa8, 0x7a, 0x14, 0xd5, 0x3c, + 0x42, 0x1f, 0x18, 0x5b, 0xc5, 0x9b, 0x3d, 0xb4, 0xad, 0x41, 0x0e, 0x85, 0x76, 0xf1, 0xa6, 0x69, + 0x71, 0x41, 0x42, 0xe1, 0x14, 0x63, 0xc6, 0xc6, 0xb6, 0x27, 0x69, 0x34, 0x9d, 0x24, 0x05, 0xc6, + 0x02, 0xcb, 0xe7, 0x69, 0x90, 0x0d, 0xb6, 0x56, 0x2e, 0x41, 0x86, 0xb4, 0xfc, 0x0a, 0xae, 0xb1, + 0x88, 0xcb, 0x86, 0xa0, 0x14, 0x0d, 0xb2, 0x0e, 0xb2, 0x3d, 0xdf, 0xaa, 0x11, 0x16, 0xe1, 0x9c, + 0x91, 0xd0, 0xca, 0x22, 0xc8, 0xae, 0x45, 0xcc, 0x9a, 0xe7, 0x7b, 0x54, 0x44, 0x38, 0xeb, 0x5a, + 0xe4, 0xb3, 0x88, 0xd6, 0x4d, 0xb8, 0x7c, 0xca, 0xa7, 0xd8, 0xe3, 0xc8, 0x83, 0xe3, 0x94, 0x07, + 0xdc, 0xc3, 0xa9, 0xe3, 0x76, 0x0f, 0x96, 0x00, 0x6c, 0x3b, 0xc9, 0xa0, 0x08, 0x6a, 0xc4, 0xe1, + 0x39, 0x7c, 0x29, 0xc1, 0x7c, 0x9c, 0xc4, 0xbd, 0x06, 0x7d, 0xcb, 0xc2, 0x9d, 0x87, 0xf1, 0x00, + 0x07, 0x36, 0x62, 0xb1, 0x1a, 0x33, 0x38, 0xd1, 0x5e, 0xce, 0x63, 0xa9, 0x72, 0x7e, 0xc7, 0xf5, + 0xf9, 0x31, 0x5c, 0x39, 0xcb, 0xb5, 0x24, 0x7e, 0x4b, 0x00, 0x1e, 0x31, 0x43, 0xe4, 0xe3, 0x23, + 0xe4, 0x30, 0x2f, 0xb3, 0x86, 0xec, 0x11, 0x83, 0x33, 0xf4, 0x03, 0x16, 0x7b, 0x4e, 0x3d, 0x0c, + 0xb1, 0xff, 0x8e, 0xc2, 0xa3, 0xaf, 0xc1, 0xd5, 0xae, 0x7a, 0x92, 0xea, 0xfe, 0x85, 0x57, 0xf7, + 0x56, 0xa4, 0x04, 0x95, 0xf7, 0xf7, 0x3f, 0xc7, 0xb4, 0xa7, 0x15, 0xbd, 0x7b, 0x49, 0xf9, 0x3f, + 0xcc, 0x1c, 0xa2, 0xd6, 0x36, 0x0a, 0x9e, 0x21, 0x6a, 0x3d, 0x42, 0x9e, 0x5b, 0xa5, 0xa2, 0xbe, + 0x4f, 0xf1, 0x95, 0x0d, 0xc8, 0x10, 0x6a, 0xd1, 0x06, 0x11, 0x27, 0xce, 0xc5, 0x38, 0x4d, 0x06, + 0xb2, 0x91, 0x77, 0x84, 0xf6, 0xd9, 0x47, 0x43, 0x6c, 0xd2, 0x17, 0x59, 0xd8, 0xd2, 0x86, 0x26, + 0x6e, 0xfc, 0x24, 0xc1, 0x4c, 0x89, 0xb8, 0xdb, 0x16, 0x79, 0x12, 0x7a, 0x36, 0xea, 0xe7, 0x45, + 0xef, 0x58, 0xd6, 0x23, 0x11, 0x71, 0x2c, 0x19, 0xa1, 0x5c, 0x85, 0x29, 0x5e, 0x2c, 0x41, 0xc3, + 0xaf, 0xa0, 0x90, 0x59, 0x3c, 0x66, 0x4c, 0x32, 0xde, 0x2e, 0x63, 0xb1, 0x1e, 0x6d, 0xd4, 0xeb, + 0xb5, 0x56, 0xd2, 0xa3, 0x8c, 0xd2, 0x35, 0x50, 0x3b, 0x2d, 0x4b, 0xcc, 0x7e, 0x06, 0xb9, 0x12, + 0x71, 0x77, 0xa3, 0x74, 0xbd, 0x9d, 0xc9, 0x67, 0xa4, 0x7f, 0x01, 0x2e, 0xa6, 0x64, 0x27, 0x4a, + 0x5f, 0x8e, 0xb3, 0x03, 0x2f, 0x62, 0xee, 0x05, 0x7b, 0x15, 0x82, 0xc2, 0x23, 0xe4, 0xec, 0x35, + 0x68, 0x05, 0x37, 0x02, 0xa7, 0xdc, 0xec, 0x61, 0xc3, 0x22, 0xb0, 0x0e, 0xe7, 0x1d, 0xc3, 0x73, + 0x9f, 0x8d, 0x18, 0xac, 0x61, 0xf2, 0x30, 0x87, 0x85, 0x30, 0x13, 0x47, 0xa5, 0xd6, 0x7e, 0xd1, + 0xcc, 0xe2, 0x13, 0x3d, 0x65, 0xbe, 0xff, 0x23, 0xd0, 0x3a, 0xf6, 0xf3, 0xe6, 0xe3, 0x45, 0xc3, + 0x03, 0xac, 0xa6, 0x60, 0x9b, 0x27, 0xdf, 0x95, 0xf7, 0x61, 0xa1, 0x03, 0x1d, 0x1d, 0x76, 0x0d, + 0x82, 0x1c, 0x15, 0x18, 0x74, 0x3e, 0x05, 0xdd, 0xb6, 0xc8, 0x53, 0x82, 0x1c, 0xe5, 0x18, 0xf4, + 0x0e, 0x18, 0x3a, 0x38, 0x40, 0x36, 0xf5, 0x8e, 0x10, 0x13, 0xc0, 0x53, 0x3f, 0xc9, 0x6e, 0xf4, + 0xbc, 0xb8, 0xd1, 0xaf, 0x0f, 0x70, 0xa3, 0xef, 0x04, 0xd4, 0x58, 0x4e, 0x69, 0x7c, 0x10, 0xcb, + 0x8d, 0x33, 0xaf, 0x7c, 0xda, 0x47, 0x37, 0x3f, 0xa9, 0xa7, 0x98, 0xf5, 0xdd, 0x65, 0xb1, 0xf3, + 0x5b, 0xc1, 0x30, 0x7d, 0x64, 0xd5, 0x1a, 0xc8, 0x0c, 0x79, 0xaf, 0x38, 0xbc, 0xe8, 0x36, 0x1f, + 0x0d, 0x39, 0x85, 0xfc, 0xf3, 0x6a, 0xe5, 0x62, 0xcb, 0xf2, 0x6b, 0xf7, 0xf4, 0xb4, 0x38, 0xdd, + 0xc8, 0x31, 0x86, 0x68, 0x45, 0xa7, 0xad, 0x59, 0x33, 0x03, 0x34, 0xab, 0xb2, 0x02, 0x93, 0xdc, + 0x45, 0x56, 0xa3, 0xe2, 0x00, 0x05, 0xc6, 0xda, 0x8a, 0x38, 0xca, 0x75, 0xb8, 0xc0, 0x37, 0x44, + 0xa7, 0x09, 0xaf, 0xde, 0x2c, 0xf3, 0x3c, 0xc7, 0xd8, 0x65, 0x42, 0x58, 0xe5, 0xa6, 0x27, 0x13, + 0xb9, 0xdf, 0x64, 0xa2, 0x5f, 0x83, 0xb5, 0x1e, 0xa5, 0x9d, 0xb4, 0xc0, 0x5f, 0xa3, 0x6c, 0xe8, + 0x4a, 0xef, 0xdb, 0x09, 0xfa, 0x77, 0x40, 0xd4, 0xe4, 0x28, 0x70, 0x50, 0x28, 0xca, 0x5f, 0x50, + 0x91, 0x3b, 0x7c, 0x65, 0x76, 0x5c, 0xeb, 0x39, 0xce, 0xde, 0x12, 0xad, 0xaa, 0x41, 0x56, 0x84, + 0x38, 0x14, 0x77, 0x56, 0x42, 0x2b, 0xd7, 0x60, 0x3a, 0x5e, 0x8b, 0xb0, 0x8d, 0x73, 0x11, 0x31, + 0x97, 0x47, 0xee, 0x64, 0xf0, 0xcc, 0xbc, 0xd5, 0xe0, 0x19, 0x79, 0xe9, 0x23, 0x42, 0x2c, 0x97, + 0x87, 0x5e, 0x36, 0x62, 0x52, 0xb9, 0x02, 0x10, 0x85, 0x5c, 0x74, 0xb0, 0xcc, 0xed, 0xf4, 0x02, + 0xd1, 0xb8, 0xd7, 0xe1, 0x82, 0x17, 0x98, 0xe2, 0xee, 0xe4, 0xdd, 0xca, 0x5b, 0x2e, 0xe7, 0x05, + 0xed, 0x2d, 0x9a, 0x1a, 0x40, 0x26, 0xd9, 0x8e, 0x64, 0x00, 0x49, 0xe7, 0x75, 0xaa, 0xef, 0xc4, + 0xb9, 0x08, 0x32, 0x6d, 0x9a, 0x38, 0xf4, 0x5c, 0x2f, 0x50, 0x73, 0xdc, 0x20, 0xda, 0xdc, 0x63, + 0x74, 0x74, 0xfe, 0x59, 0x84, 0x20, 0xaa, 0x4e, 0xb3, 0x0f, 0x9c, 0xd0, 0xff, 0x0b, 0x7a, 0xf7, + 0x14, 0x27, 0x95, 0xf0, 0xad, 0x04, 0xd3, 0x25, 0xe2, 0xee, 0x23, 0xba, 0x8b, 0x1d, 0xf4, 0x18, + 0xb5, 0x7a, 0x0d, 0x92, 0x05, 0x90, 0xf9, 0xc5, 0xb7, 0x8f, 0x28, 0x2b, 0x80, 0xc9, 0xe2, 0x6c, + 0x32, 0x5b, 0x34, 0x2a, 0x8f, 0xd9, 0x07, 0xe3, 0x64, 0x8f, 0x72, 0x03, 0x94, 0xa8, 0xbe, 0x89, + 0xe7, 0x06, 0x28, 0x34, 0xc5, 0xe8, 0x24, 0x8e, 0xc4, 0x19, 0x4a, 0xc8, 0x3e, 0xfb, 0x20, 0xf8, + 0xba, 0x0a, 0x97, 0xd2, 0xa6, 0xc4, 0x56, 0x16, 0x7f, 0x9d, 0x84, 0xd1, 0x12, 0x71, 0x95, 0x6f, + 0x24, 0x98, 0x3d, 0x3d, 0x52, 0xdd, 0xce, 0xf7, 0x7c, 0x21, 0xe5, 0xcf, 0x1a, 0x56, 0xb4, 0x0f, + 0xcf, 0x01, 0x4a, 0x26, 0x9c, 0xaf, 0x25, 0x98, 0x39, 0xf5, 0x24, 0x29, 0x0e, 0x28, 0xb1, 0x0d, + 0xa3, 0xdd, 0x1b, 0x1e, 0x93, 0x18, 0xf1, 0x83, 0x04, 0x97, 0xba, 0x4c, 0x51, 0x77, 0xfa, 0x8b, + 0x3d, 0x1b, 0xa9, 0x7d, 0x72, 0x5e, 0x64, 0x62, 0xd6, 0x97, 0x30, 0xdd, 0x31, 0x4d, 0xdd, 0xec, + 0x2f, 0x33, 0x8d, 0xd0, 0xee, 0x0c, 0x8b, 0x48, 0xb4, 0xb7, 0x20, 0x97, 0x1e, 0x82, 0x0a, 0xfd, + 0x45, 0xa5, 0x00, 0xda, 0x07, 0x43, 0x02, 0x12, 0xd5, 0x75, 0x80, 0xb6, 0x49, 0xe6, 0x46, 0x7f, + 0x31, 0x27, 0xbb, 0xb5, 0xf7, 0x86, 0xd9, 0x9d, 0x68, 0xfc, 0x59, 0x02, 0xb5, 0xeb, 0x18, 0x33, + 0x40, 0x69, 0x75, 0xc3, 0x6a, 0x9b, 0xe7, 0xc7, 0x26, 0xc6, 0xfd, 0x28, 0xc1, 0x42, 0xb7, 0x0b, + 0xe6, 0xee, 0xb0, 0xf2, 0x13, 0xa8, 0x76, 0xff, 0xdc, 0xd0, 0xf6, 0x0a, 0xed, 0x78, 0xcd, 0x0e, + 0x50, 0xa1, 0x69, 0xc4, 0x20, 0x15, 0xda, 0xe5, 0x75, 0x19, 0x9d, 0x1d, 0xa7, 0x1e, 0xef, 0x03, + 0x9c, 0x1d, 0x9d, 0x98, 0x41, 0xce, 0x8e, 0x6e, 0x8f, 0x7a, 0xe5, 0x2b, 0xb8, 0xd0, 0xf9, 0x2f, + 0xd0, 0xad, 0xfe, 0xe2, 0x3a, 0x20, 0xda, 0xdd, 0xa1, 0x21, 0xb1, 0x01, 0x9b, 0x8f, 0x9f, 0xbf, + 0x5e, 0x96, 0x5e, 0xbc, 0x5e, 0x96, 0xfe, 0x7c, 0xbd, 0x2c, 0x7d, 0xf7, 0x66, 0x79, 0xe4, 0xc5, + 0x9b, 0xe5, 0x91, 0xdf, 0xdf, 0x2c, 0x8f, 0x3c, 0xbb, 0xd5, 0x76, 0x8f, 0x47, 0x42, 0x37, 0xf8, + 0xdf, 0x61, 0xb1, 0xfc, 0x42, 0xb3, 0xd0, 0xfe, 0x27, 0x59, 0x74, 0xad, 0x57, 0x32, 0xec, 0xef, + 0xad, 0xdb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x34, 0xdd, 0xf5, 0x5e, 0x3f, 0x13, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -2419,6 +2428,16 @@ func (m *MsgAddToOutTxTrackerResponse) MarshalToSizedBuffer(dAtA []byte) (int, e _ = i var l int _ = l + if m.IsRemoved { + i-- + if m.IsRemoved { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + } return len(dAtA) - i, nil } @@ -3215,6 +3234,9 @@ func (m *MsgAddToOutTxTrackerResponse) Size() (n int) { } var l int _ = l + if m.IsRemoved { + n += 2 + } return n } @@ -4750,6 +4772,26 @@ func (m *MsgAddToOutTxTrackerResponse) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: MsgAddToOutTxTrackerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field IsRemoved", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.IsRemoved = bool(v != 0) default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) diff --git a/zetaclient/evm_client.go b/zetaclient/evm_client.go index cc68008983..09a68a390b 100644 --- a/zetaclient/evm_client.go +++ b/zetaclient/evm_client.go @@ -557,6 +557,7 @@ func (ob *EVMChainClient) observeOutTx() { if err != nil { continue } + //FIXME: remove this timeout here to ensure that all trackers are queried outTimeout := time.After(time.Duration(timeoutNonce) * time.Second) TRACKERLOOP: // Skip old gabbage trackers as we spent too much time on querying them diff --git a/zetaclient/zetacore_observer.go b/zetaclient/zetacore_observer.go index fa5b8c7c46..fb208dd98d 100644 --- a/zetaclient/zetacore_observer.go +++ b/zetaclient/zetacore_observer.go @@ -178,6 +178,11 @@ func (co *CoreObserver) startSendScheduler() { co.logger.ZetaChainWatcher.Error().Msgf("mismatch chainid: want %d, got %d", c.ChainId, params.ReceiverChainId) continue } + const MaxLookaheadNonce = 120 + if params.OutboundTxTssNonce > cctxList[0].GetCurrentOutTxParam().OutboundTxTssNonce+MaxLookaheadNonce { + co.logger.ZetaChainWatcher.Error().Msgf("nonce too high: signing %d, earliest pending %d", params.OutboundTxTssNonce, cctxList[0].GetCurrentOutTxParam().OutboundTxTssNonce) + break + } // #nosec G701 range is verified currentHeight := uint64(bn) nonce := params.OutboundTxTssNonce