Skip to content

feat: wonderland token #5

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
xorsal wants to merge 1 commit into
base: main-add-aztec
Choose a base branch
from
Open

feat: wonderland token #5

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion chains/aztec/contracts/train/Nargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ compiler_version = ">=0.25.0"

[dependencies]
aztec = { git="https://github.com/AztecProtocol/aztec-packages/", tag="v3.0.0-devnet.2", directory="noir-projects/aztec-nr/aztec" }
token = { git="https://github.com/AztecProtocol/aztec-packages/", tag="v3.0.0-devnet.2", directory="noir-projects/noir-contracts/contracts/app/token_contract" }
# token = { git="https://github.com/AztecProtocol/aztec-packages/", tag="v3.0.0-devnet.2", directory="noir-projects/noir-contracts/contracts/app/token_contract" }
token = { git="https://github.com/defi-wonderland/aztec-standards/", tag="v3.0.0-devnet.2", directory="src/token_contract" }
sha256 = { tag = "v0.2.1", git = "https://github.com/noir-lang/sha256" }
86 changes: 63 additions & 23 deletions chains/aztec/contracts/train/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ pub contract Train {
protocol_types::{address::AztecAddress, traits::{Deserialize, Packable, Serialize}},
state_vars::{DelayedPublicMutable, map::Map, private_immutable::PrivateImmutable},
};
use dep::sha256;
use dep::token::Token;
use sha256;
use token::Token;

use crate::lib::{bytes_to_u128_limbs, u128_limbs_to_bytes};
use crate::types::events::{
Expand Down Expand Up @@ -108,7 +108,7 @@ pub contract Train {
);

Token::at(token)
.transfer_to_public(
.transfer_private_to_public(
context.msg_sender().expect(f"Sender must not be none!"),
context.this_address(),
amount,
Expand Down Expand Up @@ -213,12 +213,24 @@ pub contract Train {
let htlc_private = storage.contracts_private.at(Id).get_note();
let htlc_public = storage.contracts_public.at(Id).get_current_value();

let partial_note = Token::at(htlc_public.token)
.prepare_private_balance_increase(htlc_private.owner)
.call(&mut context);
let commitment = Token::at(htlc_public.token)
.initialize_transfer_commitment(
htlc_private.owner,
context.this_address()
).call(&mut context);
Token::at(htlc_public.token)
.finalize_transfer_to_private(htlc_public.amount, partial_note)
.enqueue(&mut context);
.transfer_public_to_commitment(
context.this_address(),
commitment,
htlc_public.amount,
0 as Field,
).enqueue(&mut context);
// let partial_note = Token::at(htlc_public.token)
// .prepare_private_balance_increase(htlc_private.owner)
// .call(&mut context);
// Token::at(htlc_public.token)
// .finalize_transfer_to_private(htlc_public.amount, partial_note)
// .enqueue(&mut context);
}

#[external("public")]
Expand Down Expand Up @@ -290,14 +302,24 @@ pub contract Train {
MessageDelivery.CONSTRAINED_ONCHAIN,
);


Token::at(token)
.transfer_to_public(
.transfer_private_to_public(
context.msg_sender().expect(f"Sender must not be none!"),
context.this_address(),
amount,
randomness,
)
.call(&mut context);

// Token::at(token)
// .transfer_to_public(
// context.msg_sender().expect(f"Sender must not be none!"),
// context.this_address(),
// amount,
// randomness,
// )
// .call(&mut context);
}

#[internal]
Expand Down Expand Up @@ -371,22 +393,40 @@ pub contract Train {
let htlc_public = storage.contracts_public.at(Id).get_current_value();
if (htlc_public.ownership_hash_high == 0 as u128) {
if htlc_public.ownership_hash_low == 0 as u128 {
let partial_note = Token::at(htlc_public.token)
.prepare_private_balance_increase(htlc_public.src_receiver)
.call(&mut context);
Token::at(htlc_public.token)
.finalize_transfer_to_private(htlc_public.amount, partial_note)
.enqueue(&mut context);
let commitment = Token::at(htlc_public.token).initialize_transfer_commitment(
htlc_public.src_receiver, context.this_address()
).call(&mut context);
Token::at(htlc_public.token).transfer_public_to_commitment(
context.this_address(),
commitment,
htlc_public.amount,
0 as Field,
).enqueue(&mut context);
// let partial_note = Token::at(htlc_public.token)
// .prepare_private_balance_increase(htlc_public.src_receiver)
// .call(&mut context);
// Token::at(htlc_public.token)
// .finalize_transfer_to_private(htlc_public.amount, partial_note)
// .enqueue(&mut context);
}
} else {
let partial_note = Token::at(htlc_public.token)
.prepare_private_balance_increase(context.msg_sender().expect(
f"Sender must not be none!",
))
.call(&mut context);
Token::at(htlc_public.token)
.finalize_transfer_to_private(htlc_public.amount, partial_note)
.enqueue(&mut context);
let commitment = Token::at(htlc_public.token).initialize_transfer_commitment(
context.msg_sender().expect(f"Sender must not be none!"), context.this_address()
).call(&mut context);
Token::at(htlc_public.token).transfer_public_to_commitment(
context.this_address(),
commitment,
htlc_public.amount,
0 as Field,
).enqueue(&mut context);
// let partial_note = Token::at(htlc_public.token)
// .prepare_private_balance_increase(context.msg_sender().expect(
// f"Sender must not be none!",
// ))
// .call(&mut context);
// Token::at(htlc_public.token)
// .finalize_transfer_to_private(htlc_public.amount, partial_note)
// .enqueue(&mut context);
}
}

Expand Down