@thru/programs 0.3.18 → 0.4.0
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/README.md +9 -0
- package/dist/abi-manager/index.cjs +153 -32
- package/dist/abi-manager/index.cjs.map +1 -1
- package/dist/abi-manager/index.d.cts +1 -1
- package/dist/abi-manager/index.d.ts +1 -1
- package/dist/abi-manager/index.js +3 -2
- package/dist/amm/index.cjs +81 -47
- package/dist/amm/index.cjs.map +1 -1
- package/dist/amm/index.js +2 -3
- package/dist/amm/index.js.map +1 -1
- package/dist/bootstrap-addresses/index.cjs +58 -20
- package/dist/bootstrap-addresses/index.cjs.map +1 -1
- package/dist/bootstrap-addresses/index.d.cts +38 -19
- package/dist/bootstrap-addresses/index.d.ts +38 -19
- package/dist/bootstrap-addresses/index.js +2 -3
- package/dist/{chunk-UPB725FV.js → chunk-2NNQJFKS.js} +5 -4
- package/dist/chunk-2NNQJFKS.js.map +1 -0
- package/dist/{chunk-FQDO6J6E.js → chunk-A2BWZE2D.js} +12 -10
- package/dist/chunk-A2BWZE2D.js.map +1 -0
- package/dist/{chunk-PRU4KGQO.js → chunk-JHINXDSG.js} +43 -4
- package/dist/chunk-JHINXDSG.js.map +1 -0
- package/dist/{chunk-Q6762F4G.js → chunk-QGOAPK5X.js} +3 -3
- package/dist/{chunk-Q6762F4G.js.map → chunk-QGOAPK5X.js.map} +1 -1
- package/dist/chunk-S3UTJHRO.js +77 -0
- package/dist/chunk-S3UTJHRO.js.map +1 -0
- package/dist/{chunk-NMPO53TW.js → chunk-ZOFTRAAH.js} +4 -4
- package/dist/{chunk-NMPO53TW.js.map → chunk-ZOFTRAAH.js.map} +1 -1
- package/dist/{chunk-IGZZOZ73.js → chunk-ZP7A3GHV.js} +3 -4
- package/dist/chunk-ZP7A3GHV.js.map +1 -0
- package/dist/clob/index.cjs +164 -130
- package/dist/clob/index.cjs.map +1 -1
- package/dist/clob/index.js +4 -5
- package/dist/clob/index.js.map +1 -1
- package/dist/deploy/index.cjs +240 -168
- package/dist/deploy/index.cjs.map +1 -1
- package/dist/deploy/index.d.cts +5 -0
- package/dist/deploy/index.d.ts +5 -0
- package/dist/deploy/index.js +66 -37
- package/dist/deploy/index.js.map +1 -1
- package/dist/manager/index.cjs +14 -1
- package/dist/manager/index.cjs.map +1 -1
- package/dist/manager/index.d.cts +5 -1
- package/dist/manager/index.d.ts +5 -1
- package/dist/manager/index.js +2 -3
- package/dist/multicall/index.cjs +57 -23
- package/dist/multicall/index.cjs.map +1 -1
- package/dist/multicall/index.js +3 -4
- package/dist/oracle/index.cjs +64 -30
- package/dist/oracle/index.cjs.map +1 -1
- package/dist/oracle/index.js +2 -3
- package/dist/oracle/index.js.map +1 -1
- package/dist/passkey-manager/index.cjs +52 -18
- package/dist/passkey-manager/index.cjs.map +1 -1
- package/dist/passkey-manager/index.js +2 -3
- package/dist/passkey-manager/index.js.map +1 -1
- package/dist/perp/index.cjs +12 -2
- package/dist/perp/index.cjs.map +1 -1
- package/dist/perp/index.js +2 -3
- package/dist/perp/index.js.map +1 -1
- package/dist/uploader/index.cjs +45 -7
- package/dist/uploader/index.cjs.map +1 -1
- package/dist/uploader/index.d.cts +2 -1
- package/dist/uploader/index.d.ts +2 -1
- package/dist/uploader/index.js +2 -2
- package/package.json +2 -2
- package/src/abi-manager/constants.ts +2 -1
- package/src/abi-manager/index.test.ts +2 -2
- package/src/bootstrap-addresses/index.test.ts +70 -18
- package/src/bootstrap-addresses/index.ts +56 -19
- package/src/deploy/accounts.ts +7 -3
- package/src/deploy/chain.ts +1 -1
- package/src/deploy/constants.ts +3 -4
- package/src/deploy/deploy.test.ts +11 -10
- package/src/deploy/inspection.ts +3 -2
- package/src/deploy/types.ts +5 -0
- package/src/deploy/uploader.ts +5 -4
- package/src/deploy/workflows.test.ts +74 -5
- package/src/deploy/workflows.ts +55 -17
- package/src/manager/constants.ts +14 -2
- package/src/manager/derivation.ts +3 -3
- package/src/manager/index.test.ts +3 -3
- package/src/manager/index.ts +3 -0
- package/src/manager/types.ts +1 -1
- package/src/multicall/index.test.ts +1 -1
- package/src/passkey-manager/validate.test.ts +1 -1
- package/src/uploader/constants.ts +5 -4
- package/src/uploader/index.test.ts +2 -2
- package/src/uploader/index.ts +1 -0
- package/dist/chunk-FHYZQ5R3.js +0 -37
- package/dist/chunk-FHYZQ5R3.js.map +0 -1
- package/dist/chunk-FQDO6J6E.js.map +0 -1
- package/dist/chunk-IGZZOZ73.js.map +0 -1
- package/dist/chunk-O2ONVSHW.js +0 -51
- package/dist/chunk-O2ONVSHW.js.map +0 -1
- package/dist/chunk-PRU4KGQO.js.map +0 -1
- package/dist/chunk-UPB725FV.js.map +0 -1
package/src/deploy/workflows.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Pubkey, createThruClient, type InstructionContext } from "@thru/sdk";
|
|
2
2
|
import type { Thru } from "@thru/sdk/client";
|
|
3
3
|
import {
|
|
4
|
+
ABI_ACCOUNT_HEADER_SIZE,
|
|
4
5
|
createOfficialABIInstruction,
|
|
5
6
|
createOfficialABIMetaInstruction,
|
|
6
7
|
createUpgradeOfficialABIInstruction,
|
|
@@ -76,6 +77,7 @@ interface Context {
|
|
|
76
77
|
client: Thru;
|
|
77
78
|
signer: ResolvedSigner;
|
|
78
79
|
seed: string;
|
|
80
|
+
managerProgramAddress: string;
|
|
79
81
|
ephemeral: boolean;
|
|
80
82
|
chunkSize: number;
|
|
81
83
|
program: ManagedProgramAddresses;
|
|
@@ -85,6 +87,7 @@ interface Context {
|
|
|
85
87
|
|
|
86
88
|
interface ProgramState {
|
|
87
89
|
meta: ParsedManagerMeta;
|
|
90
|
+
dataSize: number;
|
|
88
91
|
}
|
|
89
92
|
|
|
90
93
|
interface ABIState {
|
|
@@ -201,6 +204,14 @@ async function createContext(
|
|
|
201
204
|
request: DeploymentRequestBase,
|
|
202
205
|
programAddressAssertion?: string,
|
|
203
206
|
): Promise<Context> {
|
|
207
|
+
let managerProgramAddress: string;
|
|
208
|
+
try {
|
|
209
|
+
const manager = Pubkey.from(request.managerProgramAddress ?? MANAGER_PROGRAM_ADDRESS);
|
|
210
|
+
if (manager.toBytes().every((byte) => byte === 0)) throw new Error("zero parent");
|
|
211
|
+
managerProgramAddress = manager.toThruFmt();
|
|
212
|
+
} catch (error) {
|
|
213
|
+
throw asDeployError(error, "INVALID_INPUT", "managerProgramAddress must be a nonzero Thru address");
|
|
214
|
+
}
|
|
204
215
|
const client = request.client ?? createThruClient();
|
|
205
216
|
const chunkSize = validateSeedAndChunkSize(request.seed, request.chunkSize);
|
|
206
217
|
const signer = await resolveSigner(
|
|
@@ -209,7 +220,7 @@ async function createContext(
|
|
|
209
220
|
request.signer.privateKey,
|
|
210
221
|
);
|
|
211
222
|
const ephemeral = request.ephemeral ?? false;
|
|
212
|
-
const program = deriveManagedProgramAddresses(request.seed, ephemeral);
|
|
223
|
+
const program = deriveManagedProgramAddresses(request.seed, ephemeral, managerProgramAddress);
|
|
213
224
|
|
|
214
225
|
if (programAddressAssertion) {
|
|
215
226
|
let supplied: Pubkey;
|
|
@@ -239,6 +250,7 @@ async function createContext(
|
|
|
239
250
|
client,
|
|
240
251
|
signer,
|
|
241
252
|
seed: request.seed,
|
|
253
|
+
managerProgramAddress,
|
|
242
254
|
ephemeral,
|
|
243
255
|
chunkSize,
|
|
244
256
|
program,
|
|
@@ -247,6 +259,14 @@ async function createContext(
|
|
|
247
259
|
};
|
|
248
260
|
}
|
|
249
261
|
|
|
262
|
+
function assertOfficialABIParent(context: Context): void {
|
|
263
|
+
// The on-chain ABI Manager authenticates canonical main-Manager metadata.
|
|
264
|
+
// Root-owned main-Manager upgrades must remain binary-only.
|
|
265
|
+
if (context.managerProgramAddress !== MANAGER_PROGRAM_ADDRESS) {
|
|
266
|
+
throw new DeployError("INVALID_INPUT", "official ABI publication requires the canonical main Manager parent");
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
|
|
250
270
|
function addressDetails(context: Context): Record<string, string> {
|
|
251
271
|
return {
|
|
252
272
|
programMetaAccountAddress: context.program.programMetaAccountAddress,
|
|
@@ -298,7 +318,7 @@ async function requireProgram(context: Context): Promise<ProgramState> {
|
|
|
298
318
|
},
|
|
299
319
|
);
|
|
300
320
|
}
|
|
301
|
-
const meta = parseManagerMeta(metaAccount);
|
|
321
|
+
const meta = parseManagerMeta(metaAccount, context.managerProgramAddress);
|
|
302
322
|
assertManagerOpen(meta);
|
|
303
323
|
if (!bytesEqual(meta.authority, context.signer.publicKey)) {
|
|
304
324
|
throw new DeployError(
|
|
@@ -311,8 +331,8 @@ async function requireProgram(context: Context): Promise<ProgramState> {
|
|
|
311
331
|
},
|
|
312
332
|
);
|
|
313
333
|
}
|
|
314
|
-
assertManagedProgramAccount(programAccount);
|
|
315
|
-
return { meta };
|
|
334
|
+
assertManagedProgramAccount(programAccount, undefined, context.managerProgramAddress);
|
|
335
|
+
return { meta, dataSize: requireAccountData(programAccount, "managed program account").length };
|
|
316
336
|
}
|
|
317
337
|
|
|
318
338
|
async function requireABI(context: Context): Promise<ABIState> {
|
|
@@ -365,7 +385,7 @@ async function verifyProgram(
|
|
|
365
385
|
"managed program readback is missing",
|
|
366
386
|
);
|
|
367
387
|
}
|
|
368
|
-
const meta = parseManagerMeta(metaAccount);
|
|
388
|
+
const meta = parseManagerMeta(metaAccount, context.managerProgramAddress);
|
|
369
389
|
assertManagerOpen(meta);
|
|
370
390
|
assertPubkeyBytes(
|
|
371
391
|
meta.authority,
|
|
@@ -378,7 +398,7 @@ async function verifyProgram(
|
|
|
378
398
|
`program version mismatch: expected ${expectedVersion}, got ${meta.version}`,
|
|
379
399
|
);
|
|
380
400
|
}
|
|
381
|
-
assertManagedProgramAccount(programAccount);
|
|
401
|
+
assertManagedProgramAccount(programAccount, undefined, context.managerProgramAddress);
|
|
382
402
|
if (
|
|
383
403
|
expectedBytes &&
|
|
384
404
|
!bytesEqual(
|
|
@@ -632,7 +652,10 @@ export async function deployProgram(
|
|
|
632
652
|
request.abi === undefined ? undefined : normalizeBytes(request.abi, "abi");
|
|
633
653
|
validateProgramImage(programBytes);
|
|
634
654
|
const context = await createContext(operation, request);
|
|
635
|
-
if (abiBytes)
|
|
655
|
+
if (abiBytes) {
|
|
656
|
+
assertOfficialABIParent(context);
|
|
657
|
+
await validateABI(abiBytes, context.client);
|
|
658
|
+
}
|
|
636
659
|
progress(context, "validation", "succeeded");
|
|
637
660
|
progress(context, "preflight", "started");
|
|
638
661
|
const absent: Array<[string, string]> = [
|
|
@@ -697,7 +720,8 @@ export async function deployProgram(
|
|
|
697
720
|
let transaction: DeploymentTransaction;
|
|
698
721
|
if (!abiBytes || !abiUpload) {
|
|
699
722
|
transaction = {
|
|
700
|
-
program:
|
|
723
|
+
program: context.managerProgramAddress,
|
|
724
|
+
stateUnits: 1 + Math.ceil((64 + programBytes.length) / 4096),
|
|
701
725
|
readWrite: [
|
|
702
726
|
context.program.programMetaAccountAddress,
|
|
703
727
|
context.program.programAccountAddress,
|
|
@@ -726,7 +750,8 @@ export async function deployProgram(
|
|
|
726
750
|
]);
|
|
727
751
|
transaction = {
|
|
728
752
|
program: DEPLOYMENT_MULTICALL_PROGRAM_ADDRESS,
|
|
729
|
-
stateUnits:
|
|
753
|
+
stateUnits: 2 + Math.ceil((64 + programBytes.length) / 4096)
|
|
754
|
+
+ Math.ceil((64 + ABI_ACCOUNT_HEADER_SIZE + abiBytes.length) / 4096),
|
|
730
755
|
memoryUnits: 10_000,
|
|
731
756
|
readWrite: [
|
|
732
757
|
context.program.programMetaAccountAddress,
|
|
@@ -735,7 +760,7 @@ export async function deployProgram(
|
|
|
735
760
|
context.abi.abiAccountAddress,
|
|
736
761
|
],
|
|
737
762
|
readOnly: [
|
|
738
|
-
|
|
763
|
+
context.managerProgramAddress,
|
|
739
764
|
ABI_MANAGER_PROGRAM_ADDRESS,
|
|
740
765
|
programUpload.result.bufferAccountAddress,
|
|
741
766
|
abiUpload.result.bufferAccountAddress,
|
|
@@ -743,7 +768,7 @@ export async function deployProgram(
|
|
|
743
768
|
instructionData: (tx) =>
|
|
744
769
|
multicall(tx, [
|
|
745
770
|
{
|
|
746
|
-
program:
|
|
771
|
+
program: context.managerProgramAddress,
|
|
747
772
|
instructionData: createProgramInstruction(
|
|
748
773
|
context,
|
|
749
774
|
programUpload,
|
|
@@ -798,6 +823,7 @@ export async function deployProgramABI(
|
|
|
798
823
|
request,
|
|
799
824
|
request.programAddress,
|
|
800
825
|
);
|
|
826
|
+
assertOfficialABIParent(context);
|
|
801
827
|
await validateABI(abiBytes, context.client);
|
|
802
828
|
progress(context, "validation", "succeeded");
|
|
803
829
|
progress(context, "preflight", "started");
|
|
@@ -839,7 +865,7 @@ export async function deployProgramABI(
|
|
|
839
865
|
]);
|
|
840
866
|
const transaction: DeploymentTransaction = {
|
|
841
867
|
program: DEPLOYMENT_MULTICALL_PROGRAM_ADDRESS,
|
|
842
|
-
stateUnits:
|
|
868
|
+
stateUnits: 1 + Math.ceil((64 + ABI_ACCOUNT_HEADER_SIZE + abiBytes.length) / 4096),
|
|
843
869
|
memoryUnits: 10_000,
|
|
844
870
|
readWrite: [
|
|
845
871
|
context.abi.abiMetaAccountAddress,
|
|
@@ -901,7 +927,10 @@ export async function upgradeProgram(
|
|
|
901
927
|
request,
|
|
902
928
|
request.programAddress,
|
|
903
929
|
);
|
|
904
|
-
if (abiBytes)
|
|
930
|
+
if (abiBytes) {
|
|
931
|
+
assertOfficialABIParent(context);
|
|
932
|
+
await validateABI(abiBytes, context.client);
|
|
933
|
+
}
|
|
905
934
|
progress(context, "validation", "succeeded");
|
|
906
935
|
progress(context, "preflight", "started");
|
|
907
936
|
const programState = await requireProgram(context);
|
|
@@ -947,7 +976,11 @@ export async function upgradeProgram(
|
|
|
947
976
|
abiBytes && abiUpload
|
|
948
977
|
? {
|
|
949
978
|
program: DEPLOYMENT_MULTICALL_PROGRAM_ADDRESS,
|
|
950
|
-
stateUnits:
|
|
979
|
+
stateUnits: Math.max(0,
|
|
980
|
+
Math.ceil((64 + programBytes.length) / 4096)
|
|
981
|
+
- Math.ceil((64 + programState.dataSize) / 4096)
|
|
982
|
+
+ Math.ceil((64 + ABI_ACCOUNT_HEADER_SIZE + abiBytes.length) / 4096)
|
|
983
|
+
- Math.ceil((64 + ABI_ACCOUNT_HEADER_SIZE + abiState!.abi.content.length) / 4096)),
|
|
951
984
|
memoryUnits: 10_000,
|
|
952
985
|
readWrite: [
|
|
953
986
|
context.program.programMetaAccountAddress,
|
|
@@ -955,7 +988,7 @@ export async function upgradeProgram(
|
|
|
955
988
|
context.abi.abiAccountAddress,
|
|
956
989
|
],
|
|
957
990
|
readOnly: [
|
|
958
|
-
|
|
991
|
+
context.managerProgramAddress,
|
|
959
992
|
ABI_MANAGER_PROGRAM_ADDRESS,
|
|
960
993
|
context.abi.abiMetaAccountAddress,
|
|
961
994
|
programUpload.result.bufferAccountAddress,
|
|
@@ -964,7 +997,7 @@ export async function upgradeProgram(
|
|
|
964
997
|
instructionData: (tx) =>
|
|
965
998
|
multicall(tx, [
|
|
966
999
|
{
|
|
967
|
-
program:
|
|
1000
|
+
program: context.managerProgramAddress,
|
|
968
1001
|
instructionData: upgradeProgramInstruction(
|
|
969
1002
|
context,
|
|
970
1003
|
programUpload,
|
|
@@ -982,7 +1015,9 @@ export async function upgradeProgram(
|
|
|
982
1015
|
]),
|
|
983
1016
|
}
|
|
984
1017
|
: {
|
|
985
|
-
program:
|
|
1018
|
+
program: context.managerProgramAddress,
|
|
1019
|
+
stateUnits: Math.max(0, Math.ceil((64 + programBytes.length) / 4096)
|
|
1020
|
+
- Math.ceil((64 + programState.dataSize) / 4096)),
|
|
986
1021
|
readWrite: [
|
|
987
1022
|
context.program.programMetaAccountAddress,
|
|
988
1023
|
context.program.programAccountAddress,
|
|
@@ -1027,6 +1062,7 @@ export async function upgradeProgramABI(
|
|
|
1027
1062
|
request,
|
|
1028
1063
|
request.programAddress,
|
|
1029
1064
|
);
|
|
1065
|
+
assertOfficialABIParent(context);
|
|
1030
1066
|
await validateABI(abiBytes, context.client);
|
|
1031
1067
|
progress(context, "validation", "succeeded");
|
|
1032
1068
|
progress(context, "preflight", "started");
|
|
@@ -1054,6 +1090,8 @@ export async function upgradeProgramABI(
|
|
|
1054
1090
|
);
|
|
1055
1091
|
const transaction: DeploymentTransaction = {
|
|
1056
1092
|
program: ABI_MANAGER_PROGRAM_ADDRESS,
|
|
1093
|
+
stateUnits: Math.max(0, Math.ceil((64 + ABI_ACCOUNT_HEADER_SIZE + abiBytes.length) / 4096)
|
|
1094
|
+
- Math.ceil((64 + ABI_ACCOUNT_HEADER_SIZE + abiState.abi.content.length) / 4096)),
|
|
1057
1095
|
readWrite: [context.abi.abiAccountAddress],
|
|
1058
1096
|
readOnly: [
|
|
1059
1097
|
context.abi.abiMetaAccountAddress,
|
package/src/manager/constants.ts
CHANGED
|
@@ -1,7 +1,19 @@
|
|
|
1
1
|
import { encodeAddress } from '@thru/sdk/helpers';
|
|
2
|
-
import {
|
|
2
|
+
import { deriveProgramAddress } from '@thru/sdk';
|
|
3
|
+
import { padSeed, systemProgramPubkey } from '../utils/helpers.js';
|
|
3
4
|
|
|
4
|
-
|
|
5
|
+
/** The immutable trust root manages only the upgradeable main Manager. */
|
|
6
|
+
export const ROOT_MANAGER_PROGRAM_PUBKEY = systemProgramPubkey(0x01);
|
|
7
|
+
export const ROOT_MANAGER_PROGRAM_ADDRESS = encodeAddress(ROOT_MANAGER_PROGRAM_PUBKEY);
|
|
8
|
+
export const MANAGER_PROGRAM_SEED = 'thru-main-manager:949457';
|
|
9
|
+
const managerMeta = deriveProgramAddress({
|
|
10
|
+
programAddress: ROOT_MANAGER_PROGRAM_ADDRESS,
|
|
11
|
+
seed: padSeed(MANAGER_PROGRAM_SEED),
|
|
12
|
+
});
|
|
13
|
+
export const MANAGER_PROGRAM_PUBKEY = deriveProgramAddress({
|
|
14
|
+
programAddress: ROOT_MANAGER_PROGRAM_ADDRESS,
|
|
15
|
+
seed: managerMeta.bytes,
|
|
16
|
+
}).bytes;
|
|
5
17
|
export const MANAGER_PROGRAM_ADDRESS = encodeAddress(MANAGER_PROGRAM_PUBKEY);
|
|
6
18
|
|
|
7
19
|
export const MANAGER_META_SIZE = 73;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { deriveProgramAddress } from '@thru/sdk';
|
|
2
|
-
import { MANAGER_PROGRAM_ADDRESS } from './constants';
|
|
2
|
+
import { MANAGER_PROGRAM_ADDRESS } from './constants.js';
|
|
3
3
|
import {
|
|
4
4
|
padSeed,
|
|
5
5
|
pubkeyBytes,
|
|
6
6
|
type ProgramSeed,
|
|
7
|
-
} from '../utils/helpers';
|
|
8
|
-
import type { ManagedProgramAddresses } from './types';
|
|
7
|
+
} from '../utils/helpers.js';
|
|
8
|
+
import type { ManagedProgramAddresses } from './types.js';
|
|
9
9
|
|
|
10
10
|
export function deriveManagedProgramAddresses(
|
|
11
11
|
seed: ProgramSeed,
|
|
@@ -25,13 +25,13 @@ function creationProof(siblingCount = 0): Uint8Array {
|
|
|
25
25
|
describe('manager SDK', () => {
|
|
26
26
|
it('exports the canonical manager ID and Rust-compatible derivation vectors', () => {
|
|
27
27
|
expect(MANAGER_PROGRAM_ADDRESS).toBe(
|
|
28
|
-
'
|
|
28
|
+
'taMGRmPoSTkUtF6UlmCIq58K8OYsnXshOMPdobxxHytqmu'
|
|
29
29
|
);
|
|
30
30
|
expect(deriveManagedProgramAddresses('nft')).toMatchObject({
|
|
31
31
|
programMetaAccountAddress:
|
|
32
|
-
'
|
|
32
|
+
'taJM9c0C5t2kaaNv_PyeVn6khHuwc-zeN39MUTW_yghOBU',
|
|
33
33
|
programAccountAddress:
|
|
34
|
-
'
|
|
34
|
+
'tak_0Jtlh0y2hPHscfXkS1eXuEpPUB35xh5KqT5A2fR2ZE',
|
|
35
35
|
});
|
|
36
36
|
});
|
|
37
37
|
|
package/src/manager/index.ts
CHANGED
package/src/manager/types.ts
CHANGED
|
@@ -20,7 +20,7 @@ function instructionData(programIdx: number, data: Uint8Array): number[] {
|
|
|
20
20
|
describe('multicall helpers', () => {
|
|
21
21
|
it('encodes calls with generated InstructionData views', () => {
|
|
22
22
|
expect(MULTICALL_PROGRAM_ADDRESS).toBe(
|
|
23
|
-
'
|
|
23
|
+
'taMULTIrOL8WpIFr16C1ECsO60qAsuwmwJephZHDOTvSeP'
|
|
24
24
|
);
|
|
25
25
|
expect(MULTICALL_PROGRAM_PUBKEY).toHaveLength(32);
|
|
26
26
|
expect(GENESIS_MULTICALL_PROGRAM_PUBKEY).toEqual(
|
|
@@ -221,7 +221,7 @@ describe('passkey manager validate helpers', () => {
|
|
|
221
221
|
|
|
222
222
|
it('encodes multicall instructions with the known program address', () => {
|
|
223
223
|
expect(MULTICALL_PROGRAM_ADDRESS).toBe(
|
|
224
|
-
'
|
|
224
|
+
'taMULTIrOL8WpIFr16C1ECsO60qAsuwmwJephZHDOTvSeP'
|
|
225
225
|
);
|
|
226
226
|
expect(MULTICALL_PROGRAM_PUBKEY).toHaveLength(32);
|
|
227
227
|
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { systemProgramPubkey } from "../utils/helpers";
|
|
1
|
+
import { deriveManagedProgramAddresses } from "../manager/derivation.js";
|
|
3
2
|
|
|
4
|
-
export const
|
|
5
|
-
|
|
3
|
+
export const UPLOADER_PROGRAM_SEED = "thru-program:1073768";
|
|
4
|
+
const uploader = deriveManagedProgramAddresses(UPLOADER_PROGRAM_SEED);
|
|
5
|
+
export const UPLOADER_PROGRAM_PUBKEY = uploader.programAccountBytes;
|
|
6
|
+
export const UPLOADER_PROGRAM_ADDRESS = uploader.programAccountAddress;
|
|
6
7
|
|
|
7
8
|
export const UPLOADER_META_SIZE = 65;
|
|
8
9
|
export const UPLOADER_STATE_OPEN = 0x01;
|
|
@@ -19,8 +19,8 @@ describe("uploader SDK", () => {
|
|
|
19
19
|
|
|
20
20
|
it("matches the Rust derivation vector", () => {
|
|
21
21
|
expect(deriveUploadAddresses("nft_program")).toMatchObject({
|
|
22
|
-
metaAccountAddress: "
|
|
23
|
-
bufferAccountAddress: "
|
|
22
|
+
metaAccountAddress: "taEktoLtrjtZxKPAtIjtzX4nH9adB3KU6nc2nOg6sqjA_W",
|
|
23
|
+
bufferAccountAddress: "taJVgXjZiK4v8DE0DeHS9EUr42bTF0zpdUyf4YwpcRoA3v",
|
|
24
24
|
});
|
|
25
25
|
});
|
|
26
26
|
|
package/src/uploader/index.ts
CHANGED
package/dist/chunk-FHYZQ5R3.js
DELETED
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import { systemProgramPubkey, pubkeyBytes, padSeed } from './chunk-PRU4KGQO.js';
|
|
2
|
-
import { encodeAddress } from '@thru/sdk/helpers';
|
|
3
|
-
import { deriveProgramAddress } from '@thru/sdk';
|
|
4
|
-
|
|
5
|
-
var MANAGER_PROGRAM_PUBKEY = systemProgramPubkey(4);
|
|
6
|
-
var MANAGER_PROGRAM_ADDRESS = encodeAddress(MANAGER_PROGRAM_PUBKEY);
|
|
7
|
-
var MANAGER_META_SIZE = 73;
|
|
8
|
-
var MANAGER_STATE_OPEN = 0;
|
|
9
|
-
var MANAGER_STATE_PAUSED = 1;
|
|
10
|
-
var MANAGER_STATE_FINALIZED = 2;
|
|
11
|
-
var MANAGER_PROGRAM_IMAGE_VERSION = 1;
|
|
12
|
-
var MANAGER_PROGRAM_IMAGE_HEADER_SIZE = 8;
|
|
13
|
-
var MANAGER_PROGRAM_IMAGE_TRAILER_SIZE = 8;
|
|
14
|
-
var MANAGER_PROGRAM_IMAGE_MIN_TEXT_SIZE = 4;
|
|
15
|
-
function deriveManagedProgramAddresses(seed, ephemeral = false, managerProgramAddress = MANAGER_PROGRAM_ADDRESS) {
|
|
16
|
-
const manager = pubkeyBytes(managerProgramAddress, "manager program address");
|
|
17
|
-
const meta = deriveProgramAddress({
|
|
18
|
-
programAddress: manager,
|
|
19
|
-
seed: padSeed(seed),
|
|
20
|
-
ephemeral
|
|
21
|
-
});
|
|
22
|
-
const program = deriveProgramAddress({
|
|
23
|
-
programAddress: manager,
|
|
24
|
-
seed: meta.bytes,
|
|
25
|
-
ephemeral
|
|
26
|
-
});
|
|
27
|
-
return {
|
|
28
|
-
programMetaAccountAddress: meta.address,
|
|
29
|
-
programMetaAccountBytes: meta.bytes,
|
|
30
|
-
programAccountAddress: program.address,
|
|
31
|
-
programAccountBytes: program.bytes
|
|
32
|
-
};
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
export { MANAGER_META_SIZE, MANAGER_PROGRAM_ADDRESS, MANAGER_PROGRAM_IMAGE_HEADER_SIZE, MANAGER_PROGRAM_IMAGE_MIN_TEXT_SIZE, MANAGER_PROGRAM_IMAGE_TRAILER_SIZE, MANAGER_PROGRAM_IMAGE_VERSION, MANAGER_PROGRAM_PUBKEY, MANAGER_STATE_FINALIZED, MANAGER_STATE_OPEN, MANAGER_STATE_PAUSED, deriveManagedProgramAddresses };
|
|
36
|
-
//# sourceMappingURL=chunk-FHYZQ5R3.js.map
|
|
37
|
-
//# sourceMappingURL=chunk-FHYZQ5R3.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/manager/constants.ts","../src/manager/derivation.ts"],"names":[],"mappings":";;;;AAGO,IAAM,sBAAA,GAAyB,oBAAoB,CAAI;AACvD,IAAM,uBAAA,GAA0B,cAAc,sBAAsB;AAEpE,IAAM,iBAAA,GAAoB;AAE1B,IAAM,kBAAA,GAAqB;AAC3B,IAAM,oBAAA,GAAuB;AAC7B,IAAM,uBAAA,GAA0B;AAEhC,IAAM,6BAAA,GAAgC;AACtC,IAAM,iCAAA,GAAoC;AAC1C,IAAM,kCAAA,GAAqC;AAC3C,IAAM,mCAAA,GAAsC;ACN5C,SAAS,6BAAA,CACd,IAAA,EACA,SAAA,GAAY,KAAA,EACZ,wBAA6C,uBAAA,EACpB;AACzB,EAAA,MAAM,OAAA,GAAU,WAAA,CAAY,qBAAA,EAAuB,yBAAyB,CAAA;AAC5E,EAAA,MAAM,OAAO,oBAAA,CAAqB;AAAA,IAChC,cAAA,EAAgB,OAAA;AAAA,IAChB,IAAA,EAAM,QAAQ,IAAI,CAAA;AAAA,IAClB;AAAA,GACD,CAAA;AACD,EAAA,MAAM,UAAU,oBAAA,CAAqB;AAAA,IACnC,cAAA,EAAgB,OAAA;AAAA,IAChB,MAAM,IAAA,CAAK,KAAA;AAAA,IACX;AAAA,GACD,CAAA;AACD,EAAA,OAAO;AAAA,IACL,2BAA2B,IAAA,CAAK,OAAA;AAAA,IAChC,yBAAyB,IAAA,CAAK,KAAA;AAAA,IAC9B,uBAAuB,OAAA,CAAQ,OAAA;AAAA,IAC/B,qBAAqB,OAAA,CAAQ;AAAA,GAC/B;AACF","file":"chunk-FHYZQ5R3.js","sourcesContent":["import { encodeAddress } from '@thru/sdk/helpers';\nimport { systemProgramPubkey } from '../utils/helpers';\n\nexport const MANAGER_PROGRAM_PUBKEY = systemProgramPubkey(0x04);\nexport const MANAGER_PROGRAM_ADDRESS = encodeAddress(MANAGER_PROGRAM_PUBKEY);\n\nexport const MANAGER_META_SIZE = 73;\n\nexport const MANAGER_STATE_OPEN = 0x00;\nexport const MANAGER_STATE_PAUSED = 0x01;\nexport const MANAGER_STATE_FINALIZED = 0x02;\n\nexport const MANAGER_PROGRAM_IMAGE_VERSION = 0x01;\nexport const MANAGER_PROGRAM_IMAGE_HEADER_SIZE = 8;\nexport const MANAGER_PROGRAM_IMAGE_TRAILER_SIZE = 8;\nexport const MANAGER_PROGRAM_IMAGE_MIN_TEXT_SIZE = 4;\n","import { deriveProgramAddress } from '@thru/sdk';\nimport { MANAGER_PROGRAM_ADDRESS } from './constants';\nimport {\n padSeed,\n pubkeyBytes,\n type ProgramSeed,\n} from '../utils/helpers';\nimport type { ManagedProgramAddresses } from './types';\n\nexport function deriveManagedProgramAddresses(\n seed: ProgramSeed,\n ephemeral = false,\n managerProgramAddress: string | Uint8Array = MANAGER_PROGRAM_ADDRESS\n): ManagedProgramAddresses {\n const manager = pubkeyBytes(managerProgramAddress, 'manager program address');\n const meta = deriveProgramAddress({\n programAddress: manager,\n seed: padSeed(seed),\n ephemeral,\n });\n const program = deriveProgramAddress({\n programAddress: manager,\n seed: meta.bytes,\n ephemeral,\n });\n return {\n programMetaAccountAddress: meta.address,\n programMetaAccountBytes: meta.bytes,\n programAccountAddress: program.address,\n programAccountBytes: program.bytes,\n };\n}\n"]}
|