@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
|
@@ -2,6 +2,7 @@ import { P as ProgramSeed, I as InstructionData } from '../helpers-DD7q61nr.cjs'
|
|
|
2
2
|
export { A as AccountLookupContext } from '../helpers-DD7q61nr.cjs';
|
|
3
3
|
import { Account } from '@thru/sdk';
|
|
4
4
|
|
|
5
|
+
declare const UPLOADER_PROGRAM_SEED = "thru-program:1073768";
|
|
5
6
|
declare const UPLOADER_PROGRAM_PUBKEY: Uint8Array<ArrayBufferLike>;
|
|
6
7
|
declare const UPLOADER_PROGRAM_ADDRESS: string;
|
|
7
8
|
declare const UPLOADER_META_SIZE = 65;
|
|
@@ -758,4 +759,4 @@ declare class UploaderInstructionBuilder {
|
|
|
758
759
|
private __tnValidateOrThrow;
|
|
759
760
|
}
|
|
760
761
|
|
|
761
|
-
export { CreateArgs, CreateArgsBuilder, type CreateUploadBufferInstructionArgs, DestroyArgs, DestroyArgsBuilder, type DestroyUploadInstructionArgs, FinalizeArgs, FinalizeArgsBuilder, type FinalizeUploadInstructionArgs, InstructionData, ProgramSeed, UPLOADER_DEFAULT_CHUNK_SIZE, UPLOADER_ERRORS, UPLOADER_MAX_CHUNK_SIZE, UPLOADER_META_SIZE, UPLOADER_MIN_CHUNK_SIZE, UPLOADER_PROGRAM_ADDRESS, UPLOADER_PROGRAM_PUBKEY, UPLOADER_STATE_FINALIZED, UPLOADER_STATE_OPEN, type UploadAddresses, UploaderError, UploaderErrorBuilder, type UploaderErrorName, UploaderInstruction, type UploaderInstructionArgs, UploaderInstructionBuilder, UploaderInstruction_payload_Inner, UploaderProgramMeta, UploaderProgramMetaBuilder, type UploaderProgramMetaInfo, WriteArgs, WriteArgsBuilder, type WriteUploadInstructionArgs, buildUploaderInstructionBytes, createDestroyUploadInstruction, createFinalizeUploadInstruction, createUploadBufferInstruction, createWriteUploadInstruction, deriveUploadAddresses, parseUploaderProgramMeta, uploaderErrorName };
|
|
762
|
+
export { CreateArgs, CreateArgsBuilder, type CreateUploadBufferInstructionArgs, DestroyArgs, DestroyArgsBuilder, type DestroyUploadInstructionArgs, FinalizeArgs, FinalizeArgsBuilder, type FinalizeUploadInstructionArgs, InstructionData, ProgramSeed, UPLOADER_DEFAULT_CHUNK_SIZE, UPLOADER_ERRORS, UPLOADER_MAX_CHUNK_SIZE, UPLOADER_META_SIZE, UPLOADER_MIN_CHUNK_SIZE, UPLOADER_PROGRAM_ADDRESS, UPLOADER_PROGRAM_PUBKEY, UPLOADER_PROGRAM_SEED, UPLOADER_STATE_FINALIZED, UPLOADER_STATE_OPEN, type UploadAddresses, UploaderError, UploaderErrorBuilder, type UploaderErrorName, UploaderInstruction, type UploaderInstructionArgs, UploaderInstructionBuilder, UploaderInstruction_payload_Inner, UploaderProgramMeta, UploaderProgramMetaBuilder, type UploaderProgramMetaInfo, WriteArgs, WriteArgsBuilder, type WriteUploadInstructionArgs, buildUploaderInstructionBytes, createDestroyUploadInstruction, createFinalizeUploadInstruction, createUploadBufferInstruction, createWriteUploadInstruction, deriveUploadAddresses, parseUploaderProgramMeta, uploaderErrorName };
|
package/dist/uploader/index.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { P as ProgramSeed, I as InstructionData } from '../helpers-DD7q61nr.js';
|
|
|
2
2
|
export { A as AccountLookupContext } from '../helpers-DD7q61nr.js';
|
|
3
3
|
import { Account } from '@thru/sdk';
|
|
4
4
|
|
|
5
|
+
declare const UPLOADER_PROGRAM_SEED = "thru-program:1073768";
|
|
5
6
|
declare const UPLOADER_PROGRAM_PUBKEY: Uint8Array<ArrayBufferLike>;
|
|
6
7
|
declare const UPLOADER_PROGRAM_ADDRESS: string;
|
|
7
8
|
declare const UPLOADER_META_SIZE = 65;
|
|
@@ -758,4 +759,4 @@ declare class UploaderInstructionBuilder {
|
|
|
758
759
|
private __tnValidateOrThrow;
|
|
759
760
|
}
|
|
760
761
|
|
|
761
|
-
export { CreateArgs, CreateArgsBuilder, type CreateUploadBufferInstructionArgs, DestroyArgs, DestroyArgsBuilder, type DestroyUploadInstructionArgs, FinalizeArgs, FinalizeArgsBuilder, type FinalizeUploadInstructionArgs, InstructionData, ProgramSeed, UPLOADER_DEFAULT_CHUNK_SIZE, UPLOADER_ERRORS, UPLOADER_MAX_CHUNK_SIZE, UPLOADER_META_SIZE, UPLOADER_MIN_CHUNK_SIZE, UPLOADER_PROGRAM_ADDRESS, UPLOADER_PROGRAM_PUBKEY, UPLOADER_STATE_FINALIZED, UPLOADER_STATE_OPEN, type UploadAddresses, UploaderError, UploaderErrorBuilder, type UploaderErrorName, UploaderInstruction, type UploaderInstructionArgs, UploaderInstructionBuilder, UploaderInstruction_payload_Inner, UploaderProgramMeta, UploaderProgramMetaBuilder, type UploaderProgramMetaInfo, WriteArgs, WriteArgsBuilder, type WriteUploadInstructionArgs, buildUploaderInstructionBytes, createDestroyUploadInstruction, createFinalizeUploadInstruction, createUploadBufferInstruction, createWriteUploadInstruction, deriveUploadAddresses, parseUploaderProgramMeta, uploaderErrorName };
|
|
762
|
+
export { CreateArgs, CreateArgsBuilder, type CreateUploadBufferInstructionArgs, DestroyArgs, DestroyArgsBuilder, type DestroyUploadInstructionArgs, FinalizeArgs, FinalizeArgsBuilder, type FinalizeUploadInstructionArgs, InstructionData, ProgramSeed, UPLOADER_DEFAULT_CHUNK_SIZE, UPLOADER_ERRORS, UPLOADER_MAX_CHUNK_SIZE, UPLOADER_META_SIZE, UPLOADER_MIN_CHUNK_SIZE, UPLOADER_PROGRAM_ADDRESS, UPLOADER_PROGRAM_PUBKEY, UPLOADER_PROGRAM_SEED, UPLOADER_STATE_FINALIZED, UPLOADER_STATE_OPEN, type UploadAddresses, UploaderError, UploaderErrorBuilder, type UploaderErrorName, UploaderInstruction, type UploaderInstructionArgs, UploaderInstructionBuilder, UploaderInstruction_payload_Inner, UploaderProgramMeta, UploaderProgramMetaBuilder, type UploaderProgramMetaInfo, WriteArgs, WriteArgsBuilder, type WriteUploadInstructionArgs, buildUploaderInstructionBytes, createDestroyUploadInstruction, createFinalizeUploadInstruction, createUploadBufferInstruction, createWriteUploadInstruction, deriveUploadAddresses, parseUploaderProgramMeta, uploaderErrorName };
|
package/dist/uploader/index.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
export { CreateArgs, CreateArgsBuilder, DestroyArgs, DestroyArgsBuilder, FinalizeArgs, FinalizeArgsBuilder, UPLOADER_DEFAULT_CHUNK_SIZE, UPLOADER_ERRORS, UPLOADER_MAX_CHUNK_SIZE, UPLOADER_META_SIZE, UPLOADER_MIN_CHUNK_SIZE, UPLOADER_PROGRAM_ADDRESS, UPLOADER_PROGRAM_PUBKEY, UPLOADER_STATE_FINALIZED, UPLOADER_STATE_OPEN, UploaderError, UploaderErrorBuilder, UploaderInstruction, UploaderInstructionBuilder, UploaderInstruction_payload_Inner, UploaderProgramMeta, UploaderProgramMetaBuilder, WriteArgs, WriteArgsBuilder, buildUploaderInstructionBytes, createDestroyUploadInstruction, createFinalizeUploadInstruction, createUploadBufferInstruction, createWriteUploadInstruction, deriveUploadAddresses, parseUploaderProgramMeta, uploaderErrorName } from '../chunk-
|
|
2
|
-
import '../chunk-
|
|
1
|
+
export { CreateArgs, CreateArgsBuilder, DestroyArgs, DestroyArgsBuilder, FinalizeArgs, FinalizeArgsBuilder, UPLOADER_DEFAULT_CHUNK_SIZE, UPLOADER_ERRORS, UPLOADER_MAX_CHUNK_SIZE, UPLOADER_META_SIZE, UPLOADER_MIN_CHUNK_SIZE, UPLOADER_PROGRAM_ADDRESS, UPLOADER_PROGRAM_PUBKEY, UPLOADER_PROGRAM_SEED, UPLOADER_STATE_FINALIZED, UPLOADER_STATE_OPEN, UploaderError, UploaderErrorBuilder, UploaderInstruction, UploaderInstructionBuilder, UploaderInstruction_payload_Inner, UploaderProgramMeta, UploaderProgramMetaBuilder, WriteArgs, WriteArgsBuilder, buildUploaderInstructionBytes, createDestroyUploadInstruction, createFinalizeUploadInstruction, createUploadBufferInstruction, createWriteUploadInstruction, deriveUploadAddresses, parseUploaderProgramMeta, uploaderErrorName } from '../chunk-A2BWZE2D.js';
|
|
2
|
+
import '../chunk-JHINXDSG.js';
|
|
3
3
|
//# sourceMappingURL=index.js.map
|
|
4
4
|
//# sourceMappingURL=index.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@thru/programs",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.4.0",
|
|
4
4
|
"description": "Typed TypeScript clients for Thru's core on-chain programs: token, AMM, CLOB, oracle, multicall, passkey manager, and others.",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"homepage": "https://thru.org/docs/sdks/web-packages/programs/",
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
}
|
|
90
90
|
},
|
|
91
91
|
"dependencies": {
|
|
92
|
-
"@thru/sdk": "0.
|
|
92
|
+
"@thru/sdk": "0.4.0"
|
|
93
93
|
},
|
|
94
94
|
"devDependencies": {
|
|
95
95
|
"@types/node": "^25.9.1",
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Pubkey } from '@thru/sdk';
|
|
2
|
+
import { BOOTSTRAP_PROGRAM_ADDRESSES } from '../bootstrap-addresses/index';
|
|
2
3
|
|
|
3
4
|
export const ABI_MANAGER_PROGRAM_ADDRESS =
|
|
4
|
-
|
|
5
|
+
BOOTSTRAP_PROGRAM_ADDRESSES.abi_manager;
|
|
5
6
|
export const ABI_MANAGER_PROGRAM_PUBKEY = Pubkey.from(
|
|
6
7
|
ABI_MANAGER_PROGRAM_ADDRESS
|
|
7
8
|
).toBytes();
|
|
@@ -25,9 +25,9 @@ describe('ABI-manager SDK', () => {
|
|
|
25
25
|
'taAFaJ4ctkbuhYBl2FX6tmXGJZQgShIXt6TPrMw4-GOsv4';
|
|
26
26
|
expect(deriveOfficialABIAddresses(programAddress)).toMatchObject({
|
|
27
27
|
abiMetaAccountAddress:
|
|
28
|
-
'
|
|
28
|
+
'taOLU1zaR-KPEa8cBkG3u5U7iovhmP-NuOwpGT6bKROhF_',
|
|
29
29
|
abiAccountAddress:
|
|
30
|
-
'
|
|
30
|
+
'taoEDtoyUlGvNW-sJdhH0VjmnRG35Oh0FS_oalfGbHUHCn',
|
|
31
31
|
});
|
|
32
32
|
const seed = hashExternalABISeed('publisher-seed');
|
|
33
33
|
const external = deriveExternalABIAddresses(
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import { createHash } from 'node:crypto';
|
|
1
2
|
import { describe, expect, it } from 'vitest';
|
|
2
3
|
|
|
3
|
-
import { deriveManagedProgramAddresses } from '../manager';
|
|
4
|
+
import { deriveManagedProgramAddresses, MANAGER_PROGRAM_PUBKEY, MANAGER_PROGRAM_ADDRESS, MANAGER_PROGRAM_SEED, ROOT_MANAGER_PROGRAM_ADDRESS } from '../manager';
|
|
5
|
+
import { UPLOADER_PROGRAM_SEED, UPLOADER_PROGRAM_ADDRESS } from '../uploader';
|
|
4
6
|
import {
|
|
5
7
|
BOOTSTRAP_PROGRAM_ADDRESSES,
|
|
6
8
|
BOOTSTRAP_PROGRAM_SEEDS,
|
|
@@ -12,28 +14,53 @@ import { createThruClient } from '@thru/sdk/client';
|
|
|
12
14
|
import { deriveMintAddress } from '../token';
|
|
13
15
|
|
|
14
16
|
const EXPECTED_ADDRESSES = {
|
|
15
|
-
noop: '
|
|
16
|
-
faucet: '
|
|
17
|
-
name_service: '
|
|
18
|
-
oracle: '
|
|
19
|
-
multicall: '
|
|
20
|
-
abi_manager: '
|
|
21
|
-
token: '
|
|
22
|
-
amm: '
|
|
23
|
-
clob: '
|
|
24
|
-
thru_registrar: '
|
|
25
|
-
wthru: '
|
|
26
|
-
passkey_manager: '
|
|
27
|
-
nft: '
|
|
28
|
-
block_producer: '
|
|
29
|
-
consensus_validator: '
|
|
17
|
+
noop: 'taNOOPV4A7S3WTsirr149To2GoGZ9q8zllQaBrbekHfkJT',
|
|
18
|
+
faucet: 'taFCTxR0y2eabGGaEdtTwC9pHz7ZY4CYD7FOiBFUJeAW16',
|
|
19
|
+
name_service: 'taNAMEqRNEDeMWp0cDYmMVdZyTZiF5NyGDR9zTwH42rWQG',
|
|
20
|
+
oracle: 'taORCLOkTSYq5enR2XOGoSDmzMc0P5NlqjP8nKpfd3vgps',
|
|
21
|
+
multicall: 'taMULTIrOL8WpIFr16C1ECsO60qAsuwmwJephZHDOTvSeP',
|
|
22
|
+
abi_manager: 'taABII8WXcPaPIt47cXjOBbyoBUGBDXznAMHorVMeok3mw',
|
|
23
|
+
token: 'taTOKENKRgcl3vO0yVhftATDbXuhgWcfaaxv9xpEEdMdUE',
|
|
24
|
+
amm: 'taAMMx8gG44RcOyRqNYZ55pDaAJoGS0R8kPYxBN96sO8kD',
|
|
25
|
+
clob: 'taCLOBcFk1PT8JTHQM1LzsyK6HLv1YkSJKZ2ZyIxo8fiTe',
|
|
26
|
+
thru_registrar: 'taREGMtyyVIMr27zDpvN0aRiSS2aOVffM9cZCsc0Xomaxw',
|
|
27
|
+
wthru: 'taWTHRUBelpONhTRjYc7n4OovodUsUtZKTIuREWAi9G9lm',
|
|
28
|
+
passkey_manager: 'taPASSIvjIgz2kZ1CIIhvbT00XV9Ve5kZ2I9uDLanzIgbA',
|
|
29
|
+
nft: 'taNFTjOaeDBSPHNf0LVRWAkF4raUFQgrz0EQIgJd60ENb5',
|
|
30
|
+
block_producer: 'taBPUH9m3CXZcBQyCrTmclHtltipiPelIHzdAf8QdIDvnt',
|
|
31
|
+
consensus_validator: 'taCONStGMCE1RJ9ttceyt0FZhYapGJ7zzBuCE5qqYdLhaF',
|
|
30
32
|
} as const;
|
|
31
33
|
|
|
32
34
|
describe('bootstrap-managed program addresses', () => {
|
|
33
|
-
it('
|
|
35
|
+
it('pins the root, approved main Manager and Uploader derivations', () => {
|
|
36
|
+
expect(ROOT_MANAGER_PROGRAM_ADDRESS).toBe('taAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEB');
|
|
37
|
+
expect(deriveManagedProgramAddresses(MANAGER_PROGRAM_SEED, false, ROOT_MANAGER_PROGRAM_ADDRESS).programAccountAddress)
|
|
38
|
+
.toBe('taMGRmPoSTkUtF6UlmCIq58K8OYsnXshOMPdobxxHytqmu');
|
|
39
|
+
expect(MANAGER_PROGRAM_ADDRESS).toBe('taMGRmPoSTkUtF6UlmCIq58K8OYsnXshOMPdobxxHytqmu');
|
|
40
|
+
expect(deriveManagedProgramAddresses(UPLOADER_PROGRAM_SEED).programAccountAddress).toBe(UPLOADER_PROGRAM_ADDRESS);
|
|
41
|
+
expect(UPLOADER_PROGRAM_ADDRESS).toBe('taUPLMH5QYOAT4ktwQeO7DXAEKtqBhYehalNGf5BJFQDYq');
|
|
42
|
+
});
|
|
43
|
+
it('matches all fifteen approved fresh-network vanity addresses', () => {
|
|
34
44
|
expect(BOOTSTRAP_PROGRAM_ADDRESSES).toEqual(EXPECTED_ADDRESSES);
|
|
35
45
|
});
|
|
36
46
|
|
|
47
|
+
it('pins the NFT seed, metadata, raw executable, and requested presentation', () => {
|
|
48
|
+
expect(BOOTSTRAP_PROGRAM_SEEDS.nft).toBe('thru-program:1654635');
|
|
49
|
+
const padded = Buffer.alloc(32);
|
|
50
|
+
padded.write(BOOTSTRAP_PROGRAM_SEEDS.nft);
|
|
51
|
+
expect(padded.toString('hex')).toBe(
|
|
52
|
+
'746872752d70726f6772616d3a31363534363335000000000000000000000000',
|
|
53
|
+
);
|
|
54
|
+
const nft = deriveManagedProgramAddresses(BOOTSTRAP_PROGRAM_SEEDS.nft, false);
|
|
55
|
+
expect(nft.programMetaAccountAddress).toBe(
|
|
56
|
+
'taIclvuHJiNtJxssqjw42tsrWMc5Kb7Rteeta4E4YOfOaE',
|
|
57
|
+
);
|
|
58
|
+
expect(Buffer.from(nft.programAccountBytes).toString('hex')).toBe(
|
|
59
|
+
'3454e339a7830523c735fd0b551580905e2b69415082bcf411022025deb410d6',
|
|
60
|
+
);
|
|
61
|
+
expect(nft.programAccountAddress).toMatch(/^taNFTj[A-Za-z0-9]+$/);
|
|
62
|
+
});
|
|
63
|
+
|
|
37
64
|
it('derives every address from its permanent bootstrap seed', () => {
|
|
38
65
|
for (const name of Object.keys(BOOTSTRAP_PROGRAM_SEEDS) as Array<
|
|
39
66
|
keyof typeof BOOTSTRAP_PROGRAM_SEEDS
|
|
@@ -45,8 +72,33 @@ describe('bootstrap-managed program addresses', () => {
|
|
|
45
72
|
}
|
|
46
73
|
});
|
|
47
74
|
|
|
48
|
-
it('derives
|
|
75
|
+
it('independently derives permanent executable addresses and their checksums', () => {
|
|
76
|
+
const manager = MANAGER_PROGRAM_PUBKEY;
|
|
77
|
+
const derive = (seed: Uint8Array) => createHash('sha256')
|
|
78
|
+
.update(manager).update(Uint8Array.of(0)).update(seed).digest();
|
|
79
|
+
const seeds = Object.values(BOOTSTRAP_PROGRAM_SEEDS);
|
|
80
|
+
expect(new Set(seeds).size).toBe(seeds.length);
|
|
81
|
+
expect(new Set(Object.values(EXPECTED_ADDRESSES)).size).toBe(seeds.length);
|
|
82
|
+
for (const name of Object.keys(BOOTSTRAP_PROGRAM_SEEDS) as Array<
|
|
83
|
+
keyof typeof BOOTSTRAP_PROGRAM_SEEDS
|
|
84
|
+
>) {
|
|
85
|
+
const seed = Buffer.from(BOOTSTRAP_PROGRAM_SEEDS[name], 'utf8');
|
|
86
|
+
expect(seed.length).toBeGreaterThan(0);
|
|
87
|
+
expect(seed.length).toBeLessThanOrEqual(32);
|
|
88
|
+
const padded = Buffer.alloc(32);
|
|
89
|
+
seed.copy(padded);
|
|
90
|
+
const executable = derive(derive(padded));
|
|
91
|
+
const checksum = executable.reduce((sum, byte) => sum + byte, 0) & 0xff;
|
|
92
|
+
const address = 'ta' + Buffer.concat([executable, Buffer.from([checksum])])
|
|
93
|
+
.toString('base64url');
|
|
94
|
+
expect(address).toBe(EXPECTED_ADDRESSES[name]);
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
it('derives the approved Alphanet THRUSD mint with the wallet setup default', () => {
|
|
49
99
|
const client = createThruClient({ baseUrl: 'https://rpc.test' });
|
|
100
|
+
expect(createHash('sha256').update('thru:credits:app-wide-mint:v1').digest('hex'))
|
|
101
|
+
.toBe(CREDITS_MINT_SEED_HEX);
|
|
50
102
|
expect(
|
|
51
103
|
deriveMintAddress(
|
|
52
104
|
client,
|
|
@@ -1,29 +1,34 @@
|
|
|
1
|
-
import { deriveManagedProgramAddresses } from '../manager/derivation';
|
|
1
|
+
import { deriveManagedProgramAddresses } from '../manager/derivation.js';
|
|
2
|
+
import { deriveAddress, deriveProgramAddress, Pubkey } from '@thru/sdk';
|
|
2
3
|
|
|
3
4
|
/** Permanent seeds used by programs/bootstrap. Changing a seed changes every
|
|
4
5
|
* managed program and ABI address derived from it. */
|
|
5
6
|
export const BOOTSTRAP_PROGRAM_SEEDS = Object.freeze({
|
|
6
|
-
noop: 'thru-
|
|
7
|
-
faucet: 'thru-
|
|
8
|
-
name_service: 'thru-
|
|
9
|
-
oracle: 'thru-
|
|
10
|
-
multicall: 'thru-
|
|
11
|
-
abi_manager: 'thru-
|
|
12
|
-
token: 'thru-
|
|
13
|
-
amm: 'thru-
|
|
14
|
-
clob: 'thru-
|
|
15
|
-
thru_registrar: 'thru-
|
|
16
|
-
wthru: 'thru-
|
|
17
|
-
passkey_manager: 'thru-
|
|
18
|
-
nft: 'thru-
|
|
19
|
-
block_producer: 'thru-
|
|
20
|
-
consensus_validator: 'thru-
|
|
7
|
+
noop: 'thru-program:22654259',
|
|
8
|
+
faucet: 'thru-program:310129',
|
|
9
|
+
name_service: 'thru-program:2236909',
|
|
10
|
+
oracle: 'thru-program:87959905',
|
|
11
|
+
multicall: 'thru-program:3153525730',
|
|
12
|
+
abi_manager: 'thru-program:167497',
|
|
13
|
+
token: 'thru-program:3767426089',
|
|
14
|
+
amm: 'thru-program:4614050',
|
|
15
|
+
clob: 'thru-program:79287062',
|
|
16
|
+
thru_registrar: 'thru-program:449594',
|
|
17
|
+
wthru: 'thru-program:1687299648',
|
|
18
|
+
passkey_manager: 'thru-program:1746189',
|
|
19
|
+
nft: 'thru-program:1654635',
|
|
20
|
+
block_producer: 'thru-program:8222',
|
|
21
|
+
consensus_validator: 'thru-program:35555736',
|
|
21
22
|
} as const);
|
|
22
23
|
|
|
23
24
|
function managedProgramAddress(seed: string): string {
|
|
24
25
|
return deriveManagedProgramAddresses(seed).programAccountAddress;
|
|
25
26
|
}
|
|
26
27
|
|
|
28
|
+
/** EOA is installed by genesis, not uploaded by application bootstrap. */
|
|
29
|
+
export const GENESIS_EOA_PROGRAM_SEED = 'thru-program:207434';
|
|
30
|
+
export const GENESIS_EOA_PROGRAM_ADDRESS = managedProgramAddress(GENESIS_EOA_PROGRAM_SEED);
|
|
31
|
+
|
|
27
32
|
/** Canonical application-facing addresses for bootstrap-managed programs. */
|
|
28
33
|
export const BOOTSTRAP_PROGRAM_ADDRESSES = Object.freeze({
|
|
29
34
|
noop: managedProgramAddress(BOOTSTRAP_PROGRAM_SEEDS.noop),
|
|
@@ -47,12 +52,44 @@ export const BOOTSTRAP_PROGRAM_ADDRESSES = Object.freeze({
|
|
|
47
52
|
),
|
|
48
53
|
} as const);
|
|
49
54
|
|
|
50
|
-
|
|
55
|
+
function stateAddress(program: string, label: string): string {
|
|
56
|
+
const seed = new Uint8Array(32);
|
|
57
|
+
seed.set(new TextEncoder().encode(label));
|
|
58
|
+
return deriveProgramAddress({ programAddress: program, seed }).address;
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const wthruSeed = new Uint8Array(32);
|
|
62
|
+
/** Created by Faucet initialization after deployment, never by genesis. */
|
|
63
|
+
export const BOOTSTRAP_FAUCET_VAULT_ADDRESS = stateAddress(BOOTSTRAP_PROGRAM_ADDRESSES.faucet, 'vault');
|
|
64
|
+
|
|
65
|
+
wthruSeed.set(new TextEncoder().encode('wthru'));
|
|
66
|
+
const wthruMintSeed = deriveAddress([
|
|
67
|
+
Pubkey.from(BOOTSTRAP_PROGRAM_ADDRESSES.wthru).toBytes(), wthruSeed,
|
|
68
|
+
]).bytes;
|
|
69
|
+
|
|
70
|
+
/** State pre-created by mksnap before the managed executables are deployed.
|
|
71
|
+
* Consensus state uses its own namespace; WTHRU matches program initialization. */
|
|
72
|
+
export const BOOTSTRAP_STATE_ADDRESSES = Object.freeze({
|
|
73
|
+
attestor_table: stateAddress(BOOTSTRAP_PROGRAM_ADDRESSES.consensus_validator, 'attestor_table'),
|
|
74
|
+
attestor_mint: stateAddress(BOOTSTRAP_PROGRAM_ADDRESSES.consensus_validator, 'attestor_mint'),
|
|
75
|
+
converted_vault: stateAddress(BOOTSTRAP_PROGRAM_ADDRESSES.consensus_validator, 'converted_vault'),
|
|
76
|
+
unclaimed_vault: stateAddress(BOOTSTRAP_PROGRAM_ADDRESSES.consensus_validator, 'unclaimed_vault'),
|
|
77
|
+
validator_token_base: stateAddress(BOOTSTRAP_PROGRAM_ADDRESSES.consensus_validator, 'validator_token'),
|
|
78
|
+
wthru_mint: deriveProgramAddress({
|
|
79
|
+
programAddress: BOOTSTRAP_PROGRAM_ADDRESSES.token, seed: wthruMintSeed,
|
|
80
|
+
}).address,
|
|
81
|
+
wthru_vault: stateAddress(BOOTSTRAP_PROGRAM_ADDRESSES.wthru, 'vault'),
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
/** Alphanet production THRUSD mint after the approved fresh-network reset.
|
|
85
|
+
* Keep the legacy CREDITS export names for consumers. The seed is SHA-256 of
|
|
86
|
+
* thru:credits:app-wide-mint:v1, matching the wallet mint setup default.
|
|
87
|
+
* Application mints are initialized separately, not by core ensure all. */
|
|
51
88
|
export const CREDITS_MINT_AUTHORITY_ADDRESS =
|
|
52
89
|
'taDOTQyYDVPvYqIFKNBFbOIstmBXeY7Ne06JnUAjmHa4VI';
|
|
53
90
|
export const CREDITS_MINT_SEED_HEX =
|
|
54
|
-
'
|
|
91
|
+
'93dd69ed3fd6776d814430ec1d9de70716cdac46f89184d88251cabc4865f211';
|
|
55
92
|
export const CREDITS_MINT_ADDRESS =
|
|
56
|
-
'
|
|
93
|
+
'taRfWjryqWSRRp6ZU_ahCHXKhEA0oRVKWZlE4Us86vnOOt';
|
|
57
94
|
|
|
58
95
|
export type BootstrapProgramName = keyof typeof BOOTSTRAP_PROGRAM_SEEDS;
|
package/src/deploy/accounts.ts
CHANGED
|
@@ -79,15 +79,19 @@ function assertOwner(account: Account, owner: string, label: string): void {
|
|
|
79
79
|
export function assertManagedProgramAccount(
|
|
80
80
|
account: Account,
|
|
81
81
|
label = "managed program account",
|
|
82
|
+
managerProgramAddress = MANAGER_PROGRAM_ADDRESS,
|
|
82
83
|
): void {
|
|
83
|
-
assertOwner(account,
|
|
84
|
+
assertOwner(account, managerProgramAddress, label);
|
|
84
85
|
if (!account.meta?.flags.isProgram) {
|
|
85
86
|
throw new DeployError("VERIFICATION_FAILED", `${label} is not executable`);
|
|
86
87
|
}
|
|
87
88
|
}
|
|
88
89
|
|
|
89
|
-
export function parseManagerMeta(
|
|
90
|
-
|
|
90
|
+
export function parseManagerMeta(
|
|
91
|
+
account: Account,
|
|
92
|
+
managerProgramAddress = MANAGER_PROGRAM_ADDRESS,
|
|
93
|
+
): ParsedManagerMeta {
|
|
94
|
+
assertOwner(account, managerProgramAddress, "program metadata account");
|
|
91
95
|
try {
|
|
92
96
|
const parsed = parseManagerProgramMeta(account);
|
|
93
97
|
return {
|
package/src/deploy/chain.ts
CHANGED
|
@@ -83,7 +83,7 @@ export async function submitTransaction(
|
|
|
83
83
|
header: {
|
|
84
84
|
fee: 0n,
|
|
85
85
|
computeUnits: transaction.computeUnits ?? 500_000_000,
|
|
86
|
-
stateUnits: transaction.stateUnits ??
|
|
86
|
+
stateUnits: transaction.stateUnits ?? 1,
|
|
87
87
|
memoryUnits: transaction.memoryUnits ?? 5_000,
|
|
88
88
|
expiryAfter: transaction.expiryAfter ?? 10_000,
|
|
89
89
|
},
|
package/src/deploy/constants.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { MULTICALL_PROGRAM_ADDRESS } from "../multicall";
|
|
2
2
|
|
|
3
3
|
export {
|
|
4
4
|
MANAGER_META_SIZE,
|
|
@@ -13,10 +13,9 @@ export {
|
|
|
13
13
|
ABI_STATE_FINALIZED,
|
|
14
14
|
ABI_STATE_OPEN,
|
|
15
15
|
} from "../abi-manager";
|
|
16
|
-
/**
|
|
17
|
-
* Multicall cannot be used to deploy itself. */
|
|
16
|
+
/** Bootstrap installs this binary through Manager without an ABI first. */
|
|
18
17
|
export const DEPLOYMENT_MULTICALL_PROGRAM_ADDRESS =
|
|
19
|
-
|
|
18
|
+
MULTICALL_PROGRAM_ADDRESS;
|
|
20
19
|
export {
|
|
21
20
|
UPLOADER_DEFAULT_CHUNK_SIZE as DEFAULT_CHUNK_SIZE,
|
|
22
21
|
UPLOADER_MAX_CHUNK_SIZE as MAX_CHUNK_SIZE,
|
|
@@ -3,6 +3,7 @@ import { encodeAddress } from "@thru/sdk/helpers";
|
|
|
3
3
|
import { describe, expect, it, vi } from "vitest";
|
|
4
4
|
import { deriveProgramABIAddresses } from "../abi-manager";
|
|
5
5
|
import { deriveManagedProgramAddresses } from "../manager";
|
|
6
|
+
import { BOOTSTRAP_PROGRAM_ADDRESSES } from "../bootstrap-addresses";
|
|
6
7
|
import { deriveUploadAddresses } from "../uploader";
|
|
7
8
|
import {
|
|
8
9
|
parseABIAccount,
|
|
@@ -53,18 +54,18 @@ describe("deployment address derivation", () => {
|
|
|
53
54
|
const program = deriveManagedProgramAddresses("nft");
|
|
54
55
|
expect(program).toMatchObject({
|
|
55
56
|
programMetaAccountAddress:
|
|
56
|
-
"
|
|
57
|
-
programAccountAddress: "
|
|
57
|
+
"taJM9c0C5t2kaaNv_PyeVn6khHuwc-zeN39MUTW_yghOBU",
|
|
58
|
+
programAccountAddress: "tak_0Jtlh0y2hPHscfXkS1eXuEpPUB35xh5KqT5A2fR2ZE",
|
|
58
59
|
});
|
|
59
60
|
expect(
|
|
60
61
|
deriveProgramABIAddresses(program.programAccountAddress),
|
|
61
62
|
).toMatchObject({
|
|
62
|
-
abiMetaAccountAddress: "
|
|
63
|
-
abiAccountAddress: "
|
|
63
|
+
abiMetaAccountAddress: "taUkpVSe_kjePfi1VuPEtdsOz8kZZy2tI6DABDju_W4arS",
|
|
64
|
+
abiAccountAddress: "taeecO6WARCvCL_fJz9WnGNlrQ1r-96I79A6m-en4krTNe",
|
|
64
65
|
});
|
|
65
66
|
expect(deriveUploadAddresses("nft_temporary")).toMatchObject({
|
|
66
|
-
metaAccountAddress: "
|
|
67
|
-
bufferAccountAddress: "
|
|
67
|
+
metaAccountAddress: "ta1WUSEixlsGSJ6qBFdur6lzwO_xOF0x1y70CiI_ju7Ifc",
|
|
68
|
+
bufferAccountAddress: "taIx7ja7eblEGbwJOrS4a1kikDTuQg_nYvu-2kKfC6aCIx",
|
|
68
69
|
});
|
|
69
70
|
});
|
|
70
71
|
|
|
@@ -80,11 +81,11 @@ describe("deployment address derivation", () => {
|
|
|
80
81
|
});
|
|
81
82
|
|
|
82
83
|
it("uses canonical built-in addresses", () => {
|
|
83
|
-
expect(UPLOADER_PROGRAM_ADDRESS).toBe(
|
|
84
|
-
expect(MANAGER_PROGRAM_ADDRESS).toBe(
|
|
85
|
-
expect(DEPLOYMENT_MULTICALL_PROGRAM_ADDRESS).toBe(
|
|
84
|
+
expect(UPLOADER_PROGRAM_ADDRESS).toBe("taUPLMH5QYOAT4ktwQeO7DXAEKtqBhYehalNGf5BJFQDYq");
|
|
85
|
+
expect(MANAGER_PROGRAM_ADDRESS).toBe("taMGRmPoSTkUtF6UlmCIq58K8OYsnXshOMPdobxxHytqmu");
|
|
86
|
+
expect(DEPLOYMENT_MULTICALL_PROGRAM_ADDRESS).toBe(BOOTSTRAP_PROGRAM_ADDRESSES.multicall);
|
|
86
87
|
expect(ABI_MANAGER_PROGRAM_ADDRESS).toBe(
|
|
87
|
-
|
|
88
|
+
BOOTSTRAP_PROGRAM_ADDRESSES.abi_manager,
|
|
88
89
|
);
|
|
89
90
|
});
|
|
90
91
|
});
|
package/src/deploy/inspection.ts
CHANGED
|
@@ -37,6 +37,7 @@ export async function inspectProgramDeployment(
|
|
|
37
37
|
const programAddresses = deriveManagedProgramAddresses(
|
|
38
38
|
request.seed,
|
|
39
39
|
ephemeral,
|
|
40
|
+
request.managerProgramAddress,
|
|
40
41
|
);
|
|
41
42
|
const abiAddresses = deriveProgramABIAddresses(
|
|
42
43
|
programAddresses.programAccountAddress,
|
|
@@ -66,8 +67,8 @@ export async function inspectProgramDeployment(
|
|
|
66
67
|
if (!metadataAccount || !programAccount) {
|
|
67
68
|
program = absentPair(!!metadataAccount, !!programAccount);
|
|
68
69
|
} else {
|
|
69
|
-
const metadata = parseManagerMeta(metadataAccount);
|
|
70
|
-
assertManagedProgramAccount(programAccount);
|
|
70
|
+
const metadata = parseManagerMeta(metadataAccount, request.managerProgramAddress);
|
|
71
|
+
assertManagedProgramAccount(programAccount, undefined, request.managerProgramAddress);
|
|
71
72
|
const authorityAddress = Pubkey.from(metadata.authority).toThruFmt();
|
|
72
73
|
if (request.authorityAddress !== undefined) {
|
|
73
74
|
let expectedAuthority: Uint8Array;
|
package/src/deploy/types.ts
CHANGED
|
@@ -32,6 +32,9 @@ export interface DeployProgressEvent {
|
|
|
32
32
|
|
|
33
33
|
export interface DeploymentRequestBase {
|
|
34
34
|
seed: string;
|
|
35
|
+
/** Parent Manager executable. Use root to upgrade the managed main Manager.
|
|
36
|
+
* Non-default parents support program binaries, not official ABI publication. */
|
|
37
|
+
managerProgramAddress?: string;
|
|
35
38
|
signer: DeploymentSigner;
|
|
36
39
|
client?: Thru;
|
|
37
40
|
ephemeral?: boolean;
|
|
@@ -124,6 +127,8 @@ export type UpgradeProgramABIResult = ProgramABIMutationResult;
|
|
|
124
127
|
export interface InspectProgramDeploymentRequest {
|
|
125
128
|
client: Thru;
|
|
126
129
|
seed: string;
|
|
130
|
+
/** Parent Manager executable used for derivation and ownership checks. */
|
|
131
|
+
managerProgramAddress?: string;
|
|
127
132
|
ephemeral?: boolean;
|
|
128
133
|
authorityAddress?: string;
|
|
129
134
|
expectedProgramBytes?: Uint8Array;
|
package/src/deploy/uploader.ts
CHANGED
|
@@ -214,7 +214,8 @@ export async function uploadArtifact(
|
|
|
214
214
|
seed: upload.seed,
|
|
215
215
|
}),
|
|
216
216
|
computeUnits: 50_000 + upload.bytes.length * 2,
|
|
217
|
-
|
|
217
|
+
// One metadata account plus the meta-inclusive buffer footprint.
|
|
218
|
+
stateUnits: 1 + Math.ceil((64 + upload.bytes.length) / 4096),
|
|
218
219
|
memoryUnits: 10_000,
|
|
219
220
|
expiryAfter: 10,
|
|
220
221
|
},
|
|
@@ -314,7 +315,7 @@ export async function uploadArtifact(
|
|
|
314
315
|
offset,
|
|
315
316
|
}),
|
|
316
317
|
computeUnits: 500_000_000,
|
|
317
|
-
stateUnits:
|
|
318
|
+
stateUnits: 1,
|
|
318
319
|
memoryUnits: 5_000,
|
|
319
320
|
expiryAfter: 10_000,
|
|
320
321
|
},
|
|
@@ -414,7 +415,7 @@ export async function uploadArtifact(
|
|
|
414
415
|
expectedHash: upload.hash,
|
|
415
416
|
}),
|
|
416
417
|
computeUnits: 50_000 + upload.bytes.length * 200,
|
|
417
|
-
stateUnits:
|
|
418
|
+
stateUnits: 1,
|
|
418
419
|
memoryUnits: 5_000,
|
|
419
420
|
expiryAfter: 10_000,
|
|
420
421
|
},
|
|
@@ -497,7 +498,7 @@ export async function cleanupUpload(
|
|
|
497
498
|
metaAccount: upload.addresses.metaAccountBytes,
|
|
498
499
|
}),
|
|
499
500
|
computeUnits: 50_000,
|
|
500
|
-
stateUnits:
|
|
501
|
+
stateUnits: 1,
|
|
501
502
|
memoryUnits: 5_000,
|
|
502
503
|
expiryAfter: 10_000,
|
|
503
504
|
},
|
|
@@ -17,7 +17,8 @@ import {
|
|
|
17
17
|
import { DeployError } from "./errors";
|
|
18
18
|
import type { DeploymentTransaction } from "./chain";
|
|
19
19
|
import type { PreparedUpload } from "./uploader";
|
|
20
|
-
import { deployProgram, upgradeProgram } from "./workflows";
|
|
20
|
+
import { deployProgram, deployProgramABI, upgradeProgram, upgradeProgramABI } from "./workflows";
|
|
21
|
+
import { inspectProgramDeployment } from "./inspection";
|
|
21
22
|
|
|
22
23
|
const mocks = vi.hoisted(() => ({
|
|
23
24
|
submitTransaction: vi.fn(),
|
|
@@ -113,6 +114,7 @@ interface Harness {
|
|
|
113
114
|
submitMode: "success" | "failure" | "unknown";
|
|
114
115
|
wrongProgramReadback: boolean;
|
|
115
116
|
duplicateTarget: boolean;
|
|
117
|
+
ownerOverride?: string;
|
|
116
118
|
encoded?: Uint8Array;
|
|
117
119
|
transaction?: DeploymentTransaction;
|
|
118
120
|
};
|
|
@@ -148,12 +150,15 @@ function instructionContext(
|
|
|
148
150
|
};
|
|
149
151
|
}
|
|
150
152
|
|
|
151
|
-
async function makeHarness(
|
|
153
|
+
async function makeHarness(
|
|
154
|
+
upgrade = false,
|
|
155
|
+
managerProgramAddress = MANAGER_PROGRAM_ADDRESS,
|
|
156
|
+
): Promise<Harness> {
|
|
152
157
|
const privateKey = new Uint8Array(32).fill(0x19);
|
|
153
158
|
const localClient = createThruClient();
|
|
154
159
|
const publicKey = await localClient.keys.fromPrivateKey(privateKey);
|
|
155
160
|
const signer = { address: Pubkey.from(publicKey).toThruFmt(), privateKey };
|
|
156
|
-
const program = deriveManagedProgramAddresses("workflow");
|
|
161
|
+
const program = deriveManagedProgramAddresses("workflow", false, managerProgramAddress);
|
|
157
162
|
const abi = deriveProgramABIAddresses(program.programAccountAddress);
|
|
158
163
|
const state: Harness["state"] = {
|
|
159
164
|
committed: false,
|
|
@@ -195,7 +200,7 @@ async function makeHarness(upgrade = false): Promise<Harness> {
|
|
|
195
200
|
program.programMetaAccountAddress,
|
|
196
201
|
storedAccount(
|
|
197
202
|
program.programMetaAccountAddress,
|
|
198
|
-
|
|
203
|
+
state.ownerOverride ?? managerProgramAddress,
|
|
199
204
|
managerData,
|
|
200
205
|
),
|
|
201
206
|
],
|
|
@@ -203,7 +208,7 @@ async function makeHarness(upgrade = false): Promise<Harness> {
|
|
|
203
208
|
program.programAccountAddress,
|
|
204
209
|
storedAccount(
|
|
205
210
|
program.programAccountAddress,
|
|
206
|
-
|
|
211
|
+
state.ownerOverride ?? managerProgramAddress,
|
|
207
212
|
programBytes,
|
|
208
213
|
true,
|
|
209
214
|
),
|
|
@@ -298,6 +303,70 @@ describe("deployment workflows", () => {
|
|
|
298
303
|
);
|
|
299
304
|
});
|
|
300
305
|
|
|
306
|
+
const rootManager = Pubkey.from(Uint8Array.from([...new Uint8Array(31), 1])).toThruFmt();
|
|
307
|
+
|
|
308
|
+
it.each([false, true])("supports root-managed binary operations (upgrade=%s)", async (upgrade) => {
|
|
309
|
+
const harness = await makeHarness(upgrade, rootManager);
|
|
310
|
+
const operation = upgrade ? upgradeProgram : deployProgram;
|
|
311
|
+
const result = await operation({
|
|
312
|
+
seed: "workflow", managerProgramAddress: rootManager,
|
|
313
|
+
signer: harness.signer, client: harness.client, program: image(0x33),
|
|
314
|
+
});
|
|
315
|
+
expect(result.programAccountAddress).toBe(harness.program.programAccountAddress);
|
|
316
|
+
expect(result.programMetaAccountAddress).toBe(harness.program.programMetaAccountAddress);
|
|
317
|
+
expect(result.programVersion).toBe(upgrade ? 6n : 0n);
|
|
318
|
+
expect(mocks.submitTransaction).toHaveBeenCalledOnce();
|
|
319
|
+
expect(harness.state.transaction?.program).toBe(rootManager);
|
|
320
|
+
expect(harness.state.encoded?.[0]).toBe(upgrade ? 2 : 0);
|
|
321
|
+
await expect(inspectProgramDeployment({
|
|
322
|
+
client: harness.client, seed: "workflow", managerProgramAddress: rootManager,
|
|
323
|
+
authorityAddress: harness.signer.address, expectedProgramBytes: image(0x33),
|
|
324
|
+
})).resolves.toMatchObject({
|
|
325
|
+
programAccountAddress: harness.program.programAccountAddress,
|
|
326
|
+
program: { status: "present", bytesMatch: true, version: upgrade ? 6n : 0n },
|
|
327
|
+
});
|
|
328
|
+
});
|
|
329
|
+
|
|
330
|
+
it("rejects another Manager's ownership even with the expected authority", async () => {
|
|
331
|
+
const harness = await makeHarness(true, rootManager);
|
|
332
|
+
harness.state.ownerOverride = MANAGER_PROGRAM_ADDRESS;
|
|
333
|
+
const request = {
|
|
334
|
+
seed: "workflow", managerProgramAddress: rootManager,
|
|
335
|
+
signer: harness.signer, client: harness.client, program: image(0x33),
|
|
336
|
+
};
|
|
337
|
+
await expect(upgradeProgram(request)).rejects.toMatchObject({ code: "VERIFICATION_FAILED" });
|
|
338
|
+
await expect(inspectProgramDeployment(request)).rejects.toMatchObject({ code: "VERIFICATION_FAILED" });
|
|
339
|
+
expect(mocks.uploadArtifact).not.toHaveBeenCalled();
|
|
340
|
+
expect(mocks.submitTransaction).not.toHaveBeenCalled();
|
|
341
|
+
});
|
|
342
|
+
|
|
343
|
+
it.each([deployProgram, upgradeProgram, deployProgramABI, upgradeProgramABI])(
|
|
344
|
+
"rejects unsupported official ABI operations under root before uploading",
|
|
345
|
+
async (operation) => {
|
|
346
|
+
const harness = await makeHarness(true, rootManager);
|
|
347
|
+
await expect(operation({
|
|
348
|
+
seed: "workflow", managerProgramAddress: rootManager,
|
|
349
|
+
signer: harness.signer, client: harness.client,
|
|
350
|
+
program: image(0x33), abi: ABI_BYTES,
|
|
351
|
+
})).rejects.toMatchObject({ code: "INVALID_INPUT" });
|
|
352
|
+
expect(mocks.uploadArtifact).not.toHaveBeenCalled();
|
|
353
|
+
expect(mocks.submitTransaction).not.toHaveBeenCalled();
|
|
354
|
+
},
|
|
355
|
+
);
|
|
356
|
+
|
|
357
|
+
it.each(["not-an-address", Pubkey.from(new Uint8Array(32)).toThruFmt()])(
|
|
358
|
+
"rejects an invalid parent before resolving the signer",
|
|
359
|
+
async (managerProgramAddress) => {
|
|
360
|
+
const harness = await makeHarness();
|
|
361
|
+
await expect(deployProgram({
|
|
362
|
+
seed: "workflow", managerProgramAddress,
|
|
363
|
+
signer: harness.signer, client: harness.client, program: image(0x33),
|
|
364
|
+
})).rejects.toMatchObject({ code: "INVALID_INPUT" });
|
|
365
|
+
expect(harness.client.keys.fromPrivateKey).not.toHaveBeenCalled();
|
|
366
|
+
expect(mocks.uploadArtifact).not.toHaveBeenCalled();
|
|
367
|
+
},
|
|
368
|
+
);
|
|
369
|
+
|
|
301
370
|
it("commits a program plus ABI in one ordered multicall and reports cleanup warnings", async () => {
|
|
302
371
|
const harness = await makeHarness();
|
|
303
372
|
mocks.cleanupUpload.mockImplementation(
|