Skip to content
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
11 changes: 11 additions & 0 deletions .changeset/cuddly-mirrors-bathe.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
'@reservoir0x/relay-bitcoin-wallet-adapter': minor
'@reservoir0x/relay-ethers-wallet-adapter': minor
'@reservoir0x/relay-sui-wallet-adapter': minor
'@reservoir0x/relay-svm-wallet-adapter': minor
'@reservoir0x/relay-kit-hooks': minor
'@reservoir0x/relay-sdk': minor
'@reservoir0x/relay-kit-ui': minor
---

Upgrade viem to >=2.26.0
26 changes: 13 additions & 13 deletions demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
"trailingComma": "none"
},
"dependencies": {
"@dynamic-labs/bitcoin": "4.10.4",
"@dynamic-labs/eclipse": "4.10.4",
"@dynamic-labs/ethereum": "4.10.4",
"@dynamic-labs/ethereum-core": "4.10.4",
"@dynamic-labs/sdk-react-core": "4.10.4",
"@dynamic-labs/solana": "4.10.4",
"@dynamic-labs/sui": "4.10.4",
"@dynamic-labs/utils": "4.10.4",
"@dynamic-labs/wagmi-connector": "4.10.4",
"@dynamic-labs-connectors/abstract-global-wallet-evm": "4.1.2",
"@privy-io/cross-app-connect": "0.2.0",
"@dynamic-labs/bitcoin": "4.22.2",
"@dynamic-labs/eclipse": "4.22.2",
"@dynamic-labs/ethereum": "4.22.2",
"@dynamic-labs/ethereum-core": "4.22.2",
"@dynamic-labs/sdk-react-core": "4.22.2",
"@dynamic-labs/solana": "4.22.2",
"@dynamic-labs/sui": "4.22.2",
"@dynamic-labs/utils": "4.22.2",
"@dynamic-labs/wagmi-connector": "4.22.2",
"@dynamic-labs-connectors/abstract-global-wallet-evm": "4.3.1",
"@privy-io/cross-app-connect": "0.2.2",
"@radix-ui/colors": "^0.1.8",
"@reservoir0x/relay-bitcoin-wallet-adapter": "workspace:*",
"@reservoir0x/relay-kit-hooks": "workspace:*",
Expand All @@ -41,8 +41,8 @@
"react": "^18.0.0",
"react-dom": "^18.0.0",
"usehooks-ts": "^3.1.0",
"viem": "~2.23.4",
"wagmi": "~2.14.3",
"viem": ">=2.26.0",
"wagmi": "^2.15.6",
"@moonpay/moonpay-react": "^1.8.3"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/hooks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"peerDependencies": {
"react": "^18.0",
"react-dom": "^18.0",
"viem": "~2.23.4",
"viem": ">=2.26.0",
"@tanstack/react-query": ">=5.0.0"
},
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/relay-bitcoin-wallet-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@
},
"peerDependencies": {
"@reservoir0x/relay-sdk": "workspace:*",
"viem": "~2.23.4"
"viem": ">=2.26.0"
}
}
2 changes: 1 addition & 1 deletion packages/relay-ethers-wallet-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,6 @@
"@reservoir0x/relay-sdk": "workspace:*",
"@ethersproject/abstract-signer": "^5.7.0",
"ethers": "^5.6.1",
"viem": "~2.23.4"
"viem": ">=2.26.0"
}
}
2 changes: 1 addition & 1 deletion packages/relay-sui-wallet-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@
"peerDependencies": {
"@reservoir0x/relay-sdk": "workspace:*",
"@mysten/sui": "1.24.0",
"viem": "~2.23.4"
"viem": ">=2.26.0"
}
}
2 changes: 1 addition & 1 deletion packages/relay-svm-wallet-adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,6 @@
"peerDependencies": {
"@reservoir0x/relay-sdk": "workspace:*",
"@solana/web3.js": "~1.98.2",
"viem": "~2.23.4"
"viem": ">=2.26.0"
}
}
2 changes: 1 addition & 1 deletion packages/sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"vitest": "^1.6.0"
},
"peerDependencies": {
"viem": "~2.23.4"
"viem": ">=2.26.0"
},
"dependencies": {
"axios": "^1.6.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/sdk/src/types/Progress.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export type ProgressData = {
details?: Execute['details']
currentStep?: ExecuteStep | null
currentStepItem?: ExecuteStepItem
txHashes?: { txHash: string; chainId: number }[]
txHashes?: { txHash: string; chainId: number; isBatchTx?: boolean }[]
error?: Execute['error']
refunded?: Execute['refunded']
}
14 changes: 6 additions & 8 deletions packages/sdk/src/utils/viemWallet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
hexToBigInt,
http
} from 'viem'
import { eip5792Actions } from 'viem/experimental'

export function isViemWalletClient(
wallet: WalletClient | AdaptedWallet
Expand Down Expand Up @@ -191,11 +190,12 @@ export const adaptViemWallet = (wallet: WalletClient): AdaptedWallet => {
supportsAtomicBatch: async (chainId) => {
if (!wallet.account) return false
try {
const eip5792Wallet = wallet.extend(eip5792Actions())
const capabilities = await eip5792Wallet.getCapabilities({
account: eip5792Wallet.account
const capabilities = await wallet.getCapabilities({
account: wallet.account,
chainId
})
return capabilities[chainId]?.atomicBatch?.supported

return capabilities?.atomicBatch?.supported
} catch {
return false
}
Expand All @@ -218,8 +218,6 @@ export const adaptViemWallet = (wallet: WalletClient): AdaptedWallet => {
})
}))

const eip5792Wallet = wallet.extend(eip5792Actions())

const client = getClient()
const chain = client.chains.find(
(chain) => chain.id === chainId
Expand All @@ -229,7 +227,7 @@ export const adaptViemWallet = (wallet: WalletClient): AdaptedWallet => {
throw 'Chain not found when sending transaction'
}

const id = await eip5792Wallet.sendCalls({
const { id } = await wallet.sendCalls({
chain,
account: wallet.account as Account,
calls
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@
"@tanstack/react-query": ">=5.0.0",
"react": "^18.0",
"react-dom": "^18.0",
"viem": "~2.23.4",
"wagmi": "~2.14.3"
"viem": ">=2.26.0",
"wagmi": "^2.15.6"
},
"peerDependenciesMeta": {
"@moonpay/moonpay-react": {
Expand Down
Loading