logos-blockchain/lssa
1
0
Fork 0
mirror of https://github.com/logos-blockchain/lssa.git synced 2026-01-08 08:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

move claiming accounts logic to state transition

Browse Source
This commit is contained in:
Sergio Chouhy 2025-08-14 14:48:20 -03:00
parent d1ebb831ef
commit a694e705ea
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nssa/src/program.rs
View File

@ -45,28 +45,15 @@ impl Program {
// Get outputs // Get outputs
let ProgramOutput { let ProgramOutput {
post_states: mut post_states, mut post_states, ..
..
} = session_info } = session_info
.journal .journal
.decode() .decode()
.map_err(|e| NssaError::ProgramExecutionFailed(e.to_string()))?; .map_err(|e| NssaError::ProgramExecutionFailed(e.to_string()))?;
// TODO: Move this logic to `V01State::transition_from_public_transaction`.
self.claim_accounts_with_default_program_owner(&mut post_states);
Ok(post_states) Ok(post_states)
} }
fn claim_accounts_with_default_program_owner(&self, post_states: &mut [Account]) {
// Claim any output account with default program owner field
for account in post_states.iter_mut() {
if account.program_owner == DEFAULT_PROGRAM_ID {
account.program_owner = self.id;
}
}
}
/// Executes and proves the program `P`. /// Executes and proves the program `P`.
/// Returns the proof /// Returns the proof
fn execute_and_prove( fn execute_and_prove(
@ -218,13 +205,10 @@ mod tests {
let expected_sender_post = Account { let expected_sender_post = Account {
balance: 77665544332211 - balance_to_move, balance: 77665544332211 - balance_to_move,
program_owner: program.id(),
..Account::default() ..Account::default()
}; };
let expected_recipient_post = Account { let expected_recipient_post = Account {
balance: balance_to_move, balance: balance_to_move,
// Program claims the account since the pre_state has default prorgam owner
program_owner: program.id(),
..Account::default() ..Account::default()
}; };
let [sender_post, recipient_post] = program let [sender_post, recipient_post] = program

10
nssa/src/state.rs
View File

@ -1,7 +1,10 @@
use crate::{ use crate::{
address::Address, error::NssaError, program::Program, public_transaction::PublicTransaction, address::Address, error::NssaError, program::Program, public_transaction::PublicTransaction,
}; };
use nssa_core::{account::Account, program::ProgramId}; use nssa_core::{
account::Account,
program::{DEFAULT_PROGRAM_ID, ProgramId},
};
use std::collections::HashMap; use std::collections::HashMap;
pub struct V01State { pub struct V01State {
@ -48,7 +51,12 @@ impl V01State {
for (address, post) in state_diff.into_iter() { for (address, post) in state_diff.into_iter() {
let current_account = self.get_account_by_address_mut(address); let current_account = self.get_account_by_address_mut(address);
*current_account = post; *current_account = post;
// The invoked program claims the accounts with default program id.
if current_account.program_owner == DEFAULT_PROGRAM_ID {
current_account.program_owner = tx.message().program_id;
}
} }
for address in tx.signer_addresses() { for address in tx.signer_addresses() {