Skip to content

Commit b2ac036

Browse files
evertonfragaevertonfraga
committed
vm: migrating to scoped packages
1 parent 0a38c08 commit b2ac036

39 files changed

+69
-69
lines changed

‎packages/vm/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Supported `Istanbul` EIPs:
6262

6363
```javascript
6464
const BN = require('bn.js')
65-
var VM = require('ethereumjs-vm').default
65+
var VM = require('@ethereumjs/vm').default
6666

6767
// Create a new VM instance
6868
// For explicity setting the HF use e.g. `new VM({ hardfork: 'petersburg' })`
@@ -207,8 +207,8 @@ If you want to join for work or do improvements on the libraries have a look at
207207
[gitter-link]: https://gitter.im/ethereum/ethereumjs
208208
[js-standard-style-badge]: https://cdn.rawgit.com/feross/standard/master/badge.svg
209209
[js-standard-style-link]: https://github.com/feross/standard
210-
[vm-npm-badge]: https://img.shields.io/npm/v/ethereumjs-vm.svg
211-
[vm-npm-link]: https://www.npmjs.org/package/ethereumjs-vm
210+
[vm-npm-badge]: https://img.shields.io/npm/v/@ethereumjs/vm.svg
211+
[vm-npm-link]: https://www.npmjs.org/package/@ethereumjs/vm
212212
[vm-issues-badge]: https://img.shields.io/github/issues/ethereumjs/ethereumjs-vm/package:%20vm?label=issues
213213
[vm-issues-link]: https://github.com/ethereumjs/ethereumjs-vm/issues?q=is%3Aopen+is%3Aissue+label%3A"package%3A+vm"
214214
[vm-actions-badge]: https://github.com/ethereumjs/ethereumjs-vm/workflows/VM%20Test/badge.svg

‎packages/vm/examples/run-blockchain/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import VM from '../../'
22

3-
import Account from 'ethereumjs-account'
4-
import Blockchain from 'ethereumjs-blockchain'
3+
import Account from '@ethereumjs/account'
4+
import Blockchain from '@ethereumjs/blockchain'
55
import * as utils from 'ethereumjs-util'
66
import { promisify } from 'util'
77
import PStateManager from '../../lib/state/promisified'
88

9-
const Block = require('ethereumjs-block')
9+
const Block = require('@ethereumjs/block')
1010
const BlockHeader = require('ethereumjs-block/header.js')
1111
const testData = require('./test-data')
1212
const level = require('level')

‎packages/vm/examples/run-solidity-contract/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import * as path from 'path'
55
import * as fs from 'fs'
66
import { promisify } from 'util'
77
import * as util from 'ethereumjs-util'
8-
import Account from 'ethereumjs-account'
9-
import { Transaction } from 'ethereumjs-tx'
8+
import Account from '@ethereumjs/account'
9+
import { Transaction } from '@ethereumjs/tx'
1010
const abi = require('ethereumjs-abi')
1111
const solc = require('solc')
1212

‎packages/vm/examples/run-transactions-complete/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import VM from '../..'
2-
import Account from 'ethereumjs-account'
2+
import Account from '@ethereumjs/account'
33
import * as utils from 'ethereumjs-util'
44
import PStateManager from '../../lib/state/promisified'
5-
import { Transaction } from 'ethereumjs-tx'
5+
import { Transaction } from '@ethereumjs/tx'
66

77
async function main() {
88
const vm = new VM()

‎packages/vm/lib/evm/eei.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import BN = require('bn.js')
22
import { toBuffer } from 'ethereumjs-util'
3-
import Account from 'ethereumjs-account'
4-
import Blockchain from 'ethereumjs-blockchain'
5-
import Common from 'ethereumjs-common'
3+
import Account from '@ethereumjs/account'
4+
import Blockchain from '@ethereumjs/blockchain'
5+
import Common from '@ethereumjs/common'
66
import PStateManager from '../state/promisified'
77
import { VmError, ERROR } from '../exceptions'
88
import Message from './message'

‎packages/vm/lib/evm/evm.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
toBuffer,
88
zeros,
99
} from 'ethereumjs-util'
10-
import Account from 'ethereumjs-account'
10+
import Account from '@ethereumjs/account'
1111
import { ERROR, VmError } from '../exceptions'
1212
import PStateManager from '../state/promisified'
1313
import { getPrecompile, PrecompileFunc, ripemdPrecompileAddress } from './precompiles'
@@ -16,7 +16,7 @@ import Message from './message'
1616
import EEI from './eei'
1717
import { default as Interpreter, InterpreterOpts, RunState } from './interpreter'
1818

19-
const Block = require('ethereumjs-block')
19+
const Block = require('@ethereumjs/block')
2020

2121
/**
2222
* Result of executing a message via the [[EVM]].

‎packages/vm/lib/evm/interpreter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import BN = require('bn.js')
2-
import Common from 'ethereumjs-common'
2+
import Common from '@ethereumjs/common'
33
import { StateManager } from '../state'
44
import PStateManager from '../state/promisified'
55
import { ERROR, VmError } from '../exceptions'
@@ -8,7 +8,7 @@ import Stack from './stack'
88
import EEI from './eei'
99
import { Opcode } from './opcodes'
1010
import { handlers as opHandlers, OpHandler } from './opFns'
11-
import Account from 'ethereumjs-account'
11+
import Account from '@ethereumjs/account'
1212

1313
export interface InterpreterOpts {
1414
pc?: number

‎packages/vm/lib/evm/opcodes.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Common from 'ethereumjs-common'
1+
import Common from '@ethereumjs/common'
22

33
export interface Opcode {
44
name: string

‎packages/vm/lib/evm/precompiles/types.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import BN = require('bn.js')
2-
import Common from 'ethereumjs-common'
2+
import Common from '@ethereumjs/common'
33
import { ExecResult } from '../evm'
44

55
export interface PrecompileFunc {

‎packages/vm/lib/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import BN = require('bn.js')
2-
import Account from 'ethereumjs-account'
3-
import Blockchain from 'ethereumjs-blockchain'
4-
import Common from 'ethereumjs-common'
2+
import Account from '@ethereumjs/account'
3+
import Blockchain from '@ethereumjs/blockchain'
4+
import Common from '@ethereumjs/common'
55
import { StateManager } from './state'
66
import { default as runCode, RunCodeOpts } from './runCode'
77
import { default as runCall, RunCallOpts } from './runCall'

‎packages/vm/lib/runBlockchain.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import Blockchain from 'ethereumjs-blockchain'
1+
import Blockchain from '@ethereumjs/blockchain'
22
import VM from './index'
33
const async = require('async')
44

‎packages/vm/lib/runCall.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import VM from './index'
44
import TxContext from './evm/txContext'
55
import Message from './evm/message'
66
import { default as EVM, EVMResult } from './evm/evm'
7-
const Block = require('ethereumjs-block')
7+
const Block = require('@ethereumjs/block')
88

99
/**
1010
* Options for running a call (or create) operation

‎packages/vm/lib/runCode.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import VM from './index'
1616
import TxContext from './evm/txContext'
1717
import Message from './evm/message'
1818
import { default as EVM, ExecResult } from './evm/evm'
19-
const Block = require('ethereumjs-block')
19+
const Block = require('@ethereumjs/block')
2020

2121
/**
2222
* Options for the [[runCode]] method.

‎packages/vm/lib/runTx.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import BN = require('bn.js')
22
import { toBuffer } from 'ethereumjs-util'
3-
import Account from 'ethereumjs-account'
4-
import { Transaction } from 'ethereumjs-tx'
3+
import Account from '@ethereumjs/account'
4+
import { Transaction } from '@ethereumjs/tx'
55
import VM from './index'
66
import Bloom from './bloom'
77
import { default as EVM, EVMResult } from './evm/evm'
88
import Message from './evm/message'
99
import TxContext from './evm/txContext'
1010
import PStateManager from './state/promisified'
11-
const Block = require('ethereumjs-block')
11+
const Block = require('@ethereumjs/block')
1212

1313
/**
1414
* Options for the `runTx` method.

‎packages/vm/lib/state/cache.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const asyncLib = require('async')
22
const Tree = require('functional-red-black-tree')
3-
import Account from 'ethereumjs-account'
3+
import Account from '@ethereumjs/account'
44

55
/**
66
* @ignore

‎packages/vm/lib/state/promisified.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const promisify = require('util.promisify')
2-
import Account from 'ethereumjs-account'
2+
import Account from '@ethereumjs/account'
33
import { default as StateManager, StorageDump } from './stateManager'
44

55
/**

‎packages/vm/lib/state/stateManager.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ const asyncLib = require('async')
44
import * as utils from 'ethereumjs-util'
55
import BN = require('bn.js')
66
import { encode, decode } from 'rlp'
7-
import Common from 'ethereumjs-common'
7+
import Common from '@ethereumjs/common'
88
import { genesisStateByName } from 'ethereumjs-common/dist/genesisStates'
9-
import Account from 'ethereumjs-account'
9+
import Account from '@ethereumjs/account'
1010
import Cache from './cache'
1111
import { ripemdPrecompileAddress } from '../evm/precompiles'
1212

‎packages/vm/package.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "ethereumjs-vm",
2+
"name": "@ethereumjs/vm",
33
"version": "4.1.3",
44
"description": "An Ethereum VM implementation",
55
"main": "dist/index.js",
@@ -46,14 +46,14 @@
4646
"VM"
4747
],
4848
"dependencies": {
49+
"@ethereumjs/account": "^3.0.0",
50+
"@ethereumjs/block": "^2.2.2",
51+
"@ethereumjs/blockchain": "^4.0.3",
52+
"@ethereumjs/common": "^1.5.0",
53+
"@ethereumjs/tx": "^2.1.2",
4954
"async": "^2.1.2",
5055
"async-eventemitter": "^0.2.2",
5156
"core-js-pure": "^3.0.1",
52-
"ethereumjs-account": "^3.0.0",
53-
"ethereumjs-block": "^2.2.2",
54-
"ethereumjs-blockchain": "^4.0.3",
55-
"ethereumjs-common": "^1.5.0",
56-
"ethereumjs-tx": "^2.1.2",
5757
"ethereumjs-util": "^6.2.0",
5858
"fake-merkle-patricia-tree": "^1.0.1",
5959
"functional-red-black-tree": "^1.0.1",

‎packages/vm/tests/BlockchainTestsRunner.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ const async = require('async')
22
const testUtil = require('./util.js')
33
const ethUtil = require('ethereumjs-util')
44
const Trie = require('merkle-patricia-tree/secure')
5-
const Block = require('ethereumjs-block')
6-
const Blockchain = require('ethereumjs-blockchain').default
5+
const Block = require('@ethereumjs/block')
6+
const Blockchain = require('@ethereumjs/blockchain').default
77
const BlockHeader = require('ethereumjs-block/header.js')
88
const level = require('level')
99
const levelMem = require('level-mem')

‎packages/vm/tests/GeneralStateTestsRunner.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const async = require('async')
22
const testUtil = require('./util')
33
const Trie = require('merkle-patricia-tree/secure')
44
const ethUtil = require('ethereumjs-util')
5-
const Account = require('ethereumjs-account').default
5+
const Account = require('@ethereumjs/account').default
66
const BN = ethUtil.BN
77

88
function parseTestCases (forkConfigTestSuite, testData, data, gasLimit, value) {

‎packages/vm/tests/VMTestsRunner.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const async = require('async')
22
const VM = require('../')
3-
const Account = require('ethereumjs-account').default
3+
const Account = require('@ethereumjs/account').default
44
const testUtil = require('./util')
55
const Trie = require('merkle-patricia-tree/secure')
66
const ethUtil = require('ethereumjs-util')

‎packages/vm/tests/api/events.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const tape = require('tape')
22
const util = require('ethereumjs-util')
3-
const { Transaction } = require('ethereumjs-tx')
4-
const Block = require('ethereumjs-block')
3+
const { Transaction } = require('@ethereumjs/tx')
4+
const Block = require('@ethereumjs/block')
55
const VM = require('../../dist/index').default
66

77
tape('VM events', t => {

‎packages/vm/tests/api/evm/precompiles/06-ecadd.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const BN = require('bn.js')
22
const tape = require('tape')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44
const util = require('ethereumjs-util')
55
const VM = require('../../../../dist/index').default
66
const { getPrecompile } = require('../../../../dist/evm/precompiles')

‎packages/vm/tests/api/evm/precompiles/07-ecmul.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const BN = require('bn.js')
22
const tape = require('tape')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44
const util = require('ethereumjs-util')
55
const VM = require('../../../../dist/index').default
66
const { getPrecompile } = require('../../../../dist/evm/precompiles')

‎packages/vm/tests/api/evm/precompiles/08-ecpairing.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const BN = require('bn.js')
22
const tape = require('tape')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44
const util = require('ethereumjs-util')
55
const VM = require('../../../../dist/index').default
66
const { getPrecompile } = require('../../../../dist/evm/precompiles')

‎packages/vm/tests/api/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const promisify = require('util.promisify')
22
const tape = require('tape')
33
const util = require('ethereumjs-util')
4-
const Block = require('ethereumjs-block')
5-
const Common = require('ethereumjs-common').default
4+
const Block = require('@ethereumjs/block')
5+
const Common = require('@ethereumjs/common').default
66
const Trie = require('merkle-patricia-tree/secure')
77
const VM = require('../../dist/index').default
88
const { setupVM } = require('./utils')

‎packages/vm/tests/api/istanbul/eip-1108.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const BN = require('bn.js')
22
const tape = require('tape')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44
const util = require('ethereumjs-util')
55
const VM = require('../../../dist/index').default
66
const { getPrecompile } = require('../../../dist/evm/precompiles')

‎packages/vm/tests/api/istanbul/eip-1344.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const tape = require('tape')
22
const BN = require('bn.js')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44
const VM = require('../../../dist/index').default
55
const { ERROR } = require('../../../dist/exceptions')
66

‎packages/vm/tests/api/istanbul/eip-152.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const tape = require('tape')
22
const BN = require('bn.js')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44
const blake2f = require('../../../dist/evm/precompiles/09-blake2f').default
55
const F = require('../../../dist/evm/precompiles/09-blake2f').F
66
const { ERROR } = require('../../../dist/exceptions')

‎packages/vm/tests/api/istanbul/eip-1884.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const tape = require('tape')
22
const BN = require('bn.js')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44
const VM = require('../../../dist/index').default
55
const PStateManager = require('../../../dist/state/promisified').default
66
const { ERROR } = require('../../../dist/exceptions')

‎packages/vm/tests/api/istanbul/eip-2200.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const tape = require('tape')
22
const BN = require('bn.js')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44
const VM = require('../../../dist/index').default
55
const PStateManager = require('../../../dist/state/promisified').default
66
const { ERROR } = require('../../../dist/exceptions')

‎packages/vm/tests/api/opcodes.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const tape = require('tape')
22
const { getOpcodesForHF } = require('../../dist/evm/opcodes')
3-
const Common = require('ethereumjs-common').default
3+
const Common = require('@ethereumjs/common').default
44

55
const CHAINID = 0x46
66

‎packages/vm/tests/api/runBlock.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const promisify = require('util.promisify')
22
const tape = require('tape')
3-
const Block = require('ethereumjs-block')
4-
const Common = require('ethereumjs-common').default
3+
const Block = require('@ethereumjs/block')
4+
const Common = require('@ethereumjs/common').default
55
const util = require('ethereumjs-util')
66
const runBlock = require('../../dist/runBlock').default
77
const PStateManager = require('../../dist/state/promisified').default

‎packages/vm/tests/api/runBlockchain.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const tape = require('tape')
22
const level = require('level-mem')
33
const promisify = require('util.promisify')
4-
const Blockchain = require('ethereumjs-blockchain').default
5-
const Block = require('ethereumjs-block')
6-
const Common = require('ethereumjs-common').default
4+
const Blockchain = require('@ethereumjs/blockchain').default
5+
const Block = require('@ethereumjs/block')
6+
const Common = require('@ethereumjs/common').default
77
const util = require('ethereumjs-util')
88
const runBlockchain = require('../../dist/runBlockchain').default
99
const PStateManager = require('../../dist/state/promisified').default

‎packages/vm/tests/api/runTx.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const promisify = require('util.promisify')
22
const tape = require('tape')
3-
const Transaction = require('ethereumjs-tx').Transaction
3+
const Transaction = require('@ethereumjs/tx').Transaction
44
const ethUtil = require('ethereumjs-util')
55
const runTx = require('../../dist/runTx').default
66
const PStateManager = require('../../dist/state/promisified').default

‎packages/vm/tests/api/state/cache.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const promisify = require('util.promisify')
22
const tape = require('tape')
33
const Trie = require('merkle-patricia-tree/secure.js')
4-
const Account = require('ethereumjs-account').default
4+
const Account = require('@ethereumjs/account').default
55
const Cache = require('../../../dist/state/cache').default
66
const utils = require('../utils')
77

‎packages/vm/tests/api/state/stateManager.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const promisify = require('util.promisify')
22
const tape = require('tape')
33
const { parallel } = require('async')
44
const util = require('ethereumjs-util')
5-
const Common = require('ethereumjs-common').default
5+
const Common = require('@ethereumjs/common').default
66
const { StateManager } = require('../../../dist/state')
77
const { createAccount } = require('../utils')
88
const { isRunningInKarma } = require('../../util')

0 commit comments

Comments
 (0)