Skip to content

Commit 2225ebd

Browse files
mchappellmkazlauskas
mchappell
and
mkazlauskas
authored
chore: [LW-11493] update cardano js sdk dependencies (#1420)
* chore: update cardano-sdk dependencies * refactor(extension): update cardano-sdk implementation * fixup! refactor(extension): update cardano-sdk implementation --------- Co-authored-by: Martynas Kazlauskas <martynas.kazlauskas@iohk.io>
1 parent 3cb56ba commit 2225ebd

File tree

9 files changed

+166
-161
lines changed

9 files changed

+166
-161
lines changed

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

Lines changed: 8 additions & 8 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.6",
45-
"@cardano-sdk/core": "0.39.2",
46-
"@cardano-sdk/dapp-connector": "0.12.35",
47-
"@cardano-sdk/input-selection": "0.13.17",
48-
"@cardano-sdk/tx-construction": "0.21.2",
44+
"@cardano-sdk/cardano-services-client": "0.20.7",
45+
"@cardano-sdk/core": "0.39.3",
46+
"@cardano-sdk/dapp-connector": "0.12.36",
47+
"@cardano-sdk/input-selection": "0.13.18",
48+
"@cardano-sdk/tx-construction": "0.21.3",
4949
"@cardano-sdk/util": "0.15.5",
50-
"@cardano-sdk/wallet": "0.44.0",
51-
"@cardano-sdk/web-extension": "0.33.0",
50+
"@cardano-sdk/wallet": "0.44.1",
51+
"@cardano-sdk/web-extension": "0.34.0",
5252
"@emurgo/cip14-js": "~3.0.1",
5353
"@input-output-hk/lace-ui-toolkit": "1.15.1",
5454
"@lace/cardano": "0.1.0",
@@ -94,7 +94,7 @@
9494
"zustand": "3.5.14"
9595
},
9696
"devDependencies": {
97-
"@cardano-sdk/hardware-ledger": "0.12.1",
97+
"@cardano-sdk/hardware-ledger": "0.12.2",
9898
"@emurgo/cardano-message-signing-asmjs": "1.0.1",
9999
"@openpgp/web-stream-tools": "0.0.11-patch-0",
100100
"@pdfme/common": "^4.0.2",

‎apps/browser-extension-wallet/src/lib/scripts/background/__tests__/cache-wallets-address.test.ts

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@ describe('cacheActivatedWalletAddressSubscription', () => {
1818

1919
it('should not trigger subscription for no active wallet', () => {
2020
const mockWalletManager = {
21-
activeWallet$: of(undefined),
22-
activeWalletId$: of(undefined)
21+
activeWallet$: of(undefined)
2322
} as unknown as WalletManager<Wallet.WalletMetadata, Wallet.AccountMetadata>;
2423

2524
const mockWalletRepository = {
@@ -34,8 +33,10 @@ describe('cacheActivatedWalletAddressSubscription', () => {
3433

3534
it('should subscribe and update metadata', () => {
3635
const mockWalletManager = {
37-
activeWallet$: of({ addresses$: of([{ address: 'address1' }]) }),
38-
activeWalletId$: of({ walletId: 'walletId' })
36+
activeWallet$: of({
37+
observableWallet: { addresses$: of([{ address: 'address1' }]) },
38+
props: { walletId: 'walletId' }
39+
})
3940
} as unknown as WalletManager<Wallet.WalletMetadata, Wallet.AccountMetadata>;
4041

4142
const mockWalletRepository = {
@@ -61,14 +62,16 @@ describe('cacheActivatedWalletAddressSubscription', () => {
6162
it('should update metadata when a new wallet is added and activated', () => {
6263
createTestScheduler().run(({ cold, expectObservable }) => {
6364
const mockWalletManager = {
64-
activeWalletId$: cold('a----f', {
65-
a: { walletId: 'walletId1' },
66-
f: { walletId: 'walletId2' }
67-
}),
68-
activeWallet$: eachSubscription(
69-
cold('a', { a: { addresses$: cold('a', { a: [{ address: 'address1' }] }) } }),
70-
cold('a', { a: { addresses$: cold('a', { a: [{ address: 'address2' }] }) } })
71-
)
65+
activeWallet$: cold('a----f', {
66+
a: {
67+
observableWallet: { addresses$: cold('a', { a: [{ address: 'address1' }] }) },
68+
props: { walletId: 'walletId1' }
69+
},
70+
f: {
71+
observableWallet: { addresses$: cold('a', { a: [{ address: 'address2' }] }) },
72+
props: { walletId: 'walletId2' }
73+
}
74+
})
7275
} as unknown as WalletManager<Wallet.WalletMetadata, Wallet.AccountMetadata>;
7376
const mockWalletRepository = {
7477
wallets$: eachSubscription(

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,19 @@ export const walletMetadataWithAddresses = (
99
walletManager: WalletManager<Wallet.WalletMetadata, Wallet.AccountMetadata>,
1010
walletRepository: WalletRepository<Wallet.WalletMetadata, Wallet.AccountMetadata>
1111
): Observable<UpdateWalletMetadataProps<Wallet.WalletMetadata>> =>
12-
walletManager.activeWalletId$.pipe(
12+
walletManager.activeWallet$.pipe(
1313
switchMap((activeWallet) =>
1414
activeWallet
15-
? walletManager.activeWallet$.pipe(
16-
filter(isNotNil),
17-
switchMap((observableWallet) => observableWallet.addresses$),
15+
? activeWallet.observableWallet.addresses$.pipe(
1816
map((addresses) => addresses.map(({ address }) => address)),
1917
blockingWithLatestFrom(
2018
walletRepository.wallets$.pipe(
21-
map((wallets) => wallets.find(({ walletId }) => walletId === activeWallet.walletId)),
19+
map((wallets) => wallets.find(({ walletId }) => walletId === activeWallet.props.walletId)),
2220
filter(isNotNil)
2321
)
2422
),
2523
map(([walletAddresses, walletEntity]) => ({
26-
walletId: activeWallet.walletId,
24+
walletId: activeWallet.props.walletId,
2725
metadata: {
2826
...walletEntity.metadata,
2927
walletAddresses: uniq([...(walletEntity?.metadata?.walletAddresses || []), ...walletAddresses])

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { runtime, Tabs, tabs } from 'webextension-polyfill';
77
import { exposeApi, RemoteApiPropertyType, cip30 } from '@cardano-sdk/web-extension';
88
import { DAPP_CHANNELS } from '../../../utils/constants';
99
import { DappDataService } from '../types';
10-
import { BehaviorSubject, Observable, of } from 'rxjs';
10+
import { BehaviorSubject, map, Observable, of } from 'rxjs';
1111
import { APIErrorCode, ApiError } from '@cardano-sdk/dapp-connector';
1212
import { Wallet } from '@lace/cardano';
1313
import pDebounce from 'p-debounce';
@@ -81,7 +81,11 @@ export const confirmationCallback: walletCip30.CallbackConfirmation = {
8181
}, DEBOUNCE_THROTTLE)
8282
};
8383

84-
const walletApi = walletCip30.createWalletApi(wallet$, confirmationCallback, { logger: console });
84+
const walletApi = walletCip30.createWalletApi(
85+
wallet$.pipe(map((activeWallet) => activeWallet?.observableWallet || undefined)),
86+
confirmationCallback,
87+
{ logger: console }
88+
);
8589

8690
cip30.initializeBackgroundScript(
8791
{ walletName: process.env.WALLET_NAME },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ walletManager
224224

225225
exposeApi(
226226
{
227-
api$: walletManager.activeWallet$.asObservable(),
227+
api$: walletManager.activeWallet$.pipe(map((activeWallet) => activeWallet?.observableWallet || undefined)),
228228
baseChannel: walletChannel(process.env.WALLET_NAME),
229229
properties: observableWalletProperties
230230
},

‎packages/cardano/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@
4040
"watch": "yarn build --watch"
4141
},
4242
"dependencies": {
43-
"@cardano-sdk/cardano-services-client": "0.20.6",
44-
"@cardano-sdk/core": "0.39.2",
43+
"@cardano-sdk/cardano-services-client": "0.20.7",
44+
"@cardano-sdk/core": "0.39.3",
4545
"@cardano-sdk/crypto": "0.1.30",
46-
"@cardano-sdk/hardware-ledger": "0.12.1",
47-
"@cardano-sdk/hardware-trezor": "0.6.1",
48-
"@cardano-sdk/key-management": "0.24.1",
49-
"@cardano-sdk/tx-construction": "0.21.2",
46+
"@cardano-sdk/hardware-ledger": "0.12.2",
47+
"@cardano-sdk/hardware-trezor": "0.6.2",
48+
"@cardano-sdk/key-management": "0.24.2",
49+
"@cardano-sdk/tx-construction": "0.21.3",
5050
"@cardano-sdk/util": "0.15.5",
51-
"@cardano-sdk/wallet": "0.44.0",
52-
"@cardano-sdk/web-extension": "0.33.0",
51+
"@cardano-sdk/wallet": "0.44.1",
52+
"@cardano-sdk/web-extension": "0.34.0",
5353
"@lace/common": "0.1.0",
5454
"@ledgerhq/devices": "^8.2.1",
5555
"@stablelib/chacha20poly1305": "1.0.1",
@@ -71,7 +71,7 @@
7171
"webextension-polyfill": "0.8.0"
7272
},
7373
"devDependencies": {
74-
"@cardano-sdk/util-dev": "0.22.8",
74+
"@cardano-sdk/util-dev": "0.22.9",
7575
"@emurgo/cardano-message-signing-browser": "1.0.1",
7676
"axios": "^1.7.4",
7777
"rollup-plugin-polyfill-node": "^0.8.0",

‎packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
},
4444
"dependencies": {
4545
"@ant-design/icons": "^4.7.0",
46-
"@cardano-sdk/wallet": "0.44.0",
47-
"@cardano-sdk/web-extension": "0.33.0",
46+
"@cardano-sdk/wallet": "0.44.1",
47+
"@cardano-sdk/web-extension": "0.34.0",
4848
"@input-output-hk/lace-ui-toolkit": "1.15.1",
4949
"@lace/cardano": "0.1.0",
5050
"@lace/common": "0.1.0",

‎packages/staking/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,12 +76,12 @@
7676
},
7777
"devDependencies": {
7878
"@babel/core": "^7.21.0",
79-
"@cardano-sdk/core": "0.39.2",
80-
"@cardano-sdk/input-selection": "0.13.17",
81-
"@cardano-sdk/tx-construction": "0.21.2",
79+
"@cardano-sdk/core": "0.39.3",
80+
"@cardano-sdk/input-selection": "0.13.18",
81+
"@cardano-sdk/tx-construction": "0.21.3",
8282
"@cardano-sdk/util": "0.15.5",
83-
"@cardano-sdk/wallet": "0.44.0",
84-
"@cardano-sdk/web-extension": "0.33.0",
83+
"@cardano-sdk/wallet": "0.44.1",
84+
"@cardano-sdk/web-extension": "0.34.0",
8585
"@storybook/addon-actions": "^7.6.7",
8686
"@storybook/addon-essentials": "^7.6.7",
8787
"@storybook/addon-interactions": "^7.6.7",
@@ -126,11 +126,11 @@
126126
"wait-on": "^7.0.1"
127127
},
128128
"peerDependencies": {
129-
"@cardano-sdk/input-selection": "0.13.17",
130-
"@cardano-sdk/tx-construction": "0.21.2",
129+
"@cardano-sdk/input-selection": "0.13.18",
130+
"@cardano-sdk/tx-construction": "0.21.3",
131131
"@cardano-sdk/util": "0.15.5",
132-
"@cardano-sdk/wallet": "0.44.0",
133-
"@cardano-sdk/web-extension": "0.33.0",
132+
"@cardano-sdk/wallet": "0.44.1",
133+
"@cardano-sdk/web-extension": "0.34.0",
134134
"@lace/cardano": "^0.1.0",
135135
"@lace/common": "^0.1.0",
136136
"@lace/core": "0.1.0",

0 commit comments

Comments
 (0)