Allow defined confirmations for block mature (#187)
* Correct RPC ports for zec_testnet * Allow defined confirmations for block mature
This commit is contained in:
parent
2c6dea65ad
commit
1fe93a6fab
|
@ -15,5 +15,8 @@
|
||||||
"txURL": "http://explorer.zeroclassic.org/tx/",
|
"txURL": "http://explorer.zeroclassic.org/tx/",
|
||||||
"blockURL": "http://explorer.zeroclassic.org/block/",
|
"blockURL": "http://explorer.zeroclassic.org/block/",
|
||||||
"_comment_explorer": "This is the coin's explorer full base url for transaction and blocks i.e. (https://explorer.coin.com/tx/). The pool will automatically add the transaction id or block id at the end."
|
"_comment_explorer": "This is the coin's explorer full base url for transaction and blocks i.e. (https://explorer.coin.com/tx/). The pool will automatically add the transaction id or block id at the end."
|
||||||
|
},
|
||||||
|
"poolOptions": {
|
||||||
|
"confirmations": 720
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -795,6 +795,19 @@ function SetupForPool(logger, poolOptions, setupFinished){
|
||||||
// get transaction category for round
|
// get transaction category for round
|
||||||
round.category = generationTx.category
|
round.category = generationTx.category
|
||||||
|
|
||||||
|
//Pay before daemon considers mature
|
||||||
|
if (typeof poolOptions.coin.poolOptions.confirmations === 'undefined') {
|
||||||
|
poolOptions.coin.poolOptions.confirmations = 100;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (round.confirmations >= poolOptions.coin.poolOptions.confirmations) {
|
||||||
|
round.category = 'generate';
|
||||||
|
} else if (round.confirmations <= poolOptions.coin.poolOptions.confirmations) {
|
||||||
|
round.category = 'immature';
|
||||||
|
} else {
|
||||||
|
round.category;
|
||||||
|
}
|
||||||
|
|
||||||
// get reward for newly generated blocks
|
// get reward for newly generated blocks
|
||||||
if (round.category === 'generate' || round.category === 'immature') {
|
if (round.category === 'generate' || round.category === 'immature') {
|
||||||
round.reward = coinsRound(parseFloat(generationTx.amount || generationTx.value))
|
round.reward = coinsRound(parseFloat(generationTx.amount || generationTx.value))
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
"maxBlocksPerPayment": 3,
|
"maxBlocksPerPayment": 3,
|
||||||
"daemon": {
|
"daemon": {
|
||||||
"host": "127.0.0.1",
|
"host": "127.0.0.1",
|
||||||
"port": 18233,
|
"port": 18232,
|
||||||
"user": "rpcuser",
|
"user": "rpcuser",
|
||||||
"password": "rpcpassword"
|
"password": "rpcpassword"
|
||||||
}
|
}
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
"daemons": [
|
"daemons": [
|
||||||
{
|
{
|
||||||
"host": "127.0.0.1",
|
"host": "127.0.0.1",
|
||||||
"port": 18233,
|
"port": 18232,
|
||||||
"user": "rpcuser",
|
"user": "rpcuser",
|
||||||
"password": "rpcpassword"
|
"password": "rpcpassword"
|
||||||
}
|
}
|
||||||
|
|
|
@ -152,8 +152,9 @@
|
||||||
<span style="padding-left: 18px;"><small>{{=readableDate(block[4])}}</small></span>
|
<span style="padding-left: 18px;"><small>{{=readableDate(block[4])}}</small></span>
|
||||||
{{ } }}
|
{{ } }}
|
||||||
{{if (it.stats.pools[pool].pending.confirms) { }}
|
{{if (it.stats.pools[pool].pending.confirms) { }}
|
||||||
|
{{if (typeof it.poolsConfigs[pool].coin.poolOptions.confirmations === 'undefined') { it.poolsConfigs[pool].coin.poolOptions.confirmations = 100; }}}
|
||||||
{{if (it.stats.pools[pool].pending.confirms[block[0]]) { }}
|
{{if (it.stats.pools[pool].pending.confirms[block[0]]) { }}
|
||||||
<span style="float:right; color: red;"><small>{{=it.stats.pools[pool].pending.confirms[block[0]]}} of 100</small></span>
|
<span style="float:right; color: red;"><small>{{=it.stats.pools[pool].pending.confirms[block[0]]}} of {{=it.poolsConfigs[pool].coin.poolOptions.confirmations}}</small></span>
|
||||||
{{ } else { }}
|
{{ } else { }}
|
||||||
<span style="float:right; color: red;"><small>*PENDING*</small></span>
|
<span style="float:right; color: red;"><small>*PENDING*</small></span>
|
||||||
{{ } }}
|
{{ } }}
|
||||||
|
|
Loading…
Reference in New Issue