rubic-sdk 5.34.0-alpha.eddy.21 → 5.34.0-alpha.eddy.23
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/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js +7 -19
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js +3 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.js +2 -4
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-bridge-routing-directions.js +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-bridge-routing-directions.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-calculation-factory.d.ts +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-calculation-factory.js +4 -2
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-calculation-factory.js.map +1 -1
- package/package.json +1 -1
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js
CHANGED
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.EddyBridgeProvider = void 0;
|
|
4
4
|
const errors_1 = require("../../../../../common/errors");
|
|
5
5
|
const tokens_1 = require("../../../../../common/tokens");
|
|
6
|
-
const native_tokens_1 = require("../../../../../common/tokens/constants/native-tokens");
|
|
7
6
|
const blockchain_name_1 = require("../../../../../core/blockchain/models/blockchain-name");
|
|
8
7
|
const fake_wallet_address_1 = require("../../../../common/constants/fake-wallet-address");
|
|
9
8
|
const check_unsupported_receiver_address_1 = require("../../../../common/utils/check-unsupported-receiver-address");
|
|
@@ -35,21 +34,18 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
35
34
|
const routingDirection = (0, eddy_bridge_routing_directions_1.eddyRoutingDirection)(from, toToken);
|
|
36
35
|
const feeInfo = await this.getFeeInfo(fromBlockchain, options.providerAddress, from, useProxy);
|
|
37
36
|
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(from, feeInfo.rubicProxy?.platformFee?.percent);
|
|
38
|
-
const [eddySlippage, eddyFee,
|
|
37
|
+
const [eddySlippage, eddyFee, gasFeeInSrcTokenUnits] = await Promise.all([
|
|
39
38
|
eddy_bridge_contract_service_1.EddyBridgeContractService.getEddySlipage(),
|
|
40
39
|
eddy_bridge_contract_service_1.EddyBridgeContractService.getPlatformFee(),
|
|
41
40
|
eddy_bridge_contract_service_1.EddyBridgeContractService.getGasFeeInDestChain(from, toToken)
|
|
42
41
|
]);
|
|
43
42
|
const ratioToAmount = 1 - eddyFee;
|
|
44
|
-
const calculationFactory = new eddy_calculation_factory_1.EddyBridgeCalculationFactory(from, toToken, options, ratioToAmount);
|
|
43
|
+
const calculationFactory = new eddy_calculation_factory_1.EddyBridgeCalculationFactory(from, toToken, options, ratioToAmount, gasFeeInSrcTokenUnits);
|
|
45
44
|
const toAmount = await calculationFactory.calculateToAmount();
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}),
|
|
51
|
-
tokens_1.PriceToken.createFromToken(native_tokens_1.nativeTokensList[from.blockchain])
|
|
52
|
-
]);
|
|
45
|
+
const to = await tokens_1.PriceTokenAmount.createToken({
|
|
46
|
+
...toToken.asStruct,
|
|
47
|
+
tokenAmount: toAmount
|
|
48
|
+
});
|
|
53
49
|
const gasData = options.gasCalculation === 'enabled'
|
|
54
50
|
? await eddy_bridge_trade_1.EddyBridgeTrade.getGasData({
|
|
55
51
|
feeInfo,
|
|
@@ -63,15 +59,7 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
63
59
|
: null;
|
|
64
60
|
const trade = new eddy_bridge_trade_1.EddyBridgeTrade({
|
|
65
61
|
crossChainTrade: {
|
|
66
|
-
feeInfo
|
|
67
|
-
...feeInfo,
|
|
68
|
-
provider: {
|
|
69
|
-
cryptoFee: {
|
|
70
|
-
amount: gasFeeInDestTokenUnits,
|
|
71
|
-
token: nativeSrcChainToken
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
},
|
|
62
|
+
feeInfo,
|
|
75
63
|
from: fromWithoutFee,
|
|
76
64
|
gasData,
|
|
77
65
|
to,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.ts"],"names":[],"mappings":";;;AAAA,8CAAmE;AACnE,8CAAiE;AACjE,
|
|
1
|
+
{"version":3,"file":"eddy-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.ts"],"names":[],"mappings":"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"}
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js
CHANGED
|
@@ -18,6 +18,7 @@ const evm_cross_chain_trade_1 = require("../common/emv-cross-chain-trade/evm-cro
|
|
|
18
18
|
const bridge_type_1 = require("../common/models/bridge-type");
|
|
19
19
|
const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade");
|
|
20
20
|
const eddy_bridge_contract_addresses_1 = require("./constants/eddy-bridge-contract-addresses");
|
|
21
|
+
const eddy_bridge_contract_service_1 = require("./services/eddy-bridge-contract-service");
|
|
21
22
|
const eddy_bridge_routing_directions_1 = require("./utils/eddy-bridge-routing-directions");
|
|
22
23
|
const eddy_calculation_factory_1 = require("./utils/eddy-calculation-factory");
|
|
23
24
|
const eddy_evm_config_factory_1 = require("./utils/eddy-evm-config-factory");
|
|
@@ -106,7 +107,8 @@ class EddyBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
106
107
|
}
|
|
107
108
|
async getTransactionConfigAndAmount(_receiverAddress) {
|
|
108
109
|
const evmConfig = new eddy_evm_config_factory_1.EddyBridgeEvmConfigFactory(this.from, this.to, this.walletAddress || fake_wallet_address_1.FAKE_WALLET_ADDRESS, this.routingDirection).getEvmConfig();
|
|
109
|
-
const
|
|
110
|
+
const gasFeeInSrcTokenUnits = await eddy_bridge_contract_service_1.EddyBridgeContractService.getGasFeeInDestChain(this.from, this.to);
|
|
111
|
+
const calculationFactory = new eddy_calculation_factory_1.EddyBridgeCalculationFactory(this.from, this.to, this.quoteOptions, this.ratioToAmount, gasFeeInSrcTokenUnits);
|
|
110
112
|
const toStringWeiAmount = await calculationFactory.calculateToStringWeiAmount();
|
|
111
113
|
return {
|
|
112
114
|
config: evmConfig,
|
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"eddy-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.EddyBridgeContractService = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
8
|
const tokens_1 = require("../../../../../../common/tokens");
|
|
9
|
-
const native_tokens_1 = require("../../../../../../common/tokens/constants/native-tokens");
|
|
10
9
|
const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
|
|
11
10
|
const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
|
|
12
11
|
const injector_1 = require("../../../../../../core/injector/injector");
|
|
@@ -41,9 +40,8 @@ class EddyBridgeContractService {
|
|
|
41
40
|
blockchain: blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN
|
|
42
41
|
});
|
|
43
42
|
const gasFeeUsdt = web3_pure_1.Web3Pure.fromWei(zrc20WeiAmount || 0, 18).multipliedBy(zrc20TokenWithPrice.price);
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
return gasFeeInSrcChainNativeEquivalent;
|
|
43
|
+
const gasFeeInSrcTokenEquivalent = gasFeeUsdt.dividedBy(fromToken.price);
|
|
44
|
+
return gasFeeInSrcTokenEquivalent;
|
|
47
45
|
}
|
|
48
46
|
/**
|
|
49
47
|
* @returns eddy static slippage
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-contract-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"eddy-bridge-contract-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA+C;AAC/C,gFAAgG;AAChG,uEAAmE;AACnE,yDAAsD;AAEtD,gGAA8F;AAC9F,kEAA+D;AAC/D,oEAA2D;AAC3D,oFAAsF;AAEtF,MAAa,yBAAyB;IAC3B,MAAM,CAAC,KAAK,CAAC,cAAc;QAC9B,IAAI;YACA,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;YACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,gEAA+B,EAC/B,iCAAe,EACf,aAAa,EACb,EAAE,CACL,CAAC;YACF,oGAAoG;YACpG,OAAO,GAAG,GAAG,IAAK,CAAC;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,CAAC;SACZ;IACL,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,oBAAoB,CACpC,SAAwC,EACxC,OAAsC;QAEtC,IAAI,OAAO,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS;YAAE,OAAO,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;QAE9E,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,IAAA,4DAA+B,EAAC,OAAO,CAAC,EACxC,6BAAU,EACV,gBAAgB,EAChB,EAAE,CACL,CAAC;QACF,MAAM,EAAE,CAAC,EAAE,uBAAuB,EAAE,CAAC,EAAE,cAAc,EAAE,GAAG,GAAG,CAAC;QAE9D,MAAM,mBAAmB,GAAG,MAAM,mBAAU,CAAC,WAAW,CAAC;YACrD,OAAO,EAAE,uBAAuB;YAChC,UAAU,EAAE,iCAAe,CAAC,SAAS;SACxC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,oBAAQ,CAAC,OAAO,CAAC,cAAc,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,CACrE,mBAAmB,CAAC,KAAK,CAC5B,CAAC;QACF,MAAM,0BAA0B,GAAG,UAAU,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAEzE,OAAO,0BAA0B,CAAC;IACtC,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,cAAc;QAC9B,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,gEAA+B,EAC/B,iCAAe,EACf,UAAU,EACV,EAAE,CACL,CAAC;QACF,0CAA0C;QAC1C,OAAO,GAAG,GAAG,IAAK,CAAC;IACvB,CAAC;CACJ;AA9DD,8DA8DC"}
|
|
@@ -40,8 +40,9 @@ function eddyRoutingDirection(from, to) {
|
|
|
40
40
|
return exports.ERD.ANY_CHAIN_NATIVE_TO_ZETA_NATIVE;
|
|
41
41
|
if (from.isNative && isSupportedToToken)
|
|
42
42
|
return exports.ERD.ANY_CHAIN_NATIVE_TO_ZETA_TOKEN;
|
|
43
|
-
if (!from.isNative && isSupportedToToken && isSupportedFromToken)
|
|
43
|
+
if (!from.isNative && isSupportedToToken && isSupportedFromToken && !to.isNative) {
|
|
44
44
|
return exports.ERD.ANY_CHAIN_TOKEN_TO_ZETA_TOKEN;
|
|
45
|
+
}
|
|
45
46
|
}
|
|
46
47
|
// BSC <-> ETH routes are not supported
|
|
47
48
|
// if (
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-routing-directions.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-bridge-routing-directions.ts"],"names":[],"mappings":";;;AAAA,8CAA4D;AAE5D,4DAA+D;AAC/D,gFAAgG;AAEhG,gGAA0F;AAC1F,6EAA+E;AAE/E,yBAAyB;AACZ,QAAA,GAAG,GAAG;IACf,+BAA+B,EAAE,iCAAiC;IAClE,8BAA8B,EAAE,gCAAgC;IAChE,4BAA4B,EAAE,8BAA8B;IAC5D,2BAA2B,EAAE,6BAA6B;IAC1D,mCAAmC,EAAE,qCAAqC;IAC1E,kCAAkC,EAAE,oCAAoC;IACxE,6BAA6B,EAAE,+BAA+B;CACxD,CAAC;AAIE,QAAA,sBAAsB,GAAG;IAClC,aAAa,EAAE,eAAe;IAC9B,mBAAmB,EAAE,qBAAqB;IAC1C,iBAAiB,EAAE,mBAAmB;IACtC,yBAAyB,EAAE,2BAA2B;CAChD,CAAC;AAKX,sCAAsC;AACtC,SAAgB,oBAAoB,CAChC,IAAyC,EACzC,EAAiC;IAEjC,IAAI,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAAE;QAC/C,MAAM,oBAAoB,GAAG,4DAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CACrE,IAAA,6BAAgB,EAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CACnD,CAAC;QACF,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAA,4DAA+B,EAAC,EAAE,CAAC,CAAC;QAEjE,IAAI,IAAI,CAAC,QAAQ,IAAI,kBAAkB;YAAE,OAAO,WAAG,CAAC,4BAA4B,CAAC;QACjF,IAAI,oBAAoB,IAAI,kBAAkB;YAAE,OAAO,WAAG,CAAC,2BAA2B,CAAC;KAC1F;IAED,IACI,IAAI,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS;QAC7C,EAAE,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAC7C;QACE,MAAM,kBAAkB,GAAG,4DAA2B,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CACnE,IAAA,6BAAgB,EAAC,QAAQ,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,CACjD,CAAC;QACF,MAAM,oBAAoB,GAAG,CAAC,CAAC,IAAA,4DAA+B,EAAC,IAAI,CAAC,CAAC;QAErE,IAAI,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,QAAQ;YAAE,OAAO,WAAG,CAAC,+BAA+B,CAAC;QAC7E,IAAI,IAAI,CAAC,QAAQ,IAAI,kBAAkB;YAAE,OAAO,WAAG,CAAC,8BAA8B,CAAC;QACnF,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,kBAAkB,IAAI,oBAAoB;
|
|
1
|
+
{"version":3,"file":"eddy-bridge-routing-directions.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-bridge-routing-directions.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,9 +7,10 @@ export declare class EddyBridgeCalculationFactory {
|
|
|
7
7
|
private readonly toToken;
|
|
8
8
|
private readonly options;
|
|
9
9
|
private readonly ratioToAmount;
|
|
10
|
+
private readonly gasFeeInSrcTokenUnits;
|
|
10
11
|
private calculationType;
|
|
11
12
|
private readonly calculators;
|
|
12
|
-
constructor(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredCrossChainOptions, ratioToAmount: number);
|
|
13
|
+
constructor(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredCrossChainOptions, ratioToAmount: number, gasFeeInSrcTokenUnits: BigNumber);
|
|
13
14
|
calculateToAmount(): Promise<BigNumber>;
|
|
14
15
|
calculateToStringWeiAmount(): Promise<string>;
|
|
15
16
|
private calculateDirectBridge;
|
|
@@ -8,11 +8,12 @@ const eddy_finance_provider_1 = require("../../../../../on-chain/calculation-man
|
|
|
8
8
|
const eddy_bridge_routing_directions_1 = require("./eddy-bridge-routing-directions");
|
|
9
9
|
const find_transit_token_address_1 = require("./find-transit-token-address");
|
|
10
10
|
class EddyBridgeCalculationFactory {
|
|
11
|
-
constructor(from, toToken, options, ratioToAmount) {
|
|
11
|
+
constructor(from, toToken, options, ratioToAmount, gasFeeInSrcTokenUnits) {
|
|
12
12
|
this.from = from;
|
|
13
13
|
this.toToken = toToken;
|
|
14
14
|
this.options = options;
|
|
15
15
|
this.ratioToAmount = ratioToAmount;
|
|
16
|
+
this.gasFeeInSrcTokenUnits = gasFeeInSrcTokenUnits;
|
|
16
17
|
this.calculators = new Map([
|
|
17
18
|
[eddy_bridge_routing_directions_1.EDDY_CALCULATION_TYPES.DIRECT_BRIDGE, this.calculateDirectBridge],
|
|
18
19
|
[eddy_bridge_routing_directions_1.EDDY_CALCULATION_TYPES.SWAP_FROM_ZETACHAIN, this.calculateSwapFromZetachain],
|
|
@@ -24,7 +25,8 @@ class EddyBridgeCalculationFactory {
|
|
|
24
25
|
async calculateToAmount() {
|
|
25
26
|
const calculatorFn = this.calculators.get(this.calculationType);
|
|
26
27
|
const toAmount = await calculatorFn.apply(this);
|
|
27
|
-
|
|
28
|
+
const toAmountWithGasInDestChain = toAmount.minus(this.gasFeeInSrcTokenUnits);
|
|
29
|
+
return toAmountWithGasInDestChain;
|
|
28
30
|
}
|
|
29
31
|
async calculateToStringWeiAmount() {
|
|
30
32
|
const nonWeiAmount = await this.calculateToAmount();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-calculation-factory.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-calculation-factory.ts"],"names":[],"mappings":";;;AACA,8CAAiE;AACjE,gFAAgG;AAChG,uEAAmE;AACnE,kJAA6I;AAG7I,qFAI0C;AAC1C,6EAA+E;AAE/E,MAAa,4BAA4B;IAUrC,YACqB,IAAyC,EACzC,OAAsC,EACtC,OAAkC,EAClC,aAAqB;
|
|
1
|
+
{"version":3,"file":"eddy-calculation-factory.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/utils/eddy-calculation-factory.ts"],"names":[],"mappings":"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"}
|