@helium/helium-entity-manager-sdk 0.2.11 → 0.2.14

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.
Files changed (44) hide show
  1. package/lib/cjs/functions/onboardIotHotspot.js +8 -4
  2. package/lib/cjs/functions/onboardIotHotspot.js.map +1 -1
  3. package/lib/cjs/functions/onboardMobileHotspot.js +8 -4
  4. package/lib/cjs/functions/onboardMobileHotspot.js.map +1 -1
  5. package/lib/cjs/functions/updateIotMetadata.js +7 -3
  6. package/lib/cjs/functions/updateIotMetadata.js.map +1 -1
  7. package/lib/cjs/functions/updateMobileMetadata.js +7 -3
  8. package/lib/cjs/functions/updateMobileMetadata.js.map +1 -1
  9. package/lib/cjs/helpers.js +20 -0
  10. package/lib/cjs/helpers.js.map +1 -0
  11. package/lib/cjs/index.js +3 -1
  12. package/lib/cjs/index.js.map +1 -1
  13. package/lib/cjs/pdas.js +10 -2
  14. package/lib/cjs/pdas.js.map +1 -1
  15. package/lib/esm/src/functions/onboardIotHotspot.js +8 -4
  16. package/lib/esm/src/functions/onboardIotHotspot.js.map +1 -1
  17. package/lib/esm/src/functions/onboardMobileHotspot.js +8 -4
  18. package/lib/esm/src/functions/onboardMobileHotspot.js.map +1 -1
  19. package/lib/esm/src/functions/updateIotMetadata.js +7 -3
  20. package/lib/esm/src/functions/updateIotMetadata.js.map +1 -1
  21. package/lib/esm/src/functions/updateMobileMetadata.js +7 -3
  22. package/lib/esm/src/functions/updateMobileMetadata.js.map +1 -1
  23. package/lib/esm/src/helpers.js +16 -0
  24. package/lib/esm/src/helpers.js.map +1 -0
  25. package/lib/esm/src/index.js +1 -0
  26. package/lib/esm/src/index.js.map +1 -1
  27. package/lib/esm/src/pdas.js +8 -1
  28. package/lib/esm/src/pdas.js.map +1 -1
  29. package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
  30. package/lib/types/src/functions/onboardIotHotspot.d.ts +3 -3
  31. package/lib/types/src/functions/onboardIotHotspot.d.ts.map +1 -1
  32. package/lib/types/src/functions/onboardMobileHotspot.d.ts +2 -2
  33. package/lib/types/src/functions/onboardMobileHotspot.d.ts.map +1 -1
  34. package/lib/types/src/functions/updateIotMetadata.d.ts +2 -1
  35. package/lib/types/src/functions/updateIotMetadata.d.ts.map +1 -1
  36. package/lib/types/src/functions/updateMobileMetadata.d.ts +2 -1
  37. package/lib/types/src/functions/updateMobileMetadata.d.ts.map +1 -1
  38. package/lib/types/src/helpers.d.ts +5 -0
  39. package/lib/types/src/helpers.d.ts.map +1 -0
  40. package/lib/types/src/index.d.ts +1 -0
  41. package/lib/types/src/index.d.ts.map +1 -1
  42. package/lib/types/src/pdas.d.ts +1 -0
  43. package/lib/types/src/pdas.d.ts.map +1 -1
  44. package/package.json +6 -6
@@ -21,20 +21,24 @@ var __rest = (this && this.__rest) || function (s, e) {
21
21
  };
22
22
  Object.defineProperty(exports, "__esModule", { value: true });
23
23
  exports.onboardIotHotspot = void 0;
24
- const pdas_1 = require("../pdas");
25
24
  const spl_utils_1 = require("@helium/spl-utils");
25
+ const helpers_1 = require("../helpers");
26
+ const pdas_1 = require("../pdas");
26
27
  function onboardIotHotspot(_a) {
27
28
  var { program, rewardableEntityConfig, assetId, maker, dao, dcFeePayer, payer, location, elevation, gain } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "maker", "dao", "dcFeePayer", "payer", "location", "elevation", "gain"]);
28
29
  return __awaiter(this, void 0, void 0, function* () {
29
- const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = yield (0, spl_utils_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
30
- const [info] = yield (0, pdas_1.iotInfoKey)(rewardableEntityConfig, json_uri.split("/").slice(-1)[0]);
30
+ const { asset, args, accounts, remainingAccounts } = yield (0, spl_utils_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
31
+ const { ownership: { owner }, } = asset;
32
+ const keyToAssetKey = (0, helpers_1.keyToAssetForAsset)(asset, dao);
33
+ const keyToAsset = yield program.account.keyToAssetV0.fetch(keyToAssetKey);
34
+ const [info] = yield (0, pdas_1.iotInfoKey)(rewardableEntityConfig, keyToAsset.entityKey);
31
35
  const makerAcc = yield program.account.makerV0.fetchNullable(maker);
32
36
  return program.methods
33
37
  .onboardIotHotspotV0(Object.assign(Object.assign({}, args), { location: typeof location == "undefined" ? null : location, elevation: typeof elevation == "undefined" ? null : elevation, gain: typeof gain == "undefined" ? null : gain }))
34
38
  .accounts(Object.assign(Object.assign({}, accounts), { dcFeePayer,
35
39
  payer,
36
40
  rewardableEntityConfig, hotspotOwner: owner, iotInfo: info, maker,
37
- 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] }))
41
+ dao, issuingAuthority: makerAcc === null || makerAcc === void 0 ? void 0 : makerAcc.issuingAuthority, keyToAsset: keyToAssetKey }))
38
42
  .remainingAccounts(remainingAccounts);
39
43
  });
40
44
  }
@@ -1 +1 @@
1
- {"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAIA,kCAAoD;AACpD,iDAG2B;AAE3B,SAAsB,iBAAiB,CAAC,EAsBQ;QAtBR,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,UAAU,EACV,KAAK,EACL,QAAQ,EACR,SAAS,EACT,IAAI,OAY0C,EAX3C,IAAI,cAX+B,wHAYvC,CADQ;;QAYP,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,gCAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,iBAAU,EAC7B,sBAAsB,EACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpE,OAAO,OAAO,CAAC,OAAO;aACnB,mBAAmB,iCACf,IAAI,KACP,QAAQ,EAAE,OAAO,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAC1D,SAAS,EAAE,OAAO,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAC7D,IAAI,EAAE,OAAO,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAC9C;aACD,QAAQ,iCAEJ,QAAQ,KACX,UAAU;YACV,KAAK;YACL,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,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;AAlED,8CAkEC"}
1
+ {"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAEA,iDAG2B;AAG3B,wCAAgD;AAChD,kCAAqC;AAErC,SAAsB,iBAAiB,CAAC,EAsBQ;QAtBR,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,UAAU,EACV,KAAK,EACL,QAAQ,EACR,SAAS,EACT,IAAI,OAY0C,EAX3C,IAAI,cAX+B,wHAYvC,CADQ;;QAYP,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAChD,MAAM,IAAA,gCAAoB,kBACxB,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QACL,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;QAEV,MAAM,aAAa,GAAG,IAAA,4BAAkB,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CACzD,aAAa,CACd,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,iBAAU,EAC7B,sBAAsB,EACtB,UAAU,CAAC,SAAS,CACrB,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpE,OAAO,OAAO,CAAC,OAAO;aACnB,mBAAmB,iCACf,IAAI,KACP,QAAQ,EAAE,OAAO,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,EAC1D,SAAS,EAAE,OAAO,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,EAC7D,IAAI,EAAE,OAAO,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,IAC9C;aACD,QAAQ,iCAEJ,QAAQ,KACX,UAAU;YACV,KAAK;YACL,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,EAAE,aAAa,IACzB;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AAhED,8CAgEC"}
@@ -21,20 +21,24 @@ var __rest = (this && this.__rest) || function (s, e) {
21
21
  };
22
22
  Object.defineProperty(exports, "__esModule", { value: true });
23
23
  exports.onboardMobileHotspot = void 0;
24
- const pdas_1 = require("../pdas");
25
24
  const spl_utils_1 = require("@helium/spl-utils");
25
+ const helpers_1 = require("../helpers");
26
+ const pdas_1 = require("../pdas");
26
27
  function onboardMobileHotspot(_a) {
27
28
  var { program, rewardableEntityConfig, assetId, maker, location, dao, payer, dcFeePayer } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "maker", "location", "dao", "payer", "dcFeePayer"]);
28
29
  return __awaiter(this, void 0, void 0, function* () {
29
- const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = yield (0, spl_utils_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
30
- const [info] = yield (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, json_uri.split("/").slice(-1)[0]);
30
+ const { asset, args, accounts, remainingAccounts, } = yield (0, spl_utils_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
31
+ const { ownership: { owner }, } = asset;
32
+ const keyToAssetKey = (0, helpers_1.keyToAssetForAsset)(asset, dao);
33
+ const keyToAsset = yield program.account.keyToAssetV0.fetch(keyToAssetKey);
34
+ const [info] = yield (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, keyToAsset.entityKey);
31
35
  const makerAcc = yield program.account.makerV0.fetchNullable(maker);
32
36
  return program.methods
33
37
  .onboardMobileHotspotV0(Object.assign(Object.assign({}, args), { location: typeof location == "undefined" ? null : location }))
34
38
  .accounts(Object.assign(Object.assign({}, accounts), { dcFeePayer,
35
39
  payer,
36
40
  rewardableEntityConfig, hotspotOwner: owner, mobileInfo: info, maker,
37
- 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] }))
41
+ dao, issuingAuthority: makerAcc === null || makerAcc === void 0 ? void 0 : makerAcc.issuingAuthority, keyToAsset: keyToAssetKey }))
38
42
  .remainingAccounts(remainingAccounts);
39
43
  });
40
44
  }
@@ -1 +1 @@
1
- {"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAuD;AACvD,iDAG2B;AAG3B,SAAsB,oBAAoB,CAAC,EAmBK;QAnBL,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,QAAQ,EACR,GAAG,EACH,KAAK,EACL,UAAU,OAWoC,EAV3C,IAAI,cATkC,mGAU1C,CADQ;;QAWP,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,gCAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,oBAAa,EAChC,sBAAsB,EACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpE,OAAO,OAAO,CAAC,OAAO;aACnB,sBAAsB,iCAClB,IAAI,KACP,QAAQ,EAAE,OAAO,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,IAC1D;aACD,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;AA7DD,oDA6DC"}
1
+ {"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAEA,iDAG2B;AAG3B,wCAAgD;AAChD,kCAAwC;AAExC,SAAsB,oBAAoB,CAAC,EAmBK;QAnBL,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,QAAQ,EACR,GAAG,EACH,KAAK,EACL,UAAU,OAWoC,EAV3C,IAAI,cATkC,mGAU1C,CADQ;;QAWP,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,IAAA,gCAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QACH,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;QAEV,MAAM,aAAa,GAAG,IAAA,4BAAkB,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CACzD,aAAa,CACd,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,oBAAa,EAChC,sBAAsB,EACtB,UAAU,CAAC,SAAS,CACrB,CAAC;QACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QAEpE,OAAO,OAAO,CAAC,OAAO;aACnB,sBAAsB,iCAClB,IAAI,KACP,QAAQ,EAAE,OAAO,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,IAC1D;aACD,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,aAAa,IACzB;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AA/DD,oDA+DC"}
@@ -23,11 +23,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
23
23
  exports.updateIotMetadata = void 0;
24
24
  const pdas_1 = require("../pdas");
25
25
  const spl_utils_1 = require("@helium/spl-utils");
26
+ const helpers_1 = require("../helpers");
26
27
  function updateIotMetadata(_a) {
27
- var { program, rewardableEntityConfig, assetId, location, elevation, gain, dcFeePayer, payer } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "location", "elevation", "gain", "dcFeePayer", "payer"]);
28
+ var { program, rewardableEntityConfig, assetId, location, elevation, gain, dcFeePayer, payer, dao = helpers_1.HELIUM_DAO } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "location", "elevation", "gain", "dcFeePayer", "payer", "dao"]);
28
29
  return __awaiter(this, void 0, void 0, function* () {
29
- const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = yield (0, spl_utils_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
30
- const [info] = yield (0, pdas_1.iotInfoKey)(rewardableEntityConfig, json_uri.split("/").slice(-1)[0]);
30
+ const { asset, args, accounts, remainingAccounts, } = yield (0, spl_utils_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
31
+ const { ownership: { owner }, } = asset;
32
+ const keyToAssetKey = (0, helpers_1.keyToAssetForAsset)(asset, dao);
33
+ const keyToAsset = yield program.account.keyToAssetV0.fetch(keyToAssetKey);
34
+ const [info] = yield (0, pdas_1.iotInfoKey)(rewardableEntityConfig, keyToAsset.entityKey);
31
35
  return program.methods
32
36
  .updateIotInfoV0(Object.assign({ location,
33
37
  elevation,
@@ -1 +1 @@
1
- {"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAqC;AACrC,iDAG2B;AAE3B,SAAsB,iBAAiB,CAAC,EAmBQ;QAnBR,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,UAAU,EACV,KAAK,OAWyC,EAV3C,IAAI,cAT+B,wGAUvC,CADQ;;QAWP,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,gCAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,iBAAU,EAC7B,sBAAsB,EACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO;aACnB,eAAe,iBACd,QAAQ;YACR,SAAS;YACT,IAAI,IACD,IAAI,EACP;aACD,QAAQ,iCAEJ,QAAQ,KACX,UAAU;YACV,KAAK;YACL,sBAAsB,EACtB,YAAY,EAAE,KAAK,EACnB,OAAO,EAAE,IAAI,IACb;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AAxDD,8CAwDC"}
1
+ {"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAqC;AACrC,iDAG2B;AAC3B,wCAA4D;AAE5D,SAAsB,iBAAiB,CAAC,EAqBQ;QArBR,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,UAAU,EACV,KAAK,EACL,GAAG,GAAG,oBAAU,OAY8B,EAX3C,IAAI,cAV+B,+GAWvC,CADQ;;QAYP,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,IAAA,gCAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QACH,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;QAEV,MAAM,aAAa,GAAG,IAAA,4BAAkB,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CACzD,aAAa,CACd,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,iBAAU,EAAC,sBAAsB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;QAE9E,OAAO,OAAO,CAAC,OAAO;aACnB,eAAe,iBACd,QAAQ;YACR,SAAS;YACT,IAAI,IACD,IAAI,EACP;aACD,QAAQ,iCAEJ,QAAQ,KACX,UAAU;YACV,KAAK;YACL,sBAAsB,EACtB,YAAY,EAAE,KAAK,EACnB,OAAO,EAAE,IAAI,IACb;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AA3DD,8CA2DC"}
@@ -23,11 +23,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
23
23
  exports.updateMobileMetadata = void 0;
24
24
  const pdas_1 = require("../pdas");
25
25
  const spl_utils_1 = require("@helium/spl-utils");
26
+ const helpers_1 = require("../helpers");
26
27
  function updateMobileMetadata(_a) {
27
- var { program, rewardableEntityConfig, assetId, location, dcFeePayer, payer } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "location", "dcFeePayer", "payer"]);
28
+ var { program, rewardableEntityConfig, assetId, location, dcFeePayer, payer, dao = helpers_1.HELIUM_DAO } = _a, rest = __rest(_a, ["program", "rewardableEntityConfig", "assetId", "location", "dcFeePayer", "payer", "dao"]);
28
29
  return __awaiter(this, void 0, void 0, function* () {
29
- const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = yield (0, spl_utils_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
30
- const [info] = yield (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, json_uri.split("/").slice(-1)[0]);
30
+ const { asset, args, accounts, remainingAccounts, } = yield (0, spl_utils_1.proofArgsAndAccounts)(Object.assign({ connection: program.provider.connection, assetId }, rest));
31
+ const { ownership: { owner }, } = asset;
32
+ const keyToAssetKey = (0, helpers_1.keyToAssetForAsset)(asset, dao);
33
+ const keyToAsset = yield program.account.keyToAssetV0.fetch(keyToAssetKey);
34
+ const [info] = yield (0, pdas_1.mobileInfoKey)(rewardableEntityConfig, keyToAsset.entityKey);
31
35
  return program.methods
32
36
  .updateMobileInfoV0(Object.assign({ location }, args))
33
37
  .accounts(Object.assign(Object.assign({}, accounts), { dcFeePayer,
@@ -1 +1 @@
1
- {"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAwC;AACxC,iDAG2B;AAE3B,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,gCAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,oBAAa,EAChC,sBAAsB,EACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO;aACnB,kBAAkB,iBACjB,QAAQ,IACL,IAAI,EACP;aACD,QAAQ,iCAEJ,QAAQ,KACX,UAAU;YACV,KAAK;YACL,sBAAsB,EACtB,YAAY,EAAE,KAAK,EACnB,UAAU,EAAE,IAAI,IAChB;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AAlDD,oDAkDC"}
1
+ {"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAGA,kCAAwC;AACxC,iDAG2B;AAC3B,wCAA4D;AAE5D,SAAsB,oBAAoB,CAAC,EAiBK;QAjBL,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,UAAU,EACV,KAAK,EACL,GAAG,GAAG,oBAAU,OAU8B,EAT3C,IAAI,cARkC,0FAS1C,CADQ;;QAUP,MAAM,EACJ,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,iBAAiB,GAClB,GAAG,MAAM,IAAA,gCAAoB,kBAC5B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,EACvC,OAAO,IACJ,IAAI,EACP,CAAC;QAEH,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;QAEV,MAAM,aAAa,GAAG,IAAA,4BAAkB,EAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CACzD,aAAa,CACd,CAAC;QACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,IAAA,oBAAa,EAChC,sBAAsB,EACtB,UAAU,CAAC,SAAS,CACrB,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO;aACnB,kBAAkB,iBACjB,QAAQ,IACL,IAAI,EACP;aACD,QAAQ,iCAEJ,QAAQ,KACX,UAAU;YACV,KAAK;YACL,sBAAsB,EACtB,YAAY,EAAE,KAAK,EACnB,UAAU,EAAE,IAAI,IAChB;aACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;;CACzC;AAzDD,oDAyDC"}
@@ -0,0 +1,20 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.keyToAssetForAsset = exports.HELIUM_DAO = void 0;
4
+ const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
5
+ const spl_utils_1 = require("@helium/spl-utils");
6
+ const pdas_1 = require("./pdas");
7
+ exports.HELIUM_DAO = (0, helium_sub_daos_sdk_1.daoKey)(spl_utils_1.HNT_MINT)[0];
8
+ function keyToAssetForAsset(asset, dao = exports.HELIUM_DAO) {
9
+ if (asset.creators[1]) {
10
+ return asset.creators[1].address;
11
+ }
12
+ const entityKey = asset.content.json_uri.split("/").slice(-1)[0];
13
+ let keySerialization = "b58";
14
+ if (new Set(["IOT OPS", "CARRIER"]).has(asset.content.metadata.symbol)) {
15
+ keySerialization = "utf8";
16
+ }
17
+ return (0, pdas_1.keyToAssetKey)(dao, entityKey, keySerialization)[0];
18
+ }
19
+ exports.keyToAssetForAsset = keyToAssetForAsset;
20
+ //# sourceMappingURL=helpers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/helpers.ts"],"names":[],"mappings":";;;AAAA,qEAAqD;AACrD,iDAAoD;AAEpD,iCAAuC;AAE1B,QAAA,UAAU,GAAG,IAAA,4BAAM,EAAC,oBAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9C,SAAgB,kBAAkB,CAChC,KAAY,EACZ,MAAiB,kBAAU;IAE3B,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACrB,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;KAClC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;IAC3E,IAAI,gBAAgB,GAA2B,KAAK,CAAC;IACrD,IAAI,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACtE,gBAAgB,GAAG,MAAM,CAAC;KAC3B;IAED,OAAO,IAAA,oBAAa,EAAC,GAAG,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5D,CAAC;AAfD,gDAeC"}
package/lib/cjs/index.js CHANGED
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
14
14
  for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
15
15
  };
16
16
  Object.defineProperty(exports, "__esModule", { value: true });
17
- exports.init = exports.updateMobileMetadata = exports.updateIotMetadata = exports.proofArgsAndAccounts = exports.onboardMobileHotspot = exports.onboardIotHotspot = void 0;
17
+ exports.keyToAssetForAsset = exports.init = exports.updateMobileMetadata = exports.updateIotMetadata = exports.proofArgsAndAccounts = exports.onboardMobileHotspot = exports.onboardIotHotspot = void 0;
18
18
  __exportStar(require("./constants"), exports);
19
19
  var onboardIotHotspot_1 = require("./functions/onboardIotHotspot");
20
20
  Object.defineProperty(exports, "onboardIotHotspot", { enumerable: true, get: function () { return onboardIotHotspot_1.onboardIotHotspot; } });
@@ -30,4 +30,6 @@ var init_1 = require("./init");
30
30
  Object.defineProperty(exports, "init", { enumerable: true, get: function () { return init_1.init; } });
31
31
  __exportStar(require("./pdas"), exports);
32
32
  __exportStar(require("./resolvers"), exports);
33
+ var helpers_1 = require("./helpers");
34
+ Object.defineProperty(exports, "keyToAssetForAsset", { enumerable: true, get: function () { return helpers_1.keyToAssetForAsset; } });
33
35
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAEA,8CAA4B;AAC5B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAC7B,+CAAyD;AAAhD,iHAAA,oBAAoB,OAAA;AAC7B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAC7B,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,yCAAuB;AACvB,8CAA4B"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAKA,8CAA4B;AAC5B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAC7B,+CAAyD;AAAhD,iHAAA,oBAAoB,OAAA;AAC7B,mEAAkE;AAAzD,sHAAA,iBAAiB,OAAA;AAC1B,yEAAwE;AAA/D,4HAAA,oBAAoB,OAAA;AAC7B,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,yCAAuB;AACvB,8CAA4B;AAC5B,qCAA+C;AAAtC,6GAAA,kBAAkB,OAAA"}
package/lib/cjs/pdas.js CHANGED
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.collectionMetadataKey = exports.mobileInfoKey = exports.iotInfoKey = exports.keyToAssetKey = exports.decodeEntityKey = exports.encodeEntityKey = exports.makerApprovalKey = exports.programApprovalKey = exports.makerKey = exports.dataOnlyEscrowKey = exports.dataOnlyConfigKey = exports.hotspotCollectionKey = exports.rewardableEntityConfigKey = exports.entityCreatorKey = void 0;
6
+ exports.collectionMetadataKey = exports.mobileInfoKey = exports.iotInfoKey = exports.keyToAssetKey = exports.keyToAssetKeyRaw = exports.decodeEntityKey = exports.encodeEntityKey = exports.makerApprovalKey = exports.programApprovalKey = exports.makerKey = exports.dataOnlyEscrowKey = exports.dataOnlyConfigKey = exports.hotspotCollectionKey = exports.rewardableEntityConfigKey = exports.entityCreatorKey = void 0;
7
7
  const web3_js_1 = require("@solana/web3.js");
8
8
  const js_sha256_1 = require("js-sha256");
9
9
  const constants_1 = require("./constants");
@@ -61,6 +61,14 @@ keySerialization = { b58: {} }) {
61
61
  }
62
62
  }
63
63
  exports.decodeEntityKey = decodeEntityKey;
64
+ const keyToAssetKeyRaw = (dao, hashedEntityKey, programId = constants_1.PROGRAM_ID) => {
65
+ return web3_js_1.PublicKey.findProgramAddressSync([
66
+ Buffer.from("key_to_asset", "utf-8"),
67
+ dao.toBuffer(),
68
+ hashedEntityKey,
69
+ ], programId);
70
+ };
71
+ exports.keyToAssetKeyRaw = keyToAssetKeyRaw;
64
72
  const keyToAssetKey = (dao, entityKey, encoding = "b58", programId = constants_1.PROGRAM_ID) => {
65
73
  if (typeof entityKey === "string") {
66
74
  if (encoding == "b58" || address_1.default.isValid(entityKey)) {
@@ -71,7 +79,7 @@ const keyToAssetKey = (dao, entityKey, encoding = "b58", programId = constants_1
71
79
  }
72
80
  }
73
81
  const hash = (0, js_sha256_1.sha256)(entityKey);
74
- return web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("key_to_asset", "utf-8"), dao.toBuffer(), Buffer.from(hash, "hex")], programId);
82
+ return (0, exports.keyToAssetKeyRaw)(dao, Buffer.from(hash, "hex"), programId);
75
83
  };
76
84
  exports.keyToAssetKey = keyToAssetKey;
77
85
  const iotInfoKey = (rewardableEntityConfig, entityKey, programId = constants_1.PROGRAM_ID) => {
@@ -1 +1 @@
1
- {"version":3,"file":"pdas.js","sourceRoot":"","sources":["../../src/pdas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pdas.js","sourceRoot":"","sources":["../../src/pdas.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,16 @@
1
- import { iotInfoKey, keyToAssetKey } from "../pdas";
2
1
  import { proofArgsAndAccounts, } from "@helium/spl-utils";
2
+ import { keyToAssetForAsset } from "../helpers";
3
+ import { iotInfoKey } from "../pdas";
3
4
  export async function onboardIotHotspot({ program, rewardableEntityConfig, assetId, maker, dao, dcFeePayer, payer, location, elevation, gain, ...rest }) {
4
- const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
5
+ const { asset, args, accounts, remainingAccounts } = await proofArgsAndAccounts({
5
6
  connection: program.provider.connection,
6
7
  assetId,
7
8
  ...rest,
8
9
  });
9
- const [info] = await iotInfoKey(rewardableEntityConfig, json_uri.split("/").slice(-1)[0]);
10
+ const { ownership: { owner }, } = asset;
11
+ const keyToAssetKey = keyToAssetForAsset(asset, dao);
12
+ const keyToAsset = await program.account.keyToAssetV0.fetch(keyToAssetKey);
13
+ const [info] = await iotInfoKey(rewardableEntityConfig, keyToAsset.entityKey);
10
14
  const makerAcc = await program.account.makerV0.fetchNullable(maker);
11
15
  return program.methods
12
16
  .onboardIotHotspotV0({
@@ -26,7 +30,7 @@ export async function onboardIotHotspot({ program, rewardableEntityConfig, asset
26
30
  maker,
27
31
  dao,
28
32
  issuingAuthority: makerAcc?.issuingAuthority,
29
- keyToAsset: (await keyToAssetKey(dao, json_uri.split("/").slice(-1)[0]))[0],
33
+ keyToAsset: keyToAssetKey,
30
34
  })
31
35
  .remainingAccounts(remainingAccounts);
32
36
  }
@@ -1 +1 @@
1
- {"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EACL,oBAAoB,GAErB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,UAAU,EACV,KAAK,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,GAAG,IAAI,EAWuC;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,MAAM,UAAU,CAC7B,sBAAsB,EACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,OAAO,CAAC,OAAO;SACnB,mBAAmB,CAAC;QACnB,GAAG,IAAI;QACP,QAAQ,EAAE,OAAO,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ;QAC1D,SAAS,EAAE,OAAO,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QAC7D,IAAI,EAAE,OAAO,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;KAC/C,CAAC;SACD,QAAQ,CAAC;QACR,oBAAoB;QACpB,GAAG,QAAQ;QACX,UAAU;QACV,KAAK;QACL,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI;QACb,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"}
1
+ {"version":3,"file":"onboardIotHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardIotHotspot.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,GAAG,EACH,UAAU,EACV,KAAK,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,GAAG,IAAI,EAWuC;IAC9C,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAChD,MAAM,oBAAoB,CAAC;QACzB,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU;QACvC,OAAO;QACP,GAAG,IAAI;KACR,CAAC,CAAC;IACL,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;IAEV,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CACzD,aAAa,CACd,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,UAAU,CAC7B,sBAAsB,EACtB,UAAU,CAAC,SAAS,CACrB,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,OAAO,CAAC,OAAO;SACnB,mBAAmB,CAAC;QACnB,GAAG,IAAI;QACP,QAAQ,EAAE,OAAO,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ;QAC1D,SAAS,EAAE,OAAO,SAAS,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QAC7D,IAAI,EAAE,OAAO,IAAI,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI;KAC/C,CAAC;SACD,QAAQ,CAAC;QACR,oBAAoB;QACpB,GAAG,QAAQ;QACX,UAAU;QACV,KAAK;QACL,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI;QACb,KAAK;QACL,GAAG;QACH,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB;QAC5C,UAAU,EAAE,aAAa;KAC1B,CAAC;SACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
@@ -1,12 +1,16 @@
1
- import { keyToAssetKey, mobileInfoKey } from "../pdas";
2
1
  import { proofArgsAndAccounts, } from "@helium/spl-utils";
2
+ import { keyToAssetForAsset } from "../helpers";
3
+ import { mobileInfoKey } from "../pdas";
3
4
  export async function onboardMobileHotspot({ program, rewardableEntityConfig, assetId, maker, location, dao, payer, dcFeePayer, ...rest }) {
4
- const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
5
+ const { asset, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
5
6
  connection: program.provider.connection,
6
7
  assetId,
7
8
  ...rest,
8
9
  });
9
- const [info] = await mobileInfoKey(rewardableEntityConfig, json_uri.split("/").slice(-1)[0]);
10
+ const { ownership: { owner }, } = asset;
11
+ const keyToAssetKey = keyToAssetForAsset(asset, dao);
12
+ const keyToAsset = await program.account.keyToAssetV0.fetch(keyToAssetKey);
13
+ const [info] = await mobileInfoKey(rewardableEntityConfig, keyToAsset.entityKey);
10
14
  const makerAcc = await program.account.makerV0.fetchNullable(maker);
11
15
  return program.methods
12
16
  .onboardMobileHotspotV0({
@@ -24,7 +28,7 @@ export async function onboardMobileHotspot({ program, rewardableEntityConfig, as
24
28
  maker,
25
29
  dao,
26
30
  issuingAuthority: makerAcc?.issuingAuthority,
27
- keyToAsset: (await keyToAssetKey(dao, json_uri.split("/").slice(-1)[0]))[0],
31
+ keyToAsset: keyToAssetKey,
28
32
  })
29
33
  .remainingAccounts(remainingAccounts);
30
34
  }
@@ -1 +1 @@
1
- {"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,EACL,oBAAoB,GAErB,MAAM,mBAAmB,CAAC;AAG3B,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,QAAQ,EACR,GAAG,EACH,KAAK,EACL,UAAU,EACV,GAAG,IAAI,EAUuC;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,MAAM,aAAa,CAChC,sBAAsB,EACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,OAAO,CAAC,OAAO;SACnB,sBAAsB,CAAC;QACtB,GAAG,IAAI;QACP,QAAQ,EAAE,OAAO,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ;KAC3D,CAAC;SACD,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"}
1
+ {"version":3,"file":"onboardMobileHotspot.js","sourceRoot":"","sources":["../../../../src/functions/onboardMobileHotspot.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,oBAAoB,GACrB,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,KAAK,EACL,QAAQ,EACR,GAAG,EACH,KAAK,EACL,UAAU,EACV,GAAG,IAAI,EAUuC;IAC9C,MAAM,EACJ,KAAK,EACL,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;IACH,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;IAEV,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CACzD,aAAa,CACd,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,aAAa,CAChC,sBAAsB,EACtB,UAAU,CAAC,SAAS,CACrB,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAEpE,OAAO,OAAO,CAAC,OAAO;SACnB,sBAAsB,CAAC;QACtB,GAAG,IAAI;QACP,QAAQ,EAAE,OAAO,QAAQ,IAAI,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ;KAC3D,CAAC;SACD,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,aAAa;KAC1B,CAAC;SACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
@@ -1,12 +1,16 @@
1
1
  import { iotInfoKey } from "../pdas";
2
2
  import { proofArgsAndAccounts, } from "@helium/spl-utils";
3
- export async function updateIotMetadata({ program, rewardableEntityConfig, assetId, location, elevation, gain, dcFeePayer, payer, ...rest }) {
4
- const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
3
+ import { HELIUM_DAO, keyToAssetForAsset } from "../helpers";
4
+ export async function updateIotMetadata({ program, rewardableEntityConfig, assetId, location, elevation, gain, dcFeePayer, payer, dao = HELIUM_DAO, ...rest }) {
5
+ const { asset, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
5
6
  connection: program.provider.connection,
6
7
  assetId,
7
8
  ...rest,
8
9
  });
9
- const [info] = await iotInfoKey(rewardableEntityConfig, json_uri.split("/").slice(-1)[0]);
10
+ const { ownership: { owner }, } = asset;
11
+ const keyToAssetKey = keyToAssetForAsset(asset, dao);
12
+ const keyToAsset = await program.account.keyToAssetV0.fetch(keyToAssetKey);
13
+ const [info] = await iotInfoKey(rewardableEntityConfig, keyToAsset.entityKey);
10
14
  return program.methods
11
15
  .updateIotInfoV0({
12
16
  location,
@@ -1 +1 @@
1
- {"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EACL,oBAAoB,GAErB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,UAAU,EACV,KAAK,EACL,GAAG,IAAI,EAUuC;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,MAAM,UAAU,CAC7B,sBAAsB,EACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;IAEF,OAAO,OAAO,CAAC,OAAO;SACnB,eAAe,CAAC;QACf,QAAQ;QACR,SAAS;QACT,IAAI;QACJ,GAAG,IAAI;KACR,CAAC;SACD,QAAQ,CAAC;QACR,oBAAoB;QACpB,GAAG,QAAQ;QACX,UAAU;QACV,KAAK;QACL,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI;KACd,CAAC;SACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
1
+ {"version":3,"file":"updateIotMetadata.js","sourceRoot":"","sources":["../../../../src/functions/updateIotMetadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EACL,oBAAoB,GAErB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACtC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,UAAU,EACV,KAAK,EACL,GAAG,GAAG,UAAU,EAChB,GAAG,IAAI,EAWuC;IAC9C,MAAM,EACJ,KAAK,EACL,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;IACH,MAAM,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;IAEV,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CACzD,aAAa,CACd,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,UAAU,CAAC,sBAAsB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IAE9E,OAAO,OAAO,CAAC,OAAO;SACnB,eAAe,CAAC;QACf,QAAQ;QACR,SAAS;QACT,IAAI;QACJ,GAAG,IAAI;KACR,CAAC;SACD,QAAQ,CAAC;QACR,oBAAoB;QACpB,GAAG,QAAQ;QACX,UAAU;QACV,KAAK;QACL,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,OAAO,EAAE,IAAI;KACd,CAAC;SACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
@@ -1,12 +1,16 @@
1
1
  import { mobileInfoKey } from "../pdas";
2
2
  import { proofArgsAndAccounts, } from "@helium/spl-utils";
3
- export async function updateMobileMetadata({ program, rewardableEntityConfig, assetId, location, dcFeePayer, payer, ...rest }) {
4
- const { asset: { content: { json_uri }, ownership: { owner }, }, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
3
+ import { HELIUM_DAO, keyToAssetForAsset } from "../helpers";
4
+ export async function updateMobileMetadata({ program, rewardableEntityConfig, assetId, location, dcFeePayer, payer, dao = HELIUM_DAO, ...rest }) {
5
+ const { asset, args, accounts, remainingAccounts, } = await proofArgsAndAccounts({
5
6
  connection: program.provider.connection,
6
7
  assetId,
7
8
  ...rest,
8
9
  });
9
- const [info] = await mobileInfoKey(rewardableEntityConfig, json_uri.split("/").slice(-1)[0]);
10
+ const { ownership: { owner }, } = asset;
11
+ const keyToAssetKey = keyToAssetForAsset(asset, dao);
12
+ const keyToAsset = await program.account.keyToAssetV0.fetch(keyToAssetKey);
13
+ const [info] = await mobileInfoKey(rewardableEntityConfig, keyToAsset.entityKey);
10
14
  return program.methods
11
15
  .updateMobileInfoV0({
12
16
  location,
@@ -1 +1 @@
1
- {"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EACL,oBAAoB,GAErB,MAAM,mBAAmB,CAAC;AAE3B,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,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,MAAM,aAAa,CAChC,sBAAsB,EACtB,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACjC,CAAC;IAEF,OAAO,OAAO,CAAC,OAAO;SACnB,kBAAkB,CAAC;QAClB,QAAQ;QACR,GAAG,IAAI;KACR,CAAC;SACD,QAAQ,CAAC;QACR,oBAAoB;QACpB,GAAG,QAAQ;QACX,UAAU;QACV,KAAK;QACL,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,IAAI;KACjB,CAAC;SACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
1
+ {"version":3,"file":"updateMobileMetadata.js","sourceRoot":"","sources":["../../../../src/functions/updateMobileMetadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EACL,oBAAoB,GAErB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,EACzC,OAAO,EACP,sBAAsB,EACtB,OAAO,EACP,QAAQ,EACR,UAAU,EACV,KAAK,EACL,GAAG,GAAG,UAAU,EAChB,GAAG,IAAI,EASuC;IAC9C,MAAM,EACJ,KAAK,EACL,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,EACJ,SAAS,EAAE,EAAE,KAAK,EAAE,GACrB,GAAG,KAAK,CAAC;IAEV,MAAM,aAAa,GAAG,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CACzD,aAAa,CACd,CAAC;IACF,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,aAAa,CAChC,sBAAsB,EACtB,UAAU,CAAC,SAAS,CACrB,CAAC;IAEF,OAAO,OAAO,CAAC,OAAO;SACnB,kBAAkB,CAAC;QAClB,QAAQ;QACR,GAAG,IAAI;KACR,CAAC;SACD,QAAQ,CAAC;QACR,oBAAoB;QACpB,GAAG,QAAQ;QACX,UAAU;QACV,KAAK;QACL,sBAAsB;QACtB,YAAY,EAAE,KAAK;QACnB,UAAU,EAAE,IAAI;KACjB,CAAC;SACD,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;AAC1C,CAAC"}
@@ -0,0 +1,16 @@
1
+ import { daoKey } from "@helium/helium-sub-daos-sdk";
2
+ import { HNT_MINT } from "@helium/spl-utils";
3
+ import { keyToAssetKey } from "./pdas";
4
+ export const HELIUM_DAO = daoKey(HNT_MINT)[0];
5
+ export function keyToAssetForAsset(asset, dao = HELIUM_DAO) {
6
+ if (asset.creators[1]) {
7
+ return asset.creators[1].address;
8
+ }
9
+ const entityKey = asset.content.json_uri.split("/").slice(-1)[0];
10
+ let keySerialization = "b58";
11
+ if (new Set(["IOT OPS", "CARRIER"]).has(asset.content.metadata.symbol)) {
12
+ keySerialization = "utf8";
13
+ }
14
+ return keyToAssetKey(dao, entityKey, keySerialization)[0];
15
+ }
16
+ //# sourceMappingURL=helpers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAC;AACrD,OAAO,EAAS,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAEvC,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;AAE9C,MAAM,UAAU,kBAAkB,CAChC,KAAY,EACZ,MAAiB,UAAU;IAE3B,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE;QACrB,OAAO,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;KAClC;IAED,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAW,CAAC;IAC3E,IAAI,gBAAgB,GAA2B,KAAK,CAAC;IACrD,IAAI,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QACtE,gBAAgB,GAAG,MAAM,CAAC;KAC3B;IAED,OAAO,aAAa,CAAC,GAAG,EAAE,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5D,CAAC"}
@@ -7,4 +7,5 @@ export { updateMobileMetadata } from "./functions/updateMobileMetadata";
7
7
  export { init } from "./init";
8
8
  export * from "./pdas";
9
9
  export * from "./resolvers";
10
+ export { keyToAssetForAsset } from "./helpers";
10
11
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAEA,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAKA,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC"}
@@ -45,6 +45,13 @@ keySerialization = { b58: {} }) {
45
45
  return entityKey.toString("utf-8");
46
46
  }
47
47
  }
48
+ export const keyToAssetKeyRaw = (dao, hashedEntityKey, programId = PROGRAM_ID) => {
49
+ return PublicKey.findProgramAddressSync([
50
+ Buffer.from("key_to_asset", "utf-8"),
51
+ dao.toBuffer(),
52
+ hashedEntityKey,
53
+ ], programId);
54
+ };
48
55
  export const keyToAssetKey = (dao, entityKey, encoding = "b58", programId = PROGRAM_ID) => {
49
56
  if (typeof entityKey === "string") {
50
57
  if (encoding == "b58" || Address.isValid(entityKey)) {
@@ -55,7 +62,7 @@ export const keyToAssetKey = (dao, entityKey, encoding = "b58", programId = PROG
55
62
  }
56
63
  }
57
64
  const hash = sha256(entityKey);
58
- return PublicKey.findProgramAddressSync([Buffer.from("key_to_asset", "utf-8"), dao.toBuffer(), Buffer.from(hash, "hex")], programId);
65
+ return keyToAssetKeyRaw(dao, Buffer.from(hash, "hex"), programId);
59
66
  };
60
67
  export const iotInfoKey = (rewardableEntityConfig, entityKey, programId = PROGRAM_ID) => {
61
68
  if (typeof entityKey === "string") {
@@ -1 +1 @@
1
- {"version":3,"file":"pdas.js","sourceRoot":"","sources":["../../../src/pdas.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"pdas.js","sourceRoot":"","sources":["../../../src/pdas.ts"],"names":[],"mappings":"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"}