Skip to content

Commit edad259

Browse files
AngelCastilloBAngelCastilloB
committed
fix: bump cardano-js-sdk
1 parent 156be93 commit edad259

File tree

20 files changed

+269
-273
lines changed

20 files changed

+269
-273
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,15 @@
5656
},
5757
"dependencies": {
5858
"@ant-design/icons": "^4.7.0",
59-
"@cardano-sdk/cardano-services-client": "0.26.14",
60-
"@cardano-sdk/core": "0.45.10",
61-
"@cardano-sdk/dapp-connector": "0.13.13",
62-
"@cardano-sdk/input-selection": "0.14.13",
63-
"@cardano-sdk/tx-construction": "0.26.12",
64-
"@cardano-sdk/util": "0.16.0",
65-
"@cardano-sdk/util-rxjs": "0.9.15",
66-
"@cardano-sdk/wallet": "0.52.9",
67-
"@cardano-sdk/web-extension": "0.39.9",
59+
"@cardano-sdk/cardano-services-client": "0.26.16",
60+
"@cardano-sdk/core": "0.46.0",
61+
"@cardano-sdk/dapp-connector": "0.13.14",
62+
"@cardano-sdk/input-selection": "0.14.15",
63+
"@cardano-sdk/tx-construction": "0.27.2",
64+
"@cardano-sdk/util": "0.17.0",
65+
"@cardano-sdk/util-rxjs": "0.9.17",
66+
"@cardano-sdk/wallet": "0.53.2",
67+
"@cardano-sdk/web-extension": "0.39.12",
6868
"@emurgo/cip14-js": "~3.0.1",
6969
"@input-output-hk/lace-ui-toolkit": "3.5.0",
7070
"@lace/bitcoin": "0.1.0",
@@ -119,7 +119,7 @@
119119
"zustand": "3.5.14"
120120
},
121121
"devDependencies": {
122-
"@cardano-sdk/hardware-ledger": "0.15.13",
122+
"@cardano-sdk/hardware-ledger": "0.16.2",
123123
"@emurgo/cardano-message-signing-asmjs": "1.0.1",
124124
"@openpgp/web-stream-tools": "0.0.11-patch-0",
125125
"@pdfme/common": "^4.0.2",

‎apps/browser-extension-wallet/src/features/address-book/context/__test__/context.test.tsx

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ const mockHandleResolution = {
3535

3636
const makeDbContextWrapper =
3737
(dbInstance: WalletDatabase): FunctionComponent =>
38-
({ children }: { children?: React.ReactNode }) =>
39-
(
40-
<AppSettingsProvider>
41-
<StoreProvider appMode="browser" store={create(() => ({ environmentName: 'Preprod' } as any))}>
42-
<DatabaseProvider dbCustomInstance={dbInstance}>
43-
<AddressBookProvider>{children}</AddressBookProvider>
44-
</DatabaseProvider>
45-
</StoreProvider>
46-
</AppSettingsProvider>
47-
);
38+
({ children }: { children?: React.ReactNode }) =>
39+
(
40+
<AppSettingsProvider>
41+
<StoreProvider appMode="browser" store={create(() => ({ environmentName: 'Preprod' } as any))}>
42+
<DatabaseProvider dbCustomInstance={dbInstance}>
43+
<AddressBookProvider>{children}</AddressBookProvider>
44+
</DatabaseProvider>
45+
</StoreProvider>
46+
</AppSettingsProvider>
47+
);
4848

4949
describe('testing useAddressBookState', () => {
5050
let db: WalletDatabase;

‎apps/browser-extension-wallet/src/features/address-book/hooks/__tests__/useGetFilteredAddressBook.test.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ const mockHandleResolution = {
2626
};
2727
const makeDbContextWrapper =
2828
(dbIntance: WalletDatabase): FunctionComponent =>
29-
({ children }: { children?: React.ReactNode }) =>
30-
(
31-
<AppSettingsProvider>
32-
<StoreProvider appMode="browser" store={create(() => ({ environmentName: 'Preprod' } as any))}>
33-
<DatabaseProvider dbCustomInstance={dbIntance}>{children}</DatabaseProvider>
34-
</StoreProvider>
35-
</AppSettingsProvider>
36-
);
29+
({ children }: { children?: React.ReactNode }) =>
30+
(
31+
<AppSettingsProvider>
32+
<StoreProvider appMode="browser" store={create(() => ({ environmentName: 'Preprod' } as any))}>
33+
<DatabaseProvider dbCustomInstance={dbIntance}>{children}</DatabaseProvider>
34+
</StoreProvider>
35+
</AppSettingsProvider>
36+
);
3737
describe('Testing useGetFilteredAddressBook hook', () => {
3838
let db: WalletDatabase;
3939
const mockAddress: AddressBookSchema[] = [

‎apps/browser-extension-wallet/src/features/dapp/components/confirm-transaction/__tests__/utils.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ describe('Testing utils', () => {
8585
});
8686

8787
test('testing pubDRepKeyToHash', async () => {
88-
const pubDRepKeyHex = '_pubDRepKeyHex';
88+
const pubDRepKeyHex = '8293d319ef5b3ac72366dd28006bd315b715f7e7cfcbd3004129b80d';
8989
expect(await pubDRepKeyToHash(pubDRepKeyHex as Wallet.Crypto.Ed25519PublicKeyHex)).toEqual(pubDRepKeyHex);
9090
});
9191

‎apps/browser-extension-wallet/src/features/dapp/components/confirm-transaction/utils.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/* eslint-disable sonarjs/no-small-switch */
22
/* eslint-disable complexity */
33
import { Wallet } from '@lace/cardano';
4-
import { RemoteApiPropertyType, TransactionWitnessRequest, WalletType, exposeApi } from '@cardano-sdk/web-extension';
4+
import { exposeApi, RemoteApiPropertyType, TransactionWitnessRequest, WalletType } from '@cardano-sdk/web-extension';
55
import type { UserPromptService } from '@lib/scripts/background/services';
6-
import { DAPP_CHANNELS, cardanoCoin } from '@src/utils/constants';
6+
import { cardanoCoin, DAPP_CHANNELS } from '@src/utils/constants';
77
import { runtime } from 'webextension-polyfill';
88
import { of } from 'rxjs';
99
import { logger } from '@lace/common';
@@ -66,8 +66,7 @@ export const pubDRepKeyToHash = async (
6666
pubDRepKeyHex: Wallet.Crypto.Ed25519PublicKeyHex
6767
): Promise<Wallet.Crypto.Hash28ByteBase16> => {
6868
const pubDRepKey = await Wallet.Crypto.Ed25519PublicKey.fromHex(pubDRepKeyHex);
69-
const drepKeyHex = (await pubDRepKey.hash()).hex();
70-
return Wallet.Crypto.Hash28ByteBase16.fromEd25519KeyHashHex(drepKeyHex);
69+
return (await pubDRepKey.hash()).hex() as unknown as Wallet.Crypto.Hash28ByteBase16;
7170
};
7271

7372
export const depositPaidWithSymbol = (deposit: bigint, coinId: Wallet.CoinId): string => {

‎apps/browser-extension-wallet/src/lib/scripts/background/storage/extension-blob-key-value-store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ import { ExtensionDocumentStore } from './extension-document-store';
33
import { storage as sdkStorage } from '@cardano-sdk/wallet';
44
import { Logger } from 'ts-log';
55
import { defaultIfEmpty, EMPTY, firstValueFrom, from, mergeMap, Observable, of } from 'rxjs';
6-
import { OpaqueString, toSerializableObject } from '@cardano-sdk/util';
6+
import { toSerializableObject } from '@cardano-sdk/util';
77

88
/**
99
* Stores entire key-value collection in a single document
1010
*/
1111
// eslint-disable-next-line @typescript-eslint/no-explicit-any
12-
export class ExtensionBlobKeyValueStore<K extends string | OpaqueString<any>, V extends {}>
12+
export class ExtensionBlobKeyValueStore<K extends string, V extends {}>
1313
extends ExtensionDocumentStore<Record<K, V>>
1414
implements sdkStorage.KeyValueStore<K, V>
1515
{

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,5 @@ export const getWalletName = (): string => {
199199
return `${process.env.WALLET_NAME}`;
200200
};
201201

202-
export const hashExtendedAccountPublicKey = (extendedAccountPublicKey: string): string => {
203-
const input = Buffer.from(extendedAccountPublicKey);
204-
return blake2b(blake2b.BYTES_MIN).update(input).digest('hex');
205-
};
202+
export const hashExtendedAccountPublicKey = (extendedAccountPublicKey: string): string =>
203+
blake2b.hash(extendedAccountPublicKey, 16);

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

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,11 +171,14 @@ const walletFactory: WalletFactory<Wallet.WalletMetadata, Wallet.AccountMetadata
171171
if (!walletAccount) {
172172
throw new Error('Wallet account not found');
173173
}
174-
const bip32Account = new Wallet.KeyManagement.Bip32Account({
175-
accountIndex,
176-
chainId,
177-
extendedAccountPublicKey: walletAccount.extendedAccountPublicKey
178-
});
174+
const bip32Account = new Wallet.KeyManagement.Bip32Account(
175+
{
176+
accountIndex,
177+
chainId,
178+
extendedAccountPublicKey: walletAccount.extendedAccountPublicKey
179+
},
180+
await Wallet.KeyManagement.Bip32Account.createDefaultDependencies()
181+
);
179182

180183
const useWebSocket = isExperimentEnabled(featureFlags, ExperimentName.WEBSOCKET_API);
181184
const localPollingIntervalConfig = !Number.isNaN(Number(process.env.WALLET_POLLING_INTERVAL_IN_SEC))

‎packages/cardano/package.json

Lines changed: 11 additions & 11 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.26.14",
44-
"@cardano-sdk/core": "0.45.10",
45-
"@cardano-sdk/crypto": "0.2.3",
46-
"@cardano-sdk/hardware-ledger": "0.15.13",
47-
"@cardano-sdk/hardware-trezor": "0.7.12",
48-
"@cardano-sdk/key-management": "0.27.11",
49-
"@cardano-sdk/tx-construction": "0.26.12",
50-
"@cardano-sdk/util": "0.16.0",
51-
"@cardano-sdk/wallet": "0.52.9",
52-
"@cardano-sdk/web-extension": "0.39.9",
43+
"@cardano-sdk/cardano-services-client": "0.26.16",
44+
"@cardano-sdk/core": "0.46.0",
45+
"@cardano-sdk/crypto": "0.3.0",
46+
"@cardano-sdk/hardware-ledger": "0.16.2",
47+
"@cardano-sdk/hardware-trezor": "0.7.15",
48+
"@cardano-sdk/key-management": "0.28.1",
49+
"@cardano-sdk/tx-construction": "0.27.2",
50+
"@cardano-sdk/util": "0.17.0",
51+
"@cardano-sdk/wallet": "0.53.2",
52+
"@cardano-sdk/web-extension": "0.39.12",
5353
"@lace/common": "0.1.0",
5454
"@ledgerhq/devices": "^8.4.4",
5555
"@stablelib/chacha20poly1305": "1.0.1",
@@ -73,7 +73,7 @@
7373
},
7474
"devDependencies": {
7575
"@blockfrost/blockfrost-js": "^5.5.0",
76-
"@cardano-sdk/util-dev": "0.25.16",
76+
"@cardano-sdk/util-dev": "0.25.18",
7777
"@emurgo/cardano-message-signing-browser": "1.0.1",
7878
"@types/webextension-polyfill": "0.10.0",
7979
"rollup-plugin-polyfill-node": "^0.8.0",

‎packages/cardano/src/wallet/lib/__tests__/blockfrost-address-discovery.test.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ describe('BlockfrostAddressDiscovery', () => {
4242
const paymentAddress2 = 'addr2...' as Cardano.PaymentAddress;
4343

4444
accountMock.deriveAddress
45-
.mockResolvedValueOnce({
45+
.mockReturnValueOnce({
4646
address: paymentAddress1,
4747
rewardAccount,
4848
type: AddressType.External,
@@ -54,7 +54,7 @@ describe('BlockfrostAddressDiscovery', () => {
5454
role: KeyRole.Stake
5555
}
5656
})
57-
.mockResolvedValue({
57+
.mockReturnValue({
5858
address: paymentAddress2,
5959
rewardAccount,
6060
type: AddressType.External,
@@ -104,7 +104,7 @@ describe('BlockfrostAddressDiscovery', () => {
104104
const rewardAccount = 'stake1u9p...' as Cardano.RewardAccount;
105105
const paymentAddress1 = 'addr1...' as Cardano.PaymentAddress;
106106

107-
accountMock.deriveAddress.mockResolvedValue({
107+
accountMock.deriveAddress.mockReturnValue({
108108
address: paymentAddress1,
109109
rewardAccount,
110110
type: AddressType.External,
@@ -130,7 +130,7 @@ describe('BlockfrostAddressDiscovery', () => {
130130
const paymentAddress1 = 'addr1...' as Cardano.PaymentAddress;
131131
const frankenAddress = 'addrUnknown...' as Cardano.PaymentAddress;
132132

133-
accountMock.deriveAddress.mockResolvedValue({
133+
accountMock.deriveAddress.mockReturnValue({
134134
address: paymentAddress1,
135135
rewardAccount,
136136
type: AddressType.External,

‎packages/cardano/src/wallet/lib/blockfrost-address-discovery.ts

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,21 @@ const fetchAllAddressesForAccount = async (
7575
/**
7676
* Derive the reward account (stake address) at a given stakeIndex.
7777
*/
78-
const deriveRewardAccount = async (account: Bip32Account, stakeIndex: number): Promise<Cardano.RewardAccount> => {
79-
const address = await account.deriveAddress({ type: AddressType.External, index: 0 }, stakeIndex);
78+
const deriveRewardAccount = (account: Bip32Account, stakeIndex: number): Cardano.RewardAccount => {
79+
const address = account.deriveAddress({ type: AddressType.External, index: 0 }, stakeIndex);
8080

8181
return address.rewardAccount;
8282
};
8383

8484
/**
8585
* Derive a payment address at a given (payment) index + address type (internal/external).
8686
*/
87-
const derivePaymentAddress = async (
87+
const derivePaymentAddress = (
8888
account: Bip32Account,
8989
paymentIndex: number,
9090
stakeIndex: number,
9191
isInternal: boolean
92-
): Promise<GroupedAddress> => {
92+
): GroupedAddress => {
9393
const type = isInternal ? AddressType.Internal : AddressType.External;
9494
return account.deriveAddress({ type, index: paymentIndex }, stakeIndex);
9595
};
@@ -101,12 +101,12 @@ const derivePaymentAddress = async (
101101
*
102102
* @returns Array of discovered (matched) addresses + leftover “unknown/franken” addresses
103103
*/
104-
const discoverAddressesForStakeKey = async (
104+
const discoverAddressesForStakeKey = (
105105
account: Bip32Account,
106106
logger: Logger,
107107
stakeIndex: number,
108108
allAddressesForStake: Cardano.PaymentAddress[]
109-
): Promise<{ discovered: GroupedAddress[]; unknown: Cardano.PaymentAddress[] }> => {
109+
): { discovered: GroupedAddress[]; unknown: Cardano.PaymentAddress[] } => {
110110
const discovered: GroupedAddress[] = [];
111111
const uniqueAddressesForStake = new Set(allAddressesForStake);
112112

@@ -120,10 +120,10 @@ const discoverAddressesForStakeKey = async (
120120
break;
121121
}
122122

123-
const externalAddr = await derivePaymentAddress(account, paymentIndex, stakeIndex, false);
123+
const externalAddr = derivePaymentAddress(account, paymentIndex, stakeIndex, false);
124124
const externalInSet = uniqueAddressesForStake.has(externalAddr.address as Cardano.PaymentAddress);
125125

126-
const internalAddr = await derivePaymentAddress(account, paymentIndex, stakeIndex, true);
126+
const internalAddr = derivePaymentAddress(account, paymentIndex, stakeIndex, true);
127127
const internalInSet = uniqueAddressesForStake.has(internalAddr.address as Cardano.PaymentAddress);
128128

129129
if (externalInSet) {
@@ -174,7 +174,7 @@ const discoverAddresses = async (
174174

175175
while (stakeGapCount < STAKE_KEY_GAP) {
176176
logger.debug(`Deriving reward account for stake index ${stakeIndex}...`);
177-
const rewardAccount = await deriveRewardAccount(account, stakeIndex);
177+
const rewardAccount = deriveRewardAccount(account, stakeIndex);
178178

179179
logger.debug(`Fetching addresses for stake credential ${rewardAccount}...`);
180180
const allAddressesForStake = await fetchAllAddressesForAccount(client, rewardAccount, logger);
@@ -187,12 +187,7 @@ const discoverAddresses = async (
187187

188188
stakeGapCount = 0;
189189

190-
const { discovered, unknown } = await discoverAddressesForStakeKey(
191-
account,
192-
logger,
193-
stakeIndex,
194-
allAddressesForStake
195-
);
190+
const { discovered, unknown } = discoverAddressesForStakeKey(account, logger, stakeIndex, allAddressesForStake);
196191

197192
discoveredAll.push(...discovered);
198193

@@ -226,7 +221,7 @@ export class BlockfrostAddressDiscovery implements AddressDiscovery {
226221
public async discover(manager: Bip32Account): Promise<GroupedAddress[]> {
227222
this.#logger.debug('Discovering addresses using Blockfrost...');
228223

229-
const firstAddress = await manager.deriveAddress({ index: 0, type: AddressType.External }, 0);
224+
const firstAddress = manager.deriveAddress({ index: 0, type: AddressType.External }, 0);
230225

231226
const discoveredAddresses = await discoverAddresses(manager, this.#client, this.#logger);
232227

‎packages/cardano/src/wallet/test/mocks/mock-wallet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const mockWallet = async (customKeyAgent?: KeyManagement.InMemoryKeyAgent
7474
handleProvider,
7575
logger,
7676
witnesser: KeyManagement.util.createBip32Ed25519Witnesser(asyncKeyAgent),
77-
bip32Account: new KeyManagement.Bip32Account(keyAgent)
77+
bip32Account: await KeyManagement.Bip32Account.fromAsyncKeyAgent(asyncKeyAgent)
7878
}
7979
);
8080

‎packages/common/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"watch": "yarn build --watch"
4040
},
4141
"dependencies": {
42-
"@cardano-sdk/util": "0.16.0",
42+
"@cardano-sdk/util": "0.17.0",
4343
"antd": "^4.24.10",
4444
"classnames": "^2.3.1",
4545
"jdenticon": "3.1.0",

‎packages/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@
4343
},
4444
"dependencies": {
4545
"@ant-design/icons": "^4.7.0",
46-
"@cardano-sdk/crypto": "0.2.3",
47-
"@cardano-sdk/wallet": "0.52.9",
48-
"@cardano-sdk/web-extension": "0.39.9",
46+
"@cardano-sdk/crypto": "0.3.0",
47+
"@cardano-sdk/wallet": "0.53.2",
48+
"@cardano-sdk/web-extension": "0.39.12",
4949
"@input-output-hk/lace-ui-toolkit": "3.8.0",
5050
"@lace/cardano": "0.1.0",
5151
"@lace/common": "0.1.0",

‎packages/nami/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@
5757
},
5858
"dependencies": {
5959
"@biglup/is-cid": "^1.0.3",
60-
"@cardano-sdk/core": "0.45.10",
61-
"@cardano-sdk/crypto": "0.2.3",
62-
"@cardano-sdk/tx-construction": "0.26.12",
63-
"@cardano-sdk/util": "0.16.0",
64-
"@cardano-sdk/web-extension": "0.39.9",
60+
"@cardano-sdk/core": "0.46.0",
61+
"@cardano-sdk/crypto": "0.3.0",
62+
"@cardano-sdk/tx-construction": "0.27.2",
63+
"@cardano-sdk/util": "0.17.0",
64+
"@cardano-sdk/web-extension": "0.39.12",
6565
"@chakra-ui/css-reset": "1.0.0",
6666
"@chakra-ui/icons": "1.0.13",
6767
"@chakra-ui/react": "1.6.4",

‎packages/nami/src/adapters/transactions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable functional/prefer-immutable-types */
1+
/* eslint-disable functional/prefer-immutable-types, @typescript-eslint/no-redundant-type-constituents */
22
import { useCallback, useEffect, useState, useMemo } from 'react';
33

44
import {

‎packages/nami/src/api/extension/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/* eslint-disable @typescript-eslint/no-unsafe-enum-comparison */
22
/* eslint-disable unicorn/no-null */
3+
/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
34
import {
45
Cardano,
56
Serialization,

‎packages/nami/src/features/dapp-outside-handles-provider/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
12
import type { Serialization } from '@cardano-sdk/core';
23
import type { Cip30DataSignature } from '@cardano-sdk/dapp-connector';
34
import type { HexBlob } from '@cardano-sdk/util';

0 commit comments

Comments
 (0)