@@ -40,6 +40,8 @@ message MsgUpdateParams {
4040
4141 // NOTE: All parameters must be supplied.
4242 Params params = 2 [(gogoproto.nullable ) = false , (amino.dont_omitempty ) = true ];
43+
44+ // Next free index: 3
4345}
4446
4547// MsgUpdateParamsResponse defines the response structure for executing a
@@ -53,20 +55,22 @@ message MsgImportMorseClaimableAccounts {
5355 // authority is the address that controls the module (defaults to x/gov unless overwritten).
5456 string authority = 1 [(cosmos_proto.scalar ) = "cosmos.AddressString" ];
5557
56- // the account state derived from the Morse state export and the `pocketd migrate collect-morse-accounts` command.
58+ // the account state derived from the Morse state export and the `pocketd tx migration collect-morse-accounts` command.
5759 MorseAccountState morse_account_state = 2 [(gogoproto.jsontag ) = "morse_account_state" , (gogoproto.nullable ) = false ];
5860
5961 // Validates the morse_account_state sha256 hash:
6062 // - Transaction fails if hash doesn't match on-chain computation
6163 // - Off-chain social consensus should be reached off-chain before verification
6264
63- // Verification can be done by comparing with locally derived Morse state like so:
64- // $ pocketd migrate collect-morse-accounts $<(pocket util export-genesis-for-reset)
65+ // Verification can be done by comparing with locally derived Morse state like so (at a high-level) :
66+ // $ pocketd tx migration collect-morse-accounts $<(pocket util export-genesis-for-reset)
6567
6668 // Additional documentation:
6769 // - pocket util export-genesis-for-migration --help
68- // - pocketd migrate collect-morse-accounts --help
70+ // - pocketd tx migration collect-morse-accounts --help
6971 bytes morse_account_state_hash = 3 [(gogoproto.jsontag ) = "morse_account_state_hash" ];
72+
73+ // Next free index: 4
7074}
7175
7276// MsgImportMorseClaimableAccountsResponse is returned from MsgImportMorseClaimableAccounts.
@@ -78,6 +82,8 @@ message MsgImportMorseClaimableAccountsResponse {
7882
7983 // Number of claimable accounts (EOAs) collected from Morse state export.
8084 uint64 num_accounts = 2 [(gogoproto.jsontag ) = "num_accounts" ];
85+
86+ // Next free index: 3
8187}
8288
8389// MsgClaimMorseAccount is used to execute a claim (one-time minting of tokens on Shannon),
@@ -88,25 +94,40 @@ message MsgImportMorseClaimableAccountsResponse {
8894// - The Shannon account specified must be the message signer
8995// - Authz grants MAY be used to delegate claiming authority to other Shannon accounts
9096message MsgClaimMorseAccount {
91- option (cosmos.msg.v1.signer ) = "shannon_dest_address" ;
97+ option (cosmos.msg.v1.signer ) = "shannon_signing_address" ;
98+
99+ // The bech32-encoded address of the Shannon account which is signing for this message.
100+ // This account is liable for any fees incurred by violating the constraints of Morse
101+ // account/actor claim message fee waiving; the tx contains ONE OR MORE Morse account/actor
102+ // claim messages AND has EXACTLY ONE signer.
103+ string shannon_signing_address = 4 [(cosmos_proto.scalar ) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_signing_address" ];
92104
93105 // The bech32-encoded address of the Shannon account to which the claimed balance will be minted.
94106 string shannon_dest_address = 1 [(cosmos_proto.scalar ) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_dest_address" ];
95107
108+ // DEV_NOTE: This field was momentarily used to hold the Morse source
109+ // address; however, an optimization eliminates the need for this.
110+ // Reserved for backwards compatibility.
111+ //
96112 // The hex-encoded address of the Morse account whose balance will be claimed.
97113 // E.g.: 00f9900606fa3d5c9179fc0c8513078a53a2073e
98- string morse_src_address = 2 [(gogoproto.jsontag ) = "morse_src_address" ];
114+ // string morse_src_address = 2 [(gogoproto.jsontag) = "morse_src_address"];
115+ reserved 2 ;
116+
117+ // The ed25519 public key of the morse account with morse_src_address.
118+ bytes morse_public_key = 5 [(gogoproto.casttype ) = "github.com/cometbft/cometbft/crypto/ed25519.PubKey" ];
99119
100120 // The hex-encoded signature, by the Morse account, of this message (where this field is nil).
101121 // I.e.: morse_signature = private_key.sign(marshal(MsgClaimMorseAccount{morse_signature: nil, ...}))
102122 bytes morse_signature = 3 [(gogoproto.jsontag ) = "morse_signature" ];
123+
124+ // Next free index: 6
103125}
104126
105127// MsgClaimMorseAccountResponse is returned from MsgClaimMorseAccount.
106128// It indicates the morse_src_address of the account which was claimed, the total
107129// balance claimed, and the height at which the claim was committed.
108130message MsgClaimMorseAccountResponse {
109-
110131 // The hex-encoded address of the Morse account whose balance will be claimed.
111132 // E.g.: 00f9900606fa3d5c9179fc0c8513078a53a2073e
112133 string morse_src_address = 1 [(gogoproto.jsontag ) = "morse_src_address" ];
@@ -116,23 +137,38 @@ message MsgClaimMorseAccountResponse {
116137
117138 // The session end height (on Shannon) in which the claim was committed (i.e. claimed).
118139 int64 session_end_height = 3 [(gogoproto.jsontag ) = "session_end_height" ];
140+
141+ // Next free index: 4
119142}
120143
121144// MsgClaimMorseApplication is used to execute a claim (one-time minting of tokens on Shannon),
122145// of the total tokens owned by the given Morse account, according to the on-chain MorseClaimableAccounts,
123146// to the balance of the given Shannon account, followed by staking that Shannon account as an application
124147// for the given service_config and the same stake amount as on Morse.
125148message MsgClaimMorseApplication {
126- option (cosmos.msg.v1.signer ) = "shannon_dest_address" ;
149+ option (cosmos.msg.v1.signer ) = "shannon_signing_address" ;
150+
151+ // The bech32-encoded address of the Shannon account which is signing for this message.
152+ // This account is liable for any fees incurred by violating the constraints of Morse
153+ // account/actor claim message fee waiving; the tx contains ONE OR MORE Morse account/actor
154+ // claim messages AND has EXACTLY ONE signer.
155+ string shannon_signing_address = 5 [(cosmos_proto.scalar ) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_signing_address" ];
127156
128157 // The bech32-encoded address of the Shannon account to which the claimed tokens
129158 // will be minted and from which the application will be staked.
130159 string shannon_dest_address = 1 [(cosmos_proto.scalar ) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_dest_address" ];
131160
161+ // DEV_NOTE: This field was momentarily used to hold the Morse source
162+ // address; however, an optimization eliminates the need for this.
163+ // Reserved for backwards compatibility.
164+ //
132165 // The hex-encoded address of the Morse account whose balance will be claimed.
133166 // E.g.: 00f9900606fa3d5c9179fc0c8513078a53a2073e
167+ // string morse_src_address = 2 [(gogoproto.jsontag) = "morse_src_address"];
168+ reserved 2 ;
134169
135- string morse_src_address = 2 [(gogoproto.jsontag ) = "morse_src_address" ];
170+ // The ed25519 public key of the morse account with morse_src_address.
171+ bytes morse_public_key = 6 [(gogoproto.casttype ) = "github.com/cometbft/cometbft/crypto/ed25519.PubKey" ];
136172
137173 // The hex-encoded signature, by the Morse account, of this message (where this field is nil).
138174 // I.e.: morse_signature = private_key.sign(marshal(MsgClaimMorseAccount{morse_signature: nil, ...}))
@@ -142,6 +178,8 @@ message MsgClaimMorseApplication {
142178 // NOTE: This is not a repeated field, as in MsgStakeApplication,
143179 // because an application can only be staked for one service.
144180 shared.ApplicationServiceConfig service_config = 4 [(gogoproto.jsontag ) = "service_config" ];
181+
182+ // Next free index: 7
145183}
146184
147185// MsgClaimMorseApplicationResponse is returned from MsgClaimMorseApplication.
@@ -164,6 +202,8 @@ message MsgClaimMorseApplicationResponse {
164202
165203 // The application which was staked as a result of the claim.
166204 application.Application application = 5 [(gogoproto.jsontag ) = "application" ];
205+
206+ // Next free index: 6
167207}
168208
169209// MsgClaimMorseSupplier is used to:
@@ -175,7 +215,13 @@ message MsgClaimMorseApplicationResponse {
175215// NOTE: The supplier module's staking fee parameter (at the time of claiming) is deducted from the
176216// claimed balance.
177217message MsgClaimMorseSupplier {
178- option (cosmos.msg.v1.signer ) = "shannon_owner_address" ;
218+ option (cosmos.msg.v1.signer ) = "shannon_signing_address" ;
219+
220+ // The bech32-encoded address of the Shannon account which is signing for this message.
221+ // This account is liable for any fees incurred by violating the constraints of Morse
222+ // account/actor claim message fee waiving; the tx contains ONE OR MORE Morse account/actor
223+ // claim messages AND has EXACTLY ONE signer.
224+ string shannon_signing_address = 6 [(cosmos_proto.scalar ) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_signing_address" ];
179225
180226 // The bech32-encoded address of the Shannon account to which the claimed tokens
181227 // will be minted and which become the supplier owner.
@@ -187,11 +233,17 @@ message MsgClaimMorseSupplier {
187233 // See: https://dev.poktroll.com/operate/configs/supplier_staking_config#staking-types.
188234 string shannon_operator_address = 2 [(cosmos_proto.scalar ) = "cosmos.AddressString", (gogoproto.jsontag) = "shannon_operator_address" ];
189235
236+ // The ed25519 public key of the morse account with morse_src_address.
237+ bytes morse_public_key = 7 [(gogoproto.casttype ) = "github.com/cometbft/cometbft/crypto/ed25519.PubKey" ];
238+
239+ // DEV_NOTE: This field was momentarily used to hold the Morse source
240+ // address; however, an optimization eliminates the need for this.
241+ // Reserved for backwards compatibility.
242+ //
190243 // The hex-encoded address of the Morse account whose balance will be claimed.
191244 // E.g.: 00f9900606fa3d5c9179fc0c8513078a53a2073e
192- //
193- // TODO_MAINNET(@bryanchriswhite, #1126): Rename to `morse_src_owner_address`.
194- string morse_src_address = 3 [(gogoproto.jsontag ) = "morse_src_address" ];
245+ // string morse_src_address = 3 [(gogoproto.jsontag) = "morse_src_address"];
246+ reserved 3 ;
195247
196248 // The hex-encoded signature, by the Morse account, of this message (where this field is nil).
197249 // I.e.: morse_signature = private_key.sign(marshal(MsgClaimMorseAccount{morse_signature: nil, ...}))
@@ -201,6 +253,8 @@ message MsgClaimMorseSupplier {
201253
202254 // The services this supplier is staked to provide service for.
203255 repeated shared.SupplierServiceConfig services = 5 [(gogoproto.jsontag ) = "services" ];
256+
257+ // Next free index: 8
204258}
205259
206260// MsgClaimMorseSupplierResponse is returned from MsgClaimMorseSupplier.
@@ -224,5 +278,7 @@ message MsgClaimMorseSupplierResponse {
224278
225279 // The supplier which was staked as a result of the claim.
226280 shared.Supplier supplier = 5 [(gogoproto.jsontag ) = "supplier" ];
281+
282+ // Next free index: 6
227283}
228284
0 commit comments