Skip to content

fix: remove hard coded canonical gas address #5106

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

Merged
alexghr merged 1 commit into from
Mar 11, 2024
Merged

fix: remove hard coded canonical gas address #5106

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
8 changes: 1 addition & 7 deletions noir-projects/noir-contracts/contracts/app_subscription_contract/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ contract AppSubscription {

global SUBSCRIPTION_DURATION_IN_BLOCKS = 5;
global SUBSCRIPTION_TXS = 5;
global CANONICAL_GAS_TOKEN_ADDRESS = AztecAddress::from_field(10518537853519909204957666322334442672584410385979059968848104222965977783517);

#[aztec(private)]
fn entrypoint(payload: pub DAppPayload, user_address: pub AztecAddress) {
Expand Down Expand Up @@ -82,12 +81,7 @@ contract AppSubscription {
storage.subscription_recipient_address.initialize(subscription_recipient_address);
storage.subscription_price.initialize(subscription_price);

let actual_gas_token_address = if is_empty(gas_token_address) {
CANONICAL_GAS_TOKEN_ADDRESS
} else {
gas_token_address
};
storage.gas_token_address.initialize(actual_gas_token_address);
storage.gas_token_address.initialize(gas_token_address);
}

#[aztec(public)]
Expand Down
10 changes: 1 addition & 9 deletions noir-projects/noir-contracts/contracts/fpc_contract/src/main.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,11 @@ contract FPC {
gas_token_address: SharedImmutable<AztecAddress>,
}

global CANONICAL_GAS_TOKEN_ADDRESS = AztecAddress::from_field(10518537853519909204957666322334442672584410385979059968848104222965977783517);

#[aztec(public)]
#[aztec(initializer)]
fn constructor(other_asset: AztecAddress, gas_token_address: AztecAddress) {
let actual_gas_token_address = if is_empty(gas_token_address) {
CANONICAL_GAS_TOKEN_ADDRESS
} else {
gas_token_address
};

storage.other_asset.initialize(other_asset);
storage.gas_token_address.initialize(actual_gas_token_address);
storage.gas_token_address.initialize(gas_token_address);
}

#[aztec(private)]
Expand Down
4 changes: 2 additions & 2 deletions yarn-project/end-to-end/src/e2e_dapp_subscription.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ describe('e2e_dapp_subscription', () => {
bananaCoin = await BananaCoin.deploy(aliceWallet, aliceAddress, TOKEN_NAME, TOKEN_SYMBOL, TOKEN_DECIMALS)
.send()
.deployed();
bananaFPC = await FPCContract.deploy(aliceWallet, bananaCoin.address, AztecAddress.ZERO).send().deployed();
bananaFPC = await FPCContract.deploy(aliceWallet, bananaCoin.address, gasTokenContract.address).send().deployed();

counterContract = await CounterContract.deploy(bobWallet, 0, bobAddress).send().deployed();

Expand All @@ -95,7 +95,7 @@ describe('e2e_dapp_subscription', () => {
// anyone can purchase a subscription for 100 test tokens
bananaCoin.address,
SUBSCRIPTION_AMOUNT,
AztecAddress.ZERO,
gasTokenContract.address,
)
.send()
.deployed();
Expand Down