Skip to content

Commit e3c67cb

Browse files
feat: bump cardano-js-sdk (#1986)
1 parent 1e1f0a5 commit e3c67cb

File tree

10 files changed

+150
-142
lines changed

10 files changed

+150
-142
lines changed

apps/browser-extension-wallet/package.json

Lines changed: 7 additions & 7 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.26",
59+
"@cardano-sdk/cardano-services-client": "0.26.27",
6060
"@cardano-sdk/core": "0.46.9",
6161
"@cardano-sdk/dapp-connector": "0.13.23",
62-
"@cardano-sdk/input-selection": "0.14.24",
63-
"@cardano-sdk/tx-construction": "0.28.6",
62+
"@cardano-sdk/input-selection": "0.14.25",
63+
"@cardano-sdk/tx-construction": "0.28.7",
6464
"@cardano-sdk/util": "0.17.0",
65-
"@cardano-sdk/util-rxjs": "0.9.26",
66-
"@cardano-sdk/wallet": "0.53.17",
67-
"@cardano-sdk/web-extension": "0.39.27",
65+
"@cardano-sdk/util-rxjs": "0.9.27",
66+
"@cardano-sdk/wallet": "0.53.20",
67+
"@cardano-sdk/web-extension": "0.39.30",
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.16",
122+
"@cardano-sdk/hardware-ledger": "0.16.18",
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/dapp/components/ConfirmData.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,14 @@ export const DappConfirmData = (): React.ReactElement => {
115115
drepAddr?.getType() === Wallet.Cardano.AddressType.EnterpriseKey &&
116116
drepAddr?.getProps().paymentPart?.hash === ownPubDRepKeyHash
117117
) {
118-
txDataAddress = Wallet.Cardano.DRepID.cip129FromCredential({
119-
hash: drepAddr?.getProps().paymentPart?.hash,
120-
type: Wallet.Cardano.CredentialType.KeyHash
121-
});
118+
txDataAddress = Wallet.Cardano.DRepID.toAddress(
119+
Wallet.Cardano.DRepID.cip129FromCredential({
120+
hash: drepAddr?.getProps().paymentPart?.hash,
121+
type: Wallet.Cardano.CredentialType.KeyHash
122+
})
123+
)
124+
.toAddress()
125+
.toBech32();
122126
}
123127
}
124128

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* eslint-disable no-magic-numbers */
1+
/* eslint-disable no-magic-numbers, new-cap */
22
import { POPUP_WINDOW, POPUP_WINDOW_NAMI, POPUP_WINDOW_NAMI_TITLE } from '@src/utils/constants';
33
import { runtime, Tabs, tabs, Windows, windows } from 'webextension-polyfill';
44
import { Wallet } from '@lace/cardano';
@@ -14,6 +14,7 @@ import {
1414
import * as KeyManagement from '@cardano-sdk/key-management';
1515
import { getBackgroundStorage } from './storage';
1616
import { catchAndBrandExtensionApiError } from '@utils/catch-and-brand-extension-api-error';
17+
import { HexBlob } from '@cardano-sdk/util';
1718

1819
const { blake2b } = Wallet.Crypto;
1920
const DAPP_CONNECTOR_REGEX = new RegExp(/dappconnector/i);
@@ -200,4 +201,4 @@ export const getWalletName = (): string => {
200201
};
201202

202203
export const hashExtendedAccountPublicKey = (extendedAccountPublicKey: string): string =>
203-
blake2b.hash(extendedAccountPublicKey, 16);
204+
blake2b.hash(HexBlob(extendedAccountPublicKey), 16);

packages/cardano/package.json

Lines changed: 8 additions & 8 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.26",
43+
"@cardano-sdk/cardano-services-client": "0.26.27",
4444
"@cardano-sdk/core": "0.46.9",
4545
"@cardano-sdk/crypto": "0.4.3",
46-
"@cardano-sdk/hardware-ledger": "0.16.16",
47-
"@cardano-sdk/hardware-trezor": "0.7.25",
48-
"@cardano-sdk/key-management": "0.29.8",
49-
"@cardano-sdk/tx-construction": "0.28.6",
46+
"@cardano-sdk/hardware-ledger": "0.16.18",
47+
"@cardano-sdk/hardware-trezor": "0.7.28",
48+
"@cardano-sdk/key-management": "0.29.9",
49+
"@cardano-sdk/tx-construction": "0.28.7",
5050
"@cardano-sdk/util": "0.17.0",
51-
"@cardano-sdk/wallet": "0.53.17",
52-
"@cardano-sdk/web-extension": "0.39.27",
51+
"@cardano-sdk/wallet": "0.53.20",
52+
"@cardano-sdk/web-extension": "0.39.30",
5353
"@lace/common": "0.1.0",
5454
"@ledgerhq/devices": "^8.4.4",
5555
"@stablelib/chacha20poly1305": "1.0.1",
@@ -74,7 +74,7 @@
7474
},
7575
"devDependencies": {
7676
"@blockfrost/blockfrost-js": "^5.5.0",
77-
"@cardano-sdk/util-dev": "0.25.27",
77+
"@cardano-sdk/util-dev": "0.25.28",
7878
"@emurgo/cardano-message-signing-browser": "1.0.1",
7979
"@types/webextension-polyfill": "0.10.0",
8080
"rollup-plugin-polyfill-node": "^0.8.0",

packages/cardano/src/wallet/lib/stakePoolService.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// cSpell:ignore delegators
2-
/* eslint-disable camelcase */
2+
/* eslint-disable camelcase, new-cap */
33
/* eslint-disable unicorn/no-array-callback-reference */
44

55
import { BlockfrostClient } from '@cardano-sdk/cardano-services-client';
@@ -12,7 +12,7 @@ import {
1212
StakePoolSortOptions,
1313
StakePoolStats
1414
} from '@cardano-sdk/core';
15-
import { fromSerializableObject, toSerializableObject } from '@cardano-sdk/util';
15+
import { fromSerializableObject, Percent, toSerializableObject } from '@cardano-sdk/util';
1616
import { Storage } from 'webextension-polyfill';
1717
import type { Responses } from '@blockfrost/blockfrost-js';
1818
import Fuse from 'fuse.js';
@@ -89,11 +89,11 @@ const toCore = (pool: BlockFrostPool): Cardano.StakePool => ({
8989
blocksCreated: pool.blocks_minted,
9090
delegators: 0,
9191
livePledge: BigInt(0),
92-
saturation: pool.live_saturation,
93-
size: { active: 0, live: 0 },
92+
saturation: Percent(pool.live_saturation),
93+
size: { active: Percent(0), live: Percent(0) },
9494
stake: { active: BigInt(pool.active_stake), live: BigInt(pool.live_stake) },
95-
lastRos: 0,
96-
ros: 0
95+
lastRos: Percent(0),
96+
ros: Percent(0)
9797
},
9898
owners: [],
9999
pledge: BigInt(pool.declared_pledge),
@@ -216,9 +216,9 @@ const enrichStakePool = ({ details, networkData, id, stakePools }: enrichStakePo
216216
stakePool.metrics.livePledge = BigInt(details.live_pledge);
217217
stakePool.metrics.delegators = details.live_delegators;
218218
// The `if` containing this branch makes the stakePool a StakePoolWithMetrics
219-
stakePool.metrics.ros = estimateROS(stakePool as StakePoolWithMetrics, networkData);
219+
stakePool.metrics.ros = Percent(estimateROS(stakePool as StakePoolWithMetrics, networkData));
220220
}
221-
stakePool.owners = details.owners;
221+
stakePool.owners = details.owners.map((owner) => Cardano.RewardAccount(owner));
222222
}
223223
};
224224

packages/core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
"dependencies": {
4444
"@ant-design/icons": "^4.7.0",
4545
"@cardano-sdk/crypto": "0.4.3",
46-
"@cardano-sdk/wallet": "0.53.17",
47-
"@cardano-sdk/web-extension": "0.39.27",
46+
"@cardano-sdk/wallet": "0.53.20",
47+
"@cardano-sdk/web-extension": "0.39.30",
4848
"@input-output-hk/lace-ui-toolkit": "3.8.0",
4949
"@lace/cardano": "0.1.0",
5050
"@lace/common": "0.1.0",

packages/nami/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@
5757
"@biglup/is-cid": "^1.0.3",
5858
"@cardano-sdk/core": "0.46.9",
5959
"@cardano-sdk/crypto": "0.4.3",
60-
"@cardano-sdk/tx-construction": "0.28.6",
60+
"@cardano-sdk/tx-construction": "0.28.7",
6161
"@cardano-sdk/util": "0.17.0",
62-
"@cardano-sdk/web-extension": "0.39.27",
62+
"@cardano-sdk/web-extension": "0.39.30",
6363
"@chakra-ui/css-reset": "1.0.0",
6464
"@chakra-ui/icons": "1.0.13",
6565
"@chakra-ui/react": "1.6.4",

packages/staking/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@
7979
"devDependencies": {
8080
"@babel/core": "^7.21.0",
8181
"@cardano-sdk/core": "0.46.9",
82-
"@cardano-sdk/input-selection": "0.14.24",
83-
"@cardano-sdk/tx-construction": "0.28.6",
82+
"@cardano-sdk/input-selection": "0.14.25",
83+
"@cardano-sdk/tx-construction": "0.28.7",
8484
"@cardano-sdk/util": "0.17.0",
85-
"@cardano-sdk/wallet": "0.53.17",
86-
"@cardano-sdk/web-extension": "0.39.27",
85+
"@cardano-sdk/wallet": "0.53.20",
86+
"@cardano-sdk/web-extension": "0.39.30",
8787
"@storybook/addon-actions": "^7.6.7",
8888
"@storybook/addon-essentials": "^7.6.7",
8989
"@storybook/addon-interactions": "^7.6.7",
@@ -129,11 +129,11 @@
129129
"wait-on": "^7.0.1"
130130
},
131131
"peerDependencies": {
132-
"@cardano-sdk/input-selection": "0.14.24",
133-
"@cardano-sdk/tx-construction": "0.28.6",
132+
"@cardano-sdk/input-selection": "0.14.25",
133+
"@cardano-sdk/tx-construction": "0.28.7",
134134
"@cardano-sdk/util": "0.17.0",
135-
"@cardano-sdk/wallet": "0.53.17",
136-
"@cardano-sdk/web-extension": "0.39.27",
135+
"@cardano-sdk/wallet": "0.53.20",
136+
"@cardano-sdk/web-extension": "0.39.30",
137137
"@lace/cardano": "^0.1.0",
138138
"@lace/common": "^0.1.0",
139139
"@lace/core": "0.1.0",

packages/staking/src/features/Drawer/StakePoolDetail.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ export const StakePoolDetail = ({ popupView }: { popupView?: boolean }): React.R
4646

4747
useEffect(() => {
4848
stakePoolProvider
49-
.queryStakePools({ filters: { identifier: { values: [{ id }] } }, pagination: { limit: 1, startAt: 0 } })
49+
.queryStakePools({
50+
filters: { identifier: { values: [{ id: Wallet.Cardano.PoolId(id) }] } },
51+
pagination: { limit: 1, startAt: 0 },
52+
})
5053
.then(({ pageResults: [stakePool] }) => stakePool && setDetails(mapStakePoolToDisplayData({ stakePool })))
5154
.catch(logger.error);
5255
}, [id, stakePoolProvider]);

0 commit comments

Comments
 (0)