@helium/helium-entity-manager-sdk 0.0.14 → 0.0.16

package/lib/esm/src/resolvers.js

@@ -1,17 +1,25 @@
 import { subDaoEpochInfoResolver } from "@helium/helium-sub-daos-sdk";
 import { ataResolver, combineResolvers, heliumCommonResolver, resolveIndividual, } from "@helium/spl-utils";
-import { iotInfoKey, mobileInfoKey } from "./pdas";
+import { iotInfoKey, keyToAssetKey, mobileInfoKey } from "./pdas";
 import { getAssociatedTokenAddress } from "@solana/spl-token";
+import { getLeafAssetId } from "@metaplex-foundation/mpl-bubblegum";
 export const heliumEntityManagerResolvers = combineResolvers(heliumCommonResolver, ataResolver({
     instruction: "initializeMakerV0",
     account: "tokenAccount",
     mint: "collection",
     owner: "maker",
+}), resolveIndividual(async ({ path, args, accounts }) => {
+    if (path[path.length - 1] === "keyToAsset" &&
+        args[args.length - 1].entityKey &&
+        accounts.dao) {
+        return (await keyToAssetKey(accounts.dao, args[args.length - 1].entityKey))[0];
+    }
 }), resolveIndividual(async ({ path, args, provider, accounts }) => {
     if (path[path.length - 1] === "iotInfo" &&
-        args[args.length - 1].metadata &&
+        args[args.length - 1].index &&
+        accounts.merkleTree &&
         accounts.rewardableEntityConfig) {
-        return iotInfoKey(accounts.rewardableEntityConfig, args[args.length - 1].metadata.uri.split("/").slice(-1)[0])[0];
+        return iotInfoKey(accounts.rewardableEntityConfig, await getLeafAssetId(accounts.merkleTree, args[args.length - 1].index))[0];
     }
     else if (path[path.length - 1] === "recipient") {
         // @ts-ignore
@@ -19,9 +27,10 @@ export const heliumEntityManagerResolvers = combineResolvers(heliumCommonResolve
     }
 }), resolveIndividual(async ({ path, args, provider, accounts }) => {
     if (path[path.length - 1] === "mobileInfo" &&
-        args[args.length - 1].metadata &&
+        args[args.length - 1].index &&
+        accounts.merkleTree &&
         accounts.rewardableEntityConfig) {
-        return mobileInfoKey(accounts.rewardableEntityConfig, args[args.length - 1].metadata.uri.split("/").slice(-1)[0])[0];
+        return mobileInfoKey(accounts.rewardableEntityConfig, await getLeafAssetId(accounts.merkleTree, args[args.length - 1].index))[0];
     }
     else if (path[path.length - 1] === "recipient") {
         // @ts-ignore

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

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