From 021fe3d410773024cd5f0387e62db6e6ec800f32 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Wed, 9 May 2018 13:54:12 +0300
Subject: [PATCH] restore ecmul test

---
 .../ecmul_0-3_5616_28000_96.json              | 165 +++++++-----------
 .../ecmul_0-3_5616_28000_96Filler.json        |   9 +-
 2 files changed, 69 insertions(+), 105 deletions(-)

diff --git a/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json b/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json
index 7649260922c..1fd4f006b29 100644
--- a/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json
+++ b/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96.json
@@ -1,12 +1,11 @@
 {
     "ecmul_0-3_5616_28000_96" : {
         "_info" : {
-            "comment" : "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes",
-            "filling-rpc-server" : "eth/v1.3.0/Linux/g++/Interpreter/Debug/37f37291*/",
-            "filling-tool-version" : "retesteth-0.0.1+commit.86270701.Linux.g++",
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.82b0643a.Linux.g++",
             "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json",
-            "sourceHash" : "ffb11a96ca9809a418095e7ae1d31bdd5c47895364c5dc60a0d00a6ad3b9b88d"
+            "sourceHash" : "4cde278d0a2c42fc2926b6e98cf5f25dfaae8dc54830783e70664902b404d840"
         },
         "env" : {
             "currentCoinbase" : "0x3535353535353535353535353535353535353535",
@@ -16,122 +15,162 @@
             "currentTimestamp" : "0x03e8",
             "previousHash" : "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
         },
+        "post" : {
+            "Byzantium" : [
+                {
+                    "hash" : "0x41d8fd264853c79997c692917095fc4b2b43e94e424a47ae10632ae85b3c5c01",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x41d8fd264853c79997c692917095fc4b2b43e94e424a47ae10632ae85b3c5c01",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 1,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x41d8fd264853c79997c692917095fc4b2b43e94e424a47ae10632ae85b3c5c01",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 2,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                {
+                    "hash" : "0x41d8fd264853c79997c692917095fc4b2b43e94e424a47ae10632ae85b3c5c01",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 3,
+                        "value" : 0
+                    },
+                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                }
+            ]
+        },
         "pre" : {
             "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x0000000000000000000000000000000000000002" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x0000000000000000000000000000000000000004" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x0000000000000000000000000000000000000005" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x0000000000000000000000000000000000000006" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x0000000000000000000000000000000000000007" : {
                 "balance" : "0x01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x10a1c1cb95c92ec31d3f22c66eef1d9f3f258c6b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x13cbb8d99c6c4e0f2728c7d72606e78a29c4e224" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x24143873e0e0815fdcbcffdbe09c979cbf9ad013" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x3535353535353535353535353535353535353535" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x598443f1880ef585b21f1d7585bd0577402861e5" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x77db2bebba79db42a978f896968f4afce746ea1f" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x7d577a597b2742b498cb5cf0c26cdcd726d39e6e" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x82a978b3f5962a5b0957d9ee9eef472ee55b42f1" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0xad",
                 "storage" : {
                 }
             },
             "0x90f0b1ebbba1c1936aff7aaf20a7878ff9e04b6c" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -146,14 +185,14 @@
             },
             "0xdceceaf3fc5c0a63d195d69b1a90011b7b19650d" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xe0fc04fa2d34a66b779fd5cee748268032a146c0" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -176,84 +215,6 @@
             "value" : [
                 "0x"
             ]
-        },
-        "post" : {
-            "Byzantium" : [
-                {
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "hash" : "0x60904f7b0bf855e8415df331627f073b4e86799c6e21278a177bc83aa869df6a",
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "hash" : "0x60904f7b0bf855e8415df331627f073b4e86799c6e21278a177bc83aa869df6a",
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    },
-                    "hash" : "0x60904f7b0bf855e8415df331627f073b4e86799c6e21278a177bc83aa869df6a",
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 0
-                    },
-                    "hash" : "0x60904f7b0bf855e8415df331627f073b4e86799c6e21278a177bc83aa869df6a",
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ],
-            "Constantinople" : [
-                {
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 0,
-                        "value" : 0
-                    },
-                    "hash" : "0x60904f7b0bf855e8415df331627f073b4e86799c6e21278a177bc83aa869df6a",
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 1,
-                        "value" : 0
-                    },
-                    "hash" : "0x60904f7b0bf855e8415df331627f073b4e86799c6e21278a177bc83aa869df6a",
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 2,
-                        "value" : 0
-                    },
-                    "hash" : "0x60904f7b0bf855e8415df331627f073b4e86799c6e21278a177bc83aa869df6a",
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                {
-                    "indexes" : {
-                        "data" : 0,
-                        "gas" : 3,
-                        "value" : 0
-                    },
-                    "hash" : "0x60904f7b0bf855e8415df331627f073b4e86799c6e21278a177bc83aa869df6a",
-                    "logs" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                }
-            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
index 85b76416b7c..269a6e17838 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
@@ -248,6 +248,11 @@
                         "balance": "1000000000000000000",
                         "code": "0x"
                     },
+                    "3535353535353535353535353535353535353535": {
+                        "storage": {},
+                        "nonce": "0",
+                        "code": "0x"
+                    },
                     "0000000000000000000000000000000000000002": {
                         "storage": {},
                         "nonce": "0",
@@ -275,8 +280,6 @@
                 }
             }
         ],
-        "_info": { 
-	    "comment" : "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes"
-	}
+        "explanation": "Puts the point (0, 3) and the factor 21888242871839275222246405745257275088548364400416034343698204186575808495616 into the ECMUL precompile, truncating or expanding the input data to 96 bytes. Gives the execution 28000 bytes"
     }
 }