Skip to content

Commit 8b8fb46

Browse files
authored
refactor: simplify Ada Handle provider configuration (#1378)
There's no need to manage a separate set of configuration for this provider, given we're now using the same backend.
1 parent cd5335e commit 8b8fb46

File tree

8 files changed

+20
-49
lines changed

8 files changed

+20
-49
lines changed

apps/browser-extension-wallet/.env.defaults

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,6 @@ CEXPLORER_URL_PREVIEW=https://preview.cexplorer.io
7777
CEXPLORER_URL_PREPROD=https://preprod.cexplorer.io
7878
CEXPLORER_URL_SANCHONET=https://sancho.cexplorer.io
7979

80-
# ADA Handle URLs
81-
ADA_HANDLE_URL_MAINNET=https://dev-mainnet.lw.iog.io/
82-
ADA_HANDLE_URL_PREPROD=https://dev-preprod.lw.iog.io/
83-
ADA_HANDLE_URL_PREVIEW=https://dev-preview.lw.iog.io/
84-
ADA_HANDLE_URL_SANCHONET=
85-
8680
# Manifest.json
8781
LACE_EXTENSION_KEY=gafhhkghbfjjkeiendhlofajokpaflmk
8882

apps/browser-extension-wallet/.env.developerpreview

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ CEXPLORER_URL_PREVIEW=https://preview.cexplorer.io
7575
CEXPLORER_URL_PREPROD=https://preprod.cexplorer.io
7676
CEXPLORER_URL_SANCHONET=https://sancho.cexplorer.io
7777

78-
# ADA Handle URLs
79-
ADA_HANDLE_URL_MAINNET=https://dev-mainnet.lw.iog.io
80-
ADA_HANDLE_URL_PREVIEW=https://dev-preview.lw.iog.io
81-
ADA_HANDLE_URL_PREPROD=https://dev-preprod.lw.iog.io
82-
ADA_HANDLE_URL_SANCHONET=
83-
8478
# Manifest.json
8579
LACE_EXTENSION_KEY=djcdfchkaijggdjokfomholkalbffgil
8680

apps/browser-extension-wallet/.env.example

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@ CEXPLORER_URL_PREVIEW=https://preview.cexplorer.io
7575
CEXPLORER_URL_PREPROD=https://preprod.cexplorer.io
7676
CEXPLORER_URL_SANCHONET=https://sancho.cexplorer.io
7777

78-
# ADA Handle URLs
79-
ADA_HANDLE_URL_MAINNET=https://dev-mainnet.lw.iog.io
80-
ADA_HANDLE_URL_PREVIEW=https://dev-preview.lw.iog.io
81-
ADA_HANDLE_URL_PREPROD=https://dev-preprod.lw.iog.io
82-
ADA_HANDLE_URL_SANCHONET=
83-
8478
# Manifest.json
8579
LACE_EXTENSION_KEY=gafhhkghbfjjkeiendhlofajokpaflmk
8680

apps/browser-extension-wallet/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"permissions": ["webRequest", "storage", "tabs", "unlimitedStorage"],
2020
"host_permissions": ["<all_urls>"],
2121
"content_security_policy": {
22-
"extension_pages": "default-src 'self' $LOCALHOST_DEFAULT_SRC; frame-src https://connect.trezor.io/ https://www.youtube-nocookie.com; script-src 'self' 'wasm-unsafe-eval' $LOCALHOST_SCRIPT_SRC; font-src 'self' https://use.typekit.net; object-src 'self'; connect-src $CARDANO_SERVICES_URLS $ADA_HANDLE_URLS https://coingecko.live-mainnet.eks.lw.iog.io https://muesliswap.live-mainnet.eks.lw.iog.io $LOCALHOST_CONNECT_SRC $POSTHOG_HOST https://use.typekit.net data:; style-src * 'unsafe-inline'; img-src * data:;"
22+
"extension_pages": "default-src 'self' $LOCALHOST_DEFAULT_SRC; frame-src https://connect.trezor.io/ https://www.youtube-nocookie.com; script-src 'self' 'wasm-unsafe-eval' $LOCALHOST_SCRIPT_SRC; font-src 'self' https://use.typekit.net; object-src 'self'; connect-src $CARDANO_SERVICES_URLS https://coingecko.live-mainnet.eks.lw.iog.io https://muesliswap.live-mainnet.eks.lw.iog.io $LOCALHOST_CONNECT_SRC $POSTHOG_HOST https://use.typekit.net data:; style-src * 'unsafe-inline'; img-src * data:;"
2323
},
2424
"content_scripts": [
2525
{
Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1 @@
1-
import { Cardano } from '@cardano-sdk/core';
2-
import { Wallet } from '@lace/cardano';
3-
4-
export const ADA_HANDLE_POLICY_ID = Wallet.ADA_HANDLE_POLICY_ID;
51
export const isAdaHandleEnabled = process.env.USE_ADA_HANDLE === 'true';
6-
export const HANDLE_SERVER_URLS: Record<Cardano.NetworkMagics, string> = {
7-
[Cardano.NetworkMagics.Mainnet]: process.env.ADA_HANDLE_URL_MAINNET,
8-
[Cardano.NetworkMagics.Preprod]: process.env.ADA_HANDLE_URL_PREPROD,
9-
[Cardano.NetworkMagics.Preview]: process.env.ADA_HANDLE_URL_PREVIEW,
10-
[Cardano.NetworkMagics.Sanchonet]: process.env.ADA_HANDLE_URL_SANCHONET
11-
};
Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
1+
import { getBaseUrlForChain } from '@src/utils/chain';
2+
import { getChainName } from '@src/utils/get-chain-name';
13
import { useMemo } from 'react';
24
import { useWalletStore } from '@src/stores';
35
import { handleHttpProvider } from '@cardano-sdk/cardano-services-client';
4-
import { HandleProvider } from '@cardano-sdk/core';
5-
import { HANDLE_SERVER_URLS } from '@src/features/ada-handle/config';
66
import { logger } from '@lib/wallet-api-ui';
7+
import axiosFetchAdapter from '@vespaiach/axios-fetch-adapter';
8+
import { HandleProvider } from '@cardano-sdk/core';
79

810
export const useHandleResolver = (): HandleProvider => {
9-
const {
10-
currentChain: { networkMagic }
11-
} = useWalletStore();
11+
const { currentChain } = useWalletStore();
12+
const baseCardanoServicesUrl = getBaseUrlForChain(getChainName(currentChain));
1213

13-
return useMemo(() => {
14-
const serverUrl = HANDLE_SERVER_URLS[networkMagic as keyof typeof HANDLE_SERVER_URLS];
15-
return handleHttpProvider({
16-
baseUrl: serverUrl,
17-
logger
18-
});
19-
}, [networkMagic]);
14+
return useMemo(
15+
() =>
16+
handleHttpProvider({
17+
adapter: axiosFetchAdapter,
18+
baseUrl: baseCardanoServicesUrl,
19+
logger
20+
}),
21+
[baseCardanoServicesUrl]
22+
);
2023
};

apps/browser-extension-wallet/src/lib/scripts/background/wallet.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import {
2626
walletRepositoryProperties
2727
} from '@cardano-sdk/web-extension';
2828
import { Wallet } from '@lace/cardano';
29-
import { HANDLE_SERVER_URLS } from '@src/features/ada-handle/config';
3029
import { Cardano, HandleProvider } from '@cardano-sdk/core';
3130
import { cacheActivatedWalletAddressSubscription } from './cache-wallets-address';
3231
import axiosFetchAdapter from '@vespaiach/axios-fetch-adapter';
3332
import { SharedWalletScriptKind } from '@lace/core';
33+
import { getBaseUrlForChain } from '@utils/chain';
3434

3535
const logger = console;
3636

@@ -65,7 +65,7 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
6565
const chainName: Wallet.ChainName = chainIdToChainName(chainId);
6666
const providers = await getProviders(chainName);
6767

68-
const baseUrl = HANDLE_SERVER_URLS[Cardano.ChainIds[chainName].networkMagic];
68+
const baseUrl = getBaseUrlForChain(chainName);
6969

7070
// This is used in place of the handle provider for environments where the handle provider is not available
7171
const noopHandleResolver: HandleProvider = {
@@ -88,7 +88,7 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
8888
handleProvider: baseUrl
8989
? handleHttpProvider({
9090
adapter: axiosFetchAdapter,
91-
baseUrl: HANDLE_SERVER_URLS[Cardano.ChainIds[chainName].networkMagic],
91+
baseUrl,
9292
logger
9393
})
9494
: noopHandleResolver,
@@ -117,7 +117,7 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
117117
handleProvider: baseUrl
118118
? handleHttpProvider({
119119
adapter: axiosFetchAdapter,
120-
baseUrl: HANDLE_SERVER_URLS[Cardano.ChainIds[chainName].networkMagic],
120+
baseUrl,
121121
logger
122122
})
123123
: noopHandleResolver,

apps/browser-extension-wallet/webpack-utils.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ const transformManifest = (content, mode) => {
1616
'$CARDANO_SERVICES_URLS',
1717
`${process.env.CARDANO_SERVICES_URL_MAINNET} ${process.env.CARDANO_SERVICES_URL_PREPROD} ${process.env.CARDANO_SERVICES_URL_PREVIEW} ${process.env.CARDANO_SERVICES_URL_SANCHONET}`
1818
)
19-
.replace(
20-
'$ADA_HANDLE_URLS',
21-
`${process.env.ADA_HANDLE_URL_MAINNET} ${process.env.ADA_HANDLE_URL_PREPROD} ${process.env.ADA_HANDLE_URL_PREVIEW} ${process.env.ADA_HANDLE_URL_SANCHONET}`
22-
)
2319
.replace('$LOCALHOST_DEFAULT_SRC', mode === 'development' ? 'http://localhost:3000' : '')
2420
.replace('$LOCALHOST_SCRIPT_SRC', mode === 'development' ? 'http://localhost:3000' : '')
2521
.replace(

0 commit comments

Comments
 (0)