@helium/spl-utils 0.0.10 → 0.0.11
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/accountFetchCache/accountFetchCache.js +3 -3
- package/lib/cjs/accountFetchCache/accountFetchCache.js.map +1 -1
- package/lib/cjs/accountsResolver/ataResolver.js +5 -3
- package/lib/cjs/accountsResolver/ataResolver.js.map +1 -1
- package/lib/cjs/accountsResolver/heliumCommonResolver.js +8 -0
- package/lib/cjs/accountsResolver/heliumCommonResolver.js.map +1 -1
- package/lib/cjs/accountsResolver/individual.js +39 -33
- package/lib/cjs/accountsResolver/individual.js.map +1 -1
- package/lib/cjs/mplAssetAPI.js +8 -3
- package/lib/cjs/mplAssetAPI.js.map +1 -1
- package/lib/cjs/token.js.map +1 -1
- package/lib/cjs/transaction.js +3 -0
- package/lib/cjs/transaction.js.map +1 -1
- package/lib/esm/src/accountFetchCache/accountFetchCache.js +3 -3
- package/lib/esm/src/accountFetchCache/accountFetchCache.js.map +1 -1
- package/lib/esm/src/accountsResolver/ataResolver.js +4 -3
- package/lib/esm/src/accountsResolver/ataResolver.js.map +1 -1
- package/lib/esm/src/accountsResolver/heliumCommonResolver.js +8 -0
- package/lib/esm/src/accountsResolver/heliumCommonResolver.js.map +1 -1
- package/lib/esm/src/accountsResolver/individual.js +39 -33
- package/lib/esm/src/accountsResolver/individual.js.map +1 -1
- package/lib/esm/src/mplAssetAPI.js +24 -20
- package/lib/esm/src/mplAssetAPI.js.map +1 -1
- package/lib/esm/src/token.js +3 -3
- package/lib/esm/src/token.js.map +1 -1
- package/lib/esm/src/transaction.js +3 -0
- package/lib/esm/src/transaction.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/accountFetchCache/accountFetchCache.d.ts +4 -4
- package/lib/types/src/accountFetchCache/accountFetchCache.d.ts.map +1 -1
- package/lib/types/src/accountsResolver/ataResolver.d.ts +3 -3
- package/lib/types/src/accountsResolver/ataResolver.d.ts.map +1 -1
- package/lib/types/src/accountsResolver/heliumCommonResolver.d.ts.map +1 -1
- package/lib/types/src/accountsResolver/individual.d.ts +1 -1
- package/lib/types/src/accountsResolver/individual.d.ts.map +1 -1
- package/lib/types/src/accountsResolver/utils.d.ts +1 -1
- package/lib/types/src/accountsResolver/utils.d.ts.map +1 -1
- package/lib/types/src/extendBorsh.d.ts +1 -1
- package/lib/types/src/extendBorsh.d.ts.map +1 -1
- package/lib/types/src/mplAssetAPI.d.ts +3 -3
- package/lib/types/src/mplAssetAPI.d.ts.map +1 -1
- package/lib/types/src/token.d.ts.map +1 -1
- package/lib/types/src/transaction.d.ts.map +1 -1
- package/lib/types/src/utils.d.ts +1 -1
- package/lib/types/src/utils.d.ts.map +1 -1
- package/package.json +3 -3
|
@@ -55,12 +55,12 @@ class AccountFetchCache {
|
|
|
55
55
|
return self.oldGetAccountinfo(publicKey, com);
|
|
56
56
|
});
|
|
57
57
|
}
|
|
58
|
-
connection.sendTransaction = function overloadedSendTransaction(
|
|
58
|
+
connection.sendTransaction = function overloadedSendTransaction(...args) {
|
|
59
59
|
return __awaiter(this, void 0, void 0, function* () {
|
|
60
|
-
const result = yield self.oldSendTransaction(
|
|
60
|
+
const result = yield self.oldSendTransaction(...args);
|
|
61
61
|
this.confirmTransaction(result, "finalized")
|
|
62
62
|
.then(() => {
|
|
63
|
-
return self.requeryMissing(
|
|
63
|
+
return self.requeryMissing(args[0].instructions);
|
|
64
64
|
})
|
|
65
65
|
.catch(console.error);
|
|
66
66
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountFetchCache.js","sourceRoot":"","sources":["../../../src/accountFetchCache/accountFetchCache.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"accountFetchCache.js","sourceRoot":"","sources":["../../../src/accountFetchCache/accountFetchCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,12 @@ const individual_1 = require("./individual");
|
|
|
14
14
|
const spl_token_1 = require("@solana/spl-token");
|
|
15
15
|
const utils_1 = require("./utils");
|
|
16
16
|
function ataResolver({ instruction, account, mint, owner, }) {
|
|
17
|
-
return (0, individual_1.resolveIndividual)(({ path, accounts, idlIx }) => __awaiter(this, void 0, void 0, function* () {
|
|
18
|
-
|
|
17
|
+
return (0, individual_1.resolveIndividual)(({ path, accounts, idlIx, provider }) => __awaiter(this, void 0, void 0, function* () {
|
|
18
|
+
var _a;
|
|
19
|
+
if ((typeof instruction === "undefined" || idlIx.name === instruction) && path.join(".") === account) {
|
|
19
20
|
const mintKey = (0, utils_1.get)(accounts, mint.split("."));
|
|
20
|
-
|
|
21
|
+
// @ts-ignore
|
|
22
|
+
const ownerKey = owner ? (0, utils_1.get)(accounts, owner.split(".")) : (_a = provider.wallet) === null || _a === void 0 ? void 0 : _a.publicKey;
|
|
21
23
|
if (mintKey && ownerKey) {
|
|
22
24
|
return (0, spl_token_1.getAssociatedTokenAddress)(mintKey, ownerKey, true);
|
|
23
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ataResolver.js","sourceRoot":"","sources":["../../../src/accountsResolver/ataResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6CAAiD;AACjD,iDAA8D;AAC9D,mCAA8B;AAS9B,SAAgB,WAAW,CAAuB,EAChD,WAAW,EACX,OAAO,EACP,IAAI,EACJ,KAAK,GACW;IAChB,OAAO,IAAA,8BAAiB,EAAC,CAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE
|
|
1
|
+
{"version":3,"file":"ataResolver.js","sourceRoot":"","sources":["../../../src/accountsResolver/ataResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,6CAAiD;AACjD,iDAA8D;AAC9D,mCAA8B;AAS9B,SAAgB,WAAW,CAAuB,EAChD,WAAW,EACX,OAAO,EACP,IAAI,EACJ,KAAK,GACW;IAChB,OAAO,IAAA,8BAAiB,EAAC,CAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;;QACrE,IAAI,CAAC,OAAO,WAAW,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE;YACpG,MAAM,OAAO,GAAG,IAAA,WAAG,EAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAc,CAAC;YAC5D,aAAa;YACb,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,IAAA,WAAG,EAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAc,CAAC,CAAC,CAAC,MAAA,QAAQ,CAAC,MAAM,0CAAE,SAAS,CAAC;YAEnG,IAAI,OAAO,IAAI,QAAQ,EAAE;gBACvB,OAAO,IAAA,qCAAyB,EAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;aAC3D;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAA,CAAC,CAAC;AACL,CAAC;AAlBD,kCAkBC"}
|
|
@@ -26,6 +26,14 @@ exports.heliumCommonResolver = (0, individual_1.resolveIndividual)(({ path }) =>
|
|
|
26
26
|
return new web3_js_1.PublicKey("cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK");
|
|
27
27
|
case "logWrapper":
|
|
28
28
|
return new web3_js_1.PublicKey("noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV");
|
|
29
|
+
case "governanceProgramId":
|
|
30
|
+
return new web3_js_1.PublicKey("GovER5Lthms3bLBqWub97yVrMmEogzX7xNjdXpPPCVZw");
|
|
31
|
+
case "voterStakeRegistryProgramId":
|
|
32
|
+
return new web3_js_1.PublicKey("hvsrY9UBtHhYRvstM2BWCsni81kevfn7B2DEhYbGA1a");
|
|
33
|
+
case "vsrProgram":
|
|
34
|
+
return new web3_js_1.PublicKey("hvsrY9UBtHhYRvstM2BWCsni81kevfn7B2DEhYbGA1a");
|
|
35
|
+
case "instructions":
|
|
36
|
+
return new web3_js_1.PublicKey("Sysvar1nstructions1111111111111111111111111");
|
|
29
37
|
default:
|
|
30
38
|
return;
|
|
31
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heliumCommonResolver.js","sourceRoot":"","sources":["../../../src/accountsResolver/heliumCommonResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;
|
|
1
|
+
{"version":3,"file":"heliumCommonResolver.js","sourceRoot":"","sources":["../../../src/accountsResolver/heliumCommonResolver.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA4C;AAC5C,6CAAiD;AAGpC,QAAA,oBAAoB,GAAG,IAAA,8BAAiB,EAAC,CAAO,EAAE,IAAI,EAAE,EAAE,EAAE;IACvE,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;QAC7B,KAAK,oBAAoB;YACvB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,sBAAsB;YACzB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,sBAAsB;YACzB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,kBAAkB;YACrB,OAAO,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;QACvE,KAAK,oBAAoB;YACvB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,YAAY;YACf,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,qBAAqB;YACxB,OAAO,IAAI,mBAAS,CAAC,8CAA8C,CAAC,CAAC;QACvE,KAAK,6BAA6B;YAChC,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,YAAY;YACf,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,cAAc;YACjB,OAAO,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE;YACE,OAAO;KACV;AACH,CAAC,CAAA,CAAC,CAAC"}
|
|
@@ -18,42 +18,48 @@ const utils_1 = require("./utils");
|
|
|
18
18
|
function resolveIndividualImpl({ idlAccounts, programId, provider, args, accounts, path = [], resolver, idlIx, }) {
|
|
19
19
|
return __awaiter(this, void 0, void 0, function* () {
|
|
20
20
|
const newPath = [...path, (0, camelcase_1.default)(idlAccounts.name)];
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
21
|
+
try {
|
|
22
|
+
if (idlAccounts.accounts) {
|
|
23
|
+
let resolved = 0;
|
|
24
|
+
const subAccounts = idlAccounts.accounts;
|
|
25
|
+
for (let k = 0; k < subAccounts.length; k += 1) {
|
|
26
|
+
const subAccount = subAccounts[k];
|
|
27
|
+
resolved += yield resolveIndividualImpl({
|
|
28
|
+
idlAccounts: subAccount,
|
|
29
|
+
programId,
|
|
30
|
+
provider,
|
|
31
|
+
args,
|
|
32
|
+
accounts,
|
|
33
|
+
path: newPath,
|
|
34
|
+
resolver,
|
|
35
|
+
idlIx,
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
return resolved;
|
|
36
39
|
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
resolved = 1;
|
|
40
|
+
else {
|
|
41
|
+
let resolved = 0;
|
|
42
|
+
let value = (0, utils_1.get)(accounts, newPath);
|
|
43
|
+
if (!value) {
|
|
44
|
+
value = yield resolver({
|
|
45
|
+
programId,
|
|
46
|
+
provider,
|
|
47
|
+
path: newPath,
|
|
48
|
+
args,
|
|
49
|
+
accounts,
|
|
50
|
+
idlIx,
|
|
51
|
+
});
|
|
52
|
+
if (value) {
|
|
53
|
+
resolved = 1;
|
|
54
|
+
}
|
|
53
55
|
}
|
|
56
|
+
(0, utils_1.set)(accounts, newPath, value);
|
|
57
|
+
return resolved;
|
|
54
58
|
}
|
|
55
|
-
|
|
56
|
-
|
|
59
|
+
}
|
|
60
|
+
catch (e) {
|
|
61
|
+
console.error(`Error while resolving ${newPath}`, e);
|
|
62
|
+
throw e;
|
|
57
63
|
}
|
|
58
64
|
});
|
|
59
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"individual.js","sourceRoot":"","sources":["../../../src/accountsResolver/individual.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAQA,0DAAkC;AAClC,mCAA6C;AAW7C,SAAe,qBAAqB,CAAC,EACnC,WAAW,EACX,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,IAAI,GAAG,EAAE,EACT,QAAQ,EACR,KAAK,GAUN;;QACC,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,IAAA,mBAAS,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAEvD,IAAK,WAA2B,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"individual.js","sourceRoot":"","sources":["../../../src/accountsResolver/individual.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAQA,0DAAkC;AAClC,mCAA6C;AAW7C,SAAe,qBAAqB,CAAC,EACnC,WAAW,EACX,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,IAAI,GAAG,EAAE,EACT,QAAQ,EACR,KAAK,GAUN;;QACC,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,IAAA,mBAAS,EAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;QAEvD,IAAI;YACF,IAAK,WAA2B,CAAC,QAAQ,EAAE;gBACzC,IAAI,QAAQ,GAAG,CAAC,CAAC;gBACjB,MAAM,WAAW,GAAI,WAA2B,CAAC,QAAQ,CAAC;gBAC1D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;oBAC9C,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;oBAElC,QAAQ,IAAI,MAAM,qBAAqB,CAAC;wBACtC,WAAW,EAAE,UAAU;wBACvB,SAAS;wBACT,QAAQ;wBACR,IAAI;wBACJ,QAAQ;wBACR,IAAI,EAAE,OAAO;wBACb,QAAQ;wBACR,KAAK;qBACN,CAAC,CAAC;iBACJ;gBAED,OAAO,QAAQ,CAAC;aACjB;iBAAM;gBACL,IAAI,QAAQ,GAAG,CAAC,CAAC;gBACjB,IAAI,KAAK,GAAG,IAAA,WAAG,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBACnC,IAAI,CAAC,KAAK,EAAE;oBACV,KAAK,GAAG,MAAM,QAAQ,CAAC;wBACrB,SAAS;wBACT,QAAQ;wBACR,IAAI,EAAE,OAAO;wBACb,IAAI;wBACJ,QAAQ;wBACR,KAAK;qBACN,CAAC,CAAC;oBACH,IAAI,KAAK,EAAE;wBACT,QAAQ,GAAG,CAAC,CAAC;qBACd;iBACF;gBACD,IAAA,WAAG,EAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;gBAC9B,OAAO,QAAQ,CAAC;aACjB;SACF;QAAC,OAAO,CAAM,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;YACrD,MAAM,CAAC,CAAC;SACT;IACH,CAAC;CAAA;AAED;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAC/B,QAA4B;IAE5B,OAAO,CAAO,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;QAC9D,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YACjD,QAAQ,IAAI,MAAM,qBAAqB,CAAC;gBACtC,WAAW,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC9B,SAAS;gBACT,QAAQ;gBACR,QAAQ;gBACR,IAAI;gBACJ,QAAQ;gBACR,KAAK;aACN,CAAC,CAAC;SACJ;QACD,OAAO;YACL,QAAQ;YACR,QAAQ;SACT,CAAA;IACH,CAAC,CAAA,CAAC;AACJ,CAAC;AArBD,8CAqBC"}
|
package/lib/cjs/mplAssetAPI.js
CHANGED
|
@@ -15,8 +15,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.getAssetsByOwner = exports.getAssetProof = exports.getAsset = void 0;
|
|
16
16
|
const web3_js_1 = require("@solana/web3.js");
|
|
17
17
|
const axios_1 = __importDefault(require("axios"));
|
|
18
|
+
// @ts-ignore
|
|
19
|
+
const bs58_1 = __importDefault(require("bs58"));
|
|
18
20
|
function getAsset(url, assetId) {
|
|
19
|
-
var _a, _b, _c, _d;
|
|
20
21
|
return __awaiter(this, void 0, void 0, function* () {
|
|
21
22
|
try {
|
|
22
23
|
const response = yield axios_1.default.post(url, {
|
|
@@ -27,7 +28,7 @@ function getAsset(url, assetId) {
|
|
|
27
28
|
});
|
|
28
29
|
const result = response.data.result;
|
|
29
30
|
if (result) {
|
|
30
|
-
return
|
|
31
|
+
return toAsset(result);
|
|
31
32
|
}
|
|
32
33
|
}
|
|
33
34
|
catch (error) {
|
|
@@ -37,6 +38,10 @@ function getAsset(url, assetId) {
|
|
|
37
38
|
});
|
|
38
39
|
}
|
|
39
40
|
exports.getAsset = getAsset;
|
|
41
|
+
function toAsset(result) {
|
|
42
|
+
var _a, _b, _c, _d, _e;
|
|
43
|
+
return Object.assign(Object.assign({}, result), { id: new web3_js_1.PublicKey(result.id), compression: Object.assign(Object.assign({}, result.compression), { dataHash: (_a = result.compression.data_hash) !== null && _a !== void 0 ? _a : bs58_1.default.decode(result.compression.data_hash), creatorHash: (_b = result.compression.creator_hash) !== null && _b !== void 0 ? _b : bs58_1.default.decode(result.compression.creator_hash), assetHash: (_c = result.compression.asset_hash) !== null && _c !== void 0 ? _c : bs58_1.default.decode(result.compression.asset_hash), tree: (_d = result.compression.tree) !== null && _d !== void 0 ? _d : bs58_1.default.decode(result.compression.tree) }), ownership: Object.assign(Object.assign({}, result.ownership), { owner: (_e = result.ownership.owner) !== null && _e !== void 0 ? _e : new web3_js_1.PublicKey(result.ownership.owner) }) });
|
|
44
|
+
}
|
|
40
45
|
function getAssetProof(url, assetId) {
|
|
41
46
|
return __awaiter(this, void 0, void 0, function* () {
|
|
42
47
|
try {
|
|
@@ -74,7 +79,7 @@ function getAssetsByOwner(url, wallet, { sortBy = "created", limit = 50, page =
|
|
|
74
79
|
id: "rpd-op-123",
|
|
75
80
|
params: [wallet, sortBy, limit, page, before, after],
|
|
76
81
|
});
|
|
77
|
-
return (_a = response.data.result) === null || _a === void 0 ? void 0 : _a.items;
|
|
82
|
+
return (_a = response.data.result) === null || _a === void 0 ? void 0 : _a.items.map(toAsset);
|
|
78
83
|
}
|
|
79
84
|
catch (error) {
|
|
80
85
|
console.error(error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mplAssetAPI.js","sourceRoot":"","sources":["../../src/mplAssetAPI.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,kDAA0B;AA2B1B,SAAsB,QAAQ,CAC5B,GAAW,EACX,OAAkB
|
|
1
|
+
{"version":3,"file":"mplAssetAPI.js","sourceRoot":"","sources":["../../src/mplAssetAPI.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,6CAA4C;AAC5C,kDAA0B;AAC1B,aAAa;AACb,gDAA0B;AA2B1B,SAAsB,QAAQ,CAC5B,GAAW,EACX,OAAkB;;QAElB,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACrC,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,WAAW;gBACnB,EAAE,EAAE,YAAY;gBAChB,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;aAC7B,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACpC,IAAI,MAAM,EAAE;gBACV,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC;aACxB;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CAAA;AAnBD,4BAmBC;AAED,SAAS,OAAO,CAAC,MAAW;;IAC1B,uCACK,MAAM,KACT,EAAE,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAC5B,WAAW,kCACN,MAAM,CAAC,WAAW,KACrB,QAAQ,EACN,MAAA,MAAM,CAAC,WAAW,CAAC,SAAS,mCAC5B,cAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAC7C,WAAW,EACT,MAAA,MAAM,CAAC,WAAW,CAAC,YAAY,mCAC/B,cAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,EAChD,SAAS,EACP,MAAA,MAAM,CAAC,WAAW,CAAC,UAAU,mCAC7B,cAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,EAC9C,IAAI,EAAE,MAAA,MAAM,CAAC,WAAW,CAAC,IAAI,mCAAI,cAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,KAEzE,SAAS,kCACJ,MAAM,CAAC,SAAS,KACnB,KAAK,EAAE,MAAA,MAAM,CAAC,SAAS,CAAC,KAAK,mCAAI,IAAI,mBAAS,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,OAExE;AACJ,CAAC;AAED,SAAsB,aAAa,CACjC,GAAW,EACX,OAAkB;;QAElB,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACrC,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,iBAAiB;gBACzB,EAAE,EAAE,YAAY;gBAChB,MAAM,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;aAC7B,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;YACpC,IAAI,MAAM,EAAE;gBACV,OAAO;oBACL,IAAI,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,IAAI,CAAC;oBAChC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,IAAI,mBAAS,CAAC,CAAC,CAAC,CAAC;oBACrD,SAAS,EAAE,MAAM,CAAC,UAAU;oBAC5B,IAAI,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,IAAI,CAAC;oBAChC,MAAM,EAAE,IAAI,mBAAS,CAAC,MAAM,CAAC,OAAO,CAAC;iBACtC,CAAC;aACH;SACF;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,KAAK,CAAC;SACb;IACH,CAAC;CAAA;AAzBD,sCAyBC;AAWD,SAAsB,gBAAgB,CACpC,GAAW,EACX,MAAc,EACd,EACE,MAAM,GAAG,SAAS,EAClB,KAAK,GAAG,EAAE,EACV,IAAI,GAAG,CAAC,EACR,MAAM,GAAG,EAAE,EACX,KAAK,GAAG,EAAE,MACW,EAAE;;;QAEzB,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,IAAI,CAAC,GAAG,EAAE;gBACrC,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,qBAAqB;gBAC7B,EAAE,EAAE,YAAY;gBAChB,MAAM,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC;aACrD,CAAC,CAAC;YAEH,OAAO,MAAA,QAAQ,CAAC,IAAI,CAAC,MAAM,0CAAE,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACjD;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACrB,MAAM,KAAK,CAAC;SACb;;CACF;AAxBD,4CAwBC"}
|
package/lib/cjs/token.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/token.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gFAKiD;AAEjD,iDAO2B;AAC3B,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../src/token.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/transaction.js
CHANGED
|
@@ -28,6 +28,9 @@ function promiseAllInOrder(it) {
|
|
|
28
28
|
}
|
|
29
29
|
function sendInstructions(provider, instructions, signers = [], payer = provider.wallet.publicKey, commitment = "confirmed", idlErrors = new Map()) {
|
|
30
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
31
|
+
if (instructions.length == 0) {
|
|
32
|
+
return "";
|
|
33
|
+
}
|
|
31
34
|
let tx = new web3_js_1.Transaction();
|
|
32
35
|
tx.recentBlockhash = (yield provider.connection.getRecentBlockhash()).blockhash;
|
|
33
36
|
tx.feePayer = payer || provider.wallet.publicKey;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/transaction.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAcyB;AACzB,+CAA6C;AAE7C,SAAe,KAAK,CAAC,EAAU;;QAC7B,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;IAC3D,CAAC;CAAA;AAED,SAAe,iBAAiB,CAC9B,EAAwB;;QAExB,IAAI,GAAG,GAAQ,EAAE,CAAC;QAClB,KAAK,MAAM,CAAC,IAAI,EAAE,EAAE;YAClB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SACrB;QAED,OAAO,GAAG,CAAC;IACb,CAAC;CAAA;AAcD,SAAsB,gBAAgB,CACpC,QAAwB,EACxB,YAAsC,EACtC,UAAoB,EAAE,EACtB,QAAmB,QAAQ,CAAC,MAAM,CAAC,SAAS,EAC5C,aAAyB,WAAW,EACpC,YAAiC,IAAI,GAAG,EAAE;;QAE1C,IAAI,EAAE,GAAG,IAAI,qBAAW,EAAE,CAAC;QAC3B,EAAE,CAAC,eAAe,GAAG,CACnB,MAAM,QAAQ,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAC/C,CAAC,SAAS,CAAC;QACZ,EAAE,CAAC,QAAQ,GAAG,KAAK,IAAI,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;QACjD,EAAE,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC;QACxB,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,EAAE,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,CAAC;SAC5B;QACD,EAAE,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QAE/C,IAAI;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,uBAAuB,CAC5C,QAAQ,CAAC,UAAU,EACnB,EAAE,CAAC,SAAS,EAAE,EACd;gBACE,aAAa,EAAE,IAAI;aACpB,EACD,UAAU,CACX,CAAC;YACF,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,MAAM,QAAQ,GAAG,0BAAY,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;YAClD,MAAM,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;SACvC;IACH,CAAC;CAAA;
|
|
1
|
+
{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,11 +51,11 @@ export class AccountFetchCache {
|
|
|
51
51
|
return self.oldGetAccountinfo(publicKey, com);
|
|
52
52
|
};
|
|
53
53
|
}
|
|
54
|
-
connection.sendTransaction = async function overloadedSendTransaction(
|
|
55
|
-
const result = await self.oldSendTransaction(
|
|
54
|
+
connection.sendTransaction = async function overloadedSendTransaction(...args) {
|
|
55
|
+
const result = await self.oldSendTransaction(...args);
|
|
56
56
|
this.confirmTransaction(result, "finalized")
|
|
57
57
|
.then(() => {
|
|
58
|
-
return self.requeryMissing(
|
|
58
|
+
return self.requeryMissing(args[0].instructions);
|
|
59
59
|
})
|
|
60
60
|
.catch(console.error);
|
|
61
61
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountFetchCache.js","sourceRoot":"","sources":["../../../../src/accountFetchCache/accountFetchCache.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"accountFetchCache.js","sourceRoot":"","sources":["../../../../src/accountFetchCache/accountFetchCache.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,11 @@ import { resolveIndividual } from "./individual";
|
|
|
2
2
|
import { getAssociatedTokenAddress } from "@solana/spl-token";
|
|
3
3
|
import { get } from "./utils";
|
|
4
4
|
export function ataResolver({ instruction, account, mint, owner, }) {
|
|
5
|
-
return resolveIndividual(async ({ path, accounts, idlIx }) => {
|
|
6
|
-
if (idlIx.name === instruction && path.join(".") === account) {
|
|
5
|
+
return resolveIndividual(async ({ path, accounts, idlIx, provider }) => {
|
|
6
|
+
if ((typeof instruction === "undefined" || idlIx.name === instruction) && path.join(".") === account) {
|
|
7
7
|
const mintKey = get(accounts, mint.split("."));
|
|
8
|
-
|
|
8
|
+
// @ts-ignore
|
|
9
|
+
const ownerKey = owner ? get(accounts, owner.split(".")) : provider.wallet?.publicKey;
|
|
9
10
|
if (mintKey && ownerKey) {
|
|
10
11
|
return getAssociatedTokenAddress(mintKey, ownerKey, true);
|
|
11
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ataResolver.js","sourceRoot":"","sources":["../../../../src/accountsResolver/ataResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAS9B,MAAM,UAAU,WAAW,CAAuB,EAChD,WAAW,EACX,OAAO,EACP,IAAI,EACJ,KAAK,GACW;IAChB,OAAO,iBAAiB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"ataResolver.js","sourceRoot":"","sources":["../../../../src/accountsResolver/ataResolver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAS9B,MAAM,UAAU,WAAW,CAAuB,EAChD,WAAW,EACX,OAAO,EACP,IAAI,EACJ,KAAK,GACW;IAChB,OAAO,iBAAiB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE;QACrE,IAAI,CAAC,OAAO,WAAW,KAAK,WAAW,IAAI,KAAK,CAAC,IAAI,KAAK,WAAW,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,OAAO,EAAE;YACpG,MAAM,OAAO,GAAG,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAc,CAAC;YAC5D,aAAa;YACb,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAC;YAEnG,IAAI,OAAO,IAAI,QAAQ,EAAE;gBACvB,OAAO,yBAAyB,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;aAC3D;SACF;QACD,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -14,6 +14,14 @@ export const heliumCommonResolver = resolveIndividual(async ({ path }) => {
|
|
|
14
14
|
return new PublicKey("cmtDvXumGCrqC1Age74AVPhSRVXJMd8PJS91L8KbNCK");
|
|
15
15
|
case "logWrapper":
|
|
16
16
|
return new PublicKey("noopb9bkMVfRPU8AsbpTUg8AQkHtKwMYZiFUjNRtMmV");
|
|
17
|
+
case "governanceProgramId":
|
|
18
|
+
return new PublicKey("GovER5Lthms3bLBqWub97yVrMmEogzX7xNjdXpPPCVZw");
|
|
19
|
+
case "voterStakeRegistryProgramId":
|
|
20
|
+
return new PublicKey("hvsrY9UBtHhYRvstM2BWCsni81kevfn7B2DEhYbGA1a");
|
|
21
|
+
case "vsrProgram":
|
|
22
|
+
return new PublicKey("hvsrY9UBtHhYRvstM2BWCsni81kevfn7B2DEhYbGA1a");
|
|
23
|
+
case "instructions":
|
|
24
|
+
return new PublicKey("Sysvar1nstructions1111111111111111111111111");
|
|
17
25
|
default:
|
|
18
26
|
return;
|
|
19
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heliumCommonResolver.js","sourceRoot":"","sources":["../../../../src/accountsResolver/heliumCommonResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"heliumCommonResolver.js","sourceRoot":"","sources":["../../../../src/accountsResolver/heliumCommonResolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAGjD,MAAM,CAAC,MAAM,oBAAoB,GAAG,iBAAiB,CAAC,KAAK,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;IACvE,QAAQ,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;QAC7B,KAAK,oBAAoB;YACvB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,sBAAsB;YACzB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,sBAAsB;YACzB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,kBAAkB;YACrB,OAAO,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;QACvE,KAAK,oBAAoB;YACvB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,YAAY;YACf,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,qBAAqB;YACxB,OAAO,IAAI,SAAS,CAAC,8CAA8C,CAAC,CAAC;QACvE,KAAK,6BAA6B;YAChC,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,YAAY;YACf,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE,KAAK,cAAc;YACjB,OAAO,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;QACtE;YACE,OAAO;KACV;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -2,42 +2,48 @@ import camelCase from "camelcase";
|
|
|
2
2
|
import { get, set } from "./utils";
|
|
3
3
|
async function resolveIndividualImpl({ idlAccounts, programId, provider, args, accounts, path = [], resolver, idlIx, }) {
|
|
4
4
|
const newPath = [...path, camelCase(idlAccounts.name)];
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
5
|
+
try {
|
|
6
|
+
if (idlAccounts.accounts) {
|
|
7
|
+
let resolved = 0;
|
|
8
|
+
const subAccounts = idlAccounts.accounts;
|
|
9
|
+
for (let k = 0; k < subAccounts.length; k += 1) {
|
|
10
|
+
const subAccount = subAccounts[k];
|
|
11
|
+
resolved += await resolveIndividualImpl({
|
|
12
|
+
idlAccounts: subAccount,
|
|
13
|
+
programId,
|
|
14
|
+
provider,
|
|
15
|
+
args,
|
|
16
|
+
accounts,
|
|
17
|
+
path: newPath,
|
|
18
|
+
resolver,
|
|
19
|
+
idlIx,
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
return resolved;
|
|
20
23
|
}
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
resolved = 1;
|
|
24
|
+
else {
|
|
25
|
+
let resolved = 0;
|
|
26
|
+
let value = get(accounts, newPath);
|
|
27
|
+
if (!value) {
|
|
28
|
+
value = await resolver({
|
|
29
|
+
programId,
|
|
30
|
+
provider,
|
|
31
|
+
path: newPath,
|
|
32
|
+
args,
|
|
33
|
+
accounts,
|
|
34
|
+
idlIx,
|
|
35
|
+
});
|
|
36
|
+
if (value) {
|
|
37
|
+
resolved = 1;
|
|
38
|
+
}
|
|
37
39
|
}
|
|
40
|
+
set(accounts, newPath, value);
|
|
41
|
+
return resolved;
|
|
38
42
|
}
|
|
39
|
-
|
|
40
|
-
|
|
43
|
+
}
|
|
44
|
+
catch (e) {
|
|
45
|
+
console.error(`Error while resolving ${newPath}`, e);
|
|
46
|
+
throw e;
|
|
41
47
|
}
|
|
42
48
|
}
|
|
43
49
|
/**
|