Skip to content

Commit

Permalink
dirty save
Browse files Browse the repository at this point in the history
  • Loading branch information
@dionysuzx
dionysuzx committed Feb 7, 2023
1 parent 1b55d09 commit 6319132
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 4 deletions.
10 changes: 9 additions & 1 deletion packages/protocol/contracts/bridge/Bridge.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,15 @@ contract Bridge is EssentialContract, IBridge {

/// Allow Bridge to receive ETH from the TokenVault or EtherVault.
receive() external payable {
// TODO(dave): require the sender is the TokenVault or EtherVault
// If on Ethereum, ensure sender is TokenVault. If on Taiko, ensure
// sender is TokenVault or EtherVault.
require(
address(0) == this.resolve("ether_vault", true)
? msg.sender == this.resolve("token_vault", false)
: (msg.sender == this.resolve("token_vault", false) ||
msg.sender == this.resolve("ether_vault", true)),
"B:receive"
);
}

/// @dev Initializer to be called after being deployed behind a proxy.
Expand Down
120 changes: 117 additions & 3 deletions packages/protocol/test/bridge/Bridge.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ import { deployBridge, sendMessage } from "../utils/bridge";
import { deploySignalService } from "../utils/signal";
import { Message } from "../utils/message";

describe("Bridge", function () {
describe("Bridge", () => {
let owner: any;
let nonOwner: any;
let srcChainId: number;
let enabledDestChainId: number;
let l1Bridge: Bridge;
let l1EtherVault: EtherVault;
let addressManager: AddressManager;

beforeEach(async () => {
[owner, nonOwner] = await ethers.getSigners();
Expand All @@ -23,7 +24,7 @@ describe("Bridge", function () {

enabledDestChainId = srcChainId + 1;

const addressManager: AddressManager = await (
addressManager = await (
await ethers.getContractFactory("AddressManager")
).deploy();
await addressManager.init();
Expand All @@ -40,9 +41,122 @@ describe("Bridge", function () {
`${enabledDestChainId}.bridge`,
"0x0000000000000000000000000000000000000001" // dummy address so chain is "enabled"
);
await addressManager.setAddress(
`${srcChainId}.token_vault`,
"0x0000000000000000000000000000000000000002"
);
await addressManager.setAddress(
`${enabledDestChainId}.token_vault`,
"0x0000000000000000000000000000000000000002"
);
await addressManager.setAddress(
`${enabledDestChainId}.ether_vault`,
"0x0000000000000000000000000000000000000003"
);
});

describe("receive()", () => {
it("throws when an address other than TokenVault tries to send funds to the bridge on L1", async () => {
const message: Message = {
id: 1,
sender: owner.address,
srcChainId: 1,
destChainId: 5,
owner: ethers.constants.AddressZero,
to: nonOwner.address,
refundAddress: owner.address,
depositValue: 1,
callValue: 1,
processingFee: 1,
gasLimit: 100,
data: ethers.constants.HashZero,
memo: "",
};
await expect(
owner.sendTransaction({
to: l1Bridge.address,
value: message.depositValue,
})
).to.be.revertedWith("B:receive");
});
it("throws when an address other than TokenVault or EtherVault tries to send funds to the bridge on L2", async () => {
const message: Message = {
id: 1,
sender: owner.address,
srcChainId: 1,
destChainId: 5,
owner: ethers.constants.AddressZero,
to: nonOwner.address,
refundAddress: owner.address,
depositValue: 1,
callValue: 1,
processingFee: 1,
gasLimit: 100,
data: ethers.constants.HashZero,
memo: "",
};
await expect(
owner.sendTransaction({
to: l1Bridge.address,
value: message.depositValue,
})
).to.be.revertedWith("B:receive");
});
it("succeeds when the TokenVault sends funds to the bridge on L1", async () => {
const message: Message = {
id: 1,
sender: owner.address,
srcChainId: 1,
destChainId: 5,
owner: ethers.constants.AddressZero,
to: nonOwner.address,
refundAddress: owner.address,
depositValue: 1,
callValue: 1,
processingFee: 1,
gasLimit: 100,
data: ethers.constants.HashZero,
memo: "",
};
const tokenVaultAddress = await addressManager.getAddress(
`${srcChainId}.token_vault`
);
await expect(
owner.sendTransaction({
to: tokenVaultAddress,
value: message.depositValue,
})
).to.not.be.reverted;
});
it("succeeds when the EtherVault sends funds to the bridge on L2", async () => {
const message: Message = {
id: 1,
sender: owner.address,
srcChainId: 1,
destChainId: 5,
owner: ethers.constants.AddressZero,
to: nonOwner.address,
refundAddress: owner.address,
depositValue: 1,
callValue: 1,
processingFee: 1,
gasLimit: 100,
data: ethers.constants.HashZero,
memo: "",
};
const etherVaultAddress = await addressManager.getAddress(
`${enabledDestChainId}.ether_vault`
);
await expect(
owner.sendTransaction({
to: etherVaultAddress,
value: message.depositValue,
})
).to.not.be.reverted;
});
});

describe("sendMessage()", function () {
describe("sendMessage()", () => {
it("throws when owner is the zero address", async () => {
const message: Message = {
id: 1,
Expand Down

0 comments on commit 6319132

Please sign in to comment.