diff --git a/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto b/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto index c6981563c5..88ca547482 100644 --- a/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto +++ b/proto/zetachain/zetacore/crosschain/cross_chain_tx.proto @@ -17,7 +17,7 @@ enum CctxStatus { Reverted = 5; // inbound reverted. Aborted = 6; // inbound tx error or invalid paramters and cannot revert; just abort. - // But the amount can be refunded to zetachain using and admin proposal + // But the amount can be refunded to zetachain using and admin proposal } enum TxFinalizationStatus { @@ -28,7 +28,7 @@ enum TxFinalizationStatus { } message InboundParams { string sender = 1; // this address is the immediate contract/EOA that calls - // the Connector.send() + // the Connector.send() int64 sender_chain_id = 2; string tx_origin = 3; // this address is the EOA that signs the inbound tx pkg.coin.CoinType coin_type = 4; @@ -65,7 +65,7 @@ message OutboundParams { uint64 tss_nonce = 5; uint64 gas_limit = 6; string gas_price = 7; - string gas_priority_fee = 13; + string gas_priority_fee = 23; // the above are commands for zetaclients // the following fields are used when the outbound tx is mined string hash = 8; @@ -79,6 +79,9 @@ message OutboundParams { uint64 effective_gas_limit = 22; string tss_pubkey = 11; TxFinalizationStatus tx_finalization_status = 12; + + // not used. do not edit. + reserved 13 to 19; } message Status { diff --git a/x/crosschain/types/cross_chain_tx.pb.go b/x/crosschain/types/cross_chain_tx.pb.go index 8c70830a27..5817c7b709 100644 --- a/x/crosschain/types/cross_chain_tx.pb.go +++ b/x/crosschain/types/cross_chain_tx.pb.go @@ -255,7 +255,7 @@ type OutboundParams struct { TssNonce uint64 `protobuf:"varint,5,opt,name=tss_nonce,json=tssNonce,proto3" json:"tss_nonce,omitempty"` GasLimit uint64 `protobuf:"varint,6,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"` GasPrice string `protobuf:"bytes,7,opt,name=gas_price,json=gasPrice,proto3" json:"gas_price,omitempty"` - GasPriorityFee string `protobuf:"bytes,13,opt,name=gas_priority_fee,json=gasPriorityFee,proto3" json:"gas_priority_fee,omitempty"` + GasPriorityFee string `protobuf:"bytes,23,opt,name=gas_priority_fee,json=gasPriorityFee,proto3" json:"gas_priority_fee,omitempty"` // the above are commands for zetaclients // the following fields are used when the outbound tx is mined Hash string `protobuf:"bytes,8,opt,name=hash,proto3" json:"hash,omitempty"` @@ -567,76 +567,76 @@ func init() { } var fileDescriptor_d4c1966807fb5cb2 = []byte{ - // 1093 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x6e, 0x1b, 0x37, - 0x10, 0xd6, 0x46, 0x8a, 0x2c, 0x8d, 0x7e, 0x43, 0x2b, 0xc6, 0xd6, 0x45, 0x14, 0x57, 0x45, 0x1c, - 0x25, 0xa8, 0x25, 0xc4, 0xb9, 0x14, 0xbd, 0xd9, 0x46, 0x9c, 0x18, 0x69, 0x12, 0x63, 0x63, 0xf7, - 0x90, 0x43, 0xb7, 0xd4, 0xee, 0x68, 0x45, 0x58, 0x5a, 0xaa, 0x4b, 0xca, 0x58, 0x05, 0x7d, 0x83, - 0x5e, 0xfa, 0x10, 0x3d, 0xf4, 0xd8, 0x27, 0xe8, 0x39, 0xb7, 0xe6, 0x58, 0xf4, 0x60, 0x14, 0xf6, - 0x1b, 0xf4, 0x09, 0x0a, 0x92, 0xbb, 0x92, 0x65, 0x18, 0x76, 0x9a, 0xf6, 0xa4, 0xf9, 0x21, 0xbf, - 0x19, 0x0d, 0xbf, 0x8f, 0x5c, 0xd8, 0x7c, 0x8b, 0x92, 0x7a, 0x03, 0xca, 0xc2, 0xae, 0xb6, 0x78, - 0x84, 0x5d, 0x2f, 0xe2, 0x42, 0x98, 0x98, 0x36, 0x5d, 0x6d, 0xbb, 0x32, 0xee, 0x8c, 0x23, 0x2e, - 0x39, 0xb9, 0x33, 0xdb, 0xd3, 0x49, 0xf7, 0x74, 0xe6, 0x7b, 0x56, 0x1b, 0x01, 0x0f, 0xb8, 0x5e, - 0xd9, 0x55, 0x96, 0xd9, 0xb4, 0xba, 0x7e, 0x49, 0xa1, 0xf1, 0x51, 0xd0, 0xf5, 0xb8, 0x2a, 0xc3, - 0x59, 0x68, 0xd6, 0xb5, 0x7e, 0xcd, 0x41, 0x65, 0x2f, 0xec, 0xf1, 0x49, 0xe8, 0xef, 0xd3, 0x88, - 0x8e, 0x04, 0x59, 0x81, 0xbc, 0xc0, 0xd0, 0xc7, 0xc8, 0xb6, 0xd6, 0xac, 0x76, 0xd1, 0x49, 0x3c, - 0xb2, 0x0e, 0x35, 0x63, 0x25, 0xfd, 0x31, 0xdf, 0xbe, 0xb1, 0x66, 0xb5, 0xb3, 0x4e, 0xc5, 0x84, - 0x77, 0x54, 0x74, 0xcf, 0x27, 0x9f, 0x42, 0x51, 0xc6, 0x2e, 0x8f, 0x58, 0xc0, 0x42, 0x3b, 0xab, - 0x21, 0x0a, 0x32, 0x7e, 0xa5, 0x7d, 0xb2, 0x0d, 0x45, 0x55, 0xdc, 0x95, 0xd3, 0x31, 0xda, 0xb9, - 0x35, 0xab, 0x5d, 0xdd, 0xbc, 0xd7, 0xb9, 0xe4, 0xff, 0x8d, 0x8f, 0x82, 0x8e, 0xee, 0x72, 0x87, - 0xb3, 0xf0, 0x60, 0x3a, 0x46, 0xa7, 0xe0, 0x25, 0x16, 0x69, 0xc0, 0x4d, 0x2a, 0x04, 0x4a, 0xfb, - 0xa6, 0x06, 0x37, 0x0e, 0x79, 0x0a, 0x79, 0x3a, 0xe2, 0x93, 0x50, 0xda, 0x79, 0x15, 0xde, 0xee, - 0xbe, 0x3b, 0xb9, 0x9b, 0xf9, 0xf3, 0xe4, 0xee, 0xfd, 0x80, 0xc9, 0xc1, 0xa4, 0xd7, 0xf1, 0xf8, - 0xa8, 0xeb, 0x71, 0x31, 0xe2, 0x22, 0xf9, 0xd9, 0x10, 0xfe, 0x51, 0x57, 0xf5, 0x21, 0x3a, 0x87, - 0x2c, 0x94, 0x4e, 0xb2, 0x9d, 0x7c, 0x0e, 0x15, 0xde, 0x13, 0x18, 0x1d, 0xa3, 0xef, 0x0e, 0xa8, - 0x18, 0xd8, 0x4b, 0xba, 0x4c, 0x39, 0x0d, 0x3e, 0xa3, 0x62, 0x40, 0xbe, 0x04, 0x7b, 0xb6, 0x08, - 0x63, 0x89, 0x51, 0x48, 0x87, 0xee, 0x00, 0x59, 0x30, 0x90, 0x76, 0x61, 0xcd, 0x6a, 0xe7, 0x9c, - 0x95, 0x34, 0xff, 0x24, 0x49, 0x3f, 0xd3, 0x59, 0xf2, 0x19, 0x94, 0x7b, 0x74, 0x38, 0xe4, 0xd2, - 0x65, 0xa1, 0x8f, 0xb1, 0x5d, 0xd4, 0xe8, 0x25, 0x13, 0xdb, 0x53, 0x21, 0xb2, 0x09, 0xb7, 0xfb, - 0x2c, 0xa4, 0x43, 0xf6, 0x16, 0x7d, 0x57, 0x8d, 0x24, 0x45, 0x06, 0x8d, 0xbc, 0x3c, 0x4b, 0xbe, - 0x41, 0x49, 0x13, 0x58, 0x06, 0x2b, 0x32, 0x76, 0x93, 0x0c, 0x95, 0x8c, 0x87, 0xae, 0x90, 0x54, - 0x4e, 0x84, 0x5d, 0xd2, 0x53, 0x7e, 0xdc, 0xb9, 0x92, 0x45, 0x9d, 0x83, 0x78, 0xf7, 0xdc, 0xde, - 0xd7, 0x7a, 0xab, 0xd3, 0x90, 0x97, 0x44, 0x5b, 0xdf, 0x43, 0x55, 0x15, 0xde, 0xf2, 0x3c, 0x35, - 0x2f, 0x16, 0x06, 0xc4, 0x85, 0x65, 0xda, 0xe3, 0x91, 0x4c, 0xdb, 0x4d, 0x0e, 0xc2, 0xfa, 0xb8, - 0x83, 0xb8, 0x95, 0x60, 0xe9, 0x22, 0x1a, 0xa9, 0xf5, 0x63, 0x1e, 0xaa, 0xaf, 0x26, 0xf2, 0x3c, - 0x4d, 0x57, 0xa1, 0x10, 0xa1, 0x87, 0xec, 0x78, 0x46, 0xd4, 0x99, 0x4f, 0x1e, 0x40, 0x3d, 0xb5, - 0x0d, 0x59, 0xf7, 0x52, 0xae, 0xd6, 0xd2, 0x78, 0xca, 0xd6, 0x05, 0x42, 0x66, 0x3f, 0x8e, 0x90, - 0x73, 0xea, 0xe5, 0xfe, 0x1b, 0xf5, 0x94, 0x74, 0x84, 0x70, 0x43, 0x1e, 0x7a, 0xa8, 0xd9, 0x9d, - 0x73, 0x0a, 0x52, 0x88, 0x97, 0xca, 0x57, 0xc9, 0x80, 0x0a, 0x77, 0xc8, 0x46, 0xcc, 0x70, 0x3c, - 0xe7, 0x14, 0x02, 0x2a, 0xbe, 0x56, 0x7e, 0x9a, 0x1c, 0x47, 0xcc, 0xc3, 0x84, 0xb0, 0x2a, 0xb9, - 0xaf, 0x7c, 0xd2, 0x86, 0x7a, 0x92, 0xe4, 0x11, 0x93, 0x53, 0xb7, 0x8f, 0x68, 0x57, 0xf4, 0x9a, - 0xaa, 0x59, 0xa3, 0xc3, 0xbb, 0x88, 0x84, 0x40, 0x4e, 0x53, 0xbe, 0xa0, 0xb3, 0xda, 0xfe, 0x10, - 0xc2, 0x5e, 0xa5, 0x06, 0xb8, 0x52, 0x0d, 0x9f, 0x80, 0x6a, 0xd3, 0x9d, 0x08, 0xf4, 0xed, 0x86, - 0x5e, 0xb9, 0x14, 0x50, 0x71, 0x28, 0xd0, 0x27, 0xdf, 0xc2, 0x32, 0xf6, 0xfb, 0xe8, 0x49, 0x76, - 0x8c, 0xee, 0xfc, 0xcf, 0xdd, 0xd6, 0x23, 0xee, 0x24, 0x23, 0x5e, 0xff, 0x80, 0x11, 0xef, 0x29, - 0x4e, 0xcd, 0xa0, 0x9e, 0xa6, 0x53, 0xe9, 0x5c, 0xc4, 0x37, 0x93, 0x5d, 0xd1, 0x5d, 0x2c, 0xac, - 0x37, 0x23, 0xbe, 0x03, 0xa0, 0x0e, 0x67, 0x3c, 0xe9, 0x1d, 0xe1, 0x54, 0xab, 0xaa, 0xe8, 0xa8, - 0xe3, 0xda, 0xd7, 0x81, 0x2b, 0x04, 0x58, 0xfe, 0xbf, 0x05, 0xf8, 0xbb, 0x05, 0x79, 0x63, 0x92, - 0x2d, 0xc8, 0x27, 0x55, 0x2c, 0x5d, 0xe5, 0xc1, 0x35, 0x55, 0x76, 0x3c, 0x19, 0x27, 0xd8, 0xc9, - 0x46, 0x72, 0x0f, 0xaa, 0xc6, 0x72, 0x47, 0x28, 0x04, 0x0d, 0x50, 0x4b, 0xa5, 0xe8, 0x54, 0x4c, - 0xf4, 0x85, 0x09, 0x92, 0x47, 0xd0, 0x18, 0x52, 0x21, 0x0f, 0xc7, 0x3e, 0x95, 0xe8, 0x4a, 0x36, - 0x42, 0x21, 0xe9, 0x68, 0xac, 0x35, 0x93, 0x75, 0x96, 0xe7, 0xb9, 0x83, 0x34, 0x45, 0xda, 0x50, - 0x63, 0x62, 0x4b, 0x89, 0xd9, 0xc1, 0xfe, 0x24, 0xf4, 0xd1, 0xd7, 0x02, 0x29, 0x38, 0x17, 0xc3, - 0xad, 0xdf, 0xb2, 0x50, 0xde, 0x51, 0x5d, 0x6a, 0x59, 0x1e, 0xc4, 0xc4, 0x86, 0x25, 0x2f, 0x42, - 0x2a, 0x79, 0x2a, 0xee, 0xd4, 0x55, 0xb7, 0xbf, 0xe1, 0xa1, 0xe9, 0xd2, 0x38, 0xe4, 0x3b, 0x28, - 0xea, 0x9b, 0xa7, 0x8f, 0x28, 0xcc, 0xbb, 0xb0, 0xbd, 0xf3, 0x2f, 0x55, 0xf8, 0xf7, 0xc9, 0xdd, - 0xfa, 0x94, 0x8e, 0x86, 0x5f, 0xb5, 0x66, 0x48, 0x2d, 0xa7, 0xa0, 0xec, 0x5d, 0x44, 0x41, 0xee, - 0x43, 0x2d, 0xc2, 0x21, 0x9d, 0xa2, 0x3f, 0x9b, 0x53, 0xde, 0x68, 0x28, 0x09, 0xa7, 0x83, 0xda, - 0x85, 0x92, 0xe7, 0xc9, 0x38, 0x3d, 0x7d, 0x25, 0xa5, 0xd2, 0xe5, 0x77, 0xca, 0xb9, 0x73, 0x49, - 0xce, 0x04, 0xbc, 0xd9, 0xf9, 0x90, 0xd7, 0x50, 0x65, 0xe6, 0x61, 0x76, 0xc7, 0xfa, 0xca, 0xd3, - 0xca, 0x2b, 0x6d, 0x7e, 0x71, 0x0d, 0xd4, 0xc2, 0x6b, 0xee, 0x54, 0xd8, 0xc2, 0xe3, 0xfe, 0x0d, - 0xd4, 0x78, 0x72, 0x8f, 0xa6, 0xa8, 0xb0, 0x96, 0x6d, 0x97, 0x36, 0x37, 0xae, 0x41, 0x5d, 0xbc, - 0x7d, 0x9d, 0x2a, 0x5f, 0xf0, 0x1f, 0xfe, 0x00, 0x30, 0xa7, 0x16, 0x21, 0x50, 0xdd, 0xc7, 0xd0, - 0x67, 0x61, 0x90, 0x34, 0x53, 0xcf, 0x90, 0x65, 0xa8, 0x25, 0xb1, 0x14, 0xaa, 0x6e, 0x91, 0x5b, - 0x50, 0x49, 0xbd, 0x17, 0x2c, 0x44, 0xbf, 0x9e, 0x55, 0xa1, 0x64, 0x9d, 0x83, 0xc7, 0x18, 0xc9, - 0x7a, 0x8e, 0x94, 0xa1, 0x60, 0x6c, 0xf4, 0xeb, 0x37, 0x49, 0x09, 0x96, 0xb6, 0xcc, 0x03, 0x51, - 0xcf, 0xaf, 0xe6, 0x7e, 0xf9, 0xb9, 0x69, 0x3d, 0x7c, 0x0e, 0x8d, 0xcb, 0xe4, 0x43, 0xea, 0x50, - 0x7e, 0xc9, 0xe5, 0x6e, 0xfa, 0x5c, 0xd6, 0x33, 0xa4, 0x02, 0xc5, 0xb9, 0x6b, 0x29, 0xe4, 0x27, - 0x31, 0x7a, 0x13, 0x05, 0x76, 0xc3, 0x80, 0x6d, 0x3f, 0x7f, 0x77, 0xda, 0xb4, 0xde, 0x9f, 0x36, - 0xad, 0xbf, 0x4e, 0x9b, 0xd6, 0x4f, 0x67, 0xcd, 0xcc, 0xfb, 0xb3, 0x66, 0xe6, 0x8f, 0xb3, 0x66, - 0xe6, 0xcd, 0xa3, 0x73, 0x4c, 0x52, 0x33, 0xda, 0xb8, 0xf0, 0x7d, 0x15, 0x9f, 0xff, 0x94, 0xd3, - 0xc4, 0xea, 0xe5, 0xf5, 0x57, 0xd6, 0xe3, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xa0, 0x2f, - 0xa4, 0xf8, 0x09, 0x00, 0x00, + // 1100 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xcd, 0x72, 0x13, 0x47, + 0x10, 0xd6, 0x22, 0x21, 0x4b, 0xad, 0xbf, 0x65, 0x2c, 0x9c, 0x8d, 0x53, 0x08, 0x47, 0x29, 0x40, + 0x50, 0x41, 0x2a, 0xcc, 0x25, 0x95, 0x9b, 0xed, 0xc2, 0xe0, 0x10, 0xc0, 0xb5, 0x98, 0x1c, 0x38, + 0x64, 0x33, 0xda, 0x6d, 0xad, 0xa6, 0x2c, 0xed, 0x28, 0x3b, 0x23, 0xd7, 0x8a, 0xca, 0x43, 0x24, + 0xef, 0x90, 0x43, 0x8e, 0x79, 0x82, 0x9c, 0xb9, 0x85, 0x63, 0x2a, 0x07, 0x2a, 0x85, 0xdf, 0x20, + 0x4f, 0x90, 0x9a, 0x99, 0x5d, 0xc9, 0x72, 0xb9, 0x6c, 0x42, 0x72, 0x52, 0xf7, 0xd7, 0x33, 0x5f, + 0xb7, 0x7a, 0xbe, 0x9e, 0x59, 0xd8, 0x7c, 0x85, 0x92, 0xfa, 0x43, 0xca, 0xa2, 0x9e, 0xb6, 0x78, + 0x8c, 0x3d, 0x3f, 0xe6, 0x42, 0x18, 0x4c, 0x9b, 0x9e, 0xb6, 0x3d, 0x99, 0x74, 0x27, 0x31, 0x97, + 0x9c, 0x5c, 0x9b, 0xef, 0xe9, 0x66, 0x7b, 0xba, 0x8b, 0x3d, 0xeb, 0xcd, 0x90, 0x87, 0x5c, 0xaf, + 0xec, 0x29, 0xcb, 0x6c, 0x5a, 0xbf, 0x79, 0x46, 0xa2, 0xc9, 0x61, 0xd8, 0xf3, 0xb9, 0x4a, 0xc3, + 0x59, 0x64, 0xd6, 0xb5, 0x7f, 0x2d, 0x40, 0x6d, 0x2f, 0xea, 0xf3, 0x69, 0x14, 0xec, 0xd3, 0x98, + 0x8e, 0x05, 0x59, 0x83, 0xa2, 0xc0, 0x28, 0xc0, 0xd8, 0xb1, 0x36, 0xac, 0x4e, 0xd9, 0x4d, 0x3d, + 0x72, 0x13, 0x1a, 0xc6, 0x4a, 0xeb, 0x63, 0x81, 0x73, 0x69, 0xc3, 0xea, 0xe4, 0xdd, 0x9a, 0x81, + 0x77, 0x14, 0xba, 0x17, 0x90, 0x4f, 0xa0, 0x2c, 0x13, 0x8f, 0xc7, 0x2c, 0x64, 0x91, 0x93, 0xd7, + 0x14, 0x25, 0x99, 0x3c, 0xd3, 0x3e, 0xd9, 0x86, 0xb2, 0x4a, 0xee, 0xc9, 0xd9, 0x04, 0x9d, 0xc2, + 0x86, 0xd5, 0xa9, 0x6f, 0xde, 0xe8, 0x9e, 0xf1, 0xff, 0x26, 0x87, 0x61, 0x57, 0x57, 0xb9, 0xc3, + 0x59, 0x74, 0x30, 0x9b, 0xa0, 0x5b, 0xf2, 0x53, 0x8b, 0x34, 0xe1, 0x32, 0x15, 0x02, 0xa5, 0x73, + 0x59, 0x93, 0x1b, 0x87, 0x3c, 0x84, 0x22, 0x1d, 0xf3, 0x69, 0x24, 0x9d, 0xa2, 0x82, 0xb7, 0x7b, + 0xaf, 0xdf, 0x5e, 0xcf, 0xfd, 0xf9, 0xf6, 0xfa, 0xad, 0x90, 0xc9, 0xe1, 0xb4, 0xdf, 0xf5, 0xf9, + 0xb8, 0xe7, 0x73, 0x31, 0xe6, 0x22, 0xfd, 0xb9, 0x2b, 0x82, 0xc3, 0x9e, 0xaa, 0x43, 0x74, 0x5f, + 0xb0, 0x48, 0xba, 0xe9, 0x76, 0xf2, 0x19, 0xd4, 0x78, 0x5f, 0x60, 0x7c, 0x84, 0x81, 0x37, 0xa4, + 0x62, 0xe8, 0xac, 0xe8, 0x34, 0xd5, 0x0c, 0x7c, 0x44, 0xc5, 0x90, 0x7c, 0x01, 0xce, 0x7c, 0x11, + 0x26, 0x12, 0xe3, 0x88, 0x8e, 0xbc, 0x21, 0xb2, 0x70, 0x28, 0x9d, 0xd2, 0x86, 0xd5, 0x29, 0xb8, + 0x6b, 0x59, 0xfc, 0x41, 0x1a, 0x7e, 0xa4, 0xa3, 0xe4, 0x53, 0xa8, 0xf6, 0xe9, 0x68, 0xc4, 0xa5, + 0xc7, 0xa2, 0x00, 0x13, 0xa7, 0xac, 0xd9, 0x2b, 0x06, 0xdb, 0x53, 0x10, 0xd9, 0x84, 0xab, 0x03, + 0x16, 0xd1, 0x11, 0x7b, 0x85, 0x81, 0xa7, 0x5a, 0x92, 0x31, 0x83, 0x66, 0x5e, 0x9d, 0x07, 0x5f, + 0xa2, 0xa4, 0x29, 0x2d, 0x83, 0x35, 0x99, 0x78, 0x69, 0x84, 0x4a, 0xc6, 0x23, 0x4f, 0x48, 0x2a, + 0xa7, 0xc2, 0xa9, 0xe8, 0x2e, 0xdf, 0xef, 0x9e, 0xab, 0xa2, 0xee, 0x41, 0xb2, 0x7b, 0x62, 0xef, + 0x73, 0xbd, 0xd5, 0x6d, 0xca, 0x33, 0xd0, 0xf6, 0xf7, 0x50, 0x57, 0x89, 0xb7, 0x7c, 0x5f, 0xf5, + 0x8b, 0x45, 0x21, 0xf1, 0x60, 0x95, 0xf6, 0x79, 0x2c, 0xb3, 0x72, 0xd3, 0x83, 0xb0, 0x3e, 0xec, + 0x20, 0xae, 0xa4, 0x5c, 0x3a, 0x89, 0x66, 0x6a, 0xff, 0x54, 0x84, 0xfa, 0xb3, 0xa9, 0x3c, 0x29, + 0xd3, 0x75, 0x28, 0xc5, 0xe8, 0x23, 0x3b, 0x9a, 0x0b, 0x75, 0xee, 0x93, 0xdb, 0x60, 0x67, 0xb6, + 0x11, 0xeb, 0x5e, 0xa6, 0xd5, 0x46, 0x86, 0x67, 0x6a, 0x5d, 0x12, 0x64, 0xfe, 0xc3, 0x04, 0xb9, + 0x90, 0x5e, 0xe1, 0xbf, 0x49, 0x4f, 0x8d, 0x8e, 0x10, 0x5e, 0xc4, 0x23, 0x1f, 0xb5, 0xba, 0x0b, + 0x6e, 0x49, 0x0a, 0xf1, 0x54, 0xf9, 0x2a, 0x18, 0x52, 0xe1, 0x8d, 0xd8, 0x98, 0x19, 0x8d, 0x17, + 0xdc, 0x52, 0x48, 0xc5, 0xd7, 0xca, 0xcf, 0x82, 0x93, 0x98, 0xf9, 0x98, 0x0a, 0x56, 0x05, 0xf7, + 0x95, 0x4f, 0x3a, 0x60, 0xa7, 0x41, 0x1e, 0x33, 0x39, 0xf3, 0x06, 0x88, 0xce, 0x47, 0x7a, 0x4d, + 0xdd, 0xac, 0xd1, 0xf0, 0x2e, 0x22, 0x21, 0x50, 0xd0, 0x92, 0x2f, 0xe9, 0xa8, 0xb6, 0xdf, 0x47, + 0xb0, 0xe7, 0x4d, 0x03, 0x9c, 0x3b, 0x0d, 0x1f, 0x83, 0x2a, 0xd3, 0x9b, 0x0a, 0x0c, 0x9c, 0xa6, + 0x5e, 0xb9, 0x12, 0x52, 0xf1, 0x42, 0x60, 0x40, 0xbe, 0x85, 0x55, 0x1c, 0x0c, 0xd0, 0x97, 0xec, + 0x08, 0xbd, 0xc5, 0x9f, 0xbb, 0xaa, 0x5b, 0xdc, 0x4d, 0x5b, 0x7c, 0xf3, 0x3d, 0x5a, 0xbc, 0xa7, + 0x34, 0x35, 0xa7, 0x7a, 0x98, 0x75, 0xa5, 0x7b, 0x9a, 0xdf, 0x74, 0x76, 0x4d, 0x57, 0xb1, 0xb4, + 0xde, 0xb4, 0xf8, 0x1a, 0x80, 0x3a, 0x9c, 0xc9, 0xb4, 0x7f, 0x88, 0x33, 0x3d, 0x55, 0x65, 0x57, + 0x1d, 0xd7, 0xbe, 0x06, 0xce, 0x19, 0xc0, 0xea, 0xff, 0x3c, 0x80, 0x5f, 0x15, 0x4a, 0x35, 0xbb, + 0xd9, 0xfe, 0xdd, 0x82, 0xa2, 0x01, 0xc8, 0x16, 0x14, 0xd3, 0x5c, 0x96, 0xce, 0x75, 0xfb, 0x82, + 0x5c, 0x3b, 0xbe, 0x4c, 0xd2, 0x0c, 0xe9, 0x46, 0x72, 0x03, 0xea, 0xc6, 0xf2, 0xc6, 0x28, 0x04, + 0x0d, 0x51, 0x0f, 0x4c, 0xd9, 0xad, 0x19, 0xf4, 0x89, 0x01, 0xc9, 0x3d, 0x68, 0x8e, 0xa8, 0x90, + 0x2f, 0x26, 0x01, 0x95, 0xe8, 0x49, 0x36, 0x46, 0x21, 0xe9, 0x78, 0xa2, 0x27, 0x27, 0xef, 0xae, + 0x2e, 0x62, 0x07, 0x59, 0x88, 0x74, 0xa0, 0xc1, 0xc4, 0x96, 0x1a, 0x69, 0x17, 0x07, 0xd3, 0x28, + 0xc0, 0x40, 0x8f, 0x49, 0xc9, 0x3d, 0x0d, 0xb7, 0x7f, 0xcb, 0x43, 0x75, 0x47, 0x55, 0xa9, 0x87, + 0xf3, 0x20, 0x21, 0x0e, 0xac, 0xf8, 0x31, 0x52, 0xc9, 0xb3, 0x11, 0xcf, 0x5c, 0xf5, 0x06, 0x18, + 0x35, 0x9a, 0x2a, 0x8d, 0x43, 0xbe, 0x83, 0xb2, 0xbe, 0x7f, 0x06, 0x88, 0xc2, 0xbc, 0x0e, 0xdb, + 0x3b, 0xff, 0x72, 0x16, 0xff, 0x7e, 0x7b, 0xdd, 0x9e, 0xd1, 0xf1, 0xe8, 0xcb, 0xf6, 0x9c, 0xa9, + 0xed, 0x96, 0x94, 0xbd, 0x8b, 0x28, 0xc8, 0x2d, 0x68, 0xc4, 0x38, 0xa2, 0x33, 0x0c, 0xe6, 0x7d, + 0x2a, 0x9a, 0x49, 0x4a, 0xe1, 0xac, 0x51, 0xbb, 0x50, 0xf1, 0x7d, 0x99, 0x64, 0x1a, 0x50, 0x03, + 0x55, 0x39, 0xfb, 0x66, 0x39, 0x71, 0x2e, 0xe9, 0x99, 0x80, 0x3f, 0x3f, 0x1f, 0xf2, 0x1c, 0xea, + 0xcc, 0x3c, 0xcf, 0xde, 0x44, 0x5f, 0x7c, 0x7a, 0xfe, 0x2a, 0x9b, 0x9f, 0x5f, 0x40, 0xb5, 0xf4, + 0xa6, 0xbb, 0x35, 0xb6, 0xf4, 0xc4, 0x7f, 0x03, 0x0d, 0x9e, 0xde, 0xa6, 0x19, 0x2b, 0x6c, 0xe4, + 0x3b, 0x95, 0xcd, 0xbb, 0x17, 0xb0, 0x2e, 0xdf, 0xc1, 0x6e, 0x9d, 0x2f, 0xf9, 0x77, 0x7e, 0x00, + 0x58, 0x48, 0x8b, 0x10, 0xa8, 0xef, 0x63, 0x14, 0xb0, 0x28, 0x4c, 0x8b, 0xb1, 0x73, 0x64, 0x15, + 0x1a, 0x29, 0x96, 0x51, 0xd9, 0x16, 0xb9, 0x02, 0xb5, 0xcc, 0x7b, 0xc2, 0x22, 0x0c, 0xec, 0xbc, + 0x82, 0xd2, 0x75, 0x2e, 0x1e, 0x61, 0x2c, 0xed, 0x02, 0xa9, 0x42, 0xc9, 0xd8, 0x18, 0xd8, 0x97, + 0x49, 0x05, 0x56, 0xb6, 0xcc, 0x33, 0x61, 0x17, 0xd7, 0x0b, 0xbf, 0xfc, 0xdc, 0xb2, 0xee, 0x3c, + 0x86, 0xe6, 0x59, 0x43, 0x44, 0x6c, 0xa8, 0x3e, 0xe5, 0x72, 0x37, 0x7b, 0x34, 0xed, 0x1c, 0xa9, + 0x41, 0x79, 0xe1, 0x5a, 0x8a, 0xf9, 0x41, 0x82, 0xfe, 0x54, 0x91, 0x5d, 0x32, 0x64, 0xdb, 0x8f, + 0x5f, 0xbf, 0x6b, 0x59, 0x6f, 0xde, 0xb5, 0xac, 0xbf, 0xde, 0xb5, 0xac, 0x1f, 0x8f, 0x5b, 0xb9, + 0x37, 0xc7, 0xad, 0xdc, 0x1f, 0xc7, 0xad, 0xdc, 0xcb, 0x7b, 0x27, 0x94, 0xa4, 0x7a, 0x74, 0xf7, + 0xd4, 0x57, 0x56, 0x72, 0xf2, 0x83, 0x4e, 0x0b, 0xab, 0x5f, 0xd4, 0xdf, 0x5a, 0xf7, 0xff, 0x09, + 0x00, 0x00, 0xff, 0xff, 0xea, 0x6a, 0x48, 0x57, 0xfe, 0x09, 0x00, 0x00, } func (m *InboundParams) Marshal() (dAtA []byte, err error) { @@ -785,6 +785,15 @@ func (m *OutboundParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.GasPriorityFee) > 0 { + i -= len(m.GasPriorityFee) + copy(dAtA[i:], m.GasPriorityFee) + i = encodeVarintCrossChainTx(dAtA, i, uint64(len(m.GasPriorityFee))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xba + } if m.EffectiveGasLimit != 0 { i = encodeVarintCrossChainTx(dAtA, i, uint64(m.EffectiveGasLimit)) i-- @@ -811,13 +820,6 @@ func (m *OutboundParams) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0xa0 } - if len(m.GasPriorityFee) > 0 { - i -= len(m.GasPriorityFee) - copy(dAtA[i:], m.GasPriorityFee) - i = encodeVarintCrossChainTx(dAtA, i, uint64(len(m.GasPriorityFee))) - i-- - dAtA[i] = 0x6a - } if m.TxFinalizationStatus != 0 { i = encodeVarintCrossChainTx(dAtA, i, uint64(m.TxFinalizationStatus)) i-- @@ -1152,10 +1154,6 @@ func (m *OutboundParams) Size() (n int) { if m.TxFinalizationStatus != 0 { n += 1 + sovCrossChainTx(uint64(m.TxFinalizationStatus)) } - l = len(m.GasPriorityFee) - if l > 0 { - n += 1 + l + sovCrossChainTx(uint64(l)) - } if m.GasUsed != 0 { n += 2 + sovCrossChainTx(uint64(m.GasUsed)) } @@ -1164,6 +1162,10 @@ func (m *OutboundParams) Size() (n int) { if m.EffectiveGasLimit != 0 { n += 2 + sovCrossChainTx(uint64(m.EffectiveGasLimit)) } + l = len(m.GasPriorityFee) + if l > 0 { + n += 2 + l + sovCrossChainTx(uint64(l)) + } return n } @@ -1992,9 +1994,28 @@ func (m *OutboundParams) Unmarshal(dAtA []byte) error { break } } - case 13: + case 20: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field GasUsed", wireType) + } + m.GasUsed = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowCrossChainTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.GasUsed |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 21: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field GasPriorityFee", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EffectiveGasPrice", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2022,13 +2043,15 @@ func (m *OutboundParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.GasPriorityFee = string(dAtA[iNdEx:postIndex]) + if err := m.EffectiveGasPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } iNdEx = postIndex - case 20: + case 22: if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field GasUsed", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field EffectiveGasLimit", wireType) } - m.GasUsed = 0 + m.EffectiveGasLimit = 0 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowCrossChainTx @@ -2038,14 +2061,14 @@ func (m *OutboundParams) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.GasUsed |= uint64(b&0x7F) << shift + m.EffectiveGasLimit |= uint64(b&0x7F) << shift if b < 0x80 { break } } - case 21: + case 23: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field EffectiveGasPrice", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field GasPriorityFee", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2073,29 +2096,8 @@ func (m *OutboundParams) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.EffectiveGasPrice.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.GasPriorityFee = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 22: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field EffectiveGasLimit", wireType) - } - m.EffectiveGasLimit = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowCrossChainTx - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.EffectiveGasLimit |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } default: iNdEx = preIndex skippy, err := skipCrossChainTx(dAtA[iNdEx:])