Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion 08-custom-tokens/src/BasicTokenContract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ import {
UInt64,
PublicKey,
Signature,
UInt32,
} from 'snarkyjs';

const tokenSymbol = 'MYTKN';

export class BasicTokenContract extends SmartContract {
@state(UInt64) totalAmountInCirculation = State<UInt64>();
@state(UInt32) mintNonce = State<UInt32>();

deploy(args: DeployArgs) {
super.deploy(args);
Expand Down Expand Up @@ -44,11 +46,13 @@ export class BasicTokenContract extends SmartContract {
this.totalAmountInCirculation.assertEquals(totalAmountInCirculation);

let newTotalAmountInCirculation = totalAmountInCirculation.add(amount);
let nonce = this.mintNonce.get();
this.mintNonce.assertEquals(nonce);

adminSignature
.verify(
this.address,
amount.toFields().concat(receiverAddress.toFields())
amount.toFields().concat(...receiverAddress.toFields(), ...nonce.toFields())
)
.assertTrue();

Expand All @@ -57,6 +61,7 @@ export class BasicTokenContract extends SmartContract {
amount,
});

this.mintNonce.set(nonce.add(1));
this.totalAmountInCirculation.set(newTotalAmountInCirculation);
}

Expand Down
7 changes: 6 additions & 1 deletion 08-custom-tokens/src/WhitelistedTokenContract.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
Signature,
Poseidon,
MerkleWitness,
UInt32,
} from 'snarkyjs';

class MerkleWitness20 extends MerkleWitness(20) {}
Expand All @@ -19,6 +20,7 @@ const tokenSymbol = 'MYTKN';

export class WhitelistedTokenContract extends SmartContract {
@state(UInt64) totalAmountInCirculation = State<UInt64>();
@state(UInt32) mintNonce = State<UInt32>();
@state(Field) whitelistTreeRoot = State<Field>();

deploy(args: DeployArgs) {
Expand Down Expand Up @@ -54,11 +56,13 @@ export class WhitelistedTokenContract extends SmartContract {
this.totalAmountInCirculation.assertEquals(totalAmountInCirculation);

let newTotalAmountInCirculation = totalAmountInCirculation.add(amount);
let nonce = this.mintNonce.get();
this.mintNonce.assertEquals(nonce);

adminSignature
.verify(
this.address,
amount.toFields().concat(receiverAddress.toFields())
amount.toFields().concat(...receiverAddress.toFields(), ...nonce.toFields())
)
.assertTrue();

Expand All @@ -67,6 +71,7 @@ export class WhitelistedTokenContract extends SmartContract {
amount,
});

this.mintNonce.set(nonce.add(1));
this.totalAmountInCirculation.set(newTotalAmountInCirculation);
}

Expand Down