@helium/helium-admin-cli 0.4.0 → 0.4.1

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.
@@ -57,8 +57,8 @@ function run(args = process.argv) {
57
57
  },
58
58
  name: {
59
59
  default: "nJWGUMOK",
60
- describe: "The lazy transactions instance name"
61
- }
60
+ describe: "The lazy transactions instance name",
61
+ },
62
62
  });
63
63
  const argv = yield yarg.argv;
64
64
  process.env.ANCHOR_WALLET = argv.wallet;
@@ -70,28 +70,63 @@ function run(args = process.argv) {
70
70
  const lt = yield lazyProgram.account.lazyTransactionsV0.fetch(ltKey);
71
71
  const blocks = yield lazyProgram.account.block.all();
72
72
  const blocksByKey = new Set(blocks.map((b) => b.publicKey.toString()));
73
- const allIndices = new Array(1 << lt.maxDepth).fill(0).map((_, i) => i);
74
- const blockIndices = allIndices.filter((bi) => blocksByKey.has((0, lazy_transactions_sdk_1.blockKey)(ltKey, bi)[0].toBase58()));
75
- if (lt.executed.length !== 1 << lt.maxDepth) {
73
+ const allIndices = new Array(1 << lt.maxDepth)
74
+ .fill(0)
75
+ .map((_, i) => i)
76
+ .map((bi) => ({
77
+ index: bi,
78
+ block: (0, lazy_transactions_sdk_1.blockKey)(ltKey, bi)[0],
79
+ }));
80
+ const blockIndices = allIndices.filter((bi) => blocksByKey.has(bi.block.toBase58()));
81
+ if (lt.executedTransactions.equals(web3_js_1.PublicKey.default)) {
82
+ const executedTransactions = web3_js_1.Keypair.generate();
83
+ const executedTransactionsSize = 1 + (0, lazy_transactions_sdk_1.getBitmapLen)(lt.maxDepth);
84
+ const executedTransactionsRent = yield provider.connection.getMinimumBalanceForRentExemption(executedTransactionsSize);
76
85
  yield lazyProgram.methods
77
- .reinitializeExecutedTransactionsV0()
86
+ .updateLazyTransactionsV0({
87
+ root: null,
88
+ authority: null,
89
+ })
90
+ .preInstructions([
91
+ web3_js_1.SystemProgram.createAccount({
92
+ fromPubkey: provider.wallet.publicKey,
93
+ newAccountPubkey: executedTransactions.publicKey,
94
+ space: executedTransactionsSize,
95
+ lamports: executedTransactionsRent,
96
+ programId: lazyProgram.programId,
97
+ }),
98
+ ])
78
99
  .accounts({
79
100
  lazyTransactions: ltKey,
101
+ executedTransactions: executedTransactions.publicKey,
80
102
  })
103
+ .signers([executedTransactions])
81
104
  .rpc({ skipPreflight: true });
105
+ lt.executedTransactions = executedTransactions.publicKey;
106
+ }
107
+ // Do in chunks so we don't create too many promises
108
+ let instructions = [];
109
+ let i = 0;
110
+ for (const chunk of (0, spl_utils_1.chunks)(blockIndices, 10)) {
111
+ if (i % 1000 === 0) {
112
+ console.log(`Forming txns ${i * 10}/${blockIndices.length}`);
113
+ }
114
+ i++;
115
+ instructions.push(...(yield Promise.all(chunk.map((bi) => lazyProgram.methods
116
+ .closeMarkerV0({
117
+ index: bi.index,
118
+ })
119
+ .accountsStrict({
120
+ refund: provider.wallet.publicKey,
121
+ lazyTransactions: ltKey,
122
+ authority: provider.wallet.publicKey,
123
+ block: bi.block,
124
+ executedTransactions: lt.executedTransactions,
125
+ })
126
+ .instruction()))));
82
127
  }
83
- const instructions = yield Promise.all(blockIndices.map((bi) => lazyProgram.methods
84
- .closeMarkerV0({
85
- index: bi,
86
- })
87
- .accounts({
88
- refund: provider.wallet.publicKey,
89
- lazyTransactions: ltKey,
90
- authority: provider.wallet.publicKey,
91
- })
92
- .instruction()));
93
128
  console.log(`${blocks.length} blocks to close`);
94
- const txns = (0, spl_utils_1.chunks)(instructions, 10).map(chunk => {
129
+ const txns = (0, spl_utils_1.chunks)(instructions, 10).map((chunk) => {
95
130
  const tx = new web3_js_1.Transaction({
96
131
  feePayer: provider.wallet.publicKey,
97
132
  });
@@ -1 +1 @@
1
- {"version":3,"file":"close-lazy-transaction-markers.js","sourceRoot":"","sources":["../../src/close-lazy-transaction-markers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"close-lazy-transaction-markers.js","sourceRoot":"","sources":["../../src/close-lazy-transaction-markers.ts"],"names":[],"mappings":"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"}
@@ -92,7 +92,7 @@ function run(args = process.argv) {
92
92
  epoch,
93
93
  })
94
94
  .preInstructions([
95
- web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 350000 }),
95
+ web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({ units: 500000 }),
96
96
  ])
97
97
  .accounts({
98
98
  subDao: subDao.publicKey,
@@ -0,0 +1,149 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ var desc = Object.getOwnPropertyDescriptor(m, k);
5
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
6
+ desc = { enumerable: true, get: function() { return m[k]; } };
7
+ }
8
+ Object.defineProperty(o, k2, desc);
9
+ }) : (function(o, m, k, k2) {
10
+ if (k2 === undefined) k2 = k;
11
+ o[k2] = m[k];
12
+ }));
13
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
14
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
15
+ }) : function(o, v) {
16
+ o["default"] = v;
17
+ });
18
+ var __importStar = (this && this.__importStar) || function (mod) {
19
+ if (mod && mod.__esModule) return mod;
20
+ var result = {};
21
+ if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
22
+ __setModuleDefault(result, mod);
23
+ return result;
24
+ };
25
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
+ return new (P || (P = Promise))(function (resolve, reject) {
28
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
29
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
30
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
31
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
32
+ });
33
+ };
34
+ var __importDefault = (this && this.__importDefault) || function (mod) {
35
+ return (mod && mod.__esModule) ? mod : { "default": mod };
36
+ };
37
+ Object.defineProperty(exports, "__esModule", { value: true });
38
+ exports.run = void 0;
39
+ const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
40
+ const anchor = __importStar(require("@coral-xyz/anchor"));
41
+ const web3_js_1 = require("@solana/web3.js");
42
+ const bn_js_1 = require("bn.js");
43
+ const os_1 = __importDefault(require("os"));
44
+ const yargs_1 = __importDefault(require("yargs/yargs"));
45
+ const spl_utils_1 = require("@helium/spl-utils");
46
+ function run(args = process.argv) {
47
+ var _a, _b, _c;
48
+ return __awaiter(this, void 0, void 0, function* () {
49
+ const yarg = (0, yargs_1.default)(args).options({
50
+ wallet: {
51
+ alias: "k",
52
+ describe: "Anchor wallet keypair",
53
+ default: `${os_1.default.homedir()}/.config/solana/id.json`,
54
+ },
55
+ url: {
56
+ alias: "u",
57
+ default: "http://127.0.0.1:8899",
58
+ describe: "The solana url",
59
+ },
60
+ });
61
+ const argv = yield yarg.argv;
62
+ process.env.ANCHOR_WALLET = argv.wallet;
63
+ process.env.ANCHOR_PROVIDER_URL = argv.url;
64
+ anchor.setProvider(anchor.AnchorProvider.local(argv.url));
65
+ const epoch = 19624;
66
+ const provider = anchor.getProvider();
67
+ const heliumSubDaosProgram = yield (0, helium_sub_daos_sdk_1.init)(provider);
68
+ const connection = new web3_js_1.Connection(provider.connection.rpcEndpoint, "confirmed");
69
+ const subDaoEpochInfos = [
70
+ (0, helium_sub_daos_sdk_1.subDaoEpochInfoKey)((0, helium_sub_daos_sdk_1.subDaoKey)(spl_utils_1.IOT_MINT)[0], new bn_js_1.BN(epoch).mul(new bn_js_1.BN(helium_sub_daos_sdk_1.EPOCH_LENGTH)))[0],
71
+ (0, helium_sub_daos_sdk_1.subDaoEpochInfoKey)((0, helium_sub_daos_sdk_1.subDaoKey)(spl_utils_1.MOBILE_MINT)[0], new bn_js_1.BN(epoch).mul(new bn_js_1.BN(helium_sub_daos_sdk_1.EPOCH_LENGTH)))[0],
72
+ ];
73
+ console.log(subDaoEpochInfos);
74
+ const coder = new anchor.BorshCoder(heliumSubDaosProgram.idl);
75
+ for (const subDaoEpochInfo of subDaoEpochInfos) {
76
+ const sigs = [];
77
+ let before = undefined;
78
+ while (true) {
79
+ const newSigs = yield connection.getSignaturesForAddress(subDaoEpochInfo, {
80
+ limit: 1000,
81
+ before,
82
+ });
83
+ sigs.push(...newSigs);
84
+ if (newSigs.length < 1000) {
85
+ break;
86
+ }
87
+ before = newSigs[newSigs.length - 1].signature;
88
+ }
89
+ let foundIssue = false;
90
+ for (const sig of sigs) {
91
+ const tx = yield connection.getTransaction(sig.signature);
92
+ if (((_a = tx === null || tx === void 0 ? void 0 : tx.meta) === null || _a === void 0 ? void 0 : _a.err) || !tx) {
93
+ continue;
94
+ }
95
+ // Should have been before this
96
+ if (tx.blockTime && tx.blockTime > 1695652196) {
97
+ continue;
98
+ }
99
+ for (const instruction of ((tx === null || tx === void 0 ? void 0 : tx.transaction.message.instructions) || []).filter((ix) => tx.transaction.message.accountKeys[ix.programIdIndex].equals(heliumSubDaosProgram.programId))) {
100
+ const accountMetas = instruction.accounts.map((idx) => ({
101
+ pubkey: tx.transaction.message.accountKeys[idx],
102
+ isSigner: tx.transaction.message.isAccountSigner(idx),
103
+ isWritable: tx.transaction.message.isAccountWritable(idx),
104
+ }));
105
+ const ix = coder.instruction.decode(instruction.data, "base58");
106
+ if (!ix) {
107
+ continue;
108
+ }
109
+ const formatted = coder.instruction.format(ix, accountMetas);
110
+ if (ix.name === "issueRewardsV0") {
111
+ foundIssue = true;
112
+ }
113
+ if (!foundIssue) {
114
+ continue;
115
+ }
116
+ if (ix.name !== "claimRewardsV0") {
117
+ continue;
118
+ }
119
+ // @ts-ignore
120
+ if (ix.data.args.epoch.eq(new anchor.BN())) {
121
+ continue;
122
+ }
123
+ const position = (_b = formatted === null || formatted === void 0 ? void 0 : formatted.accounts.find((a) => a.name === "Position")) === null || _b === void 0 ? void 0 : _b.pubkey;
124
+ const subDao = (_c = formatted === null || formatted === void 0 ? void 0 : formatted.accounts.find((a) => a.name === "Sub Dao")) === null || _c === void 0 ? void 0 : _c.pubkey;
125
+ if (!subDao || !position) {
126
+ throw new Error("Subdao or position missing");
127
+ }
128
+ const method = heliumSubDaosProgram.methods
129
+ .tempClaimFailedClaims()
130
+ .accounts({
131
+ authority: provider.wallet.publicKey,
132
+ position,
133
+ subDao,
134
+ subDaoEpochInfo,
135
+ });
136
+ const { block } = yield method.pubkeys();
137
+ if (!(yield connection.getAccountInfo(block))) {
138
+ console.log("Repairing", position.toBase58());
139
+ yield method.rpc({
140
+ skipPreflight: true,
141
+ });
142
+ }
143
+ }
144
+ }
145
+ }
146
+ });
147
+ }
148
+ exports.run = run;
149
+ //# sourceMappingURL=temp-claim-failed-claims.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"temp-claim-failed-claims.js","sourceRoot":"","sources":["../../src/temp-claim-failed-claims.ts"],"names":[],"mappings":"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"}
@@ -100,6 +100,7 @@ function run(args = process.argv) {
100
100
  lazyTransactions,
101
101
  authority: lazyTrAcc.authority,
102
102
  canopy: lazyTrAcc.canopy,
103
+ executedTransactions: lazyTrAcc.executedTransactions,
103
104
  })
104
105
  .instruction();
105
106
  yield (0, utils_1.sendInstructionsOrSquads)({
@@ -1 +1 @@
1
- {"version":3,"file":"update-lazy-transactions.js","sourceRoot":"","sources":["../../src/update-lazy-transactions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-lazy-transactions.js","sourceRoot":"","sources":["../../src/update-lazy-transactions.ts"],"names":[],"mappings":"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"}
@@ -178,6 +178,7 @@ function run(args = process.argv) {
178
178
  .accounts({
179
179
  rewardableEntityConfig: rewardableConfigKey,
180
180
  authority: rewardableConfigAcc.authority,
181
+ payer: rewardableConfigAcc.authority,
181
182
  })
182
183
  .instruction(),
183
184
  ];
@@ -1 +1 @@
1
- {"version":3,"file":"update-rewardable-entity-config.js","sourceRoot":"","sources":["../../src/update-rewardable-entity-config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-rewardable-entity-config.js","sourceRoot":"","sources":["../../src/update-rewardable-entity-config.ts"],"names":[],"mappings":"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"}
@@ -1,9 +1,9 @@
1
1
  import * as anchor from "@coral-xyz/anchor";
2
- import { blockKey, init as initLazy, lazyTransactionsKey } from "@helium/lazy-transactions-sdk";
2
+ import { blockKey, getBitmapLen, init as initLazy, lazyTransactionsKey, } from "@helium/lazy-transactions-sdk";
3
3
  import os from "os";
4
4
  import yargs from "yargs/yargs";
5
5
  import { bulkSendTransactions, chunks } from "@helium/spl-utils";
6
- import { Transaction } from "@solana/web3.js";
6
+ import { Keypair, PublicKey, SystemProgram, Transaction, } from "@solana/web3.js";
7
7
  export async function run(args = process.argv) {
8
8
  const yarg = yargs(args).options({
9
9
  wallet: {
@@ -18,8 +18,8 @@ export async function run(args = process.argv) {
18
18
  },
19
19
  name: {
20
20
  default: "nJWGUMOK",
21
- describe: "The lazy transactions instance name"
22
- }
21
+ describe: "The lazy transactions instance name",
22
+ },
23
23
  });
24
24
  const argv = await yarg.argv;
25
25
  process.env.ANCHOR_WALLET = argv.wallet;
@@ -31,28 +31,63 @@ export async function run(args = process.argv) {
31
31
  const lt = await lazyProgram.account.lazyTransactionsV0.fetch(ltKey);
32
32
  const blocks = await lazyProgram.account.block.all();
33
33
  const blocksByKey = new Set(blocks.map((b) => b.publicKey.toString()));
34
- const allIndices = new Array(1 << lt.maxDepth).fill(0).map((_, i) => i);
35
- const blockIndices = allIndices.filter((bi) => blocksByKey.has(blockKey(ltKey, bi)[0].toBase58()));
36
- if (lt.executed.length !== 1 << lt.maxDepth) {
34
+ const allIndices = new Array(1 << lt.maxDepth)
35
+ .fill(0)
36
+ .map((_, i) => i)
37
+ .map((bi) => ({
38
+ index: bi,
39
+ block: blockKey(ltKey, bi)[0],
40
+ }));
41
+ const blockIndices = allIndices.filter((bi) => blocksByKey.has(bi.block.toBase58()));
42
+ if (lt.executedTransactions.equals(PublicKey.default)) {
43
+ const executedTransactions = Keypair.generate();
44
+ const executedTransactionsSize = 1 + getBitmapLen(lt.maxDepth);
45
+ const executedTransactionsRent = await provider.connection.getMinimumBalanceForRentExemption(executedTransactionsSize);
37
46
  await lazyProgram.methods
38
- .reinitializeExecutedTransactionsV0()
47
+ .updateLazyTransactionsV0({
48
+ root: null,
49
+ authority: null,
50
+ })
51
+ .preInstructions([
52
+ SystemProgram.createAccount({
53
+ fromPubkey: provider.wallet.publicKey,
54
+ newAccountPubkey: executedTransactions.publicKey,
55
+ space: executedTransactionsSize,
56
+ lamports: executedTransactionsRent,
57
+ programId: lazyProgram.programId,
58
+ }),
59
+ ])
39
60
  .accounts({
40
61
  lazyTransactions: ltKey,
62
+ executedTransactions: executedTransactions.publicKey,
41
63
  })
64
+ .signers([executedTransactions])
42
65
  .rpc({ skipPreflight: true });
66
+ lt.executedTransactions = executedTransactions.publicKey;
67
+ }
68
+ // Do in chunks so we don't create too many promises
69
+ let instructions = [];
70
+ let i = 0;
71
+ for (const chunk of chunks(blockIndices, 10)) {
72
+ if (i % 1000 === 0) {
73
+ console.log(`Forming txns ${i * 10}/${blockIndices.length}`);
74
+ }
75
+ i++;
76
+ instructions.push(...(await Promise.all(chunk.map((bi) => lazyProgram.methods
77
+ .closeMarkerV0({
78
+ index: bi.index,
79
+ })
80
+ .accountsStrict({
81
+ refund: provider.wallet.publicKey,
82
+ lazyTransactions: ltKey,
83
+ authority: provider.wallet.publicKey,
84
+ block: bi.block,
85
+ executedTransactions: lt.executedTransactions,
86
+ })
87
+ .instruction()))));
43
88
  }
44
- const instructions = await Promise.all(blockIndices.map((bi) => lazyProgram.methods
45
- .closeMarkerV0({
46
- index: bi,
47
- })
48
- .accounts({
49
- refund: provider.wallet.publicKey,
50
- lazyTransactions: ltKey,
51
- authority: provider.wallet.publicKey,
52
- })
53
- .instruction()));
54
89
  console.log(`${blocks.length} blocks to close`);
55
- const txns = chunks(instructions, 10).map(chunk => {
90
+ const txns = chunks(instructions, 10).map((chunk) => {
56
91
  const tx = new Transaction({
57
92
  feePayer: provider.wallet.publicKey,
58
93
  });
@@ -1 +1 @@
1
- {"version":3,"file":"close-lazy-transaction-markers.js","sourceRoot":"","sources":["../../../src/close-lazy-transaction-markers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"close-lazy-transaction-markers.js","sourceRoot":"","sources":["../../../src/close-lazy-transaction-markers.ts"],"names":[],"mappings":"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"}
@@ -53,7 +53,7 @@ export async function run(args = process.argv) {
53
53
  epoch,
54
54
  })
55
55
  .preInstructions([
56
- ComputeBudgetProgram.setComputeUnitLimit({ units: 350000 }),
56
+ ComputeBudgetProgram.setComputeUnitLimit({ units: 500000 }),
57
57
  ])
58
58
  .accounts({
59
59
  subDao: subDao.publicKey,
@@ -0,0 +1,107 @@
1
+ import { EPOCH_LENGTH, init as initDao, subDaoEpochInfoKey, subDaoKey, } from "@helium/helium-sub-daos-sdk";
2
+ import * as anchor from "@coral-xyz/anchor";
3
+ import { Connection, } from "@solana/web3.js";
4
+ import { BN } from "bn.js";
5
+ import os from "os";
6
+ import yargs from "yargs/yargs";
7
+ import { IOT_MINT, MOBILE_MINT } from "@helium/spl-utils";
8
+ export async function run(args = process.argv) {
9
+ const yarg = yargs(args).options({
10
+ wallet: {
11
+ alias: "k",
12
+ describe: "Anchor wallet keypair",
13
+ default: `${os.homedir()}/.config/solana/id.json`,
14
+ },
15
+ url: {
16
+ alias: "u",
17
+ default: "http://127.0.0.1:8899",
18
+ describe: "The solana url",
19
+ },
20
+ });
21
+ const argv = await yarg.argv;
22
+ process.env.ANCHOR_WALLET = argv.wallet;
23
+ process.env.ANCHOR_PROVIDER_URL = argv.url;
24
+ anchor.setProvider(anchor.AnchorProvider.local(argv.url));
25
+ const epoch = 19624;
26
+ const provider = anchor.getProvider();
27
+ const heliumSubDaosProgram = await initDao(provider);
28
+ const connection = new Connection(provider.connection.rpcEndpoint, "confirmed");
29
+ const subDaoEpochInfos = [
30
+ subDaoEpochInfoKey(subDaoKey(IOT_MINT)[0], new BN(epoch).mul(new BN(EPOCH_LENGTH)))[0],
31
+ subDaoEpochInfoKey(subDaoKey(MOBILE_MINT)[0], new BN(epoch).mul(new BN(EPOCH_LENGTH)))[0],
32
+ ];
33
+ console.log(subDaoEpochInfos);
34
+ const coder = new anchor.BorshCoder(heliumSubDaosProgram.idl);
35
+ for (const subDaoEpochInfo of subDaoEpochInfos) {
36
+ const sigs = [];
37
+ let before = undefined;
38
+ while (true) {
39
+ const newSigs = await connection.getSignaturesForAddress(subDaoEpochInfo, {
40
+ limit: 1000,
41
+ before,
42
+ });
43
+ sigs.push(...newSigs);
44
+ if (newSigs.length < 1000) {
45
+ break;
46
+ }
47
+ before = newSigs[newSigs.length - 1].signature;
48
+ }
49
+ let foundIssue = false;
50
+ for (const sig of sigs) {
51
+ const tx = await connection.getTransaction(sig.signature);
52
+ if (tx?.meta?.err || !tx) {
53
+ continue;
54
+ }
55
+ // Should have been before this
56
+ if (tx.blockTime && tx.blockTime > 1695652196) {
57
+ continue;
58
+ }
59
+ for (const instruction of (tx?.transaction.message.instructions || []).filter((ix) => tx.transaction.message.accountKeys[ix.programIdIndex].equals(heliumSubDaosProgram.programId))) {
60
+ const accountMetas = instruction.accounts.map((idx) => ({
61
+ pubkey: tx.transaction.message.accountKeys[idx],
62
+ isSigner: tx.transaction.message.isAccountSigner(idx),
63
+ isWritable: tx.transaction.message.isAccountWritable(idx),
64
+ }));
65
+ const ix = coder.instruction.decode(instruction.data, "base58");
66
+ if (!ix) {
67
+ continue;
68
+ }
69
+ const formatted = coder.instruction.format(ix, accountMetas);
70
+ if (ix.name === "issueRewardsV0") {
71
+ foundIssue = true;
72
+ }
73
+ if (!foundIssue) {
74
+ continue;
75
+ }
76
+ if (ix.name !== "claimRewardsV0") {
77
+ continue;
78
+ }
79
+ // @ts-ignore
80
+ if (ix.data.args.epoch.eq(new anchor.BN())) {
81
+ continue;
82
+ }
83
+ const position = formatted?.accounts.find((a) => a.name === "Position")?.pubkey;
84
+ const subDao = formatted?.accounts.find((a) => a.name === "Sub Dao")?.pubkey;
85
+ if (!subDao || !position) {
86
+ throw new Error("Subdao or position missing");
87
+ }
88
+ const method = heliumSubDaosProgram.methods
89
+ .tempClaimFailedClaims()
90
+ .accounts({
91
+ authority: provider.wallet.publicKey,
92
+ position,
93
+ subDao,
94
+ subDaoEpochInfo,
95
+ });
96
+ const { block } = await method.pubkeys();
97
+ if (!(await connection.getAccountInfo(block))) {
98
+ console.log("Repairing", position.toBase58());
99
+ await method.rpc({
100
+ skipPreflight: true,
101
+ });
102
+ }
103
+ }
104
+ }
105
+ }
106
+ }
107
+ //# sourceMappingURL=temp-claim-failed-claims.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"temp-claim-failed-claims.js","sourceRoot":"","sources":["../../../src/temp-claim-failed-claims.ts"],"names":[],"mappings":"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"}
@@ -61,6 +61,7 @@ export async function run(args = process.argv) {
61
61
  lazyTransactions,
62
62
  authority: lazyTrAcc.authority,
63
63
  canopy: lazyTrAcc.canopy,
64
+ executedTransactions: lazyTrAcc.executedTransactions,
64
65
  })
65
66
  .instruction();
66
67
  await sendInstructionsOrSquads({
@@ -1 +1 @@
1
- {"version":3,"file":"update-lazy-transactions.js","sourceRoot":"","sources":["../../../src/update-lazy-transactions.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-lazy-transactions.js","sourceRoot":"","sources":["../../../src/update-lazy-transactions.ts"],"names":[],"mappings":"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"}
@@ -139,6 +139,7 @@ export async function run(args = process.argv) {
139
139
  .accounts({
140
140
  rewardableEntityConfig: rewardableConfigKey,
141
141
  authority: rewardableConfigAcc.authority,
142
+ payer: rewardableConfigAcc.authority,
142
143
  })
143
144
  .instruction(),
144
145
  ];