@helium/spl-utils 0.0.4 → 0.0.6

package/lib/cjs/accountFetchCache/accountFetchCache.js

@@ -69,12 +69,17 @@ class AccountFetchCache {
         connection.sendRawTransaction = function overloadedSendRawTransaction(rawTransaction, options) {
             return __awaiter(this, void 0, void 0, function* () {
                 const result = yield self.oldSendRawTransaction(rawTransaction, options);
-                const instructions = web3_js_1.Transaction.from(rawTransaction).instructions;
-                this.confirmTransaction(result, "finalized")
-                    .then(() => {
-                    return self.requeryMissing(instructions);
-                })
-                    .catch(console.error);
+                try {
+                    const instructions = web3_js_1.Transaction.from(rawTransaction).instructions;
+                    this.confirmTransaction(result, "finalized")
+                        .then(() => {
+                        return self.requeryMissing(instructions);
+                    })
+                        .catch(console.error);
+                }
+                catch (e) {
+                    // TODO: handle transaction v2
+                }
                 return result;
             });
         };
@@ -117,7 +122,7 @@ class AccountFetchCache {
             const currentBatch = this.currentBatch;
             this.currentBatch = new Set(); // Erase current batch from state, so we can fetch multiple at a time
             try {
-                console.log(`Batching account fetch of ${currentBatch.size}`);
+                console.log("accountFetchCache", `Batching account fetch of ${currentBatch.size}`);
                 const keys = Array.from(currentBatch);
                 const array = yield this.connection.getMultipleAccountsInfo(keys.map(b => new web3_js_1.PublicKey(b)), this.commitment);
                 keys.forEach((key, index) => {
@@ -245,9 +250,15 @@ class AccountFetchCache {
         });
     }
     onAccountChange(key, parser, account) {
-        const parsed = this.getParsed(key, account, parser);
-        const address = key.toBase58();
-        this.updateCache(address, parsed || null);
+        try {
+            const parsed = this.getParsed(key, account, parser);
+            const address = key.toBase58();
+            console.log("accountFetchCache", `Received account change ${key}`, parsed);
+            this.updateCache(address, parsed || null);
+        }
+        catch (e) {
+            console.error("accountFetchCache", "Failed to update account", e);
+        }
     }
     watch(id, parser, exists = true) {
         const address = id.toBase58();
@@ -295,7 +306,15 @@ class AccountFetchCache {
                 const subscriptionId = this.accountChangeListeners.get(address);
                 if (subscriptionId) {
                     this.accountChangeListeners.delete(address);
-                    this.connection.removeAccountChangeListener(subscriptionId);
+                    try {
+                        this.connection.removeAccountChangeListener(subscriptionId);
+                    }
+                    catch (e) {
+                        if (e.toString().includes("not implemented")) {
+                            // @ts-ignore
+                            this.usableConnection.removeAccountChangeListener(subscriptionId);
+                        }
+                    }
                 }
                 this.missingAccounts.delete(address);
             }

package/lib/cjs/accountFetchCache/accountFetchCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"accountFetchCache.js","sourceRoot":"","sources":["../../../src/accountFetchCache/accountFetchCache.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CASyB;AACzB,iDAA8C;AAGjC,QAAA,kBAAkB,GAAG,EAAE,CAAC;AACxB,QAAA,aAAa,GAAG,EAAE,CAAC;AAkBhC,SAAS,oBAAoB,CAC3B,YAAsC;IAEtC,OAAO,YAAY;SAChB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SACtB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;SAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC;AAED,IAAI,EAAE,GAAG,CAAC,CAAC;AAEX,MAAa,iBAAiB;IAoC5B,YAAY,EACV,UAAU,EACV,SAAS,GAAG,0BAAkB,EAC9B,KAAK,GAAG,qBAAa,EACrB,UAAU,EACV,mBAAmB,GAAG,KAAK,EAC3B,gBAAgB,GAAG,KAAK,GASzB;QA9CD,yBAAoB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACjD,2BAAsB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACnD,YAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5B,oBAAe,GAAG,IAAI,GAAG,EAA8C,CAAC;QACxE,iBAAY,GAAG,IAAI,GAAG,EAA6C,CAAC;QACpE,uBAAkB,GAAG,IAAI,GAAG,EAA8C,CAAC;QAC3E,YAAO,GAA0B,IAAI,CAAC;QACtC,iBAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,qBAAgB,GAAG,IAAI,GAAG,EAGvB,CAAC;QACJ,iBAAY,GAAG,IAAI,GAAG,EAA+C,CAAC;QACtE,YAAO,GAAG,IAAI,2BAAY,EAAE,CAAC;QAkC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,WAAW,CAChC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAC5B,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,IAAI,CAAC,qBAAqB;YACxB,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,MAAM,IAAI,GAAG,IAAI,CAAC;QAElB,IAAI,gBAAgB,EAAE;YACpB,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEpE,UAAU,CAAC,cAAc,GAAG,CAC1B,SAAoB,EACpB,GAAgB,EACqB,EAAE;gBACvC,IACE,CAAC,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,UAAU;oBAC5C,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,WAAW,EACpD;oBACA,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oBAC/D,UAAU,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,gBAAgB;oBAChD,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,KAAI,IAAI,CAAC;iBAChC;gBAED,OAAO,IAAI,CAAC,iBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC;SACH;QACD,UAAU,CAAC,eAAe,GAAG,SAAe,yBAAyB,CACnE,WAAwB,EACxB,OAAsB,EACtB,OAAqB;;gBAErB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAE5E,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC;qBACzC,IAAI,CAAC,GAAG,EAAE;oBACT,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBACvD,CAAC,CAAC;qBACD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACxB,OAAO,MAAM,CAAC;YAChB,CAAC;SAAA,CAAC;QAEF,UAAU,CAAC,kBAAkB,GAAG,SAAe,4BAA4B,CACzE,cAAmD,EACnD,OAAqB;;gBAErB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBACzE,MAAM,YAAY,GAAG,qBAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC;gBAEnE,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC;qBACzC,IAAI,CAAC,GAAG,EAAE;oBACT,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;gBAC3C,CAAC,CAAC;qBACD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAExB,OAAO,MAAM,CAAC;YAChB,CAAC;SAAA,CAAC;IACJ,CAAC;IAEK,cAAc,CAAC,YAAsC;;YACzD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACrE,CAAC,CAAC,QAAQ,EAAE,CACb,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,CACf,iBAAiB,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;gBACtC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACjD,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAChD,IAAI,mBAAS,CAAC,OAAO,CAAC,EACtB,MAAM,EACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EACzB,IAAI,CACL,CAAC;gBACF,OAAO,EAAE,CAAC;gBACV,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;iBACtC;YACH,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,YAAY;;YAChB,IAAI;gBACF,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAC3B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CACf,IAAI,CAAC,cAAc,CACjB,IAAI,mBAAS,CAAC,OAAO,CAAC,EACtB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EACzB,IAAI,CACL,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,4CAA4C;iBACnF,CACF,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,kDAAkD;gBAClD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClB;QACH,CAAC;KAAA;IAED,KAAK;QACH,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC;SACzD;QACD,IAAI,CAAC,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAC1D,IAAI,CAAC,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAChE,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACtC,CAAC;IAEK,UAAU;;YACd,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YACvC,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,qEAAqE;YACpG,IAAI;gBACF,OAAO,CAAC,GAAG,CAAC,6BAA6B,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;gBAC9D,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;gBAC7G,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAChD,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC,CAAC,CAAC;gBAEH,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;aACxB;YAAC,OAAO,CAAM,EAAE;gBACf,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAChD,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,CAAC;aACT;QACH,CAAC;KAAA;IAEK,UAAU,CAAC,EAAa;;YAC5B,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAE5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAE7B,IAAI,CAAC,OAAO,IAAI,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnD,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,0BAAkB,EAAE;gBAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;aACnB;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;aAChE;YAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;oBAC7C,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACpC,IAAI,GAAG,EAAE;wBACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;qBACpB;oBACD,OAAO,CAAC,IAAK,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IAEK,KAAK;;YACT,IAAI,CAAC,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC;KAAA;IAEK,cAAc,CAClB,MAA0B,EAC1B,MAAqC,EACrC,WAAoB,KAAK,EAAE,kDAAkD;IAC7E,YAAY,GAAG,KAAK;;YAEpB,IAAI,EAAa,CAAC;YAClB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,EAAE,GAAG,IAAI,mBAAS,CAAC,MAAM,CAAC,CAAC;aAC5B;iBAAM;gBACL,EAAE,GAAG,MAAM,CAAC;aACb;YACD,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;aAC9B;YAED,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAE9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;YACvE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,UAAU,IAAI,IAAI,EAAE;gBACzD,IAAI,CAAC,WAAW,CAAI,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC;aAC5C;YAED,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,CAAC;KAAA;IAEK,WAAW,CAAI,EAAU,EAAE,IAAiC;;YAChE,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC;YAExC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7E,CAAC;KAAA;IAOD,mEAAmE;IAC7D,MAAM,CACV,MAA0B,EAC1B,MAAqC,EACrC,WAAoB,KAAK,EAAE,kDAAkD;IAC7E,YAAY,GAAG,KAAK;;YAEpB,IAAI,EAAa,CAAC;YAClB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,EAAE,GAAG,IAAI,mBAAS,CAAC,MAAM,CAAC,CAAC;aAC5B;iBAAM;gBACL,EAAE,GAAG,MAAM,CAAC;aACb;YAED,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAEhC,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC9B,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAC3B;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,4EAA4E;aAC3G;YAED,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACnD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC9C,OAAO,MAAM,IAAI,IAAI;oBACnB,CAAC,CAAC,SAAS;oBACX,CAAC,CAAE,MAA2C,CAAC;aAClD;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAElD,CAAC;YACF,IAAI,CAAC,YAAY,IAAI,aAAa,EAAE;gBAClC,OAAO,aAAa,CAAC;aACtB;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAClC,IAAI,CAAC,IAAI,EAAE;oBACT,OAAO,SAAS,CAAC;iBAClB;gBAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjD,MAAM,EAAE,EAAE;oBACV,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,SAAS;iBAChB,CAAC;gBAEF,sHAAsH;gBACtH,uEAAuE;gBACvE,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE;oBACrC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;iBACnC;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAY,CAAC,CAAC;YAE7C,OAAO,KAAK,CAAC;QACf,CAAC;KAAA;IAED,eAAe,CACb,GAAc,EACd,MAAoC,EACpC,OAA4B;QAE5B,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CACH,EAAa,EACb,MAAqC,EACrC,SAAkB,IAAI;QAEtB,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,QAAQ,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACjE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEjD,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;YACvB,2CAA2C;YAC3C,2BAA2B;YAC3B,oFAAoF;YAClF,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC7C,IAAI;oBACF,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAC7B,OAAO,EACP,IAAI,CAAC,UAAU,CAAC,eAAe,CAC7B,EAAE,EACF,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EACzD,IAAI,CAAC,UAAU,CAChB,CACF,CAAC;iBACH;gBAAC,OAAO,CAAM,EAAE;oBACf,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;wBAC5C,aAAa;wBACb,IAAI,CAAC,gBAAgB;4BACnB,aAAa;4BACb,IAAI,CAAC,gBAAgB;gCACrB,IAAI,oBAAU;gCACZ,aAAa;gCACb,IAAI,CAAC,UAAU,CAAC,YAAY,EAC5B,IAAI,CAAC,UAAU,CAChB,CAAC;wBACJ,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAC7B,OAAO;wBACP,aAAa;wBACb,IAAI,CAAC,gBAAgB,CAAC,eAAe,CACnC,EAAE;wBACF,aAAa;wBACb,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EACzD,IAAI,CAAC,UAAU,CAChB,CACF,CAAC;qBACH;yBAAM;wBACL,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;wBAChB,MAAM,CAAC,CAAA;qBACR;iBACF;aACF;SACJ;aAAM,IAAI,CAAC,MAAM,EAAE;YAClB,iCAAiC;YACjC,IAAI,CAAC,eAAe,CAAC,GAAG,CACtB,OAAO,EACP,MAAM,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAC5C,CAAC;SACH;QAED,OAAO,GAAG,EAAE;YACV,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAE,GAAG,CAAC,CAAC;YAC7D,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAEjD,IAAI,QAAQ,IAAI,CAAC,EAAE;gBACjB,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAChE,IAAI,cAAc,EAAE;oBAClB,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC5C,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;iBAC7D;gBACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACtC;QACH,CAAC,CAAC;IACJ,CAAC;IAEK,KAAK,CACT,MAA0B,EAC1B,MAAyB;;YAEzB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC9C,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACtC;YAED,OAAO,GAAG,CAAC;QACb,CAAC;KAAA;IAED,SAAS,CACP,EAAsB,EACtB,GAAwB,EACxB,MAAyB;QAEzB,MAAM,OAAO,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,QAAQ,EAAE,CAAC;QAC7D,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAChC,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC;YACvD,iBAAiB,CAAC,aAAa,CAAqB,CAAC;QACvD,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,mBAAS,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;gBACL,MAAM,EAAE,IAAI,mBAAS,CAAC,EAAE,CAAC;gBACzB,OAAO,EAAE,GAAG;aACb,CAAC;SACH;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,MAA0B;QAC5B,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;SACzB;aAAM;YACL,GAAG,GAAG,MAAM,CAAC;SACd;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,MAA0B;QAC/B,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;SACzB;aAAM;YACL,GAAG,GAAG,MAAM,CAAC;SACd;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACzC;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,QAAQ,CAAI,MAAwB;QAClC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE;YAC/C,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,MAAM,EAAE;gBAC9C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACjB;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,cAAc,CACZ,MAA0B,EAC1B,MAAoC;QAEpC,IAAI,MAAM,EAAE;YACV,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC;YACzE,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACnD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC9C,IAAI,MAAM,EAAE;oBACV,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;oBACrD,IAAI,MAAM,EAAE;wBACV,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;qBACxC;iBACF;aACF;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;;AAnfH,8CAofC;AAtPQ,+BAAa,GAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IAC/D,MAAM;IACN,OAAO;CACR,CAAC,CAAC"}
+{"version":3,"file":"accountFetchCache.js","sourceRoot":"","sources":["../../../src/accountFetchCache/accountFetchCache.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CASyB;AACzB,iDAA8C;AAGjC,QAAA,kBAAkB,GAAG,EAAE,CAAC;AACxB,QAAA,aAAa,GAAG,EAAE,CAAC;AAkBhC,SAAS,oBAAoB,CAC3B,YAAsC;IAEtC,OAAO,YAAY;SAChB,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;SACtB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;SAC3B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAC1B,CAAC;AAED,IAAI,EAAE,GAAG,CAAC,CAAC;AAEX,MAAa,iBAAiB;IAoC5B,YAAY,EACV,UAAU,EACV,SAAS,GAAG,0BAAkB,EAC9B,KAAK,GAAG,qBAAa,EACrB,UAAU,EACV,mBAAmB,GAAG,KAAK,EAC3B,gBAAgB,GAAG,KAAK,GASzB;QA9CD,yBAAoB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACjD,2BAAsB,GAAG,IAAI,GAAG,EAAkB,CAAC;QACnD,YAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QAC5B,oBAAe,GAAG,IAAI,GAAG,EAA8C,CAAC;QACxE,iBAAY,GAAG,IAAI,GAAG,EAA6C,CAAC;QACpE,uBAAkB,GAAG,IAAI,GAAG,EAA8C,CAAC;QAC3E,YAAO,GAA0B,IAAI,CAAC;QACtC,iBAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,qBAAgB,GAAG,IAAI,GAAG,EAGvB,CAAC;QACJ,iBAAY,GAAG,IAAI,GAAG,EAA+C,CAAC;QACtE,YAAO,GAAG,IAAI,2BAAY,EAAE,CAAC;QAkC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,WAAW,CAChC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAC5B,mBAAmB,CACpB,CAAC;QAEF,IAAI,CAAC,kBAAkB,GAAG,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,IAAI,CAAC,qBAAqB;YACxB,UAAU,CAAC,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAEjD,MAAM,IAAI,GAAG,IAAI,CAAC;QAElB,IAAI,gBAAgB,EAAE;YACpB,IAAI,CAAC,iBAAiB,GAAG,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAEpE,UAAU,CAAC,cAAc,GAAG,CAC1B,SAAoB,EACpB,GAAgB,EACqB,EAAE;gBACvC,IACE,CAAC,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,UAAU;oBAC5C,OAAO,CAAC,GAAG,IAAI,UAAU,CAAC,UAAU,CAAC,IAAI,WAAW,EACpD;oBACA,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oBAC/D,UAAU,CAAC,OAAO,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,gBAAgB;oBAChD,OAAO,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,KAAI,IAAI,CAAC;iBAChC;gBAED,OAAO,IAAI,CAAC,iBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC;SACH;QACD,UAAU,CAAC,eAAe,GAAG,SAAe,yBAAyB,CACnE,WAAwB,EACxB,OAAsB,EACtB,OAAqB;;gBAErB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;gBAE5E,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC;qBACzC,IAAI,CAAC,GAAG,EAAE;oBACT,OAAO,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC;gBACvD,CAAC,CAAC;qBACD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBACxB,OAAO,MAAM,CAAC;YAChB,CAAC;SAAA,CAAC;QAEF,UAAU,CAAC,kBAAkB,GAAG,SAAe,4BAA4B,CACzE,cAAmD,EACnD,OAAqB;;gBAErB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;gBAEzE,IAAI;oBACF,MAAM,YAAY,GAAG,qBAAW,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,YAAY,CAAC;oBAEnE,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,WAAW,CAAC;yBACzC,IAAI,CAAC,GAAG,EAAE;wBACT,OAAO,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;oBAC3C,CAAC,CAAC;yBACD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;iBACzB;gBAAC,OAAM,CAAM,EAAE;oBACd,8BAA8B;iBAC/B;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC;SAAA,CAAC;IACJ,CAAC;IAEK,cAAc,CAAC,YAAsC;;YACzD,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACrE,CAAC,CAAC,QAAQ,EAAE,CACb,CAAC;YACF,MAAM,OAAO,CAAC,GAAG,CACf,iBAAiB,CAAC,GAAG,CAAC,CAAO,OAAO,EAAE,EAAE;gBACtC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBACjD,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,MAAM,IAAI,CAAC,cAAc,CAChD,IAAI,mBAAS,CAAC,OAAO,CAAC,EACtB,MAAM,EACN,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EACzB,IAAI,CACL,CAAC;gBACF,OAAO,EAAE,CAAC;gBACV,IAAI,KAAK,EAAE;oBACT,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;iBACtC;YACH,CAAC,CAAA,CAAC,CACH,CAAC;QACJ,CAAC;KAAA;IAEK,YAAY;;YAChB,IAAI;gBACF,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,GAAG,CAC3B,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CACf,IAAI,CAAC,cAAc,CACjB,IAAI,mBAAS,CAAC,OAAO,CAAC,EACtB,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EACjC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EACzB,IAAI,CACL,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,4CAA4C;iBACnF,CACF,CAAC;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,kDAAkD;gBAClD,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAClB;QACH,CAAC;KAAA;IAED,KAAK;QACH,IAAI,IAAI,CAAC,iBAAiB,EAAE;YAC1B,IAAI,CAAC,UAAU,CAAC,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC;SACzD;QACD,IAAI,CAAC,UAAU,CAAC,eAAe,GAAG,IAAI,CAAC,kBAAkB,CAAC;QAC1D,IAAI,CAAC,UAAU,CAAC,kBAAkB,GAAG,IAAI,CAAC,qBAAqB,CAAC;QAChE,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IACtC,CAAC;IAEK,UAAU;;YACd,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;YACvC,IAAI,CAAC,YAAY,GAAG,IAAI,GAAG,EAAE,CAAC,CAAC,qEAAqE;YACpG,IAAI;gBACF,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,6BAA6B,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;gBACnF,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBACtC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAuB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAA;gBAC7G,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE;oBAC1B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAChD,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;gBAC3C,CAAC,CAAC,CAAC;gBAEH,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;aACxB;YAAC,OAAO,CAAM,EAAE;gBACf,YAAY,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBAC3B,MAAM,QAAQ,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;oBAChD,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;gBACH,MAAM,CAAC,CAAC;aACT;QACH,CAAC;KAAA;IAEK,UAAU,CAAC,EAAa;;YAC5B,MAAM,KAAK,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAE5B,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAE7B,IAAI,CAAC,OAAO,IAAI,IAAI,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnD,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,GAAG,0BAAkB,EAAE;gBAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;aACnB;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;aAChE;YAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBACnE,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;oBAC7C,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oBACpC,IAAI,GAAG,EAAE;wBACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;qBACpB;oBACD,OAAO,CAAC,IAAK,CAAC,CAAC;gBACjB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;YAEH,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;IAEK,KAAK;;YACT,IAAI,CAAC,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAC1B,CAAC;KAAA;IAEK,cAAc,CAClB,MAA0B,EAC1B,MAAqC,EACrC,WAAoB,KAAK,EAAE,kDAAkD;IAC7E,YAAY,GAAG,KAAK;;YAEpB,IAAI,EAAa,CAAC;YAClB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,EAAE,GAAG,IAAI,mBAAS,CAAC,MAAM,CAAC,CAAC;aAC5B;iBAAM;gBACL,EAAE,GAAG,MAAM,CAAC;aACb;YACD,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO,CAAC,SAAS,EAAE,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;aAC9B;YAED,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAE9B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC;YACvE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAClD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,UAAU,IAAI,IAAI,EAAE;gBACzD,IAAI,CAAC,WAAW,CAAI,OAAO,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC;aAC5C;YAED,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACzB,CAAC;KAAA;IAEK,WAAW,CAAI,EAAU,EAAE,IAAiC;;YAChE,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,IAAI,IAAI,CAAC,CAAC;YAExC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QAC7E,CAAC;KAAA;IAOD,mEAAmE;IAC7D,MAAM,CACV,MAA0B,EAC1B,MAAqC,EACrC,WAAoB,KAAK,EAAE,kDAAkD;IAC7E,YAAY,GAAG,KAAK;;YAEpB,IAAI,EAAa,CAAC;YAClB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;gBAC9B,EAAE,GAAG,IAAI,mBAAS,CAAC,MAAM,CAAC,CAAC;aAC5B;iBAAM;gBACL,EAAE,GAAG,MAAM,CAAC;aACb;YAED,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAEhC,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;YAC9B,IAAI,QAAQ,EAAE;gBACZ,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;aAC3B;iBAAM,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACpC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,4EAA4E;aAC3G;YAED,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACnD,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC9C,OAAO,MAAM,IAAI,IAAI;oBACnB,CAAC,CAAC,SAAS;oBACX,CAAC,CAAE,MAA2C,CAAC;aAClD;YAED,MAAM,aAAa,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAElD,CAAC;YACF,IAAI,CAAC,YAAY,IAAI,aAAa,EAAE;gBAClC,OAAO,aAAa,CAAC;aACtB;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC9C,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;gBAClC,IAAI,CAAC,IAAI,EAAE;oBACT,OAAO,SAAS,CAAC;iBAClB;gBAED,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI;oBACjD,MAAM,EAAE,EAAE;oBACV,OAAO,EAAE,IAAI;oBACb,IAAI,EAAE,SAAS;iBAChB,CAAC;gBAEF,sHAAsH;gBACtH,uEAAuE;gBACvE,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,CAAC,IAAI,EAAE;oBACrC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;iBACnC;gBAED,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAY,CAAC,CAAC;YAE7C,OAAO,KAAK,CAAC;QACf,CAAC;KAAA;IAED,eAAe,CACb,GAAc,EACd,MAAoC,EACpC,OAA4B;QAE5B,IAAI;YACF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YACpD,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC/B,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,2BAA2B,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;YAC3E,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,MAAM,IAAI,IAAI,CAAC,CAAC;SAC3C;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,0BAA0B,EAAE,CAAC,CAAC,CAAA;SAClE;IACH,CAAC;IAED,KAAK,CACH,EAAa,EACb,MAAqC,EACrC,SAAkB,IAAI;QAEtB,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC3C,IAAI,QAAQ,GAAG,CAAC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACjE,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAEjD,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE;YACvB,2CAA2C;YAC3C,2BAA2B;YAC3B,oFAAoF;YAClF,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBAC7C,IAAI;oBACF,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAC7B,OAAO,EACP,IAAI,CAAC,UAAU,CAAC,eAAe,CAC7B,EAAE,EACF,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EACzD,IAAI,CAAC,UAAU,CAChB,CACF,CAAC;iBACH;gBAAC,OAAO,CAAM,EAAE;oBACf,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;wBAC5C,aAAa;wBACb,IAAI,CAAC,gBAAgB;4BACnB,aAAa;4BACb,IAAI,CAAC,gBAAgB;gCACrB,IAAI,oBAAU;gCACZ,aAAa;gCACb,IAAI,CAAC,UAAU,CAAC,YAAY,EAC5B,IAAI,CAAC,UAAU,CAChB,CAAC;wBACJ,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAC7B,OAAO;wBACP,aAAa;wBACb,IAAI,CAAC,gBAAgB,CAAC,eAAe,CACnC,EAAE;wBACF,aAAa;wBACb,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EACzD,IAAI,CAAC,UAAU,CAChB,CACF,CAAC;qBACH;yBAAM;wBACL,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;wBAChB,MAAM,CAAC,CAAA;qBACR;iBACF;aACF;SACJ;aAAM,IAAI,CAAC,MAAM,EAAE;YAClB,iCAAiC;YACjC,IAAI,CAAC,eAAe,CAAC,GAAG,CACtB,OAAO,EACP,MAAM,IAAI,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,CAC5C,CAAC;SACH;QAED,OAAO,GAAG,EAAE;YACV,MAAM,QAAQ,GAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,CAAE,GAAG,CAAC,CAAC;YAC7D,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAEjD,IAAI,QAAQ,IAAI,CAAC,EAAE;gBACjB,MAAM,cAAc,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAChE,IAAI,cAAc,EAAE;oBAClB,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;oBAC5C,IAAI;wBACF,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;qBAC7D;oBAAC,OAAO,CAAM,EAAE;wBACf,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE;4BAC5C,aAAa;4BACb,IAAI,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,cAAc,CAAC,CAAC;yBACnE;qBACF;iBACF;gBACD,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;aACtC;QACH,CAAC,CAAC;IACJ,CAAC;IAEK,KAAK,CACT,MAA0B,EAC1B,MAAyB;;YAEzB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC9C,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;aACtC;YAED,OAAO,GAAG,CAAC;QACb,CAAC;KAAA;IAED,SAAS,CACP,EAAsB,EACtB,GAAwB,EACxB,MAAyB;QAEzB,MAAM,OAAO,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,QAAQ,EAAE,CAAC;QAC7D,IAAI,CAAC,cAAc,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAChC,MAAM,WAAW,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC;YACvD,iBAAiB,CAAC,aAAa,CAAqB,CAAC;QACvD,MAAM,OAAO,GAAG,WAAW,CAAC,IAAI,mBAAS,CAAC,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;QACzD,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;gBACL,MAAM,EAAE,IAAI,mBAAS,CAAC,EAAE,CAAC;gBACzB,OAAO,EAAE,GAAG;aACb,CAAC;SACH;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,GAAG,CAAC,MAA0B;QAC5B,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;SACzB;aAAM;YACL,GAAG,GAAG,MAAM,CAAC;SACd;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,MAA0B;QAC/B,IAAI,GAAW,CAAC;QAChB,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;YAC9B,GAAG,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;SACzB;aAAM;YACL,GAAG,GAAG,MAAM,CAAC;SACd;QAED,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnD,IAAI,KAAK,EAAE;YACT,IAAI,CAAC,UAAU,CAAC,2BAA2B,CAAC,KAAK,CAAC,CAAC;YACnD,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SACzC;QAED,IAAI,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC9B,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;SACb;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,QAAQ,CAAI,MAAwB;QAClC,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,KAAK,MAAM,EAAE,IAAI,IAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,EAAE;YAC/C,IAAI,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,MAAM,EAAE;gBAC9C,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACjB;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,cAAc,CACZ,MAA0B,EAC1B,MAAoC;QAEpC,IAAI,MAAM,EAAE;YACV,MAAM,OAAO,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,EAAE,CAAC;YACzE,IAAI,MAAM,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;gBACnD,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;gBAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC9C,IAAI,MAAM,EAAE;oBACV,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;oBACrD,IAAI,MAAM,EAAE;wBACV,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;qBACxC;iBACF;aACF;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;;AApgBH,8CAqgBC;AAlQQ,+BAAa,GAAuB,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IAC/D,MAAM;IACN,OAAO;CACR,CAAC,CAAC"}

package/lib/cjs/accountsResolver/ataResolver.js

@@ -15,15 +15,9 @@ const spl_token_1 = require("@solana/spl-token");
 const utils_1 = require("./utils");
 function ataResolver({ instruction, account, mint, owner, }) {
     return (0, individual_1.resolveIndividual)(({ path, accounts, idlIx }) => __awaiter(this, void 0, void 0, function* () {
-        if (idlIx.name === instruction && path[path.length - 1] === account) {
-            const mintKey = (0, utils_1.get)(accounts, [
-                ...path.slice(0, path.length - 1),
-                mint,
-            ]);
-            const ownerKey = (0, utils_1.get)(accounts, [
-                ...path.slice(0, path.length - 1),
-                owner,
-            ]);
+        if (idlIx.name === instruction && path.join(".") === account) {
+            const mintKey = (0, utils_1.get)(accounts, mint.split("."));
+            const ownerKey = (0, utils_1.get)(accounts, owner.split("."));
             if (mintKey && ownerKey) {
                 return (0, spl_token_1.getAssociatedTokenAddress)(mintKey, ownerKey, true);
             }

package/lib/cjs/accountsResolver/ataResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"ataResolver.js","sourceRoot":"","sources":["../../../src/accountsResolver/ataResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6CAAiD;AACjD,iDAA8D;AAC9D,mCAA8B;AAS9B,SAAgB,WAAW,CAAuB,EAChD,WAAW,EACX,OAAO,EACP,IAAI,EACJ,KAAK,GACW;IAChB,OAAO,IAAA,8BAAiB,EAAC,CAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3D,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,OAAO,EAAE;YACnE,MAAM,OAAO,GAAG,IAAA,WAAG,EAAC,QAAQ,EAAE;gBAC5B,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjC,IAAI;aACL,CAAc,CAAC;YAChB,MAAM,QAAQ,GAAG,IAAA,WAAG,EAAC,QAAQ,EAAE;gBAC7B,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjC,KAAK;aACN,CAAc,CAAC;YAEhB,IAAI,OAAO,IAAI,QAAQ,EAAE;gBACvB,OAAO,IAAA,qCAAyB,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;aAC3D;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAvBD,kCAuBC"}
+{"version":3,"file":"ataResolver.js","sourceRoot":"","sources":["../../../src/accountsResolver/ataResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6CAAiD;AACjD,iDAA8D;AAC9D,mCAA8B;AAS9B,SAAgB,WAAW,CAAuB,EAChD,WAAW,EACX,OAAO,EACP,IAAI,EACJ,KAAK,GACW;IAChB,OAAO,IAAA,8BAAiB,EAAC,CAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3D,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE;YAC5D,MAAM,OAAO,GAAG,IAAA,WAAG,EAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAc,CAAC;YAC5D,MAAM,QAAQ,GAAG,IAAA,WAAG,EAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAc,CAAC;YAE9D,IAAI,OAAO,IAAI,QAAQ,EAAE;gBACvB,OAAO,IAAA,qCAAyB,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;aAC3D;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAjBD,kCAiBC"}

package/lib/cjs/accountsResolver/heliumCommonResolver.js

@@ -0,0 +1,33 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.heliumCommonResolver = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const individual_1 = require("./individual");
+exports.heliumCommonResolver = (0, individual_1.resolveIndividual)(({ path }) => __awaiter(void 0, void 0, void 0, function* () {
+    switch (path[path.length - 1]) {
+        case "dataCreditsProgram":
+            return new web3_js_1.PublicKey("credacwrBVewZAgCwNgowCSMbCiepuesprUWPBeLTSg");
+        case "tokenMetadataProgram":
+            return new web3_js_1.PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
+        case "heliumSubDaosProgram":
+            return new web3_js_1.PublicKey("hdaojPkgSD8bciDc1w2Z4kXFFibCXngJiw2GRpEL7Wf");
+        case "bubblegumProgram":
+            return new web3_js_1.PublicKey("BGUMAp9Gq7iTEuizy4pqaxsTyUCBK68MDfK752saRPUY");
+        case "compressionProgram":
+            return new web3_js_1.PublicKey("cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK");
+        case "logWrapper":
+            return new web3_js_1.PublicKey("noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV");
+        default:
+            return;
+    }
+}));
+//# sourceMappingURL=heliumCommonResolver.js.map

package/lib/cjs/accountsResolver/heliumCommonResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"heliumCommonResolver.js","sourceRoot":"","sources":["../../../src/accountsResolver/heliumCommonResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAE5C,6CAAiD;AAGpC,QAAA,oBAAoB,GAAG,IAAA,8BAAiB,EAAC,CAAO,EAAE,IAAI,EAAE,EAAE,EAAE;IACvE,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;QAC7B,KAAK,oBAAoB;YACvB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,sBAAsB;YACzB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,sBAAsB;YACzB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,kBAAkB;YACrB,OAAO,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;QACvE,KAAK,oBAAoB;YACvB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,YAAY;YACf,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE;YACE,OAAO;KACV;AACH,CAAC,CAAA,CAAC,CAAC"}

package/lib/cjs/constants.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MOBILE_MINT = exports.HNT_MINT = exports.DC_MINT = void 0;
 const web3_js_1 = require("@solana/web3.js");
-exports.DC_MINT = new web3_js_1.PublicKey("2SyDxfawpkdg2EojMv1ZTUiqCefYFksNXjsBZivu5dpG");
-exports.HNT_MINT = new web3_js_1.PublicKey("9PT9Um19m1JKc1sbWETxD9NySjinnNoxv7xYmvBXUqyx");
-exports.MOBILE_MINT = new web3_js_1.PublicKey("CKuwd2oB8be14g9Y94NuM87nZZzq9HXDBeEe6N3QXZdN");
+exports.DC_MINT = new web3_js_1.PublicKey("8po3rj3xE1wo5y38zW8gH2ZoTZzqowMAuD1ugBpUKj32");
+exports.HNT_MINT = new web3_js_1.PublicKey("BJUtKj5M6w69N3vcZP6n1DUVUsZSVvNRPoeqkToXEYhp");
+exports.MOBILE_MINT = new web3_js_1.PublicKey("8K38wjyEXdUX8w6GPida3X9BQhcSJ9fnVjRyUaotkqAs");
 //# sourceMappingURL=constants.js.map

package/lib/cjs/index.js

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ataResolver = exports.set = exports.get = exports.resolveIndividual = exports.combineResolvers = void 0;
+exports.getAssetProof = exports.getAsset = exports.heliumCommonResolver = exports.ataResolver = exports.set = exports.get = exports.resolveIndividual = exports.combineResolvers = void 0;
 var combineResolvers_1 = require("./accountsResolver/combineResolvers");
 Object.defineProperty(exports, "combineResolvers", { enumerable: true, get: function () { return combineResolvers_1.combineResolvers; } });
 var individual_1 = require("./accountsResolver/individual");
@@ -24,6 +24,8 @@ Object.defineProperty(exports, "get", { enumerable: true, get: function () { ret
 Object.defineProperty(exports, "set", { enumerable: true, get: function () { return utils_1.set; } });
 var ataResolver_1 = require("./accountsResolver/ataResolver");
 Object.defineProperty(exports, "ataResolver", { enumerable: true, get: function () { return ataResolver_1.ataResolver; } });
+var heliumCommonResolver_1 = require("./accountsResolver/heliumCommonResolver");
+Object.defineProperty(exports, "heliumCommonResolver", { enumerable: true, get: function () { return heliumCommonResolver_1.heliumCommonResolver; } });
 __exportStar(require("./extendBorsh"), exports);
 __exportStar(require("./transaction"), exports);
 __exportStar(require("./accountFetchCache"), exports);
@@ -32,4 +34,7 @@ __exportStar(require("./executeRemoteTxn"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./token"), exports);
 __exportStar(require("./constants"), exports);
+var mplAssetAPI_1 = require("./mplAssetAPI");
+Object.defineProperty(exports, "getAsset", { enumerable: true, get: function () { return mplAssetAPI_1.getAsset; } });
+Object.defineProperty(exports, "getAssetProof", { enumerable: true, get: function () { return mplAssetAPI_1.getAssetProof; } });
 //# sourceMappingURL=index.js.map

package/lib/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wEAAuE;AAA9D,oHAAA,gBAAgB,OAAA;AACzB,4DAAkE;AAAzD,+GAAA,iBAAiB,OAAA;AAC1B,kDAAoD;AAA3C,4FAAA,GAAG,OAAA;AAAE,4FAAA,GAAG,OAAA;AACjB,8DAA6D;AAApD,0GAAA,WAAW,OAAA;AAEpB,gDAA8B;AAC9B,gDAA8B;AAC9B,sDAAoC;AACpC,gDAA8B;AAC9B,qDAAmC;AACnC,0CAAwB;AACxB,0CAAwB;AACxB,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wEAAuE;AAA9D,oHAAA,gBAAgB,OAAA;AACzB,4DAAkE;AAAzD,+GAAA,iBAAiB,OAAA;AAC1B,kDAAoD;AAA3C,4FAAA,GAAG,OAAA;AAAE,4FAAA,GAAG,OAAA;AACjB,8DAA6D;AAApD,0GAAA,WAAW,OAAA;AACpB,gFAA+E;AAAtE,4HAAA,oBAAoB,OAAA;AAE7B,gDAA8B;AAC9B,gDAA8B;AAC9B,sDAAoC;AACpC,gDAA8B;AAC9B,qDAAmC;AACnC,0CAAwB;AACxB,0CAAwB;AACxB,8CAA4B;AAG5B,6CAAwD;AAA/C,uGAAA,QAAQ,OAAA;AAAE,4GAAA,aAAa,OAAA"}

package/lib/cjs/mplAssetAPI.js

@@ -0,0 +1,67 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAssetProof = exports.getAsset = void 0;
+const web3_js_1 = require("@solana/web3.js");
+const axios_1 = __importDefault(require("axios"));
+function getAsset(url, assetId) {
+    var _a, _b, _c, _d;
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const response = yield axios_1.default.post(url + "/get_asset", {
+                jsonrpc: "2.0",
+                method: "get_asset",
+                id: "rpd-op-123",
+                params: [assetId.toBase58()],
+            });
+            const result = response.data.result;
+            if (result) {
+                return Object.assign(Object.assign({}, result), { id: new web3_js_1.PublicKey(result.id), compression: Object.assign(Object.assign({}, result.compression), { dataHash: (_a = result.compression.dataHash) !== null && _a !== void 0 ? _a : new web3_js_1.PublicKey(result.compression.dataHash).toBase58(), creatorHash: (_b = result.compression.creatorHash) !== null && _b !== void 0 ? _b : new web3_js_1.PublicKey(result.compression.creatorHash).toBase58(), assetHash: (_c = result.compression.assetHash) !== null && _c !== void 0 ? _c : new web3_js_1.PublicKey(result.compression.assetHash).toBase58(), tree: (_d = result.compression.tree) !== null && _d !== void 0 ? _d : new web3_js_1.PublicKey(result.compression.tree).toBase58() }), ownership: Object.assign(Object.assign({}, result.ownership), { owner: new web3_js_1.PublicKey(result.ownership.owner) }) });
+            }
+        }
+        catch (error) {
+            console.error(error);
+            throw error;
+        }
+    });
+}
+exports.getAsset = getAsset;
+function getAssetProof(url, assetId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const response = yield axios_1.default.post(url + "/get_asset_proof", {
+                jsonrpc: "2.0",
+                method: "get_asset",
+                id: "rpd-op-123",
+                params: [assetId.toBase58()],
+            });
+            const result = response.data.result;
+            if (result) {
+                return {
+                    root: new web3_js_1.PublicKey(result.root),
+                    proof: result.proof.map((p) => new web3_js_1.PublicKey(p)),
+                    nodeIndex: result.node_index,
+                    leaf: new web3_js_1.PublicKey(result.leaf),
+                    treeId: new web3_js_1.PublicKey(result.tree_id),
+                };
+            }
+        }
+        catch (error) {
+            console.error(error);
+            throw error;
+        }
+    });
+}
+exports.getAssetProof = getAssetProof;
+//# sourceMappingURL=mplAssetAPI.js.map

package/lib/cjs/mplAssetAPI.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mplAssetAPI.js","sourceRoot":"","sources":["../../src/mplAssetAPI.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,kDAA0B;AA2B1B,SAAsB,QAAQ,CAAC,GAAW,EAAE,OAAkB;;;QAC5D,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,GAAG,GAAG,YAAY,EAAE;gBACpD,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,WAAW;gBACnB,EAAE,EAAE,YAAY;gBAChB,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;aAC7B,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACpC,IAAI,MAAM,EAAE;gBACV,uCACK,MAAM,KACT,EAAE,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAC5B,WAAW,kCACN,MAAM,CAAC,WAAW,KACrB,QAAQ,EAAE,MAAA,MAAM,CAAC,WAAW,CAAC,QAAQ,mCAAI,IAAI,mBAAS,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAC9F,WAAW,EAAE,MAAA,MAAM,CAAC,WAAW,CAAC,WAAW,mCAAI,IAAI,mBAAS,CAAC,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,EACvG,SAAS,EAAE,MAAA,MAAM,CAAC,WAAW,CAAC,SAAS,mCAAI,IAAI,mBAAS,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,EACjG,IAAI,EAAE,MAAA,MAAM,CAAC,WAAW,CAAC,IAAI,mCAAI,IAAI,mBAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,KAEpF,SAAS,kCACJ,MAAM,CAAC,SAAS,KACnB,KAAK,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAE9C;aACH;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,KAAK,CAAC;SACb;;CACF;AA9BD,4BA8BC;AAED,SAAsB,aAAa,CACjC,GAAW,EACX,OAAkB;;QAElB,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,GAAG,GAAG,kBAAkB,EAAE;gBAC1D,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,WAAW;gBACnB,EAAE,EAAE,YAAY;gBAChB,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;aAC7B,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACpC,IAAI,MAAM,EAAE;gBACV,OAAO;oBACL,IAAI,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,IAAI,CAAC;oBAChC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC;oBACrD,SAAS,EAAE,MAAM,CAAC,UAAU;oBAC5B,IAAI,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,IAAI,CAAC;oBAChC,MAAM,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,OAAO,CAAC;iBACtC,CAAC;aACH;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CAAA;AAzBD,sCAyBC"}

package/lib/cjs/token.js.map

@@ -1 +1 @@
-{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/token.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gFAKiD;AAEjD,iDAM2B;AAC3B,6CAOyB;AAEzB,SAAsB,MAAM,CAC1B,QAA+B,EAC/B,IAAe,EACf,MAAuB,EACvB,WAAsB;;QAEtB,MAAM,MAAM,GAAG,IAAI,qBAAW,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,CACR,IAAA,mCAAuB,EACrB,IAAI,EACJ,WAAW,EACX,QAAQ,CAAC,MAAM,CAAC,SAAS,EACzB,MAAM,CACP,CACF,CAAC;QACF,IAAI;YACF,MAAM,QAAQ,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;SACvC;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,CAAC,IAAI,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,CAAC;SACT;IACH,CAAC;CAAA;AAxBD,wBAwBC;AAED,SAAsB,4BAA4B,CAChD,QAA+B,EAC/B,IAAe,EACf,MAA0B,EAC1B,KAAgB,QAAQ,CAAC,MAAM,CAAC,SAAS,EACzC,YAAuB,QAAQ,CAAC,MAAM,CAAC,SAAS,EAChD,QAAmB,QAAQ,CAAC,MAAM,CAAC,SAAS;;QAE5C,MAAM,GAAG,GAAG,MAAM,IAAA,qCAAyB,EAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;QAC5D,MAAM,YAAY,GAA6B,EAAE,CAAC;QAClD,IAAI,CAAC,CAAC,MAAM,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,EAAE;YACpD,YAAY,CAAC,IAAI,CACf,IAAA,mDAAuC,EAAC,KAAK,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAC9D,CAAC;SACH;QAED,IAAI,MAAM,IAAI,CAAC,EAAE;YACf,YAAY,CAAC,IAAI,CACf,IAAA,mCAAuB,EAAC,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CACzE,CAAC;SACH;QAED,OAAO;YACL,YAAY;YACZ,GAAG;SACJ,CAAC;IACJ,CAAC;CAAA;AA1BD,oEA0BC;AAED,SAAsB,gBAAgB,CACpC,QAA+B,EAC/B,IAAe,EACf,MAA0B,EAC1B,KAAgB,QAAQ,CAAC,MAAM,CAAC,SAAS,EACzC,YAAuB,QAAQ,CAAC,MAAM,CAAC,SAAS,EAChD,QAAmB,QAAQ,CAAC,MAAM,CAAC,SAAS,EAC5C,cAA+B;;QAE/B,MAAM,MAAM,GAAG,IAAI,qBAAW,EAAE,CAAC;QACjC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,MAAM,4BAA4B,CAC9D,QAAQ,EACR,IAAI,EACJ,MAAM,EACN,EAAE,EACF,SAAS,EACT,KAAK,CACN,CAAC;QACF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;QAEzD,IAAI;YACF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC;gBACzB,MAAM,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,SAAS,EAAE,cAAc,CAAC,CAAC;SACpE;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,CAAC,IAAI,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,CAAC;SACT;QACD,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AA/BD,4CA+BC;AAED,SAAsB,sBAAsB,CAC1C,QAA+B,EAC/B,QAAgB,EAChB,aAAwB,EACxB,kBAAoC,IAAI,EACxC,cAAuB,iBAAO,CAAC,QAAQ,EAAE;;QAEzC,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC;QACtC,OAAO;YACL,uBAAa,CAAC,aAAa,CAAC;gBAC1B,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;gBACrC,gBAAgB,EAAE,OAAO;gBACzB,KAAK,EAAE,EAAE;gBACT,QAAQ,EAAE,MAAM,QAAQ,CAAC,UAAU,CAAC,iCAAiC,CAAC,EAAE,CAAC;gBACzE,SAAS,EAAE,4BAAgB;aAC5B,CAAC;YACF,MAAM,IAAA,2CAA+B,EACnC,WAAW,CAAC,SAAS,EACrB,QAAQ,EACR,aAAa,EACb,eAAe,CAChB;SACF,CAAC;IACJ,CAAC;CAAA;AAvBD,wDAuBC;AAED,SAAsB,UAAU,CAC9B,QAA+B,EAC/B,QAAgB,EAChB,aAAwB,EACxB,kBAAoC,IAAI,EACxC,cAAuB,iBAAO,CAAC,QAAQ,EAAE;;QAEzC,MAAM,EAAE,GAAG,IAAI,qBAAW,EAAE,CAAC;QAC7B,EAAE,CAAC,GAAG,CACJ,GAAG,CAAC,MAAM,sBAAsB,CAC9B,QAAQ,EACR,QAAQ,EACR,aAAa,EACb,eAAe,EACf,WAAW,CACZ,CAAC,CACH,CAAC;QAEF,IAAI;YACF,MAAM,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;SAClD;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,CAAC,IAAI,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,CAAC;SACT;QAED,OAAO,WAAW,CAAC,SAAS,CAAC;IAC/B,CAAC;CAAA;AA7BD,gCA6BC;AAED,SAAsB,SAAS,CAC7B,QAA+B,EAC/B,SAAoB,EACpB,OAAY,EAAE,EACd,aAAyB,EACzB,cAAuB,iBAAO,CAAC,QAAQ,EAAE,EACzC,YAAuB,QAAQ,CAAC,MAAM,CAAC,SAAS;;QAEhD,MAAM,OAAO,GAAG,WAAW,CAAC,SAAS,CAAC;QAEtC,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAC/C,QAAQ,EACR,CAAC,EACD,QAAQ,CAAC,MAAM,CAAC,SAAS,EACzB,QAAQ,CAAC,MAAM,CAAC,SAAS,EACzB,WAAW,CACZ,CAAC;QACF,MAAM,CAAC,QAAQ,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACjD;YACE,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;YAC/B,+BAAmB,CAAC,QAAQ,EAAE;YAC9B,OAAO,CAAC,QAAQ,EAAE;SACnB,EACD,+BAAmB,CACpB,CAAC;QACF,YAAY,CAAC,IAAI,CACf,MAAM,IAAA,6DAAwC,EAC5C;YACE,QAAQ;YACR,IAAI,EAAE,OAAO;YACb,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;YACxC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;YAChC,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;SAC3C,EACD;YACE,2BAA2B,EAAE;gBAC3B,IAAI,kBACF,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,EACb,GAAG,EAAE,uFAAuF,EAC5F,oBAAoB,EAAE,EAAE,EACxB,QAAQ,EAAE;wBACR;4BACE,OAAO,EAAE,SAAS;4BAClB,QAAQ,EAAE,IAAI;4BACd,KAAK,EAAE,GAAG;yBACX;qBACF,EACD,UAAU,EAAE,aAAa;wBACvB,CAAC,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,QAAQ,EAAE,KAAK,EAAE;wBACzC,CAAC,CAAC,IAAI,EACR,IAAI,EAAE,IAAI,IACP,IAAI,CACR;gBACD,SAAS,EAAE,IAAI;gBACf,iBAAiB,EAAE,IAAI;aACxB;SACF,CACF,CACF,CAAC;QAEF,MAAM,EAAE,YAAY,EAAE,UAAU,EAAE,GAAG,MAAM,4BAA4B,CACrE,QAAQ,EACR,WAAW,CAAC,SAAS,EACrB,CAAC,EACD,SAAS,CACV,CAAC;QACF,YAAY,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,CAAC;QAEjC,IAAI,aAAa,EAAE;YACjB,MAAM,CAAC,yBAAyB,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAClE;gBACE,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;gBAC/B,+BAAmB,CAAC,QAAQ,EAAE;gBAC9B,aAAa,CAAC,QAAQ,EAAE;aACzB,EACD,+BAAmB,CACpB,CAAC;YACF,MAAM,CAAC,uBAAuB,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAChE;gBACE,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;gBAC/B,+BAAmB,CAAC,QAAQ,EAAE;gBAC9B,aAAa,CAAC,QAAQ,EAAE;gBACxB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;aAC/B,EACD,+BAAmB,CACpB,CAAC;YACF,MAAM,WAAW,GAAG,IAAA,sDAAiC,EAAC;gBACpD,QAAQ,EAAE,QAAQ;gBAClB,mBAAmB,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;gBAC9C,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;gBAChC,cAAc,EAAE,aAAa;gBAC7B,UAAU,EAAE,yBAAyB;gBACrC,8BAA8B,EAAE,uBAAuB;aACxD,CAAC,CAAC;YACH,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAChC;QAED,MAAM,CAAC,OAAO,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CAChD;YACE,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC;YAC/B,+BAAmB,CAAC,QAAQ,EAAE;YAC9B,OAAO,CAAC,QAAQ,EAAE;YAClB,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC;SAC/B,EACD,+BAAmB,CACpB,CAAC;QACF,YAAY,CAAC,IAAI,CACf,IAAA,2DAAsC,EACpC;YACE,OAAO;YACP,IAAI,EAAE,OAAO;YACb,eAAe,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;YAC1C,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;YACxC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;YAChC,QAAQ;SACT,EACD;YACE,uBAAuB,EAAE;gBACvB,SAAS,EAAE,CAAC;aACb;SACF,CACF,CACF,CAAC;QAEF,MAAM,EAAE,GAAG,IAAI,qBAAW,EAAE,CAAC;QAC7B,EAAE,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;QAExB,IAAI;YACF,MAAM,QAAQ,CAAC,cAAc,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;SAClD;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,CAAC,IAAI,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;aAClC;YACD,MAAM,CAAC,CAAC;SACT;QAED,OAAO;YACL,OAAO;YACP,aAAa;SACd,CAAC;IACJ,CAAC;CAAA;AA9ID,8BA8IC"}
+{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/token.ts"],"names":[],"mappings":"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"}

package/lib/cjs/utils.js

@@ -3,12 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.humanReadable = exports.roundToDecimals = exports.numberWithCommas = exports.supplyAsNum = exports.toBN = exports.amountAsNum = exports.toNumber = exports.truthy = void 0;
+exports.humanReadable = exports.humanReadableBigint = exports.roundToDecimals = exports.numberWithCommas = exports.supplyAsNum = exports.toBN = exports.amountAsNum = exports.toNumber = exports.truthy = void 0;
 const bn_js_1 = __importDefault(require("bn.js"));
 const truthy = (value) => !!value;
 exports.truthy = truthy;
 function toNumber(numberOrBn, mintOrDecimals) {
-    if (bn_js_1.default.isBN(numberOrBn)) {
+    if (bn_js_1.default.isBN(numberOrBn) || typeof numberOrBn == "bigint") {
         return amountAsNum(numberOrBn, mintOrDecimals);
     }
     else {
@@ -21,8 +21,8 @@ function amountAsNum(amount, mintOrDecimals) {
         ? mintOrDecimals
         : mintOrDecimals.decimals;
     const factor = new bn_js_1.default(Math.pow(10, decimals).toString());
-    const decimal = amount.mod(factor).toNumber() / factor.toNumber();
-    return amount.div(factor).toNumber() + decimal;
+    const decimal = new bn_js_1.default(amount.toString()).mod(factor).toNumber() / factor.toNumber();
+    return new bn_js_1.default(amount.toString()).div(factor).toNumber() + decimal;
 }
 exports.amountAsNum = amountAsNum;
 function toBN(numberOrBn, mintOrDecimals) {
@@ -51,6 +51,10 @@ function roundToDecimals(num, decimals) {
     return Math.trunc(num * Math.pow(10, decimals)) / Math.pow(10, decimals);
 }
 exports.roundToDecimals = roundToDecimals;
+function humanReadableBigint(bigint, decimals, round = decimals) {
+    return numberWithCommas(roundToDecimals(toNumber(bigint, decimals), round));
+}
+exports.humanReadableBigint = humanReadableBigint;
 function humanReadable(bn, mint) {
     return numberWithCommas(roundToDecimals(toNumber(bn, mint), mint.decimals));
 }

package/lib/cjs/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAuB;AAKhB,MAAM,MAAM,GAAG,CAAI,KAAQ,EAAsB,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;AAAtD,QAAA,MAAM,UAAgD;AAEnE,SAAgB,QAAQ,CAAC,UAAuB,EAAE,cAA6B;IAC7E,IAAI,eAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACvB,OAAO,WAAW,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;KAChD;SAAM;QACL,OAAO,UAAU,CAAC;KACnB;AACH,CAAC;AAND,4BAMC;AAED,SAAgB,WAAW,CAAC,MAAU,EAAE,cAA6B;IACnE,MAAM,QAAQ,GACZ,OAAO,cAAc,KAAK,QAAQ;QAChC,CAAC,CAAC,cAAc;QAChB,CAAC,CAAE,cAAuB,CAAC,QAAQ,CAAC;IACxC,MAAM,MAAM,GAAG,IAAI,eAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IAClE,OAAO,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC;AACjD,CAAC;AARD,kCAQC;AAED,SAAgB,IAAI,CAClB,UAAuB,EACvB,cAA6B;IAE7B,MAAM,QAAQ,GACZ,OAAO,cAAc,KAAK,QAAQ;QAChC,CAAC,CAAC,cAAc;QAChB,CAAC,CAAE,cAAuB,CAAC,QAAQ,CAAC;IAExC,IAAI,eAAE,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACvB,OAAO,UAAU,CAAC;KACnB;SAAM;QACL,OAAO,IAAI,eAAE,CACX,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,cAAc,CACnE,UAAU,EACV,EAAE,WAAW,EAAE,KAAK,EAAE,CACvB,CACF,CAAC;KACH;AACH,CAAC;AAnBD,oBAmBC;AAED,SAAgB,WAAW,CAAC,IAAU;IACpC,OAAO,WAAW,CAAC,IAAI,eAAE,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AAFD,kCAEC;AAED,SAAgB,gBAAgB,CAAC,CAAS,EAAE,WAAmB,CAAC;IAC9D,OAAO,eAAe,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE;QAC1D,qBAAqB,EAAE,QAAQ;KAChC,CAAC,CAAC;AACL,CAAC;AAJD,4CAIC;AAED,SAAgB,eAAe,CAAC,GAAW,EAAE,QAAgB;IAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;AAC3E,CAAC;AAFD,0CAEC;AAGD,SAAgB,aAAa,CAAC,EAAM,EAAE,IAAU;IAC9C,OAAO,gBAAgB,CACrB,eAAe,CAAC,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,CACnD,CAAC;AACJ,CAAC;AAJD,sCAIC"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}

package/lib/esm/src/accountFetchCache/accountFetchCache.js

@@ -62,12 +62,17 @@ export class AccountFetchCache {
         };
         connection.sendRawTransaction = async function overloadedSendRawTransaction(rawTransaction, options) {
             const result = await self.oldSendRawTransaction(rawTransaction, options);
-            const instructions = Transaction.from(rawTransaction).instructions;
-            this.confirmTransaction(result, "finalized")
-                .then(() => {
-                return self.requeryMissing(instructions);
-            })
-                .catch(console.error);
+            try {
+                const instructions = Transaction.from(rawTransaction).instructions;
+                this.confirmTransaction(result, "finalized")
+                    .then(() => {
+                    return self.requeryMissing(instructions);
+                })
+                    .catch(console.error);
+            }
+            catch (e) {
+                // TODO: handle transaction v2
+            }
             return result;
         };
     }
@@ -104,7 +109,7 @@ export class AccountFetchCache {
         const currentBatch = this.currentBatch;
         this.currentBatch = new Set(); // Erase current batch from state, so we can fetch multiple at a time
         try {
-            console.log(`Batching account fetch of ${currentBatch.size}`);
+            console.log("accountFetchCache", `Batching account fetch of ${currentBatch.size}`);
             const keys = Array.from(currentBatch);
             const array = await this.connection.getMultipleAccountsInfo(keys.map(b => new PublicKey(b)), this.commitment);
             keys.forEach((key, index) => {
@@ -225,9 +230,15 @@ export class AccountFetchCache {
         return query;
     }
     onAccountChange(key, parser, account) {
-        const parsed = this.getParsed(key, account, parser);
-        const address = key.toBase58();
-        this.updateCache(address, parsed || null);
+        try {
+            const parsed = this.getParsed(key, account, parser);
+            const address = key.toBase58();
+            console.log("accountFetchCache", `Received account change ${key}`, parsed);
+            this.updateCache(address, parsed || null);
+        }
+        catch (e) {
+            console.error("accountFetchCache", "Failed to update account", e);
+        }
     }
     watch(id, parser, exists = true) {
         const address = id.toBase58();
@@ -275,7 +286,15 @@ export class AccountFetchCache {
                 const subscriptionId = this.accountChangeListeners.get(address);
                 if (subscriptionId) {
                     this.accountChangeListeners.delete(address);
-                    this.connection.removeAccountChangeListener(subscriptionId);
+                    try {
+                        this.connection.removeAccountChangeListener(subscriptionId);
+                    }
+                    catch (e) {
+                        if (e.toString().includes("not implemented")) {
+                            // @ts-ignore
+                            this.usableConnection.removeAccountChangeListener(subscriptionId);
+                        }
+                    }
                 }
                 this.missingAccounts.delete(address);
             }

package/lib/esm/src/accountFetchCache/accountFetchCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"accountFetchCache.js","sourceRoot":"","sources":["../../../../src/accountFetchCache/accountFetchCache.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"accountFetchCache.js","sourceRoot":"","sources":["../../../../src/accountFetchCache/accountFetchCache.ts"],"names":[],"mappings":"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"}

package/lib/esm/src/accountsResolver/ataResolver.js

@@ -3,15 +3,9 @@ import { getAssociatedTokenAddress } from "@solana/spl-token";
 import { get } from "./utils";
 export function ataResolver({ instruction, account, mint, owner, }) {
     return resolveIndividual(async ({ path, accounts, idlIx }) => {
-        if (idlIx.name === instruction && path[path.length - 1] === account) {
-            const mintKey = get(accounts, [
-                ...path.slice(0, path.length - 1),
-                mint,
-            ]);
-            const ownerKey = get(accounts, [
-                ...path.slice(0, path.length - 1),
-                owner,
-            ]);
+        if (idlIx.name === instruction && path.join(".") === account) {
+            const mintKey = get(accounts, mint.split("."));
+            const ownerKey = get(accounts, owner.split("."));
             if (mintKey && ownerKey) {
                 return getAssociatedTokenAddress(mintKey, ownerKey, true);
             }

package/lib/esm/src/accountsResolver/ataResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"ataResolver.js","sourceRoot":"","sources":["../../../../src/accountsResolver/ataResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAS9B,MAAM,UAAU,WAAW,CAAuB,EAChD,WAAW,EACX,OAAO,EACP,IAAI,EACJ,KAAK,GACW;IAChB,OAAO,iBAAiB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3D,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,OAAO,EAAE;YACnE,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE;gBAC5B,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjC,IAAI;aACL,CAAc,CAAC;YAChB,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE;gBAC7B,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;gBACjC,KAAK;aACN,CAAc,CAAC;YAEhB,IAAI,OAAO,IAAI,QAAQ,EAAE;gBACvB,OAAO,yBAAyB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;aAC3D;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"ataResolver.js","sourceRoot":"","sources":["../../../../src/accountsResolver/ataResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAS9B,MAAM,UAAU,WAAW,CAAuB,EAChD,WAAW,EACX,OAAO,EACP,IAAI,EACJ,KAAK,GACW;IAChB,OAAO,iBAAiB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;QAC3D,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE;YAC5D,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAc,CAAC;YAC5D,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAc,CAAC;YAE9D,IAAI,OAAO,IAAI,QAAQ,EAAE;gBACvB,OAAO,yBAAyB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;aAC3D;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC"}

package/lib/esm/src/accountsResolver/heliumCommonResolver.js

@@ -0,0 +1,21 @@
+import { PublicKey } from "@solana/web3.js";
+import { resolveIndividual } from "./individual";
+export const heliumCommonResolver = resolveIndividual(async ({ path }) => {
+    switch (path[path.length - 1]) {
+        case "dataCreditsProgram":
+            return new PublicKey("credacwrBVewZAgCwNgowCSMbCiepuesprUWPBeLTSg");
+        case "tokenMetadataProgram":
+            return new PublicKey("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s");
+        case "heliumSubDaosProgram":
+            return new PublicKey("hdaojPkgSD8bciDc1w2Z4kXFFibCXngJiw2GRpEL7Wf");
+        case "bubblegumProgram":
+            return new PublicKey("BGUMAp9Gq7iTEuizy4pqaxsTyUCBK68MDfK752saRPUY");
+        case "compressionProgram":
+            return new PublicKey("cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK");
+        case "logWrapper":
+            return new PublicKey("noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV");
+        default:
+            return;
+    }
+});
+//# sourceMappingURL=heliumCommonResolver.js.map

package/lib/esm/src/accountsResolver/heliumCommonResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"heliumCommonResolver.js","sourceRoot":"","sources":["../../../../src/accountsResolver/heliumCommonResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;IACvE,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;QAC7B,KAAK,oBAAoB;YACvB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,sBAAsB;YACzB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,sBAAsB;YACzB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,kBAAkB;YACrB,OAAO,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;QACvE,KAAK,oBAAoB;YACvB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,YAAY;YACf,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE;YACE,OAAO;KACV;AACH,CAAC,CAAC,CAAC"}

package/lib/esm/src/constants.js

@@ -1,5 +1,5 @@
 import { PublicKey } from "@solana/web3.js";
-export const DC_MINT = new PublicKey("2SyDxfawpkdg2EojMv1ZTUiqCefYFksNXjsBZivu5dpG");
-export const HNT_MINT = new PublicKey("9PT9Um19m1JKc1sbWETxD9NySjinnNoxv7xYmvBXUqyx");
-export const MOBILE_MINT = new PublicKey("CKuwd2oB8be14g9Y94NuM87nZZzq9HXDBeEe6N3QXZdN");
+export const DC_MINT = new PublicKey("8po3rj3xE1wo5y38zW8gH2ZoTZzqowMAuD1ugBpUKj32");
+export const HNT_MINT = new PublicKey("BJUtKj5M6w69N3vcZP6n1DUVUsZSVvNRPoeqkToXEYhp");
+export const MOBILE_MINT = new PublicKey("8K38wjyEXdUX8w6GPida3X9BQhcSJ9fnVjRyUaotkqAs");
 //# sourceMappingURL=constants.js.map