update monero-project to v0.17.1.1

bump version to 0.4.6 nodejs >= 10.0.0 update dist files
woodser · Nov 4, 2020 · a0884bb · a0884bb
1 parent eaeda13
commit a0884bb
Show file tree

Hide file tree

Showing 17 changed files with 29 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Monero JavaScript Library
 
-A Node.js library for creating Monero applications using RPC and WebAssembly bindings to [monero v0.17.0.1 'Oxygen Orion'](https://github.com/monero-project/monero/tree/v0.17.0.1).
+A Node.js library for creating Monero applications using RPC and WebAssembly bindings to [monero v0.17.1.1 'Oxygen Orion'](https://github.com/monero-project/monero/tree/v0.17.1.1).
 
 * Supports wallet and daemon RPC clients.
 * Supports client-side wallets in Node.js or the browser using WebAssembly.

diff --git a/bin/update_submodules.sh b/bin/update_submodules.sh
@@ -5,11 +5,11 @@ git submodule update --init --recursive
 
 # update monero-cpp
 cd ./external/monero-cpp
-git checkout tags/v0.3.6
-git pull --ff-only origin tags/v0.3.6
+git checkout tags/v0.3.7
+git pull --ff-only origin tags/v0.3.7
 
 # update monero-core
 cd ./external/monero-core
-git checkout tags/v0.17.0.1
-git pull --ff-only origin tags/v0.17.0.1
+git checkout tags/v0.17.1.1
+git pull --ff-only origin tags/v0.17.1.1
 cd ../../../../
diff --git a/dist/MoneroWebWorker.dist.js b/dist/MoneroWebWorker.dist.js
diff --git a/dist/MoneroWebWorker.dist.js.map b/dist/MoneroWebWorker.dist.js.map
diff --git a/dist/monero_core.js b/dist/monero_core.js
diff --git a/dist/monero_core.wasm b/dist/monero_core.wasm
diff --git a/dist/monero_core_keys.js b/dist/monero_core_keys.js
diff --git a/dist/monero_core_keys.wasm b/dist/monero_core_keys.wasm
diff --git a/external/monero-cpp b/external/monero-cpp
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "monero-javascript",
   "description": "A JavaScript library for using Monero",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "license": "MIT",
   "repository": "https://github.com/monero-ecosystem/monero-javascript",
   "private": false,
@@ -22,6 +22,9 @@
       }
     ]
   },
+  "engines": {
+    "node": ">=10.0.0"
+  },
   "dependencies": {
     "ajv": "^6.12.2",
     "async": "2.6.1",

diff --git a/src/main/js/common/MoneroUtils.js b/src/main/js/common/MoneroUtils.js
@@ -10,14 +10,13 @@ const MoneroError = require("./MoneroError");
  */
 class MoneroUtils {
 
-
   /**
    * <p>Get the version of the monero-javascript library.<p>
    * 
    * @return {string} the version of this monero-javascript library
    */
   static getVersion() {
-    return "0.4.5";
+    return "0.4.6";
   }
 
   // TODO: improve validation

diff --git a/src/main/js/wallet/MoneroWalletRpc.js b/src/main/js/wallet/MoneroWalletRpc.js
@@ -711,7 +711,10 @@ class MoneroWalletRpc extends MoneroWallet {
 
     // special case: re-fetch txs if inconsistency caused by needing to make multiple rpc calls
     for (let tx of txs) {
-      if (tx.isConfirmed() && tx.getBlock() === undefined) return this.getTxs(query);
+      if (tx.isConfirmed() && tx.getBlock() === undefined) {
+        console.error("Inconsistency detected building txs from multiple rpc calls, re-fetching txs");
+        return this.getTxs(query);
+      }
     }
 
     // order txs if tx hashes given then return

diff --git a/src/test/TestDeveloperGuide.js b/src/test/TestDeveloperGuide.js
@@ -32,7 +32,8 @@ class TestDeveloperGuide {
       it("Test developer guide transaction queries", async function() {
 
         // get a transaction by hash
-        let tx = await wallet.getTx("9fb2cb7c73743002f131b72874e77b1152891968dc1f2849d3439ace8bae6d8e");
+        let tx = await wallet.getTx((await wallet.getTxs())[0].getHash()); // REPLACE WITH BELOW FOR MD FILE
+        //let tx = await wallet.getTx("9fb2cb7c73743002f131b72874e77b1152891968dc1f2849d3439ace8bae6d8e");
 
         // get unconfirmed transactions
         let txs = await wallet.getTxs({

diff --git a/src/test/TestMoneroDaemonRpc.js b/src/test/TestMoneroDaemonRpc.js
@@ -1745,7 +1745,7 @@ async function getConfirmedTxHashes(daemon) {
   let numTxs = 5;
   let txHashes = [];
   let height = await daemon.getHeight();
-  while (txHashes.length < numTxs && height >= 0) {
+  while (txHashes.length < numTxs && height > 0) {
     let block = await daemon.getBlockByHeight(--height);
     for (let txHash of block.getTxHashes()) txHashes.push(txHash);
   }

diff --git a/src/test/utils/TestUtils.js b/src/test/utils/TestUtils.js
@@ -176,9 +176,9 @@ TestUtils.MAX_FEE = new BigInteger("7500000").multiply(new BigInteger("10000"));
 TestUtils.NETWORK_TYPE = MoneroNetworkType.STAGENET;
 
 // default keypair to test
-TestUtils.MNEMONIC = "niece cube almost phase zeal ultimate pyramid tapestry hickory bulb bifocals festival always wayside sphere kept upwards wagtail invoke radar pager flippant sensible stunning kept";
-TestUtils.ADDRESS = "59dF9pSotECe1Fn4dBGZXWHYyNdo53rbZ7YYseu9jBKCf4c2cUzhuFVRH8HuD4wyaKTqtD3VF3F4eQe3Kzq342F5U8R4jeq";
-TestUtils.FIRST_RECEIVE_HEIGHT = 201;   // NOTE: this value MUST be the height of the wallet's first tx for tests
+TestUtils.MNEMONIC = "limits linen agreed gesture medicate having nurse doing pests tonic nugget pimple anxiety saucepan movement acquire estate likewise exult niece pedantic voyage fuselage gyrate fuselage";
+TestUtils.ADDRESS = "54mANzvpzCWQD9FPG9a4XXaRjvQF7uLCxRc6i2uGx9pnQ6nUKaoKZ2oC9kC3Ee6SKBgFLzkwssZ9QH6TeiNGC6CFA99Hnck";
+TestUtils.FIRST_RECEIVE_HEIGHT = 8360;   // NOTE: this value MUST be the height of the wallet's first tx for tests
 
 // wallet RPC config
 TestUtils.WALLET_RPC_CONFIG = {

diff --git a/todo.txt b/todo.txt
@@ -1,3 +1,4 @@
+support startSyncing(refreshRate)
 support listener js object
 support strings in queries, etc
 wallet.waitForTxsToClearPool()?