From 0b4818c36e994aa66ae48a32b09089101821c0df Mon Sep 17 00:00:00 2001 From: Tanguy Pruvot Date: Thu, 24 Nov 2016 00:03:37 +0100 Subject: [PATCH] sql: new coins fields for stratum/pow settings Also some more fields to cache the available balance (to allow triggers) --- sql/2016-11-23-coins.sql | 13 +++++++++++ web/yaamp/models/db_coinsModel.php | 2 ++ web/yaamp/modules/site/coin_form.php | 32 +++++++++++++++++++++++++++- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 sql/2016-11-23-coins.sql diff --git a/sql/2016-11-23-coins.sql b/sql/2016-11-23-coins.sql new file mode 100644 index 0000000..ca49abf --- /dev/null +++ b/sql/2016-11-23-coins.sql @@ -0,0 +1,13 @@ +-- Recent additions to add after db init (.gz) +-- mysql yaamp -p < file.sql + +-- don't forget to restart memcached service to refresh the db structure + +ALTER TABLE `coins` ADD `powend_height` INT(11) NULL AFTER `target_height`; +ALTER TABLE `coins` ADD `mature_blocks` INT(11) NULL AFTER `reward_mul`; +ALTER TABLE `coins` ADD `block_time` INT(11) NULL AFTER `payout_max`; +ALTER TABLE `coins` ADD `available` DOUBLE NULL AFTER `balance`; +ALTER TABLE `coins` ADD `cleared` DOUBLE NULL AFTER `balance`; +ALTER TABLE `coins` ADD `immature` DOUBLE NULL AFTER `balance`; +ALTER TABLE `coins` ADD `max_miners` INT(11) NULL AFTER `visible`; +ALTER TABLE `coins` ADD `max_shares` INT(11) NULL AFTER `max_miners`; diff --git a/web/yaamp/models/db_coinsModel.php b/web/yaamp/models/db_coinsModel.php index 46b6202..fef6b58 100644 --- a/web/yaamp/models/db_coinsModel.php +++ b/web/yaamp/models/db_coinsModel.php @@ -37,6 +37,8 @@ class db_coins extends CActiveRecord 'txfee' => 'Tx Fee', 'program' => 'Process name', 'conf_folder' => 'Conf. folder', + 'mature_blocks' => 'PoW Confirmations', + 'powend_height' => 'End of PoW', 'rpchost' => 'RPC Host', 'rpcport' => 'RPC Port', 'rpcuser' => 'RPC User', diff --git a/web/yaamp/modules/site/coin_form.php b/web/yaamp/modules/site/coin_form.php index 18cf445..4e24934 100644 --- a/web/yaamp/modules/site/coin_form.php +++ b/web/yaamp/modules/site/coin_form.php @@ -86,7 +86,25 @@ echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'target_height'); echo CUFHtml::activeLabelEx($coin, 'target_height'); echo CUFHtml::activeTextField($coin, 'target_height', array('maxlength'=>32,'style'=>'width: 120px;')); -echo '

'; +echo '

Known height of the network

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'powend_height'); +echo CUFHtml::activeLabelEx($coin, 'powend_height'); +echo CUFHtml::activeTextField($coin, 'powend_height', array('maxlength'=>32,'style'=>'width: 120px;')); +echo '

Height of the end of PoW mining

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'mature_blocks'); +echo CUFHtml::activeLabelEx($coin, 'mature_blocks'); +echo CUFHtml::activeTextField($coin, 'mature_blocks', array('maxlength'=>32,'style'=>'width: 120px;')); +echo '

Required block count to mature

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'block_time'); +echo CUFHtml::activeLabelEx($coin, 'block_time'); +echo CUFHtml::activeTextField($coin, 'block_time', array('maxlength'=>32,'style'=>'width: 120px;')); +echo '

Average block time (sec)

'; echo CUFHtml::closeCtrlHolder(); echo CUFHtml::openActiveCtrlHolder($coin, 'errors'); @@ -141,6 +159,18 @@ echo CUFHtml::activeCheckBox($coin, 'auxpow'); echo '

Merged mining

'; echo CUFHtml::closeCtrlHolder(); +echo CUFHtml::openActiveCtrlHolder($coin, 'max_miners'); +echo CUFHtml::activeLabelEx($coin, 'max_miners'); +echo CUFHtml::activeTextField($coin, 'max_miners', array('maxlength'=>32,'style'=>'width: 120px;')); +echo '

Miners allowed by the stratum

'; +echo CUFHtml::closeCtrlHolder(); + +echo CUFHtml::openActiveCtrlHolder($coin, 'max_shares'); +echo CUFHtml::activeLabelEx($coin, 'max_shares'); +echo CUFHtml::activeTextField($coin, 'max_shares', array('maxlength'=>32,'style'=>'width: 120px;')); +echo '

Auto restart stratum after this amount of shares

'; +echo CUFHtml::closeCtrlHolder(); + echo CUFHtml::openActiveCtrlHolder($coin, 'master_wallet'); echo CUFHtml::activeLabelEx($coin, 'master_wallet'); echo CUFHtml::activeTextField($coin, 'master_wallet', array('maxlength'=>200));