Merge pull request #1099 from obscuren/fork_fix

Fork fix

Author: obscuren

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

@@ -1,10 +1,6 @@
 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)
 }