diff --git a/package.json b/package.json index e8d9272c..8e9164af 100644 --- a/package.json +++ b/package.json @@ -35,5 +35,5 @@ "typescript": "^5.0.4" }, "packageManager": "yarn@3.5.0", - "stableVersion": "4.1.9-11" + "stableVersion": "4.1.9-12" } diff --git a/packages/sdk-core/package.json b/packages/sdk-core/package.json index 1b3c1eeb..aef79076 100644 --- a/packages/sdk-core/package.json +++ b/packages/sdk-core/package.json @@ -19,7 +19,7 @@ "@polkadot/api": "^10" }, "dependencies": { - "@acala-network/types": "^6.0.0-34", + "@acala-network/types": "^6.0.4", "@polkadot/api": "^10.9.1", "bignumber.js": "^9.0.0", "lodash": "^4.17.20" diff --git a/packages/sdk-homa/package.json b/packages/sdk-homa/package.json index 228ad50d..486a41fc 100644 --- a/packages/sdk-homa/package.json +++ b/packages/sdk-homa/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@acala-network/sdk-core": "4.1.9-12", - "@acala-network/types": "^6.0.0-34", + "@acala-network/types": "^6.0.4", "@polkadot/api": "^10.9.1", "lodash": "^4.17.20", "rxjs": "^7.8.1" diff --git a/packages/sdk-loan/package.json b/packages/sdk-loan/package.json index 70e22451..dcacdce7 100644 --- a/packages/sdk-loan/package.json +++ b/packages/sdk-loan/package.json @@ -20,7 +20,7 @@ }, "dependencies": { "@acala-network/sdk": "4.1.9-12", - "@acala-network/types": "^6.0.0-34", + "@acala-network/types": "^6.0.4", "@polkadot/api": "^10.9.1", "lodash": "^4.17.20", "rxjs": "^7.8.1" diff --git a/packages/sdk-swap/package.json b/packages/sdk-swap/package.json index 975303be..93faef93 100644 --- a/packages/sdk-swap/package.json +++ b/packages/sdk-swap/package.json @@ -21,7 +21,7 @@ "dependencies": { "@acala-network/sdk": "^4.1.9-12", "@acala-network/sdk-core": "^4.1.9-12", - "@acala-network/types": "^6.0.0-34", + "@acala-network/types": "^6.0.4", "@polkadot/api": "^10.9.1", "rxjs": "^7.8.1" }, diff --git a/packages/sdk/package.json b/packages/sdk/package.json index e2557c3e..314e67c2 100644 --- a/packages/sdk/package.json +++ b/packages/sdk/package.json @@ -19,13 +19,13 @@ "homepage": "https://github.com/AcalaNetwork/acala.js", "peerDependencies": { "@acala-network/api": "^5", - "@acala-network/eth-providers": "~2.7.3", + "@acala-network/eth-providers": "~2.7.18", "@polkadot/api": "^10", "ethers": "~5.7.0" }, "dependencies": { "@acala-network/api": "^5.1.1", - "@acala-network/eth-providers": "~2.7.3", + "@acala-network/eth-providers": "~2.7.18", "@acala-network/sdk-core": "4.1.9-12", "@polkadot/api": "^10.9.1", "axios": "^0.24.0", diff --git a/packages/sdk/src/wallet/balance-adapter/acala.ts b/packages/sdk/src/wallet/balance-adapter/acala.ts index 7d7a7063..fece5764 100644 --- a/packages/sdk/src/wallet/balance-adapter/acala.ts +++ b/packages/sdk/src/wallet/balance-adapter/acala.ts @@ -65,7 +65,7 @@ export class AcalaBalanceAdapter implements AcalaExpandBalanceAdapter { private transformNative = (data: FrameSystemAccountInfo, token: Token) => { const free = FN.fromInner(data.data.free.toString(), token.decimals); - const locked = FN.fromInner((data.data.miscFrozen || data.data.frozen).toString(), token.decimals); + const locked = FN.fromInner(((data.data as any).miscFrozen || data.data.frozen).toString(), token.decimals); const reserved = FN.fromInner(data.data.reserved.toString(), token.decimals); const available = free.sub(locked).max(FN.ZERO); diff --git a/packages/sdk/src/wallet/vesting/index.ts b/packages/sdk/src/wallet/vesting/index.ts index 3df26ccd..2cad7a49 100644 --- a/packages/sdk/src/wallet/vesting/index.ts +++ b/packages/sdk/src/wallet/vesting/index.ts @@ -4,7 +4,7 @@ import { Option, Vec } from '@polkadot/types'; import { OrmlVestingVestingSchedule, PalletBalancesBalanceLock, - PolkadotPrimitivesV2PersistedValidationData + PolkadotPrimitivesV5PersistedValidationData } from '@polkadot/types/lookup'; import { combineLatest, firstValueFrom, map, Observable } from 'rxjs'; import { TokenProvider } from '../token-provider/type'; @@ -36,7 +36,7 @@ export class Vesting { params: [address] }).observable; // get parachain block api.query.parachainSystem.validationData() - const parachain$ = Storage.create>({ + const parachain$ = Storage.create>({ api: this.api, path: 'query.parachainSystem.validationData', params: [] diff --git a/packages/sdk/src/wallet/wallet.ts b/packages/sdk/src/wallet/wallet.ts index 9dc7621f..87a57ba7 100644 --- a/packages/sdk/src/wallet/wallet.ts +++ b/packages/sdk/src/wallet/wallet.ts @@ -218,7 +218,7 @@ export class Wallet implements BaseSDK { const consumers = accountInfo.consumers.toBigInt(); const nativeFreeBalance = FN.fromInner(accountInfo.data.free.toString(), nativeToken.decimals); const nativeLockedBalance = FN.fromInner( - (accountInfo.data.miscFrozen || accountInfo.data.frozen).toString(), + ((accountInfo.data as any).miscFrozen || accountInfo.data.frozen).toString(), nativeToken.decimals ); const isDefaultFee = forceToCurrencyName(feeToken) === nativeToken.name; diff --git a/packages/wormhole-portal/package.json b/packages/wormhole-portal/package.json index eb12d42d..4bc45bfa 100644 --- a/packages/wormhole-portal/package.json +++ b/packages/wormhole-portal/package.json @@ -16,13 +16,13 @@ "homepage": "https://github.com/AcalaNetwork/acala.js", "peerDependencies": { "@acala-network/api": "^5", - "@acala-network/eth-providers": "~2.7.3", + "@acala-network/eth-providers": "~2.7.18", "@polkadot/api": "^10", "ethers": "~5.7.0" }, "dependencies": { "@acala-network/api": "^5.1.1", - "@acala-network/eth-providers": "~2.7.3", + "@acala-network/eth-providers": "~2.7.18", "@acala-network/sdk": "^4.1.9-12", "@certusone/wormhole-sdk": "^0.5.0", "@ethersproject/bignumber": "^5.7.0", diff --git a/packages/wormhole-portal/src/utils/get-tx-receipt-with-retry.ts b/packages/wormhole-portal/src/utils/get-tx-receipt-with-retry.ts index 78649180..e0852664 100644 --- a/packages/wormhole-portal/src/utils/get-tx-receipt-with-retry.ts +++ b/packages/wormhole-portal/src/utils/get-tx-receipt-with-retry.ts @@ -13,7 +13,7 @@ export async function getTxReceiptWithRetry( attempts++; await new Promise((resolve) => setTimeout(resolve, retryTimeout)); try { - result = await provider.getReceiptByHash(hash); + result = await provider.getReceipt(hash); } catch (e) { if (retryAttempts !== undefined && attempts > retryAttempts) { throw e; diff --git a/yarn.lock b/yarn.lock index 80f36f0c..b89731a9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -36,52 +36,32 @@ __metadata: languageName: node linkType: hard -"@acala-network/eth-providers@npm:~2.7.3": - version: 2.7.3 - resolution: "@acala-network/eth-providers@npm:2.7.3" +"@acala-network/eth-providers@npm:~2.7.18": + version: 2.7.18 + resolution: "@acala-network/eth-providers@npm:2.7.18" dependencies: "@acala-network/contracts": 4.3.4 - "@acala-network/eth-transactions": 2.7.3 - "@ethersproject/abstract-provider": ~5.7.0 - "@ethersproject/address": ~5.7.0 - "@ethersproject/bignumber": ~5.7.0 - "@ethersproject/bytes": ~5.7.0 - "@ethersproject/contracts": ~5.7.0 - "@ethersproject/keccak256": ~5.7.0 - "@ethersproject/logger": ~5.7.0 - "@ethersproject/networks": ~5.7.0 - "@ethersproject/properties": ~5.7.0 - "@ethersproject/providers": ~5.7.0 - "@ethersproject/transactions": ~5.7.0 - "@ethersproject/wallet": ~5.7.0 + "@acala-network/eth-transactions": 2.7.18 bn.js: ~5.2.0 ethers: ~5.7.0 graphql: ~16.0.1 graphql-request: ~3.6.1 lru-cache: ~7.8.2 peerDependencies: - "@acala-network/api": ~5.1.1 - "@polkadot/api": ^10.5.1 - checksum: 6d23c370d03680b11bb9cee2576f828c8c5bc6e0fc617040eee0892a9e58822e38b8b8faad848c9ab29301b5f7c2460053ccd903ea996fc71bd47ce2f5892d8f + "@acala-network/api": ~6.0.4 + "@polkadot/api": ^10.11.1 + checksum: 20ba427f9d6c5cdadd2f84574d91817a28414f8e16b9488ec6ef133a7b0fe2523c6b8df8a03b6cc5ea5ad8149649adee47e05d6cf18faff9088465824df53d2c languageName: node linkType: hard -"@acala-network/eth-transactions@npm:2.7.3": - version: 2.7.3 - resolution: "@acala-network/eth-transactions@npm:2.7.3" +"@acala-network/eth-transactions@npm:2.7.18": + version: 2.7.18 + resolution: "@acala-network/eth-transactions@npm:2.7.18" dependencies: - "@ethersproject/address": ~5.7.0 - "@ethersproject/bignumber": ~5.7.0 - "@ethersproject/bytes": ~5.7.0 - "@ethersproject/constants": ~5.7.0 - "@ethersproject/hash": ~5.7.0 - "@ethersproject/logger": ~5.7.0 - "@ethersproject/rlp": ~5.7.0 - "@ethersproject/transactions": ~5.7.0 - "@ethersproject/wallet": ~5.7.0 + ethers: ~5.7.0 peerDependencies: - "@polkadot/util-crypto": ^12.1.2 - checksum: 87da93dc640089e07c6905e4dcbabd2d7f060f4819f8c8e722b96542d803c3b1d6aeba9a97fded6abe7983ab6b901b7a7a54bd94e50f187517e772b432231114 + "@polkadot/util-crypto": ^12.4.2 + checksum: bc80d9f9c7bdc13159b51e63ccbac2a87d8631edd59e2522ca133af8363d3f8f518a9d76a7ba947c35703d27191e6e7118e249c31c98b20688832b2f3a33b5dd languageName: node linkType: hard @@ -89,7 +69,7 @@ __metadata: version: 0.0.0-use.local resolution: "@acala-network/sdk-core@workspace:packages/sdk-core" dependencies: - "@acala-network/types": ^6.0.0-34 + "@acala-network/types": ^6.0.4 "@polkadot/api": ^10.9.1 "@types/lodash": ^4.14.161 bignumber.js: ^9.0.0 @@ -105,7 +85,7 @@ __metadata: resolution: "@acala-network/sdk-homa@workspace:packages/sdk-homa" dependencies: "@acala-network/sdk-core": 4.1.9-12 - "@acala-network/types": ^6.0.0-34 + "@acala-network/types": ^6.0.4 "@polkadot/api": ^10.9.1 "@types/lodash": ^4.14.161 lodash: ^4.17.20 @@ -121,7 +101,7 @@ __metadata: resolution: "@acala-network/sdk-loan@workspace:packages/sdk-loan" dependencies: "@acala-network/sdk": 4.1.9-12 - "@acala-network/types": ^6.0.0-34 + "@acala-network/types": ^6.0.4 "@polkadot/api": ^10.9.1 "@types/lodash": ^4.14.161 lodash: ^4.17.20 @@ -152,7 +132,7 @@ __metadata: dependencies: "@acala-network/sdk": ^4.1.9-12 "@acala-network/sdk-core": ^4.1.9-12 - "@acala-network/types": ^6.0.0-34 + "@acala-network/types": ^6.0.4 "@polkadot/api": ^10.9.1 "@types/lodash": ^4.14.161 rxjs: ^7.8.1 @@ -167,7 +147,7 @@ __metadata: resolution: "@acala-network/sdk@workspace:packages/sdk" dependencies: "@acala-network/api": ^5.1.1 - "@acala-network/eth-providers": ~2.7.3 + "@acala-network/eth-providers": ~2.7.18 "@acala-network/sdk-core": 4.1.9-12 "@polkadot/api": ^10.9.1 "@typechain/ethers-v5": ^10.1.0 @@ -184,7 +164,7 @@ __metadata: typechain: ^8.1.0 peerDependencies: "@acala-network/api": ^5 - "@acala-network/eth-providers": ~2.7.3 + "@acala-network/eth-providers": ~2.7.18 "@polkadot/api": ^10 ethers: ~5.7.0 languageName: unknown @@ -211,12 +191,12 @@ __metadata: languageName: node linkType: hard -"@acala-network/types@npm:^6.0.0-34": - version: 6.0.0-34 - resolution: "@acala-network/types@npm:6.0.0-34" +"@acala-network/types@npm:^6.0.4": + version: 6.0.4 + resolution: "@acala-network/types@npm:6.0.4" peerDependencies: "@polkadot/api": ^10.9.1 - checksum: 81ddd1a5ed760fc9a088e93293eeda477401e146bea2f3695bc9ecf4300c5b006a67fc7a695ba61fd2698d54df9fcec7e8e239c75d09aafe2296028ba0c7e626 + checksum: 39de2159c0973e0a9143752f013154d5527a670c79444394767fd6b3bac07c68dbd2fef344f72c6967f77ce9dc5136f571f65d7e5a4e8f9f1f0daf87f9b8a1be languageName: node linkType: hard @@ -225,7 +205,7 @@ __metadata: resolution: "@acala-network/wormhole-portal@workspace:packages/wormhole-portal" dependencies: "@acala-network/api": ^5.1.1 - "@acala-network/eth-providers": ~2.7.3 + "@acala-network/eth-providers": ~2.7.18 "@acala-network/sdk": ^4.1.9-12 "@certusone/wormhole-sdk": ^0.5.0 "@ethersproject/bignumber": ^5.7.0 @@ -238,7 +218,7 @@ __metadata: ethers: ~5.7.0 peerDependencies: "@acala-network/api": ^5 - "@acala-network/eth-providers": ~2.7.3 + "@acala-network/eth-providers": ~2.7.18 "@polkadot/api": ^10 ethers: ~5.7.0 languageName: unknown @@ -2006,7 +1986,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/abstract-provider@npm:5.7.0, @ethersproject/abstract-provider@npm:^5.7.0, @ethersproject/abstract-provider@npm:~5.7.0": +"@ethersproject/abstract-provider@npm:5.7.0, @ethersproject/abstract-provider@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/abstract-provider@npm:5.7.0" dependencies: @@ -2034,7 +2014,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/address@npm:5.7.0, @ethersproject/address@npm:^5.7.0, @ethersproject/address@npm:~5.7.0": +"@ethersproject/address@npm:5.7.0, @ethersproject/address@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/address@npm:5.7.0" dependencies: @@ -2066,7 +2046,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/bignumber@npm:5.7.0, @ethersproject/bignumber@npm:^5.7.0, @ethersproject/bignumber@npm:~5.7.0": +"@ethersproject/bignumber@npm:5.7.0, @ethersproject/bignumber@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/bignumber@npm:5.7.0" dependencies: @@ -2077,7 +2057,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/bytes@npm:5.7.0, @ethersproject/bytes@npm:^5.7.0, @ethersproject/bytes@npm:~5.7.0": +"@ethersproject/bytes@npm:5.7.0, @ethersproject/bytes@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/bytes@npm:5.7.0" dependencies: @@ -2086,7 +2066,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/constants@npm:5.7.0, @ethersproject/constants@npm:^5.7.0, @ethersproject/constants@npm:~5.7.0": +"@ethersproject/constants@npm:5.7.0, @ethersproject/constants@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/constants@npm:5.7.0" dependencies: @@ -2095,7 +2075,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/contracts@npm:5.7.0, @ethersproject/contracts@npm:~5.7.0": +"@ethersproject/contracts@npm:5.7.0": version: 5.7.0 resolution: "@ethersproject/contracts@npm:5.7.0" dependencies: @@ -2113,7 +2093,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/hash@npm:5.7.0, @ethersproject/hash@npm:^5.7.0, @ethersproject/hash@npm:~5.7.0": +"@ethersproject/hash@npm:5.7.0, @ethersproject/hash@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/hash@npm:5.7.0" dependencies: @@ -2171,7 +2151,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/keccak256@npm:5.7.0, @ethersproject/keccak256@npm:^5.7.0, @ethersproject/keccak256@npm:~5.7.0": +"@ethersproject/keccak256@npm:5.7.0, @ethersproject/keccak256@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/keccak256@npm:5.7.0" dependencies: @@ -2181,14 +2161,14 @@ __metadata: languageName: node linkType: hard -"@ethersproject/logger@npm:5.7.0, @ethersproject/logger@npm:^5.7.0, @ethersproject/logger@npm:~5.7.0": +"@ethersproject/logger@npm:5.7.0, @ethersproject/logger@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/logger@npm:5.7.0" checksum: 075ab2f605f1fd0813f2e39c3308f77b44a67732b36e712d9bc085f22a84aac4da4f71b39bee50fe78da3e1c812673fadc41180c9970fe5e486e91ea17befe0d languageName: node linkType: hard -"@ethersproject/networks@npm:5.7.1, @ethersproject/networks@npm:^5.7.0, @ethersproject/networks@npm:~5.7.0": +"@ethersproject/networks@npm:5.7.1, @ethersproject/networks@npm:^5.7.0": version: 5.7.1 resolution: "@ethersproject/networks@npm:5.7.1" dependencies: @@ -2207,7 +2187,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/properties@npm:5.7.0, @ethersproject/properties@npm:^5.7.0, @ethersproject/properties@npm:~5.7.0": +"@ethersproject/properties@npm:5.7.0, @ethersproject/properties@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/properties@npm:5.7.0" dependencies: @@ -2216,7 +2196,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/providers@npm:5.7.2, @ethersproject/providers@npm:~5.7.0": +"@ethersproject/providers@npm:5.7.2": version: 5.7.2 resolution: "@ethersproject/providers@npm:5.7.2" dependencies: @@ -2254,7 +2234,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.7.0, @ethersproject/rlp@npm:~5.7.0": +"@ethersproject/rlp@npm:5.7.0, @ethersproject/rlp@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/rlp@npm:5.7.0" dependencies: @@ -2314,7 +2294,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/transactions@npm:5.7.0, @ethersproject/transactions@npm:^5.7.0, @ethersproject/transactions@npm:~5.7.0": +"@ethersproject/transactions@npm:5.7.0, @ethersproject/transactions@npm:^5.7.0": version: 5.7.0 resolution: "@ethersproject/transactions@npm:5.7.0" dependencies: @@ -2342,7 +2322,7 @@ __metadata: languageName: node linkType: hard -"@ethersproject/wallet@npm:5.7.0, @ethersproject/wallet@npm:~5.7.0": +"@ethersproject/wallet@npm:5.7.0": version: 5.7.0 resolution: "@ethersproject/wallet@npm:5.7.0" dependencies: