From f3d727f16e6c2a119759ea4ea4ac8ecc9681b70d Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Tue, 31 Jul 2018 10:46:15 +0200 Subject: [PATCH] Changes from master --- bchain/coins/btc/bitcoinrpc.go | 1 + bchain/coins/eth/ethrpc.go | 7 ++++--- build/templates/blockbook/blockchaincfg.json | 1 + configs/coins/bgold.json | 2 +- configs/coins/bitcoin.json | 2 +- configs/coins/bitcoin_testnet.json | 2 +- configs/coins/litecoin.json | 2 +- 7 files changed, 10 insertions(+), 7 deletions(-) diff --git a/bchain/coins/btc/bitcoinrpc.go b/bchain/coins/btc/bitcoinrpc.go index 6b6142ed..e0176d16 100644 --- a/bchain/coins/btc/bitcoinrpc.go +++ b/bchain/coins/btc/bitcoinrpc.go @@ -37,6 +37,7 @@ type BitcoinRPC struct { type Configuration struct { CoinName string `json:"coin_name"` + CoinShortcut string `json:"coin_shortcut"` RPCURL string `json:"rpc_url"` RPCUser string `json:"rpc_user"` RPCPass string `json:"rpc_pass"` diff --git a/bchain/coins/eth/ethrpc.go b/bchain/coins/eth/ethrpc.go index d1fd5042..1285c354 100644 --- a/bchain/coins/eth/ethrpc.go +++ b/bchain/coins/eth/ethrpc.go @@ -30,9 +30,10 @@ const ( ) type Configuration struct { - CoinName string `json:"coin_name"` - RPCURL string `json:"rpc_url"` - RPCTimeout int `json:"rpc_timeout"` + CoinName string `json:"coin_name"` + CoinShortcut string `json:"coin_shortcut"` + RPCURL string `json:"rpc_url"` + RPCTimeout int `json:"rpc_timeout"` } // EthereumRPC is an interface to JSON-RPC eth service. diff --git a/build/templates/blockbook/blockchaincfg.json b/build/templates/blockbook/blockchaincfg.json index c24b3afc..f8acb70b 100644 --- a/build/templates/blockbook/blockchaincfg.json +++ b/build/templates/blockbook/blockchaincfg.json @@ -7,6 +7,7 @@ {{end}} "coin_name": "{{.Coin.Name}}", + "coin_shortcut": "{{.Coin.Shortcut}}", "rpc_url": "{{template "IPC.RPCURLTemplate" .}}", "rpc_user": "{{.IPC.RPCUser}}", "rpc_pass": "{{.IPC.RPCPass}}", diff --git a/configs/coins/bgold.json b/configs/coins/bgold.json index 5f7b245f..791deba1 100644 --- a/configs/coins/bgold.json +++ b/configs/coins/bgold.json @@ -239,7 +239,7 @@ "system_user": "blockbook-bgold", "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", - "explorer_url": "https://explorer.bitcoingold.org", + "explorer_url": "/explorer", "additional_params": "", "block_chain": { "parse": true, diff --git a/configs/coins/bitcoin.json b/configs/coins/bitcoin.json index 0fa0f907..f60bf39d 100644 --- a/configs/coins/bitcoin.json +++ b/configs/coins/bitcoin.json @@ -47,7 +47,7 @@ "system_user": "blockbook-bitcoin", "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", - "explorer_url": "https://btc-explorer.trezor.io", + "explorer_url": "/explorer", "additional_params": "", "block_chain": { "parse": true, diff --git a/configs/coins/bitcoin_testnet.json b/configs/coins/bitcoin_testnet.json index d949cf5f..760163be 100644 --- a/configs/coins/bitcoin_testnet.json +++ b/configs/coins/bitcoin_testnet.json @@ -47,7 +47,7 @@ "system_user": "blockbook-bitcoin", "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", - "explorer_url": "https://btc-testnet-explorer.trezor.io", + "explorer_url": "/explorer", "additional_params": "", "block_chain": { "parse": true, diff --git a/configs/coins/litecoin.json b/configs/coins/litecoin.json index 9279940f..67cbbb48 100644 --- a/configs/coins/litecoin.json +++ b/configs/coins/litecoin.json @@ -47,7 +47,7 @@ "system_user": "blockbook-litecoin", "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", - "explorer_url": "https://ltc-explorer.trezor.io", + "explorer_url": "/explorer", "additional_params": "", "block_chain": { "parse": true,