rubic-sdk 5.50.5-alpha.solana.29 → 5.50.5-alpha.solana.30
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.
|
@@ -19,7 +19,7 @@ class SolanaWeb3Private extends web3_private_1.Web3Private {
|
|
|
19
19
|
? Buffer.from(options.data.slice(2), 'hex')
|
|
20
20
|
: utils_1.base64.decode(options.data);
|
|
21
21
|
const tx = web3_js_1.VersionedTransaction.deserialize(decodedData);
|
|
22
|
-
const txMessage =
|
|
22
|
+
// const txMessage = TransactionMessage.decompile(tx.message);
|
|
23
23
|
const { blockhash } = await web3Public.getRecentBlockhash();
|
|
24
24
|
const avgGas = await injector_1.Injector.web3PublicService
|
|
25
25
|
.getWeb3Public('SOLANA')
|
|
@@ -33,11 +33,32 @@ class SolanaWeb3Private extends web3_private_1.Web3Private {
|
|
|
33
33
|
const computeLimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
|
|
34
34
|
units: computeUnitLimit
|
|
35
35
|
});
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
36
|
+
const swapIx = tx.message.compiledInstructions.map((ci) => {
|
|
37
|
+
const programId = tx.message.staticAccountKeys[ci.programIdIndex];
|
|
38
|
+
const keys = ci.accountKeyIndexes.map(index => ({
|
|
39
|
+
pubkey: tx.message.staticAccountKeys[index],
|
|
40
|
+
isSigner: tx.message.isAccountSigner(index),
|
|
41
|
+
isWritable: tx.message.isAccountWritable(index)
|
|
42
|
+
}));
|
|
43
|
+
return new web3_js_1.TransactionInstruction({
|
|
44
|
+
programId,
|
|
45
|
+
keys,
|
|
46
|
+
data: Buffer.from(ci.data)
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
tx.message.recentBlockhash = blockhash;
|
|
50
|
+
const instructions = [
|
|
51
|
+
computePriceIx,
|
|
52
|
+
computeLimitIx,
|
|
53
|
+
...swapIx
|
|
54
|
+
];
|
|
55
|
+
// txMessage.instructions.push(computePriceIx, computeLimitIx);
|
|
56
|
+
// const msgWithGas = txMessage.compileToV0Message();
|
|
57
|
+
const msgWithGas = new web3_js_1.TransactionMessage({
|
|
58
|
+
instructions,
|
|
59
|
+
payerKey: new web3_js_1.PublicKey(tx.message.staticAccountKeys[0]),
|
|
60
|
+
recentBlockhash: blockhash
|
|
61
|
+
}).compileToV0Message();
|
|
41
62
|
const txWithGas = new web3_js_1.VersionedTransaction(msgWithGas);
|
|
42
63
|
const { signature } = await this.solanaWeb3.signAndSendTransaction(txWithGas);
|
|
43
64
|
options.onTransactionHash?.(signature);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"solana-web3-private.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"solana-web3-private.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.ts"],"names":[],"mappings":"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"}
|