@@ -101,8 +101,6 @@ impl Hashable for SnappAccount {
101
101
roi = roi. append_field ( * field) ;
102
102
}
103
103
104
- // elog!("ROInput={:?}", roi);
105
-
106
104
roi
107
105
}
108
106
@@ -125,10 +123,6 @@ pub struct AccountLegacy {
125
123
pub timing : Timing , // Timing.t
126
124
pub permissions : PermissionsLegacy < AuthRequired > , // Permissions.t
127
125
pub snap : Option < SnappAccount > ,
128
- // Below fields are for `develop` branch
129
- // pub token_symbol: TokenSymbol, // Token_symbol.t
130
- // pub zkapp: Option<ZkAppAccount>, // Zkapp_account.t
131
- // pub zkapp_uri: String, // string
132
126
}
133
127
134
128
pub fn get_legacy_hash_of < T : Hashable > ( init_value : T :: D , item : & T ) -> Fp {
@@ -143,21 +137,6 @@ impl Hashable for AccountLegacy {
143
137
fn to_roinput ( & self ) -> ROInput {
144
138
let mut roi = ROInput :: new ( ) ;
145
139
146
- // Self::token_symbol
147
-
148
- // https://github.com/MinaProtocol/mina/blob/2fac5d806a06af215dbab02f7b154b4f032538b7/src/lib/mina_base/account.ml#L97
149
- // assert!(self.token_symbol.len() <= 6);
150
-
151
- // if !self.token_symbol.is_empty() {
152
- // let mut s = <[u8; 6]>::default();
153
- // let len = self.token_symbol.len();
154
-
155
- // s[..len].copy_from_slice(&self.token_symbol.as_bytes());
156
- // roi.append_bytes(self.token_symbol.as_bytes());
157
- // } else {
158
- // roi.append_bytes(&[0; 6]);
159
- // }
160
-
161
140
// Self::snapp
162
141
let snapp_accout = match self . snap . as_ref ( ) {
163
142
Some ( snapp) => Cow :: Borrowed ( snapp) ,
@@ -167,8 +146,6 @@ impl Hashable for AccountLegacy {
167
146
168
147
roi = roi. append_field ( snapp_digest) ;
169
148
170
- // elog!("ROINPUT={:?}", roi);
171
-
172
149
// Self::permissions
173
150
for auth in [
174
151
self . permissions . set_verification_key ,
@@ -259,142 +236,15 @@ impl Hashable for AccountLegacy {
259
236
roi
260
237
}
261
238
262
- // fn to_roinput(&self) -> ROInput {
263
- // let mut roi = ROInput::new();
264
-
265
- // // Self::public_key
266
- // roi.append_field(self.public_key.x);
267
- // roi.append_bool(self.public_key.is_odd);
268
-
269
- // // Self::token_id
270
- // roi.append_u64(self.token_id.0);
271
-
272
- // // Self::token_permissions
273
- // match self.token_permissions {
274
- // TokenPermissions::TokenOwned { disable_new_accounts } => {
275
- // roi.append_bool(true);
276
- // roi.append_bool(disable_new_accounts);
277
- // },
278
- // TokenPermissions::NotOwned { account_disabled } => {
279
- // roi.append_bool(false);
280
- // roi.append_bool(account_disabled);
281
- // },
282
- // }
283
-
284
- // // Self::balance
285
- // roi.append_u64(self.balance);
286
-
287
- // // Self::token_symbol
288
-
289
- // // https://github.com/MinaProtocol/mina/blob/2fac5d806a06af215dbab02f7b154b4f032538b7/src/lib/mina_base/account.ml#L97
290
- // // assert!(self.token_symbol.len() <= 6);
291
-
292
- // // if !self.token_symbol.is_empty() {
293
- // // let mut s = <[u8; 6]>::default();
294
- // // let len = self.token_symbol.len();
295
-
296
- // // s[..len].copy_from_slice(&self.token_symbol.as_bytes());
297
- // // roi.append_bytes(self.token_symbol.as_bytes());
298
- // // } else {
299
- // // roi.append_bytes(&[0; 6]);
300
- // // }
301
-
302
- // // Self::nonce
303
- // roi.append_u32(self.nonce);
304
-
305
- // // Self::receipt_chain_hash
306
- // roi.append_field(self.receipt_chain_hash.0);
307
-
308
- // // Self::delegate
309
- // match self.delegate.as_ref() {
310
- // Some(delegate) => {
311
- // roi.append_field(delegate.x);
312
- // roi.append_bool(delegate.is_odd);
313
- // },
314
- // None => {
315
- // // Public_key.Compressed.empty
316
- // roi.append_field(Fp::zero());
317
- // roi.append_bool(false);
318
- // },
319
- // }
320
-
321
- // // Self::voting_for
322
- // roi.append_field(self.voting_for.0);
323
-
324
- // // Self::timing
325
- // match self.timing {
326
- // Timing::Untimed => {
327
- // roi.append_bool(false);
328
- // roi.append_u64(0); // initial_minimum_balance
329
- // roi.append_u32(0); // cliff_time
330
- // roi.append_u64(0); // cliff_amount
331
- // roi.append_u32(1); // vesting_period
332
- // roi.append_u64(0); // vesting_increment
333
- // },
334
- // Timing::Timed { initial_minimum_balance, cliff_time, cliff_amount, vesting_period, vesting_increment } => {
335
- // roi.append_bool(true);
336
- // roi.append_u64(initial_minimum_balance);
337
- // roi.append_u32(cliff_time);
338
- // roi.append_u64(cliff_amount);
339
- // roi.append_u32(vesting_period);
340
- // roi.append_u64(vesting_increment);
341
- // },
342
- // }
343
-
344
- // // Self::permissions
345
- // for auth in [
346
- // self.permissions.set_verification_key,
347
- // self.permissions.set_permissions,
348
- // self.permissions.set_delegate,
349
- // self.permissions.receive,
350
- // self.permissions.send,
351
- // self.permissions.edit_state,
352
- // ] {
353
- // for bit in auth.encode().to_bits() {
354
- // roi.append_bool(bit);
355
- // }
356
- // }
357
- // roi.append_bool(self.permissions.stake);
358
-
359
- // // Self::snapp
360
- // let snapp_accout = match self.snap.as_ref() {
361
- // Some(snapp) => Cow::Borrowed(snapp),
362
- // None => Cow::Owned(SnappAccount::default()),
363
- // };
364
- // let mut hasher = create_legacy::<SnappAccount>(());
365
- // hasher.update(snapp_accout.as_ref());
366
- // let snapp_digest = hasher.digest();
367
-
368
- // roi.append_field(snapp_digest);
369
-
370
- // elog!("ROINPUT={:?}", roi);
371
-
372
- // roi
373
- // }
374
-
375
239
fn domain_string ( _: ( ) ) -> Option < String > {
376
240
Some ( "CodaAccount*********" . to_string ( ) )
377
241
}
378
242
}
379
243
380
- // mina_hasher::poseidon::
381
-
382
244
impl AccountLegacy {
383
245
pub fn create ( ) -> Self {
384
- // use o1_utils::field_helpers::FieldHelpers;
385
-
386
- // let token_id = bs58::decode("wSHV2S4qX9jFsLjQo8r1BsMLH2ZRKsZx6EJd1sbozGPieEC4Jf").into_vec().unwrap();
387
- // let token_id = Fp::from_bytes(&token_id).unwrap();
388
-
389
- // elog!("token_id={:?}", token_id.to_string());
390
-
391
- // let t = bs58::encode(token_id).into_string();
392
- // let t = bs58::encode(token_id.to_bytes()).into_string();
393
- // elog!("token_id={:?}", t);
394
-
395
246
let pubkey = CompressedPubKey :: from_address (
396
247
"B62qnzbXmRNo9q32n4SNu2mpB8e7FYYLH8NmaX6oFCBYjjQ8SbD7uzV" ,
397
- // "B62qiTKpEPjGTSHZrtM8uXiKgn8So916pLmNJKDhKeyBQL9TDb3nvBG", // Public_key.Compressed.empty
398
248
)
399
249
. unwrap ( ) ;
400
250
@@ -404,19 +254,14 @@ impl AccountLegacy {
404
254
token_permissions : TokenPermissions :: NotOwned {
405
255
account_disabled : false ,
406
256
} ,
407
- // token_symbol: "".to_string(),
408
- // token_symbol: String::new(),
409
257
balance : Balance :: from_u64 ( 10101 ) ,
410
258
nonce : Nonce :: from_u32 ( 62772 ) ,
411
259
receipt_chain_hash : ReceiptChainHash :: default ( ) ,
412
260
delegate : Some ( pubkey) ,
413
- // delegate: None,
414
261
voting_for : VotingFor :: default ( ) ,
415
262
timing : Timing :: Untimed ,
416
263
permissions : PermissionsLegacy :: user_default ( ) ,
417
264
snap : None ,
418
- // zkapp: None,
419
- // zkapp_uri: String::new(),
420
265
}
421
266
}
422
267
0 commit comments