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
package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js
CHANGED
|
@@ -26,7 +26,8 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
26
26
|
approveAddress
|
|
27
27
|
},
|
|
28
28
|
providerAddress,
|
|
29
|
-
routePath: []
|
|
29
|
+
routePath: [],
|
|
30
|
+
useProxy: false
|
|
30
31
|
});
|
|
31
32
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
|
|
32
33
|
}
|
|
@@ -41,8 +42,8 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
41
42
|
get methodName() {
|
|
42
43
|
return 'startBridgeTokensViaGenericCrossChain';
|
|
43
44
|
}
|
|
44
|
-
constructor({ crossChainTrade, providerAddress, routePath }) {
|
|
45
|
-
super(providerAddress, routePath);
|
|
45
|
+
constructor({ crossChainTrade, providerAddress, routePath, useProxy }) {
|
|
46
|
+
super(providerAddress, routePath, useProxy);
|
|
46
47
|
/**ABSTRACT PROPS */
|
|
47
48
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.OWL_TO_BRIDGE;
|
|
48
49
|
this.isAggregator = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owl-to-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.ts"],"names":[],"mappings":";;;AAGA,6GAAwG;AAExG,2FAAwF;AAGxF,gFAAkG;AAClG,mFAA4E;AAC5E,mGAA6F;AAC7F,qHAA8G;AAC9G,2HAAoH;AACpH,iGAA2F;AAE3F,8DAAuE;AAKvE,oHAA6G;AAI7G,sEAAgE;AAEhE,MAAa,gBAAiB,SAAQ,0CAAkB;IACpD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,OAAO,EACP,SAAS,EACT,OAAO,EACP,eAAe,EACf,UAAU,EACV,cAAc,EACM;QACpB,MAAM,KAAK,GAAG,IAAI,gBAAgB,CAAC;YAC/B,eAAe,EAAE;gBACb,OAAO;gBACP,IAAI,EAAE,SAAS;gBACf,EAAE,EAAE,OAAO;gBACX,WAAW,EAAE,SAAS,CAAC,2BAA2B,CAAC,OAAO,CAAC,IAAI,CAAC;gBAChE,OAAO,EAAE,IAAI;gBACb,UAAU;gBACV,cAAc;aACjB;YACD,eAAe;YACf,SAAS,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"owl-to-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,7 +105,7 @@ class PulseChainCrossChainProvider extends cross_chain_provider_1.CrossChainProv
|
|
|
105
105
|
priceImpact: fromToken.calculatePriceImpactPercent(to),
|
|
106
106
|
routerAddress: sourceBridgeManager.sourceBridgeAddress,
|
|
107
107
|
tokenRegistered
|
|
108
|
-
}, options.providerAddress, await this.getRoutePath(fromToken, transitToken, to, onChainTrade)),
|
|
108
|
+
}, options.providerAddress, await this.getRoutePath(fromToken, transitToken, to, onChainTrade), useProxy),
|
|
109
109
|
error: amountsErrors,
|
|
110
110
|
tradeType: this.type
|
|
111
111
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pulse-chain-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA2F;AAC3F,8CAAwE;AACxE,4DAA+D;AAC/D,gFAIoD;AACpD,uEAAmE;AACnE,yFAAmF;AAEnF,uHAAoH;AACpH,6HAAwH;AAIxH,wKAAiK;AACjK,6KAG+H;AAC/H,kJAA8I;AAE9I,2JAAoJ;AACpJ,qIAAgI;AAGhI,MAAa,4BAA6B,SAAQ,yCAAkB;IAApE;;QACoB,SAAI,GAAG,+CAAsB,CAAC,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"pulse-chain-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ export declare class PulseChainCrossChainTrade extends EvmCrossChainTrade {
|
|
|
44
44
|
priceImpact: number | null;
|
|
45
45
|
routerAddress: string;
|
|
46
46
|
tokenRegistered: boolean;
|
|
47
|
-
}, providerAddress: string, routePath: RubicStep[]);
|
|
47
|
+
}, providerAddress: string, routePath: RubicStep[], useProxy: boolean);
|
|
48
48
|
needApprove(): Promise<boolean>;
|
|
49
49
|
protected swapDirect(options?: SwapTransactionOptions): Promise<string | never>;
|
|
50
50
|
getContractParams(options: GetContractParamsOptions): Promise<ContractParams>;
|
|
@@ -29,7 +29,7 @@ class PulseChainCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTra
|
|
|
29
29
|
onChainTrade: onChainTrade,
|
|
30
30
|
routerAddress,
|
|
31
31
|
tokenRegistered
|
|
32
|
-
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []);
|
|
32
|
+
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, [], false);
|
|
33
33
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade, receiverAddress);
|
|
34
34
|
}
|
|
35
35
|
catch (_err) {
|
|
@@ -57,8 +57,8 @@ class PulseChainCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTra
|
|
|
57
57
|
get isErc677() {
|
|
58
58
|
return !this.isTokenRegistered || omni_bridge_1.OmniBridge.isCustomWrap(this.from);
|
|
59
59
|
}
|
|
60
|
-
constructor(crossChainTrade, providerAddress, routePath) {
|
|
61
|
-
super(providerAddress, routePath);
|
|
60
|
+
constructor(crossChainTrade, providerAddress, routePath, useProxy) {
|
|
61
|
+
super(providerAddress, routePath, useProxy);
|
|
62
62
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.PULSE_CHAIN_BRIDGE;
|
|
63
63
|
this.isAggregator = false;
|
|
64
64
|
this.bridgeType = bridge_type_1.BRIDGE_TYPE.PULSE_CHAIN_BRIDGE;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pulse-chain-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-trade.ts"],"names":[],"mappings":";;;AAEA,gFAAgG;AAChG,6GAAwG;AAExG,uEAAmE;AAGnE,uHAAoH;AACpH,uJAAiJ;AACjJ,yKAAkK;AAClK,+KAAwK;AACxK,qJAA+I;AAE/I,kHAA+G;AAM/G,wKAAiK;AAEjK,kJAA8I;AAC9I,4IAAwI;AACxI,0HAAmH;AAGnH,MAAa,yBAA0B,SAAQ,0CAAkB;IAC7D,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAC1B,IAAyC,EACzC,OAA4C,EAC5C,YAAoC,EACpC,OAAgB,EAChB,gBAA2B,EAC3B,eAAuB,EACvB,eAAuB,EACvB,aAAqB,EACrB,eAAwB;QAExB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,yBAAyB,CACvC;gBACI,IAAI;gBACJ,EAAE,EAAE,OAAO;gBACX,OAAO,EAAE,IAAI;gBACb,WAAW,EAAE,CAAC;gBACd,QAAQ,EAAE,CAAC;gBACX,OAAO,EAAE,OAAQ;gBACjB,gBAAgB;gBAChB,YAAY,EAAE,YAAY;gBAC1B,aAAa;gBACb,eAAe;aAClB,EACD,eAAe,IAAI,2BAAW,CAAC,aAAa,EAC5C,EAAE,
|
|
1
|
+
{"version":3,"file":"pulse-chain-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/pulse-chain-bridge/pulse-chain-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ const errors_1 = require("../../../../../common/errors");
|
|
|
9
9
|
const blockchain_1 = require("../../../../../common/utils/blockchain");
|
|
10
10
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
11
11
|
const rango_contract_address_1 = require("../../../../common/providers/rango/constants/rango-contract-address");
|
|
12
|
+
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
12
13
|
const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
|
|
13
14
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
14
15
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
|
@@ -35,7 +36,8 @@ class RangoCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
35
36
|
swapQueryParams
|
|
36
37
|
},
|
|
37
38
|
routePath,
|
|
38
|
-
providerAddress: swapQueryParams.toAddress
|
|
39
|
+
providerAddress: swapQueryParams.toAddress,
|
|
40
|
+
useProxy: false
|
|
39
41
|
});
|
|
40
42
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade, receiverAddress);
|
|
41
43
|
}
|
|
@@ -55,7 +57,7 @@ class RangoCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
55
57
|
return 'startBridgeTokensViaGenericCrossChain';
|
|
56
58
|
}
|
|
57
59
|
constructor(params) {
|
|
58
|
-
super(params.providerAddress, params.routePath);
|
|
60
|
+
super(params.providerAddress, params.routePath, params.useProxy);
|
|
59
61
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.RANGO;
|
|
60
62
|
this.isAggregator = true;
|
|
61
63
|
this.onChainSubtype = { from: undefined, to: undefined };
|
|
@@ -86,8 +88,9 @@ class RangoCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
86
88
|
type: `rango:${this.bridgeType}`,
|
|
87
89
|
fromAddress: this.walletAddress
|
|
88
90
|
});
|
|
91
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo?.rubicProxy?.platformFee?.percent);
|
|
89
92
|
const extraNativeFee = this.from.isNative
|
|
90
|
-
? new bignumber_js_1.default(providerValue).minus(
|
|
93
|
+
? new bignumber_js_1.default(providerValue).minus(fromWithoutFee.stringWeiAmount).toFixed()
|
|
91
94
|
: new bignumber_js_1.default(providerValue).toFixed();
|
|
92
95
|
const providerData = await proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getGenericProviderData(providerRouter, data, this.from.blockchain, providerRouter, extraNativeFee);
|
|
93
96
|
const methodArguments = [bridgeData, providerData];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rango-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/rango-provider/rango-cross-chain-trade.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAkD;AAElD,4DAA+D;AAE/D,6GAAwG;AAIxG,iHAA8G;AAG9G,0HAAmH;AAEnH,gFAAkG;AAClG,mGAA6F;AAC7F,qHAA8G;AAC9G,2HAAoH;AACpH,iGAA2F;AAE3F,8DAAuE;AAKvE,oHAA6G;AAK7G,4FAAqF;AAErF,MAAa,oBAAqB,SAAQ,0CAAkB;IACxD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,SAAS,EACT,OAAO,EACP,OAAO,EACP,SAAS,EACT,eAAe,EACf,aAAa,EACb,eAAe,EACK;QACpB,IAAI,CAAC;YACD,MAAM,KAAK,GAAG,IAAI,oBAAoB,CAAC;gBACnC,eAAe,EAAE;oBACb,IAAI,EAAE,SAAS;oBACf,EAAE,EAAE,OAAO;oBACX,gBAAgB,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;oBAClC,OAAO;oBACP,OAAO,EAAE,IAAI;oBACb,WAAW,EAAE,SAAS,CAAC,2BAA2B,CAAC,OAAO,CAAC,IAAI,CAAC;oBAChE,QAAQ,EAAE,eAAe,CAAC,QAAQ;oBAClC,aAAa;oBACb,eAAe;iBAClB;gBACD,SAAS;gBACT,eAAe,EAAE,eAAe,CAAC,SAAS;
|
|
1
|
+
{"version":3,"file":"rango-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/rango-provider/rango-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RangoCrossChainParser = void 0;
|
|
4
|
+
const cross_chain_trade_type_1 = require("../../../models/cross-chain-trade-type");
|
|
4
5
|
const rango_cross_chain_trade_1 = require("../rango-cross-chain-trade");
|
|
5
6
|
class RangoCrossChainParser {
|
|
6
7
|
static async getTradeConstructorParams({ feeInfo, fromToken, options, routePath, swapQueryParams, toToken, toTokenAmountMin, bridgeSubtype, receiverAddress }) {
|
|
8
|
+
const useProxy = options.useProxy?.[cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.RANGO] ?? true;
|
|
7
9
|
const gasData = options.gasCalculation === 'enabled'
|
|
8
10
|
? await rango_cross_chain_trade_1.RangoCrossChainTrade.getGasData({
|
|
9
11
|
fromToken,
|
|
@@ -32,7 +34,8 @@ class RangoCrossChainParser {
|
|
|
32
34
|
return {
|
|
33
35
|
crossChainTrade,
|
|
34
36
|
providerAddress,
|
|
35
|
-
routePath
|
|
37
|
+
routePath,
|
|
38
|
+
useProxy
|
|
36
39
|
};
|
|
37
40
|
}
|
|
38
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rango-cross-chain-params-parser.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/rango-provider/services/rango-cross-chain-params-parser.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"rango-cross-chain-params-parser.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/rango-provider/services/rango-cross-chain-params-parser.ts"],"names":[],"mappings":";;;AAAA,mFAAgF;AAKhF,wEAAkE;AAElE,MAAa,qBAAqB;IACvB,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,EAC1C,OAAO,EACP,SAAS,EACT,OAAO,EACP,SAAS,EACT,eAAe,EACf,OAAO,EACP,gBAAgB,EAChB,aAAa,EACb,eAAe,EACuB;QACtC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,+CAAsB,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;QAC1E,MAAM,OAAO,GACT,OAAO,CAAC,cAAc,KAAK,SAAS;YAChC,CAAC,CAAC,MAAM,8CAAoB,CAAC,UAAU,CAAC;gBAClC,SAAS;gBACT,OAAO;gBACP,eAAe;gBACf,OAAO;gBACP,SAAS;gBACT,aAAa;gBACb,eAAe;aAClB,CAAC;YACJ,CAAC,CAAC,IAAI,CAAC;QACf,MAAM,WAAW,GAAG,SAAS,CAAC,2BAA2B,CAAC,OAAO,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,OAAO,CAAC,iBAAiB,CAAC;QAE3C,MAAM,eAAe,GAA6D;YAC9E,IAAI,EAAE,SAAS;YACf,EAAE,EAAE,OAAO;YACX,OAAO;YACP,gBAAgB;YAChB,WAAW;YACX,QAAQ;YACR,OAAO;YACP,eAAe;YACf,aAAa;SAChB,CAAC;QAEF,MAAM,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC;QAEhD,OAAO;YACH,eAAe;YACf,eAAe;YACf,SAAS;YACT,QAAQ;SACX,CAAC;IACN,CAAC;CACJ;AAjDD,sDAiDC"}
|
|
@@ -79,7 +79,7 @@ class RouterCrossChainProvider extends cross_chain_provider_1.CrossChainProvider
|
|
|
79
79
|
priceImpact: from.calculatePriceImpactPercent(to),
|
|
80
80
|
routerQuoteConfig,
|
|
81
81
|
slippage: options.slippageTolerance
|
|
82
|
-
}, options.providerAddress, routePath),
|
|
82
|
+
}, options.providerAddress, routePath, useProxy),
|
|
83
83
|
tradeType: this.type
|
|
84
84
|
};
|
|
85
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA4D;AAC5D,8CAA8E;AAE9E,sEAAmE;AACnE,kGAA8F;AAC9F,uEAAmE;AAEnE,yGAAoG;AACpG,yFAAmF;AACnF,+HAA4H;AAG5H,gFAA6E;AAC7E,yEAAoE;AAIpE,oHAA6G;AAC7G,yGAGyD;AACzD,yEAAmE;AACnE,mGAAyF;AACzF,MAAa,wBAAyB,SAAQ,yCAAkB;IAAhE;;QACoB,SAAI,GAAG,+CAAsB,CAAC,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"router-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,7 +38,7 @@ export declare class RouterCrossChainTrade extends EvmCrossChainTrade {
|
|
|
38
38
|
priceImpact: number | null;
|
|
39
39
|
routerQuoteConfig: RouterQuoteResponseConfig;
|
|
40
40
|
slippage: number;
|
|
41
|
-
}, providerAddress: string, routePath: RubicStep[]);
|
|
41
|
+
}, providerAddress: string, routePath: RubicStep[], useProxy: boolean);
|
|
42
42
|
protected getContractParams(options: GetContractParamsOptions, skipAmountChangeCheck?: boolean | undefined): Promise<ContractParams>;
|
|
43
43
|
protected getTransactionConfigAndAmount(receiverAddress?: string): Promise<{
|
|
44
44
|
config: EvmEncodeConfig;
|
|
@@ -46,3 +46,11 @@ export declare class RouterCrossChainTrade extends EvmCrossChainTrade {
|
|
|
46
46
|
}>;
|
|
47
47
|
getTradeInfo(): TradeInfo;
|
|
48
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* FROM - 100
|
|
51
|
+
* FROM+PERCENT - 103
|
|
52
|
+
* FROM-PERCENT - 97
|
|
53
|
+
*
|
|
54
|
+
* FROM-PERCENT - > api -> FROM-PERCENT+EXTRA
|
|
55
|
+
* FROM-PERCENT+EXTRA - FROM >< 0
|
|
56
|
+
*/
|
|
@@ -9,6 +9,7 @@ const errors_1 = require("../../../../../common/errors");
|
|
|
9
9
|
const blockchains_info_1 = require("../../../../../core/blockchain/utils/blockchains-info/blockchains-info");
|
|
10
10
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
11
11
|
const router_api_service_1 = require("../../../../common/providers/router/services/router-api-service");
|
|
12
|
+
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
12
13
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
13
14
|
const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
|
|
14
15
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
|
@@ -28,7 +29,7 @@ class RouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
28
29
|
priceImpact: 0,
|
|
29
30
|
routerQuoteConfig,
|
|
30
31
|
slippage: 0
|
|
31
|
-
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []);
|
|
32
|
+
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, [], false);
|
|
32
33
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade, receiverAddress);
|
|
33
34
|
}
|
|
34
35
|
get fromBlockchain() {
|
|
@@ -42,8 +43,8 @@ class RouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
42
43
|
get methodName() {
|
|
43
44
|
return 'startBridgeTokensViaGenericCrossChain';
|
|
44
45
|
}
|
|
45
|
-
constructor(crossChainTrade, providerAddress, routePath) {
|
|
46
|
-
super(providerAddress, routePath);
|
|
46
|
+
constructor(crossChainTrade, providerAddress, routePath, useProxy) {
|
|
47
|
+
super(providerAddress, routePath, useProxy);
|
|
47
48
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.ROUTER;
|
|
48
49
|
this.onChainSubtype = { from: undefined, to: undefined };
|
|
49
50
|
this.bridgeType = bridge_type_1.BRIDGE_TYPE.ROUTER;
|
|
@@ -83,8 +84,9 @@ class RouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
83
84
|
fromAddress: this.walletAddress,
|
|
84
85
|
toAddress: receivingAsset
|
|
85
86
|
});
|
|
87
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo?.rubicProxy?.platformFee?.percent);
|
|
86
88
|
const extraNativeFee = this.from.isNative
|
|
87
|
-
? new bignumber_js_1.default(providerValue).minus(
|
|
89
|
+
? new bignumber_js_1.default(providerValue).minus(fromWithoutFee.stringWeiAmount).toFixed()
|
|
88
90
|
: new bignumber_js_1.default(providerValue).toFixed();
|
|
89
91
|
const providerData = await proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getGenericProviderData(to, data, this.fromBlockchain, to, extraNativeFee);
|
|
90
92
|
const methodArguments = [bridgeData, providerData];
|
|
@@ -138,4 +140,12 @@ class RouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
138
140
|
}
|
|
139
141
|
}
|
|
140
142
|
exports.RouterCrossChainTrade = RouterCrossChainTrade;
|
|
143
|
+
/**
|
|
144
|
+
* FROM - 100
|
|
145
|
+
* FROM+PERCENT - 103
|
|
146
|
+
* FROM-PERCENT - 97
|
|
147
|
+
*
|
|
148
|
+
* FROM-PERCENT - > api -> FROM-PERCENT+EXTRA
|
|
149
|
+
* FROM-PERCENT+EXTRA - FROM >< 0
|
|
150
|
+
*/
|
|
141
151
|
//# sourceMappingURL=router-cross-chain-trade.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-trade.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAkD;AAGlD,kGAA8F;AAC9F,6GAAwG;AAIxG,yGAAoG;
|
|
1
|
+
{"version":3,"file":"router-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ class ScrollBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
24
24
|
async calculate(fromToken, toToken, options) {
|
|
25
25
|
const fromBlockchain = fromToken.blockchain;
|
|
26
26
|
const toBlockchain = toToken.blockchain;
|
|
27
|
+
const useProxy = options?.useProxy?.[this.type] ?? true;
|
|
27
28
|
if (!this.areSupportedBlockchains(fromBlockchain, toBlockchain)) {
|
|
28
29
|
return {
|
|
29
30
|
trade: null,
|
|
@@ -64,7 +65,7 @@ class ScrollBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
64
65
|
from: fromToken,
|
|
65
66
|
to,
|
|
66
67
|
gasData
|
|
67
|
-
}, options.providerAddress, await this.getRoutePath(fromToken, to)),
|
|
68
|
+
}, options.providerAddress, await this.getRoutePath(fromToken, to), useProxy),
|
|
68
69
|
tradeType: this.type
|
|
69
70
|
};
|
|
70
71
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-provider.ts"],"names":[],"mappings":";;;AAAA,8CAA2E;AAC3E,8CAAiE;AACjE,4DAA+D;AAC/D,gFAIoD;AACpD,yDAAsD;AAEtD,uHAAoH;AAEpH,6HAAwH;AAIxH,4JAAqJ;AACrJ,4JAAqJ;AACrJ,uKAGwH;AACxH,kIAA6H;AAE7H,+FAAyF;AAEzF,MAAa,oBAAqB,SAAQ,yCAAkB;IAA5D;;QACoB,SAAI,GAAG,+CAAsB,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"scroll-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ export declare class ScrollBridgeTrade extends EvmCrossChainTrade {
|
|
|
34
34
|
from: PriceTokenAmount<EvmBlockchainName>;
|
|
35
35
|
to: PriceTokenAmount<EvmBlockchainName>;
|
|
36
36
|
gasData: GasData | null;
|
|
37
|
-
}, providerAddress: string, routePath: RubicStep[]);
|
|
37
|
+
}, providerAddress: string, routePath: RubicStep[], useProxy: boolean);
|
|
38
38
|
getContractParams(_options: GetContractParamsOptions): Promise<ContractParams>;
|
|
39
39
|
getTradeAmountRatio(_fromUsd: BigNumber): BigNumber;
|
|
40
40
|
getTradeInfo(): TradeInfo;
|
package/lib/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-trade.js
CHANGED
|
@@ -29,7 +29,7 @@ class ScrollBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
29
29
|
from,
|
|
30
30
|
to,
|
|
31
31
|
gasData: null
|
|
32
|
-
}, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []);
|
|
32
|
+
}, evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, [], false);
|
|
33
33
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
|
|
34
34
|
}
|
|
35
35
|
get fromBlockchain() {
|
|
@@ -43,8 +43,8 @@ class ScrollBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
43
43
|
? 'swapAndStartBridgeTokensViaGenericCrossChain'
|
|
44
44
|
: 'startBridgeTokensViaGenericCrossChain';
|
|
45
45
|
}
|
|
46
|
-
constructor(crossChainTrade, providerAddress, routePath) {
|
|
47
|
-
super(providerAddress, routePath);
|
|
46
|
+
constructor(crossChainTrade, providerAddress, routePath, useProxy) {
|
|
47
|
+
super(providerAddress, routePath, useProxy);
|
|
48
48
|
this.onChainSubtype = { from: undefined, to: undefined };
|
|
49
49
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.SCROLL_BRIDGE;
|
|
50
50
|
this.isAggregator = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scroll-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-trade.ts"],"names":[],"mappings":";;;;;;AAAA,uCAKuB;AACvB,wDAA2D;AAC3D,gEAAqC;AAErC,8CAAkD;AAElD,gFAAgG;AAChG,sGAAkG;AAClG,6GAAwG;AAExG,uEAAmE;AACnE,yDAAsD;AAGtD,uHAAoH;AACpH,gIAA4H;AAC5H,sJAAiJ;AACjJ,qJAA+I;AAE/I,kHAA+G;AAK/G,4JAAqJ;AACrJ,4JAAqJ;AACrJ,kKAA4J;AAC5J,0HAAmH;AAKnH,MAAa,iBAAkB,SAAQ,0CAAkB;IACrD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAC1B,IAAyC,EACzC,EAAuC;QAEvC,MAAM,KAAK,GAAG,IAAI,iBAAiB,CAC/B;YACI,IAAI;YACJ,EAAE;YACF,OAAO,EAAE,IAAI;SAChB,EACD,2BAAW,CAAC,aAAa,EACzB,EAAE,
|
|
1
|
+
{"version":3,"file":"scroll-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/scroll-bridge/scroll-bridge-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -97,7 +97,7 @@ class SquidrouterCrossChainProvider extends cross_chain_provider_1.CrossChainPro
|
|
|
97
97
|
onChainTrade: null,
|
|
98
98
|
onChainSubtype: { from: undefined, to: undefined },
|
|
99
99
|
transactionRequest: requestParams
|
|
100
|
-
}, options.providerAddress, await this.getRoutePath(estimate, from, to)),
|
|
100
|
+
}, options.providerAddress, await this.getRoutePath(estimate, from, to), useProxy),
|
|
101
101
|
tradeType: this.type
|
|
102
102
|
};
|
|
103
103
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"squidrouter-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA2E;AAC3E,8CAAiE;AACjE,6EAA6E;AAC7E,4DAA+D;AAE/D,sGAAkG;AAClG,uEAAmE;AAGnE,wHAAmH;AACnH,yFAAmF;AAEnF,uHAAoH;AACpH,6HAAwH;AAKxH,wKAAiK;AACjK,qMAG4I;AAC5I,6JAAuJ;AAEvJ,MAAa,6BAA8B,SAAQ,yCAAkB;IAArE;;QACqB,kBAAa,GAAG,4CAA4C,CAAC;QAE9D,SAAI,GAAG,+CAAsB,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"squidrouter-cross-chain-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -51,7 +51,7 @@ export declare class SquidrouterCrossChainTrade extends EvmCrossChainTrade {
|
|
|
51
51
|
onChainTrade: EvmOnChainTrade | null;
|
|
52
52
|
onChainSubtype: OnChainSubtype;
|
|
53
53
|
transactionRequest: SquidrouterTransactionRequest;
|
|
54
|
-
}, providerAddress: string, routePath: RubicStep[]);
|
|
54
|
+
}, providerAddress: string, routePath: RubicStep[], useProxy: boolean);
|
|
55
55
|
protected swapDirect(options?: SwapTransactionOptions): Promise<string | never>;
|
|
56
56
|
getContractParams(options: GetContractParamsOptions): Promise<ContractParams>;
|
|
57
57
|
getTradeAmountRatio(fromUsd: BigNumber): BigNumber;
|
|
@@ -10,6 +10,7 @@ const errors_2 = require("../../../../../common/utils/errors");
|
|
|
10
10
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
11
11
|
const injector_1 = require("../../../../../core/injector/injector");
|
|
12
12
|
const squidrouter_api_service_1 = require("../../../../common/providers/squidrouter/services/squidrouter-api-service");
|
|
13
|
+
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
13
14
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
14
15
|
const rubic_proxy_contract_address_1 = require("../common/constants/rubic-proxy-contract-address");
|
|
15
16
|
const evm_common_cross_chain_abi_1 = require("../common/emv-cross-chain-trade/constants/evm-common-cross-chain-abi");
|
|
@@ -43,7 +44,7 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
|
|
|
43
44
|
onChainTrade: null,
|
|
44
45
|
onChainSubtype: { from: undefined, to: undefined },
|
|
45
46
|
transactionRequest
|
|
46
|
-
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, []);
|
|
47
|
+
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, [], false);
|
|
47
48
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade, receiverAddress);
|
|
48
49
|
}
|
|
49
50
|
catch (_err) {
|
|
@@ -61,8 +62,8 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
|
|
|
61
62
|
get methodName() {
|
|
62
63
|
return 'startBridgeTokensViaGenericCrossChain';
|
|
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.SQUIDROUTER;
|
|
67
68
|
this.isAggregator = false;
|
|
68
69
|
this.onChainSubtype = {
|
|
@@ -122,8 +123,9 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
|
|
|
122
123
|
type: `native:${this.type}`,
|
|
123
124
|
fromAddress: this.walletAddress
|
|
124
125
|
});
|
|
126
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo.rubicProxy?.platformFee?.percent);
|
|
125
127
|
const extraNativeFee = this.from.isNative
|
|
126
|
-
? new bignumber_js_1.default(providerValue).minus(
|
|
128
|
+
? new bignumber_js_1.default(providerValue).minus(fromWithoutFee.stringWeiAmount).toFixed()
|
|
127
129
|
: new bignumber_js_1.default(providerValue).toFixed();
|
|
128
130
|
const providerData = await proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getGenericProviderData(to, data, this.fromBlockchain, to, extraNativeFee);
|
|
129
131
|
const methodArguments = [bridgeData, providerData];
|