Skip to content

Commit 2e75a21

Browse files
CJentzschCJentzsch
committed
new jumpdest interpretation
1 parent 7aab71f commit 2e75a21

File tree

2 files changed

+10
-97
lines changed

2 files changed

+10
-97
lines changed

‎StateTests/stSystemOperationsTest.json‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4166,11 +4166,10 @@
41664166
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f1600055",
41674167
"nonce" : "0",
41684168
"storage" : {
4169-
"0x" : "0x01"
41704169
}
41714170
},
41724171
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
4173-
"balance" : "1165",
4172+
"balance" : "1636",
41744173
"code" : "0x",
41754174
"nonce" : "0",
41764175
"storage" : {
@@ -4181,11 +4180,10 @@
41814180
"code" : "0x60003554156009570060203560003555",
41824181
"nonce" : "0",
41834182
"storage" : {
4184-
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
41854183
}
41864184
},
41874185
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
4188-
"balance" : "999999999999898835",
4186+
"balance" : "999999999999898364",
41894187
"code" : "0x",
41904188
"nonce" : "1",
41914189
"storage" : {
@@ -4243,11 +4241,10 @@
42434241
"code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
42444242
"nonce" : "0",
42454243
"storage" : {
4246-
"0x" : "0x01"
42474244
}
42484245
},
42494246
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
4250-
"balance" : "1165",
4247+
"balance" : "1136",
42514248
"code" : "0x",
42524249
"nonce" : "0",
42534250
"storage" : {
@@ -4258,11 +4255,10 @@
42584255
"code" : "0x60003554156009570060203560003555",
42594256
"nonce" : "0",
42604257
"storage" : {
4261-
"0xeeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
42624258
}
42634259
},
42644260
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
4265-
"balance" : "999999999999898835",
4261+
"balance" : "999999999999898864",
42664262
"code" : "0x",
42674263
"nonce" : "1",
42684264
"storage" : {
@@ -4320,11 +4316,10 @@
43204316
"code" : "0x7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600060406000620f1206601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055",
43214317
"nonce" : "0",
43224318
"storage" : {
4323-
"0x" : "0x01"
43244319
}
43254320
},
43264321
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
4327-
"balance" : "965",
4322+
"balance" : "1136",
43284323
"code" : "0x",
43294324
"nonce" : "0",
43304325
"storage" : {
@@ -4338,7 +4333,7 @@
43384333
}
43394334
},
43404335
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
4341-
"balance" : "999999999999899035",
4336+
"balance" : "999999999999898864",
43424337
"code" : "0x",
43434338
"nonce" : "1",
43444339
"storage" : {
@@ -4848,18 +4843,17 @@
48484843
"code" : "0x60003554156009570060203560003555",
48494844
"nonce" : "0",
48504845
"storage" : {
4851-
"0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
48524846
}
48534847
},
48544848
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
4855-
"balance" : "1149",
4849+
"balance" : "1000000",
48564850
"code" : "0x",
48574851
"nonce" : "0",
48584852
"storage" : {
48594853
}
48604854
},
48614855
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
4862-
"balance" : "999999999999898851",
4856+
"balance" : "999999999998900000",
48634857
"code" : "0x",
48644858
"nonce" : "1",
48654859
"storage" : {
@@ -4972,12 +4966,10 @@
49724966
"code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
49734967
"nonce" : "0",
49744968
"storage" : {
4975-
"0x" : "0x01",
4976-
"0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xaaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa"
49774969
}
49784970
},
49794971
"2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
4980-
"balance" : "1165",
4972+
"balance" : "1636",
49814973
"code" : "0x",
49824974
"nonce" : "0",
49834975
"storage" : {
@@ -4991,7 +4983,7 @@
49914983
}
49924984
},
49934985
"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
4994-
"balance" : "999999999999898835",
4986+
"balance" : "999999999999898364",
49954987
"code" : "0x",
49964988
"nonce" : "1",
49974989
"storage" : {

‎VMTests/vmIOandFlowOperationsTest.json‎

Lines changed: 0 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,6 @@
135135
}
136136
},
137137
"jump0" : {
138-
"callcreates" : [
139-
],
140138
"env" : {
141139
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
142140
"currentDifficulty" : "256",
@@ -155,20 +153,6 @@
155153
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
156154
"value" : "1000000000000000000"
157155
},
158-
"gas" : "9696",
159-
"logs" : [
160-
],
161-
"out" : "0x",
162-
"post" : {
163-
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
164-
"balance" : "1000000000000000000",
165-
"code" : "0x60236007566001600255",
166-
"nonce" : "0",
167-
"storage" : {
168-
"0x02" : "0x23"
169-
}
170-
}
171-
},
172156
"pre" : {
173157
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
174158
"balance" : "1000000000000000000",
@@ -254,8 +238,6 @@
254238
}
255239
},
256240
"jump0_jumpdest1" : {
257-
"callcreates" : [
258-
],
259241
"env" : {
260242
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
261243
"currentDifficulty" : "256",
@@ -274,20 +256,6 @@
274256
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
275257
"value" : "1000000000000000000"
276258
},
277-
"gas" : "9696",
278-
"logs" : [
279-
],
280-
"out" : "0x",
281-
"post" : {
282-
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
283-
"balance" : "1000000000000000000",
284-
"code" : "0x602360085660015b600255",
285-
"nonce" : "0",
286-
"storage" : {
287-
"0x02" : "0x23"
288-
}
289-
}
290-
},
291259
"pre" : {
292260
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
293261
"balance" : "1000000000000000000",
@@ -402,8 +370,6 @@
402370
}
403371
},
404372
"jumpi0" : {
405-
"callcreates" : [
406-
],
407373
"env" : {
408374
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
409375
"currentDifficulty" : "256",
@@ -422,20 +388,6 @@
422388
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
423389
"value" : "1000000000000000000"
424390
},
425-
"gas" : "9695",
426-
"logs" : [
427-
],
428-
"out" : "0x",
429-
"post" : {
430-
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
431-
"balance" : "1000000000000000000",
432-
"code" : "0x602360016009576001600255",
433-
"nonce" : "0",
434-
"storage" : {
435-
"0x02" : "0x23"
436-
}
437-
}
438-
},
439391
"pre" : {
440392
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
441393
"balance" : "1000000000000000000",
@@ -492,8 +444,6 @@
492444
}
493445
},
494446
"jumpi1_jumpdest" : {
495-
"callcreates" : [
496-
],
497447
"env" : {
498448
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
499449
"currentDifficulty" : "256",
@@ -512,20 +462,6 @@
512462
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
513463
"value" : "1000000000000000000"
514464
},
515-
"gas" : "9695",
516-
"logs" : [
517-
],
518-
"out" : "0x",
519-
"post" : {
520-
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
521-
"balance" : "1000000000000000000",
522-
"code" : "0x60236001600a5760015b600255",
523-
"nonce" : "0",
524-
"storage" : {
525-
"0x02" : "0x23"
526-
}
527-
}
528-
},
529465
"pre" : {
530466
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
531467
"balance" : "1000000000000000000",
@@ -537,8 +473,6 @@
537473
}
538474
},
539475
"jumpi2" : {
540-
"callcreates" : [
541-
],
542476
"env" : {
543477
"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
544478
"currentDifficulty" : "256",
@@ -557,19 +491,6 @@
557491
"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
558492
"value" : "1000000000000000000"
559493
},
560-
"gas" : "9997",
561-
"logs" : [
562-
],
563-
"out" : "0x",
564-
"post" : {
565-
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
566-
"balance" : "1000000000000000000",
567-
"code" : "0x60017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff576002600355",
568-
"nonce" : "0",
569-
"storage" : {
570-
}
571-
}
572-
},
573494
"pre" : {
574495
"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
575496
"balance" : "1000000000000000000",

0 commit comments

Comments
 (0)