From 8e8a9668609fae7e7b4870727ea1ae5d17725f58 Mon Sep 17 00:00:00 2001 From: M5M400 Date: Thu, 4 May 2017 11:14:08 +0200 Subject: [PATCH 1/3] Update config_entries.json --- sql_sync/config_entries.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sql_sync/config_entries.json b/sql_sync/config_entries.json index dbf34fe..fbd2f2d 100644 --- a/sql_sync/config_entries.json +++ b/sql_sync/config_entries.json @@ -550,5 +550,13 @@ "item_value": "25", "item_type": "int", "Item_desc": "Number of minutes between payment daemon retrying due to not enough funds" + }, + { + "id": 75, + "module": "payout", + "item": "priority", + "item_value": "0", + "item_type": "int", + "Item_desc": "Payout priority setting. 0 = use default (4x fee); 1 = low prio (1x fee)" } ] From acba927240ac8067a75e730c5803fafb6199044d Mon Sep 17 00:00:00 2001 From: M5M400 Date: Thu, 4 May 2017 11:15:38 +0200 Subject: [PATCH 2/3] Update base.sql --- deployment/base.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployment/base.sql b/deployment/base.sql index 4b7f517..9bb1528 100644 --- a/deployment/base.sql +++ b/deployment/base.sql @@ -230,8 +230,9 @@ INSERT INTO pool.config (module, item, item_value, item_type, Item_desc) VALUES INSERT INTO pool.config (module, item, item_value, item_type, Item_desc) VALUES ('general', 'emailSig', 'NodeJS-Pool Administration Team', 'string', 'Signature line for the emails.'); INSERT INTO pool.config (module, item, item_value, item_type, Item_desc) VALUES ('payout', 'timer', '120', 'int', 'Number of minutes between main payment daemon cycles'); INSERT INTO pool.config (module, item, item_value, item_type, Item_desc) VALUES ('payout', 'timerRetry', '25', 'int', 'Number of minutes between payment daemon retrying due to not enough funds'); +INSERT INTO pool.config (module, item, item_value, item_type, Item_desc) VALUES ('payout', 'priority', '0', 'int', 'Payout priority setting. 0 = use default (4x fee); 1 = low prio (1x fee)'); INSERT INTO pool.users (username, pass, email, admin, payout_threshold) VALUES ('Administrator', null, 'Password123', 1, 0); INSERT INTO pool.port_config (poolPort, difficulty, portDesc, portType, hidden, `ssl`) VALUES (3333, 1000, 'Low-End Hardware (Up to 30-40 h/s)', 'pplns', 0, 0); INSERT INTO pool.port_config (poolPort, difficulty, portDesc, portType, hidden, `ssl`) VALUES (5555, 5000, 'Medium-Range Hardware (Up to 160 h/s)', 'pplns', 0, 0); INSERT INTO pool.port_config (poolPort, difficulty, portDesc, portType, hidden, `ssl`) VALUES (7777, 10000, 'High-End Hardware (Anything else!)', 'pplns', 0, 0); -INSERT INTO pool.port_config (poolPort, difficulty, portDesc, portType, hidden, `ssl`) VALUES (9000, 20000, 'Claymore SSL', 'pplns', 0, 1); \ No newline at end of file +INSERT INTO pool.port_config (poolPort, difficulty, portDesc, portType, hidden, `ssl`) VALUES (9000, 20000, 'Claymore SSL', 'pplns', 0, 1); From ecf74a3b91ae0db6d7bc32a9611915ae1bb7dea7 Mon Sep 17 00:00:00 2001 From: M5M400 Date: Thu, 4 May 2017 11:20:51 +0200 Subject: [PATCH 3/3] Update payments.js added TX priority config setting --- lib/payments.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/payments.js b/lib/payments.js index 0436295..cada6da 100644 --- a/lib/payments.js +++ b/lib/payments.js @@ -107,6 +107,7 @@ let shapeshiftQueue = async.queue(function (task, callback) { address: shapeshiftTxnData.sAddress } ], + priority: global.config.payout.priority, mixin: global.config.payout.mixIn, payment_id: shapeshiftTxnData.deposit }; @@ -257,6 +258,7 @@ let xmrToQueue = async.queue(function (task, callback) { address: orderStatus.xmr_receiving_address } ], + priority: global.config.payout.priority, mixin: global.config.payout.mixIn, payment_id: orderStatus.xmr_required_payment_id }; @@ -502,6 +504,7 @@ function Payee(amount, address, paymentID, bitcoin) { address: this.address } ], + priority: global.config.payout.priority, mixin: global.config.payout.mixIn, payment_id: this.paymentID }; @@ -533,6 +536,7 @@ function Payee(amount, address, paymentID, bitcoin) { address: this.address } ], + priority: global.config.payout.priority, mixin: global.config.payout.mixIn }; let identifier = this.id; @@ -640,6 +644,7 @@ function makePayments() { while (paymentDestinations.length > 0) { let paymentDetails = { destinations: paymentDestinations.splice(0, global.config.payout.maxPaymentTxns), + priority: global.config.payout.priority, mixin: global.config.payout.mixIn }; console.log("Paying out: " + paymentDetails.destinations.length + " people");