rubic-sdk 5.34.0-alpha.eddy.18 → 5.34.0-alpha.eddy.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js +1 -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/services/eddy-bridge-contract-service.d.ts +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.js +13 -3
- package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.js.map +1 -1
- package/package.json +1 -1
package/lib/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.js
CHANGED
|
@@ -38,7 +38,7 @@ class EddyBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
38
38
|
const [eddySlippage, eddyFee, gasFeeInDestTokenUnits] = await Promise.all([
|
|
39
39
|
eddy_bridge_contract_service_1.EddyBridgeContractService.getEddySlipage(),
|
|
40
40
|
eddy_bridge_contract_service_1.EddyBridgeContractService.getPlatformFee(),
|
|
41
|
-
eddy_bridge_contract_service_1.EddyBridgeContractService.getGasFeeInDestChain(toToken)
|
|
41
|
+
eddy_bridge_contract_service_1.EddyBridgeContractService.getGasFeeInDestChain(from, toToken)
|
|
42
42
|
]);
|
|
43
43
|
const ratioToAmount = 1 - eddyFee;
|
|
44
44
|
const calculationFactory = new eddy_calculation_factory_1.EddyBridgeCalculationFactory(from, toToken, options, ratioToAmount);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.ts"],"names":[],"mappings":";;;AAAA,8CAAmE;AACnE,8CAAiE;AACjE,6EAA6E;AAC7E,gFAAgG;AAChG,2FAAwF;AACxF,qHAA+G;AAC/G,yFAAmF;AAGnF,gFAA6E;AAC7E,yEAAoE;AAIpE,oHAA6G;AAC7G,2FAGkD;AAClD,yDAA6D;AAC7D,2DAAsD;AACtD,gFAA0E;AAC1E,0FAAoF;AACpF,2FAA8E;AAC9E,+EAAgF;AAEhF,MAAa,kBAAmB,SAAQ,yCAAkB;IAA1D;;QACoB,SAAI,GAAG,+CAAsB,CAAC,WAAW,CAAC;IAkK9D,CAAC;IAhKU,qBAAqB,CAAC,cAAiC;QAC1D,OAAO,wDAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAAkC;QAElC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAsC,CAAC;QACnE,MAAM,QAAQ,GAAG,KAAK,CAAC;QACvB,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,yCAAmB,CAAC;QAEnF,IAAI;YACA,IAAA,oEAA+B,EAC3B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,WAAW,IAAI,aAAa,CACxC,CAAC;YACF,MAAM,gBAAgB,GAAG,IAAA,qDAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE7D,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,IAAI,EACJ,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAC3C,CAAC;YAEF,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,sBAAsB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACtE,wDAAyB,CAAC,cAAc,EAAE;gBAC1C,wDAAyB,CAAC,cAAc,EAAE;gBAC1C,wDAAyB,CAAC,oBAAoB,CAAC,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"eddy-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/eddy-bridge-provider.ts"],"names":[],"mappings":";;;AAAA,8CAAmE;AACnE,8CAAiE;AACjE,6EAA6E;AAC7E,gFAAgG;AAChG,2FAAwF;AACxF,qHAA+G;AAC/G,yFAAmF;AAGnF,gFAA6E;AAC7E,yEAAoE;AAIpE,oHAA6G;AAC7G,2FAGkD;AAClD,yDAA6D;AAC7D,2DAAsD;AACtD,gFAA0E;AAC1E,0FAAoF;AACpF,2FAA8E;AAC9E,+EAAgF;AAEhF,MAAa,kBAAmB,SAAQ,yCAAkB;IAA1D;;QACoB,SAAI,GAAG,+CAAsB,CAAC,WAAW,CAAC;IAkK9D,CAAC;IAhKU,qBAAqB,CAAC,cAAiC;QAC1D,OAAO,wDAAyB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,cAAc,CAAC,CAAC;IAC7E,CAAC;IAEM,KAAK,CAAC,SAAS,CAClB,IAAyC,EACzC,OAAsC,EACtC,OAAkC;QAElC,MAAM,cAAc,GAAG,IAAI,CAAC,UAAsC,CAAC;QACnE,MAAM,QAAQ,GAAG,KAAK,CAAC;QACvB,MAAM,aAAa,GAAG,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,IAAI,yCAAmB,CAAC;QAEnF,IAAI;YACA,IAAA,oEAA+B,EAC3B,OAAO,EAAE,eAAe,EACxB,OAAO,EAAE,WAAW,IAAI,aAAa,CACxC,CAAC;YACF,MAAM,gBAAgB,GAAG,IAAA,qDAAoB,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAE7D,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,IAAI,EACJ,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAC3C,CAAC;YAEF,MAAM,CAAC,YAAY,EAAE,OAAO,EAAE,sBAAsB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBACtE,wDAAyB,CAAC,cAAc,EAAE;gBAC1C,wDAAyB,CAAC,cAAc,EAAE;gBAC1C,wDAAyB,CAAC,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC;aAChE,CAAC,CAAC;YACH,MAAM,aAAa,GAAG,CAAC,GAAG,OAAO,CAAC;YAElC,MAAM,kBAAkB,GAAG,IAAI,uDAA4B,CACvD,IAAI,EACJ,OAAO,EACP,OAAO,EACP,aAAa,CAChB,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,kBAAkB,CAAC,iBAAiB,EAAE,CAAC;YAE9D,MAAM,CAAC,EAAE,EAAE,mBAAmB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAChD,yBAAgB,CAAC,WAAW,CAAC;oBACzB,GAAG,OAAO,CAAC,QAAQ;oBACnB,WAAW,EAAE,QAAQ;iBACxB,CAAC;gBACF,mBAAU,CAAC,eAAe,CAAC,gCAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aAChE,CAAC,CAAC;YAEH,MAAM,OAAO,GACT,OAAO,CAAC,cAAc,KAAK,SAAS;gBAChC,CAAC,CAAC,MAAM,mCAAe,CAAC,UAAU,CAAC;oBAC7B,OAAO;oBACP,IAAI,EAAE,cAAc;oBACpB,OAAO,EAAE,EAAE;oBACX,eAAe,EAAE,OAAO,CAAC,eAAe;oBACxC,QAAQ,EAAE,OAAO,CAAC,iBAAiB;oBACnC,gBAAgB;oBAChB,YAAY,EAAE,OAAO;iBACxB,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAC;YAEf,MAAM,KAAK,GAAG,IAAI,mCAAe,CAAC;gBAC9B,eAAe,EAAE;oBACb,OAAO,EAAE;wBACL,GAAG,OAAO;wBACV,QAAQ,EAAE;4BACN,SAAS,EAAE;gCACP,MAAM,EAAE,sBAAsB;gCAC9B,KAAK,EAAE,mBAAmB;6BAC7B;yBACJ;qBACJ;oBACD,IAAI,EAAE,cAAc;oBACpB,OAAO;oBACP,EAAE;oBACF,WAAW,EAAE,IAAI,CAAC,2BAA2B,CAAC,EAAE,CAAC;oBACjD,QAAQ,EAAE,YAAY;oBACtB,gBAAgB;oBAChB,YAAY,EAAE,OAAO;oBACrB,aAAa;iBAChB;gBACD,eAAe,EAAE,OAAO,CAAC,eAAe;gBACxC,SAAS,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,CAAC;aAC/C,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,oBAAoB,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;SAC3D;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,aAAa,GAAG,yCAAkB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;YACzD,OAAO;gBACH,KAAK,EAAE,IAAI;gBACX,KAAK,EAAE,aAAa;gBACpB,SAAS,EAAE,IAAI,CAAC,IAAI;aACvB,CAAC;SACL;IACL,CAAC;IAEO,KAAK,CAAC,oBAAoB,CAC9B,cAAmD,EACnD,KAAsB;QAEtB,MAAM,MAAM,GAAG,gCAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAC/E,IAAI,CAAC,MAAM,EAAE;YACT,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YACvC,uCAAuC;SAC1C;QACD,IAAI,iBAAiB,GAAY,IAAI,CAAC;QAEtC,IAAI,cAAc,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS,EAAE;YACzD,IAAI;gBACA,MAAM,YAAY,GAAG,MAAM,8CAAoB,CAAC,8BAA8B,CAC1E,cAAc,CACjB,CAAC;gBACF,iBAAiB,GAAG,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;aAClE;YAAC,MAAM,GAAE;SACb;QAED,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC3C,OAAO;gBACH,KAAK;gBACL,KAAK,EAAE,IAAI,uBAAc,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC;gBAC5D,SAAS,EAAE,IAAI,CAAC,IAAI;aACvB,CAAC;SACL;QACD,IAAI,cAAc,CAAC,WAAW,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,EAAE;YACjE,OAAO;gBACH,KAAK;gBACL,KAAK,EAAE,IAAI,uBAAc,CAAC,MAAM,CAAC,GAAG,EAAE,cAAc,CAAC,MAAM,CAAC;gBAC5D,SAAS,EAAE,IAAI,CAAC,IAAI;aACvB,CAAC;SACL;QAED,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAC3C,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;AAnKD,gDAmKC"}
|
|
@@ -4,9 +4,10 @@ import { EvmBlockchainName } from '../../../../../../core/blockchain/models/bloc
|
|
|
4
4
|
export declare class EddyBridgeContractService {
|
|
5
5
|
static getPlatformFee(): Promise<number>;
|
|
6
6
|
/**
|
|
7
|
+
* Eddy takes gasFee in source chain native currency
|
|
7
8
|
* @param toToken target chain token
|
|
8
9
|
*/
|
|
9
|
-
static getGasFeeInDestChain(toToken: PriceToken<EvmBlockchainName>): Promise<BigNumber>;
|
|
10
|
+
static getGasFeeInDestChain(fromToken: PriceToken<EvmBlockchainName>, toToken: PriceToken<EvmBlockchainName>): Promise<BigNumber>;
|
|
10
11
|
/**
|
|
11
12
|
* @returns eddy static slippage
|
|
12
13
|
*/
|
|
@@ -5,6 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.EddyBridgeContractService = void 0;
|
|
7
7
|
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
8
|
+
const tokens_1 = require("../../../../../../common/tokens");
|
|
9
|
+
const native_tokens_1 = require("../../../../../../common/tokens/constants/native-tokens");
|
|
8
10
|
const blockchain_name_1 = require("../../../../../../core/blockchain/models/blockchain-name");
|
|
9
11
|
const web3_pure_1 = require("../../../../../../core/blockchain/web3-pure/web3-pure");
|
|
10
12
|
const injector_1 = require("../../../../../../core/injector/injector");
|
|
@@ -25,15 +27,23 @@ class EddyBridgeContractService {
|
|
|
25
27
|
}
|
|
26
28
|
}
|
|
27
29
|
/**
|
|
30
|
+
* Eddy takes gasFee in source chain native currency
|
|
28
31
|
* @param toToken target chain token
|
|
29
32
|
*/
|
|
30
|
-
static async getGasFeeInDestChain(toToken) {
|
|
33
|
+
static async getGasFeeInDestChain(fromToken, toToken) {
|
|
31
34
|
if (toToken.blockchain === blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN)
|
|
32
35
|
return new bignumber_js_1.default(0);
|
|
33
36
|
const web3Public = injector_1.Injector.web3PublicService.getWeb3Public(blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN);
|
|
34
37
|
const res = await web3Public.callContractMethod((0, find_transit_token_address_1.findCompatibleZrc20TokenAddress)(toToken), zrc_20_token_abi_1.ZRC_20_ABI, 'withdrawGasFee', []);
|
|
35
|
-
const
|
|
36
|
-
|
|
38
|
+
const [zrc20GasFeeTokenAddress, zrc20WeiAmount] = res;
|
|
39
|
+
const zrc20TokenWithPrice = await tokens_1.PriceToken.createToken({
|
|
40
|
+
address: zrc20GasFeeTokenAddress,
|
|
41
|
+
blockchain: blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN
|
|
42
|
+
});
|
|
43
|
+
const gasFeeUsdt = web3_pure_1.Web3Pure.fromWei(zrc20WeiAmount || 0, 18).multipliedBy(zrc20TokenWithPrice.price);
|
|
44
|
+
const sourceChainNative = await tokens_1.PriceToken.createFromToken(native_tokens_1.nativeTokensList[fromToken.blockchain]);
|
|
45
|
+
const gasFeeInSrcChainNativeEquivalent = gasFeeUsdt.dividedBy(sourceChainNative.price);
|
|
46
|
+
return gasFeeInSrcChainNativeEquivalent;
|
|
37
47
|
}
|
|
38
48
|
/**
|
|
39
49
|
* @returns eddy static slippage
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eddy-bridge-contract-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;
|
|
1
|
+
{"version":3,"file":"eddy-bridge-contract-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/eddy-bridge/services/eddy-bridge-contract-service.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAA+C;AAC/C,6EAA6E;AAC7E,gFAAgG;AAChG,uEAAmE;AACnE,yDAAsD;AAEtD,gGAA8F;AAC9F,kEAA+D;AAC/D,oEAA2D;AAC3D,oFAAsF;AAEtF,MAAa,yBAAyB;IAC3B,MAAM,CAAC,KAAK,CAAC,cAAc;QAC9B,IAAI;YACA,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;YACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,gEAA+B,EAC/B,iCAAe,EACf,aAAa,EACb,EAAE,CACL,CAAC;YACF,oGAAoG;YACpG,OAAO,GAAG,GAAG,IAAK,CAAC;SACtB;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,CAAC;SACZ;IACL,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,KAAK,CAAC,oBAAoB,CACpC,SAAwC,EACxC,OAAsC;QAEtC,IAAI,OAAO,CAAC,UAAU,KAAK,iCAAe,CAAC,SAAS;YAAE,OAAO,IAAI,sBAAS,CAAC,CAAC,CAAC,CAAC;QAE9E,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,IAAA,4DAA+B,EAAC,OAAO,CAAC,EACxC,6BAAU,EACV,gBAAgB,EAChB,EAAE,CACL,CAAC;QACF,MAAM,CAAC,uBAAuB,EAAE,cAAc,CAAC,GAAG,GAAG,CAAC;QAEtD,MAAM,mBAAmB,GAAG,MAAM,mBAAU,CAAC,WAAW,CAAC;YACrD,OAAO,EAAE,uBAAuB;YAChC,UAAU,EAAE,iCAAe,CAAC,SAAS;SACxC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,oBAAQ,CAAC,OAAO,CAAC,cAAc,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,CACrE,mBAAmB,CAAC,KAAK,CAC5B,CAAC;QACF,MAAM,iBAAiB,GAAG,MAAM,mBAAU,CAAC,eAAe,CACtD,gCAAgB,CAAC,SAAS,CAAC,UAAU,CAAC,CACzC,CAAC;QACF,MAAM,gCAAgC,GAAG,UAAU,CAAC,SAAS,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAEvF,OAAO,gCAAgC,CAAC;IAC5C,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,cAAc;QAC9B,MAAM,UAAU,GAAG,mBAAQ,CAAC,iBAAiB,CAAC,aAAa,CAAC,iCAAe,CAAC,SAAS,CAAC,CAAC;QACvF,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,kBAAkB,CAC3C,gEAA+B,EAC/B,iCAAe,EACf,UAAU,EACV,EAAE,CACL,CAAC;QACF,0CAA0C;QAC1C,OAAO,GAAG,GAAG,IAAK,CAAC;IACvB,CAAC;CACJ;AAjED,8DAiEC"}
|