Skip to content

Commit

Permalink
chore: lint the code
Browse files Browse the repository at this point in the history
  • Loading branch information
danijelTxFusion committed Feb 7, 2024
1 parent fa5dfff commit b08b738
Show file tree
Hide file tree
Showing 7 changed files with 55 additions and 25 deletions.
2 changes: 1 addition & 1 deletion src/adapters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
FullDepositFee,
PriorityOpResponse,
TransactionResponse,
PaymasterParams
PaymasterParams,
} from "./types";
import {
BOOTLOADER_FORMAL_ADDRESS,
Expand Down
9 changes: 7 additions & 2 deletions src/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,12 @@ export class Provider extends ethers.providers.JsonRpcProvider {
}

const bridge = IL2BridgeFactory.connect(tx.bridgeAddress!, this);
const populatedTx = await bridge.populateTransaction.withdraw(tx.to, tx.token, tx.amount, tx.overrides);
const populatedTx = await bridge.populateTransaction.withdraw(
tx.to,
tx.token,
tx.amount,
tx.overrides,
);
if (tx.paymasterParamas) {
return {
...populatedTx,
Expand Down Expand Up @@ -745,7 +750,7 @@ export class Provider extends ethers.providers.JsonRpcProvider {
};
} else {
const token = IERC20Factory.connect(tx.token, this);
const populatedTx = await token.populateTransaction.transfer(tx.to, tx.amount, tx.overrides);
const populatedTx = await token.populateTransaction.transfer(tx.to, tx.amount, tx.overrides);
if (tx.paymasterParamas) {
return {
...populatedTx,
Expand Down
2 changes: 1 addition & 1 deletion src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -295,4 +295,4 @@ export interface StorageProof {
index: number;
proof: string[];
}[];
}
}
8 changes: 6 additions & 2 deletions tests/integration/provider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,9 @@ describe("Provider", () => {
it("should return a DAI withdraw transaction", async () => {
const tx = {
from: "0x36615Cf349d7F6344891B1e7CA7C72883F5dc049",
to: ethers.utils.getAddress((await provider.getDefaultBridgeAddresses()).erc20L2 as string),
to: ethers.utils.getAddress(
(await provider.getDefaultBridgeAddresses()).erc20L2 as string,
),
data: "0xd9caed1200000000000000000000000036615cf349d7f6344891b1e7ca7c72883f5dc04900000000000000000000000082b5ea13260346f4251c0940067a9117a6cf13840000000000000000000000000000000000000000000000000000000000000005",
};
const result = await provider.getWithdrawTx({
Expand All @@ -395,7 +397,9 @@ describe("Provider", () => {
it("should return a DAI withdraw transaction with paymaster parameters", async () => {
const tx = {
from: "0x36615Cf349d7F6344891B1e7CA7C72883F5dc049",
to: ethers.utils.getAddress((await provider.getDefaultBridgeAddresses()).erc20L2 as string),
to: ethers.utils.getAddress(
(await provider.getDefaultBridgeAddresses()).erc20L2 as string,
),
data: "0xd9caed1200000000000000000000000036615cf349d7f6344891b1e7ca7c72883f5dc04900000000000000000000000082b5ea13260346f4251c0940067a9117a6cf13840000000000000000000000000000000000000000000000000000000000000005",
customData: {
paymasterParams: {
Expand Down
45 changes: 34 additions & 11 deletions tests/integration/wallet.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -540,12 +540,16 @@ describe("Wallet", () => {
expect(paymasterBalanceBeforeWithdrawal.sub(paymasterBalanceAfterWithdrawal).gte(0)).to.be
.true;
expect(
paymasterTokenBalanceAfterWithdrawal.sub(paymasterTokenBalanceBeforeWithdrawal).eq(minimalAllowance),
paymasterTokenBalanceAfterWithdrawal
.sub(paymasterTokenBalanceBeforeWithdrawal)
.eq(minimalAllowance),
).to.be.true;

expect(l2BalanceBeforeWithdrawal.sub(l2BalanceAfterWithdrawal).eq(amount)).to.be.true;
expect(
l2ApprovalTokenBalanceAfterWithdrawal.eq(l2ApprovalTokenBalanceBeforeWithdrawal.sub(minimalAllowance)),
l2ApprovalTokenBalanceAfterWithdrawal.eq(
l2ApprovalTokenBalanceBeforeWithdrawal.sub(minimalAllowance),
),
).to.be.true;

expect(result).not.to.be.null;
Expand Down Expand Up @@ -615,13 +619,18 @@ describe("Wallet", () => {
const l1BalanceAfterWithdrawal = await wallet.getBalanceL1(DAI_L1);
const l2ApprovalTokenBalanceAfterWithdrawal = await wallet.getBalance(TOKEN);

expect(paymasterBalanceBeforeWithdrawal.sub(paymasterBalanceAfterWithdrawal).gte(0)).to.be.true;
expect(paymasterBalanceBeforeWithdrawal.sub(paymasterBalanceAfterWithdrawal).gte(0)).to.be
.true;
expect(
paymasterTokenBalanceAfterWithdrawal.sub(paymasterTokenBalanceBeforeWithdrawal).eq(minimalAllowance)
paymasterTokenBalanceAfterWithdrawal
.sub(paymasterTokenBalanceBeforeWithdrawal)
.eq(minimalAllowance),
).to.be.true;

expect(
l2ApprovalTokenBalanceAfterWithdrawal.eq(l2ApprovalTokenBalanceBeforeWithdrawal.sub(minimalAllowance))
l2ApprovalTokenBalanceAfterWithdrawal.eq(
l2ApprovalTokenBalanceBeforeWithdrawal.sub(minimalAllowance),
),
).to.be.true;

expect(result).not.to.be.null;
Expand Down Expand Up @@ -725,15 +734,22 @@ describe("Wallet", () => {
const receiverBalanceAfterTransfer = await provider.getBalance(RECEIVER);

expect(paymasterBalanceBeforeTransfer.sub(paymasterBalanceAfterTransfer).gte(0)).to.be.true;
expect(paymasterTokenBalanceAfterTransfer.sub(paymasterTokenBalanceBeforeTransfer).eq(minimalAllowance)).to.be.true;
expect(
paymasterTokenBalanceAfterTransfer
.sub(paymasterTokenBalanceBeforeTransfer)
.eq(minimalAllowance),
).to.be.true;

expect(senderBalanceBeforeTransfer.sub(senderBalanceAfterTransfer).eq(amount)).to.be.true;
expect(
senderApprovalTokenBalanceAfterTransfer.eq(senderApprovalTokenBalanceBeforeTransfer.sub(minimalAllowance))
senderApprovalTokenBalanceAfterTransfer.eq(
senderApprovalTokenBalanceBeforeTransfer.sub(minimalAllowance),
),
).to.be.true;

expect(result).not.to.be.null;
expect(receiverBalanceAfterTransfer.sub(receiverBalanceBeforeTransfer).eq(amount)).to.be.true;
expect(receiverBalanceAfterTransfer.sub(receiverBalanceBeforeTransfer).eq(amount)).to.be
.true;
}).timeout(25_000);

it("should transfer DAI", async () => {
Expand Down Expand Up @@ -790,15 +806,22 @@ describe("Wallet", () => {
const receiverBalanceAfterTransfer = await provider.getBalance(RECEIVER, "latest", l2DAI);

expect(paymasterBalanceBeforeTransfer.sub(paymasterBalanceAfterTransfer).gte(0)).to.be.true;
expect(paymasterTokenBalanceAfterTransfer.sub(paymasterTokenBalanceBeforeTransfer).eq(minimalAllowance)).to.be.true;
expect(
paymasterTokenBalanceAfterTransfer
.sub(paymasterTokenBalanceBeforeTransfer)
.eq(minimalAllowance),
).to.be.true;

expect(senderBalanceBeforeTransfer.sub(senderBalanceAfterTransfer).eq(amount)).to.be.true;
expect(
senderApprovalTokenBalanceAfterTransfer.eq(senderApprovalTokenBalanceBeforeTransfer.sub(minimalAllowance)),
senderApprovalTokenBalanceAfterTransfer.eq(
senderApprovalTokenBalanceBeforeTransfer.sub(minimalAllowance),
),
).to.be.true;

expect(result).not.to.be.null;
expect(receiverBalanceAfterTransfer.sub(receiverBalanceBeforeTransfer).eq(amount)).to.be.true;
expect(receiverBalanceAfterTransfer.sub(receiverBalanceBeforeTransfer).eq(amount)).to.be
.true;
}).timeout(25_000);
});

Expand Down
2 changes: 1 addition & 1 deletion tests/setup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ async function deployPaymasterAndToken(): Promise<{ token: string; paymaster: st
const tokenAddress = tokenContract.address;

// mint tokens to wallet
const mintTx = await tokenContract.mint(wallet.address,50,);
const mintTx = await tokenContract.mint(wallet.address, 50);
await mintTx.wait();

const paymasterAbi = require(paymasterPath).abi;
Expand Down
12 changes: 5 additions & 7 deletions tests/unit/util.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,11 @@ describe("utils", () => {
it("should return a serialized transaction with populated default values", async () => {
const tx =
"0x71ea8080808080808082010e808082010e9436615cf349d7f6344891b1e7ca7c72883f5dc04982c350c080c0";
const result = utils.serialize(
{
type: 113,
chainId: 270,
from: "0x36615Cf349d7F6344891B1e7CA7C72883F5dc049",
},
);
const result = utils.serialize({
type: 113,
chainId: 270,
from: "0x36615Cf349d7F6344891B1e7CA7C72883F5dc049",
});
expect(result).to.be.equal(tx);
});

Expand Down

0 comments on commit b08b738

Please sign in to comment.