Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: bring back previous interface of solana rpc #675

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: bring back previous interface of solana rpc #675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 19 additions & 5 deletions advanced/wallets/react-wallet-v2/src/lib/SolanaLib.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ export default class SolanaLib {
const transaction = this.deserialize(params.transaction)
this.sign(transaction)

return { transaction: this.serialize(transaction) }
const signature = bs58.encode(transaction.signatures[0])

return {
transaction: this.serialize(transaction),
signature
}
}

public async signAndSendTransaction(
Expand All @@ -69,7 +74,7 @@ export default class SolanaLib {
const signature = await connection.sendTransaction(transaction, {
maxRetries: 3,
preflightCommitment: 'recent',
...params.options
...params.sendOptions
})

return { signature }
Expand All @@ -80,7 +85,13 @@ export default class SolanaLib {
}

private deserialize(transaction: string): VersionedTransaction {
return VersionedTransaction.deserialize(bs58.decode(transaction))
/*
* We should consider serializing the transaction to base58 as it is the solana standard.
* But our specs requires base64 right now:
* https://docs.walletconnect.com/advanced/multichain/rpc-reference/solana-rpc#solana_signtransaction
*/
const decodedBase64 = Uint8Array.from(Buffer.from(transaction, 'base64'))
return VersionedTransaction.deserialize(decodedBase64)
}

private sign(transaction: VersionedTransaction) {
Expand All @@ -96,10 +107,13 @@ export namespace SolanaLib {

export type SignMessage = RPCRequest<{ message: string }, { signature: string }>

export type SignTransaction = RPCRequest<{ transaction: string }, { transaction: string }>
export type SignTransaction = RPCRequest<
{ transaction: string },
{ transaction: string; signature: string }
>

export type SignAndSendTransaction = RPCRequest<
{ transaction: string; options?: SendOptions },
{ transaction: string; sendOptions?: SendOptions },
{ signature: string }
>
}