Skip to content
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

feat(stack): implement control flow and checktimelock #2217

Closed
wants to merge 10 commits into from
Closed

feat(stack): implement control flow and checktimelock #2217

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
78aab3f
feat(stack): implement control flow
tmpolaczyk Jun 7, 2022
65e183e
feat(stack): allow context in machine operate function
tmpolaczyk Jun 8, 2022
c301938
feat: implement CheckTimelock scripting operator
tmpolaczyk Jun 8, 2022
7057d7f
feat(stack): Sha256 operator
tmpolaczyk Jun 8, 2022
81eb69a
feat: add error handling to script encode and decode
tmpolaczyk Jun 8, 2022
85dc1dd
feat(node): avoid unused call to signature_mngr in BuildScriptTx
tmpolaczyk Jun 13, 2022
9eb710e
feat(stack): remove MyControlFlow enum, use simple Result instead
tmpolaczyk Jun 13, 2022
0ff9da4
feat(stack): implement CheckSig operator
tmpolaczyk Jun 14, 2022
c96a82e
test(stack): add atomic swap use case test
tmpolaczyk Jun 15, 2022
b557090
test(stack): add another atomic swap test case
tmpolaczyk Jun 20, 2022
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
2 changes: 1 addition & 1 deletion node/src/actors/chain_manager/handlers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1310,7 +1310,7 @@ impl Handler<BuildScriptTransaction> for ChainManager {
.into_actor(self)
tmpolaczyk marked this conversation as resolved.
Show resolved Hide resolved
.then(|s, _act, _ctx| match s {
Ok(_signatures) => {
let multi_sig_witness = witnet_stack::encode(vec![]);
let multi_sig_witness = witnet_stack::encode(vec![]).unwrap();
let num_inputs = vtt.inputs.len();
let transaction = Transaction::ValueTransfer(VTTransaction {
body: vtt,
Expand Down
8 changes: 4 additions & 4 deletions src/cli/node/json_rpc_client.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@ pub fn create_multisig_address(
]);

let locking_script_hash =
PublicKeyHash::from_script_bytes(&witnet_stack::encode(redeem_script));
PublicKeyHash::from_script_bytes(&witnet_stack::encode(redeem_script)?);

println!(
"Sending to {}-of-{} multisig address {} composed of {:?}",
Expand Down Expand Up @@ -778,7 +778,7 @@ pub fn create_opened_multisig(
Item::Value(MyValue::Integer(i128::from(n))),
Item::Operator(MyOperator::CheckMultiSig),
]);
let redeem_script_bytes = witnet_stack::encode(redeem_script);
let redeem_script_bytes = witnet_stack::encode(redeem_script)?;
let vt_outputs = vec![ValueTransferOutput {
pkh: address,
value,
Expand Down Expand Up @@ -854,13 +854,13 @@ pub fn sign_tx(addr: SocketAddr, hex: String, dry_run: bool) -> Result<(), failu
match tx {
Transaction::ValueTransfer(ref mut vtt) => {
let signature_bytes = signature.to_pb_bytes()?;
let mut script = witnet_stack::decode(&vtt.witness[0]);
let mut script = witnet_stack::decode(&vtt.witness[0])?;

println!("Previous script:\n{:?}", script);
script.push(Item::Value(MyValue::Signature(signature_bytes)));

println!("Post script:\n{:?}", script);
let encoded_script = witnet_stack::encode(script);
let encoded_script = witnet_stack::encode(script)?;

vtt.witness[0] = encoded_script;

Expand Down
Loading