Skip to content

Commit 7cd8c0c

Browse files
AngelCastilloBAngelCastilloB
authored
feat: sdk bump (#1921)
1 parent 8439de1 commit 7cd8c0c

File tree

8 files changed

+204
-199
lines changed

8 files changed

+204
-199
lines changed

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

Lines changed: 9 additions & 9 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.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",
59+
"@cardano-sdk/cardano-services-client": "0.26.18",
60+
"@cardano-sdk/core": "0.46.2",
61+
"@cardano-sdk/dapp-connector": "0.13.16",
62+
"@cardano-sdk/input-selection": "0.14.17",
63+
"@cardano-sdk/tx-construction": "0.27.4",
6464
"@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",
65+
"@cardano-sdk/util-rxjs": "0.9.19",
66+
"@cardano-sdk/wallet": "0.53.5",
67+
"@cardano-sdk/web-extension": "0.39.15",
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.16.2",
122+
"@cardano-sdk/hardware-ledger": "0.16.5",
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",

‎packages/cardano/package.json

Lines changed: 10 additions & 10 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.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",
43+
"@cardano-sdk/cardano-services-client": "0.26.18",
44+
"@cardano-sdk/core": "0.46.2",
45+
"@cardano-sdk/crypto": "0.4.1",
46+
"@cardano-sdk/hardware-ledger": "0.16.5",
47+
"@cardano-sdk/hardware-trezor": "0.7.17",
48+
"@cardano-sdk/key-management": "0.29.1",
49+
"@cardano-sdk/tx-construction": "0.27.4",
5050
"@cardano-sdk/util": "0.17.0",
51-
"@cardano-sdk/wallet": "0.53.2",
52-
"@cardano-sdk/web-extension": "0.39.12",
51+
"@cardano-sdk/wallet": "0.53.5",
52+
"@cardano-sdk/web-extension": "0.39.15",
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.18",
76+
"@cardano-sdk/util-dev": "0.25.20",
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-
.mockReturnValueOnce({
45+
.mockResolvedValueOnce({
4646
address: paymentAddress1,
4747
rewardAccount,
4848
type: AddressType.External,
@@ -54,7 +54,7 @@ describe('BlockfrostAddressDiscovery', () => {
5454
role: KeyRole.Stake
5555
}
5656
})
57-
.mockReturnValue({
57+
.mockResolvedValue({
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.mockReturnValue({
107+
accountMock.deriveAddress.mockResolvedValue({
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.mockReturnValue({
133+
accountMock.deriveAddress.mockResolvedValue({
134134
address: paymentAddress1,
135135
rewardAccount,
136136
type: AddressType.External,

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

Lines changed: 16 additions & 11 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 = (account: Bip32Account, stakeIndex: number): Cardano.RewardAccount => {
79-
const address = account.deriveAddress({ type: AddressType.External, index: 0 }, stakeIndex);
78+
const deriveRewardAccount = async (account: Bip32Account, stakeIndex: number): Promise<Cardano.RewardAccount> => {
79+
const address = await 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 = (
87+
const derivePaymentAddress = async (
8888
account: Bip32Account,
8989
paymentIndex: number,
9090
stakeIndex: number,
9191
isInternal: boolean
92-
): GroupedAddress => {
92+
): Promise<GroupedAddress> => {
9393
const type = isInternal ? AddressType.Internal : AddressType.External;
9494
return account.deriveAddress({ type, index: paymentIndex }, stakeIndex);
9595
};
@@ -101,12 +101,12 @@ const derivePaymentAddress = (
101101
*
102102
* @returns Array of discovered (matched) addresses + leftover “unknown/franken” addresses
103103
*/
104-
const discoverAddressesForStakeKey = (
104+
const discoverAddressesForStakeKey = async (
105105
account: Bip32Account,
106106
logger: Logger,
107107
stakeIndex: number,
108108
allAddressesForStake: Cardano.PaymentAddress[]
109-
): { discovered: GroupedAddress[]; unknown: Cardano.PaymentAddress[] } => {
109+
): Promise<{ discovered: GroupedAddress[]; unknown: Cardano.PaymentAddress[] }> => {
110110
const discovered: GroupedAddress[] = [];
111111
const uniqueAddressesForStake = new Set(allAddressesForStake);
112112

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

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

126-
const internalAddr = derivePaymentAddress(account, paymentIndex, stakeIndex, true);
126+
const internalAddr = await 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 = deriveRewardAccount(account, stakeIndex);
177+
const rewardAccount = await deriveRewardAccount(account, stakeIndex);
178178

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

188188
stakeGapCount = 0;
189189

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

192197
discoveredAll.push(...discovered);
193198

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

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

226231
const discoveredAddresses = await discoverAddresses(manager, this.#client, this.#logger);
227232

‎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.3.0",
47-
"@cardano-sdk/wallet": "0.53.2",
48-
"@cardano-sdk/web-extension": "0.39.12",
46+
"@cardano-sdk/crypto": "0.4.1",
47+
"@cardano-sdk/wallet": "0.53.5",
48+
"@cardano-sdk/web-extension": "0.39.15",
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: 4 additions & 4 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.46.0",
61-
"@cardano-sdk/crypto": "0.3.0",
62-
"@cardano-sdk/tx-construction": "0.27.2",
60+
"@cardano-sdk/core": "0.46.2",
61+
"@cardano-sdk/crypto": "0.4.1",
62+
"@cardano-sdk/tx-construction": "0.27.4",
6363
"@cardano-sdk/util": "0.17.0",
64-
"@cardano-sdk/web-extension": "0.39.12",
64+
"@cardano-sdk/web-extension": "0.39.15",
6565
"@chakra-ui/css-reset": "1.0.0",
6666
"@chakra-ui/icons": "1.0.13",
6767
"@chakra-ui/react": "1.6.4",

‎packages/staking/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@
7979
},
8080
"devDependencies": {
8181
"@babel/core": "^7.21.0",
82-
"@cardano-sdk/core": "0.46.0",
83-
"@cardano-sdk/input-selection": "0.14.15",
84-
"@cardano-sdk/tx-construction": "0.27.2",
82+
"@cardano-sdk/core": "0.46.2",
83+
"@cardano-sdk/input-selection": "0.14.17",
84+
"@cardano-sdk/tx-construction": "0.27.4",
8585
"@cardano-sdk/util": "0.17.0",
86-
"@cardano-sdk/wallet": "0.53.2",
87-
"@cardano-sdk/web-extension": "0.39.12",
86+
"@cardano-sdk/wallet": "0.53.5",
87+
"@cardano-sdk/web-extension": "0.39.15",
8888
"@storybook/addon-actions": "^7.6.7",
8989
"@storybook/addon-essentials": "^7.6.7",
9090
"@storybook/addon-interactions": "^7.6.7",
@@ -130,11 +130,11 @@
130130
"wait-on": "^7.0.1"
131131
},
132132
"peerDependencies": {
133-
"@cardano-sdk/input-selection": "0.14.15",
134-
"@cardano-sdk/tx-construction": "0.27.2",
133+
"@cardano-sdk/input-selection": "0.14.17",
134+
"@cardano-sdk/tx-construction": "0.27.4",
135135
"@cardano-sdk/util": "0.17.0",
136-
"@cardano-sdk/wallet": "0.53.2",
137-
"@cardano-sdk/web-extension": "0.39.12",
136+
"@cardano-sdk/wallet": "0.53.5",
137+
"@cardano-sdk/web-extension": "0.39.15",
138138
"@lace/cardano": "^0.1.0",
139139
"@lace/common": "^0.1.0",
140140
"@lace/core": "0.1.0",

0 commit comments

Comments
 (0)