diff --git a/bchain/coins/bch/bcashparser_test.go b/bchain/coins/bch/bcashparser_test.go new file mode 100644 index 00000000..0bad2eb8 --- /dev/null +++ b/bchain/coins/bch/bcashparser_test.go @@ -0,0 +1,250 @@ +package bch + +import ( + "blockbook/bchain" + "blockbook/bchain/coins/btc" + "bytes" + "encoding/hex" + "reflect" + "testing" +) + +func TestBcashAddressEncodeAddress(t *testing.T) { + addr := bcashAddress{"13zMwGC5bxRn9ckJ1mgxf7UR8qbbNe2iji", GetChainParams("main")} + got1, err := addr.EncodeAddress(bchain.DefaultAddress) + if err != nil { + t.Errorf("EncodeAddress() error = %v", err) + return + } + if got1 != "13zMwGC5bxRn9ckJ1mgxf7UR8qbbNe2iji" { + t.Errorf("EncodeAddress() got1 = %v, want %v", got1, "13zMwGC5bxRn9ckJ1mgxf7UR8qbbNe2iji") + } + got2, err := addr.EncodeAddress(bchain.BCashAddress) + if err != nil { + t.Errorf("EncodeAddress() error = %v", err) + return + } + if got2 != "bitcoincash:qqsvjuqqwgyzvz7zz9xcvxent0ul2xjs6y4d9qvsrf" { + t.Errorf("EncodeAddress() got2 = %v, want %v", got2, "bitcoincash:qqsvjuqqwgyzvz7zz9xcvxent0ul2xjs6y4d9qvsrf") + } +} + +func TestBcashAddressAreEqual(t *testing.T) { + addr := bcashAddress{"13zMwGC5bxRn9ckJ1mgxf7UR8qbbNe2iji", GetChainParams("main")} + got1, err := addr.AreEqual("13zMwGC5bxRn9ckJ1mgxf7UR8qbbNe2iji") + if err != nil { + t.Errorf("AreEqual() error = %v", err) + return + } + if got1 != true { + t.Errorf("AreEqual() got1 = %v, want %v", got1, true) + } + got2, err := addr.AreEqual("bitcoincash:qqsvjuqqwgyzvz7zz9xcvxent0ul2xjs6y4d9qvsrf") + if err != nil { + t.Errorf("AreEqual() error = %v", err) + return + } + if got2 != true { + t.Errorf("AreEqual() got2 = %v, want %v", got2, true) + } + got3, err := addr.AreEqual("1HoKgKQh7ZNomWURmS9Tk3z8JM2MWm7S1w") + if err != nil { + t.Errorf("AreEqual() error = %v", err) + return + } + if got3 != false { + t.Errorf("AreEqual() got3 = %v, want %v", got3, false) + } + got4, err := addr.AreEqual("bitcoincash:qzuyf0gpqj7q5wfck3nyghhklju7r0k3ksmq6d0vch") + if err != nil { + t.Errorf("AreEqual() error = %v", err) + return + } + if got4 != false { + t.Errorf("AreEqual() got4 = %v, want %v", got4, false) + } +} + +func TestBcashAddressInSlice(t *testing.T) { + addr := bcashAddress{"13zMwGC5bxRn9ckJ1mgxf7UR8qbbNe2iji", GetChainParams("main")} + got1, err := addr.InSlice([]string{"13zMwGC5bxRn9ckJ1mgxf7UR8qbbNe2iji", "bitcoincash:qzuyf0gpqj7q5wfck3nyghhklju7r0k3ksmq6d0vch"}) + if err != nil { + t.Errorf("InSlice() error = %v", err) + return + } + if got1 != true { + t.Errorf("InSlice() got1 = %v, want %v", got1, true) + } + got2, err := addr.InSlice([]string{"1HoKgKQh7ZNomWURmS9Tk3z8JM2MWm7S1w", "bitcoincash:qqsvjuqqwgyzvz7zz9xcvxent0ul2xjs6y4d9qvsrf"}) + if err != nil { + t.Errorf("InSlice() error = %v", err) + return + } + if got2 != true { + t.Errorf("InSlice() got2 = %v, want %v", got2, true) + } + got3, err := addr.InSlice([]string{"1HoKgKQh7ZNomWURmS9Tk3z8JM2MWm7S1w", "1E6Np6dUPYpBSdLMLuwBF8sRQ3cngdaRRY"}) + if err != nil { + t.Errorf("InSlice() error = %v", err) + return + } + if got3 != false { + t.Errorf("InSlice() got3 = %v, want %v", got3, false) + } + got4, err := addr.InSlice([]string{"bitcoincash:qzuyf0gpqj7q5wfck3nyghhklju7r0k3ksmq6d0vch", "bitcoincash:qz8emmpenqgeg7et8xsz8prvhy6cqcalyyjcamt7e9"}) + if err != nil { + t.Errorf("InSlice() error = %v", err) + return + } + if got4 != false { + t.Errorf("InSlice() got4 = %v, want %v", got4, false) + } +} + +func TestAddressToOutputScript(t *testing.T) { + parser := BCashParser{&btc.BitcoinParser{Params: GetChainParams("test")}} + want, err := hex.DecodeString("76a9144fa927fd3bcf57d4e3c582c3d2eb2bd3df8df47c88ac") + if err != nil { + panic(err) + } + got1, err := parser.AddressToOutputScript("mnnAKPTSrWjgoi3uEYaQkHA1QEC5btFeBr") + if err != nil { + t.Errorf("AddressToOutputScript() error = %v", err) + return + } + if !bytes.Equal(got1, want) { + t.Errorf("AddressToOutputScript() got1 = %v, want %v", got1, want) + } + got2, err := parser.AddressToOutputScript("bchtest:qp86jfla8084048rckpv85ht90falr050s03ejaesm") + if err != nil { + t.Errorf("AddressToOutputScript() error = %v", err) + return + } + if !bytes.Equal(got2, want) { + t.Errorf("AddressToOutputScript() got2 = %v, want %v", got2, want) + } +} + +var testTx1 = bchain.Tx{ + Hex: "01000000017f9a22c9cbf54bd902400df746f138f37bcf5b4d93eb755820e974ba43ed5f42040000006a4730440220037f4ed5427cde81d55b9b6a2fd08c8a25090c2c2fff3a75c1a57625ca8a7118022076c702fe55969fa08137f71afd4851c48e31082dd3c40c919c92cdbc826758d30121029f6da5623c9f9b68a9baf9c1bc7511df88fa34c6c2f71f7c62f2f03ff48dca80feffffff019c9700000000000017a9146144d57c8aff48492c9dfb914e120b20bad72d6f8773d00700", + Blocktime: 1519053802, + Txid: "056e3d82e5ffd0e915fb9b62797d76263508c34fe3e5dbed30dd3e943930f204", + LockTime: 512115, + Vin: []bchain.Vin{ + { + ScriptSig: bchain.ScriptSig{ + Hex: "4730440220037f4ed5427cde81d55b9b6a2fd08c8a25090c2c2fff3a75c1a57625ca8a7118022076c702fe55969fa08137f71afd4851c48e31082dd3c40c919c92cdbc826758d30121029f6da5623c9f9b68a9baf9c1bc7511df88fa34c6c2f71f7c62f2f03ff48dca80", + }, + Txid: "425fed43ba74e9205875eb934d5bcf7bf338f146f70d4002d94bf5cbc9229a7f", + Vout: 4, + Sequence: 4294967294, + }, + }, + Vout: []bchain.Vout{ + { + Value: 0.00038812, + N: 0, + ScriptPubKey: bchain.ScriptPubKey{ + Hex: "a9146144d57c8aff48492c9dfb914e120b20bad72d6f87", + Addresses: []string{ + "3AZKvpKhSh1o8t1QrX3UeXG9d2BhCRnbcK", + }, + }, + Address: &bcashAddress{"3AZKvpKhSh1o8t1QrX3UeXG9d2BhCRnbcK", GetChainParams("main")}, + }, + }, +} +var testTxPacked1 = "0001e2408ba8d7af5401000000017f9a22c9cbf54bd902400df746f138f37bcf5b4d93eb755820e974ba43ed5f42040000006a4730440220037f4ed5427cde81d55b9b6a2fd08c8a25090c2c2fff3a75c1a57625ca8a7118022076c702fe55969fa08137f71afd4851c48e31082dd3c40c919c92cdbc826758d30121029f6da5623c9f9b68a9baf9c1bc7511df88fa34c6c2f71f7c62f2f03ff48dca80feffffff019c9700000000000017a9146144d57c8aff48492c9dfb914e120b20bad72d6f8773d00700" + +var testTx2 = bchain.Tx{ + Hex: "010000000001019d64f0c72a0d206001decbffaa722eb1044534c74eee7a5df8318e42a4323ec10000000017160014550da1f5d25a9dae2eafd6902b4194c4c6500af6ffffffff02809698000000000017a914cd668d781ece600efa4b2404dc91fd26b8b8aed8870553d7360000000017a914246655bdbd54c7e477d0ea2375e86e0db2b8f80a8702473044022076aba4ad559616905fa51d4ddd357fc1fdb428d40cb388e042cdd1da4a1b7357022011916f90c712ead9a66d5f058252efd280439ad8956a967e95d437d246710bc9012102a80a5964c5612bb769ef73147b2cf3c149bc0fd4ecb02f8097629c94ab013ffd00000000", + Blocktime: 1235678901, + Txid: "474e6795760ebe81cb4023dc227e5a0efe340e1771c89a0035276361ed733de7", + LockTime: 0, + Vin: []bchain.Vin{ + { + ScriptSig: bchain.ScriptSig{ + Hex: "160014550da1f5d25a9dae2eafd6902b4194c4c6500af6", + }, + Txid: "c13e32a4428e31f85d7aee4ec7344504b12e72aaffcbde0160200d2ac7f0649d", + Vout: 0, + Sequence: 4294967295, + }, + }, + Vout: []bchain.Vout{ + { + Value: .1, + N: 0, + ScriptPubKey: bchain.ScriptPubKey{ + Hex: "a914cd668d781ece600efa4b2404dc91fd26b8b8aed887", + Addresses: []string{ + "2NByHN6A8QYkBATzxf4pRGbCSHD5CEN2TRu", + }, + }, + Address: &bcashAddress{"2NByHN6A8QYkBATzxf4pRGbCSHD5CEN2TRu", GetChainParams("test")}, + }, + { + Value: 9.20081157, + N: 1, + ScriptPubKey: bchain.ScriptPubKey{ + Hex: "a914246655bdbd54c7e477d0ea2375e86e0db2b8f80a87", + Addresses: []string{ + "2MvZguYaGjM7JihBgNqgLF2Ca2Enb76Hj9D", + }, + }, + Address: &bcashAddress{"2MvZguYaGjM7JihBgNqgLF2Ca2Enb76Hj9D", GetChainParams("test")}, + }, + }, +} +var testTxPacked2 = "0007c91a899ab7da6a010000000001019d64f0c72a0d206001decbffaa722eb1044534c74eee7a5df8318e42a4323ec10000000017160014550da1f5d25a9dae2eafd6902b4194c4c6500af6ffffffff02809698000000000017a914cd668d781ece600efa4b2404dc91fd26b8b8aed8870553d7360000000017a914246655bdbd54c7e477d0ea2375e86e0db2b8f80a8702473044022076aba4ad559616905fa51d4ddd357fc1fdb428d40cb388e042cdd1da4a1b7357022011916f90c712ead9a66d5f058252efd280439ad8956a967e95d437d246710bc9012102a80a5964c5612bb769ef73147b2cf3c149bc0fd4ecb02f8097629c94ab013ffd00000000" + +func Test_UnpackTx(t *testing.T) { + type args struct { + packedTx string + parser *BCashParser + } + tests := []struct { + name string + args args + want *bchain.Tx + want1 uint32 + wantErr bool + }{ + { + name: "btc-1", + args: args{ + packedTx: testTxPacked1, + parser: &BCashParser{&btc.BitcoinParser{Params: GetChainParams("main")}}, + }, + want: &testTx1, + want1: 123456, + wantErr: false, + }, + { + name: "testnet-1", + args: args{ + packedTx: testTxPacked2, + parser: &BCashParser{&btc.BitcoinParser{Params: GetChainParams("test")}}, + }, + want: &testTx2, + want1: 510234, + wantErr: false, + }, + } + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + b, _ := hex.DecodeString(tt.args.packedTx) + got, got1, err := tt.args.parser.UnpackTx(b) + if (err != nil) != tt.wantErr { + t.Errorf("unpackTx() error = %v, wantErr %v", err, tt.wantErr) + return + } + if !reflect.DeepEqual(got, tt.want) { + t.Errorf("unpackTx() got = %v, want %v", got, tt.want) + } + if got1 != tt.want1 { + t.Errorf("unpackTx() got1 = %v, want %v", got1, tt.want1) + } + }) + } +} diff --git a/bchain/coins/blockchain.go b/bchain/coins/blockchain.go index 39f01e6e..c90332ae 100644 --- a/bchain/coins/blockchain.go +++ b/bchain/coins/blockchain.go @@ -85,6 +85,10 @@ func (c *blockChainWithMetrics) GetNetworkName() string { return c.b.GetNetworkName() } +func (c *blockChainWithMetrics) GetSubversion() string { + return c.b.GetSubversion() +} + func (c *blockChainWithMetrics) GetBestBlockHash() (v string, err error) { defer func(s time.Time) { c.observeRPCLatency("GetBestBlockHash", s, err) }(time.Now()) return c.b.GetBestBlockHash() diff --git a/bchain/coins/btc/bitcoinparser_test.go b/bchain/coins/btc/bitcoinparser_test.go index 35adacea..6982128f 100644 --- a/bchain/coins/btc/bitcoinparser_test.go +++ b/bchain/coins/btc/bitcoinparser_test.go @@ -135,6 +135,7 @@ var testTx1 = bchain.Tx{ "3AZKvpKhSh1o8t1QrX3UeXG9d2BhCRnbcK", }, }, + Address: bchain.NewBaseAddress("3AZKvpKhSh1o8t1QrX3UeXG9d2BhCRnbcK"), }, }, } @@ -165,6 +166,7 @@ var testTx2 = bchain.Tx{ "2NByHN6A8QYkBATzxf4pRGbCSHD5CEN2TRu", }, }, + Address: bchain.NewBaseAddress("2NByHN6A8QYkBATzxf4pRGbCSHD5CEN2TRu"), }, { Value: 9.20081157, @@ -175,6 +177,7 @@ var testTx2 = bchain.Tx{ "2MvZguYaGjM7JihBgNqgLF2Ca2Enb76Hj9D", }, }, + Address: bchain.NewBaseAddress("2MvZguYaGjM7JihBgNqgLF2Ca2Enb76Hj9D"), }, }, } diff --git a/bchain/coins/btc/bitcoinrpc.go b/bchain/coins/btc/bitcoinrpc.go index af6a3617..cb894517 100644 --- a/bchain/coins/btc/bitcoinrpc.go +++ b/bchain/coins/btc/bitcoinrpc.go @@ -29,6 +29,7 @@ type BitcoinRPC struct { Mempool *bchain.UTXOMempool ParseBlocks bool mq *bchain.MQ + Subversion string } type configuration struct { @@ -38,6 +39,7 @@ type configuration struct { RPCTimeout int `json:"rpcTimeout"` Parse bool `json:"parse"` ZeroMQBinding string `json:"zeroMQBinding"` + Subversion string `json:"subversion"` } // NewBitcoinRPC returns new BitcoinRPC instance. @@ -60,6 +62,7 @@ func NewBitcoinRPC(config json.RawMessage, pushHandler func(bchain.NotificationT user: c.RPCUser, password: c.RPCPass, ParseBlocks: c.Parse, + Subversion: c.Subversion, } mq, err := bchain.NewMQ(c.ZeroMQBinding, pushHandler) @@ -119,6 +122,10 @@ func (b *BitcoinRPC) GetNetworkName() string { return b.Network } +func (b *BitcoinRPC) GetSubversion() string { + return b.Subversion +} + // getblockhash type cmdGetBlockHash struct { diff --git a/bchain/coins/eth/ethrpc.go b/bchain/coins/eth/ethrpc.go index 01137fb9..26c844bc 100644 --- a/bchain/coins/eth/ethrpc.go +++ b/bchain/coins/eth/ethrpc.go @@ -240,6 +240,10 @@ func (b *EthereumRPC) GetNetworkName() string { return b.Network } +func (b *EthereumRPC) GetSubversion() string { + return "" +} + func (b *EthereumRPC) getBestHeader() (*ethtypes.Header, error) { b.bestHeaderMu.Lock() defer b.bestHeaderMu.Unlock() diff --git a/bchain/coins/zec/zcashparser_test.go b/bchain/coins/zec/zcashparser_test.go index c7af46c3..2fdf9ed4 100644 --- a/bchain/coins/zec/zcashparser_test.go +++ b/bchain/coins/zec/zcashparser_test.go @@ -33,6 +33,7 @@ var testTx1 = bchain.Tx{ "t1Y4yL14ACHaAbjemkdpW7nYNHWnv1yQbDA", }, }, + Address: bchain.NewBaseAddress("t1Y4yL14ACHaAbjemkdpW7nYNHWnv1yQbDA"), }, }, } @@ -65,6 +66,7 @@ var testTx2 = bchain.Tx{ "t1VmHTTwpEtwvojxodN2CSQqLYi1hzY3cAq", }, }, + Address: bchain.NewBaseAddress("t1VmHTTwpEtwvojxodN2CSQqLYi1hzY3cAq"), }, { Value: .1, @@ -75,6 +77,7 @@ var testTx2 = bchain.Tx{ "t1ecxMXpphUTRQXGLXnVhJ6ucqD3DZipddg", }, }, + Address: bchain.NewBaseAddress("t1ecxMXpphUTRQXGLXnVhJ6ucqD3DZipddg"), }, }, } diff --git a/bchain/types.go b/bchain/types.go index 10ac998e..73b2b56b 100644 --- a/bchain/types.go +++ b/bchain/types.go @@ -126,6 +126,7 @@ type BlockChain interface { // chain info IsTestnet() bool GetNetworkName() string + GetSubversion() string // requests GetBestBlockHash() (string, error) GetBestBlockHeight() (uint32, error) diff --git a/configs/bch-testnet.json b/configs/bch-testnet.json index 606eb66a..d95bc22d 100644 --- a/configs/bch-testnet.json +++ b/configs/bch-testnet.json @@ -4,5 +4,6 @@ "rpcPass": "rpc", "rpcTimeout": 25, "parse": true, - "zeroMQBinding": "tcp://127.0.0.1:18434" + "zeroMQBinding": "tcp://127.0.0.1:18434", + "subversion": "/Bitcoin ABC:0.17.0(EB8.0; bitcore-sl)/" } diff --git a/configs/bch.json b/configs/bch.json index e124c7af..4a4a60db 100644 --- a/configs/bch.json +++ b/configs/bch.json @@ -4,5 +4,6 @@ "rpcPass": "rpc", "rpcTimeout": 25, "parse": true, - "zeroMQBinding": "tcp://127.0.0.1:8434" + "zeroMQBinding": "tcp://127.0.0.1:8434", + "subversion": "/Bitcoin ABC:0.17.0(EB8.0; bitcore-sl)/" } diff --git a/server/socketio.go b/server/socketio.go index 08c9535b..98465a2f 100644 --- a/server/socketio.go +++ b/server/socketio.go @@ -602,6 +602,7 @@ func (s *SocketIoServer) getInfo() (res resultGetInfo, err error) { res.Result.Blocks = int(height) res.Result.Testnet = s.chain.IsTestnet() res.Result.Network = s.chain.GetNetworkName() + res.Result.Subversion = s.chain.GetSubversion() return }