Merge branch 'release/poc5-rc9'

1 files changed, 8 insertions, 4 deletions

diff --git a/ethchain/state_object.go b/ethchain/state_object.go
index 8e059f334..3e9c6df40 100644
--- a/ethchain/state_object.go
+++ b/ethchain/state_object.go
@@ -28,8 +28,7 @@ func MakeContract(tx *Transaction, state *State) *StateObject {
 		value := tx.Value
 		contract := NewContract(addr, value, ZeroHash256)
 
-		contract.script = tx.Data
-		contract.initScript = tx.Init
+		contract.initScript = tx.Data
 
 		state.UpdateStateObject(contract)
 
@@ -82,12 +81,17 @@ func (c *StateObject) SetStorage(num *big.Int, val *ethutil.Value) {
 	c.SetAddr(addr, val)
 }
 
-func (c *StateObject) GetMem(num *big.Int) *ethutil.Value {
+func (c *StateObject) GetStorage(num *big.Int) *ethutil.Value {
 	nb := ethutil.BigToBytes(num, 256)
 
 	return c.Addr(nb)
 }
 
+/* DEPRECATED */
+func (c *StateObject) GetMem(num *big.Int) *ethutil.Value {
+	return c.GetStorage(num)
+}
+
 func (c *StateObject) GetInstr(pc *big.Int) *ethutil.Value {
 	if int64(len(c.script)-1) < pc.Int64() {
 		return ethutil.NewValue(0)
@@ -146,7 +150,7 @@ func (c *StateObject) RlpEncode() []byte {
 	if c.state != nil {
 		root = c.state.trie.Root
 	} else {
-		root = ZeroHash256
+		root = ""
 	}
 
 	return ethutil.Encode([]interface{}{c.Amount, c.Nonce, root, ethutil.Sha3Bin(c.script)})