From 5dd4d41726a99fe425492139fb8c18da8f819260 Mon Sep 17 00:00:00 2001 From: Koen Rijpstra Date: Mon, 14 Oct 2024 21:34:32 +0200 Subject: [PATCH 1/3] Added ZK Compression program names --- app/utils/programs.ts | 50 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 4 deletions(-) diff --git a/app/utils/programs.ts b/app/utils/programs.ts index 1b83dfce..bd1e3f22 100644 --- a/app/utils/programs.ts +++ b/app/utils/programs.ts @@ -86,6 +86,16 @@ export enum PROGRAM_NAMES { OPENBOOK_DEX = 'OpenBook Dex', FINTERNET_USER_MANAGER = 'Finternet - User manager', FINTERNET_TOKEN_MANAGER = 'Finternet - Token manager', + + // ZK Compression + ZK_LIGHT_SYSTEM_PROGRAM = "Light System Program", + ZK_COMPRESSED_TOKEN_PROGRAM = "Compressed Token Program", + ZK_ACCOUNT_COMPRESSION_PROGRAM = "Account Compression Program", + ZK_SHARED_PUBLIC_STATE_TREE = "Shared Public State Tree", + ZK_SHARED_PUBLIC_NULLIFIER_QUEUE = "Shared Public Nullifier Queue", + ZK_SHARED_PUBLIC_ADDRESS_TREE = "Shared Public Address Tree", + ZK_SHARED_PUBLIC_ADDRESS_QUEUE = "Shared Public Address Queue", + ZK_COMPRESSED_TOKEN_ESCROW_OWNER_PDA = "Compressed Token Escrow Owner PDA", } const ALL_CLUSTERS = [Cluster.Custom, Cluster.Devnet, Cluster.Testnet, Cluster.MainnetBeta]; @@ -204,7 +214,7 @@ export const PROGRAM_INFO_BY_ID: { [address: string]: ProgramInfo } = { name: PROGRAM_NAMES.CLOCKWORK_2, }, CmFuqQTLs2nQof5uaktJn1a6k2VdbGmZPfrJufB2Vm3F: { - deployments: [Cluster.Devnet,Cluster.MainnetBeta], + deployments: [Cluster.Devnet, Cluster.MainnetBeta], name: PROGRAM_NAMES.FINTERNET_USER_MANAGER, }, ComputeBudget111111111111111111111111111111: { @@ -435,6 +445,38 @@ export const PROGRAM_INFO_BY_ID: { [address: string]: ProgramInfo } = { deployments: [Cluster.MainnetBeta], name: PROGRAM_NAMES.WORMHOLE_TOKEN, }, + SySTEM1eSU2p4BGQfQpimFEWWSC1XDFeun3Nqzz3rT7: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_LIGHT_SYSTEM_PROGRAM, + }, + cTokenmWW8bLPjZEBAUgYy3zKxQZW6VKi7bqNFEVv3m: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_COMPRESSED_TOKEN_PROGRAM, + }, + compr6CUsB5m2jS4Y3831ztGSTnDpnKJTKS95d64XVq: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_ACCOUNT_COMPRESSION_PROGRAM, + }, + smt1NamzXdq4AMqS2fS2F1i5KTYPZRhoHgWx38d8WsT: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_SHARED_PUBLIC_STATE_TREE, + }, + nfq1NvQDJ2GEgnS8zt9prAe8rjjpAW1zFkrvZoBR148: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_SHARED_PUBLIC_NULLIFIER_QUEUE, + }, + amt1Ayt45jfbdw5YSo7iz6WZxUmnZsQTYXy82hVwyC2: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_SHARED_PUBLIC_ADDRESS_TREE, + }, + aq1S9z4reTSQAdgWHGD2zDaS39sjGrAxbR31vxJ2F4F: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_SHARED_PUBLIC_ADDRESS_QUEUE, + }, + GXtd2izAiMJPwMEjfgTRH3d7k9mjn4Jq3JrWFv9gySYy: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_COMPRESSED_TOKEN_ESCROW_OWNER_PDA, + }, }; export const SPECIAL_IDS: { [key: string]: string } = { @@ -456,8 +498,8 @@ export const SYSVAR_IDS: { [key: string]: string } = { }; export const TOKEN_IDS: { [key: string]: string } = { - TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: 'Token Program', - TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb: 'Token-2022 Program', + TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: 'Token Program', + TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb: 'Token-2022 Program', } as const; export type TokenProgram = 'spl-token' | 'spl-token-2022'; @@ -468,7 +510,7 @@ export function isTokenProgram(program: string): program is TokenProgram { try { assertIsTokenProgram(program); return true; - } catch(e) { + } catch (e) { return false; } } From 39009f64a6009bca253acb1d6dc0bf941204afcd Mon Sep 17 00:00:00 2001 From: Noah Gundotra Date: Tue, 15 Oct 2024 10:36:17 -0400 Subject: [PATCH 2/3] Remove address labels from program labels --- app/utils/programs.ts | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/app/utils/programs.ts b/app/utils/programs.ts index bd1e3f22..7d52420d 100644 --- a/app/utils/programs.ts +++ b/app/utils/programs.ts @@ -89,13 +89,8 @@ export enum PROGRAM_NAMES { // ZK Compression ZK_LIGHT_SYSTEM_PROGRAM = "Light System Program", - ZK_COMPRESSED_TOKEN_PROGRAM = "Compressed Token Program", - ZK_ACCOUNT_COMPRESSION_PROGRAM = "Account Compression Program", - ZK_SHARED_PUBLIC_STATE_TREE = "Shared Public State Tree", - ZK_SHARED_PUBLIC_NULLIFIER_QUEUE = "Shared Public Nullifier Queue", - ZK_SHARED_PUBLIC_ADDRESS_TREE = "Shared Public Address Tree", - ZK_SHARED_PUBLIC_ADDRESS_QUEUE = "Shared Public Address Queue", - ZK_COMPRESSED_TOKEN_ESCROW_OWNER_PDA = "Compressed Token Escrow Owner PDA", + ZK_COMPRESSED_TOKEN_PROGRAM = "ZK Compressed Token Program", + ZK_ACCOUNT_COMPRESSION_PROGRAM = "ZK Account Compression Program" } const ALL_CLUSTERS = [Cluster.Custom, Cluster.Devnet, Cluster.Testnet, Cluster.MainnetBeta]; @@ -457,26 +452,6 @@ export const PROGRAM_INFO_BY_ID: { [address: string]: ProgramInfo } = { deployments: [Cluster.MainnetBeta, Cluster.Devnet], name: PROGRAM_NAMES.ZK_ACCOUNT_COMPRESSION_PROGRAM, }, - smt1NamzXdq4AMqS2fS2F1i5KTYPZRhoHgWx38d8WsT: { - deployments: [Cluster.MainnetBeta, Cluster.Devnet], - name: PROGRAM_NAMES.ZK_SHARED_PUBLIC_STATE_TREE, - }, - nfq1NvQDJ2GEgnS8zt9prAe8rjjpAW1zFkrvZoBR148: { - deployments: [Cluster.MainnetBeta, Cluster.Devnet], - name: PROGRAM_NAMES.ZK_SHARED_PUBLIC_NULLIFIER_QUEUE, - }, - amt1Ayt45jfbdw5YSo7iz6WZxUmnZsQTYXy82hVwyC2: { - deployments: [Cluster.MainnetBeta, Cluster.Devnet], - name: PROGRAM_NAMES.ZK_SHARED_PUBLIC_ADDRESS_TREE, - }, - aq1S9z4reTSQAdgWHGD2zDaS39sjGrAxbR31vxJ2F4F: { - deployments: [Cluster.MainnetBeta, Cluster.Devnet], - name: PROGRAM_NAMES.ZK_SHARED_PUBLIC_ADDRESS_QUEUE, - }, - GXtd2izAiMJPwMEjfgTRH3d7k9mjn4Jq3JrWFv9gySYy: { - deployments: [Cluster.MainnetBeta, Cluster.Devnet], - name: PROGRAM_NAMES.ZK_COMPRESSED_TOKEN_ESCROW_OWNER_PDA, - }, }; export const SPECIAL_IDS: { [key: string]: string } = { From a9ee3ccda7fa9f79c0b3f5c0b6fd589846e231de Mon Sep 17 00:00:00 2001 From: Noah Gundotra Date: Tue, 15 Oct 2024 17:32:58 -0400 Subject: [PATCH 3/3] fix lint --- app/utils/programs.ts | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/app/utils/programs.ts b/app/utils/programs.ts index 7d52420d..cca253b2 100644 --- a/app/utils/programs.ts +++ b/app/utils/programs.ts @@ -88,9 +88,9 @@ export enum PROGRAM_NAMES { FINTERNET_TOKEN_MANAGER = 'Finternet - Token manager', // ZK Compression - ZK_LIGHT_SYSTEM_PROGRAM = "Light System Program", - ZK_COMPRESSED_TOKEN_PROGRAM = "ZK Compressed Token Program", - ZK_ACCOUNT_COMPRESSION_PROGRAM = "ZK Account Compression Program" + ZK_LIGHT_SYSTEM_PROGRAM = 'Light System Program', + ZK_COMPRESSED_TOKEN_PROGRAM = 'ZK Compressed Token Program', + ZK_ACCOUNT_COMPRESSION_PROGRAM = 'ZK Account Compression Program', } const ALL_CLUSTERS = [Cluster.Custom, Cluster.Devnet, Cluster.Testnet, Cluster.MainnetBeta]; @@ -356,6 +356,10 @@ export const PROGRAM_INFO_BY_ID: { [address: string]: ProgramInfo } = { deployments: LIVE_CLUSTERS, name: PROGRAM_NAMES.SWAP, }, + SySTEM1eSU2p4BGQfQpimFEWWSC1XDFeun3Nqzz3rT7: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_LIGHT_SYSTEM_PROGRAM, + }, TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA: { deployments: ALL_CLUSTERS, name: PROGRAM_NAMES.TOKEN, @@ -384,6 +388,10 @@ export const PROGRAM_INFO_BY_ID: { [address: string]: ProgramInfo } = { deployments: LIVE_CLUSTERS, name: PROGRAM_NAMES.NFT_AUCTION, }, + cTokenmWW8bLPjZEBAUgYy3zKxQZW6VKi7bqNFEVv3m: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_COMPRESSED_TOKEN_PROGRAM, + }, cjg3oHmg9uuPsP8D6g29NWvhySJkdYdAo9D25PRbKXJ: { deployments: [Cluster.Devnet, Cluster.MainnetBeta], name: PROGRAM_NAMES.CHAINLINK_ORACLE, @@ -400,6 +408,10 @@ export const PROGRAM_INFO_BY_ID: { [address: string]: ProgramInfo } = { deployments: LIVE_CLUSTERS, name: PROGRAM_NAMES.NFT_CANDY_MACHINE, }, + compr6CUsB5m2jS4Y3831ztGSTnDpnKJTKS95d64XVq: { + deployments: [Cluster.MainnetBeta, Cluster.Devnet], + name: PROGRAM_NAMES.ZK_ACCOUNT_COMPRESSION_PROGRAM, + }, gSbePebfvPy7tRqimPoVecS2UsBvYv46ynrzWocc92s: { deployments: [Cluster.Devnet], name: PROGRAM_NAMES.PYTH_DEVNET, @@ -418,7 +430,7 @@ export const PROGRAM_INFO_BY_ID: { [address: string]: ProgramInfo } = { }, oreV2ZymfyeXgNgBdqMkumTqqAprVqgBWQfoYkrtKWQ: { deployments: [Cluster.MainnetBeta], - name: PROGRAM_NAMES.ORE + name: PROGRAM_NAMES.ORE, }, p1exdMJcjVao65QdewkaZRUnU6VPSXhus9n2GzWfh98: { deployments: LIVE_CLUSTERS, @@ -440,18 +452,6 @@ export const PROGRAM_INFO_BY_ID: { [address: string]: ProgramInfo } = { deployments: [Cluster.MainnetBeta], name: PROGRAM_NAMES.WORMHOLE_TOKEN, }, - SySTEM1eSU2p4BGQfQpimFEWWSC1XDFeun3Nqzz3rT7: { - deployments: [Cluster.MainnetBeta, Cluster.Devnet], - name: PROGRAM_NAMES.ZK_LIGHT_SYSTEM_PROGRAM, - }, - cTokenmWW8bLPjZEBAUgYy3zKxQZW6VKi7bqNFEVv3m: { - deployments: [Cluster.MainnetBeta, Cluster.Devnet], - name: PROGRAM_NAMES.ZK_COMPRESSED_TOKEN_PROGRAM, - }, - compr6CUsB5m2jS4Y3831ztGSTnDpnKJTKS95d64XVq: { - deployments: [Cluster.MainnetBeta, Cluster.Devnet], - name: PROGRAM_NAMES.ZK_ACCOUNT_COMPRESSION_PROGRAM, - }, }; export const SPECIAL_IDS: { [key: string]: string } = { @@ -479,7 +479,8 @@ export const TOKEN_IDS: { [key: string]: string } = { export type TokenProgram = 'spl-token' | 'spl-token-2022'; export function assertIsTokenProgram(program: string): asserts program is TokenProgram { - if (program !== 'spl-token' && program !== 'spl-token-2022') throw new Error("Expected token program name of `spl-token` or `spl-token-2022`"); + if (program !== 'spl-token' && program !== 'spl-token-2022') + throw new Error('Expected token program name of `spl-token` or `spl-token-2022`'); } export function isTokenProgram(program: string): program is TokenProgram { try {