rubic-sdk 5.24.0-alpha.owlto.1 → 5.24.0-alpha.owlto.10
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/meson-provider/meson-cross-chain-provider.js +2 -2
- 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/owl-to-bridge/constants/owl-to-supported-chains.d.ts +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/constants/owl-to-supported-chains.js +1 -3
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/constants/owl-to-supported-chains.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/models/owl-to-trade-types.d.ts +2 -0
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.js +7 -5
- 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 +2 -2
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js +12 -10
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js.map +1 -1
- package/package.json +1 -1
|
@@ -64,14 +64,14 @@ class MesonCrossChainProvider extends cross_chain_provider_1.CrossChainProvider
|
|
|
64
64
|
providerAddress: options.providerAddress,
|
|
65
65
|
routePath: await this.getRoutePath(from, to)
|
|
66
66
|
});
|
|
67
|
-
if (
|
|
67
|
+
if (fromWithoutFee.tokenAmount.lt(min)) {
|
|
68
68
|
return {
|
|
69
69
|
trade,
|
|
70
70
|
error: new errors_1.MinAmountError(min, from.symbol),
|
|
71
71
|
tradeType: this.type
|
|
72
72
|
};
|
|
73
73
|
}
|
|
74
|
-
if (
|
|
74
|
+
if (fromWithoutFee.tokenAmount.gt(max)) {
|
|
75
75
|
return {
|
|
76
76
|
trade,
|
|
77
77
|
error: new errors_1.MaxAmountError(max, from.symbol),
|
|
@@ -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;IA8M7C,CAAC;IA5MU,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;YACA,IAAI,CAAC,QAAQ,EAAE;gBACX,MAAM,IAAI,sBAAa,CAAC,kCAAkC,CAAC,CAAC;aAC/D;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;YAEF,MAAM,cAAc,GAAG,IAAA,wCAAiB,EACpC,iBAAiB,EACjB,OAAO,CAAC,UAAU,EAAE,WAAW,EAAE,OAAO,CAC3C,CAAC;YAEF,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAElD,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,cAAc;oBACpB,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,cAAc;oBACpB,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;aAC/C,CAAC,CAAC;YAEH,IAAI,
|
|
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":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const owlToSupportedBlockchains: readonly ["ETH", "BSC", "ZK_FAIR", "SCROLL", "
|
|
1
|
+
export declare const owlToSupportedBlockchains: readonly ["ETH", "BSC", "ZK_FAIR", "SCROLL", "BASE", "ZK_SYNC", "LINEA", "ARBITRUM", "OPTIMISM", "POLYGON_ZKEVM", "POLYGON", "KROMA", "MANTA_PACIFIC", "XLAYER", "MANTLE", "BLAST", "ZETACHAIN", "MERLIN", "MODE", "TAIKO"];
|
|
2
2
|
export type OwlToSupportedBlockchain = (typeof owlToSupportedBlockchains)[number];
|
|
@@ -7,7 +7,6 @@ exports.owlToSupportedBlockchains = [
|
|
|
7
7
|
blockchain_name_1.BLOCKCHAIN_NAME.BINANCE_SMART_CHAIN,
|
|
8
8
|
blockchain_name_1.BLOCKCHAIN_NAME.ZK_FAIR,
|
|
9
9
|
blockchain_name_1.BLOCKCHAIN_NAME.SCROLL,
|
|
10
|
-
blockchain_name_1.BLOCKCHAIN_NAME.STARKNET,
|
|
11
10
|
blockchain_name_1.BLOCKCHAIN_NAME.BASE,
|
|
12
11
|
blockchain_name_1.BLOCKCHAIN_NAME.ZK_SYNC,
|
|
13
12
|
blockchain_name_1.BLOCKCHAIN_NAME.LINEA,
|
|
@@ -17,13 +16,12 @@ exports.owlToSupportedBlockchains = [
|
|
|
17
16
|
blockchain_name_1.BLOCKCHAIN_NAME.POLYGON,
|
|
18
17
|
blockchain_name_1.BLOCKCHAIN_NAME.KROMA,
|
|
19
18
|
blockchain_name_1.BLOCKCHAIN_NAME.MANTA_PACIFIC,
|
|
20
|
-
// BLOCKCHAIN_NAME.METIS,
|
|
21
19
|
blockchain_name_1.BLOCKCHAIN_NAME.XLAYER,
|
|
22
20
|
blockchain_name_1.BLOCKCHAIN_NAME.MANTLE,
|
|
23
21
|
blockchain_name_1.BLOCKCHAIN_NAME.BLAST,
|
|
24
22
|
blockchain_name_1.BLOCKCHAIN_NAME.ZETACHAIN,
|
|
25
23
|
blockchain_name_1.BLOCKCHAIN_NAME.MERLIN,
|
|
26
24
|
blockchain_name_1.BLOCKCHAIN_NAME.MODE,
|
|
27
|
-
blockchain_name_1.BLOCKCHAIN_NAME.
|
|
25
|
+
blockchain_name_1.BLOCKCHAIN_NAME.TAIKO
|
|
28
26
|
];
|
|
29
27
|
//# sourceMappingURL=owl-to-supported-chains.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"owl-to-supported-chains.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/constants/owl-to-supported-chains.ts"],"names":[],"mappings":";;;AAAA,gFAA6E;AAEhE,QAAA,yBAAyB,GAAG;IACrC,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,mBAAmB;IACnC,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"owl-to-supported-chains.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/constants/owl-to-supported-chains.ts"],"names":[],"mappings":";;;AAAA,gFAA6E;AAEhE,QAAA,yBAAyB,GAAG;IACrC,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,mBAAmB;IACnC,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,IAAI;IACpB,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,KAAK;IACrB,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,QAAQ;IACxB,iCAAe,CAAC,aAAa;IAC7B,iCAAe,CAAC,OAAO;IACvB,iCAAe,CAAC,KAAK;IACrB,iCAAe,CAAC,aAAa;IAC7B,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,KAAK;IACrB,iCAAe,CAAC,SAAS;IACzB,iCAAe,CAAC,MAAM;IACtB,iCAAe,CAAC,IAAI;IACpB,iCAAe,CAAC,KAAK;CACf,CAAC"}
|
|
@@ -12,6 +12,7 @@ export interface OwlToGetGasDataParams {
|
|
|
12
12
|
providerAddress: string;
|
|
13
13
|
gasLimit: BigNumber;
|
|
14
14
|
swapParams: OwlTopSwapRequest;
|
|
15
|
+
approveAddress: string;
|
|
15
16
|
}
|
|
16
17
|
export interface OwlToTradeParams {
|
|
17
18
|
crossChainTrade: {
|
|
@@ -21,6 +22,7 @@ export interface OwlToTradeParams {
|
|
|
21
22
|
feeInfo: FeeInfo;
|
|
22
23
|
priceImpact: number | null;
|
|
23
24
|
swapParams: OwlTopSwapRequest;
|
|
25
|
+
approveAddress: string;
|
|
24
26
|
};
|
|
25
27
|
providerAddress: string;
|
|
26
28
|
routePath: RubicStep[];
|
|
@@ -43,7 +43,7 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
43
43
|
tokenSymbol: pairInfo.token_name,
|
|
44
44
|
walletAddress
|
|
45
45
|
};
|
|
46
|
-
const { receive_value, gas_fee } = await owl_to_api_service_1.OwlToApiService.getSwapInfo(swapParams);
|
|
46
|
+
const { receive_value, gas_fee, txs } = await owl_to_api_service_1.OwlToApiService.getSwapInfo(swapParams);
|
|
47
47
|
const to = new tokens_1.PriceTokenAmount({
|
|
48
48
|
...toToken.asStruct,
|
|
49
49
|
weiAmount: new bignumber_js_1.default(receive_value.raw_value)
|
|
@@ -55,7 +55,8 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
55
55
|
toToken: to,
|
|
56
56
|
providerAddress: options.providerAddress,
|
|
57
57
|
gasLimit: new bignumber_js_1.default(gas_fee.raw_value),
|
|
58
|
-
swapParams
|
|
58
|
+
swapParams,
|
|
59
|
+
approveAddress: txs.transfer_body.to
|
|
59
60
|
})
|
|
60
61
|
: null;
|
|
61
62
|
const trade = new owl_to_bridge_trade_1.OwlToBridgeTrade({
|
|
@@ -65,19 +66,20 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
|
65
66
|
to,
|
|
66
67
|
gasData,
|
|
67
68
|
priceImpact: from.calculatePriceImpactPercent(to),
|
|
68
|
-
swapParams
|
|
69
|
+
swapParams,
|
|
70
|
+
approveAddress: txs.transfer_body.to
|
|
69
71
|
},
|
|
70
72
|
providerAddress: options.providerAddress,
|
|
71
73
|
routePath: await this.getRoutePath(from, to)
|
|
72
74
|
});
|
|
73
|
-
if (
|
|
75
|
+
if (fromWithoutFee.tokenAmount.lt(minAmountBN)) {
|
|
74
76
|
return {
|
|
75
77
|
trade,
|
|
76
78
|
error: new errors_1.MinAmountError(minAmountBN, from.symbol),
|
|
77
79
|
tradeType: this.type
|
|
78
80
|
};
|
|
79
81
|
}
|
|
80
|
-
if (
|
|
82
|
+
if (fromWithoutFee.tokenAmount.gt(maxAmountBN)) {
|
|
81
83
|
return {
|
|
82
84
|
trade,
|
|
83
85
|
error: new errors_1.MaxAmountError(maxAmountBN, from.symbol),
|
|
@@ -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,qHAA+G;AAC/G,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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"}
|
|
@@ -14,7 +14,7 @@ import { TradeInfo } from '../common/models/trade-info';
|
|
|
14
14
|
import { OwlToGetGasDataParams, OwlToTradeParams } from './models/owl-to-trade-types';
|
|
15
15
|
export declare class OwlToBridgeTrade extends EvmCrossChainTrade {
|
|
16
16
|
/** @internal */
|
|
17
|
-
static getGasData({ feeInfo, fromToken, toToken, providerAddress, gasLimit, swapParams }: OwlToGetGasDataParams): Promise<GasData | null>;
|
|
17
|
+
static getGasData({ feeInfo, fromToken, toToken, providerAddress, gasLimit, swapParams, approveAddress }: OwlToGetGasDataParams): Promise<GasData | null>;
|
|
18
18
|
/**ABSTRACT PROPS */
|
|
19
19
|
readonly type: CrossChainTradeType;
|
|
20
20
|
readonly isAggregator: boolean;
|
|
@@ -28,6 +28,7 @@ export declare class OwlToBridgeTrade extends EvmCrossChainTrade {
|
|
|
28
28
|
readonly priceImpact: number | null;
|
|
29
29
|
/** */
|
|
30
30
|
private readonly swapParams;
|
|
31
|
+
private readonly providerGateway;
|
|
31
32
|
private get fromBlockchain();
|
|
32
33
|
protected get fromContractAddress(): string;
|
|
33
34
|
protected get methodName(): string;
|
|
@@ -37,6 +38,5 @@ export declare class OwlToBridgeTrade extends EvmCrossChainTrade {
|
|
|
37
38
|
config: EvmEncodeConfig;
|
|
38
39
|
amount: string;
|
|
39
40
|
}>;
|
|
40
|
-
needApprove(): Promise<boolean>;
|
|
41
41
|
getTradeInfo(): TradeInfo;
|
|
42
42
|
}
|
package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js
CHANGED
|
@@ -16,7 +16,7 @@ const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-f
|
|
|
16
16
|
const owl_to_api_service_1 = require("./services/owl-to-api-service");
|
|
17
17
|
class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
18
18
|
/** @internal */
|
|
19
|
-
static async getGasData({ feeInfo, fromToken, toToken, providerAddress, gasLimit, swapParams }) {
|
|
19
|
+
static async getGasData({ feeInfo, fromToken, toToken, providerAddress, gasLimit, swapParams, approveAddress }) {
|
|
20
20
|
try {
|
|
21
21
|
const trade = new OwlToBridgeTrade({
|
|
22
22
|
crossChainTrade: {
|
|
@@ -25,12 +25,17 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
25
25
|
to: toToken,
|
|
26
26
|
priceImpact: fromToken.calculatePriceImpactPercent(toToken) || 0,
|
|
27
27
|
gasData: null,
|
|
28
|
-
swapParams
|
|
28
|
+
swapParams,
|
|
29
|
+
approveAddress
|
|
29
30
|
},
|
|
30
31
|
providerAddress,
|
|
31
32
|
routePath: []
|
|
32
33
|
});
|
|
33
|
-
|
|
34
|
+
const gasData = await (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade);
|
|
35
|
+
if (!gasData) {
|
|
36
|
+
throw new Error('gasData is null');
|
|
37
|
+
}
|
|
38
|
+
return gasData;
|
|
34
39
|
}
|
|
35
40
|
catch (_err) {
|
|
36
41
|
const gasDetails = await injector_1.Injector.gasPriceApi.getGasPrice(fromToken.blockchain);
|
|
@@ -43,7 +48,9 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
43
48
|
}
|
|
44
49
|
get fromContractAddress() {
|
|
45
50
|
// @TODO Add owl-to contract addresses
|
|
46
|
-
return this.isProxyTrade
|
|
51
|
+
return this.isProxyTrade
|
|
52
|
+
? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].gateway
|
|
53
|
+
: this.providerGateway;
|
|
47
54
|
}
|
|
48
55
|
get methodName() {
|
|
49
56
|
return 'startBridgeTokensViaTransfer';
|
|
@@ -62,6 +69,7 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
62
69
|
this.toTokenAmountMin = crossChainTrade.to.tokenAmount;
|
|
63
70
|
this.feeInfo = crossChainTrade.feeInfo;
|
|
64
71
|
this.swapParams = crossChainTrade.swapParams;
|
|
72
|
+
this.providerGateway = crossChainTrade.approveAddress;
|
|
65
73
|
}
|
|
66
74
|
async getContractParams(options) {
|
|
67
75
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
|
@@ -103,12 +111,6 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
103
111
|
amount: this.to.stringWeiAmount
|
|
104
112
|
};
|
|
105
113
|
}
|
|
106
|
-
async needApprove() {
|
|
107
|
-
if (this.isProxyTrade) {
|
|
108
|
-
return super.needApprove();
|
|
109
|
-
}
|
|
110
|
-
return false;
|
|
111
|
-
}
|
|
112
114
|
getTradeInfo() {
|
|
113
115
|
return {
|
|
114
116
|
estimatedGas: this.estimatedGas,
|
|
@@ -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,yDAAsD;AACtD,2FAAwF;AAGxF,gFAAkG;AAClG,qEAAmE;AACnE,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,QAAQ,EACR,UAAU,
|
|
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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"}
|