@openocean.finance/openocean-sdk 1.7.63 → 1.7.64
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/lib/swapSdk/Swap.d.ts +1 -0
- package/lib/swapSdk/Swap.js +55 -10
- package/package.json +1 -1
package/lib/swapSdk/Swap.d.ts
CHANGED
|
@@ -16,6 +16,7 @@ export declare class Swap {
|
|
|
16
16
|
getGas(): Promise<unknown>;
|
|
17
17
|
sendONTTransaction(): Promise<void>;
|
|
18
18
|
sendSolanaTransaction(): Promise<void>;
|
|
19
|
+
sendSolanaTransactionToBlockRust(serializedTransaction: any): Promise<void>;
|
|
19
20
|
sendSuiTransaction(): Promise<void>;
|
|
20
21
|
sendStarknetTransaction(): Promise<void>;
|
|
21
22
|
sendAptosTransaction(): Promise<void>;
|
package/lib/swapSdk/Swap.js
CHANGED
|
@@ -205,7 +205,7 @@ var Swap = /** @class */ (function () {
|
|
|
205
205
|
res = this.res;
|
|
206
206
|
_d.label = 1;
|
|
207
207
|
case 1:
|
|
208
|
-
_d.trys.push([1,
|
|
208
|
+
_d.trys.push([1, 11, , 12]);
|
|
209
209
|
transaction = '';
|
|
210
210
|
if (res.isVersioned || res.dexId == 6 || res.dexId == 7 || res.dexId == 9) {
|
|
211
211
|
transaction = web3_js_1.VersionedTransaction.deserialize(Buffer.from(res.transaction, 'hex'));
|
|
@@ -248,12 +248,18 @@ var Swap = /** @class */ (function () {
|
|
|
248
248
|
verifySignatures: false,
|
|
249
249
|
requireAllSignatures: false
|
|
250
250
|
});
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
// blockhashWithExpiryBlockHeight
|
|
255
|
-
})];
|
|
251
|
+
console.log('sendSolanaTransactionToBlockRust', res, serializedTransaction);
|
|
252
|
+
if (!res.isTip) return [3 /*break*/, 9];
|
|
253
|
+
return [4 /*yield*/, this.sendSolanaTransactionToBlockRust(serializedTransaction)];
|
|
256
254
|
case 8:
|
|
255
|
+
_d.sent();
|
|
256
|
+
return [2 /*return*/];
|
|
257
|
+
case 9: return [4 /*yield*/, (0, solanaTransactionSender_1.transactionSenderAndConfirmationWaiter)({
|
|
258
|
+
connection: this.wallet.connection,
|
|
259
|
+
serializedTransaction: serializedTransaction,
|
|
260
|
+
// blockhashWithExpiryBlockHeight
|
|
261
|
+
})];
|
|
262
|
+
case 10:
|
|
257
263
|
transactionResponse = _d.sent();
|
|
258
264
|
if (transactionResponse && transactionResponse.response) {
|
|
259
265
|
if ((_b = transactionResponse.response.meta) === null || _b === void 0 ? void 0 : _b.err) {
|
|
@@ -266,12 +272,51 @@ var Swap = /** @class */ (function () {
|
|
|
266
272
|
else {
|
|
267
273
|
this.errorCallback('Transaction not confirmed.');
|
|
268
274
|
}
|
|
269
|
-
return [3 /*break*/,
|
|
270
|
-
case
|
|
275
|
+
return [3 /*break*/, 12];
|
|
276
|
+
case 11:
|
|
271
277
|
e_1 = _d.sent();
|
|
272
278
|
this.errorCallback(e_1.message);
|
|
273
|
-
return [3 /*break*/,
|
|
274
|
-
case
|
|
279
|
+
return [3 /*break*/, 12];
|
|
280
|
+
case 12: return [2 /*return*/];
|
|
281
|
+
}
|
|
282
|
+
});
|
|
283
|
+
});
|
|
284
|
+
};
|
|
285
|
+
Swap.prototype.sendSolanaTransactionToBlockRust = function (serializedTransaction) {
|
|
286
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
287
|
+
var headers, body, res, err_1;
|
|
288
|
+
var _a;
|
|
289
|
+
return __generator(this, function (_b) {
|
|
290
|
+
switch (_b.label) {
|
|
291
|
+
case 0:
|
|
292
|
+
headers = {
|
|
293
|
+
'Content-Type': 'application/json',
|
|
294
|
+
'x-api-key': '3286e2c789ddc0a71cbbfad34e5adad2',
|
|
295
|
+
};
|
|
296
|
+
body = {
|
|
297
|
+
jsonrpc: '2.0',
|
|
298
|
+
id: 1,
|
|
299
|
+
method: 'sendTransaction',
|
|
300
|
+
params: [
|
|
301
|
+
Buffer.from(serializedTransaction).toString('base64'),
|
|
302
|
+
{
|
|
303
|
+
encoding: 'base64'
|
|
304
|
+
}
|
|
305
|
+
],
|
|
306
|
+
};
|
|
307
|
+
_b.label = 1;
|
|
308
|
+
case 1:
|
|
309
|
+
_b.trys.push([1, 3, , 4]);
|
|
310
|
+
return [4 /*yield*/, axios_1.default.post('https://jp1.rpc.blockrush.io', body, { headers: headers })];
|
|
311
|
+
case 2:
|
|
312
|
+
res = _b.sent();
|
|
313
|
+
console.log('RPC Response:', res.data);
|
|
314
|
+
return [3 /*break*/, 4];
|
|
315
|
+
case 3:
|
|
316
|
+
err_1 = _b.sent();
|
|
317
|
+
console.error('RPC Error:', ((_a = err_1.response) === null || _a === void 0 ? void 0 : _a.data) || err_1.message);
|
|
318
|
+
return [3 /*break*/, 4];
|
|
319
|
+
case 4: return [2 /*return*/];
|
|
275
320
|
}
|
|
276
321
|
});
|
|
277
322
|
});
|