From db256a3cc607460db1b5e22fc8742a746a7bc305 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Tue, 6 Feb 2018 21:42:33 +0300
Subject: update stCodeSize stBadOpcode

---
 .../ExtCodeCopyTests_d0g0v0Filler.json             | 99 +++++++++++++++++++++-
 .../codesizeOOGInvalidSize_d0g0v0Filler.json       | 47 ++++++++++
 .../codesizeValid_d0g0v0Filler.json                | 50 +++++++++++
 .../stCodeCopyTest/ExtCodeCopyTestsFiller.json     |  2 +-
 .../codesizeOOGInvalidSizeFiller.json              |  2 +-
 .../stCodeSizeLimit/codesizeValidFiller.json       |  2 +-
 6 files changed, 198 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCodeCopyTest/ExtCodeCopyTests_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCodeCopyTest/ExtCodeCopyTests_d0g0v0Filler.json
index 0339c41d9..61d37a44e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCodeCopyTest/ExtCodeCopyTests_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCodeCopyTest/ExtCodeCopyTests_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,103 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x05" : "0x11120000000000000000000000000000000000000000000000000000000000",
+                            "0x06" : "0x11121314151617181920212223242526272829303132000000000000000000"
+                        }
+                    },
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    },
+                    "0xcccf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x00"
+                    },
+                    "0xdddf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x05" : "0x11120000000000000000000000000000000000000000000000000000000000",
+                            "0x06" : "0x11121314151617181920212223242526272829303132000000000000000000"
+                        }
+                    },
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    },
+                    "0xcccf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x00"
+                    },
+                    "0xdddf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x05" : "0x11120000000000000000000000000000000000000000000000000000000000",
+                            "0x06" : "0x11121314151617181920212223242526272829303132000000000000000000"
+                        }
+                    },
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    },
+                    "0xcccf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x00"
+                    },
+                    "0xdddf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x05" : "0x11120000000000000000000000000000000000000000000000000000000000",
+                            "0x06" : "0x11121314151617181920212223242526272829303132000000000000000000"
+                        }
+                    },
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    },
+                    "0xcccf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x00"
+                    },
+                    "0xdddf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x05" : "0x11120000000000000000000000000000000000000000000000000000000000",
+                            "0x06" : "0x11121314151617181920212223242526272829303132000000000000000000"
+                        }
+                    },
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    },
+                    "0xcccf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x00"
+                    },
+                    "0xdddf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize_d0g0v0Filler.json
index e9e9cba89..bd1895fea 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCodeSizeLimit/codesizeOOGInvalidSize_d0g0v0Filler.json
@@ -25,6 +25,53 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCodeSizeLimit/codesizeValid_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCodeSizeLimit/codesizeValid_d0g0v0Filler.json
index fd2068c6f..2e3b73160 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCodeSizeLimit/codesizeValid_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCodeSizeLimit/codesizeValid_d0g0v0Filler.json
@@ -25,6 +25,56 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "EIP158",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x01"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/GeneralStateTestsFiller/stCodeCopyTest/ExtCodeCopyTestsFiller.json b/src/GeneralStateTestsFiller/stCodeCopyTest/ExtCodeCopyTestsFiller.json
index 2f360e476..73ae15fac 100644
--- a/src/GeneralStateTestsFiller/stCodeCopyTest/ExtCodeCopyTestsFiller.json
+++ b/src/GeneralStateTestsFiller/stCodeCopyTest/ExtCodeCopyTestsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">Frontier"],
                 "result" : {
 		    "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 		        "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json b/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json
index d1fd244ce..830b7cb8a 100644
--- a/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json
+++ b/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeOOGInvalidSizeFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP158"],
+                "network" : [">=EIP158"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
 			"shouldnotexist" : "1"
diff --git a/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json b/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json
index 62fed45b6..3842e45ad 100644
--- a/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json
+++ b/src/GeneralStateTestsFiller/stCodeSizeLimit/codesizeValidFiller.json
@@ -28,7 +28,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["Byzantium"],
+                "network" : [">=Byzantium"],
                 "result" : {
                     "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
 			            "balance" : "1"
-- 
cgit v1.2.3