rubic-sdk 5.38.1-alpha.new-fee.2 → 5.38.1-alpha.new-fee.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/features/cross-chain/calculation-manager/providers/lifi-provider/lifi-cross-chain-trade.js +3 -1
- 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-trade.js +1 -1
- 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/rango-provider/rango-cross-chain-trade.js +3 -1
- 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/router-provider/router-cross-chain-trade.d.ts +8 -0
- package/lib/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-trade.js +11 -1
- package/lib/features/cross-chain/calculation-manager/providers/router-provider/router-cross-chain-trade.js.map +1 -1
- package/package.json +1 -1
|
@@ -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");
|
|
@@ -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":"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
|
|
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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"}
|
|
@@ -30,7 +30,7 @@ class MesonCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
30
30
|
},
|
|
31
31
|
providerAddress: providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS,
|
|
32
32
|
routePath: [],
|
|
33
|
-
useProxy:
|
|
33
|
+
useProxy: true
|
|
34
34
|
});
|
|
35
35
|
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
|
|
36
36
|
}
|
|
@@ -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;AAIxG,gFAAkG;AAClG,mFAA4E;AAC5E,mGAA6F;AAC7F,qHAA8G;AAC9G,2HAAoH;AACpH,iGAA2F;AAE3F,8DAAuE;AAKvE,oHAA6G;AAC7G,qDAAkD;AAClD,mFAA8E;AAM9E,4FAA8E;AAE9E,MAAa,oBAAqB,SAAQ,0CAAkB;IACxD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,OAAO,EACP,IAAI,EACJ,eAAe,EACf,iBAAiB,EACjB,iBAAiB,EACjB,OAAO,EACa;QACpB,IAAI;YACA,MAAM,KAAK,GAAG,IAAI,oBAAoB,CAAC;gBACnC,eAAe,EAAE;oBACb,IAAI;oBACJ,EAAE,EAAE,OAAO;oBACX,OAAO,EAAE,IAAI;oBACb,WAAW,EAAE,CAAC;oBACd,OAAO;oBACP,iBAAiB;oBACjB,iBAAiB;iBACpB;gBACD,eAAe,EAAE,eAAe,IAAI,2BAAW,CAAC,aAAa;gBAC7D,SAAS,EAAE,EAAE;gBACb,QAAQ,EAAE,
|
|
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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"}
|
|
@@ -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");
|
|
@@ -87,8 +88,9 @@ class RangoCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
87
88
|
type: `rango:${this.bridgeType}`,
|
|
88
89
|
fromAddress: this.walletAddress
|
|
89
90
|
});
|
|
91
|
+
const fromWithoutFee = (0, get_from_without_fee_1.getFromWithoutFee)(this.from, this.feeInfo?.rubicProxy?.platformFee?.percent);
|
|
90
92
|
const extraNativeFee = this.from.isNative
|
|
91
|
-
? new bignumber_js_1.default(providerValue).minus(
|
|
93
|
+
? new bignumber_js_1.default(providerValue).minus(fromWithoutFee.stringWeiAmount).toFixed()
|
|
92
94
|
: new bignumber_js_1.default(providerValue).toFixed();
|
|
93
95
|
const providerData = await proxy_cross_chain_evm_trade_1.ProxyCrossChainEvmTrade.getGenericProviderData(providerRouter, data, this.from.blockchain, providerRouter, extraNativeFee);
|
|
94
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":"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
|
|
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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"}
|
|
@@ -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");
|
|
@@ -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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"}
|