rubic-sdk 5.17.0-alpha.owl-to.5 → 5.17.0-alpha.owl-to.7
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.
|
@@ -44,7 +44,7 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
44
44
|
});
|
|
45
45
|
const fromWithoutFeeWithCode = new tokens_1.PriceTokenAmount({
|
|
46
46
|
...fromWithoutFee.asStruct,
|
|
47
|
-
weiAmount: this.getFromWeiAmountWithCode(from, targetChainCode)
|
|
47
|
+
weiAmount: this.getFromWeiAmountWithCode(from, targetChainCode, transferFee)
|
|
48
48
|
});
|
|
49
49
|
const gasData = options.gasCalculation === 'enabled'
|
|
50
50
|
? await owl_to_bridge_trade_1.OwlToBridgeTrade.getGasData({
|
|
@@ -109,9 +109,9 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
109
109
|
makerAddress: txInfo.maker_address
|
|
110
110
|
};
|
|
111
111
|
}
|
|
112
|
-
getFromWeiAmountWithCode(from, code) {
|
|
113
|
-
const decrementCode = `0.${code.padStart(from.decimals, '0')}`;
|
|
114
|
-
const sendingAmount = from.tokenAmount.minus(
|
|
112
|
+
getFromWeiAmountWithCode(from, code, transferFee) {
|
|
113
|
+
// const decrementCode = `0.${code.padStart(from.decimals, '0')}`;
|
|
114
|
+
const sendingAmount = from.tokenAmount.minus(transferFee);
|
|
115
115
|
const sendingStringWeiAmount = web3_pure_1.Web3Pure.toWei(sendingAmount, from.decimals);
|
|
116
116
|
const validCode = code.padStart(4, '0');
|
|
117
117
|
const amount = sendingStringWeiAmount.replace(/\d{4}$/g, validCode);
|
|
@@ -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,8CAAkD;AAClD,8CAAiE;AAEjE,sGAAkG;AAClG,uEAAmE;AACnE,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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"}
|