gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feat: use base64 encoding when sending and simulating transactions (#12950)

Browse Source
This commit is contained in:
Justin Starry
2020-10-16 23:54:30 +08:00
committed by GitHub
parent 28a72220f6
commit 71264bef67
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
web3.js/src/connection.js
View File

@ -2744,11 +2744,12 @@ export class Connection {
const signData = transaction.serializeMessage(); const signData = transaction.serializeMessage();
const wireTransaction = transaction._serialize(signData); const wireTransaction = transaction._serialize(signData);
const encodedTransaction = bs58.encode(wireTransaction); const encodedTransaction = wireTransaction.toString('base64');
const args = [encodedTransaction]; const config: any = {encoding: 'base64'};
const args = [encodedTransaction, config];
if (signers) { if (signers) {
args.push({sigVerify: true}); config.sigVerify = true;
} }
const unsafeRes = await this._rpcRequest('simulateTransaction', args); const unsafeRes = await this._rpcRequest('simulateTransaction', args);
@ -2817,7 +2818,7 @@ export class Connection {
rawTransaction: Buffer | Uint8Array | Array<number>, rawTransaction: Buffer | Uint8Array | Array<number>,
options: ?SendOptions, options: ?SendOptions,
): Promise<TransactionSignature> { ): Promise<TransactionSignature> {
const encodedTransaction = bs58.encode(toBuffer(rawTransaction)); const encodedTransaction = toBuffer(rawTransaction).toString('base64');
const result = await this.sendEncodedTransaction( const result = await this.sendEncodedTransaction(
encodedTransaction, encodedTransaction,
options, options,
@ -2827,13 +2828,14 @@ export class Connection {
/** /**
* Send a transaction that has already been signed, serialized into the * Send a transaction that has already been signed, serialized into the
* wire format, and encoded as a base58 string * wire format, and encoded as a base64 string
*/ */
async sendEncodedTransaction( async sendEncodedTransaction(
encodedTransaction: string, encodedTransaction: string,
options: ?SendOptions, options: ?SendOptions,
): Promise<TransactionSignature> { ): Promise<TransactionSignature> {
const args = [encodedTransaction]; const config: any = {encoding: 'base64'};
const args = [encodedTransaction, config];
const skipPreflight = options && options.skipPreflight; const skipPreflight = options && options.skipPreflight;
const preflightCommitment = options && options.preflightCommitment; const preflightCommitment = options && options.preflightCommitment;
@ -2844,9 +2846,9 @@ export class Connection {
} }
if (skipPreflight) { if (skipPreflight) {
args.push({skipPreflight}); config.skipPreflight = skipPreflight;
} else if (preflightCommitment) { } else if (preflightCommitment) {
args.push({preflightCommitment}); config.preflightCommitment = preflightCommitment;
} }
const unsafeRes = await this._rpcRequest('sendTransaction', args); const unsafeRes = await this._rpcRequest('sendTransaction', args);