@helium/helium-admin-cli 0.11.4 → 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
@@ -39,7 +39,7 @@ exports.run = void 0;
39
39
  const anchor = __importStar(require("@coral-xyz/anchor"));
40
40
  const web3_js_1 = require("@solana/web3.js");
41
41
  const mpl_token_metadata_1 = require("@metaplex-foundation/mpl-token-metadata");
42
- const sdk_1 = __importDefault(require("@sqds/sdk"));
42
+ const multisig = __importStar(require("@sqds/multisig"));
43
43
  const os_1 = __importDefault(require("os"));
44
44
  const yargs_1 = __importDefault(require("yargs/yargs"));
45
45
  const utils_1 = require("./utils");
@@ -56,27 +56,22 @@ function run(args = process.argv) {
56
56
  default: 'http://127.0.0.1:8899',
57
57
  describe: 'The solana url',
58
58
  },
59
- token: {
59
+ mint: {
60
60
  required: true,
61
61
  type: 'string',
62
62
  describe: 'Token address to update metadata for',
63
63
  },
64
64
  uri: {
65
- required: true,
66
65
  type: 'string',
67
66
  describe: 'The new metadata URI',
68
67
  },
69
- executeTransaction: {
70
- type: 'boolean',
71
- },
72
68
  multisig: {
73
69
  type: 'string',
74
70
  describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
75
71
  },
76
- authorityIndex: {
77
- type: 'number',
78
- describe: 'Authority index for squads. Defaults to 1',
79
- default: 1,
72
+ newAuthority: {
73
+ type: 'string',
74
+ describe: 'New authority for the token',
80
75
  },
81
76
  });
82
77
  const argv = yield yarg.argv;
@@ -86,16 +81,17 @@ function run(args = process.argv) {
86
81
  const provider = anchor.getProvider();
87
82
  const walletKP = (0, utils_1.loadKeypair)(argv.wallet);
88
83
  const wallet = new anchor.Wallet(walletKP);
89
- const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
90
- commitmentOrConfig: 'finalized',
91
- });
92
84
  let authority = wallet.publicKey;
93
- let multisig = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
94
- if (multisig) {
95
- authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
85
+ let multisigPda = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
86
+ if (multisigPda) {
87
+ const [vaultPda] = multisig.getVaultPda({
88
+ multisigPda,
89
+ index: 0,
90
+ });
91
+ authority = vaultPda;
96
92
  }
97
93
  try {
98
- const tokenAddress = new web3_js_1.PublicKey(argv.token);
94
+ const tokenAddress = new web3_js_1.PublicKey(argv.mint);
99
95
  // Find the metadata PDA for the token
100
96
  const [metadataAddress] = web3_js_1.PublicKey.findProgramAddressSync([
101
97
  Buffer.from("metadata", "utf-8"),
@@ -114,25 +110,22 @@ function run(args = process.argv) {
114
110
  data: {
115
111
  name: metadataAccount.data.name,
116
112
  symbol: metadataAccount.data.symbol,
117
- uri: argv.uri,
113
+ uri: argv.uri ? argv.uri : metadataAccount.data.uri,
118
114
  sellerFeeBasisPoints: metadataAccount.data.sellerFeeBasisPoints,
119
115
  creators: metadataAccount.data.creators || null,
120
116
  collection: null,
121
117
  uses: null
122
118
  },
123
- updateAuthority: metadataAccount.updateAuthority,
119
+ updateAuthority: argv.newAuthority ? new web3_js_1.PublicKey(argv.newAuthority) : metadataAccount.updateAuthority,
124
120
  primarySaleHappened: metadataAccount.primarySaleHappened,
125
121
  isMutable: metadataAccount.isMutable
126
122
  }
127
123
  })
128
124
  ];
129
- yield (0, utils_1.sendInstructionsOrSquads)({
125
+ yield (0, utils_1.sendInstructionsOrSquadsV4)({
130
126
  provider,
131
127
  instructions: updateInstructions,
132
- executeTransaction: argv.executeTransaction,
133
- squads,
134
- multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
135
- authorityIndex: argv.authorityIndex,
128
+ multisig: multisigPda,
136
129
  signers: [],
137
130
  });
138
131
  console.log(`Successfully created transaction to update metadata URI for token ${argv.token} to ${argv.uri}`);
@@ -1 +1 @@
1
- {"version":3,"file":"update-token-metadata.js","sourceRoot":"","sources":["../../src/update-token-metadata.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,6CAA4C;AAC5C,gFAIgD;AAChD,oDAA+B;AAC/B,4CAAoB;AACpB,wDAAgC;AAChC,mCAAgE;AAEhE,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,KAAK,EAAE;gBACL,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,sCAAsC;aACjD;YACD,GAAG,EAAE;gBACH,QAAQ,EAAE,IAAI;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,sBAAsB;aACjC;YACD,kBAAkB,EAAE;gBAClB,IAAI,EAAE,SAAS;aAChB;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;aACvG;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,2CAA2C;gBACrD,OAAO,EAAE,CAAC;aACX;SACF,CAAC,CAAC;QAEH,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,QAAQ,GAAG,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC1C,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,aAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE;YACtE,kBAAkB,EAAE,WAAW;SAChC,CAAC,CAAC;QACH,IAAI,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QACjC,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,IAAI,QAAQ,EAAE;YACZ,SAAS,GAAG,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC;SACnE;QACD,IAAI;YACF,MAAM,YAAY,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAE/C,sCAAsC;YACtC,MAAM,CAAC,eAAe,CAAC,GAAG,mBAAS,CAAC,sBAAsB,CACxD;gBACE,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC;gBAChC,+BAAyB,CAAC,QAAQ,EAAE;gBACpC,YAAY,CAAC,QAAQ,EAAE;aACxB,EACD,+BAAyB,CAC1B,CAAC;YAEF,sCAAsC;YACtC,MAAM,eAAe,GAAG,MAAM,6BAAQ,CAAC,kBAAkB,CACvD,QAAQ,CAAC,UAAU,EACnB,eAAe,CAChB,CAAC;YAEF,gCAAgC;YAChC,MAAM,kBAAkB,GAAG;gBACzB,IAAA,6DAAwC,EACtC;oBACE,QAAQ,EAAE,eAAe;oBACzB,eAAe,EAAE,SAAS;iBAC3B,EACD;oBACE,2BAA2B,EAAE;wBAC3B,IAAI,EAAE;4BACJ,IAAI,EAAE,eAAe,CAAC,IAAI,CAAC,IAAI;4BAC/B,MAAM,EAAE,eAAe,CAAC,IAAI,CAAC,MAAM;4BACnC,GAAG,EAAE,IAAI,CAAC,GAAG;4BACb,oBAAoB,EAAE,eAAe,CAAC,IAAI,CAAC,oBAAoB;4BAC/D,QAAQ,EAAE,eAAe,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI;4BAC/C,UAAU,EAAE,IAAI;4BAChB,IAAI,EAAE,IAAI;yBACX;wBACD,eAAe,EAAE,eAAe,CAAC,eAAe;wBAChD,mBAAmB,EAAE,eAAe,CAAC,mBAAmB;wBACxD,SAAS,EAAE,eAAe,CAAC,SAAS;qBACrC;iBACF,CACF;aACF,CAAC;YAEF,MAAM,IAAA,gCAAwB,EAAC;gBAC7B,QAAQ;gBACR,YAAY,EAAE,kBAAkB;gBAChC,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;gBAC3C,MAAM;gBACN,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;gBAClE,cAAc,EAAE,IAAI,CAAC,cAAc;gBACnC,OAAO,EAAE,EAAE;aACZ,CAAC,CAAC;YAEH,OAAO,CAAC,GAAG,CAAC,qEAAqE,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;SAC/G;QAAC,OAAO,GAAG,EAAE;YACZ,OAAO,CAAC,KAAK,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC;YACvD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;CAAA;AAhHD,kBAgHC"}
1
+ {"version":3,"file":"update-token-metadata.js","sourceRoot":"","sources":["../../src/update-token-metadata.ts"],"names":[],"mappings":"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"}
@@ -38,10 +38,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
38
38
  exports.run = void 0;
39
39
  const anchor = __importStar(require("@coral-xyz/anchor"));
40
40
  const web3_js_1 = require("@solana/web3.js");
41
- const sdk_1 = __importDefault(require("@sqds/sdk"));
42
41
  const os_1 = __importDefault(require("os"));
43
42
  const yargs_1 = __importDefault(require("yargs/yargs"));
44
43
  const utils_1 = require("./utils");
44
+ const multisig = __importStar(require("@sqds/multisig"));
45
45
  function run(args = process.argv) {
46
46
  return __awaiter(this, void 0, void 0, function* () {
47
47
  const yarg = (0, yargs_1.default)(args).options({
@@ -55,18 +55,10 @@ function run(args = process.argv) {
55
55
  default: 'http://127.0.0.1:8899',
56
56
  describe: 'The solana url',
57
57
  },
58
- executeTransaction: {
59
- type: 'boolean',
60
- },
61
58
  multisig: {
62
59
  type: 'string',
63
60
  describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
64
61
  },
65
- authorityIndex: {
66
- type: 'number',
67
- describe: 'Authority index for squads. Defaults to 1',
68
- default: 1,
69
- },
70
62
  programId: {
71
63
  type: 'string',
72
64
  required: true,
@@ -83,24 +75,22 @@ function run(args = process.argv) {
83
75
  const provider = anchor.getProvider();
84
76
  const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
85
77
  const connection = provider.connection;
86
- const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
87
- commitmentOrConfig: 'finalized',
88
- });
89
78
  let authority = provider.wallet.publicKey;
90
- let multisig = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
91
- if (multisig) {
92
- authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
79
+ let multisigPda = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
80
+ if (multisigPda) {
81
+ const [vaultPda] = multisig.getVaultPda({
82
+ multisigPda,
83
+ index: 0,
84
+ });
85
+ authority = vaultPda;
93
86
  }
94
87
  console.log(authority.toBase58());
95
- yield (0, utils_1.sendInstructionsOrSquads)({
88
+ yield (0, utils_1.sendInstructionsOrSquadsV4)({
96
89
  provider,
97
90
  instructions: [
98
91
  yield (0, utils_1.createIdlUpgradeInstruction)(new web3_js_1.PublicKey(argv.programId), new web3_js_1.PublicKey(argv.bufferId), authority),
99
92
  ],
100
- executeTransaction: argv.executeTransaction,
101
- squads,
102
- multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
103
- authorityIndex: argv.authorityIndex,
93
+ multisig: multisigPda,
104
94
  signers: [],
105
95
  });
106
96
  });
@@ -1 +1 @@
1
- {"version":3,"file":"upgrade-idl.js","sourceRoot":"","sources":["../../src/upgrade-idl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upgrade-idl.js","sourceRoot":"","sources":["../../src/upgrade-idl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,6CAA4C;AAC5C,4CAAoB;AACpB,wDAAgC;AAChC,mCAKiB;AAGjB,yDAA2C;AAE3C,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,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EACN,oGAAoG;aACvG;YACD,SAAS,EAAE;gBACT,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACf;YACD,QAAQ,EAAE;gBACR,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;aACf;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,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QACvC,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;QAC1C,IAAI,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACtE,IAAI,WAAW,EAAE;YACf,MAAM,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC;gBACtC,WAAW;gBACX,KAAK,EAAE,CAAC;aACT,CAAC,CAAC;YACH,SAAS,GAAG,QAAQ,CAAC;SACtB;QACD,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClC,MAAM,IAAA,kCAA0B,EAAC;YAC/B,QAAQ;YACR,YAAY,EAAE;gBACZ,MAAM,IAAA,mCAA2B,EAC/B,IAAI,mBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAC7B,IAAI,mBAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC5B,SAAS,CACV;aACF;YACD,QAAQ,EAAE,WAAY;YACtB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;IACL,CAAC;CAAA;AAvDD,kBAuDC"}
@@ -41,7 +41,6 @@ const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
41
41
  const mobile_entity_manager_sdk_1 = require("@helium/mobile-entity-manager-sdk");
42
42
  const spl_utils_1 = require("@helium/spl-utils");
43
43
  const web3_js_1 = require("@solana/web3.js");
44
- const sdk_1 = __importDefault(require("@sqds/sdk"));
45
44
  const os_1 = __importDefault(require("os"));
46
45
  const yargs_1 = __importDefault(require("yargs/yargs"));
47
46
  const utils_1 = require("./utils");
@@ -147,19 +146,13 @@ function run(args = process.argv) {
147
146
  })
148
147
  .instruction());
149
148
  }
150
- // @ts-ignore
151
- const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, provider.wallet, {
152
- commitmentOrConfig: "finalized",
153
- });
154
- yield (0, utils_1.sendInstructionsOrSquads)({
149
+ yield (0, utils_1.sendInstructionsOrSquadsV4)({
155
150
  provider,
156
151
  instructions,
157
152
  signers: [],
158
153
  payer: provider.wallet.publicKey,
159
154
  commitment: "confirmed",
160
- executeTransaction: false,
161
155
  multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
162
- squads,
163
156
  });
164
157
  });
165
158
  }
@@ -1 +1 @@
1
- {"version":3,"file":"upsert-incentive-program.js","sourceRoot":"","sources":["../../src/upsert-incentive-program.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"upsert-incentive-program.js","sourceRoot":"","sources":["../../src/upsert-incentive-program.ts"],"names":[],"mappings":"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"}
package/lib/cjs/utils.js CHANGED
@@ -35,7 +35,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
35
35
  return (mod && mod.__esModule) ? mod : { "default": mod };
36
36
  };
37
37
  Object.defineProperty(exports, "__esModule", { value: true });
38
- exports.parseEmissionsSchedule = exports.sendInstructionsOrSquads = exports.createCloseBufferInstruction = exports.sendInstructionsOrCreateProposal = exports.isLocalhost = exports.loadKeypair = exports.createAndMint = exports.exists = exports.getUnixTimestamp = exports.getTimestampFromDays = exports.createIdlUpgradeInstruction = exports.merkleSizes = void 0;
38
+ exports.parseEmissionsSchedule = exports.sendInstructionsOrSquads = exports.sendInstructionsOrSquadsV4 = exports.createCloseBufferInstruction = exports.sendInstructionsOrCreateProposal = exports.isLocalhost = exports.loadKeypair = exports.createAndMint = exports.exists = exports.getUnixTimestamp = exports.getTimestampFromDays = exports.createIdlUpgradeInstruction = exports.createSetIdlAuthorityInstruction = exports.createProgramSetAuthorityInstruction = exports.merkleSizes = void 0;
39
39
  const anchor = __importStar(require("@coral-xyz/anchor"));
40
40
  const idl_1 = require("@coral-xyz/anchor/dist/cjs/idl");
41
41
  const spl_utils_1 = require("@helium/spl-utils");
@@ -44,9 +44,11 @@ const spl_governance_1 = require("@solana/spl-governance");
44
44
  const spl_token_1 = require("@solana/spl-token");
45
45
  const web3_js_1 = require("@solana/web3.js");
46
46
  const sdk_1 = require("@sqds/sdk");
47
+ const multisig = __importStar(require("@sqds/multisig"));
47
48
  const bn_js_1 = require("bn.js");
48
49
  const fs_1 = __importDefault(require("fs"));
49
50
  const node_fetch_1 = __importDefault(require("node-fetch"));
51
+ const squads_batch_optimizer_1 = require("./squads-batch-optimizer");
50
52
  const SECONDS_PER_DAY = 86400;
51
53
  // Goal = 3 proof nodes needed
52
54
  exports.merkleSizes = [
@@ -61,6 +63,61 @@ exports.merkleSizes = [
61
63
  [20, 64, 17],
62
64
  [24, 64, 17],
63
65
  ];
66
+ function createProgramSetAuthorityInstruction(programId, upgradeAuthority, newAuthority) {
67
+ return __awaiter(this, void 0, void 0, function* () {
68
+ const bpfUpgradableLoaderId = spl_governance_1.BPF_UPGRADE_LOADER_ID;
69
+ const [programDataAddress] = yield web3_js_1.PublicKey.findProgramAddress([programId.toBuffer()], bpfUpgradableLoaderId);
70
+ const keys = [
71
+ {
72
+ pubkey: programDataAddress,
73
+ isWritable: true,
74
+ isSigner: false,
75
+ },
76
+ {
77
+ pubkey: upgradeAuthority,
78
+ isWritable: false,
79
+ isSigner: true,
80
+ },
81
+ {
82
+ pubkey: newAuthority,
83
+ isWritable: false,
84
+ isSigner: false,
85
+ },
86
+ ];
87
+ return new web3_js_1.TransactionInstruction({
88
+ keys,
89
+ programId: bpfUpgradableLoaderId,
90
+ data: Buffer.from([4, 0, 0, 0]), // SetAuthority instruction bincode
91
+ });
92
+ });
93
+ }
94
+ exports.createProgramSetAuthorityInstruction = createProgramSetAuthorityInstruction;
95
+ function createSetIdlAuthorityInstruction(programId, upgradeAuthority, newAuthority) {
96
+ return __awaiter(this, void 0, void 0, function* () {
97
+ const prefix = Buffer.from("0a69e9a778bcf440", "hex");
98
+ const ixn = Buffer.from("04", "hex");
99
+ const data = Buffer.concat([prefix.reverse(), ixn, newAuthority.toBuffer()]);
100
+ const idlAddr = yield (0, idl_1.idlAddress)(programId);
101
+ const keys = [
102
+ {
103
+ pubkey: idlAddr,
104
+ isWritable: true,
105
+ isSigner: false,
106
+ },
107
+ {
108
+ pubkey: upgradeAuthority,
109
+ isWritable: false,
110
+ isSigner: true,
111
+ },
112
+ ];
113
+ return new web3_js_1.TransactionInstruction({
114
+ keys,
115
+ programId,
116
+ data,
117
+ });
118
+ });
119
+ }
120
+ exports.createSetIdlAuthorityInstruction = createSetIdlAuthorityInstruction;
64
121
  function createIdlUpgradeInstruction(programId, bufferAddress, upgradeAuthority) {
65
122
  return __awaiter(this, void 0, void 0, function* () {
66
123
  const prefix = Buffer.from("0a69e9a778bcf440", "hex");
@@ -356,13 +413,14 @@ function createCloseBufferInstruction(programId, bufferAddress, upgradeAuthority
356
413
  });
357
414
  }
358
415
  exports.createCloseBufferInstruction = createCloseBufferInstruction;
359
- function sendInstructionsOrSquads({ provider, instructions, signers = [], payer = provider.wallet.publicKey, commitment = "confirmed", idlErrors = new Map(), executeTransaction = false, squads, multisig, authorityIndex, }) {
416
+ function sendInstructionsOrSquadsV4({ provider, instructions, signers = [], payer = provider.wallet.publicKey, commitment = "confirmed", idlErrors = new Map(), multisig: multisigPda, }) {
360
417
  return __awaiter(this, void 0, void 0, function* () {
361
418
  if (!multisig) {
362
419
  return yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
363
420
  connection: provider.connection,
364
421
  computeUnits: 1000000,
365
422
  instructions,
423
+ feePayer: payer,
366
424
  }), signers, payer, commitment, idlErrors);
367
425
  }
368
426
  const signerSet = new Set(instructions
@@ -377,11 +435,91 @@ function sendInstructionsOrSquads({ provider, instructions, signers = [], payer
377
435
  connection: provider.connection,
378
436
  computeUnits: 1000000,
379
437
  instructions: nonMissingSignerIxs,
438
+ feePayer: payer,
380
439
  }), signers, payer, commitment, idlErrors);
381
440
  }
382
441
  if (squadsSignatures.length >= 2) {
383
442
  throw new Error("Too many missing signatures");
384
443
  }
444
+ const multisigInfo = yield multisig.accounts.Multisig.fromAccountAddress(provider.connection, multisigPda);
445
+ const transactionIndex = Number(multisigInfo.transactionIndex) + 1;
446
+ const createBatchIx = yield multisig.instructions.batchCreate({
447
+ batchIndex: BigInt(transactionIndex),
448
+ creator: provider.wallet.publicKey,
449
+ multisigPda: multisigPda,
450
+ vaultIndex: 0,
451
+ memo: "Helium-admin-cli batch",
452
+ });
453
+ yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
454
+ connection: provider.connection,
455
+ instructions: [createBatchIx, yield multisig.instructions.proposalCreate({
456
+ multisigPda: multisigPda,
457
+ transactionIndex: BigInt(transactionIndex),
458
+ creator: provider.wallet.publicKey,
459
+ isDraft: true,
460
+ })],
461
+ feePayer: payer,
462
+ }));
463
+ const [vault] = yield multisig.getVaultPda({
464
+ multisigPda: multisigPda,
465
+ index: 0,
466
+ programId: multisig.PROGRAM_ID,
467
+ });
468
+ const { transactionMessages, failedBuckets } = yield (0, squads_batch_optimizer_1.packageInstructions)(instructions.map(ix => [ix]), [], vault);
469
+ const addInstructions = yield Promise.all(transactionMessages.map((tm, index) => multisig.instructions.batchAddTransaction({
470
+ batchIndex: BigInt(transactionIndex),
471
+ multisigPda: multisigPda,
472
+ transactionIndex: index + 1,
473
+ transactionMessage: tm,
474
+ vaultIndex: 0,
475
+ member: provider.wallet.publicKey,
476
+ ephemeralSigners: 0
477
+ })));
478
+ if (failedBuckets.length > 0) {
479
+ throw new Error(`Failed to package instructions: ${failedBuckets.join(", ")}`);
480
+ }
481
+ yield (0, spl_utils_1.bulkSendTransactions)(provider, addInstructions.map(ix => ({
482
+ feePayer: provider.wallet.publicKey,
483
+ instructions: [ix],
484
+ })));
485
+ yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
486
+ connection: provider.connection,
487
+ instructions: [yield multisig.instructions.proposalActivate({
488
+ multisigPda: multisigPda,
489
+ transactionIndex: BigInt(transactionIndex),
490
+ member: provider.wallet.publicKey,
491
+ })],
492
+ feePayer: payer,
493
+ }));
494
+ });
495
+ }
496
+ exports.sendInstructionsOrSquadsV4 = sendInstructionsOrSquadsV4;
497
+ function sendInstructionsOrSquads({ provider, instructions, signers = [], payer = provider.wallet.publicKey, commitment = "confirmed", idlErrors = new Map(), executeTransaction = false, squads, multisig, authorityIndex, }) {
498
+ return __awaiter(this, void 0, void 0, function* () {
499
+ if (!multisig) {
500
+ return yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
501
+ connection: provider.connection,
502
+ computeUnits: 1000000,
503
+ instructions,
504
+ }), signers, payer, commitment, idlErrors);
505
+ }
506
+ const signerSet = new Set(instructions
507
+ .map((ix) => ix.keys.filter((k) => k.isSigner).map((k) => k.pubkey.toBase58()))
508
+ .flat());
509
+ const signerKeys = Array.from(signerSet).map((k) => new web3_js_1.PublicKey(k));
510
+ const nonMissingSignerIxs = instructions.filter((ix) => !ix.keys.some((k) => k.isSigner && !k.pubkey.equals(provider.wallet.publicKey)));
511
+ const squadsSignatures = signerKeys.filter((k) => !k.equals(provider.wallet.publicKey) &&
512
+ !signers.some((s) => s.publicKey.equals(k)));
513
+ if (squadsSignatures.length == 0) {
514
+ return yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
515
+ connection: provider.connection,
516
+ computeUnits: 1000000,
517
+ instructions: nonMissingSignerIxs,
518
+ }), signers, payer, commitment, idlErrors);
519
+ }
520
+ if (squadsSignatures.length >= 2) {
521
+ throw new Error("Too many missing signatures " + squadsSignatures.map(s => s.toBase58()).join(", "));
522
+ }
385
523
  const txIndex = yield squads.getNextTransactionIndex(multisig);
386
524
  const ix = yield squads.buildCreateTransaction(multisig, authorityIndex, txIndex);
387
525
  yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/utils.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,66 @@
1
+ import * as anchor from '@coral-xyz/anchor';
2
+ import { PublicKey } from '@solana/web3.js';
3
+ import * as multisig from "@sqds/multisig";
4
+ import os from 'os';
5
+ import yargs from 'yargs/yargs';
6
+ import { loadKeypair, sendInstructionsOrSquadsV4 } from './utils';
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
+ proposer: {
25
+ type: 'string',
26
+ required: true,
27
+ },
28
+ });
29
+ const argv = await yarg.argv;
30
+ process.env.ANCHOR_WALLET = argv.wallet;
31
+ process.env.ANCHOR_PROVIDER_URL = argv.url;
32
+ anchor.setProvider(anchor.AnchorProvider.local(argv.url));
33
+ const provider = anchor.getProvider();
34
+ const wallet = new anchor.Wallet(loadKeypair(argv.wallet));
35
+ let authority = provider.wallet.publicKey;
36
+ const multisigPda = new PublicKey(argv.multisig);
37
+ const multisigInfo = await multisig.accounts.Multisig.fromAccountAddress(provider.connection, multisigPda);
38
+ // Get the updated transaction index
39
+ const currentTransactionIndex = Number(multisigInfo.transactionIndex);
40
+ const newTransactionIndex = BigInt(currentTransactionIndex + 1);
41
+ const ix = await multisig.instructions.configTransactionCreate({
42
+ rentPayer: wallet.publicKey,
43
+ multisigPda,
44
+ // Replace with current index if needed
45
+ transactionIndex: newTransactionIndex,
46
+ // Member must have at least "Proposer" permissions
47
+ creator: wallet.publicKey,
48
+ actions: [{
49
+ // Type of action
50
+ __kind: "AddMember",
51
+ newMember: {
52
+ key: new PublicKey(argv.proposer),
53
+ permissions: {
54
+ mask: multisig.types.Permission.Initiate
55
+ }
56
+ },
57
+ }],
58
+ });
59
+ await sendInstructionsOrSquadsV4({
60
+ provider,
61
+ payer: wallet.publicKey,
62
+ instructions: [ix],
63
+ multisig: multisigPda,
64
+ });
65
+ }
66
+ //# sourceMappingURL=add-squads-proposer.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"add-squads-proposer.js","sourceRoot":"","sources":["../../../src/add-squads-proposer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,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;AAChC,OAAO,EACL,WAAW,EACX,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAEjB,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,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,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,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC3D,IAAI,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;IAC1C,MAAM,WAAW,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CACtE,QAAQ,CAAC,UAAU,EACnB,WAAW,CACZ,CAAC;IAEF,oCAAoC;IACpC,MAAM,uBAAuB,GAAG,MAAM,CAAC,YAAY,CAAC,gBAAgB,CAAC,CAAC;IACtE,MAAM,mBAAmB,GAAG,MAAM,CAAC,uBAAuB,GAAG,CAAC,CAAC,CAAC;IAEhE,MAAM,EAAE,GAAG,MAAM,QAAQ,CAAC,YAAY,CAAC,uBAAuB,CAAC;QAC7D,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW;QACX,uCAAuC;QACvC,gBAAgB,EAAE,mBAAmB;QACrC,mDAAmD;QACnD,OAAO,EAAE,MAAM,CAAC,SAAS;QACzB,OAAO,EAAE,CAAC;gBACR,iBAAiB;gBACjB,MAAM,EAAE,WAAW;gBACnB,SAAS,EAAE;oBACT,GAAG,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC;oBACjC,WAAW,EAAE;wBACX,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,QAAQ;qBACzC;iBACF;aACF,CAAC;KACH,CAAC,CAAC;IAEH,MAAM,0BAA0B,CAAC;QAC/B,QAAQ;QACR,KAAK,EAAE,MAAM,CAAC,SAAS;QACvB,YAAY,EAAE,CAAC,EAAE,CAAC;QAClB,QAAQ,EAAE,WAAW;KACtB,CAAC,CAAA;AACJ,CAAC"}