From 304dca5a739d38b5a73a3c92715ed4878e6b04c4 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 4 Jul 2024 18:04:55 +0100 Subject: [PATCH 01/30] feat: add `datil-test` support --- local-tests/setup/tinny-config.ts | 2 ++ local-tests/tests/wrapped-keys/util.ts | 4 ++++ .../constants/src/lib/constants/constants.ts | 17 ++++++++++++++-- packages/constants/src/lib/enums.ts | 1 + .../contracts-sdk/src/lib/contracts-sdk.ts | 20 +++++++++++++++---- .../src/lib/lit-auth-client.ts | 8 ++++++-- packages/types/src/lib/types.ts | 1 + .../src/lib/service-client/types.ts | 2 +- .../src/lib/service-client/utils.ts | 1 + 9 files changed, 47 insertions(+), 9 deletions(-) diff --git a/local-tests/setup/tinny-config.ts b/local-tests/setup/tinny-config.ts index e6bfbd18c..7e874d122 100644 --- a/local-tests/setup/tinny-config.ts +++ b/local-tests/setup/tinny-config.ts @@ -6,6 +6,7 @@ export enum LIT_TESTNET { MANZANO = 'manzano', CAYENNE = 'cayenne', DATIL_DEV = 'datil-dev', + DATIL_TEST = 'datil-test', } export enum LIT_RPC { @@ -22,6 +23,7 @@ export const RPC_MAP = { [LIT_TESTNET.MANZANO]: LIT_RPC.CHRONICLE, [LIT_TESTNET.CAYENNE]: LIT_RPC.CHRONICLE, [LIT_TESTNET.DATIL_DEV]: LIT_RPC.VESUVIUS, + [LIT_TESTNET.DATIL_TEST]: LIT_RPC.VESUVIUS, }; export interface ProcessEnvs { diff --git a/local-tests/tests/wrapped-keys/util.ts b/local-tests/tests/wrapped-keys/util.ts index b39b7b19d..de3ebe92e 100644 --- a/local-tests/tests/wrapped-keys/util.ts +++ b/local-tests/tests/wrapped-keys/util.ts @@ -17,6 +17,8 @@ export function getChainForNetwork(network: LIT_NETWORKS_KEYS): { }; case 'datil-dev': return { chain: 'vesuvius', chainId: LIT_CHAINS['datilDevnet'].chainId }; + case 'datil-test': + return { chain: 'vesuvius', chainId: LIT_CHAINS['datilTestnet'].chainId }; default: throw new Error(`Cannot identify chain params for ${network}`); } @@ -36,6 +38,8 @@ export function getGasParamsForNetwork(network: LIT_NETWORKS_KEYS): { }; case 'datil-dev': return { gasLimit: 5000000 }; + case 'datil-test': + return { gasLimit: 5000000 }; default: throw new Error(`Cannot identify chain params for ${network}`); } diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 12400af25..abcb18ea8 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -481,7 +481,18 @@ export const LIT_CHAINS: LITChain = { contractAddress: null, chainId: 2311, name: 'Vesuvius - Lit Protocol Devnet', - symbol: 'testLIT', + symbol: 'tstLit', + decimals: 18, + rpcUrls: ['https://vesuvius-rpc.litprotocol.com/'], + blockExplorerUrls: ['https://vesuvius-explorer.litprotocol.com/'], + type: null, + vmType: 'EVM', + }, + datilTestnet: { + contractAddress: null, + chainId: 2311, + name: 'Vesuvius - Lit Protocol Testnet', + symbol: 'tstLit', decimals: 18, rpcUrls: ['https://vesuvius-rpc.litprotocol.com/'], blockExplorerUrls: ['https://vesuvius-explorer.litprotocol.com/'], @@ -628,7 +639,7 @@ export enum LIT_RPC { CHRONICLE = 'https://chain-rpc.litprotocol.com/http', /** - * Vesuvius RPC endpoint - used for >= Datil-dev + * Vesuvius RPC endpoint - used for >= Datil-dev, Datil-test */ VESUVIUS = 'https://vesuvius-rpc.litprotocol.com', } @@ -790,6 +801,7 @@ export const LIT_NETWORKS: { [key in LitNetwork]: string[] } & { [LitNetwork.Cayenne]: [], [LitNetwork.Manzano]: [], [LitNetwork.DatilDev]: [], + [LitNetwork.DatilTest]: [], [LitNetwork.Habanero]: [], [LitNetwork.Custom]: [], // FIXME: Remove localhost and internalDev; replaced with 'custom' type networks @@ -832,6 +844,7 @@ export const RELAY_URL_CAYENNE = export const RELAY_URL_HABANERO = 'https://habanero-relayer.getlit.dev'; export const RELAY_URL_MANZANO = 'https://manzano-relayer.getlit.dev'; export const RELAY_URL_DATIL_DEV = 'https://datil-dev-relayer.getlit.dev'; +export const RELAY_URL_DATIL_TEST = 'https://datil-test-relayer.getlit.dev'; // ========== Lit Actions ========== export const LIT_ACTION_IPFS_HASH = diff --git a/packages/constants/src/lib/enums.ts b/packages/constants/src/lib/enums.ts index f48e77975..d6b64ce5a 100644 --- a/packages/constants/src/lib/enums.ts +++ b/packages/constants/src/lib/enums.ts @@ -59,6 +59,7 @@ export enum LitNetwork { Habanero = 'habanero', Custom = 'custom', DatilDev = 'datil-dev', + DatilTest = 'datil-test', } /** diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index a84727fb6..76fb80565 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -215,7 +215,9 @@ export class LitContracts { // if rpc is not specified, use the default rpc if (!this.rpc) { this.rpc = - args?.network === 'datil-dev' ? LIT_RPC.VESUVIUS : LIT_RPC.CHRONICLE; + args?.network === 'datil-dev' || args?.network === 'datil-test' + ? LIT_RPC.VESUVIUS + : LIT_RPC.CHRONICLE; } if (!this.rpcs) { @@ -304,7 +306,9 @@ export class LitContracts { }; const chainInfo = - this.network === 'datil-dev' ? vesuviusChainInfo : chronicleChainInfo; + this.network === 'datil-dev' || this.network === 'datil-test' + ? vesuviusChainInfo + : chronicleChainInfo; try { await web3Provider.send('wallet_switchEthereumChain', [ @@ -612,14 +616,16 @@ export class LitContracts { ) { let provider: ethers.providers.JsonRpcProvider; rpcUrl = - rpcUrl ?? network === 'datil-dev' ? LIT_RPC.VESUVIUS : LIT_RPC.CHRONICLE; + rpcUrl ?? (network === 'datil-dev' || network === 'datil-test') + ? LIT_RPC.VESUVIUS + : LIT_RPC.CHRONICLE; if (context && 'provider' in context!) { provider = context.provider; } else { provider = new ethers.providers.JsonRpcProvider(rpcUrl); } - if (network === 'datil-dev') { + if (network === 'datil-dev' || network === 'datil-test') { // @ts-ignore context!.Staking!.abi = minStakingAbi; } @@ -987,6 +993,9 @@ export class LitContracts { const DATIL_DEV_API = 'https://lit-general-worker.getlit.dev/datil-dev/contracts'; + const DATIL_TEST_API = + 'https://lit-general-worker.getlit.dev/datil-test/contracts'; + const fetchData = async (url: string) => { try { return await fetch(url).then((res) => res.json()); @@ -1008,6 +1017,9 @@ export class LitContracts { case 'datil-dev': data = await fetchData(DATIL_DEV_API); break; + case 'datil-test': + data = await fetchData(DATIL_TEST_API); + break; case 'custom': case 'localhost': // just use cayenne abis for custom and localhost diff --git a/packages/lit-auth-client/src/lib/lit-auth-client.ts b/packages/lit-auth-client/src/lib/lit-auth-client.ts index f52c13cc6..23cdf251a 100644 --- a/packages/lit-auth-client/src/lib/lit-auth-client.ts +++ b/packages/lit-auth-client/src/lib/lit-auth-client.ts @@ -6,6 +6,7 @@ import { ProviderType, RELAY_URL_CAYENNE, RELAY_URL_DATIL_DEV, + RELAY_URL_DATIL_TEST, RELAY_URL_HABANERO, RELAY_URL_MANZANO, } from '@lit-protocol/constants'; @@ -97,7 +98,7 @@ export class LitAuthClient { ); } - const supportedNetworks = ['cayenne', 'habanero', 'manzano', 'datil-dev']; + const supportedNetworks = ['cayenne', 'habanero', 'manzano', 'datil-dev', 'datil-test']; if (!supportedNetworks.includes(this.litNodeClient.config.litNetwork)) { throw new Error( @@ -122,6 +123,9 @@ export class LitAuthClient { case 'datil-dev': url = RELAY_URL_DATIL_DEV; break; + case 'datil-test': + url = RELAY_URL_DATIL_TEST; + break; } this.relay = new LitRelay({ @@ -146,7 +150,7 @@ export class LitAuthClient { // Set RPC URL this.rpcUrl = - options?.rpcUrl || this.litNodeClient.config.litNetwork === 'datil-dev' + options?.rpcUrl || (this.litNodeClient.config.litNetwork === 'datil-dev' || this.litNodeClient.config.litNetwork === 'datil-test') ? LIT_RPC.VESUVIUS : LIT_RPC.CHRONICLE; log('rpc url: ', this.rpcUrl); diff --git a/packages/types/src/lib/types.ts b/packages/types/src/lib/types.ts index e51df2445..73d6f299d 100644 --- a/packages/types/src/lib/types.ts +++ b/packages/types/src/lib/types.ts @@ -121,6 +121,7 @@ export type LITChain = Record; export type LIT_NETWORKS_KEYS = | 'cayenne' | 'datil-dev' + | 'datil-test' | 'localhost' | 'custom' | 'habanero' diff --git a/packages/wrapped-keys/src/lib/service-client/types.ts b/packages/wrapped-keys/src/lib/service-client/types.ts index 83bfb3aab..317bc6f2b 100644 --- a/packages/wrapped-keys/src/lib/service-client/types.ts +++ b/packages/wrapped-keys/src/lib/service-client/types.ts @@ -11,7 +11,7 @@ export type FetchKeyParams = BaseApiParams; export type SupportedNetworks = Extract< LIT_NETWORKS_KEYS, - 'cayenne' | 'manzano' | 'habanero' | 'datil-dev' + 'cayenne' | 'manzano' | 'habanero' | 'datil-dev' | 'datil-test' >; export interface StoreKeyParams extends BaseApiParams { diff --git a/packages/wrapped-keys/src/lib/service-client/utils.ts b/packages/wrapped-keys/src/lib/service-client/utils.ts index d1532b4f3..cb9bd49a8 100644 --- a/packages/wrapped-keys/src/lib/service-client/utils.ts +++ b/packages/wrapped-keys/src/lib/service-client/utils.ts @@ -24,6 +24,7 @@ const supportedNetworks: SupportedNetworks[] = [ 'manzano', 'habanero', 'datil-dev', + 'datil-test', ]; function isSupportedLitNetwork( From ea52a3121b400fb4ad0b261f4b956dbfc01c7a41 Mon Sep 17 00:00:00 2001 From: Anson Date: Fri, 5 Jul 2024 15:55:20 +0100 Subject: [PATCH 02/30] feat: add `datil-test` support --- packages/lit-auth-client/src/lib/lit-auth-client.ts | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/lit-auth-client/src/lib/lit-auth-client.ts b/packages/lit-auth-client/src/lib/lit-auth-client.ts index 23cdf251a..03444a686 100644 --- a/packages/lit-auth-client/src/lib/lit-auth-client.ts +++ b/packages/lit-auth-client/src/lib/lit-auth-client.ts @@ -98,7 +98,13 @@ export class LitAuthClient { ); } - const supportedNetworks = ['cayenne', 'habanero', 'manzano', 'datil-dev', 'datil-test']; + const supportedNetworks = [ + 'cayenne', + 'habanero', + 'manzano', + 'datil-dev', + 'datil-test', + ]; if (!supportedNetworks.includes(this.litNodeClient.config.litNetwork)) { throw new Error( @@ -150,7 +156,9 @@ export class LitAuthClient { // Set RPC URL this.rpcUrl = - options?.rpcUrl || (this.litNodeClient.config.litNetwork === 'datil-dev' || this.litNodeClient.config.litNetwork === 'datil-test') + options?.rpcUrl || + this.litNodeClient.config.litNetwork === 'datil-dev' || + this.litNodeClient.config.litNetwork === 'datil-test' ? LIT_RPC.VESUVIUS : LIT_RPC.CHRONICLE; log('rpc url: ', this.rpcUrl); From c52d380fe1da61c7244d46efa25b0767ff1893c4 Mon Sep 17 00:00:00 2001 From: Anson Date: Fri, 5 Jul 2024 16:23:57 +0100 Subject: [PATCH 03/30] fix: use staging api instead of `datil-test` --- packages/contracts-sdk/src/lib/contracts-sdk.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index 76fb80565..33ffe5d91 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -992,9 +992,8 @@ export class LitContracts { 'https://lit-general-worker.getlit.dev/habanero-contract-addresses'; const DATIL_DEV_API = 'https://lit-general-worker.getlit.dev/datil-dev/contracts'; - const DATIL_TEST_API = - 'https://lit-general-worker.getlit.dev/datil-test/contracts'; + 'https://staging.apis.getlit.dev/datil-test/contracts'; const fetchData = async (url: string) => { try { @@ -2437,7 +2436,6 @@ https://developer.litprotocol.com/v3/sdk/wallets/auth-methods/#auth-method-scope permittedAuthMethodScopes, addPkpEthAddressAsPermittedAddress, sendPkpToItself, - { value: mintCost, gasLimit: gasLimit || GAS_LIMIT, From 88cf00ea532b0c4d9193078cc51bc5bf0e4bc21f Mon Sep 17 00:00:00 2001 From: Anson Date: Fri, 5 Jul 2024 16:24:44 +0100 Subject: [PATCH 04/30] fix: add `datil-test` to `SERVICE_URL_BY_LIT_NETWORK` --- packages/wrapped-keys/src/lib/service-client/constants.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/wrapped-keys/src/lib/service-client/constants.ts b/packages/wrapped-keys/src/lib/service-client/constants.ts index c99b2483f..6c2c73ad9 100644 --- a/packages/wrapped-keys/src/lib/service-client/constants.ts +++ b/packages/wrapped-keys/src/lib/service-client/constants.ts @@ -10,6 +10,7 @@ const SERVICE_URL_BY_NETWORKTYPE: Record = { export const SERVICE_URL_BY_LIT_NETWORK: Record = { [LitNetwork.DatilDev]: SERVICE_URL_BY_NETWORKTYPE.TestNetworks, + [LitNetwork.DatilTest]: SERVICE_URL_BY_NETWORKTYPE.TestNetworks, [LitNetwork.Cayenne]: SERVICE_URL_BY_NETWORKTYPE.TestNetworks, [LitNetwork.Manzano]: SERVICE_URL_BY_NETWORKTYPE.TestNetworks, [LitNetwork.Habanero]: SERVICE_URL_BY_NETWORKTYPE.Production, From d7fd0e92320c740bcce07eecf6ee2a708ce0150f Mon Sep 17 00:00:00 2001 From: Anson Date: Fri, 5 Jul 2024 16:38:35 +0100 Subject: [PATCH 05/30] fix: relayer mint claim --- packages/misc/src/lib/misc.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/misc/src/lib/misc.ts b/packages/misc/src/lib/misc.ts index 5d2dfe894..8bd7649a5 100644 --- a/packages/misc/src/lib/misc.ts +++ b/packages/misc/src/lib/misc.ts @@ -8,6 +8,7 @@ import { LitNetwork, RELAY_URL_CAYENNE, RELAY_URL_DATIL_DEV, + RELAY_URL_DATIL_TEST, RELAY_URL_HABANERO, RELAY_URL_MANZANO, } from '@lit-protocol/constants'; @@ -681,6 +682,10 @@ export const defaultMintClaimCallback: MintCallback< case LitNetwork.DatilDev: relayUrl = RELAY_URL_DATIL_DEV + '/auth/claim'; break; + break; + case LitNetwork.DatilTest: + relayUrl = RELAY_URL_DATIL_TEST + '/auth/claim'; + break; } const url = params.relayUrl ? params.relayUrl : relayUrl; From 8c91b34b95a0f98c63967c604ceb69e0ab5e81d1 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 10:34:21 +0100 Subject: [PATCH 06/30] chore: update `DATIL_TEST_API` from staging to prod --- packages/contracts-sdk/src/lib/contracts-sdk.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index 33ffe5d91..84d3c4ba8 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -993,7 +993,7 @@ export class LitContracts { const DATIL_DEV_API = 'https://lit-general-worker.getlit.dev/datil-dev/contracts'; const DATIL_TEST_API = - 'https://staging.apis.getlit.dev/datil-test/contracts'; + 'https://apis.getlit.dev/datil-test/contracts'; const fetchData = async (url: string) => { try { From acb95ed17089f125cb5b618a7ad109a03f0cb6ff Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 10:38:45 +0100 Subject: [PATCH 07/30] chore: prettier --- packages/contracts-sdk/src/lib/contracts-sdk.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index 84d3c4ba8..38ebee49c 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -992,8 +992,7 @@ export class LitContracts { 'https://lit-general-worker.getlit.dev/habanero-contract-addresses'; const DATIL_DEV_API = 'https://lit-general-worker.getlit.dev/datil-dev/contracts'; - const DATIL_TEST_API = - 'https://apis.getlit.dev/datil-test/contracts'; + const DATIL_TEST_API = 'https://apis.getlit.dev/datil-test/contracts'; const fetchData = async (url: string) => { try { From e1c9a1387a452ec3cd41fa0d80b11e0afce693c3 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 12:40:51 +0100 Subject: [PATCH 08/30] feat: use map of network to RPC, general worker, relayer urls --- .../constants/src/lib/constants/constants.ts | 140 +++++++++++++++++- .../contracts-sdk/src/lib/contracts-sdk.ts | 22 +-- .../src/lib/lit-auth-client.ts | 16 +- packages/misc/src/lib/misc.ts | 48 +++--- 4 files changed, 169 insertions(+), 57 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index abcb18ea8..14ac1bcfc 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -625,27 +625,136 @@ export const LIT_CHAINS: LITChain = { export const LIT_CHAIN_RPC_URL = LIT_CHAINS['chronicleTestnet'].rpcUrls[0]; /** - * Enum representing the available LIT RPC endpoints. + * Constants representing the available LIT RPC endpoints. */ -export enum LIT_RPC { +export const LIT_RPC = { /** * Local Anvil RPC endpoint. */ - LOCAL_ANVIL = 'http://127.0.0.1:8545', + LOCAL_ANVIL: 'http://127.0.0.1:8545', /** * Chronicle RPC endpoint - Used for Cayenne, Manzano, Habanero */ - CHRONICLE = 'https://chain-rpc.litprotocol.com/http', + CHRONICLE: 'https://chain-rpc.litprotocol.com/http', /** * Vesuvius RPC endpoint - used for >= Datil-dev, Datil-test + * @deprecated Will be removed in version 7.x. - Use CHRONICLE_VESUVIUS instead */ - VESUVIUS = 'https://vesuvius-rpc.litprotocol.com', -} + VESUVIUS: 'https://vesuvius-rpc.litprotocol.com', + + /** + * Vesuvius RPC endpoint - used for >= Datil-dev, Datil-test + */ + CHRONICLE_VESUVIUS: 'https://vesuvius-rpc.litprotocol.com', +} as const; export const LIT_EVM_CHAINS = LIT_CHAINS; +/** + * Represents the Lit Network constants. + */ +export const LIT_NETWORK: { [key in keyof typeof LitNetwork]: string } = { + Cayenne: 'cayenne', + Manzano: 'manzano', + Habanero: 'habanero', + Custom: 'custom', + DatilDev: 'datil-dev', + DatilTest: 'datil-test', +}; + +/** + * The type representing the keys of the LIT_NETWORK object. + * + * Possible values are: + * - 'Cayenne' + * - 'Manzano' + * - 'Habanero' + * - 'Custom' + * - 'DatilDev' + * - 'DatilTest' + * etc. + */ +export type LIT_NETWORK_TYPES = keyof typeof LIT_NETWORK; + +/** + * The type representing the values of the LIT_NETWORK object. + * + * Possible values are: + * - 'cayenne' + * - 'manzano' + * - 'habanero' + * - 'custom' + * - 'datil-dev' + * - 'datil-test' + * etc. + */ +export type LIT_NETWORK_VALUES = (typeof LIT_NETWORK)[LIT_NETWORK_TYPES]; + +/** + * RPC URL by Network + * + * A mapping of network names to their corresponding RPC URLs. + */ +export const RPC_URL_BY_NETWORK: Record = { + Cayenne: LIT_RPC.CHRONICLE, + Manzano: LIT_RPC.CHRONICLE, + Habanero: LIT_RPC.CHRONICLE, + DatilDev: LIT_RPC.CHRONICLE_VESUVIUS, + DatilTest: LIT_RPC.CHRONICLE_VESUVIUS, + Custom: LIT_RPC.LOCAL_ANVIL, +}; + +/** + * Mapping of network names to their corresponding relayer URLs. + */ +export const RELAYER_URL_BY_NETWORK: Record = { + Cayenne: 'https://relayer-server-staging-cayenne.getlit.dev', + Manzano: 'https://manzano-relayer.getlit.dev', + Habanero: 'https://habanero-relayer.getlit.dev', + DatilDev: 'https://datil-dev-relayer.getlit.dev', + DatilTest: 'https://datil-test-relayer.getlit.dev', + Custom: 'http://localhost:3000', +}; + +/** + * URL mappings for general worker URLs by network. + */ +export const GENERAL_WORKER_URL_BY_NETWORK: Record< + keyof typeof LIT_NETWORK, + string +> = { + Cayenne: 'https://apis.getlit.dev/cayenne/contracts', + Manzano: 'https://apis.getlit.dev/manzano/contracts', + Habanero: 'https://apis.getlit.dev/habanero/contracts', + DatilDev: 'https://apis.getlit.dev/datil-dev/contracts', + DatilTest: 'https://apis.getlit.dev/datil-test/contracts', + + // just use cayenne abis for custom and localhost + Custom: 'https://apis.getlit.dev/cayenne/contracts', +}; + +/** + * URL constants for the staging worker by network. + * + * @remarks + * This constant maps each network to its corresponding staging worker URL. + */ +export const GENERAL_STAGING_WORKER_URL_BY_NETWORK: Record< + keyof typeof LIT_NETWORK, + string +> = { + Cayenne: 'https://staging.apis.getlit.dev/cayenne/contracts', + Manzano: 'https://staging.apis.getlit.dev/manzano/contracts', + Habanero: 'https://staging.apis.getlit.dev/habanero/contracts', + DatilDev: 'https://staging.apis.getlit.dev/datil-dev/contracts', + DatilTest: 'https://staging.apis.getlit.dev/datil-test/contracts', + + // just use cayenne abis for custom and localhost + Custom: 'https://apis.getlit.dev/cayenne/contracts', +}; + /** * Solana Chains supported by the LIT protocol. Use the chain name as a key in this object. * @constant @@ -839,11 +948,30 @@ export const TELEM_API_URL = 'https://lit-general-worker.getlit.dev'; // ========== RLI Delegation ========== export const SIWE_DELEGATION_URI = 'lit:capability:delegation'; +/** + * @deprecated Will be removed in version 7.x. - Use RELAYER_URL_BY_NETWORK.Cayenne instead + */ export const RELAY_URL_CAYENNE = 'https://relayer-server-staging-cayenne.getlit.dev'; + +/** + * @deprecated Will be removed in version 7.x. - Use RELAYER_URL_BY_NETWORK.Habanero instead + */ export const RELAY_URL_HABANERO = 'https://habanero-relayer.getlit.dev'; + +/** + * @deprecated Will be removed in version 7.x. - Use RELAYER_URL_BY_NETWORK.Manzano instead + */ export const RELAY_URL_MANZANO = 'https://manzano-relayer.getlit.dev'; + +/** + * @deprecated Will be removed in version 7.x. - Use RELAYER_URL_BY_NETWORK.DatilDev instead + */ export const RELAY_URL_DATIL_DEV = 'https://datil-dev-relayer.getlit.dev'; + +/** + * @deprecated Will be removed in version 7.x. - Use RELAYER_URL_BY_NETWORK.DatilTest instead + */ export const RELAY_URL_DATIL_TEST = 'https://datil-test-relayer.getlit.dev'; // ========== Lit Actions ========== diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index 38ebee49c..8ff113510 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -70,6 +70,7 @@ import { import { AuthMethodScope, AuthMethodType, + GENERAL_WORKER_URL_BY_NETWORK, LIT_CHAINS, LIT_RPC, } from '@lit-protocol/constants'; @@ -984,15 +985,6 @@ export class LitContracts { // context?: LitContractContext | LitContractResolverContext ) { let data; - const CAYENNE_API = - 'https://lit-general-worker.getlit.dev/contract-addresses'; - const MANZANO_API = - 'https://lit-general-worker.getlit.dev/manzano-contract-addresses'; - const HABANERO_API = - 'https://lit-general-worker.getlit.dev/habanero-contract-addresses'; - const DATIL_DEV_API = - 'https://lit-general-worker.getlit.dev/datil-dev/contracts'; - const DATIL_TEST_API = 'https://apis.getlit.dev/datil-test/contracts'; const fetchData = async (url: string) => { try { @@ -1004,24 +996,24 @@ export class LitContracts { switch (network) { case 'cayenne': - data = await fetchData(CAYENNE_API); + data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.Cayenne); break; case 'manzano': - data = await fetchData(MANZANO_API); + data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.Manzano); break; case 'habanero': - data = await fetchData(HABANERO_API); + data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.Habanero); break; case 'datil-dev': - data = await fetchData(DATIL_DEV_API); + data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.DatilDev); break; case 'datil-test': - data = await fetchData(DATIL_TEST_API); + data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.DatilTest); break; case 'custom': case 'localhost': // just use cayenne abis for custom and localhost - data = await fetchData(CAYENNE_API); + data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.Cayenne); break; default: throw new Error( diff --git a/packages/lit-auth-client/src/lib/lit-auth-client.ts b/packages/lit-auth-client/src/lib/lit-auth-client.ts index 03444a686..0971205c9 100644 --- a/packages/lit-auth-client/src/lib/lit-auth-client.ts +++ b/packages/lit-auth-client/src/lib/lit-auth-client.ts @@ -4,11 +4,7 @@ import { AuthMethodType, LIT_RPC, ProviderType, - RELAY_URL_CAYENNE, - RELAY_URL_DATIL_DEV, - RELAY_URL_DATIL_TEST, - RELAY_URL_HABANERO, - RELAY_URL_MANZANO, + RELAYER_URL_BY_NETWORK, } from '@lit-protocol/constants'; import { LitNodeClient } from '@lit-protocol/lit-node-client'; import { bootstrapLogManager, getLoggerbyId, log } from '@lit-protocol/misc'; @@ -118,19 +114,19 @@ export class LitAuthClient { switch (this.litNodeClient.config.litNetwork) { case 'cayenne': - url = RELAY_URL_CAYENNE; + url = RELAYER_URL_BY_NETWORK.Cayenne; break; case 'habanero': - url = RELAY_URL_HABANERO; + url = RELAYER_URL_BY_NETWORK.Habanero; break; case 'manzano': - url = RELAY_URL_MANZANO; + url = RELAYER_URL_BY_NETWORK.Manzano; break; case 'datil-dev': - url = RELAY_URL_DATIL_DEV; + url = RELAYER_URL_BY_NETWORK.DatilDev; break; case 'datil-test': - url = RELAY_URL_DATIL_TEST; + url = RELAYER_URL_BY_NETWORK.DatilTest; break; } diff --git a/packages/misc/src/lib/misc.ts b/packages/misc/src/lib/misc.ts index 8bd7649a5..05f82a815 100644 --- a/packages/misc/src/lib/misc.ts +++ b/packages/misc/src/lib/misc.ts @@ -3,14 +3,12 @@ import { ILitError, LIT_AUTH_SIG_CHAIN_KEYS, LIT_CHAINS, - LIT_ENDPOINT, LIT_ERROR, + LIT_NETWORK, + LIT_NETWORK_TYPES, + LIT_NETWORK_VALUES, LitNetwork, - RELAY_URL_CAYENNE, - RELAY_URL_DATIL_DEV, - RELAY_URL_DATIL_TEST, - RELAY_URL_HABANERO, - RELAY_URL_MANZANO, + RELAYER_URL_BY_NETWORK, } from '@lit-protocol/constants'; import { @@ -664,28 +662,26 @@ export const defaultMintClaimCallback: MintCallback< RelayClaimProcessor > = async ( params: ClaimResult, - network: string = 'cayenne' + network: LIT_NETWORK_VALUES = 'cayenne' ): Promise => { try { - let relayUrl: string = ''; - - switch (network) { - case LitNetwork.Cayenne: - relayUrl = RELAY_URL_CAYENNE + '/auth/claim'; - break; - case LitNetwork.Habanero: - relayUrl = RELAY_URL_HABANERO + 'auth/claim'; - break; - case LitNetwork.Manzano: - relayUrl = RELAY_URL_MANZANO + 'auth/claim'; - break; - case LitNetwork.DatilDev: - relayUrl = RELAY_URL_DATIL_DEV + '/auth/claim'; - break; - break; - case LitNetwork.DatilTest: - relayUrl = RELAY_URL_DATIL_TEST + '/auth/claim'; - break; + const AUTH_CLAIM_PATH = '/auth/claim'; + + const AUTH_CLAIM_URL_BY_NETWORK: Record = { + Cayenne: RELAYER_URL_BY_NETWORK.Cayenne + AUTH_CLAIM_PATH, + Manzano: RELAYER_URL_BY_NETWORK.Manzano + AUTH_CLAIM_PATH, + Habanero: RELAYER_URL_BY_NETWORK.Habanero + AUTH_CLAIM_PATH, + DatilDev: RELAYER_URL_BY_NETWORK.DatilDev + AUTH_CLAIM_PATH, + DatilTest: RELAYER_URL_BY_NETWORK.DatilTest + AUTH_CLAIM_PATH, + Custom: RELAYER_URL_BY_NETWORK.Cayenne + AUTH_CLAIM_PATH, + }; + + const relayUrl : LIT_NETWORK_VALUES = AUTH_CLAIM_URL_BY_NETWORK[network as LIT_NETWORK_TYPES]; + + if (!params.relayUrl && !relayUrl) { + throw new Error( + 'No relayUrl provided and no default relayUrl found for network' + ); } const url = params.relayUrl ? params.relayUrl : relayUrl; From f669cf3bb501ed0673a89191bece45a438798bce Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 12:46:11 +0100 Subject: [PATCH 09/30] chore: prettier --- packages/misc/src/lib/misc.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/misc/src/lib/misc.ts b/packages/misc/src/lib/misc.ts index 05f82a815..2dc3a09f6 100644 --- a/packages/misc/src/lib/misc.ts +++ b/packages/misc/src/lib/misc.ts @@ -676,7 +676,8 @@ export const defaultMintClaimCallback: MintCallback< Custom: RELAYER_URL_BY_NETWORK.Cayenne + AUTH_CLAIM_PATH, }; - const relayUrl : LIT_NETWORK_VALUES = AUTH_CLAIM_URL_BY_NETWORK[network as LIT_NETWORK_TYPES]; + const relayUrl: LIT_NETWORK_VALUES = + AUTH_CLAIM_URL_BY_NETWORK[network as LIT_NETWORK_TYPES]; if (!params.relayUrl && !relayUrl) { throw new Error( From 29a6ee9b5dd14777d798eed80168b0804b2d6dfd Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 13:30:36 +0100 Subject: [PATCH 10/30] fix: use map values --- .../constants/src/lib/constants/constants.ts | 90 +++++++++++++++--- .../contracts-sdk/src/lib/contracts-sdk.ts | 91 ++++++------------- .../src/lib/lit-auth-client.ts | 15 ++- 3 files changed, 111 insertions(+), 85 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 14ac1bcfc..7816421e0 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -477,10 +477,14 @@ export const LIT_CHAINS: LITChain = { type: null, vmType: 'EVM', }, + + /** + * @deprecated Will be removed in version 7.x. - Use `chronicleVesuviusTestnet` instead. + */ datilDevnet: { contractAddress: null, chainId: 2311, - name: 'Vesuvius - Lit Protocol Devnet', + name: 'Chronicle Vesuvius - Lit Protocol Testnet', symbol: 'tstLit', decimals: 18, rpcUrls: ['https://vesuvius-rpc.litprotocol.com/'], @@ -488,10 +492,10 @@ export const LIT_CHAINS: LITChain = { type: null, vmType: 'EVM', }, - datilTestnet: { + chronicleVesuviusTestnet: { contractAddress: null, chainId: 2311, - name: 'Vesuvius - Lit Protocol Testnet', + name: 'Chronicle Vesuvius - Lit Protocol Testnet', symbol: 'tstLit', decimals: 18, rpcUrls: ['https://vesuvius-rpc.litprotocol.com/'], @@ -624,6 +628,42 @@ export const LIT_CHAINS: LITChain = { export const LIT_CHAIN_RPC_URL = LIT_CHAINS['chronicleTestnet'].rpcUrls[0]; +/** + * Object containing information to submit to Metamask + */ +export const metamaskChainInfo = { + /** + * Information about the "chronicle" chain. + */ + chronicle: { + chainId: LIT_CHAINS['chronicleTestnet'].chainId, + chainName: LIT_CHAINS['chronicleTestnet'].name, + nativeCurrency: { + name: LIT_CHAINS['chronicleTestnet'].symbol, + symbol: LIT_CHAINS['chronicleTestnet'].symbol, + decimals: LIT_CHAINS['chronicleTestnet'].decimals, + }, + rpcUrls: LIT_CHAINS['chronicleTestnet'].rpcUrls, + blockExplorerUrls: LIT_CHAINS['chronicleTestnet'].blockExplorerUrls, + iconUrls: ['future'], + }, + /** + * Information about the "chronicleVesuvius" chain. + */ + chronicleVesuvius: { + chainId: LIT_CHAINS['chronicleVesuviusTestnet'].chainId, + chainName: LIT_CHAINS['chronicleVesuviusTestnet'].name, + nativeCurrency: { + name: LIT_CHAINS['chronicleVesuviusTestnet'].symbol, + symbol: LIT_CHAINS['chronicleVesuviusTestnet'].symbol, + decimals: LIT_CHAINS['chronicleVesuviusTestnet'].decimals, + }, + rpcUrls: LIT_CHAINS['chronicleVesuviusTestnet'].rpcUrls, + blockExplorerUrls: LIT_CHAINS['chronicleVesuviusTestnet'].blockExplorerUrls, + iconUrls: ['future'], + }, +}; + /** * Constants representing the available LIT RPC endpoints. */ @@ -655,14 +695,15 @@ export const LIT_EVM_CHAINS = LIT_CHAINS; /** * Represents the Lit Network constants. */ -export const LIT_NETWORK: { [key in keyof typeof LitNetwork]: string } = { +export const LIT_NETWORK = { Cayenne: 'cayenne', Manzano: 'manzano', Habanero: 'habanero', - Custom: 'custom', DatilDev: 'datil-dev', DatilTest: 'datil-test', -}; + Custom: 'custom', + Localhost: 'localhost', +} as const; /** * The type representing the keys of the LIT_NETWORK object. @@ -690,20 +731,21 @@ export type LIT_NETWORK_TYPES = keyof typeof LIT_NETWORK; * - 'datil-test' * etc. */ -export type LIT_NETWORK_VALUES = (typeof LIT_NETWORK)[LIT_NETWORK_TYPES]; +export type LIT_NETWORK_VALUES = (typeof LIT_NETWORK)[keyof typeof LIT_NETWORK]; /** * RPC URL by Network * * A mapping of network names to their corresponding RPC URLs. */ -export const RPC_URL_BY_NETWORK: Record = { - Cayenne: LIT_RPC.CHRONICLE, - Manzano: LIT_RPC.CHRONICLE, - Habanero: LIT_RPC.CHRONICLE, - DatilDev: LIT_RPC.CHRONICLE_VESUVIUS, - DatilTest: LIT_RPC.CHRONICLE_VESUVIUS, - Custom: LIT_RPC.LOCAL_ANVIL, +export const RPC_URL_BY_NETWORK: { [key in LIT_NETWORK_VALUES]: string } = { + cayenne: LIT_RPC.CHRONICLE, + manzano: LIT_RPC.CHRONICLE, + habanero: LIT_RPC.CHRONICLE, + 'datil-dev': LIT_RPC.CHRONICLE_VESUVIUS, + 'datil-test': LIT_RPC.CHRONICLE_VESUVIUS, + custom: LIT_RPC.LOCAL_ANVIL, + localhost: LIT_RPC.LOCAL_ANVIL, }; /** @@ -716,6 +758,7 @@ export const RELAYER_URL_BY_NETWORK: Record = { DatilDev: 'https://datil-dev-relayer.getlit.dev', DatilTest: 'https://datil-test-relayer.getlit.dev', Custom: 'http://localhost:3000', + Localhost: 'http://localhost:3000', }; /** @@ -733,6 +776,7 @@ export const GENERAL_WORKER_URL_BY_NETWORK: Record< // just use cayenne abis for custom and localhost Custom: 'https://apis.getlit.dev/cayenne/contracts', + Localhost: 'https://apis.getlit.dev/cayenne/contracts', }; /** @@ -753,6 +797,24 @@ export const GENERAL_STAGING_WORKER_URL_BY_NETWORK: Record< // just use cayenne abis for custom and localhost Custom: 'https://apis.getlit.dev/cayenne/contracts', + Localhost: 'https://apis.getlit.dev/cayenne/contracts', +}; + +/** + * Mapping of network values to corresponding chain info. + */ +export const CHAIN_INFO_BY_NETWORK: Record< + LIT_NETWORK_VALUES, + | typeof metamaskChainInfo.chronicle + | typeof metamaskChainInfo.chronicleVesuvius +> = { + cayenne: metamaskChainInfo.chronicle, + manzano: metamaskChainInfo.chronicle, + habanero: metamaskChainInfo.chronicle, + 'datil-dev': metamaskChainInfo.chronicleVesuvius, + 'datil-test': metamaskChainInfo.chronicleVesuvius, + custom: metamaskChainInfo.chronicleVesuvius, + localhost: metamaskChainInfo.chronicleVesuvius, }; /** diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index 8ff113510..2edfd5d92 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -1,13 +1,4 @@ /* eslint-disable import/order */ -import { - BigNumber, - BigNumberish, - BytesLike, - ContractReceipt, - ethers, -} from 'ethers'; -import { hexToDec, decToHex, intToIP } from './hex2dec'; -import bs58 from 'bs58'; import { isBrowser, isNode } from '@lit-protocol/misc'; import { CreateCustomAuthMethodRequest, @@ -21,6 +12,13 @@ import { MintWithAuthParams, MintWithAuthResponse, } from '@lit-protocol/types'; +import bs58 from 'bs58'; +import { + BytesLike, + ContractReceipt, + ethers +} from 'ethers'; +import { decToHex, hexToDec, intToIP } from './hex2dec'; // ----- autogen:import-data:start ----- // Generated at 2023-11-07T01:50:52.460Z @@ -52,29 +50,28 @@ import * as stakingContract from '../abis/Staking.sol/Staking'; import * as stakingBalancesContract from '../abis/StakingBalances.sol/StakingBalances'; // ----- autogen:imports:end ----- -import { TokenInfo, derivedAddresses } from './addresses'; -import { IPubkeyRouter } from '../abis/PKPNFT.sol/PKPNFT'; +import { + AuthMethodScope, + AuthMethodType, + CHAIN_INFO_BY_NETWORK, + GENERAL_WORKER_URL_BY_NETWORK, + RPC_URL_BY_NETWORK +} from '@lit-protocol/constants'; +import { LogManager, Logger } from '@lit-protocol/logger'; import { computeAddress } from 'ethers/lib/utils'; +import { IPubkeyRouter } from '../abis/PKPNFT.sol/PKPNFT'; +import { minStakingAbi } from '../abis/minAbi/minStakingAbi'; +import { TokenInfo, derivedAddresses } from './addresses'; import { getAuthIdByAuthMethod, stringToArrayify } from './auth-utils'; -import { Logger, LogManager } from '@lit-protocol/logger'; -import { - calculateUTCMidnightExpiration, - convertRequestsPerDayToPerSecond, - requestsToKilosecond, -} from './utils'; import { CIDParser, IPFSHash, getBytes32FromMultihash, } from './helpers/getBytes32FromMultihash'; import { - AuthMethodScope, - AuthMethodType, - GENERAL_WORKER_URL_BY_NETWORK, - LIT_CHAINS, - LIT_RPC, -} from '@lit-protocol/constants'; -import { minStakingAbi } from '../abis/minAbi/minStakingAbi'; + calculateUTCMidnightExpiration, + requestsToKilosecond +} from './utils'; // const DEFAULT_RPC = 'https://lit-protocol.calderachain.xyz/replica-http'; // const DEFAULT_READ_RPC = 'https://lit-protocol.calderachain.xyz/replica-http'; @@ -215,10 +212,7 @@ export class LitContracts { this.network = args?.network || 'cayenne'; // if rpc is not specified, use the default rpc if (!this.rpc) { - this.rpc = - args?.network === 'datil-dev' || args?.network === 'datil-test' - ? LIT_RPC.VESUVIUS - : LIT_RPC.CHRONICLE; + this.rpc = RPC_URL_BY_NETWORK[this.network]; } if (!this.rpcs) { @@ -280,45 +274,21 @@ export class LitContracts { return '0x' + decimal.toString(16); } - const chronicleChainInfo = { - chainId: _decimalToHex(LIT_CHAINS['chronicleTestnet'].chainId), - chainName: LIT_CHAINS['chronicleTestnet'].name, - nativeCurrency: { - name: LIT_CHAINS['chronicleTestnet'].symbol, - symbol: LIT_CHAINS['chronicleTestnet'].symbol, - decimals: LIT_CHAINS['chronicleTestnet'].decimals, - }, - rpcUrls: LIT_CHAINS['chronicleTestnet'].rpcUrls, - blockExplorerUrls: LIT_CHAINS['chronicleTestnet'].blockExplorerUrls, - iconUrls: ['future'], - }; + let chainInfo = CHAIN_INFO_BY_NETWORK[this.network]; - const vesuviusChainInfo = { - chainId: _decimalToHex(LIT_CHAINS['datilDevnet'].chainId), - chainName: LIT_CHAINS['datilDevnet'].name, - nativeCurrency: { - name: LIT_CHAINS['datilDevnet'].symbol, - symbol: LIT_CHAINS['datilDevnet'].symbol, - decimals: LIT_CHAINS['datilDevnet'].decimals, - }, - rpcUrls: LIT_CHAINS['datilDevnet'].rpcUrls, - blockExplorerUrls: LIT_CHAINS['datilDevnet'].blockExplorerUrls, - iconUrls: ['future'], + const metamaskChainInfo = { + ...chainInfo, + chainId: _decimalToHex(chainInfo.chainId), }; - const chainInfo = - this.network === 'datil-dev' || this.network === 'datil-test' - ? vesuviusChainInfo - : chronicleChainInfo; - try { await web3Provider.send('wallet_switchEthereumChain', [ - { chainId: chainInfo.chainId }, + { chainId: metamaskChainInfo.chainId }, ]); } catch (e) { await web3Provider.request({ method: 'wallet_addEthereumChain', - params: [chainInfo], + params: [metamaskChainInfo], }); } @@ -616,10 +586,7 @@ export class LitContracts { rpcUrl?: string ) { let provider: ethers.providers.JsonRpcProvider; - rpcUrl = - rpcUrl ?? (network === 'datil-dev' || network === 'datil-test') - ? LIT_RPC.VESUVIUS - : LIT_RPC.CHRONICLE; + rpcUrl = RPC_URL_BY_NETWORK[network]; if (context && 'provider' in context!) { provider = context.provider; } else { diff --git a/packages/lit-auth-client/src/lib/lit-auth-client.ts b/packages/lit-auth-client/src/lib/lit-auth-client.ts index 0971205c9..a6e13611d 100644 --- a/packages/lit-auth-client/src/lib/lit-auth-client.ts +++ b/packages/lit-auth-client/src/lib/lit-auth-client.ts @@ -2,22 +2,22 @@ import { ethers } from 'ethers'; import { AuthMethodType, - LIT_RPC, ProviderType, RELAYER_URL_BY_NETWORK, + RPC_URL_BY_NETWORK, } from '@lit-protocol/constants'; import { LitNodeClient } from '@lit-protocol/lit-node-client'; -import { bootstrapLogManager, getLoggerbyId, log } from '@lit-protocol/misc'; +import { bootstrapLogManager, log } from '@lit-protocol/misc'; import { + AuthMethod, EthWalletProviderOptions, IRelay, LitAuthClientOptions, + MintRequestBody, OAuthProviderOptions, - StytchOtpProviderOptions, ProviderOptions, + StytchOtpProviderOptions, WebAuthnProviderOptions, - AuthMethod, - MintRequestBody, } from '@lit-protocol/types'; import AppleProvider from './providers/AppleProvider'; @@ -153,10 +153,7 @@ export class LitAuthClient { // Set RPC URL this.rpcUrl = options?.rpcUrl || - this.litNodeClient.config.litNetwork === 'datil-dev' || - this.litNodeClient.config.litNetwork === 'datil-test' - ? LIT_RPC.VESUVIUS - : LIT_RPC.CHRONICLE; + RPC_URL_BY_NETWORK[this.litNodeClient.config.litNetwork]; log('rpc url: ', this.rpcUrl); log('relay config: ', options.litRelayConfig); log('relay instance: ', this.relay); From d1d6f32df03983d4d87a7f05800ce2e687b8ce97 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 13:48:35 +0100 Subject: [PATCH 11/30] fix: use map values instead of keys --- .../constants/src/lib/constants/constants.ts | 75 +++++++------------ .../contracts-sdk/src/lib/contracts-sdk.ts | 50 +++---------- .../src/lib/lit-auth-client.ts | 20 +---- packages/misc/src/lib/misc.ts | 15 +--- 4 files changed, 44 insertions(+), 116 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 7816421e0..fe284a355 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -708,28 +708,11 @@ export const LIT_NETWORK = { /** * The type representing the keys of the LIT_NETWORK object. * - * Possible values are: - * - 'Cayenne' - * - 'Manzano' - * - 'Habanero' - * - 'Custom' - * - 'DatilDev' - * - 'DatilTest' - * etc. */ export type LIT_NETWORK_TYPES = keyof typeof LIT_NETWORK; /** * The type representing the values of the LIT_NETWORK object. - * - * Possible values are: - * - 'cayenne' - * - 'manzano' - * - 'habanero' - * - 'custom' - * - 'datil-dev' - * - 'datil-test' - * etc. */ export type LIT_NETWORK_VALUES = (typeof LIT_NETWORK)[keyof typeof LIT_NETWORK]; @@ -751,32 +734,31 @@ export const RPC_URL_BY_NETWORK: { [key in LIT_NETWORK_VALUES]: string } = { /** * Mapping of network names to their corresponding relayer URLs. */ -export const RELAYER_URL_BY_NETWORK: Record = { - Cayenne: 'https://relayer-server-staging-cayenne.getlit.dev', - Manzano: 'https://manzano-relayer.getlit.dev', - Habanero: 'https://habanero-relayer.getlit.dev', - DatilDev: 'https://datil-dev-relayer.getlit.dev', - DatilTest: 'https://datil-test-relayer.getlit.dev', - Custom: 'http://localhost:3000', - Localhost: 'http://localhost:3000', +export const RELAYER_URL_BY_NETWORK: { [key in LIT_NETWORK_VALUES]: string } = { + cayenne: 'https://relayer-server-staging-cayenne.getlit.dev', + manzano: 'https://manzano-relayer.getlit.dev', + habanero: 'https://habanero-relayer.getlit.dev', + 'datil-dev': 'https://datil-dev-relayer.getlit.dev', + 'datil-test': 'https://datil-test-relayer.getlit.dev', + custom: 'http://localhost:3000', + localhost: 'http://localhost:3000', }; /** * URL mappings for general worker URLs by network. */ -export const GENERAL_WORKER_URL_BY_NETWORK: Record< - keyof typeof LIT_NETWORK, - string -> = { - Cayenne: 'https://apis.getlit.dev/cayenne/contracts', - Manzano: 'https://apis.getlit.dev/manzano/contracts', - Habanero: 'https://apis.getlit.dev/habanero/contracts', - DatilDev: 'https://apis.getlit.dev/datil-dev/contracts', - DatilTest: 'https://apis.getlit.dev/datil-test/contracts', +export const GENERAL_WORKER_URL_BY_NETWORK: { + [key in LIT_NETWORK_VALUES]: string; +} = { + cayenne: 'https://apis.getlit.dev/cayenne/contracts', + manzano: 'https://apis.getlit.dev/manzano/contracts', + habanero: 'https://apis.getlit.dev/habanero/contracts', + 'datil-dev': 'https://apis.getlit.dev/datil-dev/contracts', + 'datil-test': 'https://apis.getlit.dev/datil-test/contracts', // just use cayenne abis for custom and localhost - Custom: 'https://apis.getlit.dev/cayenne/contracts', - Localhost: 'https://apis.getlit.dev/cayenne/contracts', + custom: 'https://apis.getlit.dev/cayenne/contracts', + localhost: 'https://apis.getlit.dev/cayenne/contracts', }; /** @@ -785,19 +767,18 @@ export const GENERAL_WORKER_URL_BY_NETWORK: Record< * @remarks * This constant maps each network to its corresponding staging worker URL. */ -export const GENERAL_STAGING_WORKER_URL_BY_NETWORK: Record< - keyof typeof LIT_NETWORK, - string -> = { - Cayenne: 'https://staging.apis.getlit.dev/cayenne/contracts', - Manzano: 'https://staging.apis.getlit.dev/manzano/contracts', - Habanero: 'https://staging.apis.getlit.dev/habanero/contracts', - DatilDev: 'https://staging.apis.getlit.dev/datil-dev/contracts', - DatilTest: 'https://staging.apis.getlit.dev/datil-test/contracts', +export const GENERAL_STAGING_WORKER_URL_BY_NETWORK: { + [key in LIT_NETWORK_VALUES]: string; +} = { + cayenne: 'https://staging.apis.getlit.dev/cayenne/contracts', + manzano: 'https://staging.apis.getlit.dev/manzano/contracts', + habanero: 'https://staging.apis.getlit.dev/habanero/contracts', + 'datil-dev': 'https://staging.apis.getlit.dev/datil-dev/contracts', + 'datil-test': 'https://staging.apis.getlit.dev/datil-test/contracts', // just use cayenne abis for custom and localhost - Custom: 'https://apis.getlit.dev/cayenne/contracts', - Localhost: 'https://apis.getlit.dev/cayenne/contracts', + custom: 'https://apis.getlit.dev/cayenne/contracts', + localhost: 'https://apis.getlit.dev/cayenne/contracts', }; /** diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index 2edfd5d92..bd2a6b303 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -13,11 +13,7 @@ import { MintWithAuthResponse, } from '@lit-protocol/types'; import bs58 from 'bs58'; -import { - BytesLike, - ContractReceipt, - ethers -} from 'ethers'; +import { BytesLike, ContractReceipt, ethers } from 'ethers'; import { decToHex, hexToDec, intToIP } from './hex2dec'; // ----- autogen:import-data:start ----- @@ -55,7 +51,8 @@ import { AuthMethodType, CHAIN_INFO_BY_NETWORK, GENERAL_WORKER_URL_BY_NETWORK, - RPC_URL_BY_NETWORK + LIT_NETWORK_VALUES, + RPC_URL_BY_NETWORK, } from '@lit-protocol/constants'; import { LogManager, Logger } from '@lit-protocol/logger'; import { computeAddress } from 'ethers/lib/utils'; @@ -68,10 +65,7 @@ import { IPFSHash, getBytes32FromMultihash, } from './helpers/getBytes32FromMultihash'; -import { - calculateUTCMidnightExpiration, - requestsToKilosecond -} from './utils'; +import { calculateUTCMidnightExpiration, requestsToKilosecond } from './utils'; // const DEFAULT_RPC = 'https://lit-protocol.calderachain.xyz/replica-http'; // const DEFAULT_READ_RPC = 'https://lit-protocol.calderachain.xyz/replica-http'; @@ -948,11 +942,9 @@ export class LitContracts { }; private static async _resolveContractContext( - network: LIT_NETWORKS_KEYS + network: LIT_NETWORK_VALUES // context?: LitContractContext | LitContractResolverContext ) { - let data; - const fetchData = async (url: string) => { try { return await fetch(url).then((res) => res.json()); @@ -961,33 +953,15 @@ export class LitContracts { } }; - switch (network) { - case 'cayenne': - data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.Cayenne); - break; - case 'manzano': - data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.Manzano); - break; - case 'habanero': - data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.Habanero); - break; - case 'datil-dev': - data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.DatilDev); - break; - case 'datil-test': - data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.DatilTest); - break; - case 'custom': - case 'localhost': - // just use cayenne abis for custom and localhost - data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK.Cayenne); - break; - default: - throw new Error( - `[_resolveContractContext] Unsupported network: ${network}` - ); + // -- check if it's supported network + if (!GENERAL_WORKER_URL_BY_NETWORK[network]) { + throw new Error( + `[_resolveContractContext] Unsupported network: ${network}` + ); } + const data = await fetchData(GENERAL_WORKER_URL_BY_NETWORK[network]); + if (!data) { throw new Error('[_resolveContractContext] No data found'); } diff --git a/packages/lit-auth-client/src/lib/lit-auth-client.ts b/packages/lit-auth-client/src/lib/lit-auth-client.ts index a6e13611d..e73e2bdd6 100644 --- a/packages/lit-auth-client/src/lib/lit-auth-client.ts +++ b/packages/lit-auth-client/src/lib/lit-auth-client.ts @@ -110,25 +110,7 @@ export class LitAuthClient { ); } - let url; - - switch (this.litNodeClient.config.litNetwork) { - case 'cayenne': - url = RELAYER_URL_BY_NETWORK.Cayenne; - break; - case 'habanero': - url = RELAYER_URL_BY_NETWORK.Habanero; - break; - case 'manzano': - url = RELAYER_URL_BY_NETWORK.Manzano; - break; - case 'datil-dev': - url = RELAYER_URL_BY_NETWORK.DatilDev; - break; - case 'datil-test': - url = RELAYER_URL_BY_NETWORK.DatilTest; - break; - } + let url = RELAYER_URL_BY_NETWORK[this.litNodeClient.config.litNetwork]; this.relay = new LitRelay({ relayUrl: url, diff --git a/packages/misc/src/lib/misc.ts b/packages/misc/src/lib/misc.ts index 2dc3a09f6..936a949f0 100644 --- a/packages/misc/src/lib/misc.ts +++ b/packages/misc/src/lib/misc.ts @@ -662,22 +662,13 @@ export const defaultMintClaimCallback: MintCallback< RelayClaimProcessor > = async ( params: ClaimResult, - network: LIT_NETWORK_VALUES = 'cayenne' + network: string = 'cayenne' ): Promise => { try { const AUTH_CLAIM_PATH = '/auth/claim'; - const AUTH_CLAIM_URL_BY_NETWORK: Record = { - Cayenne: RELAYER_URL_BY_NETWORK.Cayenne + AUTH_CLAIM_PATH, - Manzano: RELAYER_URL_BY_NETWORK.Manzano + AUTH_CLAIM_PATH, - Habanero: RELAYER_URL_BY_NETWORK.Habanero + AUTH_CLAIM_PATH, - DatilDev: RELAYER_URL_BY_NETWORK.DatilDev + AUTH_CLAIM_PATH, - DatilTest: RELAYER_URL_BY_NETWORK.DatilTest + AUTH_CLAIM_PATH, - Custom: RELAYER_URL_BY_NETWORK.Cayenne + AUTH_CLAIM_PATH, - }; - - const relayUrl: LIT_NETWORK_VALUES = - AUTH_CLAIM_URL_BY_NETWORK[network as LIT_NETWORK_TYPES]; + const relayUrl: string = + RELAYER_URL_BY_NETWORK[network as LIT_NETWORK_VALUES] + AUTH_CLAIM_PATH; if (!params.relayUrl && !relayUrl) { throw new Error( From f615185d8e7f5f888cbf369f683cbfd9ba93bfa6 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 13:49:28 +0100 Subject: [PATCH 12/30] fix: doc on LIT_RPC --- packages/constants/src/lib/constants/constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index fe284a355..cbae458c7 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -679,13 +679,13 @@ export const LIT_RPC = { CHRONICLE: 'https://chain-rpc.litprotocol.com/http', /** - * Vesuvius RPC endpoint - used for >= Datil-dev, Datil-test + * Chronicle Vesuvius RPC endpoint - used for >= Datil-dev, Datil-test * @deprecated Will be removed in version 7.x. - Use CHRONICLE_VESUVIUS instead */ VESUVIUS: 'https://vesuvius-rpc.litprotocol.com', /** - * Vesuvius RPC endpoint - used for >= Datil-dev, Datil-test + * Chronicle Vesuvius RPC endpoint - used for >= Datil-dev, Datil-test */ CHRONICLE_VESUVIUS: 'https://vesuvius-rpc.litprotocol.com', } as const; From 30691ec9cfee174ce68090f5c43269eb6cda5caa Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 13:58:14 +0100 Subject: [PATCH 13/30] fix: let to const --- packages/lit-auth-client/src/lib/lit-auth-client.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/lit-auth-client/src/lib/lit-auth-client.ts b/packages/lit-auth-client/src/lib/lit-auth-client.ts index e73e2bdd6..b81256092 100644 --- a/packages/lit-auth-client/src/lib/lit-auth-client.ts +++ b/packages/lit-auth-client/src/lib/lit-auth-client.ts @@ -110,7 +110,7 @@ export class LitAuthClient { ); } - let url = RELAYER_URL_BY_NETWORK[this.litNodeClient.config.litNetwork]; + const url = RELAYER_URL_BY_NETWORK[this.litNodeClient.config.litNetwork]; this.relay = new LitRelay({ relayUrl: url, From 9cf33e84987759376b8bade1b02f90ba48b830b4 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 13:59:35 +0100 Subject: [PATCH 14/30] fix: rename `CHAIN_INFO` to `METAMASK_CHAIN_INFO` --- packages/constants/src/lib/constants/constants.ts | 2 +- packages/contracts-sdk/src/lib/contracts-sdk.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index cbae458c7..4c5244b89 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -784,7 +784,7 @@ export const GENERAL_STAGING_WORKER_URL_BY_NETWORK: { /** * Mapping of network values to corresponding chain info. */ -export const CHAIN_INFO_BY_NETWORK: Record< +export const METAMASK_CHAIN_INFO_BY_NETWORK: Record< LIT_NETWORK_VALUES, | typeof metamaskChainInfo.chronicle | typeof metamaskChainInfo.chronicleVesuvius diff --git a/packages/contracts-sdk/src/lib/contracts-sdk.ts b/packages/contracts-sdk/src/lib/contracts-sdk.ts index bd2a6b303..cd8157481 100644 --- a/packages/contracts-sdk/src/lib/contracts-sdk.ts +++ b/packages/contracts-sdk/src/lib/contracts-sdk.ts @@ -49,7 +49,7 @@ import * as stakingBalancesContract from '../abis/StakingBalances.sol/StakingBal import { AuthMethodScope, AuthMethodType, - CHAIN_INFO_BY_NETWORK, + METAMASK_CHAIN_INFO_BY_NETWORK, GENERAL_WORKER_URL_BY_NETWORK, LIT_NETWORK_VALUES, RPC_URL_BY_NETWORK, @@ -268,7 +268,7 @@ export class LitContracts { return '0x' + decimal.toString(16); } - let chainInfo = CHAIN_INFO_BY_NETWORK[this.network]; + const chainInfo = METAMASK_CHAIN_INFO_BY_NETWORK[this.network]; const metamaskChainInfo = { ...chainInfo, From ea614f60e6d3f7befd3c6e6a82e604beb402557f Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 14:01:35 +0100 Subject: [PATCH 15/30] fix: https://github.com/LIT-Protocol/js-sdk/pull/527#discussion_r1673974820 --- packages/lit-auth-client/src/lib/lit-auth-client.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/lit-auth-client/src/lib/lit-auth-client.ts b/packages/lit-auth-client/src/lib/lit-auth-client.ts index b81256092..496e034af 100644 --- a/packages/lit-auth-client/src/lib/lit-auth-client.ts +++ b/packages/lit-auth-client/src/lib/lit-auth-client.ts @@ -136,6 +136,11 @@ export class LitAuthClient { this.rpcUrl = options?.rpcUrl || RPC_URL_BY_NETWORK[this.litNodeClient.config.litNetwork]; + + if (!this.rpcUrl) { + throw new Error('No RPC URL provided'); + } + log('rpc url: ', this.rpcUrl); log('relay config: ', options.litRelayConfig); log('relay instance: ', this.relay); From bc91353b2e8e7a8fec67e078711b8b01a0dd496a Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 14:24:31 +0100 Subject: [PATCH 16/30] fix: jsDoc and chain info --- .../constants/src/lib/constants/constants.ts | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 4c5244b89..072504217 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -466,13 +466,21 @@ export const LIT_CHAINS: LITChain = { type: null, vmType: 'EVM', }, + + /** + * Chainlist entry for the Chronicle Testnet. + * https://chainlist.org/chain/175177 + */ chronicleTestnet: { contractAddress: null, chainId: 175177, name: 'Chronicle - Lit Protocol Testnet', - symbol: 'testLPX', + symbol: 'tstLPX', decimals: 18, - rpcUrls: ['https://lit-protocol.calderachain.xyz/replica-http'], + rpcUrls: [ + 'https://lit-protocol.calderachain.xyz/replica-http', + 'https://chain-rpc.litprotocol.com/http', + ], blockExplorerUrls: ['https://chain.litprotocol.com/'], type: null, vmType: 'EVM', @@ -492,6 +500,11 @@ export const LIT_CHAINS: LITChain = { type: null, vmType: 'EVM', }, + + /** + * Chainlist entry for the Chronicle Vesuvius Testnet. + * https://chainlist.org/chain/2311 + */ chronicleVesuviusTestnet: { contractAddress: null, chainId: 2311, @@ -507,9 +520,12 @@ export const LIT_CHAINS: LITChain = { contractAddress: null, chainId: 175177, name: 'Chronicle - Lit Protocol Testnet', - symbol: 'testLPX', + symbol: 'tstLit', decimals: 18, - rpcUrls: ['https://lit-protocol.calderachain.xyz/replica-http'], + rpcUrls: [ + 'https://lit-protocol.calderachain.xyz/replica-http', + 'https://chain-rpc.litprotocol.com/http', + ], blockExplorerUrls: ['https://chain.litprotocol.com/'], type: null, vmType: 'EVM', @@ -707,7 +723,6 @@ export const LIT_NETWORK = { /** * The type representing the keys of the LIT_NETWORK object. - * */ export type LIT_NETWORK_TYPES = keyof typeof LIT_NETWORK; @@ -763,9 +778,6 @@ export const GENERAL_WORKER_URL_BY_NETWORK: { /** * URL constants for the staging worker by network. - * - * @remarks - * This constant maps each network to its corresponding staging worker URL. */ export const GENERAL_STAGING_WORKER_URL_BY_NETWORK: { [key in LIT_NETWORK_VALUES]: string; @@ -782,7 +794,7 @@ export const GENERAL_STAGING_WORKER_URL_BY_NETWORK: { }; /** - * Mapping of network values to corresponding chain info. + * Mapping of network values to corresponding Metamask chain info. */ export const METAMASK_CHAIN_INFO_BY_NETWORK: Record< LIT_NETWORK_VALUES, From 12569ddcc1fdbbe9513bfc463182ca431d94e2c7 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 15:05:58 +0100 Subject: [PATCH 17/30] fix: check the correct variable, not the concatenated string --- packages/misc/src/lib/misc.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/misc/src/lib/misc.ts b/packages/misc/src/lib/misc.ts index 936a949f0..75e1de937 100644 --- a/packages/misc/src/lib/misc.ts +++ b/packages/misc/src/lib/misc.ts @@ -668,7 +668,7 @@ export const defaultMintClaimCallback: MintCallback< const AUTH_CLAIM_PATH = '/auth/claim'; const relayUrl: string = - RELAYER_URL_BY_NETWORK[network as LIT_NETWORK_VALUES] + AUTH_CLAIM_PATH; + RELAYER_URL_BY_NETWORK[network as LIT_NETWORK_VALUES]; if (!params.relayUrl && !relayUrl) { throw new Error( @@ -676,8 +676,9 @@ export const defaultMintClaimCallback: MintCallback< ); } - const url = params.relayUrl ? params.relayUrl : relayUrl; - const response = await fetch(url, { + const relayUrlWithPath = relayUrl + AUTH_CLAIM_PATH; + + const response = await fetch(relayUrlWithPath, { method: 'POST', body: JSON.stringify(params), headers: { From 2a249dcc0ed9aa8e4a4b20b1a0afe6316f9a6102 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 19:32:33 +0100 Subject: [PATCH 18/30] fix: https://github.com/LIT-Protocol/js-sdk/pull/523#pullrequestreview-2172657487 --- packages/constants/src/lib/constants/constants.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 072504217..08227784c 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -493,7 +493,7 @@ export const LIT_CHAINS: LITChain = { contractAddress: null, chainId: 2311, name: 'Chronicle Vesuvius - Lit Protocol Testnet', - symbol: 'tstLit', + symbol: 'tstLPX', decimals: 18, rpcUrls: ['https://vesuvius-rpc.litprotocol.com/'], blockExplorerUrls: ['https://vesuvius-explorer.litprotocol.com/'], @@ -509,7 +509,7 @@ export const LIT_CHAINS: LITChain = { contractAddress: null, chainId: 2311, name: 'Chronicle Vesuvius - Lit Protocol Testnet', - symbol: 'tstLit', + symbol: 'tstLPX', decimals: 18, rpcUrls: ['https://vesuvius-rpc.litprotocol.com/'], blockExplorerUrls: ['https://vesuvius-explorer.litprotocol.com/'], @@ -520,7 +520,7 @@ export const LIT_CHAINS: LITChain = { contractAddress: null, chainId: 175177, name: 'Chronicle - Lit Protocol Testnet', - symbol: 'tstLit', + symbol: 'tstLPX', decimals: 18, rpcUrls: [ 'https://lit-protocol.calderachain.xyz/replica-http', From 6dab1b8d1091067dc792b0b2eeeedf18efb89f4b Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 20:32:18 +0100 Subject: [PATCH 19/30] Update packages/constants/src/lib/constants/constants.ts Co-authored-by: Daryl Collins Signed-off-by: Anson --- packages/constants/src/lib/constants/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 08227784c..5c48e2620 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -520,7 +520,7 @@ export const LIT_CHAINS: LITChain = { contractAddress: null, chainId: 175177, name: 'Chronicle - Lit Protocol Testnet', - symbol: 'tstLPX', + symbol: 'tstLIT', decimals: 18, rpcUrls: [ 'https://lit-protocol.calderachain.xyz/replica-http', From 69d20e8e98a6ec785bc1b4b5a5eb470e481b6b9f Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 20:32:25 +0100 Subject: [PATCH 20/30] Update packages/constants/src/lib/constants/constants.ts Co-authored-by: Daryl Collins Signed-off-by: Anson --- packages/constants/src/lib/constants/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 5c48e2620..b3287c58b 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -475,7 +475,7 @@ export const LIT_CHAINS: LITChain = { contractAddress: null, chainId: 175177, name: 'Chronicle - Lit Protocol Testnet', - symbol: 'tstLPX', + symbol: 'tstLIT', decimals: 18, rpcUrls: [ 'https://lit-protocol.calderachain.xyz/replica-http', From 31d5d67becdf66eb6639711a815d7f9620b63139 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 20:50:30 +0100 Subject: [PATCH 21/30] fix: remove `as const` --- packages/constants/src/lib/constants/constants.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 08227784c..5520016b1 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -719,7 +719,7 @@ export const LIT_NETWORK = { DatilTest: 'datil-test', Custom: 'custom', Localhost: 'localhost', -} as const; +}; /** * The type representing the keys of the LIT_NETWORK object. @@ -749,7 +749,9 @@ export const RPC_URL_BY_NETWORK: { [key in LIT_NETWORK_VALUES]: string } = { /** * Mapping of network names to their corresponding relayer URLs. */ -export const RELAYER_URL_BY_NETWORK: { [key in LIT_NETWORK_VALUES]: string } = { +export const RELAYER_URL_BY_NETWORK: { + [key in LIT_NETWORK_VALUES]: string; +} = { cayenne: 'https://relayer-server-staging-cayenne.getlit.dev', manzano: 'https://manzano-relayer.getlit.dev', habanero: 'https://habanero-relayer.getlit.dev', From 89b24c889b0b14830684fe581095ca9d8455595a Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 20:50:59 +0100 Subject: [PATCH 22/30] feat: add isSupportedLitNetwork checker --- packages/misc/src/lib/misc.ts | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/packages/misc/src/lib/misc.ts b/packages/misc/src/lib/misc.ts index 75e1de937..752dd47f4 100644 --- a/packages/misc/src/lib/misc.ts +++ b/packages/misc/src/lib/misc.ts @@ -5,9 +5,7 @@ import { LIT_CHAINS, LIT_ERROR, LIT_NETWORK, - LIT_NETWORK_TYPES, LIT_NETWORK_VALUES, - LitNetwork, RELAYER_URL_BY_NETWORK, } from '@lit-protocol/constants'; @@ -658,19 +656,37 @@ export const genRandomPath = (): string => { ); }; +/** + * Checks if the given LitNetwork value is supported. + * @param litNetwork - The LitNetwork value to check. + * @throws {Error} - Throws an error if the LitNetwork value is not supported. + */ +export function isSupportedLitNetwork( + litNetwork: LIT_NETWORK_VALUES +): asserts litNetwork is LIT_NETWORK_VALUES { + const supportedNetworks = Object.values(LIT_NETWORK); + + if (!supportedNetworks.includes(litNetwork)) { + throw new Error( + `Unsupported LitNetwork! (${supportedNetworks.join('|')}) are supported.` + ); + } +} + export const defaultMintClaimCallback: MintCallback< RelayClaimProcessor > = async ( params: ClaimResult, - network: string = 'cayenne' + network: LIT_NETWORK_VALUES = 'cayenne' ): Promise => { + isSupportedLitNetwork(network); + try { const AUTH_CLAIM_PATH = '/auth/claim'; - const relayUrl: string = - RELAYER_URL_BY_NETWORK[network as LIT_NETWORK_VALUES]; + const relayUrl: string = params.relayUrl || RELAYER_URL_BY_NETWORK[network]; - if (!params.relayUrl && !relayUrl) { + if (!relayUrl) { throw new Error( 'No relayUrl provided and no default relayUrl found for network' ); From 2c73ec86f39dfb5af4a30681e660265c5fa9241a Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 21:06:46 +0100 Subject: [PATCH 23/30] feat: add `DatilTest` to SEV --- packages/core/src/lib/lit-core.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core/src/lib/lit-core.ts b/packages/core/src/lib/lit-core.ts index e2aecef17..db7d33c60 100644 --- a/packages/core/src/lib/lit-core.ts +++ b/packages/core/src/lib/lit-core.ts @@ -110,6 +110,7 @@ const BLOCKHASH_SYNC_INTERVAL = 30_000; const NETWORKS_REQUIRING_SEV: string[] = [ LitNetwork.Habanero, LitNetwork.Manzano, + LitNetwork.DatilTest ]; // The only network we consider entirely static, and thus ignore EPOCH changes for, is Cayenne From 80b97f88f48a5f4157b4be985ef4a32dd83e113e Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 21:10:28 +0100 Subject: [PATCH 24/30] chore: prettier --- packages/core/src/lib/lit-core.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/lib/lit-core.ts b/packages/core/src/lib/lit-core.ts index db7d33c60..08a0d7d1e 100644 --- a/packages/core/src/lib/lit-core.ts +++ b/packages/core/src/lib/lit-core.ts @@ -110,7 +110,7 @@ const BLOCKHASH_SYNC_INTERVAL = 30_000; const NETWORKS_REQUIRING_SEV: string[] = [ LitNetwork.Habanero, LitNetwork.Manzano, - LitNetwork.DatilTest + LitNetwork.DatilTest, ]; // The only network we consider entirely static, and thus ignore EPOCH changes for, is Cayenne From a8857e92e20915c4cd6952c734f6986ac3a77c40 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 22:13:41 +0100 Subject: [PATCH 25/30] https://github.com/LIT-Protocol/js-sdk/pull/523#discussion_r1674672268 --- .../src/lib/lit-auth-client.ts | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/packages/lit-auth-client/src/lib/lit-auth-client.ts b/packages/lit-auth-client/src/lib/lit-auth-client.ts index 496e034af..2591d6668 100644 --- a/packages/lit-auth-client/src/lib/lit-auth-client.ts +++ b/packages/lit-auth-client/src/lib/lit-auth-client.ts @@ -7,7 +7,11 @@ import { RPC_URL_BY_NETWORK, } from '@lit-protocol/constants'; import { LitNodeClient } from '@lit-protocol/lit-node-client'; -import { bootstrapLogManager, log } from '@lit-protocol/misc'; +import { + bootstrapLogManager, + isSupportedLitNetwork, + log, +} from '@lit-protocol/misc'; import { AuthMethod, EthWalletProviderOptions, @@ -94,21 +98,7 @@ export class LitAuthClient { ); } - const supportedNetworks = [ - 'cayenne', - 'habanero', - 'manzano', - 'datil-dev', - 'datil-test', - ]; - - if (!supportedNetworks.includes(this.litNodeClient.config.litNetwork)) { - throw new Error( - `Unsupported litNetwork: ${ - this.litNodeClient.config.litNetwork - }. Supported networks are: ${supportedNetworks.join(', ')}` - ); - } + isSupportedLitNetwork(this.litNodeClient.config.litNetwork); const url = RELAYER_URL_BY_NETWORK[this.litNodeClient.config.litNetwork]; From a56826c50cc4f46b7df3435252ac6d6ec8b0fa6a Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 22:16:06 +0100 Subject: [PATCH 26/30] Update local-tests/tests/wrapped-keys/util.ts Co-authored-by: Daryl Collins Signed-off-by: Anson --- local-tests/tests/wrapped-keys/util.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local-tests/tests/wrapped-keys/util.ts b/local-tests/tests/wrapped-keys/util.ts index de3ebe92e..419527148 100644 --- a/local-tests/tests/wrapped-keys/util.ts +++ b/local-tests/tests/wrapped-keys/util.ts @@ -16,9 +16,9 @@ export function getChainForNetwork(network: LIT_NETWORKS_KEYS): { chainId: LIT_CHAINS['chronicleTestnet'].chainId, }; case 'datil-dev': - return { chain: 'vesuvius', chainId: LIT_CHAINS['datilDevnet'].chainId }; + return { chain: 'vesuvius', chainId: LIT_CHAINS['chronicleVesuviusTestnet'].chainId }; case 'datil-test': - return { chain: 'vesuvius', chainId: LIT_CHAINS['datilTestnet'].chainId }; + return { chain: 'vesuvius', chainId: LIT_CHAINS['chronicleVesuviusTestnet'].chainId }; default: throw new Error(`Cannot identify chain params for ${network}`); } From bb03270dff09e0ed06e24e0c9b6dcb34d1d04e55 Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 22:31:24 +0100 Subject: [PATCH 27/30] fix: add `DatilTest` to `NETWORKS_WITH_EPOCH_CHANGES` --- packages/core/src/lib/lit-core.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/core/src/lib/lit-core.ts b/packages/core/src/lib/lit-core.ts index 08a0d7d1e..2c9295e28 100644 --- a/packages/core/src/lib/lit-core.ts +++ b/packages/core/src/lib/lit-core.ts @@ -116,6 +116,7 @@ const NETWORKS_REQUIRING_SEV: string[] = [ // The only network we consider entirely static, and thus ignore EPOCH changes for, is Cayenne const NETWORKS_WITH_EPOCH_CHANGES: string[] = [ LitNetwork.DatilDev, + LitNetwork.DatilTest, LitNetwork.Habanero, LitNetwork.Manzano, LitNetwork.Custom, From 41daabb1500a4e0ea96ec70b135fa7ce124fef6a Mon Sep 17 00:00:00 2001 From: Anson Date: Thu, 11 Jul 2024 22:39:51 +0100 Subject: [PATCH 28/30] chore: prettier --- local-tests/tests/wrapped-keys/util.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/local-tests/tests/wrapped-keys/util.ts b/local-tests/tests/wrapped-keys/util.ts index 419527148..c8464ca31 100644 --- a/local-tests/tests/wrapped-keys/util.ts +++ b/local-tests/tests/wrapped-keys/util.ts @@ -16,9 +16,15 @@ export function getChainForNetwork(network: LIT_NETWORKS_KEYS): { chainId: LIT_CHAINS['chronicleTestnet'].chainId, }; case 'datil-dev': - return { chain: 'vesuvius', chainId: LIT_CHAINS['chronicleVesuviusTestnet'].chainId }; + return { + chain: 'vesuvius', + chainId: LIT_CHAINS['chronicleVesuviusTestnet'].chainId, + }; case 'datil-test': - return { chain: 'vesuvius', chainId: LIT_CHAINS['chronicleVesuviusTestnet'].chainId }; + return { + chain: 'vesuvius', + chainId: LIT_CHAINS['chronicleVesuviusTestnet'].chainId, + }; default: throw new Error(`Cannot identify chain params for ${network}`); } From 3d2830e6fb7bc2e41c32ce872439f1764ee5317a Mon Sep 17 00:00:00 2001 From: Anson Date: Fri, 12 Jul 2024 10:39:28 +0100 Subject: [PATCH 29/30] fix: PKPEthers use rpc mapper --- packages/constants/src/lib/constants/constants.ts | 3 +++ packages/pkp-ethers/src/lib/pkp-ethers.ts | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/constants/src/lib/constants/constants.ts b/packages/constants/src/lib/constants/constants.ts index 747750b53..27aa79d5a 100644 --- a/packages/constants/src/lib/constants/constants.ts +++ b/packages/constants/src/lib/constants/constants.ts @@ -642,6 +642,9 @@ export const LIT_CHAINS: LITChain = { }, }; +/** + * @deprecated Will be removed in version 7.x. - This is using the OLD chornicle testnet. `LIT_CHAINS['chronicleTestnet']` instead, or use `LIT_CHAINS['chronicleVesuviusTestnet']` for the new Chronicle Vesuvius Testnet (Jul 2024). + */ export const LIT_CHAIN_RPC_URL = LIT_CHAINS['chronicleTestnet'].rpcUrls[0]; /** diff --git a/packages/pkp-ethers/src/lib/pkp-ethers.ts b/packages/pkp-ethers/src/lib/pkp-ethers.ts index 3d9f3c292..4478fd863 100644 --- a/packages/pkp-ethers/src/lib/pkp-ethers.ts +++ b/packages/pkp-ethers/src/lib/pkp-ethers.ts @@ -43,7 +43,7 @@ import { ETHSignature, ETHTxRes, } from './pkp-ethers-types'; -import { LIT_CHAINS } from '@lit-protocol/constants'; +import { RPC_URL_BY_NETWORK } from '@lit-protocol/constants'; import { getTransactionToSign, isSignedTransaction } from './helper'; const logger = new Logger(version); @@ -67,9 +67,14 @@ export class PKPEthersWallet constructor(prop: PKPEthersWalletProp) { super(prop); - this.rpcProvider = new ethers.providers.JsonRpcProvider( - prop.rpc ?? LIT_CHAINS['chronicleTestnet'].rpcUrls[0] - ); + const rpcUrl = + prop.rpc || RPC_URL_BY_NETWORK[prop.litNodeClient.config.litNetwork]; + + if (!rpcUrl) { + throw new Error('No RPC URL provided'); + } + + this.rpcProvider = new ethers.providers.JsonRpcProvider(rpcUrl); this.provider = prop.provider ?? this.rpcProvider; From 28972a5876b3d9c68f17a99b834d1d1a1ff827e3 Mon Sep 17 00:00:00 2001 From: Anson Date: Fri, 12 Jul 2024 11:44:39 +0100 Subject: [PATCH 30/30] fix: merge master --- lerna.json | 2 +- packages/access-control-conditions/package.json | 2 +- packages/auth-browser/package.json | 2 +- packages/auth-helpers/package.json | 2 +- packages/bls-sdk/package.json | 2 +- packages/constants/package.json | 2 +- .../constants/src/lib/constants/autogen_internal.ts | 12 ++++-------- packages/constants/src/lib/version.ts | 2 +- packages/contracts-sdk/package.json | 2 +- packages/core/package.json | 2 +- packages/crypto/package.json | 2 +- packages/ecdsa-sdk/package.json | 2 +- packages/encryption/package.json | 2 +- packages/lit-auth-client/package.json | 2 +- packages/lit-node-client-nodejs/package.json | 2 +- packages/lit-node-client/package.json | 2 +- packages/logger/package.json | 2 +- packages/misc-browser/package.json | 2 +- packages/misc/package.json | 2 +- packages/nacl/package.json | 2 +- packages/pkp-base/package.json | 2 +- packages/pkp-client/package.json | 2 +- packages/pkp-cosmos/package.json | 2 +- packages/pkp-ethers/package.json | 2 +- packages/pkp-sui/package.json | 2 +- packages/pkp-walletconnect/package.json | 2 +- packages/sev-snp-utils-sdk/package.json | 2 +- packages/types/package.json | 2 +- packages/uint8arrays/package.json | 2 +- packages/wrapped-keys/package.json | 2 +- 30 files changed, 33 insertions(+), 37 deletions(-) diff --git a/lerna.json b/lerna.json index 1304625e4..094523471 100644 --- a/lerna.json +++ b/lerna.json @@ -2,5 +2,5 @@ "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useNx": true, "useWorkspaces": true, - "version": "6.1.0" + "version": "6.1.1" } diff --git a/packages/access-control-conditions/package.json b/packages/access-control-conditions/package.json index 8877a9241..7ff3cac23 100644 --- a/packages/access-control-conditions/package.json +++ b/packages/access-control-conditions/package.json @@ -21,7 +21,7 @@ "tags": [ "universal" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/auth-browser/package.json b/packages/auth-browser/package.json index 189fee943..faa314831 100644 --- a/packages/auth-browser/package.json +++ b/packages/auth-browser/package.json @@ -30,7 +30,7 @@ "tags": [ "browser" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/auth-helpers/package.json b/packages/auth-helpers/package.json index 576c845e4..10697ea3a 100644 --- a/packages/auth-helpers/package.json +++ b/packages/auth-helpers/package.json @@ -28,7 +28,7 @@ "crypto": false, "stream": false }, - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/bls-sdk/package.json b/packages/bls-sdk/package.json index 0dbd7c067..c5763acf4 100644 --- a/packages/bls-sdk/package.json +++ b/packages/bls-sdk/package.json @@ -27,7 +27,7 @@ "buildOptions": { "genReact": false }, - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/constants/package.json b/packages/constants/package.json index 002d8331d..08b3cc2d9 100644 --- a/packages/constants/package.json +++ b/packages/constants/package.json @@ -20,7 +20,7 @@ "tags": [ "universal" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/constants/src/lib/constants/autogen_internal.ts b/packages/constants/src/lib/constants/autogen_internal.ts index 8c8109328..79f4b18d9 100644 --- a/packages/constants/src/lib/constants/autogen_internal.ts +++ b/packages/constants/src/lib/constants/autogen_internal.ts @@ -1,10 +1,8 @@ // This file is auto-generated by tools/scripts/gen-internal-dev.mjs export const INTERNAL_DEV = [ - 'https://158.69.34.226:443', - 'https://158.69.34.228:443', - 'https://158.69.34.227:443', - 'https://167.114.17.203:443', 'https://167.114.17.205:443', + 'https://167.114.17.203:443', + 'https://158.69.34.227:443', ]; export const INTERNAL_MIN_NODE_COUNT = 3; @@ -14,11 +12,9 @@ export const INTERNAL_DEFAULT_CONFIG = { minNodeCount: 3, debug: true, bootstrapUrls: [ - 'https://158.69.34.226:443', - 'https://158.69.34.228:443', - 'https://158.69.34.227:443', - 'https://167.114.17.203:443', 'https://167.114.17.205:443', + 'https://167.114.17.203:443', + 'https://158.69.34.227:443', ], litNetwork: 'internalDev', connectTimeout: 20000, diff --git a/packages/constants/src/lib/version.ts b/packages/constants/src/lib/version.ts index cb3cc64f8..f89aaa295 100644 --- a/packages/constants/src/lib/version.ts +++ b/packages/constants/src/lib/version.ts @@ -1 +1 @@ -export const version = '6.1.0'; +export const version = '6.1.1'; diff --git a/packages/contracts-sdk/package.json b/packages/contracts-sdk/package.json index fee81ec3c..53e30c993 100644 --- a/packages/contracts-sdk/package.json +++ b/packages/contracts-sdk/package.json @@ -32,7 +32,7 @@ "tags": [ "universal" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/core/package.json b/packages/core/package.json index 3e8f29d54..66b14e21a 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "@lit-protocol/core", - "version": "6.1.0", + "version": "6.1.1", "type": "commonjs", "license": "MIT", "homepage": "https://github.com/Lit-Protocol/js-sdk", diff --git a/packages/crypto/package.json b/packages/crypto/package.json index 52812fa08..f0ef0d385 100644 --- a/packages/crypto/package.json +++ b/packages/crypto/package.json @@ -21,7 +21,7 @@ "tags": [ "universal" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/ecdsa-sdk/package.json b/packages/ecdsa-sdk/package.json index dd231f213..71cccd19f 100644 --- a/packages/ecdsa-sdk/package.json +++ b/packages/ecdsa-sdk/package.json @@ -24,7 +24,7 @@ "tags": [ "universal" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/encryption/package.json b/packages/encryption/package.json index 8d28a1202..2f2336a01 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -25,7 +25,7 @@ "crypto": false, "stream": false }, - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/lit-auth-client/package.json b/packages/lit-auth-client/package.json index 80c2fc9ba..94efb82eb 100644 --- a/packages/lit-auth-client/package.json +++ b/packages/lit-auth-client/package.json @@ -1,6 +1,6 @@ { "name": "@lit-protocol/lit-auth-client", - "version": "6.1.0", + "version": "6.1.1", "type": "commonjs", "license": "MIT", "homepage": "https://github.com/Lit-Protocol/js-sdk", diff --git a/packages/lit-node-client-nodejs/package.json b/packages/lit-node-client-nodejs/package.json index 64201c334..456ef2f20 100644 --- a/packages/lit-node-client-nodejs/package.json +++ b/packages/lit-node-client-nodejs/package.json @@ -24,7 +24,7 @@ "tags": [ "nodejs" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/lit-node-client/package.json b/packages/lit-node-client/package.json index b09a9cbb2..e8a763024 100644 --- a/packages/lit-node-client/package.json +++ b/packages/lit-node-client/package.json @@ -28,7 +28,7 @@ "crypto": false, "stream": false }, - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/logger/package.json b/packages/logger/package.json index 0d6717a1b..d297eee34 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -1,6 +1,6 @@ { "name": "@lit-protocol/logger", - "version": "6.1.0", + "version": "6.1.1", "type": "commonjs", "tags": [ "universal" diff --git a/packages/misc-browser/package.json b/packages/misc-browser/package.json index c04dabb96..9b4211df2 100644 --- a/packages/misc-browser/package.json +++ b/packages/misc-browser/package.json @@ -21,7 +21,7 @@ "tags": [ "browser" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/misc/package.json b/packages/misc/package.json index 896f81c42..4e9d5fc62 100644 --- a/packages/misc/package.json +++ b/packages/misc/package.json @@ -24,7 +24,7 @@ "tags": [ "universal" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/nacl/package.json b/packages/nacl/package.json index b10c373f1..498f67482 100644 --- a/packages/nacl/package.json +++ b/packages/nacl/package.json @@ -21,7 +21,7 @@ "access": "public", "directory": "../../dist/packages/nacl" }, - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/pkp-base/package.json b/packages/pkp-base/package.json index 411cf91d1..55c158499 100644 --- a/packages/pkp-base/package.json +++ b/packages/pkp-base/package.json @@ -1,6 +1,6 @@ { "name": "@lit-protocol/pkp-base", - "version": "6.1.0", + "version": "6.1.1", "type": "commonjs", "license": "MIT", "homepage": "https://github.com/Lit-Protocol/js-sdk", diff --git a/packages/pkp-client/package.json b/packages/pkp-client/package.json index 04d87a1f3..e21b77db6 100644 --- a/packages/pkp-client/package.json +++ b/packages/pkp-client/package.json @@ -1,6 +1,6 @@ { "name": "@lit-protocol/pkp-client", - "version": "6.1.0", + "version": "6.1.1", "type": "commonjs", "license": "MIT", "homepage": "https://github.com/Lit-Protocol/js-sdk", diff --git a/packages/pkp-cosmos/package.json b/packages/pkp-cosmos/package.json index 57466e8ee..d90b02c73 100644 --- a/packages/pkp-cosmos/package.json +++ b/packages/pkp-cosmos/package.json @@ -1,6 +1,6 @@ { "name": "@lit-protocol/pkp-cosmos", - "version": "6.1.0", + "version": "6.1.1", "type": "commonjs", "license": "MIT", "homepage": "https://github.com/Lit-Protocol/js-sdk", diff --git a/packages/pkp-ethers/package.json b/packages/pkp-ethers/package.json index bd488f5dc..f2581ca5f 100644 --- a/packages/pkp-ethers/package.json +++ b/packages/pkp-ethers/package.json @@ -20,7 +20,7 @@ "tags": [ "universal" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/pkp-sui/package.json b/packages/pkp-sui/package.json index 6c694f0dd..54192ac3a 100644 --- a/packages/pkp-sui/package.json +++ b/packages/pkp-sui/package.json @@ -1,6 +1,6 @@ { "name": "@lit-protocol/pkp-sui", - "version": "6.1.0", + "version": "6.1.1", "type": "commonjs", "license": "MIT", "homepage": "https://github.com/Lit-Protocol/js-sdk", diff --git a/packages/pkp-walletconnect/package.json b/packages/pkp-walletconnect/package.json index d3f545e1a..330fa7e2f 100644 --- a/packages/pkp-walletconnect/package.json +++ b/packages/pkp-walletconnect/package.json @@ -1,6 +1,6 @@ { "name": "@lit-protocol/pkp-walletconnect", - "version": "6.1.0", + "version": "6.1.1", "type": "commonjs", "license": "MIT", "homepage": "https://github.com/Lit-Protocol/js-sdk", diff --git a/packages/sev-snp-utils-sdk/package.json b/packages/sev-snp-utils-sdk/package.json index bdf561462..abdf82e04 100644 --- a/packages/sev-snp-utils-sdk/package.json +++ b/packages/sev-snp-utils-sdk/package.json @@ -27,7 +27,7 @@ "buildOptions": { "genReact": false }, - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/types/package.json b/packages/types/package.json index 5df2913a1..cfd010ac4 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -23,7 +23,7 @@ "buildOptions": { "genReact": false }, - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/uint8arrays/package.json b/packages/uint8arrays/package.json index 0cf082e2c..321e807ff 100644 --- a/packages/uint8arrays/package.json +++ b/packages/uint8arrays/package.json @@ -21,7 +21,7 @@ "tags": [ "universal" ], - "version": "6.1.0", + "version": "6.1.1", "main": "./dist/src/index.js", "typings": "./dist/src/index.d.ts" } diff --git a/packages/wrapped-keys/package.json b/packages/wrapped-keys/package.json index 106ed590f..abb8a7ea4 100644 --- a/packages/wrapped-keys/package.json +++ b/packages/wrapped-keys/package.json @@ -23,7 +23,7 @@ "buildOptions": { "genReact": false }, - "version": "6.1.0", + "version": "6.1.1", "scripts": { "bundle": "yarn node ./esbuild.config.js" },