Skip to content

Commit e7bdbaa

Browse files
authored
Merge pull request #345 from sc-forks/fix/emit-free-logs
Upgrade testrpc-sc 6.4.5-sc.3
2 parents 07d1aa7 + bcb471a commit e7bdbaa

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"license": "ISC",
2222
"dependencies": {
2323
"death": "^1.1.0",
24-
"ethereumjs-testrpc-sc": "6.4.5-sc.2",
24+
"ethereumjs-testrpc-sc": "6.4.5-sc.3",
2525
"istanbul": "^0.4.5",
2626
"keccakjs": "^0.2.1",
2727
"req-cwd": "^1.0.1",
@@ -37,7 +37,7 @@
3737
"ethereumjs-account": "~2.0.4",
3838
"ethereumjs-tx": "^1.2.2",
3939
"ethereumjs-util": "^5.0.1",
40-
"ethereumjs-vm": "git+https://github.com/sc-forks/ethereumjs-vm-sc.git#3c328147a2c48a379af775930f52c439813a21e2",
40+
"ethereumjs-vm": "https://github.com/sc-forks/ethereumjs-vm-sc.git#b77327985b480ace0f11bc899475cadf981ddb65",
4141
"merkle-patricia-tree": "~2.1.2",
4242
"mocha": "^4.1.0",
4343
"request": "^2.88.0",

test/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ describe('app', () => {
341341
collectGarbage();
342342
});
343343

344-
it.skip('contract sends / transfers to instrumented fallback: coverage, cleanup & exit(0)', () => {
344+
it('contract sends / transfers to instrumented fallback: coverage, cleanup & exit(0)', () => {
345345
// Skipped due to https://github.com/sc-forks/solidity-coverage/issues/106
346346
// Validate ethereumjs-vm hack to remove gas constraints on transfer() and send()
347347
assert(pathExists('./coverage') === false, 'should start without: coverage');

yarn.lock

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -913,10 +913,10 @@ ethereumjs-common@^1.1.0:
913913
resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.3.0.tgz#ca7d152b615d5e1851fcf184d062bf14c62c18e6"
914914
integrity sha512-/jdFHyHOIS3FiAnunwRZ+oNulFtNNSHyWii3PaNHReOUmBAxij7KMyZLKh0tE16JEsJtXOVz1ceYuq++ILzv+g==
915915

916-
917-
version "6.4.5-sc.2"
918-
resolved "https://registry.yarnpkg.com/ethereumjs-testrpc-sc/-/ethereumjs-testrpc-sc-6.4.5-sc.2.tgz#c6cd72c7fbaad30ea4c254b98efeb451d185d336"
919-
integrity sha512-vqumwbUkH/FCTBkzgL21Pfh9Q5DXVN3o+yoi8u7vsBZSubj0+msg7NBIlU7bkolk2LRpTf4gX6dFab7eY+TNtw==
916+
917+
version "6.4.5-sc.3"
918+
resolved "https://registry.yarnpkg.com/ethereumjs-testrpc-sc/-/ethereumjs-testrpc-sc-6.4.5-sc.3.tgz#7c02bfb4c07f32d0ccb30140b61736e5f1bb71c4"
919+
integrity sha512-uQD5Tf+C1QgXRx4GkYnlkB6UxLInkbn2gZzwAKLbnDKIzqcv4JiKVUJxnHyYrbXAu0IAxexus7jYnpju2yDHqw==
920920
dependencies:
921921
bn.js "4.11.8"
922922
source-map-support "0.5.9"
@@ -967,9 +967,9 @@ ethereumjs-util@^6.0.0:
967967
safe-buffer "^5.1.1"
968968
secp256k1 "^3.0.1"
969969

970-
"ethereumjs-vm@git+https://github.com/sc-forks/ethereumjs-vm-sc.git#3c328147a2c48a379af775930f52c439813a21e2":
970+
"ethereumjs-vm@https://github.com/sc-forks/ethereumjs-vm-sc.git#b77327985b480ace0f11bc899475cadf981ddb65":
971971
version "2.6.0"
972-
resolved "git+https://github.com/sc-forks/ethereumjs-vm-sc.git#3c328147a2c48a379af775930f52c439813a21e2"
972+
resolved "https://github.com/sc-forks/ethereumjs-vm-sc.git#b77327985b480ace0f11bc899475cadf981ddb65"
973973
dependencies:
974974
async "^2.1.2"
975975
async-eventemitter "^0.2.2"

0 commit comments

Comments
 (0)