@helium/helium-admin-cli 0.10.1 → 0.10.3
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/backfill-recent-proposals.js +10 -35
- package/lib/cjs/backfill-recent-proposals.js.map +1 -1
- package/lib/cjs/queue-wallet-claims.js +10 -2
- package/lib/cjs/queue-wallet-claims.js.map +1 -1
- package/lib/esm/src/backfill-recent-proposals.js +12 -37
- package/lib/esm/src/backfill-recent-proposals.js.map +1 -1
- package/lib/esm/src/queue-wallet-claims.js +10 -2
- package/lib/esm/src/queue-wallet-claims.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/backfill-recent-proposals.d.ts.map +1 -1
- package/lib/types/src/queue-wallet-claims.d.ts.map +1 -1
- package/package.json +15 -15
- package/lib/cjs/backfill-proxy-markers.js +0 -121
- package/lib/cjs/backfill-proxy-markers.js.map +0 -1
- package/lib/cjs/remove-authorities.js +0 -134
- package/lib/cjs/remove-authorities.js.map +0 -1
- package/lib/esm/src/backfill-proxy-markers.js +0 -80
- package/lib/esm/src/backfill-proxy-markers.js.map +0 -1
- package/lib/esm/src/remove-authorities.js +0 -93
- package/lib/esm/src/remove-authorities.js.map +0 -1
- package/lib/types/src/backfill-proxy-markers.d.ts +0 -2
- package/lib/types/src/backfill-proxy-markers.d.ts.map +0 -1
- package/lib/types/src/remove-authorities.d.ts +0 -2
- package/lib/types/src/remove-authorities.d.ts.map +0 -1
|
@@ -40,10 +40,7 @@ const anchor = __importStar(require("@coral-xyz/anchor"));
|
|
|
40
40
|
const account_fetch_cache_1 = require("@helium/account-fetch-cache");
|
|
41
41
|
const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
|
|
42
42
|
const spl_utils_1 = require("@helium/spl-utils");
|
|
43
|
-
const voter_stake_registry_sdk_1 = require("@helium/voter-stake-registry-sdk");
|
|
44
|
-
const web3_js_1 = require("@solana/web3.js");
|
|
45
43
|
const bn_js_1 = require("bn.js");
|
|
46
|
-
const fs_1 = __importDefault(require("fs"));
|
|
47
44
|
const os_1 = __importDefault(require("os"));
|
|
48
45
|
const yargs_1 = __importDefault(require("yargs/yargs"));
|
|
49
46
|
function run(args = process.argv) {
|
|
@@ -59,14 +56,8 @@ function run(args = process.argv) {
|
|
|
59
56
|
default: "http://127.0.0.1:8899",
|
|
60
57
|
describe: "The solana url",
|
|
61
58
|
},
|
|
62
|
-
recentProposalsFile: {
|
|
63
|
-
alias: "m",
|
|
64
|
-
describe: "The mistake file",
|
|
65
|
-
default: "mistake.json",
|
|
66
|
-
},
|
|
67
59
|
});
|
|
68
60
|
const argv = yield yarg.argv;
|
|
69
|
-
const recentProposals = JSON.parse(fs_1.default.readFileSync(argv.recentProposalsFile, "utf8"));
|
|
70
61
|
process.env.ANCHOR_WALLET = argv.wallet;
|
|
71
62
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
72
63
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
@@ -77,35 +68,20 @@ function run(args = process.argv) {
|
|
|
77
68
|
extendConnection: true,
|
|
78
69
|
});
|
|
79
70
|
const hsdProgram = yield (0, helium_sub_daos_sdk_1.init)(provider);
|
|
80
|
-
const
|
|
71
|
+
const daoK = (0, helium_sub_daos_sdk_1.daoKey)(spl_utils_1.HNT_MINT)[0];
|
|
72
|
+
const dao = yield hsdProgram.account.daoV0.fetch(daoK);
|
|
73
|
+
const oldestProposal = dao.recentProposals[3].ts;
|
|
74
|
+
const daoEpochInfos = yield hsdProgram.account.daoEpochInfoV0.all();
|
|
75
|
+
const affectedDaoEpochInfos = daoEpochInfos.filter((e) => e.account.epoch.mul(new bn_js_1.BN(helium_sub_daos_sdk_1.EPOCH_LENGTH)).gt(oldestProposal));
|
|
81
76
|
let instructions = [];
|
|
82
|
-
let delIndex = 0;
|
|
83
77
|
let i = 0;
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
const delegation = delegations[delIndex];
|
|
88
|
-
if (delegation === null || delegation === void 0 ? void 0 : delegation.deprecatedRecentProposals) {
|
|
89
|
-
const deprecatedProposals = delegation.deprecatedRecentProposals.map((p) => p.proposal.toBase58());
|
|
90
|
-
const currentProposals = proposals.map((p) => p.proposal);
|
|
91
|
-
if (!arrayEquals(deprecatedProposals, currentProposals)) {
|
|
92
|
-
throw new Error(`Deprecated recent proposals mismatch for delegation ${delegation.position.toBase58()}:\n` +
|
|
93
|
-
`Deprecated: ${deprecatedProposals.join(", ")}\n` +
|
|
94
|
-
`Current: ${currentProposals.join(", ")}`);
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
instructions.push(yield vsrProgram.methods
|
|
98
|
-
.tempBackfillRecentProposals({
|
|
99
|
-
recentProposals: proposals.map(({ proposal, ts }) => ({
|
|
100
|
-
proposal: new web3_js_1.PublicKey(proposal),
|
|
101
|
-
ts: new bn_js_1.BN(ts),
|
|
102
|
-
})),
|
|
103
|
-
})
|
|
78
|
+
for (const daoEpochInfo of affectedDaoEpochInfos) {
|
|
79
|
+
instructions.push(yield hsdProgram.methods
|
|
80
|
+
.tempBackfillDaoRecentProposals()
|
|
104
81
|
.accountsStrict({
|
|
105
82
|
authority: provider.wallet.publicKey,
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
systemProgram: web3_js_1.SystemProgram.programId,
|
|
83
|
+
dao: daoK,
|
|
84
|
+
daoEpochInfo: daoEpochInfo.publicKey,
|
|
109
85
|
})
|
|
110
86
|
.instruction());
|
|
111
87
|
if (i > 20) {
|
|
@@ -117,7 +93,6 @@ function run(args = process.argv) {
|
|
|
117
93
|
instructions = [];
|
|
118
94
|
}
|
|
119
95
|
i++;
|
|
120
|
-
delIndex++;
|
|
121
96
|
}
|
|
122
97
|
yield (0, spl_utils_1.batchParallelInstructionsWithPriorityFee)(provider, instructions, {
|
|
123
98
|
onProgress: console.log,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill-recent-proposals.js","sourceRoot":"","sources":["../../src/backfill-recent-proposals.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qEAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"backfill-recent-proposals.js","sourceRoot":"","sources":["../../src/backfill-recent-proposals.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,6 +64,11 @@ function run(args = process.argv) {
|
|
|
64
64
|
describe: "The task queue to queue",
|
|
65
65
|
default: "H39gEszvsi6AT4rYBiJTuZHJSF5hMHy6CKGTd7wzhsg7",
|
|
66
66
|
},
|
|
67
|
+
walletToClaim: {
|
|
68
|
+
type: "string",
|
|
69
|
+
alias: "w",
|
|
70
|
+
describe: "The wallet to claim",
|
|
71
|
+
},
|
|
67
72
|
});
|
|
68
73
|
const argv = yield yarg.argv;
|
|
69
74
|
process.env.ANCHOR_WALLET = argv.wallet;
|
|
@@ -78,13 +83,16 @@ function run(args = process.argv) {
|
|
|
78
83
|
const instructions = [];
|
|
79
84
|
const task1 = (0, tuktuk_sdk_2.nextAvailableTaskIds)(taskQueueAcc.taskBitmap, 1)[0];
|
|
80
85
|
const queueAuthority = web3_js_1.PublicKey.findProgramAddressSync([Buffer.from("queue_authority")], PROGRAM_ID)[0];
|
|
86
|
+
const walletToClaim = argv.walletToClaim
|
|
87
|
+
? new web3_js_1.PublicKey(argv.walletToClaim)
|
|
88
|
+
: provider.wallet.publicKey;
|
|
81
89
|
instructions.push(yield program.methods
|
|
82
90
|
.queueWalletClaimV0({
|
|
83
91
|
freeTaskId: task1,
|
|
84
92
|
})
|
|
85
93
|
.accountsStrict({
|
|
86
94
|
task: (0, tuktuk_sdk_1.taskKey)(taskQueue, task1)[0],
|
|
87
|
-
wallet:
|
|
95
|
+
wallet: walletToClaim,
|
|
88
96
|
taskQueue,
|
|
89
97
|
payer: provider.wallet.publicKey,
|
|
90
98
|
systemProgram: web3_js_1.SystemProgram.programId,
|
|
@@ -92,7 +100,7 @@ function run(args = process.argv) {
|
|
|
92
100
|
tuktukProgram: tuktukProgram.programId,
|
|
93
101
|
pdaWallet: (0, tuktuk_sdk_1.customSignerKey)(taskQueue, [
|
|
94
102
|
Buffer.from("claim_payer"),
|
|
95
|
-
|
|
103
|
+
walletToClaim.toBuffer(),
|
|
96
104
|
])[0],
|
|
97
105
|
taskQueueAuthority: (0, tuktuk_sdk_1.taskQueueAuthorityKey)(taskQueue, queueAuthority)[0],
|
|
98
106
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-wallet-claims.js","sourceRoot":"","sources":["../../src/queue-wallet-claims.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,iDAA6E;AAC7E,mDAK4B;AAC5B,6CAIyB;AACzB,4CAAoB;AACpB,wDAAgC;AAEhC,mDAA0D;AAE1D,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,6CAA6C,CAAC,CAAC;AAEhF,SAAsB,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;;QAChD,MAAM,IAAI,GAAG,IAAA,eAAK,EAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC/B,MAAM,EAAE;gBACN,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,uBAAuB;gBACjC,OAAO,EAAE,GAAG,YAAE,CAAC,OAAO,EAAE,yBAAyB;aAClD;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,uBAAuB;gBAChC,QAAQ,EAAE,gBAAgB;aAC3B;YACD,SAAS,EAAE;gBACT,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,QAAQ;gBACd,KAAK,EAAE,GAAG;gBACV,QAAQ,EAAE,yBAAyB;gBACnC,OAAO,EAAE,8CAA8C;aACxD;SACF,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;QAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;QAC/D,MAAM,SAAS,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAChE,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAChC,GAAe,EACf,QAAQ,CACmB,CAAC;QAC9B,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAU,EAAC,QAAQ,CAAC,CAAC;QACjD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC9E,MAAM,YAAY,GAA6B,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,IAAA,iCAAoB,EAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClE,MAAM,cAAc,GAAG,mBAAS,CAAC,sBAAsB,CACrD,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAChC,UAAU,CACX,CAAC,CAAC,CAAC,CAAC;QACL,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;aAClB,kBAAkB,CAAC;YAClB,UAAU,EAAE,KAAK;SAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"queue-wallet-claims.js","sourceRoot":"","sources":["../../src/queue-wallet-claims.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
import * as anchor from "@coral-xyz/anchor";
|
|
2
2
|
import { AccountFetchCache } from "@helium/account-fetch-cache";
|
|
3
|
-
import {
|
|
4
|
-
import { batchParallelInstructionsWithPriorityFee } from "@helium/spl-utils";
|
|
5
|
-
import { init as initVsr } from "@helium/voter-stake-registry-sdk";
|
|
6
|
-
import { PublicKey, SystemProgram, } from "@solana/web3.js";
|
|
3
|
+
import { daoKey, EPOCH_LENGTH, init as initHsd } from "@helium/helium-sub-daos-sdk";
|
|
4
|
+
import { batchParallelInstructionsWithPriorityFee, HNT_MINT } from "@helium/spl-utils";
|
|
7
5
|
import { BN } from "bn.js";
|
|
8
|
-
import fs from "fs";
|
|
9
6
|
import os from "os";
|
|
10
7
|
import yargs from "yargs/yargs";
|
|
11
8
|
export async function run(args = process.argv) {
|
|
@@ -20,14 +17,8 @@ export async function run(args = process.argv) {
|
|
|
20
17
|
default: "http://127.0.0.1:8899",
|
|
21
18
|
describe: "The solana url",
|
|
22
19
|
},
|
|
23
|
-
recentProposalsFile: {
|
|
24
|
-
alias: "m",
|
|
25
|
-
describe: "The mistake file",
|
|
26
|
-
default: "mistake.json",
|
|
27
|
-
},
|
|
28
20
|
});
|
|
29
21
|
const argv = await yarg.argv;
|
|
30
|
-
const recentProposals = JSON.parse(fs.readFileSync(argv.recentProposalsFile, "utf8"));
|
|
31
22
|
process.env.ANCHOR_WALLET = argv.wallet;
|
|
32
23
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
33
24
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
@@ -38,35 +29,20 @@ export async function run(args = process.argv) {
|
|
|
38
29
|
extendConnection: true,
|
|
39
30
|
});
|
|
40
31
|
const hsdProgram = await initHsd(provider);
|
|
41
|
-
const
|
|
32
|
+
const daoK = daoKey(HNT_MINT)[0];
|
|
33
|
+
const dao = await hsdProgram.account.daoV0.fetch(daoK);
|
|
34
|
+
const oldestProposal = dao.recentProposals[3].ts;
|
|
35
|
+
const daoEpochInfos = await hsdProgram.account.daoEpochInfoV0.all();
|
|
36
|
+
const affectedDaoEpochInfos = daoEpochInfos.filter((e) => e.account.epoch.mul(new BN(EPOCH_LENGTH)).gt(oldestProposal));
|
|
42
37
|
let instructions = [];
|
|
43
|
-
let delIndex = 0;
|
|
44
38
|
let i = 0;
|
|
45
|
-
const
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
const delegation = delegations[delIndex];
|
|
49
|
-
if (delegation?.deprecatedRecentProposals) {
|
|
50
|
-
const deprecatedProposals = delegation.deprecatedRecentProposals.map((p) => p.proposal.toBase58());
|
|
51
|
-
const currentProposals = proposals.map((p) => p.proposal);
|
|
52
|
-
if (!arrayEquals(deprecatedProposals, currentProposals)) {
|
|
53
|
-
throw new Error(`Deprecated recent proposals mismatch for delegation ${delegation.position.toBase58()}:\n` +
|
|
54
|
-
`Deprecated: ${deprecatedProposals.join(", ")}\n` +
|
|
55
|
-
`Current: ${currentProposals.join(", ")}`);
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
instructions.push(await vsrProgram.methods
|
|
59
|
-
.tempBackfillRecentProposals({
|
|
60
|
-
recentProposals: proposals.map(({ proposal, ts }) => ({
|
|
61
|
-
proposal: new PublicKey(proposal),
|
|
62
|
-
ts: new BN(ts),
|
|
63
|
-
})),
|
|
64
|
-
})
|
|
39
|
+
for (const daoEpochInfo of affectedDaoEpochInfos) {
|
|
40
|
+
instructions.push(await hsdProgram.methods
|
|
41
|
+
.tempBackfillDaoRecentProposals()
|
|
65
42
|
.accountsStrict({
|
|
66
43
|
authority: provider.wallet.publicKey,
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
systemProgram: SystemProgram.programId,
|
|
44
|
+
dao: daoK,
|
|
45
|
+
daoEpochInfo: daoEpochInfo.publicKey,
|
|
70
46
|
})
|
|
71
47
|
.instruction());
|
|
72
48
|
if (i > 20) {
|
|
@@ -78,7 +54,6 @@ export async function run(args = process.argv) {
|
|
|
78
54
|
instructions = [];
|
|
79
55
|
}
|
|
80
56
|
i++;
|
|
81
|
-
delIndex++;
|
|
82
57
|
}
|
|
83
58
|
await batchParallelInstructionsWithPriorityFee(provider, instructions, {
|
|
84
59
|
onProgress: console.log,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill-recent-proposals.js","sourceRoot":"","sources":["../../../src/backfill-recent-proposals.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"backfill-recent-proposals.js","sourceRoot":"","sources":["../../../src/backfill-recent-proposals.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,11 @@ export async function run(args = process.argv) {
|
|
|
25
25
|
describe: "The task queue to queue",
|
|
26
26
|
default: "H39gEszvsi6AT4rYBiJTuZHJSF5hMHy6CKGTd7wzhsg7",
|
|
27
27
|
},
|
|
28
|
+
walletToClaim: {
|
|
29
|
+
type: "string",
|
|
30
|
+
alias: "w",
|
|
31
|
+
describe: "The wallet to claim",
|
|
32
|
+
},
|
|
28
33
|
});
|
|
29
34
|
const argv = await yarg.argv;
|
|
30
35
|
process.env.ANCHOR_WALLET = argv.wallet;
|
|
@@ -39,13 +44,16 @@ export async function run(args = process.argv) {
|
|
|
39
44
|
const instructions = [];
|
|
40
45
|
const task1 = nextAvailableTaskIds(taskQueueAcc.taskBitmap, 1)[0];
|
|
41
46
|
const queueAuthority = PublicKey.findProgramAddressSync([Buffer.from("queue_authority")], PROGRAM_ID)[0];
|
|
47
|
+
const walletToClaim = argv.walletToClaim
|
|
48
|
+
? new PublicKey(argv.walletToClaim)
|
|
49
|
+
: provider.wallet.publicKey;
|
|
42
50
|
instructions.push(await program.methods
|
|
43
51
|
.queueWalletClaimV0({
|
|
44
52
|
freeTaskId: task1,
|
|
45
53
|
})
|
|
46
54
|
.accountsStrict({
|
|
47
55
|
task: taskKey(taskQueue, task1)[0],
|
|
48
|
-
wallet:
|
|
56
|
+
wallet: walletToClaim,
|
|
49
57
|
taskQueue,
|
|
50
58
|
payer: provider.wallet.publicKey,
|
|
51
59
|
systemProgram: SystemProgram.programId,
|
|
@@ -53,7 +61,7 @@ export async function run(args = process.argv) {
|
|
|
53
61
|
tuktukProgram: tuktukProgram.programId,
|
|
54
62
|
pdaWallet: customSignerKey(taskQueue, [
|
|
55
63
|
Buffer.from("claim_payer"),
|
|
56
|
-
|
|
64
|
+
walletToClaim.toBuffer(),
|
|
57
65
|
])[0],
|
|
58
66
|
taskQueueAuthority: taskQueueAuthorityKey(taskQueue, queueAuthority)[0],
|
|
59
67
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-wallet-claims.js","sourceRoot":"","sources":["../../../src/queue-wallet-claims.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,wCAAwC,EAAE,MAAM,mBAAmB,CAAC;AAC7E,OAAO,EACL,eAAe,EACf,IAAI,IAAI,UAAU,EAClB,OAAO,EACP,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,SAAS,EACT,aAAa,GAEd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAE1D,MAAM,UAAU,GAAG,IAAI,SAAS,CAAC,6CAA6C,CAAC,CAAC;AAEhF,MAAM,CAAC,KAAK,UAAU,GAAG,CAAC,OAAY,OAAO,CAAC,IAAI;IAChD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;QAC/B,MAAM,EAAE;YACN,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,uBAAuB;YACjC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,yBAAyB;SAClD;QACD,GAAG,EAAE;YACH,KAAK,EAAE,GAAG;YACV,OAAO,EAAE,uBAAuB;YAChC,QAAQ,EAAE,gBAAgB;SAC3B;QACD,SAAS,EAAE;YACT,QAAQ,EAAE,IAAI;YACd,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;YACV,QAAQ,EAAE,yBAAyB;YACnC,OAAO,EAAE,8CAA8C;SACxD;KACF,CAAC,CAAC;IACH,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC;IACxC,OAAO,CAAC,GAAG,CAAC,mBAAmB,GAAG,IAAI,CAAC,GAAG,CAAC;IAC3C,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,EAA2B,CAAC;IAC/D,MAAM,SAAS,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,IAAI,MAAM,CAAC,OAAO,CAChC,GAAe,EACf,QAAQ,CACmB,CAAC;IAC9B,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC9E,MAAM,YAAY,GAA6B,EAAE,CAAC;IAClD,MAAM,KAAK,GAAG,oBAAoB,CAAC,YAAY,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAClE,MAAM,cAAc,GAAG,SAAS,CAAC,sBAAsB,CACrD,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAChC,UAAU,CACX,CAAC,CAAC,CAAC,CAAC;IACL,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;SAClB,kBAAkB,CAAC;QAClB,UAAU,EAAE,KAAK;KAClB,CAAC;
|
|
1
|
+
{"version":3,"file":"queue-wallet-claims.js","sourceRoot":"","sources":["../../../src/queue-wallet-claims.ts"],"names":[],"mappings":"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"}
|