Merge pull request #1099 from obscuren/fork_fix

Fork fix

core/blocks.go

@@ -4,4 +4,5 @@ import "github.com/ethereum/go-ethereum/common"
 
 var badHashes = []common.Hash{
 	common.HexToHash("f269c503aed286caaa0d114d6a5320e70abbc2febe37953207e76a2873f2ba79"),
+	common.HexToHash("38f5bbbffd74804820ffa4bab0cd540e9de229725afb98c1a7e57936f4a714bc"),
 }

core/vm/memory.go

 package vm
 
-import (
-	"fmt"
-
-	"github.com/ethereum/go-ethereum/common"
-)
+import "fmt"
 
 type Memory struct {
 	store []byte
@@ -24,7 +20,7 @@ func (m *Memory) Set(offset, size uint64, value []byte) {
 	// It's possible the offset is greater than 0 and size equals 0. This is because
 	// the calcMemSize (common.go) could potentially return 0 when size is zero (NO-OP)
 	if size > 0 {
-		copy(m.store[offset:offset+size], common.RightPadBytes(value, int(size)))
+		copy(m.store[offset:offset+size], value)
 	}
 }
 

tests/block_test.go

@@ -32,10 +32,6 @@ func TestBcInvalidRLPTests(t *testing.T) {
 	runBlockTestsInFile("files/BlockTests/bcInvalidRLPTest.json", []string{}, t)
 }
 
-func TestBcJSAPITests(t *testing.T) {
-	runBlockTestsInFile("files/BlockTests/bcJS_API_Test.json", []string{}, t)
-}
-
 func TestBcRPCAPITests(t *testing.T) {
 	runBlockTestsInFile("files/BlockTests/bcRPC_API_Test.json", []string{}, t)
 }

tests/files/KeyStoreTests/basic_tests.json

+{
+    "test1": {
+        "json": {
+            "crypto" : {
+                "cipher" : "aes-128-ctr",
+                "cipherparams" : {
+                    "iv" : "6087dab2f9fdbbfaddc31a909735c1e6"
+                },
+                "ciphertext" : "5318b4d5bcd28de64ee5559e671353e16f075ecae9f99c7a79a38af5f869aa46",
+                "kdf" : "pbkdf2",
+                "kdfparams" : {
+                    "c" : 262144,
+                    "dklen" : 32,
+                    "prf" : "hmac-sha256",
+                    "salt" : "ae3cd4e7013836a3df6bd7241b12db061dbe2c6785853cce422d148a624ce0bd"
+                },
+                "mac" : "517ead924a9d0dc3124507e3393d175ce3ff7c1e96529c6c555ce9e51205e9b2"
+            },
+            "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6",
+            "version" : 3
+        },
+        "password": "testpassword",
+        "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d"
+    },
+    "test2": {
+        "json": {
+            "crypto" : {
+                "cipher" : "aes-128-ctr",
+                "cipherparams" : {
+                    "iv" : "83dbcc02d8ccb40e466191a123791e0e"
+                },
+                "ciphertext" : "d172bf743a674da9cdad04534d56926ef8358534d458fffccd4e6ad2fbde479c",
+                "kdf" : "scrypt",
+                "kdfparams" : {
+                    "dklen" : 32,
+                    "n" : 262144,
+                    "r" : 1,
+                    "p" : 8,
+                    "salt" : "ab0c7876052600dd703518d6fc3fe8984592145b591fc8fb5c6d43190334ba19"
+                },
+                "mac" : "2103ac29920d71da29f15d75b4a16dbe95cfd7ff8faea1056c33131d846e3097"
+            },
+            "id" : "3198bc9c-6672-5ab3-d995-4942343ae5b6",
+            "version" : 3
+        },
+        "password": "testpassword",
+        "priv": "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d"
+    },
+    "python_generated_test_with_odd_iv": {
+        "json": {
+            "version": 3, 
+            "crypto": {
+                "ciphertext": "ee75456c006b1e468133c5d2a916bacd3cf515ced4d9b021b5c59978007d1e87", 
+                "version": 1, 
+                "kdf": "pbkdf2", 
+                "kdfparams": {
+                    "dklen": 32, 
+                    "c": 262144, 
+                    "prf": "hmac-sha256", 
+                    "salt": "504490577620f64f43d73f29479c2cf0"
+                }, 
+                "mac": "196815708465de9af7504144a1360d08874fc3c30bb0e648ce88fbc36830d35d", 
+                "cipherparams": {
+                    "iv": "514ccc8c4fb3e60e5538e0cf1e27c233"
+                }, 
+                "cipher": "aes-128-ctr"
+            }, 
+            "id": "98d193c7-5174-4c7c-5345-c1daf95477b5"
+        },
+        "password": "foo", 
+        "priv": "0101010101010101010101010101010101010101010101010101010101010101"
+    },
+    "evilnonce": {
+        "json": {
+            "version": 3, 
+            "crypto": {
+                "ciphertext": "d69313b6470ac1942f75d72ebf8818a0d484ac78478a132ee081cd954d6bd7a9", 
+                "cipherparams": {
+                    "iv": "ffffffffffffffffffffffffffffffff"
+                }, 
+                "kdf": "pbkdf2", 
+                "kdfparams": {
+                    "dklen": 32, 
+                    "c": 262144, 
+                    "prf": "hmac-sha256", 
+                    "salt": "c82ef14476014cbf438081a42709e2ed"
+                }, 
+                "mac": "cf6bfbcc77142a22c4a908784b4a16f1023a1d0e2aff404c20158fa4f1587177", 
+                "cipher": "aes-128-ctr", 
+                "version": 1
+            }, 
+            "id": "abb67040-8dbe-0dad-fc39-2b082ef0ee5f"
+        },
+        "password": "bar",
+        "priv": "0202020202020202020202020202020202020202020202020202020202020202"
+    }
+}