@meshconnect/uwc-injected-connector 0.25.0 → 0.26.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/services/solana/solana-transaction-service.d.ts +17 -0
- package/dist/services/solana/solana-transaction-service.d.ts.map +1 -1
- package/dist/services/solana/solana-transaction-service.js +44 -24
- package/dist/services/solana/solana-transaction-service.js.map +1 -1
- package/package.json +6 -6
- package/src/services/solana/solana-transaction-service.test.ts +135 -1
- package/src/services/solana/solana-transaction-service.ts +60 -30
|
@@ -19,6 +19,17 @@ export declare class SolanaTransactionService {
|
|
|
19
19
|
* Helper: Get RPC URL with fallback
|
|
20
20
|
*/
|
|
21
21
|
private getRpcUrl;
|
|
22
|
+
/**
|
|
23
|
+
* Helper: Whether the wallet declares V0 support. A bridged adapter is a
|
|
24
|
+
* Comlink proxy whose property reads return a Promise (its `.has` would
|
|
25
|
+
* always look truthy), so the value is always resolved first.
|
|
26
|
+
*/
|
|
27
|
+
private supportsVersionedTransactions;
|
|
28
|
+
/**
|
|
29
|
+
* Helper: Serialize for the bridge path. Legacy skips signature checks
|
|
30
|
+
* because the wallet has not signed yet.
|
|
31
|
+
*/
|
|
32
|
+
private serializeTransaction;
|
|
22
33
|
/**
|
|
23
34
|
* Two mutually exclusive paths:
|
|
24
35
|
* 1. sendSerializedTransaction(Uint8Array, string) — Comlink bridge safe.
|
|
@@ -33,6 +44,12 @@ export declare class SolanaTransactionService {
|
|
|
33
44
|
* Send SPL token transfer
|
|
34
45
|
*/
|
|
35
46
|
private sendSplTokenTransaction;
|
|
47
|
+
/**
|
|
48
|
+
* Legacy by default. V0 only when the request opts in and the wallet
|
|
49
|
+
* declares V0 support: Trust's mobile in-app provider cannot sign a legacy
|
|
50
|
+
* transaction delivered through the Wallet Standard, but signs V0.
|
|
51
|
+
*/
|
|
52
|
+
private buildTransferTransaction;
|
|
36
53
|
/**
|
|
37
54
|
* Send native SOL transfer
|
|
38
55
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-transaction-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"solana-transaction-service.d.ts","sourceRoot":"","sources":["../../../src/services/solana/solana-transaction-service.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAEV,aAAa,EACb,SAAS,EAGT,wBAAwB,EACzB,MAAM,wBAAwB,CAAA;AAG/B,OAAO,KAAK,EAEV,aAAa,EACd,MAAM,iCAAiC,CAAA;AAExC;;GAEG;AACH,qBAAa,wBAAwB;IACnC,OAAO,CAAC,aAAa,CAAe;IACpC,OAAO,CAAC,OAAO,CAA0B;IAEzC,YAAY,aAAa,GAAE,aAAkB,EAG5C;IAED;;OAEG;IACG,eAAe,CACnB,OAAO,EAAE,wBAAwB,EACjC,OAAO,EAAE,aAAa,EACtB,SAAS,CAAC,EAAE,SAAS,GACpB,OAAO,CAAC,MAAM,CAAC,CA2BjB;IAED;;OAEG;YACW,mBAAmB;IAWjC;;OAEG;IACH,OAAO,CAAC,SAAS;IAMjB;;;;OAIG;YACW,6BAA6B;IAO3C;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;;;OAIG;YACW,kBAAkB;IA2BhC;;OAEG;YACW,qBAAqB;IA2BnC;;OAEG;YACW,uBAAuB;IA2BrC;;;;OAIG;YACW,wBAAwB;IAqBtC;;OAEG;YACW,mCAAmC;CAiClD"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Transaction, VersionedTransaction, Connection, PublicKey } from '@solana/web3.js';
|
|
2
|
+
import { isVersionedTransaction } from '@solana/wallet-adapter-base';
|
|
2
3
|
import { parseError } from '../../utils/error-utils';
|
|
3
4
|
import { SolanaTransactionBuilder } from './solana-transaction-builder';
|
|
4
5
|
/**
|
|
@@ -52,6 +53,27 @@ export class SolanaTransactionService {
|
|
|
52
53
|
? this.networkRpcMap[networkId]
|
|
53
54
|
: 'https://api.mainnet-beta.solana.com';
|
|
54
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Helper: Whether the wallet declares V0 support. A bridged adapter is a
|
|
58
|
+
* Comlink proxy whose property reads return a Promise (its `.has` would
|
|
59
|
+
* always look truthy), so the value is always resolved first.
|
|
60
|
+
*/
|
|
61
|
+
async supportsVersionedTransactions(adapter) {
|
|
62
|
+
const versions = await Promise.resolve(adapter.supportedTransactionVersions);
|
|
63
|
+
return versions?.has(0) ?? false;
|
|
64
|
+
}
|
|
65
|
+
/**
|
|
66
|
+
* Helper: Serialize for the bridge path. Legacy skips signature checks
|
|
67
|
+
* because the wallet has not signed yet.
|
|
68
|
+
*/
|
|
69
|
+
serializeTransaction(transaction) {
|
|
70
|
+
return isVersionedTransaction(transaction)
|
|
71
|
+
? transaction.serialize()
|
|
72
|
+
: transaction.serialize({
|
|
73
|
+
requireAllSignatures: false,
|
|
74
|
+
verifySignatures: false
|
|
75
|
+
});
|
|
76
|
+
}
|
|
55
77
|
/**
|
|
56
78
|
* Two mutually exclusive paths:
|
|
57
79
|
* 1. sendSerializedTransaction(Uint8Array, string) — Comlink bridge safe.
|
|
@@ -84,18 +106,8 @@ export class SolanaTransactionService {
|
|
|
84
106
|
if (!request.blockhash) {
|
|
85
107
|
throw new Error('Blockhash is required for Solana transactions');
|
|
86
108
|
}
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
transaction.instructions =
|
|
90
|
-
await this.builder.buildTransferInstructions(request);
|
|
91
|
-
transaction.recentBlockhash = request.blockhash;
|
|
92
|
-
transaction.feePayer = new PublicKey(request.from);
|
|
93
|
-
const rpcUrl = this.getRpcUrl(networkId);
|
|
94
|
-
const serializedTx = transaction.serialize({
|
|
95
|
-
requireAllSignatures: false,
|
|
96
|
-
verifySignatures: false
|
|
97
|
-
});
|
|
98
|
-
return await this.executeTransaction(adapter, serializedTx, transaction, rpcUrl);
|
|
109
|
+
const transaction = await this.buildTransferTransaction(adapter, request);
|
|
110
|
+
return await this.executeTransaction(adapter, this.serializeTransaction(transaction), transaction, this.getRpcUrl(networkId));
|
|
99
111
|
}
|
|
100
112
|
catch (error) {
|
|
101
113
|
parseError(error);
|
|
@@ -112,23 +124,31 @@ export class SolanaTransactionService {
|
|
|
112
124
|
if (!request.blockhash) {
|
|
113
125
|
throw new Error('Blockhash is required for Solana transactions');
|
|
114
126
|
}
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
transaction.instructions =
|
|
118
|
-
await this.builder.buildTransferInstructions(request);
|
|
119
|
-
transaction.recentBlockhash = request.blockhash;
|
|
120
|
-
transaction.feePayer = new PublicKey(request.from);
|
|
121
|
-
const rpcUrl = this.getRpcUrl(networkId);
|
|
122
|
-
const serializedTx = transaction.serialize({
|
|
123
|
-
requireAllSignatures: false,
|
|
124
|
-
verifySignatures: false
|
|
125
|
-
});
|
|
126
|
-
return await this.executeTransaction(adapter, serializedTx, transaction, rpcUrl);
|
|
127
|
+
const transaction = await this.buildTransferTransaction(adapter, request);
|
|
128
|
+
return await this.executeTransaction(adapter, this.serializeTransaction(transaction), transaction, this.getRpcUrl(networkId));
|
|
127
129
|
}
|
|
128
130
|
catch (error) {
|
|
129
131
|
parseError(error);
|
|
130
132
|
}
|
|
131
133
|
}
|
|
134
|
+
/**
|
|
135
|
+
* Legacy by default. V0 only when the request opts in and the wallet
|
|
136
|
+
* declares V0 support: Trust's mobile in-app provider cannot sign a legacy
|
|
137
|
+
* transaction delivered through the Wallet Standard, but signs V0.
|
|
138
|
+
*/
|
|
139
|
+
async buildTransferTransaction(adapter, request) {
|
|
140
|
+
const feePayer = new PublicKey(request.from);
|
|
141
|
+
if (request.preferVersionedTransaction &&
|
|
142
|
+
(await this.supportsVersionedTransactions(adapter))) {
|
|
143
|
+
return this.builder.getVersionedTransaction(feePayer, request);
|
|
144
|
+
}
|
|
145
|
+
const transaction = new Transaction();
|
|
146
|
+
transaction.instructions =
|
|
147
|
+
await this.builder.buildTransferInstructions(request);
|
|
148
|
+
transaction.recentBlockhash = request.blockhash;
|
|
149
|
+
transaction.feePayer = feePayer;
|
|
150
|
+
return transaction;
|
|
151
|
+
}
|
|
132
152
|
/**
|
|
133
153
|
* Send native SOL transfer
|
|
134
154
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-transaction-service.js","sourceRoot":"","sources":["../../../src/services/solana/solana-transaction-service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,oBAAoB,EACpB,UAAU,EACV,SAAS,EACV,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"solana-transaction-service.js","sourceRoot":"","sources":["../../../src/services/solana/solana-transaction-service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@meshconnect/uwc-injected-connector",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.26.0",
|
|
4
4
|
"description": "Injected connector for Universal Wallet Connector",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -28,11 +28,11 @@
|
|
|
28
28
|
"uuid": "^14.0.2",
|
|
29
29
|
"viem": "^2.56.5",
|
|
30
30
|
"@meshconnect/uwc-bridge-child": "0.6.0",
|
|
31
|
-
"@meshconnect/uwc-constants": "0.7.
|
|
32
|
-
"@meshconnect/uwc-ton-connector": "0.9.
|
|
33
|
-
"@meshconnect/uwc-bitcoin": "0.5.
|
|
34
|
-
"@meshconnect/uwc-tron-connector": "0.7.
|
|
35
|
-
"@meshconnect/uwc-types": "0.
|
|
31
|
+
"@meshconnect/uwc-constants": "0.7.13",
|
|
32
|
+
"@meshconnect/uwc-ton-connector": "0.9.7",
|
|
33
|
+
"@meshconnect/uwc-bitcoin": "0.5.1",
|
|
34
|
+
"@meshconnect/uwc-tron-connector": "0.7.11",
|
|
35
|
+
"@meshconnect/uwc-types": "0.29.0"
|
|
36
36
|
},
|
|
37
37
|
"devDependencies": {
|
|
38
38
|
"typescript": "^7.0.2"
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { describe, it, expect, beforeEach, vi } from 'vitest'
|
|
2
2
|
import { SolanaTransactionService } from './solana-transaction-service'
|
|
3
|
-
import
|
|
3
|
+
import { Transaction } from '@solana/web3.js'
|
|
4
|
+
import type {
|
|
5
|
+
SolanaNativeTransferRequest,
|
|
6
|
+
SolanaTokenTransferRequest
|
|
7
|
+
} from '@meshconnect/uwc-types'
|
|
4
8
|
import type { ExtendedStandardWalletAdapter } from '../../wallet-standard-discovery'
|
|
5
9
|
|
|
6
10
|
vi.mock('@solana/web3.js', () => {
|
|
@@ -211,4 +215,134 @@ describe('SolanaTransactionService', () => {
|
|
|
211
215
|
expect(mockAdapter.sendTransaction).not.toHaveBeenCalled()
|
|
212
216
|
})
|
|
213
217
|
})
|
|
218
|
+
|
|
219
|
+
describe('preferVersionedTransaction — native SOL and SPL transfers', () => {
|
|
220
|
+
const networkId = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp'
|
|
221
|
+
const nativeRequest: SolanaNativeTransferRequest = {
|
|
222
|
+
from: '5SDmgvJWAeu8Pcp1WRV9uyeiRRrFC654n3vGPSuLEdhm',
|
|
223
|
+
to: '2cXWFBHqJamsAsgZjZgLrDDCvszrRVdMMaaCp9gQTsWL',
|
|
224
|
+
amount: BigInt(100000),
|
|
225
|
+
blockhash: '3PQ5dzi2ZCTfnu5aoncPBW1LBkqGGA54xpakg4JlNF1X'
|
|
226
|
+
}
|
|
227
|
+
const splRequest: SolanaTokenTransferRequest = {
|
|
228
|
+
...nativeRequest,
|
|
229
|
+
tokenMint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v',
|
|
230
|
+
tokenDecimals: 6
|
|
231
|
+
}
|
|
232
|
+
const requests = [
|
|
233
|
+
['native SOL', nativeRequest],
|
|
234
|
+
['SPL token', splRequest]
|
|
235
|
+
] as const
|
|
236
|
+
|
|
237
|
+
const v0Bytes = new Uint8Array([4, 5, 6])
|
|
238
|
+
const legacyBytes = new Uint8Array([1, 2, 3])
|
|
239
|
+
const v0Transaction = { version: 0, serialize: () => v0Bytes }
|
|
240
|
+
const supportsV0 = new Set(['legacy', 0])
|
|
241
|
+
|
|
242
|
+
beforeEach(() => {
|
|
243
|
+
mockGetVersionedTransaction.mockResolvedValue(v0Transaction)
|
|
244
|
+
})
|
|
245
|
+
|
|
246
|
+
const directAdapter = (supportedTransactionVersions: unknown) =>
|
|
247
|
+
({
|
|
248
|
+
publicKey: { toBase58: vi.fn().mockResolvedValue(nativeRequest.from) },
|
|
249
|
+
supportedTransactionVersions,
|
|
250
|
+
sendTransaction: vi.fn().mockResolvedValue('sig')
|
|
251
|
+
}) as unknown as ExtendedStandardWalletAdapter
|
|
252
|
+
|
|
253
|
+
const bridgedAdapter = (supportedTransactionVersions: unknown) =>
|
|
254
|
+
({
|
|
255
|
+
publicKey: { toBase58: vi.fn().mockResolvedValue(nativeRequest.from) },
|
|
256
|
+
supportedTransactionVersions: Promise.resolve(
|
|
257
|
+
supportedTransactionVersions
|
|
258
|
+
),
|
|
259
|
+
sendSerializedTransaction: vi.fn().mockResolvedValue('sig'),
|
|
260
|
+
sendTransaction: vi.fn()
|
|
261
|
+
}) as unknown as ExtendedStandardWalletAdapter
|
|
262
|
+
|
|
263
|
+
const sentTransaction = (adapter: ExtendedStandardWalletAdapter) =>
|
|
264
|
+
vi.mocked(adapter.sendTransaction).mock.calls[0]![0]
|
|
265
|
+
|
|
266
|
+
it.each(requests)(
|
|
267
|
+
'%s: sends legacy when the request does not opt in, even if the wallet supports V0',
|
|
268
|
+
async (_, request) => {
|
|
269
|
+
const adapter = directAdapter(supportsV0)
|
|
270
|
+
|
|
271
|
+
await service.sendTransaction(request, adapter, networkId)
|
|
272
|
+
|
|
273
|
+
expect(sentTransaction(adapter)).toBeInstanceOf(Transaction)
|
|
274
|
+
expect(mockGetVersionedTransaction).not.toHaveBeenCalled()
|
|
275
|
+
}
|
|
276
|
+
)
|
|
277
|
+
|
|
278
|
+
it.each(requests)(
|
|
279
|
+
'%s: sends V0 when the request opts in and the wallet supports V0',
|
|
280
|
+
async (_, request) => {
|
|
281
|
+
const adapter = directAdapter(supportsV0)
|
|
282
|
+
const optedIn = { ...request, preferVersionedTransaction: true }
|
|
283
|
+
|
|
284
|
+
await service.sendTransaction(optedIn, adapter, networkId)
|
|
285
|
+
|
|
286
|
+
expect(sentTransaction(adapter)).toBe(v0Transaction)
|
|
287
|
+
expect(mockGetVersionedTransaction).toHaveBeenCalledWith(
|
|
288
|
+
expect.objectContaining({ toBase58: expect.any(Function) }),
|
|
289
|
+
optedIn
|
|
290
|
+
)
|
|
291
|
+
}
|
|
292
|
+
)
|
|
293
|
+
|
|
294
|
+
it.each([
|
|
295
|
+
['null (legacy-only Wallet Standard wallet)', null],
|
|
296
|
+
['legacy only', new Set(['legacy'])],
|
|
297
|
+
['undefined', undefined]
|
|
298
|
+
])(
|
|
299
|
+
'falls back to legacy when the wallet declares %s',
|
|
300
|
+
async (_, versions) => {
|
|
301
|
+
const adapter = directAdapter(versions)
|
|
302
|
+
|
|
303
|
+
await service.sendTransaction(
|
|
304
|
+
{ ...nativeRequest, preferVersionedTransaction: true },
|
|
305
|
+
adapter,
|
|
306
|
+
networkId
|
|
307
|
+
)
|
|
308
|
+
|
|
309
|
+
expect(sentTransaction(adapter)).toBeInstanceOf(Transaction)
|
|
310
|
+
expect(mockGetVersionedTransaction).not.toHaveBeenCalled()
|
|
311
|
+
}
|
|
312
|
+
)
|
|
313
|
+
|
|
314
|
+
it.each(requests)(
|
|
315
|
+
'%s: bridged adapter (Comlink promise) sends V0 bytes when supported',
|
|
316
|
+
async (_, request) => {
|
|
317
|
+
const adapter = bridgedAdapter(supportsV0)
|
|
318
|
+
|
|
319
|
+
await service.sendTransaction(
|
|
320
|
+
{ ...request, preferVersionedTransaction: true },
|
|
321
|
+
adapter,
|
|
322
|
+
networkId
|
|
323
|
+
)
|
|
324
|
+
|
|
325
|
+
expect(adapter.sendSerializedTransaction).toHaveBeenCalledWith(
|
|
326
|
+
v0Bytes,
|
|
327
|
+
expect.any(String)
|
|
328
|
+
)
|
|
329
|
+
}
|
|
330
|
+
)
|
|
331
|
+
|
|
332
|
+
it('bridged adapter (Comlink promise) sends legacy bytes when V0 is not supported', async () => {
|
|
333
|
+
const adapter = bridgedAdapter(null)
|
|
334
|
+
|
|
335
|
+
await service.sendTransaction(
|
|
336
|
+
{ ...nativeRequest, preferVersionedTransaction: true },
|
|
337
|
+
adapter,
|
|
338
|
+
networkId
|
|
339
|
+
)
|
|
340
|
+
|
|
341
|
+
expect(adapter.sendSerializedTransaction).toHaveBeenCalledWith(
|
|
342
|
+
legacyBytes,
|
|
343
|
+
expect.any(String)
|
|
344
|
+
)
|
|
345
|
+
expect(mockGetVersionedTransaction).not.toHaveBeenCalled()
|
|
346
|
+
})
|
|
347
|
+
})
|
|
214
348
|
})
|
|
@@ -4,6 +4,7 @@ import {
|
|
|
4
4
|
Connection,
|
|
5
5
|
PublicKey
|
|
6
6
|
} from '@solana/web3.js'
|
|
7
|
+
import { isVersionedTransaction } from '@solana/wallet-adapter-base'
|
|
7
8
|
import type {
|
|
8
9
|
SolanaNativeTransferRequest,
|
|
9
10
|
NetworkRpcMap,
|
|
@@ -90,6 +91,33 @@ export class SolanaTransactionService {
|
|
|
90
91
|
: 'https://api.mainnet-beta.solana.com'
|
|
91
92
|
}
|
|
92
93
|
|
|
94
|
+
/**
|
|
95
|
+
* Helper: Whether the wallet declares V0 support. A bridged adapter is a
|
|
96
|
+
* Comlink proxy whose property reads return a Promise (its `.has` would
|
|
97
|
+
* always look truthy), so the value is always resolved first.
|
|
98
|
+
*/
|
|
99
|
+
private async supportsVersionedTransactions(
|
|
100
|
+
adapter: SolanaAdapter
|
|
101
|
+
): Promise<boolean> {
|
|
102
|
+
const versions = await Promise.resolve(adapter.supportedTransactionVersions)
|
|
103
|
+
return versions?.has(0) ?? false
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/**
|
|
107
|
+
* Helper: Serialize for the bridge path. Legacy skips signature checks
|
|
108
|
+
* because the wallet has not signed yet.
|
|
109
|
+
*/
|
|
110
|
+
private serializeTransaction(
|
|
111
|
+
transaction: Transaction | VersionedTransaction
|
|
112
|
+
): Uint8Array {
|
|
113
|
+
return isVersionedTransaction(transaction)
|
|
114
|
+
? transaction.serialize()
|
|
115
|
+
: transaction.serialize({
|
|
116
|
+
requireAllSignatures: false,
|
|
117
|
+
verifySignatures: false
|
|
118
|
+
})
|
|
119
|
+
}
|
|
120
|
+
|
|
93
121
|
/**
|
|
94
122
|
* Two mutually exclusive paths:
|
|
95
123
|
* 1. sendSerializedTransaction(Uint8Array, string) — Comlink bridge safe.
|
|
@@ -139,25 +167,13 @@ export class SolanaTransactionService {
|
|
|
139
167
|
throw new Error('Blockhash is required for Solana transactions')
|
|
140
168
|
}
|
|
141
169
|
|
|
142
|
-
|
|
143
|
-
const transaction = new Transaction()
|
|
144
|
-
transaction.instructions =
|
|
145
|
-
await this.builder.buildTransferInstructions(request)
|
|
146
|
-
|
|
147
|
-
transaction.recentBlockhash = request.blockhash
|
|
148
|
-
transaction.feePayer = new PublicKey(request.from)
|
|
149
|
-
|
|
150
|
-
const rpcUrl = this.getRpcUrl(networkId)
|
|
151
|
-
const serializedTx = transaction.serialize({
|
|
152
|
-
requireAllSignatures: false,
|
|
153
|
-
verifySignatures: false
|
|
154
|
-
})
|
|
170
|
+
const transaction = await this.buildTransferTransaction(adapter, request)
|
|
155
171
|
|
|
156
172
|
return await this.executeTransaction(
|
|
157
173
|
adapter,
|
|
158
|
-
|
|
174
|
+
this.serializeTransaction(transaction),
|
|
159
175
|
transaction,
|
|
160
|
-
|
|
176
|
+
this.getRpcUrl(networkId)
|
|
161
177
|
)
|
|
162
178
|
} catch (error) {
|
|
163
179
|
parseError(error)
|
|
@@ -181,31 +197,45 @@ export class SolanaTransactionService {
|
|
|
181
197
|
throw new Error('Blockhash is required for Solana transactions')
|
|
182
198
|
}
|
|
183
199
|
|
|
184
|
-
|
|
185
|
-
const transaction = new Transaction()
|
|
186
|
-
transaction.instructions =
|
|
187
|
-
await this.builder.buildTransferInstructions(request)
|
|
188
|
-
|
|
189
|
-
transaction.recentBlockhash = request.blockhash
|
|
190
|
-
transaction.feePayer = new PublicKey(request.from)
|
|
191
|
-
|
|
192
|
-
const rpcUrl = this.getRpcUrl(networkId)
|
|
193
|
-
const serializedTx = transaction.serialize({
|
|
194
|
-
requireAllSignatures: false,
|
|
195
|
-
verifySignatures: false
|
|
196
|
-
})
|
|
200
|
+
const transaction = await this.buildTransferTransaction(adapter, request)
|
|
197
201
|
|
|
198
202
|
return await this.executeTransaction(
|
|
199
203
|
adapter,
|
|
200
|
-
|
|
204
|
+
this.serializeTransaction(transaction),
|
|
201
205
|
transaction,
|
|
202
|
-
|
|
206
|
+
this.getRpcUrl(networkId)
|
|
203
207
|
)
|
|
204
208
|
} catch (error) {
|
|
205
209
|
parseError(error)
|
|
206
210
|
}
|
|
207
211
|
}
|
|
208
212
|
|
|
213
|
+
/**
|
|
214
|
+
* Legacy by default. V0 only when the request opts in and the wallet
|
|
215
|
+
* declares V0 support: Trust's mobile in-app provider cannot sign a legacy
|
|
216
|
+
* transaction delivered through the Wallet Standard, but signs V0.
|
|
217
|
+
*/
|
|
218
|
+
private async buildTransferTransaction(
|
|
219
|
+
adapter: SolanaAdapter,
|
|
220
|
+
request: SolanaNativeTransferRequest | SolanaTokenTransferRequest
|
|
221
|
+
): Promise<Transaction | VersionedTransaction> {
|
|
222
|
+
const feePayer = new PublicKey(request.from)
|
|
223
|
+
|
|
224
|
+
if (
|
|
225
|
+
request.preferVersionedTransaction &&
|
|
226
|
+
(await this.supportsVersionedTransactions(adapter))
|
|
227
|
+
) {
|
|
228
|
+
return this.builder.getVersionedTransaction(feePayer, request)
|
|
229
|
+
}
|
|
230
|
+
|
|
231
|
+
const transaction = new Transaction()
|
|
232
|
+
transaction.instructions =
|
|
233
|
+
await this.builder.buildTransferInstructions(request)
|
|
234
|
+
transaction.recentBlockhash = request.blockhash
|
|
235
|
+
transaction.feePayer = feePayer
|
|
236
|
+
return transaction
|
|
237
|
+
}
|
|
238
|
+
|
|
209
239
|
/**
|
|
210
240
|
* Send native SOL transfer
|
|
211
241
|
*/
|