Fix api.GetTransaction for EthereumType blockchain

api/worker.go

@@ -20,6 +20,7 @@ type Worker struct {
 	txCache     *db.TxCache
 	chain       bchain.BlockChain
 	chainParser bchain.BlockChainParser
+	chainType   bchain.ChainType
 	is          *common.InternalState
 }
 
@@ -30,6 +31,7 @@ func NewWorker(db *db.RocksDB, chain bchain.BlockChain, txCache *db.TxCache, is
 		txCache:     txCache,
 		chain:       chain,
 		chainParser: chain.GetChainParser(),
+		chainType:   chain.GetChainParser().GetChainType(),
 		is:          is,
 	}
 	return w, nil
@@ -105,10 +107,12 @@ func (w *Worker) GetTransaction(txid string, spendingTxs bool) (*Tx, error) {
 	var ta *db.TxAddresses
 	var blockhash string
 	if bchainTx.Confirmations > 0 {
+		if w.chainType == bchain.ChainBitcoinType {
 			ta, err = w.db.GetTxAddresses(txid)
 			if err != nil {
 				return nil, errors.Annotatef(err, "GetTxAddresses %v", txid)
 			}
+		}
 		blockhash, err = w.db.GetBlockHash(height)
 		if err != nil {
 			return nil, errors.Annotatef(err, "GetBlockHash %v", height)
@@ -124,6 +128,7 @@ func (w *Worker) GetTransaction(txid string, spendingTxs bool) (*Tx, error) {
 		vin.Vout = bchainVin.Vout
 		vin.Sequence = int64(bchainVin.Sequence)
 		vin.ScriptSig.Hex = bchainVin.ScriptSig.Hex
+		if w.chainType == bchain.ChainBitcoinType {
 			//  bchainVin.Txid=="" is coinbase transaction
 			if bchainVin.Txid != "" {
 				// load spending addresses from TxAddresses
@@ -164,6 +169,16 @@ func (w *Worker) GetTransaction(txid string, spendingTxs bool) (*Tx, error) {
 				vin.Value = w.chainParser.AmountToDecimalString(&vin.ValueSat)
 				valInSat.Add(&valInSat, &vin.ValueSat)
 			}
+		} else if w.chainType == bchain.ChainEthereumType {
+			if len(bchainVin.Addresses) > 0 {
+				vin.AddrDesc, err = w.chainParser.GetAddrDescFromAddress(bchainVin.Addresses[0])
+				if err != nil {
+					glog.Errorf("GetAddrDescFromAddress error %v, tx %v, bchainVin %v", err, bchainTx.Txid, bchainVin)
+				}
+				vin.Addresses = bchainVin.Addresses
+				vin.Searchable = true
+			}
+		}
 	}
 	vouts := make([]Vout, len(bchainTx.Vout))
 	for i := range bchainTx.Vout {

bchain/coins/eth/ethparser.go

@@ -291,7 +291,26 @@ func (p *EthereumParser) UnpackBlockHash(buf []byte) (string, error) {
 	return hexutil.Encode(buf), nil
 }
 
-// GetChainType returns TypeEthereum
+// GetChainType returns EthereumType
 func (p *EthereumParser) GetChainType() bchain.ChainType {
 	return bchain.ChainEthereumType
 }
+
+// GetHeightFromTx returns ethereum specific data from bchain.Tx
+func GetHeightFromTx(tx *bchain.Tx) (uint32, error) {
+	// TODO -  temporary implementation - will use bchain.Tx.SpecificData field
+	b, err := hex.DecodeString(tx.Hex)
+	if err != nil {
+		return 0, err
+	}
+	var r rpcTransaction
+	var n uint64
+	err = json.Unmarshal(b, &r)
+	if err != nil {
+		return 0, err
+	}
+	if n, err = hexutil.DecodeUint64(r.BlockNumber); err != nil {
+		return 0, errors.Annotatef(err, "BlockNumber %v", r.BlockNumber)
+	}
+	return uint32(n), nil
+}

bchain/types.go

@@ -15,7 +15,7 @@ type ChainType int
 const (
 	// ChainBitcoinType is blockchain derived from bitcoin
 	ChainBitcoinType = ChainType(iota)
-	// TypeEthereum is blockchain derived from ethereum
+	// ChainEthereumType is blockchain derived from ethereum
 	ChainEthereumType
 )
 

db/rocksdb.go

@@ -301,9 +301,11 @@ func (d *RocksDB) writeBlock(block *bchain.Block, op int) error {
 			return err
 		}
 	} else if chainType == bchain.ChainEthereumType {
-		if err := d.writeAddressesTypeEthereum(wb, block, op); err != nil {
+		if err := d.writeAddressesEthereumType(wb, block, op); err != nil {
 			return err
 		}
+	} else {
+		return errors.New("Unknown chain type")
 	}
 
 	return d.db.Write(d.wo, wb)
@@ -861,7 +863,7 @@ func (d *RocksDB) addAddrDescToRecords(op int, wb *gorocksdb.WriteBatch, records
 	return nil
 }
 
-func (d *RocksDB) writeAddressesTypeEthereum(wb *gorocksdb.WriteBatch, block *bchain.Block, op int) error {
+func (d *RocksDB) writeAddressesEthereumType(wb *gorocksdb.WriteBatch, block *bchain.Block, op int) error {
 	addresses := make(map[string][]outpoint)
 	for _, tx := range block.Txs {
 		btxID, err := d.chainParser.PackTxid(tx.Txid)

db/txcache.go

@@ -2,9 +2,11 @@ package db
 
 import (
 	"blockbook/bchain"
+	"blockbook/bchain/coins/eth"
 	"blockbook/common"
 
 	"github.com/golang/glog"
+	"github.com/juju/errors"
 )
 
 // TxCache is handle to TxCacheServer
@@ -14,6 +16,7 @@ type TxCache struct {
 	metrics   *common.Metrics
 	is        *common.InternalState
 	enabled   bool
+	chainType bchain.ChainType
 }
 
 // NewTxCache creates new TxCache interface and returns its handle
@@ -27,6 +30,7 @@ func NewTxCache(db *RocksDB, chain bchain.BlockChain, metrics *common.Metrics, i
 		metrics:   metrics,
 		is:        is,
 		enabled:   enabled,
+		chainType: chain.GetChainParser().GetChainType(),
 	}, nil
 }
 
@@ -56,6 +60,7 @@ func (c *TxCache) GetTransaction(txid string) (*bchain.Tx, uint32, error) {
 	c.metrics.TxCacheEfficiency.With(common.Labels{"status": "miss"}).Inc()
 	// cache only confirmed transactions
 	if tx.Confirmations > 0 {
+		if c.chainType == bchain.ChainBitcoinType {
 			ta, err := c.db.GetTxAddresses(txid)
 			if err != nil {
 				return nil, 0, err
@@ -69,6 +74,14 @@ func (c *TxCache) GetTransaction(txid string) (*bchain.Tx, uint32, error) {
 			} else {
 				h = ta.Height
 			}
+		} else if c.chainType == bchain.ChainEthereumType {
+			h, err = eth.GetHeightFromTx(tx)
+			if err != nil {
+				return nil, 0, err
+			}
+		} else {
+			return nil, 0, errors.New("Unknown chain type")
+		}
 		if c.enabled {
 			err = c.db.PutTx(tx, h, tx.Blocktime)
 			// do not return caching error, only log it