@helium/helium-entity-manager-sdk 0.0.14 → 0.0.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/functions/onboardIotHotspot.js +8 -8
- package/lib/cjs/functions/onboardIotHotspot.js.map +1 -1
- package/lib/cjs/functions/onboardMobileHotspot.js +7 -8
- package/lib/cjs/functions/onboardMobileHotspot.js.map +1 -1
- package/lib/cjs/functions/updateIotMetadata.js +2 -3
- package/lib/cjs/functions/updateIotMetadata.js.map +1 -1
- package/lib/cjs/functions/updateMobileMetadata.js +2 -3
- package/lib/cjs/functions/updateMobileMetadata.js.map +1 -1
- package/lib/cjs/pdas.js +25 -11
- package/lib/cjs/pdas.js.map +1 -1
- package/lib/cjs/resolvers.js +14 -5
- package/lib/cjs/resolvers.js.map +1 -1
- package/lib/esm/src/functions/onboardIotHotspot.js +9 -9
- package/lib/esm/src/functions/onboardIotHotspot.js.map +1 -1
- package/lib/esm/src/functions/onboardMobileHotspot.js +8 -9
- package/lib/esm/src/functions/onboardMobileHotspot.js.map +1 -1
- package/lib/esm/src/functions/updateIotMetadata.js +2 -3
- package/lib/esm/src/functions/updateIotMetadata.js.map +1 -1
- package/lib/esm/src/functions/updateMobileMetadata.js +2 -3
- package/lib/esm/src/functions/updateMobileMetadata.js.map +1 -1
- package/lib/esm/src/pdas.js +14 -10
- package/lib/esm/src/pdas.js.map +1 -1
- package/lib/esm/src/resolvers.js +14 -5
- package/lib/esm/src/resolvers.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/functions/onboardIotHotspot.d.ts +7 -1
- package/lib/types/src/functions/onboardIotHotspot.d.ts.map +1 -1
- package/lib/types/src/functions/onboardMobileHotspot.d.ts +7 -1
- package/lib/types/src/functions/onboardMobileHotspot.d.ts.map +1 -1
- package/lib/types/src/functions/updateIotMetadata.d.ts.map +1 -1
- package/lib/types/src/functions/updateMobileMetadata.d.ts.map +1 -1
- package/lib/types/src/pdas.d.ts +3 -2
- package/lib/types/src/pdas.d.ts.map +1 -1
- package/lib/types/src/resolvers.d.ts.map +1 -1
- package/package.json +5 -5
|
@@ -12,8 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.onboardIotHotspot = void 0;
|
|
13
13
|
const spl_utils_1 = require("@helium/spl-utils");
|
|
14
14
|
const pdas_1 = require("../pdas");
|
|
15
|
-
|
|
16
|
-
function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, assetEndpoint, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, }) {
|
|
15
|
+
function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, dao, assetEndpoint, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, }) {
|
|
17
16
|
return __awaiter(this, void 0, void 0, function* () {
|
|
18
17
|
// @ts-ignore
|
|
19
18
|
const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
|
|
@@ -26,14 +25,13 @@ function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, as
|
|
|
26
25
|
throw new Error("No asset proof with ID " + assetId.toBase58());
|
|
27
26
|
}
|
|
28
27
|
const { root, proof, leaf, treeId, nodeIndex } = assetProof;
|
|
29
|
-
const { ownership: { owner }, content: { json_uri
|
|
30
|
-
const
|
|
31
|
-
const [info] = (0, pdas_1.iotInfoKey)(rewardableEntityConfig, eccCompact);
|
|
28
|
+
const { ownership: { owner }, content: { json_uri } } = asset;
|
|
29
|
+
const [info] = (0, pdas_1.iotInfoKey)(rewardableEntityConfig, assetId);
|
|
32
30
|
const makerAcc = yield program.account.makerV0.fetchNullable(maker);
|
|
33
|
-
const
|
|
31
|
+
const keyToAsset = (yield (0, pdas_1.keyToAssetKey)(dao, json_uri.split("/").slice(-1)[0]))[0];
|
|
34
32
|
return program.methods
|
|
35
33
|
.onboardIotHotspotV0({
|
|
36
|
-
|
|
34
|
+
hash: leaf.toBuffer().toJSON().data,
|
|
37
35
|
root: root.toBuffer().toJSON().data,
|
|
38
36
|
index: nodeIndex,
|
|
39
37
|
})
|
|
@@ -44,7 +42,9 @@ function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, as
|
|
|
44
42
|
iotInfo: info,
|
|
45
43
|
merkleTree: treeId,
|
|
46
44
|
maker,
|
|
47
|
-
|
|
45
|
+
dao,
|
|
46
|
+
issuingAuthority: makerAcc === null || makerAcc === void 0 ? void 0 : makerAcc.issuingAuthority,
|
|
47
|
+
keyToAsset,
|
|
48
48
|
})
|
|
49
49
|
.remainingAccounts(proof.map((p) => {
|
|
50
50
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;
|
|
1
|
+
{"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAG/E,kCAAoD;AAGpD,SAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAahC;;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,EACtB,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,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,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,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,OAAO;gBACL,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACN,CAAC;CAAA;AAtED,8CAsEC"}
|
|
@@ -12,8 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
12
12
|
exports.onboardMobileHotspot = void 0;
|
|
13
13
|
const spl_utils_1 = require("@helium/spl-utils");
|
|
14
14
|
const pdas_1 = require("../pdas");
|
|
15
|
-
|
|
16
|
-
function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker, assetEndpoint, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, }) {
|
|
15
|
+
function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker, dao, assetEndpoint, getAssetFn = spl_utils_1.getAsset, getAssetProofFn = spl_utils_1.getAssetProof, }) {
|
|
17
16
|
return __awaiter(this, void 0, void 0, function* () {
|
|
18
17
|
// @ts-ignore
|
|
19
18
|
const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
|
|
@@ -25,15 +24,13 @@ function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker,
|
|
|
25
24
|
if (!assetProof) {
|
|
26
25
|
throw new Error("No asset proof with ID " + assetId.toBase58());
|
|
27
26
|
}
|
|
28
|
-
const { root, proof, treeId, nodeIndex } = assetProof;
|
|
29
|
-
const { ownership: { owner }, content: { json_uri
|
|
30
|
-
const
|
|
31
|
-
const [info] = (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, eccCompact);
|
|
27
|
+
const { root, proof, treeId, nodeIndex, leaf } = assetProof;
|
|
28
|
+
const { ownership: { owner }, content: { json_uri } } = asset;
|
|
29
|
+
const [info] = (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, assetId);
|
|
32
30
|
const makerAcc = yield program.account.makerV0.fetchNullable(maker);
|
|
33
|
-
const anchorMetadata = (0, utils_1.assetToMetadataArgs)(asset);
|
|
34
31
|
return program.methods
|
|
35
32
|
.onboardMobileHotspotV0({
|
|
36
|
-
|
|
33
|
+
hash: leaf.toBuffer().toJSON().data,
|
|
37
34
|
root: root.toBuffer().toJSON().data,
|
|
38
35
|
index: nodeIndex,
|
|
39
36
|
})
|
|
@@ -44,7 +41,9 @@ function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker,
|
|
|
44
41
|
mobileInfo: info,
|
|
45
42
|
merkleTree: treeId,
|
|
46
43
|
maker,
|
|
44
|
+
dao,
|
|
47
45
|
issuingAuthority: makerAcc === null || makerAcc === void 0 ? void 0 : makerAcc.issuingAuthority,
|
|
46
|
+
keyToAsset: (yield (0, pdas_1.keyToAssetKey)(dao, json_uri.split("/").slice(-1)[0]))[0],
|
|
48
47
|
})
|
|
49
48
|
.remainingAccounts(proof.map((p) => {
|
|
50
49
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAG/E,
|
|
1
|
+
{"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAG/E,kCAAuD;AAEvD,SAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAahC;;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,EACtB,GAAG,KAAK,CAAC;QAEV,MAAM,CAAC,IAAI,CAAC,GAAG,IAAA,oBAAa,EAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAE9D,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,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,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,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"}
|
|
@@ -25,9 +25,8 @@ function updateIotMetadata({ program, rewardableEntityConfig, assetId, location,
|
|
|
25
25
|
throw new Error("No asset proof with ID " + assetId.toBase58());
|
|
26
26
|
}
|
|
27
27
|
const { root, proof, leaf, treeId, nodeIndex } = assetProof;
|
|
28
|
-
const { ownership: { owner },
|
|
29
|
-
const
|
|
30
|
-
const [info] = (0, pdas_1.iotInfoKey)(rewardableEntityConfig, eccCompact);
|
|
28
|
+
const { ownership: { owner }, } = asset;
|
|
29
|
+
const [info] = (0, pdas_1.iotInfoKey)(rewardableEntityConfig, assetId);
|
|
31
30
|
return program.methods
|
|
32
31
|
.updateIotInfoV0({
|
|
33
32
|
location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAG/E,kCAAqC;AAErC,SAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAchC;;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,
|
|
1
|
+
{"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAG/E,kCAAqC;AAErC,SAAsB,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAchC;;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;QAE3D,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,sBAAsB;YACtB,YAAY,EAAE,KAAK;YACnB,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,MAAM;SACnB,CAAC;aACD,iBAAiB,CAChB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,OAAO;gBACL,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACN,CAAC;CAAA;AAlED,8CAkEC"}
|
|
@@ -25,9 +25,8 @@ function updateMobileMetadata({ program, rewardableEntityConfig, assetId, locati
|
|
|
25
25
|
throw new Error("No asset proof with ID " + assetId.toBase58());
|
|
26
26
|
}
|
|
27
27
|
const { root, proof, leaf, treeId, nodeIndex } = assetProof;
|
|
28
|
-
const { ownership: { owner },
|
|
29
|
-
const
|
|
30
|
-
const [info] = (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, eccCompact);
|
|
28
|
+
const { ownership: { owner }, } = asset;
|
|
29
|
+
const [info] = (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, assetId);
|
|
31
30
|
return program.methods
|
|
32
31
|
.updateMobileInfoV0({
|
|
33
32
|
location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAG/E,kCAAoD;AAEpD,SAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAYhC;;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,
|
|
1
|
+
{"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,iDAA+E;AAG/E,kCAAoD;AAEpD,SAAsB,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,aAAa,EACb,UAAU,GAAG,oBAAQ,EACrB,eAAe,GAAG,yBAAa,GAYhC;;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,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,sBAAsB;YACtB,YAAY,EAAE,KAAK;YACnB,UAAU,EAAE,IAAI;YAChB,UAAU,EAAE,MAAM;SACnB,CAAC;aACD,iBAAiB,CAChB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACd,OAAO;gBACL,MAAM,EAAE,CAAC;gBACT,UAAU,EAAE,KAAK;gBACjB,QAAQ,EAAE,KAAK;aAChB,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;IACN,CAAC;CAAA;AA3DD,oDA2DC"}
|
package/lib/cjs/pdas.js
CHANGED
|
@@ -1,14 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
2
11
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
12
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
13
|
};
|
|
5
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.collectionMetadataKey = exports.mobileInfoKey = exports.iotInfoKey = exports.makerKey = exports.hotspotCollectionKey = exports.rewardableEntityConfigKey = void 0;
|
|
15
|
+
exports.collectionMetadataKey = exports.mobileInfoKey = exports.iotInfoKey = exports.keyToAssetKey = exports.makerKey = exports.hotspotCollectionKey = exports.rewardableEntityConfigKey = void 0;
|
|
7
16
|
const web3_js_1 = require("@solana/web3.js");
|
|
8
17
|
const constants_1 = require("./constants");
|
|
9
18
|
const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
|
|
10
|
-
const
|
|
11
|
-
|
|
19
|
+
const crypto_1 = __importDefault(require("crypto"));
|
|
20
|
+
// @ts-ignore
|
|
21
|
+
const bs58_1 = __importDefault(require("bs58"));
|
|
12
22
|
const rewardableEntityConfigKey = (subDao, symbol, programId = constants_1.PROGRAM_ID) => web3_js_1.PublicKey.findProgramAddressSync([
|
|
13
23
|
Buffer.from("rewardable_entity_config", "utf-8"),
|
|
14
24
|
subDao.toBuffer(),
|
|
@@ -22,19 +32,23 @@ const makerKey = (name, programId = constants_1.PROGRAM_ID) => web3_js_1.PublicK
|
|
|
22
32
|
Buffer.from(name, "utf-8"),
|
|
23
33
|
], programId);
|
|
24
34
|
exports.makerKey = makerKey;
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
35
|
+
const keyToAssetKey = (dao, entityKey, programId = constants_1.PROGRAM_ID) => __awaiter(void 0, void 0, void 0, function* () {
|
|
36
|
+
if (typeof entityKey === "string") {
|
|
37
|
+
entityKey = Buffer.from(bs58_1.default.decode(entityKey));
|
|
38
|
+
}
|
|
39
|
+
const hash = yield crypto_1.default.subtle.digest("SHA-256", entityKey);
|
|
40
|
+
return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("key_to_asset", "utf-8"), dao.toBuffer(), Buffer.from(hash)], programId);
|
|
41
|
+
});
|
|
42
|
+
exports.keyToAssetKey = keyToAssetKey;
|
|
43
|
+
const iotInfoKey = (rewardableEntityConfig, assetId, programId = constants_1.PROGRAM_ID) => {
|
|
44
|
+
return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("iot_info", "utf-8"), rewardableEntityConfig.toBuffer(), assetId.toBuffer()], programId);
|
|
29
45
|
};
|
|
30
46
|
exports.iotInfoKey = iotInfoKey;
|
|
31
|
-
const mobileInfoKey = (rewardableEntityConfig,
|
|
32
|
-
let hexString = (0, sha256_1.default)(hotspotKey).toString(enc_hex_1.default);
|
|
33
|
-
let seed = Uint8Array.from(Buffer.from(hexString, "hex"));
|
|
47
|
+
const mobileInfoKey = (rewardableEntityConfig, assetId, programId = constants_1.PROGRAM_ID) => {
|
|
34
48
|
return web3_js_1.PublicKey.findProgramAddressSync([
|
|
35
49
|
Buffer.from("mobile_info", "utf-8"),
|
|
36
50
|
rewardableEntityConfig.toBuffer(),
|
|
37
|
-
|
|
51
|
+
assetId.toBuffer(),
|
|
38
52
|
], programId);
|
|
39
53
|
};
|
|
40
54
|
exports.mobileInfoKey = mobileInfoKey;
|
package/lib/cjs/pdas.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pdas.js","sourceRoot":"","sources":["../../src/pdas.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pdas.js","sourceRoot":"","sources":["../../src/pdas.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/resolvers.js
CHANGED
|
@@ -14,17 +14,25 @@ const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
|
|
|
14
14
|
const spl_utils_1 = require("@helium/spl-utils");
|
|
15
15
|
const pdas_1 = require("./pdas");
|
|
16
16
|
const spl_token_1 = require("@solana/spl-token");
|
|
17
|
+
const mpl_bubblegum_1 = require("@metaplex-foundation/mpl-bubblegum");
|
|
17
18
|
exports.heliumEntityManagerResolvers = (0, spl_utils_1.combineResolvers)(spl_utils_1.heliumCommonResolver, (0, spl_utils_1.ataResolver)({
|
|
18
19
|
instruction: "initializeMakerV0",
|
|
19
20
|
account: "tokenAccount",
|
|
20
21
|
mint: "collection",
|
|
21
22
|
owner: "maker",
|
|
22
|
-
}), (0, spl_utils_1.resolveIndividual)(({ path, args,
|
|
23
|
+
}), (0, spl_utils_1.resolveIndividual)(({ path, args, accounts }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
24
|
+
if (path[path.length - 1] === "keyToAsset" &&
|
|
25
|
+
args[args.length - 1].entityKey &&
|
|
26
|
+
accounts.dao) {
|
|
27
|
+
return (yield (0, pdas_1.keyToAssetKey)(accounts.dao, args[args.length - 1].entityKey))[0];
|
|
28
|
+
}
|
|
29
|
+
})), (0, spl_utils_1.resolveIndividual)(({ path, args, provider, accounts }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
23
30
|
var _a;
|
|
24
31
|
if (path[path.length - 1] === "iotInfo" &&
|
|
25
|
-
args[args.length - 1].
|
|
32
|
+
args[args.length - 1].index &&
|
|
33
|
+
accounts.merkleTree &&
|
|
26
34
|
accounts.rewardableEntityConfig) {
|
|
27
|
-
return (0, pdas_1.iotInfoKey)(accounts.rewardableEntityConfig, args[args.length - 1].
|
|
35
|
+
return (0, pdas_1.iotInfoKey)(accounts.rewardableEntityConfig, yield (0, mpl_bubblegum_1.getLeafAssetId)(accounts.merkleTree, args[args.length - 1].index))[0];
|
|
28
36
|
}
|
|
29
37
|
else if (path[path.length - 1] === "recipient") {
|
|
30
38
|
// @ts-ignore
|
|
@@ -33,9 +41,10 @@ exports.heliumEntityManagerResolvers = (0, spl_utils_1.combineResolvers)(spl_uti
|
|
|
33
41
|
})), (0, spl_utils_1.resolveIndividual)(({ path, args, provider, accounts }) => __awaiter(void 0, void 0, void 0, function* () {
|
|
34
42
|
var _b;
|
|
35
43
|
if (path[path.length - 1] === "mobileInfo" &&
|
|
36
|
-
args[args.length - 1].
|
|
44
|
+
args[args.length - 1].index &&
|
|
45
|
+
accounts.merkleTree &&
|
|
37
46
|
accounts.rewardableEntityConfig) {
|
|
38
|
-
return (0, pdas_1.mobileInfoKey)(accounts.rewardableEntityConfig, args[args.length - 1].
|
|
47
|
+
return (0, pdas_1.mobileInfoKey)(accounts.rewardableEntityConfig, yield (0, mpl_bubblegum_1.getLeafAssetId)(accounts.merkleTree, args[args.length - 1].index))[0];
|
|
39
48
|
}
|
|
40
49
|
else if (path[path.length - 1] === "recipient") {
|
|
41
50
|
// @ts-ignore
|
package/lib/cjs/resolvers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../src/resolvers.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qEAAsE;AACtE,iDAK2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../src/resolvers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { getAsset, getAssetProof } from "@helium/spl-utils";
|
|
2
|
-
import { iotInfoKey } from "../pdas";
|
|
3
|
-
|
|
4
|
-
export async function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, assetEndpoint, getAssetFn = getAsset, getAssetProofFn = getAssetProof, }) {
|
|
2
|
+
import { iotInfoKey, keyToAssetKey } from "../pdas";
|
|
3
|
+
export async function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, dao, assetEndpoint, getAssetFn = getAsset, getAssetProofFn = getAssetProof, }) {
|
|
5
4
|
// @ts-ignore
|
|
6
5
|
const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
|
|
7
6
|
const asset = await getAssetFn(endpoint, assetId);
|
|
@@ -13,14 +12,13 @@ export async function onboardIotHotspot({ program, rewardableEntityConfig, asset
|
|
|
13
12
|
throw new Error("No asset proof with ID " + assetId.toBase58());
|
|
14
13
|
}
|
|
15
14
|
const { root, proof, leaf, treeId, nodeIndex } = assetProof;
|
|
16
|
-
const { ownership: { owner }, content: { json_uri
|
|
17
|
-
const
|
|
18
|
-
const [info] = iotInfoKey(rewardableEntityConfig, eccCompact);
|
|
15
|
+
const { ownership: { owner }, content: { json_uri } } = asset;
|
|
16
|
+
const [info] = iotInfoKey(rewardableEntityConfig, assetId);
|
|
19
17
|
const makerAcc = await program.account.makerV0.fetchNullable(maker);
|
|
20
|
-
const
|
|
18
|
+
const keyToAsset = (await keyToAssetKey(dao, json_uri.split("/").slice(-1)[0]))[0];
|
|
21
19
|
return program.methods
|
|
22
20
|
.onboardIotHotspotV0({
|
|
23
|
-
|
|
21
|
+
hash: leaf.toBuffer().toJSON().data,
|
|
24
22
|
root: root.toBuffer().toJSON().data,
|
|
25
23
|
index: nodeIndex,
|
|
26
24
|
})
|
|
@@ -31,7 +29,9 @@ export async function onboardIotHotspot({ program, rewardableEntityConfig, asset
|
|
|
31
29
|
iotInfo: info,
|
|
32
30
|
merkleTree: treeId,
|
|
33
31
|
maker,
|
|
34
|
-
|
|
32
|
+
dao,
|
|
33
|
+
issuingAuthority: makerAcc?.issuingAuthority,
|
|
34
|
+
keyToAsset,
|
|
35
35
|
})
|
|
36
36
|
.remainingAccounts(proof.map((p) => {
|
|
37
37
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAG/E,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,GAAG,QAAQ,EACrB,eAAe,GAAG,aAAa,GAahC;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,EACtB,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,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,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,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACd,OAAO;YACL,MAAM,EAAE,CAAC;YACT,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { getAsset, getAssetProof } from "@helium/spl-utils";
|
|
2
|
-
import { mobileInfoKey } from "../pdas";
|
|
3
|
-
|
|
4
|
-
export async function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker, assetEndpoint, getAssetFn = getAsset, getAssetProofFn = getAssetProof, }) {
|
|
2
|
+
import { keyToAssetKey, mobileInfoKey } from "../pdas";
|
|
3
|
+
export async function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker, dao, assetEndpoint, getAssetFn = getAsset, getAssetProofFn = getAssetProof, }) {
|
|
5
4
|
// @ts-ignore
|
|
6
5
|
const endpoint = assetEndpoint || program.provider.connection._rpcEndpoint;
|
|
7
6
|
const asset = await getAssetFn(endpoint, assetId);
|
|
@@ -12,15 +11,13 @@ export async function onboardMobileHotspot({ program, rewardableEntityConfig, as
|
|
|
12
11
|
if (!assetProof) {
|
|
13
12
|
throw new Error("No asset proof with ID " + assetId.toBase58());
|
|
14
13
|
}
|
|
15
|
-
const { root, proof, treeId, nodeIndex } = assetProof;
|
|
16
|
-
const { ownership: { owner }, content: { json_uri
|
|
17
|
-
const
|
|
18
|
-
const [info] = mobileInfoKey(rewardableEntityConfig, eccCompact);
|
|
14
|
+
const { root, proof, treeId, nodeIndex, leaf } = assetProof;
|
|
15
|
+
const { ownership: { owner }, content: { json_uri } } = asset;
|
|
16
|
+
const [info] = mobileInfoKey(rewardableEntityConfig, assetId);
|
|
19
17
|
const makerAcc = await program.account.makerV0.fetchNullable(maker);
|
|
20
|
-
const anchorMetadata = assetToMetadataArgs(asset);
|
|
21
18
|
return program.methods
|
|
22
19
|
.onboardMobileHotspotV0({
|
|
23
|
-
|
|
20
|
+
hash: leaf.toBuffer().toJSON().data,
|
|
24
21
|
root: root.toBuffer().toJSON().data,
|
|
25
22
|
index: nodeIndex,
|
|
26
23
|
})
|
|
@@ -31,7 +28,9 @@ export async function onboardMobileHotspot({ program, rewardableEntityConfig, as
|
|
|
31
28
|
mobileInfo: info,
|
|
32
29
|
merkleTree: treeId,
|
|
33
30
|
maker,
|
|
31
|
+
dao,
|
|
34
32
|
issuingAuthority: makerAcc?.issuingAuthority,
|
|
33
|
+
keyToAsset: (await keyToAssetKey(dao, json_uri.split("/").slice(-1)[0]))[0],
|
|
35
34
|
})
|
|
36
35
|
.remainingAccounts(proof.map((p) => {
|
|
37
36
|
return {
|
|
@@ -1 +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;AAG/E,OAAO,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAG/E,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,aAAa,EACb,UAAU,GAAG,QAAQ,EACrB,eAAe,GAAG,aAAa,GAahC;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,EACtB,GAAG,KAAK,CAAC;IAEV,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAE9D,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,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,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACd,OAAO;YACL,MAAM,EAAE,CAAC;YACT,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
|
|
@@ -12,9 +12,8 @@ export async function updateIotMetadata({ program, rewardableEntityConfig, asset
|
|
|
12
12
|
throw new Error("No asset proof with ID " + assetId.toBase58());
|
|
13
13
|
}
|
|
14
14
|
const { root, proof, leaf, treeId, nodeIndex } = assetProof;
|
|
15
|
-
const { ownership: { owner },
|
|
16
|
-
const
|
|
17
|
-
const [info] = iotInfoKey(rewardableEntityConfig, eccCompact);
|
|
15
|
+
const { ownership: { owner }, } = asset;
|
|
16
|
+
const [info] = iotInfoKey(rewardableEntityConfig, assetId);
|
|
18
17
|
return program.methods
|
|
19
18
|
.updateIotInfoV0({
|
|
20
19
|
location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAG/E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,aAAa,EACb,UAAU,GAAG,QAAQ,EACrB,eAAe,GAAG,aAAa,GAchC;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,
|
|
1
|
+
{"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAG/E,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,aAAa,EACb,UAAU,GAAG,QAAQ,EACrB,eAAe,GAAG,aAAa,GAchC;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,GACrB,GAAG,KAAK,CAAC;IAEV,MAAM,CAAC,IAAI,CAAC,GAAG,UAAU,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAE3D,OAAO,OAAO,CAAC,OAAO;SACnB,eAAe,CAAC;QACf,QAAQ;QACR,SAAS;QACT,IAAI;QACJ,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,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI;QACb,UAAU,EAAE,MAAM;KACnB,CAAC;SACD,iBAAiB,CAChB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACd,OAAO;YACL,MAAM,EAAE,CAAC;YACT,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
|
|
@@ -12,9 +12,8 @@ export async function updateMobileMetadata({ program, rewardableEntityConfig, as
|
|
|
12
12
|
throw new Error("No asset proof with ID " + assetId.toBase58());
|
|
13
13
|
}
|
|
14
14
|
const { root, proof, leaf, treeId, nodeIndex } = assetProof;
|
|
15
|
-
const { ownership: { owner },
|
|
16
|
-
const
|
|
17
|
-
const [info] = mobileInfoKey(rewardableEntityConfig, eccCompact);
|
|
15
|
+
const { ownership: { owner }, } = asset;
|
|
16
|
+
const [info] = mobileInfoKey(rewardableEntityConfig, assetId);
|
|
18
17
|
return program.methods
|
|
19
18
|
.updateMobileInfoV0({
|
|
20
19
|
location,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAG/E,OAAO,EAAc,aAAa,EAAE,MAAM,SAAS,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,aAAa,EACb,UAAU,GAAG,QAAQ,EACrB,eAAe,GAAG,aAAa,GAYhC;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,
|
|
1
|
+
{"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,QAAQ,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAG/E,OAAO,EAAc,aAAa,EAAE,MAAM,SAAS,CAAC;AAEpD,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,aAAa,EACb,UAAU,GAAG,QAAQ,EACrB,eAAe,GAAG,aAAa,GAYhC;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,GACrB,GAAG,KAAK,CAAC;IAEV,MAAM,CAAC,IAAI,CAAC,GAAG,aAAa,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;IAE9D,OAAO,OAAO,CAAC,OAAO;SACnB,kBAAkB,CAAC;QAClB,QAAQ;QACR,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,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,IAAI;QAChB,UAAU,EAAE,MAAM;KACnB,CAAC;SACD,iBAAiB,CAChB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QACd,OAAO;YACL,MAAM,EAAE,CAAC;YACT,UAAU,EAAE,KAAK;YACjB,QAAQ,EAAE,KAAK;SAChB,CAAC;IACJ,CAAC,CAAC,CACH,CAAC;AACN,CAAC"}
|
package/lib/esm/src/pdas.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { PublicKey } from "@solana/web3.js";
|
|
2
2
|
import { PROGRAM_ID } from "./constants";
|
|
3
3
|
import { PROGRAM_ID as TOKEN_METADATA_PROGRAM_ID } from "@metaplex-foundation/mpl-token-metadata";
|
|
4
|
-
import
|
|
5
|
-
|
|
4
|
+
import crypto from "crypto";
|
|
5
|
+
// @ts-ignore
|
|
6
|
+
import bs58 from "bs58";
|
|
6
7
|
export const rewardableEntityConfigKey = (subDao, symbol, programId = PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
|
7
8
|
Buffer.from("rewardable_entity_config", "utf-8"),
|
|
8
9
|
subDao.toBuffer(),
|
|
@@ -13,18 +14,21 @@ export const makerKey = (name, programId = PROGRAM_ID) => PublicKey.findProgramA
|
|
|
13
14
|
Buffer.from("maker", "utf-8"),
|
|
14
15
|
Buffer.from(name, "utf-8"),
|
|
15
16
|
], programId);
|
|
16
|
-
export const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
17
|
+
export const keyToAssetKey = async (dao, entityKey, programId = PROGRAM_ID) => {
|
|
18
|
+
if (typeof entityKey === "string") {
|
|
19
|
+
entityKey = Buffer.from(bs58.decode(entityKey));
|
|
20
|
+
}
|
|
21
|
+
const hash = await crypto.subtle.digest("SHA-256", entityKey);
|
|
22
|
+
return PublicKey.findProgramAddressSync([Buffer.from("key_to_asset", "utf-8"), dao.toBuffer(), Buffer.from(hash)], programId);
|
|
20
23
|
};
|
|
21
|
-
export const
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
export const iotInfoKey = (rewardableEntityConfig, assetId, programId = PROGRAM_ID) => {
|
|
25
|
+
return PublicKey.findProgramAddressSync([Buffer.from("iot_info", "utf-8"), rewardableEntityConfig.toBuffer(), assetId.toBuffer()], programId);
|
|
26
|
+
};
|
|
27
|
+
export const mobileInfoKey = (rewardableEntityConfig, assetId, programId = PROGRAM_ID) => {
|
|
24
28
|
return PublicKey.findProgramAddressSync([
|
|
25
29
|
Buffer.from("mobile_info", "utf-8"),
|
|
26
30
|
rewardableEntityConfig.toBuffer(),
|
|
27
|
-
|
|
31
|
+
assetId.toBuffer(),
|
|
28
32
|
], programId);
|
|
29
33
|
};
|
|
30
34
|
export const collectionMetadataKey = (collection, programId = TOKEN_METADATA_PROGRAM_ID) => PublicKey.findProgramAddressSync([
|
package/lib/esm/src/pdas.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pdas.js","sourceRoot":"","sources":["../../../src/pdas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,UAAU,IAAI,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AAClG,OAAO,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"pdas.js","sourceRoot":"","sources":["../../../src/pdas.ts"],"names":[],"mappings":"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"}
|
package/lib/esm/src/resolvers.js
CHANGED
|
@@ -1,17 +1,25 @@
|
|
|
1
1
|
import { subDaoEpochInfoResolver } from "@helium/helium-sub-daos-sdk";
|
|
2
2
|
import { ataResolver, combineResolvers, heliumCommonResolver, resolveIndividual, } from "@helium/spl-utils";
|
|
3
|
-
import { iotInfoKey, mobileInfoKey } from "./pdas";
|
|
3
|
+
import { iotInfoKey, keyToAssetKey, mobileInfoKey } from "./pdas";
|
|
4
4
|
import { getAssociatedTokenAddress } from "@solana/spl-token";
|
|
5
|
+
import { getLeafAssetId } from "@metaplex-foundation/mpl-bubblegum";
|
|
5
6
|
export const heliumEntityManagerResolvers = combineResolvers(heliumCommonResolver, ataResolver({
|
|
6
7
|
instruction: "initializeMakerV0",
|
|
7
8
|
account: "tokenAccount",
|
|
8
9
|
mint: "collection",
|
|
9
10
|
owner: "maker",
|
|
11
|
+
}), resolveIndividual(async ({ path, args, accounts }) => {
|
|
12
|
+
if (path[path.length - 1] === "keyToAsset" &&
|
|
13
|
+
args[args.length - 1].entityKey &&
|
|
14
|
+
accounts.dao) {
|
|
15
|
+
return (await keyToAssetKey(accounts.dao, args[args.length - 1].entityKey))[0];
|
|
16
|
+
}
|
|
10
17
|
}), resolveIndividual(async ({ path, args, provider, accounts }) => {
|
|
11
18
|
if (path[path.length - 1] === "iotInfo" &&
|
|
12
|
-
args[args.length - 1].
|
|
19
|
+
args[args.length - 1].index &&
|
|
20
|
+
accounts.merkleTree &&
|
|
13
21
|
accounts.rewardableEntityConfig) {
|
|
14
|
-
return iotInfoKey(accounts.rewardableEntityConfig, args[args.length - 1].
|
|
22
|
+
return iotInfoKey(accounts.rewardableEntityConfig, await getLeafAssetId(accounts.merkleTree, args[args.length - 1].index))[0];
|
|
15
23
|
}
|
|
16
24
|
else if (path[path.length - 1] === "recipient") {
|
|
17
25
|
// @ts-ignore
|
|
@@ -19,9 +27,10 @@ export const heliumEntityManagerResolvers = combineResolvers(heliumCommonResolve
|
|
|
19
27
|
}
|
|
20
28
|
}), resolveIndividual(async ({ path, args, provider, accounts }) => {
|
|
21
29
|
if (path[path.length - 1] === "mobileInfo" &&
|
|
22
|
-
args[args.length - 1].
|
|
30
|
+
args[args.length - 1].index &&
|
|
31
|
+
accounts.merkleTree &&
|
|
23
32
|
accounts.rewardableEntityConfig) {
|
|
24
|
-
return mobileInfoKey(accounts.rewardableEntityConfig, args[args.length - 1].
|
|
33
|
+
return mobileInfoKey(accounts.rewardableEntityConfig, await getLeafAssetId(accounts.merkleTree, args[args.length - 1].index))[0];
|
|
25
34
|
}
|
|
26
35
|
else if (path[path.length - 1] === "recipient") {
|
|
27
36
|
// @ts-ignore
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,WAAW,EACX,gBAAgB,EAChB,oBAAoB,EACpB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"resolvers.js","sourceRoot":"","sources":["../../../src/resolvers.ts"],"names":[],"mappings":"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"}
|