Skip to content

fix: contract deployment and type issues for SDK compatibility #163

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

fix: contract deployment and type issues for SDK compatibility #163

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
18 changes: 8 additions & 10 deletions scripts/fees.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ async function main() {

const feeJuicePortalManager = await L1FeeJuicePortalManager.new(
pxe,
//@ts-ignore
l1Client,
l1Client as any,
logger,
);

Expand All @@ -68,12 +67,12 @@ async function main() {

// Two arbitrary txs to make the L1 message available on L2
const votingContract = await EasyPrivateVotingContract.deploy(wallet1, wallet1.getAddress()).send({ fee: { paymentMethod } }).deployed();
const bananaCoin = await TokenContract.deploy(wallet1, wallet1.getAddress(), "bananaCoin", "BNC", 18).send({ fee: { paymentMethod } }).deployed()
const bananaCoin = await TokenContract.deploy({ wallet: wallet1, name: "bananaCoin", symbol: "BNC", decimals: 18 }).send({ fee: { paymentMethod } }).deployed()

// Claim Fee Juice & Pay Fees yourself

const claimAndPay = new FeeJuicePaymentMethodWithClaim(wallet2, claim)
await account2.deploy({ fee: { paymentMethod: claimAndPay } }).wait()
await account2.deploy().send({ fee: { paymentMethod: claimAndPay } }).wait()
logger.info(`New account at ${account2.getAddress()} deployed using claimed funds for fees.`)

// Pay fees yourself
Expand All @@ -93,36 +92,36 @@ async function main() {
const fpcClaim = await feeJuicePortalManager.bridgeTokensPublic(fpc.address, FEE_FUNDING_FOR_TESTER_ACCOUNT, true);
// 2 public txs to make the bridged fee juice available
// Mint some bananaCoin and send to the newWallet to pay fees privately
await bananaCoin.methods.mint_to_private(wallet1.getAddress(), wallet2.getAddress(), FEE_FUNDING_FOR_TESTER_ACCOUNT).send({ fee: { paymentMethod } }).wait()
await bananaCoin.methods.mint_to_private(wallet1.getAddress(), wallet2.getAddress(), 10n, 0n).send({ fee: { paymentMethod } }).wait()
// mint some public bananaCoin to the newWallet to pay fees publicly
await bananaCoin.methods.mint_to_public(wallet2.getAddress(), FEE_FUNDING_FOR_TESTER_ACCOUNT).send({ fee: { paymentMethod } }).wait()
const bananaBalance = await bananaCoin.withWallet(wallet2).methods.balance_of_private(wallet2.getAddress()).simulate()

logger.info(`BananaCoin balance of newWallet is ${bananaBalance}`)

const feeJuiceInstance = await getCanonicalFeeJuice();
const feeJuice = await FeeJuiceContract.at(feeJuiceInstance.address, wallet2)
const feeJuice = FeeJuiceContract.at(feeJuiceInstance.address, wallet2)
await feeJuice.methods.claim(fpc.address, fpcClaim.claimAmount, fpcClaim.claimSecret, fpcClaim.messageLeafIndex).send().wait()

logger.info(`Fpc fee juice balance ${await feeJuice.methods.balance_of_public(fpc.address).simulate()}`)

const privateFee = new PrivateFeePaymentMethod(fpc.address, wallet2)
await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({ fee: { paymentMethod: privateFee } }).wait()
await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10n, 0n).send({ fee: { paymentMethod: privateFee } }).wait()

logger.info(`Transfer paid with fees via the FPC, privately.`)

// Public Fee Payments via FPC

const publicFee = new PublicFeePaymentMethod(fpc.address, wallet2)
await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({ fee: { paymentMethod: publicFee } }).wait()
await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10n, 0n).send({ fee: { paymentMethod: publicFee } }).wait()
logger.info(`Transfer paid with fees via the FPC, publicly.`)

// Sponsored Fee Payment

// This method will only work in environments where there is a sponsored fee contract deployed
const deployedSponsoredFPC = await getDeployedSponsoredFPCAddress(pxe);
const sponsoredPaymentMethod = new SponsoredFeePaymentMethod(deployedSponsoredFPC);
await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10, 0).send({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait()
await bananaCoin.withWallet(wallet2).methods.transfer_in_private(wallet2.getAddress(), wallet1.getAddress(), 10n, 0n).send({ fee: { paymentMethod: sponsoredPaymentMethod } }).wait()
logger.info(`Transfer paid with fees from Sponsored FPC.`)
}

Expand All @@ -137,4 +136,3 @@ function getL1WalletClient(rpcUrl: string, index: number) {
transport: http(rpcUrl),
});
}

Loading