From b3f88710eab030084cc3952dd45bbca0265e581d Mon Sep 17 00:00:00 2001 From: cgewecke Date: Mon, 19 Dec 2016 20:50:53 -0800 Subject: [PATCH 1/2] Update testrpc, vm, and re-patch --- hookIntoEvents.patch | 14 +++++++------- package.json | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hookIntoEvents.patch b/hookIntoEvents.patch index 535c721..aac8840 100644 --- a/hookIntoEvents.patch +++ b/hookIntoEvents.patch @@ -1,5 +1,5 @@ ---- opFns.js.orig 2016-07-04 17:29:54.000000000 +0100 -+++ opFns.js 2016-09-30 12:30:33.000000000 +0100 +--- opFns.js.orig 2016-12-19 15:10:12.000000000 -0800 ++++ opFns.js 2016-12-19 15:15:51.000000000 -0800 @@ -6,6 +6,7 @@ const logTable = require('./logTable.js') const ERROR = constants.ERROR @@ -8,23 +8,23 @@ // the opcode functions module.exports = { -@@ -499,7 +500,6 @@ +@@ -489,7 +490,7 @@ memLength = utils.bufferToInt(memLength) const numOfTopics = runState.opCode - 0xa0 const mem = memLoad(runState, memOffset, memLength) - subGas(runState, new BN(numOfTopics * fees.logTopicGas.v + memLength * fees.logDataGas.v)) ++ //subGas(runState, new BN(numOfTopics * fees.logTopicGas.v + memLength * fees.logDataGas.v)) // add address var log = [runState.address] -@@ -507,6 +507,12 @@ +@@ -497,6 +498,11 @@ // add data log.push(mem) -+ //Added to allow tracking of instrumentation even for .call() and throw + var toWrite = {}; -+ toWrite.address= log[0].toString('hex'); ++ toWrite.address= log[0].toString('hex') + toWrite.topics = log[1].map(function(x){return x.toString('hex')}) -+ toWrite.data = log[2].toString('hex'); ++ toWrite.data = log[2].toString('hex') + fs.appendFileSync('./allFiredEvents', JSON.stringify(toWrite) + '\n') runState.logs.push(log) }, diff --git a/package.json b/package.json index f353ad2..a73194b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "author": "", "license": "ISC", "dependencies": { - "ethereumjs-testrpc": "^2.2.7", + "ethereumjs-testrpc": "^3.0.3", "istanbul": "^0.4.5", "shelljs": "^0.7.4", "solidity-parser": "git+https://github.com/ConsenSys/solidity-parser.git#master" From 8a6f6f8a2c8df93e24c6aa31d3a44657d60568b1 Mon Sep 17 00:00:00 2001 From: Alex Rea Date: Fri, 23 Dec 2016 07:02:45 +0000 Subject: [PATCH 2/2] Add circle.yml --- circle.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 circle.yml diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..8c76c90 --- /dev/null +++ b/circle.yml @@ -0,0 +1,3 @@ +dependencies: + pre: + - npm install -g truffle