@helium/helium-entity-manager-sdk 0.0.17 → 0.0.18

package/lib/cjs/functions/onboardIotHotspot.js

@@ -8,55 +8,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onboardIotHotspot = void 0;
-const spl_utils_1 = require("@helium/spl-utils");
-const spl_account_compression_1 = require("@solana/spl-account-compression");
 const pdas_1 = require("../pdas");
-function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, dao, assetEndpoint, dcFeePayer, payer, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, }) {
+const proofArgsAndAccounts_1 = require("./proofArgsAndAccounts");
+function onboardIotHotspot(_a) {
+    var { program, rewardableEntityConfig, assetId, maker, dao, dcFeePayer, payer } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "maker", "dao", "dcFeePayer", "payer"]);
     return __awaiter(this, void 0, void 0, function* () {
-        // @ts-ignore
-        const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
-        const asset = yield getAssetFn(endpoint, assetId);
-        if (!asset) {
-            throw new Error("No asset with ID " + assetId.toBase58());
-        }
-        const assetProof = yield getAssetProofFn(endpoint, assetId);
-        if (!assetProof) {
-            throw new Error("No asset proof with ID " + assetId.toBase58());
-        }
-        const { root, proof, leaf, treeId, nodeIndex } = assetProof;
-        const { ownership: { owner }, content: { json_uri }, } = asset;
+        const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = yield (0, proofArgsAndAccounts_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
         const [info] = (0, pdas_1.iotInfoKey)(rewardableEntityConfig, assetId);
         const makerAcc = yield program.account.makerV0.fetchNullable(maker);
-        const canopy = yield (yield spl_account_compression_1.ConcurrentMerkleTreeAccount.fromAccountAddress(program.provider.connection, treeId)).getCanopyDepth();
         const keyToAsset = (yield (0, pdas_1.keyToAssetKey)(dao, json_uri.split("/").slice(-1)[0]))[0];
         return program.methods
-            .onboardIotHotspotV0({
-            hash: leaf.toBuffer().toJSON().data,
-            root: root.toBuffer().toJSON().data,
-            index: nodeIndex,
-        })
-            .accounts({
-            // hotspot: assetId,
-            payer,
+            .onboardIotHotspotV0(args)
+            .accounts(Object.assign(Object.assign({}, accounts), { payer,
             dcFeePayer,
-            rewardableEntityConfig,
-            hotspotOwner: owner,
-            iotInfo: info,
-            merkleTree: treeId,
-            maker,
-            dao,
-            issuingAuthority: makerAcc === null || makerAcc === void 0 ? void 0 : makerAcc.issuingAuthority,
-            keyToAsset,
-        })
-            .remainingAccounts(proof.slice(0, proof.length - canopy).map((p) => {
-            return {
-                pubkey: p,
-                isWritable: false,
-                isSigner: false,
-            };
-        }));
+            rewardableEntityConfig, hotspotOwner: owner, iotInfo: info, maker,
+            dao, issuingAuthority: makerAcc === null || makerAcc === void 0 ? void 0 : makerAcc.issuingAuthority, keyToAsset }))
+            .remainingAccounts(remainingAccounts);
     });
 }
 exports.onboardIotHotspot = onboardIotHotspot;

package/lib/cjs/functions/onboardIotHotspot.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAE/E,6EAA8E;AAE9E,kCAAoD;AAGpD,SAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,aAAa,EACb,UAAU,EACV,KAAK,EACL,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAehC;;QACC,aAAa;QACb,MAAM,QAAQ,GAAG,aAAa,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;QAC3E,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC3D;QACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjE;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QAC5D,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,EACpB,OAAO,EAAE,EAAE,QAAQ,EAAE,GACtB,GAAG,KAAK,CAAC;QACV,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAU,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAE3D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,qDAA2B,CAAC,kBAAkB,CAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,MAAM,CACP,CACF,CAAC,cAAc,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,CACjB,MAAM,IAAA,oBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAC,CAAC,CAAC;QACL,OAAO,OAAO,CAAC,OAAO;aACnB,mBAAmB,CAAC;YACnB,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;YACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;YACnC,KAAK,EAAE,SAAS;SACjB,CAAC;aACD,QAAQ,CAAC;YACR,oBAAoB;YACpB,KAAK;YACL,UAAU;YACV,sBAAsB;YACtB,YAAY,EAAE,KAAK;YACnB,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,MAAM;YAClB,KAAK;YACL,GAAG;YACH,gBAAgB,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB;YAC5C,UAAU;SACX,CAAC;aACD,iBAAiB,CAChB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,OAAO;gBACL,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACN,CAAC;CAAA;AAlFD,8CAkFC"}
+{"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAoD;AACpD,iEAAwF;AAGxF,SAAsB,iBAAiB,CAAC,EAgBQ;QAhBR,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,UAAU,EACV,KAAK,OASyC,EAR3C,IAAI,cAR+B,uFASvC,CADQ;;QASP,MAAM,EACJ,KAAK,EAAE,EACL,OAAO,EAAE,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,EACD,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,IAAA,2CAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAU,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpE,MAAM,UAAU,GAAG,CACjB,MAAM,IAAA,oBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAC,CAAC,CAAC;QACL,OAAO,OAAO,CAAC,OAAO;aACnB,mBAAmB,CAAC,IAAI,CAAC;aACzB,QAAQ,iCAEJ,QAAQ,KACX,KAAK;YACL,UAAU;YACV,sBAAsB,EACtB,YAAY,EAAE,KAAK,EACnB,OAAO,EAAE,IAAI,EACb,KAAK;YACL,GAAG,EACH,gBAAgB,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB,EAC5C,UAAU,IACV;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AArDD,8CAqDC"}

package/lib/cjs/functions/onboardMobileHotspot.js

@@ -8,54 +8,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onboardMobileHotspot = void 0;
-const spl_utils_1 = require("@helium/spl-utils");
-const spl_account_compression_1 = require("@solana/spl-account-compression");
 const pdas_1 = require("../pdas");
-function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker, dao, payer, dcFeePayer, assetEndpoint, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, }) {
+const proofArgsAndAccounts_1 = require("./proofArgsAndAccounts");
+function onboardMobileHotspot(_a) {
+    var { program, rewardableEntityConfig, assetId, maker, dao, payer, dcFeePayer } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "maker", "dao", "payer", "dcFeePayer"]);
     return __awaiter(this, void 0, void 0, function* () {
-        // @ts-ignore
-        const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
-        const asset = yield getAssetFn(endpoint, assetId);
-        if (!asset) {
-            throw new Error("No asset with ID " + assetId.toBase58());
-        }
-        const assetProof = yield getAssetProofFn(endpoint, assetId);
-        if (!assetProof) {
-            throw new Error("No asset proof with ID " + assetId.toBase58());
-        }
-        const { root, proof, treeId, nodeIndex, leaf } = assetProof;
-        const { ownership: { owner }, content: { json_uri }, } = asset;
+        const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = yield (0, proofArgsAndAccounts_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
         const [info] = (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, assetId);
-        const canopy = yield (yield spl_account_compression_1.ConcurrentMerkleTreeAccount.fromAccountAddress(program.provider.connection, treeId)).getCanopyDepth();
         const makerAcc = yield program.account.makerV0.fetchNullable(maker);
         return program.methods
-            .onboardMobileHotspotV0({
-            hash: leaf.toBuffer().toJSON().data,
-            root: root.toBuffer().toJSON().data,
-            index: nodeIndex,
-        })
-            .accounts({
-            // hotspot: assetId,
-            dcFeePayer,
+            .onboardMobileHotspotV0(args)
+            .accounts(Object.assign(Object.assign({}, accounts), { dcFeePayer,
             payer,
-            rewardableEntityConfig,
-            hotspotOwner: owner,
-            mobileInfo: info,
-            merkleTree: treeId,
-            maker,
-            dao,
-            issuingAuthority: makerAcc === null || makerAcc === void 0 ? void 0 : makerAcc.issuingAuthority,
-            keyToAsset: (yield (0, pdas_1.keyToAssetKey)(dao, json_uri.split("/").slice(-1)[0]))[0],
-        })
-            .remainingAccounts(proof.slice(0, proof.length - canopy).map((p) => {
-            return {
-                pubkey: p,
-                isWritable: false,
-                isSigner: false,
-            };
-        }));
+            rewardableEntityConfig, hotspotOwner: owner, mobileInfo: info, maker,
+            dao, issuingAuthority: makerAcc === null || makerAcc === void 0 ? void 0 : makerAcc.issuingAuthority, keyToAsset: (yield (0, pdas_1.keyToAssetKey)(dao, json_uri.split("/").slice(-1)[0]))[0] }))
+            .remainingAccounts(remainingAccounts);
     });
 }
 exports.onboardMobileHotspot = onboardMobileHotspot;

package/lib/cjs/functions/onboardMobileHotspot.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAE/E,6EAA8E;AAE9E,kCAAuD;AAEvD,SAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,KAAK,EACL,UAAU,EACV,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAehC;;QACC,aAAa;QACb,MAAM,QAAQ,GAAG,aAAa,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;QAC3E,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC3D;QACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjE;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;QAC5D,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,EACpB,OAAO,EAAE,EAAE,QAAQ,EAAE,GACtB,GAAG,KAAK,CAAC;QAEV,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,oBAAa,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,qDAA2B,CAAC,kBAAkB,CAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,MAAM,CACP,CACF,CAAC,cAAc,EAAE,CAAC;QACnB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpE,OAAO,OAAO,CAAC,OAAO;aACnB,sBAAsB,CAAC;YACtB,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;YACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;YACnC,KAAK,EAAE,SAAS;SACjB,CAAC;aACD,QAAQ,CAAC;YACR,oBAAoB;YACpB,UAAU;YACV,KAAK;YACL,sBAAsB;YACtB,YAAY,EAAE,KAAK;YACnB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,MAAM;YAClB,KAAK;YACL,GAAG;YACH,gBAAgB,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB;YAC5C,UAAU,EAAE,CACV,MAAM,IAAA,oBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAC,CAAC;SACL,CAAC;aACD,iBAAiB,CAChB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,OAAO;gBACL,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACN,CAAC;CAAA;AAjFD,oDAiFC"}
+{"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAuD;AACvD,iEAAwF;AAExF,SAAsB,oBAAoB,CAAC,EAiBK;QAjBL,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,KAAK,EACL,UAAU,OAUoC,EAT3C,IAAI,cARkC,uFAS1C,CADQ;;QAUP,MAAM,EACJ,KAAK,EAAE,EACL,OAAO,EAAE,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,EACD,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,IAAA,2CAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,oBAAa,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpE,OAAO,OAAO,CAAC,OAAO;aACnB,sBAAsB,CAAC,IAAI,CAAC;aAC5B,QAAQ,iCAEJ,QAAQ,KACX,UAAU;YACV,KAAK;YACL,sBAAsB,EACtB,YAAY,EAAE,KAAK,EACnB,UAAU,EAAE,IAAI,EAChB,KAAK;YACL,GAAG,EACH,gBAAgB,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,gBAAgB,EAC5C,UAAU,EAAE,CACV,MAAM,IAAA,oBAAa,EAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAC,CAAC,IACJ;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AArDD,oDAqDC"}

package/lib/cjs/functions/proofArgsAndAccounts.js

@@ -0,0 +1,51 @@
+"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.proofArgsAndAccounts = void 0;
+const spl_utils_1 = require("@helium/spl-utils");
+const spl_account_compression_1 = require("@solana/spl-account-compression");
+function proofArgsAndAccounts({ connection, assetId, assetEndpoint, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, }) {
+    return __awaiter(this, void 0, void 0, function* () {
+        // @ts-ignore
+        const endpoint = assetEndpoint || connection._rpcEndpoint;
+        const asset = yield getAssetFn(endpoint, assetId);
+        if (!asset) {
+            throw new Error("No asset with ID " + assetId.toBase58());
+        }
+        const assetProof = yield getAssetProofFn(endpoint, assetId);
+        if (!assetProof) {
+            throw new Error("No asset proof with ID " + assetId.toBase58());
+        }
+        const { compression: { leafId }, } = asset;
+        const { root, proof, leaf, treeId } = assetProof;
+        const canopy = yield (yield spl_account_compression_1.ConcurrentMerkleTreeAccount.fromAccountAddress(connection, treeId)).getCanopyDepth();
+        return {
+            asset,
+            args: {
+                hash: leaf.toBuffer().toJSON().data,
+                root: root.toBuffer().toJSON().data,
+                index: leafId,
+            },
+            accounts: {
+                merkleTree: treeId,
+            },
+            remainingAccounts: proof.slice(0, proof.length - canopy).map((p) => {
+                return {
+                    pubkey: p,
+                    isWritable: false,
+                    isSigner: false,
+                };
+            }),
+        };
+    });
+}
+exports.proofArgsAndAccounts = proofArgsAndAccounts;
+//# sourceMappingURL=proofArgsAndAccounts.js.map

package/lib/cjs/functions/proofArgsAndAccounts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"proofArgsAndAccounts.js","sourceRoot":"","sources":["../../../src/functions/proofArgsAndAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA+E;AAC/E,6EAA8E;AAc9E,SAAsB,oBAAoB,CAAC,EACzC,UAAU,EACV,OAAO,EACP,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GACN;;QAUzB,aAAa;QACb,MAAM,QAAQ,GAAG,aAAa,IAAI,UAAU,CAAC,YAAY,CAAC;QAC1D,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC3D;QACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjE;QACD,MAAM,EACJ,WAAW,EAAE,EAAE,MAAM,EAAE,GACxB,GAAG,KAAK,CAAC;QACV,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;QACjD,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,qDAA2B,CAAC,kBAAkB,CAClD,UAAU,EACV,MAAM,CACP,CACF,CAAC,cAAc,EAAE,CAAC;QAEnB,OAAO;YACL,KAAK;YACL,IAAI,EAAE;gBACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;gBACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;gBACnC,KAAK,EAAE,MAAO;aACf;YACD,QAAQ,EAAE;gBACR,UAAU,EAAE,MAAM;aACnB;YACD,iBAAiB,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACjE,OAAO;oBACL,MAAM,EAAE,CAAC;oBACT,UAAU,EAAE,KAAK;oBACjB,QAAQ,EAAE,KAAK;iBAChB,CAAC;YACJ,CAAC,CAAC;SACH,CAAC;IACJ,CAAC;CAAA;AAvDD,oDAuDC"}

package/lib/cjs/functions/updateIotMetadata.js

@@ -8,52 +8,34 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateIotMetadata = void 0;
-const spl_utils_1 = require("@helium/spl-utils");
-const spl_account_compression_1 = require("@solana/spl-account-compression");
 const pdas_1 = require("../pdas");
-function updateIotMetadata({ program, rewardableEntityConfig, assetId, location, elevation, gain, assetEndpoint, payer, dcFeePayer, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, }) {
+const proofArgsAndAccounts_1 = require("./proofArgsAndAccounts");
+function updateIotMetadata(_a) {
+    var { program, rewardableEntityConfig, assetId, location, elevation, gain, payer, dcFeePayer } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "location", "elevation", "gain", "payer", "dcFeePayer"]);
     return __awaiter(this, void 0, void 0, function* () {
-        // @ts-ignore
-        const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
-        const asset = yield getAssetFn(endpoint, assetId);
-        if (!asset) {
-            throw new Error("No asset with ID " + assetId.toBase58());
-        }
-        const assetProof = yield getAssetProofFn(endpoint, assetId);
-        if (!assetProof) {
-            throw new Error("No asset proof with ID " + assetId.toBase58());
-        }
-        const { root, proof, leaf, treeId, nodeIndex } = assetProof;
-        const { ownership: { owner }, } = asset;
+        const { asset: { ownership: { owner }, }, args, accounts, remainingAccounts, } = yield (0, proofArgsAndAccounts_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
         const [info] = (0, pdas_1.iotInfoKey)(rewardableEntityConfig, assetId);
-        const canopy = yield (yield spl_account_compression_1.ConcurrentMerkleTreeAccount.fromAccountAddress(program.provider.connection, treeId)).getCanopyDepth();
         return program.methods
-            .updateIotInfoV0({
-            location,
+            .updateIotInfoV0(Object.assign({ location,
             elevation,
-            gain,
-            hash: leaf.toBuffer().toJSON().data,
-            root: root.toBuffer().toJSON().data,
-            index: nodeIndex,
-        })
-            .accounts({
-            // hotspot: assetId,
-            payer,
+            gain }, args))
+            .accounts(Object.assign(Object.assign({}, accounts), { payer,
             dcFeePayer,
-            rewardableEntityConfig,
-            hotspotOwner: owner,
-            iotInfo: info,
-            merkleTree: treeId,
-        })
-            .remainingAccounts(proof.slice(0, proof.length - canopy).map((p) => {
-            return {
-                pubkey: p,
-                isWritable: false,
-                isSigner: false,
-            };
-        }));
+            rewardableEntityConfig, hotspotOwner: owner, iotInfo: info }))
+            .remainingAccounts(remainingAccounts);
     });
 }
 exports.updateIotMetadata = updateIotMetadata;

package/lib/cjs/functions/updateIotMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAE/E,6EAA8E;AAE9E,kCAAqC;AAErC,SAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,aAAa,EACb,KAAK,EACL,UAAU,EACV,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAgBhC;;QACC,aAAa;QACb,MAAM,QAAQ,GAAG,aAAa,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;QAC3E,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC3D;QACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjE;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QAC5D,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;QAEV,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAU,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAC3D,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,qDAA2B,CAAC,kBAAkB,CAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,MAAM,CACP,CACF,CAAC,cAAc,EAAE,CAAC;QACnB,OAAO,OAAO,CAAC,OAAO;aACnB,eAAe,CAAC;YACf,QAAQ;YACR,SAAS;YACT,IAAI;YACJ,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;YACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;YACnC,KAAK,EAAE,SAAS;SACjB,CAAC;aACD,QAAQ,CAAC;YACR,oBAAoB;YACpB,KAAK;YACL,UAAU;YACV,sBAAsB;YACtB,YAAY,EAAE,KAAK;YACnB,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,MAAM;SACnB,CAAC;aACD,iBAAiB,CAChB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,OAAO;gBACL,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACN,CAAC;CAAA;AA7ED,8CA6EC"}
+{"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAqC;AACrC,iEAAwF;AAExF,SAAsB,iBAAiB,CAAC,EAmBQ;QAnBR,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,KAAK,EACL,UAAU,OAWoC,EAV3C,IAAI,cAT+B,wGAUvC,CADQ;;QAWP,MAAM,EACJ,KAAK,EAAE,EACL,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,EACD,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,IAAA,2CAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,iBAAU,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAE3D,OAAO,OAAO,CAAC,OAAO;aACnB,eAAe,iBACd,QAAQ;YACR,SAAS;YACT,IAAI,IACD,IAAI,EACP;aACD,QAAQ,iCAEJ,QAAQ,KACX,KAAK;YACL,UAAU;YACV,sBAAsB,EACtB,YAAY,EAAE,KAAK,EACnB,OAAO,EAAE,IAAI,IACb;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AApDD,8CAoDC"}

package/lib/cjs/functions/updateMobileMetadata.js

@@ -8,49 +8,32 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateMobileMetadata = void 0;
-const spl_utils_1 = require("@helium/spl-utils");
-const spl_account_compression_1 = require("@solana/spl-account-compression");
 const pdas_1 = require("../pdas");
-function updateMobileMetadata({ program, rewardableEntityConfig, assetId, location, assetEndpoint, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, dcFeePayer, payer, }) {
+const proofArgsAndAccounts_1 = require("./proofArgsAndAccounts");
+function updateMobileMetadata(_a) {
+    var { program, rewardableEntityConfig, assetId, location, dcFeePayer, payer } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "location", "dcFeePayer", "payer"]);
     return __awaiter(this, void 0, void 0, function* () {
-        // @ts-ignore
-        const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
-        const asset = yield getAssetFn(endpoint, assetId);
-        if (!asset) {
-            throw new Error("No asset with ID " + assetId.toBase58());
-        }
-        const assetProof = yield getAssetProofFn(endpoint, assetId);
-        if (!assetProof) {
-            throw new Error("No asset proof with ID " + assetId.toBase58());
-        }
-        const { root, proof, leaf, treeId, nodeIndex } = assetProof;
-        const { ownership: { owner }, } = asset;
-        const canopy = yield (yield spl_account_compression_1.ConcurrentMerkleTreeAccount.fromAccountAddress(program.provider.connection, treeId)).getCanopyDepth();
+        const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = yield (0, proofArgsAndAccounts_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
         const [info] = (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, assetId);
         return program.methods
-            .updateMobileInfoV0({
-            location,
-            hash: leaf.toBuffer().toJSON().data,
-            root: root.toBuffer().toJSON().data,
-            index: nodeIndex,
-        })
-            .accounts({
-            dcFeePayer,
+            .updateMobileInfoV0(Object.assign({ location }, args))
+            .accounts(Object.assign(Object.assign({}, accounts), { dcFeePayer,
             payer,
-            rewardableEntityConfig,
-            hotspotOwner: owner,
-            mobileInfo: info,
-            merkleTree: treeId,
-        })
-            .remainingAccounts(proof.slice(0, proof.length - canopy).map((p) => {
-            return {
-                pubkey: p,
-                isWritable: false,
-                isSigner: false,
-            };
-        }));
+            rewardableEntityConfig, hotspotOwner: owner, mobileInfo: info }))
+            .remainingAccounts(remainingAccounts);
     });
 }
 exports.updateMobileMetadata = updateMobileMetadata;

package/lib/cjs/functions/updateMobileMetadata.js.map

@@ -1 +1 @@
-{"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAE/E,6EAA8E;AAE9E,kCAAoD;AAEpD,SAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,EAC/B,UAAU,EACV,KAAK,GAcN;;QACC,aAAa;QACb,MAAM,QAAQ,GAAG,aAAa,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;QAC3E,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SAC3D;QACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC5D,IAAI,CAAC,UAAU,EAAE;YACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjE;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QAC5D,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;QACV,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,qDAA2B,CAAC,kBAAkB,CAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,MAAM,CACP,CACF,CAAC,cAAc,EAAE,CAAC;QACnB,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,oBAAa,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAE9D,OAAO,OAAO,CAAC,OAAO;aACnB,kBAAkB,CAAC;YAClB,QAAQ;YACR,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;YACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;YACnC,KAAK,EAAE,SAAS;SACjB,CAAC;aACD,QAAQ,CAAC;YACR,UAAU;YACV,KAAK;YACL,sBAAsB;YACtB,YAAY,EAAE,KAAK;YACnB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,MAAM;SACnB,CAAC;aACD,iBAAiB,CAChB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9C,OAAO;gBACL,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACN,CAAC;CAAA;AAtED,oDAsEC"}
+{"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAwC;AACxC,iEAAwF;AAExF,SAAsB,oBAAoB,CAAC,EAeK;QAfL,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,UAAU,EACV,KAAK,OASyC,EAR3C,IAAI,cAPkC,mFAQ1C,CADQ;;QASP,MAAM,EACJ,KAAK,EAAE,EACL,OAAO,EAAE,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,EACD,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,IAAA,2CAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,oBAAa,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAE9D,OAAO,OAAO,CAAC,OAAO;aACnB,kBAAkB,iBACjB,QAAQ,IACL,IAAI,EACP;aACD,QAAQ,iCACJ,QAAQ,KACX,UAAU;YACV,KAAK;YACL,sBAAsB,EACtB,YAAY,EAAE,KAAK,EACnB,UAAU,EAAE,IAAI,IAChB;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AA7CD,oDA6CC"}

package/lib/cjs/index.js

@@ -23,7 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = exports.onboardMobileHotspot = exports.onboardIotHotspot = exports.updateMobileMetadata = exports.updateIotMetadata = void 0;
+exports.init = exports.proofArgsAndAccounts = exports.onboardMobileHotspot = exports.onboardIotHotspot = exports.updateMobileMetadata = exports.updateIotMetadata = void 0;
 const anchor_1 = require("@project-serum/anchor");
 const constants_1 = require("./constants");
 const resolvers_1 = require("./resolvers");
@@ -38,6 +38,8 @@ var onboardIotHotspot_1 = require("./functions/onboardIotHotspot");
 Object.defineProperty(exports, "onboardIotHotspot", { enumerable: true, get: function () { return onboardIotHotspot_1.onboardIotHotspot; } });
 var onboardMobileHotspot_1 = require("./functions/onboardMobileHotspot");
 Object.defineProperty(exports, "onboardMobileHotspot", { enumerable: true, get: function () { return onboardMobileHotspot_1.onboardMobileHotspot; } });
+var proofArgsAndAccounts_1 = require("./functions/proofArgsAndAccounts");
+Object.defineProperty(exports, "proofArgsAndAccounts", { enumerable: true, get: function () { return proofArgsAndAccounts_1.proofArgsAndAccounts; } });
 const init = (provider, programId = constants_1.PROGRAM_ID, idl) => __awaiter(void 0, void 0, void 0, function* () {
     if (!idl) {
         idl = yield anchor_1.Program.fetchIdl(programId, provider);

package/lib/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAqE;AAGrE,2CAAyC;AACzC,2CAA2D;AAC3D,yCAAuB;AACvB,8CAA4B;AAC5B,8CAA4B;AAC5B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAC7B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAEtB,MAAM,IAAI,GAAG,CAClB,QAAwB,EACxB,YAAuB,sBAAU,EACjC,GAAgB,EACuB,EAAE;IACzC,IAAI,CAAC,GAAG,EAAE;QACR,GAAG,GAAG,MAAM,gBAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;KACnD;IAED,MAAM,mBAAmB,GAAG,IAAI,gBAAO,CACrC,GAA0B,EAC1B,SAAS,EACT,QAAQ,EACR,SAAS,EACT,GAAG,EAAE,CAAC,wCAA4B,CACH,CAAC;IAElC,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAA,CAAC;AAlBW,QAAA,IAAI,QAkBf"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAAqE;AAGrE,2CAAyC;AACzC,2CAA2D;AAC3D,yCAAuB;AACvB,8CAA4B;AAC5B,8CAA4B;AAC5B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAC7B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAC7B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAEtB,MAAM,IAAI,GAAG,CAClB,QAAwB,EACxB,YAAuB,sBAAU,EACjC,GAAgB,EACuB,EAAE;IACzC,IAAI,CAAC,GAAG,EAAE;QACR,GAAG,GAAG,MAAM,gBAAO,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;KACnD;IAED,MAAM,mBAAmB,GAAG,IAAI,gBAAO,CACrC,GAA0B,EAC1B,SAAS,EACT,QAAQ,EACR,SAAS,EACT,GAAG,EAAE,CAAC,wCAA4B,CACH,CAAC;IAElC,OAAO,mBAAmB,CAAC;AAC7B,CAAC,CAAA,CAAC;AAlBW,QAAA,IAAI,QAkBf"}

package/lib/cjs/pdas.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.collectionMetadataKey = exports.mobileInfoKey = exports.iotInfoKey = exports.keyToAssetKey = exports.makerKey = exports.hotspotCollectionKey = exports.rewardableEntityConfigKey = void 0;
+exports.collectionMetadataKey = exports.mobileInfoKey = exports.iotInfoKey = exports.keyToAssetKey = exports.makerApprovalKey = exports.makerKey = exports.hotspotCollectionKey = exports.rewardableEntityConfigKey = void 0;
 const web3_js_1 = require("@solana/web3.js");
 const constants_1 = require("./constants");
 const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
@@ -32,6 +32,8 @@ const makerKey = (name, programId = constants_1.PROGRAM_ID) => web3_js_1.PublicK
     Buffer.from(name, "utf-8"),
 ], programId);
 exports.makerKey = makerKey;
+const makerApprovalKey = (rewardableEntityConfig, maker, programId = constants_1.PROGRAM_ID) => web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("maker_approval", "utf-8"), rewardableEntityConfig.toBuffer(), maker.toBuffer()], programId);
+exports.makerApprovalKey = makerApprovalKey;
 const keyToAssetKey = (dao, entityKey, programId = constants_1.PROGRAM_ID) => __awaiter(void 0, void 0, void 0, function* () {
     if (typeof entityKey === "string") {
         entityKey = Buffer.from(bs58_1.default.decode(entityKey));

package/lib/cjs/pdas.js.map

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

package/lib/esm/src/functions/onboardIotHotspot.js

@@ -1,48 +1,29 @@
-import { getAsset, getAssetProof } from "@helium/spl-utils";
-import { ConcurrentMerkleTreeAccount } from "@solana/spl-account-compression";
 import { iotInfoKey, keyToAssetKey } from "../pdas";
-export async function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, dao, assetEndpoint, dcFeePayer, payer, getAssetFn = getAsset, getAssetProofFn = getAssetProof, }) {
-    // @ts-ignore
-    const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
-    const asset = await getAssetFn(endpoint, assetId);
-    if (!asset) {
-        throw new Error("No asset with ID " + assetId.toBase58());
-    }
-    const assetProof = await getAssetProofFn(endpoint, assetId);
-    if (!assetProof) {
-        throw new Error("No asset proof with ID " + assetId.toBase58());
-    }
-    const { root, proof, leaf, treeId, nodeIndex } = assetProof;
-    const { ownership: { owner }, content: { json_uri }, } = asset;
+import { proofArgsAndAccounts } from "./proofArgsAndAccounts";
+export async function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, dao, dcFeePayer, payer, ...rest }) {
+    const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
+        connection: program.provider.connection,
+        assetId,
+        ...rest,
+    });
     const [info] = iotInfoKey(rewardableEntityConfig, assetId);
     const makerAcc = await program.account.makerV0.fetchNullable(maker);
-    const canopy = await (await ConcurrentMerkleTreeAccount.fromAccountAddress(program.provider.connection, treeId)).getCanopyDepth();
     const keyToAsset = (await keyToAssetKey(dao, json_uri.split("/").slice(-1)[0]))[0];
     return program.methods
-        .onboardIotHotspotV0({
-        hash: leaf.toBuffer().toJSON().data,
-        root: root.toBuffer().toJSON().data,
-        index: nodeIndex,
-    })
+        .onboardIotHotspotV0(args)
         .accounts({
         // hotspot: assetId,
+        ...accounts,
         payer,
         dcFeePayer,
         rewardableEntityConfig,
         hotspotOwner: owner,
         iotInfo: info,
-        merkleTree: treeId,
         maker,
         dao,
         issuingAuthority: makerAcc?.issuingAuthority,
         keyToAsset,
     })
-        .remainingAccounts(proof.slice(0, proof.length - canopy).map((p) => {
-        return {
-            pubkey: p,
-            isWritable: false,
-            isSigner: false,
-        };
-    }));
+        .remainingAccounts(remainingAccounts);
 }
 //# sourceMappingURL=onboardIotHotspot.js.map

package/lib/esm/src/functions/onboardIotHotspot.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAE9E,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAGpD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,aAAa,EACb,UAAU,EACV,KAAK,EACL,UAAU,GAAG,QAAQ,EACrB,eAAe,GAAG,aAAa,GAehC;IACC,aAAa;IACb,MAAM,QAAQ,GAAG,aAAa,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;IAC3E,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC3D;IACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;KACjE;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;IAC5D,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,EACpB,OAAO,EAAE,EAAE,QAAQ,EAAE,GACtB,GAAG,KAAK,CAAC;IACV,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAE3D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEpE,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,2BAA2B,CAAC,kBAAkB,CAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,MAAM,CACP,CACF,CAAC,cAAc,EAAE,CAAC;IACnB,MAAM,UAAU,GAAG,CACjB,MAAM,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAC,CAAC,CAAC;IACL,OAAO,OAAO,CAAC,OAAO;SACnB,mBAAmB,CAAC;QACnB,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;QACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;QACnC,KAAK,EAAE,SAAS;KACjB,CAAC;SACD,QAAQ,CAAC;QACR,oBAAoB;QACpB,KAAK;QACL,UAAU;QACV,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,MAAM;QAClB,KAAK;QACL,GAAG;QACH,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB;QAC5C,UAAU;KACX,CAAC;SACD,iBAAiB,CAChB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9C,OAAO;YACL,MAAM,EAAE,CAAC;YACT,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
+{"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,wBAAwB,CAAC;AAGxF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,UAAU,EACV,KAAK,EACL,GAAG,IAAI,EAQuC;IAC9C,MAAM,EACJ,KAAK,EAAE,EACL,OAAO,EAAE,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,EACD,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,oBAAoB,CAAC;QAC7B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU;QACvC,OAAO;QACP,GAAG,IAAI;KACR,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEpE,MAAM,UAAU,GAAG,CACjB,MAAM,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAC,CAAC,CAAC;IACL,OAAO,OAAO,CAAC,OAAO;SACnB,mBAAmB,CAAC,IAAI,CAAC;SACzB,QAAQ,CAAC;QACR,oBAAoB;QACpB,GAAG,QAAQ;QACX,KAAK;QACL,UAAU;QACV,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI;QACb,KAAK;QACL,GAAG;QACH,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB;QAC5C,UAAU;KACX,CAAC;SACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}

package/lib/esm/src/functions/onboardMobileHotspot.js

@@ -1,47 +1,28 @@
-import { getAsset, getAssetProof } from "@helium/spl-utils";
-import { ConcurrentMerkleTreeAccount } from "@solana/spl-account-compression";
 import { keyToAssetKey, mobileInfoKey } from "../pdas";
-export async function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker, dao, payer, dcFeePayer, assetEndpoint, getAssetFn = getAsset, getAssetProofFn = getAssetProof, }) {
-    // @ts-ignore
-    const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
-    const asset = await getAssetFn(endpoint, assetId);
-    if (!asset) {
-        throw new Error("No asset with ID " + assetId.toBase58());
-    }
-    const assetProof = await getAssetProofFn(endpoint, assetId);
-    if (!assetProof) {
-        throw new Error("No asset proof with ID " + assetId.toBase58());
-    }
-    const { root, proof, treeId, nodeIndex, leaf } = assetProof;
-    const { ownership: { owner }, content: { json_uri }, } = asset;
+import { proofArgsAndAccounts } from "./proofArgsAndAccounts";
+export async function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker, dao, payer, dcFeePayer, ...rest }) {
+    const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
+        connection: program.provider.connection,
+        assetId,
+        ...rest,
+    });
     const [info] = mobileInfoKey(rewardableEntityConfig, assetId);
-    const canopy = await (await ConcurrentMerkleTreeAccount.fromAccountAddress(program.provider.connection, treeId)).getCanopyDepth();
     const makerAcc = await program.account.makerV0.fetchNullable(maker);
     return program.methods
-        .onboardMobileHotspotV0({
-        hash: leaf.toBuffer().toJSON().data,
-        root: root.toBuffer().toJSON().data,
-        index: nodeIndex,
-    })
+        .onboardMobileHotspotV0(args)
         .accounts({
         // hotspot: assetId,
+        ...accounts,
         dcFeePayer,
         payer,
         rewardableEntityConfig,
         hotspotOwner: owner,
         mobileInfo: info,
-        merkleTree: treeId,
         maker,
         dao,
         issuingAuthority: makerAcc?.issuingAuthority,
         keyToAsset: (await keyToAssetKey(dao, json_uri.split("/").slice(-1)[0]))[0],
     })
-        .remainingAccounts(proof.slice(0, proof.length - canopy).map((p) => {
-        return {
-            pubkey: p,
-            isWritable: false,
-            isSigner: false,
-        };
-    }));
+        .remainingAccounts(remainingAccounts);
 }
 //# sourceMappingURL=onboardMobileHotspot.js.map

package/lib/esm/src/functions/onboardMobileHotspot.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAE/E,OAAO,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AAE9E,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEvD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,KAAK,EACL,UAAU,EACV,aAAa,EACb,UAAU,GAAG,QAAQ,EACrB,eAAe,GAAG,aAAa,GAehC;IACC,aAAa;IACb,MAAM,QAAQ,GAAG,aAAa,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC;IAC3E,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAClD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC3D;IACD,MAAM,UAAU,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC5D,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;KACjE;IACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC;IAC5D,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,EACpB,OAAO,EAAE,EAAE,QAAQ,EAAE,GACtB,GAAG,KAAK,CAAC;IAEV,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,MAAM,CACnB,MAAM,2BAA2B,CAAC,kBAAkB,CAClD,OAAO,CAAC,QAAQ,CAAC,UAAU,EAC3B,MAAM,CACP,CACF,CAAC,cAAc,EAAE,CAAC;IACnB,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,OAAO,CAAC,OAAO;SACnB,sBAAsB,CAAC;QACtB,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;QACnC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI;QACnC,KAAK,EAAE,SAAS;KACjB,CAAC;SACD,QAAQ,CAAC;QACR,oBAAoB;QACpB,UAAU;QACV,KAAK;QACL,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,MAAM;QAClB,KAAK;QACL,GAAG;QACH,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB;QAC5C,UAAU,EAAE,CACV,MAAM,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAC,CAAC;KACL,CAAC;SACD,iBAAiB,CAChB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC9C,OAAO;YACL,MAAM,EAAE,CAAC;YACT,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
+{"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAA4B,MAAM,wBAAwB,CAAC;AAExF,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,KAAK,EACL,UAAU,EACV,GAAG,IAAI,EASuC;IAC9C,MAAM,EACJ,KAAK,EAAE,EACL,OAAO,EAAE,EAAE,QAAQ,EAAE,EACrB,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,EACD,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,oBAAoB,CAAC;QAC7B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU;QACvC,OAAO;QACP,GAAG,IAAI;KACR,CAAC,CAAC;IAEH,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAC9D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,OAAO,CAAC,OAAO;SACnB,sBAAsB,CAAC,IAAI,CAAC;SAC5B,QAAQ,CAAC;QACR,oBAAoB;QACpB,GAAG,QAAQ;QACX,UAAU;QACV,KAAK;QACL,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,IAAI;QAChB,KAAK;QACL,GAAG;QACH,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB;QAC5C,UAAU,EAAE,CACV,MAAM,aAAa,CAAC,GAAG,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAC3D,CAAC,CAAC,CAAC;KACL,CAAC;SACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}