From 4ba150954ef8ac72416a35f06fdad9c6d7ed461d Mon Sep 17 00:00:00 2001 From: Carl Allendorph Date: Sat, 19 Apr 2014 12:48:42 -0700 Subject: [PATCH 01/14] Converted spaces to tabs to be compliant with the coding standards defined in cpp-ethereum --- rlptest.json | 64 ++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/rlptest.json b/rlptest.json index e96447199..41cd64adb 100644 --- a/rlptest.json +++ b/rlptest.json @@ -1,42 +1,42 @@ { - "emptystring": { - "in": "", - "out": "80" - }, - "shortstring": { - "in": "dog", + "emptystring": { + "in": "", + "out": "80" + }, + "shortstring": { + "in": "dog", "out": "83646f67" - }, - "longstring": { - "in": "Lorem ipsum dolor sit amet, consectetur adipisicing elit", + }, + "longstring": { + "in": "Lorem ipsum dolor sit amet, consectetur adipisicing elit", "out": "b8384c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c6974" - }, - "zero": { - "in": 0, - "out": "80" - }, - "smallint": { - "in": 1, - "out": "01" - }, - "mediumint": { - "in": 1000, - "out": "8203e8" - }, + }, + "zero": { + "in": 0, + "out": "80" + }, + "smallint": { + "in": 1, + "out": "01" + }, + "mediumint": { + "in": 1000, + "out": "8203e8" + }, "emptylist": { - "in": [], - "out": "c0" - }, - "stringlist": { - "in": [ "dog", "god", "cat" ], + "in": [], + "out": "c0" + }, + "stringlist": { + "in": [ "dog", "god", "cat" ], "out": "cc83646f6783676f6483636174" }, - "multilist": { - "in": [ "zw", [ 4 ], 1 ], + "multilist": { + "in": [ "zw", [ 4 ], 1 ], "out": "c6827a77c10401" - }, - "listsoflists": { - "in": [ [ [], [] ], [] ], + }, + "listsoflists": { + "in": [ [ [], [] ], [] ], "out": "c4c2c0c0c0" }, "bigint": { From 5fd2a98fcb4f6a648160204d1b20b0f980d55b9d Mon Sep 17 00:00:00 2001 From: Carl Allendorph Date: Sat, 19 Apr 2014 13:26:14 -0700 Subject: [PATCH 02/14] Added some new test cases for the rlp encoding. --- rlptest.json | 110 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 5 deletions(-) diff --git a/rlptest.json b/rlptest.json index 41cd64adb..19adbb8e2 100644 --- a/rlptest.json +++ b/rlptest.json @@ -6,11 +6,19 @@ "shortstring": { "in": "dog", "out": "83646f67" + }, + "shortstring2": { + "in": "Lorem ipsum dolor sit amet, consectetur adipisicing eli", + "out": "b74c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c69" }, "longstring": { "in": "Lorem ipsum dolor sit amet, consectetur adipisicing elit", "out": "b8384c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e7365637465747572206164697069736963696e6720656c6974" }, + "longstring2": { + "in": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur mauris magna, suscipit sed vehicula non, iaculis faucibus tortor. Proin suscipit ultricies malesuada. Duis tortor elit, dictum quis tristique eu, ultrices at risus. Morbi a est imperdiet mi ullamcorper aliquet suscipit nec lorem. Aenean quis leo mollis, vulputate elit varius, consequat enim. Nulla ultrices turpis justo, et posuere urna consectetur nec. Proin non convallis metus. Donec tempor ipsum in mauris congue sollicitudin. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Suspendisse convallis sem vel massa faucibus, eget lacinia lacus tempor. Nulla quis ultricies purus. Proin auctor rhoncus nibh condimentum mollis. Aliquam consequat enim at metus luctus, a eleifend purus egestas. Curabitur at nibh metus. Nam bibendum, neque at auctor tristique, lorem libero aliquet arcu, non interdum tellus lectus sit amet eros. Cras rhoncus, metus ac ornare cursus, dolor justo ultrices metus, at ullamcorper volutpat", + "out": "b904004c6f72656d20697073756d20646f6c6f722073697420616d65742c20636f6e73656374657475722061646970697363696e6720656c69742e20437572616269747572206d6175726973206d61676e612c20737573636970697420736564207665686963756c61206e6f6e2c20696163756c697320666175636962757320746f72746f722e2050726f696e20737573636970697420756c74726963696573206d616c6573756164612e204475697320746f72746f7220656c69742c2064696374756d2071756973207472697374697175652065752c20756c7472696365732061742072697375732e204d6f72626920612065737420696d70657264696574206d6920756c6c616d636f7270657220616c6971756574207375736369706974206e6563206c6f72656d2e2041656e65616e2071756973206c656f206d6f6c6c69732c2076756c70757461746520656c6974207661726975732c20636f6e73657175617420656e696d2e204e756c6c6120756c74726963657320747572706973206a7573746f2c20657420706f73756572652075726e6120636f6e7365637465747572206e65632e2050726f696e206e6f6e20636f6e76616c6c6973206d657475732e20446f6e65632074656d706f7220697073756d20696e206d617572697320636f6e67756520736f6c6c696369747564696e2e20566573746962756c756d20616e746520697073756d207072696d697320696e206661756369627573206f726369206c756374757320657420756c74726963657320706f737565726520637562696c69612043757261653b2053757370656e646973736520636f6e76616c6c69732073656d2076656c206d617373612066617563696275732c2065676574206c6163696e6961206c616375732074656d706f722e204e756c6c61207175697320756c747269636965732070757275732e2050726f696e20617563746f722072686f6e637573206e69626820636f6e64696d656e74756d206d6f6c6c69732e20416c697175616d20636f6e73657175617420656e696d206174206d65747573206c75637475732c206120656c656966656e6420707572757320656765737461732e20437572616269747572206174206e696268206d657475732e204e616d20626962656e64756d2c206e6571756520617420617563746f72207472697374697175652c206c6f72656d206c696265726f20616c697175657420617263752c206e6f6e20696e74657264756d2074656c6c7573206c65637475732073697420616d65742065726f732e20437261732072686f6e6375732c206d65747573206163206f726e617265206375727375732c20646f6c6f72206a7573746f20756c747269636573206d657475732c20617420756c6c616d636f7270657220766f6c7574706174" + }, "zero": { "in": 0, "out": "80" @@ -19,26 +27,118 @@ "in": 1, "out": "01" }, - "mediumint": { - "in": 1000, - "out": "8203e8" + "smallint2": { + "in": 16, + "out": "10" + }, + "smallint3": { + "in": 79, + "out": "4f" + }, + "smallint4": { + "in": 127, + "out": "7f" + }, + "mediumint1": { + "in": 128, + "out": "8180" + }, + "mediumint2": { + "in": 1000, + "out": "8203e8" + }, + "mediumint3": { + "in": 100000, + "out": "830186a0" + }, + "mediumint4": { + "in": "#83729609699884896815286331701780722", + "out": "8F102030405060708090A0B0C0D0E0F2" + }, + "mediumint5": { + "in": "#105315505618206987246253880190783558935785933862974822347068935681", + "out": "9C0100020003000400050006000700080009000A000B000C000D000E01" }, "emptylist": { "in": [], - "out": "c0" + "out": "c0" }, "stringlist": { "in": [ "dog", "god", "cat" ], "out": "cc83646f6783676f6483636174" - }, + }, "multilist": { "in": [ "zw", [ 4 ], 1 ], "out": "c6827a77c10401" }, + "shortListMax1": { + "in": [ "asdf", "qwer", "zxcv", "asdf","qwer", "zxcv", "asdf", "qwer", "zxcv", "asdf", "qwer"], + "out": "F784617364668471776572847a78637684617364668471776572847a78637684617364668471776572847a78637684617364668471776572" + }, + "longList1" : { + "in" : [ + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"] + ], + "out": "F840CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376" + }, + "longList2" : { + "in" : [ + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"], + ["asdf","qwer","zxcv"] + ], + "out": "F90200CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376CF84617364668471776572847a786376" + }, + "listsoflists": { "in": [ [ [], [] ], [] ], "out": "c4c2c0c0c0" }, + "listsoflists2": { + "in": [ [], [[]], [ [], [[]] ] ], + "out": "c7c0c1c0c3c0c1c0" + }, + "dictTest1" : { + "in" : [ + ["key1", "val1"], + ["key2", "val2"], + ["key3", "val3"], + ["key4", "val4"] + ], + "out" : "ECCA846b6579318476616c31CA846b6579328476616c32CA846b6579338476616c33CA846b6579348476616c34" + }, "bigint": { "in": "#115792089237316195423570985008687907853269984665640564039457584007913129639936", "out": "a1010000000000000000000000000000000000000000000000000000000000000000" From edbb8d407ecfbcbb6504659cbd9bdabdb93369e3 Mon Sep 17 00:00:00 2001 From: Vitalik Buterin Date: Tue, 6 May 2014 16:53:43 -0400 Subject: [PATCH 03/14] Removed unneeded test, added new tests --- blockgenesistest.txt | 20 ++++++++++++++ hexencodetest.txt | 34 ----------------------- keyaddrtest.txt | 22 +++++++++++++++ rlptest.txt | 42 +++++------------------------ trietest.txt | 64 ++++++++++++++++++++++++++++++++++---------- txtest.txt | 24 +++++++++++++++++ 6 files changed, 123 insertions(+), 83 deletions(-) create mode 100644 blockgenesistest.txt delete mode 100644 hexencodetest.txt create mode 100644 keyaddrtest.txt create mode 100644 txtest.txt diff --git a/blockgenesistest.txt b/blockgenesistest.txt new file mode 100644 index 000000000..8ad5590f1 --- /dev/null +++ b/blockgenesistest.txt @@ -0,0 +1,20 @@ +[ + { + "inputs": { + }, + "result": "f892f88ea00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479400000000000000000000000000000000000000008080834000008087038d7ea4c68000830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0" + }, + { + "inputs": { + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": 100000000000000000000 + }, + "result": "f8b2f8aea00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a05e5b074eca68ed6f5cf3ef14712b7c97f431a41deff21e3f211cf687f618026780834000008087038d7ea4c68000830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0" + }, + { + "inputs": { + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": 99000000000000000000, + "13978aee95f38490e9769c39b2773ed763d9cd5f": 1000000000000000000 + }, + "result": "f8b2f8aea00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a0b1062e564d1bdb302a2feae46e837fef59c4f8a408967009dcc48327d80d8fff80834000008087038d7ea4c68000830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0" + } +] diff --git a/hexencodetest.txt b/hexencodetest.txt deleted file mode 100644 index a6d18834c..000000000 --- a/hexencodetest.txt +++ /dev/null @@ -1,34 +0,0 @@ -[ - [ - [ 1, 2, 3, 4, 5 ], - "112345" - ], - [ - [ 0, 1, 2, 3, 4, 5 ], - "00012345" - ], - [ - [ 6, 4, 6, 15, 6, 7, 6, 5, 16 ], - "20646f6765" - ], - [ - [ 7, 6, 5, 16 ], - "3765" - ], - [ - [ 16 ], - "20" - ], - [ - [ 0, 16 ], - "30" - ], - [ - [ 15, 1, 12, 11, 8, 16 ], - "3f1cb8" - ], - [ - [ 0, 15, 1, 12, 11, 8, 16 ], - "200f1cb8" - ] -] diff --git a/keyaddrtest.txt b/keyaddrtest.txt new file mode 100644 index 000000000..f48905037 --- /dev/null +++ b/keyaddrtest.txt @@ -0,0 +1,22 @@ +[ + { + "seed": "cow", + "key": "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", + "addr": "cd2a3d9f938e13cd947ec05abc7fe734df8dd826", + "sig_of_emptystring": { + v: 27, + r: 55022946425863772466282515086640833500580355555249003729267710149987842051473, + s: 3021698389129950584349170550428805649435913935175976180112863059249983907949 + } + }, + { + "seed": "horse", + "key": "c87f65ff3f271bf5dc8643484f66b200109caffe4bf98c4cb393dc35740b28c0", + "addr": "13978aee95f38490e9769c39b2773ed763d9cd5f", + "sig_of_emptystring": { + v: 28, + r: 20570452350081260599473412372903969148670549754219103025003129053348571714359, + s: 76892551129780267788164835941580941601518827936179476514262023835864819088004 + } + } +] diff --git a/rlptest.txt b/rlptest.txt index b443d65a4..4ab9f8029 100644 --- a/rlptest.txt +++ b/rlptest.txt @@ -1,54 +1,26 @@ [ [ "cat", - "43636174" + "83636174" ], [ "dog", - "43646f67" + "83646f67" ], [ [ "cat", "dog" ], - "824363617443646f67" + "c88363617483646f67" ], [ [ "dog", "god", "cat" ], - "8343646f6743676f6443636174" + "cc83646f6783676f6483636174" ], - [ - 1, - "01" - ], - [ - 10, - "0a" - ], - [ - 100, - "1864" - ], - [ - 1000, - "1903e8" - ], - [ - 115792089237316195423570985008687907853269984665640564039457584007913129639935, - "37ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" - ], - [ - 115792089237316195423570985008687907853269984665640564039457584007913129639936, - "3821010000000000000000000000000000000000000000000000000000000000000000" - ], - [ - [ 1, 2, [] ], - "83010280" - ], [ [ [ [], [] ], [] ], - "8282808080" + "c4c2c0c0c0" ], [ - [ "zw", [ 4 ], "wz" ], - "83427a77810442777a" + [ "zw", [ "4" ], "wz" ], + "c8827a77c13482777a" ] ] diff --git a/trietest.txt b/trietest.txt index 4a5c5ded5..059f149fe 100644 --- a/trietest.txt +++ b/trietest.txt @@ -1,19 +1,55 @@ [ { - "inputs": { - "doe": "reindeer", - "dog": "puppy", - "dogglesworth": "cat" - }, - "expectation": "d85f9267d7ed5767fb1b48defa8eb20a1c007a87a07588135a74b40b55de2e67" + "inputs": [ + ["doe", "reindeer"], + ["dog", "puppy"], + ["dogglesworth", "cat"] + ], + "expectation": "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3" }, { - "inputs":{ - "do": "verb", - "horse": "stallion", - "doge": "coin", - "dog": "puppy" - }, - "expectation": "cf7d318935b52db6e23d8c1f5e6b7e62f3606d4ed13783f4fdbd6e67a2085d04" - } + "inputs":[ + ["do", "verb"], + ["horse", "stallion"], + ["doge", "coin"], + ["dog", "puppy"] + ], + "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" + }, + { + "inputs":[ + ["do", "verb"], + ["ether", "wookiedoo"], + ["horse", "stallion"], + ["shaman", "horse"], + ["doge", "coin"], + ["ether", ""], + ["dog", "puppy"], + ["shaman", ""] + ], + "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" + }, + { + "inputs":[ + ["foo", "bar"], + ["food", "bat"], + ["food", "bass"] + ], + "expectation": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3" + }, + { + "inputs":[ + ["be", "e"], + ["dog", "puppy"], + ["bed", "d"] + ], + "expectation": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b" + }, + { + "inputs":[ + ["test", "test"], + ["te", "testy"], + ], + "expectation": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928" + } ] diff --git a/txtest.txt b/txtest.txt new file mode 100644 index 000000000..1261d0766 --- /dev/null +++ b/txtest.txt @@ -0,0 +1,24 @@ +[ + { + "key": "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4", + "nonce": 0, + "gasprice": 1000000000000, + "startgas": 10000, + "to": "13978aee95f38490e9769c39b2773ed763d9cd5f", + "value": 10000000000000000, + "data": "", + "unsigned": "eb8085e8d4a510008227109413978aee95f38490e9769c39b2773ed763d9cd5f872386f26fc1000080808080", + "signed": "f86b8085e8d4a510008227109413978aee95f38490e9769c39b2773ed763d9cd5f872386f26fc10000801ba0eab47c1a49bf2fe5d40e01d313900e19ca485867d462fe06e139e3a536c6d4f4a014a569d327dcda4b29f74f93c0e9729d2f49ad726e703f9cd90dbb0fbf6649f1" + }, + { + "key": "c87f65ff3f271bf5dc8643484f66b200109caffe4bf98c4cb393dc35740b28c0", + "nonce": 0, + "gasprice": 1000000000000, + "startgas": 10000, + "to": "", + "value": 0, + "data": "6025515b525b600a37f260003556601b596020356000355760015b525b54602052f260255860005b525b54602052f2", + "unsigned": "f83f8085e8d4a510008227108080af6025515b525b600a37f260003556601b596020356000355760015b525b54602052f260255860005b525b54602052f2808080", + "signed": "f87f8085e8d4a510008227108080af6025515b525b600a37f260003556601b596020356000355760015b525b54602052f260255860005b525b54602052f21ba05afed0244d0da90b67cf8979b0f246432a5112c0d31e8d5eedd2bc17b171c694a0bb1035c834677c2e1185b8dc90ca6d1fa585ab3d7ef23707e1a497a98e752d1b" + } +] From 2b6c136dda0d55a0ebd228bff029d97411c9cec6 Mon Sep 17 00:00:00 2001 From: Vitalik Buterin Date: Sun, 11 May 2014 21:42:41 -0400 Subject: [PATCH 04/14] Moved txt to json --- blockgenesistest.txt => blockgenesistest.json | 0 keyaddrtest.txt => keyaddrtest.json | 0 txtest.txt => txtes.json | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename blockgenesistest.txt => blockgenesistest.json (100%) rename keyaddrtest.txt => keyaddrtest.json (100%) rename txtest.txt => txtes.json (100%) diff --git a/blockgenesistest.txt b/blockgenesistest.json similarity index 100% rename from blockgenesistest.txt rename to blockgenesistest.json diff --git a/keyaddrtest.txt b/keyaddrtest.json similarity index 100% rename from keyaddrtest.txt rename to keyaddrtest.json diff --git a/txtest.txt b/txtes.json similarity index 100% rename from txtest.txt rename to txtes.json From f44a85933110dd3ef362090f512678e99ae80256 Mon Sep 17 00:00:00 2001 From: Chen Houwu Date: Sun, 18 May 2014 15:04:42 +0800 Subject: [PATCH 05/14] add: case when value is long, ensure it's not get rlp encoded as node --- trietest.json | 50 ++++++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/trietest.json b/trietest.json index 059f149fe..2cd4d5f9b 100644 --- a/trietest.json +++ b/trietest.json @@ -1,4 +1,10 @@ [ + { + "inputs": [ + ["A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] + ], + "expectation": "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab" + }, { "inputs": [ ["doe", "reindeer"], @@ -9,47 +15,47 @@ }, { "inputs":[ - ["do", "verb"], - ["horse", "stallion"], - ["doge", "coin"], + ["do", "verb"], + ["horse", "stallion"], + ["doge", "coin"], ["dog", "puppy"] - ], + ], "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" }, { "inputs":[ - ["do", "verb"], - ["ether", "wookiedoo"], - ["horse", "stallion"], - ["shaman", "horse"], - ["doge", "coin"], + ["do", "verb"], + ["ether", "wookiedoo"], + ["horse", "stallion"], + ["shaman", "horse"], + ["doge", "coin"], ["ether", ""], ["dog", "puppy"], ["shaman", ""] - ], + ], "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" }, { "inputs":[ - ["foo", "bar"], - ["food", "bat"], + ["foo", "bar"], + ["food", "bat"], ["food", "bass"] - ], + ], "expectation": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3" - }, + }, { "inputs":[ - ["be", "e"], - ["dog", "puppy"], + ["be", "e"], + ["dog", "puppy"], ["bed", "d"] - ], + ], "expectation": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b" - }, + }, { "inputs":[ - ["test", "test"], - ["te", "testy"], - ], + ["test", "test"], + ["te", "testy"], + ], "expectation": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928" - } + } ] From 5131429abbe6d2636064e17b45c99827a904c345 Mon Sep 17 00:00:00 2001 From: Ben Kirwin Date: Mon, 19 May 2014 11:18:31 -0400 Subject: [PATCH 06/14] Delete a comma This should now be parseable as JSON. --- trietest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trietest.json b/trietest.json index 2cd4d5f9b..2db1968ed 100644 --- a/trietest.json +++ b/trietest.json @@ -54,7 +54,7 @@ { "inputs":[ ["test", "test"], - ["te", "testy"], + ["te", "testy"] ], "expectation": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928" } From ede5499da624d95db1cad63939be56f7bdaa6389 Mon Sep 17 00:00:00 2001 From: Heiko Heiko Date: Tue, 20 May 2014 17:21:09 +0200 Subject: [PATCH 07/14] add: current initial alloc and genesis hashes --- genesishashestest.json | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 genesishashestest.json diff --git a/genesishashestest.json b/genesishashestest.json new file mode 100644 index 000000000..bec1a253f --- /dev/null +++ b/genesishashestest.json @@ -0,0 +1,16 @@ +{ + "genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a012582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca1680834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", + "genesis_state_root": "12582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca16", + "initial_alloc": { + "2ef47100e0787b915105fd5e3f4ff6752079d5cb": 1606938044258990275541962092341162602522202993782792835301376, + "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": 1606938044258990275541962092341162602522202993782792835301376, + "e6716f9544a56c530d868e4bfbacb172315bdead": 1606938044258990275541962092341162602522202993782792835301376, + "8a40bfaa73256b60764c1bf40675a99083efb075": 1606938044258990275541962092341162602522202993782792835301376, + "e4157b34ea9615cfbde6b4fda419828124b70c78": 1606938044258990275541962092341162602522202993782792835301376, + "1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": 1606938044258990275541962092341162602522202993782792835301376, + "6c386a4b26f73c802f34673f7248bb118f97424a": 1606938044258990275541962092341162602522202993782792835301376, + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": 1606938044258990275541962092341162602522202993782792835301376 + }, + "genesis_hash": "c305511e7cb9b33767e50f5e94ecd7b1c51359a04f45183860ec6808d80b0d3f" +} + From 66bc3665c17e1eec309e5a40b2a9c74273fb639a Mon Sep 17 00:00:00 2001 From: Heiko Heiko Date: Tue, 20 May 2014 17:36:35 +0200 Subject: [PATCH 08/14] fix: represent integers as strings --- genesishashestest.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/genesishashestest.json b/genesishashestest.json index bec1a253f..20913e670 100644 --- a/genesishashestest.json +++ b/genesishashestest.json @@ -2,14 +2,14 @@ "genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a012582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca1680834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", "genesis_state_root": "12582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca16", "initial_alloc": { - "2ef47100e0787b915105fd5e3f4ff6752079d5cb": 1606938044258990275541962092341162602522202993782792835301376, - "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": 1606938044258990275541962092341162602522202993782792835301376, - "e6716f9544a56c530d868e4bfbacb172315bdead": 1606938044258990275541962092341162602522202993782792835301376, - "8a40bfaa73256b60764c1bf40675a99083efb075": 1606938044258990275541962092341162602522202993782792835301376, - "e4157b34ea9615cfbde6b4fda419828124b70c78": 1606938044258990275541962092341162602522202993782792835301376, - "1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": 1606938044258990275541962092341162602522202993782792835301376, - "6c386a4b26f73c802f34673f7248bb118f97424a": 1606938044258990275541962092341162602522202993782792835301376, - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": 1606938044258990275541962092341162602522202993782792835301376 + "8a40bfaa73256b60764c1bf40675a99083efb075": "1606938044258990275541962092341162602522202993782792835301376", + "e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376", + "1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": "1606938044258990275541962092341162602522202993782792835301376", + "6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376", + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": "1606938044258990275541962092341162602522202993782792835301376", + "2ef47100e0787b915105fd5e3f4ff6752079d5cb": "1606938044258990275541962092341162602522202993782792835301376", + "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", + "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" }, "genesis_hash": "c305511e7cb9b33767e50f5e94ecd7b1c51359a04f45183860ec6808d80b0d3f" } From c31a93c27a9048df92fcf53a2201c6e3737a40fd Mon Sep 17 00:00:00 2001 From: ethers Date: Tue, 20 May 2014 15:42:39 -0700 Subject: [PATCH 09/14] fix file name that seems to have been a typo --- txtes.json => txtest.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename txtes.json => txtest.json (100%) diff --git a/txtes.json b/txtest.json similarity index 100% rename from txtes.json rename to txtest.json From a0d01b1a0b59555e38ea694ff864f2aa25a0d953 Mon Sep 17 00:00:00 2001 From: Chen Houwu Date: Wed, 21 May 2014 22:29:53 +0800 Subject: [PATCH 10/14] fix: wrong rlp hex --- genesishashestest.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/genesishashestest.json b/genesishashestest.json index 20913e670..396654deb 100644 --- a/genesishashestest.json +++ b/genesishashestest.json @@ -1,16 +1,16 @@ { - "genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a012582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca1680834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", - "genesis_state_root": "12582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca16", + "genesis_rlp_hex": "f88bf88780a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a012582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca1680834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", + "genesis_state_root": "12582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca16", "initial_alloc": { - "8a40bfaa73256b60764c1bf40675a99083efb075": "1606938044258990275541962092341162602522202993782792835301376", - "e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376", - "1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": "1606938044258990275541962092341162602522202993782792835301376", - "6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376", - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": "1606938044258990275541962092341162602522202993782792835301376", - "2ef47100e0787b915105fd5e3f4ff6752079d5cb": "1606938044258990275541962092341162602522202993782792835301376", - "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", + "8a40bfaa73256b60764c1bf40675a99083efb075": "1606938044258990275541962092341162602522202993782792835301376", + "e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376", + "1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": "1606938044258990275541962092341162602522202993782792835301376", + "6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376", + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": "1606938044258990275541962092341162602522202993782792835301376", + "2ef47100e0787b915105fd5e3f4ff6752079d5cb": "1606938044258990275541962092341162602522202993782792835301376", + "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" - }, + }, "genesis_hash": "c305511e7cb9b33767e50f5e94ecd7b1c51359a04f45183860ec6808d80b0d3f" } From 4300197a748de29cc5c93fd77f13cae029dad49e Mon Sep 17 00:00:00 2001 From: Chen Houwu Date: Wed, 21 May 2014 22:42:23 +0800 Subject: [PATCH 11/14] fix: wrong sha3 hash because of the wrong rlp hex --- genesishashestest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/genesishashestest.json b/genesishashestest.json index 396654deb..03c436e5b 100644 --- a/genesishashestest.json +++ b/genesishashestest.json @@ -11,6 +11,6 @@ "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" }, - "genesis_hash": "c305511e7cb9b33767e50f5e94ecd7b1c51359a04f45183860ec6808d80b0d3f" + "genesis_hash": "18645bce07b6f66e21d067c0a886ece782a9c4a0d9c0deb7281cebca4a62f5bd" } From 42e14ec54fa57c2373625d21e5b47f597c748bf5 Mon Sep 17 00:00:00 2001 From: Chen Houwu Date: Wed, 21 May 2014 23:27:40 +0800 Subject: [PATCH 12/14] revert to correct data --- genesishashestest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/genesishashestest.json b/genesishashestest.json index 03c436e5b..6dd2c7dbe 100644 --- a/genesishashestest.json +++ b/genesishashestest.json @@ -1,5 +1,5 @@ { - "genesis_rlp_hex": "f88bf88780a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a012582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca1680834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", + "genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a012582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca1680834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", "genesis_state_root": "12582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca16", "initial_alloc": { "8a40bfaa73256b60764c1bf40675a99083efb075": "1606938044258990275541962092341162602522202993782792835301376", @@ -11,6 +11,6 @@ "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" }, - "genesis_hash": "18645bce07b6f66e21d067c0a886ece782a9c4a0d9c0deb7281cebca4a62f5bd" + "genesis_hash": "c305511e7cb9b33767e50f5e94ecd7b1c51359a04f45183860ec6808d80b0d3f" } From 356a3296bc7eeac8b1b65aa843b5856cd786c4cf Mon Sep 17 00:00:00 2001 From: Ben Kirwin Date: Thu, 22 May 2014 00:20:48 -0400 Subject: [PATCH 13/14] Add some arbitrary test names This should now conform to the format specified in the README. --- trietest.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/trietest.json b/trietest.json index 2db1968ed..c77e7eb8e 100644 --- a/trietest.json +++ b/trietest.json @@ -1,11 +1,11 @@ -[ - { +{ + "singleItem": { "inputs": [ ["A", "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"] ], "expectation": "d23786fb4a010da3ce639d66d5e904a11dbc02746d1ce25029e53290cabf28ab" }, - { + "dogs": { "inputs": [ ["doe", "reindeer"], ["dog", "puppy"], @@ -13,7 +13,7 @@ ], "expectation": "8aad789dff2f538bca5d8ea56e8abe10f4c7ba3a5dea95fea4cd6e7c3a1168d3" }, - { + "puppy": { "inputs":[ ["do", "verb"], ["horse", "stallion"], @@ -22,7 +22,7 @@ ], "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" }, - { + "emptyValues": { "inputs":[ ["do", "verb"], ["ether", "wookiedoo"], @@ -35,7 +35,7 @@ ], "expectation": "5991bb8c6514148a29db676a14ac506cd2cd5775ace63c30a4fe457715e9ac84" }, - { + "foo": { "inputs":[ ["foo", "bar"], ["food", "bat"], @@ -43,7 +43,7 @@ ], "expectation": "17beaa1648bafa633cda809c90c04af50fc8aed3cb40d16efbddee6fdf63c4c3" }, - { + "smallValues": { "inputs":[ ["be", "e"], ["dog", "puppy"], @@ -51,11 +51,11 @@ ], "expectation": "3f67c7a47520f79faa29255d2d3c084a7a6df0453116ed7232ff10277a8be68b" }, - { + "testy": { "inputs":[ ["test", "test"], ["te", "testy"] ], "expectation": "8452568af70d8d140f58d941338542f645fcca50094b20f3c3d8c3df49337928" } -] +} From 78576dd3d3d4bf46af19d703affdd42f221e49c9 Mon Sep 17 00:00:00 2001 From: Heiko Heiko Date: Fri, 30 May 2014 17:19:09 +0200 Subject: [PATCH 14/14] changes based on new account structure nonce, balance, storage, code --- genesishashestest.json | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/genesishashestest.json b/genesishashestest.json index 6dd2c7dbe..e792c1d28 100644 --- a/genesishashestest.json +++ b/genesishashestest.json @@ -1,16 +1,15 @@ { - "genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a012582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca1680834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", - "genesis_state_root": "12582945fc5ad12c3e7b67c4fc37a68fc0d52d995bb7f7291ff41a2739a7ca16", - "initial_alloc": { - "8a40bfaa73256b60764c1bf40675a99083efb075": "1606938044258990275541962092341162602522202993782792835301376", - "e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376", - "1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": "1606938044258990275541962092341162602522202993782792835301376", - "6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376", - "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": "1606938044258990275541962092341162602522202993782792835301376", - "2ef47100e0787b915105fd5e3f4ff6752079d5cb": "1606938044258990275541962092341162602522202993782792835301376", - "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", - "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" - }, - "genesis_hash": "c305511e7cb9b33767e50f5e94ecd7b1c51359a04f45183860ec6808d80b0d3f" + "genesis_rlp_hex": "f8abf8a7a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347940000000000000000000000000000000000000000a023b503734ff34ddb7bd5e478f1645680ec778ab3f90007cb1c854653693e5adc80834000008080830f4240808080a004994f67dc55b09e814ab7ffc8df3686b4afb2bb53e60eae97ef043fe03fb829c0c0", + "genesis_state_root": "23b503734ff34ddb7bd5e478f1645680ec778ab3f90007cb1c854653693e5adc", + "initial_alloc": { + "8a40bfaa73256b60764c1bf40675a99083efb075": "1606938044258990275541962092341162602522202993782792835301376", + "e4157b34ea9615cfbde6b4fda419828124b70c78": "1606938044258990275541962092341162602522202993782792835301376", + "1e12515ce3e0f817a4ddef9ca55788a1d66bd2df": "1606938044258990275541962092341162602522202993782792835301376", + "6c386a4b26f73c802f34673f7248bb118f97424a": "1606938044258990275541962092341162602522202993782792835301376", + "cd2a3d9f938e13cd947ec05abc7fe734df8dd826": "1606938044258990275541962092341162602522202993782792835301376", + "2ef47100e0787b915105fd5e3f4ff6752079d5cb": "1606938044258990275541962092341162602522202993782792835301376", + "e6716f9544a56c530d868e4bfbacb172315bdead": "1606938044258990275541962092341162602522202993782792835301376", + "1a26338f0d905e295fccb71fa9ea849ffa12aaf4": "1606938044258990275541962092341162602522202993782792835301376" + }, + "genesis_hash": "77ef4fdaf389dca53236bcf7f72698e154eab2828f86fbc4fc6cd9225d285c89" } -