@helium/helium-admin-cli 0.2.11 → 0.2.14-next.112
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/bin/helium-admin.js +5 -2
- 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/claim-rewards.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 +143 -0
- package/lib/cjs/close-lazy-transaction-markers.js.map +1 -0
- package/lib/cjs/create-carrier.js +29 -28
- package/lib/cjs/create-carrier.js.map +1 -1
- package/lib/cjs/create-dao.js +73 -78
- package/lib/cjs/create-dao.js.map +1 -1
- package/lib/cjs/create-data-only-config.js +175 -0
- package/lib/cjs/create-data-only-config.js.map +1 -0
- package/lib/cjs/create-maker.js +45 -43
- 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 +110 -132
- package/lib/cjs/create-subdao.js.map +1 -1
- package/lib/cjs/distribute-iot-operations-fund.js +120 -0
- package/lib/cjs/distribute-iot-operations-fund.js.map +1 -0
- package/lib/cjs/end-epoch.js +1 -1
- package/lib/cjs/end-epoch.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/issue-test-hotspot.js.map +1 -1
- package/lib/cjs/log-hotspot.js +9 -4
- package/lib/cjs/log-hotspot.js.map +1 -1
- package/lib/cjs/mint-dc.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 +33 -85
- package/lib/cjs/setup-hst.js.map +1 -1
- package/lib/cjs/submit-price.js.map +1 -1
- package/lib/cjs/{create-active-device-aggregator.js → take-snapshot.js} +7 -49
- package/lib/cjs/take-snapshot.js.map +1 -0
- package/lib/cjs/temp-claim-failed-claims.js +149 -0
- package/lib/cjs/temp-claim-failed-claims.js.map +1 -0
- 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-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-lazy-distributor.js +25 -24
- package/lib/cjs/update-lazy-distributor.js.map +1 -1
- package/lib/cjs/update-lazy-transactions.js +16 -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 +48 -5
- 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 +54 -61
- 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/cjs/utils.js +7 -52
- package/lib/cjs/utils.js.map +1 -1
- package/lib/cjs/{repair-iot-operations-fund.js → write-merkle-canopy-depths.js} +11 -49
- package/lib/cjs/write-merkle-canopy-depths.js.map +1 -0
- 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/claim-rewards.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 +102 -0
- package/lib/esm/src/close-lazy-transaction-markers.js.map +1 -0
- package/lib/esm/src/create-carrier.js +40 -39
- package/lib/esm/src/create-carrier.js.map +1 -1
- package/lib/esm/src/create-dao.js +87 -92
- package/lib/esm/src/create-dao.js.map +1 -1
- package/lib/esm/src/create-data-only-config.js +132 -0
- package/lib/esm/src/create-data-only-config.js.map +1 -0
- package/lib/esm/src/create-maker.js +59 -57
- 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 +126 -148
- package/lib/esm/src/create-subdao.js.map +1 -1
- package/lib/esm/src/distribute-iot-operations-fund.js +79 -0
- package/lib/esm/src/distribute-iot-operations-fund.js.map +1 -0
- package/lib/esm/src/end-epoch.js +1 -1
- package/lib/esm/src/end-epoch.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/issue-test-hotspot.js.map +1 -1
- package/lib/esm/src/log-hotspot.js +9 -4
- package/lib/esm/src/log-hotspot.js.map +1 -1
- package/lib/esm/src/mint-dc.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 +41 -92
- package/lib/esm/src/setup-hst.js.map +1 -1
- package/lib/esm/src/submit-price.js.map +1 -1
- package/lib/esm/src/take-snapshot.js +29 -0
- package/lib/esm/src/take-snapshot.js.map +1 -0
- package/lib/esm/src/temp-claim-failed-claims.js +107 -0
- package/lib/esm/src/temp-claim-failed-claims.js.map +1 -0
- 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-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-lazy-distributor.js +32 -31
- package/lib/esm/src/update-lazy-distributor.js.map +1 -1
- package/lib/esm/src/update-lazy-transactions.js +23 -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 +49 -6
- 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 +64 -71
- 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/src/utils.js +4 -46
- package/lib/esm/src/utils.js.map +1 -1
- package/lib/esm/src/write-merkle-canopy-depths.js +34 -0
- package/lib/esm/src/write-merkle-canopy-depths.js.map +1 -0
- 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-carrier.d.ts.map +1 -1
- package/lib/types/src/create-dao.d.ts.map +1 -1
- package/lib/types/src/{update-aggregator.d.ts → create-data-only-config.d.ts} +1 -1
- package/lib/types/src/create-data-only-config.d.ts.map +1 -0
- 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/distribute-iot-operations-fund.d.ts +2 -0
- package/lib/types/src/distribute-iot-operations-fund.d.ts.map +1 -0
- package/lib/types/src/issue-iot-operations-fund.d.ts.map +1 -1
- package/lib/types/src/log-hotspot.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 +0 -2
- package/lib/types/src/setup-hst.d.ts.map +1 -1
- package/lib/types/src/{reset-clockwork.d.ts → take-snapshot.d.ts} +1 -1
- package/lib/types/src/take-snapshot.d.ts.map +1 -0
- package/lib/types/src/{repair-iot-operations-fund.d.ts → temp-claim-failed-claims.d.ts} +1 -1
- package/lib/types/src/temp-claim-failed-claims.d.ts.map +1 -0
- 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-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/lib/types/src/utils.d.ts +1 -11
- package/lib/types/src/utils.d.ts.map +1 -1
- package/lib/types/src/write-merkle-canopy-depths.d.ts +2 -0
- package/lib/types/src/write-merkle-canopy-depths.d.ts.map +1 -0
- package/package.json +27 -30
- package/lib/cjs/create-active-device-aggregator.js.map +0 -1
- package/lib/cjs/repair-iot-operations-fund.js.map +0 -1
- package/lib/cjs/reset-clockwork.js +0 -143
- package/lib/cjs/reset-clockwork.js.map +0 -1
- package/lib/cjs/update-aggregator.js +0 -115
- package/lib/cjs/update-aggregator.js.map +0 -1
- package/lib/esm/src/create-active-device-aggregator.js +0 -71
- package/lib/esm/src/create-active-device-aggregator.js.map +0 -1
- package/lib/esm/src/repair-iot-operations-fund.js +0 -72
- package/lib/esm/src/repair-iot-operations-fund.js.map +0 -1
- package/lib/esm/src/reset-clockwork.js +0 -102
- package/lib/esm/src/reset-clockwork.js.map +0 -1
- package/lib/esm/src/update-aggregator.js +0 -74
- package/lib/esm/src/update-aggregator.js.map +0 -1
- package/lib/types/src/create-active-device-aggregator.d.ts +0 -2
- package/lib/types/src/create-active-device-aggregator.d.ts.map +0 -1
- package/lib/types/src/repair-iot-operations-fund.d.ts.map +0 -1
- package/lib/types/src/reset-clockwork.d.ts.map +0 -1
- package/lib/types/src/update-aggregator.d.ts.map +0 -1
|
@@ -1,83 +1,83 @@
|
|
|
1
|
-
import Address from
|
|
2
|
-
import { ED25519_KEY_TYPE } from
|
|
3
|
-
import { init as initHem, makerKey, rewardableEntityConfigKey, makerApprovalKey, } from
|
|
4
|
-
import { init as initHsd, subDaoKey } from
|
|
5
|
-
import { init as initVsr } from
|
|
6
|
-
import { chunks, humanReadable, sendInstructions, truthy, } from
|
|
7
|
-
import * as anchor from
|
|
8
|
-
import { getConcurrentMerkleTreeAccountSize, SPL_ACCOUNT_COMPRESSION_PROGRAM_ID, } from
|
|
9
|
-
import { Keypair, PublicKey, SystemProgram, } from
|
|
10
|
-
import fs from
|
|
11
|
-
import os from
|
|
12
|
-
import yargs from
|
|
13
|
-
import { exists, loadKeypair, sendInstructionsOrSquads, merkleSizes } from
|
|
14
|
-
import Squads from
|
|
1
|
+
import Address from '@helium/address';
|
|
2
|
+
import { ED25519_KEY_TYPE } from '@helium/address/build/KeyTypes';
|
|
3
|
+
import { init as initHem, makerKey, rewardableEntityConfigKey, makerApprovalKey, } from '@helium/helium-entity-manager-sdk';
|
|
4
|
+
import { init as initHsd, subDaoKey } from '@helium/helium-sub-daos-sdk';
|
|
5
|
+
import { init as initVsr } from '@helium/voter-stake-registry-sdk';
|
|
6
|
+
import { chunks, humanReadable, sendInstructions, truthy, } from '@helium/spl-utils';
|
|
7
|
+
import * as anchor from '@coral-xyz/anchor';
|
|
8
|
+
import { getConcurrentMerkleTreeAccountSize, SPL_ACCOUNT_COMPRESSION_PROGRAM_ID, } from '@solana/spl-account-compression';
|
|
9
|
+
import { Keypair, PublicKey, SystemProgram, } from '@solana/web3.js';
|
|
10
|
+
import fs from 'fs';
|
|
11
|
+
import os from 'os';
|
|
12
|
+
import yargs from 'yargs/yargs';
|
|
13
|
+
import { exists, loadKeypair, sendInstructionsOrSquads, merkleSizes, } from './utils';
|
|
14
|
+
import Squads from '@sqds/sdk';
|
|
15
15
|
export async function run(args = process.argv) {
|
|
16
16
|
const yarg = yargs(args).options({
|
|
17
17
|
wallet: {
|
|
18
|
-
alias:
|
|
19
|
-
describe:
|
|
18
|
+
alias: 'k',
|
|
19
|
+
describe: 'Anchor wallet keypair',
|
|
20
20
|
default: `${os.homedir()}/.config/solana/id.json`,
|
|
21
21
|
},
|
|
22
22
|
executeTransaction: {
|
|
23
|
-
type:
|
|
23
|
+
type: 'boolean',
|
|
24
24
|
},
|
|
25
25
|
url: {
|
|
26
|
-
alias:
|
|
27
|
-
default:
|
|
28
|
-
describe:
|
|
26
|
+
alias: 'u',
|
|
27
|
+
default: 'http://127.0.0.1:8899',
|
|
28
|
+
describe: 'The solana url',
|
|
29
29
|
},
|
|
30
30
|
subdaoMint: {
|
|
31
31
|
required: true,
|
|
32
|
-
describe:
|
|
33
|
-
type:
|
|
32
|
+
describe: 'Public Key of the subdao mint',
|
|
33
|
+
type: 'string',
|
|
34
34
|
},
|
|
35
35
|
govProgramId: {
|
|
36
|
-
type:
|
|
37
|
-
describe:
|
|
38
|
-
default:
|
|
36
|
+
type: 'string',
|
|
37
|
+
describe: 'Pubkey of the GOV program',
|
|
38
|
+
default: 'hgovkRU6Ghe1Qoyb54HdSLdqN7VtxaifBzRmh9jtd3S',
|
|
39
39
|
},
|
|
40
40
|
fromFile: {
|
|
41
|
-
describe:
|
|
41
|
+
describe: 'Load makers from a json file and create in bulk',
|
|
42
42
|
required: false,
|
|
43
|
-
type:
|
|
43
|
+
type: 'string',
|
|
44
44
|
},
|
|
45
45
|
name: {
|
|
46
|
-
alias:
|
|
47
|
-
type:
|
|
46
|
+
alias: 'n',
|
|
47
|
+
type: 'string',
|
|
48
48
|
required: false,
|
|
49
|
-
describe:
|
|
49
|
+
describe: 'The name of the maker',
|
|
50
50
|
},
|
|
51
51
|
makerKey: {
|
|
52
|
-
alias:
|
|
53
|
-
type:
|
|
54
|
-
describe:
|
|
52
|
+
alias: 'm',
|
|
53
|
+
type: 'string',
|
|
54
|
+
describe: '*Helium* Public Key of a maker',
|
|
55
55
|
required: false,
|
|
56
56
|
},
|
|
57
57
|
makerCount: {
|
|
58
|
-
alias:
|
|
59
|
-
type:
|
|
60
|
-
describe:
|
|
58
|
+
alias: 'c',
|
|
59
|
+
type: 'number',
|
|
60
|
+
describe: 'Estimated number of hotspots this maker will have',
|
|
61
61
|
required: false,
|
|
62
62
|
},
|
|
63
63
|
merkleBasePath: {
|
|
64
|
-
type:
|
|
65
|
-
describe:
|
|
64
|
+
type: 'string',
|
|
65
|
+
describe: 'Base path for merkle keypairs',
|
|
66
66
|
default: `${__dirname}/../keypairs`,
|
|
67
67
|
},
|
|
68
68
|
symbol: {
|
|
69
|
-
alias:
|
|
70
|
-
type:
|
|
69
|
+
alias: 's',
|
|
70
|
+
type: 'string',
|
|
71
71
|
required: true,
|
|
72
|
-
describe:
|
|
72
|
+
describe: 'The symbol of the entity config',
|
|
73
73
|
},
|
|
74
74
|
multisig: {
|
|
75
|
-
type:
|
|
76
|
-
describe:
|
|
75
|
+
type: 'string',
|
|
76
|
+
describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
|
|
77
77
|
},
|
|
78
78
|
authorityIndex: {
|
|
79
|
-
type:
|
|
80
|
-
describe:
|
|
79
|
+
type: 'number',
|
|
80
|
+
describe: 'Authority index for squads. Defaults to 1',
|
|
81
81
|
default: 1,
|
|
82
82
|
},
|
|
83
83
|
});
|
|
@@ -86,6 +86,7 @@ export async function run(args = process.argv) {
|
|
|
86
86
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
87
87
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
88
88
|
const provider = anchor.getProvider();
|
|
89
|
+
const wallet = new anchor.Wallet(loadKeypair(argv.wallet));
|
|
89
90
|
const name = argv.name;
|
|
90
91
|
const symbol = argv.symbol;
|
|
91
92
|
let makers = [
|
|
@@ -93,19 +94,19 @@ export async function run(args = process.argv) {
|
|
|
93
94
|
name,
|
|
94
95
|
address: argv.makerKey,
|
|
95
96
|
count: argv.makerCount || 300000,
|
|
96
|
-
staked: true
|
|
97
|
+
staked: true,
|
|
97
98
|
},
|
|
98
99
|
];
|
|
99
100
|
if (argv.fromFile) {
|
|
100
|
-
makers = JSON.parse(fs.readFileSync(argv.fromFile,
|
|
101
|
+
makers = JSON.parse(fs.readFileSync(argv.fromFile, 'utf-8'));
|
|
101
102
|
// Append a special fallthrough maker for hotspots that don't have a maker
|
|
102
103
|
const solAddr = provider.wallet.publicKey;
|
|
103
104
|
const helAddr = new Address(0, 0, ED25519_KEY_TYPE, solAddr.toBuffer());
|
|
104
105
|
makers.push({
|
|
105
|
-
name:
|
|
106
|
+
name: 'Migrated Helium Hotspot',
|
|
106
107
|
address: helAddr.b58,
|
|
107
108
|
count: 50000,
|
|
108
|
-
staked: true
|
|
109
|
+
staked: true,
|
|
109
110
|
});
|
|
110
111
|
}
|
|
111
112
|
const hemProgram = await initHem(provider);
|
|
@@ -119,8 +120,8 @@ export async function run(args = process.argv) {
|
|
|
119
120
|
const dao = await hsdProgram.account.daoV0.fetch(subdaoAcc.dao);
|
|
120
121
|
let subdaoPayer = provider.wallet.publicKey;
|
|
121
122
|
let daoPayer = provider.wallet.publicKey;
|
|
122
|
-
const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL,
|
|
123
|
-
commitmentOrConfig:
|
|
123
|
+
const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
124
|
+
commitmentOrConfig: 'finalized',
|
|
124
125
|
});
|
|
125
126
|
let authority = provider.wallet.publicKey;
|
|
126
127
|
let multisig = argv.multisig ? new PublicKey(argv.multisig) : null;
|
|
@@ -128,7 +129,7 @@ export async function run(args = process.argv) {
|
|
|
128
129
|
authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
|
|
129
130
|
subdaoPayer = authority;
|
|
130
131
|
daoPayer = authority;
|
|
131
|
-
console.log(
|
|
132
|
+
console.log('SQUAD AUTH', authority.toBase58());
|
|
132
133
|
}
|
|
133
134
|
const createInstructions = [];
|
|
134
135
|
const approveInstructions = [];
|
|
@@ -155,7 +156,7 @@ export async function run(args = process.argv) {
|
|
|
155
156
|
console.log(`
|
|
156
157
|
Creating maker with helium addr: ${address}.
|
|
157
158
|
Solana addr: ${makerAuthority.toBase58()}.
|
|
158
|
-
Size: ${size}, buffer: ${buffer}, canopy: ${canopy}.
|
|
159
|
+
Size: ${size}, buffer: ${buffer}, canopy: ${canopy}.
|
|
159
160
|
Space: ${space} bytes
|
|
160
161
|
Cost: ~${humanReadable(new anchor.BN(rent), 9)} Sol
|
|
161
162
|
`);
|
|
@@ -164,8 +165,8 @@ export async function run(args = process.argv) {
|
|
|
164
165
|
}
|
|
165
166
|
const create = await hemProgram.methods
|
|
166
167
|
.initializeMakerV0({
|
|
167
|
-
name,
|
|
168
|
-
metadataUrl:
|
|
168
|
+
name: name,
|
|
169
|
+
metadataUrl: 'todo',
|
|
169
170
|
issuingAuthority: makerAuthority,
|
|
170
171
|
updateAuthority,
|
|
171
172
|
})
|
|
@@ -239,7 +240,8 @@ export async function run(args = process.argv) {
|
|
|
239
240
|
createInstructions.push(innerCreateInstrs);
|
|
240
241
|
const innerApproveInstrs = [];
|
|
241
242
|
let approve;
|
|
242
|
-
if (staked &&
|
|
243
|
+
if (staked &&
|
|
244
|
+
!(await exists(conn, makerApprovalKey(entityConfigKey, maker)[0]))) {
|
|
243
245
|
const authority = (await hemProgram.account.rewardableEntityConfigV0.fetch(entityConfigKey)).authority;
|
|
244
246
|
approve = await hemProgram.methods
|
|
245
247
|
.approveMakerV0()
|
|
@@ -254,7 +256,7 @@ export async function run(args = process.argv) {
|
|
|
254
256
|
}
|
|
255
257
|
approveInstructions.push(innerApproveInstrs);
|
|
256
258
|
}
|
|
257
|
-
console.log(
|
|
259
|
+
console.log('Total sol needed: ', humanReadable(new anchor.BN(totalSol), 9));
|
|
258
260
|
if (multisig) {
|
|
259
261
|
// Approve instructions must execute after ALL create instructions
|
|
260
262
|
const instrs = createInstructions.flat().filter(truthy);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-maker.js","sourceRoot":"","sources":["../../../src/create-maker.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EACL,IAAI,IAAI,OAAO,EACf,QAAQ,EACR,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACzE,OAAO,EAAE,IAAI,IAAI,OAAO,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EACL,MAAM,EACN,aAAa,EACb,gBAAgB,EAChB,MAAM,GACP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EACL,kCAAkC,EAClC,kCAAkC,GACnC,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,OAAO,EACP,SAAS,EACT,aAAa,GAEd,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"create-maker.js","sourceRoot":"","sources":["../../../src/create-maker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,47 +1,47 @@
|
|
|
1
|
-
import { init
|
|
2
|
-
import * as anchor from
|
|
3
|
-
import { Keypair, PublicKey
|
|
4
|
-
import os from
|
|
5
|
-
import yargs from
|
|
6
|
-
import { exists, loadKeypair
|
|
7
|
-
import Squads from
|
|
8
|
-
import fs from
|
|
9
|
-
import { heliumAddressToSolPublicKey } from
|
|
1
|
+
import { init } from '@helium/price-oracle-sdk';
|
|
2
|
+
import * as anchor from '@coral-xyz/anchor';
|
|
3
|
+
import { Keypair, PublicKey } from '@solana/web3.js';
|
|
4
|
+
import os from 'os';
|
|
5
|
+
import yargs from 'yargs/yargs';
|
|
6
|
+
import { exists, loadKeypair } from './utils';
|
|
7
|
+
import Squads from '@sqds/sdk';
|
|
8
|
+
import fs from 'fs';
|
|
9
|
+
import { heliumAddressToSolPublicKey } from '@helium/spl-utils';
|
|
10
10
|
export async function run(args = process.argv) {
|
|
11
11
|
const yarg = yargs(args).options({
|
|
12
12
|
wallet: {
|
|
13
|
-
alias:
|
|
14
|
-
describe:
|
|
13
|
+
alias: 'k',
|
|
14
|
+
describe: 'Anchor wallet keypair',
|
|
15
15
|
default: `${os.homedir()}/.config/solana/id.json`,
|
|
16
16
|
},
|
|
17
17
|
url: {
|
|
18
|
-
alias:
|
|
19
|
-
default:
|
|
20
|
-
describe:
|
|
18
|
+
alias: 'u',
|
|
19
|
+
default: 'http://127.0.0.1:8899',
|
|
20
|
+
describe: 'The solana url',
|
|
21
21
|
},
|
|
22
22
|
priceOracleKeypair: {
|
|
23
|
-
type:
|
|
23
|
+
type: 'string',
|
|
24
24
|
required: false,
|
|
25
|
-
describe:
|
|
25
|
+
describe: 'Keypair of the price oracle account',
|
|
26
26
|
default: null,
|
|
27
27
|
},
|
|
28
28
|
oracles: {
|
|
29
|
-
type:
|
|
29
|
+
type: 'string',
|
|
30
30
|
required: true,
|
|
31
31
|
describe: `JSON file of helium keypairs of the oracles`,
|
|
32
32
|
},
|
|
33
33
|
decimals: {
|
|
34
|
-
type:
|
|
34
|
+
type: 'number',
|
|
35
35
|
required: true,
|
|
36
|
-
describe:
|
|
36
|
+
describe: 'Number of decimals in the price',
|
|
37
37
|
},
|
|
38
38
|
multisig: {
|
|
39
|
-
type:
|
|
40
|
-
describe:
|
|
39
|
+
type: 'string',
|
|
40
|
+
describe: 'Address of the squads multisig to control the dao. If not provided, your wallet will be the authority',
|
|
41
41
|
},
|
|
42
42
|
authorityIndex: {
|
|
43
|
-
type:
|
|
44
|
-
describe:
|
|
43
|
+
type: 'number',
|
|
44
|
+
describe: 'Authority index for squads. Defaults to 1',
|
|
45
45
|
default: 1,
|
|
46
46
|
},
|
|
47
47
|
});
|
|
@@ -50,18 +50,21 @@ export async function run(args = process.argv) {
|
|
|
50
50
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
51
51
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
52
52
|
const provider = anchor.getProvider();
|
|
53
|
+
const wallet = new anchor.Wallet(loadKeypair(argv.wallet));
|
|
53
54
|
const program = await init(provider);
|
|
54
|
-
const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL,
|
|
55
|
-
commitmentOrConfig:
|
|
55
|
+
const squads = Squads.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
56
|
+
commitmentOrConfig: 'finalized',
|
|
56
57
|
});
|
|
57
58
|
let authority = provider.wallet.publicKey;
|
|
58
59
|
let multisig = argv.multisig ? new PublicKey(argv.multisig) : null;
|
|
59
60
|
if (multisig) {
|
|
60
61
|
authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
|
|
61
62
|
}
|
|
62
|
-
const priceOracleKeypair = argv.priceOracleKeypair
|
|
63
|
+
const priceOracleKeypair = argv.priceOracleKeypair
|
|
64
|
+
? await loadKeypair(argv.priceOracleKeypair)
|
|
65
|
+
: Keypair.generate();
|
|
63
66
|
if (await exists(provider.connection, priceOracleKeypair.publicKey)) {
|
|
64
|
-
console.log(
|
|
67
|
+
console.log('Price oracle already exists');
|
|
65
68
|
return;
|
|
66
69
|
}
|
|
67
70
|
const oracleKeys = JSON.parse(fs.readFileSync(argv.oracles).toString()).map((hKey) => heliumAddressToSolPublicKey(hKey));
|
|
@@ -72,14 +75,17 @@ export async function run(args = process.argv) {
|
|
|
72
75
|
lastSubmittedTimestamp: null,
|
|
73
76
|
};
|
|
74
77
|
});
|
|
75
|
-
await program.methods
|
|
78
|
+
await program.methods
|
|
79
|
+
.initializePriceOracleV0({
|
|
76
80
|
oracles,
|
|
77
81
|
decimals: argv.decimals,
|
|
78
|
-
authority
|
|
79
|
-
})
|
|
82
|
+
authority,
|
|
83
|
+
})
|
|
84
|
+
.accounts({
|
|
80
85
|
priceOracle: priceOracleKeypair.publicKey,
|
|
81
86
|
payer: provider.wallet.publicKey,
|
|
82
|
-
})
|
|
87
|
+
})
|
|
88
|
+
.signers([priceOracleKeypair])
|
|
83
89
|
.rpc({ skipPreflight: true });
|
|
84
90
|
console.log(`Created price oracle at: ${priceOracleKeypair.publicKey}`);
|
|
85
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-price-oracle.js","sourceRoot":"","sources":["../../../src/create-price-oracle.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"create-price-oracle.js","sourceRoot":"","sources":["../../../src/create-price-oracle.ts"],"names":[],"mappings":"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"}
|