rubic-sdk 5.50.5-alpha.solana.30 → 5.50.5-alpha.solana.32
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/core/blockchain/web3-private-service/web3-private/solana-web3-private/models/solana-transaction-options.d.ts +1 -0
- package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.d.ts +1 -1
- package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.js +33 -28
- package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-solana-cross-chain-trade.js +5 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-solana-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/lifi-provider/chains/lifi-solana-cross-chain-trade.js +5 -1
- package/lib/features/cross-chain/calculation-manager/providers/lifi-provider/chains/lifi-solana-cross-chain-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/solana-on-chain-trade/solana-on-chain-trade.js +2 -1
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-trade/solana-on-chain-trade/solana-on-chain-trade.js.map +1 -1
- package/package.json +1 -1
@@ -7,6 +7,6 @@ export declare class SolanaWeb3Private extends Web3Private {
|
|
7
7
|
private readonly solanaWeb3;
|
8
8
|
protected readonly Web3Pure: typeof SolanaWeb3Pure;
|
9
9
|
getBlockchainName(): Promise<BlockchainName | undefined>;
|
10
|
-
sendTransaction(options
|
10
|
+
sendTransaction(options: SolanaTransactionOptions): Promise<string>;
|
11
11
|
constructor(solanaWeb3: SolanaWeb3);
|
12
12
|
}
|
@@ -12,14 +12,14 @@ class SolanaWeb3Private extends web3_private_1.Web3Private {
|
|
12
12
|
async getBlockchainName() {
|
13
13
|
return blockchain_name_1.BLOCKCHAIN_NAME.SOLANA;
|
14
14
|
}
|
15
|
-
async sendTransaction(options
|
15
|
+
async sendTransaction(options) {
|
16
16
|
try {
|
17
17
|
const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.SOLANA);
|
18
18
|
const decodedData = options.data.startsWith('0x')
|
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
|
-
|
22
|
+
const txMessage = web3_js_1.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,33 +33,38 @@ 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
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
36
|
+
txMessage.instructions.push(computePriceIx, computeLimitIx);
|
37
|
+
txMessage.recentBlockhash = blockhash;
|
38
|
+
// const swapIx = tx.message.compiledInstructions.map((ci: MessageCompiledInstruction) => {
|
39
|
+
// const programId = tx.message.staticAccountKeys[ci.programIdIndex]!;
|
40
|
+
// const keys = ci.accountKeyIndexes.map(index => ({
|
41
|
+
// pubkey: tx.message.staticAccountKeys[index]!,
|
42
|
+
// isSigner: tx.message.isAccountSigner(index),
|
43
|
+
// isWritable: tx.message.isAccountWritable(index)
|
44
|
+
// }));
|
45
|
+
// return new TransactionInstruction({
|
46
|
+
// programId,
|
47
|
+
// keys,
|
48
|
+
// data: Buffer.from(ci.data)
|
49
|
+
// });
|
50
|
+
// });
|
51
|
+
// const swapIx = new TransactionInstruction({
|
52
|
+
// data: decodedData,
|
53
|
+
// programId: SWAP_PROGRAM_ID
|
54
|
+
// });
|
55
|
+
// tx.message.recentBlockhash = blockhash;
|
56
|
+
// const instructions: TransactionInstruction[] = [
|
57
|
+
// computePriceIx,
|
58
|
+
// computeLimitIx,
|
59
|
+
// ...swapIx
|
60
|
+
// ];
|
55
61
|
// txMessage.instructions.push(computePriceIx, computeLimitIx);
|
56
|
-
// const msgWithGas =
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
const txWithGas = new web3_js_1.VersionedTransaction(msgWithGas);
|
62
|
+
// const msgWithGas = new TransactionMessage({
|
63
|
+
// payerKey: new PublicKey(options.fromAddress),
|
64
|
+
// recentBlockhash: blockhash,
|
65
|
+
// instructions
|
66
|
+
// }).compileToV0Message();
|
67
|
+
const txWithGas = new web3_js_1.VersionedTransaction(txMessage.compileToV0Message());
|
63
68
|
const { signature } = await this.solanaWeb3.signAndSendTransaction(txWithGas);
|
64
69
|
options.onTransactionHash?.(signature);
|
65
70
|
return 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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"}
|
@@ -60,7 +60,11 @@ class DebridgeSolanaCrossChainTrade extends solana_cross_chain_trade_1.SolanaCro
|
|
60
60
|
}
|
61
61
|
transactionHash = hash;
|
62
62
|
};
|
63
|
-
await this.web3Private.sendTransaction({
|
63
|
+
await this.web3Private.sendTransaction({
|
64
|
+
data,
|
65
|
+
onTransactionHash,
|
66
|
+
fromAddress: this.walletAddress
|
67
|
+
});
|
64
68
|
return transactionHash;
|
65
69
|
}
|
66
70
|
catch (err) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"debridge-solana-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-solana-cross-chain-trade.ts"],"names":[],"mappings":";;;AACA,8CAA+F;AAE/F,oDAAqD;AAErD,kGAA8F;AAG9F,uFAAkF;AAClF,uHAAoH;AACpH,uJAAiJ;AACjJ,kHAA+G;AAK/G,8JAAwJ;AAKxJ,+HAA4H;AAE5H,8DAAkE;AAElE;;GAEG;AACH,MAAa,6BAA8B,SAAQ,gDAAqB;IA+BpE,IAAY,cAAc;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,UAA0E,CAAC;IAChG,CAAC;IAED,IAAc,mBAAmB;QAC7B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,wDAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC;IAClE,CAAC;IAID,IAAc,UAAU;QACpB,OAAO,uCAAuC,CAAC;IACnD,CAAC;IAED,YACI,eAAyD,EACzD,eAAuB,EACvB,SAAsB;QAEtB,KAAK,CAAC,eAAe,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;QA3C7B,SAAI,GAAG,+CAAsB,CAAC,QAAQ,CAAC;QAEvC,iBAAY,GAAG,KAAK,CAAC;QAErB,mBAAc,GAAG;YAC7B,IAAI,EAAE,yCAAmB,CAAC,GAAG;YAC7B,EAAE,EAAE,yCAAmB,CAAC,GAAG;SAC9B,CAAC;QAEc,eAAU,GAAG,yBAAW,CAAC,QAAQ,CAAC;QAU1C,mBAAc,GAAkB,IAAI,CAAC;QA0BzC,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,kBAAkB,GAAG,eAAe,CAAC,kBAAkB,CAAC;QAC7D,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;QAC/C,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;QACzC,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QACvC,IAAI,CAAC,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;QAErD,IAAI,CAAC,aAAa,GAAG,eAAe,CAAC,aAAa,CAAC;IACvD,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,UAAkC,EAAE;QAC3D,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,eAAuB,CAAC;QAE5B,IAAI,CAAC;YACD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAC5C,KAAK,EACL,OAAO,EAAE,YAAY,IAAI,KAAK,EAC9B,OAAO,EAAE,eAAe,CAC3B,CAAC;YAEF,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;YAC9B,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;gBACvC,IAAI,SAAS,EAAE,CAAC;oBACZ,SAAS,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;gBACD,eAAe,GAAG,IAAI,CAAC;YAC3B,CAAC,CAAC;YAEF,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,
|
1
|
+
{"version":3,"file":"debridge-solana-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-solana-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
@@ -54,7 +54,11 @@ class LifiSolanaCrossChainTrade extends solana_cross_chain_trade_1.SolanaCrossCh
|
|
54
54
|
}
|
55
55
|
transactionHash = hash;
|
56
56
|
};
|
57
|
-
await this.web3Private.sendTransaction({
|
57
|
+
await this.web3Private.sendTransaction({
|
58
|
+
data,
|
59
|
+
onTransactionHash,
|
60
|
+
fromAddress: this.walletAddress
|
61
|
+
});
|
58
62
|
return transactionHash;
|
59
63
|
}
|
60
64
|
catch (err) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"lifi-solana-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/lifi-provider/chains/lifi-solana-cross-chain-trade.ts"],"names":[],"mappings":";;;AACA,8CAI2B;AAE3B,oDAAqD;AAErD,uEAAmE;AAGnE,6EAAwE;AAExE,mFAAgF;AAChF,sGAAgG;AAOhG,6GAAuG;AAMvG,mEAA8D;AAE9D,MAAa,yBAA0B,SAAQ,gDAAqB;IA0BhE,IAAY,cAAc;QACtB,OAAO,IAAI,CAAC,IAAI,CAAC,UAA+C,CAAC;IACrE,CAAC;IAED,IAAc,mBAAmB;QAC7B,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,wDAAyB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC;IAClE,CAAC;IAED,IAAc,UAAU;QACpB,OAAO,uCAAuC,CAAC;IACnD,CAAC;IAED,IAAuB,aAAa;QAChC,OAAO,oBAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IACnE,CAAC;IAED,YACI,eAAqE,EACrE,eAAuB,EACvB,SAAsB,EACtB,QAAiB;QAEjB,KAAK,CAAC,eAAe,EAAE,SAAS,EAAE,QAAQ,CAAC,CAAC;QAlDhD,gBAAgB;QACA,SAAI,GAAG,+CAAsB,CAAC,IAAI,CAAC;QAEnC,iBAAY,GAAG,KAAK,CAAC;QAiDjC,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAC;QACjC,IAAI,CAAC,EAAE,GAAG,eAAe,CAAC,EAAE,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC;QACnC,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC,eAAe,CAAC;QAErE,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC,gBAAgB,CAAC;QACzD,IAAI,CAAC,OAAO,GAAG,eAAe,CAAC,OAAO,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC;QACzC,IAAI,CAAC,WAAW,GAAG,eAAe,CAAC,WAAW,CAAC;QAC/C,IAAI,CAAC,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC;QACrD,IAAI,CAAC,UAAU,GAAG,eAAe,CAAC,UAAU,CAAC;IACjD,CAAC;IAES,KAAK,CAAC,UAAU,CAAC,UAAkC,EAAE;QAC3D,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC5B,MAAM,IAAI,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC;QAC7C,IAAI,eAAuB,CAAC;QAE5B,IAAI,CAAC;YACD,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAC5C,KAAK,EACL,OAAO,EAAE,YAAY,IAAI,KAAK,EAC9B,OAAO,EAAE,eAAe,CAC3B,CAAC;YAEF,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;YAC9B,MAAM,iBAAiB,GAAG,CAAC,IAAY,EAAE,EAAE;gBACvC,IAAI,SAAS,EAAE,CAAC;oBACZ,SAAS,CAAC,IAAI,CAAC,CAAC;gBACpB,CAAC;gBACD,eAAe,GAAG,IAAI,CAAC;YAC3B,CAAC,CAAC;YAEF,MAAM,IAAI,CAAC,WAAW,CAAC,eAAe,CAAC,
|
1
|
+
{"version":3,"file":"lifi-solana-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/lifi-provider/chains/lifi-solana-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
@@ -99,7 +99,8 @@ class SolanaOnChainTrade extends on_chain_trade_1.OnChainTrade {
|
|
99
99
|
try {
|
100
100
|
await this.web3Private.sendTransaction({
|
101
101
|
data: transactionConfig.data,
|
102
|
-
onTransactionHash
|
102
|
+
onTransactionHash,
|
103
|
+
fromAddress: this.walletAddress
|
103
104
|
});
|
104
105
|
return transactionHash;
|
105
106
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"solana-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-trade/solana-on-chain-trade/solana-on-chain-trade.ts"],"names":[],"mappings":"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
|
1
|
+
{"version":3,"file":"solana-on-chain-trade.js","sourceRoot":"","sources":["../../../../../../../../src/features/on-chain/calculation-manager/providers/common/on-chain-trade/solana-on-chain-trade/solana-on-chain-trade.ts"],"names":[],"mappings":"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"}
|