[WIP] Deposit withdrawal contracts by Jinglan · Pull Request #216 · ethereum-optimism/optimism

Jinglan · 2020-08-13T21:41:53Z

Description

Questions

Metadata

Fixes

Fixes # [Link to Issue]

Contributing Agreement

I have read and understood the Optimism Contributing Guide and Code of Conduct and am following those guidelines in this pull request.

…ontracts

K-Ho

Great! Left some comments, mostly style - I can go through and make all of these changes myself or happy to walk you through

K-Ho · 2020-08-14T20:39:38Z

packages/contracts/contracts/optimistic-ethereum/bridge/ERC20.sol

+
+    using SafeMath for uint;
+
+    uint256 constant private MAX_UINT256 = 2**256 - 1;


This line isn't needed because we have SafeMath

K-Ho · 2020-08-14T20:46:46Z

packages/contracts/contracts/optimistic-ethereum/bridge/ERC20.sol

+    }
+
+    function transferFrom(address from, address to, uint value) external returns (bool) {
+        if (allowance[from][msg.sender] != uint(-1)) {


pretty sure we can remove this line. Also need to add check that the amount allowed is greater than or equal to the value, see: https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v2.0.0/contracts/token/ERC20/ERC20.sol#L96

K-Ho · 2020-08-14T20:56:56Z

packages/contracts/contracts/optimistic-ethereum/bridge/L1ERC20Bridge.sol

+            _amount
+        );
+        // Tell L2 to mint corresponding coins
+        MockL1ToL2MessagePasser(l1ToL2MessagePasser).passMessageToL2(messageData);


Suggested change

MockL1ToL2MessagePasser(l1ToL2MessagePasser).passMessageToL2(messageData);

IL1ToL2MessagePasser(l1ToL2MessagePasser).passMessageToL2(messageData);

K-Ho · 2020-08-14T20:58:24Z

packages/contracts/contracts/optimistic-ethereum/bridge/L1ERC20Bridge.sol

+pragma experimental ABIEncoderV2;
+import { ERC20 } from "./ERC20.sol";
+import { ContractResolver } from "../utils/resolvers/ContractResolver.sol";
+import { MockL1ToL2MessagePasser } from "../ovm/test-helpers/MockL1ToL2MessagePasser.sol";


Suggested change

import { MockL1ToL2MessagePasser } from "../ovm/test-helpers/MockL1ToL2MessagePasser.sol";

import { IL1ToL2MessagePasser } from "./IL1ToL2MessagePasser.sol";

K-Ho · 2020-08-14T21:16:26Z

packages/contracts/test/contracts/bridge/DepositedERC20.spec.ts

+    it('sets DepositedERC20 factory address correctly', async () => {
+      const factoryAddress = await depositedERC20.l2ERC20Bridge()
+      factoryAddress.should.equal(await wallet.getAddress())
+      console.log('test')


K-Ho · 2020-08-14T21:17:34Z

packages/contracts/test/contracts/bridge/DepositedERC20.spec.ts

+      const evilDepositedERC20 = depositedERC20.connect(badwallet)
+      await TestUtils.assertRevertsAsync(
+        'Get outta here. L2 factory bridge address ONLY.',
+        async () => {
+          await evilDepositedERC20.processDeposit('0x' + '00'.repeat(20), 5)
+        }
+      )


Suggested change

const evilDepositedERC20 = depositedERC20.connect(badwallet)

await TestUtils.assertRevertsAsync(

'Get outta here. L2 factory bridge address ONLY.',

async () => {

await evilDepositedERC20.processDeposit('0x' + '00'.repeat(20), 5)

}

)

await TestUtils.assertRevertsAsync(

'Get outta here. L2 factory bridge address ONLY.',

async () => {

await depositedERC20

.connect(badwallet)

.processDeposit('0x' + '00'.repeat(20), 5)

}

)

Also can update '0x' + '00'.repeat(20) -> ZERO_ADDRESS

K-Ho · 2020-08-14T21:19:10Z

packages/contracts/test/contracts/bridge/DepositedERC20.spec.ts

+    it('mints tokens and increases total supply', async () => {
+
+      const initialTotalSupply = (await depositedERC20.totalSupply()).toNumber()
+      const depositAmount = 5


Define a DEFAULT_DEPOSIT_AMOUNT = 5 at the start of test file and you can just use that in all of your tests :)

K-Ho · 2020-08-14T22:12:11Z

packages/contracts/test/contracts/bridge/L1ERC20Bridge.spec.ts

+    MockL1ToL2MessagePasser = await ethers.getContractFactory(
+      'MockL1ToL2MessagePasser'
+    )
+    ERC20 = await (await ethers.getContractFactory('ERC20')).connect(depositer)


Suggested change

ERC20 = await (await ethers.getContractFactory('ERC20')).connect(depositer)

ERC20 = await ethers.getContractFactory('ERC20').connect(depositer)

K-Ho · 2020-08-14T22:32:33Z

packages/contracts/test/contracts/bridge/L1ERC20Bridge.spec.ts

+  describe('setCorrespondingL2BridgeAddress()', async () => {
+    it('Sets address correctly, and throws if address has already been set', async () => {
+      await l1ERC20Bridge.setCorrespondingL2BridgeAddress(l2ERC20Bridge.address)
+      const l2BridgeAddress = await l1ERC20Bridge.l2ERC20BridgeAddress()


need another check that this was actually set to l2ERC20Bridge.address

K-Ho · 2020-08-18T17:02:00Z

packages/contracts/contracts/optimistic-ethereum/bridge/L1ERC20Bridge.sol

+            _amount
+        );
+        // Tell L2 to mint corresponding coins
+        MockL1ToL2MessagePasser(l1ToL2MessagePasser).passMessageToL2(messageData);


Send to L1ToL2Transaction queue with
{calldata: messageData,
to: L2ERC20Bridge
gasLimit..
etc
}

K-Ho · 2020-09-18T19:30:05Z

Closing for now, can always re-open if needed

* Bump version to 0.1.5 * Update changelog

…ism#216)

…ox-8 fix: sync develop

…m-v1.7.7 Merge upstream v1.7.7

### Description Removes the publishing of basic docs to gh-pages. There's now a nice mdbook that's published by the books.yml workflow.

Closes #193 Closes #216

Jinglan added 24 commits July 25, 2020 19:39

Add working constructor and test

8cbfad6

Rename contracts and add new test

2d8771b

Add working test for require statement

17519cb

Add working test for processDeposit()

f9b034d

Add two working tests for minting

141597c

Add new withdrawal data type

c9a1ca1

Added working tests for burn

7e0eb4c

Updated withdrawal data type

95d83d3

Add public variables and constructor

739e6c3

Rename ERC20Withdrawal to Withrawal

6c57eec

Add to-do to fix ERC20 initialization

7643ebd

Add working test for require statement

9ca5d4d

Add working test for forwardDeposit

1009f16

ugh fuck

d6833fe

Create message passing interface and mock contract

ba38204

Add working test for forwardWithdrawal

e6ded4a

Remove console log debugging lines

7d1f97e

Add L1 Bridge contract files

aaffffd

Merge remote-tracking branch 'origin' into YAS-404/DepositWithdrawalC…

d983608

…ontracts

Add message passer to l1 contract

dfac5ad

Add working tests for setAddress and initializeDeposit

0afe598

Fix constructor parameters for DepositedERC20

9b05dd1

Fix parameters for calling depositedERC20

8e357ef

Add untested redeemWithdrawal function

f08698f

K-Ho reviewed Aug 14, 2020

View reviewed changes

K-Ho reviewed Aug 18, 2020

View reviewed changes

Jinglan and others added 4 commits August 18, 2020 16:14

Something mysterious is breaking

7c74a78

Add test for resetting index per block in L2ToL1Message Passer

58b7cda

lint and fix failing test

3b109d1

change uncommented test to skip

726679f

mocked L2ToL1MessageReceiver

2d8e743

K-Ho closed this Sep 18, 2020

gakonst deleted the YAS-404/DepositWithdrawalContracts branch March 18, 2021 15:02

snario pushed a commit that referenced this pull request Apr 14, 2021

version: bump to 0.1.5 (#216)

570a164

* Bump version to 0.1.5 * Update changelog

bap2pecs pushed a commit to babylonlabs-io/optimism that referenced this pull request Jul 31, 2024

chore: Remove --all flag when starting fpd daemon (ethereum-optim…

a2f63dc

…ism#216)

OptimismBot pushed a commit that referenced this pull request Jan 28, 2025

Merge pull request #216 from defi-wonderland/fix/merge-conflict-lockb…

1d08b45

…ox-8 fix: sync develop

xibao-nr pushed a commit to node-real/combo-optimism that referenced this pull request Feb 19, 2025

Merge pull request ethereum-optimism#216 from bnb-chain/merge-upstrea…

010ecf0

…m-v1.7.7 Merge upstream v1.7.7

Zena-park added a commit to tokamak-network/optimism that referenced this pull request Dec 30, 2025

[DSM-01S] Illegible Numeric Value Representations ethereum-optimism#216

e6bc51a

theochap pushed a commit that referenced this pull request Jan 15, 2026

fix(ci): Remove Docs gh-page publish (#216)

15d9666

### Description Removes the publishing of basic docs to gh-pages. There's now a nice mdbook that's published by the books.yml workflow.

emhane pushed a commit that referenced this pull request Feb 3, 2026

feat: implemented mdbx replace_updates (#329)

788b160

Closes #193 Closes #216


		using SafeMath for uint;

		uint256 constant private MAX_UINT256 = 2**256 - 1;

	MockL1ToL2MessagePasser(l1ToL2MessagePasser).passMessageToL2(messageData);
	IL1ToL2MessagePasser(l1ToL2MessagePasser).passMessageToL2(messageData);

	import { MockL1ToL2MessagePasser } from "../ovm/test-helpers/MockL1ToL2MessagePasser.sol";
	import { IL1ToL2MessagePasser } from "./IL1ToL2MessagePasser.sol";

	ERC20 = await (await ethers.getContractFactory('ERC20')).connect(depositer)
	ERC20 = await ethers.getContractFactory('ERC20').connect(depositer)

Conversation

Jinglan commented Aug 13, 2020

Description

Questions

Metadata

Fixes

Contributing Agreement

Uh oh!

K-Ho left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

K-Ho commented Sep 18, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants