From ade15b947b2ebd4960380e6f5aa5690b58449527 Mon Sep 17 00:00:00 2001 From: Igor Artamonov Date: Fri, 21 Oct 2016 02:18:34 +0600 Subject: [PATCH 1/2] EXP reprice, ECIP-1015 --- core/vm/vm.go | 3 +- params/gas_table.go | 3 + .../Homestead/stPreCompiledContracts.json | 168 +++++++------- .../EIP150/Homestead/stRefundTest.json | 24 +- .../EIP150/Homestead/stWalletTest.json | 214 +++++++++--------- 5 files changed, 208 insertions(+), 204 deletions(-) diff --git a/core/vm/vm.go b/core/vm/vm.go index a4542ebc9..31e6ab46b 100644 --- a/core/vm/vm.go +++ b/core/vm/vm.go @@ -304,7 +304,8 @@ func calculateGasAndSize(gasTable params.GasTable, env Environment, contract *Co quadMemGas(mem, newMemSize, gas) case EXP: - gas.Add(gas, new(big.Int).Mul(big.NewInt(int64(len(stack.data[stack.len()-2].Bytes()))), params.ExpByteGas)) + expByteLen := int64(len(stack.data[stack.len()-2].Bytes())) + gas.Add(gas, new(big.Int).Mul(big.NewInt(expByteLen), gasTable.ExpByte)) case SSTORE: err := stack.require(2) if err != nil { diff --git a/params/gas_table.go b/params/gas_table.go index 98f00a7ee..28df95ac5 100644 --- a/params/gas_table.go +++ b/params/gas_table.go @@ -25,6 +25,7 @@ type GasTable struct { SLoad *big.Int Calls *big.Int Suicide *big.Int + ExpByte *big.Int // CreateBySuicide occurs when the // refunded account is one that does @@ -44,6 +45,7 @@ var ( SLoad: big.NewInt(50), Calls: big.NewInt(40), Suicide: big.NewInt(0), + ExpByte: big.NewInt(10), // explicitly set to nil to indicate // this rule does not apply to homestead. @@ -59,6 +61,7 @@ var ( SLoad: big.NewInt(200), Calls: big.NewInt(700), Suicide: big.NewInt(5000), + ExpByte: big.NewInt(50), CreateBySuicide: big.NewInt(25000), } diff --git a/tests/files/StateTests/EIP150/Homestead/stPreCompiledContracts.json b/tests/files/StateTests/EIP150/Homestead/stPreCompiledContracts.json index 775f84fa0..7635c22b0 100644 --- a/tests/files/StateTests/EIP150/Homestead/stPreCompiledContracts.json +++ b/tests/files/StateTests/EIP150/Homestead/stPreCompiledContracts.json @@ -23,21 +23,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x014c22", + "balance" : "0x014c4a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7612d3e", + "balance" : "0x0de0b6b3a7612d16", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "9eac1b6a89d6b05265e9b04176c468a87c03d1ea45cf55b06efd0c9ab48d2301", + "postStateRoot" : "6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -86,21 +86,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xc273", + "balance" : "0xc29b", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761b6ed", + "balance" : "0x0de0b6b3a761b6c5", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "0c8f940ac7ccc785ea3269c54e2163015371fe33503a1f8132b978038cd575e1", + "postStateRoot" : "57d85a776f0ed60eb9f8addc94d51c6a4291bd377076fa0f472c3c3e36cf0faa", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -148,21 +148,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x9c59", + "balance" : "0x9c81", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761dd07", + "balance" : "0x0de0b6b3a761dcdf", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "b883081d90f494799d270110223dadef0a39d8876bc0c14f4826c5d3e3ae0ebb", + "postStateRoot" : "897f996d27f67f93cf68f7a3dc8aaec646b713234c34a2c162a43841ac55dc90", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -210,21 +210,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xb3ca", + "balance" : "0xb3f2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761c596", + "balance" : "0x0de0b6b3a761c56e", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "2be771c1f218681ff8b8a2c2af94605601c815cd7034c69891a7dd17c5c26313", + "postStateRoot" : "6ffab1a138206bf9486ae55c422414ef4a7d287370035c89b1b58f0eb3facc26", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -339,21 +339,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x014c22", + "balance" : "0x014c4a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7612d3e", + "balance" : "0x0de0b6b3a7612d16", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "22f37948a081bbb85a340254a983ca835503113cfb6418143021fb89021e5bf5", + "postStateRoot" : "fa8f83131d8d5f9322d2893e12342a8980948d1e734cfdbfa99aabefb9942b03", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -404,21 +404,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x014c1f", + "balance" : "0x014c47", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7612d41", + "balance" : "0x0de0b6b3a7612d19", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "e575a3b7d926bc4c6de7be26d68a1d094b0ec0841d2130493d23ab102051596a", + "postStateRoot" : "91656c11a9845fd85d0bd83befcd344906d4aa16edfd5fa4273d01b634476b3d", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -467,21 +467,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xd6f2", + "balance" : "0xd71a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761a26e", + "balance" : "0x0de0b6b3a761a246", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "f262fe6a03bbc8679c4a82514702934627d13d6c7e76085eae0ef31de1cfbc73", + "postStateRoot" : "12c413ef17691f161eeb212121bbad4804d14a8ffc8ecf0bb740ab1229beebcc", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -530,21 +530,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xd6f2", + "balance" : "0xd71a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761a26e", + "balance" : "0x0de0b6b3a761a246", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "8be0de871f149dd9036ffea13ad9076a19b0a87f6d7828103907724e28f83b5d", + "postStateRoot" : "9b3d7d6eac73bb9f96ea5f8157c4993f0459a65ea5918cc5c2196238be22a0cd", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -594,21 +594,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01118a", + "balance" : "0x0111b2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a76167d6", + "balance" : "0x0de0b6b3a76167ae", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "fed1e9a3da583046162af6ed6171e7683d3a89100c474e7617931cbb23c9171e", + "postStateRoot" : "66a61576f892dd293458323d70df471ca61771c959203d1e174d64d557e53aca", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -657,21 +657,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xd6f2", + "balance" : "0xd71a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761a26e", + "balance" : "0x0de0b6b3a761a246", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "e216badd7d303a75a5ba7269f21c9e25353a4e0276757e55459ce0da5e2f5fc8", + "postStateRoot" : "40b646526608d59b43f550e238f50a3bcfaf065b83fa186e877015fc93b6f738", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -721,21 +721,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01118a", + "balance" : "0x0111b2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a76167d6", + "balance" : "0x0de0b6b3a76167ae", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "c7710f6a93d1f58657ea85ded47657ba849f076d133087388e6cb2bd5f674ba1", + "postStateRoot" : "7897ca4676634b39cb65d8f06d58720262c5a17cebf696dbadd378550ff0cd1f", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -784,21 +784,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xd6f2", + "balance" : "0xd71a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761a26e", + "balance" : "0x0de0b6b3a761a246", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "ef146e382f63cd5e0c0b19a2b982fa24d65b5e5816fd99b4852942bca11c1994", + "postStateRoot" : "e0fb6df8294c30d22dd68bb80917de61e7ca3fb5bd9e29cb29dab6432176be7d", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -848,21 +848,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01118a", + "balance" : "0x0111b2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a76167d6", + "balance" : "0x0de0b6b3a76167ae", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "ea5900accbdb7ac4d5e3838d594a0a6be6996889c5926e781734788b4ef8350d", + "postStateRoot" : "9fc4b5d1e199ad0d51733ecc120706356d81ee5f0c49a2ae6494e8f23a86dde9", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -913,21 +913,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x014c22", + "balance" : "0x014c4a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7612d3e", + "balance" : "0x0de0b6b3a7612d16", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "9eac1b6a89d6b05265e9b04176c468a87c03d1ea45cf55b06efd0c9ab48d2301", + "postStateRoot" : "6596d735e854ec9815daff8a76980309a1830fb70a4d2e50cccfeacd4ef08ea7", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -2767,21 +2767,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01adca", + "balance" : "0x01adf2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a760cb96", + "balance" : "0x0de0b6b3a760cb6e", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "8505dbcf94b936e26c353b02f74fb7a63c8944a99e3ecb290d57e4eff2fabdab", + "postStateRoot" : "ea92261e84ce4efbd1a033b976cd8a0ff1d8454c78f9fa93e95c0be3d95591c8", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -2837,21 +2837,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01241b", + "balance" : "0x012443", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7615545", + "balance" : "0x0de0b6b3a761551d", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "58840eda5f0456e479cbc88fb36a3d726aa00cc749f7f9d6781b3040fbfde0e2", + "postStateRoot" : "ebb3d4a42e5482fdc37e6b886825babaaf2323112fb400be522da92a5d4d606f", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -2899,21 +2899,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xfe01", + "balance" : "0xfe29", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7617b5f", + "balance" : "0x0de0b6b3a7617b37", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "866186ae9d33b5b2a581f5df2565e64e8c61c662c4005766735edb716201da8c", + "postStateRoot" : "8112f1d37f51c6905fdbcd509fbf8eff2578c3b7f314acbcee49856a8e257072", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -2961,21 +2961,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x011572", + "balance" : "0x01159a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a76163ee", + "balance" : "0x0de0b6b3a76163c6", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "588ae61bf355d95355831237f9c194249fea4ee07ba336e50df603abfd97d88a", + "postStateRoot" : "b6bf32d8dd390c9d512edd4cc09e4ecfafecec80a1268865255a18b20c6ecf27", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3104,21 +3104,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01adca", + "balance" : "0x01adf2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a760cb96", + "balance" : "0x0de0b6b3a760cb6e", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "3d5b0141e864305619c2ab5a2e0d234aed6500593e67d4670d9274d37125b046", + "postStateRoot" : "5a68c57e086a0902568ff40b26a04a7eac61b21a346921a21bb37348eb53e5e9", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3176,21 +3176,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01adc7", + "balance" : "0x01adef", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a760cb99", + "balance" : "0x0de0b6b3a760cb71", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "124609657b6e6c9d599efde65a05ab2c46a92e775fbe862f7e7a28754531d87d", + "postStateRoot" : "b24d49d567c007b54c06e3c82775a3b53819c6ae49bac6e9d4eb4f3c95e071a7", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3246,21 +3246,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01389a", + "balance" : "0x0138c2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a76140c6", + "balance" : "0x0de0b6b3a761409e", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "598525c77ae0e6c1f9521c791a79dd72adb2028c78be1e6851b6b445106e7e90", + "postStateRoot" : "a6f69cf8c27a33a41372bd0b0aa375a618e64c45ac3a7753255d83ef791fab00", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3316,21 +3316,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01389a", + "balance" : "0x0138c2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a76140c6", + "balance" : "0x0de0b6b3a761409e", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "14a386a5c799c6bf2171ead5376c4d167810e8faf64085d8f1d683bcc880c5df", + "postStateRoot" : "b798ab84683d94ef49060b840a80d8bdd4a986bc11a5923a8b9ff68537745fbf", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3387,21 +3387,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x017332", + "balance" : "0x01735a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761062e", + "balance" : "0x0de0b6b3a7610606", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "4b068eda7ef6d2485f037a5da86d987352aedf658e043556fab5eb53ff12d32b", + "postStateRoot" : "cded86578e25353ec674b917813312d47dc5594a2e66049d533a64d0739d2b22", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3457,21 +3457,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01389a", + "balance" : "0x0138c2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a76140c6", + "balance" : "0x0de0b6b3a761409e", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "8294f78f70d24b3c5229b7f74a48164b06c2017cf8d6d5d0e6b80d4c11622e45", + "postStateRoot" : "8f59cf6705c6d1c08564b2af9af6fb2bcc5ee014fbe865ac8274d6864f06a060", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3672,21 +3672,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x017332", + "balance" : "0x01735a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761062e", + "balance" : "0x0de0b6b3a7610606", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "a6c5db01005f66672af63de8f23bb41c1d94adee8d6808698eba96989d762a80", + "postStateRoot" : "0967e17a2fc9fa62ee1d83333ebd3b20a9283def5ab8f2d178049e13f2883076", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3742,21 +3742,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01389a", + "balance" : "0x0138c2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a76140c6", + "balance" : "0x0de0b6b3a761409e", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "6b66f574dedab09f4ec85ad6f09a73784b475eb2b5c1c19497d8c4de66b4f6a2", + "postStateRoot" : "4d68d3d845118afaf686b3b033fc6749439f2324312349fc478c68b3033db92c", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3813,21 +3813,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x017332", + "balance" : "0x01735a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a761062e", + "balance" : "0x0de0b6b3a7610606", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "fb856755b7081da6b2524530d15a140672838a64b1502a12664dd31f6feb2450", + "postStateRoot" : "4b3df99c674dfd0d94a6542475e8a409a12f8a512812828541687536a85e4541", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", @@ -3885,21 +3885,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01adca", + "balance" : "0x01adf2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a760cb96", + "balance" : "0x0de0b6b3a760cb6e", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "8505dbcf94b936e26c353b02f74fb7a63c8944a99e3ecb290d57e4eff2fabdab", + "postStateRoot" : "ea92261e84ce4efbd1a033b976cd8a0ff1d8454c78f9fa93e95c0be3d95591c8", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x01312d00", diff --git a/tests/files/StateTests/EIP150/Homestead/stRefundTest.json b/tests/files/StateTests/EIP150/Homestead/stRefundTest.json index 9897c7062..d4c34cd2d 100644 --- a/tests/files/StateTests/EIP150/Homestead/stRefundTest.json +++ b/tests/files/StateTests/EIP150/Homestead/stRefundTest.json @@ -158,21 +158,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xb374", + "balance" : "0xb388", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xd32c", + "balance" : "0xd318", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "d27a6d9b1da7ee2474413253621bd0e145e04f4a375ec62f3330173caf3854d5", + "postStateRoot" : "9a866458681a832830dd48849d51940a4d835897d7d7481d3ba9b46b6bb00ebc", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a7640000", @@ -227,21 +227,21 @@ } }, "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x962d", + "balance" : "0x9655", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0xf073", + "balance" : "0xf04b", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "8c0ff698efea55f245a46aecfae9ce755781b856920b29b38dc198c05f88b058", + "postStateRoot" : "2556bc8f45d770a17481726751babca7c8e280b2275da7a4bb3def1368a59691", "pre" : { "095e7baea6a6c7c4c2dfeb977efac326af552d87" : { "balance" : "0x0de0b6b3a7640000", @@ -1235,21 +1235,21 @@ "out" : "0x0000000000000000000000000000000000000000000000000000000000000001", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x4104", + "balance" : "0x4154", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0452dc", + "balance" : "0x04528c", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "f86cd78f87f71a92c8db138f99e6ce104e81b30bbafac118127ec5057148aa99", + "postStateRoot" : "6d682e26dc5364fc47db5306aea09899760ac2bd4b89229bfbf62b784ab1866d", "pre" : { "1000000000000000000000000000000000000001" : { "balance" : "0x0de0b6b3a7640000", @@ -1290,21 +1290,21 @@ "out" : "0x0000000000000000000000000000000000000000000000000000000000000001", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x358f", + "balance" : "0x35cb", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x045e51", + "balance" : "0x045e15", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "6f5cbf09a8693d41dec28d7b4ada05d6cb4cc00029ee9311721903060039fd50", + "postStateRoot" : "470504afdd4f770328e7e01c552f262cc55996fc83cc5fe05c825fda6b50312c", "pre" : { "1000000000000000000000000000000000000001" : { "balance" : "0x0de0b6b3a7640000", diff --git a/tests/files/StateTests/EIP150/Homestead/stWalletTest.json b/tests/files/StateTests/EIP150/Homestead/stWalletTest.json index e685f32f3..dd6a8a5b8 100644 --- a/tests/files/StateTests/EIP150/Homestead/stWalletTest.json +++ b/tests/files/StateTests/EIP150/Homestead/stWalletTest.json @@ -13,14 +13,14 @@ "out" : "0x606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0c77bb", + "balance" : "0x0c77e3", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a7527870", + "balance" : "0x0de0b6b3a7527848", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -39,7 +39,7 @@ } } }, - "postStateRoot" : "ed81234935fb19c5c48025847ffb0811ff29aa19f83e54c5ebeb9fac2a14017c", + "postStateRoot" : "78cc460350595ca82c6cd51cecefdc3cee7dd716733ee37a41d88441abfea784", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -51,7 +51,7 @@ }, "transaction" : { "data" : "606060409081526001600081815581805533600160a060020a0316600381905581526101026020529190912055620151804204610107556109b4806100456000396000f300606060405236156100985760e060020a6000350463173825d9811461009a5780632f54bf6e146100f65780634123cb6b1461011a5780635c52c2f5146101235780637065cb4814610154578063746c917114610188578063b20d30a914610191578063b75c7dc6146101c5578063ba51a6df146101f5578063c2cf732614610229578063f00d4b5d14610269578063f1736d86146102a2575b005b6100986004356000600036436040518084848082843750505090910190815260405190819003602001902090506105b9815b600160a060020a0333166000908152610102602052604081205481808083811415610719576108b0565b6102ac6004355b600160a060020a0316600090815261010260205260408120541190565b6102ac60015481565b6100986000364360405180848480828437505050909101908152604051908190036020019020905061070b816100cc565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610531816100cc565b6102ac60005481565b610098600435600036436040518084848082843750505090910190815260405190819003602001902090506106ff816100cc565b610098600435600160a060020a03331660009081526101026020526040812054908080838114156102be57610340565b61009860043560003643604051808484808284375050509091019081526040519081900360200190209050610678816100cc565b6102ac600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156106d1576106f5565b6100986004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506103ca816100cc565b6102ac6101055481565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156103405781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156103c3576103d8836100fd565b156103e357506103c5565b600160a060020a03841660009081526101026020526040812054925082141561040c57506103c5565b6103475b6101045460005b8181101561085f576101048054829081101561000257600091825260008051602061099483398151915201541461048a5761010480546101039160009184908110156100025760008051602061099483398151915201548252506020919091526040812081815560018101829055600201555b600101610417565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561052c5761053f826100fd565b1561054a575061052e565b610552610410565b60015460fa90106105675761056561057c565b505b60015460fa9010610492575061052e565b6106365b600060015b600154811015610899575b600154811080156105ac5750600281610100811015610002570154600014155b156108b95760010161058c565b156103c557600160a060020a0383166000908152610102602052604081205492508214156105e7575061052c565b6001600160005054036000600050541115610602575061052c565b600060028361010081101561000257508301819055600160a060020a03841681526101026020526040812055610578610410565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561052c5760015482111561068d575061052e565b600082905561069a610410565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106f057600094506106f5565b600194505b5050505092915050565b1561052c575061010555565b1561052e5760006101065550565b60008681526101036020526040812080549094509092508214156107a2578154835560018381018390556101048054918201808255828015829011610771578183600052602060002091820191016107719190610885565b5050506002840181905561010480548892908110156100025760009190915260008051602061099483398151915201555b506001820154600284900a908116600014156108b05760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a182546001901161089d57600086815261010360205260409020600201546101048054909190811015610002576040600090812060008051602061099483398151915292909201819055808255600180830182905560029092015595506108b09050565b61010480546000808355919091526103c590600080516020610994833981519152908101905b808211156108995760008155600101610885565b5090565b8254600019018355600183018054821790555b50505050919050565b5b600180541180156108dc57506001546002906101008110156100025701546000145b156108f057600180546000190190556108ba565b600154811080156109135750600154600290610100811015610002570154600014155b801561092d57506002816101008110156100025701546000145b1561098e57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61058156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", - "gasLimit" : "0x0c77bb", + "gasLimit" : "0x0c77e3", "gasPrice" : "0x01", "nonce" : "0x01", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", @@ -177,14 +177,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0127f6", + "balance" : "0x012896", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75dc835", + "balance" : "0x0de0b6b3a75dc795", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -205,7 +205,7 @@ } } }, - "postStateRoot" : "f2f751b7fb481f1517fb6e83bdf398b0c46c90686e2a53512a6a3cbb1de60fab", + "postStateRoot" : "e51a9621a6a56da7a889ea18c1ecb980c9b527c28ec7f2fc745d671e3d8edbc0", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -261,14 +261,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x019e37", + "balance" : "0x019ed7", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d51f4", + "balance" : "0x0de0b6b3a75d5154", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -289,7 +289,7 @@ } } }, - "postStateRoot" : "2d9807af3717e5ebfabb1350898a88667b4d1f113d61b5a6b7c9cdc880f19081", + "postStateRoot" : "470dee92b65693a8152fdc185281a5e090432f7ba1f7874f078281b7dffaac9f", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -343,14 +343,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0162d3", + "balance" : "0x016373", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d8d58", + "balance" : "0x0de0b6b3a75d8cb8", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -370,7 +370,7 @@ } } }, - "postStateRoot" : "96040ba023f020260739b09631662b263039782070ce1d40482d4afea7d00613", + "postStateRoot" : "fa2a0c4ee3c6c9adfc9086c327c2416b81562244c7636a8350572de57eb0e688", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -432,7 +432,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01ff70", + "balance" : "0x0200b0", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -452,14 +452,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75cf0bb", + "balance" : "0x0de0b6b3a75cef7b", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "21751242b027dcf541e1cd60966343230eed1cd15237d565a0ab2105547ee99d", + "postStateRoot" : "c2cce9d7b2f2a11dd0bb6f8d5a1a1bba962b8ad4231e4b7c811cdf1bfffe7971", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -512,7 +512,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x015601", + "balance" : "0x0156c9", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -531,14 +531,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d9a2a", + "balance" : "0x0de0b6b3a75d9962", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "26571ae1ea2375908bf22dbf1cc78035899424046731bb4d4e96fed3cebc811e", + "postStateRoot" : "26e722fe6f5f192b22ef8f3dc1f4e747f34bbf510f573efb6af738ab92ff120b", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -599,7 +599,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x018f28", + "balance" : "0x019068", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -617,14 +617,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d6103", + "balance" : "0x0de0b6b3a75d5fc3", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "d3148e6d6aaa2f41a172553339875a3e03ad3c2188ea101e25fe46acd3c71767", + "postStateRoot" : "04a24c8abe2a280f58fb589c896e7ddf11ae087033cc92cb2c8ba138b80b3dcb", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -677,7 +677,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01523f", + "balance" : "0x01532f", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -696,14 +696,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d9dec", + "balance" : "0x0de0b6b3a75d9cfc", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "556ebd705e6dc4fdb6266e20354eacf8f4079c575bb55d0f11166fd76efaee9f", + "postStateRoot" : "461884afb67e38da536946c0d744de98acf65d209ec82ff35b5eb68f5a3b68b1", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -756,7 +756,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x015d57", + "balance" : "0x015e47", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -775,14 +775,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d92d4", + "balance" : "0x0de0b6b3a75d91e4", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "7d7233bf2c13cfa192ce9dc2bc8101313971fe6ea493c2403ae2acb91b8d73e6", + "postStateRoot" : "ed869e9a7d2bc63013cb9a23173ece41d4437d4e4608e513069304529cd54c4e", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -835,7 +835,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x015c08", + "balance" : "0x015cd0", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -854,14 +854,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d9423", + "balance" : "0x0de0b6b3a75d935b", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "6c66eaf6153b3633e255fb22efd2b9b0607586f04f0179779a40336f98fcbdce", + "postStateRoot" : "88cbbea3a252ac70dd8fc4838a95d40945f8e0ad4d977c6cbb4f31aa0f237d84", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -922,7 +922,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x011ee2", + "balance" : "0x011f82", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -939,14 +939,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75dd149", + "balance" : "0x0de0b6b3a75dd0a9", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "1c1c1b9de665348f9df4250e5805e8d6bbee0eb689e973b8c451a1bd1882dee2", + "postStateRoot" : "5708c053b70f81b7197a90d1094c79693e8dffe395d9f14d75a67bfb5408a267", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1007,7 +1007,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0159ba", + "balance" : "0x015a5a", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1025,14 +1025,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d9671", + "balance" : "0x0de0b6b3a75d95d1", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "d320f3b38ce4d0c378d452d0b09330a4f627fdd0d921c2f5fa283ba11f7916da", + "postStateRoot" : "8fe39e19833a3cbd557d97d2246fcfda845ed17ce543fd726f983e3eb6772cb1", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1085,7 +1085,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x015103", + "balance" : "0x0151a3", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1104,14 +1104,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d9f28", + "balance" : "0x0de0b6b3a75d9e88", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "52a2b577fd97dd0add6284b1b1fd4c1c69791802b3be0e14ea4e0bf1aac340e8", + "postStateRoot" : "8092af9e8eac2d2444cc28eed24647661679b8998ffd0d845f7edec40a16d7cb", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1156,7 +1156,7 @@ "out" : "0x606060405236156100775760e060020a6000350463173825d981146100795780632f54bf6e146100d55780634123cb6b146100f95780637065cb4814610102578063746c917114610136578063b75c7dc61461013f578063ba51a6df1461016f578063c2cf7326146101a3578063f00d4b5d146101e3575b005b610077600435600060003643604051808484808284375050509091019081526040519081900360200190209050610529815b600160a060020a033316600090815261010260205260408120548180808381141561066f57610806565b61021c6004355b600160a060020a0316600090815261010260205260408120541190565b61021c60015481565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506104a1816100ab565b61021c60005481565b610077600435600160a060020a033316600090815261010260205260408120549080808381141561022e576102b0565b610077600435600036436040518084848082843750505090910190815260405190819003602001902090506105e8816100ab565b61021c600435602435600082815261010360209081526040808320600160a060020a03851684526101029092528220548290818181141561064157610665565b61007760043560243560006000364360405180848480828437505050909101908152604051908190036020019020905061033a816100ab565b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a92908316819011156102b05781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a038316600283610100811015610002570155600160a060020a0384811660008181526101026020908152604080832083905593871680835291849020869055835192835282015281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b1561033357610348836100dc565b156103535750610335565b600160a060020a03841660009081526101026020526040812054925082141561037c5750610335565b6102b75b6101045460005b818110156107b557610104805482908110156100025760009182526000805160206108ea8339815191520154146103fa576101048054610103916000918490811015610002576000805160206108ea83398151915201548252506020919091526040812081815560018101829055600201555b600101610387565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b1561049c576104af826100dc565b156104ba575061049e565b6104c2610380565b60015460fa90106104d7576104d56104ec565b505b60015460fa9010610402575061049e565b6105a65b600060015b6001548110156107ef575b6001548110801561051c5750600281610100811015610002570154600014155b1561080f576001016104fc565b1561033557600160a060020a038316600090815261010260205260408120549250821415610557575061049c565b6001600160005054036000600050541115610572575061049c565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556104e8610380565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b1561049c576001548211156105fd575061049e565b600082905561060a610380565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156106605760009450610665565b600194505b5050505092915050565b60008681526101036020526040812080549094509092508214156106f85781548355600183810183905561010480549182018082558280158290116106c7578183600052602060002091820191016106c791906107db565b505050600284018190556101048054889290811015610002576000919091526000805160206108ea83398151915201555b506001820154600284900a908116600014156108065760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a18254600190116107f35760008681526101036020526040902060020154610104805490919081101561000257604060009081206000805160206108ea83398151915292909201819055808255600180830182905560029092015595506108069050565b6101048054600080835591909152610335906000805160206108ea833981519152908101905b808211156107ef57600081556001016107db565b5090565b8254600019018355600183018054821790555b50505050919050565b5b6001805411801561083257506001546002906101008110156100025701546000145b156108465760018054600019019055610810565b600154811080156108695750600154600290610100811015610002570154600014155b801561088357506002816101008110156100025701546000145b156108e457600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b6104f156004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0b7692", + "balance" : "0x0b76ba", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1174,14 +1174,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a758890a", + "balance" : "0x0de0b6b3a75888e2", "code" : "0x", "nonce" : "0x01", "storage" : { } } }, - "postStateRoot" : "2f6e2b63729f951a32bcb3e6b501be8af00422a9e5ef159a36ebed07559ecd06", + "postStateRoot" : "ca5231e5493e94957a58bc07ea852edded24d6f8cb1a73ef3f0b4d4b3843a0a7", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a7640000", @@ -1311,7 +1311,7 @@ "out" : "0x0000000000000000000000000000000000000000000000000000000000000000", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5a84", + "balance" : "0x5ad4", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1329,14 +1329,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75e95a7", + "balance" : "0x0de0b6b3a75e9557", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "7195e4d36a906fdc0346931d809e55e1d27921817d7780d4098bf164f2dedaf1", + "postStateRoot" : "4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1381,7 +1381,7 @@ "out" : "0x0000000000000000000000000000000000000000000000000000000000000001", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5a84", + "balance" : "0x5ad4", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1399,14 +1399,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75e95a7", + "balance" : "0x0de0b6b3a75e9557", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "7195e4d36a906fdc0346931d809e55e1d27921817d7780d4098bf164f2dedaf1", + "postStateRoot" : "4f7f5592be43176a0029d4d375b52afee2dc907ebb0e33d67fc1437c94b71e26", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1467,7 +1467,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x016365", + "balance" : "0x01638d", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1485,14 +1485,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d8cc6", + "balance" : "0x0de0b6b3a75d8c9e", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "67a01a2bbf3822cbb3179a05685218cbaee903a73c4b47b29de0af4d9122d621", + "postStateRoot" : "bc471eeda0238882c1cadfd7e4897334569f78832484e9715a2e396d5ddc7815", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1539,14 +1539,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5b3d", + "balance" : "0x5b8d", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { - "balance" : "0x0de0b6b3a75e94ee", + "balance" : "0x0de0b6b3a75e949e", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -1571,7 +1571,7 @@ } } }, - "postStateRoot" : "6e6f58709e4b66c0df01499e6f7433dc54d7a6140f8f0a92b517b0babd036756", + "postStateRoot" : "fa675da31c7250893f5a2e2aa7d89c0c3ad18b03d237c5c339ff8a4bd3c278ef", "pre" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "0x0de0b6b3a75ef08f", @@ -1631,7 +1631,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x015761", + "balance" : "0x015829", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1650,14 +1650,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d98ca", + "balance" : "0x0de0b6b3a75d9802", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "982e4ff5074f3331cc081c99474650921f41829ea515cdbb036453865ffb237d", + "postStateRoot" : "63fd77f981b9e01643abe7a66f465eeb8f273b30b717a04e5ef9cd469328ac6b", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1710,7 +1710,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0155a7", + "balance" : "0x01566f", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1729,14 +1729,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d9a84", + "balance" : "0x0de0b6b3a75d99bc", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "66decb6aab1b1844ea6b70583e6b1f69cc2be7d909c3d3cbfcd3b68ac744dd70", + "postStateRoot" : "b4897c497efaf2519fafc2f139cb0738b019ff01ae14c79c7488129250934cdb", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1781,7 +1781,7 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5f36", + "balance" : "0x5fae", "code" : "0x", "nonce" : "0x00", "storage" : { @@ -1799,14 +1799,14 @@ } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75e90f5", + "balance" : "0x0de0b6b3a75e907d", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "db7f36cbcd9ac9c98e8868f2f0b071c94d0dcd842266b692162e3b951f328370", + "postStateRoot" : "7d5794558d5ddb7239e0d69b38782b20417b592d598e5ac00128cb16ca585b4f", "pre" : { "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : { "balance" : "0x64", @@ -1867,14 +1867,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01c0ea", + "balance" : "0x01c1b2", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { - "balance" : "0x5af310787f16", + "balance" : "0x5af310787e4e", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -1904,7 +1904,7 @@ } } }, - "postStateRoot" : "76d400e242aa18890d5586152e67f7d432b0cc9c2abdc84cef5686d1a8ee3661", + "postStateRoot" : "2c52ac094e626f3acf90b21fe87fadde57108829d05d14a86a5c5328560baf91", "pre" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "0x5af3107a4000", @@ -1981,14 +1981,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01a642", + "balance" : "0x01a70a", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { - "balance" : "0x5af3107899be", + "balance" : "0x5af3107898f6", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -2016,7 +2016,7 @@ } } }, - "postStateRoot" : "b0d9066f15757dfad94b553598d8e1691ea7735d19d8a0623d3d33982d677b70", + "postStateRoot" : "c341907f27b95bf7d430f8649f81aeb19aec69a69b80323e2a7e98b373024376", "pre" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "0x5af3107a4000", @@ -2093,14 +2093,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x016e2b", + "balance" : "0x016ea3", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { - "balance" : "0x5af31078d1d5", + "balance" : "0x5af31078d15d", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -2128,7 +2128,7 @@ } } }, - "postStateRoot" : "69b8a269709ee68ff09702d3478d9c1faca7139c6da635517fdd22e7339c7c30", + "postStateRoot" : "31860009e5b38e2bbbeafa52f4ce78c9e130e00d25f73de18d5de9bd93207340", "pre" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "0x5af3107a4000", @@ -2205,14 +2205,14 @@ "out" : "0x0000000000000000000000000000000000000000000000000000000000000001", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0xc27c", + "balance" : "0xc31c", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { - "balance" : "0x5af310797d84", + "balance" : "0x5af310797ce4", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -2248,7 +2248,7 @@ } } }, - "postStateRoot" : "23966adcfcae0a0ddd28591c9f959c808aca30107336bb03277f749820f9734f", + "postStateRoot" : "11645d1f9235d0092b8cb36f8066e1245abfa79f7f1c14520888bce3713e1fad", "pre" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "0x5af3107a4000", @@ -2318,14 +2318,14 @@ "out" : "0x606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x12b13f", + "balance" : "0x12b167", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a74c3eec", + "balance" : "0x0de0b6b3a74c3ec4", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -2344,7 +2344,7 @@ } } }, - "postStateRoot" : "cc0650864150a1af52c5c5425b107ca18ab99632cb2a1714be89ce4f547fa9c7", + "postStateRoot" : "867b23c7d192ae1318178e63713f116b11b6f3f041e2ec83051f6293c6b405e7", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -2356,7 +2356,7 @@ }, "transaction" : { "data" : "6060604052604051602080611014833960806040818152925160016000818155818055600160a060020a03331660038190558152610102909452938320939093556201518042046101075582917f102d25c49d33fcdb8976a3f2744e0785c98d9e43b88364859e6aec4ae82eff5c91a250610f958061007f6000396000f300606060405236156100b95760e060020a6000350463173825d9811461010b5780632f54bf6e146101675780634123cb6b1461018f5780635c52c2f5146101985780637065cb48146101c9578063746c9171146101fd578063797af62714610206578063b20d30a914610219578063b61d27f61461024d578063b75c7dc61461026e578063ba51a6df1461029e578063c2cf7326146102d2578063cbf0b0c014610312578063f00d4b5d14610346578063f1736d861461037f575b61038960003411156101095760408051600160a060020a033316815234602082015281517fe1fffcc4923d04b559f4d29a8bfc6cda04eb5b0d3c460751c2402c5c5cc9109c929181900390910190a15b565b610389600435600060003643604051808484808284375050509091019081526040519081900360200190209050610693815b600160a060020a0333166000908152610102602052604081205481808083811415610c1357610d6c565b61038b6004355b600160a060020a03811660009081526101026020526040812054115b919050565b61038b60015481565b610389600036436040518084848082843750505090910190815260405190819003602001902090506107e58161013d565b6103896004356000364360405180848480828437505050909101908152604051908190036020019020905061060b8161013d565b61038b60005481565b61038b6004355b600081610a4b8161013d565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107d98161013d565b61038b6004803590602480359160443591820191013560006108043361016e565b610389600435600160a060020a033316600090815261010260205260408120549080808381141561039d5761041f565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107528161013d565b61038b600435602435600082815261010360209081526040808320600160a060020a0385168452610102909252822054829081818114156107ab576107cf565b610389600435600036436040518084848082843750505090910190815260405190819003602001902090506107f38161013d565b6103896004356024356000600036436040518084848082843750505090910190815260405190819003602001902090506104ac8161013d565b61038b6101055481565b005b60408051918252519081900360200190f35b5050506000828152610103602052604081206001810154600284900a929083168190111561041f5781546001838101805492909101845590849003905560408051600160a060020a03331681526020810187905281517fc7fb647e59b18047309aa15aad418e5d7ca96d173ad704f1031a2c3d7591734b929181900390910190a15b5050505050565b600160a060020a03831660028361010081101561000257508301819055600160a060020a03851660008181526101026020908152604080832083905584835291829020869055815192835282019290925281517fb532073b38c83145e3e5135377a08bf9aab55bc0fd7c1179cd4fb995d2a5159c929181900390910190a15b505b505050565b156104a5576104ba8361016e565b156104c557506104a7565b600160a060020a0384166000908152610102602052604081205492508214156104ee57506104a7565b6104265b6101045460005b81811015610eba57610104805461010891600091849081101561000257600080516020610f7583398151915201548252506020918252604081208054600160a060020a0319168155600181018290556002810180548382559083528383209193610f3f92601f9290920104810190610a33565b60018054810190819055600160a060020a038316906002906101008110156100025790900160005081905550600160005054610102600050600084600160a060020a03168152602001908152602001600020600050819055507f994a936646fe87ffe4f1e469d3d6aa417d6b855598397f323de5b449f765f0c3826040518082600160a060020a0316815260200191505060405180910390a15b505b50565b15610606576106198261016e565b156106245750610608565b61062c6104f2565b60015460fa90106106415761063f610656565b505b60015460fa901061056c5750610608565b6107105b600060015b600154811015610a47575b600154811080156106865750600281610100811015610002570154600014155b15610d7557600101610666565b156104a757600160a060020a0383166000908152610102602052604081205492508214156106c15750610606565b60016001600050540360006000505411156106dc5750610606565b600060028361010081101561000257508301819055600160a060020a038416815261010260205260408120556106526104f2565b5060408051600160a060020a038516815290517f58619076adf5bb0943d100ef88d52d7c3fd691b19d3a9071b555b651fbf418da9181900360200190a1505050565b15610606576001548211156107675750610608565b60008290556107746104f2565b6040805183815290517facbdb084c721332ac59f9b8e392196c9eb0e4932862da8eb9beaf0dad4f550da9181900360200190a15050565b506001830154600282900a908116600014156107ca57600094506107cf565b600194505b5050505092915050565b15610606575061010555565b156106085760006101065550565b156106065781600160a060020a0316ff5b15610a2357610818846000610e4f3361016e565b156108d4577f92ca3a80853e6663fa31fa10b99225f18d4902939b4c53a9caae9043f6efd00433858786866040518086600160a060020a0316815260200185815260200184600160a060020a031681526020018060200182810382528484828181526020019250808284378201915050965050505050505060405180910390a184600160a060020a03168484846040518083838082843750505090810191506000908083038185876185025a03f15060009350610a2392505050565b6000364360405180848480828437505050909101908152604051908190036020019020915061090490508161020d565b158015610927575060008181526101086020526040812054600160a060020a0316145b15610a235760008181526101086020908152604082208054600160a060020a03191688178155600181018790556002018054858255818452928290209092601f01919091048101908490868215610a2b579182015b82811115610a2b57823582600050559160200191906001019061097c565b50600050507f1733cbb53659d713b79580f79f3f9ff215f78a7c7aa45890f3b89fc5cddfbf328133868887876040518087815260200186600160a060020a0316815260200185815260200184600160a060020a03168152602001806020018281038252848482818152602001925080828437820191505097505050505050505060405180910390a15b949350505050565b5061099a9291505b80821115610a475760008155600101610a33565b5090565b15610c005760008381526101086020526040812054600160a060020a031614610c0057604080516000918220805460018201546002929092018054600160a060020a0392909216949293909291819084908015610acd57820191906000526020600020905b815481529060010190602001808311610ab057829003601f168201915b50509250505060006040518083038185876185025a03f1505050600084815261010860209081526040805181842080546001820154600160a060020a033381811686529685018c905294840181905293166060830181905260a06080840181815260029390930180549185018290527fe7c957c06e9a662c1a6c77366179f5b702b97651dc28eee7d5bf1dff6e40bb4a985095968b969294929390929160c083019085908015610ba257820191906000526020600020905b815481529060010190602001808311610b8557829003601f168201915b505097505050505050505060405180910390a160008381526101086020908152604082208054600160a060020a031916815560018101839055600281018054848255908452828420919392610c0692601f9290920104810190610a33565b50919050565b505050600191505061018a565b6000868152610103602052604081208054909450909250821415610c9c578154835560018381018390556101048054918201808255828015829011610c6b57818360005260206000209182019101610c6b9190610a33565b50505060028401819055610104805488929081101561000257600091909152600080516020610f7583398151915201555b506001820154600284900a90811660001415610d6c5760408051600160a060020a03331681526020810188905281517fe1c52dc63b719ade82e8bea94cc41a0d5d28e4aaf536adb5e9cccc9ff8c1aeda929181900390910190a1825460019011610d59576000868152610103602052604090206002015461010480549091908110156100025760406000908120600080516020610f758339815191529290920181905580825560018083018290556002909201559550610d6c9050565b8254600019018355600183018054821790555b50505050919050565b5b60018054118015610d9857506001546002906101008110156100025701546000145b15610dac5760018054600019019055610d76565b60015481108015610dcf5750600154600290610100811015610002570154600014155b8015610de957506002816101008110156100025701546000145b15610e4a57600154600290610100811015610002578101549082610100811015610002578101919091558190610102906000908361010081101561000257810154825260209290925260408120929092556001546101008110156100025701555b61065b565b1561018a5761010754610e655b62015180420490565b1115610e7e57600061010655610e79610e5c565b610107555b6101065480830110801590610e9c5750610106546101055490830111155b15610eb25750610106805482019055600161018a565b50600061018a565b6106066101045460005b81811015610f4a5761010480548290811015610002576000918252600080516020610f75833981519152015414610f3757610104805461010391600091849081101561000257600080516020610f7583398151915201548252506020919091526040812081815560018101829055600201555b600101610ec4565b5050506001016104f9565b61010480546000808355919091526104a790600080516020610f7583398151915290810190610a3356004c0be60200faa20559308cb7b5a1bb3255c16cb1cab91f525b5ae7a03d02fabe", - "gasLimit" : "0x12b13f", + "gasLimit" : "0x12b167", "gasPrice" : "0x01", "nonce" : "0x01", "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8", @@ -2482,14 +2482,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x57ac", + "balance" : "0x57d4", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75e987f", + "balance" : "0x0de0b6b3a75e9857", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -2508,7 +2508,7 @@ } } }, - "postStateRoot" : "b9ea431e30a83fb32f66ebd5ebf4f8f1a550e0e1471304ebfe6b3025ec8203c4", + "postStateRoot" : "567dbc211151e1d9af70a3678402f013b9f04ac62ecc881fb254f7cacf07cb48", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -2642,14 +2642,14 @@ "out" : "0x033b0bf8ea9cb5f4a03729112a8312179b6cf53cf7a02f75105d301746001a40", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x03057f", + "balance" : "0x03070f", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75beb10", + "balance" : "0x0de0b6b3a75be980", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -2676,7 +2676,7 @@ } } }, - "postStateRoot" : "161e7009688fa6bcef343e335ade24c52ebac615889020c1763c813b51ebb453", + "postStateRoot" : "fd49d7a6bc8d9d81341cfbda68c3ddd15c4a670abb4f439c30ad2bca7304a147", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -2739,14 +2739,14 @@ "out" : "0x033b0bf8ea9cb5f4a03729112a8312179b6cf53cf7a02f75105d301746001a40", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x027ef7", + "balance" : "0x0280af", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75c7198", + "balance" : "0x0de0b6b3a75c6fe0", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -2769,7 +2769,7 @@ } } }, - "postStateRoot" : "3185a8575c952922ffea8efb1ba84daca8797f056e009c3928656d4fd3d8edec", + "postStateRoot" : "568fefc5c5ed4e3feb45370d16d351e7d5f3bfc273308e302474f59254deb585", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -2831,14 +2831,14 @@ "out" : "0x033b0bf8ea9cb5f4a03729112a8312179b6cf53cf7a02f75105d301746001a40", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x021d21", + "balance" : "0x021ed9", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75cd36e", + "balance" : "0x0de0b6b3a75cd1b6", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -2861,7 +2861,7 @@ } } }, - "postStateRoot" : "cf8c32e174a1d3ee23f60772974158538f30d2862da72583e52207510d9421c3", + "postStateRoot" : "a5d696323ff9a16dbe5afccd2dad2d62362853bb706e204bb676d4c2512c7d0f", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -2916,14 +2916,14 @@ "out" : "0x0000000000000000000000000000000000000000000000000000000000000000", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x0160a7", + "balance" : "0x016197", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75d8fe8", + "balance" : "0x0de0b6b3a75d8ef8", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -2951,7 +2951,7 @@ } } }, - "postStateRoot" : "c2c581694bc15abea73a08e924614a579cbdf069944ebd5d3daba67714e8f869", + "postStateRoot" : "698f2b036b3d2cf9f35eb330c57073a4d67e6de806bc12b8f7f53c7629bfa8c6", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -3006,21 +3006,21 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x010b3b", + "balance" : "0x010c03", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75de5b8", + "balance" : "0x0de0b6b3a75de4f0", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "e19510e88eed6b272878d76ed78088a0e0a109f9a5af5700eb52f08546378de5", + "postStateRoot" : "464315f22436999a8774d41d9e577131c7ee0424b1a1aa021b0097cfd96cdc02", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -3066,14 +3066,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x5c4c", + "balance" : "0x5c9c", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { - "balance" : "0x0de0b6b3a75e93df", + "balance" : "0x0de0b6b3a75e938f", "code" : "0x", "nonce" : "0x02", "storage" : { @@ -3099,7 +3099,7 @@ } } }, - "postStateRoot" : "d41e7b0dc1039a6838820818d456d9e63ec1fe11d97f5b5bb59e51e1ededa22b", + "postStateRoot" : "4f551222d047d6b7a8765fc08ab6a88517d721607987744a9183e55c45029c5a", "pre" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "0x0de0b6b3a75ef08f", @@ -3160,21 +3160,21 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x010b3b", + "balance" : "0x010c03", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { - "balance" : "0x0de0b6b3a75de4f0", + "balance" : "0x0de0b6b3a75de428", "code" : "0x", "nonce" : "0x02", "storage" : { } } }, - "postStateRoot" : "7fb2b50700b86b0902528b7f8532fb33a3e4b57e0aa686c9ad32bb54492275bc", + "postStateRoot" : "90380da4746fbe31e21ac989ec926f1508f96ae3adf04c225af816fc95f1b07d", "pre" : { "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : { "balance" : "0x0de0b6b3a75ef08f", @@ -3236,14 +3236,14 @@ "out" : "0x", "post" : { "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : { - "balance" : "0x01cb90", + "balance" : "0x01cc44", "code" : "0x", "nonce" : "0x00", "storage" : { } }, "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { - "balance" : "0x5af310787470", + "balance" : "0x5af3107873bc", "code" : "0x", "nonce" : "0x01", "storage" : { @@ -3269,7 +3269,7 @@ } } }, - "postStateRoot" : "08dc2f434c12e5a7f22af2849eb01339216e01e4fd0c194a759a3d7dab122265", + "postStateRoot" : "d1f22189317089339421e4f708541e7f8c465614f3f76ad96923bad6ca5ee99b", "pre" : { "3fb1cd2cd96c6d5c0b5eb3322d807b34482481d4" : { "balance" : "0x5af3107a4000", From f3e5fb592a1f536a914bd528b3474f9e2962db4b Mon Sep 17 00:00:00 2001 From: Igor Artamonov Date: Fri, 21 Oct 2016 02:21:42 +0600 Subject: [PATCH 2/2] bumped version 3.1.0 --- VERSION | 2 +- cmd/geth/main.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/VERSION b/VERSION index cb2b00e4f..fd2a01863 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.1 +3.1.0 diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 1b06b8f13..4e284d7b3 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -49,8 +49,8 @@ import ( const ( clientIdentifier = "Geth" // Client identifier to advertise over the network versionMajor = 3 // Major version component of the current release - versionMinor = 0 // Minor version component of the current release - versionPatch = 1 // Patch version component of the current release + versionMinor = 1 // Minor version component of the current release + versionPatch = 0 // Patch version component of the current release versionMeta = "unstable" // Version metadata to append to the version string // !EPROJECT Replace Oracle or remove point of centralization