Skip to content

Commit 601ca42

Browse files
Resolve merge conflicts: integrate Session Properties section and preserve comprehensive method implementations
- Keep introductory text from main branch - Preserve all comprehensive method implementations (stx_getAddresses, stx_signTransaction, stx_signStructuredMessage, stx_callContract) - Use original 'addresses' array format for stx_getAddresses response - Integrate Session Properties section from main branch with correct stx_getAddresses reference - Remove duplicate method definitions from conflict markers Co-Authored-By: [email protected] <[email protected]>
2 parents 81557f7 + d1312ad commit 601ca42

File tree

41 files changed

+74
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+74
-59
lines changed

advanced/multichain/rpc-reference/bitcoin-rpc.mdx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ If the wallet user changes to account 1 we get path `m/84'/0'/1'/0/0` with ident
3232
- `m/84'/0'/1'/change/address_index`
3333
- `m/86'/0'/1'/change/address_index`
3434

35+
3536
## sendTransfer
3637

3738
This method is used to sign and submit a transfer of any `amount` of Bitcoin to a single `recipientAddress`, optionally including a `changeAddress` for the change amount and `memo` set as an OP_RETURN output by supporting wallets. The transaction will be signed and broadcast upon user approval.
@@ -111,6 +112,10 @@ We recognize that there are two broad classes of wallets in use today:
111112
- `path` : `String` - _(Optional)_ Derivation path of the address e.g. "m/84'/0'/0'/0/0".
112113
- `intention` : `String` - _(Optional)_ Intention of the address, e.g. "payment" or "ordinal".
113114

115+
### Session Properties
116+
In a connection request, it is recommended to serialize the response to `getAccountAddresses` in `session.sessionProperties.bip122_getAccountAddresses`. This allows dapps to consume an active session without requiring a context switch to re-request all addresses and associated public keys from the wallet.
117+
118+
114119
### Example: Dynamic Wallet
115120

116121
The example below specifies a result from a dynamic wallet. For the sake of this example, receive and change addresses with index 3-4 are considered unused and addresses with paths `m/49'/0'/0'/0/7` and `m/84'/0'/0'/0/2` are considered to have UTXOs.

advanced/multichain/rpc-reference/stacks-rpc.mdx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ title: "Stacks"
33
description: Stacks JSON-RPC Methods
44
---
55

6+
67
These are the methods that wallets should implement to handle Stacks transfers and messages via WalletConnect.
78

89
## Core Methods (common)
@@ -257,3 +258,7 @@ Wrapper method for `stx_signTransaction` that calls a Stacks contract.
257258

258259
- `txid` - is used to identify the transaction on the explorer
259260
- `transaction` - hex-encoded raw transaction
261+
262+
## Session Properties
263+
264+
In a connection request, it is recommended to serialize the response to `stx_getAddresses` in `session.sessionProperties.stacks_getAddresses`. This allows dapps to consume an active session without requiring a context switch to re-request all addresses and associated public keys from the wallet.

advanced/multichain/rpc-reference/sui-rpc.mdx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ This method returns an Array of public keys and addresses available to sign from
4444
}
4545
```
4646

47-
### sui_signTransaction
47+
### Session Properties
48+
In a connection request, it is recommended to serialize the response to `getAccounts` in `session.sessionProperties.sui_getAccounts`. This allows dapps to consume an active session without requiring a context switch to re-request all addresses and associated public keys from the wallet.
49+
50+
51+
52+
## sui_signTransaction
4853

4954
Sign a Sui transaction without executing it.
5055

appkit/authentication/one-click-auth.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ Enable your users to connect to web3 through a single tap with One-Click Auth, i
5959

6060
<Card
6161
title="Try Demo"
62-
href="https://appkit-lab.reown.com/library/wagmi-siwe/"
62+
href="https://appkit-lab.reown.com/appkit/?name=wagmi-siwe"
6363
/>

appkit/authentication/siwx/default.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This feature allows developers using our SDK to implement authentication by havi
1414
## Demo
1515

1616
<CardGroup cols={2}>
17-
<Card icon="flask" title="Try Demo" href="https://appkit-lab.reown.com/library/siwx-default/" />
17+
<Card icon="flask" title="Try Demo" href="https://appkit-lab.reown.com/appkit/?name=siwx-default" />
1818
</CardGroup>
1919

2020
## Getting Started

appkit/features/multichain.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ AppKit is now multichain. The architecture is designed to support both EVM and n
1313

1414
<Card
1515
title="Try Demo"
16-
href="https://appkit-lab.reown.com/library/multichain-wagmi-solana/"
16+
href="https://appkit-lab.reown.com/appkit/?name=multichain-wagmi-solana"
1717
horizontal
1818
/>
1919

appkit/features/onramp.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ On-Ramp securely provides users access to over 100 cryptocurrencies from right w
2727
## Demo
2828

2929
<CardGroup cols={2}>
30-
<Card icon="flask" title="Try Demo" href="https://appkit-lab.reown.com/library/wagmi/" />
30+
<Card icon="flask" title="Try Demo" href="https://appkit-lab.reown.com/appkit/?name=wagmi" />
3131
</CardGroup>
3232

3333
## Get Started

appkit/javascript/core/actions.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ const themeMode = modal.getThemeMode();
229229
## Wallet Buttons
230230

231231

232-
Using wallet buttons ([Demo in our Lab](https://appkit-lab.reown.com/library/wagmi-wallet-button/)), you can directly connect to the top 20 wallets, WalletConnect QR and also all the social logins.
232+
Using wallet buttons ([Demo in our Lab](https://appkit-lab.reown.com/appkit/?name=wagmi)), you can directly connect to the top 20 wallets, WalletConnect QR and also all the social logins.
233233
This feature allows to customize dApps, enabling users to connect their wallets effortlessly, all without the need for the traditional modal.
234234

235235
Follow these steps to use the component:

appkit/networks/bitcoin.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Currently, the following extension wallets are supported:
2525

2626
While we provide a standardized interface for Bitcoin connector methods, not all wallets support every method. As a result, you may encounter a `MethodNotSupportedError` when attempting to use methods that are not supported by a specific wallet.
2727
If your wallet supports a mentioned standard but you cannot connect, please reach out to our development team for assistance via [Github issues](https://github.com/reown-com/appkit/issues/new/choose).
28-
<Card title="Try Demo" href="https://appkit-lab.reown.com/library/bitcoin/" horizontal />
28+
<Card title="Try Demo" href="https://appkit-lab.reown.com/appkit/?name=bitcoin" horizontal />
2929

3030

3131
## Get Started

appkit/networks/evm.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The AppKit SDK supports all EVM-compatible chains, allowing users to connect the
1414
></video>
1515
</Frame>
1616
**AppKit provides a simple, secure, and seamless in-app experience for users looking to transact within web3.**
17-
<Card title="Try Demo" href="https://appkit-lab.reown.com/library/solana/" horizontal />
17+
<Card title="Try Demo" href="https://appkit-lab.reown.com/appkit/?name=solana" horizontal />
1818

1919
## Get Started
2020
<CardGroup cols={3}>

0 commit comments

Comments
 (0)