Skip to content
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

Jump to bottom

Add initial mint event in the btoken initializer #198

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Add initial mint event in the btoken initializer #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ff1a32
Add verizon event in the btoken initializer
vtleonardo Aug 22, 2022
1253835
changed test deposit id to 2 since initializer increments to 1
z-j-lin Aug 22, 2022
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
2 changes: 2 additions & 0 deletions bridge/contracts/BToken.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ contract BToken is

function initialize() public onlyFactory initializer {
__ERC20_init("AliceNet Utility Token", "ALCB");
// Initial deposit to cover the migrated txs on aliceNet
_virtualDeposit(1, 0xba7809A4114eEF598132461f3202b5013e834CD5, 500000000000);
}

/// Distributes the yields of the BToken sale to all stakeholders
Expand Down
14 changes: 7 additions & 7 deletions bridge/test/bToken/deposit.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ describe("Testing BToken Deposit methods", async () => {
[admin, user] = await ethers.getSigners();
showState("Initial", await getState(fixture));
ethIn = ethers.utils.parseEther(eth.toString());
bTokenDeposit = ethers.utils.parseUnits(bTokens.toString());
bTokenDeposit = ethers.utils.parseUnits(bTokens.toString(10));
});

it("Should fail querying for an invalid deposit ID", async () => {
Expand Down Expand Up @@ -67,7 +67,7 @@ describe("Testing BToken Deposit methods", async () => {
);
await expect(fixture.bToken.deposit(1, user.address, bTokenDeposit))
.to.emit(fixture.bToken, "DepositReceived")
.withArgs(1 || 2, 1, user.address, bTokenDeposit);
.withArgs(2, 1, user.address, bTokenDeposit);
expectedState = await getState(fixture);
const tx = await fixture.bToken.deposit(1, user.address, bTokenDeposit);
expectedState.Balances.bToken.admin -= bTokenDeposit.toBigInt();
Expand All @@ -94,7 +94,7 @@ describe("Testing BToken Deposit methods", async () => {
)
)
.to.emit(fixture.bToken, "DepositReceived")
.withArgs(1 || 2, 1, user.address, bTokenDeposit);
.withArgs(2, 1, user.address, bTokenDeposit);
expectedState = await getState(fixture);
const tx = await fixture.factory
.connect(admin)
Expand All @@ -120,7 +120,7 @@ describe("Testing BToken Deposit methods", async () => {
})
)
.to.emit(fixture.bToken, "DepositReceived")
.withArgs(1 || 2, 1, user.address, bTokens);
.withArgs(2, 1, user.address, bTokens);
expectedState = await getState(fixture);
const tx = await fixture.bToken.mintDeposit(1, user.address, 0, {
value: ethIn,
Expand Down Expand Up @@ -150,7 +150,7 @@ describe("Testing BToken Deposit methods", async () => {
bTokenDeposit,
])
);
const depositId = 1;
const depositId = 2;
const deposit = await fixture.bToken.getDeposit(depositId);
expect(deposit.value).to.be.equal(ethIn.toBigInt());
});
Expand All @@ -165,7 +165,7 @@ describe("Testing BToken Deposit methods", async () => {
);
await expect(fixture.bToken.deposit(1, user.address, bTokenDeposit))
.to.emit(fixture.bToken, "DepositReceived")
.withArgs(1 || 2, 1, user.address, bTokenDeposit);
.withArgs(2, 1, user.address, bTokenDeposit);
expectedState = await getState(fixture);
const tx = await fixture.bToken.deposit(1, user.address, bTokenDeposit);
const [, tx2] = await callFunctionAndGetReturnValues(
Expand Down Expand Up @@ -197,7 +197,7 @@ describe("Testing BToken Deposit methods", async () => {
}))
)
.to.emit(fixture.bToken, "DepositReceived")
.withArgs(1 || 2, 1, user.address, bTokens);
.withArgs(2, 1, user.address, bTokens);
const tx = await fixture.bToken.mintDeposit(1, user.address, 0, {
value: ethIn,
});
Expand Down
13 changes: 10 additions & 3 deletions bridge/test/setup.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,9 +598,16 @@ export const getFixture = async (
"ATokenMinter",
"ATokenMinter"
)) as ATokenMinter;
const mintToFactory = aTokenMinter.interface.encodeFunctionData("mint", [factory.address, ethers.utils.parseEther("100000000")])
const txResponse = await factory.callAny(aTokenMinter.address, 0, mintToFactory)
await txResponse.wait()
const mintToFactory = aTokenMinter.interface.encodeFunctionData("mint", [
factory.address,
ethers.utils.parseEther("100000000"),
]);
const txResponse = await factory.callAny(
aTokenMinter.address,
0,
mintToFactory
);
await txResponse.wait();
const aTokenBurner = (await deployUpgradeableWithFactory(
factory,
"ATokenBurner",
Expand Down