remove old program output constructors

This commit is contained in:
Sergio Chouhy
2026-03-25 16:56:04 -03:00
parent 3356aef291
commit abc30c0ce0
25 changed files with 91 additions and 116 deletions
+3 -6
View File
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = u128;
@@ -19,9 +19,6 @@ fn main() {
let mut account_post = account_pre.clone();
account_post.balance = account_post.balance.saturating_sub(balance_to_burn);
write_nssa_outputs(
instruction_words,
vec![pre],
vec![AccountPostState::new(account_post)],
);
ProgramOutput::new(instruction_words, vec![pre], vec![AccountPostState::new(account_post)])
.write();
}
@@ -1,6 +1,6 @@
use nssa_core::program::{
AccountPostState, ChainedCall, PdaSeed, ProgramId, ProgramInput, read_nssa_inputs,
write_nssa_outputs_with_chained_call,
AccountPostState, ChainedCall, PdaSeed, ProgramId, ProgramInput, ProgramOutput,
read_nssa_inputs,
};
use risc0_zkvm::serde::to_vec;
@@ -54,13 +54,14 @@ fn main() {
};
}
write_nssa_outputs_with_chained_call(
ProgramOutput::new(
instruction_words,
vec![sender_pre.clone(), recipient_pre.clone()],
vec![
AccountPostState::new(sender_pre.account),
AccountPostState::new(recipient_pre.account),
],
chained_calls,
);
)
.with_chained_calls(chained_calls)
.write();
}
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = (Option<Vec<u8>>, bool);
@@ -33,5 +33,5 @@ fn main() {
AccountPostState::new(account_post)
};
write_nssa_outputs(instruction_words, vec![pre], vec![post_state]);
ProgramOutput::new(instruction_words, vec![pre], vec![post_state]).write();
}
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = ();
@@ -17,5 +17,5 @@ fn main() {
let account_post = AccountPostState::new_claimed(pre.account.clone());
write_nssa_outputs(instruction_words, vec![pre], vec![account_post]);
ProgramOutput::new(instruction_words, vec![pre], vec![account_post]).write();
}
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = Vec<u8>;
@@ -22,9 +22,10 @@ fn main() {
.try_into()
.expect("provided data should fit into data limit");
write_nssa_outputs(
ProgramOutput::new(
instruction_words,
vec![pre],
vec![AccountPostState::new_claimed(account_post)],
);
)
.write();
}
@@ -1,6 +1,6 @@
use nssa_core::{
account::Account,
program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs},
program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs},
};
type Instruction = ();
@@ -14,12 +14,13 @@ fn main() {
let account_pre = pre.account.clone();
write_nssa_outputs(
ProgramOutput::new(
instruction_words,
vec![pre],
vec![
AccountPostState::new(account_pre),
AccountPostState::new(Account::default()),
],
);
)
.write();
}
@@ -1,8 +1,7 @@
use nssa_core::{
account::AccountWithMetadata,
program::{
AccountPostState, ChainedCall, ProgramId, ProgramInput, read_nssa_inputs,
write_nssa_outputs_with_chained_call,
AccountPostState, ChainedCall, ProgramId, ProgramInput, ProgramOutput, read_nssa_inputs,
},
};
use risc0_zkvm::serde::to_vec;
@@ -40,13 +39,14 @@ fn main() {
pda_seeds: vec![],
};
write_nssa_outputs_with_chained_call(
ProgramOutput::new(
instruction_words,
vec![sender.clone(), receiver.clone()],
vec![
AccountPostState::new(sender.account),
AccountPostState::new(receiver.account),
],
vec![chained_call],
);
)
.with_chained_calls(vec![chained_call])
.write();
}
+3 -6
View File
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = ();
@@ -16,9 +16,6 @@ fn main() {
.checked_add(1)
.expect("Balance overflow");
write_nssa_outputs(
instruction_words,
vec![pre],
vec![AccountPostState::new(account_post)],
);
ProgramOutput::new(instruction_words, vec![pre], vec![AccountPostState::new(account_post)])
.write();
}
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = ();
@@ -11,9 +11,10 @@ fn main() {
let account_pre1 = pre1.account.clone();
write_nssa_outputs(
ProgramOutput::new(
instruction_words,
vec![pre1, pre2],
vec![AccountPostState::new(account_pre1)],
);
)
.write();
}
@@ -5,7 +5,7 @@
use nssa_core::{
account::{Account, AccountWithMetadata},
program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs},
program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs},
};
/// Initializes a default account under the ownership of this program.
@@ -80,5 +80,5 @@ fn main() {
}
_ => panic!("invalid params"),
};
write_nssa_outputs(instruction_data, pre_states, post_states);
ProgramOutput::new(instruction_data, pre_states, post_states).write();
}
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = ();
@@ -13,9 +13,6 @@ fn main() {
let mut account_post = account_pre.clone();
account_post.nonce.public_account_nonce_increment();
write_nssa_outputs(
instruction_words,
vec![pre],
vec![AccountPostState::new(account_post)],
);
ProgramOutput::new(instruction_words, vec![pre], vec![AccountPostState::new(account_post)])
.write();
}
+2 -2
View File
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = ();
@@ -9,5 +9,5 @@ fn main() {
.iter()
.map(|account| AccountPostState::new(account.account.clone()))
.collect();
write_nssa_outputs(instruction_words, pre_states, post_states);
ProgramOutput::new(instruction_words, pre_states, post_states).write();
}
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = ();
@@ -13,9 +13,6 @@ fn main() {
let mut account_post = account_pre.clone();
account_post.program_owner = [0, 1, 2, 3, 4, 5, 6, 7];
write_nssa_outputs(
instruction_words,
vec![pre],
vec![AccountPostState::new(account_post)],
);
ProgramOutput::new(instruction_words, vec![pre], vec![AccountPostState::new(account_post)])
.write();
}
@@ -1,4 +1,4 @@
use nssa_core::program::{AccountPostState, ProgramInput, read_nssa_inputs, write_nssa_outputs};
use nssa_core::program::{AccountPostState, ProgramInput, ProgramOutput, read_nssa_inputs};
type Instruction = u128;
@@ -26,12 +26,13 @@ fn main() {
.checked_add(balance)
.expect("Overflow when adding balance");
write_nssa_outputs(
ProgramOutput::new(
instruction_words,
vec![sender_pre, receiver_pre],
vec![
AccountPostState::new(sender_post),
AccountPostState::new(receiver_post),
],
);
)
.write();
}