@helium/helium-admin-cli 0.11.5 → 0.11.6

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 (271) hide show
  1. package/lib/cjs/add-squads-proposer.js +107 -0
  2. package/lib/cjs/add-squads-proposer.js.map +1 -0
  3. package/lib/cjs/approve-carrier.js +1 -16
  4. package/lib/cjs/approve-carrier.js.map +1 -1
  5. package/lib/cjs/approve-maker.js +1 -16
  6. package/lib/cjs/approve-maker.js.map +1 -1
  7. package/lib/cjs/approve-program.js +1 -16
  8. package/lib/cjs/approve-program.js.map +1 -1
  9. package/lib/cjs/close-buffers.js +10 -20
  10. package/lib/cjs/close-buffers.js.map +1 -1
  11. package/lib/cjs/close-canopy.js +1 -16
  12. package/lib/cjs/close-canopy.js.map +1 -1
  13. package/lib/cjs/close-legacy-auto-topoff.js +124 -0
  14. package/lib/cjs/close-legacy-auto-topoff.js.map +1 -0
  15. package/lib/cjs/create-and-approve-makers.js +11 -21
  16. package/lib/cjs/create-and-approve-makers.js.map +1 -1
  17. package/lib/cjs/create-boost-config.js +1 -13
  18. package/lib/cjs/create-boost-config.js.map +1 -1
  19. package/lib/cjs/create-common-lut.js +10 -17
  20. package/lib/cjs/create-common-lut.js.map +1 -1
  21. package/lib/cjs/create-dao.js +12 -22
  22. package/lib/cjs/create-dao.js.map +1 -1
  23. package/lib/cjs/create-data-only-config.js +10 -17
  24. package/lib/cjs/create-data-only-config.js.map +1 -1
  25. package/lib/cjs/create-price-oracle.js +8 -7
  26. package/lib/cjs/create-price-oracle.js.map +1 -1
  27. package/lib/cjs/create-subdao.js +14 -22
  28. package/lib/cjs/create-subdao.js.map +1 -1
  29. package/lib/cjs/create-tuktuk-dca-lut.js +128 -0
  30. package/lib/cjs/create-tuktuk-dca-lut.js.map +1 -0
  31. package/lib/cjs/execute-vault-transaction.js +91 -0
  32. package/lib/cjs/execute-vault-transaction.js.map +1 -0
  33. package/lib/cjs/extend-common-lut.js +10 -16
  34. package/lib/cjs/extend-common-lut.js.map +1 -1
  35. package/lib/cjs/initialize-tuktuk-dca.js +237 -0
  36. package/lib/cjs/initialize-tuktuk-dca.js.map +1 -0
  37. package/lib/cjs/issue-iot-operations-fund.js +1 -16
  38. package/lib/cjs/issue-iot-operations-fund.js.map +1 -1
  39. package/lib/cjs/reset-vsr-voting-mint.js +1 -16
  40. package/lib/cjs/reset-vsr-voting-mint.js.map +1 -1
  41. package/lib/cjs/revoke-maker.js +1 -16
  42. package/lib/cjs/revoke-maker.js.map +1 -1
  43. package/lib/cjs/set-dc-onboarding-fees-paid-epoch-info.js +1 -16
  44. package/lib/cjs/set-dc-onboarding-fees-paid-epoch-info.js.map +1 -1
  45. package/lib/cjs/set-dc-onboarding-fees-paid.js +1 -16
  46. package/lib/cjs/set-dc-onboarding-fees-paid.js.map +1 -1
  47. package/lib/cjs/set-proxy-config.js +10 -17
  48. package/lib/cjs/set-proxy-config.js.map +1 -1
  49. package/lib/cjs/setup-dc-auto-topoff.js +183 -38
  50. package/lib/cjs/setup-dc-auto-topoff.js.map +1 -1
  51. package/lib/cjs/setup-hst.js +8 -7
  52. package/lib/cjs/setup-hst.js.map +1 -1
  53. package/lib/cjs/squads-batch-optimizer.js +156 -0
  54. package/lib/cjs/squads-batch-optimizer.js.map +1 -0
  55. package/lib/cjs/swap-carrier-stake.js +1 -16
  56. package/lib/cjs/swap-carrier-stake.js.map +1 -1
  57. package/lib/cjs/swap-maker-stake.js +1 -16
  58. package/lib/cjs/swap-maker-stake.js.map +1 -1
  59. package/lib/cjs/switch-mobile-ops-fund.js +1 -13
  60. package/lib/cjs/switch-mobile-ops-fund.js.map +1 -1
  61. package/lib/cjs/transfer-program-authorities.js +98 -0
  62. package/lib/cjs/transfer-program-authorities.js.map +1 -0
  63. package/lib/cjs/update-account-circuit-breaker.js +1 -16
  64. package/lib/cjs/update-account-circuit-breaker.js.map +1 -1
  65. package/lib/cjs/update-boost-config.js +1 -16
  66. package/lib/cjs/update-boost-config.js.map +1 -1
  67. package/lib/cjs/update-carrier.js +1 -16
  68. package/lib/cjs/update-carrier.js.map +1 -1
  69. package/lib/cjs/update-dao.js +1 -16
  70. package/lib/cjs/update-dao.js.map +1 -1
  71. package/lib/cjs/update-data-credits.js +1 -16
  72. package/lib/cjs/update-data-credits.js.map +1 -1
  73. package/lib/cjs/update-delegated-dc-subdao.js +1 -16
  74. package/lib/cjs/update-delegated-dc-subdao.js.map +1 -1
  75. package/lib/cjs/update-lazy-distributor.js +1 -16
  76. package/lib/cjs/update-lazy-distributor.js.map +1 -1
  77. package/lib/cjs/update-lazy-transactions.js +1 -16
  78. package/lib/cjs/update-lazy-transactions.js.map +1 -1
  79. package/lib/cjs/update-maker.js +1 -16
  80. package/lib/cjs/update-maker.js.map +1 -1
  81. package/lib/cjs/update-mint-circuit-breaker.js +1 -16
  82. package/lib/cjs/update-mint-circuit-breaker.js.map +1 -1
  83. package/lib/cjs/update-organization.js +101 -0
  84. package/lib/cjs/update-organization.js.map +1 -0
  85. package/lib/cjs/update-price-oracle.js +1 -16
  86. package/lib/cjs/update-price-oracle.js.map +1 -1
  87. package/lib/cjs/update-proxy-config.js +1 -16
  88. package/lib/cjs/update-proxy-config.js.map +1 -1
  89. package/lib/cjs/update-registrar-authorities.js +6 -8
  90. package/lib/cjs/update-registrar-authorities.js.map +1 -1
  91. package/lib/cjs/update-rewardable-entity-config.js +5 -17
  92. package/lib/cjs/update-rewardable-entity-config.js.map +1 -1
  93. package/lib/cjs/update-subdao-vehnt.js +1 -16
  94. package/lib/cjs/update-subdao-vehnt.js.map +1 -1
  95. package/lib/cjs/update-subdao.js +2 -42
  96. package/lib/cjs/update-subdao.js.map +1 -1
  97. package/lib/cjs/update-token-metadata.js +17 -24
  98. package/lib/cjs/update-token-metadata.js.map +1 -1
  99. package/lib/cjs/upgrade-idl.js +10 -20
  100. package/lib/cjs/upgrade-idl.js.map +1 -1
  101. package/lib/cjs/upsert-incentive-program.js +1 -8
  102. package/lib/cjs/upsert-incentive-program.js.map +1 -1
  103. package/lib/cjs/utils.js +140 -2
  104. package/lib/cjs/utils.js.map +1 -1
  105. package/lib/esm/src/add-squads-proposer.js +66 -0
  106. package/lib/esm/src/add-squads-proposer.js.map +1 -0
  107. package/lib/esm/src/approve-carrier.js +2 -17
  108. package/lib/esm/src/approve-carrier.js.map +1 -1
  109. package/lib/esm/src/approve-maker.js +2 -17
  110. package/lib/esm/src/approve-maker.js.map +1 -1
  111. package/lib/esm/src/approve-program.js +2 -17
  112. package/lib/esm/src/approve-program.js.map +1 -1
  113. package/lib/esm/src/close-buffers.js +11 -21
  114. package/lib/esm/src/close-buffers.js.map +1 -1
  115. package/lib/esm/src/close-canopy.js +2 -17
  116. package/lib/esm/src/close-canopy.js.map +1 -1
  117. package/lib/esm/src/close-legacy-auto-topoff.js +83 -0
  118. package/lib/esm/src/close-legacy-auto-topoff.js.map +1 -0
  119. package/lib/esm/src/create-and-approve-makers.js +12 -22
  120. package/lib/esm/src/create-and-approve-makers.js.map +1 -1
  121. package/lib/esm/src/create-boost-config.js +2 -14
  122. package/lib/esm/src/create-boost-config.js.map +1 -1
  123. package/lib/esm/src/create-common-lut.js +11 -18
  124. package/lib/esm/src/create-common-lut.js.map +1 -1
  125. package/lib/esm/src/create-dao.js +13 -23
  126. package/lib/esm/src/create-dao.js.map +1 -1
  127. package/lib/esm/src/create-data-only-config.js +11 -18
  128. package/lib/esm/src/create-data-only-config.js.map +1 -1
  129. package/lib/esm/src/create-price-oracle.js +8 -7
  130. package/lib/esm/src/create-price-oracle.js.map +1 -1
  131. package/lib/esm/src/create-subdao.js +15 -23
  132. package/lib/esm/src/create-subdao.js.map +1 -1
  133. package/lib/esm/src/create-tuktuk-dca-lut.js +87 -0
  134. package/lib/esm/src/create-tuktuk-dca-lut.js.map +1 -0
  135. package/lib/esm/src/execute-vault-transaction.js +50 -0
  136. package/lib/esm/src/execute-vault-transaction.js.map +1 -0
  137. package/lib/esm/src/extend-common-lut.js +11 -17
  138. package/lib/esm/src/extend-common-lut.js.map +1 -1
  139. package/lib/esm/src/initialize-tuktuk-dca.js +196 -0
  140. package/lib/esm/src/initialize-tuktuk-dca.js.map +1 -0
  141. package/lib/esm/src/issue-iot-operations-fund.js +2 -17
  142. package/lib/esm/src/issue-iot-operations-fund.js.map +1 -1
  143. package/lib/esm/src/reset-vsr-voting-mint.js +2 -17
  144. package/lib/esm/src/reset-vsr-voting-mint.js.map +1 -1
  145. package/lib/esm/src/revoke-maker.js +2 -17
  146. package/lib/esm/src/revoke-maker.js.map +1 -1
  147. package/lib/esm/src/set-dc-onboarding-fees-paid-epoch-info.js +2 -17
  148. package/lib/esm/src/set-dc-onboarding-fees-paid-epoch-info.js.map +1 -1
  149. package/lib/esm/src/set-dc-onboarding-fees-paid.js +2 -17
  150. package/lib/esm/src/set-dc-onboarding-fees-paid.js.map +1 -1
  151. package/lib/esm/src/set-proxy-config.js +11 -18
  152. package/lib/esm/src/set-proxy-config.js.map +1 -1
  153. package/lib/esm/src/setup-dc-auto-topoff.js +185 -41
  154. package/lib/esm/src/setup-dc-auto-topoff.js.map +1 -1
  155. package/lib/esm/src/setup-hst.js +8 -7
  156. package/lib/esm/src/setup-hst.js.map +1 -1
  157. package/lib/esm/src/squads-batch-optimizer.js +128 -0
  158. package/lib/esm/src/squads-batch-optimizer.js.map +1 -0
  159. package/lib/esm/src/swap-carrier-stake.js +2 -17
  160. package/lib/esm/src/swap-carrier-stake.js.map +1 -1
  161. package/lib/esm/src/swap-maker-stake.js +2 -17
  162. package/lib/esm/src/swap-maker-stake.js.map +1 -1
  163. package/lib/esm/src/switch-mobile-ops-fund.js +2 -14
  164. package/lib/esm/src/switch-mobile-ops-fund.js.map +1 -1
  165. package/lib/esm/src/transfer-program-authorities.js +57 -0
  166. package/lib/esm/src/transfer-program-authorities.js.map +1 -0
  167. package/lib/esm/src/update-account-circuit-breaker.js +2 -17
  168. package/lib/esm/src/update-account-circuit-breaker.js.map +1 -1
  169. package/lib/esm/src/update-boost-config.js +2 -17
  170. package/lib/esm/src/update-boost-config.js.map +1 -1
  171. package/lib/esm/src/update-carrier.js +2 -17
  172. package/lib/esm/src/update-carrier.js.map +1 -1
  173. package/lib/esm/src/update-dao.js +2 -17
  174. package/lib/esm/src/update-dao.js.map +1 -1
  175. package/lib/esm/src/update-data-credits.js +2 -17
  176. package/lib/esm/src/update-data-credits.js.map +1 -1
  177. package/lib/esm/src/update-delegated-dc-subdao.js +2 -17
  178. package/lib/esm/src/update-delegated-dc-subdao.js.map +1 -1
  179. package/lib/esm/src/update-lazy-distributor.js +2 -17
  180. package/lib/esm/src/update-lazy-distributor.js.map +1 -1
  181. package/lib/esm/src/update-lazy-transactions.js +2 -17
  182. package/lib/esm/src/update-lazy-transactions.js.map +1 -1
  183. package/lib/esm/src/update-maker.js +2 -17
  184. package/lib/esm/src/update-maker.js.map +1 -1
  185. package/lib/esm/src/update-mint-circuit-breaker.js +2 -17
  186. package/lib/esm/src/update-mint-circuit-breaker.js.map +1 -1
  187. package/lib/esm/src/update-organization.js +60 -0
  188. package/lib/esm/src/update-organization.js.map +1 -0
  189. package/lib/esm/src/update-price-oracle.js +2 -17
  190. package/lib/esm/src/update-price-oracle.js.map +1 -1
  191. package/lib/esm/src/update-proxy-config.js +2 -17
  192. package/lib/esm/src/update-proxy-config.js.map +1 -1
  193. package/lib/esm/src/update-registrar-authorities.js +7 -9
  194. package/lib/esm/src/update-registrar-authorities.js.map +1 -1
  195. package/lib/esm/src/update-rewardable-entity-config.js +6 -18
  196. package/lib/esm/src/update-rewardable-entity-config.js.map +1 -1
  197. package/lib/esm/src/update-subdao-vehnt.js +2 -17
  198. package/lib/esm/src/update-subdao-vehnt.js.map +1 -1
  199. package/lib/esm/src/update-subdao.js +4 -44
  200. package/lib/esm/src/update-subdao.js.map +1 -1
  201. package/lib/esm/src/update-token-metadata.js +18 -25
  202. package/lib/esm/src/update-token-metadata.js.map +1 -1
  203. package/lib/esm/src/upgrade-idl.js +11 -21
  204. package/lib/esm/src/upgrade-idl.js.map +1 -1
  205. package/lib/esm/src/upsert-incentive-program.js +2 -9
  206. package/lib/esm/src/upsert-incentive-program.js.map +1 -1
  207. package/lib/esm/src/utils.js +131 -2
  208. package/lib/esm/src/utils.js.map +1 -1
  209. package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
  210. package/lib/types/src/add-squads-proposer.d.ts +2 -0
  211. package/lib/types/src/add-squads-proposer.d.ts.map +1 -0
  212. package/lib/types/src/approve-carrier.d.ts.map +1 -1
  213. package/lib/types/src/approve-maker.d.ts.map +1 -1
  214. package/lib/types/src/approve-program.d.ts.map +1 -1
  215. package/lib/types/src/close-buffers.d.ts.map +1 -1
  216. package/lib/types/src/close-canopy.d.ts.map +1 -1
  217. package/lib/types/src/close-legacy-auto-topoff.d.ts +2 -0
  218. package/lib/types/src/close-legacy-auto-topoff.d.ts.map +1 -0
  219. package/lib/types/src/create-and-approve-makers.d.ts.map +1 -1
  220. package/lib/types/src/create-boost-config.d.ts.map +1 -1
  221. package/lib/types/src/create-common-lut.d.ts.map +1 -1
  222. package/lib/types/src/create-dao.d.ts.map +1 -1
  223. package/lib/types/src/create-data-only-config.d.ts.map +1 -1
  224. package/lib/types/src/create-price-oracle.d.ts.map +1 -1
  225. package/lib/types/src/create-subdao.d.ts.map +1 -1
  226. package/lib/types/src/create-tuktuk-dca-lut.d.ts +2 -0
  227. package/lib/types/src/create-tuktuk-dca-lut.d.ts.map +1 -0
  228. package/lib/types/src/execute-vault-transaction.d.ts +2 -0
  229. package/lib/types/src/execute-vault-transaction.d.ts.map +1 -0
  230. package/lib/types/src/extend-common-lut.d.ts.map +1 -1
  231. package/lib/types/src/initialize-tuktuk-dca.d.ts +2 -0
  232. package/lib/types/src/initialize-tuktuk-dca.d.ts.map +1 -0
  233. package/lib/types/src/issue-iot-operations-fund.d.ts.map +1 -1
  234. package/lib/types/src/reset-vsr-voting-mint.d.ts.map +1 -1
  235. package/lib/types/src/revoke-maker.d.ts.map +1 -1
  236. package/lib/types/src/set-dc-onboarding-fees-paid-epoch-info.d.ts.map +1 -1
  237. package/lib/types/src/set-dc-onboarding-fees-paid.d.ts.map +1 -1
  238. package/lib/types/src/set-proxy-config.d.ts.map +1 -1
  239. package/lib/types/src/setup-dc-auto-topoff.d.ts.map +1 -1
  240. package/lib/types/src/setup-hst.d.ts.map +1 -1
  241. package/lib/types/src/squads-batch-optimizer.d.ts +23 -0
  242. package/lib/types/src/squads-batch-optimizer.d.ts.map +1 -0
  243. package/lib/types/src/swap-carrier-stake.d.ts.map +1 -1
  244. package/lib/types/src/swap-maker-stake.d.ts.map +1 -1
  245. package/lib/types/src/switch-mobile-ops-fund.d.ts.map +1 -1
  246. package/lib/types/src/transfer-program-authorities.d.ts +2 -0
  247. package/lib/types/src/transfer-program-authorities.d.ts.map +1 -0
  248. package/lib/types/src/update-account-circuit-breaker.d.ts.map +1 -1
  249. package/lib/types/src/update-boost-config.d.ts.map +1 -1
  250. package/lib/types/src/update-carrier.d.ts.map +1 -1
  251. package/lib/types/src/update-dao.d.ts.map +1 -1
  252. package/lib/types/src/update-data-credits.d.ts.map +1 -1
  253. package/lib/types/src/update-delegated-dc-subdao.d.ts.map +1 -1
  254. package/lib/types/src/update-lazy-distributor.d.ts.map +1 -1
  255. package/lib/types/src/update-lazy-transactions.d.ts.map +1 -1
  256. package/lib/types/src/update-maker.d.ts.map +1 -1
  257. package/lib/types/src/update-mint-circuit-breaker.d.ts.map +1 -1
  258. package/lib/types/src/update-organization.d.ts +2 -0
  259. package/lib/types/src/update-organization.d.ts.map +1 -0
  260. package/lib/types/src/update-price-oracle.d.ts.map +1 -1
  261. package/lib/types/src/update-proxy-config.d.ts.map +1 -1
  262. package/lib/types/src/update-registrar-authorities.d.ts.map +1 -1
  263. package/lib/types/src/update-rewardable-entity-config.d.ts.map +1 -1
  264. package/lib/types/src/update-subdao-vehnt.d.ts.map +1 -1
  265. package/lib/types/src/update-subdao.d.ts.map +1 -1
  266. package/lib/types/src/update-token-metadata.d.ts.map +1 -1
  267. package/lib/types/src/upgrade-idl.d.ts.map +1 -1
  268. package/lib/types/src/upsert-incentive-program.d.ts.map +1 -1
  269. package/lib/types/src/utils.d.ts +11 -0
  270. package/lib/types/src/utils.d.ts.map +1 -1
  271. package/package.json +16 -15
@@ -0,0 +1,50 @@
1
+ import * as anchor from "@coral-xyz/anchor";
2
+ import { sendInstructionsWithPriorityFee } from "@helium/spl-utils";
3
+ import { PublicKey } from "@solana/web3.js";
4
+ import * as multisig from "@sqds/multisig";
5
+ import os from "os";
6
+ import yargs from "yargs/yargs";
7
+ export async function run(args = process.argv) {
8
+ const yarg = yargs(args).options({
9
+ wallet: {
10
+ alias: "k",
11
+ describe: "Anchor wallet keypair",
12
+ default: `${os.homedir()}/.config/solana/id.json`,
13
+ },
14
+ url: {
15
+ alias: "u",
16
+ default: "http://127.0.0.1:8899",
17
+ describe: "The solana url",
18
+ },
19
+ multisig: {
20
+ type: "string",
21
+ describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
22
+ required: true,
23
+ },
24
+ transactionIndex: {
25
+ type: "number",
26
+ describe: "Transaction index to execute",
27
+ required: true,
28
+ },
29
+ batchIndex: {
30
+ type: "number",
31
+ describe: "Batch index to execute",
32
+ required: true,
33
+ },
34
+ });
35
+ const argv = await yarg.argv;
36
+ process.env.ANCHOR_WALLET = argv.wallet;
37
+ process.env.ANCHOR_PROVIDER_URL = argv.url;
38
+ anchor.setProvider(anchor.AnchorProvider.local(argv.url));
39
+ const provider = anchor.getProvider();
40
+ const connection = provider.connection;
41
+ const ix = await multisig.instructions.batchExecuteTransaction({
42
+ multisigPda: new PublicKey(argv.multisig),
43
+ transactionIndex: argv.transactionIndex,
44
+ batchIndex: BigInt(argv.batchIndex),
45
+ member: provider.wallet.publicKey,
46
+ connection,
47
+ });
48
+ await sendInstructionsWithPriorityFee(provider, [ix.instruction]);
49
+ }
50
+ //# sourceMappingURL=execute-vault-transaction.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"execute-vault-transaction.js","sourceRoot":"","sources":["../../../src/execute-vault-transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,+BAA+B,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAEhC,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,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,oGAAoG;YACtG,QAAQ,EAAE,IAAI;SACf;QACD,gBAAgB,EAAE;YAChB,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,8BAA8B;YACxC,QAAQ,EAAE,IAAI;SACf;QACD,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,wBAAwB;YAClC,QAAQ,EAAE,IAAI;SACf;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,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;IAEvC,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,uBAAuB,CAAC;QAC7D,WAAW,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAS,CAAC;QAC1C,gBAAgB,EAAE,IAAI,CAAC,gBAAiB;QACxC,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,UAAW,CAAC;QACpC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;QACjC,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,+BAA+B,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;AACpE,CAAC"}
@@ -1,10 +1,10 @@
1
1
  import * as anchor from "@coral-xyz/anchor";
2
2
  import { HELIUM_COMMON_LUT, chunks, truthy, withPriorityFees, } from "@helium/spl-utils";
3
3
  import { AddressLookupTableProgram, PublicKey, } from "@solana/web3.js";
4
- import Squads from "@sqds/sdk";
4
+ import * as multisig from '@sqds/multisig';
5
5
  import os from "os";
6
6
  import yargs from "yargs/yargs";
7
- import { loadKeypair, sendInstructionsOrSquads } from "./utils";
7
+ import { loadKeypair, sendInstructionsOrSquadsV4 } from "./utils";
8
8
  export async function run(args = process.argv) {
9
9
  const yarg = yargs(args).options({
10
10
  wallet: {
@@ -21,11 +21,6 @@ export async function run(args = process.argv) {
21
21
  type: "string",
22
22
  describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
23
23
  },
24
- authorityIndex: {
25
- type: "number",
26
- describe: "Authority index for squads. Defaults to 1",
27
- default: 1,
28
- },
29
24
  lookupTable: {
30
25
  type: "string",
31
26
  describe: "Address of the address lookup table",
@@ -38,13 +33,14 @@ export async function run(args = process.argv) {
38
33
  anchor.setProvider(anchor.AnchorProvider.local(argv.url));
39
34
  const provider = anchor.getProvider();
40
35
  const wallet = new anchor.Wallet(loadKeypair(argv.wallet));
41
- const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
42
- commitmentOrConfig: "finalized",
43
- });
44
36
  let authority = provider.wallet.publicKey;
45
- let multisig = argv.multisig ? new PublicKey(argv.multisig) : null;
46
- if (multisig) {
47
- authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
37
+ let multisigPda = argv.multisig ? new PublicKey(argv.multisig) : null;
38
+ if (multisigPda) {
39
+ const [vaultPda] = multisig.getVaultPda({
40
+ multisigPda,
41
+ index: 0,
42
+ });
43
+ authority = vaultPda;
48
44
  }
49
45
  const accounts = [
50
46
  // HNT lazy distributor
@@ -62,12 +58,10 @@ export async function run(args = process.argv) {
62
58
  });
63
59
  const lookupTableAddress = new PublicKey(argv.lookupTable);
64
60
  for (const addresses of chunks(accounts, 20)) {
65
- await sendInstructionsOrSquads({
61
+ await sendInstructionsOrSquadsV4({
66
62
  provider,
67
63
  signers: [],
68
- squads,
69
- multisig: multisig,
70
- authorityIndex: argv.authorityIndex,
64
+ multisig: multisigPda,
71
65
  instructions: await withPriorityFees({
72
66
  connection: provider.connection,
73
67
  computeUnits: 200000,
@@ -1 +1 @@
1
- {"version":3,"file":"extend-common-lut.js","sourceRoot":"","sources":["../../../src/extend-common-lut.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"extend-common-lut.js","sourceRoot":"","sources":["../../../src/extend-common-lut.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,196 @@
1
+ import * as anchor from "@coral-xyz/anchor";
2
+ import { dcaKey, init as initTuktukDca, queueAuthorityKey } from "@helium/tuktuk-dca-sdk";
3
+ import { init as initTuktuk, nextAvailableTaskIds, taskKey, taskQueueAuthorityKey } from "@helium/tuktuk-sdk";
4
+ import { getAssociatedTokenAddressSync } from "@solana/spl-token";
5
+ import { PublicKey, SystemProgram } from "@solana/web3.js";
6
+ import os from "os";
7
+ import yargs from "yargs/yargs";
8
+ import { loadKeypair, sendInstructionsOrSquadsV4 } from "./utils";
9
+ const TASK_QUEUE_ID = new PublicKey("HMBp68hMkHAr574nmckmS93p2RSZL5N4NMavhmFApwjF");
10
+ export async function run(args = process.argv) {
11
+ const yarg = yargs(args).options({
12
+ wallet: {
13
+ alias: "k",
14
+ describe: "Anchor wallet keypair",
15
+ default: `${os.homedir()}/.config/solana/id.json`,
16
+ },
17
+ url: {
18
+ alias: "u",
19
+ default: "http://127.0.0.1:8899",
20
+ describe: "The solana url",
21
+ },
22
+ inputMint: {
23
+ type: "string",
24
+ describe: "Pubkey of the input token mint",
25
+ required: true,
26
+ },
27
+ outputMint: {
28
+ type: "string",
29
+ describe: "Pubkey of the output token mint",
30
+ required: true,
31
+ },
32
+ destinationWallet: {
33
+ type: "string",
34
+ describe: "Pubkey of the destination wallet",
35
+ required: true,
36
+ },
37
+ numOrders: {
38
+ type: "number",
39
+ describe: "Number of DCA orders",
40
+ required: true,
41
+ },
42
+ swapAmountPerOrder: {
43
+ type: "number",
44
+ describe: "Amount to swap per order (in token units)",
45
+ required: true,
46
+ },
47
+ intervalSeconds: {
48
+ type: "number",
49
+ describe: "Interval between orders in seconds",
50
+ required: true,
51
+ },
52
+ slippageBps: {
53
+ type: "number",
54
+ describe: "Slippage tolerance in basis points (e.g., 50 for 0.5%)",
55
+ default: 50,
56
+ },
57
+ inputPriceOracle: {
58
+ type: "string",
59
+ describe: "Pubkey of the input price oracle",
60
+ required: true,
61
+ },
62
+ outputPriceOracle: {
63
+ type: "string",
64
+ describe: "Pubkey of the output price oracle",
65
+ required: true,
66
+ },
67
+ dcaSigner: {
68
+ type: "string",
69
+ describe: "Pubkey of the DCA signer",
70
+ required: true,
71
+ },
72
+ dcaUrl: {
73
+ type: "string",
74
+ describe: "URL of the DCA service",
75
+ required: true,
76
+ },
77
+ crankReward: {
78
+ type: "number",
79
+ describe: "Crank reward in lamports",
80
+ default: 20000,
81
+ },
82
+ multisig: {
83
+ type: 'string',
84
+ describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
85
+ },
86
+ initialLamports: {
87
+ type: "number",
88
+ describe: "Initial lamports to send to the DCA account for rent",
89
+ default: 10000000,
90
+ },
91
+ });
92
+ const argv = await yarg.argv;
93
+ process.env.ANCHOR_WALLET = argv.wallet;
94
+ process.env.ANCHOR_PROVIDER_URL = argv.url;
95
+ anchor.setProvider(anchor.AnchorProvider.local(argv.url));
96
+ const provider = anchor.getProvider();
97
+ const tuktukDcaProgram = await initTuktukDca(provider);
98
+ const tuktukProgram = await initTuktuk(provider);
99
+ const wallet = new anchor.Wallet(loadKeypair(argv.wallet));
100
+ let authority = provider.wallet.publicKey;
101
+ let multisigPda = argv.multisig ? new PublicKey(argv.multisig) : null;
102
+ if (multisigPda) {
103
+ const { getVaultPda } = await import('@sqds/multisig');
104
+ const [vaultPda] = getVaultPda({
105
+ multisigPda,
106
+ index: 0,
107
+ });
108
+ authority = vaultPda;
109
+ }
110
+ const inputMint = new PublicKey(argv.inputMint);
111
+ const outputMint = new PublicKey(argv.outputMint);
112
+ const destinationWallet = new PublicKey(argv.destinationWallet);
113
+ const inputPriceOracle = new PublicKey(argv.inputPriceOracle);
114
+ const outputPriceOracle = new PublicKey(argv.outputPriceOracle);
115
+ const dcaSigner = new PublicKey(argv.dcaSigner);
116
+ // Get destination token account
117
+ const destinationTokenAccount = getAssociatedTokenAddressSync(outputMint, destinationWallet, true);
118
+ // Get task queue and find available task IDs
119
+ const taskQueue = await tuktukProgram.account.taskQueueV0.fetch(TASK_QUEUE_ID);
120
+ const [nextTask] = nextAvailableTaskIds(taskQueue.taskBitmap, 1);
121
+ const instructions = [];
122
+ const dcaPda = dcaKey(authority, inputMint, outputMint, 0)[0];
123
+ const dcaPdaExists = await tuktukDcaProgram.account.dcaV0.fetchNullable(dcaPda);
124
+ if (dcaPdaExists) {
125
+ console.log(`DCA already initialized at: ${dcaPda.toBase58()}, closing it...`);
126
+ const { instruction: closeDcaIx } = await tuktukDcaProgram.methods
127
+ .closeDcaV0()
128
+ .accounts({ dca: dcaPda })
129
+ .prepare();
130
+ await sendInstructionsOrSquadsV4({
131
+ provider,
132
+ instructions: [closeDcaIx],
133
+ multisig: multisigPda,
134
+ signers: [],
135
+ });
136
+ }
137
+ // Initialize DCA
138
+ const { instruction: initDcaIx, pubkeys: { core } } = await tuktukDcaProgram.methods
139
+ .initializeDcaV0({
140
+ index: 0,
141
+ numOrders: argv.numOrders,
142
+ swapAmountPerOrder: new anchor.BN(argv.swapAmountPerOrder),
143
+ intervalSeconds: new anchor.BN(argv.intervalSeconds),
144
+ slippageBpsFromOracle: argv.slippageBps,
145
+ taskId: nextTask,
146
+ dcaSigner,
147
+ dcaUrl: argv.dcaUrl,
148
+ crankReward: new anchor.BN(argv.crankReward),
149
+ })
150
+ .accountsPartial({
151
+ core: {
152
+ rentPayer: authority,
153
+ dcaPayer: authority,
154
+ authority,
155
+ inputMint,
156
+ outputMint,
157
+ destinationTokenAccount,
158
+ inputPriceOracle,
159
+ outputPriceOracle,
160
+ taskQueue: TASK_QUEUE_ID,
161
+ },
162
+ queueAuthority: queueAuthorityKey()[0],
163
+ taskQueueAuthority: taskQueueAuthorityKey(TASK_QUEUE_ID, queueAuthorityKey()[0])[0],
164
+ task: taskKey(TASK_QUEUE_ID, nextTask)[0],
165
+ })
166
+ .prepare();
167
+ const dca = core?.dca;
168
+ instructions.push(initDcaIx);
169
+ // Fund the DCA account with initial lamports
170
+ instructions.push(SystemProgram.transfer({
171
+ fromPubkey: authority,
172
+ toPubkey: dca,
173
+ lamports: argv.initialLamports,
174
+ }));
175
+ await sendInstructionsOrSquadsV4({
176
+ provider,
177
+ instructions,
178
+ multisig: multisigPda,
179
+ signers: [],
180
+ });
181
+ console.log(`✅ Initialized Tuktuk DCA at: ${dca.toBase58()}`);
182
+ console.log(`📊 Configuration:`);
183
+ console.log(` - Input Mint: ${inputMint.toBase58()}`);
184
+ console.log(` - Output Mint: ${outputMint.toBase58()}`);
185
+ console.log(` - Destination: ${destinationWallet.toBase58()}`);
186
+ console.log(` - Orders: ${argv.numOrders}`);
187
+ console.log(` - Amount per order: ${argv.swapAmountPerOrder}`);
188
+ console.log(` - Interval: ${argv.intervalSeconds} seconds`);
189
+ console.log(` - Slippage: ${argv.slippageBps} bps`);
190
+ console.log(` - DCA Signer: ${dcaSigner.toBase58()}`);
191
+ console.log(` - DCA URL: ${argv.dcaUrl}`);
192
+ }
193
+ if (require.main === module) {
194
+ run();
195
+ }
196
+ //# sourceMappingURL=initialize-tuktuk-dca.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"initialize-tuktuk-dca.js","sourceRoot":"","sources":["../../../src/initialize-tuktuk-dca.ts"],"names":[],"mappings":"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"}
@@ -4,10 +4,9 @@ import { init as initHsd } from '@helium/helium-sub-daos-sdk';
4
4
  import { daoKey } from '@helium/helium-sub-daos-sdk';
5
5
  import { createMintInstructions, sendInstructions } from '@helium/spl-utils';
6
6
  import { PublicKey, Keypair } from '@solana/web3.js';
7
- import Squads from '@sqds/sdk';
8
7
  import os from 'os';
9
8
  import yargs from 'yargs/yargs';
10
- import { loadKeypair, sendInstructionsOrSquads } from './utils';
9
+ import { loadKeypair, sendInstructionsOrSquadsV4 } from './utils';
11
10
  export async function run(args = process.argv) {
12
11
  const yarg = yargs(args).options({
13
12
  wallet: {
@@ -30,18 +29,10 @@ export async function run(args = process.argv) {
30
29
  required: true,
31
30
  describe: 'Recipient wallet address for the iot ops fund nft',
32
31
  },
33
- executeTransaction: {
34
- type: 'boolean',
35
- },
36
32
  multisig: {
37
33
  type: 'string',
38
34
  describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
39
35
  },
40
- authorityIndex: {
41
- type: 'number',
42
- describe: 'Authority index for squads. Defaults to 1',
43
- default: 1,
44
- },
45
36
  });
46
37
  const argv = await yarg.argv;
47
38
  process.env.ANCHOR_WALLET = argv.wallet;
@@ -66,16 +57,10 @@ export async function run(args = process.argv) {
66
57
  authority: daoAcc.authority,
67
58
  })
68
59
  .instruction());
69
- const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
70
- commitmentOrConfig: 'finalized',
71
- });
72
- await sendInstructionsOrSquads({
60
+ await sendInstructionsOrSquadsV4({
73
61
  provider,
74
62
  instructions,
75
- executeTransaction: argv.executeTransaction,
76
- squads,
77
63
  multisig: argv.multisig ? new PublicKey(argv.multisig) : undefined,
78
- authorityIndex: argv.authorityIndex,
79
64
  signers: [],
80
65
  });
81
66
  }
@@ -1 +1 @@
1
- {"version":3,"file":"issue-iot-operations-fund.js","sourceRoot":"","sources":["../../../src/issue-iot-operations-fund.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"issue-iot-operations-fund.js","sourceRoot":"","sources":["../../../src/issue-iot-operations-fund.ts"],"names":[],"mappings":"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"}
@@ -2,10 +2,9 @@ import * as anchor from '@coral-xyz/anchor';
2
2
  import { daoKey, init as initDao, subDaoKey, } from '@helium/helium-sub-daos-sdk';
3
3
  import { init as initVsr } from '@helium/voter-stake-registry-sdk';
4
4
  import { PublicKey } from '@solana/web3.js';
5
- import Squads from '@sqds/sdk';
6
5
  import os from 'os';
7
6
  import yargs from 'yargs/yargs';
8
- import { getTimestampFromDays, getUnixTimestamp, loadKeypair, sendInstructionsOrSquads, } from './utils';
7
+ import { getTimestampFromDays, getUnixTimestamp, loadKeypair, sendInstructionsOrSquadsV4, } from './utils';
9
8
  const SECS_PER_DAY = 86400;
10
9
  const SECS_PER_YEAR = 365 * SECS_PER_DAY;
11
10
  const MAX_LOCKUP = 4 * SECS_PER_YEAR;
@@ -39,18 +38,10 @@ export async function run(args = process.argv) {
39
38
  describe: 'Reset the subdao voting mint',
40
39
  default: false,
41
40
  },
42
- executeTransaction: {
43
- type: 'boolean',
44
- },
45
41
  multisig: {
46
42
  type: 'string',
47
43
  describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
48
44
  },
49
- authorityIndex: {
50
- type: 'number',
51
- describe: 'Authority index for squads. Defaults to 1',
52
- default: 1,
53
- },
54
45
  });
55
46
  const argv = await yarg.argv;
56
47
  process.env.ANCHOR_WALLET = argv.wallet;
@@ -67,9 +58,6 @@ export async function run(args = process.argv) {
67
58
  const now = Number(await getUnixTimestamp(provider));
68
59
  const in7Days = now + getTimestampFromDays(7);
69
60
  const instructions = [];
70
- const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
71
- commitmentOrConfig: 'finalized',
72
- });
73
61
  if (argv.resetDaoVotingMint) {
74
62
  console.log('resetting dao votingMint');
75
63
  const hntMint = new PublicKey(argv.hntMint);
@@ -126,13 +114,10 @@ export async function run(args = process.argv) {
126
114
  ])
127
115
  .instruction());
128
116
  }
129
- await sendInstructionsOrSquads({
117
+ await sendInstructionsOrSquadsV4({
130
118
  provider,
131
119
  instructions,
132
- executeTransaction: argv.executeTransaction,
133
- squads,
134
120
  multisig: argv.multisig ? new PublicKey(argv.multisig) : undefined,
135
- authorityIndex: argv.authorityIndex,
136
121
  signers: [],
137
122
  });
138
123
  }
@@ -1 +1 @@
1
- {"version":3,"file":"reset-vsr-voting-mint.js","sourceRoot":"","sources":["../../../src/reset-vsr-voting-mint.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"reset-vsr-voting-mint.js","sourceRoot":"","sources":["../../../src/reset-vsr-voting-mint.ts"],"names":[],"mappings":"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"}
@@ -3,10 +3,9 @@ import { init as initHem, makerKey, rewardableEntityConfigKey } from "@helium/he
3
3
  import { daoKey, subDaoKey } from "@helium/helium-sub-daos-sdk";
4
4
  import { HNT_MINT } from "@helium/spl-utils";
5
5
  import { PublicKey } from "@solana/web3.js";
6
- import Squads from "@sqds/sdk";
7
6
  import os from "os";
8
7
  import yargs from "yargs/yargs";
9
- import { loadKeypair, sendInstructionsOrSquads } from "./utils";
8
+ import { loadKeypair, sendInstructionsOrSquadsV4 } from "./utils";
10
9
  export async function run(args = process.argv) {
11
10
  const yarg = yargs(args).options({
12
11
  wallet: {
@@ -25,18 +24,10 @@ export async function run(args = process.argv) {
25
24
  required: true,
26
25
  describe: "Name of the maker, case sensitive",
27
26
  },
28
- executeTransaction: {
29
- type: "boolean",
30
- },
31
27
  multisig: {
32
28
  type: "string",
33
29
  describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
34
30
  },
35
- authorityIndex: {
36
- type: "number",
37
- describe: "Authority index for squads. Defaults to 1",
38
- default: 1,
39
- },
40
31
  dntMint: {
41
32
  type: "string",
42
33
  describe: "The dnt mint to revoke",
@@ -70,16 +61,10 @@ export async function run(args = process.argv) {
70
61
  rewardableEntityConfig: rewardableEntityConfigK,
71
62
  })
72
63
  .instruction());
73
- const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
74
- commitmentOrConfig: "finalized",
75
- });
76
- await sendInstructionsOrSquads({
64
+ await sendInstructionsOrSquadsV4({
77
65
  provider,
78
66
  instructions,
79
- executeTransaction: argv.executeTransaction,
80
- squads,
81
67
  multisig: argv.multisig ? new PublicKey(argv.multisig) : undefined,
82
- authorityIndex: argv.authorityIndex,
83
68
  signers: [],
84
69
  });
85
70
  }
@@ -1 +1 @@
1
- {"version":3,"file":"revoke-maker.js","sourceRoot":"","sources":["../../../src/revoke-maker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,QAAQ,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AACzG,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,SAAS,EAA0B,MAAM,iBAAiB,CAAC;AACpE,OAAO,MAAM,MAAM,WAAW,CAAC;AAC/B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAC;AAEhE,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,IAAI,EAAE;YACJ,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,mCAAmC;SAC9C;QACD,kBAAkB,EAAE;YAClB,IAAI,EAAE,SAAS;SAChB;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,QAAQ,EACN,oGAAoG;SACvG;QACD,cAAc,EAAE;YACd,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,2CAA2C;YACrD,OAAO,EAAE,CAAC;SACX;QACD,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,wBAAwB;YAClC,QAAQ,EAAE,IAAI;SACf;QACD,MAAM,EAAE;YACN,KAAK,EAAE,GAAG;YACV,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,iCAAiC;SAC5C;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,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;IAExC,MAAM,YAAY,GAA6B,EAAE,CAAC;IAElD,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1D,0BAA0B;IAC1B,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3C,MAAM,uBAAuB,GAAG,yBAAyB,CACvD,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EACzC,IAAI,CAAC,MAAM,CACZ,CAAC,CAAC,CAAC,CAAC;IACL,MAAM,sBAAsB,GAC1B,MAAM,OAAO,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAClD,uBAAuB,CACxB,CAAC;IAEJ,YAAY,CAAC,IAAI,CACf,MAAM,OAAO,CAAC,OAAO;SAClB,aAAa,EAAE;SACf,eAAe,CAAC;QACf,KAAK;QACL,SAAS,EAAE,sBAAsB,CAAC,SAAS;QAC3C,sBAAsB,EAAE,uBAAuB;KAChD,CAAC;SACD,WAAW,EAAE,CACjB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE;QACtE,kBAAkB,EAAE,WAAW;KAChC,CAAC,CAAC;IAEH,MAAM,wBAAwB,CAAC;QAC7B,QAAQ;QACR,YAAY;QACZ,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;QAC3C,MAAM;QACN,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;QAClE,cAAc,EAAE,IAAI,CAAC,cAAc;QACnC,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;AACL,CAAC"}
1
+ {"version":3,"file":"revoke-maker.js","sourceRoot":"","sources":["../../../src/revoke-maker.ts"],"names":[],"mappings":"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"}
@@ -2,10 +2,9 @@ import * as anchor from "@coral-xyz/anchor";
2
2
  import { init as initHsd, subDaoKey } from "@helium/helium-sub-daos-sdk";
3
3
  import { MOBILE_MINT } from "@helium/spl-utils";
4
4
  import { PublicKey } from "@solana/web3.js";
5
- import Squads from "@sqds/sdk";
6
5
  import os from "os";
7
6
  import yargs from "yargs/yargs";
8
- import { loadKeypair, sendInstructionsOrSquads } from "./utils";
7
+ import { loadKeypair, sendInstructionsOrSquadsV4 } from "./utils";
9
8
  export async function run(args = process.argv) {
10
9
  const yarg = yargs(args).options({
11
10
  wallet: {
@@ -18,18 +17,10 @@ export async function run(args = process.argv) {
18
17
  default: "http://127.0.0.1:8899",
19
18
  describe: "The solana url",
20
19
  },
21
- executeTransaction: {
22
- type: "boolean",
23
- },
24
20
  multisig: {
25
21
  type: "string",
26
22
  describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
27
23
  },
28
- authorityIndex: {
29
- type: "number",
30
- describe: "Authority index for squads. Defaults to 1",
31
- default: 1,
32
- },
33
24
  minimumPeriods: {
34
25
  type: "number",
35
26
  describe: "The new minimum number of periods",
@@ -70,16 +61,10 @@ export async function run(args = process.argv) {
70
61
  authority: subDaoAcc.authority,
71
62
  })
72
63
  .instruction());
73
- const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
74
- commitmentOrConfig: "finalized",
75
- });
76
- await sendInstructionsOrSquads({
64
+ await sendInstructionsOrSquadsV4({
77
65
  provider,
78
66
  instructions,
79
- executeTransaction: argv.executeTransaction,
80
- squads,
81
67
  multisig: argv.multisig ? new PublicKey(argv.multisig) : undefined,
82
- authorityIndex: argv.authorityIndex,
83
68
  signers: [],
84
69
  });
85
70
  }
@@ -1 +1 @@
1
- {"version":3,"file":"set-dc-onboarding-fees-paid-epoch-info.js","sourceRoot":"","sources":["../../../src/set-dc-onboarding-fees-paid-epoch-info.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"set-dc-onboarding-fees-paid-epoch-info.js","sourceRoot":"","sources":["../../../src/set-dc-onboarding-fees-paid-epoch-info.ts"],"names":[],"mappings":"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"}