diff --git a/.github/shared/build/action.yml b/.github/shared/build/action.yml index fc32677cd5..5ff0313aeb 100644 --- a/.github/shared/build/action.yml +++ b/.github/shared/build/action.yml @@ -4,6 +4,15 @@ inputs: LACE_EXTENSION_KEY: description: 'Public extended manifest key' required: true + CARDANO_SERVICES_URL_MAINNET: + description: 'Cardano Services Mainnet URL' + required: false + CARDANO_SERVICES_URL_PREPROD: + description: 'Cardano Services Preprod URL' + required: false + CARDANO_SERVICES_URL_PREVIEW: + description: 'Cardano Services Preview URL' + required: false runs: using: 'composite' steps: @@ -26,4 +35,7 @@ runs: shell: bash env: LACE_EXTENSION_KEY: ${{ inputs.LACE_EXTENSION_KEY }} + CARDANO_SERVICES_URL_MAINNET: ${{ inputs.CARDANO_SERVICES_URL_MAINNET }} + CARDANO_SERVICES_URL_PREPROD: ${{ inputs.CARDANO_SERVICES_URL_PREPROD }} + CARDANO_SERVICES_URL_PREVIEW: ${{ inputs.CARDANO_SERVICES_URL_PREVIEW }} run: yarn browser build diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5de2cde10..6ebfc8f659 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: run: yarn lint - name: Run unit tests, generate test coverage report env: - AVAILABLE_CHAINS: 'Preprod,Preview,Mainnet' + AVAILABLE_CHAINS: 'Preprod,Preview,Mainnet,Sanchonet' DEFAULT_CHAIN: 'Preprod' run: yarn test:coverage --maxWorkers=2 - name: Upload build diff --git a/.github/workflows/e2e-tests-linux.yml b/.github/workflows/e2e-tests-linux.yml index c59123fdca..613dc181f7 100644 --- a/.github/workflows/e2e-tests-linux.yml +++ b/.github/workflows/e2e-tests-linux.yml @@ -50,6 +50,9 @@ jobs: uses: ./.github/shared/build with: LACE_EXTENSION_KEY: ${{ secrets.MANIFEST_PUBLIC_KEY }} + CARDANO_SERVICES_URL_MAINNET: ${{ secrets.CARDANO_SERVICES_URL_MAINNET }} + CARDANO_SERVICES_URL_PREPROD: ${{ secrets.CARDANO_SERVICES_URL_PREPROD }} + CARDANO_SERVICES_URL_PREVIEW: ${{ secrets.CARDANO_SERVICES_URL_PREVIEW }} - name: Start XVFB run: | Xvfb :99 & diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml index 0ba84ae435..ffbec68a30 100644 --- a/.github/workflows/smoke-tests.yml +++ b/.github/workflows/smoke-tests.yml @@ -26,6 +26,9 @@ jobs: uses: ./.github/shared/build with: LACE_EXTENSION_KEY: ${{ secrets.MANIFEST_PUBLIC_KEY }} + CARDANO_SERVICES_URL_MAINNET: ${{ secrets.CARDANO_SERVICES_URL_MAINNET }} + CARDANO_SERVICES_URL_PREPROD: ${{ secrets.CARDANO_SERVICES_URL_PREPROD }} + CARDANO_SERVICES_URL_PREVIEW: ${{ secrets.CARDANO_SERVICES_URL_PREVIEW }} - name: Start XVFB run: | Xvfb :99 & diff --git a/apps/browser-extension-wallet/.env.defaults b/apps/browser-extension-wallet/.env.defaults index f21f652d02..b4a982f896 100644 --- a/apps/browser-extension-wallet/.env.defaults +++ b/apps/browser-extension-wallet/.env.defaults @@ -4,7 +4,7 @@ DEFAULT_CHAIN=Mainnet WALLET_SYNC_TIMEOUT_IN_SEC=60 WALLET_INTERVAL_IN_SEC=30 DROP_CONSOLE_IN_PRODUCTION=false -AVAILABLE_CHAINS=Preprod,Preview,Mainnet +AVAILABLE_CHAINS=Preprod,Preview,Mainnet,Sanchonet ADA_PRICE_POLLING_IN_SEC=60 SAVED_PRICE_DURATION_IN_MINUTES=720 @@ -53,17 +53,22 @@ PRODUCTION_MODE_TRACKING=false CARDANO_SERVICES_URL_MAINNET=https://backend.live-mainnet.eks.lw.iog.io CARDANO_SERVICES_URL_PREPROD=https://backend.live-preprod.eks.lw.iog.io CARDANO_SERVICES_URL_PREVIEW=https://backend.live-preview.eks.lw.iog.io +# TODO: update this with a valid sanchonet url +CARDANO_SERVICES_URL_SANCHONET=https://backend.live-preprod.eks.lw.iog.io # Explorer URLs CEXPLORER_URL_MAINNET=https://cexplorer.io CEXPLORER_URL_PREVIEW=https://preview.cexplorer.io CEXPLORER_URL_PREPROD=https://preprod.cexplorer.io -CEXPLORER_URL_TESTNET=https://testnet.cexplorer.io +# TODO: update this with a valid sanchonet cexplorer +CEXPLORER_URL_SANCHONET=https://preprod.cexplorer.io # ADA Handle URLs ADA_HANDLE_URL_MAINNET=https://api.handle.me ADA_HANDLE_URL_PREVIEW=https://preview.api.handle.me ADA_HANDLE_URL_PREPROD=https://preprod.api.handle.me +# TODO: update this with a valid sanchonet url +ADA_HANDLE_URL_SANCHONET=https://preprod.api.handle.me # Manifest.json LACE_EXTENSION_KEY=gafhhkghbfjjkeiendhlofajokpaflmk diff --git a/apps/browser-extension-wallet/.env.example b/apps/browser-extension-wallet/.env.example index 0feb996b90..8637515a3d 100644 --- a/apps/browser-extension-wallet/.env.example +++ b/apps/browser-extension-wallet/.env.example @@ -4,7 +4,7 @@ DEFAULT_CHAIN=Mainnet WALLET_SYNC_TIMEOUT_IN_SEC=60 WALLET_INTERVAL_IN_SEC=30 DROP_CONSOLE_IN_PRODUCTION=false -AVAILABLE_CHAINS=Preprod,Preview,Mainnet +AVAILABLE_CHAINS=Preprod,Preview,Mainnet,Sanchonet ADA_PRICE_POLLING_IN_SEC=60 SAVED_PRICE_DURATION_IN_MINUTES=720 @@ -53,17 +53,22 @@ POSTHOG_EXCLUDED_EVENTS= CARDANO_SERVICES_URL_MAINNET=https://backend.live-mainnet.eks.lw.iog.io CARDANO_SERVICES_URL_PREPROD=https://backend.live-preprod.eks.lw.iog.io CARDANO_SERVICES_URL_PREVIEW=https://backend.live-preview.eks.lw.iog.io +# TODO: update this with a valid sanchonet url +CARDANO_SERVICES_URL_SANCHONET=https://backend.live-preprod.eks.lw.iog.io # Explorer URLs CEXPLORER_URL_MAINNET=https://cexplorer.io CEXPLORER_URL_PREVIEW=https://preview.cexplorer.io CEXPLORER_URL_PREPROD=https://preprod.cexplorer.io -CEXPLORER_URL_TESTNET=https://testnet.cexplorer.io +# TODO: update this with a valid sanchonet cexplorer +CEXPLORER_URL_SANCHONET=https://preprod.cexplorer.io # ADA Handle URLs ADA_HANDLE_URL_MAINNET=https://api.handle.me ADA_HANDLE_URL_PREVIEW=https://preview.api.handle.me ADA_HANDLE_URL_PREPROD=https://preprod.api.handle.me +# TODO: update this with a valid sanchonet url +ADA_HANDLE_URL_SANCHONET=https://preprod.api.handle.me # Manifest.json LACE_EXTENSION_KEY=gafhhkghbfjjkeiendhlofajokpaflmk diff --git a/apps/browser-extension-wallet/package.json b/apps/browser-extension-wallet/package.json index 50ad7df5f7..d025c8d483 100644 --- a/apps/browser-extension-wallet/package.json +++ b/apps/browser-extension-wallet/package.json @@ -40,14 +40,14 @@ }, "dependencies": { "@ant-design/icons": "^4.7.0", - "@cardano-sdk/cardano-services-client": "0.12.2", - "@cardano-sdk/core": "0.19.1", - "@cardano-sdk/dapp-connector": "0.9.15", - "@cardano-sdk/input-selection": "0.11.9", - "@cardano-sdk/tx-construction": "0.11.2", - "@cardano-sdk/util": "0.14.0", - "@cardano-sdk/wallet": "0.21.1", - "@cardano-sdk/web-extension": "0.14.6", + "@cardano-sdk/cardano-services-client": "0.14.2", + "@cardano-sdk/core": "0.21.0", + "@cardano-sdk/dapp-connector": "0.11.1", + "@cardano-sdk/input-selection": "0.12.2", + "@cardano-sdk/tx-construction": "0.14.0", + "@cardano-sdk/util": "0.14.2", + "@cardano-sdk/wallet": "0.24.0", + "@cardano-sdk/web-extension": "0.16.1", "@emurgo/cip14-js": "~3.0.1", "@koralabs/handles-public-api-interfaces": "^1.6.6", "@lace/cardano": "0.1.0", diff --git a/apps/browser-extension-wallet/src/config.ts b/apps/browser-extension-wallet/src/config.ts index f50e5e74e4..61fe468996 100644 --- a/apps/browser-extension-wallet/src/config.ts +++ b/apps/browser-extension-wallet/src/config.ts @@ -6,6 +6,7 @@ type CardanoServiceUrls = { Mainnet: string; Preprod: string; Preview: string; + Sanchonet: string; }; type CExplorerUrlPaths = { @@ -33,7 +34,8 @@ const envChecks = (chosenChain: Wallet.ChainName): void => { if ( !process.env.CARDANO_SERVICES_URL_MAINNET || !process.env.CARDANO_SERVICES_URL_PREPROD || - !process.env.CARDANO_SERVICES_URL_PREVIEW + !process.env.CARDANO_SERVICES_URL_PREVIEW || + !process.env.CARDANO_SERVICES_URL_SANCHONET ) { throw new Error('env vars not complete'); } @@ -42,7 +44,7 @@ const envChecks = (chosenChain: Wallet.ChainName): void => { !process.env.CEXPLORER_URL_MAINNET || !process.env.CEXPLORER_URL_PREVIEW || !process.env.CEXPLORER_URL_PREPROD || - !process.env.CEXPLORER_URL_TESTNET + !process.env.CEXPLORER_URL_SANCHONET ) { throw new Error('explorer vars not complete'); } @@ -81,13 +83,14 @@ export const config = (): Config => { CARDANO_SERVICES_URLS: { Mainnet: process.env.CARDANO_SERVICES_URL_MAINNET, Preprod: process.env.CARDANO_SERVICES_URL_PREPROD, - Preview: process.env.CARDANO_SERVICES_URL_PREVIEW + Preview: process.env.CARDANO_SERVICES_URL_PREVIEW, + Sanchonet: process.env.CARDANO_SERVICES_URL_SANCHONET }, CEXPLORER_BASE_URL: { Mainnet: `${process.env.CEXPLORER_URL_MAINNET}`, - LegacyTestnet: `${process.env.CEXPLORER_URL_TESTNET}`, Preprod: `${process.env.CEXPLORER_URL_PREPROD}`, - Preview: `${process.env.CEXPLORER_URL_PREVIEW}` + Preview: `${process.env.CEXPLORER_URL_PREVIEW}`, + Sanchonet: `${process.env.CEXPLORER_URL_SANCHONET}` }, CEXPLORER_URL_PATHS: { Tx: 'tx', diff --git a/apps/browser-extension-wallet/src/features/ada-handle/config.ts b/apps/browser-extension-wallet/src/features/ada-handle/config.ts index 8a40c29ff1..2a3c7779fb 100644 --- a/apps/browser-extension-wallet/src/features/ada-handle/config.ts +++ b/apps/browser-extension-wallet/src/features/ada-handle/config.ts @@ -7,5 +7,6 @@ export const HANDLE_SERVER_URLS: Record = { [Cardano.NetworkMagics.Mainnet]: 'https://api.handle.me', [Cardano.NetworkMagics.Preprod]: 'https://preprod.api.handle.me', [Cardano.NetworkMagics.Preview]: 'https://preview.api.handle.me', - [Cardano.NetworkMagics.Testnet]: '' + // TODO: update once there's a valid sanchonet version available + [Cardano.NetworkMagics.Sanchonet]: 'https://sanchonet.api.handle.me' }; diff --git a/apps/browser-extension-wallet/src/features/address-book/context/AddressBookProvider.tsx b/apps/browser-extension-wallet/src/features/address-book/context/AddressBookProvider.tsx index dac76ff5dc..6d69dde97e 100644 --- a/apps/browser-extension-wallet/src/features/address-book/context/AddressBookProvider.tsx +++ b/apps/browser-extension-wallet/src/features/address-book/context/AddressBookProvider.tsx @@ -19,7 +19,7 @@ export const cardanoNetworkMap = { Mainnet: Wallet.Cardano.NetworkMagics.Mainnet, Preprod: Wallet.Cardano.NetworkMagics.Preprod, Preview: Wallet.Cardano.NetworkMagics.Preview, - LegacyTestnet: Wallet.Cardano.NetworkMagics.Testnet + Sanchonet: Wallet.Cardano.NetworkMagics.Sanchonet }; const handleRecordValidation = (list: AddressBookSchema[], record: AddressRecordParams) => { diff --git a/apps/browser-extension-wallet/src/features/dapp/components/__tests__/Connect.test.tsx b/apps/browser-extension-wallet/src/features/dapp/components/__tests__/Connect.test.tsx index 4a66f12313..188e24e0a9 100644 --- a/apps/browser-extension-wallet/src/features/dapp/components/__tests__/Connect.test.tsx +++ b/apps/browser-extension-wallet/src/features/dapp/components/__tests__/Connect.test.tsx @@ -99,12 +99,6 @@ describe('Connect Component: ', () => { }); rerender(); await waitFor(assert); - - mockUseWalletStore.mockReturnValueOnce({ - environmentName: 'LegacyTestnet' - }); - rerender(); - await waitFor(assert); }); test('should render default warning modal for any other than Mainnet env and https protocol', async () => { @@ -125,12 +119,6 @@ describe('Connect Component: ', () => { }); rerender(); await waitFor(assert); - - mockUseWalletStore.mockReturnValueOnce({ - environmentName: 'LegacyTestnet' - }); - rerender(); - await waitFor(assert); }); }); }); diff --git a/apps/browser-extension-wallet/src/hooks/__tests__/useCollateral.test.tsx b/apps/browser-extension-wallet/src/hooks/__tests__/useCollateral.test.tsx index f3bf2ecfb6..0ebd83c6f6 100644 --- a/apps/browser-extension-wallet/src/hooks/__tests__/useCollateral.test.tsx +++ b/apps/browser-extension-wallet/src/hooks/__tests__/useCollateral.test.tsx @@ -33,6 +33,7 @@ const signedTx = { cbor: '' as TxCBOR, tx: { id: 'txId' } as Cardano.Tx, context: { + handleResolutions: [], handles: [] as HandleResolution[] } } as SignedTx; diff --git a/apps/browser-extension-wallet/src/hooks/__tests__/useDelegationDetails.test.ts b/apps/browser-extension-wallet/src/hooks/__tests__/useDelegationDetails.test.ts index 2a20ab0bdb..d6e507db6f 100644 --- a/apps/browser-extension-wallet/src/hooks/__tests__/useDelegationDetails.test.ts +++ b/apps/browser-extension-wallet/src/hooks/__tests__/useDelegationDetails.test.ts @@ -29,7 +29,7 @@ jest.mock('../../stores', () => ({ })); describe('Testing useBuildDelegation hook', () => { - process.env.AVAILABLE_CHAINS = process.env.AVAILABLE_CHAINS || 'Mainnet,Preprod,Preview'; + process.env.AVAILABLE_CHAINS = process.env.AVAILABLE_CHAINS || 'Mainnet,Preprod,Preview,Sanchonet'; process.env.DEFAULT_CHAIN = process.env.DEFAULT_CHAIN || 'Preprod'; test('should return use delegation details function', () => { diff --git a/apps/browser-extension-wallet/src/hooks/__tests__/useWalletManager.test.tsx b/apps/browser-extension-wallet/src/hooks/__tests__/useWalletManager.test.tsx index ec8e5bf43b..a804265e24 100644 --- a/apps/browser-extension-wallet/src/hooks/__tests__/useWalletManager.test.tsx +++ b/apps/browser-extension-wallet/src/hooks/__tests__/useWalletManager.test.tsx @@ -431,7 +431,7 @@ describe('Testing useWalletManager hook', () => { wallet, name: 'name' } as any; - const chainName = 'LegacyTestnet'; + const chainName = 'Preprod'; const mnemonicVerificationFrequency = 'mnemonicVerificationFrequency'; jest.spyOn(stores, 'useWalletStore').mockImplementation(() => ({ @@ -621,7 +621,7 @@ describe('Testing useWalletManager hook', () => { keyAgentsByChain, ...cardanoWallet } as any; - const chainName = 'LegacyTestnet'; + const chainName = 'Preprod'; const saveValueInLocalStorage = jest.fn(); jest.spyOn(localStorage, 'saveValueInLocalStorage').mockImplementation(saveValueInLocalStorage); @@ -853,18 +853,6 @@ describe('Testing useWalletManager hook', () => { expect(switchNetwork).toBeDefined(); await expect(switchNetwork(chainId)).rejects.toThrow(new Error('Chain not supported')); }); - test('shoud throw in case the chain is not available', async () => { - const chainId = 'LegacyTestnet' as any; - const { - result: { - current: { switchNetwork } - } - } = renderHook(() => useWalletManager(), { - wrapper: getWrapper({}) - }); - expect(switchNetwork).toBeDefined(); - await expect(switchNetwork(chainId)).rejects.toThrow(new Error('Chain not supported')); - }); test('shoud throw in case the wallet data for chosen chain not found', async () => { const chainId = 'Preprod' as any; const keyAgentsByChain = {}; diff --git a/apps/browser-extension-wallet/src/lib/scripts/background/config.ts b/apps/browser-extension-wallet/src/lib/scripts/background/config.ts index 7aa376d687..ccd3e52cbc 100644 --- a/apps/browser-extension-wallet/src/lib/scripts/background/config.ts +++ b/apps/browser-extension-wallet/src/lib/scripts/background/config.ts @@ -27,15 +27,7 @@ export const getProviders = (chainName: Wallet.ChainName): Wallet.WalletProvider return Wallet.createProviders({ axiosAdapter: axiosFetchAdapter, - httpProviders: { - assetProvider: `${baseCardanoServicesUrl}/asset`, - chainHistoryProvider: `${baseCardanoServicesUrl}/chain-history`, - networkInfoProvider: `${baseCardanoServicesUrl}/network-info`, - rewardsProvider: `${baseCardanoServicesUrl}/rewards`, - stakePoolProvider: `${baseCardanoServicesUrl}/stake-pool`, - txSubmitProvider: `${baseCardanoServicesUrl}/tx-submit`, - utxoProvider: `${baseCardanoServicesUrl}/utxo` - } + baseUrl: baseCardanoServicesUrl }); }; export const ownOrigin = globalThis.location.origin; diff --git a/apps/browser-extension-wallet/src/lib/scripts/background/services/userIdService.test.ts b/apps/browser-extension-wallet/src/lib/scripts/background/services/userIdService.test.ts index f15b1ae555..129566581b 100644 --- a/apps/browser-extension-wallet/src/lib/scripts/background/services/userIdService.test.ts +++ b/apps/browser-extension-wallet/src/lib/scripts/background/services/userIdService.test.ts @@ -1,6 +1,6 @@ import { BackgroundStorage } from '@lib/scripts/types'; import { mockKeyAgentsByChain } from '@src/utils/mocks/test-helpers'; -import { SESSION_LENGTH, USER_ID_BYTE_SIZE, UserIdService } from '.'; +import { SESSION_LENGTH, USER_ID_BYTE_SIZE, UserIdService } from './userIdService'; import * as utils from '../util'; import { UserTrackingType } from '@providers/AnalyticsProvider/analyticsTracker'; diff --git a/apps/browser-extension-wallet/src/lib/scripts/migrations/versions/v0_6_0.ts b/apps/browser-extension-wallet/src/lib/scripts/migrations/versions/v0_6_0.ts index 1c6950a7fe..4810db498e 100644 --- a/apps/browser-extension-wallet/src/lib/scripts/migrations/versions/v0_6_0.ts +++ b/apps/browser-extension-wallet/src/lib/scripts/migrations/versions/v0_6_0.ts @@ -77,16 +77,6 @@ export const v0_6_0: Migration = { // Generate keyAgentsDataByChain and save it in background storage newKeyAgentsByChain = { - LegacyTestnet: - keyAgentStoredChainName === 'LegacyTestnet' - ? { keyAgentData: newKeyAgentData } - : { - keyAgentData: { - ...newKeyAgentData, - chainId: Wallet.Cardano.ChainIds.LegacyTestnet, - knownAddresses: [] - } - }, Preprod: keyAgentStoredChainName === 'Preprod' ? { keyAgentData: newKeyAgentData } @@ -104,6 +94,12 @@ export const v0_6_0: Migration = { ? { keyAgentData: newKeyAgentData } : { keyAgentData: { ...newKeyAgentData, chainId: Wallet.Cardano.ChainIds.Mainnet, knownAddresses: [] } + }, + Sanchonet: + keyAgentStoredChainName === 'Sanchonet' + ? { keyAgentData: newKeyAgentData } + : { + keyAgentData: { ...newKeyAgentData, chainId: Wallet.Cardano.ChainIds.Sanchonet, knownAddresses: [] } } }; diff --git a/apps/browser-extension-wallet/src/lib/translations/en.json b/apps/browser-extension-wallet/src/lib/translations/en.json index 21fa22edf3..4c090b45f5 100644 --- a/apps/browser-extension-wallet/src/lib/translations/en.json +++ b/apps/browser-extension-wallet/src/lib/translations/en.json @@ -120,7 +120,7 @@ "mainnet": "Mainnet", "preprod": "Preprod", "preview": "Preview", - "legacyTestnet": "Legacy Testnet", + "sanchonet": "Sanchonet", "custom": "Custom", "offline": "Offline", "error": "Your internet connection is not working. You can still navigate the wallet based on the latest connection you had.", diff --git a/apps/browser-extension-wallet/src/providers/AnalyticsProvider/analyticsTracker/types.ts b/apps/browser-extension-wallet/src/providers/AnalyticsProvider/analyticsTracker/types.ts index 379409a4da..ddc6bcd7d4 100644 --- a/apps/browser-extension-wallet/src/providers/AnalyticsProvider/analyticsTracker/types.ts +++ b/apps/browser-extension-wallet/src/providers/AnalyticsProvider/analyticsTracker/types.ts @@ -132,6 +132,7 @@ export enum PostHogAction { SettingsNetworkPreviewClick = 'settings | network | preview | click', SettingsNetworkPreprodClick = 'settings | network | preprod | click', SettingsNetworkMainnetClick = 'settings | network | mainnet | click', + SettingsNetworkSanchonetClick = 'settings | network | sanchonet | click', SettingsNetworkXClick = 'settings | network | x | click', SettingsAuthorizedDappsClick = 'settings | authorized dapps | click', SettingsAuthorizedDappsTrashBinIconClick = 'settings | authorized dapps | trash bin icon | click', @@ -179,6 +180,7 @@ export enum PostHogAction { UserWalletProfileNetworkPreviewClick = 'user/wallet profile | network | preview | click', UserWalletProfileNetworkPreprodClick = 'user/wallet profile | network | preprod | click', UserWalletProfileNetworkMainnetClick = 'user/wallet profile | network | mainnet | click', + UserWalletProfileNetworkSanchonetClick = 'user/wallet profile | network | sanchonet | click', UserWalletProfileLockWalletClick = 'user/wallet profile | lock wallet | click', // Lace Logo WalletLaceClick = 'wallet | lace | click', diff --git a/apps/browser-extension-wallet/src/stores/slices/__tests__/wallet-info-slice.test.ts b/apps/browser-extension-wallet/src/stores/slices/__tests__/wallet-info-slice.test.ts index 43223b6738..8b4fe6e4d6 100644 --- a/apps/browser-extension-wallet/src/stores/slices/__tests__/wallet-info-slice.test.ts +++ b/apps/browser-extension-wallet/src/stores/slices/__tests__/wallet-info-slice.test.ts @@ -68,7 +68,7 @@ describe('Testing wallet info slice', () => { describe('environment names set correctly', () => { let useWalletInfoHook: UseStore; - process.env.AVAILABLE_CHAINS = process.env.AVAILABLE_CHAINS || 'Mainnet,Preprod,Preview'; + process.env.AVAILABLE_CHAINS = process.env.AVAILABLE_CHAINS || 'Mainnet,Preprod,Preview,Sanchonet'; beforeEach(() => { useWalletInfoHook = create(mockWalletInfoStore); diff --git a/apps/browser-extension-wallet/src/stores/slices/blockchain-provider-slice.ts b/apps/browser-extension-wallet/src/stores/slices/blockchain-provider-slice.ts index ace78ebc33..93fd2caa6e 100644 --- a/apps/browser-extension-wallet/src/stores/slices/blockchain-provider-slice.ts +++ b/apps/browser-extension-wallet/src/stores/slices/blockchain-provider-slice.ts @@ -43,15 +43,7 @@ export const getProviderByChain: BlockchainProviderFactory = (chain = CHAIN) => const baseCardanoServicesUrl = getBaseUrlForChain(chain); const providers = Wallet.createProviders({ axiosAdapter: axiosFetchAdapter, - httpProviders: { - assetProvider: `${baseCardanoServicesUrl}/asset`, - chainHistoryProvider: `${baseCardanoServicesUrl}/chain-history`, - networkInfoProvider: `${baseCardanoServicesUrl}/network-info`, - rewardsProvider: `${baseCardanoServicesUrl}/rewards`, - stakePoolProvider: `${baseCardanoServicesUrl}/stake-pool`, - txSubmitProvider: `${baseCardanoServicesUrl}/tx-submit`, - utxoProvider: `${baseCardanoServicesUrl}/utxo` - } + baseUrl: baseCardanoServicesUrl }); return IBlockchainProvider.fromWalletProviders(providers); diff --git a/apps/browser-extension-wallet/src/utils/__tests__/chain.test.ts b/apps/browser-extension-wallet/src/utils/__tests__/chain.test.ts index ef30a5c002..a2fd7e7542 100644 --- a/apps/browser-extension-wallet/src/utils/__tests__/chain.test.ts +++ b/apps/browser-extension-wallet/src/utils/__tests__/chain.test.ts @@ -9,7 +9,8 @@ describe('Testing getBaseUrlForChain function', () => { const CARDANO_SERVICES_URLS = { Mainnet: 'Mainnet', Preprod: 'Preprod', - Preview: 'Preview' + Preview: 'Preview', + Sanchonet: 'Sanchonet' }; beforeEach(() => { @@ -22,13 +23,13 @@ describe('Testing getBaseUrlForChain function', () => { }); test('should return proper url for chainName or throw', async () => { process.env.USE_DEV_ENDPOINTS = 'true'; - const AVAILABLE_CHAINS = ['Mainnet', 'Preprod', 'Preview', 'LegacyTestnet'] as unknown as Wallet.ChainName[]; + const AVAILABLE_CHAINS = ['Mainnet', 'Preprod', 'Preview', 'Sanchonet'] as unknown as Wallet.ChainName[]; jest.spyOn(config, 'config').mockReturnValue({ CARDANO_SERVICES_URLS, AVAILABLE_CHAINS } as config.Config); expect(getBaseUrlForChain('Mainnet')).toBe(CARDANO_SERVICES_URLS.Mainnet); expect(getBaseUrlForChain('Preprod')).toBe(CARDANO_SERVICES_URLS.Preprod); expect(getBaseUrlForChain('Preview')).toBe(CARDANO_SERVICES_URLS.Preview); - expect(() => getBaseUrlForChain('LegacyTestnet')).toThrow(new Error('Incorrect chain supplied')); + expect(getBaseUrlForChain('Sanchonet')).toBe(CARDANO_SERVICES_URLS.Sanchonet); }); test('should throw in case chain is not suported', async () => { diff --git a/apps/browser-extension-wallet/src/utils/__tests__/get-chain-name-by-network-magic.test.ts b/apps/browser-extension-wallet/src/utils/__tests__/get-chain-name-by-network-magic.test.ts index 5160acfe7d..c336c75bcf 100644 --- a/apps/browser-extension-wallet/src/utils/__tests__/get-chain-name-by-network-magic.test.ts +++ b/apps/browser-extension-wallet/src/utils/__tests__/get-chain-name-by-network-magic.test.ts @@ -14,8 +14,4 @@ describe('Testing getChainNameByNetworkMagic function', () => { const networkName = getChainNameByNetworkMagic(Wallet.Cardano.NetworkMagics.Preview); expect(networkName).toBe('Preview'); }); - test(`should return LegacyTestnet as name for network magic ${Wallet.Cardano.NetworkMagics.Testnet}`, () => { - const networkName = getChainNameByNetworkMagic(Wallet.Cardano.NetworkMagics.Testnet); - expect(networkName).toBe('LegacyTestnet'); - }); }); diff --git a/apps/browser-extension-wallet/src/utils/chain.ts b/apps/browser-extension-wallet/src/utils/chain.ts index 87d68ea4fe..f8077af81f 100644 --- a/apps/browser-extension-wallet/src/utils/chain.ts +++ b/apps/browser-extension-wallet/src/utils/chain.ts @@ -14,6 +14,9 @@ export const getBaseUrlForChain = (chainName: Wallet.ChainName): string => { case 'Preview': url = CARDANO_SERVICES_URLS.Preview; break; + case 'Sanchonet': + url = CARDANO_SERVICES_URLS.Sanchonet; + break; default: throw new Error('Incorrect chain supplied'); } diff --git a/apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx b/apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx index 10b4e67629..a1a6d7e2b5 100644 --- a/apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx +++ b/apps/browser-extension-wallet/src/utils/mocks/test-helpers.tsx @@ -41,10 +41,10 @@ export const mockKeyAgentDataTestnet: Wallet.KeyManagement.SerializableKeyAgentD }; export const mockKeyAgentsByChain: Wallet.KeyAgentsByChain = { - LegacyTestnet: { keyAgentData: { ...mockKeyAgentDataTestnet, chainId: Wallet.Cardano.ChainIds.LegacyTestnet } }, Mainnet: { keyAgentData: { ...mockKeyAgentDataTestnet, chainId: Wallet.Cardano.ChainIds.Mainnet } }, Preprod: { keyAgentData: { ...mockKeyAgentDataTestnet, chainId: Wallet.Cardano.ChainIds.Preprod } }, - Preview: { keyAgentData: { ...mockKeyAgentDataTestnet, chainId: Wallet.Cardano.ChainIds.Preview } } + Preview: { keyAgentData: { ...mockKeyAgentDataTestnet, chainId: Wallet.Cardano.ChainIds.Preview } }, + Sanchonet: { keyAgentData: { ...mockKeyAgentDataTestnet, chainId: Wallet.Cardano.ChainIds.Sanchonet } } }; export const mockInMemoryWallet = { @@ -193,15 +193,8 @@ export const mockAvailableBalance: Balance = { }; export const mockAssetMetadata: Wallet.Asset.AssetInfo = { - mintOrBurnCount: 0, assetId: Wallet.Cardano.AssetId('659f2917fb63f12b33667463ee575eeac1845bbc736b9c0bbc40ba8254534c41'), fingerprint: Wallet.Cardano.AssetFingerprint('asset1pkpwyknlvul7az0xx8czhl60pyel45rpje4z8w'), - history: [ - { - quantity: BigInt('1000'), - transactionId: Wallet.Cardano.TransactionId('6804edf9712d2b619edb6ac86861fe93a730693183a262b165fcc1ba1bc99cad') - } - ], name: Wallet.Cardano.AssetName('54534c41'), policyId: Wallet.Cardano.PolicyId('659f2917fb63f12b33667463ee575eeac1845bbc736b9c0bbc40ba82'), quantity: BigInt('1000'), @@ -327,7 +320,6 @@ export const TransactionBuildMock: CardanoTxBuild = { }; export const mockAsset: Wallet.Asset.AssetInfo = { - mintOrBurnCount: 0, assetId: Wallet.Cardano.AssetId('6b8d07d69639e9413dd637a1a815a7323c69c86abbafb66dbfdb1aa7'), fingerprint: Wallet.Cardano.AssetFingerprint('asset1cvmyrfrc7lpht2hcjwr9lulzyyjv27uxh3kcz0'), name: Wallet.Cardano.AssetName('54657374636f696e'), @@ -342,17 +334,10 @@ export const mockAsset: Wallet.Asset.AssetInfo = { name: 'Testcoin', ticker: 'TEST', url: 'https://developers.cardano.org/' - }, - history: [ - { - quantity: BigInt('100042'), - transactionId: Wallet.Cardano.TransactionId('abfda1ba36b9ee541516fda311319f7bdb3e3928776c2982d2f027f3e8fa54c7') - } - ] + } }; export const mockNft: Wallet.Asset.AssetInfo = { - mintOrBurnCount: 2, assetId: Wallet.Cardano.AssetId('659f2917fb63f12b33667463ee575eeac1845bbc736b9c0bbc40ba8254534c41'), fingerprint: Wallet.Cardano.AssetFingerprint('asset1pkpwyknlvul7az0xx8czhl60pyel45rpje4z8w'), name: Wallet.Cardano.AssetName('54534c41'), @@ -368,12 +353,6 @@ export const mockNft: Wallet.Asset.AssetInfo = { ticker: 'NFT', url: 'https://nft.mock.xyz/' }, - history: [ - { - quantity: BigInt('1'), - transactionId: Wallet.Cardano.TransactionId('abfda1ba36b9ee541516fda311319f7bdb3e3928776c2982d2f027f3e8fa54c7') - } - ], nftMetadata: { image: Wallet.Asset.Uri('ipfs://asd.io'), name: 'NFT #123456', diff --git a/apps/browser-extension-wallet/src/views/browser-view/features/settings/components/NetworkChoice.tsx b/apps/browser-extension-wallet/src/views/browser-view/features/settings/components/NetworkChoice.tsx index fd98ea6a08..d831b4cce6 100644 --- a/apps/browser-extension-wallet/src/views/browser-view/features/settings/components/NetworkChoice.tsx +++ b/apps/browser-extension-wallet/src/views/browser-view/features/settings/components/NetworkChoice.tsx @@ -17,23 +17,27 @@ const { AVAILABLE_CHAINS } = config(); type networkEventSettings = | PostHogAction.SettingsNetworkPreviewClick | PostHogAction.SettingsNetworkPreprodClick - | PostHogAction.SettingsNetworkMainnetClick; + | PostHogAction.SettingsNetworkMainnetClick + | PostHogAction.SettingsNetworkSanchonetClick; type networkEventUserWalletProfile = | PostHogAction.UserWalletProfileNetworkPreviewClick | PostHogAction.UserWalletProfileNetworkPreprodClick - | PostHogAction.UserWalletProfileNetworkMainnetClick; + | PostHogAction.UserWalletProfileNetworkMainnetClick + | PostHogAction.UserWalletProfileNetworkSanchonetClick; const settingsEventByNetworkName: Partial> = { Mainnet: PostHogAction.SettingsNetworkMainnetClick, Preprod: PostHogAction.SettingsNetworkPreprodClick, - Preview: PostHogAction.SettingsNetworkPreviewClick + Preview: PostHogAction.SettingsNetworkPreviewClick, + Sanchonet: PostHogAction.SettingsNetworkSanchonetClick }; const walletProfileEventByNetworkName: Partial> = { Mainnet: PostHogAction.UserWalletProfileNetworkMainnetClick, Preprod: PostHogAction.UserWalletProfileNetworkPreprodClick, - Preview: PostHogAction.UserWalletProfileNetworkPreviewClick + Preview: PostHogAction.UserWalletProfileNetworkPreviewClick, + Sanchonet: PostHogAction.UserWalletProfileNetworkSanchonetClick }; export const NetworkChoice = ({ section }: { section?: 'settings' | 'wallet-profile' }): React.ReactElement => { @@ -51,8 +55,8 @@ export const NetworkChoice = ({ section }: { section?: 'settings' | 'wallet-prof return t('general.networks.preprod'); case 'Preview': return t('general.networks.preview'); - case 'LegacyTestnet': - return t('general.networks.legacyTestnet'); + case 'Sanchonet': + return t('general.networks.sanchonet'); default: return ''; } diff --git a/apps/browser-extension-wallet/test/__mocks__/set-env-vars.js b/apps/browser-extension-wallet/test/__mocks__/set-env-vars.js index 06eb6cacea..404d6bce23 100644 --- a/apps/browser-extension-wallet/test/__mocks__/set-env-vars.js +++ b/apps/browser-extension-wallet/test/__mocks__/set-env-vars.js @@ -1,11 +1,12 @@ process.env.CARDANO_SERVICES_URL_PREVIEW = 'https://preview-prod.com'; process.env.CARDANO_SERVICES_URL_PREPROD = 'https://preprod-prod.com'; process.env.CARDANO_SERVICES_URL_MAINNET = 'https://mainnet-url.com'; -process.env.AVAILABLE_CHAINS = 'Preprod,Preview,Mainnet'; +process.env.CARDANO_SERVICES_URL_SANCHONET = 'https://sanchonet-url.com'; +process.env.AVAILABLE_CHAINS = 'Preprod,Preview,Mainnet,Sanchonet'; process.env.CEXPLORER_URL_MAINNET = 'https://cexplorer.io'; process.env.CEXPLORER_URL_PREVIEW = 'https://preview.cexplorer.io'; process.env.CEXPLORER_URL_PREPROD = 'https://preprod.cexplorer.io'; -process.env.CEXPLORER_URL_TESTNET = 'https://testnet.cexplorer.io'; +process.env.CEXPLORER_URL_SANCHONET = 'https://sanchonet.cexplorer.io'; process.env.USE_HIDE_MY_BALANCE = 'true'; process.env.USE_POSTHOG_ANALYTICS = 'true'; process.env.USE_POSTHOG_ANALYTICS_FOR_OPTED_OUT = 'false'; diff --git a/apps/browser-extension-wallet/webpack-utils.js b/apps/browser-extension-wallet/webpack-utils.js index 6e17477310..a84c27cc2a 100644 --- a/apps/browser-extension-wallet/webpack-utils.js +++ b/apps/browser-extension-wallet/webpack-utils.js @@ -9,11 +9,11 @@ const transformManifest = (content, mode) => { manifest.content_security_policy.extension_pages = manifest.content_security_policy.extension_pages .replace( '$CARDANO_SERVICES_URLS', - `${process.env.CARDANO_SERVICES_URL_MAINNET} ${process.env.CARDANO_SERVICES_URL_PREPROD} ${process.env.CARDANO_SERVICES_URL_PREVIEW}` + `${process.env.CARDANO_SERVICES_URL_MAINNET} ${process.env.CARDANO_SERVICES_URL_PREPROD} ${process.env.CARDANO_SERVICES_URL_PREVIEW} ${process.env.CARDANO_SERVICES_URL_SANCHONET}` ) .replace( '$ADA_HANDLE_URLS', - `${process.env.ADA_HANDLE_URL_MAINNET} ${process.env.ADA_HANDLE_URL_PREPROD} ${process.env.ADA_HANDLE_URL_PREVIEW}` + `${process.env.ADA_HANDLE_URL_MAINNET} ${process.env.ADA_HANDLE_URL_PREPROD} ${process.env.ADA_HANDLE_URL_PREVIEW} ${process.env.ADA_HANDLE_URL_SANCHONET}` ) .replace('$LOCALHOST_DEFAULT_SRC', mode === 'development' ? 'http://localhost:3000' : '') .replace('$LOCALHOST_SCRIPT_SRC', mode === 'development' ? 'http://localhost:3000' : '') diff --git a/packages/cardano/package.json b/packages/cardano/package.json index 4eb71a42a0..a9a568c0e1 100644 --- a/packages/cardano/package.json +++ b/packages/cardano/package.json @@ -39,14 +39,15 @@ "watch": "yarn build --watch" }, "dependencies": { - "@cardano-sdk/cardano-services-client": "0.12.2", - "@cardano-sdk/core": "0.19.1", - "@cardano-sdk/crypto": "0.1.13", - "@cardano-sdk/hardware-ledger": "0.3.3", - "@cardano-sdk/key-management": "0.10.2", - "@cardano-sdk/util": "0.14.0", - "@cardano-sdk/wallet": "0.21.1", - "@cardano-sdk/web-extension": "0.14.6", + "@cardano-sdk/cardano-services-client": "0.14.2", + "@cardano-sdk/core": "0.21.0", + "@cardano-sdk/crypto": "0.1.15", + "@cardano-sdk/hardware-ledger": "0.5.0", + "@cardano-sdk/key-management": "0.13.0", + "@cardano-sdk/util": "0.14.2", + "@cardano-sdk/wallet": "0.24.0", + "@cardano-sdk/web-extension": "0.16.1", + "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1", "@lace/common": "0.1.0", "@stablelib/chacha20poly1305": "1.0.1", "bignumber.js": "9.0.1", @@ -66,8 +67,8 @@ "webextension-polyfill": "0.8.0" }, "devDependencies": { - "@cardano-sdk/util-dev": "0.15.1", - "@dcspark/cardano-multiplatform-lib-browser": "^3.1.1", + "@cardano-sdk/util-dev": "0.17.1", + "@dcspark/cardano-multiplatform-lib-nodejs": "^3.1.1", "@emurgo/cardano-message-signing-browser": "1.0.1", "rollup-plugin-polyfill-node": "^0.8.0", "typescript": "^4.3.5" diff --git a/packages/cardano/src/wallet/lib/cardano-wallet.ts b/packages/cardano/src/wallet/lib/cardano-wallet.ts index d941ece82d..f4f21d8b1f 100644 --- a/packages/cardano/src/wallet/lib/cardano-wallet.ts +++ b/packages/cardano/src/wallet/lib/cardano-wallet.ts @@ -8,8 +8,7 @@ import { StakePoolProvider, TxSubmitProvider, util as coreUtil, - UtxoProvider, - CML + UtxoProvider } from '@cardano-sdk/core'; import { setupWallet, @@ -24,6 +23,8 @@ import { WalletManagerActivateProps, WalletManagerUi } from '@cardano-sdk/web-ex import { ChainName, WalletManagerProviderTypes } from '../types'; import * as Crypto from '@cardano-sdk/crypto'; import { createWalletUtil } from '@cardano-sdk/wallet'; +// Using nodejs to satisfy the tests requirements, but this gets replaced by webpack to the browser version in the build +import * as CML from '@dcspark/cardano-multiplatform-lib-nodejs'; export type KeyAgentsByChain = Record; diff --git a/packages/cardano/src/wallet/lib/hardware-wallet.ts b/packages/cardano/src/wallet/lib/hardware-wallet.ts index e1aa070c7e..8ba3d533a3 100644 --- a/packages/cardano/src/wallet/lib/hardware-wallet.ts +++ b/packages/cardano/src/wallet/lib/hardware-wallet.ts @@ -1,5 +1,7 @@ /* eslint-disable unicorn/no-null */ -import { Cardano, CML } from '@cardano-sdk/core'; +import { Cardano } from '@cardano-sdk/core'; +// Using nodejs CML version to satisfy the tests requirements, but this gets replaced by webpack to the browser version in the build +import * as CML from '@dcspark/cardano-multiplatform-lib-nodejs'; import { ObservableWallet, setupWallet, SetupWalletProps } from '@cardano-sdk/wallet'; import * as KeyManagement from '../../../../../node_modules/@cardano-sdk/key-management/dist/cjs'; import { ChainName, DeviceConnection, CreateHardwareWalletArgs, HardwareWallets } from '../types'; @@ -109,6 +111,7 @@ const createWithTrezorDeviceConnection = async ( return new KeyManagement.TrezorKeyAgent( { + __typename: KeyManagement.KeyAgentType.Trezor, accountIndex, chainId, extendedAccountPublicKey: publicKey, diff --git a/packages/cardano/src/wallet/lib/providers.ts b/packages/cardano/src/wallet/lib/providers.ts index 55cbc3bb14..78f212f3e5 100644 --- a/packages/cardano/src/wallet/lib/providers.ts +++ b/packages/cardano/src/wallet/lib/providers.ts @@ -4,6 +4,7 @@ import { AssetProvider, ChainHistoryProvider, NetworkInfoProvider, + Provider, RewardsProvider, StakePoolProvider, TxSubmitProvider, @@ -11,6 +12,7 @@ import { } from '@cardano-sdk/core'; import { + CreateHttpProviderConfig, assetInfoHttpProvider, chainHistoryHttpProvider, networkInfoHttpProvider, @@ -32,25 +34,23 @@ export type AllProviders = { export interface ProvidersConfig { axiosAdapter?: AxiosAdapter; - httpProviders: Partial>; + baseUrl: string; } -export const createProviders = ({ axiosAdapter, httpProviders }: ProvidersConfig): WalletProvidersDependencies => { - const httpProviderConfig = (baseUrl: string) => ({ +export const createProviders = ({ axiosAdapter, baseUrl }: ProvidersConfig): WalletProvidersDependencies => { + const httpProviderConfig: CreateHttpProviderConfig = { baseUrl, logger: console, - adapter: axiosAdapter, - // See openApi.json in @cardano-sdk/cardano-services - version: { software: '3.0.0', api: '1.0.0' } - }); + adapter: axiosAdapter + }; return { - assetProvider: assetInfoHttpProvider(httpProviderConfig(httpProviders.assetProvider)), - networkInfoProvider: networkInfoHttpProvider(httpProviderConfig(httpProviders.networkInfoProvider)), - txSubmitProvider: txSubmitHttpProvider(httpProviderConfig(httpProviders.txSubmitProvider)), - stakePoolProvider: stakePoolHttpProvider(httpProviderConfig(httpProviders.stakePoolProvider)), - utxoProvider: utxoHttpProvider(httpProviderConfig(httpProviders.utxoProvider)), - chainHistoryProvider: chainHistoryHttpProvider(httpProviderConfig(httpProviders.chainHistoryProvider)), - rewardsProvider: rewardsHttpProvider(httpProviderConfig(httpProviders.rewardsProvider)) + assetProvider: assetInfoHttpProvider(httpProviderConfig), + networkInfoProvider: networkInfoHttpProvider(httpProviderConfig), + txSubmitProvider: txSubmitHttpProvider(httpProviderConfig), + stakePoolProvider: stakePoolHttpProvider(httpProviderConfig), + utxoProvider: utxoHttpProvider(httpProviderConfig), + chainHistoryProvider: chainHistoryHttpProvider(httpProviderConfig), + rewardsProvider: rewardsHttpProvider(httpProviderConfig) }; }; diff --git a/packages/cardano/src/wallet/test/mocks/AssetsProviderStub.ts b/packages/cardano/src/wallet/test/mocks/AssetsProviderStub.ts index d011a749e7..e3c3f44bb0 100644 --- a/packages/cardano/src/wallet/test/mocks/AssetsProviderStub.ts +++ b/packages/cardano/src/wallet/test/mocks/AssetsProviderStub.ts @@ -3,19 +3,8 @@ import { Cardano, AssetProvider, Asset } from '@cardano-sdk/core'; export const mockedAssets: Asset.AssetInfo[] = [ { - mintOrBurnCount: 0, assetId: Cardano.AssetId('b0d07d45fe9514f80213f4020e5a61241458be626841cde717cb38a76e7574636f696e'), fingerprint: Cardano.AssetFingerprint('asset1pkpwyknlvul7az0xx8czhl60pyel45rpje4z8w'), - history: [ - { - quantity: BigInt('13000'), - transactionId: Cardano.TransactionId('4123d70f66414cc921f6ffc29a899aafc7137a99a0fd453d6b200863ef5702d6') - }, - { - quantity: BigInt('-1000'), - transactionId: Cardano.TransactionId('6804edf9712d2b619edb6ac86861fe93a730693183a262b165fcc1ba1bc99cad') - } - ], tokenMetadata: { assetId: Cardano.AssetId('b0d07d45fe9514f80213f4020e5a61241458be626841cde717cb38a76e7574636f696e'), decimals: 6, diff --git a/packages/cardano/src/wallet/test/mocks/TestKeyAgent.ts b/packages/cardano/src/wallet/test/mocks/TestKeyAgent.ts index cd6cb4c0e5..25f22e8998 100644 --- a/packages/cardano/src/wallet/test/mocks/TestKeyAgent.ts +++ b/packages/cardano/src/wallet/test/mocks/TestKeyAgent.ts @@ -1,6 +1,8 @@ -import { Cardano, CML } from '@cardano-sdk/core'; +import { Cardano } from '@cardano-sdk/core'; import * as KeyManagement from '../../../../../../node_modules/@cardano-sdk/key-management/dist/cjs'; import * as Crypto from '@cardano-sdk/crypto'; +import * as CML from '@dcspark/cardano-multiplatform-lib-nodejs'; + interface TestKeyAgentProps { password?: string; mnemonicWords?: string[]; diff --git a/packages/common/package.json b/packages/common/package.json index 4a94a5fc35..e8e8508be5 100644 --- a/packages/common/package.json +++ b/packages/common/package.json @@ -38,7 +38,7 @@ "watch": "yarn build --watch" }, "dependencies": { - "@cardano-sdk/util": "0.14.0", + "@cardano-sdk/util": "0.14.2", "antd": "^4.24.10", "classnames": "^2.3.1", "jdenticon": "3.1.0", diff --git a/packages/staking/package.json b/packages/staking/package.json index e4821df3af..33d81cb969 100644 --- a/packages/staking/package.json +++ b/packages/staking/package.json @@ -64,9 +64,9 @@ "zustand": "^4.4.1" }, "devDependencies": { - "@cardano-sdk/input-selection": "0.11.9", - "@cardano-sdk/tx-construction": "0.11.2", - "@cardano-sdk/util": "0.14.0", + "@cardano-sdk/input-selection": "0.12.2", + "@cardano-sdk/tx-construction": "0.14.0", + "@cardano-sdk/util": "0.14.2", "@lace/cardano": "^0.1.0", "@lace/common": "^0.1.0", "@lace/core": "0.1.0", @@ -97,10 +97,10 @@ "wait-on": "^7.0.1" }, "peerDependencies": { - "@cardano-sdk/input-selection": "0.11.9", - "@cardano-sdk/tx-construction": "0.11.1", - "@cardano-sdk/util": "0.14.0", - "@cardano-sdk/wallet": "0.21.0", + "@cardano-sdk/input-selection": "0.12.2", + "@cardano-sdk/tx-construction": "0.14.0", + "@cardano-sdk/util": "0.14.2", + "@cardano-sdk/wallet": "0.24.0", "@lace/cardano": "^0.1.0", "@lace/common": "^0.1.0", "@lace/core": "0.1.0", diff --git a/yarn.lock b/yarn.lock index 22e74204be..9364445cfd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5390,78 +5390,28 @@ __metadata: languageName: node linkType: hard -"@cardano-sdk/cardano-services-client@npm:0.12.2": - version: 0.12.2 - resolution: "@cardano-sdk/cardano-services-client@npm:0.12.2" +"@cardano-sdk/cardano-services-client@npm:0.14.2": + version: 0.14.2 + resolution: "@cardano-sdk/cardano-services-client@npm:0.14.2" dependencies: - "@cardano-sdk/core": ~0.19.0 - "@cardano-sdk/util": ~0.14.0 + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/util": ~0.14.2 axios: ^0.27.2 class-validator: ^0.14.0 json-bigint: ~1.0.0 ts-log: ^2.2.4 - checksum: 4e8de001aee127f4b931234aa94adb03d91605df10034566a1ab60017f00ff935ab697c736fee07476dc2232a561a0848e01f6ba982cf13af08e3358a843b312 - languageName: node - linkType: hard - -"@cardano-sdk/core@npm:0.19.1, @cardano-sdk/core@npm:~0.19.1": - version: 0.19.1 - resolution: "@cardano-sdk/core@npm:0.19.1" - dependencies: - "@cardano-ogmios/client": 5.6.0 - "@cardano-ogmios/schema": 5.6.0 - "@cardano-sdk/crypto": ~0.1.13 - "@cardano-sdk/util": ~0.14.0 - "@dcspark/cardano-multiplatform-lib-nodejs": ^3.1.1 - "@foxglove/crc": ^0.0.3 - "@scure/base": ^1.1.1 - fraction.js: 4.0.1 - ip-address: ^8.1.0 - lodash: ^4.17.21 - ts-custom-error: ^3.2.0 - ts-log: ^2.2.4 - peerDependencies: - rxjs: ^7.4.0 - peerDependenciesMeta: - rxjs: - optional: true - checksum: 55a00357fbb16513d5e8651b8008bf32a23a976a0228daa0bd905f48b5c0571eed76848ae3899ae2c97381fca25471231f5015387d21d3d32d848a9a4e5bbcba + checksum: 88f62b51bea9514e708ae1f4ee58572781831b3708e2e7e624eb019edff9cf7cdce40707b7f7804090b982ee59d58c8354b19111da4635da8d808fb69c2740ad languageName: node linkType: hard -"@cardano-sdk/core@npm:~0.18.0": - version: 0.18.0 - resolution: "@cardano-sdk/core@npm:0.18.0" - dependencies: - "@cardano-ogmios/client": 5.6.0 - "@cardano-ogmios/schema": 5.6.0 - "@cardano-sdk/crypto": ~0.1.12 - "@cardano-sdk/util": ~0.14.0 - "@dcspark/cardano-multiplatform-lib-nodejs": ^3.1.1 - "@foxglove/crc": ^0.0.3 - "@scure/base": ^1.1.1 - ip-address: ^8.1.0 - lodash: ^4.17.21 - ts-custom-error: ^3.2.0 - ts-log: ^2.2.4 - peerDependencies: - rxjs: ^7.4.0 - peerDependenciesMeta: - rxjs: - optional: true - checksum: f1fc5c072220db97a6407b908a57c6012035602b29034007a3d526de44628a4eb61ce0c5c8d0c7584f42bc3237d8fd1c2e3c5919266f1ff781f4731478355104 - languageName: node - linkType: hard - -"@cardano-sdk/core@npm:~0.19.0": - version: 0.19.0 - resolution: "@cardano-sdk/core@npm:0.19.0" +"@cardano-sdk/core@npm:0.21.0, @cardano-sdk/core@npm:~0.21.0": + version: 0.21.0 + resolution: "@cardano-sdk/core@npm:0.21.0" dependencies: "@cardano-ogmios/client": 5.6.0 "@cardano-ogmios/schema": 5.6.0 - "@cardano-sdk/crypto": ~0.1.12 - "@cardano-sdk/util": ~0.14.0 - "@dcspark/cardano-multiplatform-lib-nodejs": ^3.1.1 + "@cardano-sdk/crypto": ~0.1.15 + "@cardano-sdk/util": ~0.14.2 "@foxglove/crc": ^0.0.3 "@scure/base": ^1.1.1 fraction.js: 4.0.1 @@ -5469,49 +5419,21 @@ __metadata: lodash: ^4.17.21 ts-custom-error: ^3.2.0 ts-log: ^2.2.4 + web-encoding: ^1.1.5 peerDependencies: rxjs: ^7.4.0 peerDependenciesMeta: rxjs: optional: true - checksum: 92d7ceb3c2a070ede6985cf5bc9dbd48a7603d6bc260e4b78046bbabf468b392d182c0502ee2b68930dfd39573d3499c0085226c80109b09bd7720c667c30539 - languageName: node - linkType: hard - -"@cardano-sdk/crypto@npm:0.1.13, @cardano-sdk/crypto@npm:~0.1.13": - version: 0.1.13 - resolution: "@cardano-sdk/crypto@npm:0.1.13" - dependencies: - "@cardano-sdk/util": ~0.14.0 - blake2b: ^2.1.4 - bn.js: ^5.2.1 - i: ^0.3.7 - libsodium-wrappers-sumo: ^0.7.5 - lodash: ^4.17.21 - npm: ^9.3.0 - pbkdf2: ^3.1.2 - ts-custom-error: ^3.2.0 - ts-log: ^2.2.4 - peerDependencies: - "@dcspark/cardano-multiplatform-lib-asmjs": ^3.1.1 - "@dcspark/cardano-multiplatform-lib-browser": ^3.1.1 - "@dcspark/cardano-multiplatform-lib-nodejs": ^3.1.1 - peerDependenciesMeta: - "@dcspark/cardano-multiplatform-lib-asmjs": - optional: true - "@dcspark/cardano-multiplatform-lib-browser": - optional: true - "@dcspark/cardano-multiplatform-lib-nodejs": - optional: true - checksum: 771cbfd7fd30cf96227baa7eccc5e7fcd297d6c8d45824198e9f3646337a22bcfdca89f7c71478ec7abd67e61d2391827c83964a67366dffa3d56b99d21e34a2 + checksum: 5228b248d511158e3aa02fc6468ee66906194e1aa38d53abc78800d7d6914e0d3d0af47e086786fb6e1e4d5115f94b23ab16d88019f62559cee98b17e4985ef7 languageName: node linkType: hard -"@cardano-sdk/crypto@npm:~0.1.12": - version: 0.1.12 - resolution: "@cardano-sdk/crypto@npm:0.1.12" +"@cardano-sdk/crypto@npm:0.1.15, @cardano-sdk/crypto@npm:~0.1.15": + version: 0.1.15 + resolution: "@cardano-sdk/crypto@npm:0.1.15" dependencies: - "@cardano-sdk/util": ~0.14.0 + "@cardano-sdk/util": ~0.14.2 blake2b: ^2.1.4 bn.js: ^5.2.1 i: ^0.3.7 @@ -5532,120 +5454,66 @@ __metadata: optional: true "@dcspark/cardano-multiplatform-lib-nodejs": optional: true - checksum: da063060c0d5cb4fd6ee14267102d3e5755137dbb3dcc5c4a76ec3d348fd9aeab736c0250779d591e5724ca93c15d608ad20f596d0e36e70fa26966f3068e381 + checksum: fe446eca9df9293424909d67a0408c3c780a46a77cf1bf7d762b252ce1d5c3b3f5611b54e198bb3cfa2713d18e9eded7578664056a3a58f1c6a3b8a5caae54a3 languageName: node linkType: hard -"@cardano-sdk/dapp-connector@npm:0.9.15, @cardano-sdk/dapp-connector@npm:~0.9.15": - version: 0.9.15 - resolution: "@cardano-sdk/dapp-connector@npm:0.9.15" - dependencies: - "@cardano-sdk/core": ~0.19.0 - "@cardano-sdk/crypto": ~0.1.12 - "@cardano-sdk/util": ~0.14.0 - lodash: ^4.17.21 - ts-custom-error: ^3.2.0 - ts-log: ^2.2.4 - webextension-polyfill: ^0.8.0 - checksum: de6a700e81ab29feafd602e7b5677fc2de82cb50f56637d20d075febe2fad32509b06099f617d115ea71b1f371807236b6221edd13284eaece7d6d37241d4b36 - languageName: node - linkType: hard - -"@cardano-sdk/dapp-connector@npm:~0.9.16": - version: 0.9.16 - resolution: "@cardano-sdk/dapp-connector@npm:0.9.16" +"@cardano-sdk/dapp-connector@npm:0.11.1, @cardano-sdk/dapp-connector@npm:~0.11.1": + version: 0.11.1 + resolution: "@cardano-sdk/dapp-connector@npm:0.11.1" dependencies: - "@cardano-sdk/core": ~0.19.1 - "@cardano-sdk/crypto": ~0.1.13 - "@cardano-sdk/util": ~0.14.0 - lodash: ^4.17.21 + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/crypto": ~0.1.15 + "@cardano-sdk/util": ~0.14.2 ts-custom-error: ^3.2.0 ts-log: ^2.2.4 webextension-polyfill: ^0.8.0 - checksum: 16d6cf6b631091ed2a0c9076e4861e3b4fa0757d8523249004add6e796cbf8c8f779a4613e3b566b3004aed6c2ad55b8987dc2fefe2adc614f1a36be43f9cb83 + checksum: 5ba41923642f85771a72c452fec5c3c602cad11ac1869dbf29172aae132d7584718b0c7c47f7996261744f5829529e0187fac3a48397c0931efd5d09bfe6e1ef languageName: node linkType: hard -"@cardano-sdk/hardware-ledger@npm:0.3.3, @cardano-sdk/hardware-ledger@npm:~0.3.3": - version: 0.3.3 - resolution: "@cardano-sdk/hardware-ledger@npm:0.3.3" +"@cardano-sdk/hardware-ledger@npm:0.5.0, @cardano-sdk/hardware-ledger@npm:~0.5.0": + version: 0.5.0 + resolution: "@cardano-sdk/hardware-ledger@npm:0.5.0" dependencies: "@cardano-foundation/ledgerjs-hw-app-cardano": ^6.0.0 - "@cardano-sdk/core": ~0.19.0 - "@cardano-sdk/crypto": ~0.1.12 - "@cardano-sdk/key-management": ~0.10.2 - "@cardano-sdk/tx-construction": ~0.11.2 - "@cardano-sdk/util": ~0.14.0 + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/crypto": ~0.1.15 + "@cardano-sdk/key-management": ~0.13.0 + "@cardano-sdk/tx-construction": ~0.14.0 + "@cardano-sdk/util": ~0.14.2 "@ledgerhq/hw-transport": ^6.28.1 "@ledgerhq/hw-transport-node-hid-noevents": ^6.27.12 "@ledgerhq/hw-transport-webhid": ^6.27.12 ts-custom-error: ^3.2.0 ts-log: ^2.2.4 - checksum: 16ab00ba790b552d1385450808ea26b8f3c580d01f83c7ef60bbffef7ebb05aaa0e78113c4f2a6924f701da99803fd518ea6ceb571930fc8269df743e4bd573d + checksum: c90669af9de1ba0dec5e2efef814e8519fdeb4449f67a57840755d49a8952bf7bb6e66695f3a01427f525dc509bdc122fb2d965fe1ff84e0d5220440d23a236b languageName: node linkType: hard -"@cardano-sdk/input-selection@npm:0.11.9": - version: 0.11.9 - resolution: "@cardano-sdk/input-selection@npm:0.11.9" - dependencies: - "@cardano-sdk/core": ~0.19.1 - "@cardano-sdk/key-management": ~0.10.3 - "@cardano-sdk/util": ~0.14.0 - bignumber.js: ^9.1.1 - lodash: ^4.17.21 - ts-custom-error: ^3.2.0 - checksum: 80a538a3e8177544eec77cddd80ea7e92ea35349a61f5720ae9facfccaa37b2155a5c9a6a2c10854d906cc4e28a05ea0bccc2d850e41d78fc40fb73720381a7d - languageName: node - linkType: hard - -"@cardano-sdk/input-selection@npm:~0.11.8": - version: 0.11.8 - resolution: "@cardano-sdk/input-selection@npm:0.11.8" +"@cardano-sdk/input-selection@npm:0.12.2, @cardano-sdk/input-selection@npm:~0.12.2": + version: 0.12.2 + resolution: "@cardano-sdk/input-selection@npm:0.12.2" dependencies: - "@cardano-sdk/core": ~0.19.0 - "@cardano-sdk/key-management": ~0.10.2 - "@cardano-sdk/util": ~0.14.0 + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/key-management": ~0.13.0 + "@cardano-sdk/util": ~0.14.2 bignumber.js: ^9.1.1 lodash: ^4.17.21 ts-custom-error: ^3.2.0 - checksum: 0fc581e3838a95e949f32ea0d806e1f82d222ed84231aa7fc64989395d9a5c41eec433e3a2a56c6e53ed4c78e0adf70501b89f8800de8c95db56a2c1f43c1cda - languageName: node - linkType: hard - -"@cardano-sdk/key-management@npm:0.10.2, @cardano-sdk/key-management@npm:~0.10.2": - version: 0.10.2 - resolution: "@cardano-sdk/key-management@npm:0.10.2" - dependencies: - "@cardano-foundation/ledgerjs-hw-app-cardano": ^6.0.0 - "@cardano-sdk/core": ~0.19.0 - "@cardano-sdk/crypto": ~0.1.12 - "@cardano-sdk/dapp-connector": ~0.9.15 - "@cardano-sdk/util": ~0.14.0 - "@emurgo/cardano-message-signing-nodejs": ^1.0.1 - "@trezor/connect": 9.0.11 - "@trezor/connect-web": 9.0.11 - bip39: ^3.0.4 - chacha: ^2.1.0 - get-random-values: ^2.0.0 - lodash: ^4.17.21 - pbkdf2: ^3.1.2 - rxjs: ^7.4.0 - ts-custom-error: ^3.2.0 - ts-log: ^2.2.4 - checksum: 969d03792d2865bace3dd2dedd8baf2df060ffb747eed49c438f1e0eda8b96acb0813f05af6f1db7fe175109acde5bc14706bb5023f6d8dd20e2d433d01f8569 + checksum: 9f591c28cfdd804499cee461433108c86455f8e8c56b3dd368ec3f02a079742c8c0d8023baf68fc0784e6959bcaef119dab7800303e14e63c4c559b706edab6d languageName: node linkType: hard -"@cardano-sdk/key-management@npm:~0.10.3": - version: 0.10.3 - resolution: "@cardano-sdk/key-management@npm:0.10.3" +"@cardano-sdk/key-management@npm:0.13.0, @cardano-sdk/key-management@npm:~0.13.0": + version: 0.13.0 + resolution: "@cardano-sdk/key-management@npm:0.13.0" dependencies: "@cardano-foundation/ledgerjs-hw-app-cardano": ^6.0.0 - "@cardano-sdk/core": ~0.19.1 - "@cardano-sdk/crypto": ~0.1.13 - "@cardano-sdk/dapp-connector": ~0.9.16 - "@cardano-sdk/util": ~0.14.0 + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/crypto": ~0.1.15 + "@cardano-sdk/dapp-connector": ~0.11.1 + "@cardano-sdk/util": ~0.14.2 "@emurgo/cardano-message-signing-nodejs": ^1.0.1 "@trezor/connect": 9.0.11 "@trezor/connect-web": 9.0.11 @@ -5657,35 +5525,37 @@ __metadata: rxjs: ^7.4.0 ts-custom-error: ^3.2.0 ts-log: ^2.2.4 - checksum: 4db4003d249be16fba0a5da5099250fd387386d7e89b1f4797314e8fe2375ec23f46ae87f877e27748d30f35467a7fc1802d7d4abe52ba6f89bb1f8e8a5f7fe2 + checksum: debcabb323027ec64f7820d5b71dc3d320b6863bacaffa0bce03c7028eb251a53e7e8fdd81a493e599b31b63c811e318c52e456cb31b3b242669624b83421dfb languageName: node linkType: hard -"@cardano-sdk/tx-construction@npm:0.11.2, @cardano-sdk/tx-construction@npm:~0.11.2": - version: 0.11.2 - resolution: "@cardano-sdk/tx-construction@npm:0.11.2" - dependencies: - "@cardano-sdk/core": ~0.19.0 - "@cardano-sdk/crypto": ~0.1.12 - "@cardano-sdk/input-selection": ~0.11.8 - "@cardano-sdk/key-management": ~0.10.2 - "@cardano-sdk/util": ~0.14.0 - "@cardano-sdk/util-rxjs": ~0.5.9 +"@cardano-sdk/tx-construction@npm:0.14.0, @cardano-sdk/tx-construction@npm:~0.14.0": + version: 0.14.0 + resolution: "@cardano-sdk/tx-construction@npm:0.14.0" + dependencies: + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/crypto": ~0.1.15 + "@cardano-sdk/input-selection": ~0.12.2 + "@cardano-sdk/key-management": ~0.13.0 + "@cardano-sdk/util": ~0.14.2 + "@cardano-sdk/util-rxjs": ~0.5.13 lodash: ^4.17.21 npm: ^9.3.0 rxjs: ^7.4.0 ts-custom-error: ^3.2.0 ts-log: ^2.2.4 - checksum: f32d2ffa054b133805888ce52e80210fe9ec366b20983723a2da4a26c2f662437a8b73c49e6a4e52ee58962b61f9629943c5f9ab5eb224568b3800c2359b74c8 + checksum: da8a552cf9f40901ca30c863d98f9c3299303245901f6a8c5519d90d5135b4921751d08bdea88ee8cc5b01d1873b651d2f990574a2681f98bd055957603c841a languageName: node linkType: hard -"@cardano-sdk/util-dev@npm:0.15.1": - version: 0.15.1 - resolution: "@cardano-sdk/util-dev@npm:0.15.1" +"@cardano-sdk/util-dev@npm:0.17.1": + version: 0.17.1 + resolution: "@cardano-sdk/util-dev@npm:0.17.1" dependencies: - "@cardano-sdk/core": ~0.18.0 - "@cardano-sdk/util": ~0.14.0 + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/crypto": ~0.1.15 + "@cardano-sdk/key-management": ~0.13.0 + "@cardano-sdk/util": ~0.14.2 "@types/dockerode": ^3.3.8 axios: ^0.27.2 delay: ^5.0.0 @@ -5697,24 +5567,24 @@ __metadata: lodash: ^4.17.21 rxjs: ^7.4.0 ts-log: ^2.2.4 - checksum: 4bcd677d19634cfeeffba2513522c3bbde5940c9bc190abab16583f053f86632d22171ee821bffa909b4eb365aa8113158060e26a7e39004538db959dcceabc7 + checksum: 55ae2d5d67bfc08d05d71bca21025f318ff57d8d1d4c056edc3add18f76d5d3cbf2c7b9d6b2bce8358feffff9a238bb9ee867270112ac01684eb251238f89d10 languageName: node linkType: hard -"@cardano-sdk/util-rxjs@npm:~0.5.9": - version: 0.5.9 - resolution: "@cardano-sdk/util-rxjs@npm:0.5.9" +"@cardano-sdk/util-rxjs@npm:~0.5.13": + version: 0.5.13 + resolution: "@cardano-sdk/util-rxjs@npm:0.5.13" dependencies: - "@cardano-sdk/util": ~0.14.0 + "@cardano-sdk/util": ~0.14.2 backoff-rxjs: ^7.0.0 rxjs: ^7.4.0 - checksum: b1ce96c26c19b8b6a386d8e3e077b8c6298a34224465f7503cf97e601d45ac2f5094e44d21d9e26a2f4411125d9d55bc05111884d64bb83fcef88eb09cb8ba8b + checksum: dd1de80dde850b81bf35eee8ed9d21334ce63847058e72b39dfa8deb758d7c2228034bb3eae84d2bd2152a6b636a5f88fc94dbd9b86f68c0241b00e8846e3bec languageName: node linkType: hard -"@cardano-sdk/util@npm:0.14.0, @cardano-sdk/util@npm:~0.14.0": - version: 0.14.0 - resolution: "@cardano-sdk/util@npm:0.14.0" +"@cardano-sdk/util@npm:0.14.2, @cardano-sdk/util@npm:~0.14.2": + version: 0.14.2 + resolution: "@cardano-sdk/util@npm:0.14.2" dependencies: bech32: ^2.0.0 lodash: ^4.17.21 @@ -5722,23 +5592,23 @@ __metadata: ts-custom-error: ^3.2.0 ts-log: ^2.2.4 type-fest: ^2.19.0 - checksum: 4527b982294a406a1c58253dbe701808fd825dca4b35152161748086546b7c35df21e409c43ab839cc6ec235d08c908b7ebcf5c2ac74431d0e23c73838e578aa + checksum: 4c95f512c3997eb6effdea7d6e15a0128822b8cec51769c1cc85690c61640a9d077ec874c705f75331ce09e8eef285147b20785d489706da295ad67d64cd543b languageName: node linkType: hard -"@cardano-sdk/wallet@npm:0.21.1, @cardano-sdk/wallet@npm:~0.21.1": - version: 0.21.1 - resolution: "@cardano-sdk/wallet@npm:0.21.1" +"@cardano-sdk/wallet@npm:0.24.0, @cardano-sdk/wallet@npm:~0.24.0": + version: 0.24.0 + resolution: "@cardano-sdk/wallet@npm:0.24.0" dependencies: - "@cardano-sdk/core": ~0.19.0 - "@cardano-sdk/crypto": ~0.1.12 - "@cardano-sdk/dapp-connector": ~0.9.15 - "@cardano-sdk/hardware-ledger": ~0.3.3 - "@cardano-sdk/input-selection": ~0.11.8 - "@cardano-sdk/key-management": ~0.10.2 - "@cardano-sdk/tx-construction": ~0.11.2 - "@cardano-sdk/util": ~0.14.0 - "@cardano-sdk/util-rxjs": ~0.5.9 + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/crypto": ~0.1.15 + "@cardano-sdk/dapp-connector": ~0.11.1 + "@cardano-sdk/hardware-ledger": ~0.5.0 + "@cardano-sdk/input-selection": ~0.12.2 + "@cardano-sdk/key-management": ~0.13.0 + "@cardano-sdk/tx-construction": ~0.14.0 + "@cardano-sdk/util": ~0.14.2 + "@cardano-sdk/util-rxjs": ~0.5.13 backoff-rxjs: ^7.0.0 bignumber.js: ^9.1.1 delay: ^5.0.0 @@ -5748,22 +5618,22 @@ __metadata: rxjs: ^7.4.0 ts-custom-error: ^3.2.0 ts-log: ^2.2.3 - checksum: df6ab2291d72a482bc75bbaafc1c2d81fa14eb88b1d1b976ff5163c67f42369a7f7f0cd7088cbdad197e6789844f514a73c8b5e73225a9ed023439f3765e231c + checksum: c7a17024104f1eff62d14ae7d2edca0988cb50c9d3ce9b835b0abb37fedf0b533416dbeec5e24a103360261b1d77efee4a67f51f5ac8e2768dc3980efd491363 languageName: node linkType: hard -"@cardano-sdk/web-extension@npm:0.14.6": - version: 0.14.6 - resolution: "@cardano-sdk/web-extension@npm:0.14.6" - dependencies: - "@cardano-sdk/core": ~0.19.0 - "@cardano-sdk/crypto": ~0.1.12 - "@cardano-sdk/dapp-connector": ~0.9.15 - "@cardano-sdk/key-management": ~0.10.2 - "@cardano-sdk/tx-construction": ~0.11.2 - "@cardano-sdk/util": ~0.14.0 - "@cardano-sdk/util-rxjs": ~0.5.9 - "@cardano-sdk/wallet": ~0.21.1 +"@cardano-sdk/web-extension@npm:0.16.1": + version: 0.16.1 + resolution: "@cardano-sdk/web-extension@npm:0.16.1" + dependencies: + "@cardano-sdk/core": ~0.21.0 + "@cardano-sdk/crypto": ~0.1.15 + "@cardano-sdk/dapp-connector": ~0.11.1 + "@cardano-sdk/key-management": ~0.13.0 + "@cardano-sdk/tx-construction": ~0.14.0 + "@cardano-sdk/util": ~0.14.2 + "@cardano-sdk/util-rxjs": ~0.5.13 + "@cardano-sdk/wallet": ~0.24.0 backoff-rxjs: ^7.0.0 lodash: ^4.17.21 rxjs: ^7.4.0 @@ -5771,7 +5641,7 @@ __metadata: ts-log: ^2.2.3 uuid: ^8.3.2 webextension-polyfill: ^0.8.0 - checksum: 0a63669bd8859db4c3577578c8b76cb42d5ee9c2810bc08e30208f9d80200c025f92e4ab4d556ee561c7d4695ff3c898430a7dfad05ec6762f5bdc9c47d50ed1 + checksum: c2cc227f0ca7ea3046dca757f9b51cd13c06ef87205cea269dfdff8f1a63444ecd3900fa1ac3757e77a649d2037803a8db78cd668b351256e046982494d08a9d languageName: node linkType: hard @@ -6237,16 +6107,16 @@ __metadata: linkType: hard "@dcspark/cardano-multiplatform-lib-browser@npm:^3.1.1": - version: 3.1.1 - resolution: "@dcspark/cardano-multiplatform-lib-browser@npm:3.1.1" - checksum: 7814fa59b9f350fa7d1fd43fea00fb060d5176a588beea4b92d8af662d81ee73c9c21352775d06335757799aa0f24588100fc6711ba48aae09969b7e83faa217 + version: 3.1.2 + resolution: "@dcspark/cardano-multiplatform-lib-browser@npm:3.1.2" + checksum: 60124ad62a87a6530af020a1eae09ce84ee87a0ce7c3401dc39987969e145c9bb41f036af2809d8bcd7515f0452aa8cb6bd7beb519804221cf583d16f45bf954 languageName: node linkType: hard "@dcspark/cardano-multiplatform-lib-nodejs@npm:^3.1.1": - version: 3.1.1 - resolution: "@dcspark/cardano-multiplatform-lib-nodejs@npm:3.1.1" - checksum: e408d338fe199a29f0901364b77d284cc9455c0adc9041aadd8932b068a929040fda823a07eb80e5ca0df1396f148295cea3ea089de75339649141b23bdc00e3 + version: 3.1.2 + resolution: "@dcspark/cardano-multiplatform-lib-nodejs@npm:3.1.2" + checksum: b9afbe180758b8b564b2413b052d03f5225884d2425c23a33c8a65275c0a22de80f5a3e9ddda52a8e6a18072f7f898b5575aab70295e5216c3d3ae5e4c2daab0 languageName: node linkType: hard @@ -7934,14 +7804,14 @@ __metadata: resolution: "@lace/browser-extension-wallet@workspace:apps/browser-extension-wallet" dependencies: "@ant-design/icons": ^4.7.0 - "@cardano-sdk/cardano-services-client": 0.12.2 - "@cardano-sdk/core": 0.19.1 - "@cardano-sdk/dapp-connector": 0.9.15 - "@cardano-sdk/input-selection": 0.11.9 - "@cardano-sdk/tx-construction": 0.11.2 - "@cardano-sdk/util": 0.14.0 - "@cardano-sdk/wallet": 0.21.1 - "@cardano-sdk/web-extension": 0.14.6 + "@cardano-sdk/cardano-services-client": 0.14.2 + "@cardano-sdk/core": 0.21.0 + "@cardano-sdk/dapp-connector": 0.11.1 + "@cardano-sdk/input-selection": 0.12.2 + "@cardano-sdk/tx-construction": 0.14.0 + "@cardano-sdk/util": 0.14.2 + "@cardano-sdk/wallet": 0.24.0 + "@cardano-sdk/web-extension": 0.16.1 "@dcspark/cardano-multiplatform-lib-asmjs": ^3.1.0 "@emurgo/cardano-message-signing-asmjs": 1.0.1 "@emurgo/cip14-js": ~3.0.1 @@ -8005,16 +7875,17 @@ __metadata: version: 0.0.0-use.local resolution: "@lace/cardano@workspace:packages/cardano" dependencies: - "@cardano-sdk/cardano-services-client": 0.12.2 - "@cardano-sdk/core": 0.19.1 - "@cardano-sdk/crypto": 0.1.13 - "@cardano-sdk/hardware-ledger": 0.3.3 - "@cardano-sdk/key-management": 0.10.2 - "@cardano-sdk/util": 0.14.0 - "@cardano-sdk/util-dev": 0.15.1 - "@cardano-sdk/wallet": 0.21.1 - "@cardano-sdk/web-extension": 0.14.6 + "@cardano-sdk/cardano-services-client": 0.14.2 + "@cardano-sdk/core": 0.21.0 + "@cardano-sdk/crypto": 0.1.15 + "@cardano-sdk/hardware-ledger": 0.5.0 + "@cardano-sdk/key-management": 0.13.0 + "@cardano-sdk/util": 0.14.2 + "@cardano-sdk/util-dev": 0.17.1 + "@cardano-sdk/wallet": 0.24.0 + "@cardano-sdk/web-extension": 0.16.1 "@dcspark/cardano-multiplatform-lib-browser": ^3.1.1 + "@dcspark/cardano-multiplatform-lib-nodejs": ^3.1.1 "@emurgo/cardano-message-signing-browser": 1.0.1 "@lace/common": 0.1.0 "@stablelib/chacha20poly1305": 1.0.1 @@ -8045,7 +7916,7 @@ __metadata: version: 0.0.0-use.local resolution: "@lace/common@workspace:packages/common" dependencies: - "@cardano-sdk/util": 0.14.0 + "@cardano-sdk/util": 0.14.2 antd: ^4.24.10 classnames: ^2.3.1 jdenticon: 3.1.0 @@ -8131,9 +8002,9 @@ __metadata: resolution: "@lace/staking@workspace:packages/staking" dependencies: "@ant-design/icons": ^4.7.0 - "@cardano-sdk/input-selection": 0.11.9 - "@cardano-sdk/tx-construction": 0.11.2 - "@cardano-sdk/util": 0.14.0 + "@cardano-sdk/input-selection": 0.12.2 + "@cardano-sdk/tx-construction": 0.14.0 + "@cardano-sdk/util": 0.14.2 "@lace/cardano": ^0.1.0 "@lace/common": ^0.1.0 "@lace/core": 0.1.0 @@ -8172,10 +8043,10 @@ __metadata: wait-on: ^7.0.1 zustand: ^4.4.1 peerDependencies: - "@cardano-sdk/input-selection": 0.11.9 - "@cardano-sdk/tx-construction": 0.11.1 - "@cardano-sdk/util": 0.14.0 - "@cardano-sdk/wallet": 0.21.0 + "@cardano-sdk/input-selection": 0.12.2 + "@cardano-sdk/tx-construction": 0.14.0 + "@cardano-sdk/util": 0.14.2 + "@cardano-sdk/wallet": 0.24.0 "@lace/cardano": ^0.1.0 "@lace/common": ^0.1.0 "@lace/core": 0.1.0 @@ -17050,6 +16921,13 @@ __metadata: languageName: node linkType: hard +"@zxing/text-encoding@npm:0.9.0": + version: 0.9.0 + resolution: "@zxing/text-encoding@npm:0.9.0" + checksum: c23b12aee7639382e4949961304a1294776afaffa40f579e09ffecd0e5e68cf26ef3edd75009de46da8a536e571448755ca68b3e2ea707d53793c0edb2e2c34a + languageName: node + linkType: hard + "JSONStream@npm:^1.0.4": version: 1.3.5 resolution: "JSONStream@npm:1.3.5" @@ -46381,7 +46259,7 @@ __metadata: languageName: node linkType: hard -"util@npm:^0.12.0": +"util@npm:^0.12.0, util@npm:^0.12.3": version: 0.12.5 resolution: "util@npm:0.12.5" dependencies: @@ -47276,6 +47154,19 @@ __metadata: languageName: node linkType: hard +"web-encoding@npm:^1.1.5": + version: 1.1.5 + resolution: "web-encoding@npm:1.1.5" + dependencies: + "@zxing/text-encoding": 0.9.0 + util: ^0.12.3 + dependenciesMeta: + "@zxing/text-encoding": + optional: true + checksum: 2234a2b122f41006ce07859b3c0bf2e18f46144fda2907d5db0b571b76aa5c26977c646100ad9c00d2f8a4f6f2b848bc02147845d8c447ab365ec4eff376338d + languageName: node + linkType: hard + "web-namespaces@npm:^1.0.0": version: 1.1.4 resolution: "web-namespaces@npm:1.1.4"