@helium/helium-admin-cli 0.9.17 → 0.9.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cjs/add-expiration-to-delegations.js +145 -0
- package/lib/cjs/add-expiration-to-delegations.js.map +1 -0
- package/lib/cjs/create-dao.js +51 -0
- package/lib/cjs/create-dao.js.map +1 -1
- package/lib/cjs/create-subdao.js +0 -8
- package/lib/cjs/create-subdao.js.map +1 -1
- package/lib/cjs/end-epoch.js +9 -18
- package/lib/cjs/end-epoch.js.map +1 -1
- package/lib/cjs/migrate-to-hip-138.js +221 -0
- package/lib/cjs/migrate-to-hip-138.js.map +1 -0
- package/lib/cjs/update-dao.js +34 -23
- package/lib/cjs/update-dao.js.map +1 -1
- package/lib/cjs/update-subdao.js +0 -13
- package/lib/cjs/update-subdao.js.map +1 -1
- package/lib/esm/src/add-expiration-to-delegations.js +99 -0
- package/lib/esm/src/add-expiration-to-delegations.js.map +1 -0
- package/lib/esm/src/create-dao.js +52 -1
- package/lib/esm/src/create-dao.js.map +1 -1
- package/lib/esm/src/create-subdao.js +1 -9
- package/lib/esm/src/create-subdao.js.map +1 -1
- package/lib/esm/src/end-epoch.js +10 -19
- package/lib/esm/src/end-epoch.js.map +1 -1
- package/lib/esm/src/migrate-to-hip-138.js +180 -0
- package/lib/esm/src/migrate-to-hip-138.js.map +1 -0
- package/lib/esm/src/update-dao.js +42 -31
- package/lib/esm/src/update-dao.js.map +1 -1
- package/lib/esm/src/update-subdao.js +1 -14
- package/lib/esm/src/update-subdao.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/add-expiration-to-delegations.d.ts +2 -0
- package/lib/types/src/add-expiration-to-delegations.d.ts.map +1 -0
- package/lib/types/src/create-dao.d.ts.map +1 -1
- package/lib/types/src/create-subdao.d.ts.map +1 -1
- package/lib/types/src/end-epoch.d.ts.map +1 -1
- package/lib/types/src/migrate-to-hip-138.d.ts +2 -0
- package/lib/types/src/migrate-to-hip-138.d.ts.map +1 -0
- package/lib/types/src/update-dao.d.ts.map +1 -1
- package/lib/types/src/update-subdao.d.ts.map +1 -1
- package/package.json +14 -14
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
35
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
36
|
+
};
|
|
37
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
|
+
exports.run = void 0;
|
|
39
|
+
const anchor = __importStar(require("@coral-xyz/anchor"));
|
|
40
|
+
const circuit_breaker_sdk_1 = require("@helium/circuit-breaker-sdk");
|
|
41
|
+
const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
|
|
42
|
+
const lazy_distributor_sdk_1 = require("@helium/lazy-distributor-sdk");
|
|
43
|
+
const organization_sdk_1 = require("@helium/organization-sdk");
|
|
44
|
+
const rewards_oracle_sdk_1 = require("@helium/rewards-oracle-sdk");
|
|
45
|
+
const spl_utils_1 = require("@helium/spl-utils");
|
|
46
|
+
const spl_token_1 = require("@solana/spl-token");
|
|
47
|
+
const web3_js_1 = require("@solana/web3.js");
|
|
48
|
+
const sdk_1 = __importDefault(require("@sqds/sdk"));
|
|
49
|
+
const os_1 = __importDefault(require("os"));
|
|
50
|
+
const yargs_1 = __importDefault(require("yargs/yargs"));
|
|
51
|
+
const utils_1 = require("./utils");
|
|
52
|
+
function run(args = process.argv) {
|
|
53
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
54
|
+
const yarg = (0, yargs_1.default)(args).options({
|
|
55
|
+
wallet: {
|
|
56
|
+
alias: "k",
|
|
57
|
+
describe: "Anchor wallet keypair",
|
|
58
|
+
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
59
|
+
},
|
|
60
|
+
url: {
|
|
61
|
+
alias: "u",
|
|
62
|
+
default: "http://127.0.0.1:8899",
|
|
63
|
+
describe: "The solana url",
|
|
64
|
+
},
|
|
65
|
+
iotMint: {
|
|
66
|
+
type: "string",
|
|
67
|
+
describe: "IOT mint of the subdao to migrate",
|
|
68
|
+
default: spl_utils_1.IOT_MINT.toBase58(),
|
|
69
|
+
},
|
|
70
|
+
hntMint: {
|
|
71
|
+
type: "string",
|
|
72
|
+
describe: "HNT mint of the subdao to migrate",
|
|
73
|
+
default: spl_utils_1.HNT_MINT.toBase58(),
|
|
74
|
+
},
|
|
75
|
+
mobileMint: {
|
|
76
|
+
type: "string",
|
|
77
|
+
describe: "Mobile mint of the subdao to migrate",
|
|
78
|
+
default: spl_utils_1.MOBILE_MINT.toBase58(),
|
|
79
|
+
},
|
|
80
|
+
rewardsOracleUrl: {
|
|
81
|
+
alias: "ro",
|
|
82
|
+
type: "string",
|
|
83
|
+
describe: "The rewards oracle URL",
|
|
84
|
+
required: true,
|
|
85
|
+
},
|
|
86
|
+
oracleKey: {
|
|
87
|
+
type: "string",
|
|
88
|
+
describe: "Pubkey of the oracle",
|
|
89
|
+
required: true,
|
|
90
|
+
},
|
|
91
|
+
emissionSchedulePath: {
|
|
92
|
+
required: true,
|
|
93
|
+
describe: "Path to file that contains the hnt emissions schedule",
|
|
94
|
+
type: "string",
|
|
95
|
+
},
|
|
96
|
+
hstEmissionsSchedulePath: {
|
|
97
|
+
required: true,
|
|
98
|
+
describe: "Path to file that contains the new HST emissions schedule",
|
|
99
|
+
type: "string",
|
|
100
|
+
},
|
|
101
|
+
executeTransaction: {
|
|
102
|
+
type: "boolean",
|
|
103
|
+
},
|
|
104
|
+
multisig: {
|
|
105
|
+
type: "string",
|
|
106
|
+
describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
|
|
107
|
+
},
|
|
108
|
+
authorityIndex: {
|
|
109
|
+
type: "number",
|
|
110
|
+
describe: "Authority index for squads. Defaults to 1",
|
|
111
|
+
default: 1,
|
|
112
|
+
},
|
|
113
|
+
});
|
|
114
|
+
const argv = yield yarg.argv;
|
|
115
|
+
process.env.ANCHOR_WALLET = argv.wallet;
|
|
116
|
+
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
117
|
+
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
118
|
+
const provider = anchor.getProvider();
|
|
119
|
+
const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
|
|
120
|
+
const lazyDistProgram = yield (0, lazy_distributor_sdk_1.init)(provider);
|
|
121
|
+
const hsdProgram = yield (0, helium_sub_daos_sdk_1.init)(provider);
|
|
122
|
+
const instructions = [];
|
|
123
|
+
const hntMint = new web3_js_1.PublicKey(argv.hntMint);
|
|
124
|
+
const dao = (0, helium_sub_daos_sdk_1.daoKey)(hntMint)[0];
|
|
125
|
+
const resizes = [];
|
|
126
|
+
resizes.push(yield hsdProgram.methods
|
|
127
|
+
.tempResizeAccount()
|
|
128
|
+
.accounts({
|
|
129
|
+
account: dao,
|
|
130
|
+
payer: wallet.publicKey,
|
|
131
|
+
})
|
|
132
|
+
.instruction());
|
|
133
|
+
const daoEpochInfos = yield hsdProgram.account.daoEpochInfoV0.all();
|
|
134
|
+
for (const daoEpochInfo of daoEpochInfos) {
|
|
135
|
+
resizes.push(yield hsdProgram.methods
|
|
136
|
+
.tempResizeAccount()
|
|
137
|
+
.accounts({
|
|
138
|
+
account: daoEpochInfo.publicKey,
|
|
139
|
+
payer: wallet.publicKey,
|
|
140
|
+
})
|
|
141
|
+
.instruction());
|
|
142
|
+
}
|
|
143
|
+
console.log("Resizing accounts");
|
|
144
|
+
yield (0, spl_utils_1.batchParallelInstructionsWithPriorityFee)(provider, resizes);
|
|
145
|
+
const daoAcc = yield hsdProgram.account.daoV0.fetch(dao);
|
|
146
|
+
const authority = daoAcc.authority;
|
|
147
|
+
const oracleKey = new web3_js_1.PublicKey(argv.oracleKey);
|
|
148
|
+
const emissionSchedule = yield (0, utils_1.parseEmissionsSchedule)(argv.emissionSchedulePath);
|
|
149
|
+
const ld = (0, lazy_distributor_sdk_1.lazyDistributorKey)(hntMint)[0];
|
|
150
|
+
const ldAcc = yield lazyDistProgram.account.lazyDistributorV0.fetchNullable(ld);
|
|
151
|
+
if (ldAcc) {
|
|
152
|
+
console.warn("Lazy distributor already exists, skipping.");
|
|
153
|
+
}
|
|
154
|
+
else {
|
|
155
|
+
instructions.push(yield lazyDistProgram.methods
|
|
156
|
+
.initializeLazyDistributorV0({
|
|
157
|
+
authority: daoAcc.authority,
|
|
158
|
+
oracles: [
|
|
159
|
+
{
|
|
160
|
+
oracle: oracleKey,
|
|
161
|
+
url: argv.rewardsOracleUrl,
|
|
162
|
+
},
|
|
163
|
+
],
|
|
164
|
+
// 5 x epoch rewards in a 24 hour period
|
|
165
|
+
windowConfig: {
|
|
166
|
+
windowSizeSeconds: new anchor.BN(24 * 60 * 60),
|
|
167
|
+
thresholdType: circuit_breaker_sdk_1.ThresholdType.Absolute,
|
|
168
|
+
threshold: new anchor.BN(emissionSchedule[0].emissionsPerEpoch).mul(new anchor.BN(5)),
|
|
169
|
+
},
|
|
170
|
+
approver: (0, rewards_oracle_sdk_1.oracleSignerKey)()[0],
|
|
171
|
+
})
|
|
172
|
+
.accounts({
|
|
173
|
+
payer: authority,
|
|
174
|
+
rewardsMint: hntMint,
|
|
175
|
+
})
|
|
176
|
+
.instruction());
|
|
177
|
+
}
|
|
178
|
+
instructions.push(yield hsdProgram.methods
|
|
179
|
+
.updateDaoV0({
|
|
180
|
+
authority: null,
|
|
181
|
+
emissionSchedule: null,
|
|
182
|
+
hstEmissionSchedule: yield (0, utils_1.parseEmissionsSchedule)(argv.hstEmissionsSchedulePath),
|
|
183
|
+
netEmissionsCap: null,
|
|
184
|
+
hstPool: null,
|
|
185
|
+
proposalNamespace: (0, organization_sdk_1.organizationKey)("Helium")[0],
|
|
186
|
+
delegatorRewardsPercent: (0, helium_sub_daos_sdk_1.delegatorRewardsPercent)(6),
|
|
187
|
+
rewardsEscrow: (0, spl_token_1.getAssociatedTokenAddressSync)(hntMint, ld, true),
|
|
188
|
+
})
|
|
189
|
+
.accounts({
|
|
190
|
+
dao,
|
|
191
|
+
authority: daoAcc.authority,
|
|
192
|
+
payer: daoAcc.authority,
|
|
193
|
+
})
|
|
194
|
+
.instruction());
|
|
195
|
+
if (!daoAcc.delegatorPool || daoAcc.delegatorPool.equals(web3_js_1.PublicKey.default)) {
|
|
196
|
+
instructions.push(yield hsdProgram.methods
|
|
197
|
+
.initializeHntDelegatorPool()
|
|
198
|
+
.accounts({
|
|
199
|
+
dao,
|
|
200
|
+
payer: daoAcc.authority,
|
|
201
|
+
delegatorPool: (0, spl_token_1.getAssociatedTokenAddressSync)(hntMint, dao, true),
|
|
202
|
+
authority: daoAcc.authority,
|
|
203
|
+
})
|
|
204
|
+
.instruction());
|
|
205
|
+
}
|
|
206
|
+
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
207
|
+
commitmentOrConfig: "finalized",
|
|
208
|
+
});
|
|
209
|
+
yield (0, utils_1.sendInstructionsOrSquads)({
|
|
210
|
+
provider,
|
|
211
|
+
instructions,
|
|
212
|
+
executeTransaction: argv.executeTransaction,
|
|
213
|
+
squads,
|
|
214
|
+
multisig: argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : undefined,
|
|
215
|
+
authorityIndex: argv.authorityIndex,
|
|
216
|
+
signers: [],
|
|
217
|
+
});
|
|
218
|
+
});
|
|
219
|
+
}
|
|
220
|
+
exports.run = run;
|
|
221
|
+
//# sourceMappingURL=migrate-to-hip-138.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrate-to-hip-138.js","sourceRoot":"","sources":["../../src/migrate-to-hip-138.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/update-dao.js
CHANGED
|
@@ -44,64 +44,70 @@ const sdk_1 = __importDefault(require("@sqds/sdk"));
|
|
|
44
44
|
const os_1 = __importDefault(require("os"));
|
|
45
45
|
const yargs_1 = __importDefault(require("yargs/yargs"));
|
|
46
46
|
const utils_1 = require("./utils");
|
|
47
|
+
const organization_sdk_1 = require("@helium/organization-sdk");
|
|
47
48
|
function run(args = process.argv) {
|
|
48
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
50
|
const yarg = (0, yargs_1.default)(args).options({
|
|
50
51
|
wallet: {
|
|
51
|
-
alias:
|
|
52
|
-
describe:
|
|
52
|
+
alias: "k",
|
|
53
|
+
describe: "Anchor wallet keypair",
|
|
53
54
|
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
54
55
|
},
|
|
55
56
|
url: {
|
|
56
|
-
alias:
|
|
57
|
-
default:
|
|
58
|
-
describe:
|
|
57
|
+
alias: "u",
|
|
58
|
+
default: "http://127.0.0.1:8899",
|
|
59
|
+
describe: "The solana url",
|
|
59
60
|
},
|
|
60
61
|
hntMint: {
|
|
61
62
|
required: true,
|
|
62
|
-
type:
|
|
63
|
-
describe:
|
|
63
|
+
type: "string",
|
|
64
|
+
describe: "HNT mint of the dao to be updated",
|
|
64
65
|
},
|
|
65
66
|
newAuthority: {
|
|
66
67
|
required: false,
|
|
67
|
-
describe:
|
|
68
|
-
type:
|
|
68
|
+
describe: "New DAO authority",
|
|
69
|
+
type: "string",
|
|
69
70
|
default: null,
|
|
70
71
|
},
|
|
71
72
|
newEmissionsSchedulePath: {
|
|
72
73
|
required: false,
|
|
73
|
-
describe:
|
|
74
|
-
type:
|
|
74
|
+
describe: "Path to file that contains the new emissions schedule",
|
|
75
|
+
type: "string",
|
|
75
76
|
default: null,
|
|
76
77
|
},
|
|
77
78
|
newHstEmissionsSchedulePath: {
|
|
78
79
|
required: false,
|
|
79
|
-
describe:
|
|
80
|
-
type:
|
|
80
|
+
describe: "Path to file that contains the new HST emissions schedule",
|
|
81
|
+
type: "string",
|
|
81
82
|
default: null,
|
|
82
83
|
},
|
|
83
84
|
newNetEmissionsCap: {
|
|
84
85
|
required: false,
|
|
85
|
-
describe:
|
|
86
|
-
type:
|
|
86
|
+
describe: "New net emissions cap, without decimals",
|
|
87
|
+
type: "string",
|
|
87
88
|
default: null,
|
|
88
89
|
},
|
|
90
|
+
delegatorRewardsPercent: {
|
|
91
|
+
type: "number",
|
|
92
|
+
required: true,
|
|
93
|
+
describe: "Percentage of rewards allocated to delegators. Must be between 0-100 and can have 8 decimal places.",
|
|
94
|
+
},
|
|
89
95
|
newHstPool: {
|
|
90
96
|
required: false,
|
|
91
|
-
describe:
|
|
92
|
-
type:
|
|
97
|
+
describe: "New HST Pool",
|
|
98
|
+
type: "string",
|
|
93
99
|
default: null,
|
|
94
100
|
},
|
|
95
101
|
executeTransaction: {
|
|
96
|
-
type:
|
|
102
|
+
type: "boolean",
|
|
97
103
|
},
|
|
98
104
|
multisig: {
|
|
99
|
-
type:
|
|
100
|
-
describe:
|
|
105
|
+
type: "string",
|
|
106
|
+
describe: "Address of the squads multisig to be authority. If not provided, your wallet will be the authority",
|
|
101
107
|
},
|
|
102
108
|
authorityIndex: {
|
|
103
|
-
type:
|
|
104
|
-
describe:
|
|
109
|
+
type: "number",
|
|
110
|
+
describe: "Authority index for squads. Defaults to 1",
|
|
105
111
|
default: 1,
|
|
106
112
|
},
|
|
107
113
|
});
|
|
@@ -144,6 +150,11 @@ function run(args = process.argv) {
|
|
|
144
150
|
? new anchor.BN(argv.newNetEmissionsCap)
|
|
145
151
|
: null,
|
|
146
152
|
hstPool: argv.newHstPool ? new web3_js_1.PublicKey(argv.newHstPool) : null,
|
|
153
|
+
proposalNamespace: (0, organization_sdk_1.organizationKey)("Helium")[0],
|
|
154
|
+
delegatorRewardsPercent: argv.delegatorRewardsPercent
|
|
155
|
+
? (0, helium_sub_daos_sdk_1.delegatorRewardsPercent)(argv.delegatorRewardsPercent)
|
|
156
|
+
: null,
|
|
157
|
+
rewardsEscrow: null,
|
|
147
158
|
})
|
|
148
159
|
.accounts({
|
|
149
160
|
dao,
|
|
@@ -152,7 +163,7 @@ function run(args = process.argv) {
|
|
|
152
163
|
})
|
|
153
164
|
.instruction());
|
|
154
165
|
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
155
|
-
commitmentOrConfig:
|
|
166
|
+
commitmentOrConfig: "finalized",
|
|
156
167
|
});
|
|
157
168
|
yield (0, utils_1.sendInstructionsOrSquads)({
|
|
158
169
|
provider,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-dao.js","sourceRoot":"","sources":["../../src/update-dao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qEAGqC;AACrC,
|
|
1
|
+
{"version":3,"file":"update-dao.js","sourceRoot":"","sources":["../../src/update-dao.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/update-subdao.js
CHANGED
|
@@ -110,12 +110,6 @@ function run(args = process.argv) {
|
|
|
110
110
|
describe: 'VSR Registrar of subdao',
|
|
111
111
|
default: null,
|
|
112
112
|
},
|
|
113
|
-
delegatorRewardsPercent: {
|
|
114
|
-
type: 'number',
|
|
115
|
-
required: false,
|
|
116
|
-
describe: 'Percentage of rewards allocated to delegators. Must be between 0-100 and can have 8 decimal places.',
|
|
117
|
-
default: null,
|
|
118
|
-
},
|
|
119
113
|
onboardingDcFee: {
|
|
120
114
|
type: 'number',
|
|
121
115
|
required: false,
|
|
@@ -193,10 +187,6 @@ function run(args = process.argv) {
|
|
|
193
187
|
})
|
|
194
188
|
.instruction());
|
|
195
189
|
}
|
|
196
|
-
if (argv.delegatorRewardsPercent &&
|
|
197
|
-
(argv.delegatorRewardsPercent > 100 || argv.delegatorRewardsPercent < 0)) {
|
|
198
|
-
throw new Error('Delegator rewards percent must be between 0 and 100');
|
|
199
|
-
}
|
|
200
190
|
instructions.push(yield program.methods
|
|
201
191
|
.updateSubDaoV0({
|
|
202
192
|
authority: argv.newAuthority ? new web3_js_1.PublicKey(argv.newAuthority) : null,
|
|
@@ -213,9 +203,6 @@ function run(args = process.argv) {
|
|
|
213
203
|
? new bn_js_1.BN(argv.onboardingDataOnlyDcFee)
|
|
214
204
|
: null,
|
|
215
205
|
registrar: argv.registrar ? new web3_js_1.PublicKey(argv.registrar) : null,
|
|
216
|
-
delegatorRewardsPercent: argv.delegatorRewardsPercent
|
|
217
|
-
? (0, helium_sub_daos_sdk_1.delegatorRewardsPercent)(argv.delegatorRewardsPercent)
|
|
218
|
-
: null,
|
|
219
206
|
activeDeviceAuthority: argv.activeDeviceAuthority
|
|
220
207
|
? new web3_js_1.PublicKey(argv.activeDeviceAuthority)
|
|
221
208
|
: null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-subdao.js","sourceRoot":"","sources":["../../src/update-subdao.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qEAIqC;AACrC,iFAG2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"update-subdao.js","sourceRoot":"","sources":["../../src/update-subdao.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
import * as anchor from "@coral-xyz/anchor";
|
|
2
|
+
import { daoKey, init as initHsd, subDaoEpochInfoKey } from "@helium/helium-sub-daos-sdk";
|
|
3
|
+
import { init as initProxy } from "@helium/nft-proxy-sdk";
|
|
4
|
+
import { batchParallelInstructionsWithPriorityFee, HNT_MINT } from "@helium/spl-utils";
|
|
5
|
+
import { init as initVsr } from "@helium/voter-stake-registry-sdk";
|
|
6
|
+
import { PublicKey, SystemProgram, SYSVAR_CLOCK_PUBKEY } from "@solana/web3.js";
|
|
7
|
+
import { min } from "bn.js";
|
|
8
|
+
import os from "os";
|
|
9
|
+
import yargs from "yargs/yargs";
|
|
10
|
+
import { loadKeypair } from "./utils";
|
|
11
|
+
export async function run(args = process.argv) {
|
|
12
|
+
const yarg = yargs(args).options({
|
|
13
|
+
wallet: {
|
|
14
|
+
alias: "k",
|
|
15
|
+
describe: "Anchor wallet keypair",
|
|
16
|
+
default: `${os.homedir()}/.config/solana/id.json`,
|
|
17
|
+
},
|
|
18
|
+
url: {
|
|
19
|
+
alias: "u",
|
|
20
|
+
default: "http://127.0.0.1:8899",
|
|
21
|
+
describe: "The solana url",
|
|
22
|
+
},
|
|
23
|
+
hntMint: {
|
|
24
|
+
type: "string",
|
|
25
|
+
describe: "HNT mint of the dao to be updated",
|
|
26
|
+
default: HNT_MINT.toBase58(),
|
|
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
|
+
const proxyProgram = await initProxy(provider);
|
|
36
|
+
const vsrProgram = await initVsr(provider);
|
|
37
|
+
const hsdProgram = await initHsd(provider);
|
|
38
|
+
const hntMint = new PublicKey(argv.hntMint);
|
|
39
|
+
const dao = daoKey(hntMint)[0];
|
|
40
|
+
const registrarK = (await hsdProgram.account.daoV0.fetch(dao)).registrar;
|
|
41
|
+
const registrar = await vsrProgram.account.registrar.fetch(registrarK);
|
|
42
|
+
const proxyConfig = await proxyProgram.account.proxyConfigV0.fetch(registrar.proxyConfig);
|
|
43
|
+
const instructions = [];
|
|
44
|
+
const delegations = await hsdProgram.account.delegatedPositionV0.all();
|
|
45
|
+
const needsMigration = delegations.filter(d => d.account.expirationTs.isZero());
|
|
46
|
+
const positionKeys = needsMigration.map(d => d.account.position);
|
|
47
|
+
const coder = hsdProgram.coder.accounts;
|
|
48
|
+
const positionAccs = (await getMultipleAccounts({
|
|
49
|
+
connection: provider.connection,
|
|
50
|
+
keys: positionKeys,
|
|
51
|
+
})).map(a => coder.decode("positionV0", a.data));
|
|
52
|
+
const currTs = await getSolanaUnixTimestamp(provider);
|
|
53
|
+
const currTsBN = new anchor.BN(currTs.toString());
|
|
54
|
+
const proxyEndTs = proxyConfig.seasons.find(s => currTsBN.gt(s.start))?.end;
|
|
55
|
+
for (const [delegation, position] of zip(needsMigration, positionAccs)) {
|
|
56
|
+
const subDao = delegation.account.subDao;
|
|
57
|
+
instructions.push(await hsdProgram.methods
|
|
58
|
+
.addExpirationTs()
|
|
59
|
+
.accountsStrict({
|
|
60
|
+
payer: wallet.publicKey,
|
|
61
|
+
position: delegation.account.position,
|
|
62
|
+
delegatedPosition: delegation.publicKey,
|
|
63
|
+
registrar: registrarK,
|
|
64
|
+
dao,
|
|
65
|
+
subDao: delegation.account.subDao,
|
|
66
|
+
oldClosingTimeSubDaoEpochInfo: subDaoEpochInfoKey(subDao, position.lockup.endTs)[0],
|
|
67
|
+
closingTimeSubDaoEpochInfo: subDaoEpochInfoKey(subDao, min(position.lockup.endTs, proxyEndTs))[0],
|
|
68
|
+
genesisEndSubDaoEpochInfo: subDaoEpochInfoKey(subDao, position.genesisEnd)[0],
|
|
69
|
+
proxyConfig: registrar.proxyConfig,
|
|
70
|
+
systemProgram: SystemProgram.programId,
|
|
71
|
+
})
|
|
72
|
+
.instruction());
|
|
73
|
+
}
|
|
74
|
+
await batchParallelInstructionsWithPriorityFee(provider, instructions, {
|
|
75
|
+
onProgress: (status) => {
|
|
76
|
+
console.log(status);
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
async function getMultipleAccounts({ connection, keys, }) {
|
|
81
|
+
const batchSize = 100;
|
|
82
|
+
const batches = Math.ceil(keys.length / batchSize);
|
|
83
|
+
const results = [];
|
|
84
|
+
for (let i = 0; i < batches; i++) {
|
|
85
|
+
const batchKeys = keys.slice(i * batchSize, (i + 1) * batchSize);
|
|
86
|
+
const batchResults = await connection.getMultipleAccountsInfo(batchKeys);
|
|
87
|
+
results.push(...batchResults);
|
|
88
|
+
}
|
|
89
|
+
return results;
|
|
90
|
+
}
|
|
91
|
+
function zip(a, b) {
|
|
92
|
+
return a.map((_, i) => [a[i], b[i]]);
|
|
93
|
+
}
|
|
94
|
+
async function getSolanaUnixTimestamp(provider) {
|
|
95
|
+
const clock = await provider.connection.getAccountInfo(SYSVAR_CLOCK_PUBKEY);
|
|
96
|
+
const unixTime = clock.data.readBigInt64LE(8 * 4);
|
|
97
|
+
return unixTime;
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=add-expiration-to-delegations.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-expiration-to-delegations.js","sourceRoot":"","sources":["../../../src/add-expiration-to-delegations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,IAAI,IAAI,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,wCAAwC,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AACvF,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAe,SAAS,EAAE,aAAa,EAAE,mBAAmB,EAA0B,MAAM,iBAAiB,CAAC;AACrH,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAEtC,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,OAAO,EAAE;YACP,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,mCAAmC;YAC7C,OAAO,EAAE,QAAQ,CAAC,QAAQ,EAAE;SAC7B;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,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC/C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,CAAC;IAG3C,MAAM,OAAO,GAAG,IAAI,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/B,MAAM,UAAU,GAAG,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC;IACzE,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,MAAM,YAAY,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAChE,SAAS,CAAC,WAAW,CACtB,CAAC;IAEF,MAAM,YAAY,GAA6B,EAAE,CAAC;IAClD,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,mBAAmB,CAAC,GAAG,EAAE,CAAA;IACtE,MAAM,cAAc,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAC;IAChF,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjE,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAA;IACvC,MAAM,YAAY,GAAG,CAAC,MAAM,mBAAmB,CAAC;QAC9C,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,IAAI,EAAE,YAAY;KACnB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAEjD,MAAM,MAAM,GAAG,MAAM,sBAAsB,CAAC,QAAQ,CAAC,CAAC;IACtD,MAAM,QAAQ,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;IAClD,MAAM,UAAU,GAAG,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC;IAC5E,KAAK,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,IAAI,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,EAAE;QACtE,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC;QACzC,YAAY,CAAC,IAAI,CACf,MAAM,UAAU,CAAC,OAAO;aACrB,eAAe,EAAE;aACjB,cAAc,CAAC;YACd,KAAK,EAAE,MAAM,CAAC,SAAS;YACvB,QAAQ,EAAE,UAAU,CAAC,OAAO,CAAC,QAAQ;YACrC,iBAAiB,EAAE,UAAU,CAAC,SAAS;YACvC,SAAS,EAAE,UAAU;YACrB,GAAG;YACH,MAAM,EAAE,UAAU,CAAC,OAAO,CAAC,MAAM;YACjC,6BAA6B,EAAE,kBAAkB,CAC/C,MAAM,EACN,QAAQ,CAAC,MAAM,CAAC,KAAK,CACtB,CAAC,CAAC,CAAC;YACJ,0BAA0B,EAAE,kBAAkB,CAC5C,MAAM,EACN,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,EAAE,UAAW,CAAC,CACxC,CAAC,CAAC,CAAC;YACJ,yBAAyB,EAAE,kBAAkB,CAC3C,MAAM,EACN,QAAQ,CAAC,UAAU,CACpB,CAAC,CAAC,CAAC;YACJ,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,aAAa,EAAE,aAAa,CAAC,SAAS;SACvC,CAAC;aACD,WAAW,EAAE,CACjB,CAAC;KACH;IAED,MAAM,wCAAwC,CAAC,QAAQ,EAAE,YAAY,EAAE;QACrE,UAAU,EAAE,CAAC,MAAM,EAAE,EAAE;YACrB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;KACF,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,EACjC,UAAU,EACV,IAAI,GACL;IACC,MAAM,SAAS,GAAG,GAAG,CAAC;IACtB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;IACnD,MAAM,OAAO,GAA0B,EAAE,CAAC;IAE1C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,EAAE,CAAC,EAAE,EAAE;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;QACjE,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACzE,OAAO,CAAC,IAAI,CAAC,GAAG,YAAY,CAAC,CAAC;KAC/B;IAED,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,GAAG,CAAO,CAAM,EAAE,CAAM;IAC/B,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACvC,CAAC;AAED,KAAK,UAAU,sBAAsB,CACnC,QAA+B;IAE/B,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC;IAC5E,MAAM,QAAQ,GAAG,KAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACnD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
|