Skip to content

Commit 9ae28ab

Browse files
AngelCastilloBmkazlauskas
AngelCastilloB
and
mkazlauskas
authored
chore: sdk version bump (#1405)
* chore: sdk version bump * chore: remove dead code (fetch/price provider) also remove no longer used axios-cache-adapter dep --------- Co-authored-by: Martynas Kazlauskas <martynas.kazlauskas@iohk.io>
1 parent 3900cb2 commit 9ae28ab

File tree

30 files changed

+1079
-1026
lines changed

30 files changed

+1079
-1026
lines changed

‎apps/browser-extension-wallet/package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
},
4242
"dependencies": {
4343
"@ant-design/icons": "^4.7.0",
44-
"@cardano-sdk/cardano-services-client": "0.20.1",
45-
"@cardano-sdk/core": "0.38.1",
46-
"@cardano-sdk/dapp-connector": "0.12.30",
47-
"@cardano-sdk/input-selection": "0.13.12",
48-
"@cardano-sdk/tx-construction": "0.21.0",
49-
"@cardano-sdk/util": "0.15.4",
50-
"@cardano-sdk/wallet": "0.42.2",
51-
"@cardano-sdk/web-extension": "0.31.2",
44+
"@cardano-sdk/cardano-services-client": "0.20.5",
45+
"@cardano-sdk/core": "0.39.1",
46+
"@cardano-sdk/dapp-connector": "0.12.34",
47+
"@cardano-sdk/input-selection": "0.13.16",
48+
"@cardano-sdk/tx-construction": "0.21.1",
49+
"@cardano-sdk/util": "0.15.5",
50+
"@cardano-sdk/wallet": "0.43.0",
51+
"@cardano-sdk/web-extension": "0.32.0",
5252
"@emurgo/cip14-js": "~3.0.1",
5353
"@input-output-hk/lace-ui-toolkit": "1.15.1",
5454
"@lace/cardano": "0.1.0",
@@ -59,10 +59,9 @@
5959
"@pdfme/generator": "^4.0.2",
6060
"@react-rxjs/core": "^0.9.8",
6161
"@react-rxjs/utils": "^0.9.5",
62-
"@vespaiach/axios-fetch-adapter": "^0.3.0",
62+
"@shiroyasha9/axios-fetch-adapter": "^1.0.3",
6363
"antd": "^4.24.10",
6464
"are-you-es5": "^2.1.2",
65-
"axios": "0.28.0",
6665
"bignumber.js": "9.0.1",
6766
"bip39": "^3.0.4",
6867
"blake2b-no-wasm": "2.1.4",
@@ -95,7 +94,7 @@
9594
"zustand": "3.5.14"
9695
},
9796
"devDependencies": {
98-
"@cardano-sdk/hardware-ledger": "0.11.2",
97+
"@cardano-sdk/hardware-ledger": "0.12.0",
9998
"@emurgo/cardano-message-signing-asmjs": "1.0.1",
10099
"@openpgp/web-stream-tools": "0.0.11-patch-0",
101100
"@pdfme/common": "^4.0.2",

‎apps/browser-extension-wallet/src/dapp-connector.tsx

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { StoreProvider } from '@stores';
55
import '@lib/i18n';
66
import 'antd/dist/antd.css';
77
import { CurrencyStoreProvider } from '@providers/currency';
8-
import { DatabaseProvider, AxiosClientProvider, AppSettingsProvider, AnalyticsProvider } from '@providers';
8+
import { DatabaseProvider, AppSettingsProvider, AnalyticsProvider } from '@providers';
99
import { HashRouter } from 'react-router-dom';
1010
import { ThemeProvider } from '@providers/ThemeProvider';
1111
import { UIThemeProvider } from '@providers/UIThemeProvider';
@@ -20,25 +20,23 @@ const App = (): React.ReactElement => (
2020
<AppSettingsProvider>
2121
<DatabaseProvider>
2222
<StoreProvider appMode={APP_MODE_POPUP}>
23-
<AxiosClientProvider>
24-
<CurrencyStoreProvider>
25-
<HashRouter>
26-
<PostHogClientProvider>
27-
<ExperimentsProvider>
28-
<AnalyticsProvider>
29-
<ThemeProvider>
30-
<AddressesDiscoveryOverlay>
31-
<UIThemeProvider>
32-
<DappConnectorView />
33-
</UIThemeProvider>
34-
</AddressesDiscoveryOverlay>
35-
</ThemeProvider>
36-
</AnalyticsProvider>
37-
</ExperimentsProvider>
38-
</PostHogClientProvider>
39-
</HashRouter>
40-
</CurrencyStoreProvider>
41-
</AxiosClientProvider>
23+
<CurrencyStoreProvider>
24+
<HashRouter>
25+
<PostHogClientProvider>
26+
<ExperimentsProvider>
27+
<AnalyticsProvider>
28+
<ThemeProvider>
29+
<AddressesDiscoveryOverlay>
30+
<UIThemeProvider>
31+
<DappConnectorView />
32+
</UIThemeProvider>
33+
</AddressesDiscoveryOverlay>
34+
</ThemeProvider>
35+
</AnalyticsProvider>
36+
</ExperimentsProvider>
37+
</PostHogClientProvider>
38+
</HashRouter>
39+
</CurrencyStoreProvider>
4240
</StoreProvider>
4341
</DatabaseProvider>
4442
</AppSettingsProvider>

‎apps/browser-extension-wallet/src/hooks/useChainHistoryProvider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { getBaseUrlForChain } from '@src/utils/chain';
22
import { useMemo } from 'react';
33
import { chainHistoryHttpProvider } from '@cardano-sdk/cardano-services-client';
44
import { logger } from '@lib/wallet-api-ui';
5-
import axiosFetchAdapter from '@vespaiach/axios-fetch-adapter';
5+
import axiosFetchAdapter from '@shiroyasha9/axios-fetch-adapter';
66

77
export type NetworkType = 'Mainnet' | 'Preprod' | 'Preview' | 'Sanchonet';
88

‎apps/browser-extension-wallet/src/hooks/useHandleResolver.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useMemo } from 'react';
44
import { useWalletStore } from '@src/stores';
55
import { handleHttpProvider } from '@cardano-sdk/cardano-services-client';
66
import { logger } from '@lib/wallet-api-ui';
7-
import axiosFetchAdapter from '@vespaiach/axios-fetch-adapter';
7+
import axiosFetchAdapter from '@shiroyasha9/axios-fetch-adapter';
88
import { HandleProvider } from '@cardano-sdk/core';
99

1010
export const useHandleResolver = (): HandleProvider => {

‎apps/browser-extension-wallet/src/lib/axios.ts

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import axiosFetchAdapter from '@vespaiach/axios-fetch-adapter';
1+
import axiosFetchAdapter from '@shiroyasha9/axios-fetch-adapter';
22
import { Wallet } from '@lace/cardano';
33
import { RemoteApiProperties, RemoteApiPropertyType } from '@cardano-sdk/web-extension';
44
import { getBaseUrlForChain } from '@src/utils/chain';

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
import { Wallet } from '@lace/cardano';
2929
import { Cardano, HandleProvider } from '@cardano-sdk/core';
3030
import { cacheActivatedWalletAddressSubscription } from './cache-wallets-address';
31-
import axiosFetchAdapter from '@vespaiach/axios-fetch-adapter';
31+
import axiosFetchAdapter from '@shiroyasha9/axios-fetch-adapter';
3232
import { SharedWalletScriptKind } from '@lace/core';
3333
import { getBaseUrlForChain } from '@utils/chain';
3434

‎apps/browser-extension-wallet/src/popup.tsx

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,7 @@ import { HashRouter } from 'react-router-dom';
44
import { PopupView } from '@routes';
55
import { StoreProvider } from '@stores';
66
import { CurrencyStoreProvider } from '@providers/currency';
7-
import {
8-
AppSettingsProvider,
9-
AxiosClientProvider,
10-
DatabaseProvider,
11-
ThemeProvider,
12-
AnalyticsProvider
13-
} from '@providers';
7+
import { AppSettingsProvider, DatabaseProvider, ThemeProvider, AnalyticsProvider } from '@providers';
148
import '@lib/i18n';
159
import 'antd/dist/antd.css';
1610
import './styles/index.scss';
@@ -34,31 +28,29 @@ const App = (): React.ReactElement => (
3428
<AppSettingsProvider>
3529
<DatabaseProvider>
3630
<StoreProvider appMode={APP_MODE_POPUP}>
37-
<AxiosClientProvider>
38-
<CurrencyStoreProvider>
39-
<HashRouter>
40-
<PostHogClientProvider>
41-
<ExperimentsProvider>
42-
<AnalyticsProvider>
43-
<ThemeProvider>
44-
<ExternalLinkOpenerProvider>
45-
<MigrationContainer appMode={APP_MODE_POPUP}>
46-
<DataCheckContainer appMode={APP_MODE_POPUP}>
47-
<AddressesDiscoveryOverlay>
48-
<BackgroundPageProvider>
49-
<PopupView />
50-
</BackgroundPageProvider>
51-
</AddressesDiscoveryOverlay>
52-
</DataCheckContainer>
53-
</MigrationContainer>
54-
</ExternalLinkOpenerProvider>
55-
</ThemeProvider>
56-
</AnalyticsProvider>
57-
</ExperimentsProvider>
58-
</PostHogClientProvider>
59-
</HashRouter>
60-
</CurrencyStoreProvider>
61-
</AxiosClientProvider>
31+
<CurrencyStoreProvider>
32+
<HashRouter>
33+
<PostHogClientProvider>
34+
<ExperimentsProvider>
35+
<AnalyticsProvider>
36+
<ThemeProvider>
37+
<ExternalLinkOpenerProvider>
38+
<MigrationContainer appMode={APP_MODE_POPUP}>
39+
<DataCheckContainer appMode={APP_MODE_POPUP}>
40+
<AddressesDiscoveryOverlay>
41+
<BackgroundPageProvider>
42+
<PopupView />
43+
</BackgroundPageProvider>
44+
</AddressesDiscoveryOverlay>
45+
</DataCheckContainer>
46+
</MigrationContainer>
47+
</ExternalLinkOpenerProvider>
48+
</ThemeProvider>
49+
</AnalyticsProvider>
50+
</ExperimentsProvider>
51+
</PostHogClientProvider>
52+
</HashRouter>
53+
</CurrencyStoreProvider>
6254
</StoreProvider>
6355
</DatabaseProvider>
6456
</AppSettingsProvider>

‎apps/browser-extension-wallet/src/providers/AxiosProvider/context.tsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎apps/browser-extension-wallet/src/providers/AxiosProvider/index.ts

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎apps/browser-extension-wallet/src/providers/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
export * from './AppSettings';
2-
export * from './AxiosProvider';
32
export * from './currency';
43
export * from './DatabaseProvider';
54
export * from './ExternalLinkOpenerProvider';

‎apps/browser-extension-wallet/src/stores/slices/blockchain-provider-slice.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { BlockchainProviderSlice, SliceCreator } from '../types';
22
import { Wallet } from '@lace/cardano';
33
import { getBaseUrlForChain } from '@src/utils/chain';
4-
import axiosFetchAdapter from '@vespaiach/axios-fetch-adapter';
4+
import axiosFetchAdapter from '@shiroyasha9/axios-fetch-adapter';
55
import { config } from '@src/config';
66

77
const { CHAIN } = config();

‎apps/browser-extension-wallet/src/types/util.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
import { usePriceFetcher } from '@lace/core';
2-
31
export type PromiseResolvedType<T> = T extends (...args: unknown[]) => Promise<infer R> ? R : never;
42

53
export type IViewsList<T extends string | number | symbol> = Partial<Record<T, () => React.ReactElement>>;
64

7-
export type FetchPriceState = ReturnType<typeof usePriceFetcher>['result'];
8-
95
export interface ValidationResult {
106
message?: string;
117
valid: boolean;

‎apps/browser-extension-wallet/src/utils/mocks/context-providers.tsx

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@ import { I18nextProvider } from 'react-i18next';
77
import dayjs from 'dayjs';
88
import i18n from 'i18next';
99
import { Wallet } from '@lace/cardano';
10-
import {
11-
AnalyticsProvider,
12-
AppSettingsProvider,
13-
AxiosClientProvider,
14-
CurrencyStoreProvider,
15-
DatabaseProvider
16-
} from '@providers';
10+
import { AnalyticsProvider, AppSettingsProvider, CurrencyStoreProvider, DatabaseProvider } from '@providers';
1711
import { BackgroundServiceAPIProvider } from '@providers/BackgroundServiceAPI';
1812
import { MockWalletStore, walletStoreMock } from '@utils/mocks/store';
1913
import { WalletStore } from '@stores/types';
@@ -76,15 +70,13 @@ export const buildMockProviders = async (
7670
customSlice={storeCustomSlice}
7771
>
7872
<CurrencyStoreProvider>
79-
<AxiosClientProvider>
80-
<PostHogClientProvider postHogCustomClient={postHogClientMocks as any}>
81-
<AnalyticsProvider analyticsDisabled tracker={mockAnalyticsTracker as any}>
82-
<ExternalLinkOpenerProvider>
83-
<HashRouter>{children}</HashRouter>
84-
</ExternalLinkOpenerProvider>
85-
</AnalyticsProvider>
86-
</PostHogClientProvider>
87-
</AxiosClientProvider>
73+
<PostHogClientProvider postHogCustomClient={postHogClientMocks as any}>
74+
<AnalyticsProvider analyticsDisabled tracker={mockAnalyticsTracker as any}>
75+
<ExternalLinkOpenerProvider>
76+
<HashRouter>{children}</HashRouter>
77+
</ExternalLinkOpenerProvider>
78+
</AnalyticsProvider>
79+
</PostHogClientProvider>
8880
</CurrencyStoreProvider>
8981
</MockWalletStore>
9082
</DatabaseProvider>

‎apps/browser-extension-wallet/src/views/browser-view/index.tsx

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { BrowserViewRoutes } from '@views/browser/routes';
55
import {
66
CurrencyStoreProvider,
77
DatabaseProvider,
8-
AxiosClientProvider,
98
AppSettingsProvider,
109
ThemeProvider,
1110
AnalyticsProvider,
@@ -35,33 +34,31 @@ const App = (): React.ReactElement => (
3534
<AppSettingsProvider>
3635
<DatabaseProvider>
3736
<StoreProvider appMode={APP_MODE_BROWSER}>
38-
<AxiosClientProvider>
39-
<CurrencyStoreProvider>
40-
<HashRouter>
41-
<BackgroundPageProvider>
42-
<PostHogClientProvider>
43-
<ExperimentsProvider>
44-
<AnalyticsProvider>
45-
<ThemeProvider>
46-
<UIThemeProvider>
47-
<ExternalLinkOpenerProvider>
48-
<MigrationContainer appMode={APP_MODE_BROWSER}>
49-
<DataCheckContainer appMode={APP_MODE_BROWSER}>
50-
<AddressesDiscoveryOverlay>
51-
<BrowserViewRoutes />
52-
</AddressesDiscoveryOverlay>
53-
</DataCheckContainer>
54-
</MigrationContainer>
55-
</ExternalLinkOpenerProvider>
56-
</UIThemeProvider>
57-
</ThemeProvider>
58-
</AnalyticsProvider>
59-
</ExperimentsProvider>
60-
</PostHogClientProvider>
61-
</BackgroundPageProvider>
62-
</HashRouter>
63-
</CurrencyStoreProvider>
64-
</AxiosClientProvider>
37+
<CurrencyStoreProvider>
38+
<HashRouter>
39+
<BackgroundPageProvider>
40+
<PostHogClientProvider>
41+
<ExperimentsProvider>
42+
<AnalyticsProvider>
43+
<ThemeProvider>
44+
<UIThemeProvider>
45+
<ExternalLinkOpenerProvider>
46+
<MigrationContainer appMode={APP_MODE_BROWSER}>
47+
<DataCheckContainer appMode={APP_MODE_BROWSER}>
48+
<AddressesDiscoveryOverlay>
49+
<BrowserViewRoutes />
50+
</AddressesDiscoveryOverlay>
51+
</DataCheckContainer>
52+
</MigrationContainer>
53+
</ExternalLinkOpenerProvider>
54+
</UIThemeProvider>
55+
</ThemeProvider>
56+
</AnalyticsProvider>
57+
</ExperimentsProvider>
58+
</PostHogClientProvider>
59+
</BackgroundPageProvider>
60+
</HashRouter>
61+
</CurrencyStoreProvider>
6562
</StoreProvider>
6663
</DatabaseProvider>
6764
</AppSettingsProvider>

‎apps/browser-extension-wallet/test/__mocks__/axios-fetch-adapter.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
// Can be overridden in tests files with the same approach
2-
jest.mock('@vespaiach/axios-fetch-adapter', jest.fn());
2+
jest.mock('@shiroyasha9/axios-fetch-adapter', jest.fn());

‎apps/browser-extension-wallet/webpack.common.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ module.exports = () => {
5656
zlib: require.resolve('browserify-zlib'),
5757
dns: false,
5858
tls: false,
59+
process: false,
5960
child_process: false
6061
},
6162
plugins: [new TsconfigPathsPlugin({ configFile: 'src/tsconfig.json' })]

0 commit comments

Comments
 (0)