From 17b9ec0c5616dafc965ae901a53e69c75ec7dbfe Mon Sep 17 00:00:00 2001 From: krehermann Date: Fri, 16 Feb 2024 13:52:58 -0700 Subject: [PATCH] BCF-2989: onramp grpc service impl (#354) * BCF-2989: onramp grpc service impl * fix linter --------- Co-authored-by: krehermann --- pkg/loop/internal/ccip/onramp.go | 139 +++++++++ pkg/loop/internal/pb/ccip/models.pb.go | 283 +++++++++--------- pkg/loop/internal/pb/ccip/models.proto | 29 +- pkg/loop/internal/pb/ccip/onramp.pb.go | 307 ++++++++++---------- pkg/loop/internal/pb/ccip/onramp.proto | 20 +- pkg/loop/internal/pb/ccip/onramp_grpc.pb.go | 36 +-- 6 files changed, 478 insertions(+), 336 deletions(-) create mode 100644 pkg/loop/internal/ccip/onramp.go diff --git a/pkg/loop/internal/ccip/onramp.go b/pkg/loop/internal/ccip/onramp.go new file mode 100644 index 000000000..af0a40f85 --- /dev/null +++ b/pkg/loop/internal/ccip/onramp.go @@ -0,0 +1,139 @@ +package ccip + +import ( + "context" + "fmt" + + "google.golang.org/protobuf/types/known/emptypb" + + ccippb "github.com/smartcontractkit/chainlink-common/pkg/loop/internal/pb/ccip" + cciptypes "github.com/smartcontractkit/chainlink-common/pkg/types/ccip" +) + +var _ cciptypes.OnRampReader = (*OnRampReaderClient)(nil) + +type OnRampReaderClient struct { + grpc ccippb.OnRampReaderClient +} + +func NewOnRampReaderClient(grpc ccippb.OnRampReaderClient) *OnRampReaderClient { + return &OnRampReaderClient{grpc: grpc} +} + +// Address implements ccip.OnRampReader. +func (o *OnRampReaderClient) Address() (cciptypes.Address, error) { + resp, err := o.grpc.Address(context.TODO(), &emptypb.Empty{}) + if err != nil { + return cciptypes.Address(""), err + } + return cciptypes.Address(resp.Address), nil +} + +// GetDynamicConfig implements ccip.OnRampReader. +func (o *OnRampReaderClient) GetDynamicConfig() (cciptypes.OnRampDynamicConfig, error) { + resp, err := o.grpc.GetDynamicConfig(context.TODO(), &emptypb.Empty{}) + if err != nil { + return cciptypes.OnRampDynamicConfig{}, err + } + return onRampDynamicConfig(resp.DynamicConfig), nil +} + +// GetSendRequestsBetweenSeqNums implements ccip.OnRampReader. +func (o *OnRampReaderClient) GetSendRequestsBetweenSeqNums(ctx context.Context, seqNumMin uint64, seqNumMax uint64, finalized bool) ([]cciptypes.EVM2EVMMessageWithTxMeta, error) { + resp, err := o.grpc.GetSendRequestsBetweenSeqNums(ctx, &ccippb.GetSendRequestsBetweenSeqNumsRequest{ + SeqNumMin: seqNumMin, + SeqNumMax: seqNumMax, + Finalized: finalized, + }) + if err != nil { + return nil, err + } + return evm2EVMMessageWithTxMetaSlice(resp.SendRequests) +} + +// RouterAddress implements ccip.OnRampReader. +func (o *OnRampReaderClient) RouterAddress() (cciptypes.Address, error) { + panic("unimplemented") +} + +func onRampDynamicConfig(config *ccippb.OnRampDynamicConfig) cciptypes.OnRampDynamicConfig { + return cciptypes.OnRampDynamicConfig{ + Router: cciptypes.Address(config.Router), + MaxNumberOfTokensPerMsg: uint16(config.MaxNumberOfTokensPerMsg), + DestGasOverhead: config.DestGasOverhead, + DestGasPerPayloadByte: uint16(config.DestGasPerByte), + DestDataAvailabilityOverheadGas: config.DestDataAvailabilityOverheadGas, + DestGasPerDataAvailabilityByte: uint16(config.DestGasPerDataAvailabilityByte), + DestDataAvailabilityMultiplierBps: uint16(config.DestDataAvailabilityMultiplierBps), + PriceRegistry: cciptypes.Address(config.PriceRegistry), + MaxDataBytes: config.MaxDataBytes, + MaxPerMsgGasLimit: config.MaxPerMsgGasLimit, + } +} + +func evm2EVMMessageWithTxMetaSlice(messages []*ccippb.EVM2EVMMessageWithTxMeta) ([]cciptypes.EVM2EVMMessageWithTxMeta, error) { + res := make([]cciptypes.EVM2EVMMessageWithTxMeta, len(messages)) + for i, m := range messages { + decodedMsg, err := evm2EVMMessage(m.Message) + if err != nil { + return nil, fmt.Errorf("failed to convert grpc message (%v) to evm2evm message: %w", m.Message, err) + } + res[i] = cciptypes.EVM2EVMMessageWithTxMeta{ + TxMeta: txMeta(m.TxMeta), + EVM2EVMMessage: decodedMsg, + } + } + return res, nil +} + +func evm2EVMMessage(message *ccippb.EVM2EVMMessage) (cciptypes.EVM2EVMMessage, error) { + msgID, err := hash(message.MessageId) + if err != nil { + return cciptypes.EVM2EVMMessage{}, fmt.Errorf("failed to convert message id (%v): %w", message.MessageId, err) + } + + return cciptypes.EVM2EVMMessage{ + SequenceNumber: message.SequenceNumber, + GasLimit: message.GasLimit.Int(), + Nonce: message.Nonce, + MessageID: msgID, + SourceChainSelector: message.SourceChainSelector, + Sender: cciptypes.Address(message.Sender), + Receiver: cciptypes.Address(message.Receiver), + Strict: message.Strict, + FeeToken: cciptypes.Address(message.FeeToken), + FeeTokenAmount: message.FeeTokenAmount.Int(), + Data: message.Data, + TokenAmounts: tokenAmountSlice(message.TokenAmounts), + SourceTokenData: message.SourceTokenData, + }, nil +} + +func tokenAmountSlice(tokenAmounts []*ccippb.TokenAmount) []cciptypes.TokenAmount { + res := make([]cciptypes.TokenAmount, len(tokenAmounts)) + for i, t := range tokenAmounts { + res[i] = cciptypes.TokenAmount{ + Token: cciptypes.Address(t.Token), + Amount: t.Amount.Int(), + } + } + return res +} + +func txMeta(meta *ccippb.TxMeta) cciptypes.TxMeta { + return cciptypes.TxMeta{ + BlockTimestampUnixMilli: meta.BlockTimestampUnixMilli, + BlockNumber: meta.BlockNumber, + TxHash: meta.TxHash, + LogIndex: meta.LogIndex, + } +} + +func hash(h []byte) (cciptypes.Hash, error) { + var res cciptypes.Hash + if len(h) != 32 { + return res, fmt.Errorf("hash length is not 32 bytes") + } + copy(res[:], h) + return res, nil +} diff --git a/pkg/loop/internal/pb/ccip/models.pb.go b/pkg/loop/internal/pb/ccip/models.pb.go index ef75ce41b..9888c35a9 100644 --- a/pkg/loop/internal/pb/ccip/models.pb.go +++ b/pkg/loop/internal/pb/ccip/models.pb.go @@ -29,10 +29,10 @@ type TxMeta struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BlockTimestamp uint64 `protobuf:"varint,1,opt,name=block_timestamp,json=blockTimestamp,proto3" json:"block_timestamp,omitempty"` - BlockHeight uint64 `protobuf:"varint,2,opt,name=block_height,json=blockHeight,proto3" json:"block_height,omitempty"` - TxHash string `protobuf:"bytes,3,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` - LogIndex uint64 `protobuf:"varint,4,opt,name=log_index,json=logIndex,proto3" json:"log_index,omitempty"` + BlockTimestampUnixMilli int64 `protobuf:"varint,1,opt,name=block_timestamp_unix_milli,json=blockTimestampUnixMilli,proto3" json:"block_timestamp_unix_milli,omitempty"` + BlockNumber uint64 `protobuf:"varint,2,opt,name=block_number,json=blockNumber,proto3" json:"block_number,omitempty"` + TxHash string `protobuf:"bytes,3,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash,omitempty"` + LogIndex uint64 `protobuf:"varint,4,opt,name=log_index,json=logIndex,proto3" json:"log_index,omitempty"` } func (x *TxMeta) Reset() { @@ -67,16 +67,16 @@ func (*TxMeta) Descriptor() ([]byte, []int) { return file_models_proto_rawDescGZIP(), []int{0} } -func (x *TxMeta) GetBlockTimestamp() uint64 { +func (x *TxMeta) GetBlockTimestampUnixMilli() int64 { if x != nil { - return x.BlockTimestamp + return x.BlockTimestampUnixMilli } return 0 } -func (x *TxMeta) GetBlockHeight() uint64 { +func (x *TxMeta) GetBlockNumber() uint64 { if x != nil { - return x.BlockHeight + return x.BlockNumber } return 0 } @@ -103,18 +103,18 @@ type EVM2EVMMessage struct { SequenceNumber uint64 `protobuf:"varint,1,opt,name=sequence_number,json=sequenceNumber,proto3" json:"sequence_number,omitempty"` GasLimit *pb.BigInt `protobuf:"bytes,2,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"` - GasPrice uint64 `protobuf:"varint,3,opt,name=gas_price,json=gasPrice,proto3" json:"gas_price,omitempty"` - MessageId []byte `protobuf:"bytes,4,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"` // Hash [32]byte - SourceChainSelector uint64 `protobuf:"varint,5,opt,name=source_chain_selector,json=sourceChainSelector,proto3" json:"source_chain_selector,omitempty"` - Sender string `protobuf:"bytes,6,opt,name=sender,proto3" json:"sender,omitempty"` // Address - Receiver string `protobuf:"bytes,7,opt,name=receiver,proto3" json:"receiver,omitempty"` // Address - Strict bool `protobuf:"varint,8,opt,name=strict,proto3" json:"strict,omitempty"` - FeeToken string `protobuf:"bytes,9,opt,name=fee_token,json=feeToken,proto3" json:"fee_token,omitempty"` // Address - FeeTokenAmount *pb.BigInt `protobuf:"bytes,10,opt,name=fee_token_amount,json=feeTokenAmount,proto3" json:"fee_token_amount,omitempty"` - Data []byte `protobuf:"bytes,11,opt,name=data,proto3" json:"data,omitempty"` - TokenAmounts []*TokenAmount `protobuf:"bytes,12,rep,name=token_amounts,json=tokenAmounts,proto3" json:"token_amounts,omitempty"` - SourceTokenData [][]byte `protobuf:"bytes,13,rep,name=source_token_data,json=sourceTokenData,proto3" json:"source_token_data,omitempty"` - Hash []byte `protobuf:"bytes,14,opt,name=hash,proto3" json:"hash,omitempty"` // Hash [32]byte, computed from the message + Nonce uint64 `protobuf:"varint,3,opt,name=nonce,proto3" json:"nonce,omitempty"` + GasPrice uint64 `protobuf:"varint,4,opt,name=gas_price,json=gasPrice,proto3" json:"gas_price,omitempty"` + MessageId []byte `protobuf:"bytes,5,opt,name=message_id,json=messageId,proto3" json:"message_id,omitempty"` // Hash [32]byte + SourceChainSelector uint64 `protobuf:"varint,6,opt,name=source_chain_selector,json=sourceChainSelector,proto3" json:"source_chain_selector,omitempty"` + Sender string `protobuf:"bytes,7,opt,name=sender,proto3" json:"sender,omitempty"` // Address + Receiver string `protobuf:"bytes,8,opt,name=receiver,proto3" json:"receiver,omitempty"` // Address + Strict bool `protobuf:"varint,9,opt,name=strict,proto3" json:"strict,omitempty"` + FeeToken string `protobuf:"bytes,10,opt,name=fee_token,json=feeToken,proto3" json:"fee_token,omitempty"` // Address + FeeTokenAmount *pb.BigInt `protobuf:"bytes,11,opt,name=fee_token_amount,json=feeTokenAmount,proto3" json:"fee_token_amount,omitempty"` + Data []byte `protobuf:"bytes,12,opt,name=data,proto3" json:"data,omitempty"` + TokenAmounts []*TokenAmount `protobuf:"bytes,13,rep,name=token_amounts,json=tokenAmounts,proto3" json:"token_amounts,omitempty"` + SourceTokenData [][]byte `protobuf:"bytes,14,rep,name=source_token_data,json=sourceTokenData,proto3" json:"source_token_data,omitempty"` // Note: we don't bother with the Hash field here in the gRPC because it's derived from the golang struct } func (x *EVM2EVMMessage) Reset() { @@ -163,6 +163,13 @@ func (x *EVM2EVMMessage) GetGasLimit() *pb.BigInt { return nil } +func (x *EVM2EVMMessage) GetNonce() uint64 { + if x != nil { + return x.Nonce + } + return 0 +} + func (x *EVM2EVMMessage) GetGasPrice() uint64 { if x != nil { return x.GasPrice @@ -240,13 +247,6 @@ func (x *EVM2EVMMessage) GetSourceTokenData() [][]byte { return nil } -func (x *EVM2EVMMessage) GetHash() []byte { - if x != nil { - return x.Hash - } - return nil -} - // EVM2EVMOnRampCCIPSendRequestedWithMeta is a gRPC adapter to [github.com/smartcontractkit/chainlink-common/pkg/types/ccip.EVM2EVMOnRampCCIPSendRequestedWithMeta] type EVM2EVMOnRampCCIPSendRequestedWithMeta struct { state protoimpl.MessageState @@ -711,120 +711,121 @@ var file_models_proto_rawDesc = []byte{ 0x2e, 0x63, 0x63, 0x69, 0x70, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0d, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8a, 0x01, 0x0a, 0x06, 0x54, 0x78, 0x4d, 0x65, 0x74, 0x61, - 0x12, 0x27, 0x0a, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, 0x62, 0x6c, 0x6f, 0x63, 0x6b, - 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x21, 0x0a, 0x0c, 0x62, 0x6c, 0x6f, - 0x63, 0x6b, 0x5f, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, - 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x17, 0x0a, 0x07, - 0x74, 0x78, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, - 0x78, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x69, 0x6e, 0x64, - 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x49, 0x6e, 0x64, - 0x65, 0x78, 0x22, 0x92, 0x04, 0x0a, 0x0e, 0x45, 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, - 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, - 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0e, - 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x29, - 0x0a, 0x09, 0x67, 0x61, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, - 0x08, 0x67, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x67, 0x61, 0x73, - 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x67, 0x61, - 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, 0x32, 0x0a, 0x15, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, - 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x05, - 0x20, 0x01, 0x28, 0x04, 0x52, 0x13, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x68, 0x61, 0x69, - 0x6e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, - 0x64, 0x65, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, - 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x07, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x16, 0x0a, - 0x06, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, - 0x74, 0x72, 0x69, 0x63, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x66, 0x65, 0x65, 0x5f, 0x74, 0x6f, 0x6b, - 0x65, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x65, 0x65, 0x54, 0x6f, 0x6b, - 0x65, 0x6e, 0x12, 0x36, 0x0a, 0x10, 0x66, 0x65, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, - 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, - 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x0e, 0x66, 0x65, 0x65, 0x54, - 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, - 0x74, 0x61, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x47, - 0x0a, 0x0d, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, - 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x54, 0x6f, - 0x6b, 0x65, 0x6e, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x74, 0x6f, 0x6b, 0x65, 0x6e, - 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x0d, 0x20, 0x03, - 0x28, 0x0c, 0x52, 0x0f, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x44, - 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x61, 0x73, 0x68, 0x18, 0x0e, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x22, 0xa9, 0x02, 0x0a, 0x26, 0x45, 0x56, 0x4d, 0x32, - 0x45, 0x56, 0x4d, 0x4f, 0x6e, 0x52, 0x61, 0x6d, 0x70, 0x43, 0x43, 0x49, 0x50, 0x53, 0x65, 0x6e, - 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x65, 0x64, 0x57, 0x69, 0x74, 0x68, 0x4d, 0x65, - 0x74, 0x61, 0x12, 0x4a, 0x0a, 0x0e, 0x65, 0x76, 0x6d, 0x5f, 0x74, 0x6f, 0x5f, 0x65, 0x76, 0x6d, - 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6c, 0x6f, 0x6f, - 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, - 0x69, 0x70, 0x2e, 0x45, 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x52, 0x0b, 0x65, 0x76, 0x6d, 0x54, 0x6f, 0x45, 0x76, 0x6d, 0x4d, 0x73, 0x67, 0x12, 0x43, - 0x0a, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, - 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x52, 0x0e, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, - 0x61, 0x6d, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x64, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x78, 0x65, 0x63, 0x75, 0x74, 0x65, 0x64, 0x12, - 0x1c, 0x0a, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, - 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x12, 0x1b, 0x0a, - 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, - 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x78, - 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x78, 0x48, - 0x61, 0x73, 0x68, 0x22, 0xc8, 0x01, 0x0a, 0x12, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x6f, 0x6f, - 0x6c, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x24, 0x0a, 0x06, 0x74, 0x6f, - 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, - 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, - 0x12, 0x21, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x75, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x6c, 0x61, 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x73, 0x5f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, - 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, - 0x65, 0x64, 0x12, 0x28, 0x0a, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x18, 0x04, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, - 0x6e, 0x74, 0x52, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x04, - 0x72, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, - 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x04, 0x72, 0x61, 0x74, 0x65, 0x22, 0x49, - 0x0a, 0x0b, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, - 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, - 0x6b, 0x65, 0x6e, 0x12, 0x24, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, - 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, - 0x74, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x87, 0x02, 0x0a, 0x0f, 0x45, 0x78, - 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x54, 0x0a, - 0x13, 0x65, 0x76, 0x6d, 0x5f, 0x74, 0x6f, 0x5f, 0x65, 0x76, 0x6d, 0x5f, 0x6d, 0x65, 0x73, 0x73, - 0x61, 0x67, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6c, 0x6f, 0x6f, - 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, - 0x69, 0x70, 0x2e, 0x45, 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, - 0x65, 0x52, 0x10, 0x65, 0x76, 0x6d, 0x54, 0x6f, 0x45, 0x76, 0x6d, 0x4d, 0x65, 0x73, 0x73, 0x61, - 0x67, 0x65, 0x73, 0x12, 0x50, 0x0a, 0x13, 0x6f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, - 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, - 0x32, 0x20, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, - 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x44, 0x61, - 0x74, 0x61, 0x52, 0x11, 0x6f, 0x66, 0x66, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, - 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x18, - 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x06, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x12, 0x34, 0x0a, - 0x0f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x5f, 0x66, 0x6c, 0x61, 0x67, 0x5f, 0x62, 0x69, 0x74, 0x73, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, - 0x67, 0x49, 0x6e, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x46, 0x6c, 0x61, 0x67, 0x42, - 0x69, 0x74, 0x73, 0x22, 0x1f, 0x0a, 0x09, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x61, - 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x04, - 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x0a, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x72, 0x69, - 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, - 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x5e, 0x0a, 0x08, - 0x47, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2e, 0x0a, 0x13, 0x64, 0x65, 0x73, 0x74, - 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x11, 0x64, 0x65, 0x73, 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, - 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x22, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, - 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x42, 0x4f, 0x5a, 0x4d, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6d, 0x61, 0x72, 0x74, - 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6b, 0x69, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x69, - 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x6b, 0x67, - 0x2f, 0x6c, 0x6f, 0x6f, 0x70, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, - 0x62, 0x2f, 0x63, 0x63, 0x69, 0x70, 0x3b, 0x63, 0x63, 0x69, 0x70, 0x70, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x9e, 0x01, 0x0a, 0x06, 0x54, 0x78, 0x4d, 0x65, 0x74, 0x61, + 0x12, 0x3b, 0x0a, 0x1a, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, + 0x61, 0x6d, 0x70, 0x5f, 0x75, 0x6e, 0x69, 0x78, 0x5f, 0x6d, 0x69, 0x6c, 0x6c, 0x69, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x03, 0x52, 0x17, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x55, 0x6e, 0x69, 0x78, 0x4d, 0x69, 0x6c, 0x6c, 0x69, 0x12, 0x21, 0x0a, + 0x0c, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x04, 0x52, 0x0b, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, + 0x12, 0x17, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x74, 0x78, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67, + 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x6c, 0x6f, + 0x67, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x94, 0x04, 0x0a, 0x0e, 0x45, 0x56, 0x4d, 0x32, 0x45, + 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x65, 0x71, + 0x75, 0x65, 0x6e, 0x63, 0x65, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x04, 0x52, 0x0e, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x4e, 0x75, 0x6d, 0x62, + 0x65, 0x72, 0x12, 0x29, 0x0a, 0x09, 0x67, 0x61, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, + 0x49, 0x6e, 0x74, 0x52, 0x08, 0x67, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x14, 0x0a, + 0x05, 0x6e, 0x6f, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x6e, 0x6f, + 0x6e, 0x63, 0x65, 0x12, 0x1b, 0x0a, 0x09, 0x67, 0x61, 0x73, 0x5f, 0x70, 0x72, 0x69, 0x63, 0x65, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x67, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, + 0x12, 0x1d, 0x0a, 0x0a, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x05, + 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x64, 0x12, + 0x32, 0x0a, 0x15, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, + 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x04, 0x52, 0x13, + 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x53, 0x65, 0x6c, 0x65, 0x63, + 0x74, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, + 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x74, 0x72, 0x69, 0x63, + 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x73, 0x74, 0x72, 0x69, 0x63, 0x74, 0x12, + 0x1b, 0x0a, 0x09, 0x66, 0x65, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x0a, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x08, 0x66, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x36, 0x0a, 0x10, + 0x66, 0x65, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, + 0x67, 0x49, 0x6e, 0x74, 0x52, 0x0e, 0x66, 0x65, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x0c, 0x20, 0x01, + 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x12, 0x47, 0x0a, 0x0d, 0x74, 0x6f, 0x6b, 0x65, + 0x6e, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x73, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x0b, 0x32, + 0x22, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, + 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x52, 0x0c, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x73, 0x12, 0x2a, 0x0a, 0x11, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x74, 0x6f, 0x6b, 0x65, + 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0f, 0x73, 0x6f, + 0x75, 0x72, 0x63, 0x65, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x22, 0xa9, 0x02, + 0x0a, 0x26, 0x45, 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4f, 0x6e, 0x52, 0x61, 0x6d, 0x70, 0x43, + 0x43, 0x49, 0x50, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x65, 0x64, + 0x57, 0x69, 0x74, 0x68, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x4a, 0x0a, 0x0e, 0x65, 0x76, 0x6d, 0x5f, + 0x74, 0x6f, 0x5f, 0x65, 0x76, 0x6d, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x25, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x45, 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, + 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x0b, 0x65, 0x76, 0x6d, 0x54, 0x6f, 0x45, 0x76, + 0x6d, 0x4d, 0x73, 0x67, 0x12, 0x43, 0x0a, 0x0f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, + 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, + 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, + 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0e, 0x62, 0x6c, 0x6f, 0x63, 0x6b, + 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x65, 0x78, 0x65, + 0x63, 0x75, 0x74, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, 0x7a, + 0x65, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x6e, 0x61, 0x6c, 0x69, + 0x7a, 0x65, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x67, 0x5f, 0x69, 0x6e, 0x64, 0x65, 0x78, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x6c, 0x6f, 0x67, 0x49, 0x6e, 0x64, 0x65, 0x78, + 0x12, 0x17, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x06, 0x74, 0x78, 0x48, 0x61, 0x73, 0x68, 0x22, 0xc8, 0x01, 0x0a, 0x12, 0x54, 0x6f, + 0x6b, 0x65, 0x6e, 0x50, 0x6f, 0x6f, 0x6c, 0x52, 0x61, 0x74, 0x65, 0x4c, 0x69, 0x6d, 0x69, 0x74, + 0x12, 0x24, 0x0a, 0x06, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x06, + 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x21, 0x0a, 0x0c, 0x6c, 0x61, 0x73, 0x74, 0x5f, 0x75, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x6c, 0x61, + 0x73, 0x74, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x69, 0x73, 0x5f, + 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, + 0x73, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x64, 0x12, 0x28, 0x0a, 0x08, 0x63, 0x61, 0x70, 0x61, + 0x63, 0x69, 0x74, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, + 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x08, 0x63, 0x61, 0x70, 0x61, 0x63, 0x69, + 0x74, 0x79, 0x12, 0x20, 0x0a, 0x04, 0x72, 0x61, 0x74, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, + 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x04, + 0x72, 0x61, 0x74, 0x65, 0x22, 0x49, 0x0a, 0x0b, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x24, 0x0a, 0x06, 0x61, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, + 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, + 0x87, 0x02, 0x0a, 0x0f, 0x45, 0x78, 0x65, 0x63, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x70, + 0x6f, 0x72, 0x74, 0x12, 0x54, 0x0a, 0x13, 0x65, 0x76, 0x6d, 0x5f, 0x74, 0x6f, 0x5f, 0x65, 0x76, + 0x6d, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, + 0x32, 0x25, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x45, 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, + 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x10, 0x65, 0x76, 0x6d, 0x54, 0x6f, 0x45, 0x76, + 0x6d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x73, 0x12, 0x50, 0x0a, 0x13, 0x6f, 0x66, 0x66, + 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, + 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, + 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x54, + 0x6f, 0x6b, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x52, 0x11, 0x6f, 0x66, 0x66, 0x63, 0x68, 0x61, + 0x69, 0x6e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x70, + 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x06, 0x70, 0x72, 0x6f, + 0x6f, 0x66, 0x73, 0x12, 0x34, 0x0a, 0x0f, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x5f, 0x66, 0x6c, 0x61, + 0x67, 0x5f, 0x62, 0x69, 0x74, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x6c, + 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x0d, 0x70, 0x72, 0x6f, 0x6f, + 0x66, 0x46, 0x6c, 0x61, 0x67, 0x42, 0x69, 0x74, 0x73, 0x22, 0x1f, 0x0a, 0x09, 0x54, 0x6f, 0x6b, + 0x65, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x0c, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x46, 0x0a, 0x0a, 0x54, 0x6f, + 0x6b, 0x65, 0x6e, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, + 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x22, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, + 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x22, 0x5e, 0x0a, 0x08, 0x47, 0x61, 0x73, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x2e, + 0x0a, 0x13, 0x64, 0x65, 0x73, 0x74, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x73, 0x65, 0x6c, + 0x65, 0x63, 0x74, 0x6f, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x11, 0x64, 0x65, 0x73, + 0x74, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x12, 0x22, + 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, + 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x42, 0x69, 0x67, 0x49, 0x6e, 0x74, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, + 0x2f, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6b, 0x69, + 0x74, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x6c, 0x6f, 0x6f, 0x70, 0x2f, 0x69, 0x6e, 0x74, 0x65, + 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x62, 0x2f, 0x63, 0x63, 0x69, 0x70, 0x3b, 0x63, 0x63, 0x69, + 0x70, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pkg/loop/internal/pb/ccip/models.proto b/pkg/loop/internal/pb/ccip/models.proto index 6b7e32183..806132c5d 100644 --- a/pkg/loop/internal/pb/ccip/models.proto +++ b/pkg/loop/internal/pb/ccip/models.proto @@ -12,8 +12,8 @@ import "relayer.proto"; // TxMeta is a message that contains the metadata of a transaction. It is a gRPC adapter to // [github.com/smartcontractkit/chainlink-common/pkg/types/ccip.TxMeta] message TxMeta { - uint64 block_timestamp = 1; - uint64 block_height = 2; + int64 block_timestamp_unix_milli = 1; + uint64 block_number = 2; string tx_hash = 3; uint64 log_index = 4; } @@ -22,18 +22,19 @@ message TxMeta { message EVM2EVMMessage { uint64 sequence_number = 1; BigInt gas_limit = 2; - uint64 gas_price = 3; - bytes message_id = 4; // Hash [32]byte - uint64 source_chain_selector = 5; - string sender = 6; // Address - string receiver = 7; // Address - bool strict = 8; - string fee_token = 9; // Address - BigInt fee_token_amount = 10; - bytes data = 11; - repeated TokenAmount token_amounts = 12; - repeated bytes source_token_data = 13; - bytes hash = 14; // Hash [32]byte, computed from the message + uint64 nonce = 3; + uint64 gas_price = 4; + bytes message_id = 5; // Hash [32]byte + uint64 source_chain_selector = 6; + string sender = 7; // Address + string receiver = 8; // Address + bool strict = 9; + string fee_token = 10; // Address + BigInt fee_token_amount = 11; + bytes data = 12; + repeated TokenAmount token_amounts = 13; + repeated bytes source_token_data = 14; + // Note: we don't bother with the Hash field here in the gRPC because it's derived from the golang struct } // EVM2EVMOnRampCCIPSendRequestedWithMeta is a gRPC adapter to [github.com/smartcontractkit/chainlink-common/pkg/types/ccip.EVM2EVMOnRampCCIPSendRequestedWithMeta] diff --git a/pkg/loop/internal/pb/ccip/onramp.pb.go b/pkg/loop/internal/pb/ccip/onramp.pb.go index b294162b5..5aceba09c 100644 --- a/pkg/loop/internal/pb/ccip/onramp.pb.go +++ b/pkg/loop/internal/pb/ccip/onramp.pb.go @@ -21,9 +21,9 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// GetSendRequestBetweenSeqNumsRequest is a gRPC adapter for the input arguments of -// [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader.GetSendRequestBetweenSeqNums] -type GetSendRequestBetweenSeqNumsRequest struct { +// GetSendRequestsBetweenSeqNumsRequest is a gRPC adapter for the input arguments of +// [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader.GetSendRequestsBetweenSeqNums] +type GetSendRequestsBetweenSeqNumsRequest struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -33,8 +33,8 @@ type GetSendRequestBetweenSeqNumsRequest struct { Finalized bool `protobuf:"varint,3,opt,name=finalized,proto3" json:"finalized,omitempty"` } -func (x *GetSendRequestBetweenSeqNumsRequest) Reset() { - *x = GetSendRequestBetweenSeqNumsRequest{} +func (x *GetSendRequestsBetweenSeqNumsRequest) Reset() { + *x = GetSendRequestsBetweenSeqNumsRequest{} if protoimpl.UnsafeEnabled { mi := &file_onramp_proto_msgTypes[0] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -42,13 +42,13 @@ func (x *GetSendRequestBetweenSeqNumsRequest) Reset() { } } -func (x *GetSendRequestBetweenSeqNumsRequest) String() string { +func (x *GetSendRequestsBetweenSeqNumsRequest) String() string { return protoimpl.X.MessageStringOf(x) } -func (*GetSendRequestBetweenSeqNumsRequest) ProtoMessage() {} +func (*GetSendRequestsBetweenSeqNumsRequest) ProtoMessage() {} -func (x *GetSendRequestBetweenSeqNumsRequest) ProtoReflect() protoreflect.Message { +func (x *GetSendRequestsBetweenSeqNumsRequest) ProtoReflect() protoreflect.Message { mi := &file_onramp_proto_msgTypes[0] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -60,35 +60,35 @@ func (x *GetSendRequestBetweenSeqNumsRequest) ProtoReflect() protoreflect.Messag return mi.MessageOf(x) } -// Deprecated: Use GetSendRequestBetweenSeqNumsRequest.ProtoReflect.Descriptor instead. -func (*GetSendRequestBetweenSeqNumsRequest) Descriptor() ([]byte, []int) { +// Deprecated: Use GetSendRequestsBetweenSeqNumsRequest.ProtoReflect.Descriptor instead. +func (*GetSendRequestsBetweenSeqNumsRequest) Descriptor() ([]byte, []int) { return file_onramp_proto_rawDescGZIP(), []int{0} } -func (x *GetSendRequestBetweenSeqNumsRequest) GetSeqNumMin() uint64 { +func (x *GetSendRequestsBetweenSeqNumsRequest) GetSeqNumMin() uint64 { if x != nil { return x.SeqNumMin } return 0 } -func (x *GetSendRequestBetweenSeqNumsRequest) GetSeqNumMax() uint64 { +func (x *GetSendRequestsBetweenSeqNumsRequest) GetSeqNumMax() uint64 { if x != nil { return x.SeqNumMax } return 0 } -func (x *GetSendRequestBetweenSeqNumsRequest) GetFinalized() bool { +func (x *GetSendRequestsBetweenSeqNumsRequest) GetFinalized() bool { if x != nil { return x.Finalized } return false } -// GetSendRequestBetweenSeqNumsResponse is a gRPC adapter for the output arguments of -// [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader.GetSendRequestBetweenSeqNums] -type GetSendRequestBetweenSeqNumsResponse struct { +// GetSendRequestsBetweenSeqNumsResponse is a gRPC adapter for the output arguments of +// [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader.GetSendRequestsBetweenSeqNums] +type GetSendRequestsBetweenSeqNumsResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields @@ -98,8 +98,8 @@ type GetSendRequestBetweenSeqNumsResponse struct { SendRequests []*EVM2EVMMessageWithTxMeta `protobuf:"bytes,1,rep,name=send_requests,json=sendRequests,proto3" json:"send_requests,omitempty"` } -func (x *GetSendRequestBetweenSeqNumsResponse) Reset() { - *x = GetSendRequestBetweenSeqNumsResponse{} +func (x *GetSendRequestsBetweenSeqNumsResponse) Reset() { + *x = GetSendRequestsBetweenSeqNumsResponse{} if protoimpl.UnsafeEnabled { mi := &file_onramp_proto_msgTypes[1] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -107,13 +107,13 @@ func (x *GetSendRequestBetweenSeqNumsResponse) Reset() { } } -func (x *GetSendRequestBetweenSeqNumsResponse) String() string { +func (x *GetSendRequestsBetweenSeqNumsResponse) String() string { return protoimpl.X.MessageStringOf(x) } -func (*GetSendRequestBetweenSeqNumsResponse) ProtoMessage() {} +func (*GetSendRequestsBetweenSeqNumsResponse) ProtoMessage() {} -func (x *GetSendRequestBetweenSeqNumsResponse) ProtoReflect() protoreflect.Message { +func (x *GetSendRequestsBetweenSeqNumsResponse) ProtoReflect() protoreflect.Message { mi := &file_onramp_proto_msgTypes[1] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) @@ -125,12 +125,12 @@ func (x *GetSendRequestBetweenSeqNumsResponse) ProtoReflect() protoreflect.Messa return mi.MessageOf(x) } -// Deprecated: Use GetSendRequestBetweenSeqNumsResponse.ProtoReflect.Descriptor instead. -func (*GetSendRequestBetweenSeqNumsResponse) Descriptor() ([]byte, []int) { +// Deprecated: Use GetSendRequestsBetweenSeqNumsResponse.ProtoReflect.Descriptor instead. +func (*GetSendRequestsBetweenSeqNumsResponse) Descriptor() ([]byte, []int) { return file_onramp_proto_rawDescGZIP(), []int{1} } -func (x *GetSendRequestBetweenSeqNumsResponse) GetSendRequests() []*EVM2EVMMessageWithTxMeta { +func (x *GetSendRequestsBetweenSeqNumsResponse) GetSendRequests() []*EVM2EVMMessageWithTxMeta { if x != nil { return x.SendRequests } @@ -292,15 +292,15 @@ type OnRampDynamicConfig struct { unknownFields protoimpl.UnknownFields Router string `protobuf:"bytes,1,opt,name=router,proto3" json:"router,omitempty"` // Address - MaxNumberOfTokenPerMsg uint32 `protobuf:"varint,2,opt,name=max_number_of_token_per_msg,json=maxNumberOfTokenPerMsg,proto3" json:"max_number_of_token_per_msg,omitempty"` + MaxNumberOfTokensPerMsg uint32 `protobuf:"varint,2,opt,name=max_number_of_tokens_per_msg,json=maxNumberOfTokensPerMsg,proto3" json:"max_number_of_tokens_per_msg,omitempty"` DestGasOverhead uint32 `protobuf:"varint,3,opt,name=dest_gas_overhead,json=destGasOverhead,proto3" json:"dest_gas_overhead,omitempty"` DestGasPerByte uint32 `protobuf:"varint,4,opt,name=dest_gas_per_byte,json=destGasPerByte,proto3" json:"dest_gas_per_byte,omitempty"` DestDataAvailabilityOverheadGas uint32 `protobuf:"varint,5,opt,name=dest_data_availability_overhead_gas,json=destDataAvailabilityOverheadGas,proto3" json:"dest_data_availability_overhead_gas,omitempty"` - DestDataAvailabilityGasPerByte uint32 `protobuf:"varint,6,opt,name=dest_data_availability_gas_per_byte,json=destDataAvailabilityGasPerByte,proto3" json:"dest_data_availability_gas_per_byte,omitempty"` + DestGasPerDataAvailabilityByte uint32 `protobuf:"varint,6,opt,name=dest_gas_per_data_availability_byte,json=destGasPerDataAvailabilityByte,proto3" json:"dest_gas_per_data_availability_byte,omitempty"` DestDataAvailabilityMultiplierBps uint32 `protobuf:"varint,7,opt,name=dest_data_availability_multiplier_bps,json=destDataAvailabilityMultiplierBps,proto3" json:"dest_data_availability_multiplier_bps,omitempty"` PriceRegistry string `protobuf:"bytes,8,opt,name=price_registry,json=priceRegistry,proto3" json:"price_registry,omitempty"` // Address MaxDataBytes uint32 `protobuf:"varint,9,opt,name=max_data_bytes,json=maxDataBytes,proto3" json:"max_data_bytes,omitempty"` - MaxPerMsgGasLimite uint32 `protobuf:"varint,10,opt,name=max_per_msg_gas_limite,json=maxPerMsgGasLimite,proto3" json:"max_per_msg_gas_limite,omitempty"` + MaxPerMsgGasLimit uint32 `protobuf:"varint,10,opt,name=max_per_msg_gas_limit,json=maxPerMsgGasLimit,proto3" json:"max_per_msg_gas_limit,omitempty"` } func (x *OnRampDynamicConfig) Reset() { @@ -342,9 +342,9 @@ func (x *OnRampDynamicConfig) GetRouter() string { return "" } -func (x *OnRampDynamicConfig) GetMaxNumberOfTokenPerMsg() uint32 { +func (x *OnRampDynamicConfig) GetMaxNumberOfTokensPerMsg() uint32 { if x != nil { - return x.MaxNumberOfTokenPerMsg + return x.MaxNumberOfTokensPerMsg } return 0 } @@ -370,9 +370,9 @@ func (x *OnRampDynamicConfig) GetDestDataAvailabilityOverheadGas() uint32 { return 0 } -func (x *OnRampDynamicConfig) GetDestDataAvailabilityGasPerByte() uint32 { +func (x *OnRampDynamicConfig) GetDestGasPerDataAvailabilityByte() uint32 { if x != nil { - return x.DestDataAvailabilityGasPerByte + return x.DestGasPerDataAvailabilityByte } return 0 } @@ -398,9 +398,9 @@ func (x *OnRampDynamicConfig) GetMaxDataBytes() uint32 { return 0 } -func (x *OnRampDynamicConfig) GetMaxPerMsgGasLimite() uint32 { +func (x *OnRampDynamicConfig) GetMaxPerMsgGasLimit() uint32 { if x != nil { - return x.MaxPerMsgGasLimite + return x.MaxPerMsgGasLimit } return 0 } @@ -470,114 +470,115 @@ var file_onramp_proto_rawDesc = []byte{ 0x2e, 0x63, 0x63, 0x69, 0x70, 0x1a, 0x1b, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x65, 0x6d, 0x70, 0x74, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x0c, 0x6d, 0x6f, 0x64, 0x65, 0x6c, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0x83, 0x01, 0x0a, 0x23, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x53, 0x65, 0x71, 0x4e, 0x75, 0x6d, - 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0b, 0x73, 0x65, 0x71, 0x5f, - 0x6e, 0x75, 0x6d, 0x5f, 0x6d, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x73, - 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x4d, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0b, 0x73, 0x65, 0x71, 0x5f, - 0x6e, 0x75, 0x6d, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x73, - 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x4d, 0x61, 0x78, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x69, 0x6e, 0x61, - 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, 0x6e, - 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x22, 0x7c, 0x0a, 0x24, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, - 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x53, - 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x54, - 0x0a, 0x0d, 0x73, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x18, - 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, - 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x45, 0x56, - 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x57, 0x69, 0x74, 0x68, - 0x54, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0c, 0x73, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x73, 0x22, 0x3e, 0x0a, 0x15, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x41, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x25, 0x0a, - 0x0e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x41, 0x64, 0x64, - 0x72, 0x65, 0x73, 0x73, 0x22, 0x31, 0x0a, 0x15, 0x4f, 0x6e, 0x72, 0x61, 0x6d, 0x70, 0x41, 0x64, - 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x18, 0x0a, - 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x6d, 0x0a, 0x18, 0x47, 0x65, 0x74, 0x44, 0x79, - 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, - 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x0e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x5f, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x6c, 0x6f, - 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, - 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x6e, 0x52, 0x61, 0x6d, 0x70, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, - 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, - 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xaf, 0x04, 0x0a, 0x13, 0x4f, 0x6e, 0x52, 0x61, 0x6d, - 0x70, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, - 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x3b, 0x0a, 0x1b, 0x6d, 0x61, 0x78, 0x5f, 0x6e, 0x75, - 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x6f, 0x66, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x70, 0x65, - 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x16, 0x6d, 0x61, 0x78, - 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x4f, 0x66, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x65, 0x72, - 0x4d, 0x73, 0x67, 0x12, 0x2a, 0x0a, 0x11, 0x64, 0x65, 0x73, 0x74, 0x5f, 0x67, 0x61, 0x73, 0x5f, - 0x6f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0f, - 0x64, 0x65, 0x73, 0x74, 0x47, 0x61, 0x73, 0x4f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x12, - 0x29, 0x0a, 0x11, 0x64, 0x65, 0x73, 0x74, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, - 0x62, 0x79, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, 0x64, 0x65, 0x73, 0x74, - 0x47, 0x61, 0x73, 0x50, 0x65, 0x72, 0x42, 0x79, 0x74, 0x65, 0x12, 0x4c, 0x0a, 0x23, 0x64, 0x65, - 0x73, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, - 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x5f, 0x67, 0x61, - 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1f, 0x64, 0x65, 0x73, 0x74, 0x44, 0x61, 0x74, - 0x61, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x4f, 0x76, 0x65, - 0x72, 0x68, 0x65, 0x61, 0x64, 0x47, 0x61, 0x73, 0x12, 0x4b, 0x0a, 0x23, 0x64, 0x65, 0x73, 0x74, - 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, - 0x74, 0x79, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x18, - 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1e, 0x64, 0x65, 0x73, 0x74, 0x44, 0x61, 0x74, 0x61, 0x41, - 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x47, 0x61, 0x73, 0x50, 0x65, - 0x72, 0x42, 0x79, 0x74, 0x65, 0x12, 0x50, 0x0a, 0x25, 0x64, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x61, - 0x74, 0x61, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, - 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x69, 0x65, 0x72, 0x5f, 0x62, 0x70, 0x73, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x21, 0x64, 0x65, 0x73, 0x74, 0x44, 0x61, 0x74, 0x61, 0x41, 0x76, - 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x70, - 0x6c, 0x69, 0x65, 0x72, 0x42, 0x70, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x70, 0x72, 0x69, 0x63, 0x65, - 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0d, 0x70, 0x72, 0x69, 0x63, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x12, 0x24, - 0x0a, 0x0e, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x73, - 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x44, 0x61, 0x74, 0x61, 0x42, - 0x79, 0x74, 0x65, 0x73, 0x12, 0x32, 0x0a, 0x16, 0x6d, 0x61, 0x78, 0x5f, 0x70, 0x65, 0x72, 0x5f, - 0x6d, 0x73, 0x67, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x18, 0x0a, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x12, 0x6d, 0x61, 0x78, 0x50, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x47, - 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x65, 0x22, 0x93, 0x01, 0x0a, 0x18, 0x45, 0x56, 0x4d, - 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x57, 0x69, 0x74, 0x68, 0x54, - 0x78, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x3f, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x45, - 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, 0x07, 0x6d, - 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x6d, 0x65, 0x74, - 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, + 0x22, 0x84, 0x01, 0x0a, 0x24, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x73, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x53, 0x65, 0x71, 0x4e, 0x75, + 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0b, 0x73, 0x65, 0x71, + 0x5f, 0x6e, 0x75, 0x6d, 0x5f, 0x6d, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, + 0x73, 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x4d, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0b, 0x73, 0x65, 0x71, + 0x5f, 0x6e, 0x75, 0x6d, 0x5f, 0x6d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, + 0x73, 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x4d, 0x61, 0x78, 0x12, 0x1c, 0x0a, 0x09, 0x66, 0x69, 0x6e, + 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x66, 0x69, + 0x6e, 0x61, 0x6c, 0x69, 0x7a, 0x65, 0x64, 0x22, 0x7d, 0x0a, 0x25, 0x47, 0x65, 0x74, 0x53, 0x65, + 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, + 0x6e, 0x53, 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x12, 0x54, 0x0a, 0x0d, 0x73, 0x65, 0x6e, 0x64, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, - 0x54, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x06, 0x74, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x32, 0xb5, - 0x03, 0x0a, 0x0c, 0x4f, 0x6e, 0x52, 0x61, 0x6d, 0x70, 0x52, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, - 0x99, 0x01, 0x0a, 0x1c, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, - 0x73, 0x74, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x53, 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x73, - 0x12, 0x3a, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, + 0x45, 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x57, 0x69, + 0x74, 0x68, 0x54, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0c, 0x73, 0x65, 0x6e, 0x64, 0x52, 0x65, + 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x22, 0x3e, 0x0a, 0x15, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, + 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x25, 0x0a, 0x0e, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x41, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x31, 0x0a, 0x15, 0x4f, 0x6e, 0x72, 0x61, 0x6d, 0x70, + 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, + 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x22, 0x6d, 0x0a, 0x18, 0x47, 0x65, 0x74, + 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x51, 0x0a, 0x0e, 0x64, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, + 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, + 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, + 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x6e, 0x52, 0x61, 0x6d, 0x70, 0x44, 0x79, 0x6e, 0x61, + 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x0d, 0x64, 0x79, 0x6e, 0x61, 0x6d, + 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xaf, 0x04, 0x0a, 0x13, 0x4f, 0x6e, 0x52, + 0x61, 0x6d, 0x70, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x12, 0x16, 0x0a, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x06, 0x72, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x12, 0x3d, 0x0a, 0x1c, 0x6d, 0x61, 0x78, 0x5f, + 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x6f, 0x66, 0x5f, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x73, + 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x17, + 0x6d, 0x61, 0x78, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x4f, 0x66, 0x54, 0x6f, 0x6b, 0x65, 0x6e, + 0x73, 0x50, 0x65, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x2a, 0x0a, 0x11, 0x64, 0x65, 0x73, 0x74, 0x5f, + 0x67, 0x61, 0x73, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x0d, 0x52, 0x0f, 0x64, 0x65, 0x73, 0x74, 0x47, 0x61, 0x73, 0x4f, 0x76, 0x65, 0x72, 0x68, + 0x65, 0x61, 0x64, 0x12, 0x29, 0x0a, 0x11, 0x64, 0x65, 0x73, 0x74, 0x5f, 0x67, 0x61, 0x73, 0x5f, + 0x70, 0x65, 0x72, 0x5f, 0x62, 0x79, 0x74, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0e, + 0x64, 0x65, 0x73, 0x74, 0x47, 0x61, 0x73, 0x50, 0x65, 0x72, 0x42, 0x79, 0x74, 0x65, 0x12, 0x4c, + 0x0a, 0x23, 0x64, 0x65, 0x73, 0x74, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x61, 0x76, 0x61, 0x69, + 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x6f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, + 0x64, 0x5f, 0x67, 0x61, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1f, 0x64, 0x65, 0x73, + 0x74, 0x44, 0x61, 0x74, 0x61, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x79, 0x4f, 0x76, 0x65, 0x72, 0x68, 0x65, 0x61, 0x64, 0x47, 0x61, 0x73, 0x12, 0x4b, 0x0a, 0x23, + 0x64, 0x65, 0x73, 0x74, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x64, 0x61, 0x74, + 0x61, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5f, 0x62, + 0x79, 0x74, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x1e, 0x64, 0x65, 0x73, 0x74, 0x47, + 0x61, 0x73, 0x50, 0x65, 0x72, 0x44, 0x61, 0x74, 0x61, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, + 0x69, 0x6c, 0x69, 0x74, 0x79, 0x42, 0x79, 0x74, 0x65, 0x12, 0x50, 0x0a, 0x25, 0x64, 0x65, 0x73, + 0x74, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x5f, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x69, 0x65, 0x72, 0x5f, 0x62, + 0x70, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x21, 0x64, 0x65, 0x73, 0x74, 0x44, 0x61, + 0x74, 0x61, 0x41, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x4d, 0x75, + 0x6c, 0x74, 0x69, 0x70, 0x6c, 0x69, 0x65, 0x72, 0x42, 0x70, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x70, + 0x72, 0x69, 0x63, 0x65, 0x5f, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x72, 0x79, 0x18, 0x08, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x0d, 0x70, 0x72, 0x69, 0x63, 0x65, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, + 0x72, 0x79, 0x12, 0x24, 0x0a, 0x0e, 0x6d, 0x61, 0x78, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5f, 0x62, + 0x79, 0x74, 0x65, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x44, + 0x61, 0x74, 0x61, 0x42, 0x79, 0x74, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x15, 0x6d, 0x61, 0x78, 0x5f, + 0x70, 0x65, 0x72, 0x5f, 0x6d, 0x73, 0x67, 0x5f, 0x67, 0x61, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, + 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x11, 0x6d, 0x61, 0x78, 0x50, 0x65, 0x72, 0x4d, + 0x73, 0x67, 0x47, 0x61, 0x73, 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x22, 0x93, 0x01, 0x0a, 0x18, 0x45, + 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x57, 0x69, 0x74, + 0x68, 0x54, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x3f, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, + 0x67, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, + 0x2e, 0x45, 0x56, 0x4d, 0x32, 0x45, 0x56, 0x4d, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x52, + 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x12, 0x36, 0x0a, 0x07, 0x74, 0x78, 0x5f, 0x6d, + 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, + 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, + 0x70, 0x2e, 0x54, 0x78, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x06, 0x74, 0x78, 0x4d, 0x65, 0x74, 0x61, + 0x32, 0xb8, 0x03, 0x0a, 0x0c, 0x4f, 0x6e, 0x52, 0x61, 0x6d, 0x70, 0x52, 0x65, 0x61, 0x64, 0x65, + 0x72, 0x12, 0x9c, 0x01, 0x0a, 0x1d, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, + 0x75, 0x65, 0x73, 0x74, 0x73, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x53, 0x65, 0x71, 0x4e, + 0x75, 0x6d, 0x73, 0x12, 0x3b, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, + 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x53, + 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x42, 0x65, 0x74, 0x77, 0x65, + 0x65, 0x6e, 0x53, 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, + 0x1a, 0x3c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x53, 0x65, - 0x71, 0x4e, 0x75, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x3b, 0x2e, 0x6c, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x73, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x53, + 0x65, 0x71, 0x4e, 0x75, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, + 0x12, 0x57, 0x0a, 0x0d, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, + 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, + 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, + 0x70, 0x2e, 0x52, 0x6f, 0x75, 0x74, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x51, 0x0a, 0x07, 0x41, 0x64, 0x64, + 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, - 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x65, 0x6e, 0x64, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x42, 0x65, 0x74, 0x77, 0x65, 0x65, 0x6e, 0x53, 0x65, 0x71, 0x4e, 0x75, 0x6d, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x57, 0x0a, 0x0d, 0x52, - 0x6f, 0x75, 0x74, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x16, 0x2e, 0x67, - 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, - 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x52, 0x6f, 0x75, - 0x74, 0x65, 0x72, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x00, 0x12, 0x51, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, - 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2c, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, - 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, - 0x4f, 0x6e, 0x72, 0x61, 0x6d, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x44, 0x79, - 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x2e, 0x67, 0x6f, - 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x45, 0x6d, - 0x70, 0x74, 0x79, 0x1a, 0x2f, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, 0x69, 0x6e, 0x74, 0x65, 0x72, - 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, 0x2e, 0x47, 0x65, 0x74, 0x44, - 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x4f, 0x5a, 0x4d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, - 0x63, 0x74, 0x6b, 0x69, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x6c, 0x69, 0x6e, 0x6b, 0x2d, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x6c, 0x6f, 0x6f, 0x70, 0x2f, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x62, 0x2f, 0x63, 0x63, 0x69, 0x70, - 0x3b, 0x63, 0x63, 0x69, 0x70, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x63, 0x69, 0x70, 0x2e, 0x4f, 0x6e, 0x72, 0x61, 0x6d, 0x70, 0x41, 0x64, 0x64, 0x72, 0x65, + 0x73, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x12, 0x5d, 0x0a, 0x10, + 0x47, 0x65, 0x74, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x12, 0x16, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, + 0x75, 0x66, 0x2e, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x1a, 0x2f, 0x2e, 0x6c, 0x6f, 0x6f, 0x70, 0x2e, + 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2e, 0x70, 0x62, 0x2e, 0x63, 0x63, 0x69, 0x70, + 0x2e, 0x47, 0x65, 0x74, 0x44, 0x79, 0x6e, 0x61, 0x6d, 0x69, 0x63, 0x43, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x00, 0x42, 0x4f, 0x5a, 0x4d, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x73, 0x6d, 0x61, 0x72, 0x74, 0x63, + 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x6b, 0x69, 0x74, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, + 0x6c, 0x69, 0x6e, 0x6b, 0x2d, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x6b, 0x67, 0x2f, + 0x6c, 0x6f, 0x6f, 0x70, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x70, 0x62, + 0x2f, 0x63, 0x63, 0x69, 0x70, 0x3b, 0x63, 0x63, 0x69, 0x70, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -594,27 +595,27 @@ func file_onramp_proto_rawDescGZIP() []byte { var file_onramp_proto_msgTypes = make([]protoimpl.MessageInfo, 7) var file_onramp_proto_goTypes = []interface{}{ - (*GetSendRequestBetweenSeqNumsRequest)(nil), // 0: loop.internal.pb.ccip.GetSendRequestBetweenSeqNumsRequest - (*GetSendRequestBetweenSeqNumsResponse)(nil), // 1: loop.internal.pb.ccip.GetSendRequestBetweenSeqNumsResponse - (*RouterAddressResponse)(nil), // 2: loop.internal.pb.ccip.RouterAddressResponse - (*OnrampAddressResponse)(nil), // 3: loop.internal.pb.ccip.OnrampAddressResponse - (*GetDynamicConfigResponse)(nil), // 4: loop.internal.pb.ccip.GetDynamicConfigResponse - (*OnRampDynamicConfig)(nil), // 5: loop.internal.pb.ccip.OnRampDynamicConfig - (*EVM2EVMMessageWithTxMeta)(nil), // 6: loop.internal.pb.ccip.EVM2EVMMessageWithTxMeta - (*EVM2EVMMessage)(nil), // 7: loop.internal.pb.ccip.EVM2EVMMessage - (*TxMeta)(nil), // 8: loop.internal.pb.ccip.TxMeta - (*emptypb.Empty)(nil), // 9: google.protobuf.Empty + (*GetSendRequestsBetweenSeqNumsRequest)(nil), // 0: loop.internal.pb.ccip.GetSendRequestsBetweenSeqNumsRequest + (*GetSendRequestsBetweenSeqNumsResponse)(nil), // 1: loop.internal.pb.ccip.GetSendRequestsBetweenSeqNumsResponse + (*RouterAddressResponse)(nil), // 2: loop.internal.pb.ccip.RouterAddressResponse + (*OnrampAddressResponse)(nil), // 3: loop.internal.pb.ccip.OnrampAddressResponse + (*GetDynamicConfigResponse)(nil), // 4: loop.internal.pb.ccip.GetDynamicConfigResponse + (*OnRampDynamicConfig)(nil), // 5: loop.internal.pb.ccip.OnRampDynamicConfig + (*EVM2EVMMessageWithTxMeta)(nil), // 6: loop.internal.pb.ccip.EVM2EVMMessageWithTxMeta + (*EVM2EVMMessage)(nil), // 7: loop.internal.pb.ccip.EVM2EVMMessage + (*TxMeta)(nil), // 8: loop.internal.pb.ccip.TxMeta + (*emptypb.Empty)(nil), // 9: google.protobuf.Empty } var file_onramp_proto_depIdxs = []int32{ - 6, // 0: loop.internal.pb.ccip.GetSendRequestBetweenSeqNumsResponse.send_requests:type_name -> loop.internal.pb.ccip.EVM2EVMMessageWithTxMeta + 6, // 0: loop.internal.pb.ccip.GetSendRequestsBetweenSeqNumsResponse.send_requests:type_name -> loop.internal.pb.ccip.EVM2EVMMessageWithTxMeta 5, // 1: loop.internal.pb.ccip.GetDynamicConfigResponse.dynamic_config:type_name -> loop.internal.pb.ccip.OnRampDynamicConfig 7, // 2: loop.internal.pb.ccip.EVM2EVMMessageWithTxMeta.message:type_name -> loop.internal.pb.ccip.EVM2EVMMessage 8, // 3: loop.internal.pb.ccip.EVM2EVMMessageWithTxMeta.tx_meta:type_name -> loop.internal.pb.ccip.TxMeta - 0, // 4: loop.internal.pb.ccip.OnRampReader.GetSendRequestBetweenSeqNums:input_type -> loop.internal.pb.ccip.GetSendRequestBetweenSeqNumsRequest + 0, // 4: loop.internal.pb.ccip.OnRampReader.GetSendRequestsBetweenSeqNums:input_type -> loop.internal.pb.ccip.GetSendRequestsBetweenSeqNumsRequest 9, // 5: loop.internal.pb.ccip.OnRampReader.RouterAddress:input_type -> google.protobuf.Empty 9, // 6: loop.internal.pb.ccip.OnRampReader.Address:input_type -> google.protobuf.Empty 9, // 7: loop.internal.pb.ccip.OnRampReader.GetDynamicConfig:input_type -> google.protobuf.Empty - 1, // 8: loop.internal.pb.ccip.OnRampReader.GetSendRequestBetweenSeqNums:output_type -> loop.internal.pb.ccip.GetSendRequestBetweenSeqNumsResponse + 1, // 8: loop.internal.pb.ccip.OnRampReader.GetSendRequestsBetweenSeqNums:output_type -> loop.internal.pb.ccip.GetSendRequestsBetweenSeqNumsResponse 2, // 9: loop.internal.pb.ccip.OnRampReader.RouterAddress:output_type -> loop.internal.pb.ccip.RouterAddressResponse 3, // 10: loop.internal.pb.ccip.OnRampReader.Address:output_type -> loop.internal.pb.ccip.OnrampAddressResponse 4, // 11: loop.internal.pb.ccip.OnRampReader.GetDynamicConfig:output_type -> loop.internal.pb.ccip.GetDynamicConfigResponse @@ -633,7 +634,7 @@ func file_onramp_proto_init() { file_models_proto_init() if !protoimpl.UnsafeEnabled { file_onramp_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetSendRequestBetweenSeqNumsRequest); i { + switch v := v.(*GetSendRequestsBetweenSeqNumsRequest); i { case 0: return &v.state case 1: @@ -645,7 +646,7 @@ func file_onramp_proto_init() { } } file_onramp_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*GetSendRequestBetweenSeqNumsResponse); i { + switch v := v.(*GetSendRequestsBetweenSeqNumsResponse); i { case 0: return &v.state case 1: diff --git a/pkg/loop/internal/pb/ccip/onramp.proto b/pkg/loop/internal/pb/ccip/onramp.proto index 91add3dd7..7a19dd4ce 100644 --- a/pkg/loop/internal/pb/ccip/onramp.proto +++ b/pkg/loop/internal/pb/ccip/onramp.proto @@ -9,23 +9,23 @@ import "models.proto"; // OnRampReader is a gRPC service adapter for the interface // [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader] service OnRampReader { - rpc GetSendRequestBetweenSeqNums(GetSendRequestBetweenSeqNumsRequest) returns (GetSendRequestBetweenSeqNumsResponse) {} + rpc GetSendRequestsBetweenSeqNums(GetSendRequestsBetweenSeqNumsRequest) returns (GetSendRequestsBetweenSeqNumsResponse) {} rpc RouterAddress(google.protobuf.Empty) returns (RouterAddressResponse) {} rpc Address(google.protobuf.Empty) returns (OnrampAddressResponse) {} rpc GetDynamicConfig(google.protobuf.Empty) returns (GetDynamicConfigResponse) {} } -// GetSendRequestBetweenSeqNumsRequest is a gRPC adapter for the input arguments of -// [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader.GetSendRequestBetweenSeqNums] -message GetSendRequestBetweenSeqNumsRequest { +// GetSendRequestsBetweenSeqNumsRequest is a gRPC adapter for the input arguments of +// [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader.GetSendRequestsBetweenSeqNums] +message GetSendRequestsBetweenSeqNumsRequest { uint64 seq_num_min = 1; uint64 seq_num_max = 2; bool finalized = 3; } -// GetSendRequestBetweenSeqNumsResponse is a gRPC adapter for the output arguments of -// [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader.GetSendRequestBetweenSeqNums] -message GetSendRequestBetweenSeqNumsResponse { +// GetSendRequestsBetweenSeqNumsResponse is a gRPC adapter for the output arguments of +// [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampReader.GetSendRequestsBetweenSeqNums] +message GetSendRequestsBetweenSeqNumsResponse { // Note, the content here maybe better modeled as a oneof when CCIP supports // multiple types of messages/chains repeated EVM2EVMMessageWithTxMeta send_requests = 1; @@ -53,15 +53,15 @@ message GetDynamicConfigResponse { // [github.com/smartcontractkit/chainlink-common/pkg/types/OnRampDynamicConfig] message OnRampDynamicConfig { string router = 1; // Address - uint32 max_number_of_token_per_msg = 2; + uint32 max_number_of_tokens_per_msg = 2; uint32 dest_gas_overhead = 3; uint32 dest_gas_per_byte = 4; uint32 dest_data_availability_overhead_gas = 5; - uint32 dest_data_availability_gas_per_byte = 6; + uint32 dest_gas_per_data_availability_byte = 6; uint32 dest_data_availability_multiplier_bps = 7; string price_registry = 8; // Address uint32 max_data_bytes = 9; - uint32 max_per_msg_gas_limite = 10; + uint32 max_per_msg_gas_limit = 10; } // EVM2EVMMessageWithTxMeta is a gRPC adapter for the struct diff --git a/pkg/loop/internal/pb/ccip/onramp_grpc.pb.go b/pkg/loop/internal/pb/ccip/onramp_grpc.pb.go index b7e938c32..69da943de 100644 --- a/pkg/loop/internal/pb/ccip/onramp_grpc.pb.go +++ b/pkg/loop/internal/pb/ccip/onramp_grpc.pb.go @@ -20,17 +20,17 @@ import ( const _ = grpc.SupportPackageIsVersion7 const ( - OnRampReader_GetSendRequestBetweenSeqNums_FullMethodName = "/loop.internal.pb.ccip.OnRampReader/GetSendRequestBetweenSeqNums" - OnRampReader_RouterAddress_FullMethodName = "/loop.internal.pb.ccip.OnRampReader/RouterAddress" - OnRampReader_Address_FullMethodName = "/loop.internal.pb.ccip.OnRampReader/Address" - OnRampReader_GetDynamicConfig_FullMethodName = "/loop.internal.pb.ccip.OnRampReader/GetDynamicConfig" + OnRampReader_GetSendRequestsBetweenSeqNums_FullMethodName = "/loop.internal.pb.ccip.OnRampReader/GetSendRequestsBetweenSeqNums" + OnRampReader_RouterAddress_FullMethodName = "/loop.internal.pb.ccip.OnRampReader/RouterAddress" + OnRampReader_Address_FullMethodName = "/loop.internal.pb.ccip.OnRampReader/Address" + OnRampReader_GetDynamicConfig_FullMethodName = "/loop.internal.pb.ccip.OnRampReader/GetDynamicConfig" ) // OnRampReaderClient is the client API for OnRampReader service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type OnRampReaderClient interface { - GetSendRequestBetweenSeqNums(ctx context.Context, in *GetSendRequestBetweenSeqNumsRequest, opts ...grpc.CallOption) (*GetSendRequestBetweenSeqNumsResponse, error) + GetSendRequestsBetweenSeqNums(ctx context.Context, in *GetSendRequestsBetweenSeqNumsRequest, opts ...grpc.CallOption) (*GetSendRequestsBetweenSeqNumsResponse, error) RouterAddress(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*RouterAddressResponse, error) Address(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*OnrampAddressResponse, error) GetDynamicConfig(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GetDynamicConfigResponse, error) @@ -44,9 +44,9 @@ func NewOnRampReaderClient(cc grpc.ClientConnInterface) OnRampReaderClient { return &onRampReaderClient{cc} } -func (c *onRampReaderClient) GetSendRequestBetweenSeqNums(ctx context.Context, in *GetSendRequestBetweenSeqNumsRequest, opts ...grpc.CallOption) (*GetSendRequestBetweenSeqNumsResponse, error) { - out := new(GetSendRequestBetweenSeqNumsResponse) - err := c.cc.Invoke(ctx, OnRampReader_GetSendRequestBetweenSeqNums_FullMethodName, in, out, opts...) +func (c *onRampReaderClient) GetSendRequestsBetweenSeqNums(ctx context.Context, in *GetSendRequestsBetweenSeqNumsRequest, opts ...grpc.CallOption) (*GetSendRequestsBetweenSeqNumsResponse, error) { + out := new(GetSendRequestsBetweenSeqNumsResponse) + err := c.cc.Invoke(ctx, OnRampReader_GetSendRequestsBetweenSeqNums_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -84,7 +84,7 @@ func (c *onRampReaderClient) GetDynamicConfig(ctx context.Context, in *emptypb.E // All implementations must embed UnimplementedOnRampReaderServer // for forward compatibility type OnRampReaderServer interface { - GetSendRequestBetweenSeqNums(context.Context, *GetSendRequestBetweenSeqNumsRequest) (*GetSendRequestBetweenSeqNumsResponse, error) + GetSendRequestsBetweenSeqNums(context.Context, *GetSendRequestsBetweenSeqNumsRequest) (*GetSendRequestsBetweenSeqNumsResponse, error) RouterAddress(context.Context, *emptypb.Empty) (*RouterAddressResponse, error) Address(context.Context, *emptypb.Empty) (*OnrampAddressResponse, error) GetDynamicConfig(context.Context, *emptypb.Empty) (*GetDynamicConfigResponse, error) @@ -95,8 +95,8 @@ type OnRampReaderServer interface { type UnimplementedOnRampReaderServer struct { } -func (UnimplementedOnRampReaderServer) GetSendRequestBetweenSeqNums(context.Context, *GetSendRequestBetweenSeqNumsRequest) (*GetSendRequestBetweenSeqNumsResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method GetSendRequestBetweenSeqNums not implemented") +func (UnimplementedOnRampReaderServer) GetSendRequestsBetweenSeqNums(context.Context, *GetSendRequestsBetweenSeqNumsRequest) (*GetSendRequestsBetweenSeqNumsResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method GetSendRequestsBetweenSeqNums not implemented") } func (UnimplementedOnRampReaderServer) RouterAddress(context.Context, *emptypb.Empty) (*RouterAddressResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RouterAddress not implemented") @@ -120,20 +120,20 @@ func RegisterOnRampReaderServer(s grpc.ServiceRegistrar, srv OnRampReaderServer) s.RegisterService(&OnRampReader_ServiceDesc, srv) } -func _OnRampReader_GetSendRequestBetweenSeqNums_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(GetSendRequestBetweenSeqNumsRequest) +func _OnRampReader_GetSendRequestsBetweenSeqNums_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(GetSendRequestsBetweenSeqNumsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(OnRampReaderServer).GetSendRequestBetweenSeqNums(ctx, in) + return srv.(OnRampReaderServer).GetSendRequestsBetweenSeqNums(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: OnRampReader_GetSendRequestBetweenSeqNums_FullMethodName, + FullMethod: OnRampReader_GetSendRequestsBetweenSeqNums_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(OnRampReaderServer).GetSendRequestBetweenSeqNums(ctx, req.(*GetSendRequestBetweenSeqNumsRequest)) + return srv.(OnRampReaderServer).GetSendRequestsBetweenSeqNums(ctx, req.(*GetSendRequestsBetweenSeqNumsRequest)) } return interceptor(ctx, in, info, handler) } @@ -200,8 +200,8 @@ var OnRampReader_ServiceDesc = grpc.ServiceDesc{ HandlerType: (*OnRampReaderServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "GetSendRequestBetweenSeqNums", - Handler: _OnRampReader_GetSendRequestBetweenSeqNums_Handler, + MethodName: "GetSendRequestsBetweenSeqNums", + Handler: _OnRampReader_GetSendRequestsBetweenSeqNums_Handler, }, { MethodName: "RouterAddress",