logos-blockchain/logos-execution-zone
1
0
Fork 0
mirror of https://github.com/logos-blockchain/logos-execution-zone.git synced 2026-06-29 10:29:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(lee): Program::*().id() is optimized with alternative id only calls, SYSTEM_FAUCET_ACCOUNT_ID and SYSTEM_BRIDGE_ACCOUNT_ID now uses LazyLock to avoid hashing each time

Browse Source
This commit is contained in:
erhant 2026-06-15 12:53:56 +03:00
parent 6744e2f8c3
commit d8bf5c9ef4
2 changed files with 69 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
lee/state_machine/src/program.rs
View File

@ -113,66 +113,98 @@ impl Program {
#[must_use]
pub fn authenticated_transfer_program() -> Self {
Self {
id: AUTHENTICATED_TRANSFER_ID,
id: Self::authenticated_transfer_program_id(),
elf: AUTHENTICATED_TRANSFER_ELF.to_vec(),
}
}
#[must_use]
pub const fn authenticated_transfer_program_id() -> ProgramId {
AUTHENTICATED_TRANSFER_ID
}
#[must_use]
pub fn token() -> Self {
Self {
id: TOKEN_ID,
id: Self::token_id(),
elf: TOKEN_ELF.to_vec(),
}
}
#[must_use]
pub const fn token_id() -> ProgramId {
TOKEN_ID
}
#[must_use]
pub fn amm() -> Self {
Self {
id: AMM_ID,
id: Self::amm_id(),
elf: AMM_ELF.to_vec(),
}
}
#[must_use]
pub const fn amm_id() -> ProgramId {
AMM_ID
}
#[must_use]
pub fn clock() -> Self {
Self {
id: CLOCK_ID,
id: Self::clock_id(),
elf: CLOCK_ELF.to_vec(),
}
}
#[must_use]
pub const fn clock_id() -> ProgramId {
CLOCK_ID
}
#[must_use]
pub fn ata() -> Self {
Self {
id: ASSOCIATED_TOKEN_ACCOUNT_ID,
id: Self::ata_id(),
elf: ASSOCIATED_TOKEN_ACCOUNT_ELF.to_vec(),
}
}
#[must_use]
pub const fn ata_id() -> ProgramId {
ASSOCIATED_TOKEN_ACCOUNT_ID
}
#[must_use]
pub fn vault() -> Self {
Self {
id: VAULT_ID,
id: Self::vault_id(),
elf: VAULT_ELF.to_vec(),
}
}
#[must_use]
pub const fn vault_id() -> ProgramId {
VAULT_ID
}
#[must_use]
pub fn faucet() -> Self {
Self {
id: FAUCET_ID,
id: Self::faucet_id(),
elf: FAUCET_ELF.to_vec(),
}
}
#[must_use]
pub const fn faucet_id() -> ProgramId {
FAUCET_ID
}
#[must_use]
pub fn bridge() -> Self {
Self {
id: BRIDGE_ID,
id: Self::bridge_id(),
elf: BRIDGE_ELF.to_vec(),
}
}
#[must_use]
pub const fn bridge_id() -> ProgramId {
BRIDGE_ID
}
}
// TODO: Testnet only. Refactor to prevent compilation on mainnet.
@ -180,19 +212,26 @@ impl Program {
#[must_use]
pub fn pinata() -> Self {
Self {
id: PINATA_ID,
id: Self::pinata_id(),
elf: PINATA_ELF.to_vec(),
}
}
#[must_use]
pub const fn pinata_id() -> ProgramId {
PINATA_ID
}
#[must_use]
pub fn pinata_token() -> Self {
use crate::program_methods::{PINATA_TOKEN_ELF, PINATA_TOKEN_ID};
Self {
id: PINATA_TOKEN_ID,
elf: PINATA_TOKEN_ELF.to_vec(),
id: Self::pinata_token_id(),
elf: crate::program_methods::PINATA_TOKEN_ELF.to_vec(),
}
}
#[must_use]
pub const fn pinata_token_id() -> ProgramId {
crate::program_methods::PINATA_TOKEN_ID
}
}
#[cfg(test)]

28
lee/state_machine/src/state.rs
View File

@ -1,4 +1,7 @@
use std::collections::{BTreeSet, HashMap, HashSet};
use std::{
collections::{BTreeSet, HashMap, HashSet},
sync::LazyLock,
};
use borsh::{BorshDeserialize, BorshSerialize};
use clock_core::ClockAccountData;
@ -25,6 +28,12 @@ use crate::{
pub const MAX_NUMBER_CHAINED_CALLS: usize = 10;
static SYSTEM_FAUCET_ACCOUNT_ID: LazyLock<AccountId> =
LazyLock::new(|| faucet_core::compute_faucet_account_id(Program::faucet_id()));
static SYSTEM_BRIDGE_ACCOUNT_ID: LazyLock<AccountId> =
LazyLock::new(|| bridge_core::compute_bridge_account_id(Program::bridge_id()));
#[derive(Clone, BorshSerialize, BorshDeserialize)]
#[cfg_attr(test, derive(Debug, PartialEq, Eq))]
pub struct CommitmentSet {
@ -154,14 +163,13 @@ impl V03State {
) -> Self {
let faucet_account_id = system_faucet_account_id();
let bridge_account_id = system_bridge_account_id();
let authenticated_transfer_program = Program::authenticated_transfer_program();
let mut public_state: HashMap<_, _> = initial_data
.iter()
.copied()
.map(|(account_id, balance)| {
let account = Account {
balance,
program_owner: authenticated_transfer_program.id(),
program_owner: Program::authenticated_transfer_program_id(),
..Account::default()
};
(account_id, account)
@ -207,7 +215,7 @@ impl V03State {
timestamp: genesis_timestamp,
}
.to_bytes();
let clock_program_id = Program::clock().id();
let clock_program_id = Program::clock_id();
for account_id in CLOCK_PROGRAM_ACCOUNT_IDS {
self.public_state.insert(
account_id,
@ -350,7 +358,7 @@ impl V03State {
self.public_state.insert(
account_id,
Account {
program_owner: Program::pinata().id(),
program_owner: Program::pinata_id(),
balance: 1_500_000,
// Difficulty: 3
data: vec![3; 33].try_into().expect("should fit"),
@ -365,7 +373,7 @@ impl V03State {
self.public_state.insert(
account_id,
Account {
program_owner: Program::pinata_token().id(),
program_owner: Program::pinata_token_id(),
// Difficulty: 3
data: vec![3; 33].try_into().expect("should fit"),
..Account::default()
@ -383,7 +391,7 @@ impl V03State {
fn system_faucet_account() -> Account {
Account {
program_owner: Program::authenticated_transfer_program().id(),
program_owner: Program::authenticated_transfer_program_id(),
balance: u128::MAX,
..Account::default()
}
@ -391,19 +399,19 @@ fn system_faucet_account() -> Account {
fn system_bridge_account() -> Account {
Account {
program_owner: Program::authenticated_transfer_program().id(),
program_owner: Program::authenticated_transfer_program_id(),
..Account::default()
}
}
#[must_use]
pub fn system_faucet_account_id() -> AccountId {
faucet_core::compute_faucet_account_id(Program::faucet().id())
*SYSTEM_FAUCET_ACCOUNT_ID
}
#[must_use]
pub fn system_bridge_account_id() -> AccountId {
bridge_core::compute_bridge_account_id(Program::bridge().id())
*SYSTEM_BRIDGE_ACCOUNT_ID
}
#[cfg(test)]