protocol update (CALLCODE <-> RETURN), topics in log are arrays not sets

2 files changed, 61 insertions, 24 deletions

diff --git a/StateTests/stSystemOperationsTest.json b/StateTests/stSystemOperationsTest.json
index 8c0e8dde4..354a8ea0c 100644
--- a/StateTests/stSystemOperationsTest.json
+++ b/StateTests/stSystemOperationsTest.json
@@ -1278,7 +1278,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "46",
-                "code" : "0x6001600155603760005360026000f2",
+                "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0",
                 "storage" : {
                     "0x01" : "0x01"
@@ -1302,7 +1302,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x6001600155603760005360026000f2",
+                "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1477,7 +1477,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000100000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f3600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
                 "nonce" : "0",
                 "storage" : {
                     "0x" : "0x01",
@@ -1509,7 +1509,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f3600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000604060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56103e8f2600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1554,7 +1554,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000100000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f3600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f2600055",
                 "nonce" : "0",
                 "storage" : {
                     "0x" : "0x01",
@@ -1570,7 +1570,7 @@
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x6001600155603760005360026000f2",
+                "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1586,14 +1586,14 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f3600055",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526002600060406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f2600055",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                 "balance" : "23",
-                "code" : "0x6001600155603760005360026000f2",
+                "code" : "0x6001600155603760005360026000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1707,7 +1707,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000099977",
-                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052601c60046017f0600055",
+                "code" : "0x7b601080600c6000396000f30060003554156009570060203560003555600052601c60046017f0600055",
                 "nonce" : "1",
                 "storage" : {
                     "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
@@ -1738,7 +1738,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052601c60046017f0600055",
+                "code" : "0x7b601080600c6000396000f30060003554156009570060203560003555600052601c60046017f0600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1776,7 +1776,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000100000",
-                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052601c650fffffffffff6017f0600055",
+                "code" : "0x7b601080600c6000396000f30060003554156009570060203560003555600052601c650fffffffffff6017f0600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1799,7 +1799,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052601c650fffffffffff6017f0600055",
+                "code" : "0x7b601080600c6000396000f30060003554156009570060203560003555600052601c650fffffffffff6017f0600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1837,7 +1837,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000100000",
-                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052650fffffffffff60046017f0600055",
+                "code" : "0x7b601080600c6000396000f30060003554156009570060203560003555600052650fffffffffff60046017f0600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1860,7 +1860,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052650fffffffffff60046017f0600055",
+                "code" : "0x7b601080600c6000396000f30060003554156009570060203560003555600052650fffffffffff60046017f0600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1898,7 +1898,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052601c60046103e8f0600055",
+                "code" : "0x7b601080600c6000396000f30060003554156009570060203560003555600052601c60046103e8f0600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1914,7 +1914,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x7b601080600c6000396000f20060003554156009570060203560003555600052601c60046103e8f0600055",
+                "code" : "0x7b601080600c6000396000f30060003554156009570060203560003555600052601c60046103e8f0600055",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1952,7 +1952,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100023",
-                "code" : "0x603760005360016000f2",
+                "code" : "0x603760005360016000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -1975,7 +1975,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "23",
-                "code" : "0x603760005360016000f2",
+                "code" : "0x603760005360016000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2013,7 +2013,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100023",
-                "code" : "0x603760005360026000f2",
+                "code" : "0x603760005360026000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2036,7 +2036,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "23",
-                "code" : "0x603760005360026000f2",
+                "code" : "0x603760005360026000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2074,7 +2074,7 @@
         "post" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100023",
-                "code" : "0x603760005360216000f2",
+                "code" : "0x603760005360216000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
@@ -2097,7 +2097,7 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "23",
-                "code" : "0x603760005360216000f2",
+                "code" : "0x603760005360216000f3",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/VMTests/vmLogTest.json b/VMTests/vmLogTest.json
index 8a1b6e703..be907a205 100644
--- a/VMTests/vmLogTest.json
+++ b/VMTests/vmLogTest.json
@@ -801,6 +801,7 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
                 "topics" : [
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 ]
             }
@@ -852,6 +853,7 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0x",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -961,6 +963,7 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0x",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1012,6 +1015,7 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1063,6 +1067,7 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xaa",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1114,6 +1119,7 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xdd",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1166,6 +1172,7 @@
                 "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
                 "topics" : [
                     "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "000000000000000000000000cd1722f3947def4cf144679da39c4c32bdc35681"
                 ]
             }
@@ -1217,6 +1224,8 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
                 "topics" : [
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 ]
             }
@@ -1268,9 +1277,9 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xff00000000000000000000000000000000000000000000000000000000000000",
                 "topics" : [
-                    "0000000000000000000000000000000000000000000000000000000000000005",
+                    "0000000000000000000000000000000000000000000000000000000000000007",
                     "0000000000000000000000000000000000000000000000000000000000000006",
-                    "0000000000000000000000000000000000000000000000000000000000000007"
+                    "0000000000000000000000000000000000000000000000000000000000000005"
                 ]
             }
         },
@@ -1321,6 +1330,8 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0x",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1430,6 +1441,8 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0x",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1481,6 +1494,8 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1532,6 +1547,8 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xaa",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1583,6 +1600,8 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xdd",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1678,6 +1697,9 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd",
                 "topics" : [
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                    "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                     "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 ]
             }
@@ -1773,6 +1795,9 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0x",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1882,6 +1907,9 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0x",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1933,6 +1961,9 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -1984,6 +2015,9 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xaa",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }
@@ -2035,6 +2069,9 @@
                 "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
                 "data" : "0xdd",
                 "topics" : [
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
+                    "0000000000000000000000000000000000000000000000000000000000000000",
                     "0000000000000000000000000000000000000000000000000000000000000000"
                 ]
             }