diff --git a/installer/jshelper/package-lock.json b/installer/jshelper/package-lock.json index ab782e7..702daab 100644 --- a/installer/jshelper/package-lock.json +++ b/installer/jshelper/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "evernode-setup-helper", "dependencies": { - "evernode-js-client": "0.6.4" + "evernode-js-client": "0.6.5" } }, "node_modules/@types/node": { @@ -270,9 +270,9 @@ "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" }, "node_modules/evernode-js-client": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.4.tgz", - "integrity": "sha512-+JQq5Unji27mKj3QTX/NDBMyd75ciVDtZzTYlDRXEZ3NnPEK7xxPXQLS5DKlEKF+JEwKNdlWNMF9hvf+13MvVA==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.5.tgz", + "integrity": "sha512-+1xAo4M05Z7CLIY0R4OPoiY05I8NJjLyWEcSUsr9Pr1YELSi3fVMqaBxMqwyKuFIPT7O89Bs5Ykkqj819JRbDQ==", "hasInstallScript": true, "dependencies": { "elliptic": "6.5.4", @@ -1110,9 +1110,9 @@ "integrity": "sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==" }, "evernode-js-client": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.4.tgz", - "integrity": "sha512-+JQq5Unji27mKj3QTX/NDBMyd75ciVDtZzTYlDRXEZ3NnPEK7xxPXQLS5DKlEKF+JEwKNdlWNMF9hvf+13MvVA==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.5.tgz", + "integrity": "sha512-+1xAo4M05Z7CLIY0R4OPoiY05I8NJjLyWEcSUsr9Pr1YELSi3fVMqaBxMqwyKuFIPT7O89Bs5Ykkqj819JRbDQ==", "requires": { "elliptic": "6.5.4", "libsodium-wrappers": "0.7.10", diff --git a/installer/jshelper/package.json b/installer/jshelper/package.json index ef2f507..6614141 100644 --- a/installer/jshelper/package.json +++ b/installer/jshelper/package.json @@ -4,6 +4,6 @@ "build": "ncc build index.js --minify -o dist" }, "dependencies": { - "evernode-js-client": "0.6.4" + "evernode-js-client": "0.6.5" } } diff --git a/mb-xrpl/lib/message-board.js b/mb-xrpl/lib/message-board.js index 7bcb9c6..620e987 100644 --- a/mb-xrpl/lib/message-board.js +++ b/mb-xrpl/lib/message-board.js @@ -635,15 +635,15 @@ class MessageBoard { for (const tx of transactions) { // Skip, if this transaction was previously considered. - const acquireRef = this.#getTrxMemoData(tx, evernode.EventTypes.ACQUIRE_REF); + const acquireRef = this.#getTrxHookParams(tx, evernode.EventTypes.ACQUIRE_SUCCESS); if (acquireRef === trx.hash) continue loop1; - const extendRef = this.#getTrxMemoData(tx, evernode.EventTypes.EXTEND_REF); + const extendRef = this.#getTrxHookParams(tx, evernode.EventTypes.EXTEND_SUCCESS); if (extendRef === trx.hash) continue loop1; - const refundRef = this.#getTrxMemoData(tx, evernode.EventTypes.REFUND_REF); + const refundRef = this.#getTrxHookParams(tx, evernode.EventTypes.REFUND); if (refundRef === trx.hash) continue loop1; } @@ -714,12 +714,12 @@ class MessageBoard { } - #getTrxMemoData(txn, memoType) { - for (const memo of txn.Memos) { - if (memoType === memo.type) { - return memo.data; - } - } + #getTrxHookParams(txn, paramName) { + const hookParams = txn.HookParameters; + + if (hookParams.length > 1 && hookParams[0]?.value == paramName) + return hookParams[1]?.value + return null; } diff --git a/mb-xrpl/package-lock.json b/mb-xrpl/package-lock.json index 05663cf..30ed93a 100644 --- a/mb-xrpl/package-lock.json +++ b/mb-xrpl/package-lock.json @@ -6,7 +6,7 @@ "": { "name": "mb-xrpl", "dependencies": { - "evernode-js-client": "0.6.4", + "evernode-js-client": "0.6.5", "sqlite3": "5.0.2" }, "devDependencies": { @@ -937,9 +937,9 @@ } }, "node_modules/evernode-js-client": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.4.tgz", - "integrity": "sha512-+JQq5Unji27mKj3QTX/NDBMyd75ciVDtZzTYlDRXEZ3NnPEK7xxPXQLS5DKlEKF+JEwKNdlWNMF9hvf+13MvVA==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.5.tgz", + "integrity": "sha512-+1xAo4M05Z7CLIY0R4OPoiY05I8NJjLyWEcSUsr9Pr1YELSi3fVMqaBxMqwyKuFIPT7O89Bs5Ykkqj819JRbDQ==", "hasInstallScript": true, "dependencies": { "elliptic": "6.5.4", @@ -3932,9 +3932,9 @@ "dev": true }, "evernode-js-client": { - "version": "0.6.4", - "resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.4.tgz", - "integrity": "sha512-+JQq5Unji27mKj3QTX/NDBMyd75ciVDtZzTYlDRXEZ3NnPEK7xxPXQLS5DKlEKF+JEwKNdlWNMF9hvf+13MvVA==", + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/evernode-js-client/-/evernode-js-client-0.6.5.tgz", + "integrity": "sha512-+1xAo4M05Z7CLIY0R4OPoiY05I8NJjLyWEcSUsr9Pr1YELSi3fVMqaBxMqwyKuFIPT7O89Bs5Ykkqj819JRbDQ==", "requires": { "elliptic": "6.5.4", "libsodium-wrappers": "0.7.10", diff --git a/mb-xrpl/package.json b/mb-xrpl/package.json index 7f0b2d9..e5759f4 100644 --- a/mb-xrpl/package.json +++ b/mb-xrpl/package.json @@ -5,7 +5,7 @@ "build": "npm run lint && ncc build app.js --minify -o dist" }, "dependencies": { - "evernode-js-client": "0.6.4", + "evernode-js-client": "0.6.5", "sqlite3": "5.0.2" }, "devDependencies": {