@helium/helium-admin-cli 0.2.21 → 0.2.22-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-carrier.js +18 -17
- package/lib/cjs/approve-carrier.js.map +1 -1
- package/lib/cjs/approve-program.js +21 -20
- package/lib/cjs/approve-program.js.map +1 -1
- package/lib/cjs/close-buffers.js +15 -14
- package/lib/cjs/close-buffers.js.map +1 -1
- package/lib/cjs/close-canopy.js +21 -17
- package/lib/cjs/close-canopy.js.map +1 -1
- package/lib/cjs/close-lazy-transaction-markers.js +108 -0
- package/lib/cjs/close-lazy-transaction-markers.js.map +1 -0
- package/lib/cjs/create-dao.js +72 -71
- package/lib/cjs/create-dao.js.map +1 -1
- package/lib/cjs/create-data-only-config.js +22 -21
- package/lib/cjs/create-data-only-config.js.map +1 -1
- package/lib/cjs/create-maker.js +44 -42
- package/lib/cjs/create-maker.js.map +1 -1
- package/lib/cjs/create-price-oracle.js +28 -22
- package/lib/cjs/create-price-oracle.js.map +1 -1
- package/lib/cjs/create-subdao.js +96 -92
- package/lib/cjs/create-subdao.js.map +1 -1
- package/lib/cjs/issue-iot-operations-fund.js +17 -16
- package/lib/cjs/issue-iot-operations-fund.js.map +1 -1
- package/lib/cjs/repair-iot-operations-fund.js +16 -15
- package/lib/cjs/repair-iot-operations-fund.js.map +1 -1
- package/lib/cjs/reset-clockwork.js +24 -23
- package/lib/cjs/reset-clockwork.js.map +1 -1
- package/lib/cjs/reset-vsr-max-voter-record.js +24 -23
- package/lib/cjs/reset-vsr-max-voter-record.js.map +1 -1
- package/lib/cjs/reset-vsr-voting-mint.js +24 -23
- package/lib/cjs/reset-vsr-voting-mint.js.map +1 -1
- package/lib/cjs/setup-hst.js +36 -35
- package/lib/cjs/setup-hst.js.map +1 -1
- package/lib/cjs/update-account-circuit-breaker.js +21 -18
- package/lib/cjs/update-account-circuit-breaker.js.map +1 -1
- package/lib/cjs/update-aggregator.js +21 -20
- package/lib/cjs/update-aggregator.js.map +1 -1
- package/lib/cjs/update-dao.js +47 -34
- package/lib/cjs/update-dao.js.map +1 -1
- package/lib/cjs/update-data-credits.js +19 -18
- package/lib/cjs/update-data-credits.js.map +1 -1
- package/lib/cjs/update-delegated-dc-subdao.js +18 -17
- package/lib/cjs/update-delegated-dc-subdao.js.map +1 -1
- package/lib/cjs/update-iot-operations-fund-metadata.js +2 -1
- package/lib/cjs/update-iot-operations-fund-metadata.js.map +1 -1
- package/lib/cjs/update-lazy-distributor.js +25 -24
- package/lib/cjs/update-lazy-distributor.js.map +1 -1
- package/lib/cjs/update-lazy-transactions.js +15 -14
- package/lib/cjs/update-lazy-transactions.js.map +1 -1
- package/lib/cjs/update-mint-circuit-breaker.js +18 -17
- package/lib/cjs/update-mint-circuit-breaker.js.map +1 -1
- package/lib/cjs/update-registrar-authorities.js +15 -11
- package/lib/cjs/update-registrar-authorities.js.map +1 -1
- package/lib/cjs/update-rewardable-entity-config.js +25 -24
- package/lib/cjs/update-rewardable-entity-config.js.map +1 -1
- package/lib/cjs/update-subdao-vehnt.js +35 -34
- package/lib/cjs/update-subdao-vehnt.js.map +1 -1
- package/lib/cjs/update-subdao.js +56 -46
- package/lib/cjs/update-subdao.js.map +1 -1
- package/lib/cjs/upgrade-idl.js +18 -17
- package/lib/cjs/upgrade-idl.js.map +1 -1
- package/lib/esm/src/approve-carrier.js +27 -26
- package/lib/esm/src/approve-carrier.js.map +1 -1
- package/lib/esm/src/approve-program.js +30 -29
- package/lib/esm/src/approve-program.js.map +1 -1
- package/lib/esm/src/close-buffers.js +23 -22
- package/lib/esm/src/close-buffers.js.map +1 -1
- package/lib/esm/src/close-canopy.js +28 -24
- package/lib/esm/src/close-canopy.js.map +1 -1
- package/lib/esm/src/close-lazy-transaction-markers.js +67 -0
- package/lib/esm/src/close-lazy-transaction-markers.js.map +1 -0
- package/lib/esm/src/create-dao.js +90 -89
- package/lib/esm/src/create-dao.js.map +1 -1
- package/lib/esm/src/create-data-only-config.js +34 -33
- package/lib/esm/src/create-data-only-config.js.map +1 -1
- package/lib/esm/src/create-maker.js +58 -56
- package/lib/esm/src/create-maker.js.map +1 -1
- package/lib/esm/src/create-price-oracle.js +37 -31
- package/lib/esm/src/create-price-oracle.js.map +1 -1
- package/lib/esm/src/create-subdao.js +112 -108
- package/lib/esm/src/create-subdao.js.map +1 -1
- package/lib/esm/src/issue-iot-operations-fund.js +27 -26
- package/lib/esm/src/issue-iot-operations-fund.js.map +1 -1
- package/lib/esm/src/repair-iot-operations-fund.js +24 -23
- package/lib/esm/src/repair-iot-operations-fund.js.map +1 -1
- package/lib/esm/src/reset-clockwork.js +31 -30
- package/lib/esm/src/reset-clockwork.js.map +1 -1
- package/lib/esm/src/reset-vsr-max-voter-record.js +32 -31
- package/lib/esm/src/reset-vsr-max-voter-record.js.map +1 -1
- package/lib/esm/src/reset-vsr-voting-mint.js +32 -31
- package/lib/esm/src/reset-vsr-voting-mint.js.map +1 -1
- package/lib/esm/src/setup-hst.js +50 -49
- package/lib/esm/src/setup-hst.js.map +1 -1
- package/lib/esm/src/update-account-circuit-breaker.js +29 -26
- package/lib/esm/src/update-account-circuit-breaker.js.map +1 -1
- package/lib/esm/src/update-aggregator.js +28 -27
- package/lib/esm/src/update-aggregator.js.map +1 -1
- package/lib/esm/src/update-dao.js +55 -42
- package/lib/esm/src/update-dao.js.map +1 -1
- package/lib/esm/src/update-data-credits.js +26 -25
- package/lib/esm/src/update-data-credits.js.map +1 -1
- package/lib/esm/src/update-delegated-dc-subdao.js +27 -26
- package/lib/esm/src/update-delegated-dc-subdao.js.map +1 -1
- package/lib/esm/src/update-iot-operations-fund-metadata.js +3 -2
- package/lib/esm/src/update-iot-operations-fund-metadata.js.map +1 -1
- package/lib/esm/src/update-lazy-distributor.js +32 -31
- package/lib/esm/src/update-lazy-distributor.js.map +1 -1
- package/lib/esm/src/update-lazy-transactions.js +22 -21
- package/lib/esm/src/update-lazy-transactions.js.map +1 -1
- package/lib/esm/src/update-mint-circuit-breaker.js +26 -25
- package/lib/esm/src/update-mint-circuit-breaker.js.map +1 -1
- package/lib/esm/src/update-registrar-authorities.js +22 -18
- package/lib/esm/src/update-registrar-authorities.js.map +1 -1
- package/lib/esm/src/update-rewardable-entity-config.js +34 -33
- package/lib/esm/src/update-rewardable-entity-config.js.map +1 -1
- package/lib/esm/src/update-subdao-vehnt.js +45 -44
- package/lib/esm/src/update-subdao-vehnt.js.map +1 -1
- package/lib/esm/src/update-subdao.js +67 -57
- package/lib/esm/src/update-subdao.js.map +1 -1
- package/lib/esm/src/upgrade-idl.js +24 -23
- package/lib/esm/src/upgrade-idl.js.map +1 -1
- package/lib/esm/tsconfig.esm.tsbuildinfo +1 -1
- package/lib/types/src/approve-carrier.d.ts.map +1 -1
- package/lib/types/src/approve-program.d.ts.map +1 -1
- package/lib/types/src/close-buffers.d.ts.map +1 -1
- package/lib/types/src/close-canopy.d.ts.map +1 -1
- package/lib/types/src/close-lazy-transaction-markers.d.ts +2 -0
- package/lib/types/src/close-lazy-transaction-markers.d.ts.map +1 -0
- package/lib/types/src/create-dao.d.ts.map +1 -1
- package/lib/types/src/create-data-only-config.d.ts.map +1 -1
- package/lib/types/src/create-maker.d.ts.map +1 -1
- package/lib/types/src/create-price-oracle.d.ts.map +1 -1
- package/lib/types/src/create-subdao.d.ts.map +1 -1
- package/lib/types/src/issue-iot-operations-fund.d.ts.map +1 -1
- package/lib/types/src/repair-iot-operations-fund.d.ts.map +1 -1
- package/lib/types/src/reset-clockwork.d.ts.map +1 -1
- package/lib/types/src/reset-vsr-max-voter-record.d.ts.map +1 -1
- package/lib/types/src/reset-vsr-voting-mint.d.ts.map +1 -1
- package/lib/types/src/setup-hst.d.ts +1 -1
- package/lib/types/src/setup-hst.d.ts.map +1 -1
- package/lib/types/src/update-aggregator.d.ts.map +1 -1
- package/lib/types/src/update-dao.d.ts.map +1 -1
- package/lib/types/src/update-data-credits.d.ts.map +1 -1
- package/lib/types/src/update-delegated-dc-subdao.d.ts.map +1 -1
- package/lib/types/src/update-iot-operations-fund-metadata.d.ts.map +1 -1
- package/lib/types/src/update-lazy-distributor.d.ts.map +1 -1
- package/lib/types/src/update-lazy-transactions.d.ts.map +1 -1
- package/lib/types/src/update-mint-circuit-breaker.d.ts.map +1 -1
- package/lib/types/src/update-rewardable-entity-config.d.ts.map +1 -1
- package/lib/types/src/update-subdao-vehnt.d.ts.map +1 -1
- package/lib/types/src/update-subdao.d.ts.map +1 -1
- package/lib/types/src/upgrade-idl.d.ts.map +1 -1
- package/package.json +25 -25
package/lib/cjs/create-maker.js
CHANGED
|
@@ -54,69 +54,69 @@ function run(args = process.argv) {
|
|
|
54
54
|
return __awaiter(this, void 0, void 0, function* () {
|
|
55
55
|
const yarg = (0, yargs_1.default)(args).options({
|
|
56
56
|
wallet: {
|
|
57
|
-
alias:
|
|
58
|
-
describe:
|
|
57
|
+
alias: 'k',
|
|
58
|
+
describe: 'Anchor wallet keypair',
|
|
59
59
|
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
60
60
|
},
|
|
61
61
|
executeTransaction: {
|
|
62
|
-
type:
|
|
62
|
+
type: 'boolean',
|
|
63
63
|
},
|
|
64
64
|
url: {
|
|
65
|
-
alias:
|
|
66
|
-
default:
|
|
67
|
-
describe:
|
|
65
|
+
alias: 'u',
|
|
66
|
+
default: 'http://127.0.0.1:8899',
|
|
67
|
+
describe: 'The solana url',
|
|
68
68
|
},
|
|
69
69
|
subdaoMint: {
|
|
70
70
|
required: true,
|
|
71
|
-
describe:
|
|
72
|
-
type:
|
|
71
|
+
describe: 'Public Key of the subdao mint',
|
|
72
|
+
type: 'string',
|
|
73
73
|
},
|
|
74
74
|
govProgramId: {
|
|
75
|
-
type:
|
|
76
|
-
describe:
|
|
77
|
-
default:
|
|
75
|
+
type: 'string',
|
|
76
|
+
describe: 'Pubkey of the GOV program',
|
|
77
|
+
default: 'hgovkRU6Ghe1Qoyb54HdSLdqN7VtxaifBzRmh9jtd3S',
|
|
78
78
|
},
|
|
79
79
|
fromFile: {
|
|
80
|
-
describe:
|
|
80
|
+
describe: 'Load makers from a json file and create in bulk',
|
|
81
81
|
required: false,
|
|
82
|
-
type:
|
|
82
|
+
type: 'string',
|
|
83
83
|
},
|
|
84
84
|
name: {
|
|
85
|
-
alias:
|
|
86
|
-
type:
|
|
85
|
+
alias: 'n',
|
|
86
|
+
type: 'string',
|
|
87
87
|
required: false,
|
|
88
|
-
describe:
|
|
88
|
+
describe: 'The name of the maker',
|
|
89
89
|
},
|
|
90
90
|
makerKey: {
|
|
91
|
-
alias:
|
|
92
|
-
type:
|
|
93
|
-
describe:
|
|
91
|
+
alias: 'm',
|
|
92
|
+
type: 'string',
|
|
93
|
+
describe: '*Helium* Public Key of a maker',
|
|
94
94
|
required: false,
|
|
95
95
|
},
|
|
96
96
|
makerCount: {
|
|
97
|
-
alias:
|
|
98
|
-
type:
|
|
99
|
-
describe:
|
|
97
|
+
alias: 'c',
|
|
98
|
+
type: 'number',
|
|
99
|
+
describe: 'Estimated number of hotspots this maker will have',
|
|
100
100
|
required: false,
|
|
101
101
|
},
|
|
102
102
|
merkleBasePath: {
|
|
103
|
-
type:
|
|
104
|
-
describe:
|
|
103
|
+
type: 'string',
|
|
104
|
+
describe: 'Base path for merkle keypairs',
|
|
105
105
|
default: `${__dirname}/../keypairs`,
|
|
106
106
|
},
|
|
107
107
|
symbol: {
|
|
108
|
-
alias:
|
|
109
|
-
type:
|
|
108
|
+
alias: 's',
|
|
109
|
+
type: 'string',
|
|
110
110
|
required: true,
|
|
111
|
-
describe:
|
|
111
|
+
describe: 'The symbol of the entity config',
|
|
112
112
|
},
|
|
113
113
|
multisig: {
|
|
114
|
-
type:
|
|
115
|
-
describe:
|
|
114
|
+
type: 'string',
|
|
115
|
+
describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
|
|
116
116
|
},
|
|
117
117
|
authorityIndex: {
|
|
118
|
-
type:
|
|
119
|
-
describe:
|
|
118
|
+
type: 'number',
|
|
119
|
+
describe: 'Authority index for squads. Defaults to 1',
|
|
120
120
|
default: 1,
|
|
121
121
|
},
|
|
122
122
|
});
|
|
@@ -125,6 +125,7 @@ function run(args = process.argv) {
|
|
|
125
125
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
126
126
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
127
127
|
const provider = anchor.getProvider();
|
|
128
|
+
const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
|
|
128
129
|
const name = argv.name;
|
|
129
130
|
const symbol = argv.symbol;
|
|
130
131
|
let makers = [
|
|
@@ -132,19 +133,19 @@ function run(args = process.argv) {
|
|
|
132
133
|
name,
|
|
133
134
|
address: argv.makerKey,
|
|
134
135
|
count: argv.makerCount || 300000,
|
|
135
|
-
staked: true
|
|
136
|
+
staked: true,
|
|
136
137
|
},
|
|
137
138
|
];
|
|
138
139
|
if (argv.fromFile) {
|
|
139
|
-
makers = JSON.parse(fs_1.default.readFileSync(argv.fromFile,
|
|
140
|
+
makers = JSON.parse(fs_1.default.readFileSync(argv.fromFile, 'utf-8'));
|
|
140
141
|
// Append a special fallthrough maker for hotspots that don't have a maker
|
|
141
142
|
const solAddr = provider.wallet.publicKey;
|
|
142
143
|
const helAddr = new address_1.default(0, 0, KeyTypes_1.ED25519_KEY_TYPE, solAddr.toBuffer());
|
|
143
144
|
makers.push({
|
|
144
|
-
name:
|
|
145
|
+
name: 'Migrated Helium Hotspot',
|
|
145
146
|
address: helAddr.b58,
|
|
146
147
|
count: 50000,
|
|
147
|
-
staked: true
|
|
148
|
+
staked: true,
|
|
148
149
|
});
|
|
149
150
|
}
|
|
150
151
|
const hemProgram = yield (0, helium_entity_manager_sdk_1.init)(provider);
|
|
@@ -158,8 +159,8 @@ function run(args = process.argv) {
|
|
|
158
159
|
const dao = yield hsdProgram.account.daoV0.fetch(subdaoAcc.dao);
|
|
159
160
|
let subdaoPayer = provider.wallet.publicKey;
|
|
160
161
|
let daoPayer = provider.wallet.publicKey;
|
|
161
|
-
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL,
|
|
162
|
-
commitmentOrConfig:
|
|
162
|
+
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
163
|
+
commitmentOrConfig: 'finalized',
|
|
163
164
|
});
|
|
164
165
|
let authority = provider.wallet.publicKey;
|
|
165
166
|
let multisig = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
|
|
@@ -167,7 +168,7 @@ function run(args = process.argv) {
|
|
|
167
168
|
authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
|
|
168
169
|
subdaoPayer = authority;
|
|
169
170
|
daoPayer = authority;
|
|
170
|
-
console.log(
|
|
171
|
+
console.log('SQUAD AUTH', authority.toBase58());
|
|
171
172
|
}
|
|
172
173
|
const createInstructions = [];
|
|
173
174
|
const approveInstructions = [];
|
|
@@ -194,7 +195,7 @@ function run(args = process.argv) {
|
|
|
194
195
|
console.log(`
|
|
195
196
|
Creating maker with helium addr: ${address}.
|
|
196
197
|
Solana addr: ${makerAuthority.toBase58()}.
|
|
197
|
-
Size: ${size}, buffer: ${buffer}, canopy: ${canopy}.
|
|
198
|
+
Size: ${size}, buffer: ${buffer}, canopy: ${canopy}.
|
|
198
199
|
Space: ${space} bytes
|
|
199
200
|
Cost: ~${(0, spl_utils_1.humanReadable)(new anchor.BN(rent), 9)} Sol
|
|
200
201
|
`);
|
|
@@ -204,7 +205,7 @@ function run(args = process.argv) {
|
|
|
204
205
|
const create = yield hemProgram.methods
|
|
205
206
|
.initializeMakerV0({
|
|
206
207
|
name: name,
|
|
207
|
-
metadataUrl:
|
|
208
|
+
metadataUrl: 'todo',
|
|
208
209
|
issuingAuthority: makerAuthority,
|
|
209
210
|
updateAuthority,
|
|
210
211
|
})
|
|
@@ -278,7 +279,8 @@ function run(args = process.argv) {
|
|
|
278
279
|
createInstructions.push(innerCreateInstrs);
|
|
279
280
|
const innerApproveInstrs = [];
|
|
280
281
|
let approve;
|
|
281
|
-
if (staked &&
|
|
282
|
+
if (staked &&
|
|
283
|
+
!(yield (0, utils_1.exists)(conn, (0, helium_entity_manager_sdk_1.makerApprovalKey)(entityConfigKey, maker)[0]))) {
|
|
282
284
|
const authority = (yield hemProgram.account.rewardableEntityConfigV0.fetch(entityConfigKey)).authority;
|
|
283
285
|
approve = yield hemProgram.methods
|
|
284
286
|
.approveMakerV0()
|
|
@@ -293,7 +295,7 @@ function run(args = process.argv) {
|
|
|
293
295
|
}
|
|
294
296
|
approveInstructions.push(innerApproveInstrs);
|
|
295
297
|
}
|
|
296
|
-
console.log(
|
|
298
|
+
console.log('Total sol needed: ', (0, spl_utils_1.humanReadable)(new anchor.BN(totalSol), 9));
|
|
297
299
|
if (multisig) {
|
|
298
300
|
// Approve instructions must execute after ALL create instructions
|
|
299
301
|
const instrs = createInstructions.flat().filter(spl_utils_1.truthy);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-maker.js","sourceRoot":"","sources":["../../src/create-maker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAsC;AACtC,6DAAkE;AAClE,iFAK2C;AAC3C,qEAAyE;AACzE,+EAAmE;AACnE,iDAK2B;AAC3B,0DAA4C;AAC5C,6EAGyC;AACzC,6CAKyB;AACzB,4CAAoB;AACpB,4CAAoB;AACpB,wDAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"create-maker.js","sourceRoot":"","sources":["../../src/create-maker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAsC;AACtC,6DAAkE;AAClE,iFAK2C;AAC3C,qEAAyE;AACzE,+EAAmE;AACnE,iDAK2B;AAC3B,0DAA4C;AAC5C,6EAGyC;AACzC,6CAKyB;AACzB,4CAAoB;AACpB,4CAAoB;AACpB,wDAAgC;AAChC,mCAKiB;AACjB,oDAA+B;AAE/B,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,kBAAkB,EAAE;gBAClB,IAAI,EAAE,SAAS;aAChB;YACD,GAAG,EAAE;gBACH,KAAK,EAAE,GAAG;gBACV,OAAO,EAAE,uBAAuB;gBAChC,QAAQ,EAAE,gBAAgB;aAC3B;YACD,UAAU,EAAE;gBACV,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,+BAA+B;gBACzC,IAAI,EAAE,QAAQ;aACf;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,2BAA2B;gBACrC,OAAO,EAAE,6CAA6C;aACvD;YACD,QAAQ,EAAE;gBACR,QAAQ,EAAE,iDAAiD;gBAC3D,QAAQ,EAAE,KAAK;gBACf,IAAI,EAAE,QAAQ;aACf;YACD,IAAI,EAAE;gBACJ,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,KAAK;gBACf,QAAQ,EAAE,uBAAuB;aAClC;YACD,QAAQ,EAAE;gBACR,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,gCAAgC;gBAC1C,QAAQ,EAAE,KAAK;aAChB;YACD,UAAU,EAAE;gBACV,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,mDAAmD;gBAC7D,QAAQ,EAAE,KAAK;aAChB;YACD,cAAc,EAAE;gBACd,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,+BAA+B;gBACzC,OAAO,EAAE,GAAG,SAAS,cAAc;aACpC;YACD,MAAM,EAAE;gBACN,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,QAAQ;gBACd,QAAQ,EAAE,IAAI;gBACd,QAAQ,EAAE,iCAAiC;aAC5C;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,MAAM,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,IAAA,mBAAW,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;QAE3D,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAE3B,IAAI,MAAM,GAAG;YACX;gBACE,IAAI;gBACJ,OAAO,EAAE,IAAI,CAAC,QAAQ;gBACtB,KAAK,EAAE,IAAI,CAAC,UAAU,IAAI,MAAM;gBAChC,MAAM,EAAE,IAAI;aACb;SACF,CAAC;QAEF,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,CAAC;YAC7D,0EAA0E;YAC1E,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,CAAC,EAAE,CAAC,EAAE,2BAAgB,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;YACxE,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,yBAAyB;gBAC/B,OAAO,EAAE,OAAO,CAAC,GAAG;gBACpB,KAAK,EAAE,KAAK;gBACZ,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;SACJ;QAED,MAAM,UAAU,GAAG,MAAM,IAAA,gCAAO,EAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,MAAM,IAAA,0BAAO,EAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,UAAU,GAAG,MAAM,IAAA,+BAAO,EAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC;QACjC,MAAM,UAAU,GAAG,IAAI,mBAAS,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClD,MAAM,MAAM,GAAG,CAAC,MAAM,IAAA,+BAAS,EAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAChD,MAAM,eAAe,GAAG,CACtB,MAAM,IAAA,qDAAyB,EAAC,MAAM,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAC9D,CAAC,CAAC,CAAC,CAAC;QAEL,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAClE,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QAChE,IAAI,WAAW,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;QAC5C,IAAI,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;QACzC,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,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;QAC1C,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;YAClE,WAAW,GAAG,SAAS,CAAC;YACxB,QAAQ,GAAG,SAAS,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC,CAAC;SACjD;QAED,MAAM,kBAAkB,GAA+B,EAAE,CAAC;QAC1D,MAAM,mBAAmB,GAA+B,EAAE,CAAC;QAC3D,MAAM,eAAe,GAAG,GAAG,CAAC,SAAS,CAAC;QACtC,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,KAAK,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,MAAM,EAAE;YACrD,MAAM,iBAAiB,GAA6B,EAAE,CAAC;YACvD,MAAM,cAAc,GAAG,IAAI,mBAAS,CAAC,iBAAO,CAAC,OAAO,CAAC,OAAQ,CAAC,CAAC,SAAS,CAAC,CAAC;YAC1E,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,mBAAW,CAAC,IAAI,CAC7C,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,KAAK,GAAG,CAAC,CAC7C,CAAC;YACH,MAAM,KAAK,GAAG,IAAA,4DAAkC,EAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;YACvE,MAAM,KAAK,GAAG,MAAM,IAAA,oCAAQ,EAAC,SAAS,CAAC,GAAG,EAAE,IAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACtD,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,iCAAiC,CACtE,KAAK,CACN,CAAC;YACF,QAAQ,IAAI,IAAI,CAAC;YAEjB,IAAI,MAAe,CAAC;YACpB,MAAM,UAAU,GAAG,GAAG,IAAI,CAAC,cAAc,WAAW,OAAO,OAAO,CAAC;YACnE,IAAI,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;gBAC7B,MAAM,GAAG,IAAA,mBAAW,EAAC,UAAU,CAAC,CAAC;aAClC;iBAAM;gBACL,MAAM,GAAG,iBAAO,CAAC,QAAQ,EAAE,CAAC;gBAC5B,YAAE,CAAC,aAAa,CACd,UAAU,EACV,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAC7C,CAAC;aACH;YAED,IAAI,CAAC,CAAC,MAAM,IAAA,cAAM,EAAC,IAAI,EAAE,KAAK,CAAC,CAAC,EAAE;gBAChC,OAAO,CAAC,GAAG,CACT;+CACuC,OAAO;2BAC3B,cAAc,CAAC,QAAQ,EAAE;oBAChC,IAAI,aAAa,MAAM,aAAa,MAAM;qBACzC,KAAK;qBACL,IAAA,yBAAa,EAAC,IAAI,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aAC7C,CACN,CAAC;gBAEF,IAAI,KAAK,GAAG,QAAQ,EAAE;oBACpB,MAAM,IAAI,KAAK,CACb,SAAS,KAAK,4BAA4B,IAAI,KAAK,MAAM,KAAK,MAAM,GAAG,CACxE,CAAC;iBACH;gBAED,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO;qBACpC,iBAAiB,CAAC;oBACjB,IAAI,EAAE,IAAK;oBACX,WAAW,EAAE,MAAM;oBACnB,gBAAgB,EAAE,cAAc;oBAChC,eAAe;iBAChB,CAAC;qBACD,QAAQ,CAAC;oBACR,KAAK;oBACL,KAAK,EAAE,QAAQ;oBACf,GAAG,EAAE,SAAS,CAAC,GAAG;iBACnB,CAAC;qBACD,WAAW,EAAE,CAAC;gBAEjB,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO;qBACrC,cAAc,CAAC;oBACd,QAAQ,EAAE,IAAI;oBACd,aAAa,EAAE,MAAM;iBACtB,CAAC;qBACD,QAAQ,CAAC;oBACR,KAAK;oBACL,UAAU,EAAE,MAAM,CAAC,SAAS;oBAC5B,KAAK,EAAE,QAAQ;oBACf,eAAe;iBAChB,CAAC;qBACD,WAAW,EAAE,CAAC;gBAEjB,IAAI,CAAC,CAAC,MAAM,IAAA,cAAM,EAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE;oBAC3C,MAAM,IAAA,4BAAgB,EACpB,QAAQ,EACR;wBACE,uBAAa,CAAC,aAAa,CAAC;4BAC1B,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;4BACrC,gBAAgB,EAAE,MAAM,CAAC,SAAS;4BAClC,QAAQ,EACN,MAAM,QAAQ,CAAC,UAAU,CAAC,iCAAiC,CACzD,KAAK,CACN;4BACH,KAAK,EAAE,KAAK;4BACZ,SAAS,EAAE,4DAAkC;yBAC9C,CAAC;qBACH,EACD,CAAC,MAAM,CAAC,CACT,CAAC;iBACH;gBACD,iBAAiB,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,kBAAM,CAAC,CAAC,CAAC;aAC7D;iBAAM;gBACL,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC/D,iBAAiB,CAAC,IAAI,CACpB,MAAM,UAAU,CAAC,OAAO;qBACrB,aAAa,CAAC;oBACb,gBAAgB,EAAE,cAAc;oBAChC,eAAe;iBAChB,CAAC;qBACD,QAAQ,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,QAAQ,CAAC,eAAe,EAAE,CAAC;qBAC9D,WAAW,EAAE,CACjB,CAAC;gBAEF,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,CAAC,uBAAa,CAAC,SAAS,CAAC,EAAE;oBACvD,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO;yBACrC,cAAc,CAAC;wBACd,QAAQ,EAAE,IAAI;wBACd,aAAa,EAAE,MAAM;qBACtB,CAAC;yBACD,QAAQ,CAAC;wBACR,KAAK;wBACL,UAAU,EAAE,MAAM,CAAC,SAAS;wBAC5B,KAAK,EAAE,QAAQ;wBACf,eAAe;qBAChB,CAAC;yBACD,WAAW,EAAE,CAAC;oBACjB,IAAI,CAAC,CAAC,MAAM,IAAA,cAAM,EAAC,IAAI,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE;wBAC3C,MAAM,IAAA,4BAAgB,EACpB,QAAQ,EACR;4BACE,uBAAa,CAAC,aAAa,CAAC;gCAC1B,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;gCACrC,gBAAgB,EAAE,MAAM,CAAC,SAAS;gCAClC,QAAQ,EACN,MAAM,QAAQ,CAAC,UAAU,CAAC,iCAAiC,CACzD,KAAK,CACN;gCACH,KAAK,EAAE,KAAK;gCACZ,SAAS,EAAE,4DAAkC;6BAC9C,CAAC;yBACH,EACD,CAAC,MAAM,CAAC,CACT,CAAC;qBACH;oBACD,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBACjC;aACF;YACD,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAE3C,MAAM,kBAAkB,GAA6B,EAAE,CAAC;YACxD,IAAI,OAA+B,CAAC;YACpC,IACE,MAAM;gBACN,CAAC,CAAC,MAAM,IAAA,cAAM,EAAC,IAAI,EAAE,IAAA,4CAAgB,EAAC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAClE;gBACA,MAAM,SAAS,GAAG,CAChB,MAAM,UAAU,CAAC,OAAO,CAAC,wBAAwB,CAAC,KAAK,CAAC,eAAe,CAAC,CACzE,CAAC,SAAS,CAAC;gBACZ,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO;qBAC/B,cAAc,EAAE;qBAChB,QAAQ,CAAC;oBACR,KAAK;oBACL,sBAAsB,EAAE,eAAe;oBACvC,SAAS;oBACT,KAAK,EAAE,WAAW;iBACnB,CAAC;qBACD,WAAW,EAAE,CAAC;gBACjB,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAClC;YAED,mBAAmB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;SAC9C;QAED,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,IAAA,yBAAa,EAAC,IAAI,MAAM,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAE7E,IAAI,QAAQ,EAAE;YACZ,kEAAkE;YAClE,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,kBAAM,CAAC,CAAC;YACxD,MAAM,aAAa,GAAG,mBAAmB,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,kBAAM,CAAC,CAAC;YAChE,KAAK,MAAM,KAAK,IAAI,IAAA,kBAAM,EAAC,CAAC,GAAG,MAAM,EAAE,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC,EAAE;gBAC5D,MAAM,IAAA,gCAAwB,EAAC;oBAC7B,QAAQ;oBACR,YAAY,EAAE,KAAK;oBACnB,OAAO,EAAE,EAAE;oBACX,kBAAkB,EAAE,IAAI,CAAC,kBAAkB;oBAC3C,MAAM;oBACN,QAAQ;oBACR,cAAc,EAAE,IAAI,CAAC,cAAc;iBACpC,CAAC,CAAC;aACJ;SACF;aAAM;YACL,KAAK,MAAM,MAAM,IAAI,CAAC,GAAG,kBAAkB,EAAE,GAAG,mBAAmB,CAAC,EAAE;gBACpE,MAAM,IAAA,4BAAgB,EAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;aAC9C;SACF;IACH,CAAC;CAAA;AA3TD,kBA2TC"}
|
|
@@ -49,38 +49,38 @@ function run(args = process.argv) {
|
|
|
49
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
50
50
|
const yarg = (0, yargs_1.default)(args).options({
|
|
51
51
|
wallet: {
|
|
52
|
-
alias:
|
|
53
|
-
describe:
|
|
52
|
+
alias: 'k',
|
|
53
|
+
describe: 'Anchor wallet keypair',
|
|
54
54
|
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
55
55
|
},
|
|
56
56
|
url: {
|
|
57
|
-
alias:
|
|
58
|
-
default:
|
|
59
|
-
describe:
|
|
57
|
+
alias: 'u',
|
|
58
|
+
default: 'http://127.0.0.1:8899',
|
|
59
|
+
describe: 'The solana url',
|
|
60
60
|
},
|
|
61
61
|
priceOracleKeypair: {
|
|
62
|
-
type:
|
|
62
|
+
type: 'string',
|
|
63
63
|
required: false,
|
|
64
|
-
describe:
|
|
64
|
+
describe: 'Keypair of the price oracle account',
|
|
65
65
|
default: null,
|
|
66
66
|
},
|
|
67
67
|
oracles: {
|
|
68
|
-
type:
|
|
68
|
+
type: 'string',
|
|
69
69
|
required: true,
|
|
70
70
|
describe: `JSON file of helium keypairs of the oracles`,
|
|
71
71
|
},
|
|
72
72
|
decimals: {
|
|
73
|
-
type:
|
|
73
|
+
type: 'number',
|
|
74
74
|
required: true,
|
|
75
|
-
describe:
|
|
75
|
+
describe: 'Number of decimals in the price',
|
|
76
76
|
},
|
|
77
77
|
multisig: {
|
|
78
|
-
type:
|
|
79
|
-
describe:
|
|
78
|
+
type: 'string',
|
|
79
|
+
describe: 'Address of the squads multisig to control the dao. If not provided, your wallet will be the authority',
|
|
80
80
|
},
|
|
81
81
|
authorityIndex: {
|
|
82
|
-
type:
|
|
83
|
-
describe:
|
|
82
|
+
type: 'number',
|
|
83
|
+
describe: 'Authority index for squads. Defaults to 1',
|
|
84
84
|
default: 1,
|
|
85
85
|
},
|
|
86
86
|
});
|
|
@@ -89,18 +89,21 @@ function run(args = process.argv) {
|
|
|
89
89
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
90
90
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
91
91
|
const provider = anchor.getProvider();
|
|
92
|
+
const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
|
|
92
93
|
const program = yield (0, price_oracle_sdk_1.init)(provider);
|
|
93
|
-
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL,
|
|
94
|
-
commitmentOrConfig:
|
|
94
|
+
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
95
|
+
commitmentOrConfig: 'finalized',
|
|
95
96
|
});
|
|
96
97
|
let authority = provider.wallet.publicKey;
|
|
97
98
|
let multisig = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
|
|
98
99
|
if (multisig) {
|
|
99
100
|
authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
|
|
100
101
|
}
|
|
101
|
-
const priceOracleKeypair = argv.priceOracleKeypair
|
|
102
|
+
const priceOracleKeypair = argv.priceOracleKeypair
|
|
103
|
+
? yield (0, utils_1.loadKeypair)(argv.priceOracleKeypair)
|
|
104
|
+
: web3_js_1.Keypair.generate();
|
|
102
105
|
if (yield (0, utils_1.exists)(provider.connection, priceOracleKeypair.publicKey)) {
|
|
103
|
-
console.log(
|
|
106
|
+
console.log('Price oracle already exists');
|
|
104
107
|
return;
|
|
105
108
|
}
|
|
106
109
|
const oracleKeys = JSON.parse(fs_1.default.readFileSync(argv.oracles).toString()).map((hKey) => (0, spl_utils_1.heliumAddressToSolPublicKey)(hKey));
|
|
@@ -111,14 +114,17 @@ function run(args = process.argv) {
|
|
|
111
114
|
lastSubmittedTimestamp: null,
|
|
112
115
|
};
|
|
113
116
|
});
|
|
114
|
-
yield program.methods
|
|
117
|
+
yield program.methods
|
|
118
|
+
.initializePriceOracleV0({
|
|
115
119
|
oracles,
|
|
116
120
|
decimals: argv.decimals,
|
|
117
|
-
authority
|
|
118
|
-
})
|
|
121
|
+
authority,
|
|
122
|
+
})
|
|
123
|
+
.accounts({
|
|
119
124
|
priceOracle: priceOracleKeypair.publicKey,
|
|
120
125
|
payer: provider.wallet.publicKey,
|
|
121
|
-
})
|
|
126
|
+
})
|
|
127
|
+
.signers([priceOracleKeypair])
|
|
122
128
|
.rpc({ skipPreflight: true });
|
|
123
129
|
console.log(`Created price oracle at: ${priceOracleKeypair.publicKey}`);
|
|
124
130
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-price-oracle.js","sourceRoot":"","sources":["../../src/create-price-oracle.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"create-price-oracle.js","sourceRoot":"","sources":["../../src/create-price-oracle.ts"],"names":[],"mappings":"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"}
|