Skip to content

Commit 74cebed

Browse files
committed
feat: uses new canary and adds example wallet pay request
1 parent cca2d30 commit 74cebed

File tree

7 files changed

+174
-151
lines changed

7 files changed

+174
-151
lines changed

advanced/dapps/react-dapp-v2/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@
2626
"@solana/web3.js": "^1.36.0",
2727
"@stacks/network": "^7.0.2",
2828
"@stacks/transactions": "^7.0.6",
29-
"@walletconnect/core": "2.20.3-canary-1ca-4",
29+
"@walletconnect/core": "2.20.3-canary-1ca-5",
3030
"@walletconnect/encoding": "^1.0.1",
3131
"@walletconnect/jsonrpc-utils": "^1.0.8",
32-
"@walletconnect/types": "2.20.3-canary-1ca-4",
33-
"@walletconnect/universal-provider": "2.20.3-canary-1ca-4",
34-
"@walletconnect/sign-client": "2.20.3-canary-1ca-4",
35-
"@walletconnect/utils": "2.20.3-canary-1ca-4",
32+
"@walletconnect/types": "2.20.3-canary-1ca-5",
33+
"@walletconnect/universal-provider": "2.20.3-canary-1ca-5",
34+
"@walletconnect/sign-client": "2.20.3-canary-1ca-5",
35+
"@walletconnect/utils": "2.20.3-canary-1ca-5",
3636
"@reown/appkit": "1.7.5",
3737
"axios": "^1.0.0",
3838
"@mysten/sui": "^1.29.1",
@@ -112,14 +112,14 @@
112112
"next@>=9.5.5 <14.2.15": ">=14.2.15",
113113
"ansi-html@<0.0.8": ">=0.0.8",
114114
"axios@<1.8.2": ">=1.8.2",
115-
"@walletconnect/core@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-4",
115+
"@walletconnect/core@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-5",
116116
"@walletconnect/encoding": ">=1.0.1",
117117
"@walletconnect/jsonrpc-utils": ">=1.0.8",
118-
"@walletconnect/types@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-4",
119-
"@walletconnect/universal-provider@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-4",
120-
"@walletconnect/sign-client@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-4",
121-
"@walletconnect/utils@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-4",
122-
"@walletconnect/ethereum-provider@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-4"
118+
"@walletconnect/types@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-5",
119+
"@walletconnect/universal-provider@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-5",
120+
"@walletconnect/sign-client@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-5",
121+
"@walletconnect/utils@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-5",
122+
"@walletconnect/ethereum-provider@<2.21.3-canary-1ca-0": ">=2.20.3-canary-1ca-5"
123123
}
124124
}
125125
}

advanced/dapps/react-dapp-v2/pnpm-lock.yaml

Lines changed: 46 additions & 46 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

advanced/dapps/react-dapp-v2/src/contexts/ClientContext.tsx

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -195,24 +195,27 @@ export function ClientContextProvider({
195195
// },
196196
// });
197197
console.log("chains", chains);
198-
const { uri, response } = await client.authenticate({
199-
chains: chains,
200-
methods: Object.values(namespacesToRequest)
201-
.map((namespace) => namespace.methods)
202-
.flat(),
203-
uri: location.origin,
204-
domain: location.origin,
205-
nonce: "1234567890",
198+
const { uri, approval } = await client.connect({
199+
optionalNamespaces: namespacesToRequest as NamespaceConfig,
200+
walletPay: {
201+
version: "1.0.0",
202+
orderId: "order-123456",
203+
acceptedPayments: [
204+
{
205+
recipient:
206+
"eip155:1:0x71C7656EC7ab88b098defB751B7401B5f6d8976F",
207+
asset:
208+
"eip155:1/erc20:0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
209+
amount: "0x5F5E100",
210+
},
211+
],
212+
expiry: 1709593200,
213+
},
206214
});
207215
provider.events.emit("display_uri", uri);
208216
console.log("uri", uri);
209-
const { session, auths } = await response();
217+
const session = await approval();
210218
console.log("session", session);
211-
console.log("auths", auths);
212-
// const session = await provider.connect({
213-
// pairingTopic: pairing?.topic,
214-
// optionalNamespaces: namespacesToRequest as NamespaceConfig,
215-
// });
216219

217220
if (!session) {
218221
throw new Error("Session is not connected");

advanced/wallets/react-wallet-v2/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@
8383
"typescript": "5.2.2"
8484
},
8585
"resolutions": {
86-
"@walletconnect/core": "2.20.3-canary-1ca-4",
87-
"@walletconnect/utils": "2.20.3-canary-1ca-4",
88-
"@walletconnect/types": "2.20.3-canary-1ca-4",
89-
"@walletconnect/sign-client": "2.20.3-canary-1ca-4",
90-
"@walletconnect/ethereum-provider": "2.20.3-canary-1ca-4",
91-
"@walletconnect/universal-provider": "2.20.3-canary-1ca-4"
86+
"@walletconnect/core": "2.20.3-canary-1ca-5",
87+
"@walletconnect/utils": "2.20.3-canary-1ca-5",
88+
"@walletconnect/types": "2.20.3-canary-1ca-5",
89+
"@walletconnect/sign-client": "2.20.3-canary-1ca-5",
90+
"@walletconnect/ethereum-provider": "2.20.3-canary-1ca-5",
91+
"@walletconnect/universal-provider": "2.20.3-canary-1ca-5"
9292
}
9393
}

advanced/wallets/react-wallet-v2/src/utils/MultichainRequestHandler.ts

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,30 @@ import { approveSuiRequest } from './SuiRequestHandlerUtil'
55
import { approveSolanaRequest } from './SolanaRequestHandlerUtil'
66
import { approveBip122Request } from './Bip122RequestHandlerUtil'
77

8-
export function approveMultichainRequest(
8+
export async function approveMultichainRequest(
99
requestEvent: SignClientTypes.EventArguments['session_request']
1010
) {
1111
const chainId = requestEvent.params.chainId
1212
const { namespace } = parseChainId(chainId)
13+
let result: any
1314
switch (namespace) {
1415
case 'eip155':
15-
return approveEIP155Request(requestEvent)
16+
result = await approveEIP155Request(requestEvent)
17+
break
1618
case 'sui':
17-
return approveSuiRequest(requestEvent)
19+
result = await approveSuiRequest(requestEvent)
20+
break
1821
case 'solana':
19-
return approveSolanaRequest(requestEvent)
22+
result = await approveSolanaRequest(requestEvent)
23+
break
2024
case 'bip122':
21-
return approveBip122Request(requestEvent)
25+
result = await approveBip122Request(requestEvent)
2226
default:
2327
console.log('need to implement multichain request handler for', namespace)
2428
}
29+
30+
return {
31+
chainId,
32+
result
33+
}
2534
}

0 commit comments

Comments
 (0)