evernode-js-client 0.6.2 → 0.6.4

package/index.js

@@ -11725,7 +11725,7 @@ const { Buffer } = __nccwpck_require__(4300);
 const { XrplApi } = __nccwpck_require__(1850);
 const { XrplAccount } = __nccwpck_require__(9329);
 const { XrplApiEvents, XrplConstants } = __nccwpck_require__(3307);
-const { EvernodeEvents, EventTypes, MemoFormats, EvernodeConstants, HookStateKeys, HookParamKeys } = __nccwpck_require__(9849);
+const { EvernodeEvents, EventTypes, MemoFormats, EvernodeConstants, HookStateKeys, HookParamKeys, RegExp } = __nccwpck_require__(9849);
 const { DefaultValues } = __nccwpck_require__(8262);
 const { EncryptionHelper } = __nccwpck_require__(4832);
 const { EventEmitter } = __nccwpck_require__(6170);
@@ -11763,6 +11763,9 @@ class BaseEvernodeClient {
 
         this.xrplAcc = new XrplAccount(xrpAddress, xrpSecret, { xrplApi: this.xrplApi });
         this.accKeyPair = xrpSecret && this.xrplAcc.deriveKeypair();
+        this.messagePrivateKey = options.messagePrivateKey || (this.accKeyPair ? this.accKeyPair.privateKey : null);
+        if (this.messagePrivateKey && !RegExp.PublicPrivateKey.test(this.messagePrivateKey))
+            throw "Message private key is not valid.";
         this.#watchEvents = watchEvents;
         this.#autoSubscribe = autoSubscribe;
         this.events = new EventEmitter();
@@ -11975,14 +11978,21 @@ class BaseEvernodeClient {
         if (tx.TransactionType === 'URITokenBuy' && eventType === EventTypes.ACQUIRE_LEASE && tx.Memos.length &&
             tx.Memos[0].type === EventTypes.ACQUIRE_LEASE && tx.Memos[0].format === MemoFormats.BASE64 && tx.Memos[0].data) {
 
-            // If our account is the destination host account, then decrypt the payload.
+            // If our account is the destination host account, then decrypt the payload if it is encrypted.
             let payload = tx.Memos[0].data;
-            if (tx.Destination === this.xrplAcc.address) {
-                const decrypted = this.accKeyPair && await EncryptionHelper.decrypt(this.accKeyPair.privateKey, payload);
-                if (decrypted)
-                    payload = decrypted;
-                else
-                    console.log('Failed to decrypt acquire data.');
+            if (tx.Memos[0].format === MemoFormats.BASE64 && tx.Destination === this.xrplAcc.address) {
+                const prefixBuf = (Buffer.from(payload, 'base64')).slice(0, 1);
+                if (prefixBuf.readInt8() == 1) { // 1 denoted the data is encrypted
+                    payload = Buffer.from(payload, 'base64').slice(1).toString('base64');
+                    const decrypted = this.messagePrivateKey && await EncryptionHelper.decrypt(this.messagePrivateKey, payload);
+                    if (decrypted)
+                        payload = decrypted;
+                    else
+                        console.log('Failed to decrypt acquire data.');
+                }
+                else {
+                    payload = JSON.parse(Buffer.from(payload, 'base64').slice(1).toString());
+                }
             }
 
             return {
@@ -12005,13 +12015,20 @@ class BaseEvernodeClient {
             let payload = tx.Memos[0].data;
             const acquireRefId = eventData;
 
-            // If our account is the destination user account, then decrypt the payload.
+            // If our account is the destination user account, then decrypt the payload if it is encrypted.
             if (tx.Memos[0].format === MemoFormats.BASE64 && tx.Destination === this.xrplAcc.address) {
-                const decrypted = this.accKeyPair && await EncryptionHelper.decrypt(this.accKeyPair.privateKey, payload);
-                if (decrypted)
-                    payload = decrypted;
-                else
-                    console.log('Failed to decrypt instance data.');
+                const prefixBuf = (Buffer.from(payload, 'base64')).slice(0, 1);
+                if (prefixBuf.readInt8() == 1) { // 1 denoted the data is encrypted
+                    payload = Buffer.from(payload, 'base64').slice(1).toString('base64');
+                    const decrypted = this.messagePrivateKey && await EncryptionHelper.decrypt(this.messagePrivateKey, payload);
+                    if (decrypted)
+                        payload = decrypted;
+                    else
+                        console.log('Failed to decrypt instance data.');
+                }
+                else {
+                    payload = JSON.parse(Buffer.from(payload, 'base64').slice(1).toString());
+                }
             }
 
             return {
@@ -13043,7 +13060,7 @@ module.exports = {
 
 const { XrplConstants } = __nccwpck_require__(3307);
 const { BaseEvernodeClient } = __nccwpck_require__(6263);
-const { EvernodeEvents, EvernodeConstants, MemoFormats, EventTypes, ErrorCodes, HookParamKeys } = __nccwpck_require__(9849);
+const { EvernodeEvents, EvernodeConstants, MemoFormats, EventTypes, ErrorCodes, HookParamKeys, RegExp } = __nccwpck_require__(9849);
 const { XrplAccount } = __nccwpck_require__(9329);
 const { EncryptionHelper } = __nccwpck_require__(4832);
 const { Buffer } = __nccwpck_require__(4300);
@@ -13431,17 +13448,37 @@ class HostClient extends BaseEvernodeClient {
 
         // Encrypt the instance info with the tenant's encryption key (Specified in MessageKey field of the tenant account).
         const tenantAcc = new XrplAccount(tenantAddress, null, { xrplApi: this.xrplApi });
-        const encKey = await tenantAcc.getMessageKey();
-        if (!encKey)
-            throw "Tenant encryption key not set.";
 
-        const encrypted = await EncryptionHelper.encrypt(encKey, instanceInfo);
+        let encKey = null;
+        let doEncrypt = true;
+        // Initialize with not-encrypted prefix flag and the data.
+        let data = Buffer.concat([Buffer.from([0x00]), Buffer.from(JSON.stringify(instanceInfo))]).toString('base64');
+
+        if ('messageKey' in options) {
+            if (options.messageKey !== 'none' && RegExp.PublicPrivateKey.test(options.messageKey)) {
+                encKey = options.messageKey;
+            } else if (options.messageKey === 'none') {
+                doEncrypt = false;
+            } else
+                throw "Tenant encryption key not valid.";
+        } else {
+            encKey = await tenantAcc.getMessageKey();
+        }
+
+        if (doEncrypt) {
+            if (!encKey)
+                throw "Tenant encryption key not set.";
+            const encrypted = await EncryptionHelper.encrypt(encKey, instanceInfo);
+            // Override encrypted prefix flag and the data.
+            data = Buffer.concat([Buffer.from([0x01]), Buffer.from(encrypted, 'base64')]).toString('base64');
+        }
+
         return this.xrplAcc.makePayment(tenantAddress,
             XrplConstants.MIN_XRP_AMOUNT,
             XrplConstants.XRP,
             null,
             [
-                { type: EventTypes.ACQUIRE_SUCCESS, format: MemoFormats.BASE64, data: encrypted }
+                { type: EventTypes.ACQUIRE_SUCCESS, format: MemoFormats.BASE64, data: data }
             ],
             {
                 hookParams: [
@@ -13643,8 +13680,9 @@ module.exports = {
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const { BaseEvernodeClient } = __nccwpck_require__(6263);
-const { EvernodeEvents, MemoFormats, EventTypes, ErrorCodes, ErrorReasons, EvernodeConstants, HookParamKeys } = __nccwpck_require__(9849);
+const { EvernodeEvents, MemoFormats, EventTypes, ErrorCodes, ErrorReasons, EvernodeConstants, HookParamKeys, RegExp } = __nccwpck_require__(9849);
 const { EncryptionHelper } = __nccwpck_require__(4832);
+const { Buffer } = __nccwpck_require__(4300);
 const { XrplAccount } = __nccwpck_require__(9329);
 const { UtilHelpers } = __nccwpck_require__(6687);
 const { EvernodeHelpers } = __nccwpck_require__(2523);
@@ -13729,20 +13767,37 @@ class TenantClient extends BaseEvernodeClient {
         if (!buyUriOffer)
             throw { reason: ErrorReasons.NO_OFFER, error: "No offers available." };
 
-        // Encrypt the requirements with the host's encryption key (Specified in MessageKey field of the host account).
-        const encKey = await hostAcc.getMessageKey();
-        if (!encKey)
-            throw { reason: ErrorReasons.INTERNAL_ERR, error: "Host encryption key not set." };
+        let encKey = null;
+        let doEncrypt = true;
+        // Initialize with not-encrypted prefix flag and the data.
+        let data = Buffer.concat([Buffer.from([0x00]), Buffer.from(JSON.stringify(requirement))]).toString('base64');
+
+        if ('messageKey' in options) {
+            if (options.messageKey !== 'none' && RegExp.PublicPrivateKey.test(options.messageKey)) {
+                encKey = options.messageKey;
+            } else if (options.messageKey === 'none') {
+                doEncrypt = false;
+            } else
+                throw "Tenant encryption key not valid.";
+        } else {
+            encKey = await hostAcc.getMessageKey();
+        }
 
-        const ecrypted = await EncryptionHelper.encrypt(encKey, requirement, {
-            iv: options.iv, // Must be null or 16 bytes.
-            ephemPrivateKey: options.ephemPrivateKey // Must be null or 32 bytes.
-        });
+        if (doEncrypt) {
+            if (!encKey)
+                throw "Tenant encryption key not set.";
+            const encrypted = await EncryptionHelper.encrypt(encKey, requirement, {
+                iv: options.iv, // Must be null or 16 bytes.
+                ephemPrivateKey: options.ephemPrivateKey // Must be null or 32 bytes.
+            });
+            // Override encrypted prefix flag and the data.
+            data = Buffer.concat([Buffer.from([0x01]), Buffer.from(encrypted, 'base64')]).toString('base64');
+        }
 
         return this.xrplAcc.buyURIToken(
             buyUriOffer,
             [
-                { type: EventTypes.ACQUIRE_LEASE, format: MemoFormats.BASE64, data: ecrypted }
+                { type: EventTypes.ACQUIRE_LEASE, format: MemoFormats.BASE64, data: data }
             ],
             {
                 hookParams: [
@@ -14566,6 +14621,10 @@ const URITokenTypes = {
     REGISTRATION_URI_TOKEN: 2
 }
 
+const RegExp = {
+    PublicPrivateKey: /^[0-9A-Fa-f]{66}$/
+}
+
 module.exports = {
     EvernodeConstants,
     EventTypes,
@@ -14575,7 +14634,8 @@ module.exports = {
     HookStateKeys,
     EvernodeEvents,
     URITokenTypes,
-    HookParamKeys
+    HookParamKeys,
+    RegExp
 }
 
 /***/ }),
@@ -15805,7 +15865,7 @@ class UtilHelpers {
             leaseIndex: uriBuf.readUint16BE(prefixLen),
             halfTos: uriBuf.slice(prefixLen + 2, halfToSLen),
             leaseAmount: parseFloat(XflHelpers.toString(uriBuf.readBigInt64BE(prefixLen + 2 + halfToSLen))),
-            identifier: uriBuf.readUInt32BE(prefixLen + 10 + halfToSLen)
+            identifier: uriBuf.length >= (prefixLen + 10 + halfToSLen) ? uriBuf.readUInt32BE(prefixLen + 10 + halfToSLen) : null
         }
     }
 
@@ -16952,6 +17012,11 @@ class XrplApi {
         }
     }
 
+    async getTxnInfo(txnHash, options) {
+        const resp = (await this.#client.request({ command: 'tx', transaction: txnHash, binary: false, ...options }));
+        return resp?.result;
+    }
+
     async submitAndVerify(tx, options) {
         return await this.#client.submitAndWait(tx, options);
     }

package/package.json

@@ -6,7 +6,7 @@
     ],
     "homepage": "https://github.com/HotPocketDev/evernode-js-client",
     "license": "MIT",
-    "version": "0.6.2",
+    "version": "0.6.4",
     "dependencies": {
         "elliptic": "6.5.4",
         "libsodium-wrappers": "0.7.10",