Sync with trezor common and fix formatting

This commit is contained in:
Martin Boehm 2019-03-01 14:55:24 +01:00
parent 39f9f46d3d
commit e54998dccc
4 changed files with 24 additions and 14 deletions

View File

@ -26,7 +26,7 @@ const (
// Zerocoin op codes
OP_ZEROCOINMINT = 0xc1
OP_ZEROCOINSPEND = 0xc2
OP_ZEROCOINSPEND = 0xc2
)
var (
@ -38,14 +38,14 @@ func init() {
// PIVX mainnet Address encoding magics
MainNetParams = chaincfg.MainNetParams
MainNetParams.Net = MainnetMagic
MainNetParams.PubKeyHashAddrID = []byte{30} // starting with 'D'
MainNetParams.PubKeyHashAddrID = []byte{30} // starting with 'D'
MainNetParams.ScriptHashAddrID = []byte{13}
MainNetParams.PrivateKeyID = []byte{212}
// PIVX testnet Address encoding magics
TestNetParams = chaincfg.TestNet3Params
TestNetParams.Net = TestnetMagic
TestNetParams.PubKeyHashAddrID = []byte{139} // starting with 'x' or 'y'
TestNetParams.PubKeyHashAddrID = []byte{139} // starting with 'x' or 'y'
TestNetParams.ScriptHashAddrID = []byte{19}
TestNetParams.PrivateKeyID = []byte{239}
}
@ -72,7 +72,7 @@ func NewPivXParser(params *chaincfg.Params, c *btc.Configuration) *PivXParser {
func GetChainParams(chain string) *chaincfg.Params {
if !chaincfg.IsRegistered(&MainNetParams) {
err := chaincfg.Register(&MainNetParams)
if err == nil {
if err == nil {
err = chaincfg.Register(&TestNetParams)
}
if err != nil {
@ -80,11 +80,11 @@ func GetChainParams(chain string) *chaincfg.Params {
}
}
switch chain {
case "test":
case "test":
return &TestNetParams
default:
default:
return &MainNetParams
}
}
}
// ParseBlock parses raw block to our Block struct

View File

@ -27,7 +27,9 @@
"verification_type": "sha256",
"verification_source": "a2761eaa948e30b1de419f9fc2a07eb3efe852cb2bf76aa371a5e40c959929d8",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": ["bin/myriadcoin-qt"],
"exclude_files": [
"bin/myriadcoin-qt"
],
"exec_command_template": "{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/bin/myriadcoind -datadir={{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend -conf={{.Env.BackendInstallPath}}/{{.Coin.Alias}}/{{.Coin.Alias}}.conf -pid=/run/{{.Coin.Alias}}/{{.Coin.Alias}}.pid",
"logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/*.log",
"postinst_script_template": "",

View File

@ -1,7 +1,7 @@
{
"coin": {
"name": "PIVX",
"shortcut": "PIV",
"shortcut": "PIVX",
"label": "PIVX",
"alias": "pivx"
},
@ -27,7 +27,9 @@
"verification_type": "sha256",
"verification_source": "aac5b13beb9ff96b0ce62d2258d54166c756c8336672a67c7aae6b73a76b0c03",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": ["bin/pivx-qt"],
"exclude_files": [
"bin/pivx-qt"
],
"exec_command_template": "{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/bin/pivxd -datadir={{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend -conf={{.Env.BackendInstallPath}}/{{.Coin.Alias}}/{{.Coin.Alias}}.conf -pid=/run/{{.Coin.Alias}}/{{.Coin.Alias}}.pid",
"logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/*.log",
"postinst_script_template": "",
@ -53,6 +55,8 @@
"mempool_workers": 8,
"mempool_sub_workers": 2,
"block_addresses_to_keep": 300,
"xpub_magic": 36513075,
"slip44": 119,
"additional_params": {}
}
},
@ -60,4 +64,4 @@
"package_maintainer": "rikardwissing",
"package_maintainer_email": "rikard@coinid.org"
}
}
}

View File

@ -1,7 +1,7 @@
{
"coin": {
"name": "PIVX Testnet",
"shortcut": "tPIV",
"shortcut": "tPIVX",
"label": "PIVX Testnet",
"alias": "pivx_testnet"
},
@ -27,7 +27,9 @@
"verification_type": "sha256",
"verification_source": "aac5b13beb9ff96b0ce62d2258d54166c756c8336672a67c7aae6b73a76b0c03",
"extract_command": "tar -C backend --strip 1 -xf",
"exclude_files": ["bin/pivx-qt"],
"exclude_files": [
"bin/pivx-qt"
],
"exec_command_template": "{{.Env.BackendInstallPath}}/{{.Coin.Alias}}/bin/pivxd -datadir={{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend -conf={{.Env.BackendInstallPath}}/{{.Coin.Alias}}/{{.Coin.Alias}}.conf -pid=/run/{{.Coin.Alias}}/{{.Coin.Alias}}.pid",
"logrotate_files_template": "{{.Env.BackendDataPath}}/{{.Coin.Alias}}/backend/*.log",
"postinst_script_template": "",
@ -53,6 +55,8 @@
"mempool_workers": 8,
"mempool_sub_workers": 2,
"block_addresses_to_keep": 300,
"xpub_magic": 981492128,
"slip44": 1,
"additional_params": {}
}
},
@ -60,4 +64,4 @@
"package_maintainer": "PIVX team",
"package_maintainer_email": "random.zebra@protonmail.com"
}
}
}