rubic-sdk 5.50.5-alpha.solana.32 → 5.50.5-alpha.solana.4
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/common/tokens/token.d.ts +0 -2
- package/lib/common/tokens/token.js +2 -5
- package/lib/common/tokens/token.js.map +1 -1
- package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/models/solana-transaction-options.d.ts +0 -1
- 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 +3 -47
- package/lib/core/blockchain/web3-private-service/web3-private/solana-web3-private/solana-web3-private.js.map +1 -1
- package/lib/core/blockchain/web3-public-service/web3-public/models/supported-token-field.d.ts +1 -1
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/models/solana-token.d.ts +0 -6
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.d.ts +6 -0
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.js +31 -0
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.js.map +1 -1
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.d.ts +2 -3
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.js +71 -36
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.js.map +1 -1
- package/lib/core/blockchain/web3-public-service/web3-public/web3-public.js +10 -0
- package/lib/core/blockchain/web3-public-service/web3-public/web3-public.js.map +1 -1
- package/lib/features/common/models/swap-transaction-options.d.ts +0 -1
- package/lib/features/common/providers/dln/dln-api-service.d.ts +1 -1
- package/lib/features/common/providers/dln/dln-api-service.js +10 -14
- package/lib/features/common/providers/dln/dln-api-service.js.map +1 -1
- package/lib/features/common/providers/unizen/services/unizen-api-service.js +3 -3
- package/lib/features/common/providers/unizen/services/unizen-api-service.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-solana-cross-chain-trade.js +1 -5
- 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 +1 -5
- 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/aggregators/dln/chains/dln-solana-on-chain-trade.js +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/chains/dln-solana-on-chain-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/constants/dln-on-chain-supported-blockchains.d.ts +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/constants/dln-on-chain-supported-blockchains.js +8 -8
- package/lib/features/on-chain/calculation-manager/providers/aggregators/dln/constants/dln-on-chain-supported-blockchains.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/chains/lifi-solana-on-chain-trade.js +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/lifi/chains/lifi-solana-on-chain-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/constants/okuswap-api.d.ts +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/constants/okuswap-api.js +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/constants/okuswap-api.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/services/okuswap-api-service.js +3 -3
- package/lib/features/on-chain/calculation-manager/providers/aggregators/okuswap/services/okuswap-api-service.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-solana-on-chain-trade-abstract.d.ts +1 -1
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-solana-on-chain-trade-abstract.js +5 -4
- package/lib/features/on-chain/calculation-manager/providers/common/on-chain-aggregator/aggregator-solana-on-chain-trade-abstract.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 -3
- 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/lib/index.d.ts +0 -1
- package/lib/index.js +0 -1
- package/lib/index.js.map +1 -1
- package/package.json +1 -1
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-service.d.ts +0 -14
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-service.js +0 -106
- package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-service.js.map +0 -1
@@ -6,7 +6,6 @@ export type TokenStruct<T extends BlockchainName = BlockchainName> = {
|
|
6
6
|
name: string;
|
7
7
|
symbol: string;
|
8
8
|
decimals: number;
|
9
|
-
image?: string;
|
10
9
|
};
|
11
10
|
/**
|
12
11
|
* Contains main token's fields.
|
@@ -30,7 +29,6 @@ export declare class Token<T extends BlockchainName = BlockchainName> {
|
|
30
29
|
readonly name: string;
|
31
30
|
readonly symbol: string;
|
32
31
|
readonly decimals: number;
|
33
|
-
readonly image: string | undefined;
|
34
32
|
get isNative(): boolean;
|
35
33
|
get isWrapped(): boolean;
|
36
34
|
constructor(tokenStruct: TokenStruct<T>);
|
@@ -39,8 +39,7 @@ class Token {
|
|
39
39
|
...tokenBaseStruct,
|
40
40
|
name: tokenInfo.name,
|
41
41
|
symbol: tokenInfo.symbol,
|
42
|
-
decimals: parseInt(tokenInfo.decimals)
|
43
|
-
...('image' in tokenInfo && { image: tokenInfo.image })
|
42
|
+
decimals: parseInt(tokenInfo.decimals)
|
44
43
|
});
|
45
44
|
}
|
46
45
|
/**
|
@@ -67,8 +66,7 @@ class Token {
|
|
67
66
|
blockchain,
|
68
67
|
name: tokenInfo.name,
|
69
68
|
symbol: tokenInfo.symbol,
|
70
|
-
decimals: parseInt(tokenInfo.decimals)
|
71
|
-
...('image' in tokenInfo && { image: tokenInfo.image })
|
69
|
+
decimals: parseInt(tokenInfo.decimals)
|
72
70
|
});
|
73
71
|
});
|
74
72
|
}
|
@@ -98,7 +96,6 @@ class Token {
|
|
98
96
|
this.name = tokenStruct.name;
|
99
97
|
this.symbol = tokenStruct.symbol;
|
100
98
|
this.decimals = tokenStruct.decimals;
|
101
|
-
this.image = tokenStruct.image;
|
102
99
|
}
|
103
100
|
isEqualTo(token) {
|
104
101
|
return (token.blockchain === this.blockchain && (0, blockchain_1.compareAddresses)(token.address, this.address));
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/common/tokens/token.ts"],"names":[],"mappings":";;;AAAA,uEAAkE;AAClE,6EAA6E;AAE7E,4DAA+D;AAC/D,gFAA6F;AAE7F,kGAA8F;AAC9F,qGAAgG;AAChG,uEAAmE;AACnE,yDAAsD;AAEtD,qEAA+D;
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../../src/common/tokens/token.ts"],"names":[],"mappings":"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"}
|
@@ -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,60 +12,16 @@ 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
|
-
const txMessage = web3_js_1.TransactionMessage.decompile(tx.message);
|
23
22
|
const { blockhash } = await web3Public.getRecentBlockhash();
|
24
|
-
|
25
|
-
|
26
|
-
.getLastComputeUnits();
|
27
|
-
// tx.message.recentBlockhash = blockhash;
|
28
|
-
// Create the priority fee instructions
|
29
|
-
const computeUnitLimit = avgGas.multipliedBy(1.2).toNumber();
|
30
|
-
const computePriceIx = web3_js_1.ComputeBudgetProgram.setComputeUnitPrice({
|
31
|
-
microLamports: 1
|
32
|
-
});
|
33
|
-
const computeLimitIx = web3_js_1.ComputeBudgetProgram.setComputeUnitLimit({
|
34
|
-
units: computeUnitLimit
|
35
|
-
});
|
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
|
-
// ];
|
61
|
-
// txMessage.instructions.push(computePriceIx, computeLimitIx);
|
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());
|
68
|
-
const { signature } = await this.solanaWeb3.signAndSendTransaction(txWithGas);
|
23
|
+
tx.message.recentBlockhash = blockhash;
|
24
|
+
const { signature } = await this.solanaWeb3.signAndSendTransaction(tx);
|
69
25
|
options.onTransactionHash?.(signature);
|
70
26
|
return signature;
|
71
27
|
}
|
@@ -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":";;;AAAA,6CAAuD;AACvD,4CAA0C;AAC1C,gFAA6F;AAC7F,8HAAyH;AAGzH,qGAAiG;AACjG,sHAAiH;AACjH,yDAAsD;AAGtD,MAAa,iBAAkB,SAAQ,0BAAW;IAGvC,KAAK,CAAC,iBAAiB;QAC1B,OAAO,iCAAe,CAAC,MAAM,CAAC;IAClC,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,UAAoC,EAAE;QAC/D,IAAI,CAAC;YACD,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,MAAM,CAAC,CAAC;YACpF,MAAM,WAAW,GAAG,OAAO,CAAC,IAAK,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC9C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;gBAC5C,CAAC,CAAC,cAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAK,CAAC,CAAC;YAEnC,MAAM,EAAE,GAAG,8BAAoB,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YACzD,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,UAAU,CAAC,kBAAkB,EAAE,CAAC;YAC5D,EAAE,CAAC,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC;YAEvC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;YACvE,OAAO,CAAC,iBAAiB,EAAE,CAAC,SAAS,CAAC,CAAC;YACvC,OAAO,SAAS,CAAC;QACrB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,CAAC,KAAK,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAC;YAChD,MAAM,iCAAc,CAAC,UAAU,CAAC,GAAgB,CAAC,CAAC;QACtD,CAAC;IACL,CAAC;IAED,YAA6B,UAAsB;QAC/C,KAAK,CAAC,UAAU,CAAC,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QADrB,eAAU,GAAV,UAAU,CAAY;QA1BhC,aAAQ,GAAG,iCAAc,CAAC;IA4B7C,CAAC;CACJ;AA9BD,8CA8BC"}
|
package/lib/core/blockchain/web3-public-service/web3-public/models/supported-token-field.d.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export type SupportedTokenField = 'decimals' | 'symbol' | 'name'
|
1
|
+
export type SupportedTokenField = 'decimals' | 'symbol' | 'name';
|
@@ -1,4 +1,3 @@
|
|
1
|
-
import { PublicKey } from '@solana/web3.js';
|
2
1
|
export interface SolanaToken {
|
3
2
|
name: string;
|
4
3
|
symbol: string;
|
@@ -8,8 +7,3 @@ export interface SolanaToken {
|
|
8
7
|
decimals: number | null;
|
9
8
|
holders?: number | null;
|
10
9
|
}
|
11
|
-
export interface SolanaTokensFetchingResp {
|
12
|
-
tokensList: SolanaToken[];
|
13
|
-
notFetchedMints: PublicKey[];
|
14
|
-
hasNotFetchedTokens: boolean;
|
15
|
-
}
|
@@ -1,8 +1,14 @@
|
|
1
1
|
import { SolanaToken } from '../models/solana-token';
|
2
|
+
interface TokenList {
|
3
|
+
preparedTokens: SolanaToken[];
|
4
|
+
addresses: string[];
|
5
|
+
}
|
2
6
|
export declare class SolanaTokensApiService {
|
3
7
|
private static readonly apiEndpoint;
|
4
8
|
private static readonly xApiKey;
|
5
9
|
static getTokensList(tokenAddresses: string[]): Promise<{
|
6
10
|
content: SolanaToken[];
|
7
11
|
}>;
|
12
|
+
static prepareTokens(tokenAddresses: string[]): TokenList;
|
8
13
|
}
|
14
|
+
export {};
|
@@ -1,6 +1,7 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.SolanaTokensApiService = void 0;
|
4
|
+
const blockchain_1 = require("../../../../../../common/utils/blockchain");
|
4
5
|
const injector_1 = require("../../../../../injector/injector");
|
5
6
|
class SolanaTokensApiService {
|
6
7
|
static getTokensList(tokenAddresses) {
|
@@ -10,6 +11,36 @@ class SolanaTokensApiService {
|
|
10
11
|
}
|
11
12
|
});
|
12
13
|
}
|
14
|
+
static prepareTokens(tokenAddresses) {
|
15
|
+
const preparedTokens = [
|
16
|
+
{
|
17
|
+
name: 'Happy Cat',
|
18
|
+
symbol: 'HAPPY',
|
19
|
+
logoURI: null,
|
20
|
+
address: 'HAPPYwgFcjEJDzRtfWE6tiHE9zGdzpNky2FvjPHsvvGZ',
|
21
|
+
decimals: 9
|
22
|
+
},
|
23
|
+
{
|
24
|
+
name: 'Just a chill guy',
|
25
|
+
symbol: 'CHILLGUY',
|
26
|
+
logoURI: 'https://ipfs.io/ipfs/Qmckb3nWWHyoJKtX3FeagfmDZXNVqiXM4nKkYsTnygm2Ah',
|
27
|
+
address: 'Df6yfrKC8kZE3KNkrHERKzAetSxbrWeniQfyJY4Jpump',
|
28
|
+
decimals: 6
|
29
|
+
}
|
30
|
+
];
|
31
|
+
return tokenAddresses.reduce((list, address) => {
|
32
|
+
const existedToken = preparedTokens.find(token => (0, blockchain_1.compareAddresses)(token.address, address));
|
33
|
+
return existedToken
|
34
|
+
? {
|
35
|
+
preparedTokens: [...list.preparedTokens, existedToken],
|
36
|
+
addresses: list.addresses
|
37
|
+
}
|
38
|
+
: {
|
39
|
+
preparedTokens: list.preparedTokens,
|
40
|
+
addresses: [...list.addresses, address]
|
41
|
+
};
|
42
|
+
}, { preparedTokens: [], addresses: [] });
|
43
|
+
}
|
13
44
|
}
|
14
45
|
exports.SolanaTokensApiService = SolanaTokensApiService;
|
15
46
|
SolanaTokensApiService.apiEndpoint = 'https://x-api.rubic.exchange/sol_token_list';
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"solana-tokens-api-service.js","sourceRoot":"","sources":["../../../../../../../src/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;
|
1
|
+
{"version":3,"file":"solana-tokens-api-service.js","sourceRoot":"","sources":["../../../../../../../src/core/blockchain/web3-public-service/web3-public/solana-web3-public/services/solana-tokens-api-service.ts"],"names":[],"mappings":";;;AAAA,4DAA+D;AAC/D,yDAAsD;AAStD,MAAa,sBAAsB;IAKxB,MAAM,CAAC,aAAa,CAAC,cAAwB;QAChD,OAAO,mBAAQ,CAAC,UAAU,CAAC,IAAI,CAC3B,GAAG,IAAI,CAAC,WAAW,uBAAuB,EAC1C,EAAE,SAAS,EAAE,cAAc,EAAE,EAC7B;YACI,OAAO,EAAE;gBACL,MAAM,EAAE,IAAI,CAAC,OAAO;aACvB;SACJ,CACJ,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,aAAa,CAAC,cAAwB;QAChD,MAAM,cAAc,GAAG;YACnB;gBACI,IAAI,EAAE,WAAW;gBACjB,MAAM,EAAE,OAAO;gBACf,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,8CAA8C;gBACvD,QAAQ,EAAE,CAAC;aACd;YACD;gBACI,IAAI,EAAE,kBAAkB;gBACxB,MAAM,EAAE,UAAU;gBAClB,OAAO,EAAE,qEAAqE;gBAC9E,OAAO,EAAE,8CAA8C;gBACvD,QAAQ,EAAE,CAAC;aACd;SACJ,CAAC;QACF,OAAO,cAAc,CAAC,MAAM,CACxB,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE;YACd,MAAM,YAAY,GAAG,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAC7C,IAAA,6BAAgB,EAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAC3C,CAAC;YACF,OAAO,YAAY;gBACf,CAAC,CAAC;oBACI,cAAc,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC;oBACtD,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC5B;gBACH,CAAC,CAAC;oBACI,cAAc,EAAE,IAAI,CAAC,cAAc;oBACnC,SAAS,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC;iBAC1C,CAAC;QACZ,CAAC,EACD,EAAE,cAAc,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAe,CACrD,CAAC;IACN,CAAC;;AAnDL,wDAoDC;AAnD2B,kCAAW,GAAG,6CAA6C,CAAC;AAE5D,8BAAO,GAAG,8CAA8C,CAAC"}
|
@@ -13,16 +13,13 @@ import { AbiItem } from 'web3-utils';
|
|
13
13
|
*/
|
14
14
|
export declare class SolanaWeb3Public extends Web3Public {
|
15
15
|
private readonly connection;
|
16
|
-
private readonly MAX_TRANSFER_COST;
|
17
16
|
constructor(connection: Connection);
|
18
|
-
getLastComputeUnits(): Promise<BigNumber>;
|
19
17
|
getBlockNumber(): Promise<number>;
|
20
18
|
multicallContractsMethods<Output extends Web3PrimitiveType>(_contractAbi: AbiItem[], _contractsData: {
|
21
19
|
contractAddress: string;
|
22
20
|
methodsData: MethodData[];
|
23
21
|
}[]): Promise<ContractMulticallResponse<Output>[][]>;
|
24
22
|
getTransactionStatus(hash: string): Promise<TxStatus>;
|
25
|
-
callForTokenInfo(tokenAddress: string, tokenFields?: SupportedTokenField[]): Promise<Partial<Record<SupportedTokenField, string>>>;
|
26
23
|
callForTokensInfo(tokenAddresses: string[] | ReadonlyArray<string>, tokenFields?: SupportedTokenField[]): Promise<Partial<Record<SupportedTokenField, string>>[]>;
|
27
24
|
getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
|
28
25
|
getTokenBalance(address: string, tokenAddress: string): Promise<BigNumber>;
|
@@ -32,6 +29,8 @@ export declare class SolanaWeb3Public extends Web3Public {
|
|
32
29
|
gasPrice?: string;
|
33
30
|
gas?: string;
|
34
31
|
}): Promise<T>;
|
32
|
+
private fetchMints;
|
33
|
+
private hasNotFetchedTokens;
|
35
34
|
healthCheck(timeoutMs?: number): Promise<boolean>;
|
36
35
|
/**
|
37
36
|
* Gets balance of multiple tokens.
|
package/lib/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.js
CHANGED
@@ -1,4 +1,10 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
+
};
|
2
8
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
9
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
10
|
};
|
@@ -6,15 +12,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
12
|
exports.SolanaWeb3Public = void 0;
|
7
13
|
const spl_token_1 = require("@solana/spl-token");
|
8
14
|
const web3_js_1 = require("@solana/web3.js");
|
15
|
+
const utl_sdk_1 = require("@solflare-wallet/utl-sdk");
|
9
16
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
10
17
|
const rxjs_1 = require("rxjs");
|
11
18
|
const native_tokens_1 = require("../../../../../common/tokens/constants/native-tokens");
|
19
|
+
const blockchain_1 = require("../../../../../common/utils/blockchain");
|
20
|
+
const decorators_1 = require("../../../../../common/utils/decorators");
|
12
21
|
const native_solana_mint_address_1 = require("../../../constants/solana/native-solana-mint-address");
|
13
22
|
const blockchain_name_1 = require("../../../models/blockchain-name");
|
14
23
|
const tx_status_1 = require("../models/tx-status");
|
15
24
|
const web3_public_1 = require("../web3-public");
|
16
25
|
const solana_web3_pure_1 = require("../../../web3-pure/typed-web3-pure/solana-web3-pure/solana-web3-pure");
|
17
|
-
const
|
26
|
+
const solana_tokens_api_service_1 = require("./services/solana-tokens-api-service");
|
18
27
|
/**
|
19
28
|
* Class containing methods for calling contracts in order to obtain information from the blockchain.
|
20
29
|
* To send transaction or execute contract method use {@link Web3Private}.
|
@@ -23,21 +32,6 @@ class SolanaWeb3Public extends web3_public_1.Web3Public {
|
|
23
32
|
constructor(connection) {
|
24
33
|
super(blockchain_name_1.BLOCKCHAIN_NAME.SOLANA);
|
25
34
|
this.connection = connection;
|
26
|
-
this.MAX_TRANSFER_COST = 10000;
|
27
|
-
}
|
28
|
-
/* like gasLimit in evm */
|
29
|
-
async getLastComputeUnits() {
|
30
|
-
const latestSlot = await this.connection.getSlot();
|
31
|
-
const block = await this.connection.getParsedBlock(latestSlot, {
|
32
|
-
transactionDetails: 'full',
|
33
|
-
maxSupportedTransactionVersion: 0
|
34
|
-
});
|
35
|
-
const txCountInLastBlock = block.transactions.length;
|
36
|
-
const onlyDeFiSwaps = block.transactions.filter(tx => Number(tx.meta?.computeUnitsConsumed) > this.MAX_TRANSFER_COST);
|
37
|
-
const totalGasForSwaps = onlyDeFiSwaps.reduce((acc, tx) => acc + Number(tx.meta?.computeUnitsConsumed), 0);
|
38
|
-
const avgGas = new bignumber_js_1.default(totalGasForSwaps).dividedBy(txCountInLastBlock);
|
39
|
-
console.log('%cLAST_BLOCK ===> ', 'color: pink; font-size: 20px;', { block, avgGas });
|
40
|
-
return avgGas;
|
41
35
|
}
|
42
36
|
getBlockNumber() {
|
43
37
|
return this.connection.getBlockHeight('finalized');
|
@@ -62,33 +56,25 @@ class SolanaWeb3Public extends web3_public_1.Web3Public {
|
|
62
56
|
return tx_status_1.TX_STATUS.PENDING;
|
63
57
|
}
|
64
58
|
}
|
65
|
-
async
|
66
|
-
return (await this.callForTokensInfo([tokenAddress], tokenFields))[0];
|
67
|
-
}
|
68
|
-
async callForTokensInfo(tokenAddresses, tokenFields = ['decimals', 'symbol', 'name', 'image']) {
|
59
|
+
async callForTokensInfo(tokenAddresses, tokenFields = ['decimals', 'symbol', 'name']) {
|
69
60
|
const nativeTokenIndex = tokenAddresses.findIndex(address => this.Web3Pure.isNativeAddress(address));
|
70
61
|
const filteredTokenAddresses = tokenAddresses.filter((_, index) => index !== nativeTokenIndex);
|
62
|
+
const { preparedTokens, addresses } = solana_tokens_api_service_1.SolanaTokensApiService.prepareTokens(filteredTokenAddresses);
|
63
|
+
const mints = addresses.map(address => new web3_js_1.PublicKey(address));
|
64
|
+
const tokensMint = await this.fetchMints(mints);
|
65
|
+
const fetchedTokens = tokensMint.map(token => {
|
66
|
+
const entries = tokenFields.map(field => [field, token?.[field]]);
|
67
|
+
return Object.fromEntries(entries);
|
68
|
+
});
|
69
|
+
const tokens = [...fetchedTokens, ...preparedTokens];
|
70
|
+
if (nativeTokenIndex === -1) {
|
71
|
+
return tokens;
|
72
|
+
}
|
71
73
|
const blockchainNativeToken = native_tokens_1.nativeTokensList[this.blockchainName];
|
72
74
|
const nativeToken = {
|
73
75
|
...blockchainNativeToken,
|
74
76
|
decimals: blockchainNativeToken.decimals.toString()
|
75
77
|
};
|
76
|
-
// only native token in array
|
77
|
-
if (!filteredTokenAddresses.length && nativeTokenIndex !== -1) {
|
78
|
-
return [nativeToken];
|
79
|
-
}
|
80
|
-
const mints = filteredTokenAddresses.map(address => new web3_js_1.PublicKey(address));
|
81
|
-
const tokensMint = await new solana_tokens_service_1.SolanaTokensService(this.connection).fetchTokensData(mints);
|
82
|
-
const tokens = tokensMint.map(token => {
|
83
|
-
const data = tokenFields.reduce((acc, fieldName) => ({
|
84
|
-
...acc,
|
85
|
-
[fieldName]: fieldName === 'image' ? token.logoURI : token[fieldName]
|
86
|
-
}), {});
|
87
|
-
return data;
|
88
|
-
});
|
89
|
-
if (nativeTokenIndex === -1) {
|
90
|
-
return tokens;
|
91
|
-
}
|
92
78
|
tokens.splice(nativeTokenIndex, 0, nativeToken);
|
93
79
|
return tokens;
|
94
80
|
}
|
@@ -108,6 +94,52 @@ class SolanaWeb3Public extends web3_public_1.Web3Public {
|
|
108
94
|
async callContractMethod(_contractAddress, _contractAbi, _methodName, _methodArguments = [], _options = {}) {
|
109
95
|
throw new Error('Method call is not supported');
|
110
96
|
}
|
97
|
+
async fetchMints(mints) {
|
98
|
+
const tokensAddresses = mints.map(mint => mint.toString());
|
99
|
+
let tokensList = [];
|
100
|
+
let notFetchedList = [];
|
101
|
+
const m = await (0, spl_token_1.getMint)(this.connection, mints[0], 'confirmed');
|
102
|
+
const tokenData = await (0, spl_token_1.getTokenMetadata)(this.connection, mints[0], 'confirmed').catch(err => err);
|
103
|
+
const rpcResp = await this.connection
|
104
|
+
.getAccountInfo(mints[0], 'confirmed')
|
105
|
+
.catch(err => err);
|
106
|
+
console.log(`%cMINT`, 'color: aqua; font-sie: 20px;', { mint: m, tokenData, rpcResp });
|
107
|
+
try {
|
108
|
+
const { content } = await solana_tokens_api_service_1.SolanaTokensApiService.getTokensList(tokensAddresses);
|
109
|
+
tokensList = content;
|
110
|
+
notFetchedList = mints.filter(mint => tokensList.some(token => !(0, blockchain_1.compareAddresses)(token.address, mint.toString())));
|
111
|
+
}
|
112
|
+
catch { }
|
113
|
+
if (!this.hasNotFetchedTokens(notFetchedList))
|
114
|
+
return tokensList;
|
115
|
+
const config = new utl_sdk_1.UtlConfig({
|
116
|
+
connection: this.connection,
|
117
|
+
timeout: 5000
|
118
|
+
});
|
119
|
+
const tokenSDK = new utl_sdk_1.Client(config);
|
120
|
+
const metaplexTokens = await tokenSDK.getFromMetaplex(notFetchedList);
|
121
|
+
notFetchedList = mints.filter(mint => [...tokensList, ...metaplexTokens].some(token => !(0, blockchain_1.compareAddresses)(token.address, mint.toString())));
|
122
|
+
if (!this.hasNotFetchedTokens(notFetchedList))
|
123
|
+
return [...tokensList, ...metaplexTokens];
|
124
|
+
// const splApiResp = await Promise.all(
|
125
|
+
notFetchedList.map(mint => (0, spl_token_1.getTokenMetadata)(this.connection, mint, 'confirmed'));
|
126
|
+
// );
|
127
|
+
// const splApiTokens = splApiResp.filter(Boolean).map(
|
128
|
+
// token =>
|
129
|
+
// ({
|
130
|
+
// name: token!.name,
|
131
|
+
// symbol: token!.symbol,
|
132
|
+
// logoURI: token!.uri,
|
133
|
+
// decimals: Number(token?.additionalMetadata?.[0]?.[0] || 9),
|
134
|
+
// address: token!.mint.toString(),
|
135
|
+
// verified: true
|
136
|
+
// } as SolanaToken)
|
137
|
+
// );
|
138
|
+
return [...tokensList, ...metaplexTokens];
|
139
|
+
}
|
140
|
+
hasNotFetchedTokens(notFetchedList) {
|
141
|
+
return notFetchedList.length > 0;
|
142
|
+
}
|
111
143
|
healthCheck(timeoutMs = 4000) {
|
112
144
|
const request = this.connection.getBalanceAndContext(new web3_js_1.PublicKey('DVLwQbEaw5txuduQwvfbNP3sXvjawHqaoMuGMKZx15bQ'), 'confirmed');
|
113
145
|
return (0, rxjs_1.firstValueFrom)((0, rxjs_1.from)(request).pipe((0, rxjs_1.timeout)(timeoutMs), (0, rxjs_1.map)(result => Boolean(result)), (0, rxjs_1.catchError)((err) => {
|
@@ -162,4 +194,7 @@ class SolanaWeb3Public extends web3_public_1.Web3Public {
|
|
162
194
|
}
|
163
195
|
}
|
164
196
|
exports.SolanaWeb3Public = SolanaWeb3Public;
|
197
|
+
__decorate([
|
198
|
+
decorators_1.Cache
|
199
|
+
], SolanaWeb3Public.prototype, "callForTokensInfo", null);
|
165
200
|
//# sourceMappingURL=solana-web3-public.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"solana-web3-public.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"solana-web3-public.js","sourceRoot":"","sources":["../../../../../../src/core/blockchain/web3-public-service/web3-public/solana-web3-public/solana-web3-public.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,14 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
7
|
+
};
|
2
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
9
|
exports.Web3Public = void 0;
|
4
10
|
const errors_1 = require("../../../../common/errors");
|
11
|
+
const decorators_1 = require("../../../../common/utils/decorators");
|
5
12
|
const blockchains_info_1 = require("../../utils/blockchains-info/blockchains-info");
|
6
13
|
const multicall_addresses_1 = require("./constants/multicall-addresses");
|
7
14
|
const web3_pure_1 = require("../../web3-pure/web3-pure");
|
@@ -69,4 +76,7 @@ class Web3Public {
|
|
69
76
|
}
|
70
77
|
}
|
71
78
|
exports.Web3Public = Web3Public;
|
79
|
+
__decorate([
|
80
|
+
decorators_1.Cache
|
81
|
+
], Web3Public.prototype, "callForTokenInfo", null);
|
72
82
|
//# sourceMappingURL=web3-public.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"web3-public.js","sourceRoot":"","sources":["../../../../../src/core/blockchain/web3-public-service/web3-public/web3-public.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"web3-public.js","sourceRoot":"","sources":["../../../../../src/core/blockchain/web3-public-service/web3-public/web3-public.ts"],"names":[],"mappings":";;;;;;;;;AACA,8CAA0E;AAE1E,4DAAoD;AAEpD,kGAA8F;AAE9F,2HAAwH;AAKxH,uEAAmE;AAGnE;;;GAGG;AACH,MAAsB,UAAU;IAK5B,YAAyC,cAA6C;QAA7C,mBAAc,GAAd,cAAc,CAA+B;QAJnE,qBAAgB,GAAG,yCAAmB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAE5D,aAAQ,GAAG,oBAAQ,CAAC,kCAAe,CAAC,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC;IAED,CAAC;IAkC1F;;;;;OAKG;IACI,KAAK,CAAC,YAAY,CACrB,KAAY,EACZ,cAAyB,EACzB,WAAmB;QAEnB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACrE,MAAM,OAAO,GAAG,oBAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7D,IAAI,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,CAAC;YAC7B,MAAM,IAAI,+BAAsB,CAAC,KAAK,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;QACrE,CAAC;IACL,CAAC;IAED;;;;OAIG;IAEU,AAAN,KAAK,CAAC,gBAAgB,CACzB,YAAoB,EACpB,cAAqC,CAAC,UAAU,EAAE,QAAQ,EAAE,MAAM,CAAC;QAEnE,OAAO,CAAC,MAAM,IAAI,CAAC,iBAAiB,CAAC,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAE,CAAC;IAC3E,CAAC;IAyBD;;;;;;OAMG;IACI,KAAK,CAAC,uBAAuB,CAChC,eAAuB,EACvB,WAAsB,EACtB,UAAkB,EAClB,oBAAiC;QAEjC,OAAO,IAAI,CAAC,wBAAwB,CAChC,eAAe,EACf,WAAW,EACX,oBAAoB,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;YACzC,UAAU;YACV,eAAe;SAClB,CAAC,CAAC,CACN,CAAC;IACN,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,wBAAwB,CACjC,eAAuB,EACvB,WAAsB,EACtB,WAAyB;QAEzB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,yBAAyB,CAAS,WAAW,EAAE;YACtE;gBACI,eAAe;gBACf,WAAW;aACd;SACJ,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAChB,MAAM,IAAI,sBAAa,CAAC,iDAAiD,CAAC,CAAC;QAC/E,CAAC;QACD,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;CAyCJ;AAlLD,gCAkLC;AAnHgB;IADZ,kBAAK;kDAML"}
|
@@ -6,7 +6,7 @@ import { DlnOnChainEstimateResponse } from '../../../on-chain/calculation-manage
|
|
6
6
|
import { DlnOnChainSwapRequest } from '../../../on-chain/calculation-manager/providers/aggregators/dln/models/dln-on-chain-swap-request';
|
7
7
|
import { DlnOnChainSwapResponse } from '../../../on-chain/calculation-manager/providers/aggregators/dln/models/dln-on-chain-swap-response';
|
8
8
|
export declare class DlnApiService {
|
9
|
-
|
9
|
+
static apiEndpoint: string;
|
10
10
|
static fetchCrossChainQuote<T>(requestParams: EstimationRequest): Promise<T>;
|
11
11
|
static fetchCrossChainSwapData<T>(requestParams: TransactionRequest): Promise<T>;
|
12
12
|
static fetchOnChainQuote(requestParams: DlnOnChainEstimateRequest): Promise<DlnOnChainEstimateResponse>;
|
@@ -2,41 +2,37 @@
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
3
|
exports.DlnApiService = void 0;
|
4
4
|
const injector_1 = require("../../../../core/injector/injector");
|
5
|
-
const okuswap_api_1 = require("../../../on-chain/calculation-manager/providers/aggregators/okuswap/constants/okuswap-api");
|
6
5
|
class DlnApiService {
|
7
6
|
static fetchCrossChainQuote(requestParams) {
|
8
|
-
return injector_1.Injector.httpClient.get(`${DlnApiService.
|
9
|
-
params: requestParams
|
10
|
-
headers: { apiKey: okuswap_api_1.RUBIC_X_API_APIKEY }
|
7
|
+
return injector_1.Injector.httpClient.get(`${DlnApiService.apiEndpoint}/dln/order/quote`, {
|
8
|
+
params: requestParams
|
11
9
|
});
|
12
10
|
}
|
13
11
|
static fetchCrossChainSwapData(requestParams) {
|
14
|
-
return injector_1.Injector.httpClient.get(`${DlnApiService.
|
12
|
+
return injector_1.Injector.httpClient.get(`${DlnApiService.apiEndpoint}/dln/order/create-tx`, {
|
15
13
|
params: requestParams
|
16
14
|
});
|
17
15
|
}
|
18
16
|
static fetchOnChainQuote(requestParams) {
|
19
|
-
return injector_1.Injector.httpClient.get(`${DlnApiService.
|
20
|
-
params: requestParams
|
21
|
-
headers: { apiKey: okuswap_api_1.RUBIC_X_API_APIKEY }
|
17
|
+
return injector_1.Injector.httpClient.get(`${DlnApiService.apiEndpoint}/chain/estimation`, {
|
18
|
+
params: requestParams
|
22
19
|
});
|
23
20
|
}
|
24
21
|
static fetchOnChainSwapData(requestParams) {
|
25
|
-
return injector_1.Injector.httpClient.get(`${DlnApiService.
|
26
|
-
params: requestParams
|
27
|
-
headers: { apiKey: okuswap_api_1.RUBIC_X_API_APIKEY }
|
22
|
+
return injector_1.Injector.httpClient.get(`${DlnApiService.apiEndpoint}/chain/transaction`, {
|
23
|
+
params: requestParams
|
28
24
|
});
|
29
25
|
}
|
30
26
|
static fetchCrossChainEventMetaData(orderId) {
|
31
27
|
return injector_1.Injector.httpClient.get(`https://stats-api.dln.trade/api/Orders/${orderId}`);
|
32
28
|
}
|
33
29
|
static fetchCrossChainStatus(orderId) {
|
34
|
-
return injector_1.Injector.httpClient.get(`${DlnApiService.
|
30
|
+
return injector_1.Injector.httpClient.get(`${DlnApiService.apiEndpoint}/dln/order/${orderId}/status`);
|
35
31
|
}
|
36
32
|
static fetchCrossChainOrdersByHash(sourceTransactionHash) {
|
37
|
-
return injector_1.Injector.httpClient.get(`${DlnApiService.
|
33
|
+
return injector_1.Injector.httpClient.get(`${DlnApiService.apiEndpoint}/dln/tx/${sourceTransactionHash}/order-ids`);
|
38
34
|
}
|
39
35
|
}
|
40
36
|
exports.DlnApiService = DlnApiService;
|
41
|
-
DlnApiService.
|
37
|
+
DlnApiService.apiEndpoint = 'https://api.dln.trade/v1.0';
|
42
38
|
//# sourceMappingURL=dln-api-service.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"dln-api-service.js","sourceRoot":"","sources":["../../../../../src/features/common/providers/dln/dln-api-service.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;
|
1
|
+
{"version":3,"file":"dln-api-service.js","sourceRoot":"","sources":["../../../../../src/features/common/providers/dln/dln-api-service.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AAatD,MAAa,aAAa;IAGf,MAAM,CAAC,oBAAoB,CAAI,aAAgC;QAClE,OAAO,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAAI,GAAG,aAAa,CAAC,WAAW,kBAAkB,EAAE;YAC9E,MAAM,EAAE,aAA8B;SACzC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,uBAAuB,CAAI,aAAiC;QACtE,OAAO,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAAI,GAAG,aAAa,CAAC,WAAW,sBAAsB,EAAE;YAClF,MAAM,EAAE,aAA8B;SACzC,CAAC,CAAC;IACP,CAAC;IAEM,MAAM,CAAC,iBAAiB,CAC3B,aAAwC;QAExC,OAAO,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC1B,GAAG,aAAa,CAAC,WAAW,mBAAmB,EAC/C;YACI,MAAM,EAAE,aAA8B;SACzC,CACJ,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,oBAAoB,CAC9B,aAAoC;QAEpC,OAAO,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC1B,GAAG,aAAa,CAAC,WAAW,oBAAoB,EAChD;YACI,MAAM,EAAE,aAA8B;SACzC,CACJ,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,4BAA4B,CAAC,OAAe;QACtD,OAAO,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC1B,0CAA0C,OAAO,EAAE,CACtD,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,qBAAqB,CAAC,OAAe;QAC/C,OAAO,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC1B,GAAG,aAAa,CAAC,WAAW,cAAc,OAAO,SAAS,CAC7D,CAAC;IACN,CAAC;IAEM,MAAM,CAAC,2BAA2B,CACrC,qBAA6B;QAE7B,OAAO,mBAAQ,CAAC,UAAU,CAAC,GAAG,CAC1B,GAAG,aAAa,CAAC,WAAW,WAAW,qBAAqB,YAAY,CAC3E,CAAC;IACN,CAAC;;AAvDL,sCAwDC;AAvDiB,yBAAW,GAAG,4BAA4B,CAAC"}
|
@@ -8,18 +8,18 @@ class UniZenApiService {
|
|
8
8
|
static getQuoteInfo(params, chainId, tradeType) {
|
9
9
|
return injector_1.Injector.httpClient.get(`${UniZenApiService.apiEndpoint}/${chainId}/quote/${tradeType}`, {
|
10
10
|
params: { ...params },
|
11
|
-
headers: { apiKey: okuswap_api_1.
|
11
|
+
headers: { apiKey: okuswap_api_1.RUBIC_X_API_OKU_APIKEY }
|
12
12
|
});
|
13
13
|
}
|
14
14
|
static getSwapInfo(params, chainId, tradeType) {
|
15
15
|
return injector_1.Injector.httpClient.post(`${UniZenApiService.apiEndpoint}/${chainId}/swap/${tradeType}`, params, {
|
16
|
-
headers: { apiKey: okuswap_api_1.
|
16
|
+
headers: { apiKey: okuswap_api_1.RUBIC_X_API_OKU_APIKEY }
|
17
17
|
});
|
18
18
|
}
|
19
19
|
static async getTxStatus(srcTxHash) {
|
20
20
|
try {
|
21
21
|
const res = await injector_1.Injector.httpClient.get(`${UniZenApiService.apiEndpoint}/info/tx/${srcTxHash}`, {
|
22
|
-
headers: { apiKey: okuswap_api_1.
|
22
|
+
headers: { apiKey: okuswap_api_1.RUBIC_X_API_OKU_APIKEY }
|
23
23
|
});
|
24
24
|
const txStatus = res.status.toLowerCase();
|
25
25
|
if (txStatus === 'delivered') {
|