Commit d1e2fa5e authored by Eriksson Monteiro's avatar Eriksson Monteiro

update millix-node v1.11.4

parent 9e2dddfb
...@@ -774,8 +774,8 @@ export const NETWORK_SHORT_TIME_WAIT_MAX = 1500; ...@@ -774,8 +774,8 @@ export const NETWORK_SHORT_TIME_WAIT_MAX = 1500;
export const DATABASE_ENGINE = 'sqlite'; export const DATABASE_ENGINE = 'sqlite';
export const DATABASE_CONNECTION = {}; export const DATABASE_CONNECTION = {};
export const MILLIX_CIRCULATION = 9e15; export const MILLIX_CIRCULATION = 9e15;
export const NODE_MILLIX_BUILD_DATE = 1629385375; export const NODE_MILLIX_BUILD_DATE = 1629813663;
export const NODE_MILLIX_VERSION = '1.11.3-tangled'; export const NODE_MILLIX_VERSION = '1.11.4-tangled';
export const DATA_BASE_DIR_MAIN_NETWORK = './millix-tangled'; export const DATA_BASE_DIR_MAIN_NETWORK = './millix-tangled';
export const DATA_BASE_DIR_TEST_NETWORK = './millix-tangled'; export const DATA_BASE_DIR_TEST_NETWORK = './millix-tangled';
let DATA_BASE_DIR = MODE_TEST_NETWORK ? DATA_BASE_DIR_TEST_NETWORK : DATA_BASE_DIR_MAIN_NETWORK; let DATA_BASE_DIR = MODE_TEST_NETWORK ? DATA_BASE_DIR_TEST_NETWORK : DATA_BASE_DIR_MAIN_NETWORK;
......
...@@ -883,7 +883,9 @@ export class WalletTransactionConsensus { ...@@ -883,7 +883,9 @@ export class WalletTransactionConsensus {
} }
delete this._consensusRoundState[lockerID]; delete this._consensusRoundState[lockerID];
this._consensusRoundState[transactionID] = {}; this._consensusRoundState[transactionID] = {
timestamp: Date.now()
};
let unstableDateStart = ntp.now(); let unstableDateStart = ntp.now();
unstableDateStart.setMinutes(unstableDateStart.getMinutes() - config.TRANSACTION_OUTPUT_EXPIRE_OLDER_THAN); unstableDateStart.setMinutes(unstableDateStart.getMinutes() - config.TRANSACTION_OUTPUT_EXPIRE_OLDER_THAN);
...@@ -901,7 +903,8 @@ export class WalletTransactionConsensus { ...@@ -901,7 +903,8 @@ export class WalletTransactionConsensus {
return (() => { return (() => {
if (unstableDateStart.getTime() < pendingTransaction.transaction_date.getTime()) { // if not hibernated yet, we try to do a local validation first if (unstableDateStart.getTime() < pendingTransaction.transaction_date.getTime()) { // if not hibernated yet, we try to do a local validation first
return this._validateTransaction(transactionID, null, 0); return this._validateTransaction(transactionID, null, 0)
.catch(() => Promise.resolve());
} }
else { else {
return Promise.resolve(); return Promise.resolve();
......
...@@ -1800,16 +1800,15 @@ export default class Transaction { ...@@ -1800,16 +1800,15 @@ export default class Transaction {
FROM transaction_input_chain FROM transaction_input_chain
WHERE status = 1; WHERE status = 1;
UPDATE 'transaction' AS t UPDATE 'transaction' AS t
SET is_stable = 1, stable_date = CAST(strftime('%s', 'now') AS INTEGER), status = 2 SET is_stable = 1, stable_date = CAST(strftime('%s', 'now') AS INTEGER)
WHERE transaction_id IN (SELECT transaction_id FROM transaction_input_chain); WHERE transaction_id IN (SELECT transaction_id FROM transaction_input_chain);
UPDATE transaction_input UPDATE transaction_input
SET status = 2, SET is_double_spend = 0,
is_double_spend = 0,
double_spend_date = NULL double_spend_date = NULL
WHERE transaction_id IN WHERE transaction_id IN
(SELECT transaction_id FROM transaction_input_chain); (SELECT transaction_id FROM transaction_input_chain);
UPDATE transaction_output AS o UPDATE transaction_output AS o
SET status = 2, is_double_spend = 0, double_spend_date = NULL, is_stable = 1, stable_date = CAST(strftime('%s', 'now') AS INTEGER), is_spent = EXISTS ( SET is_double_spend = 0, double_spend_date = NULL, is_stable = 1, stable_date = CAST(strftime('%s', 'now') AS INTEGER), is_spent = EXISTS (
SELECT i.output_transaction_id FROM transaction_input i SELECT i.output_transaction_id FROM transaction_input i
INNER JOIN transaction_output o2 ON i.transaction_id = o2.transaction_id INNER JOIN transaction_output o2 ON i.transaction_id = o2.transaction_id
WHERE i.output_transaction_id = o.transaction_id AND i.output_position = o.output_position AND WHERE i.output_transaction_id = o.transaction_id AND i.output_position = o.output_position AND
......
...@@ -108,4 +108,4 @@ db.initialize() ...@@ -108,4 +108,4 @@ db.initialize()
}); });
} }
}); });
//millix v1.11.3-tangled //millix v1.11.4-tangled
...@@ -287,11 +287,11 @@ class Network { ...@@ -287,11 +287,11 @@ class Network {
database.getRepository('node') database.getRepository('node')
.listNodes() .listNodes()
.then((nodes) => { .then((nodes) => {
async.eachSeries(nodes, (node, callback) => { async.eachSeries(_.shuffle(nodes), (node, callback) => {
this.addNode(node.node_prefix, node.node_address, node.node_port, node.node_port_api, node.node_id); this.addNode(node.node_prefix, node.node_address, node.node_port, node.node_port_api, node.node_id);
callback(); callback();
}, () => { }, () => {
_.each(config.NODE_INITIAL_LIST, ({host, port_protocol: port, port_api: portApi}) => { _.each(_.shuffle(config.NODE_INITIAL_LIST), ({host, port_protocol: port, port_api: portApi}) => {
let prefix = config.WEBSOCKET_PROTOCOL; let prefix = config.WEBSOCKET_PROTOCOL;
let url = `${prefix}://${host}:${port}`; let url = `${prefix}://${host}:${port}`;
if ((!this._nodeList[url] || !this._nodeList[url].node_id) && (prefix && host && port && portApi)) { if ((!this._nodeList[url] || !this._nodeList[url].node_id) && (prefix && host && port && portApi)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment