@openocean.finance/widget 1.0.33 → 1.0.35
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/esm/config/version.d.ts +1 -1
- package/dist/esm/config/version.js +1 -1
- package/dist/esm/cross/adapters/RelayAdapter.js +2 -2
- package/dist/esm/cross/adapters/RelayAdapter.js.map +1 -1
- package/dist/esm/hooks/useRouteExecution.js +3 -2
- package/dist/esm/hooks/useRouteExecution.js.map +1 -1
- package/dist/esm/services/ExecuteRoute.js +53 -13
- package/dist/esm/services/ExecuteRoute.js.map +1 -1
- package/dist/esm/services/SendAndConfirmSolanaTransaction.d.ts +2 -2
- package/dist/esm/services/SendAndConfirmSolanaTransaction.js +6 -6
- package/dist/esm/services/SendAndConfirmSolanaTransaction.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -1
- package/src/config/version.ts +1 -1
- package/src/cross/adapters/RelayAdapter.ts +2 -2
- package/src/hooks/useRouteExecution.ts +3 -3
- package/src/services/ExecuteRoute.ts +71 -22
- package/src/services/SendAndConfirmSolanaTransaction.ts +76 -67
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export declare const name = "@openocean.finance/widget";
|
|
2
|
-
export declare const version = "1.0.
|
|
2
|
+
export declare const version = "1.0.35";
|
|
@@ -46,8 +46,8 @@ export class RelayAdapter extends BaseSwapAdapter {
|
|
|
46
46
|
return 'https://storage.googleapis.com/ks-setting-1d682dca/84e906bb-eaeb-45d3-a64c-2aa9c84eb3ea1747759080942.png';
|
|
47
47
|
}
|
|
48
48
|
getSupportedChains() {
|
|
49
|
-
|
|
50
|
-
return [...MAINNET_NETWORKS]
|
|
49
|
+
return [NonEvmChain.Solana, ...MAINNET_NETWORKS];
|
|
50
|
+
// return [...MAINNET_NETWORKS]
|
|
51
51
|
}
|
|
52
52
|
getSupportedTokens(_sourceChain, _destChain) {
|
|
53
53
|
return [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelayAdapter.js","sourceRoot":"","sources":["../../../../src/cross/adapters/RelayAdapter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EAEjB,4BAA4B,EAC5B,YAAY,EACZ,SAAS,GACV,MAAM,wBAAwB,CAAA;AAC/B,OAAO,EAAqB,WAAW,EAAE,MAAM,MAAM,CAAA;AACrD,OAAO,EACL,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,SAAS,EACT,KAAK,EACL,GAAG,EACH,MAAM,EACN,KAAK,EACL,OAAO,EACP,MAAM,EACN,QAAQ,EACR,OAAO,EACP,KAAK,EACL,MAAM,EACN,KAAK,EACL,QAAQ,EACR,MAAM,GACP,MAAM,aAAa,CAAA;AAGpB,OAAO,EACL,wBAAwB,EACxB,+BAA+B,EAC/B,gBAAgB,EAChB,YAAY,GACb,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EACL,eAAe,EAEf,kCAAkC,EAClC,WAAW,GAKZ,MAAM,sBAAsB,CAAA;AAE7B,MAAM,aAAa,GAAG,SAAS,CAAA;AAE/B,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,aAAa;IACjB,IAAI,EAAE,QAAQ;IACd,WAAW,EAAE,QAAQ;IACrB,MAAM,EAAE,KAAc;CACT,CAAA;AAEf,MAAM,OAAO,YAAa,SAAQ,eAAe;IAC/C;QACE,KAAK,EAAE,CAAA;QACP,YAAY,CAAC;YACX,UAAU,EAAE,iBAAiB;YAC7B,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE;gBACN,QAAQ;gBACR,SAAS;gBACT,IAAI;gBACJ,SAAS;gBACT,KAAK;gBACL,GAAG;gBACH,MAAM;gBACN,KAAK;gBACL,OAAO;gBACP,MAAM;gBACN,QAAQ;gBACR,OAAO;gBACP,MAAM;gBACN,KAAK;gBACL,MAAM;gBACN,KAAK;gBACL,QAAQ;aACT;iBACE,GAAG,CAAC,4BAA4B,CAAC;iBACjC,MAAM,CAAC,WAAkB,CAAC;SAC9B,CAAC,CAAA;IACJ,CAAC;IAED,OAAO;QACL,OAAO,OAAO,CAAA;IAChB,CAAC;IACD,OAAO;QACL,OAAO,0GAA0G,CAAA;IACnH,CAAC;IACD,kBAAkB;QAChB,
|
|
1
|
+
{"version":3,"file":"RelayAdapter.js","sourceRoot":"","sources":["../../../../src/cross/adapters/RelayAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { useAccount, useAccountDisconnect, useWalletMenu, } from '@openocean.fin
|
|
|
2
2
|
import { updateRouteExecution } from '@openocean.finance/widget-sdk';
|
|
3
3
|
import { useMutation, useQueryClient } from '@tanstack/react-query';
|
|
4
4
|
import { useCallback, useEffect, useRef } from 'react';
|
|
5
|
-
import { useConfig } from 'wagmi';
|
|
5
|
+
import { useConfig, useWalletClient } from 'wagmi';
|
|
6
6
|
import { shallow } from 'zustand/shallow';
|
|
7
7
|
import { executeRoute } from '../services/ExecuteRoute.js';
|
|
8
8
|
import { useRouteExecutionStore, useRouteExecutionStoreContext, } from '../stores/routes/RouteExecutionStore.js';
|
|
@@ -15,6 +15,7 @@ export const useRouteExecution = ({ routeId, executeInBackground, onAcceptExchan
|
|
|
15
15
|
const wagmiConfig = useConfig();
|
|
16
16
|
const disconnect = useAccountDisconnect();
|
|
17
17
|
const { openWalletMenu } = useWalletMenu();
|
|
18
|
+
const solanaWallet = useWalletClient();
|
|
18
19
|
// const { wallet: solanaWallet } = useWallet()
|
|
19
20
|
const resumedAfterMount = useRef(false);
|
|
20
21
|
const emitter = useWidgetEvents();
|
|
@@ -100,7 +101,7 @@ export const useRouteExecution = ({ routeId, executeInBackground, onAcceptExchan
|
|
|
100
101
|
wagmiConfig,
|
|
101
102
|
onDisconnect: disconnect,
|
|
102
103
|
onOpenWalletMenu: openWalletMenu,
|
|
103
|
-
|
|
104
|
+
solanaWallet: solanaWallet,
|
|
104
105
|
});
|
|
105
106
|
},
|
|
106
107
|
onMutate: () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRouteExecution.js","sourceRoot":"","sources":["../../../src/hooks/useRouteExecution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,aAAa,GACd,MAAM,sCAAsC,CAAA;AAK7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAA;AACpE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACnE,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"useRouteExecution.js","sourceRoot":"","sources":["../../../src/hooks/useRouteExecution.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { adaptSolanaWallet } from '@reservoir0x/relay-solana-wallet-adapter';
|
|
1
2
|
import { Connection, Transaction, VersionedTransaction } from '@solana/web3.js';
|
|
2
3
|
import { ethers } from 'ethers';
|
|
3
4
|
import { getPublicClient, getWalletClient } from 'wagmi/actions';
|
|
@@ -188,7 +189,7 @@ async function swapQuoteMEV(response, options) {
|
|
|
188
189
|
}
|
|
189
190
|
}
|
|
190
191
|
// Execute Solana transaction
|
|
191
|
-
async function executeSolanaSwap(step, options, process, route
|
|
192
|
+
async function executeSolanaSwap(step, options, process, route) {
|
|
192
193
|
try {
|
|
193
194
|
// Check wallet connection status
|
|
194
195
|
if (!options.account || !options.account.connector) {
|
|
@@ -198,15 +199,52 @@ async function executeSolanaSwap(step, options, process, route, solanaWallet) {
|
|
|
198
199
|
const connection = new Connection('https://burned-practical-bird.solana-mainnet.quiknode.pro/33f4786133c252415e194b29ee69ffc7671480ab');
|
|
199
200
|
const { transactionRequest, type, quoteData } = step || {};
|
|
200
201
|
if (type === 'bridge') {
|
|
201
|
-
const
|
|
202
|
+
const adaptedWallet = adaptSolanaWallet(options.account.address?.toString() ||
|
|
203
|
+
'1nc1nerator11111111111111111111111111111111', 792703809, //chain id that Relay uses to identify solana
|
|
204
|
+
connection, async (transaction) => {
|
|
205
|
+
try {
|
|
206
|
+
// Ensure transaction is properly formatted
|
|
207
|
+
if (transaction instanceof VersionedTransaction ||
|
|
208
|
+
transaction instanceof Transaction) {
|
|
209
|
+
const connector = options.account.connector;
|
|
210
|
+
if (typeof connector.signTransaction !== 'function') {
|
|
211
|
+
throw new Error('Wallet does not support transaction signing');
|
|
212
|
+
}
|
|
213
|
+
// Sign transaction
|
|
214
|
+
const signature = await connector.signTransaction(transaction);
|
|
215
|
+
const serializedTransaction = signature.serialize({
|
|
216
|
+
verifySignatures: false,
|
|
217
|
+
requireAllSignatures: false,
|
|
218
|
+
});
|
|
219
|
+
const txid = await connection.sendRawTransaction(serializedTransaction, {
|
|
220
|
+
skipPreflight: true,
|
|
221
|
+
});
|
|
222
|
+
return { signature: txid };
|
|
223
|
+
}
|
|
224
|
+
throw new Error('Invalid transaction type');
|
|
225
|
+
}
|
|
226
|
+
catch (error) {
|
|
227
|
+
console.error('Transaction sending failed:', error);
|
|
228
|
+
throw error;
|
|
229
|
+
}
|
|
230
|
+
});
|
|
231
|
+
const signedTx = await bridgeExecuteSwap({
|
|
202
232
|
quoteData: quoteData,
|
|
203
|
-
walletClient:
|
|
233
|
+
walletClient: adaptedWallet,
|
|
204
234
|
});
|
|
205
|
-
|
|
206
|
-
|
|
235
|
+
if (!signedTx) {
|
|
236
|
+
throw new Error('Failed to sign transaction');
|
|
237
|
+
}
|
|
238
|
+
const hash = signedTx.sourceTxHash;
|
|
239
|
+
process.status = 'DONE';
|
|
240
|
+
process.doneAt = Date.now();
|
|
207
241
|
process.txHash = hash;
|
|
208
|
-
process.message = 'Transaction
|
|
242
|
+
process.message = 'Transaction confirmed';
|
|
209
243
|
options.updateRouteHook?.(route);
|
|
244
|
+
// process.status = 'PENDING'
|
|
245
|
+
// process.txHash = hash
|
|
246
|
+
// process.message = 'Transaction pending'
|
|
247
|
+
// options.updateRouteHook?.(route)
|
|
210
248
|
}
|
|
211
249
|
else {
|
|
212
250
|
const txData = transactionRequest?.data || '';
|
|
@@ -298,15 +336,17 @@ async function executeEvmSwap(step, options, process, route) {
|
|
|
298
336
|
throw new Error('Please connect wallet first');
|
|
299
337
|
}
|
|
300
338
|
// Check if current chain matches target chain
|
|
301
|
-
|
|
339
|
+
console.log('walletClient', walletClient, walletClient.chain, walletClient.getChainId);
|
|
340
|
+
const currentChainId = await walletClient.getChainId();
|
|
302
341
|
const targetChainId = step.action.fromChainId;
|
|
303
|
-
if (currentChainId
|
|
342
|
+
if (currentChainId != targetChainId) {
|
|
304
343
|
try {
|
|
305
344
|
// Try to switch to target chain
|
|
306
345
|
await walletClient.switchChain({ id: targetChainId });
|
|
307
346
|
// Get updated walletClient after chain switch
|
|
308
347
|
walletClient = (await getWalletClient(options.wagmiConfig));
|
|
309
|
-
|
|
348
|
+
const currentChainId2 = await walletClient.getChainId();
|
|
349
|
+
if (!walletClient || currentChainId2 !== targetChainId) {
|
|
310
350
|
throw new Error('Failed to switch chain');
|
|
311
351
|
}
|
|
312
352
|
}
|
|
@@ -384,7 +424,7 @@ async function executeEvmSwap(step, options, process, route) {
|
|
|
384
424
|
? BigInt('0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff')
|
|
385
425
|
: BigInt(amount);
|
|
386
426
|
const hash = await walletClient.writeContract({
|
|
387
|
-
chain: walletClient.chain,
|
|
427
|
+
chain: walletClient.chain || undefined,
|
|
388
428
|
account: walletClient.account,
|
|
389
429
|
address: step.action.fromToken.address,
|
|
390
430
|
abi: [
|
|
@@ -504,7 +544,7 @@ async function executeEvmSwap(step, options, process, route) {
|
|
|
504
544
|
}
|
|
505
545
|
}
|
|
506
546
|
// Execute transaction
|
|
507
|
-
async function executeSwap(route, options
|
|
547
|
+
async function executeSwap(route, options) {
|
|
508
548
|
const updatedRoute = { ...route };
|
|
509
549
|
try {
|
|
510
550
|
// Execute transactions for each step
|
|
@@ -537,7 +577,7 @@ async function executeSwap(route, options, solanaWallet) {
|
|
|
537
577
|
// Execute different transaction logic based on chain type
|
|
538
578
|
const currentStep = route.steps[0];
|
|
539
579
|
if (currentStep.action?.fromChainId === 1151111081099710) {
|
|
540
|
-
await executeSolanaSwap(currentStep, options, process, updatedRoute
|
|
580
|
+
await executeSolanaSwap(currentStep, options, process, updatedRoute);
|
|
541
581
|
}
|
|
542
582
|
else {
|
|
543
583
|
await executeEvmSwap(currentStep, options, process, updatedRoute);
|
|
@@ -565,6 +605,6 @@ export async function executeRoute(route, options) {
|
|
|
565
605
|
if (!options.account.isConnected) {
|
|
566
606
|
throw new Error('Wallet not connected');
|
|
567
607
|
}
|
|
568
|
-
return executeSwap(route, options
|
|
608
|
+
return executeSwap(route, options);
|
|
569
609
|
}
|
|
570
610
|
//# sourceMappingURL=ExecuteRoute.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExecuteRoute.js","sourceRoot":"","sources":["../../../src/services/ExecuteRoute.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ExecuteRoute.js","sourceRoot":"","sources":["../../../src/services/ExecuteRoute.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* This module handles sending and confirming transactions on Solana blockchain
|
|
5
5
|
*/
|
|
6
|
-
import { BlockhashWithExpiryBlockHeight, Connection } from
|
|
6
|
+
import type { BlockhashWithExpiryBlockHeight, Connection } from '@solana/web3.js';
|
|
7
7
|
/**
|
|
8
8
|
* Transaction sending and confirmation parameters interface
|
|
9
9
|
*/
|
|
@@ -25,5 +25,5 @@ interface SolanaTransactionParams {
|
|
|
25
25
|
* @param params Transaction parameters
|
|
26
26
|
* @returns Transaction response and hash
|
|
27
27
|
*/
|
|
28
|
-
export declare function sendAndConfirmSolanaTransaction({ connection, serializedTransaction, process, updateRouteHook }: SolanaTransactionParams): Promise<any>;
|
|
28
|
+
export declare function sendAndConfirmSolanaTransaction({ connection, serializedTransaction, process, updateRouteHook, }: SolanaTransactionParams): Promise<any>;
|
|
29
29
|
export {};
|
|
@@ -23,7 +23,6 @@ async function sendSolanaTransaction(connection, serializedTransaction, process,
|
|
|
23
23
|
const txid = await connection.sendRawTransaction(serializedTransaction, {
|
|
24
24
|
skipPreflight: true,
|
|
25
25
|
});
|
|
26
|
-
console.log('Transaction sent:', txid);
|
|
27
26
|
// Update transaction status to pending
|
|
28
27
|
if (process && updateRouteHook) {
|
|
29
28
|
process.status = 'PENDING';
|
|
@@ -37,7 +36,8 @@ async function sendSolanaTransaction(connection, serializedTransaction, process,
|
|
|
37
36
|
console.error('Failed to send transaction:', error);
|
|
38
37
|
if (process && updateRouteHook) {
|
|
39
38
|
process.status = 'FAILED';
|
|
40
|
-
process.message =
|
|
39
|
+
process.message =
|
|
40
|
+
error instanceof Error ? error.message : 'Failed to send transaction';
|
|
41
41
|
updateRouteHook(process.route);
|
|
42
42
|
}
|
|
43
43
|
throw error;
|
|
@@ -63,7 +63,7 @@ async function confirmSolanaTransaction(connection, txid, process, updateRouteHo
|
|
|
63
63
|
const confirmation = await connection.confirmTransaction({
|
|
64
64
|
signature: txid,
|
|
65
65
|
blockhash: latestBlockhash.blockhash,
|
|
66
|
-
lastValidBlockHeight: latestBlockhash.lastValidBlockHeight
|
|
66
|
+
lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
|
|
67
67
|
});
|
|
68
68
|
// Check if transaction failed
|
|
69
69
|
if (confirmation.value.err) {
|
|
@@ -103,7 +103,7 @@ async function confirmSolanaTransaction(connection, txid, process, updateRouteHo
|
|
|
103
103
|
* @param params Transaction parameters
|
|
104
104
|
* @returns Transaction response and hash
|
|
105
105
|
*/
|
|
106
|
-
export async function sendAndConfirmSolanaTransaction({ connection, serializedTransaction, process, updateRouteHook }) {
|
|
106
|
+
export async function sendAndConfirmSolanaTransaction({ connection, serializedTransaction, process, updateRouteHook, }) {
|
|
107
107
|
try {
|
|
108
108
|
// Send transaction and get transaction hash
|
|
109
109
|
const txid = await sendSolanaTransaction(connection, serializedTransaction, process, updateRouteHook);
|
|
@@ -114,8 +114,8 @@ export async function sendAndConfirmSolanaTransaction({ connection, serializedTr
|
|
|
114
114
|
}
|
|
115
115
|
// Get transaction details
|
|
116
116
|
const response = await connection.getTransaction(txid, {
|
|
117
|
-
commitment:
|
|
118
|
-
maxSupportedTransactionVersion: 0
|
|
117
|
+
commitment: 'confirmed',
|
|
118
|
+
maxSupportedTransactionVersion: 0,
|
|
119
119
|
});
|
|
120
120
|
if (!response) {
|
|
121
121
|
throw new Error('Failed to fetch transaction details');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SendAndConfirmSolanaTransaction.js","sourceRoot":"","sources":["../../../src/services/SendAndConfirmSolanaTransaction.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"SendAndConfirmSolanaTransaction.js","sourceRoot":"","sources":["../../../src/services/SendAndConfirmSolanaTransaction.ts"],"names":[],"mappings":"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"}
|