Skip to content

Commit ebd7a84

Browse files
ganchoradkovganchoradkov
authored
refactor: stacks methods/events naming (#894)
1 parent 3b46e6b commit ebd7a84

File tree

8 files changed

+192
-180
lines changed

8 files changed

+192
-180
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
"@solana/web3.js": "^1.36.0",
2727
"@stacks/network": "^7.0.2",
2828
"@stacks/transactions": "^7.0.6",
29-
"@walletconnect/core": "^2.21.2",
29+
"@walletconnect/core": "2.21.3",
3030
"@walletconnect/encoding": "^1.0.1",
3131
"@walletconnect/jsonrpc-utils": "^1.0.8",
32-
"@walletconnect/types": "2.21.2",
33-
"@walletconnect/universal-provider": "2.21.2",
34-
"@walletconnect/utils": "2.21.2",
32+
"@walletconnect/types": "2.21.3",
33+
"@walletconnect/universal-provider": "2.21.3",
34+
"@walletconnect/utils": "2.21.3",
3535
"@reown/appkit": "1.7.5",
3636
"axios": "^1.0.0",
3737
"@mysten/sui": "^1.29.1",
@@ -111,14 +111,14 @@
111111
"next@>=9.5.5 <14.2.15": ">=14.2.15",
112112
"ansi-html@<0.0.8": ">=0.0.8",
113113
"axios@<1.8.2": ">=1.8.2",
114-
"@walletconnect/core@": ">=2.21.2",
114+
"@walletconnect/core@": ">=2.21.3",
115115
"@walletconnect/encoding@": ">=1.0.1",
116116
"@walletconnect/jsonrpc-utils@": ">=1.0.8",
117-
"@walletconnect/types@": ">=2.21.2",
118-
"@walletconnect/universal-provider@": ">=2.21.2",
119-
"@walletconnect/sign-client@": ">=2.21.2",
120-
"@walletconnect/utils@": ">=2.21.2",
121-
"@walletconnect/ethereum-provider@": ">=2.21.2"
117+
"@walletconnect/types@": ">=2.21.3",
118+
"@walletconnect/universal-provider@": ">=2.21.3",
119+
"@walletconnect/sign-client@": ">=2.21.3",
120+
"@walletconnect/utils@": ">=2.21.3",
121+
"@walletconnect/ethereum-provider@": ">=2.21.3"
122122
}
123123
}
124124
}

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

Lines changed: 98 additions & 72 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/constants/default.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,13 @@ export enum DEFAULT_TEZOS_EVENTS {}
267267
* STACKS
268268
*/
269269
export enum DEFAULT_STACKS_METHODS {
270-
STACKS_SEND_TRANSFER = "stacks_stxTransfer",
271-
STACKS_SIGN_MESSAGE = "stacks_signMessage",
270+
STACKS_SEND_TRANSFER = "stx_transferStx",
271+
STACKS_SIGN_MESSAGE = "stx_signMessage",
272272
}
273273

274274
export enum DEFAULT_STACKS_EVENTS {
275-
STACKS_CHAIN_CHANGED = "stacks_chainChanged",
276-
STACKS_ACCOUNTS_CHANGED = "stacks_accountsChanged",
275+
STACKS_CHAIN_CHANGED = "stx_chainChanged",
276+
STACKS_ACCOUNTS_CHANGED = "stx_accountsChanged",
277277
}
278278

279279
export const DEFAULT_GITHUB_REPO_URL =

‎advanced/dapps/react-dapp-v2/src/contexts/JsonRpcContext.tsx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2191,17 +2191,17 @@ export function JsonRpcContextProvider({
21912191
}
21922192

21932193
const request = {
2194-
pubkey: address,
2194+
sender: address,
21952195
recipient: recipient?.trim(),
2196-
amount: 10000,
2196+
amount: "10000",
21972197
};
21982198
console.log("request", {
21992199
method,
22002200
params: request,
22012201
chainId,
22022202
});
22032203

2204-
const result = await client!.request<{ txId: string }>({
2204+
const result = await client!.request<{ txid: string }>({
22052205
topic: session!.topic,
22062206
chainId: chainId,
22072207
request: {
@@ -2216,7 +2216,7 @@ export function JsonRpcContextProvider({
22162216
method,
22172217
address: address,
22182218
valid: true,
2219-
result: result.txId,
2219+
result: result.txid,
22202220
};
22212221
}
22222222
),
@@ -2235,7 +2235,7 @@ export function JsonRpcContextProvider({
22352235
method,
22362236
params: {
22372237
message,
2238-
pubkey: address,
2238+
address,
22392239
},
22402240
},
22412241
});

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@polkadot/keyring": "^10.1.2",
3232
"@polkadot/types": "^9.3.3",
3333
"@reown/appkit-experimental": "1.6.8",
34-
"@reown/walletkit": "1.2.6",
34+
"@reown/walletkit": "1.2.7",
3535
"@rhinestone/module-sdk": "0.1.25",
3636
"@solana/spl-token": "^0.4.13",
3737
"@solana/web3.js": "1.98.2",
@@ -83,11 +83,11 @@
8383
"typescript": "5.2.2"
8484
},
8585
"resolutions": {
86-
"@walletconnect/core": "2.21.2",
87-
"@walletconnect/utils": "2.21.2",
88-
"@walletconnect/types": "2.21.2",
89-
"@walletconnect/sign-client": "2.21.2",
90-
"@walletconnect/ethereum-provider": "2.21.2",
91-
"@walletconnect/universal-provider": "2.21.2"
86+
"@walletconnect/core": "2.21.3",
87+
"@walletconnect/utils": "2.21.3",
88+
"@walletconnect/types": "2.21.3",
89+
"@walletconnect/sign-client": "2.21.3",
90+
"@walletconnect/ethereum-provider": "2.21.3",
91+
"@walletconnect/universal-provider": "2.21.3"
9292
}
9393
}

‎advanced/wallets/react-wallet-v2/src/data/StacksData.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ export const STACKS_CHAINS = { ...STACKS_MAINNET, ...STACKS_TESTNET } as Record<
4545
* Methods
4646
*/
4747
export const STACKS_SIGNING_METHODS = {
48-
STACKS_SEND_TRANSFER: 'stacks_stxTransfer',
49-
STACKS_SIGN_MESSAGE: 'stacks_signMessage'
48+
STACKS_SEND_TRANSFER: 'stx_transferStx',
49+
STACKS_SIGN_MESSAGE: 'stx_signMessage'
5050
}
5151

5252
/**
5353
* Events
5454
*/
5555

5656
export const STACKS_EVENTS = {
57-
STACKS_CHAIN_CHANGED: 'stacks_chainChanged',
58-
STACKS_ACCOUNTS_CHANGED: 'stacks_accountsChanged'
57+
STACKS_CHAIN_CHANGED: 'stx_chainChanged',
58+
STACKS_ACCOUNTS_CHANGED: 'stx_accountsChanged'
5959
}

‎advanced/wallets/react-wallet-v2/src/lib/StacksLib.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ export default class StacksLib implements StacksWallet {
9696
}
9797

9898
async sendTransfer(request: {
99-
pubkey: string
99+
sender: string
100100
recipient: string
101101
amount: number
102102
chainId: string
103103
}) {
104104
const address = this.getAddress(request.chainId)
105-
if (address !== request.pubkey) {
106-
throw new Error(`Invalid sender pubkey/address: ${request.pubkey}, expected: ${address}`)
105+
if (address !== request.sender) {
106+
throw new Error(`Invalid sender pubkey/address: ${request.sender}, expected: ${address}`)
107107
}
108108
const network = request.chainId === STACKS_MAINNET_CAIP2 ? 'mainnet' : 'testnet'
109109

@@ -132,10 +132,10 @@ export default class StacksLib implements StacksWallet {
132132
}
133133
}
134134

135-
signMessage(request: { message: string; pubkey: string; chainId: string }) {
135+
signMessage(request: { message: string; address: string; chainId: string }) {
136136
const address = this.getAddress(request.chainId)
137-
if (address !== request.pubkey) {
138-
throw new Error(`Invalid sender pubkey/address: ${request.pubkey}, expected: ${address}`)
137+
if (address !== request.address) {
138+
throw new Error(`Invalid sender pubkey/address: ${request.address}, expected: ${address}`)
139139
}
140140

141141
const network = this.getNetworkFromAddress(address)

0 commit comments

Comments
 (0)