diff --git a/package-lock.json b/package-lock.json index 2a8055b8..07f10cf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -25,7 +25,7 @@ "web-vitals": "^1.1.1" }, "devDependencies": { - "monero-javascript": "^0.5.11" + "monero-javascript": "^0.6.4" } }, "node_modules/@babel/code-frame": { @@ -8865,9 +8865,9 @@ } }, "node_modules/follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==", + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==", "funding": [ { "type": "individual", @@ -13019,9 +13019,9 @@ } }, "node_modules/monero-javascript": { - "version": "0.5.11", - "resolved": "https://registry.npmjs.org/monero-javascript/-/monero-javascript-0.5.11.tgz", - "integrity": "sha512-0C8Q0LksHy4OWPizRxNmj0LqCaHiOR0mSWHUWi0tiNRLLoWsbJAYOYB0iWJ/yUvux22l9fVKtWEtQEYSySN4fg==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/monero-javascript/-/monero-javascript-0.6.4.tgz", + "integrity": "sha512-svBDjVJozEOQGxqysgSDcn1tggwS3tiEeJgGEOvzhsKasW97S/C+wBhNxGW+0J14bPVbqnhJIB0fFhcpKyn4zw==", "dev": true, "dependencies": { "ajv": "^6.12.6", @@ -13095,9 +13095,9 @@ "optional": true }, "node_modules/nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -17257,9 +17257,9 @@ "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" }, "node_modules/selfsigned": { - "version": "1.10.11", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz", - "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==", + "version": "1.10.14", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz", + "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==", "dependencies": { "node-forge": "^0.10.0" } @@ -28118,9 +28118,9 @@ } }, "follow-redirects": { - "version": "1.14.5", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz", - "integrity": "sha512-wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA==" + "version": "1.14.7", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz", + "integrity": "sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==" }, "for-in": { "version": "1.0.2", @@ -31362,9 +31362,9 @@ } }, "monero-javascript": { - "version": "0.5.11", - "resolved": "https://registry.npmjs.org/monero-javascript/-/monero-javascript-0.5.11.tgz", - "integrity": "sha512-0C8Q0LksHy4OWPizRxNmj0LqCaHiOR0mSWHUWi0tiNRLLoWsbJAYOYB0iWJ/yUvux22l9fVKtWEtQEYSySN4fg==", + "version": "0.6.4", + "resolved": "https://registry.npmjs.org/monero-javascript/-/monero-javascript-0.6.4.tgz", + "integrity": "sha512-svBDjVJozEOQGxqysgSDcn1tggwS3tiEeJgGEOvzhsKasW97S/C+wBhNxGW+0J14bPVbqnhJIB0fFhcpKyn4zw==", "dev": true, "requires": { "ajv": "^6.12.6", @@ -31431,9 +31431,9 @@ "optional": true }, "nanoid": { - "version": "3.1.30", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.30.tgz", - "integrity": "sha512-zJpuPDwOv8D2zq2WRoMe1HsfZthVewpel9CAvTfc/2mBD1uUT/agc5f7GHGWXlYkFvi1mVxe4IjvP2HNrop7nQ==" + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.2.0.tgz", + "integrity": "sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==" }, "nanomatch": { "version": "1.2.13", @@ -34724,9 +34724,9 @@ "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=" }, "selfsigned": { - "version": "1.10.11", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.11.tgz", - "integrity": "sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==", + "version": "1.10.14", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.14.tgz", + "integrity": "sha512-lkjaiAye+wBZDCBsu5BGi0XiLRxeUlsGod5ZP924CRSEoGuZAw/f7y9RKu28rwTfiHVhdavhB0qH0INV6P1lEA==", "requires": { "node-forge": "^0.10.0" } diff --git a/package.json b/package.json index 7fc4f98c..0525ac32 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,6 @@ ] }, "devDependencies": { - "monero-javascript": "^0.5.11" + "monero-javascript": "^0.6.4" } } diff --git a/src/HavenoDaemon.test.ts b/src/HavenoDaemon.test.ts index bad7520a..167dd22f 100644 --- a/src/HavenoDaemon.test.ts +++ b/src/HavenoDaemon.test.ts @@ -658,7 +658,7 @@ test("Handles unexpected errors during trade initialization", async () => { await traders[1].takeOffer(offer.getId(), paymentAccount.getId()); throw new Error("Should have failed taking offer because taker trade funds spent") } catch (err) { - assert(err.message.includes("not enough money"), "Unexpected error: " + err.message); + assert(err.message.includes("not enough unlocked money"), "Unexpected error: " + err.message); } // TODO: test that unavailable right after taking (taker will know before maker) @@ -693,7 +693,7 @@ test("Handles unexpected errors during trade initialization", async () => { await traders[2].takeOffer(offer.getId(), paymentAccount.getId()); throw new Error("Should have failed taking offer because maker trade funds spent") } catch (err) { - assert(err.message.includes("not enough money") || err.message.includes("timeout reached. protocol did not complete"), "Unexpected error: " + err.message); + assert(err.message.includes("not enough unlocked money") || err.message.includes("timeout reached. protocol did not complete"), "Unexpected error: " + err.message); } // trader 2's balance is unreserved