update millix node

millix_node/core/config/config.js

@@ -773,8 +773,8 @@ export const NETWORK_SHORT_TIME_WAIT_MAX                       = 1500;
 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.15.2-tangled';
+export const NODE_MILLIX_BUILD_DATE                            = 1647879243;
+export const NODE_MILLIX_VERSION                               = '1.15.3-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.js

@@ -1435,10 +1435,21 @@ class Wallet {
                 transaction_proxy_success: false
             }, network.getWebSocketByID(connectionID));
         }
+
+        const now    = Math.floor(ntp.now().getTime() / 1000);
         let pipeline = Promise.resolve();
         for (let transaction of transactionList) {
             if (transaction.shard_id !== genesisConfig.genesis_shard_id) {
                 return peer.transactionProxyResult({
+                    cause                    : 'invalid transaction shard',
+                    transaction_proxy_fail   : 'invalid_transaction',
+                    transaction_id           : transaction.transaction_id,
+                    transaction_proxy_success: false
+                }, network.getWebSocketByID(connectionID));
+            }
+            else if (transaction.transaction_date >= (now + 60)) { //clock skew: 1 minute ahead
+                return peer.transactionProxyResult({
+                    cause                    : 'invalid transaction date',
                     transaction_proxy_fail   : 'invalid_transaction',
                     transaction_id           : transaction.transaction_id,
                     transaction_proxy_success: false

millix_node/database/repositories/transaction.js

@@ -2283,10 +2283,11 @@ export default class Transaction {
 
     getFreeOutput(addressKeyIdentifier) {
         return new Promise((resolve) => {
+            const now = Math.floor(ntp.now().getTime() / 1000);
             this.database.all('SELECT transaction_output.*, `transaction`.transaction_date FROM transaction_output \
                               INNER JOIN `transaction` ON `transaction`.transaction_id = transaction_output.transaction_id \
-                              WHERE transaction_output.address_key_identifier=? and is_spent = 0 and transaction_output.is_stable = 1 and is_double_spend = 0 and transaction_output.status != 3',
-                [addressKeyIdentifier], (err, rows) => {
+                              WHERE transaction_output.address_key_identifier=? and is_spent = 0 and transaction_output.is_stable = 1 and is_double_spend = 0 and transaction_output.status != 3 and `transaction`.transaction_date < ?',
+                [addressKeyIdentifier, now], (err, rows) => {
                     resolve(rows);
                 });
         });

millix_node/index.js

@@ -125,7 +125,7 @@ db.initialize()
               });
       }
   });
-  //millix v1.15.2-tangled
+  //millix v1.15.3-tangled
   
   
   
\ No newline at end of file