Skip to content

feat: sdk bump #1921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions apps/browser-extension-wallet/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@
},
"dependencies": {
"@ant-design/icons": "^4.7.0",
"@cardano-sdk/cardano-services-client": "0.26.16",
"@cardano-sdk/core": "0.46.0",
"@cardano-sdk/dapp-connector": "0.13.14",
"@cardano-sdk/input-selection": "0.14.15",
"@cardano-sdk/tx-construction": "0.27.2",
"@cardano-sdk/cardano-services-client": "0.26.18",
"@cardano-sdk/core": "0.46.2",
"@cardano-sdk/dapp-connector": "0.13.16",
"@cardano-sdk/input-selection": "0.14.17",
"@cardano-sdk/tx-construction": "0.27.4",
"@cardano-sdk/util": "0.17.0",
"@cardano-sdk/util-rxjs": "0.9.17",
"@cardano-sdk/wallet": "0.53.2",
"@cardano-sdk/web-extension": "0.39.12",
"@cardano-sdk/util-rxjs": "0.9.19",
"@cardano-sdk/wallet": "0.53.5",
"@cardano-sdk/web-extension": "0.39.15",
"@emurgo/cip14-js": "~3.0.1",
"@input-output-hk/lace-ui-toolkit": "3.5.0",
"@lace/bitcoin": "0.1.0",
Expand Down Expand Up @@ -119,7 +119,7 @@
"zustand": "3.5.14"
},
"devDependencies": {
"@cardano-sdk/hardware-ledger": "0.16.2",
"@cardano-sdk/hardware-ledger": "0.16.5",
"@emurgo/cardano-message-signing-asmjs": "1.0.1",
"@openpgp/web-stream-tools": "0.0.11-patch-0",
"@pdfme/common": "^4.0.2",
Expand Down
20 changes: 10 additions & 10 deletions packages/cardano/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@
"watch": "yarn build --watch"
},
"dependencies": {
"@cardano-sdk/cardano-services-client": "0.26.16",
"@cardano-sdk/core": "0.46.0",
"@cardano-sdk/crypto": "0.3.0",
"@cardano-sdk/hardware-ledger": "0.16.2",
"@cardano-sdk/hardware-trezor": "0.7.15",
"@cardano-sdk/key-management": "0.28.1",
"@cardano-sdk/tx-construction": "0.27.2",
"@cardano-sdk/cardano-services-client": "0.26.18",
"@cardano-sdk/core": "0.46.2",
"@cardano-sdk/crypto": "0.4.1",
"@cardano-sdk/hardware-ledger": "0.16.5",
"@cardano-sdk/hardware-trezor": "0.7.17",
"@cardano-sdk/key-management": "0.29.1",
"@cardano-sdk/tx-construction": "0.27.4",
"@cardano-sdk/util": "0.17.0",
"@cardano-sdk/wallet": "0.53.2",
"@cardano-sdk/web-extension": "0.39.12",
"@cardano-sdk/wallet": "0.53.5",
"@cardano-sdk/web-extension": "0.39.15",
"@lace/common": "0.1.0",
"@ledgerhq/devices": "^8.4.4",
"@stablelib/chacha20poly1305": "1.0.1",
Expand All @@ -73,7 +73,7 @@
},
"devDependencies": {
"@blockfrost/blockfrost-js": "^5.5.0",
"@cardano-sdk/util-dev": "0.25.18",
"@cardano-sdk/util-dev": "0.25.20",
"@emurgo/cardano-message-signing-browser": "1.0.1",
"@types/webextension-polyfill": "0.10.0",
"rollup-plugin-polyfill-node": "^0.8.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('BlockfrostAddressDiscovery', () => {
const paymentAddress2 = 'addr2...' as Cardano.PaymentAddress;

accountMock.deriveAddress
.mockReturnValueOnce({
.mockResolvedValueOnce({
address: paymentAddress1,
rewardAccount,
type: AddressType.External,
Expand All @@ -54,7 +54,7 @@ describe('BlockfrostAddressDiscovery', () => {
role: KeyRole.Stake
}
})
.mockReturnValue({
.mockResolvedValue({
address: paymentAddress2,
rewardAccount,
type: AddressType.External,
Expand Down Expand Up @@ -104,7 +104,7 @@ describe('BlockfrostAddressDiscovery', () => {
const rewardAccount = 'stake1u9p...' as Cardano.RewardAccount;
const paymentAddress1 = 'addr1...' as Cardano.PaymentAddress;

accountMock.deriveAddress.mockReturnValue({
accountMock.deriveAddress.mockResolvedValue({
address: paymentAddress1,
rewardAccount,
type: AddressType.External,
Expand All @@ -130,7 +130,7 @@ describe('BlockfrostAddressDiscovery', () => {
const paymentAddress1 = 'addr1...' as Cardano.PaymentAddress;
const frankenAddress = 'addrUnknown...' as Cardano.PaymentAddress;

accountMock.deriveAddress.mockReturnValue({
accountMock.deriveAddress.mockResolvedValue({
address: paymentAddress1,
rewardAccount,
type: AddressType.External,
Expand Down
27 changes: 16 additions & 11 deletions packages/cardano/src/wallet/lib/blockfrost-address-discovery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,21 +75,21 @@ const fetchAllAddressesForAccount = async (
/**
* Derive the reward account (stake address) at a given stakeIndex.
*/
const deriveRewardAccount = (account: Bip32Account, stakeIndex: number): Cardano.RewardAccount => {
const address = account.deriveAddress({ type: AddressType.External, index: 0 }, stakeIndex);
const deriveRewardAccount = async (account: Bip32Account, stakeIndex: number): Promise<Cardano.RewardAccount> => {
const address = await account.deriveAddress({ type: AddressType.External, index: 0 }, stakeIndex);

return address.rewardAccount;
};

/**
* Derive a payment address at a given (payment) index + address type (internal/external).
*/
const derivePaymentAddress = (
const derivePaymentAddress = async (
account: Bip32Account,
paymentIndex: number,
stakeIndex: number,
isInternal: boolean
): GroupedAddress => {
): Promise<GroupedAddress> => {
const type = isInternal ? AddressType.Internal : AddressType.External;
return account.deriveAddress({ type, index: paymentIndex }, stakeIndex);
};
Expand All @@ -101,12 +101,12 @@ const derivePaymentAddress = (
*
* @returns Array of discovered (matched) addresses + leftover “unknown/franken” addresses
*/
const discoverAddressesForStakeKey = (
const discoverAddressesForStakeKey = async (
account: Bip32Account,
logger: Logger,
stakeIndex: number,
allAddressesForStake: Cardano.PaymentAddress[]
): { discovered: GroupedAddress[]; unknown: Cardano.PaymentAddress[] } => {
): Promise<{ discovered: GroupedAddress[]; unknown: Cardano.PaymentAddress[] }> => {
const discovered: GroupedAddress[] = [];
const uniqueAddressesForStake = new Set(allAddressesForStake);

Expand All @@ -120,10 +120,10 @@ const discoverAddressesForStakeKey = (
break;
}

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

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

if (externalInSet) {
Expand Down Expand Up @@ -174,7 +174,7 @@ const discoverAddresses = async (

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

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

stakeGapCount = 0;

const { discovered, unknown } = discoverAddressesForStakeKey(account, logger, stakeIndex, allAddressesForStake);
const { discovered, unknown } = await discoverAddressesForStakeKey(
account,
logger,
stakeIndex,
allAddressesForStake
);

discoveredAll.push(...discovered);

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

const firstAddress = manager.deriveAddress({ index: 0, type: AddressType.External }, 0);
const firstAddress = await manager.deriveAddress({ index: 0, type: AddressType.External }, 0);

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

Expand Down
6 changes: 3 additions & 3 deletions packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
},
"dependencies": {
"@ant-design/icons": "^4.7.0",
"@cardano-sdk/crypto": "0.3.0",
"@cardano-sdk/wallet": "0.53.2",
"@cardano-sdk/web-extension": "0.39.12",
"@cardano-sdk/crypto": "0.4.1",
"@cardano-sdk/wallet": "0.53.5",
"@cardano-sdk/web-extension": "0.39.15",
"@input-output-hk/lace-ui-toolkit": "3.8.0",
"@lace/cardano": "0.1.0",
"@lace/common": "0.1.0",
Expand Down
8 changes: 4 additions & 4 deletions packages/nami/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@
},
"dependencies": {
"@biglup/is-cid": "^1.0.3",
"@cardano-sdk/core": "0.46.0",
"@cardano-sdk/crypto": "0.3.0",
"@cardano-sdk/tx-construction": "0.27.2",
"@cardano-sdk/core": "0.46.2",
"@cardano-sdk/crypto": "0.4.1",
"@cardano-sdk/tx-construction": "0.27.4",
"@cardano-sdk/util": "0.17.0",
"@cardano-sdk/web-extension": "0.39.12",
"@cardano-sdk/web-extension": "0.39.15",
"@chakra-ui/css-reset": "1.0.0",
"@chakra-ui/icons": "1.0.13",
"@chakra-ui/react": "1.6.4",
Expand Down
18 changes: 9 additions & 9 deletions packages/staking/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
},
"devDependencies": {
"@babel/core": "^7.21.0",
"@cardano-sdk/core": "0.46.0",
"@cardano-sdk/input-selection": "0.14.15",
"@cardano-sdk/tx-construction": "0.27.2",
"@cardano-sdk/core": "0.46.2",
"@cardano-sdk/input-selection": "0.14.17",
"@cardano-sdk/tx-construction": "0.27.4",
"@cardano-sdk/util": "0.17.0",
"@cardano-sdk/wallet": "0.53.2",
"@cardano-sdk/web-extension": "0.39.12",
"@cardano-sdk/wallet": "0.53.5",
"@cardano-sdk/web-extension": "0.39.15",
"@storybook/addon-actions": "^7.6.7",
"@storybook/addon-essentials": "^7.6.7",
"@storybook/addon-interactions": "^7.6.7",
Expand Down Expand Up @@ -130,11 +130,11 @@
"wait-on": "^7.0.1"
},
"peerDependencies": {
"@cardano-sdk/input-selection": "0.14.15",
"@cardano-sdk/tx-construction": "0.27.2",
"@cardano-sdk/input-selection": "0.14.17",
"@cardano-sdk/tx-construction": "0.27.4",
"@cardano-sdk/util": "0.17.0",
"@cardano-sdk/wallet": "0.53.2",
"@cardano-sdk/web-extension": "0.39.12",
"@cardano-sdk/wallet": "0.53.5",
"@cardano-sdk/web-extension": "0.39.15",
"@lace/cardano": "^0.1.0",
"@lace/common": "^0.1.0",
"@lace/core": "0.1.0",
Expand Down
Loading
Loading