From 2cf9bd4c43df36d9da42e9c0670357cfa31b8347 Mon Sep 17 00:00:00 2001 From: Julian Strobl Date: Wed, 10 Jan 2024 10:30:58 +0100 Subject: [PATCH] refactor: replace raw tx by command in reissuance (#266) In the beginning we wanted to send the raw transaction to elements, but what we ended up doing is to send the command like: ``` "reissueasset assetID amount" ``` to elements-cli/elements-rpc. Closes #226 Signed-off-by: Julian Strobl --- docs/static/openapi.yml | 10 +- proto/planetmintgo/dao/reissuance.proto | 2 +- proto/planetmintgo/dao/tx.proto | 2 +- x/dao/abci.go | 2 +- x/dao/keeper/distribution.go | 2 +- .../msg_server_reissue_rddl_proposal.go | 6 +- x/dao/keeper/reissuance.go | 4 +- x/dao/keeper/reissuance_test.go | 2 +- x/dao/types/message_reissue_rddl_proposal.go | 4 +- x/dao/types/reissuance.pb.go | 54 +++---- x/dao/types/tx.pb.go | 134 +++++++++--------- 11 files changed, 111 insertions(+), 111 deletions(-) diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml index 6c11cfc..42f99b0 100644 --- a/docs/static/openapi.yml +++ b/docs/static/openapi.yml @@ -46700,7 +46700,7 @@ paths: properties: proposer: type: string - rawTx: + command: type: string txID: type: string @@ -46845,7 +46845,7 @@ paths: properties: proposer: type: string - rawTx: + command: type: string txID: type: string @@ -76488,7 +76488,7 @@ definitions: properties: proposer: type: string - rawTx: + command: type: string txID: type: string @@ -76539,7 +76539,7 @@ definitions: properties: proposer: type: string - rawTx: + command: type: string txID: type: string @@ -76583,7 +76583,7 @@ definitions: properties: proposer: type: string - rawTx: + command: type: string txID: type: string diff --git a/proto/planetmintgo/dao/reissuance.proto b/proto/planetmintgo/dao/reissuance.proto index 2c3da5e..d06c8eb 100644 --- a/proto/planetmintgo/dao/reissuance.proto +++ b/proto/planetmintgo/dao/reissuance.proto @@ -6,7 +6,7 @@ option go_package = "github.com/planetmint/planetmint-go/x/dao/types"; message Reissuance { string proposer = 1; - string rawTx = 2; + string command = 2; string txID = 3; int64 blockHeight = 4; int64 firstIncludedPop = 5; diff --git a/proto/planetmintgo/dao/tx.proto b/proto/planetmintgo/dao/tx.proto index c06478c..5a61b26 100644 --- a/proto/planetmintgo/dao/tx.proto +++ b/proto/planetmintgo/dao/tx.proto @@ -34,7 +34,7 @@ message MsgReportPopResultResponse {} message MsgReissueRDDLProposal { string creator = 1; string proposer = 2; - string tx = 3; + string command = 3; int64 blockHeight = 4; int64 firstIncludedPop = 5; int64 lastIncludedPop = 6; diff --git a/x/dao/abci.go b/x/dao/abci.go index 389dab0..1b5086d 100644 --- a/x/dao/abci.go +++ b/x/dao/abci.go @@ -36,7 +36,7 @@ func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, k keeper.Keeper) if isReIssuanceHeight(currentBlockHeight) { reIssuance, err := k.CreateNextReIssuanceObject(ctx, currentBlockHeight) if err == nil { - util.SendInitReissuance(ctx, hexProposerAddress, reIssuance.GetRawTx(), currentBlockHeight, + util.SendInitReissuance(ctx, hexProposerAddress, reIssuance.GetCommand(), currentBlockHeight, reIssuance.GetFirstIncludedPop(), reIssuance.GetLastIncludedPop()) } else { util.GetAppLogger().Error(ctx, "error while computing the RDDL re-issuance ", err) diff --git a/x/dao/keeper/distribution.go b/x/dao/keeper/distribution.go index 01e729f..a09c68d 100644 --- a/x/dao/keeper/distribution.go +++ b/x/dao/keeper/distribution.go @@ -100,7 +100,7 @@ func (k Keeper) GetDistributionForReissuedTokens(ctx sdk.Context, blockHeight in for index, obj := range reissuances { if (index == 0 && lastPoP == 0 && obj.BlockHeight == 0) || // corner case (beginning of he chain) (lastPoP < obj.BlockHeight && obj.BlockHeight <= blockHeight) { - amount, err := getUint64FromTxString(ctx, obj.GetRawTx()) + amount, err := getUint64FromTxString(ctx, obj.GetCommand()) if err == nil { overallAmount += amount } diff --git a/x/dao/keeper/msg_server_reissue_rddl_proposal.go b/x/dao/keeper/msg_server_reissue_rddl_proposal.go index 09f7284..3fe8332 100644 --- a/x/dao/keeper/msg_server_reissue_rddl_proposal.go +++ b/x/dao/keeper/msg_server_reissue_rddl_proposal.go @@ -16,8 +16,8 @@ func (k msgServer) ReissueRDDLProposal(goCtx context.Context, msg *types.MsgReis ctx := sdk.UnwrapSDKContext(goCtx) validatorIdentity, validResult := util.GetValidatorCometBFTIdentity(ctx) if validResult && msg.Proposer == validatorIdentity { - util.GetAppLogger().Info(ctx, reissueTag+"asset: "+msg.GetTx()) - txID, err := util.ReissueAsset(msg.Tx) + util.GetAppLogger().Info(ctx, reissueTag+"asset: "+msg.GetCommand()) + txID, err := util.ReissueAsset(msg.Command) if err != nil { util.GetAppLogger().Error(ctx, reissueTag+"asset reissuance failed: "+err.Error()) } @@ -30,7 +30,7 @@ func (k msgServer) ReissueRDDLProposal(goCtx context.Context, msg *types.MsgReis var reissuance types.Reissuance reissuance.BlockHeight = msg.GetBlockHeight() reissuance.Proposer = msg.GetProposer() - reissuance.RawTx = msg.GetTx() + reissuance.Command = msg.GetCommand() reissuance.FirstIncludedPop = msg.GetFirstIncludedPop() reissuance.LastIncludedPop = msg.GetLastIncludedPop() k.StoreReissuance(ctx, reissuance) diff --git a/x/dao/keeper/reissuance.go b/x/dao/keeper/reissuance.go index 662592b..695541c 100644 --- a/x/dao/keeper/reissuance.go +++ b/x/dao/keeper/reissuance.go @@ -61,7 +61,7 @@ func (k Keeper) CreateNextReIssuanceObject(ctx sdk.Context, currentBlockHeight i return } - reIssuance.RawTx = GetReissuanceCommandForValue(config.GetConfig().ReissuanceAsset, reIssuanceValue) + reIssuance.Command = GetReissuanceCommandForValue(config.GetConfig().ReissuanceAsset, reIssuanceValue) reIssuance.BlockHeight = currentBlockHeight reIssuance.FirstIncludedPop = firstIncludedPop reIssuance.LastIncludedPop = lastIncludedPop @@ -76,7 +76,7 @@ func (k Keeper) IsValidReIssuanceProposal(ctx sdk.Context, msg *types.MsgReissue if reIssuance.GetBlockHeight() == msg.GetBlockHeight() && reIssuance.GetFirstIncludedPop() == msg.GetFirstIncludedPop() && reIssuance.GetLastIncludedPop() == msg.GetLastIncludedPop() && - reIssuance.GetRawTx() == msg.GetTx() && + reIssuance.GetCommand() == msg.GetCommand() && msg.GetProposer() != "" { isValid = true } diff --git a/x/dao/keeper/reissuance_test.go b/x/dao/keeper/reissuance_test.go index b3e2cf8..9816fb6 100644 --- a/x/dao/keeper/reissuance_test.go +++ b/x/dao/keeper/reissuance_test.go @@ -19,7 +19,7 @@ func createNReissuances(k *daokeeper.Keeper, ctx sdk.Context, n int) []types.Rei for i := range items { items[i].BlockHeight = int64(i) items[i].Proposer = fmt.Sprintf("proposer_%v", i) - items[i].RawTx = daokeeper.GetReissuanceCommand("asset_id", int64(i)) + items[i].Command = daokeeper.GetReissuanceCommand("asset_id", int64(i)) items[i].TxID = "" items[i].FirstIncludedPop = int64(i) items[i].LastIncludedPop = int64(i) diff --git a/x/dao/types/message_reissue_rddl_proposal.go b/x/dao/types/message_reissue_rddl_proposal.go index 3802319..caec459 100644 --- a/x/dao/types/message_reissue_rddl_proposal.go +++ b/x/dao/types/message_reissue_rddl_proposal.go @@ -10,12 +10,12 @@ const TypeMsgReissueRDDLProposal = "reissue_rddl_proposal" var _ sdk.Msg = &MsgReissueRDDLProposal{} -func NewMsgReissueRDDLProposal(creator string, proposer string, tx string, blockHeight int64, +func NewMsgReissueRDDLProposal(creator string, proposer string, command string, blockHeight int64, firstIncludedPop int64, lastIncludedPop int64) *MsgReissueRDDLProposal { return &MsgReissueRDDLProposal{ Creator: creator, Proposer: proposer, - Tx: tx, + Command: command, BlockHeight: blockHeight, FirstIncludedPop: firstIncludedPop, LastIncludedPop: lastIncludedPop, diff --git a/x/dao/types/reissuance.pb.go b/x/dao/types/reissuance.pb.go index b760dbe..e9a1c6a 100644 --- a/x/dao/types/reissuance.pb.go +++ b/x/dao/types/reissuance.pb.go @@ -24,7 +24,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package type Reissuance struct { Proposer string `protobuf:"bytes,1,opt,name=proposer,proto3" json:"proposer,omitempty"` - RawTx string `protobuf:"bytes,2,opt,name=rawTx,proto3" json:"rawTx,omitempty"` + Command string `protobuf:"bytes,2,opt,name=command,proto3" json:"command,omitempty"` TxID string `protobuf:"bytes,3,opt,name=txID,proto3" json:"txID,omitempty"` BlockHeight int64 `protobuf:"varint,4,opt,name=blockHeight,proto3" json:"blockHeight,omitempty"` FirstIncludedPop int64 `protobuf:"varint,5,opt,name=firstIncludedPop,proto3" json:"firstIncludedPop,omitempty"` @@ -71,9 +71,9 @@ func (m *Reissuance) GetProposer() string { return "" } -func (m *Reissuance) GetRawTx() string { +func (m *Reissuance) GetCommand() string { if m != nil { - return m.RawTx + return m.Command } return "" } @@ -113,23 +113,23 @@ func init() { func init() { proto.RegisterFile("planetmintgo/dao/reissuance.proto", fileDescriptor_35cf062bd4436e27) } var fileDescriptor_35cf062bd4436e27 = []byte{ - // 248 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xbf, 0x4a, 0xc5, 0x30, - 0x14, 0x87, 0x1b, 0xef, 0x1f, 0xf4, 0x38, 0x78, 0x09, 0x0e, 0xc1, 0x21, 0x54, 0xa7, 0x22, 0xd8, - 0x0c, 0xbe, 0x81, 0x38, 0xd8, 0x4d, 0x8a, 0x93, 0x5b, 0xda, 0xc6, 0xde, 0x60, 0x6f, 0x4f, 0x48, - 0x52, 0xac, 0x6f, 0xe1, 0x63, 0x89, 0xd3, 0x1d, 0x1d, 0xa5, 0x7d, 0x11, 0x21, 0xc2, 0xb5, 0x7a, - 0xb7, 0xf3, 0xfb, 0xce, 0x37, 0x7d, 0x70, 0x6e, 0x1a, 0xd9, 0x2a, 0xbf, 0xd1, 0xad, 0xaf, 0x51, - 0x54, 0x12, 0x85, 0x55, 0xda, 0xb9, 0x4e, 0xb6, 0xa5, 0x4a, 0x8d, 0x45, 0x8f, 0x74, 0x35, 0x55, - 0xd2, 0x4a, 0xe2, 0xc5, 0x07, 0x01, 0xc8, 0x77, 0x1a, 0x3d, 0x83, 0x43, 0x63, 0xd1, 0xa0, 0x53, - 0x96, 0x91, 0x98, 0x24, 0x47, 0xf9, 0x6e, 0xd3, 0x53, 0x58, 0x58, 0xf9, 0xf2, 0xd0, 0xb3, 0x83, - 0xf0, 0xf8, 0x19, 0x94, 0xc2, 0xdc, 0xf7, 0xd9, 0x2d, 0x9b, 0x05, 0x18, 0x6e, 0x1a, 0xc3, 0x71, - 0xd1, 0x60, 0xf9, 0x7c, 0xa7, 0x74, 0xbd, 0xf6, 0x6c, 0x1e, 0x93, 0x64, 0x96, 0x4f, 0x11, 0xbd, - 0x84, 0xd5, 0x93, 0xb6, 0xce, 0x67, 0x6d, 0xd9, 0x74, 0x95, 0xaa, 0xee, 0xd1, 0xb0, 0x45, 0xd0, - 0xf6, 0x38, 0x4d, 0xe0, 0xa4, 0x91, 0x7f, 0xd5, 0x65, 0x50, 0xff, 0xe3, 0x9b, 0xec, 0x7d, 0xe0, - 0x64, 0x3b, 0x70, 0xf2, 0x35, 0x70, 0xf2, 0x36, 0xf2, 0x68, 0x3b, 0xf2, 0xe8, 0x73, 0xe4, 0xd1, - 0xa3, 0xa8, 0xb5, 0x5f, 0x77, 0x45, 0x5a, 0xe2, 0x46, 0xfc, 0x36, 0x98, 0x9c, 0x57, 0x35, 0x8a, - 0x3e, 0x44, 0xf3, 0xaf, 0x46, 0xb9, 0x62, 0x19, 0x82, 0x5d, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, - 0xc5, 0x5a, 0x83, 0x1d, 0x55, 0x01, 0x00, 0x00, + // 247 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x31, 0x4e, 0xc3, 0x30, + 0x14, 0x86, 0x63, 0x5a, 0x0a, 0x98, 0x81, 0xca, 0x93, 0xc5, 0x60, 0x05, 0xa6, 0x08, 0x89, 0x78, + 0xe0, 0x06, 0x88, 0x81, 0x6c, 0x28, 0x23, 0x9b, 0x63, 0x9b, 0xd4, 0x22, 0xf1, 0xb3, 0x6c, 0x47, + 0x2a, 0xb7, 0xe0, 0x58, 0x4c, 0xa8, 0x23, 0x23, 0x4a, 0x2e, 0x82, 0x64, 0x89, 0x12, 0x60, 0x7b, + 0xff, 0xf7, 0xbe, 0xe9, 0xc3, 0x17, 0xae, 0x13, 0x56, 0xc7, 0xde, 0xd8, 0xd8, 0x02, 0x57, 0x02, + 0xb8, 0xd7, 0x26, 0x84, 0x41, 0x58, 0xa9, 0x4b, 0xe7, 0x21, 0x02, 0x59, 0xcf, 0x95, 0x52, 0x09, + 0xb8, 0x7c, 0x47, 0x18, 0xd7, 0x7b, 0x8d, 0x9c, 0xe3, 0x63, 0xe7, 0xc1, 0x41, 0xd0, 0x9e, 0xa2, + 0x1c, 0x15, 0x27, 0xf5, 0x7e, 0x13, 0x8a, 0x8f, 0x24, 0xf4, 0xbd, 0xb0, 0x8a, 0x1e, 0xa4, 0xd7, + 0xf7, 0x24, 0x04, 0x2f, 0xe3, 0xb6, 0xba, 0xa3, 0x8b, 0x84, 0xd3, 0x4d, 0x72, 0x7c, 0xda, 0x74, + 0x20, 0x9f, 0xef, 0xb5, 0x69, 0x37, 0x91, 0x2e, 0x73, 0x54, 0x2c, 0xea, 0x39, 0x22, 0x57, 0x78, + 0xfd, 0x64, 0x7c, 0x88, 0x95, 0x95, 0xdd, 0xa0, 0xb4, 0x7a, 0x00, 0x47, 0x0f, 0x93, 0xf6, 0x8f, + 0x93, 0x02, 0x9f, 0x75, 0xe2, 0xb7, 0xba, 0x4a, 0xea, 0x5f, 0x7c, 0x5b, 0xbd, 0x8d, 0x0c, 0xed, + 0x46, 0x86, 0x3e, 0x47, 0x86, 0x5e, 0x27, 0x96, 0xed, 0x26, 0x96, 0x7d, 0x4c, 0x2c, 0x7b, 0xe4, + 0xad, 0x89, 0x9b, 0xa1, 0x29, 0x25, 0xf4, 0xfc, 0xa7, 0xc3, 0xec, 0xbc, 0x6e, 0x81, 0x6f, 0x53, + 0xb8, 0xf8, 0xe2, 0x74, 0x68, 0x56, 0x29, 0xda, 0xcd, 0x57, 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, + 0x66, 0x0a, 0x60, 0x59, 0x01, 0x00, 0x00, } func (m *Reissuance) Marshal() (dAtA []byte, err error) { @@ -174,10 +174,10 @@ func (m *Reissuance) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } - if len(m.RawTx) > 0 { - i -= len(m.RawTx) - copy(dAtA[i:], m.RawTx) - i = encodeVarintReissuance(dAtA, i, uint64(len(m.RawTx))) + if len(m.Command) > 0 { + i -= len(m.Command) + copy(dAtA[i:], m.Command) + i = encodeVarintReissuance(dAtA, i, uint64(len(m.Command))) i-- dAtA[i] = 0x12 } @@ -212,7 +212,7 @@ func (m *Reissuance) Size() (n int) { if l > 0 { n += 1 + l + sovReissuance(uint64(l)) } - l = len(m.RawTx) + l = len(m.Command) if l > 0 { n += 1 + l + sovReissuance(uint64(l)) } @@ -301,7 +301,7 @@ func (m *Reissuance) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RawTx", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Command", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -329,7 +329,7 @@ func (m *Reissuance) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.RawTx = string(dAtA[iNdEx:postIndex]) + m.Command = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 3: if wireType != 2 { diff --git a/x/dao/types/tx.pb.go b/x/dao/types/tx.pb.go index 21a7c83..ebf5a04 100644 --- a/x/dao/types/tx.pb.go +++ b/x/dao/types/tx.pb.go @@ -122,7 +122,7 @@ var xxx_messageInfo_MsgReportPopResultResponse proto.InternalMessageInfo type MsgReissueRDDLProposal struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Proposer string `protobuf:"bytes,2,opt,name=proposer,proto3" json:"proposer,omitempty"` - Tx string `protobuf:"bytes,3,opt,name=tx,proto3" json:"tx,omitempty"` + Command string `protobuf:"bytes,3,opt,name=command,proto3" json:"command,omitempty"` BlockHeight int64 `protobuf:"varint,4,opt,name=blockHeight,proto3" json:"blockHeight,omitempty"` FirstIncludedPop int64 `protobuf:"varint,5,opt,name=firstIncludedPop,proto3" json:"firstIncludedPop,omitempty"` LastIncludedPop int64 `protobuf:"varint,6,opt,name=lastIncludedPop,proto3" json:"lastIncludedPop,omitempty"` @@ -175,9 +175,9 @@ func (m *MsgReissueRDDLProposal) GetProposer() string { return "" } -func (m *MsgReissueRDDLProposal) GetTx() string { +func (m *MsgReissueRDDLProposal) GetCommand() string { if m != nil { - return m.Tx + return m.Command } return "" } @@ -855,63 +855,63 @@ func init() { func init() { proto.RegisterFile("planetmintgo/dao/tx.proto", fileDescriptor_7117c47dbc1828c7) } var fileDescriptor_7117c47dbc1828c7 = []byte{ - // 896 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0x26, 0xa9, 0x83, 0x5f, 0xa2, 0xa6, 0x9d, 0x86, 0x74, 0xb3, 0x24, 0x5b, 0xb3, 0xad, - 0x8a, 0x1b, 0x51, 0x2f, 0x14, 0x09, 0x09, 0x38, 0x20, 0x82, 0x25, 0xb0, 0xc4, 0x0a, 0x6b, 0x5b, - 0x2e, 0x08, 0x29, 0x5a, 0x7b, 0x87, 0xf5, 0x28, 0xeb, 0x9d, 0xcd, 0xcc, 0xb8, 0x72, 0xc5, 0xad, - 0x9f, 0x80, 0x13, 0x27, 0x6e, 0x5c, 0x38, 0x16, 0x89, 0x0f, 0xd1, 0x63, 0xc5, 0x01, 0x71, 0x42, - 0x28, 0x39, 0xe4, 0x6b, 0xa0, 0x9d, 0x9d, 0xfd, 0x63, 0xef, 0xc6, 0xf6, 0x25, 0x99, 0x79, 0xbf, - 0xdf, 0xbc, 0xf7, 0x9b, 0xf7, 0xde, 0x3c, 0x2f, 0x1c, 0xc4, 0xa1, 0x17, 0x61, 0x31, 0x26, 0x91, - 0x08, 0xa8, 0xed, 0x7b, 0xd4, 0x16, 0xd3, 0x4e, 0xcc, 0xa8, 0xa0, 0xe8, 0x56, 0x19, 0xea, 0xf8, - 0x1e, 0x35, 0x5a, 0x15, 0xf2, 0x70, 0xe4, 0x85, 0x21, 0x8e, 0x02, 0x9c, 0x9e, 0x31, 0xee, 0x57, - 0x18, 0xc9, 0xf2, 0x94, 0xe1, 0xf3, 0x09, 0xe6, 0x42, 0x91, 0x1e, 0x55, 0x48, 0x3e, 0xe1, 0x82, - 0x91, 0xc1, 0x44, 0x10, 0x1a, 0x9d, 0x52, 0xe6, 0x63, 0xa6, 0xa8, 0x47, 0x15, 0x6a, 0xec, 0x31, - 0x6f, 0xcc, 0x15, 0x7c, 0xdb, 0x1b, 0x93, 0x88, 0xda, 0xf2, 0xaf, 0x32, 0xed, 0x05, 0x34, 0xa0, - 0x72, 0x69, 0x27, 0x2b, 0x65, 0x3d, 0x18, 0x52, 0x3e, 0xa6, 0xfc, 0x34, 0x05, 0xd2, 0x8d, 0x82, - 0xee, 0xa6, 0x3b, 0x7b, 0xcc, 0x03, 0xfb, 0xf9, 0x87, 0xc9, 0xbf, 0x14, 0xb0, 0x08, 0x20, 0x87, - 0x07, 0x2e, 0x8e, 0x29, 0x13, 0x7d, 0x1a, 0xbb, 0x98, 0x4f, 0x42, 0x81, 0x74, 0xd8, 0x1a, 0x32, - 0xec, 0x09, 0xca, 0x74, 0xad, 0xa5, 0xb5, 0x9b, 0x6e, 0xb6, 0x45, 0x9f, 0x40, 0x33, 0x4f, 0x87, - 0xbe, 0xde, 0xd2, 0xda, 0xdb, 0x4f, 0xde, 0xe9, 0xcc, 0xe7, 0xb0, 0xf3, 0x65, 0x46, 0x71, 0x0b, - 0xb6, 0x75, 0x08, 0x46, 0x35, 0x94, 0x8b, 0x79, 0x4c, 0x23, 0x8e, 0xad, 0xbf, 0x35, 0xd8, 0x97, - 0x30, 0xe1, 0x7c, 0x82, 0xdd, 0x6e, 0xf7, 0x9b, 0x3e, 0xa3, 0x31, 0xe5, 0x5e, 0xb8, 0x40, 0x8d, - 0x01, 0x6f, 0xc5, 0x92, 0x85, 0x99, 0x14, 0xd3, 0x74, 0xf3, 0x3d, 0xba, 0x09, 0xeb, 0x62, 0xaa, - 0x6f, 0x48, 0xeb, 0xba, 0x98, 0xa2, 0x16, 0x6c, 0x0f, 0x42, 0x3a, 0x3c, 0xfb, 0x1a, 0x93, 0x60, - 0x24, 0xf4, 0xcd, 0x96, 0xd6, 0xde, 0x70, 0xcb, 0x26, 0x74, 0x0c, 0xb7, 0x7e, 0x24, 0x8c, 0x8b, - 0x5e, 0x34, 0x0c, 0x27, 0x3e, 0xf6, 0xfb, 0x34, 0xd6, 0x6f, 0x48, 0x5a, 0xc5, 0x8e, 0xda, 0xb0, - 0x1b, 0x7a, 0xb3, 0xd4, 0x86, 0xa4, 0xce, 0x9b, 0xad, 0x16, 0x98, 0xf5, 0xf7, 0xca, 0xaf, 0x4e, - 0x60, 0xc7, 0xe1, 0x81, 0x43, 0x22, 0xf1, 0x8c, 0x9e, 0xe1, 0x68, 0xc1, 0x7d, 0x3f, 0x87, 0xed, - 0x24, 0xcb, 0x6e, 0xda, 0x69, 0x2a, 0xff, 0x47, 0xd5, 0xfc, 0x3b, 0x05, 0xc9, 0x2d, 0x9f, 0xb0, - 0xf6, 0x61, 0xaf, 0x1c, 0x2a, 0x97, 0xf0, 0x52, 0x93, 0x40, 0x49, 0xe5, 0xd2, 0x4e, 0x58, 0x94, - 0x7b, 0x04, 0x9b, 0x62, 0xda, 0xeb, 0xaa, 0xec, 0xcb, 0xf5, 0xf2, 0xfc, 0x5b, 0x26, 0x1c, 0xd6, - 0x69, 0xc8, 0x45, 0xfe, 0xa6, 0xc1, 0xdb, 0x0e, 0x0f, 0xba, 0xa5, 0x77, 0xb4, 0x54, 0xa5, 0x0e, - 0x5b, 0x49, 0x41, 0x92, 0xfa, 0xac, 0xcb, 0x88, 0xd9, 0x36, 0x41, 0x7c, 0x8f, 0x3e, 0x2b, 0x64, - 0x66, 0x5b, 0x64, 0xc1, 0x0e, 0x89, 0x9e, 0x63, 0x2e, 0x28, 0x93, 0xf0, 0xa6, 0x84, 0x67, 0x6c, - 0xc9, 0xe9, 0x98, 0xc6, 0x12, 0xbe, 0x91, 0x9e, 0x56, 0x5b, 0xeb, 0x1e, 0x1c, 0xd5, 0x8a, 0xcc, - 0xaf, 0xf1, 0x93, 0x6c, 0xf4, 0x59, 0x82, 0xac, 0xce, 0x82, 0x6b, 0x7c, 0x05, 0x3b, 0xe5, 0xf1, - 0xa1, 0x2a, 0x7f, 0xbf, 0x5a, 0xf9, 0xb2, 0xdb, 0x6f, 0x93, 0x19, 0xe3, 0xce, 0x1c, 0x54, 0xdd, - 0x58, 0x13, 0x3c, 0x97, 0xf7, 0x8b, 0x06, 0xbb, 0x0e, 0x0f, 0xbe, 0x8b, 0x7d, 0x4f, 0xe0, 0xbe, - 0x1c, 0x44, 0xe8, 0x63, 0x68, 0x7a, 0x13, 0x31, 0xa2, 0x8c, 0x88, 0x17, 0xa9, 0xb4, 0x13, 0xfd, - 0xaf, 0x3f, 0x1f, 0xef, 0xa9, 0x19, 0xf3, 0x85, 0xef, 0x33, 0xcc, 0xf9, 0x53, 0xc1, 0x48, 0x14, - 0xb8, 0x05, 0x15, 0x7d, 0x06, 0x8d, 0x74, 0x94, 0x29, 0xc1, 0x7a, 0x55, 0x70, 0x1a, 0xe1, 0xa4, - 0xf9, 0xfa, 0xdf, 0x7b, 0x6b, 0xbf, 0x5f, 0xbd, 0x3a, 0xd6, 0x5c, 0x75, 0xe4, 0xd3, 0x9b, 0x2f, - 0xaf, 0x5e, 0x1d, 0x17, 0xce, 0xac, 0x03, 0xb8, 0x3b, 0xa7, 0x2b, 0xd7, 0xfc, 0xab, 0x06, 0xe0, - 0xf0, 0xa0, 0x17, 0x91, 0xac, 0xb4, 0xd7, 0xe4, 0xf1, 0x10, 0x9a, 0x24, 0x22, 0x82, 0x48, 0x2c, - 0xed, 0xda, 0xc2, 0x80, 0x4c, 0x80, 0x7c, 0x5c, 0x31, 0xd5, 0x15, 0x25, 0xcb, 0x0c, 0x8e, 0x55, - 0x5b, 0x94, 0x2c, 0x68, 0x1f, 0x1a, 0xa3, 0xb4, 0xbb, 0xd3, 0xb1, 0xa1, 0x76, 0xd6, 0x9e, 0x1c, - 0xb2, 0x4a, 0x5d, 0x26, 0xfa, 0xc9, 0x1f, 0x0d, 0xd8, 0x70, 0x78, 0x80, 0xce, 0xe1, 0x4e, 0xdd, - 0xd4, 0x6b, 0xd7, 0x3c, 0xeb, 0xda, 0x39, 0x62, 0x7c, 0xb0, 0x2a, 0x33, 0x0b, 0x8d, 0x9e, 0x42, - 0xb3, 0x18, 0x37, 0x66, 0xed, 0xf1, 0x1c, 0x37, 0x1e, 0x2e, 0xc6, 0x73, 0xa7, 0x67, 0x70, 0xbb, - 0x3a, 0x3f, 0x1e, 0x2e, 0xd3, 0x96, 0xf2, 0x8c, 0xce, 0x6a, 0xbc, 0x3c, 0x58, 0x04, 0xa8, 0x66, - 0x0e, 0xbc, 0x57, 0xeb, 0xa5, 0x4a, 0x34, 0xec, 0x15, 0x89, 0x79, 0xbc, 0x73, 0xb8, 0x53, 0xf7, - 0x62, 0xdb, 0x2b, 0xf8, 0x91, 0xcc, 0x6b, 0x8a, 0xb4, 0xe0, 0x21, 0xa2, 0x1f, 0x60, 0x67, 0xe6, - 0x11, 0xbe, 0x5b, 0xeb, 0xa1, 0x4c, 0x31, 0x1e, 0x2d, 0xa5, 0xe4, 0xde, 0x31, 0xec, 0xce, 0xff, - 0xea, 0x3f, 0xb8, 0xa6, 0x06, 0x33, 0x2c, 0xe3, 0xfd, 0x55, 0x58, 0x79, 0x18, 0x07, 0xb6, 0xb2, - 0x57, 0x79, 0x58, 0x7b, 0x50, 0xa1, 0xc6, 0x83, 0x45, 0x68, 0xe6, 0xee, 0xa4, 0xf7, 0xfa, 0xc2, - 0xd4, 0xde, 0x5c, 0x98, 0xda, 0x7f, 0x17, 0xa6, 0xf6, 0xf3, 0xa5, 0xb9, 0xf6, 0xe6, 0xd2, 0x5c, - 0xfb, 0xe7, 0xd2, 0x5c, 0xfb, 0xde, 0x0e, 0x88, 0x18, 0x4d, 0x06, 0x9d, 0x21, 0x1d, 0xdb, 0x85, - 0xa7, 0xd2, 0xf2, 0x71, 0x40, 0xed, 0x69, 0xfa, 0xf1, 0xf7, 0x22, 0xc6, 0x7c, 0xd0, 0x90, 0x1f, - 0x40, 0x1f, 0xfd, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xa1, 0x23, 0xab, 0x7b, 0x1d, 0x0a, 0x00, 0x00, + // 895 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x56, 0x4f, 0x6f, 0xdc, 0x44, + 0x14, 0x8f, 0x9b, 0x74, 0xc3, 0xbe, 0x44, 0xa4, 0x9d, 0x86, 0xd4, 0x31, 0x89, 0xbb, 0xb8, 0x55, + 0xd9, 0x46, 0x74, 0x0d, 0x45, 0x42, 0x02, 0x0e, 0x88, 0x10, 0x09, 0x22, 0x61, 0x11, 0xb9, 0xe5, + 0x82, 0x90, 0x22, 0x67, 0x3d, 0x78, 0x47, 0xb1, 0x3d, 0xce, 0xcc, 0x6c, 0x95, 0x8a, 0x5b, 0x3f, + 0x01, 0x27, 0x4e, 0xdc, 0xb8, 0x70, 0x2c, 0x12, 0x1f, 0xa2, 0xc7, 0x8a, 0x13, 0x27, 0x54, 0x25, + 0x87, 0x7e, 0x8d, 0xca, 0x33, 0xe3, 0x3f, 0xbb, 0x76, 0x76, 0xf7, 0x92, 0xcc, 0x7b, 0xbf, 0xdf, + 0x7b, 0xef, 0x37, 0xf3, 0x66, 0xde, 0x1a, 0xb6, 0xb3, 0x38, 0x48, 0xb1, 0x48, 0x48, 0x2a, 0x22, + 0xea, 0x86, 0x01, 0x75, 0xc5, 0xf9, 0x20, 0x63, 0x54, 0x50, 0x74, 0xa3, 0x0e, 0x0d, 0xc2, 0x80, + 0x5a, 0xbd, 0x06, 0x79, 0x38, 0x0a, 0xe2, 0x18, 0xa7, 0x11, 0x56, 0x31, 0xd6, 0xdd, 0x06, 0x23, + 0x5f, 0x1e, 0x33, 0x7c, 0x36, 0xc6, 0x5c, 0x68, 0xd2, 0x83, 0x06, 0x29, 0x24, 0x5c, 0x30, 0x72, + 0x32, 0x16, 0x84, 0xa6, 0xc7, 0x94, 0x85, 0x98, 0x69, 0xea, 0x6e, 0x83, 0x9a, 0x05, 0x2c, 0x48, + 0xb8, 0x86, 0x6f, 0x06, 0x09, 0x49, 0xa9, 0x2b, 0xff, 0x6a, 0xd7, 0x66, 0x44, 0x23, 0x2a, 0x97, + 0x6e, 0xbe, 0xd2, 0xde, 0xed, 0x21, 0xe5, 0x09, 0xe5, 0xc7, 0x0a, 0x50, 0x86, 0x86, 0x6e, 0x2b, + 0xcb, 0x4d, 0x78, 0xe4, 0x3e, 0xfd, 0x24, 0xff, 0xa7, 0x00, 0x87, 0x00, 0xf2, 0x78, 0xe4, 0xe3, + 0x8c, 0x32, 0x71, 0x44, 0x33, 0x1f, 0xf3, 0x71, 0x2c, 0x90, 0x09, 0xab, 0x43, 0x86, 0x03, 0x41, + 0x99, 0x69, 0xf4, 0x8c, 0x7e, 0xd7, 0x2f, 0x4c, 0xf4, 0x39, 0x74, 0xcb, 0xe3, 0x30, 0xaf, 0xf5, + 0x8c, 0xfe, 0xda, 0xa3, 0xf7, 0x07, 0xd3, 0x67, 0x38, 0xf8, 0xa6, 0xa0, 0xf8, 0x15, 0xdb, 0xd9, + 0x01, 0xab, 0x59, 0xca, 0xc7, 0x3c, 0xa3, 0x29, 0xc7, 0xce, 0x6b, 0x03, 0xb6, 0x24, 0x4c, 0x38, + 0x1f, 0x63, 0xff, 0xe0, 0xe0, 0xfb, 0x23, 0x46, 0x33, 0xca, 0x83, 0x78, 0x86, 0x1a, 0x0b, 0xde, + 0xc9, 0x24, 0x0b, 0x33, 0x29, 0xa6, 0xeb, 0x97, 0xb6, 0x8c, 0xa2, 0x49, 0x12, 0xa4, 0xa1, 0xb9, + 0xac, 0xa3, 0x94, 0x89, 0x7a, 0xb0, 0x76, 0x12, 0xd3, 0xe1, 0xe9, 0x77, 0x98, 0x44, 0x23, 0x61, + 0xae, 0xf4, 0x8c, 0xfe, 0xb2, 0x5f, 0x77, 0xa1, 0x3d, 0xb8, 0xf1, 0x0b, 0x61, 0x5c, 0x1c, 0xa6, + 0xc3, 0x78, 0x1c, 0xe2, 0xf0, 0x88, 0x66, 0xe6, 0x75, 0x49, 0x6b, 0xf8, 0x51, 0x1f, 0x36, 0xe2, + 0x60, 0x92, 0xda, 0x91, 0xd4, 0x69, 0xb7, 0xd3, 0x03, 0xbb, 0x7d, 0x87, 0xe5, 0x21, 0x10, 0x58, + 0xf7, 0x78, 0xe4, 0x91, 0x54, 0x3c, 0xa1, 0xa7, 0x38, 0x9d, 0xb1, 0xf3, 0xaf, 0x60, 0x2d, 0x3f, + 0x6f, 0x5f, 0xdd, 0x39, 0xdd, 0x89, 0xdd, 0x66, 0x27, 0xbc, 0x8a, 0xe4, 0xd7, 0x23, 0x9c, 0x2d, + 0xd8, 0xac, 0x97, 0x2a, 0x25, 0x3c, 0x37, 0x24, 0x50, 0x53, 0x39, 0xf7, 0x4e, 0xcc, 0xea, 0x02, + 0x82, 0x15, 0x71, 0x7e, 0x78, 0xa0, 0x5b, 0x20, 0xd7, 0xf3, 0xcf, 0xdf, 0xb1, 0x61, 0xa7, 0x4d, + 0x43, 0x29, 0xf2, 0x4f, 0x03, 0xde, 0xf3, 0x78, 0x74, 0x50, 0x7b, 0x51, 0x73, 0x55, 0x9a, 0xb0, + 0x9a, 0x37, 0x24, 0xef, 0xcf, 0x35, 0x59, 0xb1, 0x30, 0x73, 0x24, 0x0c, 0xe8, 0x93, 0x4a, 0x66, + 0x61, 0x22, 0x07, 0xd6, 0x49, 0xfa, 0x14, 0x73, 0x41, 0x99, 0x84, 0x57, 0x24, 0x3c, 0xe1, 0xcb, + 0xa3, 0x33, 0x9a, 0x49, 0xf8, 0xba, 0x8a, 0xd6, 0xa6, 0x73, 0x07, 0x76, 0x5b, 0x45, 0x96, 0xdb, + 0xf8, 0x55, 0x5e, 0xf9, 0x49, 0x82, 0xec, 0xce, 0x8c, 0x6d, 0x7c, 0x0b, 0xeb, 0xf5, 0x41, 0xa2, + 0x3b, 0x7f, 0xb7, 0xd9, 0xf9, 0x7a, 0xda, 0x1f, 0xf2, 0x69, 0xe3, 0x4f, 0x04, 0xea, 0xdb, 0xd8, + 0x52, 0xbc, 0x94, 0xf7, 0xbb, 0x01, 0x1b, 0x1e, 0x8f, 0x7e, 0xcc, 0xc2, 0x40, 0xe0, 0x23, 0x39, + 0x92, 0xd0, 0x67, 0xd0, 0x0d, 0xc6, 0x62, 0x44, 0x19, 0x11, 0xcf, 0x94, 0xb4, 0x7d, 0xf3, 0xdf, + 0x7f, 0x1e, 0x6e, 0xea, 0x69, 0xf3, 0x75, 0x18, 0x32, 0xcc, 0xf9, 0x63, 0xc1, 0x48, 0x1a, 0xf9, + 0x15, 0x15, 0x7d, 0x09, 0x1d, 0x35, 0xd4, 0xb4, 0x60, 0xb3, 0x29, 0x58, 0x55, 0xd8, 0xef, 0xbe, + 0xfc, 0xff, 0xce, 0xd2, 0x5f, 0x6f, 0x5e, 0xec, 0x19, 0xbe, 0x0e, 0xf9, 0xe2, 0xdd, 0xe7, 0x6f, + 0x5e, 0xec, 0x55, 0xc9, 0x9c, 0x6d, 0xb8, 0x3d, 0xa5, 0xab, 0xd4, 0xfc, 0x87, 0x01, 0xe0, 0xf1, + 0xe8, 0x30, 0x25, 0x45, 0x6b, 0xaf, 0x38, 0xc7, 0x1d, 0xe8, 0x92, 0x94, 0x08, 0x22, 0x31, 0x75, + 0x6b, 0x2b, 0x07, 0xb2, 0x01, 0xca, 0xc1, 0xc5, 0xf4, 0xad, 0xa8, 0x79, 0x26, 0x70, 0xac, 0xaf, + 0x45, 0xcd, 0x83, 0xb6, 0xa0, 0x33, 0x52, 0xb7, 0x5b, 0x8d, 0x0d, 0x6d, 0x39, 0x9b, 0x72, 0xdc, + 0x6a, 0x75, 0x85, 0xe8, 0x47, 0x7f, 0x77, 0x60, 0xd9, 0xe3, 0x11, 0x3a, 0x83, 0x5b, 0x6d, 0xf3, + 0xaf, 0xdf, 0xf2, 0xac, 0x5b, 0xe7, 0x88, 0xf5, 0xf1, 0xa2, 0xcc, 0xa2, 0x34, 0x7a, 0x0c, 0xdd, + 0x6a, 0xdc, 0xd8, 0xad, 0xe1, 0x25, 0x6e, 0xdd, 0x9f, 0x8d, 0x97, 0x49, 0x4f, 0xe1, 0x66, 0x73, + 0x7e, 0xdc, 0x9f, 0xa7, 0x4d, 0xf1, 0xac, 0xc1, 0x62, 0xbc, 0xb2, 0x58, 0x0a, 0xa8, 0x65, 0x0e, + 0x7c, 0xd8, 0x9a, 0xa5, 0x49, 0xb4, 0xdc, 0x05, 0x89, 0x65, 0xbd, 0x33, 0xb8, 0xd5, 0xf6, 0x62, + 0xfb, 0x0b, 0xe4, 0x91, 0xcc, 0x2b, 0x9a, 0x34, 0xe3, 0x21, 0xa2, 0x9f, 0x61, 0x7d, 0xe2, 0x11, + 0x7e, 0xd0, 0x9a, 0xa1, 0x4e, 0xb1, 0x1e, 0xcc, 0xa5, 0x94, 0xd9, 0x31, 0x6c, 0x4c, 0xff, 0xfe, + 0xdf, 0xbb, 0xa2, 0x07, 0x13, 0x2c, 0xeb, 0xa3, 0x45, 0x58, 0x65, 0x19, 0x0f, 0x56, 0x8b, 0x57, + 0xb9, 0xd3, 0x1a, 0xa8, 0x51, 0xeb, 0xde, 0x2c, 0xb4, 0x48, 0xb7, 0x7f, 0xf8, 0xf2, 0xc2, 0x36, + 0x5e, 0x5d, 0xd8, 0xc6, 0xeb, 0x0b, 0xdb, 0xf8, 0xed, 0xd2, 0x5e, 0x7a, 0x75, 0x69, 0x2f, 0xfd, + 0x77, 0x69, 0x2f, 0xfd, 0xe4, 0x46, 0x44, 0x8c, 0xc6, 0x27, 0x83, 0x21, 0x4d, 0xdc, 0x2a, 0x53, + 0x6d, 0xf9, 0x30, 0xa2, 0xee, 0xb9, 0xfa, 0x0c, 0x7c, 0x96, 0x61, 0x7e, 0xd2, 0x91, 0x9f, 0x42, + 0x9f, 0xbe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x0e, 0xfe, 0xcc, 0xf3, 0x27, 0x0a, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1346,10 +1346,10 @@ func (m *MsgReissueRDDLProposal) MarshalToSizedBuffer(dAtA []byte) (int, error) i-- dAtA[i] = 0x20 } - if len(m.Tx) > 0 { - i -= len(m.Tx) - copy(dAtA[i:], m.Tx) - i = encodeVarintTx(dAtA, i, uint64(len(m.Tx))) + if len(m.Command) > 0 { + i -= len(m.Command) + copy(dAtA[i:], m.Command) + i = encodeVarintTx(dAtA, i, uint64(len(m.Command))) i-- dAtA[i] = 0x1a } @@ -1867,7 +1867,7 @@ func (m *MsgReissueRDDLProposal) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Tx) + l = len(m.Command) if l > 0 { n += 1 + l + sovTx(uint64(l)) } @@ -2344,7 +2344,7 @@ func (m *MsgReissueRDDLProposal) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 3: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Tx", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Command", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2372,7 +2372,7 @@ func (m *MsgReissueRDDLProposal) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Tx = string(dAtA[iNdEx:postIndex]) + m.Command = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: if wireType != 0 {