Add missing fields to txn

structs.go

@@ -74,14 +74,17 @@ type Block struct {
 }
 
 type Transaction struct {
-	Hash     Hash
-	From     Address
-	To       *Address
-	Input    []byte
-	GasPrice uint64
-	Gas      uint64
-	Value    *big.Int
-	Nonce    uint64
+	Hash        Hash
+	From        Address
+	To          *Address
+	Input       []byte
+	GasPrice    uint64
+	Gas         uint64
+	Value       *big.Int
+	Nonce       uint64
+	BlockHash   Hash
+	BlockNumber uint64
+	TxnIndex    uint64
 }
 
 type CallMsg struct {

structs_encoding_test.go

@@ -55,7 +55,10 @@ func TestJSONEncoding(t *testing.T) {
 					"value": "0x0",
 					"gasPrice": "0x0",
 					"gas": "0x0",
-					"nonce": "0x10"
+					"nonce": "0x10",
+					"blockHash": "{{.Hash0}}",
+					"blockNumber": "0x0",
+					"transactionIndex": "0x0"
 				}`,
 			build: txn,
 		},

structs_marshal.go

@@ -93,6 +93,9 @@ func (t *Transaction) MarshalJSON() ([]byte, error) {
 		// we can remove this once we include support for custom nonces
 		o.Set("nonce", a.NewString(fmt.Sprintf("0x%x", t.Nonce)))
 	}
+	o.Set("blockHash", a.NewString(t.BlockHash.String()))
+	o.Set("blockNumber", a.NewString(fmt.Sprintf("0x%x", t.BlockNumber)))
+	o.Set("transactionIndex", a.NewString(fmt.Sprintf("0x%x", t.TxnIndex)))
 
 	res := o.MarshalTo(nil)
 	defaultArena.Put(a)

structs_unmarshal.go

@@ -136,6 +136,16 @@ func (t *Transaction) unmarshalJSON(v *fastjson.Value) error {
 	if t.Nonce, err = decodeUint(v, "nonce"); err != nil {
 		return err
 	}
+
+	if err = decodeHash(&t.BlockHash, v, "blockHash"); err != nil {
+		return err
+	}
+	if t.BlockNumber, err = decodeUint(v, "blockNumber"); err != nil {
+		return err
+	}
+	if t.TxnIndex, err = decodeUint(v, "transactionIndex"); err != nil {
+		return err
+	}
 	return nil
 }