Skip to content

use Common to set the hardfork name correctly #66

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

use Common to set the hardfork name correctly #66

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a44555
use Common to set the hardfork name correctly
hugo-dc Jan 23, 2020
94ca69d
update ethereumjs-vm to 4.1.3
hugo-dc Jan 24, 2020
4388bcd
specify chain
hugo-dc Feb 11, 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
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,10 @@
"axios": "^0.19.0",
"bn.js": "^5.0.0",
"ethereumjs-account": "^3.0.0",
"ethereumjs-common": "^1.5.0",
"ethereumjs-testing": "git+https://github.com/ethereumjs/ethereumjs-testing.git#v1.2.7",
"ethereumjs-util": "^6.1.0",
"ethereumjs-vm": "^4.1.0",
"ethereumjs-vm": "^4.1.3",
"ethereumjs-wallet": "^0.6.3",
"merkle-patricia-tree": "^3.0.0",
"rlp": "^2.2.3"
Expand Down
4 changes: 3 additions & 1 deletion src/relayer/lib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const assert = require('assert')
const { promisify } = require('util')
const Wallet = require('ethereumjs-wallet')
const Trie = require('merkle-patricia-tree/secure')
const Common = require('ethereumjs-common')

export interface TestSuite {
preStateRoot: Buffer
Expand Down Expand Up @@ -401,8 +402,9 @@ export function rawMultiproof(proof: Multiproof, flatInstructions: boolean = fal
}

export function getBasicBlockIndices(code: Buffer): number[][] {
const hfIstanbul = new Common('istanbul')
const TERMINATING_OPS = ['JUMP', 'JUMPI', 'STOP', 'RETURN', 'REVERT', 'SELFDESTRUCT']
const opcodes = getOpcodesForHF('istanbul')
const opcodes = getOpcodesForHF(hfIstanbul)
const getOp = (i: number) => (opcodes[code[i]] ? opcodes[code[i]].name : 'INVALID')

// [start, end) indices
Expand Down