@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
|
@@ -47,43 +47,43 @@ function run(args = process.argv) {
|
|
|
47
47
|
return __awaiter(this, void 0, void 0, function* () {
|
|
48
48
|
const yarg = (0, yargs_1.default)(args).options({
|
|
49
49
|
wallet: {
|
|
50
|
-
alias:
|
|
51
|
-
describe:
|
|
50
|
+
alias: 'k',
|
|
51
|
+
describe: 'Anchor wallet keypair',
|
|
52
52
|
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
53
53
|
},
|
|
54
54
|
url: {
|
|
55
|
-
alias:
|
|
56
|
-
default:
|
|
57
|
-
describe:
|
|
55
|
+
alias: 'u',
|
|
56
|
+
default: 'http://127.0.0.1:8899',
|
|
57
|
+
describe: 'The solana url',
|
|
58
58
|
},
|
|
59
59
|
hntMint: {
|
|
60
|
-
type:
|
|
61
|
-
describe:
|
|
60
|
+
type: 'string',
|
|
61
|
+
describe: 'Mint of the HNT token. Only used if --resetDaoThread flag is set',
|
|
62
62
|
},
|
|
63
63
|
dntMint: {
|
|
64
|
-
type:
|
|
65
|
-
describe:
|
|
64
|
+
type: 'string',
|
|
65
|
+
describe: 'Mint of the subdao token. Only used if --resetSubDaoThread flag is set',
|
|
66
66
|
},
|
|
67
67
|
resetDaoThread: {
|
|
68
|
-
type:
|
|
69
|
-
describe:
|
|
68
|
+
type: 'boolean',
|
|
69
|
+
describe: 'Reset the dao clockwork thread',
|
|
70
70
|
default: false,
|
|
71
71
|
},
|
|
72
72
|
resetSubDaoThread: {
|
|
73
|
-
type:
|
|
74
|
-
describe:
|
|
73
|
+
type: 'boolean',
|
|
74
|
+
describe: 'Reset the subdao clockwork thread',
|
|
75
75
|
default: false,
|
|
76
76
|
},
|
|
77
77
|
executeTransaction: {
|
|
78
|
-
type:
|
|
78
|
+
type: 'boolean',
|
|
79
79
|
},
|
|
80
80
|
multisig: {
|
|
81
|
-
type:
|
|
82
|
-
describe:
|
|
81
|
+
type: 'string',
|
|
82
|
+
describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
|
|
83
83
|
},
|
|
84
84
|
authorityIndex: {
|
|
85
|
-
type:
|
|
86
|
-
describe:
|
|
85
|
+
type: 'number',
|
|
86
|
+
describe: 'Authority index for squads. Defaults to 1',
|
|
87
87
|
default: 1,
|
|
88
88
|
},
|
|
89
89
|
});
|
|
@@ -92,17 +92,18 @@ function run(args = process.argv) {
|
|
|
92
92
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
93
93
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
94
94
|
if (argv.resetSubDaoThread && !argv.dntMint) {
|
|
95
|
-
console.log(
|
|
95
|
+
console.log('dnt mint not provided');
|
|
96
96
|
return;
|
|
97
97
|
}
|
|
98
98
|
const provider = anchor.getProvider();
|
|
99
|
+
const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
|
|
99
100
|
const hsdProgram = yield (0, helium_sub_daos_sdk_1.init)(provider);
|
|
100
101
|
const instructions = [];
|
|
101
|
-
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL,
|
|
102
|
-
commitmentOrConfig:
|
|
102
|
+
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
103
|
+
commitmentOrConfig: 'finalized',
|
|
103
104
|
});
|
|
104
105
|
if (argv.resetDaoThread) {
|
|
105
|
-
console.log(
|
|
106
|
+
console.log('resetting dao thread');
|
|
106
107
|
const hntMint = new web3_js_1.PublicKey(argv.hntMint);
|
|
107
108
|
const dao = (0, helium_sub_daos_sdk_1.daoKey)(hntMint)[0];
|
|
108
109
|
const daoAcc = yield hsdProgram.account.daoV0.fetch(dao);
|
|
@@ -115,7 +116,7 @@ function run(args = process.argv) {
|
|
|
115
116
|
.instruction());
|
|
116
117
|
}
|
|
117
118
|
if (argv.resetSubDaoThread) {
|
|
118
|
-
console.log(
|
|
119
|
+
console.log('resetting subdao thread');
|
|
119
120
|
const dntMint = new web3_js_1.PublicKey(argv.dntMint);
|
|
120
121
|
const subDao = (0, helium_sub_daos_sdk_1.subDaoKey)(dntMint)[0];
|
|
121
122
|
const subdaoAcc = yield hsdProgram.account.subDaoV0.fetch(subDao);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset-clockwork.js","sourceRoot":"","sources":["../../src/reset-clockwork.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qEAIqC;AACrC,6CAAoE;AACpE,oDAA+B;AAC/B,4CAAoB;AACpB,wDAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"reset-clockwork.js","sourceRoot":"","sources":["../../src/reset-clockwork.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,43 +48,43 @@ function run(args = process.argv) {
|
|
|
48
48
|
return __awaiter(this, void 0, void 0, function* () {
|
|
49
49
|
const yarg = (0, yargs_1.default)(args).options({
|
|
50
50
|
wallet: {
|
|
51
|
-
alias:
|
|
52
|
-
describe:
|
|
51
|
+
alias: 'k',
|
|
52
|
+
describe: 'Anchor wallet keypair',
|
|
53
53
|
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
54
54
|
},
|
|
55
55
|
url: {
|
|
56
|
-
alias:
|
|
57
|
-
default:
|
|
58
|
-
describe:
|
|
56
|
+
alias: 'u',
|
|
57
|
+
default: 'http://127.0.0.1:8899',
|
|
58
|
+
describe: 'The solana url',
|
|
59
59
|
},
|
|
60
60
|
hntMint: {
|
|
61
|
-
type:
|
|
62
|
-
describe:
|
|
61
|
+
type: 'string',
|
|
62
|
+
describe: 'Mint of the HNT token. Only used if --resetDaoRecord flag is set',
|
|
63
63
|
},
|
|
64
64
|
dntMint: {
|
|
65
|
-
type:
|
|
66
|
-
describe:
|
|
65
|
+
type: 'string',
|
|
66
|
+
describe: 'Mint of the subdao token. Only used if --resetSubDaoRecord flag is set',
|
|
67
67
|
},
|
|
68
68
|
resetDaoRecord: {
|
|
69
|
-
type:
|
|
70
|
-
describe:
|
|
69
|
+
type: 'boolean',
|
|
70
|
+
describe: 'Reset the dao max vote weight record',
|
|
71
71
|
default: false,
|
|
72
72
|
},
|
|
73
73
|
resetSubDaoRecord: {
|
|
74
|
-
type:
|
|
75
|
-
describe:
|
|
74
|
+
type: 'boolean',
|
|
75
|
+
describe: 'Reset the subdao max vote weight record',
|
|
76
76
|
default: false,
|
|
77
77
|
},
|
|
78
78
|
executeTransaction: {
|
|
79
|
-
type:
|
|
79
|
+
type: 'boolean',
|
|
80
80
|
},
|
|
81
81
|
multisig: {
|
|
82
|
-
type:
|
|
83
|
-
describe:
|
|
82
|
+
type: 'string',
|
|
83
|
+
describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
|
|
84
84
|
},
|
|
85
85
|
authorityIndex: {
|
|
86
|
-
type:
|
|
87
|
-
describe:
|
|
86
|
+
type: 'number',
|
|
87
|
+
describe: 'Authority index for squads. Defaults to 1',
|
|
88
88
|
default: 1,
|
|
89
89
|
},
|
|
90
90
|
});
|
|
@@ -93,18 +93,19 @@ function run(args = process.argv) {
|
|
|
93
93
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
94
94
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
95
95
|
if (argv.resetSubDaoRecord && !argv.dntMint) {
|
|
96
|
-
console.log(
|
|
96
|
+
console.log('dnt mint not provided');
|
|
97
97
|
return;
|
|
98
98
|
}
|
|
99
99
|
const provider = anchor.getProvider();
|
|
100
|
+
const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
|
|
100
101
|
const hsdProgram = yield (0, helium_sub_daos_sdk_1.init)(provider);
|
|
101
102
|
const hvsrProgram = yield (0, voter_stake_registry_sdk_1.init)(provider);
|
|
102
103
|
const instructions = [];
|
|
103
|
-
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL,
|
|
104
|
-
commitmentOrConfig:
|
|
104
|
+
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
105
|
+
commitmentOrConfig: 'finalized',
|
|
105
106
|
});
|
|
106
107
|
if (argv.resetDaoRecord) {
|
|
107
|
-
console.log(
|
|
108
|
+
console.log('resetting dao maxVoterWeightRecord');
|
|
108
109
|
const hntMint = new web3_js_1.PublicKey(argv.hntMint);
|
|
109
110
|
const dao = (0, helium_sub_daos_sdk_1.daoKey)(hntMint)[0];
|
|
110
111
|
const daoAcc = yield hsdProgram.account.daoV0.fetch(dao);
|
|
@@ -117,7 +118,7 @@ function run(args = process.argv) {
|
|
|
117
118
|
.instruction());
|
|
118
119
|
}
|
|
119
120
|
if (argv.resetSubDaoRecord) {
|
|
120
|
-
console.log(
|
|
121
|
+
console.log('resetting subdao maxVoterWeightRecord');
|
|
121
122
|
const dntMint = new web3_js_1.PublicKey(argv.dntMint);
|
|
122
123
|
const subDao = (0, helium_sub_daos_sdk_1.subDaoKey)(dntMint)[0];
|
|
123
124
|
const subDaoAcc = yield hsdProgram.account.subDaoV0.fetch(subDao);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset-vsr-max-voter-record.js","sourceRoot":"","sources":["../../src/reset-vsr-max-voter-record.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qEAIqC;AACrC,+EAAmE;AACnE,6CAAoE;AACpE,oDAA+B;AAC/B,4CAAoB;AACpB,wDAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"reset-vsr-max-voter-record.js","sourceRoot":"","sources":["../../src/reset-vsr-max-voter-record.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,43 +51,43 @@ function run(args = process.argv) {
|
|
|
51
51
|
return __awaiter(this, void 0, void 0, function* () {
|
|
52
52
|
const yarg = (0, yargs_1.default)(args).options({
|
|
53
53
|
wallet: {
|
|
54
|
-
alias:
|
|
55
|
-
describe:
|
|
54
|
+
alias: 'k',
|
|
55
|
+
describe: 'Anchor wallet keypair',
|
|
56
56
|
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
57
57
|
},
|
|
58
58
|
url: {
|
|
59
|
-
alias:
|
|
60
|
-
default:
|
|
61
|
-
describe:
|
|
59
|
+
alias: 'u',
|
|
60
|
+
default: 'http://127.0.0.1:8899',
|
|
61
|
+
describe: 'The solana url',
|
|
62
62
|
},
|
|
63
63
|
hntMint: {
|
|
64
|
-
type:
|
|
65
|
-
describe:
|
|
64
|
+
type: 'string',
|
|
65
|
+
describe: 'Mint of the HNT token. Only used if --resetDaoVotingMint flag is set',
|
|
66
66
|
},
|
|
67
67
|
dntMint: {
|
|
68
|
-
type:
|
|
69
|
-
describe:
|
|
68
|
+
type: 'string',
|
|
69
|
+
describe: 'Mint of the subdao token. Only used if --resetSubDaoVotingMint flag is set',
|
|
70
70
|
},
|
|
71
71
|
resetDaoVotingMint: {
|
|
72
|
-
type:
|
|
73
|
-
describe:
|
|
72
|
+
type: 'boolean',
|
|
73
|
+
describe: 'Reset the dao voting mint',
|
|
74
74
|
default: false,
|
|
75
75
|
},
|
|
76
76
|
resetSubDaoVotingMint: {
|
|
77
|
-
type:
|
|
78
|
-
describe:
|
|
77
|
+
type: 'boolean',
|
|
78
|
+
describe: 'Reset the subdao voting mint',
|
|
79
79
|
default: false,
|
|
80
80
|
},
|
|
81
81
|
executeTransaction: {
|
|
82
|
-
type:
|
|
82
|
+
type: 'boolean',
|
|
83
83
|
},
|
|
84
84
|
multisig: {
|
|
85
|
-
type:
|
|
86
|
-
describe:
|
|
85
|
+
type: 'string',
|
|
86
|
+
describe: 'Address of the squads multisig to be authority. If not provided, your wallet will be the authority',
|
|
87
87
|
},
|
|
88
88
|
authorityIndex: {
|
|
89
|
-
type:
|
|
90
|
-
describe:
|
|
89
|
+
type: 'number',
|
|
90
|
+
describe: 'Authority index for squads. Defaults to 1',
|
|
91
91
|
default: 1,
|
|
92
92
|
},
|
|
93
93
|
});
|
|
@@ -96,20 +96,21 @@ function run(args = process.argv) {
|
|
|
96
96
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
97
97
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
98
98
|
if (argv.resetSubDaoVotingMint && !argv.dntMint) {
|
|
99
|
-
console.log(
|
|
99
|
+
console.log('dnt mint not provided');
|
|
100
100
|
return;
|
|
101
101
|
}
|
|
102
102
|
const provider = anchor.getProvider();
|
|
103
|
+
const wallet = new anchor.Wallet((0, utils_1.loadKeypair)(argv.wallet));
|
|
103
104
|
const hsdProgram = yield (0, helium_sub_daos_sdk_1.init)(provider);
|
|
104
105
|
const hvsrProgram = yield (0, voter_stake_registry_sdk_1.init)(provider);
|
|
105
106
|
const now = Number(yield (0, utils_1.getUnixTimestamp)(provider));
|
|
106
107
|
const in7Days = now + (0, utils_1.getTimestampFromDays)(7);
|
|
107
108
|
const instructions = [];
|
|
108
|
-
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL,
|
|
109
|
-
commitmentOrConfig:
|
|
109
|
+
const squads = sdk_1.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
110
|
+
commitmentOrConfig: 'finalized',
|
|
110
111
|
});
|
|
111
112
|
if (argv.resetDaoVotingMint) {
|
|
112
|
-
console.log(
|
|
113
|
+
console.log('resetting dao votingMint');
|
|
113
114
|
const hntMint = new web3_js_1.PublicKey(argv.hntMint);
|
|
114
115
|
const dao = (0, helium_sub_daos_sdk_1.daoKey)(hntMint)[0];
|
|
115
116
|
const daoAcc = yield hsdProgram.account.daoV0.fetch(dao);
|
|
@@ -138,7 +139,7 @@ function run(args = process.argv) {
|
|
|
138
139
|
.instruction());
|
|
139
140
|
}
|
|
140
141
|
if (argv.resetSubDaoVotingMint) {
|
|
141
|
-
console.log(
|
|
142
|
+
console.log('resetting subdao votingMint');
|
|
142
143
|
const dntMint = new web3_js_1.PublicKey(argv.dntMint);
|
|
143
144
|
const subDao = (0, helium_sub_daos_sdk_1.subDaoKey)(dntMint)[0];
|
|
144
145
|
const subdaoAcc = yield hsdProgram.account.subDaoV0.fetch(subDao);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reset-vsr-voting-mint.js","sourceRoot":"","sources":["../../src/reset-vsr-voting-mint.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0DAA4C;AAC5C,qEAIqC;AACrC,+EAAmE;AACnE,6CAAoE;AACpE,oDAA+B;AAC/B,4CAAoB;AACpB,wDAAgC;AAChC,
|
|
1
|
+
{"version":3,"file":"reset-vsr-voting-mint.js","sourceRoot":"","sources":["../../src/reset-vsr-voting-mint.ts"],"names":[],"mappings":"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"}
|
package/lib/cjs/setup-hst.js
CHANGED
|
@@ -55,51 +55,51 @@ function run(args = process.argv) {
|
|
|
55
55
|
return __awaiter(this, void 0, void 0, function* () {
|
|
56
56
|
const yarg = (0, yargs_1.default)(args).options({
|
|
57
57
|
wallet: {
|
|
58
|
-
alias:
|
|
59
|
-
describe:
|
|
58
|
+
alias: 'k',
|
|
59
|
+
describe: 'Anchor wallet keypair',
|
|
60
60
|
default: `${os_1.default.homedir()}/.config/solana/id.json`,
|
|
61
61
|
},
|
|
62
62
|
url: {
|
|
63
|
-
alias:
|
|
64
|
-
default:
|
|
65
|
-
describe:
|
|
63
|
+
alias: 'u',
|
|
64
|
+
default: 'http://127.0.0.1:8899',
|
|
65
|
+
describe: 'The solana url',
|
|
66
66
|
},
|
|
67
67
|
hnt: {
|
|
68
|
-
type:
|
|
69
|
-
describe:
|
|
68
|
+
type: 'string',
|
|
69
|
+
describe: 'Pubkey of hnt',
|
|
70
70
|
required: true,
|
|
71
71
|
},
|
|
72
72
|
state: {
|
|
73
|
-
type:
|
|
74
|
-
alias:
|
|
73
|
+
type: 'string',
|
|
74
|
+
alias: 's',
|
|
75
75
|
default: `${__dirname}/../../migration-service/export.json`,
|
|
76
76
|
},
|
|
77
77
|
name: {
|
|
78
|
-
type:
|
|
78
|
+
type: 'string',
|
|
79
79
|
},
|
|
80
80
|
multisig: {
|
|
81
|
-
type:
|
|
82
|
-
describe:
|
|
81
|
+
type: 'string',
|
|
82
|
+
describe: 'Address of the squads multisig to control the dao. If not provided, your wallet will be the authority',
|
|
83
83
|
},
|
|
84
84
|
authorityIndex: {
|
|
85
|
-
type:
|
|
86
|
-
describe:
|
|
85
|
+
type: 'number',
|
|
86
|
+
describe: 'Authority index for squads. Defaults to 1',
|
|
87
87
|
default: 1,
|
|
88
88
|
},
|
|
89
89
|
hstKeypair: {
|
|
90
|
-
type:
|
|
91
|
-
describe:
|
|
90
|
+
type: 'string',
|
|
91
|
+
describe: 'Keypair of the HST token',
|
|
92
92
|
default: `${__dirname}/../keypairs/hst.json`,
|
|
93
93
|
},
|
|
94
94
|
hstReceiptBasePath: {
|
|
95
|
-
type:
|
|
96
|
-
describe:
|
|
97
|
-
default: `${__dirname}/../keypairs
|
|
95
|
+
type: 'string',
|
|
96
|
+
describe: 'Keypair of the HST receipt token',
|
|
97
|
+
default: `${__dirname}/../keypairs`,
|
|
98
98
|
},
|
|
99
99
|
bucket: {
|
|
100
|
-
type:
|
|
101
|
-
describe:
|
|
102
|
-
default:
|
|
100
|
+
type: 'string',
|
|
101
|
+
describe: 'Bucket URL prefix holding all of the metadata jsons',
|
|
102
|
+
default: 'https://shdw-drive.genesysgo.net/6tcnBSybPG7piEDShBcrVtYJDPSvGrDbVvXmXKpzBvWP',
|
|
103
103
|
},
|
|
104
104
|
});
|
|
105
105
|
const argv = yield yarg.argv;
|
|
@@ -107,11 +107,12 @@ function run(args = process.argv) {
|
|
|
107
107
|
process.env.ANCHOR_PROVIDER_URL = argv.url;
|
|
108
108
|
anchor.setProvider(anchor.AnchorProvider.local(argv.url));
|
|
109
109
|
const provider = anchor.getProvider();
|
|
110
|
+
const wallet = new anchor.Wallet((0, solana_js_1.loadKeypair)(argv.wallet));
|
|
110
111
|
const hstKeypair = (0, solana_js_1.loadKeypair)(argv.hstKeypair);
|
|
111
112
|
let authority = provider.wallet.publicKey;
|
|
112
113
|
let multisig = argv.multisig ? new web3_js_1.PublicKey(argv.multisig) : null;
|
|
113
|
-
const squads = sdk_2.default.endpoint(process.env.ANCHOR_PROVIDER_URL,
|
|
114
|
-
commitmentOrConfig:
|
|
114
|
+
const squads = sdk_2.default.endpoint(process.env.ANCHOR_PROVIDER_URL, wallet, {
|
|
115
|
+
commitmentOrConfig: 'finalized',
|
|
115
116
|
});
|
|
116
117
|
if (multisig) {
|
|
117
118
|
authority = squads.getAuthorityPDA(multisig, argv.authorityIndex);
|
|
@@ -137,7 +138,7 @@ function run(args = process.argv) {
|
|
|
137
138
|
});
|
|
138
139
|
const fanout = (0, fanout_sdk_1.fanoutKey)(argv.name)[0];
|
|
139
140
|
const hntAccount = yield (0, spl_token_1.getAssociatedTokenAddressSync)(hnt, fanout, true);
|
|
140
|
-
console.log(
|
|
141
|
+
console.log('Outputting hnt to', hntAccount.toBase58());
|
|
141
142
|
if (!(yield (0, utils_1.exists)(provider.connection, fanout))) {
|
|
142
143
|
yield fanoutProgram.methods
|
|
143
144
|
.initializeFanoutV0({
|
|
@@ -155,7 +156,7 @@ function run(args = process.argv) {
|
|
|
155
156
|
}
|
|
156
157
|
const clockworkProvider = new sdk_1.ClockworkProvider(provider.wallet, provider.connection);
|
|
157
158
|
for (const [address, account] of Object.entries(accounts)) {
|
|
158
|
-
if (!account.hst || account.hst === 0 || account.hst ===
|
|
159
|
+
if (!account.hst || account.hst === 0 || account.hst === '0') {
|
|
159
160
|
continue;
|
|
160
161
|
}
|
|
161
162
|
let solAddress = toSolana(address);
|
|
@@ -175,7 +176,7 @@ function run(args = process.argv) {
|
|
|
175
176
|
const ownerActual = (_a = (yield provider.connection.getTokenLargestAccounts(mint.publicKey)).value[0]) === null || _a === void 0 ? void 0 : _a.address;
|
|
176
177
|
if (ownerActual && ownerActual.toBase58() !== solAddress.toBase58()) {
|
|
177
178
|
const acc = yield (0, spl_token_1.getAccount)(provider.connection, ownerActual);
|
|
178
|
-
console.log(
|
|
179
|
+
console.log('Found diff address', solAddress.toBase58(), acc.owner.toBase58());
|
|
179
180
|
solAddress = acc.owner;
|
|
180
181
|
}
|
|
181
182
|
const [voucher] = (0, fanout_sdk_1.membershipVoucherKey)(mint.publicKey);
|
|
@@ -188,7 +189,7 @@ function run(args = process.argv) {
|
|
|
188
189
|
.accounts({
|
|
189
190
|
recipient: solAddress,
|
|
190
191
|
fanout,
|
|
191
|
-
mint: mint.publicKey
|
|
192
|
+
mint: mint.publicKey,
|
|
192
193
|
})
|
|
193
194
|
.signers([mint])
|
|
194
195
|
.rpc({ skipPreflight: true });
|
|
@@ -196,14 +197,14 @@ function run(args = process.argv) {
|
|
|
196
197
|
// 2️⃣ Define a trigger condition.
|
|
197
198
|
const trigger = {
|
|
198
199
|
cron: {
|
|
199
|
-
schedule:
|
|
200
|
+
schedule: '0 30 0 * * * *',
|
|
200
201
|
skippable: true,
|
|
201
202
|
},
|
|
202
203
|
};
|
|
203
204
|
// 3️⃣ Create the thread.
|
|
204
205
|
const threadId = `${argv.name}-${mint.publicKey.toBase58().slice(0, 8)}`;
|
|
205
206
|
const [thread] = threadKey(provider.wallet.publicKey, threadId);
|
|
206
|
-
console.log(
|
|
207
|
+
console.log('Thread ID', threadId, thread.toBase58());
|
|
207
208
|
const memberHntAccount = yield (0, spl_token_1.getAssociatedTokenAddressSync)(hnt, solAddress, true);
|
|
208
209
|
if (!(yield (0, utils_1.exists)(provider.connection, memberHntAccount))) {
|
|
209
210
|
yield (0, spl_utils_1.sendInstructions)(provider, [
|
|
@@ -213,10 +214,10 @@ function run(args = process.argv) {
|
|
|
213
214
|
const distributeIx = yield fanoutProgram.methods
|
|
214
215
|
.distributeV0()
|
|
215
216
|
.accounts({
|
|
216
|
-
payer: new web3_js_1.PublicKey(
|
|
217
|
+
payer: new web3_js_1.PublicKey('C1ockworkPayer11111111111111111111111111111'),
|
|
217
218
|
fanout,
|
|
218
219
|
owner: solAddress,
|
|
219
|
-
mint: mint.publicKey
|
|
220
|
+
mint: mint.publicKey,
|
|
220
221
|
})
|
|
221
222
|
.instruction();
|
|
222
223
|
if (!(yield (0, utils_1.exists)(provider.connection, thread))) {
|
|
@@ -248,12 +249,12 @@ function toSolana(address) {
|
|
|
248
249
|
return undefined;
|
|
249
250
|
}
|
|
250
251
|
}
|
|
251
|
-
const CLOCKWORK_PID = new web3_js_1.PublicKey(
|
|
252
|
+
const CLOCKWORK_PID = new web3_js_1.PublicKey('CLoCKyJ6DXBJqqu2VWx9RLbgnwwR6BMHHuyasVmfMzBh');
|
|
252
253
|
function threadKey(authority, threadId, programId = CLOCKWORK_PID) {
|
|
253
254
|
return web3_js_1.PublicKey.findProgramAddressSync([
|
|
254
|
-
Buffer.from(
|
|
255
|
+
Buffer.from('thread', 'utf8'),
|
|
255
256
|
authority.toBuffer(),
|
|
256
|
-
Buffer.from(threadId,
|
|
257
|
+
Buffer.from(threadId, 'utf8'),
|
|
257
258
|
], programId);
|
|
258
259
|
}
|
|
259
260
|
exports.threadKey = threadKey;
|
package/lib/cjs/setup-hst.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-hst.js","sourceRoot":"","sources":["../../src/setup-hst.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"setup-hst.js","sourceRoot":"","sources":["../../src/setup-hst.ts"],"names":[],"mappings":"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"}
|