From 94873f4d8688aefbac7fae60f360907c20397a16 Mon Sep 17 00:00:00 2001 From: Martin Boehm Date: Tue, 26 Jun 2018 13:03:59 +0200 Subject: [PATCH] Return tx version, update parser tests --- bchain/coins/bch/bcashparser_test.go | 2 ++ bchain/coins/btc/bitcoinparser.go | 4 ++-- bchain/coins/btc/bitcoinparser_test.go | 2 ++ bchain/coins/dogecoin/dogecoinparser_test.go | 2 ++ bchain/coins/litecoin/litecoinparser_test.go | 1 + 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bchain/coins/bch/bcashparser_test.go b/bchain/coins/bch/bcashparser_test.go index 1d042b9f..3e1cb4c1 100644 --- a/bchain/coins/bch/bcashparser_test.go +++ b/bchain/coins/bch/bcashparser_test.go @@ -146,6 +146,7 @@ func init() { Blocktime: 1519053802, Txid: "056e3d82e5ffd0e915fb9b62797d76263508c34fe3e5dbed30dd3e943930f204", LockTime: 512115, + Version: 1, Vin: []bchain.Vin{ { ScriptSig: bchain.ScriptSig{ @@ -176,6 +177,7 @@ func init() { Blocktime: 1235678901, Txid: "474e6795760ebe81cb4023dc227e5a0efe340e1771c89a0035276361ed733de7", LockTime: 0, + Version: 1, Vin: []bchain.Vin{ { ScriptSig: bchain.ScriptSig{ diff --git a/bchain/coins/btc/bitcoinparser.go b/bchain/coins/btc/bitcoinparser.go index 41c52759..861c7f31 100644 --- a/bchain/coins/btc/bitcoinparser.go +++ b/bchain/coins/btc/bitcoinparser.go @@ -130,8 +130,8 @@ func (p *BitcoinParser) TxFromMsgTx(t *wire.MsgTx, parseAddresses bool) bchain.T } } tx := bchain.Tx{ - Txid: t.TxHash().String(), - // skip: Version, + Txid: t.TxHash().String(), + Version: t.Version, LockTime: t.LockTime, Vin: vin, Vout: vout, diff --git a/bchain/coins/btc/bitcoinparser_test.go b/bchain/coins/btc/bitcoinparser_test.go index 46490f6c..d605f45b 100644 --- a/bchain/coins/btc/bitcoinparser_test.go +++ b/bchain/coins/btc/bitcoinparser_test.go @@ -139,6 +139,7 @@ func init() { Blocktime: 1519053802, Txid: "056e3d82e5ffd0e915fb9b62797d76263508c34fe3e5dbed30dd3e943930f204", LockTime: 512115, + Version: 1, Vin: []bchain.Vin{ { ScriptSig: bchain.ScriptSig{ @@ -169,6 +170,7 @@ func init() { Blocktime: 1235678901, Txid: "474e6795760ebe81cb4023dc227e5a0efe340e1771c89a0035276361ed733de7", LockTime: 0, + Version: 1, Vin: []bchain.Vin{ { ScriptSig: bchain.ScriptSig{ diff --git a/bchain/coins/dogecoin/dogecoinparser_test.go b/bchain/coins/dogecoin/dogecoinparser_test.go index 658d4b1c..b8ea585f 100644 --- a/bchain/coins/dogecoin/dogecoinparser_test.go +++ b/bchain/coins/dogecoin/dogecoinparser_test.go @@ -98,6 +98,7 @@ func init() { Blocktime: 1519053456, Txid: "097ea09ba284f3f2a9e880e11f837edf7e5cea81c8da2238f5bc7c2c4c407943", LockTime: 0, + Version: 1, Vin: []bchain.Vin{ { ScriptSig: bchain.ScriptSig{ @@ -139,6 +140,7 @@ func init() { Blocktime: 1519050987, Txid: "b276545af246e3ed5a4e3e5b60d359942a1808579effc53ff4f343e4f6cfc5a0", LockTime: 0, + Version: 1, Vin: []bchain.Vin{ { ScriptSig: bchain.ScriptSig{ diff --git a/bchain/coins/litecoin/litecoinparser_test.go b/bchain/coins/litecoin/litecoinparser_test.go index a28a4a35..11c55f1e 100644 --- a/bchain/coins/litecoin/litecoinparser_test.go +++ b/bchain/coins/litecoin/litecoinparser_test.go @@ -144,6 +144,7 @@ func init() { Blocktime: 1519053456, Txid: "1c50c1770374d7de2f81a87463a5225bb620d25fd467536223a5b715a47c9e32", LockTime: 0, + Version: 2, Vin: []bchain.Vin{ { ScriptSig: bchain.ScriptSig{