@cryptorubic/web3 0.14.0-alpha.solana-gas.12 → 0.15.0-alpha-rub-1045.0
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/package.json +1 -1
- package/src/lib/adapter/adapters/abstract-adapter.js +3 -5
- package/src/lib/adapter/adapters/bitcoin-adapter.js +0 -1
- package/src/lib/adapter/adapters/evm-adapter.js +5 -6
- package/src/lib/adapter/adapters/solana-adapter.d.ts +2 -5
- package/src/lib/adapter/adapters/solana-adapter.js +3 -67
- package/src/lib/adapter/adapters/ton-adapter.js +0 -2
- package/src/lib/adapter/adapters/tron-adapter.js +1 -1
- package/src/lib/adapter/adapters/utils/{solana-utils/solana-tokens-service.d.ts → solana-tokens-service.d.ts} +1 -1
- package/src/lib/adapter/adapters/utils/{solana-utils/solana-tokens-service.js → solana-tokens-service.js} +8 -10
- package/src/lib/adapter/adapters/utils/ton-api.service.js +0 -5
- package/src/lib/adapter/blockchain-adapter-factory.service.d.ts +6 -4
- package/src/lib/adapter/blockchain-adapter-factory.service.js +19 -21
- package/src/lib/adapter/constants/chain-configs/chain-configs.d.ts +1 -1
- package/src/lib/adapter/constants/chain-configs/chain-configs.js +27 -0
- package/src/lib/adapter/constants/viem-blockchain-mapping.d.ts +1 -1
- package/src/lib/adapter/constants/viem-blockchain-mapping.js +3 -2
- package/src/lib/utils/constants/web3-pure-store.js +2 -3
- package/src/lib/utils/web3-types/common-web3-pure.js +2 -4
- package/src/lib/utils/web3-types/near-web3-pure.js +1 -1
- package/src/lib/utils/web3-types/solana-web3-pure.js +1 -1
- package/src/lib/utils/web3-types/sui-web3-pure.js +2 -2
- package/src/lib/adapter/adapters/models/adapter-factory-params.d.ts +0 -7
- package/src/lib/adapter/adapters/models/adapter-factory-params.js +0 -2
- package/src/lib/utils/models/solana-transaction-config.d.ts +0 -6
- package/src/lib/utils/models/solana-transaction-config.js +0 -2
package/package.json
CHANGED
|
@@ -3,9 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.AbstractAdapter = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
5
|
class AbstractAdapter {
|
|
6
|
-
logger;
|
|
7
|
-
blockchain;
|
|
8
|
-
_public = null;
|
|
9
6
|
set public(value) {
|
|
10
7
|
this._public = value;
|
|
11
8
|
}
|
|
@@ -17,7 +14,6 @@ class AbstractAdapter {
|
|
|
17
14
|
}
|
|
18
15
|
return this._public;
|
|
19
16
|
}
|
|
20
|
-
_wallet = null;
|
|
21
17
|
set wallet(value) {
|
|
22
18
|
this._wallet = value;
|
|
23
19
|
}
|
|
@@ -29,7 +25,6 @@ class AbstractAdapter {
|
|
|
29
25
|
}
|
|
30
26
|
return this._wallet;
|
|
31
27
|
}
|
|
32
|
-
_walletAddress = null;
|
|
33
28
|
set walletAddress(value) {
|
|
34
29
|
this._walletAddress = value;
|
|
35
30
|
}
|
|
@@ -42,6 +37,9 @@ class AbstractAdapter {
|
|
|
42
37
|
return this._walletAddress;
|
|
43
38
|
}
|
|
44
39
|
constructor(blockchain, logger) {
|
|
40
|
+
this._public = null;
|
|
41
|
+
this._wallet = null;
|
|
42
|
+
this._walletAddress = null;
|
|
45
43
|
this.blockchain = blockchain;
|
|
46
44
|
if (logger) {
|
|
47
45
|
this.logger = logger;
|
|
@@ -5,7 +5,6 @@ const core_1 = require("@cryptorubic/core");
|
|
|
5
5
|
const bignumber_js_1 = require("bignumber.js");
|
|
6
6
|
const abstract_adapter_1 = require("./abstract-adapter");
|
|
7
7
|
class BitcoinAdapter extends abstract_adapter_1.AbstractAdapter {
|
|
8
|
-
httpClient;
|
|
9
8
|
constructor(httpClient, logger) {
|
|
10
9
|
super(core_1.BLOCKCHAIN_NAME.BITCOIN, logger);
|
|
11
10
|
this.httpClient = httpClient;
|
|
@@ -34,22 +34,21 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
|
|
|
34
34
|
return null;
|
|
35
35
|
}
|
|
36
36
|
const transports = rpcList.map((rpc) => (0, viem_1.http)(rpc, {
|
|
37
|
-
batch: { batchSize:
|
|
37
|
+
batch: { batchSize: 2000, wait: 16 },
|
|
38
38
|
onFetchResponse: (response) => {
|
|
39
39
|
this.handlePossibleError(response);
|
|
40
40
|
},
|
|
41
41
|
retryCount: 2,
|
|
42
42
|
retryDelay: 100,
|
|
43
|
-
timeout:
|
|
43
|
+
timeout: 5000
|
|
44
44
|
}));
|
|
45
45
|
const chain = viem_blockchain_mapping_1.viemBlockchainMapping[this.blockchain];
|
|
46
|
-
// @ts-ignore
|
|
47
46
|
return (0, viem_1.createPublicClient)({
|
|
48
47
|
// @ts-ignore
|
|
49
48
|
chain,
|
|
50
49
|
transport: (0, viem_1.fallback)(transports, {
|
|
51
50
|
rank: {
|
|
52
|
-
interval:
|
|
51
|
+
interval: 1800000
|
|
53
52
|
}
|
|
54
53
|
})
|
|
55
54
|
});
|
|
@@ -136,7 +135,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
|
|
|
136
135
|
throw err;
|
|
137
136
|
}
|
|
138
137
|
}
|
|
139
|
-
async simulateTransaction(config, from, timeout =
|
|
138
|
+
async simulateTransaction(config, from, timeout = 15000) {
|
|
140
139
|
try {
|
|
141
140
|
const callParams = {
|
|
142
141
|
account: from,
|
|
@@ -279,7 +278,7 @@ class EvmAdapter extends abstract_adapter_1.AbstractAdapter {
|
|
|
279
278
|
to: tx.to
|
|
280
279
|
};
|
|
281
280
|
}
|
|
282
|
-
async approveOnPermit2(fromAddress, tokenAddress, permit2Address, spenderAddress, deadline = new bignumber_js_1.default(
|
|
281
|
+
async approveOnPermit2(fromAddress, tokenAddress, permit2Address, spenderAddress, deadline = new bignumber_js_1.default(1000000), amount) {
|
|
283
282
|
const approveAmount = amount ? amount : new bignumber_js_1.default(2).pow(256).minus(1);
|
|
284
283
|
const expiration = new bignumber_js_1.default(Date.now()).plus(deadline).toFixed();
|
|
285
284
|
const tx = this.encodePermit2Approve(tokenAddress, spenderAddress, permit2Address, expiration, approveAmount.toFixed());
|
|
@@ -2,11 +2,10 @@ import { Abi, MulticallResponse, MulticallParameters } from 'viem';
|
|
|
2
2
|
import { AbstractAdapter } from './abstract-adapter';
|
|
3
3
|
import { AddressLookupTableAccount, Connection, Keypair, PublicKey, Transaction, TransactionInstruction, VersionedTransaction } from '@solana/web3.js';
|
|
4
4
|
import { HttpClient, ICustomLogger, PriceTokenAmount, SolanaBlockchainName, Token, TokenAmount } from '@cryptorubic/core';
|
|
5
|
+
import { EvmTransactionConfig } from '../../utils/models/evm-transaction-config';
|
|
5
6
|
import BigNumber from 'bignumber.js';
|
|
6
7
|
import { SolanaRawInstruction } from './models/solana-web3-types';
|
|
7
|
-
import { SolanaTxConfig } from '../../utils/models/solana-transaction-config';
|
|
8
8
|
export declare const NATIVE_SOLANA_MINT_ADDRESS = "So11111111111111111111111111111111111111111";
|
|
9
|
-
export declare const DEFAULT_CU_LIMIT = 400000;
|
|
10
9
|
export declare class SolanaAdapter extends AbstractAdapter<Connection, Connection, SolanaBlockchainName> {
|
|
11
10
|
private readonly httpClient;
|
|
12
11
|
constructor(rpcList: string[], httpClient: HttpClient, logger?: ICustomLogger);
|
|
@@ -15,9 +14,7 @@ export declare class SolanaAdapter extends AbstractAdapter<Connection, Connectio
|
|
|
15
14
|
write<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[]): Promise<T>;
|
|
16
15
|
multicallByContract<T>(_contracts: MulticallParameters, _allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
|
|
17
16
|
multicallByAddress<T>(_address: string, _abi: Abi, _method: string, _methodArgs?: unknown[][], _allowErrors?: boolean): Promise<MulticallResponse<T>[]>;
|
|
18
|
-
simulateTransaction(
|
|
19
|
-
private getFailedIxProgramId;
|
|
20
|
-
private getAddressLookupTableAccounts;
|
|
17
|
+
simulateTransaction(_config: EvmTransactionConfig, _from: string): Promise<void>;
|
|
21
18
|
checkEnoughBalance(token: TokenAmount | PriceTokenAmount, walletAddress: string): Promise<boolean>;
|
|
22
19
|
getBalance(userAddress: string, tokenAddress: string): Promise<BigNumber>;
|
|
23
20
|
/**
|
|
@@ -1,21 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.SolanaAdapter = exports.
|
|
3
|
+
exports.SolanaAdapter = exports.NATIVE_SOLANA_MINT_ADDRESS = void 0;
|
|
4
4
|
const spl_token_1 = require("@solana/spl-token");
|
|
5
5
|
const abstract_adapter_1 = require("./abstract-adapter");
|
|
6
6
|
const web3_js_1 = require("@solana/web3.js");
|
|
7
7
|
const core_1 = require("@cryptorubic/core");
|
|
8
8
|
const web3_pure_1 = require("../../utils/web3-pure");
|
|
9
9
|
const bignumber_js_1 = require("bignumber.js");
|
|
10
|
+
const solana_tokens_service_1 = require("./utils/solana-tokens-service");
|
|
10
11
|
const bs58_1 = require("bs58");
|
|
11
12
|
const js_base64_1 = require("js-base64");
|
|
12
|
-
const solana_tokens_service_1 = require("./utils/solana-utils/solana-tokens-service");
|
|
13
|
-
const timeout_1 = require("./utils/timeout");
|
|
14
13
|
exports.NATIVE_SOLANA_MINT_ADDRESS = 'So11111111111111111111111111111111111111111';
|
|
15
|
-
/* minimal amount for tx (in lamports) */
|
|
16
|
-
exports.DEFAULT_CU_LIMIT = 400_000;
|
|
17
14
|
class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
|
|
18
|
-
httpClient;
|
|
19
15
|
constructor(rpcList, httpClient, logger) {
|
|
20
16
|
super(core_1.BLOCKCHAIN_NAME.SOLANA, logger);
|
|
21
17
|
this.httpClient = httpClient;
|
|
@@ -42,67 +38,7 @@ class SolanaAdapter extends abstract_adapter_1.AbstractAdapter {
|
|
|
42
38
|
async multicallByAddress(_address, _abi, _method, _methodArgs = [], _allowErrors = true) {
|
|
43
39
|
throw new Error('Method multicall is not supported');
|
|
44
40
|
}
|
|
45
|
-
async simulateTransaction(
|
|
46
|
-
try {
|
|
47
|
-
const bufferData = config.data.startsWith('0x') ? Buffer.from(config.data.slice(2), 'hex') : Buffer.from(config.data, 'base64');
|
|
48
|
-
const { blockhash } = await this.public.getLatestBlockhash();
|
|
49
|
-
const tx = web3_js_1.VersionedTransaction.deserialize(bufferData);
|
|
50
|
-
tx.message.recentBlockhash = blockhash;
|
|
51
|
-
const simulation = this.public.simulateTransaction(tx, {
|
|
52
|
-
replaceRecentBlockhash: true,
|
|
53
|
-
commitment: 'confirmed',
|
|
54
|
-
accounts: {
|
|
55
|
-
encoding: 'base64',
|
|
56
|
-
addresses: [config.walletAddress]
|
|
57
|
-
}
|
|
58
|
-
});
|
|
59
|
-
const resp = await (0, timeout_1.withTimeout)(simulation, timeout, 'Solana Simulation Timeout!');
|
|
60
|
-
const err = resp.value.err;
|
|
61
|
-
const defineCuLimit = () => {
|
|
62
|
-
const cuLimit = resp.value.unitsConsumed || 0;
|
|
63
|
-
const defaultGreaterEstimated = new bignumber_js_1.default(exports.DEFAULT_CU_LIMIT).gt(cuLimit);
|
|
64
|
-
return new bignumber_js_1.default(defaultGreaterEstimated ? exports.DEFAULT_CU_LIMIT : cuLimit).toFixed(0);
|
|
65
|
-
};
|
|
66
|
-
if (err) {
|
|
67
|
-
if (Array.isArray(err['InstructionError'])) {
|
|
68
|
-
const [failedInstructionIdx, errorData] = err['InstructionError'];
|
|
69
|
-
const failedInstructionProgramId = await this.getFailedIxProgramId(tx, failedInstructionIdx);
|
|
70
|
-
this.logger?.customLog('FAILED INSTRUCTION INFO', { programId: failedInstructionProgramId, errorData });
|
|
71
|
-
const weirdError = errorData?.Custom === 1;
|
|
72
|
-
if (weirdError)
|
|
73
|
-
return defineCuLimit();
|
|
74
|
-
}
|
|
75
|
-
throw new Error('Transaction simulation failed.');
|
|
76
|
-
}
|
|
77
|
-
return defineCuLimit();
|
|
78
|
-
}
|
|
79
|
-
catch (err) {
|
|
80
|
-
this.logger?.customError('Error while simulating transaction', err);
|
|
81
|
-
throw err;
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
async getFailedIxProgramId(tx, failedInstructionIdx) {
|
|
85
|
-
const lutKeys = (tx.message.addressTableLookups ?? []).map((l) => l.accountKey.toBase58());
|
|
86
|
-
const lutAccounts = lutKeys.length ? await this.getAddressLookupTableAccounts(lutKeys) : [];
|
|
87
|
-
const decompiled = web3_js_1.TransactionMessage.decompile(tx.message, { addressLookupTableAccounts: lutAccounts });
|
|
88
|
-
const programId = decompiled.instructions[failedInstructionIdx].programId;
|
|
89
|
-
return programId.toBase58();
|
|
90
|
-
}
|
|
91
|
-
async getAddressLookupTableAccounts(keys) {
|
|
92
|
-
const result = [];
|
|
93
|
-
const infos = await this.public.getMultipleAccountsInfo(keys.map((k) => new web3_js_1.PublicKey(k)));
|
|
94
|
-
keys.forEach((address, i) => {
|
|
95
|
-
const ai = infos[i];
|
|
96
|
-
if (ai) {
|
|
97
|
-
const alt = new web3_js_1.AddressLookupTableAccount({
|
|
98
|
-
key: new web3_js_1.PublicKey(address),
|
|
99
|
-
state: web3_js_1.AddressLookupTableAccount.deserialize(ai.data)
|
|
100
|
-
});
|
|
101
|
-
result.push(alt);
|
|
102
|
-
}
|
|
103
|
-
});
|
|
104
|
-
return result;
|
|
105
|
-
}
|
|
41
|
+
async simulateTransaction(_config, _from) { }
|
|
106
42
|
async checkEnoughBalance(token, walletAddress) {
|
|
107
43
|
const balance = await this.getBalance(walletAddress, token.address);
|
|
108
44
|
return balance.gte(token.tokenAmount);
|
|
@@ -8,8 +8,6 @@ const bignumber_js_1 = require("bignumber.js");
|
|
|
8
8
|
const abstract_adapter_1 = require("./abstract-adapter");
|
|
9
9
|
const web3_pure_1 = require("../../utils/web3-pure");
|
|
10
10
|
class TonAdapter extends abstract_adapter_1.AbstractAdapter {
|
|
11
|
-
tonApi;
|
|
12
|
-
tonClient;
|
|
13
11
|
constructor(httpClient, config, logger) {
|
|
14
12
|
super(core_1.BLOCKCHAIN_NAME.TON, logger);
|
|
15
13
|
this.tonApi = new ton_api_service_1.TonApiService(httpClient, config.tonApiConfig, logger);
|
|
@@ -10,13 +10,13 @@ const core_1 = require("@cryptorubic/core");
|
|
|
10
10
|
const web3_pure_1 = require("../../utils/web3-pure");
|
|
11
11
|
const tron_web3_pure_1 = require("../../utils/web3-types/tron-web3-pure");
|
|
12
12
|
class TronAdapter extends abstract_adapter_1.AbstractAdapter {
|
|
13
|
-
multicallAddress = 'T9ziQU4EBteJzjzMzhHELdhgWFqwzS5Vki';
|
|
14
13
|
async needPreswapAction(token, contractAddress, walletAddress, amount) {
|
|
15
14
|
// return this.needApprove()
|
|
16
15
|
return false;
|
|
17
16
|
}
|
|
18
17
|
constructor(rpcList, logger) {
|
|
19
18
|
super(core_1.BLOCKCHAIN_NAME.TRON, logger);
|
|
19
|
+
this.multicallAddress = 'T9ziQU4EBteJzjzMzhHELdhgWFqwzS5Vki';
|
|
20
20
|
this.public = new tronweb_1.TronWeb({ fullHost: rpcList[0] });
|
|
21
21
|
}
|
|
22
22
|
async checkEnoughBalance(token, walletAddress) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Connection, PublicKey } from '@solana/web3.js';
|
|
2
2
|
import { HttpClient } from '@cryptorubic/core';
|
|
3
|
-
import { SolanaToken } from '
|
|
3
|
+
import { SolanaToken } from '../models/solana-web3-types';
|
|
4
4
|
export declare class SolanaTokensService {
|
|
5
5
|
private readonly httpClient;
|
|
6
6
|
private connection;
|
|
@@ -3,18 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.SolanaTokensService = void 0;
|
|
4
4
|
const spl_token_1 = require("@solana/spl-token");
|
|
5
5
|
const utl_sdk_1 = require("@solflare-wallet/utl-sdk");
|
|
6
|
-
const timeout_1 = require("
|
|
6
|
+
const timeout_1 = require("./timeout");
|
|
7
7
|
class SolanaTokensService {
|
|
8
|
-
httpClient;
|
|
9
|
-
connection;
|
|
10
|
-
// key - address of token, value - idx of token in initial tokensAddress
|
|
11
|
-
tokensOrder = {};
|
|
12
|
-
initialMints = [];
|
|
13
|
-
apiEndpoint = 'https://x-api.rubic.exchange/sol_token_list';
|
|
14
|
-
newTokensEndpoint = 'https://api.rubic.exchange/api/v2';
|
|
15
|
-
xApiKey = 'sndfje3u4b3fnNSDNFUSDNVSunw345842hrnfd3b4nt4';
|
|
16
8
|
constructor(connection, httpClient) {
|
|
17
9
|
this.httpClient = httpClient;
|
|
10
|
+
// key - address of token, value - idx of token in initial tokensAddress
|
|
11
|
+
this.tokensOrder = {};
|
|
12
|
+
this.initialMints = [];
|
|
13
|
+
this.apiEndpoint = 'https://x-api.rubic.exchange/sol_token_list';
|
|
14
|
+
this.newTokensEndpoint = 'https://api.rubic.exchange/api/v2';
|
|
15
|
+
this.xApiKey = 'sndfje3u4b3fnNSDNFUSDNVSunw345842hrnfd3b4nt4';
|
|
18
16
|
this.connection = connection;
|
|
19
17
|
}
|
|
20
18
|
async fetchTokensData(mints) {
|
|
@@ -59,7 +57,7 @@ class SolanaTokensService {
|
|
|
59
57
|
}
|
|
60
58
|
async fetchTokensFromOldBackend(mints, prevFetchedTokens) {
|
|
61
59
|
const tokensAddresses = mints.map((mint) => mint.toString());
|
|
62
|
-
const { content: tokensFromOlbBackend } = await (0, timeout_1.withTimeout)(this.getTokensListOld(tokensAddresses),
|
|
60
|
+
const { content: tokensFromOlbBackend } = await (0, timeout_1.withTimeout)(this.getTokensListOld(tokensAddresses), 3000, 'Api Timeout!').catch(() => ({ content: [] }));
|
|
63
61
|
const notSortedTokensList = [...prevFetchedTokens, ...tokensFromOlbBackend];
|
|
64
62
|
const notFetchedMints = this.getNotFetchedTokensList(notSortedTokensList);
|
|
65
63
|
return {
|
|
@@ -2,11 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.TonApiService = void 0;
|
|
4
4
|
class TonApiService {
|
|
5
|
-
httpClient;
|
|
6
|
-
logger;
|
|
7
|
-
tonApiUrl;
|
|
8
|
-
apiKey;
|
|
9
|
-
tonCenterV3Url;
|
|
10
5
|
constructor(httpClient, params, logger) {
|
|
11
6
|
this.httpClient = httpClient;
|
|
12
7
|
this.logger = logger;
|
|
@@ -2,19 +2,21 @@ import { SolanaAdapter } from './adapters/solana-adapter';
|
|
|
2
2
|
import { TronAdapter } from './adapters/tron-adapter';
|
|
3
3
|
import { AbstractAdapter } from './adapters/abstract-adapter';
|
|
4
4
|
import { WalletProvider } from './constants/models/wallet-provider';
|
|
5
|
-
import { BlockchainName, EvmBlockchainName, SolanaBlockchainName, TronBlockchainName, ICustomLogger, TonBlockchainName, BitcoinBlockchainName, SuiBlockchainName } from '@cryptorubic/core';
|
|
5
|
+
import { BlockchainName, EvmBlockchainName, SolanaBlockchainName, TronBlockchainName, ICustomLogger, HttpClient, TonBlockchainName, BitcoinBlockchainName, SuiBlockchainName } from '@cryptorubic/core';
|
|
6
6
|
import { TonAdapter } from './adapters/ton-adapter';
|
|
7
|
+
import { TonAdapterConfig } from './adapters/models/ton-adapter-config';
|
|
7
8
|
import { EvmAdapter } from './adapters/evm-adapter';
|
|
8
9
|
import { BitcoinAdapter } from './adapters/bitcoin-adapter';
|
|
9
10
|
import { SuiAdapter } from './adapters/sui-adapter';
|
|
10
|
-
import { AdaptersFactoryParams } from './adapters/models/adapter-factory-params';
|
|
11
11
|
export declare class BlockchainAdapterFactoryService {
|
|
12
12
|
private readonly rpcList;
|
|
13
|
-
private readonly
|
|
13
|
+
private readonly createLogger?;
|
|
14
|
+
private readonly httpClient?;
|
|
15
|
+
private readonly tonParams?;
|
|
14
16
|
readonly adapterStore: Partial<Record<BlockchainName, AbstractAdapter<unknown, unknown, BlockchainName>>>;
|
|
15
17
|
protected readonly logger?: ICustomLogger;
|
|
16
18
|
private constructor();
|
|
17
|
-
static createFactory(rpcList: Partial<Record<EvmBlockchainName, string[]>>,
|
|
19
|
+
static createFactory(rpcList: Partial<Record<EvmBlockchainName, string[]>>, httpClient?: HttpClient, tonParams?: TonAdapterConfig, createLogger?: (label: string) => ICustomLogger): Promise<BlockchainAdapterFactoryService>;
|
|
18
20
|
getAdapter(blockchain: SolanaBlockchainName): SolanaAdapter;
|
|
19
21
|
getAdapter(blockchain: EvmBlockchainName): EvmAdapter;
|
|
20
22
|
getAdapter(blockchain: TronBlockchainName): TronAdapter;
|
|
@@ -11,24 +11,22 @@ const evm_adapter_1 = require("./adapters/evm-adapter");
|
|
|
11
11
|
const bitcoin_adapter_1 = require("./adapters/bitcoin-adapter");
|
|
12
12
|
const sui_adapter_1 = require("./adapters/sui-adapter");
|
|
13
13
|
class BlockchainAdapterFactoryService {
|
|
14
|
-
rpcList
|
|
15
|
-
params;
|
|
16
|
-
adapterStore = {};
|
|
17
|
-
logger;
|
|
18
|
-
constructor(rpcList, params) {
|
|
14
|
+
constructor(rpcList, createLogger, httpClient, tonParams) {
|
|
19
15
|
this.rpcList = rpcList;
|
|
20
|
-
this.
|
|
16
|
+
this.createLogger = createLogger;
|
|
17
|
+
this.httpClient = httpClient;
|
|
18
|
+
this.tonParams = tonParams;
|
|
19
|
+
this.adapterStore = {};
|
|
21
20
|
this.adapterStore = this.createStorage();
|
|
22
|
-
if (this.
|
|
23
|
-
this.logger = this.
|
|
21
|
+
if (this.createLogger) {
|
|
22
|
+
this.logger = this.createLogger('BlockchainAdapterFactory');
|
|
24
23
|
}
|
|
25
24
|
}
|
|
26
|
-
static async createFactory(rpcList,
|
|
25
|
+
static async createFactory(rpcList, httpClient, tonParams, createLogger) {
|
|
27
26
|
// @TODO Add default logger
|
|
28
|
-
const loggerFn =
|
|
29
|
-
const resolvedHttpClient =
|
|
30
|
-
|
|
31
|
-
return new this(rpcList, params);
|
|
27
|
+
const loggerFn = createLogger || undefined;
|
|
28
|
+
const resolvedHttpClient = httpClient ?? (await Promise.resolve().then(() => require('axios')));
|
|
29
|
+
return new this(rpcList, createLogger, resolvedHttpClient, tonParams);
|
|
32
30
|
}
|
|
33
31
|
getAdapter(blockchain) {
|
|
34
32
|
const adapter = this.adapterStore?.[blockchain];
|
|
@@ -66,24 +64,24 @@ class BlockchainAdapterFactoryService {
|
|
|
66
64
|
return new evm_adapter_1.EvmAdapter({
|
|
67
65
|
blockchain: blockchain,
|
|
68
66
|
rpcList: rpcs
|
|
69
|
-
}, this.
|
|
67
|
+
}, this.createLogger?.(`EVM_ADAPTER_${blockchain}`));
|
|
70
68
|
}
|
|
71
69
|
}
|
|
72
70
|
if (blockchainType === core_1.CHAIN_TYPE.TRON) {
|
|
73
|
-
return new tron_adapter_1.TronAdapter(rpcs, this.
|
|
71
|
+
return new tron_adapter_1.TronAdapter(rpcs, this.createLogger?.(`TRON_ADAPTER`));
|
|
74
72
|
}
|
|
75
73
|
if (blockchainType === core_1.CHAIN_TYPE.SUI) {
|
|
76
|
-
return new sui_adapter_1.SuiAdapter(rpcs, this.
|
|
74
|
+
return new sui_adapter_1.SuiAdapter(rpcs, this.createLogger?.(`SUI_ADAPTER`));
|
|
77
75
|
}
|
|
78
76
|
if (blockchainType === core_1.CHAIN_TYPE.SOLANA) {
|
|
79
|
-
return new solana_adapter_1.SolanaAdapter(rpcs, this.
|
|
77
|
+
return new solana_adapter_1.SolanaAdapter(rpcs, this.httpClient, this.createLogger?.(`SOLANA_ADAPTER`));
|
|
80
78
|
}
|
|
81
79
|
}
|
|
82
|
-
if (blockchain === core_1.BLOCKCHAIN_NAME.TON && this.
|
|
83
|
-
return new ton_adapter_1.TonAdapter(this.
|
|
80
|
+
if (blockchain === core_1.BLOCKCHAIN_NAME.TON && this.tonParams?.tonApiConfig && this.tonParams?.tonClientConfig) {
|
|
81
|
+
return new ton_adapter_1.TonAdapter(this.httpClient, this.tonParams, this.createLogger?.(`TON_ADAPTER`));
|
|
84
82
|
}
|
|
85
|
-
if (blockchain === core_1.BLOCKCHAIN_NAME.BITCOIN && this.
|
|
86
|
-
return new bitcoin_adapter_1.BitcoinAdapter(this.
|
|
83
|
+
if (blockchain === core_1.BLOCKCHAIN_NAME.BITCOIN && this.httpClient) {
|
|
84
|
+
return new bitcoin_adapter_1.BitcoinAdapter(this.httpClient, this.createLogger?.(`BTC_ADAPTER`));
|
|
87
85
|
}
|
|
88
86
|
return null;
|
|
89
87
|
}
|
|
@@ -1428,5 +1428,32 @@ exports.viemConfig = {
|
|
|
1428
1428
|
address: '0xcA11bde05977b3631167028862bE2a173976CA11'
|
|
1429
1429
|
}
|
|
1430
1430
|
}
|
|
1431
|
+
}),
|
|
1432
|
+
PLASMA: (0, viem_1.defineChain)({
|
|
1433
|
+
id: 9745,
|
|
1434
|
+
name: 'Plasma',
|
|
1435
|
+
network: 'Plasma',
|
|
1436
|
+
nativeCurrency: {
|
|
1437
|
+
name: 'Plasma',
|
|
1438
|
+
symbol: 'XPL',
|
|
1439
|
+
decimals: 18
|
|
1440
|
+
},
|
|
1441
|
+
rpcUrls: {
|
|
1442
|
+
default: {
|
|
1443
|
+
http: ['https://rpc.plasma.to']
|
|
1444
|
+
}
|
|
1445
|
+
},
|
|
1446
|
+
blockExplorers: {
|
|
1447
|
+
default: {
|
|
1448
|
+
name: 'plasmascan',
|
|
1449
|
+
url: 'https://plasmascan.to/'
|
|
1450
|
+
}
|
|
1451
|
+
},
|
|
1452
|
+
testnet: false,
|
|
1453
|
+
contracts: {
|
|
1454
|
+
multicall3: {
|
|
1455
|
+
address: '0xcA11bde05977b3631167028862bE2a173976CA11'
|
|
1456
|
+
}
|
|
1457
|
+
}
|
|
1431
1458
|
})
|
|
1432
1459
|
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.viemBlockchainMapping = void 0;
|
|
4
|
+
const core_1 = require("@cryptorubic/core");
|
|
4
5
|
const chains_1 = require("viem/chains");
|
|
5
6
|
const chain_configs_1 = require("./chain-configs/chain-configs");
|
|
6
|
-
const core_1 = require("@cryptorubic/core");
|
|
7
7
|
exports.viemBlockchainMapping = {
|
|
8
8
|
[core_1.BLOCKCHAIN_NAME.ETHEREUM]: chains_1.mainnet,
|
|
9
9
|
[core_1.BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN]: chains_1.bsc,
|
|
@@ -76,5 +76,6 @@ exports.viemBlockchainMapping = {
|
|
|
76
76
|
[core_1.BLOCKCHAIN_NAME.WANCHAIN]: chains_1.wanchain,
|
|
77
77
|
[core_1.BLOCKCHAIN_NAME.UNICHAIN]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.UNICHAIN],
|
|
78
78
|
[core_1.BLOCKCHAIN_NAME.MORPH]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.MORPH], // viem Morph config without multicall address
|
|
79
|
-
[core_1.BLOCKCHAIN_NAME.HEMI]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.HEMI]
|
|
79
|
+
[core_1.BLOCKCHAIN_NAME.HEMI]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.HEMI],
|
|
80
|
+
[core_1.BLOCKCHAIN_NAME.PLASMA]: chain_configs_1.viemConfig[core_1.BLOCKCHAIN_NAME.PLASMA]
|
|
80
81
|
};
|
|
@@ -320,9 +320,8 @@ exports.web3PureStore = {
|
|
|
320
320
|
// regex: ?
|
|
321
321
|
}),
|
|
322
322
|
[core_1.CHAIN_TYPE.ZCASH]: new common_web3_pure_1.CommonWeb3Pure({
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
// regex: ?
|
|
323
|
+
cnApiKey: changenow_api_blockchain_1.changenowApiBlockchain.ZCASH,
|
|
324
|
+
regex: /^(t1[a-zA-Z0-9]{33}|zs[a-zA-Z0-9]{76,}|u1[a-z0-9]{76,})$/
|
|
326
325
|
}),
|
|
327
326
|
[core_1.CHAIN_TYPE.HORIZEN]: new common_web3_pure_1.CommonWeb3Pure({
|
|
328
327
|
// @TODO
|
|
@@ -3,11 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.CommonWeb3Pure = void 0;
|
|
4
4
|
const axios_1 = require("axios");
|
|
5
5
|
class CommonWeb3Pure {
|
|
6
|
-
nativeTokenAddress = '0x0000000000000000000000000000000000000000';
|
|
7
|
-
emptyAddress = '0x0000000000000000000000000000000000000000';
|
|
8
|
-
cnApiKey;
|
|
9
|
-
regEx;
|
|
10
6
|
constructor(commonParams) {
|
|
7
|
+
this.nativeTokenAddress = '0x0000000000000000000000000000000000000000';
|
|
8
|
+
this.emptyAddress = '0x0000000000000000000000000000000000000000';
|
|
11
9
|
this.cnApiKey = commonParams?.cnApiKey || undefined;
|
|
12
10
|
this.regEx = commonParams?.regex || undefined;
|
|
13
11
|
}
|
|
@@ -4,12 +4,12 @@ exports.NearWeb3Pure = void 0;
|
|
|
4
4
|
const changenow_api_blockchain_1 = require("../constants/changenow-api-blockchain");
|
|
5
5
|
const common_web3_pure_1 = require("./common-web3-pure");
|
|
6
6
|
class NearWeb3Pure extends common_web3_pure_1.CommonWeb3Pure {
|
|
7
|
-
nativeTokenAddress = 'near';
|
|
8
7
|
constructor() {
|
|
9
8
|
super({
|
|
10
9
|
cnApiKey: changenow_api_blockchain_1.changenowApiBlockchain.NEAR,
|
|
11
10
|
regex: /(^(?=.{2,64}$)([a-z0-9][a-z0-9\-_]*(?<![-_])\.)*[a-z0-9][a-z0-9\-_]*(?<![-_])(\.near)$)|(^[0-9a-f]{64}$)/
|
|
12
11
|
});
|
|
12
|
+
this.nativeTokenAddress = 'near';
|
|
13
13
|
}
|
|
14
14
|
async isAddressCorrect(address) {
|
|
15
15
|
if (this.isNativeAddress(address)) {
|
|
@@ -5,12 +5,12 @@ const changenow_api_blockchain_1 = require("../constants/changenow-api-blockchai
|
|
|
5
5
|
const common_web3_pure_1 = require("./common-web3-pure");
|
|
6
6
|
const core_1 = require("@cryptorubic/core");
|
|
7
7
|
class SolanaWeb3Pure extends common_web3_pure_1.CommonWeb3Pure {
|
|
8
|
-
nativeTokenAddress = 'So11111111111111111111111111111111111111111';
|
|
9
8
|
constructor() {
|
|
10
9
|
super({
|
|
11
10
|
cnApiKey: changenow_api_blockchain_1.changenowApiBlockchain.SOLANA,
|
|
12
11
|
regex: /^(?!.*([1-9A-HJ-NP-Za-km-z])\1{31,43}$)[1-9A-HJ-NP-Za-km-z]{32,44}$/
|
|
13
12
|
});
|
|
13
|
+
this.nativeTokenAddress = 'So11111111111111111111111111111111111111111';
|
|
14
14
|
}
|
|
15
15
|
async isAddressCorrect(address) {
|
|
16
16
|
if ((0, core_1.compareAddresses)(address, this.nativeTokenAddress)) {
|
|
@@ -5,8 +5,6 @@ const common_web3_pure_1 = require("./common-web3-pure");
|
|
|
5
5
|
const core_1 = require("@cryptorubic/core");
|
|
6
6
|
const bignumber_js_1 = require("bignumber.js");
|
|
7
7
|
class SuiWeb3Pure extends common_web3_pure_1.CommonWeb3Pure {
|
|
8
|
-
nativeTokenAddress = '0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI';
|
|
9
|
-
emptyAddress = '0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI';
|
|
10
8
|
static compareAddress(addressA, addressB) {
|
|
11
9
|
const pureAddressA = addressA.split(':')[0];
|
|
12
10
|
const pureAddressB = addressB.split(':')[0];
|
|
@@ -22,6 +20,8 @@ class SuiWeb3Pure extends common_web3_pure_1.CommonWeb3Pure {
|
|
|
22
20
|
super({
|
|
23
21
|
regex: /(^0[xX][a-fA-F0-9]{0,64}::[a-zA-Z0-9_]*::[A-Z0-9_]*$)|(^0[xX][a-fA-F0-9]{64}$)/
|
|
24
22
|
});
|
|
23
|
+
this.nativeTokenAddress = '0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI';
|
|
24
|
+
this.emptyAddress = '0x0000000000000000000000000000000000000000000000000000000000000002::sui::SUI';
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
27
|
exports.SuiWeb3Pure = SuiWeb3Pure;
|
|
@@ -1,7 +0,0 @@
|
|
|
1
|
-
import { HttpClient, ICustomLogger } from '@cryptorubic/core';
|
|
2
|
-
import { TonAdapterConfig } from './ton-adapter-config';
|
|
3
|
-
export interface AdaptersFactoryParams {
|
|
4
|
-
tonParams: TonAdapterConfig;
|
|
5
|
-
httpClient?: HttpClient;
|
|
6
|
-
createLogger?: (label: string) => ICustomLogger;
|
|
7
|
-
}
|