From f9b21b419270bd8b4edf99a8186ed1da6e7abd90 Mon Sep 17 00:00:00 2001 From: Jakub Matys Date: Fri, 27 Jul 2018 10:46:53 +0200 Subject: [PATCH] Changed structure of config files --- build/docker/deb/build-deb.sh | 2 +- build/templates/backend/config/bitcoin.conf | 8 ++-- build/templates/blockbook/blockchaincfg.json | 28 ++++++------- build/templates/generate.go | 44 ++++++++++---------- configs/coins/bcash.json | 30 ++++++------- configs/coins/bcash_testnet.json | 30 ++++++------- configs/coins/bgold.json | 28 +++++++------ configs/coins/bitcoin.json | 26 ++++++------ configs/coins/bitcoin_testnet.json | 26 ++++++------ configs/coins/dash.json | 28 +++++++------ configs/coins/dash_testnet.json | 28 +++++++------ configs/coins/dogecoin.json | 26 ++++++------ configs/coins/ethereum.json | 18 ++++---- configs/coins/ethereum_testnet_ropsten.json | 18 ++++---- configs/coins/litecoin.json | 26 ++++++------ configs/coins/litecoin_testnet.json | 26 ++++++------ configs/coins/namecoin.json | 26 ++++++------ configs/coins/vertcoin.json | 26 ++++++------ configs/coins/vertcoin_testnet.json | 26 ++++++------ configs/coins/zcash.json | 26 ++++++------ configs/coins/zcash_testnet.json | 26 ++++++------ 21 files changed, 279 insertions(+), 243 deletions(-) diff --git a/build/docker/deb/build-deb.sh b/build/docker/deb/build-deb.sh index 7686d348..6dad89cb 100755 --- a/build/docker/deb/build-deb.sh +++ b/build/docker/deb/build-deb.sh @@ -8,7 +8,7 @@ if [ $# -lt 2 ]; then fi package=$1 -coin=$(echo "$2" | tr '-' '_') +coin=$2 shift 2 cp -r /src/build/templates . diff --git a/build/templates/backend/config/bitcoin.conf b/build/templates/backend/config/bitcoin.conf index dbf27d1b..640aec2f 100644 --- a/build/templates/backend/config/bitcoin.conf +++ b/build/templates/backend/config/bitcoin.conf @@ -3,13 +3,13 @@ daemon=1 server=1 {{if .Backend.Mainnet}}mainnet=1{{else}}testnet=1{{end}} nolisten=1 -rpcuser={{.BlockChain.RPCUser}} -rpcpassword={{.BlockChain.RPCPass}} +rpcuser={{.IPC.RPCUser}} +rpcpassword={{.IPC.RPCPass}} rpcport={{.Ports.BackendRPC}} txindex=1 -zmqpubhashtx={{template "BlockChain.MessageQueueBindingTemplate" .}} -zmqpubhashblock={{template "BlockChain.MessageQueueBindingTemplate" .}} +zmqpubhashtx={{template "IPC.MessageQueueBindingTemplate" .}} +zmqpubhashblock={{template "IPC.MessageQueueBindingTemplate" .}} rpcworkqueue=1100 maxmempool=2000 diff --git a/build/templates/blockbook/blockchaincfg.json b/build/templates/blockbook/blockchaincfg.json index a563f90b..c24b3afc 100644 --- a/build/templates/blockbook/blockchaincfg.json +++ b/build/templates/blockbook/blockchaincfg.json @@ -1,22 +1,22 @@ {{define "main" -}} { -{{- if .BlockChain.AdditionalParams}} -{{- range $name, $value := .BlockChain.AdditionalParams}} +{{- if .Blockbook.BlockChain.AdditionalParams}} +{{- range $name, $value := .Blockbook.BlockChain.AdditionalParams}} "{{$name}}": {{jsonToString $value}}, {{- end}} {{end}} - "coin_name": {{.Coin.Name}}, - "rpc_url": "{{template "BlockChain.RPCURLTemplate" .}}", - "rpc_user": "{{.BlockChain.RPCUser}}", - "rpc_pass": "{{.BlockChain.RPCPass}}", - "rpc_timeout": {{.BlockChain.RPCTimeout}}, - "parse": {{.BlockChain.Parse}}, - "message_queue_binding": "{{template "BlockChain.MessageQueueBindingTemplate" .}}", - "subversion": "{{.BlockChain.Subversion}}", - "address_format": "{{.BlockChain.AddressFormat}}", - "mempool_workers": {{.BlockChain.MempoolWorkers}}, - "mempool_sub_workers": {{.BlockChain.MempoolSubWorkers}}, - "block_addresses_to_keep": {{.BlockChain.BlockAddressesToKeep}} + "coin_name": "{{.Coin.Name}}", + "rpc_url": "{{template "IPC.RPCURLTemplate" .}}", + "rpc_user": "{{.IPC.RPCUser}}", + "rpc_pass": "{{.IPC.RPCPass}}", + "rpc_timeout": {{.IPC.RPCTimeout}}, + "parse": {{.Blockbook.BlockChain.Parse}}, + "message_queue_binding": "{{template "IPC.MessageQueueBindingTemplate" .}}", + "subversion": "{{.Blockbook.BlockChain.Subversion}}", + "address_format": "{{.Blockbook.BlockChain.AddressFormat}}", + "mempool_workers": {{.Blockbook.BlockChain.MempoolWorkers}}, + "mempool_sub_workers": {{.Blockbook.BlockChain.MempoolSubWorkers}}, + "block_addresses_to_keep": {{.Blockbook.BlockChain.BlockAddressesToKeep}} } {{end}} diff --git a/build/templates/generate.go b/build/templates/generate.go index fce19c00..949577db 100644 --- a/build/templates/generate.go +++ b/build/templates/generate.go @@ -40,20 +40,13 @@ type Config struct { BlockbookInternal int `json:"blockbook_internal"` BlockbookPublic int `json:"blockbook_public"` } `json:"ports"` - BlockChain struct { - RPCURLTemplate string `json:"rpc_url_template"` - RPCUser string `json:"rpc_user"` - RPCPass string `json:"rpc_pass"` - RPCTimeout int `json:"rpc_timeout"` - Parse bool `json:"parse"` - MessageQueueBindingTemplate string `json:"message_queue_binding_template"` - Subversion string `json:"subversion"` - AddressFormat string `json:"address_format"` - MempoolWorkers int `json:"mempool_workers"` - MempoolSubWorkers int `json:"mempool_sub_workers"` - BlockAddressesToKeep int `json:"block_addresses_to_keep"` - AdditionalParams map[string]json.RawMessage `json:"additional_params"` - } `json:"block_chain"` + IPC struct { + RPCURLTemplate string `json:"rpc_url_template"` + RPCUser string `json:"rpc_user"` + RPCPass string `json:"rpc_pass"` + RPCTimeout int `json:"rpc_timeout"` + MessageQueueBindingTemplate string `json:"message_queue_binding_template"` + } `json:"ipc"` Backend struct { PackageName string `json:"package_name"` PackageRevision string `json:"package_revision"` @@ -80,6 +73,15 @@ type Config struct { PublicBindingTemplate string `json:"public_binding_template"` ExplorerURL string `json:"explorer_url"` AdditionalParams string `json:"additional_params"` + BlockChain struct { + Parse bool `json:"parse"` + Subversion string `json:"subversion"` + AddressFormat string `json:"address_format"` + MempoolWorkers int `json:"mempool_workers"` + MempoolSubWorkers int `json:"mempool_sub_workers"` + BlockAddressesToKeep int `json:"block_addresses_to_keep"` + AdditionalParams map[string]json.RawMessage `json:"additional_params"` + } `json:"block_chain"` } `json:"blockbook"` } @@ -93,13 +95,13 @@ func jsonToString(msg json.RawMessage) (string, error) { func (c *Config) ParseTemplate() *template.Template { templates := map[string]string{ - "BlockChain.RPCURLTemplate": c.BlockChain.RPCURLTemplate, - "BlockChain.MessageQueueBindingTemplate": c.BlockChain.MessageQueueBindingTemplate, - "Backend.ExecCommandTemplate": c.Backend.ExecCommandTemplate, - "Backend.LogrotateFilesTemplate": c.Backend.LogrotateFilesTemplate, - "Backend.PostinstScriptTemplate": c.Backend.PostinstScriptTemplate, - "Blockbook.InternalBindingTemplate": c.Blockbook.InternalBindingTemplate, - "Blockbook.PublicBindingTemplate": c.Blockbook.PublicBindingTemplate, + "IPC.RPCURLTemplate": c.IPC.RPCURLTemplate, + "IPC.MessageQueueBindingTemplate": c.IPC.MessageQueueBindingTemplate, + "Backend.ExecCommandTemplate": c.Backend.ExecCommandTemplate, + "Backend.LogrotateFilesTemplate": c.Backend.LogrotateFilesTemplate, + "Backend.PostinstScriptTemplate": c.Backend.PostinstScriptTemplate, + "Blockbook.InternalBindingTemplate": c.Blockbook.InternalBindingTemplate, + "Blockbook.PublicBindingTemplate": c.Blockbook.PublicBindingTemplate, } funcMap := template.FuncMap{ diff --git a/configs/coins/bcash.json b/configs/coins/bcash.json index 645ee31c..e275f53e 100644 --- a/configs/coins/bcash.json +++ b/configs/coins/bcash.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Bcash", "shortcut": "BCH", @@ -15,19 +11,12 @@ "blockbook_internal": 9031, "blockbook_public": 9131 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "subversion": "/Bitcoin ABC:0.17.1/", - "address_format": "legacy", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-bcash", @@ -55,6 +44,19 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://bitcoincash.blockexplorer.com", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "subversion": "/Bitcoin ABC:0.17.1/", + "address_format": "legacy", + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/bcash_testnet.json b/configs/coins/bcash_testnet.json index 2e91d41c..6d50a14b 100644 --- a/configs/coins/bcash_testnet.json +++ b/configs/coins/bcash_testnet.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Bcash Testnet", "shortcut": "TBCH", @@ -15,19 +11,12 @@ "blockbook_internal": 19031, "blockbook_public": 19131 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "subversion": "/Bitcoin ABC:0.17.1/", - "address_format": "legacy", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-bcash-testnet", @@ -55,6 +44,19 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://bitcoincash.blockexplorer.com", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "subversion": "/Bitcoin ABC:0.17.1/", + "address_format": "legacy", + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/bgold.json b/configs/coins/bgold.json index 2ecbef3f..943a83aa 100644 --- a/configs/coins/bgold.json +++ b/configs/coins/bgold.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Bgold", "shortcut": "BTG", @@ -15,18 +11,12 @@ "blockbook_internal": 9035, "blockbook_public": 9135 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "subversion": "/Bitcoin Gold:0.15.1/", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-bgold", @@ -249,6 +239,18 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://explorer.bitcoingold.org", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "subversion": "/Bitcoin Gold:0.15.1/", + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/bitcoin.json b/configs/coins/bitcoin.json index bcd8c654..8450e756 100644 --- a/configs/coins/bitcoin.json +++ b/configs/coins/bitcoin.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Bitcoin", "shortcut": "BTC", @@ -15,17 +11,12 @@ "blockbook_internal": 9030, "blockbook_public": 9130 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-bitcoin", @@ -56,6 +47,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://btc-explorer.trezor.io", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/bitcoin_testnet.json b/configs/coins/bitcoin_testnet.json index 79be56e0..9cba51ff 100644 --- a/configs/coins/bitcoin_testnet.json +++ b/configs/coins/bitcoin_testnet.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Testnet", "shortcut": "TEST", @@ -15,17 +11,12 @@ "blockbook_internal": 19030, "blockbook_public": 19130 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-bitcoin-testnet", @@ -56,6 +47,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://btc-testnet-explorer.trezor.io", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/dash.json b/configs/coins/dash.json index b7fd681f..b3f71c65 100644 --- a/configs/coins/dash.json +++ b/configs/coins/dash.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Dash", "shortcut": "DASH", @@ -15,18 +11,12 @@ "blockbook_internal": 9033, "blockbook_public": 9133 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "subversion": "/Dash Core:0.12.3.2/", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-dash", @@ -57,6 +47,18 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://dash-explorer.trezor.io", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "subversion": "/Dash Core:0.12.3.2/", + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/dash_testnet.json b/configs/coins/dash_testnet.json index 7c3233cb..ea8c8ac0 100644 --- a/configs/coins/dash_testnet.json +++ b/configs/coins/dash_testnet.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Dash Testnet", "shortcut": "tDASH", @@ -15,18 +11,12 @@ "blockbook_internal": 19033, "blockbook_public": 19133 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "subversion": "/Dash Core:0.12.3.2/", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-dash-testnet", @@ -57,6 +47,18 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://dash-explorer.trezor.io", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "subversion": "/Dash Core:0.12.3.2/", + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/dogecoin.json b/configs/coins/dogecoin.json index de3a42e9..cd996d46 100644 --- a/configs/coins/dogecoin.json +++ b/configs/coins/dogecoin.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Dogecoin", "shortcut": "DOGE", @@ -15,17 +11,12 @@ "blockbook_internal": 9038, "blockbook_public": 9138 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-dogecoin", @@ -57,6 +48,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://dogechain.info/", - "additional_params": "-resyncindexperiod=30011 -resyncmempoolperiod=2011" + "additional_params": "-resyncindexperiod=30011 -resyncmempoolperiod=2011", + "block_chain": { + "parse": true, + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/ethereum.json b/configs/coins/ethereum.json index 13a389a5..299de8c1 100644 --- a/configs/coins/ethereum.json +++ b/configs/coins/ethereum.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Ethereum", "shortcut": "ETH", @@ -15,10 +11,9 @@ "blockbook_internal": 9036, "blockbook_public": 9136 }, - "block_chain": { + "ipc": { "rpc_url_template": "ws://localhost:{{.Ports.BackendRPC}}", - "rpc_timeout": 25, - "additional_params": {} + "rpc_timeout": 25 }, "backend": { "package_name": "backend-ethereum", @@ -44,6 +39,13 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://etherscan.io/", - "additional_params": "" + "additional_params": "", + "block_chain": { + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/ethereum_testnet_ropsten.json b/configs/coins/ethereum_testnet_ropsten.json index 154c2dc8..8a22736f 100644 --- a/configs/coins/ethereum_testnet_ropsten.json +++ b/configs/coins/ethereum_testnet_ropsten.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Ethereum Testnet Ropsten", "shortcut": "tETH", @@ -15,10 +11,9 @@ "blockbook_internal": 19036, "blockbook_public": 19136 }, - "block_chain": { + "ipc": { "rpc_url_template": "ws://localhost:{{.Ports.BackendRPC}}", - "rpc_timeout": 25, - "additional_params": {} + "rpc_timeout": 25 }, "backend": { "package_name": "backend-ethereum-testnet-ropsten", @@ -44,6 +39,13 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://ropsten.etherscan.io/", - "additional_params": "" + "additional_params": "", + "block_chain": { + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/litecoin.json b/configs/coins/litecoin.json index 2a28ff36..36d5e719 100644 --- a/configs/coins/litecoin.json +++ b/configs/coins/litecoin.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Litecoin", "shortcut": "LTC", @@ -15,17 +11,12 @@ "blockbook_internal": 9034, "blockbook_public": 9134 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-litecoin", @@ -56,6 +47,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://ltc-explorer.trezor.io", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/litecoin_testnet.json b/configs/coins/litecoin_testnet.json index 5cfe242f..a7e900b4 100644 --- a/configs/coins/litecoin_testnet.json +++ b/configs/coins/litecoin_testnet.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Litecoin Testnet", "shortcut": "TLTC", @@ -15,17 +11,12 @@ "blockbook_internal": 19034, "blockbook_public": 19134 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-litecoin-testnet", @@ -56,6 +47,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://ltc-explorer.trezor.io", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/namecoin.json b/configs/coins/namecoin.json index fe2a2a01..8253bf27 100644 --- a/configs/coins/namecoin.json +++ b/configs/coins/namecoin.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Namecoin", "shortcut": "NMC", @@ -15,17 +11,12 @@ "blockbook_internal": 9039, "blockbook_public": 9139 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-namecoin", @@ -63,6 +54,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://namecha.in/", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/vertcoin.json b/configs/coins/vertcoin.json index 85b92e80..47de2d37 100644 --- a/configs/coins/vertcoin.json +++ b/configs/coins/vertcoin.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Vertcoin", "shortcut": "VTC", @@ -15,17 +11,12 @@ "blockbook_internal": 9040, "blockbook_public": 9140 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-vertcoin", @@ -54,6 +45,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://insight.vertcoin.org", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/vertcoin_testnet.json b/configs/coins/vertcoin_testnet.json index e661f7c6..e6d00a50 100644 --- a/configs/coins/vertcoin_testnet.json +++ b/configs/coins/vertcoin_testnet.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Vertcoin Testnet", "shortcut": "TVTC", @@ -15,17 +11,12 @@ "blockbook_internal": 19040, "blockbook_public": 19140 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 8, - "mempool_sub_workers": 2, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-vertcoin-testnet", @@ -54,6 +45,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://insight.vertcoin.org/", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 8, + "mempool_sub_workers": 2, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/zcash.json b/configs/coins/zcash.json index 166b5843..0e3b2e82 100644 --- a/configs/coins/zcash.json +++ b/configs/coins/zcash.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Zcash", "shortcut": "ZEC", @@ -15,17 +11,12 @@ "blockbook_internal": 9032, "blockbook_public": 9132 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 4, - "mempool_sub_workers": 8, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-zcash", @@ -56,6 +47,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://zcash.blockexplorer.com/", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 4, + "mempool_sub_workers": 8, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } } diff --git a/configs/coins/zcash_testnet.json b/configs/coins/zcash_testnet.json index d33ad7f4..7ad21820 100644 --- a/configs/coins/zcash_testnet.json +++ b/configs/coins/zcash_testnet.json @@ -1,8 +1,4 @@ { - "meta": { - "package_maintainer": "Jakub Matys", - "package_maintainer_email": "jakub.matys@satoshilabs.com" - }, "coin": { "name": "Zcash Testnet", "shortcut": "TAZ", @@ -15,17 +11,12 @@ "blockbook_internal": 19032, "blockbook_public": 19132 }, - "block_chain": { + "ipc": { "rpc_url_template": "http://localhost:{{.Ports.BackendRPC}}", "rpc_user": "rpc", "rpc_pass": "rpc", "rpc_timeout": 25, - "parse": true, - "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}", - "mempool_workers": 4, - "mempool_sub_workers": 8, - "block_addresses_to_keep": 300, - "additional_params": {} + "message_queue_binding_template": "tcp://127.0.0.1:{{.Ports.BackendMessageQueue}}" }, "backend": { "package_name": "backend-zcash-testnet", @@ -56,6 +47,17 @@ "internal_binding_template": ":{{.Ports.BlockbookInternal}}", "public_binding_template": ":{{.Ports.BlockbookPublic}}", "explorer_url": "https://explorer.testnet.z.cash/", - "additional_params": "" + "additional_params": "", + "block_chain": { + "parse": true, + "mempool_workers": 4, + "mempool_sub_workers": 8, + "block_addresses_to_keep": 300, + "additional_params": {} + } + }, + "meta": { + "package_maintainer": "Jakub Matys", + "package_maintainer_email": "jakub.matys@satoshilabs.com" } }