@helium/helium-admin-cli 0.6.1 → 0.6.2-next.34
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/approve-maker.js +129 -0
- package/lib/cjs/approve-maker.js.map +1 -0
- package/lib/cjs/claim-rewards.js +1 -1
- package/lib/cjs/claim-rewards.js.map +1 -1
- package/lib/cjs/close-lazy-transaction-markers.js +18 -18
- package/lib/cjs/close-lazy-transaction-markers.js.map +1 -1
- package/lib/cjs/create-and-approve-makers.js +323 -0
- package/lib/cjs/create-and-approve-makers.js.map +1 -0
- package/lib/cjs/create-boost-config.js +156 -0
- package/lib/cjs/create-boost-config.js.map +1 -0
- package/lib/cjs/create-carrier.js +1 -0
- package/lib/cjs/create-carrier.js.map +1 -1
- package/lib/cjs/create-common-lut.js +190 -0
- package/lib/cjs/create-common-lut.js.map +1 -0
- package/lib/cjs/create-dao.js +89 -72
- package/lib/cjs/create-dao.js.map +1 -1
- package/lib/cjs/create-maker.js +122 -213
- package/lib/cjs/create-maker.js.map +1 -1
- package/lib/cjs/create-subdao.js +113 -94
- package/lib/cjs/create-subdao.js.map +1 -1
- package/lib/cjs/distribute-iot-operations-fund.js +1 -1
- package/lib/cjs/distribute-iot-operations-fund.js.map +1 -1
- package/lib/cjs/end-epoch.js +21 -27
- package/lib/cjs/end-epoch.js.map +1 -1
- package/lib/cjs/{temp-repair-marker-sizes.js → is-executed.js} +18 -19
- package/lib/cjs/is-executed.js.map +1 -0
- package/lib/cjs/reset-vsr-voting-mint.js +0 -2
- package/lib/cjs/reset-vsr-voting-mint.js.map +1 -1
- package/lib/cjs/set-delegation-config.js +136 -0
- package/lib/cjs/set-delegation-config.js.map +1 -0
- package/lib/cjs/update-boost-config.js +143 -0
- package/lib/cjs/update-boost-config.js.map +1 -0
- package/lib/cjs/{reset-vsr-max-voter-record.js → update-carrier.js} +58 -61
- package/lib/cjs/update-carrier.js.map +1 -0
- package/lib/cjs/update-price-oracle.js +120 -0
- package/lib/cjs/update-price-oracle.js.map +1 -0
- package/lib/cjs/update-registrar-authorities.js +7 -2
- package/lib/cjs/update-registrar-authorities.js.map +1 -1
- package/lib/cjs/update-rewardable-entity-config.js +13 -7
- package/lib/cjs/update-rewardable-entity-config.js.map +1 -1
- package/lib/cjs/utils.js +38 -9
- package/lib/cjs/utils.js.map +1 -1
- package/lib/esm/src/approve-maker.js +88 -0
- package/lib/esm/src/approve-maker.js.map +1 -0
- package/lib/esm/src/claim-rewards.js +1 -1
- package/lib/esm/src/claim-rewards.js.map +1 -1
- package/lib/esm/src/close-lazy-transaction-markers.js +18 -18
- package/lib/esm/src/close-lazy-transaction-markers.js.map +1 -1
- package/lib/esm/src/create-and-approve-makers.js +282 -0
- package/lib/esm/src/create-and-approve-makers.js.map +1 -0
- package/lib/esm/src/create-boost-config.js +115 -0
- package/lib/esm/src/create-boost-config.js.map +1 -0
- package/lib/esm/src/create-carrier.js +1 -0
- package/lib/esm/src/create-carrier.js.map +1 -1
- package/lib/esm/src/create-common-lut.js +149 -0
- package/lib/esm/src/create-common-lut.js.map +1 -0
- package/lib/esm/src/create-dao.js +106 -89
- package/lib/esm/src/create-dao.js.map +1 -1
- package/lib/esm/src/create-maker.js +131 -222
- package/lib/esm/src/create-maker.js.map +1 -1
- package/lib/esm/src/create-subdao.js +129 -110
- package/lib/esm/src/create-subdao.js.map +1 -1
- package/lib/esm/src/distribute-iot-operations-fund.js +1 -1
- package/lib/esm/src/distribute-iot-operations-fund.js.map +1 -1
- package/lib/esm/src/end-epoch.js +22 -28
- package/lib/esm/src/end-epoch.js.map +1 -1
- package/lib/esm/src/is-executed.js +39 -0
- package/lib/esm/src/is-executed.js.map +1 -0
- package/lib/esm/src/reset-vsr-voting-mint.js +0 -2
- package/lib/esm/src/reset-vsr-voting-mint.js.map +1 -1
- package/lib/esm/src/set-delegation-config.js +95 -0
- package/lib/esm/src/set-delegation-config.js.map +1 -0
- package/lib/esm/src/update-boost-config.js +102 -0
- package/lib/esm/src/update-boost-config.js.map +1 -0
- package/lib/esm/src/update-carrier.js +101 -0
- package/lib/esm/src/update-carrier.js.map +1 -0
- package/lib/esm/src/update-price-oracle.js +79 -0
- package/lib/esm/src/update-price-oracle.js.map +1 -0
- package/lib/esm/src/update-registrar-authorities.js +7 -2
- package/lib/esm/src/update-registrar-authorities.js.map +1 -1
- package/lib/esm/src/update-rewardable-entity-config.js +13 -7
- package/lib/esm/src/update-rewardable-entity-config.js.map +1 -1
- package/lib/esm/src/utils.js +39 -10
- package/lib/esm/src/utils.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/{temp-claim-failed-claims.d.ts → approve-maker.d.ts} +1 -1
- package/lib/types/src/approve-maker.d.ts.map +1 -0
- package/lib/types/src/close-lazy-transaction-markers.d.ts.map +1 -1
- package/lib/types/src/{reset-vsr-max-voter-record.d.ts → create-and-approve-makers.d.ts} +1 -1
- package/lib/types/src/create-and-approve-makers.d.ts.map +1 -0
- package/lib/types/src/{temp-repair-marker-sizes.d.ts → create-boost-config.d.ts} +1 -1
- package/lib/types/src/create-boost-config.d.ts.map +1 -0
- package/lib/types/src/create-carrier.d.ts.map +1 -1
- package/lib/types/src/create-common-lut.d.ts +2 -0
- package/lib/types/src/create-common-lut.d.ts.map +1 -0
- package/lib/types/src/create-dao.d.ts.map +1 -1
- package/lib/types/src/create-maker.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/is-executed.d.ts +2 -0
- package/lib/types/src/is-executed.d.ts.map +1 -0
- package/lib/types/src/reset-vsr-voting-mint.d.ts.map +1 -1
- package/lib/types/src/set-delegation-config.d.ts +2 -0
- package/lib/types/src/set-delegation-config.d.ts.map +1 -0
- package/lib/types/src/update-boost-config.d.ts +2 -0
- package/lib/types/src/update-boost-config.d.ts.map +1 -0
- package/lib/types/src/update-carrier.d.ts +2 -0
- package/lib/types/src/update-carrier.d.ts.map +1 -0
- package/lib/types/src/update-price-oracle.d.ts +2 -0
- package/lib/types/src/update-price-oracle.d.ts.map +1 -0
- package/lib/types/src/update-registrar-authorities.d.ts.map +1 -1
- package/lib/types/src/update-rewardable-entity-config.d.ts.map +1 -1
- package/lib/types/src/utils.d.ts.map +1 -1
- package/package.json +15 -14
- package/lib/cjs/reset-vsr-max-voter-record.js.map +0 -1
- package/lib/cjs/temp-claim-failed-claims.js +0 -149
- package/lib/cjs/temp-claim-failed-claims.js.map +0 -1
- package/lib/cjs/temp-repair-marker-sizes.js.map +0 -1
- package/lib/esm/src/reset-vsr-max-voter-record.js +0 -104
- package/lib/esm/src/reset-vsr-max-voter-record.js.map +0 -1
- package/lib/esm/src/temp-claim-failed-claims.js +0 -107
- package/lib/esm/src/temp-claim-failed-claims.js.map +0 -1
- package/lib/esm/src/temp-repair-marker-sizes.js +0 -41
- package/lib/esm/src/temp-repair-marker-sizes.js.map +0 -1
- package/lib/types/src/reset-vsr-max-voter-record.d.ts.map +0 -1
- package/lib/types/src/temp-claim-failed-claims.d.ts.map +0 -1
- package/lib/types/src/temp-repair-marker-sizes.d.ts.map +0 -1
package/lib/cjs/create-maker.js
CHANGED
|
@@ -36,88 +36,60 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
36
36
|
};
|
|
37
37
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
38
38
|
exports.run = void 0;
|
|
39
|
-
const
|
|
40
|
-
const KeyTypes_1 = require("@helium/address/build/KeyTypes");
|
|
39
|
+
const anchor = __importStar(require("@coral-xyz/anchor"));
|
|
41
40
|
const helium_entity_manager_sdk_1 = require("@helium/helium-entity-manager-sdk");
|
|
42
41
|
const helium_sub_daos_sdk_1 = require("@helium/helium-sub-daos-sdk");
|
|
43
|
-
const voter_stake_registry_sdk_1 = require("@helium/voter-stake-registry-sdk");
|
|
44
42
|
const spl_utils_1 = require("@helium/spl-utils");
|
|
45
|
-
const anchor = __importStar(require("@coral-xyz/anchor"));
|
|
46
43
|
const spl_account_compression_1 = require("@solana/spl-account-compression");
|
|
47
44
|
const web3_js_1 = require("@solana/web3.js");
|
|
48
45
|
const fs_1 = __importDefault(require("fs"));
|
|
49
46
|
const os_1 = __importDefault(require("os"));
|
|
50
47
|
const yargs_1 = __importDefault(require("yargs/yargs"));
|
|
51
48
|
const utils_1 = require("./utils");
|
|
52
|
-
const sdk_1 = __importDefault(require("@sqds/sdk"));
|
|
53
49
|
function run(args = process.argv) {
|
|
54
50
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
51
|
const yarg = (0, yargs_1.default)(args).options({
|
|
56
52
|
wallet: {
|
|
57
|
-
alias:
|
|
58
|
-
describe:
|
|
53
|
+
alias: "k",
|
|
54
|
+
describe: "Anchor wallet keypair",
|
|
59
55
|
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
60
56
|
},
|
|
61
|
-
executeTransaction: {
|
|
62
|
-
type: 'boolean',
|
|
63
|
-
},
|
|
64
57
|
url: {
|
|
65
|
-
alias:
|
|
66
|
-
default:
|
|
67
|
-
describe:
|
|
58
|
+
alias: "u",
|
|
59
|
+
default: "http://127.0.0.1:8899",
|
|
60
|
+
describe: "The solana url",
|
|
68
61
|
},
|
|
69
|
-
|
|
62
|
+
name: {
|
|
63
|
+
alias: "n",
|
|
64
|
+
type: "string",
|
|
70
65
|
required: true,
|
|
71
|
-
describe:
|
|
72
|
-
type: 'string',
|
|
66
|
+
describe: "The name of the maker",
|
|
73
67
|
},
|
|
74
|
-
|
|
75
|
-
type:
|
|
76
|
-
describe:
|
|
77
|
-
|
|
78
|
-
},
|
|
79
|
-
fromFile: {
|
|
80
|
-
describe: 'Load makers from a json file and create in bulk',
|
|
81
|
-
required: false,
|
|
82
|
-
type: 'string',
|
|
68
|
+
issuingAuthority: {
|
|
69
|
+
type: "string",
|
|
70
|
+
describe: "Key that can issue hotspots on behalf of this maker",
|
|
71
|
+
required: true,
|
|
83
72
|
},
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
required:
|
|
88
|
-
describe: 'The name of the maker',
|
|
73
|
+
updateAuthority: {
|
|
74
|
+
type: "string",
|
|
75
|
+
describe: "Key that can update the maker's issuing authority",
|
|
76
|
+
required: true,
|
|
89
77
|
},
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
required: false,
|
|
78
|
+
metadataUrl: {
|
|
79
|
+
type: "string",
|
|
80
|
+
describe: "URL to metadata for this maker. Should be JSON with at least { name, image, description }",
|
|
81
|
+
required: true,
|
|
95
82
|
},
|
|
96
83
|
makerCount: {
|
|
97
|
-
alias:
|
|
98
|
-
type:
|
|
99
|
-
describe:
|
|
100
|
-
required: false,
|
|
101
|
-
},
|
|
102
|
-
merkleBasePath: {
|
|
103
|
-
type: 'string',
|
|
104
|
-
describe: 'Base path for merkle keypairs',
|
|
105
|
-
default: `${__dirname}/../keypairs`,
|
|
106
|
-
},
|
|
107
|
-
symbol: {
|
|
108
|
-
alias: 's',
|
|
109
|
-
type: 'string',
|
|
84
|
+
alias: "c",
|
|
85
|
+
type: "number",
|
|
86
|
+
describe: "Estimated number of hotspots this maker will have",
|
|
110
87
|
required: true,
|
|
111
|
-
describe: 'The symbol of the entity config',
|
|
112
|
-
},
|
|
113
|
-
multisig: {
|
|
114
|
-
type: 'string',
|
|
115
|
-
describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
|
|
116
88
|
},
|
|
117
|
-
|
|
118
|
-
type:
|
|
119
|
-
describe:
|
|
120
|
-
default:
|
|
89
|
+
merkleBasePath: {
|
|
90
|
+
type: "string",
|
|
91
|
+
describe: "Base path for merkle keypairs",
|
|
92
|
+
default: `${__dirname}`,
|
|
121
93
|
},
|
|
122
94
|
});
|
|
123
95
|
const argv = yield yarg.argv;
|
|
@@ -125,96 +97,99 @@ function run(args = process.argv) {
|
|
|
125
97
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
126
98
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
127
99
|
const provider = anchor.getProvider();
|
|
128
|
-
const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
|
|
129
100
|
const name = argv.name;
|
|
130
|
-
const
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
name,
|
|
134
|
-
address: argv.makerKey,
|
|
135
|
-
count: argv.makerCount || 300000,
|
|
136
|
-
staked: true,
|
|
137
|
-
},
|
|
138
|
-
];
|
|
139
|
-
if (argv.fromFile) {
|
|
140
|
-
makers = JSON.parse(fs_1.default.readFileSync(argv.fromFile, 'utf-8'));
|
|
141
|
-
// Append a special fallthrough maker for hotspots that don't have a maker
|
|
142
|
-
const solAddr = provider.wallet.publicKey;
|
|
143
|
-
const helAddr = new address_1.default(0, 0, KeyTypes_1.ED25519_KEY_TYPE, solAddr.toBuffer());
|
|
144
|
-
makers.push({
|
|
145
|
-
name: 'Migrated Helium Hotspot',
|
|
146
|
-
address: helAddr.b58,
|
|
147
|
-
count: 50000,
|
|
148
|
-
staked: true,
|
|
149
|
-
});
|
|
150
|
-
}
|
|
101
|
+
const count = argv.makerCount;
|
|
102
|
+
const issuingAuthority = new web3_js_1.PublicKey(argv.issuingAuthority);
|
|
103
|
+
const updateAuthority = new web3_js_1.PublicKey(argv.updateAuthority);
|
|
151
104
|
const hemProgram = yield (0, helium_entity_manager_sdk_1.init)(provider);
|
|
152
|
-
const hsdProgram = yield (0, helium_sub_daos_sdk_1.init)(provider);
|
|
153
|
-
const vsrProgram = yield (0, voter_stake_registry_sdk_1.init)(provider);
|
|
154
105
|
const conn = provider.connection;
|
|
155
|
-
const
|
|
156
|
-
const subdao = (yield (0, helium_sub_daos_sdk_1.subDaoKey)(subdaoMint))[0];
|
|
157
|
-
const entityConfigKey = (yield (0, helium_entity_manager_sdk_1.rewardableEntityConfigKey)(subdao, symbol.toUpperCase()))[0];
|
|
158
|
-
const subdaoAcc = yield hsdProgram.account.subDaoV0.fetch(subdao);
|
|
159
|
-
const dao = yield hsdProgram.account.daoV0.fetch(subdaoAcc.dao);
|
|
160
|
-
let subdaoPayer = provider.wallet.publicKey;
|
|
106
|
+
const daoK = (0, helium_sub_daos_sdk_1.daoKey)(spl_utils_1.HNT_MINT)[0];
|
|
161
107
|
let daoPayer = provider.wallet.publicKey;
|
|
162
|
-
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
163
|
-
commitmentOrConfig: 'finalized',
|
|
164
|
-
});
|
|
165
|
-
let authority = provider.wallet.publicKey;
|
|
166
|
-
let multisig = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
|
|
167
|
-
if (multisig) {
|
|
168
|
-
authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
|
|
169
|
-
subdaoPayer = authority;
|
|
170
|
-
daoPayer = authority;
|
|
171
|
-
console.log('SQUAD AUTH', authority.toBase58());
|
|
172
|
-
}
|
|
173
|
-
const createInstructions = [];
|
|
174
|
-
const approveInstructions = [];
|
|
175
|
-
const updateAuthority = dao.authority;
|
|
176
108
|
let totalSol = 0;
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
Solana addr: ${makerAuthority.toBase58()}.
|
|
198
|
-
Size: ${size}, buffer: ${buffer}, canopy: ${canopy}.
|
|
109
|
+
const instructions = [];
|
|
110
|
+
const [size, buffer, canopy] = utils_1.merkleSizes.find(([height]) => Math.pow(2, height) > count * 2);
|
|
111
|
+
const space = (0, spl_account_compression_1.getConcurrentMerkleTreeAccountSize)(size, buffer, canopy);
|
|
112
|
+
const maker = yield (0, helium_entity_manager_sdk_1.makerKey)(daoK, name)[0];
|
|
113
|
+
const rent = yield provider.connection.getMinimumBalanceForRentExemption(space);
|
|
114
|
+
totalSol += rent;
|
|
115
|
+
let merkle;
|
|
116
|
+
const merklePath = `${argv.merkleBasePath}/merkle-${maker.toBase58()}.json`;
|
|
117
|
+
if (fs_1.default.existsSync(merklePath)) {
|
|
118
|
+
merkle = (0, utils_1.loadKeypair)(merklePath);
|
|
119
|
+
}
|
|
120
|
+
else {
|
|
121
|
+
merkle = web3_js_1.Keypair.generate();
|
|
122
|
+
fs_1.default.writeFileSync(merklePath, JSON.stringify(Array.from(merkle.secretKey)));
|
|
123
|
+
}
|
|
124
|
+
if (!(yield (0, utils_1.exists)(conn, maker))) {
|
|
125
|
+
console.log(`
|
|
126
|
+
Creating maker with address: ${maker.toBase58()}
|
|
127
|
+
Issuing Authority: ${issuingAuthority.toBase58()}.
|
|
128
|
+
Capacity: 2^${size}, buffer: ${buffer}, canopy: ${canopy}.
|
|
199
129
|
Space: ${space} bytes
|
|
200
130
|
Cost: ~${(0, spl_utils_1.humanReadable)(new anchor.BN(rent), 9)} Sol
|
|
201
131
|
`);
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
132
|
+
if (space > 10000000) {
|
|
133
|
+
throw new Error(`Space ${space} more than 10mb for tree ${size}, ${buffer}, ${canopy}}`);
|
|
134
|
+
}
|
|
135
|
+
const create = yield hemProgram.methods
|
|
136
|
+
.initializeMakerV0({
|
|
137
|
+
name: name,
|
|
138
|
+
metadataUrl: argv.metadataUrl,
|
|
139
|
+
issuingAuthority,
|
|
140
|
+
// Temp, since we need to set maker tree
|
|
141
|
+
updateAuthority: provider.wallet.publicKey,
|
|
142
|
+
})
|
|
143
|
+
.accounts({
|
|
144
|
+
maker,
|
|
145
|
+
payer: daoPayer,
|
|
146
|
+
dao: daoK,
|
|
147
|
+
})
|
|
148
|
+
.instruction();
|
|
149
|
+
const setTree = yield hemProgram.methods
|
|
150
|
+
.setMakerTreeV0({
|
|
151
|
+
maxDepth: size,
|
|
152
|
+
maxBufferSize: buffer,
|
|
153
|
+
})
|
|
154
|
+
.accounts({
|
|
155
|
+
maker,
|
|
156
|
+
merkleTree: merkle.publicKey,
|
|
157
|
+
payer: daoPayer,
|
|
158
|
+
updateAuthority: provider.wallet.publicKey,
|
|
159
|
+
})
|
|
160
|
+
.instruction();
|
|
161
|
+
if (!(yield (0, utils_1.exists)(conn, merkle.publicKey))) {
|
|
162
|
+
yield (0, spl_utils_1.sendInstructions)(provider, [
|
|
163
|
+
web3_js_1.SystemProgram.createAccount({
|
|
164
|
+
fromPubkey: provider.wallet.publicKey,
|
|
165
|
+
newAccountPubkey: merkle.publicKey,
|
|
166
|
+
lamports: yield provider.connection.getMinimumBalanceForRentExemption(space),
|
|
167
|
+
space: space,
|
|
168
|
+
programId: spl_account_compression_1.SPL_ACCOUNT_COMPRESSION_PROGRAM_ID,
|
|
169
|
+
}),
|
|
170
|
+
], [merkle]);
|
|
171
|
+
}
|
|
172
|
+
instructions.push(...[create, setTree].filter(spl_utils_1.truthy));
|
|
173
|
+
if (!updateAuthority.equals(provider.wallet.publicKey)) {
|
|
174
|
+
instructions.push(yield hemProgram.methods
|
|
175
|
+
.updateMakerV0({
|
|
176
|
+
issuingAuthority,
|
|
210
177
|
updateAuthority,
|
|
211
178
|
})
|
|
212
|
-
.accounts({
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
179
|
+
.accounts({ maker, updateAuthority: provider.wallet.publicKey })
|
|
180
|
+
.instruction());
|
|
181
|
+
}
|
|
182
|
+
}
|
|
183
|
+
else {
|
|
184
|
+
const makerAcc = yield hemProgram.account.makerV0.fetch(maker);
|
|
185
|
+
instructions.push(yield hemProgram.methods
|
|
186
|
+
.updateMakerV0({
|
|
187
|
+
issuingAuthority,
|
|
188
|
+
updateAuthority,
|
|
189
|
+
})
|
|
190
|
+
.accounts({ maker, updateAuthority: makerAcc.updateAuthority })
|
|
191
|
+
.instruction());
|
|
192
|
+
if (makerAcc.merkleTree.equals(web3_js_1.SystemProgram.programId)) {
|
|
218
193
|
const setTree = yield hemProgram.methods
|
|
219
194
|
.setMakerTreeV0({
|
|
220
195
|
maxDepth: size,
|
|
@@ -238,85 +213,19 @@ function run(args = process.argv) {
|
|
|
238
213
|
}),
|
|
239
214
|
], [merkle]);
|
|
240
215
|
}
|
|
241
|
-
|
|
242
|
-
}
|
|
243
|
-
else {
|
|
244
|
-
const makerAcc = yield hemProgram.account.makerV0.fetch(maker);
|
|
245
|
-
innerCreateInstrs.push(yield hemProgram.methods
|
|
246
|
-
.updateMakerV0({
|
|
247
|
-
issuingAuthority: makerAuthority,
|
|
248
|
-
updateAuthority,
|
|
249
|
-
})
|
|
250
|
-
.accounts({ maker, updateAuthority: makerAcc.updateAuthority })
|
|
251
|
-
.instruction());
|
|
252
|
-
if (makerAcc.merkleTree.equals(web3_js_1.SystemProgram.programId)) {
|
|
253
|
-
const setTree = yield hemProgram.methods
|
|
254
|
-
.setMakerTreeV0({
|
|
255
|
-
maxDepth: size,
|
|
256
|
-
maxBufferSize: buffer,
|
|
257
|
-
})
|
|
258
|
-
.accounts({
|
|
259
|
-
maker,
|
|
260
|
-
merkleTree: merkle.publicKey,
|
|
261
|
-
payer: daoPayer,
|
|
262
|
-
updateAuthority,
|
|
263
|
-
})
|
|
264
|
-
.instruction();
|
|
265
|
-
if (!(yield (0, utils_1.exists)(conn, merkle.publicKey))) {
|
|
266
|
-
yield (0, spl_utils_1.sendInstructions)(provider, [
|
|
267
|
-
web3_js_1.SystemProgram.createAccount({
|
|
268
|
-
fromPubkey: provider.wallet.publicKey,
|
|
269
|
-
newAccountPubkey: merkle.publicKey,
|
|
270
|
-
lamports: yield provider.connection.getMinimumBalanceForRentExemption(space),
|
|
271
|
-
space: space,
|
|
272
|
-
programId: spl_account_compression_1.SPL_ACCOUNT_COMPRESSION_PROGRAM_ID,
|
|
273
|
-
}),
|
|
274
|
-
], [merkle]);
|
|
275
|
-
}
|
|
276
|
-
innerCreateInstrs.push(setTree);
|
|
277
|
-
}
|
|
278
|
-
}
|
|
279
|
-
createInstructions.push(innerCreateInstrs);
|
|
280
|
-
const innerApproveInstrs = [];
|
|
281
|
-
let approve;
|
|
282
|
-
if (staked &&
|
|
283
|
-
!(yield (0, utils_1.exists)(conn, (0, helium_entity_manager_sdk_1.makerApprovalKey)(entityConfigKey, maker)[0]))) {
|
|
284
|
-
const authority = (yield hemProgram.account.rewardableEntityConfigV0.fetch(entityConfigKey)).authority;
|
|
285
|
-
approve = yield hemProgram.methods
|
|
286
|
-
.approveMakerV0()
|
|
287
|
-
.accounts({
|
|
288
|
-
maker,
|
|
289
|
-
rewardableEntityConfig: entityConfigKey,
|
|
290
|
-
authority,
|
|
291
|
-
payer: subdaoPayer,
|
|
292
|
-
})
|
|
293
|
-
.instruction();
|
|
294
|
-
innerApproveInstrs.push(approve);
|
|
295
|
-
}
|
|
296
|
-
approveInstructions.push(innerApproveInstrs);
|
|
297
|
-
}
|
|
298
|
-
console.log('Total sol needed: ', (0, spl_utils_1.humanReadable)(new anchor.BN(totalSol), 9));
|
|
299
|
-
if (multisig) {
|
|
300
|
-
// Approve instructions must execute after ALL create instructions
|
|
301
|
-
const instrs = createInstructions.flat().filter(spl_utils_1.truthy);
|
|
302
|
-
const approveInstrs = approveInstructions.flat().filter(spl_utils_1.truthy);
|
|
303
|
-
for (const chunk of (0, spl_utils_1.chunks)([...instrs, ...approveInstrs], 3)) {
|
|
304
|
-
yield (0, utils_1.sendInstructionsOrSquads)({
|
|
305
|
-
provider,
|
|
306
|
-
instructions: chunk,
|
|
307
|
-
signers: [],
|
|
308
|
-
executeTransaction: argv.executeTransaction,
|
|
309
|
-
squads,
|
|
310
|
-
multisig,
|
|
311
|
-
authorityIndex: argv.authorityIndex,
|
|
312
|
-
});
|
|
216
|
+
instructions.push(setTree);
|
|
313
217
|
}
|
|
314
218
|
}
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
}
|
|
219
|
+
console.log("Total sol needed: ", (0, spl_utils_1.humanReadable)(new anchor.BN(totalSol), 9));
|
|
220
|
+
const balance = yield provider.connection.getBalance(provider.wallet.publicKey);
|
|
221
|
+
if (balance < totalSol) {
|
|
222
|
+
throw new Error(`Insufficient balance: ${(0, spl_utils_1.humanReadable)(new anchor.BN(Math.floor(balance)), 9)} < ${(0, spl_utils_1.humanReadable)(new anchor.BN(totalSol), 9)}`);
|
|
319
223
|
}
|
|
224
|
+
yield (0, spl_utils_1.sendInstructions)(provider, yield (0, spl_utils_1.withPriorityFees)({
|
|
225
|
+
connection: provider.connection,
|
|
226
|
+
instructions,
|
|
227
|
+
feePayer: provider.wallet.publicKey
|
|
228
|
+
}));
|
|
320
229
|
});
|
|
321
230
|
}
|
|
322
231
|
exports.run = run;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-maker.js","sourceRoot":"","sources":["../../src/create-maker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"create-maker.js","sourceRoot":"","sources":["../../src/create-maker.ts"],"names":[],"mappings":"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"}
|