rubic-sdk 6.0.0-alpha.ton.117 → 6.0.0-alpha.ton.118
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-public-service/constants/rpc-errors.js +2 -1
- package/lib/core/blockchain/web3-public-service/constants/rpc-errors.js.map +1 -1
- package/lib/features/common/providers/symbiosis/services/symbiosis-api-service.js +0 -4
- package/lib/features/common/providers/symbiosis/services/symbiosis-api-service.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/arbitrum-rbc-bridge/arbitrum-rbc-bridge-trade.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/arbitrum-rbc-bridge/arbitrum-rbc-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/archon-bridge/archon-bridge-provider.js +3 -2
- package/lib/features/cross-chain/calculation-manager/providers/archon-bridge/archon-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/archon-bridge/archon-bridge-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/archon-bridge/archon-bridge-trade.js +2 -2
- package/lib/features/cross-chain/calculation-manager/providers/archon-bridge/archon-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/bridgers-provider/bridgers-cross-chain-provider.js +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/bridgers-provider/bridgers-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/bridgers-provider/evm-bridgers-trade/evm-bridgers-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/bridgers-provider/evm-bridgers-trade/evm-bridgers-cross-chain-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/bridgers-provider/evm-bridgers-trade/evm-bridgers-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/bridgers-provider/tron-bridgers-trade/tron-bridgers-cross-chain-trade.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/bridgers-provider/tron-bridgers-trade/tron-bridgers-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/cbridge/cbridge-cross-chain-provider.js +3 -2
- package/lib/features/cross-chain/calculation-manager/providers/cbridge/cbridge-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/cbridge/cbridge-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/cbridge/cbridge-cross-chain-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/cbridge/cbridge-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/changenow-provider/changenow-cross-chain-provider.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/changenow-provider/changenow-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/changenow-provider/changenow-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/changenow-provider/changenow-cross-chain-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/changenow-provider/changenow-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.d.ts +4 -3
- package/lib/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.js +5 -8
- package/lib/features/cross-chain/calculation-manager/providers/common/cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/common/emv-cross-chain-trade/evm-cross-chain-trade.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/common/emv-cross-chain-trade/evm-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-evm-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-evm-cross-chain-trade.js +8 -6
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-evm-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/chains/debridge-solana-cross-chain-trade.js +1 -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/debridge-provider/debridge-cross-chain-factory.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/debridge-cross-chain-factory.js +2 -2
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/debridge-cross-chain-factory.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/debridge-cross-chain-provider.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/debridge-provider/debridge-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js +2 -1
- 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 -2
- 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/models/eddy-trade-types.d.ts +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/layerzero-bridge/layerzero-bridge-provider.js +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/layerzero-bridge/layerzero-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/layerzero-bridge/layerzero-bridge-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/layerzero-bridge/layerzero-bridge-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/layerzero-bridge/layerzero-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-provider.js +3 -2
- package/lib/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-trade.js +6 -4
- package/lib/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.js +5 -4
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.js +11 -7
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/meson-provider/models/meson-trade-types.d.ts +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/models/orbiter-bridge-trade-types.d.ts +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.d.ts +0 -1
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.js +4 -18
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.d.ts +7 -0
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.js +31 -5
- package/lib/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/models/owl-to-trade-types.d.ts +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.js +4 -3
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js +4 -3
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-provider.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/rango-provider/model/rango-cross-chain-parser-types.d.ts +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/rango-provider/rango-cross-chain-trade.js +6 -3
- package/lib/features/cross-chain/calculation-manager/providers/rango-provider/rango-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/rango-provider/services/rango-cross-chain-params-parser.js +4 -1
- package/lib/features/cross-chain/calculation-manager/providers/rango-provider/services/rango-cross-chain-params-parser.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-provider.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-trade.d.ts +9 -1
- package/lib/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-trade.js +14 -4
- package/lib/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-provider.js +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-provider.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-trade.js +6 -4
- package/lib/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/stargate-provider/stargate-cross-chain-provider.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/stargate-provider/stargate-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/stargate-provider/stargate-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/stargate-provider/stargate-cross-chain-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/stargate-provider/stargate-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/stargate-v2-provider/stargate-v2-cross-chain-provider.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/stargate-v2-provider/stargate-v2-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/stargate-v2-provider/stargate-v2-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/stargate-v2-provider/stargate-v2-cross-chain-trade.js +6 -4
- package/lib/features/cross-chain/calculation-manager/providers/stargate-v2-provider/stargate-v2-cross-chain-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-ccr-evm-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-ccr-evm-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-ccr-evm-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-cross-chain-provider.js +2 -2
- package/lib/features/cross-chain/calculation-manager/providers/symbiosis-provider/symbiosis-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/taiko-bridge/taiko-bridge-provider.js +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/taiko-bridge/taiko-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/taiko-bridge/taiko-bridge-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/taiko-bridge/taiko-bridge-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/taiko-bridge/taiko-bridge-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-provider.js +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.js +3 -3
- package/lib/features/cross-chain/calculation-manager/providers/xy-provider/xy-cross-chain-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/models/open-ocean-token-list-response.d.ts +2 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/models/open-ocean-trade-struct.d.ts +0 -2
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-provider.d.ts +0 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-provider.js +3 -41
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-provider.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.d.ts +0 -5
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.js +2 -48
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/open-ocean-trade.js.map +1 -1
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.d.ts +16 -0
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.js +75 -0
- package/lib/features/on-chain/calculation-manager/providers/aggregators/open-ocean/services/open-ocean-api-service.js.map +1 -0
- package/lib/index.d.ts +1 -0
- package/lib/index.js +1 -0
- package/lib/index.js.map +1 -1
- package/package.json +1 -1
@@ -25,12 +25,13 @@ class LifiCrossChainProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
25
25
|
constructor() {
|
26
26
|
super(...arguments);
|
27
27
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.LIFI;
|
28
|
-
this.MIN_AMOUNT_USD = new bignumber_js_1.default(
|
28
|
+
this.MIN_AMOUNT_USD = new bignumber_js_1.default(1);
|
29
29
|
}
|
30
30
|
isSupportedBlockchain(blockchain) {
|
31
31
|
return lifi_cross_chain_supported_blockchain_1.lifiCrossChainSupportedBlockchains.some(supportedBlockchain => supportedBlockchain === blockchain);
|
32
32
|
}
|
33
33
|
async calculate(from, toToken, options) {
|
34
|
+
const useProxy = options?.useProxy?.[this.type] ?? true;
|
34
35
|
const fromBlockchain = from.blockchain;
|
35
36
|
const toBlockchain = toToken.blockchain;
|
36
37
|
if (!this.areSupportedBlockchains(fromBlockchain, toBlockchain)) {
|
@@ -105,7 +106,7 @@ class LifiCrossChainProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
105
106
|
onChainSubtype: onChainType,
|
106
107
|
bridgeType: bridgeType || bridge_type_1.BRIDGE_TYPE.LIFI,
|
107
108
|
slippage: options.slippageTolerance
|
108
|
-
}, options.providerAddress, await this.getRoutePath(from, to, bestRoute));
|
109
|
+
}, options.providerAddress, await this.getRoutePath(from, to, bestRoute), useProxy);
|
109
110
|
try {
|
110
111
|
this.checkMinError(from);
|
111
112
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"lifi-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA2F;AAC3F,8CAA8E;AAC9E,6EAA6E;AAE7E,sGAAkG;AAClG,uEAAmE;AACnE,yFAAmF;AAEnF,uHAAoH;AACpH,6HAAwH;AACxH,kHAI0F;AAI1F,wKAAiK;AACjK,gLAG8H;AAC9H,wIAAkI;AAClI,qIAGuG;AACvG,kIAGuG;AACvG,+HAG+F;AAI/F,kEAA6D;AAC7D,MAAa,sBAAuB,SAAQ,yCAAkB;IAA9D;;QACoB,SAAI,GAAG,+CAAsB,CAAC,IAAI,CAAC;QAElC,mBAAc,GAAG,IAAI,sBAAS,CAAC,
|
1
|
+
{"version":3,"file":"lifi-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA2F;AAC3F,8CAA8E;AAC9E,6EAA6E;AAE7E,sGAAkG;AAClG,uEAAmE;AACnE,yFAAmF;AAEnF,uHAAoH;AACpH,6HAAwH;AACxH,kHAI0F;AAI1F,wKAAiK;AACjK,gLAG8H;AAC9H,wIAAkI;AAClI,qIAGuG;AACvG,kIAGuG;AACvG,+HAG+F;AAI/F,kEAA6D;AAC7D,MAAa,sBAAuB,SAAQ,yCAAkB;IAA9D;;QACoB,SAAI,GAAG,+CAAsB,CAAC,IAAI,CAAC;QAElC,mBAAc,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;IA8SvD,CAAC;IA5SU,qBAAqB,CACxB,UAA0B;QAE1B,OAAO,0EAAkC,CAAC,IAAI,CAC1C,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,KAAK,UAAU,CAC5D,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAAkC;QAElC,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;QACxD,MAAM,cAAc,GAAG,IAAI,CAAC,UAA+C,CAAC;QAC5E,MAAM,YAAY,GAAG,OAAO,CAAC,UAA+C,CAAC;QAC7E,IAAI,CAAC,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,YAAY,CAAC,EAAE,CAAC;YAC9D,OAAO;gBACH,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,IAAI,gCAAuB,EAAE;gBACpC,SAAS,EAAE,IAAI,CAAC,IAAI;aACvB,CAAC;QACN,CAAC;QAED,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,IAAI,CAAC,oBAAoB,CAChE,OAAO,CAAC,uBAAuB,IAAI,EAAE,CACxC,CAAC;QACF,MAAM,YAAY,GAAiB;YAC/B,QAAQ,EAAE,OAAO,CAAC,iBAAiB;YACnC,KAAK,EAAE,aAAa;YACpB,gBAAgB,EAAE,KAAK;YACvB,OAAO,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;YAClC,SAAS,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE;YAClC,UAAU,EAAE,OAAO;SACtB,CAAC;QAEF,MAAM,WAAW,GAAG,4BAAY,CAAC,cAAc,CAAC,CAAC;QACjD,MAAM,SAAS,GAAG,4BAAY,CAAC,YAAY,CAAC,CAAC;QAE7C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CACjC,cAAc,EACd,OAAO,CAAC,eAAe,EACvB,IAAI,EACJ,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CACzC,CAAC;QACF,MAAM,cAAc,GAAG,IAAA,wCAAiB,EAAC,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;QAEzF,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,CAAC;QAC1D,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,IAAI,WAAW,CAAC;QACzD,MAAM,aAAa,GAAkB;YACjC,WAAW;YACX,UAAU,EAAE,cAAc,CAAC,eAAe;YAC1C,gBAAgB,EAAE,IAAI,CAAC,OAAO;YAC9B,SAAS;YACT,cAAc,EAAE,OAAO,CAAC,OAAO;YAC/B,OAAO,EAAE,YAAY;YACrB,GAAG,CAAC,WAAW,IAAI,EAAE,WAAW,EAAE,CAAC;YACnC,GAAG,CAAC,SAAS,IAAI,EAAE,SAAS,EAAE,CAAC;SAClC,CAAC;QAEF,MAAM,MAAM,GAAG,MAAM,iCAAc,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAE7D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;QAE1B,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,CACzB,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAClE,CAAC;QAEF,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,IAAI,sBAAa,CAAC,qBAAqB,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,WAAW,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAC3D,CAAC,EAAoC,EAAE,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,KAAK,CACnE,CAAC;QACF,MAAM,WAAW,GAAG,MAAM,mBAAU,CAAC,eAAe,CAAC,gCAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;QACxF,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAC5C,OAAO,CAAC,QAAQ,GAAG;gBACf,SAAS,EAAE;oBACP,MAAM,EAAE,oBAAQ,CAAC,OAAO,CACpB,IAAI,sBAAS,CAAC,WAAW,CAAC,MAAM,CAAC,EACjC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAC7B;oBACD,KAAK,EAAE,WAAW;iBACrB;aACJ,CAAC;QACN,CAAC;QAED,IAAI,GAAG,IAAI,yBAAgB,CAAC;YACxB,GAAG,IAAI,CAAC,kBAAkB;YAC1B,KAAK,EAAE,IAAI,sBAAS,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;SAC5E,CAAC,CAAC;QACH,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;YAC5B,GAAG,OAAO,CAAC,QAAQ;YACnB,SAAS,EAAE,IAAI,sBAAS,CAAC,SAAS,CAAC,QAAQ,CAAC;SAC/C,CAAC,CAAC;QAEH,MAAM,WAAW,GAAG,IAAI,CAAC,2BAA2B,CAAC,EAAE,CAAC,CAAC;QAEzD,MAAM,OAAO,GACT,OAAO,CAAC,cAAc,KAAK,SAAS;YAChC,CAAC,CAAC,MAAM,4CAAmB,CAAC,UAAU,CAChC,IAAI,EACJ,EAAE,EACF,SAAS,EACT,OAAO,EACP,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,eAAe,CAC1B;YACH,CAAC,CAAC,IAAI,CAAC;QAEf,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAE1E,MAAM,KAAK,GAAG,IAAI,4CAAmB,CACjC;YACI,IAAI;YACJ,EAAE;YACF,KAAK,EAAE,SAAS;YAChB,OAAO;YACP,gBAAgB,EAAE,oBAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC,QAAQ,CAAC;YACtE,OAAO;YACP,WAAW;YACX,cAAc,EAAE,WAAW;YAC3B,UAAU,EAAE,UAAU,IAAI,yBAAW,CAAC,IAAI;YAC1C,QAAQ,EAAE,OAAO,CAAC,iBAAiB;SACtC,EACD,OAAO,CAAC,eAAe,EACvB,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,EAC5C,QAAQ,CACX,CAAC;QAEF,IAAI,CAAC;YACD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO;gBACH,KAAK;gBACL,KAAK,EAAE,GAAG;gBACV,SAAS,EAAE,IAAI,CAAC,IAAI;aACvB,CAAC;QACN,CAAC;QAED,OAAO;YACH,KAAK;YACL,SAAS,EAAE,IAAI,CAAC,IAAI;SACvB,CAAC;IACN,CAAC;IAEO,aAAa,CAAC,IAAsB;QACxC,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAChE,IAAI,aAAa,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;YACxC,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACnB,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,SAAS,CAC/E,aAAa,CAChB,CAAC;gBACF,MAAM,IAAI,uBAAc,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YAC1D,CAAC;YACD,MAAM,IAAI,uBAAc,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;QAC1D,CAAC;IACL,CAAC;IAES,KAAK,CAAC,UAAU,CACtB,cAAiD,EACjD,eAAuB,EACvB,eAAiC,EACjC,QAAiB;QAEjB,OAAO,qDAAuB,CAAC,UAAU,CACrC,cAAc,EACd,eAAe,EACf,eAAe,EACf,QAAQ,CACX,CAAC;IACN,CAAC;IAEO,eAAe,CAAC,cAA0B;QAI9C,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,OAAO;gBACH,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE;gBAC/C,UAAU,EAAE,SAAS;aACxB,CAAC;QACN,CAAC;QAED,MAAM,KAAK,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;QAE9C,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACZ,OAAO;gBACH,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,SAAS,EAAE;gBAC/C,UAAU,EAAE,SAAS;aACxB,CAAC;QACN,CAAC;QAED,MAAM,SAAS,GACX,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS;YACrD,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE;YAC3C,CAAC,CAAC,SAAS,CAAC;QAEpB,MAAM,SAAS,GAAG,KAAK;YACnB,EAAE,KAAK,CAAC,CAAC,CAAC;YACV,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;YAC7E,EAAE,WAAW,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;QAErC,IAAI,OAAO,GAAG,cAAc;YACxB,EAAE,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,KAAK,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC;YAC7E,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;QAEzB,OAAO,GAAG,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,yBAAW,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC;QAE9D,MAAM,WAAW,GAAG;YAChB,IAAI,EAAE,SAAS;gBACX,CAAC,CAAC,4CAA2B,CAAC,SAAgC,CAAC;gBAC/D,CAAC,CAAC,SAAS;YACf,EAAE,EAAE,SAAS;gBACT,CAAC,CAAC,4CAA2B,CAAC,SAAgC,CAAC;gBAC/D,CAAC,CAAC,SAAS;SAClB,CAAC;QACF,MAAM,UAAU,GAAG,qBAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,CAAC;QAE5E,OAAO;YACH,WAAW;YACX,UAAU;SACb,CAAC;IACN,CAAC;IAEO,oBAAoB,CAAC,iBAAoC;QAI7D,MAAM,eAAe,GAAG,EAAuB,CAAC;QAChD,MAAM,aAAa,GAAG,EAAuB,CAAC;QAE9C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,MAAM,QAAQ,GAAG,iBAAiB,CAAC,CAAC,CAAoB,CAAC;YACzD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,kDAA8B,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAClF,IAAI,QAAQ,EAAE,CAAC;gBACX,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC/B,SAAS;YACb,CAAC;YACD,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,4CAA2B,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC1E,IAAI,KAAK,EAAE,CAAC;gBACR,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACjC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,CAAC;IAC9C,CAAC;IAES,KAAK,CAAC,YAAY,CACxB,IAAsB,EACtB,EAAoB,EACpB,KAAY;QAEZ,MAAM,SAAS,GAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAc,CAAC,aAAa,CAAC;QAC7D,MAAM,cAAc,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,OAAO,CAAE,CAAC;QAElE,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;QAC5D,MAAM,SAAS,GAAG,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC;QAExD,MAAM,eAAe,GAAG,MAAM,oBAAW,CAAC,WAAW,CAAC;YAClD,OAAO,EAAE,WAAW;YACpB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,SAAS,EAAE,IAAI,sBAAS,CAAC,cAAc,CAAC,MAAM,CAAC,UAAU,CAAC;SAC7D,CAAC,CAAC;QAEH,MAAM,aAAa,GAAG,MAAM,oBAAW,CAAC,WAAW,CAAC;YAChD,OAAO,EAAE,SAAS;YAClB,UAAU,EAAE,EAAE,CAAC,UAAU;YACzB,SAAS,EAAE,IAAI,sBAAS,CAAC,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC;SAC7D,CAAC,CAAC;QAEH,uCAAuC;QACvC,MAAM,SAAS,GAAgB,EAAE,CAAC;QAElC,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;YAClC,SAAS,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,CAAC,IAAI,EAAE,eAAe,CAAC;gBAC7B,QAAQ,EAAE,yCAAmB,CAAC,IAAI;aACrC,CAAC,CAAC;QACP,CAAC;QAED,SAAS,CAAC,IAAI,CAAC;YACX,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,CAAC,eAAe,EAAE,aAAa,CAAC;YACtC,QAAQ,EAAE,+CAAsB,CAAC,IAAI;SACxC,CAAC,CAAC;QAEH,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,EAAE,CAAC;YAClC,SAAS,CAAC,IAAI,CAAC;gBACX,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,CAAC,aAAa,EAAE,EAAE,CAAC;gBACzB,QAAQ,EAAE,yCAAmB,CAAC,IAAI;aACrC,CAAC,CAAC;QACP,CAAC;QAED,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AAjTD,wDAiTC"}
|
@@ -47,7 +47,7 @@ export declare class LifiCrossChainTrade extends EvmCrossChainTrade {
|
|
47
47
|
onChainSubtype: OnChainSubtype;
|
48
48
|
bridgeType: BridgeType;
|
49
49
|
slippage: number;
|
50
|
-
}, providerAddress: string, routePath: RubicStep[]);
|
50
|
+
}, providerAddress: string, routePath: RubicStep[], useProxy: boolean);
|
51
51
|
protected swapDirect(options?: SwapTransactionOptions): Promise<string | never>;
|
52
52
|
getContractParams(options: GetContractParamsOptions): Promise<ContractParams>;
|
53
53
|
protected getTransactionConfigAndAmount(receiverAddress?: string): Promise<{
|
@@ -15,6 +15,7 @@ const errors_1 = require("../../../../../common/errors");
|
|
15
15
|
const decorators_1 = require("../../../../../common/utils/decorators");
|
16
16
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
17
17
|
const web3_pure_1 = require("../../../../../core/blockchain/web3-pure/web3-pure");
|
18
|
+
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
18
19
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
19
20
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
20
21
|
const evm_common_cross_chain_abi_1 = require("../common/emv-cross-chain-trade/constants/evm-common-cross-chain-abi");
|
@@ -44,7 +45,7 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
44
45
|
},
|
45
46
|
bridgeType: bridge_type_1.BRIDGE_TYPE.LIFI,
|
46
47
|
slippage
|
47
|
-
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []);
|
48
|
+
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, [], false);
|
48
49
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade, receiverAddress);
|
49
50
|
}
|
50
51
|
get fromBlockchain() {
|
@@ -61,8 +62,8 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
61
62
|
get amountToCheck() {
|
62
63
|
return web3_pure_1.Web3Pure.toWei(this.toTokenAmountMin, this.to.decimals);
|
63
64
|
}
|
64
|
-
constructor(crossChainTrade, providerAddress, routePath) {
|
65
|
-
super(providerAddress, routePath);
|
65
|
+
constructor(crossChainTrade, providerAddress, routePath, useProxy) {
|
66
|
+
super(providerAddress, routePath, useProxy);
|
66
67
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.LIFI;
|
67
68
|
this.isAggregator = true;
|
68
69
|
this.from = crossChainTrade.from;
|
@@ -125,8 +126,9 @@ class LifiCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
125
126
|
type: `lifi:${this.bridgeType}`,
|
126
127
|
fromAddress: this.walletAddress
|
127
128
|
});
|
129
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo?.rubicProxy?.platformFee?.percent);
|
128
130
|
const extraNativeFee = this.from.isNative
|
129
|
-
? new bignumber_js_1.default(providerValue).minus(
|
131
|
+
? new bignumber_js_1.default(providerValue).minus(fromWithoutFee.stringWeiAmount).toFixed()
|
130
132
|
: new bignumber_js_1.default(providerValue).toFixed();
|
131
133
|
const providerData = await proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getGenericProviderData(providerRouter, data, this.fromBlockchain, providerRouter, extraNativeFee);
|
132
134
|
const methodArguments = [bridgeData, providerData];
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"lifi-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-trade.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gEAAqC;AACrC,8CAAoE;AAEpE,4DAAoD;AAEpD,6GAAwG;AAExG,uEAAmE;AAGnE,uHAAoH;AACpH,uJAAiJ;AACjJ,yKAAkK;AAClK,+KAAwK;AACxK,qJAA+I;AAE/I,kHAG0F;AAM1F,wKAAiK;AAGjK,0HAAmH;AAInH,kEAA6D;AAE7D;;GAEG;AACH,MAAa,mBAAoB,SAAQ,0CAAkB;IACvD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAC1B,IAAyC,EACzC,OAA4C,EAC5C,KAAY,EACZ,OAAgB,EAChB,QAAgB,EAChB,eAAuB,EACvB,eAAwB;QAExB,MAAM,KAAK,GAAG,IAAI,mBAAmB,CACjC;YACI,IAAI;YACJ,EAAE,EAAE,OAAO;YACX,KAAK;YACL,OAAO,EAAE,IAAI;YACb,gBAAgB,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;YAClC,OAAO;YACP,WAAW,EAAE,IAAI,CAAC,2BAA2B,CAAC,OAAO,CAAC,IAAI,CAAC;YAC3D,cAAc,EAAE;gBACZ,IAAI,EAAE,SAAS;gBACf,EAAE,EAAE,SAAS;aAChB;YACD,UAAU,EAAE,yBAAW,CAAC,IAAI;YAC5B,QAAQ;SACX,EACD,eAAe,IAAI,2BAAW,CAAC,aAAa,EAC5C,EAAE,
|
1
|
+
{"version":3,"file":"lifi-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
@@ -36,14 +36,14 @@ class MesonCrossChainProvider extends cross_chain_provider_1.CrossChainProvider
|
|
36
36
|
const { max, min, mesonFee, sourceAssetString, targetAssetString } = await this.fetchTradeInfo(fromWith6Decimals, toToken);
|
37
37
|
const feeInfo = await this.getFeeInfo(fromBlockchain, options.providerAddress, from, useProxy);
|
38
38
|
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(fromWith6Decimals, feeInfo.rubicProxy?.platformFee?.percent);
|
39
|
-
const toAmount =
|
39
|
+
const toAmount = fromWithoutFee.tokenAmount.minus(mesonFee);
|
40
40
|
const to = new tokens_1.PriceTokenAmount({
|
41
41
|
...toToken.asStruct,
|
42
42
|
tokenAmount: toAmount
|
43
43
|
});
|
44
44
|
const gasData = options.gasCalculation === 'enabled'
|
45
45
|
? await meson_cross_chain_trade_1.MesonCrossChainTrade.getGasData({
|
46
|
-
from:
|
46
|
+
from: fromWith6Decimals,
|
47
47
|
feeInfo,
|
48
48
|
toToken: to,
|
49
49
|
providerAddress: options.providerAddress,
|
@@ -54,7 +54,7 @@ class MesonCrossChainProvider extends cross_chain_provider_1.CrossChainProvider
|
|
54
54
|
const trade = new meson_cross_chain_trade_1.MesonCrossChainTrade({
|
55
55
|
crossChainTrade: {
|
56
56
|
feeInfo,
|
57
|
-
from:
|
57
|
+
from: fromWith6Decimals,
|
58
58
|
gasData,
|
59
59
|
to,
|
60
60
|
priceImpact: from.calculatePriceImpactPercent(to),
|
@@ -62,7 +62,8 @@ class MesonCrossChainProvider extends cross_chain_provider_1.CrossChainProvider
|
|
62
62
|
targetAssetString
|
63
63
|
},
|
64
64
|
providerAddress: options.providerAddress,
|
65
|
-
routePath: await this.getRoutePath(from, to)
|
65
|
+
routePath: await this.getRoutePath(from, to),
|
66
|
+
useProxy
|
66
67
|
});
|
67
68
|
if (fromWithoutFee.tokenAmount.lt(min)) {
|
68
69
|
return {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"meson-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAM2B;AAC3B,8CAAiE;AACjE,4DAA+D;AAE/D,sGAAkG;AAClG,yFAAmF;AACnF,gDAAwB;AAGxB,yEAAoE;AACpE,8DAA2D;AAI3D,oHAA6G;AAC7G,uGAGwD;AACxD,uEAAiE;AAGjE,4FAA8E;AAE9E,MAAa,uBAAwB,SAAQ,yCAAkB;IAA/D;;QACoB,SAAI,GAAG,yBAAW,CAAC,KAAK,CAAC;IAgN7C,CAAC;IA9MU,qBAAqB,CAAC,UAA6B;QACtD,OAAO,mEAA8B,CAAC,IAAI,CACtC,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,KAAK,UAAU,CAC5D,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAAkC;QAElC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAsC,CAAC;QACnE,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;QAExD,IAAI,CAAC;YACD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,MAAM,IAAI,sBAAa,CAAC,kCAAkC,CAAC,CAAC;YAChE,CAAC;YAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAE1D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAC9D,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;YAE1D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CACjC,cAAc,EACd,OAAO,CAAC,eAAe,EACvB,IAAI,EACJ,QAAQ,CACX,CAAC;
|
1
|
+
{"version":3,"file":"meson-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAM2B;AAC3B,8CAAiE;AACjE,4DAA+D;AAE/D,sGAAkG;AAClG,yFAAmF;AACnF,gDAAwB;AAGxB,yEAAoE;AACpE,8DAA2D;AAI3D,oHAA6G;AAC7G,uGAGwD;AACxD,uEAAiE;AAGjE,4FAA8E;AAE9E,MAAa,uBAAwB,SAAQ,yCAAkB;IAA/D;;QACoB,SAAI,GAAG,yBAAW,CAAC,KAAK,CAAC;IAgN7C,CAAC;IA9MU,qBAAqB,CAAC,UAA6B;QACtD,OAAO,mEAA8B,CAAC,IAAI,CACtC,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,KAAK,UAAU,CAC5D,CAAC;IACN,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAAkC;QAElC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAsC,CAAC;QACnE,MAAM,QAAQ,GAAG,OAAO,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC;QAExD,IAAI,CAAC;YACD,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACZ,MAAM,IAAI,sBAAa,CAAC,kCAAkC,CAAC,CAAC;YAChE,CAAC;YAED,MAAM,iBAAiB,GAAG,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAE1D,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,GAC9D,MAAM,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;YAE1D,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CACjC,cAAc,EACd,OAAO,CAAC,eAAe,EACvB,IAAI,EACJ,QAAQ,CACX,CAAC;YACF,MAAM,cAAc,GAAG,IAAA,wCAAiB,EACpC,iBAAiB,EACjB,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAC3C,CAAC;YAEF,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAE5D,MAAM,EAAE,GAAG,IAAI,yBAAgB,CAAC;gBAC5B,GAAG,OAAO,CAAC,QAAQ;gBACnB,WAAW,EAAE,QAAQ;aACxB,CAAC,CAAC;YAEH,MAAM,OAAO,GACT,OAAO,CAAC,cAAc,KAAK,SAAS;gBAChC,CAAC,CAAC,MAAM,8CAAoB,CAAC,UAAU,CAAC;oBAClC,IAAI,EAAE,iBAAiB;oBACvB,OAAO;oBACP,OAAO,EAAE,EAAE;oBACX,eAAe,EAAE,OAAO,CAAC,eAAe;oBACxC,iBAAiB;oBACjB,iBAAiB;iBACpB,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAC;YAEf,MAAM,KAAK,GAAG,IAAI,8CAAoB,CAAC;gBACnC,eAAe,EAAE;oBACb,OAAO;oBACP,IAAI,EAAE,iBAAiB;oBACvB,OAAO;oBACP,EAAE;oBACF,WAAW,EAAE,IAAI,CAAC,2BAA2B,CAAC,EAAE,CAAC;oBACjD,iBAAiB;oBACjB,iBAAiB;iBACpB;gBACD,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,SAAS,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;gBAC5C,QAAQ;aACX,CAAC,CAAC;YAEH,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrC,OAAO;oBACH,KAAK;oBACL,KAAK,EAAE,IAAI,uBAAc,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;oBAC3C,SAAS,EAAE,IAAI,CAAC,IAAI;iBACvB,CAAC;YACN,CAAC;YACD,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrC,OAAO;oBACH,KAAK;oBACL,KAAK,EAAE,IAAI,uBAAc,CAAC,GAAG,EAAE,IAAI,CAAC,MAAM,CAAC;oBAC3C,SAAS,EAAE,IAAI,CAAC,IAAI;iBACvB,CAAC;YACN,CAAC;YAED,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,aAAa,GAAG,yCAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YAEzD,OAAO;gBACH,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,aAAa;gBACpB,SAAS,EAAE,IAAI,CAAC,IAAI;aACvB,CAAC;QACN,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,cAAc,CACxB,WAAgD,EAChD,WAA0C;QAE1C,MAAM,WAAW,GAAG,MAAM,kDAAkB,CAAC,iBAAiB,EAAE,CAAC;QAEjE,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACvE,MAAM,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QACvE,MAAM,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE,WAAW,EAAE,WAAW,CAAC,CAAC;QAE1F,MAAM,iBAAiB,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,EAAE,CAAC;QAC3E,MAAM,iBAAiB,GAAG,GAAG,kBAAkB,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,EAAE,EAAE,CAAC;QAE3E,MAAM,QAAQ,GAAG,MAAM,kDAAkB,CAAC,aAAa,CACnD,iBAAiB,EACjB,iBAAiB,EACjB,WAAW,CAAC,WAAW,CAAC,OAAO,EAAE,CACpC,CAAC;QAEF,OAAO;YACH,QAAQ;YACR,iBAAiB;YACjB,iBAAiB;YACjB,GAAG,EAAE,IAAI,sBAAS,CAAC,eAAe,CAAC,GAAG,CAAC;YACvC,GAAG,EAAE,IAAI,sBAAS,CAAC,eAAe,CAAC,GAAG,CAAC;SAC1C,CAAC;IACN,CAAC;IAEO,eAAe,CACnB,KAAoC,EACpC,SAA6B;QAE7B,MAAM,OAAO,GAAG,4BAAY,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC/C,MAAM,UAAU,GAAG,cAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7C,MAAM,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,IAAA,6BAAgB,EAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC;QAExF,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,+BAAsB,EAAE,CAAC;QACvC,CAAC;QAED,MAAM,UAAU,GAAG,KAAK,CAAC,QAAQ;YAC7B,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YACtE,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAC9B,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,IAAA,6BAAgB,EAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAC1E,CAAC;QAER,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,gCAAuB,EAAE,CAAC;QACxC,CAAC;QAED,OAAO,UAAU,CAAC;IACtB,CAAC;IAEO,kBAAkB,CACtB,WAA0C,EAC1C,WAA0C,EAC1C,SAA6B;QAE7B,MAAM,gBAAgB,GAAG,cAAI,CAAC,KAAK,CAAC,KAAK,CAAC,4BAAY,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;QAChF,MAAM,gBAAgB,GAAG,cAAI,CAAC,KAAK,CAAC,KAAK,CAAC,4BAAY,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC;QAChF,MAAM,GAAG,GAAG,CAAC,EAAE,EAAE,EAAE,CAAoB,CAAC;QAExC,KAAK,MAAM,KAAK,IAAI,SAAS,EAAE,CAAC;YAC5B,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;gBAAE,MAAM;YAC5B,IAAI,IAAA,6BAAgB,EAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC;gBAAE,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;YACzE,IAAI,IAAA,6BAAgB,EAAC,KAAK,CAAC,OAAO,EAAE,gBAAgB,CAAC;gBAAE,GAAG,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,EAAE,CAAC;QAC7E,CAAC;QAED,OAAO,GAAG,CAAC;IACf,CAAC;IAED;;OAEG;IACK,oBAAoB,CACxB,IAAyC;QAEzC,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;QAChD,MAAM,CAAC,EAAE,QAAQ,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC7C,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC,EAAE,sBAAS,CAAC,UAAU,CAAC,CAAC;QAEvE,OAAO,IAAI,yBAAgB,CAAC;YACxB,GAAG,IAAI,CAAC,QAAQ;YAChB,WAAW,EAAE,MAAM;SACtB,CAAC,CAAC;IACP,CAAC;IAES,KAAK,CAAC,YAAY,CACxB,SAA8C,EAC9C,OAA4C;QAE5C,OAAO,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACtF,CAAC;IAES,KAAK,CAAC,UAAU,CACtB,cAAwC,EACxC,eAAuB,EACvB,eAAiC,EACjC,QAAiB;QAEjB,OAAO,qDAAuB,CAAC,UAAU,CACrC,cAAc,EACd,eAAe,EACf,eAAe,EACf,QAAQ,CACX,CAAC;IACN,CAAC;CACJ;AAjND,0DAiNC"}
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.MesonCrossChainTrade = void 0;
|
4
4
|
const ethers_1 = require("ethers");
|
5
5
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
6
|
+
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
6
7
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
7
8
|
const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
|
8
9
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
@@ -29,7 +30,8 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
29
30
|
targetAssetString
|
30
31
|
},
|
31
32
|
providerAddress: providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS,
|
32
|
-
routePath: []
|
33
|
+
routePath: [],
|
34
|
+
useProxy: true
|
33
35
|
});
|
34
36
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
|
35
37
|
}
|
@@ -49,7 +51,7 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
49
51
|
return 'startBridgeTokensViaGenericCrossChain';
|
50
52
|
}
|
51
53
|
constructor(params) {
|
52
|
-
super(params.providerAddress, params.routePath);
|
54
|
+
super(params.providerAddress, params.routePath, params.useProxy);
|
53
55
|
/**ABSTRACT PROPS */
|
54
56
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.MESON;
|
55
57
|
this.isAggregator = false;
|
@@ -66,10 +68,11 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
66
68
|
}
|
67
69
|
async getContractParams(options) {
|
68
70
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
69
|
-
const { data, value: providerValue,
|
71
|
+
const { data, value: providerValue, // 0.001078
|
72
|
+
to: providerRouter } = await this.setTransactionConfig(false, options?.useCacheData || false, options?.receiverAddress || this.walletAddress);
|
70
73
|
const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
|
71
74
|
walletAddress: receiverAddress,
|
72
|
-
fromTokenAmount: this.from,
|
75
|
+
fromTokenAmount: this.from, // 0.0011
|
73
76
|
toTokenAmount: this.to,
|
74
77
|
srcChainTrade: null,
|
75
78
|
providerAddress: this.providerAddress,
|
@@ -79,7 +82,7 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
79
82
|
const extraNativeFee = '0';
|
80
83
|
const providerData = await proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getGenericProviderData(providerRouter, data, this.from.blockchain, providerRouter, extraNativeFee);
|
81
84
|
const methodArguments = [bridgeData, providerData];
|
82
|
-
const value = this.getSwapValue(providerValue);
|
85
|
+
const value = this.getSwapValue(providerValue); // 0.0011
|
83
86
|
const transactionConfiguration = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(rubic_proxy_contract_address_1.rubicProxyContractAddress[this.from.blockchain].router, evm_common_cross_chain_abi_1.evmCommonCrossChainAbi, this.methodName, methodArguments, value);
|
84
87
|
const sendingToken = this.from.isNative ? [] : [this.from.address];
|
85
88
|
const sendingAmount = this.from.isNative ? [] : [this.from.stringWeiAmount];
|
@@ -94,10 +97,11 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
94
97
|
async getTransactionConfigAndAmount(receiverAddress) {
|
95
98
|
const rubicMultiProxyAddress = rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].router;
|
96
99
|
const fromAddress = this.isProxyTrade ? rubicMultiProxyAddress : this.walletAddress;
|
100
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
|
97
101
|
const { encoded, initiator } = await meson_cross_chain_api_service_1.MesonCcrApiService.fetchInfoForTx({
|
98
102
|
sourceAssetString: this.sourceAssetString,
|
99
103
|
targetAssetString: this.targetAssetString,
|
100
|
-
amount:
|
104
|
+
amount: fromWithoutFee.tokenAmount.toFixed(),
|
101
105
|
fromAddress,
|
102
106
|
receiverAddress: receiverAddress || this.walletAddress,
|
103
107
|
useProxy: this.isProxyTrade
|
@@ -105,7 +109,7 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
105
109
|
const postingValue = ethers_1.ethers.utils.solidityPack(['address', 'uint40'], [initiator, 1]);
|
106
110
|
const methodName = 'postSwapFromContract';
|
107
111
|
const methodArgs = [encoded, postingValue, rubicMultiProxyAddress];
|
108
|
-
const value = this.from.isNative ?
|
112
|
+
const value = this.from.isNative ? fromWithoutFee.stringWeiAmount : '0';
|
109
113
|
const config = evm_web3_pure_1.EvmWeb3Pure.encodeMethodCall(meson_contract_addresses_1.mesonContractAddresses[this.fromBlockchain], meson_abi_1.MESON_ABI, methodName, methodArgs, value);
|
110
114
|
return { config, amount: this.to.stringWeiAmount };
|
111
115
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"meson-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.ts"],"names":[],"mappings":";;;AACA,mCAAgC;AAGhC,6GAAwG;
|
1
|
+
{"version":3,"file":"meson-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/meson-provider/meson-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
@@ -11,7 +11,6 @@ export declare class OrbiterBridgeProvider extends CrossChainProvider {
|
|
11
11
|
private orbiterQuoteConfigs;
|
12
12
|
isSupportedBlockchain(blockchain: EvmBlockchainName): boolean;
|
13
13
|
calculate(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>, options: RequiredCrossChainOptions): Promise<CalculationResult>;
|
14
|
-
private getSendingAmount;
|
15
14
|
protected getRoutePath(fromToken: PriceTokenAmount<EvmBlockchainName>, toToken: PriceTokenAmount<EvmBlockchainName>): Promise<RubicStep[]>;
|
16
15
|
protected getFeeInfo(fromBlockchain: OrbiterSupportedBlockchain, providerAddress: string, percentFeeToken: PriceTokenAmount, useProxy: boolean): Promise<FeeInfo>;
|
17
16
|
}
|
@@ -53,14 +53,10 @@ class OrbiterBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
53
53
|
...toToken.asStruct,
|
54
54
|
tokenAmount: web3_pure_1.Web3Pure.fromWei(toAmount, toToken.decimals)
|
55
55
|
});
|
56
|
-
const fromWithoutFeeWithCode = new tokens_1.PriceTokenAmount({
|
57
|
-
...fromWithoutFee.asStruct,
|
58
|
-
weiAmount: this.getSendingAmount(fromWithoutFee.stringWeiAmount, quoteConfig, feeInfo)
|
59
|
-
});
|
60
56
|
const gasData = options.gasCalculation === 'enabled'
|
61
57
|
? await orbiter_bridge_trade_1.OrbiterBridgeTrade.getGasData({
|
62
58
|
feeInfo,
|
63
|
-
fromToken:
|
59
|
+
fromToken: from,
|
64
60
|
toToken: to,
|
65
61
|
receiverAddress: options.receiverAddress,
|
66
62
|
providerAddress: options.providerAddress,
|
@@ -70,14 +66,15 @@ class OrbiterBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
70
66
|
const trade = new orbiter_bridge_trade_1.OrbiterBridgeTrade({
|
71
67
|
crossChainTrade: {
|
72
68
|
feeInfo,
|
73
|
-
from
|
69
|
+
from,
|
74
70
|
gasData,
|
75
71
|
to,
|
76
72
|
priceImpact: from.calculatePriceImpactPercent(to),
|
77
73
|
quoteConfig
|
78
74
|
},
|
79
75
|
providerAddress: options.providerAddress,
|
80
|
-
routePath: await this.getRoutePath(from, to)
|
76
|
+
routePath: await this.getRoutePath(from, to),
|
77
|
+
useProxy
|
81
78
|
});
|
82
79
|
return { trade, tradeType: this.type };
|
83
80
|
}
|
@@ -90,17 +87,6 @@ class OrbiterBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
90
87
|
};
|
91
88
|
}
|
92
89
|
}
|
93
|
-
getSendingAmount(fromStringWeiAmount, quoteConfig, feeInfo) {
|
94
|
-
const desiredAmount = orbiter_utils_1.OrbiterUtils.getAmountWithVcCode(fromStringWeiAmount, quoteConfig);
|
95
|
-
const fee = (feeInfo.rubicProxy?.platformFee?.percent || 0) * 1000;
|
96
|
-
const denominator = new bignumber_js_1.default(1000000);
|
97
|
-
const sendingAmount = new bignumber_js_1.default(desiredAmount)
|
98
|
-
.multipliedBy(denominator)
|
99
|
-
.dividedBy(denominator.minus(fee))
|
100
|
-
.decimalPlaces(0, 1)
|
101
|
-
.toFixed();
|
102
|
-
return new bignumber_js_1.default(sendingAmount);
|
103
|
-
}
|
104
90
|
async getRoutePath(fromToken, toToken) {
|
105
91
|
return [{ type: 'cross-chain', provider: this.type, path: [fromToken, toToken] }];
|
106
92
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"orbiter-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAmE;AACnE,8CAAiE;AAEjE,uEAAmE;AACnE,yFAAmF;AAGnF,gFAA6E;AAC7E,yEAAoE;AAIpE,oHAA6G;AAE7G,0FAGgD;AAChD,iEAA4D;AAC5D,wEAAmE;AACnE,4DAAwD;AAExD,MAAa,qBAAsB,SAAQ,yCAAkB;IAA7D;;QACoB,SAAI,GAAG,+CAAsB,CAAC,cAAc,CAAC;QAErD,wBAAmB,GAAyB,EAAE,CAAC;
|
1
|
+
{"version":3,"file":"orbiter-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-provider.ts"],"names":[],"mappings":"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"}
|
@@ -39,5 +39,12 @@ export declare class OrbiterBridgeTrade extends EvmCrossChainTrade {
|
|
39
39
|
config: EvmEncodeConfig;
|
40
40
|
amount: string;
|
41
41
|
}>;
|
42
|
+
/**
|
43
|
+
* @example for native transfer
|
44
|
+
* 1000000 - 2%(rubicPercentFee) -> convertToCode -> 998015
|
45
|
+
* amountJore - 998015 + 2%
|
46
|
+
* When Jora subtracts amountJore - 2%, he will get value with orbiter-vc-code
|
47
|
+
*/
|
48
|
+
private getFromAmountWithoutFeeWithCode;
|
42
49
|
getTradeInfo(): TradeInfo;
|
43
50
|
}
|
@@ -1,7 +1,13 @@
|
|
1
1
|
"use strict";
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
4
|
+
};
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
6
|
exports.OrbiterBridgeTrade = void 0;
|
7
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
8
|
+
const tokens_1 = require("../../../../../common/tokens");
|
4
9
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
10
|
+
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
5
11
|
const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
|
6
12
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
7
13
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
@@ -27,7 +33,8 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
27
33
|
quoteConfig
|
28
34
|
},
|
29
35
|
routePath: [],
|
30
|
-
providerAddress
|
36
|
+
providerAddress,
|
37
|
+
useProxy: false
|
31
38
|
});
|
32
39
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
|
33
40
|
}
|
@@ -47,7 +54,7 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
47
54
|
return 'startBridgeTokensViaGenericCrossChain';
|
48
55
|
}
|
49
56
|
constructor(params) {
|
50
|
-
super(params.providerAddress, params.routePath);
|
57
|
+
super(params.providerAddress, params.routePath, params.useProxy);
|
51
58
|
/**ABSTRACT PROPS */
|
52
59
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.ORBITER_BRIDGE;
|
53
60
|
this.isAggregator = false;
|
@@ -72,7 +79,6 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
72
79
|
}
|
73
80
|
transactionHash = hash;
|
74
81
|
};
|
75
|
-
// eslint-disable-next-line no-useless-catch
|
76
82
|
try {
|
77
83
|
const { data, to, value } = await this.setTransactionConfig(false, options?.useCacheData || false, options?.receiverAddress || this.walletAddress);
|
78
84
|
await this.web3Private.trySendTransaction(to, {
|
@@ -90,9 +96,17 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
90
96
|
async getContractParams(options) {
|
91
97
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
92
98
|
const { data, value: providerValue, to: providerRouter } = await this.setTransactionConfig(false, options?.useCacheData || false, options?.receiverAddress || this.walletAddress);
|
99
|
+
const percentFee = (this.feeInfo.rubicProxy?.platformFee?.percent || 0) / 100;
|
100
|
+
const fromWeiAmountWithHiddenCode = new bignumber_js_1.default(this.getFromAmountWithoutFeeWithCode())
|
101
|
+
.dividedBy(1 - percentFee)
|
102
|
+
.decimalPlaces(0, 1);
|
103
|
+
const fromWithCode = new tokens_1.PriceTokenAmount({
|
104
|
+
...this.from.asStruct,
|
105
|
+
weiAmount: fromWeiAmountWithHiddenCode
|
106
|
+
});
|
93
107
|
const bridgeData = proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getBridgeData(options, {
|
94
108
|
walletAddress: receiverAddress,
|
95
|
-
fromTokenAmount:
|
109
|
+
fromTokenAmount: fromWithCode,
|
96
110
|
toTokenAmount: this.to,
|
97
111
|
srcChainTrade: null,
|
98
112
|
providerAddress: this.providerAddress,
|
@@ -117,7 +131,8 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
117
131
|
async getTransactionConfigAndAmount(receiverAddress) {
|
118
132
|
// Orbiter deposit address to send funds money to receiverWalletAddress after transfer confirmation
|
119
133
|
const orbiterTokensDispenser = this.quoteConfig.endpoint;
|
120
|
-
const transferAmount = this.from.stringWeiAmount;
|
134
|
+
// const transferAmount = this.from.stringWeiAmount;
|
135
|
+
const transferAmount = this.getFromAmountWithoutFeeWithCode();
|
121
136
|
const encodedReceiverAndCode = orbiter_utils_1.OrbiterUtils.getHexDataArg(this.quoteConfig.vc, receiverAddress || this.walletAddress);
|
122
137
|
const methodName = this.from.isNative ? 'transfer' : 'transferToken';
|
123
138
|
const methodArgs = this.from.isNative
|
@@ -130,6 +145,17 @@ class OrbiterBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
130
145
|
amount: this.to.stringWeiAmount
|
131
146
|
};
|
132
147
|
}
|
148
|
+
/**
|
149
|
+
* @example for native transfer
|
150
|
+
* 1000000 - 2%(rubicPercentFee) -> convertToCode -> 998015
|
151
|
+
* amountJore - 998015 + 2%
|
152
|
+
* When Jora subtracts amountJore - 2%, he will get value with orbiter-vc-code
|
153
|
+
*/
|
154
|
+
getFromAmountWithoutFeeWithCode() {
|
155
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
|
156
|
+
const transferAmount = orbiter_utils_1.OrbiterUtils.getAmountWithVcCode(fromWithoutFee.stringWeiAmount, this.quoteConfig);
|
157
|
+
return transferAmount;
|
158
|
+
}
|
133
159
|
getTradeInfo() {
|
134
160
|
return {
|
135
161
|
estimatedGas: this.estimatedGas,
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"orbiter-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"orbiter-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/orbiter-bridge/orbiter-bridge-trade.ts"],"names":[],"mappings":"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"}
|
@@ -50,7 +50,7 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
50
50
|
const gasData = options.gasCalculation === 'enabled'
|
51
51
|
? await owl_to_bridge_trade_1.OwlToBridgeTrade.getGasData({
|
52
52
|
feeInfo,
|
53
|
-
fromToken:
|
53
|
+
fromToken: from,
|
54
54
|
toToken: to,
|
55
55
|
providerAddress: options.providerAddress,
|
56
56
|
swapParams,
|
@@ -60,7 +60,7 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
60
60
|
const trade = new owl_to_bridge_trade_1.OwlToBridgeTrade({
|
61
61
|
crossChainTrade: {
|
62
62
|
feeInfo,
|
63
|
-
from
|
63
|
+
from,
|
64
64
|
to,
|
65
65
|
gasData,
|
66
66
|
priceImpact: from.calculatePriceImpactPercent(to),
|
@@ -68,7 +68,8 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
68
68
|
approveAddress: txs.transfer_body.to
|
69
69
|
},
|
70
70
|
providerAddress: options.providerAddress,
|
71
|
-
routePath: await this.getRoutePath(from, to)
|
71
|
+
routePath: await this.getRoutePath(from, to),
|
72
|
+
useProxy
|
72
73
|
});
|
73
74
|
if (fromWithoutFee.tokenAmount.lt(minAmountBN)) {
|
74
75
|
return {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"owl-to-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAmE;AACnE,8CAAiE;AAEjE,sGAAkG;AAClG,2FAAwF;AACxF,yFAAmF;AAInF,yEAAoE;AACpE,8DAA2D;AAI3D,oHAA6G;AAC7G,iFAG6C;AAE7C,+DAAyD;AACzD,sEAAgE;AAEhE,MAAa,mBAAoB,SAAQ,yCAAkB;IAA3D;;QACW,SAAI,GAAwB,yBAAW,CAAC,aAAa,CAAC;
|
1
|
+
{"version":3,"file":"owl-to-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.ts"],"names":[],"mappings":"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"}
|
@@ -32,7 +32,7 @@ export declare class OwlToBridgeTrade extends EvmCrossChainTrade {
|
|
32
32
|
private get fromBlockchain();
|
33
33
|
protected get fromContractAddress(): string;
|
34
34
|
protected get methodName(): string;
|
35
|
-
constructor({ crossChainTrade, providerAddress, routePath }: OwlToTradeParams);
|
35
|
+
constructor({ crossChainTrade, providerAddress, routePath, useProxy }: OwlToTradeParams);
|
36
36
|
protected getContractParams(options: GetContractParamsOptions): Promise<ContractParams>;
|
37
37
|
protected getTransactionConfigAndAmount(receiverAddress?: string): Promise<{
|
38
38
|
config: EvmEncodeConfig;
|