Skip to content

GitLab

T
tangled
Commit 98c0209a authored by Eriksson Monteiro's avatar Eriksson Monteiro
Browse files
Options

update millix node and fix tangled ad

parent 21a63e66
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 126 additions and 70 deletions
millix_node/.gitignore
View file @ 98c0209a
node_modules
package-lock.json
data/keys.json
index.dist.*
millix_node/core/config/config.js
View file @ 98c0209a
......@@ -772,7 +772,7 @@ export const DATABASE_ENGINE = 'sqlite';
export const DATABASE_CONNECTION = {};
export const MILLIX_CIRCULATION = 9e15;
export const NODE_MILLIX_BUILD_DATE = 1640009160;
export const NODE_MILLIX_VERSION = '1.12.12-tangled';
export const NODE_MILLIX_VERSION = '1.13.0-tangled';
export const DATA_BASE_DIR_MAIN_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;
......
millix_node/core/wallet/wallet-transaction-consensus.js
View file @ 98c0209a
......@@ -213,8 +213,8 @@ export class WalletTransactionConsensus {
if (!transaction) {
wallet.requestTransactionFromNetwork(transactionID, {
priority: 1,
dispatch_request : true
priority : 1,
dispatch_request: true
});
return reject({
......@@ -293,8 +293,8 @@ export class WalletTransactionConsensus {
else if (responseType === 'transaction_not_found') {
wallet.requestTransactionFromNetwork(data.transaction_id, {
priority: 1,
dispatch_request : true
priority : 1,
dispatch_request: true
});
return reject({
......@@ -343,8 +343,8 @@ export class WalletTransactionConsensus {
if (!output) {
wallet.requestTransactionFromNetwork(input.output_transaction_id, {
priority: 1,
dispatch_request : true
priority : 1,
dispatch_request: true
});
return callback({
......@@ -492,13 +492,15 @@ export class WalletTransactionConsensus {
console.log('[wallet-transaction-consensus-oracle] consensus error: ', err);
delete this._transactionValidationState[nodeID];
let ws = network.getWebSocketByID(connectionID);
let ws = network.getWebSocketByID(connectionID);
let cacheTime = 90000;
if (err.cause === 'consensus_timeout') {
return;
}
else if (err.cause === 'transaction_not_found') {
ws && peer.transactionSyncByWebSocket(err.transaction_id_fail, ws).then(_ => _);
wallet.requestTransactionFromNetwork(err.transaction_id_fail);
cacheTime = 2000;
}
if (ws) {
......@@ -508,7 +510,7 @@ export class WalletTransactionConsensus {
valid : false,
type : 'validation_response'
};
cache.setCacheItem('validation', transactionID, validationResult, 90000);
cache.setCacheItem('validation', transactionID, validationResult, cacheTime);
peer.transactionValidationResponse(validationResult, ws, true);
}
});
......@@ -677,7 +679,9 @@ export class WalletTransactionConsensus {
type: 'validation_start'
}, ws);
peer.transactionValidationResponse(cachedValidation, ws, true);
cache.refreshCacheTime('validation', data.transaction_id, 90000);
if (cachedValidation.cause !== 'transaction_not_found') {
cache.refreshCacheTime('validation', data.transaction_id, 90000);
}
return;
}
......
millix_node/core/wallet/wallet.js
View file @ 98c0209a
......@@ -863,6 +863,10 @@ class Wallet {
delete this._transactionReceivedFromNetwork[transaction.transaction_id];
delete this._transactionRequested[transaction.transaction_id];
const cachedValidation = cache.getCacheItem('validation', transaction.transaction_id);
if(cachedValidation && cachedValidation.cause === 'transaction_not_found') {
cache.removeCacheItem('validation', transaction.transaction_id);
}
});
});
......
millix_node/index.js
View file @ 98c0209a
......@@ -126,6 +126,6 @@ db.initialize()
});
}
});
//millix v1.12.12-tangled
//millix v1.13.0-tangled
\ No newline at end of file
millix_node/tangled-advertisement.js
View file @ 98c0209a
This diff is collapsed.
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