@helium/helium-admin-cli 0.10.2 → 0.10.4

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 (12) hide show
  1. package/lib/cjs/queue-wallet-claims.js +10 -2
  2. package/lib/cjs/queue-wallet-claims.js.map +1 -1
  3. package/lib/cjs/update-subdao-vehnt.js +27 -14
  4. package/lib/cjs/update-subdao-vehnt.js.map +1 -1
  5. package/lib/esm/src/queue-wallet-claims.js +10 -2
  6. package/lib/esm/src/queue-wallet-claims.js.map +1 -1
  7. package/lib/esm/src/update-subdao-vehnt.js +27 -14
  8. package/lib/esm/src/update-subdao-vehnt.js.map +1 -1
  9. package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
  10. package/lib/types/src/queue-wallet-claims.d.ts.map +1 -1
  11. package/lib/types/src/update-subdao-vehnt.d.ts.map +1 -1
  12. package/package.json +14 -14
package/lib/cjs/queue-wallet-claims.js CHANGED
@@ -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: provider.wallet.publicKey,
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
- provider.wallet.publicKey.toBuffer(),
103
+ walletToClaim.toBuffer(),
96
104
  ])[0],
97
105
  taskQueueAuthority: (0, tuktuk_sdk_1.taskQueueAuthorityKey)(taskQueue, queueAuthority)[0],
98
106
  })
package/lib/cjs/queue-wallet-claims.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"queue-wallet-claims.js","sourceRoot":"","sources":["../../src/queue-wallet-claims.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"queue-wallet-claims.js","sourceRoot":"","sources":["../../src/queue-wallet-claims.ts"],"names":[],"mappings":"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"}
package/lib/cjs/update-subdao-vehnt.js CHANGED
@@ -151,7 +151,7 @@ function run(args = process.argv) {
151
151
  CASE WHEN p.genesis_end > current_ts THEN cast(r.voting_mints[p.voting_mint_config_idx + 1]->>'genesisVotePowerMultiplier' as numeric) ELSE 1 END as genesis_multiplier,
152
152
  GREATEST(
153
153
  cast(
154
- p.end_ts -
154
+ p.end_ts -
155
155
  CASE WHEN lockup_kind = 'constant' THEN start_ts ELSE current_ts END
156
156
  as numeric
157
157
  ),
@@ -165,7 +165,7 @@ function run(args = process.argv) {
165
165
  cast(lockup->>'startTs' as numeric) as start_ts,
166
166
  -- 1683727980 as current_ts
167
167
  FLOOR(EXTRACT(EPOCH FROM CURRENT_TIMESTAMP)) as current_ts
168
- FROM positions
168
+ FROM positions
169
169
  ) p
170
170
  JOIN registrars r on p.registrar = r.address
171
171
  ),
@@ -181,9 +181,9 @@ function run(args = process.argv) {
181
181
  amount_deposited_native,
182
182
  ve_tokens,
183
183
  initial_ve_tokens,
184
- CASE WHEN lockup_kind = 'constant' THEN
184
+ CASE WHEN lockup_kind = 'constant' THEN
185
185
  0
186
- ELSE
186
+ ELSE
187
187
  CASE WHEN current_ts < genesis_end THEN
188
188
  -- genesis
189
189
  (ve_tokens - (
@@ -199,7 +199,7 @@ function run(args = process.argv) {
199
199
  ) / (genesis_end - current_ts)
200
200
  ELSE
201
201
  -- normal
202
- ve_tokens / (end_ts - current_ts)
202
+ ve_tokens / (end_ts - current_ts)
203
203
  END
204
204
  END as fall_rate,
205
205
  start_ts,
@@ -246,26 +246,39 @@ function run(args = process.argv) {
246
246
  FROM positions_with_vehnt p
247
247
  JOIN delegated_positions d on d.position = p.address
248
248
  JOIN sub_daos s on s.address = d.sub_dao
249
- -- Remove positions getting purged this epoch
250
- WHERE (lockup_kind = 'constant' or end_ts > (floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)) + 60 * 60 * 24)
249
+ -- Remove positions getting purged this epoch or expired this epoch
250
+ WHERE
251
+ (
252
+ lockup_kind = 'constant'
253
+ or end_ts > (
254
+ floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)
255
+ ) + 60 * 60 * 24
256
+ )
257
+ AND d.expiration_ts > (floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)) + 60 * 60 * 24
251
258
  GROUP BY s.dnt_mint, s.vehnt_fall_rate, s.vehnt_delegated, s.vehnt_last_calculated_ts, s.vehnt_last_calculated_ts
252
259
  )
253
- SELECT
254
- mint,
255
- current_ts,
256
- delegations,
260
+ SELECT
261
+ mint,
262
+ delegations,
263
+ current_ts,
257
264
  real_ve_tokens * 1000000000000 as real_ve_tokens,
258
265
  approx_ve_tokens * 1000000000000 as approx_ve_tokens,
259
266
  real_fall_rate * 1000000000000 as real_fall_rate,
260
267
  approx_fall_rate * 1000000000000 as approx_fall_rate,
261
- approx_fall_rate - real_fall_rate as fall_rate_diff,
262
- approx_ve_tokens - real_ve_tokens as ve_tokens_diff
263
- FROM subdao_delegations`)).rows;
268
+ approx_fall_rate - real_fall_rate as fall_rate_diff,
269
+ approx_ve_tokens - real_ve_tokens as ve_tokens_diff
270
+ FROM subdao_delegations;
271
+ `)).rows;
264
272
  const row = response.find((x) => x.mint == argv.dntMint);
265
273
  const instructions = [];
266
274
  const subDao = (0, helium_sub_daos_sdk_1.subDaoKey)(new web3_js_1.PublicKey(argv.dntMint))[0];
267
275
  const subDaoAcc = yield program.account.subDaoV0.fetch(subDao);
268
276
  console.log('Subdao', subDao.toBase58());
277
+ console.log("updating: ", {
278
+ vehntDelegated: new bn_js_1.BN(row.real_ve_tokens.split('.')[0]).toString(),
279
+ vehntLastCalculatedTs: new bn_js_1.BN(row.current_ts).toString(),
280
+ vehntFallRate: new bn_js_1.BN(row.real_fall_rate.split('.')[0]).toString(),
281
+ });
269
282
  instructions.push(yield program.methods
270
283
  .updateSubDaoVehntV0({
271
284
  vehntDelegated: new bn_js_1.BN(row.real_ve_tokens.split('.')[0]),
package/lib/cjs/update-subdao-vehnt.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-subdao-vehnt.js","sourceRoot":"","sources":["../../src/update-subdao-vehnt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-subdao-vehnt.js","sourceRoot":"","sources":["../../src/update-subdao-vehnt.ts"],"names":[],"mappings":"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"}
package/lib/esm/src/queue-wallet-claims.js CHANGED
@@ -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: provider.wallet.publicKey,
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
- provider.wallet.publicKey.toBuffer(),
64
+ walletToClaim.toBuffer(),
57
65
  ])[0],
58
66
  taskQueueAuthority: taskQueueAuthorityKey(taskQueue, queueAuthority)[0],
59
67
  })
package/lib/esm/src/queue-wallet-claims.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"queue-wallet-claims.js","sourceRoot":"","sources":["../../../src/queue-wallet-claims.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"queue-wallet-claims.js","sourceRoot":"","sources":["../../../src/queue-wallet-claims.ts"],"names":[],"mappings":"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"}
package/lib/esm/src/update-subdao-vehnt.js CHANGED
@@ -112,7 +112,7 @@ export async function run(args = process.argv) {
112
112
  CASE WHEN p.genesis_end > current_ts THEN cast(r.voting_mints[p.voting_mint_config_idx + 1]->>'genesisVotePowerMultiplier' as numeric) ELSE 1 END as genesis_multiplier,
113
113
  GREATEST(
114
114
  cast(
115
- p.end_ts -
115
+ p.end_ts -
116
116
  CASE WHEN lockup_kind = 'constant' THEN start_ts ELSE current_ts END
117
117
  as numeric
118
118
  ),
@@ -126,7 +126,7 @@ export async function run(args = process.argv) {
126
126
  cast(lockup->>'startTs' as numeric) as start_ts,
127
127
  -- 1683727980 as current_ts
128
128
  FLOOR(EXTRACT(EPOCH FROM CURRENT_TIMESTAMP)) as current_ts
129
- FROM positions
129
+ FROM positions
130
130
  ) p
131
131
  JOIN registrars r on p.registrar = r.address
132
132
  ),
@@ -142,9 +142,9 @@ export async function run(args = process.argv) {
142
142
  amount_deposited_native,
143
143
  ve_tokens,
144
144
  initial_ve_tokens,
145
- CASE WHEN lockup_kind = 'constant' THEN
145
+ CASE WHEN lockup_kind = 'constant' THEN
146
146
  0
147
- ELSE
147
+ ELSE
148
148
  CASE WHEN current_ts < genesis_end THEN
149
149
  -- genesis
150
150
  (ve_tokens - (
@@ -160,7 +160,7 @@ export async function run(args = process.argv) {
160
160
  ) / (genesis_end - current_ts)
161
161
  ELSE
162
162
  -- normal
163
- ve_tokens / (end_ts - current_ts)
163
+ ve_tokens / (end_ts - current_ts)
164
164
  END
165
165
  END as fall_rate,
166
166
  start_ts,
@@ -207,26 +207,39 @@ export async function run(args = process.argv) {
207
207
  FROM positions_with_vehnt p
208
208
  JOIN delegated_positions d on d.position = p.address
209
209
  JOIN sub_daos s on s.address = d.sub_dao
210
- -- Remove positions getting purged this epoch
211
- WHERE (lockup_kind = 'constant' or end_ts > (floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)) + 60 * 60 * 24)
210
+ -- Remove positions getting purged this epoch or expired this epoch
211
+ WHERE
212
+ (
213
+ lockup_kind = 'constant'
214
+ or end_ts > (
215
+ floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)
216
+ ) + 60 * 60 * 24
217
+ )
218
+ AND d.expiration_ts > (floor(current_ts / (60 * 60 * 24)) * (60 * 60 * 24)) + 60 * 60 * 24
212
219
  GROUP BY s.dnt_mint, s.vehnt_fall_rate, s.vehnt_delegated, s.vehnt_last_calculated_ts, s.vehnt_last_calculated_ts
213
220
  )
214
- SELECT
215
- mint,
216
- current_ts,
217
- delegations,
221
+ SELECT
222
+ mint,
223
+ delegations,
224
+ current_ts,
218
225
  real_ve_tokens * 1000000000000 as real_ve_tokens,
219
226
  approx_ve_tokens * 1000000000000 as approx_ve_tokens,
220
227
  real_fall_rate * 1000000000000 as real_fall_rate,
221
228
  approx_fall_rate * 1000000000000 as approx_fall_rate,
222
- approx_fall_rate - real_fall_rate as fall_rate_diff,
223
- approx_ve_tokens - real_ve_tokens as ve_tokens_diff
224
- FROM subdao_delegations`)).rows;
229
+ approx_fall_rate - real_fall_rate as fall_rate_diff,
230
+ approx_ve_tokens - real_ve_tokens as ve_tokens_diff
231
+ FROM subdao_delegations;
232
+ `)).rows;
225
233
  const row = response.find((x) => x.mint == argv.dntMint);
226
234
  const instructions = [];
227
235
  const subDao = subDaoKey(new PublicKey(argv.dntMint))[0];
228
236
  const subDaoAcc = await program.account.subDaoV0.fetch(subDao);
229
237
  console.log('Subdao', subDao.toBase58());
238
+ console.log("updating: ", {
239
+ vehntDelegated: new BN(row.real_ve_tokens.split('.')[0]).toString(),
240
+ vehntLastCalculatedTs: new BN(row.current_ts).toString(),
241
+ vehntFallRate: new BN(row.real_fall_rate.split('.')[0]).toString(),
242
+ });
230
243
  instructions.push(await program.methods
231
244
  .updateSubDaoVehntV0({
232
245
  vehntDelegated: new BN(row.real_ve_tokens.split('.')[0]),
package/lib/esm/src/update-subdao-vehnt.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"update-subdao-vehnt.js","sourceRoot":"","sources":["../../../src/update-subdao-vehnt.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"update-subdao-vehnt.js","sourceRoot":"","sources":["../../../src/update-subdao-vehnt.ts"],"names":[],"mappings":"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"}