Skip to content

B
baas-ide
Commit fa86a8b8 authored by yann300's avatar yann300
Browse files
Options

use import

parent eff334ff
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 169 deletions
libs/remix-debug/test/decoder/vmCall.ts
View file @ fa86a8b8
'use strict' 'use strict'
var utileth = require('ethereumjs-util') import { Transaction as Tx } from '@ethereumjs/tx'
var Tx = require('@ethereumjs/tx').Transaction
import { Block } from '@ethereumjs/block' import { Block } from '@ethereumjs/block'
var BN = require('ethereumjs-util').BN import { BN, bufferToHex, Address } from 'ethereumjs-util'
var remixLib = require('@remix-project/remix-lib') import { vm as remixlibVM } from '@remix-project/remix-lib'
import VM from '@ethereumjs/vm' import VM from '@ethereumjs/vm'
import Common from '@ethereumjs/common' import Common from '@ethereumjs/common'
...@@ -28,7 +27,7 @@ export function sendTx (vm, from, to, value, data, cb) { ...@@ -28,7 +27,7 @@ export function sendTx (vm, from, to, value, data, cb) {
try { try {
vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}).then(function (result) { vm.runTx({block: block, tx: tx, skipBalance: true, skipNonce: true}).then(function (result) {
setTimeout(() => { setTimeout(() => {
cb(null, utileth.bufferToHex(tx.hash())) cb(null, bufferToHex(tx.hash()))
}, 500) }, 500)
}).catch((error) => { }).catch((error) => {
console.error(error) console.error(error)
...@@ -53,7 +52,7 @@ export async function initVM (st, privateKey) { ...@@ -53,7 +52,7 @@ export async function initVM (st, privateKey) {
var VM = await createVm('berlin') var VM = await createVm('berlin')
const vm = VM.vm const vm = VM.vm
var address = utileth.Address.fromPrivateKey(privateKey) var address = Address.fromPrivateKey(privateKey)
try { try {
let account = await vm.stateManager.getAccount(address) let account = await vm.stateManager.getAccount(address)
...@@ -63,7 +62,7 @@ export async function initVM (st, privateKey) { ...@@ -63,7 +62,7 @@ export async function initVM (st, privateKey) {
console.log(error) console.log(error)
} }
var web3Provider = new remixLib.vm.Web3VMProvider() var web3Provider = new remixlibVM.Web3VMProvider()
web3Provider.setVM(vm) web3Provider.setVM(vm)
vm.web3 = web3Provider vm.web3 = web3Provider
return vm return vm
......
package-lock.json
View file @ fa86a8b8
...@@ -8169,7 +8169,6 @@ ...@@ -8169,7 +8169,6 @@
"version": "4.11.6", "version": "4.11.6",
"resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz", "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-4.11.6.tgz",
"integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==", "integrity": "sha512-pqr857jrp2kPuO9uRjZ3PwnJTjoQy+fcdxvBTvHm6dkmEL9q+hDD/2j/0ELOBPtPnS8LjCX0gI9nbl8lVkadpg==",
"dev": true,
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
}, },
...@@ -8177,8 +8176,7 @@ ...@@ -8177,8 +8176,7 @@
"@types/node": { "@types/node": {
"version": "14.0.23", "version": "14.0.23",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.23.tgz",
"integrity": "sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw==", "integrity": "sha512-Z4U8yDAl5TFkmYsZdFPdjeMa57NOvnaf1tljHzhouaPEp7LCj2JKkejpI1ODviIAQuW4CcQmxkQ77rnLsOOoKw=="
"dev": true
} }
} }
}, },
...@@ -16828,53 +16826,6 @@ ...@@ -16828,53 +16826,6 @@
} }
} }
}, },
"ethashjs": {
"version": "0.0.8",
"resolved": "https://registry.npmjs.org/ethashjs/-/ethashjs-0.0.8.tgz",
"integrity": "sha512-/MSbf/r2/Ld8o0l15AymjOTlPqpN8Cr4ByUEA9GtR4x0yAh3TdtDzEg29zMjXCNPI7u6E5fOQdj/Cf9Tc7oVNw==",
"requires": {
"async": "^2.1.2",
"buffer-xor": "^2.0.1",
"ethereumjs-util": "^7.0.2",
"miller-rabin": "^4.0.0"
},
"dependencies": {
"async": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"requires": {
"lodash": "^4.17.14"
}
},
"bn.js": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz",
"integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="
},
"buffer-xor": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-2.0.2.tgz",
"integrity": "sha512-eHslX0bin3GB+Lx2p7lEYRShRewuNZL3fUl4qlVJGGiwoPGftmt8JQgk2Y9Ji5/01TnVDo33E5b5O3vUB1HdqQ==",
"requires": {
"safe-buffer": "^5.1.1"
}
},
"ethereumjs-util": {
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.0.3.tgz",
"integrity": "sha512-uLQsGPOwsRxe50WV1Dybh5N8zXDz4ev7wP49LKX9kr28I5TmcDILPgpKK/BFe5zYSfRGEeo+hPT7W3tjghYLuA==",
"requires": {
"@types/bn.js": "^4.11.3",
"bn.js": "^5.1.2",
"create-hash": "^1.1.2",
"ethereum-cryptography": "^0.1.3",
"ethjs-util": "0.1.6",
"rlp": "^2.2.4"
}
}
}
},
"ethereum-bloom-filters": { "ethereum-bloom-filters": {
"version": "1.0.9", "version": "1.0.9",
"resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.9.tgz", "resolved": "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.0.9.tgz",
...@@ -16936,14 +16887,12 @@ ...@@ -16936,14 +16887,12 @@
"ethereumjs-common": { "ethereumjs-common": {
"version": "1.5.1", "version": "1.5.1",
"resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.1.tgz", "resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.1.tgz",
"integrity": "sha512-aVUPRLgmXORGXXEVkFYgPhr9TGtpBY2tGhZ9Uh0A3lIUzUDr1x6kQx33SbjPUkLkX3eniPQnIL/2psjkjrOfcQ==", "integrity": "sha512-aVUPRLgmXORGXXEVkFYgPhr9TGtpBY2tGhZ9Uh0A3lIUzUDr1x6kQx33SbjPUkLkX3eniPQnIL/2psjkjrOfcQ=="
"dev": true
}, },
"ethereumjs-tx": { "ethereumjs-tx": {
"version": "2.1.2", "version": "2.1.2",
"resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz", "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz",
"integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==", "integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==",
"dev": true,
"requires": { "requires": {
"ethereumjs-common": "^1.5.0", "ethereumjs-common": "^1.5.0",
"ethereumjs-util": "^6.0.0" "ethereumjs-util": "^6.0.0"
...@@ -16961,7 +16910,6 @@ ...@@ -16961,7 +16910,6 @@
"version": "6.2.1", "version": "6.2.1",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz", "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
"integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==", "integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
"dev": true,
"requires": { "requires": {
"@types/bn.js": "^4.11.3", "@types/bn.js": "^4.11.3",
"bn.js": "^4.11.0", "bn.js": "^4.11.0",
...@@ -16987,25 +16935,10 @@ ...@@ -16987,25 +16935,10 @@
"rlp": "^2.2.4" "rlp": "^2.2.4"
}, },
"dependencies": { "dependencies": {
<<<<<<< HEAD
"async": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"requires": {
"lodash": "^4.17.14"
}
},
"ethereumjs-util": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz",
"integrity": "sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q==",
=======
"@types/bn.js": { "@types/bn.js": {
"version": "5.1.0", "version": "5.1.0",
"resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.0.tgz", "resolved": "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.0.tgz",
"integrity": "sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA==", "integrity": "sha512-QSSVYj7pYFN49kW77o2s9xTCwZ8F2xLbjLLSEVh8D2F4JUhZtPAGOFLTD+ffqksBx/u4cE/KImFjyhqCjn/LIA==",
>>>>>>> use last ethereumjs-vm for berlin fork
"requires": { "requires": {
"@types/node": "*" "@types/node": "*"
} }
...@@ -17017,99 +16950,6 @@ ...@@ -17017,99 +16950,6 @@
} }
} }
}, },
<<<<<<< HEAD
"ethereumjs-common": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/ethereumjs-common/-/ethereumjs-common-1.5.1.tgz",
"integrity": "sha512-aVUPRLgmXORGXXEVkFYgPhr9TGtpBY2tGhZ9Uh0A3lIUzUDr1x6kQx33SbjPUkLkX3eniPQnIL/2psjkjrOfcQ=="
},
"ethereumjs-tx": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-2.1.2.tgz",
"integrity": "sha512-zZEK1onCeiORb0wyCXUvg94Ve5It/K6GD1K+26KfFKodiBiS6d9lfCXlUKGBBdQ+bv7Day+JK0tj1K+BeNFRAw==",
"requires": {
"ethereumjs-common": "^1.5.0",
"ethereumjs-util": "^6.0.0"
},
"dependencies": {
"ethereumjs-util": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
"integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
"requires": {
"@types/bn.js": "^4.11.3",
"bn.js": "^4.11.0",
"create-hash": "^1.1.2",
"elliptic": "^6.5.2",
"ethereum-cryptography": "^0.1.3",
"ethjs-util": "0.1.6",
"rlp": "^2.2.3"
}
}
}
},
"ethereumjs-util": {
"version": "6.2.0",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.0.tgz",
"integrity": "sha512-vb0XN9J2QGdZGIEKG2vXM+kUdEivUfU6Wmi5y0cg+LRhDYKnXIZ/Lz7XjFbHRR9VIKq2lVGLzGBkA++y2nOdOQ==",
"requires": {
"@types/bn.js": "^4.11.3",
"bn.js": "^4.11.0",
"create-hash": "^1.1.2",
"ethjs-util": "0.1.6",
"keccak": "^2.0.0",
"rlp": "^2.2.3",
"secp256k1": "^3.0.1"
}
},
"ethereumjs-vm": {
"version": "4.1.3",
"resolved": "https://registry.npmjs.org/ethereumjs-vm/-/ethereumjs-vm-4.1.3.tgz",
"integrity": "sha512-RTrD0y7My4O6Qr1P2ZIsMfD6RzL6kU/RhBZ0a5XrPzAeR61crBS7or66ohDrvxDI/rDBxMi+6SnsELih6fzalw==",
"requires": {
"async": "^2.1.2",
"async-eventemitter": "^0.2.2",
"core-js-pure": "^3.0.1",
"ethereumjs-account": "^3.0.0",
"ethereumjs-block": "^2.2.2",
"ethereumjs-blockchain": "^4.0.3",
"ethereumjs-common": "^1.5.0",
"ethereumjs-tx": "^2.1.2",
"ethereumjs-util": "^6.2.0",
"fake-merkle-patricia-tree": "^1.0.1",
"functional-red-black-tree": "^1.0.1",
"merkle-patricia-tree": "^2.3.2",
"rustbn.js": "~0.2.0",
"safe-buffer": "^5.1.1",
"util.promisify": "^1.0.0"
},
"dependencies": {
"async": {
"version": "2.6.3",
"resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
"integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
"requires": {
"lodash": "^4.17.14"
}
},
"ethereumjs-util": {
"version": "6.2.1",
"resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz",
"integrity": "sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw==",
"requires": {
"@types/bn.js": "^4.11.3",
"bn.js": "^4.11.0",
"create-hash": "^1.1.2",
"elliptic": "^6.5.2",
"ethereum-cryptography": "^0.1.3",
"ethjs-util": "0.1.6",
"rlp": "^2.2.3"
}
}
}
},
=======
>>>>>>> use last ethereumjs-vm for berlin fork
"ethers": { "ethers": {
"version": "5.1.4", "version": "5.1.4",
"resolved": "https://registry.npmjs.org/ethers/-/ethers-5.1.4.tgz", "resolved": "https://registry.npmjs.org/ethers/-/ethers-5.1.4.tgz",
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment