rubic-sdk 5.42.0-alpha.oneinch.13 → 5.42.0-alpha.oneinch.16
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/oneinch-provider/oneinch-ccr-trade.d.ts +3 -0
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js +58 -2
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.d.ts +5 -0
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.js +5 -4
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.d.ts +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.js +3 -2
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -31,9 +31,12 @@ export declare class OneinchCcrTrade extends EvmCrossChainTrade {
|
|
|
31
31
|
* zkSync currently unavailable in fusion+ system
|
|
32
32
|
*/
|
|
33
33
|
protected get fromContractAddress(): string;
|
|
34
|
+
private get permit2Address();
|
|
34
35
|
protected get methodName(): string;
|
|
35
36
|
constructor(params: OneinchCcrTradeParams);
|
|
36
37
|
swap(options?: SwapTransactionOptions): Promise<string | never>;
|
|
38
|
+
private needDefaultApprove;
|
|
39
|
+
private needPermit2Approve;
|
|
37
40
|
protected getContractParams(_options: GetContractParamsOptions, _skipAmountChangeCheck?: boolean): Promise<ContractParams>;
|
|
38
41
|
protected getTransactionConfigAndAmount(_receiverAddress?: string): Promise<{
|
|
39
42
|
config: EvmEncodeConfig;
|
package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.js
CHANGED
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.OneinchCcrTrade = void 0;
|
|
7
|
+
const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
4
8
|
const blockchain_name_1 = require("../../../../../core/blockchain/models/blockchain-name");
|
|
5
9
|
const web3_pure_1 = require("../../../../../core/blockchain/web3-pure/web3-pure");
|
|
6
10
|
const check_unsupported_receiver_address_1 = require("../../../../common/utils/check-unsupported-receiver-address");
|
|
@@ -18,10 +22,15 @@ class OneinchCcrTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
18
22
|
* zkSync currently unavailable in fusion+ system
|
|
19
23
|
*/
|
|
20
24
|
get fromContractAddress() {
|
|
21
|
-
return this.from.blockchain
|
|
25
|
+
return this.from.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZK_SYNC
|
|
22
26
|
? '0x111111125421ca6dc452d289314280a0f8842a65'
|
|
23
27
|
: '0x6fd4383cb451173d5f9304f041c7bcbf27d561ff';
|
|
24
28
|
}
|
|
29
|
+
get permit2Address() {
|
|
30
|
+
return this.from.blockchain !== blockchain_name_1.BLOCKCHAIN_NAME.ZK_SYNC
|
|
31
|
+
? '0x000000000022D473030F116dDEE9F6B43aC78BA3'
|
|
32
|
+
: '0x0000000000225e31D15943971F47aD3022F714Fa';
|
|
33
|
+
}
|
|
25
34
|
get methodName() {
|
|
26
35
|
throw new Error('[OneinchCcrTrade_methodName] Proxy swaps are not available.');
|
|
27
36
|
}
|
|
@@ -57,13 +66,60 @@ class OneinchCcrTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
|
57
66
|
});
|
|
58
67
|
options.onConfirm?.(swapOrder.orderHash);
|
|
59
68
|
await oneinch_ccr_api_service_1.OneinchCcrApiService.submitSwapOrder(this.quote, swapOrder, this.walletAddress, secrets);
|
|
60
|
-
|
|
69
|
+
const needSubmitSecrets = secretsCount > 1;
|
|
70
|
+
if (needSubmitSecrets) {
|
|
71
|
+
oneinch_ccr_utils_1.OneinchCcrUtils.listenForSecretsReadiness(swapOrder.orderHash, secrets);
|
|
72
|
+
}
|
|
61
73
|
return swapOrder.orderHash;
|
|
62
74
|
}
|
|
63
75
|
catch (err) {
|
|
64
76
|
throw err;
|
|
65
77
|
}
|
|
66
78
|
}
|
|
79
|
+
// public override async needApprove(): Promise<boolean> {
|
|
80
|
+
// if (this.from.isNative) return false;
|
|
81
|
+
// const needPermit2Approve = await this.needPermit2Approve();
|
|
82
|
+
// const needApprove = await this.needDefaultApprove();
|
|
83
|
+
// return needPermit2Approve || needApprove;
|
|
84
|
+
// }
|
|
85
|
+
// public override async approve(
|
|
86
|
+
// options: EvmBasicTransactionOptions,
|
|
87
|
+
// _checkNeedApprove: boolean = true,
|
|
88
|
+
// amount: BigNumber | 'infinity' = 'infinity'
|
|
89
|
+
// ): Promise<TransactionReceipt> {
|
|
90
|
+
// this.checkWalletConnected();
|
|
91
|
+
// await this.checkBlockchainCorrect();
|
|
92
|
+
// const needDefaultApprove = await this.needDefaultApprove();
|
|
93
|
+
// const needPermit2Approve = await this.needPermit2Approve();
|
|
94
|
+
// let txReceipt: TransactionReceipt = {} as TransactionReceipt;
|
|
95
|
+
// if (needPermit2Approve) {
|
|
96
|
+
// txReceipt = await this.web3Private.approveOnPermit2(
|
|
97
|
+
// this.from.address,
|
|
98
|
+
// this.permit2Address,
|
|
99
|
+
// this.fromContractAddress,
|
|
100
|
+
// amount,
|
|
101
|
+
// new BigNumber(900_000),
|
|
102
|
+
// options
|
|
103
|
+
// );
|
|
104
|
+
// }
|
|
105
|
+
// if (needDefaultApprove) {
|
|
106
|
+
// txReceipt = await this.web3Private.approveTokens(
|
|
107
|
+
// this.from.address,
|
|
108
|
+
// this.permit2Address,
|
|
109
|
+
// amount,
|
|
110
|
+
// options
|
|
111
|
+
// );
|
|
112
|
+
// }
|
|
113
|
+
// return txReceipt;
|
|
114
|
+
// }
|
|
115
|
+
async needDefaultApprove() {
|
|
116
|
+
const allowance = await this.fromWeb3Public.getAllowance(this.from.address, this.walletAddress, this.fromContractAddress);
|
|
117
|
+
return this.from.weiAmount.gt(allowance);
|
|
118
|
+
}
|
|
119
|
+
async needPermit2Approve() {
|
|
120
|
+
const [allowance, expiration] = await this.fromWeb3Public.getAllowanceAndExpirationOnPermit2(this.from.address, this.walletAddress, this.fromContractAddress, this.permit2Address);
|
|
121
|
+
return this.from.weiAmount.gt(allowance) || new bignumber_js_1.default(Date.now()).gt(expiration);
|
|
122
|
+
}
|
|
67
123
|
async getContractParams(_options, _skipAmountChangeCheck) {
|
|
68
124
|
throw new Error('[OneinchCcrTrade_getContractParams] Fee is taken in order params `fee` and `feeReceiver`.');
|
|
69
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oneinch-ccr-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oneinch-ccr-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/oneinch-ccr-trade.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,11 @@ export declare class OneinchCcrApiService {
|
|
|
6
6
|
private static readonly xApiUrl;
|
|
7
7
|
private static readonly apiKey;
|
|
8
8
|
static fetchQuote({ srcToken, dstToken, walletAddress }: OneinchQuoteParams): Promise<OneinchCcrQuoteResponse>;
|
|
9
|
+
/**
|
|
10
|
+
* @TODO add fee=100&
|
|
11
|
+
feeReceiver=${address}&
|
|
12
|
+
source=rubic&
|
|
13
|
+
* */
|
|
9
14
|
static buildSwapOrder({ dstToken, srcToken, walletAddress, quote, secretHashes }: OneinchSwapOrderParams): Promise<OneinchSwapOrderResponse>;
|
|
10
15
|
static submitSwapOrder(quoteResp: OneinchCcrQuoteResponse, swapResp: OneinchSwapOrderResponse, walletAddress: string, secretHashes: string[]): Promise<void>;
|
|
11
16
|
static fetchReadySecrets(orderHash: string): Promise<OneinchReadySecretsResponse>;
|
|
@@ -31,7 +31,11 @@ class OneinchCcrApiService {
|
|
|
31
31
|
throw err;
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
|
-
|
|
34
|
+
/**
|
|
35
|
+
* @TODO add fee=100&
|
|
36
|
+
feeReceiver=${address}&
|
|
37
|
+
source=rubic&
|
|
38
|
+
* */
|
|
35
39
|
static async buildSwapOrder({ dstToken, srcToken, walletAddress, quote, secretHashes }) {
|
|
36
40
|
try {
|
|
37
41
|
const queryParams = `srcChain=${blockchain_id_1.blockchainId[srcToken.blockchain]}&
|
|
@@ -40,9 +44,6 @@ srcTokenAddress=${this.getApiTokenAddress(srcToken)}&
|
|
|
40
44
|
dstTokenAddress=${this.getApiTokenAddress(dstToken)}&
|
|
41
45
|
amount=${srcToken.stringWeiAmount}&
|
|
42
46
|
walletAddress=${walletAddress}&
|
|
43
|
-
fee=100&
|
|
44
|
-
feeReceiver=${walletAddress}&
|
|
45
|
-
source=rubic&
|
|
46
47
|
preset=${quote.recommendedPreset}`;
|
|
47
48
|
const res = await this.catchApiError(injector_1.Injector.httpClient.post(`${this.xApiUrl}/quoter/v1.0/quote/build?${queryParams}`, { quote: quote, secretsHashList: secretHashes }, { headers: { apikey: this.apiKey } }));
|
|
48
49
|
return res;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oneinch-ccr-api-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.ts"],"names":[],"mappings":";;;AAAA,8CAAkD;AAElD,sGAAkG;AAClG,oGAAiG;AACjG,yDAAsD;AACtD,2FAAwF;AAIxF,wFAAiF;AAUjF,2DAAsD;AAEtD,MAAa,oBAAoB;IAOtB,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,QAAQ,EACR,QAAQ,EACR,aAAa,EACI;QACjB,IAAI,CAAC;YACD,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,aAAa,CAChC,mBAAQ,CAAC,UAAU,CAAC,GAAG,CACnB,GAAG,IAAI,CAAC,OAAO,4BAA4B,EAC3C;gBACI,OAAO,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE;gBAChC,MAAM,EAAE;oBACJ,QAAQ,EAAE,4BAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAC3C,QAAQ,EAAE,4BAAY,CAAC,QAAQ,CAAC,UAAU,CAAC;oBAC3C,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;oBAClD,eAAe,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;oBAClD,MAAM,EAAE,QAAQ,CAAC,eAAe;oBAChC,aAAa,EAAE,aAAa,IAAI,yCAAmB;oBACnD,cAAc,EAAE,IAAI;oBACpB,WAAW;oBACX,kBAAkB;iBACrB;aACJ,CACJ,CACJ,CAAC;YAEF,OAAO,GAAG,CAAC;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,MAAM,GAAG,CAAC;QACd,CAAC;IACL,CAAC;IAED
|
|
1
|
+
{"version":3,"file":"oneinch-ccr-api-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export declare class OneinchCcrUtils {
|
|
2
2
|
/**
|
|
3
3
|
* submits each ready secret created in createSecretHashes array untill all secrets will be submitted
|
|
4
|
+
* @warning used only for orders with more than 1 secrets
|
|
4
5
|
*/
|
|
5
6
|
static listenForSecretsReadiness(orderHash: string, secrets: string[]): void;
|
|
6
7
|
/**
|
|
@@ -7,15 +7,16 @@ const oneinch_ccr_api_service_1 = require("./oneinch-ccr-api-service");
|
|
|
7
7
|
class OneinchCcrUtils {
|
|
8
8
|
/**
|
|
9
9
|
* submits each ready secret created in createSecretHashes array untill all secrets will be submitted
|
|
10
|
+
* @warning used only for orders with more than 1 secrets
|
|
10
11
|
*/
|
|
11
12
|
static listenForSecretsReadiness(orderHash, secrets) {
|
|
12
13
|
const submittedSecrets = {};
|
|
13
14
|
const deadlineMS = Date.now() + 1000 * 900; // 15 minutes
|
|
14
15
|
(async () => {
|
|
15
|
-
while (
|
|
16
|
+
while (Date.now() > deadlineMS) {
|
|
16
17
|
await (0, waitFor_1.waitFor)(30000);
|
|
17
18
|
const isAllSecretsSubmitted = secrets.every((hash, ind) => submittedSecrets[ind] === hash);
|
|
18
|
-
if (isAllSecretsSubmitted
|
|
19
|
+
if (isAllSecretsSubmitted)
|
|
19
20
|
break;
|
|
20
21
|
const readySecrets = await oneinch_ccr_api_service_1.OneinchCcrApiService.fetchReadySecrets(orderHash).catch(() => null);
|
|
21
22
|
if (!readySecrets || !readySecrets.fills.length)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oneinch-ccr-utils.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAEhC,sDAAmD;AAEnD,uEAAiE;AAIjE,MAAa,eAAe;IACxB
|
|
1
|
+
{"version":3,"file":"oneinch-ccr-utils.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-utils.ts"],"names":[],"mappings":";;;AAAA,mCAAgC;AAEhC,sDAAmD;AAEnD,uEAAiE;AAIjE,MAAa,eAAe;IACxB;;;OAGG;IACI,MAAM,CAAC,yBAAyB,CAAC,SAAiB,EAAE,OAAiB;QACxE,MAAM,gBAAgB,GAAG,EAAqC,CAAC;QAC/D,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAK,GAAG,GAAG,CAAC,CAAC,aAAa;QAE1D,CAAC,KAAK,IAAI,EAAE;YACR,OAAO,IAAI,CAAC,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;gBAC7B,MAAM,IAAA,iBAAO,EAAC,KAAM,CAAC,CAAC;gBAEtB,MAAM,qBAAqB,GAAG,OAAO,CAAC,KAAK,CACvC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,IAAI,CAChD,CAAC;gBACF,IAAI,qBAAqB;oBAAE,MAAM;gBAEjC,MAAM,YAAY,GAAG,MAAM,8CAAoB,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,KAAK,CAC9E,GAAG,EAAE,CAAC,IAAI,CACb,CAAC;gBACF,IAAI,CAAC,YAAY,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,MAAM;oBAAE,SAAS;gBAE1D,KAAK,MAAM,MAAM,IAAI,YAAY,CAAC,KAAK,EAAE,CAAC;oBACtC,gBAAgB,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAW,CAAC;gBACjE,CAAC;YACL,CAAC;YAED,MAAM,OAAO,CAAC,GAAG,CACb,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACjB,8CAAoB,CAAC,wBAAwB,CAAC,SAAS,EAAE,MAAM,CAAC,CACnE,CACJ,CAAC;QACN,CAAC,CAAC,EAAE,CAAC;IACT,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,SAAiB,EAAE,aAAqB;QACtE,MAAM,SAAS,GAAG,MAAO,MAAc,CAAC,QAAQ,CAAC,OAAO,CAAC;YACrD,MAAM,EAAE,sBAAsB;YAC9B,MAAM,EAAE,CAAC,aAAa,EAAE,SAAS,CAAC;SACrC,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC;IACrB,CAAC;IAEM,MAAM,CAAC,kBAAkB,CAAC,YAAoB;QACjD,MAAM,YAAY,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC;aACpD,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;aACnC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAEnD,OAAO,YAAY,CAAC;IACxB,CAAC;IAEO,MAAM,CAAC,iBAAiB;QAC5B,OAAO,CACH,IAAI;YACJ,CAAC,GAAG,eAAM,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CACvF,CAAC;IACN,CAAC;CACJ;AA9DD,0CA8DC"}
|