Skip to content

refactor: remove commented-out code from ledger legacy account module #1219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+0 −155
Open

refactor: remove commented-out code from ledger legacy account module #1219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 0 additions & 155 deletions ledger/src/account/legacy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,6 @@ impl Hashable for SnappAccount {
roi = roi.append_field(*field);
}

// elog!("ROInput={:?}", roi);

roi
}

Expand All @@ -125,10 +123,6 @@ pub struct AccountLegacy {
pub timing: Timing, // Timing.t
pub permissions: PermissionsLegacy<AuthRequired>, // Permissions.t
pub snap: Option<SnappAccount>,
// Below fields are for `develop` branch
// pub token_symbol: TokenSymbol, // Token_symbol.t
// pub zkapp: Option<ZkAppAccount>, // Zkapp_account.t
// pub zkapp_uri: String, // string
}

pub fn get_legacy_hash_of<T: Hashable>(init_value: T::D, item: &T) -> Fp {
Expand All @@ -143,21 +137,6 @@ impl Hashable for AccountLegacy {
fn to_roinput(&self) -> ROInput {
let mut roi = ROInput::new();

// Self::token_symbol

// https://github.com/MinaProtocol/mina/blob/2fac5d806a06af215dbab02f7b154b4f032538b7/src/lib/mina_base/account.ml#L97
// assert!(self.token_symbol.len() <= 6);

// if !self.token_symbol.is_empty() {
// let mut s = <[u8; 6]>::default();
// let len = self.token_symbol.len();

// s[..len].copy_from_slice(&self.token_symbol.as_bytes());
// roi.append_bytes(self.token_symbol.as_bytes());
// } else {
// roi.append_bytes(&[0; 6]);
// }

// Self::snapp
let snapp_accout = match self.snap.as_ref() {
Some(snapp) => Cow::Borrowed(snapp),
Expand All @@ -167,8 +146,6 @@ impl Hashable for AccountLegacy {

roi = roi.append_field(snapp_digest);

// elog!("ROINPUT={:?}", roi);

// Self::permissions
for auth in [
self.permissions.set_verification_key,
Expand Down Expand Up @@ -259,142 +236,15 @@ impl Hashable for AccountLegacy {
roi
}

// fn to_roinput(&self) -> ROInput {
// let mut roi = ROInput::new();

// // Self::public_key
// roi.append_field(self.public_key.x);
// roi.append_bool(self.public_key.is_odd);

// // Self::token_id
// roi.append_u64(self.token_id.0);

// // Self::token_permissions
// match self.token_permissions {
// TokenPermissions::TokenOwned { disable_new_accounts } => {
// roi.append_bool(true);
// roi.append_bool(disable_new_accounts);
// },
// TokenPermissions::NotOwned { account_disabled } => {
// roi.append_bool(false);
// roi.append_bool(account_disabled);
// },
// }

// // Self::balance
// roi.append_u64(self.balance);

// // Self::token_symbol

// // https://github.com/MinaProtocol/mina/blob/2fac5d806a06af215dbab02f7b154b4f032538b7/src/lib/mina_base/account.ml#L97
// // assert!(self.token_symbol.len() <= 6);

// // if !self.token_symbol.is_empty() {
// // let mut s = <[u8; 6]>::default();
// // let len = self.token_symbol.len();

// // s[..len].copy_from_slice(&self.token_symbol.as_bytes());
// // roi.append_bytes(self.token_symbol.as_bytes());
// // } else {
// // roi.append_bytes(&[0; 6]);
// // }

// // Self::nonce
// roi.append_u32(self.nonce);

// // Self::receipt_chain_hash
// roi.append_field(self.receipt_chain_hash.0);

// // Self::delegate
// match self.delegate.as_ref() {
// Some(delegate) => {
// roi.append_field(delegate.x);
// roi.append_bool(delegate.is_odd);
// },
// None => {
// // Public_key.Compressed.empty
// roi.append_field(Fp::zero());
// roi.append_bool(false);
// },
// }

// // Self::voting_for
// roi.append_field(self.voting_for.0);

// // Self::timing
// match self.timing {
// Timing::Untimed => {
// roi.append_bool(false);
// roi.append_u64(0); // initial_minimum_balance
// roi.append_u32(0); // cliff_time
// roi.append_u64(0); // cliff_amount
// roi.append_u32(1); // vesting_period
// roi.append_u64(0); // vesting_increment
// },
// Timing::Timed { initial_minimum_balance, cliff_time, cliff_amount, vesting_period, vesting_increment } => {
// roi.append_bool(true);
// roi.append_u64(initial_minimum_balance);
// roi.append_u32(cliff_time);
// roi.append_u64(cliff_amount);
// roi.append_u32(vesting_period);
// roi.append_u64(vesting_increment);
// },
// }

// // Self::permissions
// for auth in [
// self.permissions.set_verification_key,
// self.permissions.set_permissions,
// self.permissions.set_delegate,
// self.permissions.receive,
// self.permissions.send,
// self.permissions.edit_state,
// ] {
// for bit in auth.encode().to_bits() {
// roi.append_bool(bit);
// }
// }
// roi.append_bool(self.permissions.stake);

// // Self::snapp
// let snapp_accout = match self.snap.as_ref() {
// Some(snapp) => Cow::Borrowed(snapp),
// None => Cow::Owned(SnappAccount::default()),
// };
// let mut hasher = create_legacy::<SnappAccount>(());
// hasher.update(snapp_accout.as_ref());
// let snapp_digest = hasher.digest();

// roi.append_field(snapp_digest);

// elog!("ROINPUT={:?}", roi);

// roi
// }

fn domain_string(_: ()) -> Option<String> {
Some("CodaAccount*********".to_string())
}
}

// mina_hasher::poseidon::

impl AccountLegacy {
pub fn create() -> Self {
// use o1_utils::field_helpers::FieldHelpers;

// let token_id = bs58::decode("wSHV2S4qX9jFsLjQo8r1BsMLH2ZRKsZx6EJd1sbozGPieEC4Jf").into_vec().unwrap();
// let token_id = Fp::from_bytes(&token_id).unwrap();

// elog!("token_id={:?}", token_id.to_string());

// let t = bs58::encode(token_id).into_string();
// let t = bs58::encode(token_id.to_bytes()).into_string();
// elog!("token_id={:?}", t);

let pubkey = CompressedPubKey::from_address(
"B62qnzbXmRNo9q32n4SNu2mpB8e7FYYLH8NmaX6oFCBYjjQ8SbD7uzV",
// "B62qiTKpEPjGTSHZrtM8uXiKgn8So916pLmNJKDhKeyBQL9TDb3nvBG", // Public_key.Compressed.empty
)
.unwrap();

Expand All @@ -404,19 +254,14 @@ impl AccountLegacy {
token_permissions: TokenPermissions::NotOwned {
account_disabled: false,
},
// token_symbol: "".to_string(),
// token_symbol: String::new(),
balance: Balance::from_u64(10101),
nonce: Nonce::from_u32(62772),
receipt_chain_hash: ReceiptChainHash::default(),
delegate: Some(pubkey),
// delegate: None,
voting_for: VotingFor::default(),
timing: Timing::Untimed,
permissions: PermissionsLegacy::user_default(),
snap: None,
// zkapp: None,
// zkapp_uri: String::new(),
}
}

Expand Down