new jumpdest interpretation

ethereum · Jan 2, 2015 · 2e75a21 · 2e75a21
1 parent 7aab71f
commit 2e75a21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 97 deletions.
diff --git a/StateTests/stSystemOperationsTest.json b/StateTests/stSystemOperationsTest.json
@@ -4166,11 +4166,10 @@
  "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055",
  "nonce" : "0",
  "storage" : {
- "0x" : "0x01"
  }
  },
  "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "1165",
+ "balance" : "1636",
  "code" : "0x",
  "nonce" : "0",
  "storage" : {
@@ -4181,11 +4180,10 @@
  "code" : "0x60003554156009570060203560003555",
  "nonce" : "0",
  "storage" : {
- "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
  }
  },
  "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "999999999999898835",
+ "balance" : "999999999999898364",
  "code" : "0x",
  "nonce" : "1",
  "storage" : {
@@ -4243,11 +4241,10 @@
  "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
  "nonce" : "0",
  "storage" : {
- "0x" : "0x01"
  }
  },
  "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "1165",
+ "balance" : "1136",
  "code" : "0x",
  "nonce" : "0",
  "storage" : {
@@ -4258,11 +4255,10 @@
  "code" : "0x60003554156009570060203560003555",
  "nonce" : "0",
  "storage" : {
- "0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
  }
  },
  "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "999999999999898835",
+ "balance" : "999999999999898864",
  "code" : "0x",
  "nonce" : "1",
  "storage" : {
@@ -4320,11 +4316,10 @@
  "code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600060406000620f1206601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
  "nonce" : "0",
  "storage" : {
- "0x" : "0x01"
  }
  },
  "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "965",
+ "balance" : "1136",
  "code" : "0x",
  "nonce" : "0",
  "storage" : {
@@ -4338,7 +4333,7 @@
  }
  },
  "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "999999999999899035",
+ "balance" : "999999999999898864",
  "code" : "0x",
  "nonce" : "1",
  "storage" : {
@@ -4848,18 +4843,17 @@
  "code" : "0x60003554156009570060203560003555",
  "nonce" : "0",
  "storage" : {
- "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
  }
  },
  "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "1149",
+ "balance" : "1000000",
  "code" : "0x",
  "nonce" : "0",
  "storage" : {
  }
  },
  "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "999999999999898851",
+ "balance" : "999999999998900000",
  "code" : "0x",
  "nonce" : "1",
  "storage" : {
@@ -4972,12 +4966,10 @@
  "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
  "nonce" : "0",
  "storage" : {
- "0x" : "0x01",
- "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
  }
  },
  "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
- "balance" : "1165",
+ "balance" : "1636",
  "code" : "0x",
  "nonce" : "0",
  "storage" : {
@@ -4991,7 +4983,7 @@
  }
  },
  "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
- "balance" : "999999999999898835",
+ "balance" : "999999999999898364",
  "code" : "0x",
  "nonce" : "1",
  "storage" : {

diff --git a/VMTests/vmIOandFlowOperationsTest.json b/VMTests/vmIOandFlowOperationsTest.json
@@ -135,8 +135,6 @@
  }
  },
  "jump0" : {
- "callcreates" : [
- ],
  "env" : {
  "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
  "currentDifficulty" : "256",
@@ -155,20 +153,6 @@
  "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
  "value" : "1000000000000000000"
  },
- "gas" : "9696",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "0x60236007566001600255",
- "nonce" : "0",
- "storage" : {
- "0x02" : "0x23"
- }
- }
- },
  "pre" : {
  "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
  "balance" : "1000000000000000000",
@@ -254,8 +238,6 @@
  }
  },
  "jump0_jumpdest1" : {
- "callcreates" : [
- ],
  "env" : {
  "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
  "currentDifficulty" : "256",
@@ -274,20 +256,6 @@
  "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
  "value" : "1000000000000000000"
  },
- "gas" : "9696",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "0x602360085660015b600255",
- "nonce" : "0",
- "storage" : {
- "0x02" : "0x23"
- }
- }
- },
  "pre" : {
  "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
  "balance" : "1000000000000000000",
@@ -402,8 +370,6 @@
  }
  },
  "jumpi0" : {
- "callcreates" : [
- ],
  "env" : {
  "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
  "currentDifficulty" : "256",
@@ -422,20 +388,6 @@
  "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
  "value" : "1000000000000000000"
  },
- "gas" : "9695",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "0x602360016009576001600255",
- "nonce" : "0",
- "storage" : {
- "0x02" : "0x23"
- }
- }
- },
  "pre" : {
  "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
  "balance" : "1000000000000000000",
@@ -492,8 +444,6 @@
  }
  },
  "jumpi1_jumpdest" : {
- "callcreates" : [
- ],
  "env" : {
  "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
  "currentDifficulty" : "256",
@@ -512,20 +462,6 @@
  "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
  "value" : "1000000000000000000"
  },
- "gas" : "9695",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "0x60236001600a5760015b600255",
- "nonce" : "0",
- "storage" : {
- "0x02" : "0x23"
- }
- }
- },
  "pre" : {
  "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
  "balance" : "1000000000000000000",
@@ -537,8 +473,6 @@
  }
  },
  "jumpi2" : {
- "callcreates" : [
- ],
  "env" : {
  "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
  "currentDifficulty" : "256",
@@ -557,19 +491,6 @@
  "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
  "value" : "1000000000000000000"
  },
- "gas" : "9997",
- "logs" : [
- ],
- "out" : "0x",
- "post" : {
- "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
- "balance" : "1000000000000000000",
- "code" : "0x60017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff576002600355",
- "nonce" : "0",
- "storage" : {
- }
- }
- },
  "pre" : {
  "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
  "balance" : "1000000000000000000",