evernode-js-client 0.6.21-definition-1.7 → 0.6.21-definition-1.8

package/index.js

@@ -52626,8 +52626,8 @@ class BaseEvernodeClient {
 
         if (validPrune) {
             await this.xrplAcc.makePayment(this.config.registryAddress,
-                XrplConstants.MIN_XRP_AMOUNT,
-                XrplConstants.XRP,
+                XrplConstants.MIN_DROPS,
+                null,
                 null,
                 null,
                 {
@@ -52846,8 +52846,8 @@ class BaseEvernodeClient {
     async _withdraw(candidateId, options = {}) {
         const candidateIdBuf = Buffer.from(candidateId, 'hex');
         return await this.xrplAcc.makePayment(this.governorAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             null,
             {
@@ -52962,8 +52962,8 @@ class FoundationClient extends BaseEvernodeClient {
         voteBuf.writeUInt8(vote, CANDIDATE_VOTE_VALUE_PARAM_OFFSET);
 
         return await this.xrplAcc.makePayment(this.config.heartbeatAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             null,
             {
@@ -53031,8 +53031,8 @@ class FoundationClient extends BaseEvernodeClient {
         modeBuf.writeUInt8(mode);
 
         return await this.xrplAcc.makePayment(this.governorAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             null,
             {
@@ -53060,8 +53060,8 @@ class FoundationClient extends BaseEvernodeClient {
         reputationBuf.writeUInt8(reputation, REPUTATION_VALUE_PARAM_OFFSET)
 
         return await this.xrplAcc.makePayment(this.config.registryAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             null,
             {
@@ -53642,8 +53642,8 @@ class HostClient extends BaseEvernodeClient {
         const regUriToken = await this.getRegistrationUriToken();
 
         await this.xrplAcc.makePayment(this.config.registryAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             null,
             {
@@ -53703,8 +53703,8 @@ class HostClient extends BaseEvernodeClient {
         }
 
         return await this.xrplAcc.makePayment(this.config.registryAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             null,
             {
@@ -53734,8 +53734,8 @@ class HostClient extends BaseEvernodeClient {
 
         try {
             const res = await this.xrplAcc.makePayment(this.config.heartbeatAddress,
-                XrplConstants.MIN_XRP_AMOUNT,
-                XrplConstants.XRP,
+                XrplConstants.MIN_DROPS,
+                null,
                 null,
                 null,
                 {
@@ -53798,8 +53798,8 @@ class HostClient extends BaseEvernodeClient {
         }
 
         return this.xrplAcc.makePayment(tenantAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             [
                 { type: EventTypes.ACQUIRE_SUCCESS, format: MemoFormats.BASE64, data: data }
@@ -53853,8 +53853,8 @@ class HostClient extends BaseEvernodeClient {
         buf.writeUInt32BE(expiryMoment);
 
         return this.xrplAcc.makePayment(tenantAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             [
                 { type: EventTypes.EXTEND_SUCCESS, format: MemoFormats.HEX, data: buf.toString('hex') }
@@ -53928,8 +53928,8 @@ class HostClient extends BaseEvernodeClient {
      */
     async requestRebate(options = {}) {
         return this.xrplAcc.makePayment(this.config.registryAddress,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             [
                 { type: EventTypes.HOST_REBATE, format: "", data: "" }
@@ -53965,8 +53965,8 @@ class HostClient extends BaseEvernodeClient {
         const regUriToken = await this.getRegistrationUriToken();
 
         await this.xrplAcc.sellURIToken(regUriToken.index,
-            XrplConstants.MIN_XRP_AMOUNT,
-            XrplConstants.XRP,
+            XrplConstants.MIN_DROPS,
+            null,
             null,
             this.config.registryAddress,
             null,
@@ -54099,7 +54099,7 @@ class TenantClient extends BaseEvernodeClient {
     async getLeaseHost(hostAddress) {
         const host = new XrplAccount(hostAddress, null, { xrplApi: this.xrplApi });
         // Find an owned URI token with matching Evernode host NFT prefix.
-        const uriToken = (await host.getURITokens()).find(n => n.URI.startsWith(EvernodeConstants.TOKEN_PREFIX_HEX));
+        const uriToken = (await host.getURITokens()).find(n => n.URI.startsWith(EvernodeConstants.TOKEN_PREFIX_HEX) && n.Issuer === this.config.registryAddress);
         if (!uriToken)
             throw { reason: ErrorReasons.HOST_INVALID, error: "Host is not registered." };
 
@@ -55083,7 +55083,6 @@ module.exports = {
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
 const { EvernodeConstants, URITokenTypes } = __nccwpck_require__(9849);
-const { UtilHelpers } = __nccwpck_require__(6687);
 const { TransactionHelper } = __nccwpck_require__(7071);
 
 const NFT_PAGE_LEDGER_ENTRY_TYPE_HEX = '0050';
@@ -56771,12 +56770,12 @@ class XrplAccount {
         return await this.#prepareSubmissionTransaction(signerListTx, options);
     }
 
-    async makePayment(toAddr, amount, currency, issuer = null, memos = null, options = {}) {
+    async makePayment(toAddr, amount, currency = null, issuer = null, memos = null, options = {}) {
         const preparedTxn = await this.prepareMakePayment(toAddr, amount, currency, issuer, memos, options);
         return await this.signAndSubmit(preparedTxn);
     }
 
-    async prepareMakePayment(toAddr, amount, currency, issuer = null, memos = null, options = {}) {
+    async prepareMakePayment(toAddr, amount, currency = null, issuer = null, memos = null, options = {}) {
 
         const amountObj = makeAmountObject(amount, currency, issuer);
 
@@ -57309,13 +57308,11 @@ class XrplAccount {
     }
 }
 
-function makeAmountObject(amount, currency, issuer) {
+function makeAmountObject(amount, currency = null, issuer = null) {
     if (typeof amount !== 'string')
         throw "Amount must be a string.";
-    if (currency !== XrplConstants.XRP && !issuer)
-        throw "Non-XRP currency must have an issuer.";
 
-    const amountObj = (currency == XrplConstants.XRP) ? amount : {
+    const amountObj = !issuer ? amount : {
         currency: currency,
         issuer: issuer,
         value: amount
@@ -57940,7 +57937,9 @@ const XrplApiEvents = {
 const XrplConstants = {
     MAX_LEDGER_OFFSET: 10,
     XRP: 'XRP',
-    MIN_XRP_AMOUNT: '1' // drops
+    XAH: 'XAH',
+    MIN_XRP_AMOUNT: '1', // drops - deprecated
+    MIN_DROPS: '1'
 }
 
 const XrplTransactionTypes = {

package/package.json

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