aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr01_d0g0v0Filler.json212
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr10_d0g0v0Filler.json215
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr11_d0g0v0Filler.json214
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_0_d0g0v0Filler.json214
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_1_d0g0v0Filler.json214
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_255_d0g0v0Filler.json214
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_256_d0g0v0Filler.json212
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_1_d0g0v0Filler.json214
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_255_d0g0v0Filler.json214
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_256_d0g0v0Filler.json213
-rw-r--r--src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_257_d0g0v0Filler.json213
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr01Filler.json108
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr10Filler.json110
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr11Filler.json110
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr_-1_0Filler.json109
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr_-1_1Filler.json109
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr_-1_255Filler.json109
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr_-1_256Filler.json108
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr_2^255_1Filler.json109
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr_2^255_255Filler.json109
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr_2^255_256Filler.json109
-rw-r--r--src/GeneralStateTestsFiller/stShift/shr_2^255_257Filler.json109
22 files changed, 3548 insertions, 0 deletions
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr01_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr01_d0g0v0Filler.json
new file mode 100644
index 000000000..7e30ff7ad
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr01_d0g0v0Filler.json
@@ -0,0 +1,212 @@
+{
+ "shr01_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x600060011c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr10_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr10_d0g0v0Filler.json
new file mode 100644
index 000000000..b1dc262f1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr10_d0g0v0Filler.json
@@ -0,0 +1,215 @@
+{
+ "shr10_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c659c",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a76213c4",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x600160001c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr11_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr11_d0g0v0Filler.json
new file mode 100644
index 000000000..804b1597c
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr11_d0g0v0Filler.json
@@ -0,0 +1,214 @@
+{
+ "shr11_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c32ce",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7624692",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x600160011c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_0_d0g0v0Filler.json
new file mode 100644
index 000000000..71e60e81a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_0_d0g0v0Filler.json
@@ -0,0 +1,214 @@
+{
+ "shr_-1_0_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c659c",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60001c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_1_d0g0v0Filler.json
new file mode 100644
index 000000000..c9ef256ff
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_1_d0g0v0Filler.json
@@ -0,0 +1,214 @@
+{
+ "shr_-1_1_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ "0x00" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c659c",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_255_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_255_d0g0v0Filler.json
new file mode 100644
index 000000000..f05706fe1
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_255_d0g0v0Filler.json
@@ -0,0 +1,214 @@
+{
+ "shr_-1_255_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c659c",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60ff1c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_256_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_256_d0g0v0Filler.json
new file mode 100644
index 000000000..bfe5b45d8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_-1_256_d0g0v0Filler.json
@@ -0,0 +1,212 @@
+{
+ "shr_-1_256_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101001c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_1_d0g0v0Filler.json
new file mode 100644
index 000000000..36b32d73f
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_1_d0g0v0Filler.json
@@ -0,0 +1,214 @@
+{
+ "shr_2^255_1_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ "0x00" : "0x4000000000000000000000000000000000000000000000000000000000000000"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c659c",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x7f800000000000000000000000000000000000000000000000000000000000000060011c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_255_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_255_d0g0v0Filler.json
new file mode 100644
index 000000000..c27cafca2
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_255_d0g0v0Filler.json
@@ -0,0 +1,214 @@
+{
+ "shr_2^255_255_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c659c",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x7f800000000000000000000000000000000000000000000000000000000000000060ff1c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_256_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_256_d0g0v0Filler.json
new file mode 100644
index 000000000..6156b5e7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_256_d0g0v0Filler.json
@@ -0,0 +1,213 @@
+{
+ "shr_2^255_256_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c32ce",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x7f80000000000000000000000000000000000000000000000000000000000000006101001c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_257_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_257_d0g0v0Filler.json
new file mode 100644
index 000000000..a1f317d02
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stShift/shr_2^255_257_d0g0v0Filler.json
@@ -0,0 +1,213 @@
+{
+ "shr_2^255_257_d0g0v0" : {
+ "blocks" : [
+ {
+ "blockHeaderPremine" : {
+ "difficulty" : "0x020000",
+ "gasLimit" : "0x0f4240",
+ "timestamp" : "0x03e8",
+ "updatePoW" : "1"
+ },
+ "transactions" : [
+ {
+ "data" : "0x",
+ "gasLimit" : "0x061a80",
+ "gasPrice" : "0x01",
+ "nonce" : "0x00",
+ "r" : "0xe94818d1f3b0c69eb37720145a5ead7fbf6f8d80139dd53953b4a782301050a3",
+ "s" : "0x1fcf46908c01576715411be0857e30027d6be3250a3653f049b3ff8d74d2540c",
+ "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "v" : "0x1c",
+ "value" : "0x0186a0"
+ }
+ ],
+ "uncleHeaders" : [
+ ]
+ }
+ ],
+ "expect" : [
+ {
+ "network" : "Frontier",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Homestead",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP150",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "EIP158",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x4563918244fa1a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Byzantium",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af6321a80",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a75de580",
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "network" : "Constantinople",
+ "result" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a76586a0",
+ "storage" : {
+ }
+ },
+ "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "0x29a2241af62c32ce",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "",
+ "nonce" : "0x01",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "genesisBlockHeader" : {
+ "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+ "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "difficulty" : "131072",
+ "extraData" : "0x42",
+ "gasLimit" : "0x0f4240",
+ "gasUsed" : "0",
+ "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "nonce" : "0x0102030405060708",
+ "number" : "0",
+ "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+ "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+ "timestamp" : "0x03b6",
+ "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+ "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+ },
+ "pre" : {
+ "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "0x7f80000000000000000000000000000000000000000000000000000000000000006101011c600055",
+ "nonce" : "0x00",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "0x0de0b6b3a7640000",
+ "code" : "",
+ "nonce" : "0x00",
+ "storage" : {
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/src/GeneralStateTestsFiller/stShift/shr01Filler.json b/src/GeneralStateTestsFiller/stShift/shr01Filler.json
new file mode 100644
index 000000000..87ed87853
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr01Filler.json
@@ -0,0 +1,108 @@
+{
+ "shr01" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH1 0; PUSH1 1; SHR; PUSH1 0; SSTORE",
+ "code" : "0x600060011c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr10Filler.json b/src/GeneralStateTestsFiller/stShift/shr10Filler.json
new file mode 100644
index 000000000..cda3088e2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr10Filler.json
@@ -0,0 +1,110 @@
+{
+ "shr10" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "26012",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999873988",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH1 1; PUSH1 0; SHR; PUSH1 0; SSTORE",
+ "code" : "0x600160001c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr11Filler.json b/src/GeneralStateTestsFiller/stShift/shr11Filler.json
new file mode 100644
index 000000000..c49144b7d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr11Filler.json
@@ -0,0 +1,110 @@
+{
+ "shr11" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "13006",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999886994",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH1 1; PUSH1 1; SHR; PUSH1 0; SSTORE",
+ "code" : "0x600160011c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr_-1_0Filler.json b/src/GeneralStateTestsFiller/stShift/shr_-1_0Filler.json
new file mode 100644
index 000000000..cb3ad7e3b
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr_-1_0Filler.json
@@ -0,0 +1,109 @@
+{
+ "shr_-1_0" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "26012",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x00; SHR; PUSH1 0; SSTORE",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60001c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr_-1_1Filler.json b/src/GeneralStateTestsFiller/stShift/shr_-1_1Filler.json
new file mode 100644
index 000000000..3bef570cd
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr_-1_1Filler.json
@@ -0,0 +1,109 @@
+{
+ "shr_-1_1" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "26012",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0x01; SHR; PUSH1 0; SSTORE",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60011c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr_-1_255Filler.json b/src/GeneralStateTestsFiller/stShift/shr_-1_255Filler.json
new file mode 100644
index 000000000..2550ac5cf
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr_-1_255Filler.json
@@ -0,0 +1,109 @@
+{
+ "shr_-1_255" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "26012",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH1 0xff; SHR; PUSH1 0; SSTORE",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60ff1c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr_-1_256Filler.json b/src/GeneralStateTestsFiller/stShift/shr_-1_256Filler.json
new file mode 100644
index 000000000..8aa779821
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr_-1_256Filler.json
@@ -0,0 +1,108 @@
+{
+ "shr_-1_256" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff; PUSH2 0x0100; SHR; PUSH1 0; SSTORE",
+ "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6101001c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr_2^255_1Filler.json b/src/GeneralStateTestsFiller/stShift/shr_2^255_1Filler.json
new file mode 100644
index 000000000..9f04ab3eb
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr_2^255_1Filler.json
@@ -0,0 +1,109 @@
+{
+ "shr_2^255_1" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x4000000000000000000000000000000000000000000000000000000000000000"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "26012",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH32 0x8000000000000000000000000000000000000000000000000000000000000000; PUSH1 1; SHR; PUSH1 0; SSTORE",
+ "code" : "0x7f800000000000000000000000000000000000000000000000000000000000000060011c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr_2^255_255Filler.json b/src/GeneralStateTestsFiller/stShift/shr_2^255_255Filler.json
new file mode 100644
index 000000000..f39742e2e
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr_2^255_255Filler.json
@@ -0,0 +1,109 @@
+{
+ "shr_2^255_255" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x01"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "26012",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH32 0x8000000000000000000000000000000000000000000000000000000000000000; PUSH1 0xff; SHR; PUSH1 0; SSTORE",
+ "code" : "0x7f800000000000000000000000000000000000000000000000000000000000000060ff1c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr_2^255_256Filler.json b/src/GeneralStateTestsFiller/stShift/shr_2^255_256Filler.json
new file mode 100644
index 000000000..3e2baa3bc
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr_2^255_256Filler.json
@@ -0,0 +1,109 @@
+{
+ "shr_2^255_256" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "13006",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH32 0x8000000000000000000000000000000000000000000000000000000000000000; PUSH2 0x0100; SHR; PUSH1 0; SSTORE",
+ "code" : "0x7f80000000000000000000000000000000000000000000000000000000000000006101001c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}
diff --git a/src/GeneralStateTestsFiller/stShift/shr_2^255_257Filler.json b/src/GeneralStateTestsFiller/stShift/shr_2^255_257Filler.json
new file mode 100644
index 000000000..fb0816fea
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stShift/shr_2^255_257Filler.json
@@ -0,0 +1,109 @@
+{
+ "shr_2^255_257" : {
+ "_info" : {
+ "commment" : "Taken from https://github.com/ethereum/EIPs/blob/master/EIPS/eip-145.md"
+ },
+ "env" : {
+ "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+ "currentDifficulty" : "0x20000",
+ "currentGasLimit" : "1000000",
+ "currentNumber" : "1",
+ "currentTimestamp" : "1000",
+ "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+ },
+ "expect" : [
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : ["<=Byzantium"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "400000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "999999999999600000",
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ },
+ {
+ "indexes" : {
+ "data" : -1,
+ "gas" : -1,
+ "value" : -1
+ },
+ "network" : [">=Constantinople"],
+ "result" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000100000",
+ "storage" : {
+ "0x00" : "0x00"
+ }
+ },
+ "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+ "balance" : "13006",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "code" : "0x",
+ "nonce" : "1",
+ "storage" : {
+ }
+ }
+ }
+ }
+ ],
+ "pre" : {
+ "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+ "balance" : "1000000000000000000",
+ "// code" : "PUSH32 0x8000000000000000000000000000000000000000000000000000000000000000; PUSH2 0x0101; SHR; PUSH1 0; SSTORE",
+ "code" : "0x7f80000000000000000000000000000000000000000000000000000000000000006101011c600055",
+ "nonce" : "0",
+ "storage" : {
+ "0x00" : "0x03"
+ }
+ },
+ "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+ "balance" : "1000000000000000000",
+ "code" : "0x",
+ "nonce" : "0",
+ "storage" : {
+ }
+ }
+ },
+ "transaction" : {
+ "data" : [
+ ""
+ ],
+ "gasLimit" : [
+ "400000"
+ ],
+ "gasPrice" : "1",
+ "nonce" : "0",
+ "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+ "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+ "value" : [
+ "100000"
+ ]
+ }
+ }
+}