Skip to content

Contracts-v2 Toolchain Integration #360

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

Merged
ben-chain merged 20 commits into from
Nov 10, 2020
Merged

Contracts-v2 Toolchain Integration #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
cd8ca79
Added state dump utilities to contracts package
smartcontracts Sep 25, 2020
44cca13
Linted files
smartcontracts Sep 25, 2020
d625d28
Have dump replace addresses
smartcontracts Sep 25, 2020
0b72117
Cleaned up state dump imports
smartcontracts Sep 28, 2020
736f6eb
Linted files
smartcontracts Sep 28, 2020
4890b07
Added potential fix for ganache
smartcontracts Sep 28, 2020
63b1b84
Merge branch 'master' into feat/state-dump
smartcontracts Oct 5, 2020
db671e5
use published js-vm
K-Ho Oct 6, 2020
674813a
Merge branch 'feat/state-dump' of https://github.com/ethereum-optimis…
K-Ho Oct 6, 2020
0762925
small changes for jsvm and ganache
Oct 20, 2020
9af1554
update subprocess malloc
ben-chain Nov 5, 2020
1874138
attempt pre-merge sanity deletes
ben-chain Nov 5, 2020
8714830
Merge branch 'master' into feat/state-dump
ben-chain Nov 5, 2020
7fcfc21
update dep
ben-chain Nov 5, 2020
0680292
missed lockfile
ben-chain Nov 5, 2020
aa5a405
Merge branch 'master' into feat/state-dump-integrations
ben-chain Nov 9, 2020
6182022
get non-buidler toolchain tests running
ben-chain Nov 10, 2020
b3b63a8
update packages to use npm publish
ben-chain Nov 10, 2020
46d946c
Merge branch 'master' into feat/state-dump-integrations
ben-chain Nov 10, 2020
0e797f3
unskip test
ben-chain Nov 10, 2020
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
105 changes: 0 additions & 105 deletions .github/workflows/npm_publish.yml
View file
Open in desktop

This file was deleted.

11 changes: 5 additions & 6 deletions packages/ovm-toolchain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,8 @@
"build": "yarn run build:waffle && yarn run build:typescript",
"build:waffle": "waffle \"test/config/waffle-config.json\"",
"build:typescript": "tsc -p .",
"clean": "rimraf build/",
"test": "echo \"Skipping tests for ovm-toolchain\" # yarn run test:truffle && yarn run test:waffle-v2 && yarn run test:buidler",
"test:old": "yarn run test:truffle && yarn run test:waffle-v2 && yarn run test:buidler",
"clean": "rimraf build/ && rimraf test/temp/",
"test": "yarn run test:truffle && yarn run test:waffle-v2 && yarn run test:buidler",
"test:truffle": "truffle test \"test/test-truffle/erc20.spec.js\" --config \"test/config/truffle-config.js\"",
"test:waffle-v2": "waffle \"test/config/waffle-config.json\" && mocha --require source-map-support/register --require ts-node/register \"test/test-waffle-v2/**/*.spec.ts\" --timeout 10000",
"test:buidler": "buidler test --ovm",
Expand All @@ -55,7 +54,7 @@
"access": "public"
},
"devDependencies": {
"@eth-optimism/solc": "^0.5.16-alpha.2",
"@eth-optimism/solc": "^0.5.16-alpha.6",
"@nomiclabs/buidler": "^1.4.4",
"@nomiclabs/buidler-ethers": "^2.0.0",
"@nomiclabs/buidler-waffle": "^2.0.0",
Expand All @@ -74,9 +73,9 @@
"web3": "^1.2.11"
},
"dependencies": {
"@eth-optimism/contracts": "^0.0.2-alpha.7",
"@eth-optimism/contracts": "^0.0.2-alpha.9",
"@eth-optimism/core-utils": "^0.0.1-alpha.30",
"@eth-optimism/ethereumjs-vm": "4.2.0-alpha.0",
"@eth-optimism/ethereumjs-vm": "4.2.0-alpha.1",
"@nomiclabs/buidler": "^1.4.4",
"bn.js": "^5.1.3",
"child_process": "^1.0.2",
Expand Down
1 change: 1 addition & 0 deletions packages/ovm-toolchain/src/buidler-plugins/buidler-ovm-compiler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ internalTask(TASK_COMPILE_RUN_COMPILER).setAction(
console.log(`Using native solidity compiler`)
const output = execSync(`solc --standard-json`, {
input: JSON.stringify(input, undefined, 2),
maxBuffer: 4 * 1024 * 1024,
})
return JSON.parse(output.toString('utf8'))
} else {
Expand Down
5 changes: 4 additions & 1 deletion packages/provider/src/app/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,10 @@ export class OptimismProvider extends JsonRpcProvider {
for (let i = 0; i < b.transactions.length; i++) {
b.transactions[i].l1BlockNumber = block.transactions[i].l1BlockNumber
if (b.transactions[i].l1BlockNumber != null) {
b.transactions[i].l1BlockNumber = parseInt(b.transactions[i].l1BlockNumber, 16)
b.transactions[i].l1BlockNumber = parseInt(
b.transactions[i].l1BlockNumber,
16
)
}
b.transactions[i].l1TxOrigin = block.transactions[i].l1TxOrigin
b.transactions[i].txType = block.transactions[i].txType
Expand Down
Loading