Skip to content

GitLab

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

update millix node and wallet ui

parent 8fda5b70
Expand all Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 9 deletions
chrome/browser/resources/millix/app/static/js/main.chunk.js
View file @ d4b5d202
This source diff could not be displayed because it is too large. You can view the blob instead.
millix_node/core/config/config.js
View file @ d4b5d202
...@@ -773,7 +773,7 @@ export const DATABASE_ENGINE = 'sqlite'; ...@@ -773,7 +773,7 @@ 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 = 1640009160; export const NODE_MILLIX_BUILD_DATE = 1640009160;
export const NODE_MILLIX_VERSION = '1.15.0-tangled'; export const NODE_MILLIX_VERSION = '1.15.1-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;
......
millix_node/core/wallet/wallet-transaction-consensus.js
View file @ d4b5d202
...@@ -174,6 +174,7 @@ export class WalletTransactionConsensus { ...@@ -174,6 +174,7 @@ export class WalletTransactionConsensus {
return resolve(); return resolve();
} }
else if (transaction && transaction.status === 3) { else if (transaction && transaction.status === 3) {
console.log('[wallet-transaction-consensus-oracle] found invalid transaction ', transaction.transaction_id);
return reject({ return reject({
cause : 'transaction_invalid', cause : 'transaction_invalid',
transaction_id_fail: transactionID, transaction_id_fail: transactionID,
...@@ -227,6 +228,7 @@ export class WalletTransactionConsensus { ...@@ -227,6 +228,7 @@ export class WalletTransactionConsensus {
walletUtils.verifyTransaction(transaction) walletUtils.verifyTransaction(transaction)
.then(valid => { .then(valid => {
if (!valid) { if (!valid) {
console.log('[wallet-transaction-consensus-oracle] transaction data was is not valid ', transaction.transaction_id);
return reject({ return reject({
cause : 'transaction_invalid', cause : 'transaction_invalid',
transaction_id_fail: transaction.transaction_id, transaction_id_fail: transaction.transaction_id,
...@@ -359,6 +361,7 @@ export class WalletTransactionConsensus { ...@@ -359,6 +361,7 @@ export class WalletTransactionConsensus {
const outputAddress = output.address || `${output.address_base}${output.address_version}${output.address_key_identifier}`; const outputAddress = output.address || `${output.address_base}${output.address_version}${output.address_key_identifier}`;
if (outputUsedInTransaction.has(outputID)) { if (outputUsedInTransaction.has(outputID)) {
console.log(`[wallet-transaction-consensus-oracle] transaction ${transaction.transaction_id} is invalid because output already used ${outputID}`, transaction.transaction_input_list);
return callback({ return callback({
cause : 'transaction_invalid', cause : 'transaction_invalid',
transaction_id_fail: input.output_transaction_id, transaction_id_fail: input.output_transaction_id,
...@@ -366,6 +369,7 @@ export class WalletTransactionConsensus { ...@@ -366,6 +369,7 @@ export class WalletTransactionConsensus {
}, false); }, false);
} }
else if (outputAddress !== `${input.address_base}${input.address_version}${input.address_key_identifier}`) { else if (outputAddress !== `${input.address_base}${input.address_version}${input.address_key_identifier}`) {
console.log(`[wallet-transaction-consensus-oracle] transaction ${transaction.transaction_id} is invalid because invalid input address ${input.address_base}${input.address_version}${input.address_key_identifier}`, output);
return callback({ return callback({
cause : 'transaction_invalid', cause : 'transaction_invalid',
transaction_id_fail: transactionID, transaction_id_fail: transactionID,
...@@ -410,6 +414,7 @@ export class WalletTransactionConsensus { ...@@ -410,6 +414,7 @@ export class WalletTransactionConsensus {
}); });
if (outputTotalAmount > inputTotalAmount) { if (outputTotalAmount > inputTotalAmount) {
console.log(`[wallet-transaction-consensus-oracle] transaction ${transaction.transaction_id} is invalid because invalid amount ${outputTotalAmount} > ${inputTotalAmount}`);
return reject({ return reject({
cause : 'transaction_invalid_amount', cause : 'transaction_invalid_amount',
transaction_id_fail: transactionID, transaction_id_fail: transactionID,
......
millix_node/database/repositories/transaction.js
View file @ d4b5d202
...@@ -733,6 +733,7 @@ export default class Transaction { ...@@ -733,6 +733,7 @@ export default class Transaction {
const transactionDate = Math.floor(transaction.transaction_date.getTime() / 1000); const transactionDate = Math.floor(transaction.transaction_date.getTime() / 1000);
/* verify if expire time is greater than transaction date */ /* verify if expire time is greater than transaction date */
let transactionStatus; let transactionStatus;
const transactionStableDate = transaction.stable_date || transaction.transaction_output_list[0].stable_date;
if (!isWalletTransaction) { if (!isWalletTransaction) {
const expireDate = ntp.now(); const expireDate = ntp.now();
expireDate.setMinutes(expireDate.getMinutes() - config.TRANSACTION_OUTPUT_EXPIRE_OLDER_THAN); expireDate.setMinutes(expireDate.getMinutes() - config.TRANSACTION_OUTPUT_EXPIRE_OLDER_THAN);
...@@ -781,13 +782,13 @@ export default class Transaction { ...@@ -781,13 +782,13 @@ export default class Transaction {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.addTransaction(transaction.transaction_id, transaction.shard_id, transaction.payload_hash, transactionDate, this.addTransaction(transaction.transaction_id, transaction.shard_id, transaction.payload_hash, transactionDate,
transaction.node_id_origin, transaction.node_id_proxy, transaction.version, transaction.parent_date, transaction.node_id_origin, transaction.node_id_proxy, transaction.version, transaction.parent_date,
transaction.stable_date, transaction.timeout_date, transactionStableDate, transaction.timeout_date,
transactionStatus, transaction.create_date) transactionStatus, transaction.create_date)
.then(() => resolve()) .then(() => resolve())
.catch(() => { .catch(() => {
this.updateTransaction(transaction.transaction_id, transaction.shard_id, transaction.payload_hash, transactionDate, this.updateTransaction(transaction.transaction_id, transaction.shard_id, transaction.payload_hash, transactionDate,
transaction.node_id_origin, transaction.node_id_proxy, transaction.version, transaction.parent_date, transaction.node_id_origin, transaction.node_id_proxy, transaction.version, transaction.parent_date,
transaction.stable_date, transaction.timeout_date, transactionStableDate, transaction.timeout_date,
transactionStatus, transaction.create_date) transactionStatus, transaction.create_date)
.then(() => resolve()) .then(() => resolve())
.catch(err => reject(err)); .catch(err => reject(err));
...@@ -829,12 +830,12 @@ export default class Transaction { ...@@ -829,12 +830,12 @@ export default class Transaction {
promise = promise.then(() => { promise = promise.then(() => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.addTransactionOutput(transaction.transaction_id, transaction.shard_id, output.output_position, output.address, output.address_key_identifier, this.addTransactionOutput(transaction.transaction_id, transaction.shard_id, output.output_position, output.address, output.address_key_identifier,
output.amount, output.spent_date, output.stable_date, output.double_spend_date, output.amount, output.spent_date, transactionStableDate, output.double_spend_date,
transactionStatus, output.create_date) transactionStatus, output.create_date)
.then(resolve) .then(resolve)
.catch(() => { .catch(() => {
this.updateTransactionOutput(transaction.transaction_id, output.output_position, output.spent_date ? new Date(output.spent_date * 1000) : null, this.updateTransactionOutput(transaction.transaction_id, output.output_position, output.spent_date ? new Date(output.spent_date * 1000) : null,
output.stable_date ? new Date(output.stable_date * 1000) : null, output.double_spend_date ? new Date(output.double_spend_date * 1000) : null, transactionStatus) transactionStableDate ? new Date(transactionStableDate * 1000) : null, output.double_spend_date ? new Date(output.double_spend_date * 1000) : null, transactionStatus)
.then(resolve) .then(resolve)
.catch(reject); .catch(reject);
}); });
......
millix_node/index.js
View file @ d4b5d202
...@@ -125,7 +125,7 @@ db.initialize() ...@@ -125,7 +125,7 @@ db.initialize()
}); });
} }
}); });
//millix v1.15.0-tangled //millix v1.15.1-tangled
\ No newline at end of file
millix_node/net/network.js
View file @ d4b5d202
...@@ -41,6 +41,7 @@ class Network { ...@@ -41,6 +41,7 @@ class Network {
this.certificatePrivateKeyPem = null; this.certificatePrivateKeyPem = null;
this.nodeConnectionID = this.generateNewID(); this.nodeConnectionID = this.generateNewID();
this._selfConnectionNode = new Set(); this._selfConnectionNode = new Set();
this._allowedMessageInOutboudConnection = new Set(['node_attribute_request', 'wallet_transaction_sync']);
this.initialized = false; this.initialized = false;
this.dht = null; this.dht = null;
this.noop = () => { this.noop = () => {
...@@ -212,7 +213,7 @@ class Network { ...@@ -212,7 +213,7 @@ class Network {
} }
shouldBlockMessage(messageType) { shouldBlockMessage(messageType) {
return !!/.*_(request|sync|allocate)$/g.exec(messageType); return !this._allowedMessageInOutboudConnection.has(messageType) && !!/.*_(request|sync|allocate)$/g.exec(messageType);
} }
getHostByNode(node) { getHostByNode(node) {
......
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