@wormhole-labs/cctp-executor-route 0.26.0-beta.8 → 0.26.0
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/dist/cjs/aptos/executor.d.ts.map +1 -1
- package/dist/cjs/aptos/executor.js +36 -15
- package/dist/cjs/aptos/executor.js.map +1 -1
- package/dist/cjs/consts.d.ts +2 -0
- package/dist/cjs/consts.d.ts.map +1 -1
- package/dist/cjs/consts.js +50 -4
- package/dist/cjs/consts.js.map +1 -1
- package/dist/cjs/evm/executor.d.ts.map +1 -1
- package/dist/cjs/evm/executor.js +40 -23
- package/dist/cjs/evm/executor.js.map +1 -1
- package/dist/cjs/evm/executorV2.d.ts.map +1 -1
- package/dist/cjs/evm/executorV2.js +40 -23
- package/dist/cjs/evm/executorV2.js.map +1 -1
- package/dist/cjs/routes/cctpV1.d.ts +6 -0
- package/dist/cjs/routes/cctpV1.d.ts.map +1 -1
- package/dist/cjs/routes/cctpV1.js +1 -1
- package/dist/cjs/routes/cctpV1.js.map +1 -1
- package/dist/cjs/routes/cctpV2Base.d.ts +3 -0
- package/dist/cjs/routes/cctpV2Base.d.ts.map +1 -1
- package/dist/cjs/routes/cctpV2Base.js.map +1 -1
- package/dist/cjs/routes/cctpV2Fast.d.ts.map +1 -1
- package/dist/cjs/routes/cctpV2Fast.js +1 -1
- package/dist/cjs/routes/cctpV2Fast.js.map +1 -1
- package/dist/cjs/routes/cctpV2Standard.d.ts.map +1 -1
- package/dist/cjs/routes/cctpV2Standard.js +1 -1
- package/dist/cjs/routes/cctpV2Standard.js.map +1 -1
- package/dist/cjs/routes/helpers.d.ts +6 -2
- package/dist/cjs/routes/helpers.d.ts.map +1 -1
- package/dist/cjs/routes/helpers.js +85 -22
- package/dist/cjs/routes/helpers.js.map +1 -1
- package/dist/cjs/svm/executor.d.ts.map +1 -1
- package/dist/cjs/svm/executor.js +4 -1
- package/dist/cjs/svm/executor.js.map +1 -1
- package/dist/esm/aptos/executor.d.ts.map +1 -1
- package/dist/esm/aptos/executor.js +36 -15
- package/dist/esm/aptos/executor.js.map +1 -1
- package/dist/esm/consts.d.ts +2 -0
- package/dist/esm/consts.d.ts.map +1 -1
- package/dist/esm/consts.js +49 -3
- package/dist/esm/consts.js.map +1 -1
- package/dist/esm/evm/executor.d.ts.map +1 -1
- package/dist/esm/evm/executor.js +40 -23
- package/dist/esm/evm/executor.js.map +1 -1
- package/dist/esm/evm/executorV2.d.ts.map +1 -1
- package/dist/esm/evm/executorV2.js +40 -23
- package/dist/esm/evm/executorV2.js.map +1 -1
- package/dist/esm/routes/cctpV1.d.ts +6 -0
- package/dist/esm/routes/cctpV1.d.ts.map +1 -1
- package/dist/esm/routes/cctpV1.js +2 -2
- package/dist/esm/routes/cctpV1.js.map +1 -1
- package/dist/esm/routes/cctpV2Base.d.ts +3 -0
- package/dist/esm/routes/cctpV2Base.d.ts.map +1 -1
- package/dist/esm/routes/cctpV2Base.js.map +1 -1
- package/dist/esm/routes/cctpV2Fast.d.ts.map +1 -1
- package/dist/esm/routes/cctpV2Fast.js +2 -2
- package/dist/esm/routes/cctpV2Fast.js.map +1 -1
- package/dist/esm/routes/cctpV2Standard.d.ts.map +1 -1
- package/dist/esm/routes/cctpV2Standard.js +2 -2
- package/dist/esm/routes/cctpV2Standard.js.map +1 -1
- package/dist/esm/routes/helpers.d.ts +6 -2
- package/dist/esm/routes/helpers.d.ts.map +1 -1
- package/dist/esm/routes/helpers.js +84 -22
- package/dist/esm/routes/helpers.js.map +1 -1
- package/dist/esm/svm/executor.d.ts.map +1 -1
- package/dist/esm/svm/executor.js +4 -1
- package/dist/esm/svm/executor.js.map +1 -1
- package/dist/tsconfig.cjs.tsbuildinfo +1 -1
- package/dist/tsconfig.esm.tsbuildinfo +1 -1
- package/package.json +1 -1
package/dist/esm/evm/executor.js
CHANGED
|
@@ -34,35 +34,52 @@ export class EvmCCTPExecutor {
|
|
|
34
34
|
const recipientAddress = recipient.address
|
|
35
35
|
.toUniversalAddress()
|
|
36
36
|
.toUint8Array();
|
|
37
|
-
|
|
38
|
-
//
|
|
39
|
-
//
|
|
40
|
-
// So the total allowance needed is remainingAmount + transferTokenFee.
|
|
37
|
+
const shimAddress = details.shimContract ?? this.shimContract;
|
|
38
|
+
// Both old and new contracts require allowance for the full transfer amount
|
|
39
|
+
// (remainingAmount + transferTokenFee).
|
|
41
40
|
const totalAmount = details.remainingAmount + details.transferTokenFee;
|
|
42
41
|
const tokenAddr = circle.usdcContract.get(this.network, this.chain);
|
|
43
42
|
const tokenContract = EvmPlatform.getTokenImplementation(this.provider, tokenAddr);
|
|
44
|
-
const allowance = await tokenContract.allowance(senderAddress,
|
|
43
|
+
const allowance = await tokenContract.allowance(senderAddress, shimAddress);
|
|
45
44
|
if (allowance < totalAmount) {
|
|
46
|
-
const txReq = await tokenContract.approve.populateTransaction(
|
|
45
|
+
const txReq = await tokenContract.approve.populateTransaction(shimAddress, totalAmount);
|
|
47
46
|
yield this.createUnsignedTx(addFrom(txReq, senderAddress), "ERC20.approve of EvmCCTPExecutor", false);
|
|
48
47
|
}
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
48
|
+
const payee = details.referrer?.address?.toString() ?? senderAddress;
|
|
49
|
+
let txReq;
|
|
50
|
+
if (details.useLegacyFees) {
|
|
51
|
+
// Legacy contract ABI: accepts full amount and calculates fee from dBPS internally
|
|
52
|
+
const shimAbi = [
|
|
53
|
+
"function depositForBurn(uint256 amount, uint16 destinationChain, uint32 destinationDomain, bytes32 mintRecipient, address burnToken, (address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint16 dbps, address payee) feeArgs) external payable returns (uint64 nonce)",
|
|
54
|
+
];
|
|
55
|
+
const shim = new Contract(shimAddress, shimAbi, this.provider);
|
|
56
|
+
txReq = await shim.getFunction("depositForBurn").populateTransaction(totalAmount, toChainId(recipient.chain), circle.circleChainId.get(this.network, recipient.chain), recipientAddress, tokenAddr, {
|
|
57
|
+
refundAddress: senderAddress,
|
|
58
|
+
signedQuote: details.signedQuote,
|
|
59
|
+
instructions: details.relayInstructions,
|
|
60
|
+
}, {
|
|
61
|
+
dbps: details.referrerFeeDbps ?? 0n,
|
|
62
|
+
payee,
|
|
63
|
+
});
|
|
64
|
+
txReq.value = details.estimatedCost;
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
// New contract ABI: receives remainingAmount and collects fee separately
|
|
68
|
+
const shimAbi = [
|
|
69
|
+
"function depositForBurn(uint256 amount, uint16 destinationChain, uint32 destinationDomain, bytes32 mintRecipient, address burnToken, (address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint256 transferTokenFee, uint256 nativeTokenFee, address payee) feeArgs) external payable returns (uint64 nonce)",
|
|
70
|
+
];
|
|
71
|
+
const shim = new Contract(shimAddress, shimAbi, this.provider);
|
|
72
|
+
txReq = await shim.getFunction("depositForBurn").populateTransaction(details.remainingAmount, toChainId(recipient.chain), circle.circleChainId.get(this.network, recipient.chain), recipientAddress, tokenAddr, {
|
|
73
|
+
refundAddress: senderAddress,
|
|
74
|
+
signedQuote: details.signedQuote,
|
|
75
|
+
instructions: details.relayInstructions,
|
|
76
|
+
}, {
|
|
77
|
+
transferTokenFee: details.transferTokenFee,
|
|
78
|
+
nativeTokenFee: details.nativeTokenFee,
|
|
79
|
+
payee,
|
|
80
|
+
});
|
|
81
|
+
txReq.value = details.estimatedCost + details.nativeTokenFee;
|
|
82
|
+
}
|
|
66
83
|
yield this.createUnsignedTx(addFrom(txReq, senderAddress), "EvmCCTPExecutor.depositForBurn");
|
|
67
84
|
}
|
|
68
85
|
createUnsignedTx(txReq, description, parallelizable = false) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/evm/executor.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,MAAM,EACN,cAAc,EACd,SAAS,GACV,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EACL,UAAU,EACV,WAAW,EACX,sBAAsB,EACtB,UAAU,EACV,OAAO,GACR,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,OAAO,eAAe;IAOf;IACA;IACA;IACA;IAPF,OAAO,CAAS;IAChB,YAAY,CAAS;IAE9B,YACW,OAAU,EACV,KAAQ,EACR,QAAkB,EAClB,SAAoB;QAHpB,YAAO,GAAP,OAAO,CAAG;QACV,UAAK,GAAL,KAAK,CAAG;QACR,aAAQ,GAAR,QAAQ,CAAU;QAClB,cAAS,GAAT,SAAS,CAAW;QAE7B,IAAI,OAAO,KAAK,QAAQ;YACtB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAE1D,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,2BAA2B,CAAC,GAAG,CAC3D,OAAO,EACP,KAAK,CACI,CAAC;QAEZ,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,YAAY,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,QAAkB,EAClB,MAAiC;QAEjC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO;YAC1B,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,OAAO,OAAO,OAAO,EAAE,CAAC,CAAC;QACrE,OAAO,IAAI,eAAe,CAAC,OAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,CAAC,QAAQ,CACb,MAAyB,EACzB,SAAuB,EACvB,OAAqB;QAErB,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxD,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO;aACvC,kBAAkB,EAAE;aACpB,YAAY,EAAE,CAAC;QAElB,
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../../src/evm/executor.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,MAAM,EACN,cAAc,EACd,SAAS,GACV,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EACL,UAAU,EACV,WAAW,EACX,sBAAsB,EACtB,UAAU,EACV,OAAO,GACR,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAG5C,MAAM,OAAO,eAAe;IAOf;IACA;IACA;IACA;IAPF,OAAO,CAAS;IAChB,YAAY,CAAS;IAE9B,YACW,OAAU,EACV,KAAQ,EACR,QAAkB,EAClB,SAAoB;QAHpB,YAAO,GAAP,OAAO,CAAG;QACV,UAAK,GAAL,KAAK,CAAG;QACR,aAAQ,GAAR,QAAQ,CAAU;QAClB,cAAS,GAAT,SAAS,CAAW;QAE7B,IAAI,OAAO,KAAK,QAAQ;YACtB,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;QAE1D,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,2BAA2B,CAAC,GAAG,CAC3D,OAAO,EACP,KAAK,CACI,CAAC;QAEZ,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,YAAY,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,QAAkB,EAClB,MAAiC;QAEjC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO;YAC1B,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,OAAO,OAAO,OAAO,EAAE,CAAC,CAAC;QACrE,OAAO,IAAI,eAAe,CAAC,OAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,CAAC,QAAQ,CACb,MAAyB,EACzB,SAAuB,EACvB,OAAqB;QAErB,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxD,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO;aACvC,kBAAkB,EAAE;aACpB,YAAY,EAAE,CAAC;QAElB,MAAM,WAAW,GAAG,OAAO,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC;QAE9D,4EAA4E;QAC5E,wCAAwC;QACxC,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;QAEvE,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAE,CAAC;QAErE,MAAM,aAAa,GAAG,WAAW,CAAC,sBAAsB,CACtD,IAAI,CAAC,QAAQ,EACb,SAAS,CACV,CAAC;QAEF,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,SAAS,CAC7C,aAAa,EACb,WAAW,CACZ,CAAC;QAEF,IAAI,SAAS,GAAG,WAAW,EAAE,CAAC;YAC5B,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,mBAAmB,CAC3D,WAAW,EACX,WAAW,CACZ,CAAC;YACF,MAAM,IAAI,CAAC,gBAAgB,CACzB,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,EAC7B,kCAAkC,EAClC,KAAK,CACN,CAAC;QACJ,CAAC;QAED,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,aAAa,CAAC;QAErE,IAAI,KAAK,CAAC;QACV,IAAI,OAAO,CAAC,aAAa,EAAE,CAAC;YAC1B,mFAAmF;YACnF,MAAM,OAAO,GAAG;gBACd,iSAAiS;aAClS,CAAC;YACF,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE/D,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,mBAAmB,CAClE,WAAW,EACX,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAC1B,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAE,EACxD,gBAAgB,EAChB,SAAS,EACT;gBACE,aAAa,EAAE,aAAa;gBAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE,OAAO,CAAC,iBAAiB;aACxC,EACD;gBACE,IAAI,EAAE,OAAO,CAAC,eAAe,IAAI,EAAE;gBACnC,KAAK;aACN,CACF,CAAC;YACF,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC;QACtC,CAAC;aAAM,CAAC;YACN,yEAAyE;YACzE,MAAM,OAAO,GAAG;gBACd,sUAAsU;aACvU,CAAC;YACF,MAAM,IAAI,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAE/D,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC,mBAAmB,CAClE,OAAO,CAAC,eAAe,EACvB,SAAS,CAAC,SAAS,CAAC,KAAK,CAAC,EAC1B,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,KAAK,CAAE,EACxD,gBAAgB,EAChB,SAAS,EACT;gBACE,aAAa,EAAE,aAAa;gBAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,YAAY,EAAE,OAAO,CAAC,iBAAiB;aACxC,EACD;gBACE,gBAAgB,EAAE,OAAO,CAAC,gBAAgB;gBAC1C,cAAc,EAAE,OAAO,CAAC,cAAc;gBACtC,KAAK;aACN,CACF,CAAC;YACF,KAAK,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,GAAG,OAAO,CAAC,cAAc,CAAC;QAC/D,CAAC;QAED,MAAM,IAAI,CAAC,gBAAgB,CACzB,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,EAC7B,gCAAgC,CACjC,CAAC;IACJ,CAAC;IAEO,gBAAgB,CACtB,KAAyB,EACzB,WAAmB,EACnB,iBAA0B,KAAK;QAE/B,OAAO,IAAI,sBAAsB,CAC/B,UAAU,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,EAC/B,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,EACV,WAAW,EACX,cAAc,CACf,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executorV2.d.ts","sourceRoot":"","sources":["../../../src/evm/executorV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,QAAQ,EACT,MAAM,kCAAkC,CAAC;AAQ1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,sBAAsB,EAGvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAsB,MAAM,QAAQ,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAM1C,OAAO,EAAE,eAAe,EAA4B,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,SAAS,CACnE,YAAW,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAQ7B,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS;IAT/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;gBAGnB,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS;WAyBlB,OAAO,CAAC,CAAC,SAAS,OAAO,EACpC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAQpC,QAAQ,CACb,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,kBAAkB,GAC1B,cAAc,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"executorV2.d.ts","sourceRoot":"","sources":["../../../src/evm/executorV2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,cAAc,EACd,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,OAAO,EACP,QAAQ,EACT,MAAM,kCAAkC,CAAC;AAQ1C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAGL,sBAAsB,EAGvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAsB,MAAM,QAAQ,CAAC;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAM1C,OAAO,EAAE,eAAe,EAA4B,MAAM,YAAY,CAAC;AACvE,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAE1D,qBAAa,iBAAiB,CAAC,CAAC,SAAS,OAAO,EAAE,CAAC,SAAS,SAAS,CACnE,YAAW,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC;IAQ7B,QAAQ,CAAC,OAAO,EAAE,CAAC;IACnB,QAAQ,CAAC,KAAK,EAAE,CAAC;IACjB,QAAQ,CAAC,QAAQ,EAAE,QAAQ;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS;IAT/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;gBAGnB,OAAO,EAAE,CAAC,EACV,KAAK,EAAE,CAAC,EACR,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS;WAyBlB,OAAO,CAAC,CAAC,SAAS,OAAO,EACpC,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,YAAY,CAAC,CAAC,EAAE,QAAQ,CAAC,GAChC,OAAO,CAAC,iBAAiB,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAQpC,QAAQ,CACb,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,SAAS,EAAE,YAAY,EACvB,OAAO,EAAE,kBAAkB,GAC1B,cAAc,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IA4GzC,mBAAmB,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC;IAc9D,MAAM,CACX,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EACzB,OAAO,EAAE,eAAe,EACxB,WAAW,EAAE,MAAM,GAClB,cAAc,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAsBzC,eAAe,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxC,OAAO,CAAC,gBAAgB;CAazB"}
|
|
@@ -45,37 +45,54 @@ export class EvmCCTPv2Executor {
|
|
|
45
45
|
const recipientAddress = recipient.address
|
|
46
46
|
.toUniversalAddress()
|
|
47
47
|
.toUint8Array();
|
|
48
|
-
|
|
49
|
-
//
|
|
50
|
-
//
|
|
51
|
-
// So the total allowance needed is remainingAmount + transferTokenFee.
|
|
48
|
+
const shimAddress = details.shimContract ?? this.shimContract;
|
|
49
|
+
// Both old and new contracts require allowance for the full transfer amount
|
|
50
|
+
// (remainingAmount + transferTokenFee).
|
|
52
51
|
const totalAmount = details.remainingAmount + details.transferTokenFee;
|
|
53
52
|
const tokenContract = EvmPlatform.getTokenImplementation(this.provider, this.usdcContract);
|
|
54
|
-
const allowance = await tokenContract.allowance(senderAddress,
|
|
53
|
+
const allowance = await tokenContract.allowance(senderAddress, shimAddress);
|
|
55
54
|
if (allowance < totalAmount) {
|
|
56
|
-
const txReq = await tokenContract.approve.populateTransaction(
|
|
55
|
+
const txReq = await tokenContract.approve.populateTransaction(shimAddress, totalAmount);
|
|
57
56
|
yield this.createUnsignedTx(addFrom(txReq, senderAddress), "ERC20.approve of EvmCCTPv2Executor", false);
|
|
58
57
|
}
|
|
59
|
-
// TODO: type safety. typechain brings in so much boilerplate code and is soft deprecated. use viem?
|
|
60
|
-
const shimAbi = [
|
|
61
|
-
"function depositForBurn(uint256 amount, uint16 destinationChain, uint32 destinationDomain, bytes32 mintRecipient, address burnToken, bytes32 destinationCaller, uint256 maxFee, uint32 minFinalityThreshold, (address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint256 transferTokenFee, uint256 nativeTokenFee, address payee) feeArgs) external payable returns (uint64 nonce)",
|
|
62
|
-
];
|
|
63
58
|
// If equal to bytes32(0), any address can call receiveMessage() on destination domain.
|
|
64
59
|
const destinationCaller = new Uint8Array(32);
|
|
65
|
-
const shim = new Contract(this.shimContract, shimAbi, this.provider);
|
|
66
60
|
const destinationCircleDomain = getCircleV2Domain(this.network, recipient.chain);
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
61
|
+
const payee = details.referrer?.address?.toString() ?? senderAddress;
|
|
62
|
+
let txReq;
|
|
63
|
+
if (details.useLegacyFees) {
|
|
64
|
+
// Legacy contract ABI: accepts full amount and calculates fee from dBPS internally
|
|
65
|
+
const shimAbi = [
|
|
66
|
+
"function depositForBurn(uint256 amount, uint16 destinationChain, uint32 destinationDomain, bytes32 mintRecipient, address burnToken, bytes32 destinationCaller, uint256 maxFee, uint32 minFinalityThreshold, (address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint16 dbps, address payee) feeArgs) external payable returns (uint64 nonce)",
|
|
67
|
+
];
|
|
68
|
+
const shim = new Contract(shimAddress, shimAbi, this.provider);
|
|
69
|
+
txReq = await shim.getFunction("depositForBurn").populateTransaction(totalAmount, toChainId(recipient.chain), destinationCircleDomain, recipientAddress, this.usdcContract, destinationCaller, details.fastTransferMaxFee, details.minFinalityThreshold, {
|
|
70
|
+
refundAddress: senderAddress,
|
|
71
|
+
signedQuote: details.signedQuote,
|
|
72
|
+
instructions: details.relayInstructions,
|
|
73
|
+
}, {
|
|
74
|
+
dbps: details.referrerFeeDbps ?? 0n,
|
|
75
|
+
payee,
|
|
76
|
+
});
|
|
77
|
+
txReq.value = details.estimatedCost;
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
// New contract ABI: receives remainingAmount and collects fee separately
|
|
81
|
+
const shimAbi = [
|
|
82
|
+
"function depositForBurn(uint256 amount, uint16 destinationChain, uint32 destinationDomain, bytes32 mintRecipient, address burnToken, bytes32 destinationCaller, uint256 maxFee, uint32 minFinalityThreshold, (address refundAddress, bytes signedQuote, bytes instructions) executorArgs, (uint256 transferTokenFee, uint256 nativeTokenFee, address payee) feeArgs) external payable returns (uint64 nonce)",
|
|
83
|
+
];
|
|
84
|
+
const shim = new Contract(shimAddress, shimAbi, this.provider);
|
|
85
|
+
txReq = await shim.getFunction("depositForBurn").populateTransaction(details.remainingAmount, toChainId(recipient.chain), destinationCircleDomain, recipientAddress, this.usdcContract, destinationCaller, details.fastTransferMaxFee, details.minFinalityThreshold, {
|
|
86
|
+
refundAddress: senderAddress,
|
|
87
|
+
signedQuote: details.signedQuote,
|
|
88
|
+
instructions: details.relayInstructions,
|
|
89
|
+
}, {
|
|
90
|
+
transferTokenFee: details.transferTokenFee,
|
|
91
|
+
nativeTokenFee: details.nativeTokenFee,
|
|
92
|
+
payee,
|
|
93
|
+
});
|
|
94
|
+
txReq.value = details.estimatedCost + details.nativeTokenFee;
|
|
95
|
+
}
|
|
79
96
|
yield this.createUnsignedTx(addFrom(txReq, senderAddress), "EvmCCTPv2Executor.depositForBurn");
|
|
80
97
|
}
|
|
81
98
|
async isTransferCompleted(message) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executorV2.js","sourceRoot":"","sources":["../../../src/evm/executorV2.ts"],"names":[],"mappings":"AAQA,OAAO,EACL,MAAM,EACN,QAAQ,EACR,cAAc,EACd,SAAS,GACV,MAAM,kCAAkC,CAAC;AAG1C,OAAO,EACL,UAAU,EACV,WAAW,EACX,sBAAsB,EACtB,UAAU,EACV,OAAO,GACR,MAAM,8BAA8B,CAAC;AAEtC,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GAChB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAmB,wBAAwB,EAAE,MAAM,YAAY,CAAC;AAGvE,MAAM,OAAO,iBAAiB;IASjB;IACA;IACA;IACA;IATF,OAAO,CAAS;IAChB,YAAY,CAAS;IACrB,kBAAkB,CAAS;IAC3B,YAAY,CAAS;IAE9B,YACW,OAAU,EACV,KAAQ,EACR,QAAkB,EAClB,SAAoB;QAHpB,YAAO,GAAP,OAAO,CAAG;QACV,UAAK,GAAL,KAAK,CAAG;QACR,aAAQ,GAAR,QAAQ,CAAU;QAClB,cAAS,GAAT,SAAS,CAAW;QAE7B,IAAI,OAAO,KAAK,QAAQ;YACtB,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;QAE5D,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC,2BAA2B,CAAC,GAAG,CAC3D,OAAO,EACP,KAAK,CACI,CAAC;QAEZ,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACvD,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,YAAY,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,MAAM,kBAAkB,GACtB,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,oBAAoB,CAAC;QAC5D,IAAI,CAAC,kBAAkB;YACrB,MAAM,IAAI,KAAK,CAAC,mCAAmC,KAAK,YAAY,CAAC,CAAC;QACxE,IAAI,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QAE7C,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC7D,IAAI,CAAC,YAAY;YAAE,MAAM,IAAI,KAAK,CAAC,qBAAqB,KAAK,YAAY,CAAC,CAAC;QAC3E,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,QAAkB,EAClB,MAAiC;QAEjC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,WAAW,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;QAClE,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAE,CAAC;QAC5B,IAAI,IAAI,CAAC,OAAO,KAAK,OAAO;YAC1B,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,OAAO,OAAO,OAAO,EAAE,CAAC,CAAC;QACrE,OAAO,IAAI,iBAAiB,CAAC,OAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,CAAC,QAAQ,CACb,MAAyB,EACzB,SAAuB,EACvB,OAA2B;QAE3B,MAAM,aAAa,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC;QACxD,MAAM,gBAAgB,GAAG,SAAS,CAAC,OAAO;aACvC,kBAAkB,EAAE;aACpB,YAAY,EAAE,CAAC;QAElB,
|
|
1
|
+
{"version":3,"file":"executorV2.js","sourceRoot":"","sources":["../../../src/evm/executorV2.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,9 @@ export declare namespace CCTPExecutorRoute {
|
|
|
17
17
|
transferTokenFee?: bigint | ((amount: bigint, sourceChain: Chain) => bigint);
|
|
18
18
|
nativeTokenFee?: bigint | ((amount: bigint, sourceChain: Chain) => bigint);
|
|
19
19
|
referrerAddresses?: Partial<Record<Network, Partial<Record<Chain, string>>>>;
|
|
20
|
+
useLegacyFees?: boolean;
|
|
21
|
+
referrerFeeDbps?: bigint;
|
|
22
|
+
referrerFeeThreshold?: bigint;
|
|
20
23
|
};
|
|
21
24
|
}
|
|
22
25
|
type Op = CCTPExecutorRoute.Options;
|
|
@@ -24,6 +27,7 @@ type Vp = CCTPExecutorRoute.ValidatedParams;
|
|
|
24
27
|
type Tp = routes.TransferParams<Op>;
|
|
25
28
|
type Vr = routes.ValidationResult<Op>;
|
|
26
29
|
export type QuoteDetails = {
|
|
30
|
+
shimContract?: string;
|
|
27
31
|
signedQuote: Uint8Array;
|
|
28
32
|
relayInstructions: Uint8Array;
|
|
29
33
|
estimatedCost: bigint;
|
|
@@ -33,6 +37,8 @@ export type QuoteDetails = {
|
|
|
33
37
|
remainingAmount: bigint;
|
|
34
38
|
expiryTime: Date;
|
|
35
39
|
gasDropOff: bigint;
|
|
40
|
+
useLegacyFees?: boolean;
|
|
41
|
+
referrerFeeDbps?: bigint;
|
|
36
42
|
};
|
|
37
43
|
type Q = routes.Quote<Op, Vp, QuoteDetails>;
|
|
38
44
|
type QR = routes.QuoteResult<Op, Vp>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cctpV1.d.ts","sourceRoot":"","sources":["../../../src/routes/cctpV1.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,MAAM,EAAY,MAAM,+BAA+B,CAAC;AACjE,OAAO,EACL,gBAAgB,EAEhB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAML,MAAM,EAEP,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAIxC,yBAAiB,iBAAiB,CAAC;IACjC,KAAY,OAAO,GAAG;QAEpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,KAAY,gBAAgB,GAAG;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;KACvB,CAAC;IAEF,UAAiB,eAAgB,SAAQ,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC;QAC9E,gBAAgB,EAAE,gBAAgB,CAAC;KACpC;IAED,KAAY,MAAM,GAAG;QAMnB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;QAM7E,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;QAG3E,iBAAiB,CAAC,EAAE,OAAO,CACzB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAChD,CAAC;
|
|
1
|
+
{"version":3,"file":"cctpV1.d.ts","sourceRoot":"","sources":["../../../src/routes/cctpV1.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAE,MAAM,EAAY,MAAM,+BAA+B,CAAC;AACjE,OAAO,EACL,gBAAgB,EAEhB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,MAAM,EACX,KAAK,OAAO,EACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAML,MAAM,EAEP,MAAM,kCAAkC,CAAC;AAM1C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAIxC,yBAAiB,iBAAiB,CAAC;IACjC,KAAY,OAAO,GAAG;QAEpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,KAAY,gBAAgB,GAAG;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;KACvB,CAAC;IAEF,UAAiB,eAAgB,SAAQ,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC;QAC9E,gBAAgB,EAAE,gBAAgB,CAAC;KACpC;IAED,KAAY,MAAM,GAAG;QAMnB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;QAM7E,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;QAG3E,iBAAiB,CAAC,EAAE,OAAO,CACzB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAChD,CAAC;QAIF,aAAa,CAAC,EAAE,OAAO,CAAC;QAExB,eAAe,CAAC,EAAE,MAAM,CAAC;QAEzB,oBAAoB,CAAC,EAAE,MAAM,CAAC;KAC/B,CAAC;CACH;AAED,KAAK,EAAE,GAAG,iBAAiB,CAAC,OAAO,CAAC;AACpC,KAAK,EAAE,GAAG,iBAAiB,CAAC,eAAe,CAAC;AAE5C,KAAK,EAAE,GAAG,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;AACpC,KAAK,EAAE,GAAG,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;AAEtC,MAAM,MAAM,YAAY,GAAG;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,UAAU,CAAC;IACxB,iBAAiB,EAAE,UAAU,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,cAAc,EAAE,MAAM,CAAC;IACvB,eAAe,EAAE,MAAM,CAAC;IACxB,UAAU,EAAE,IAAI,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IAEnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;AAC5C,KAAK,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;AAKrC,KAAK,EAAE,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,EAAE,CAAA;CAAE,CAAC;AAC1C,KAAK,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAG5B,wBAAgB,iBAAiB,CAC/B,MAAM,GAAE,iBAAiB,CAAC,MAGzB;SAI2B,CAAC,SAAS,OAAO;;6BAmDxB,EAAE;kEAQb,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;+DAqCJ,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;kEA8DJ,MAAM,SACP,CAAC,MACJ,YAAY,GACf,OAAO,CAAC,CAAC,CAAC;uBAWyB,CAAC,YAAY,MAAM;;;;;;;;;;yBAlJ7B,OAAO,EAAE;6BAIL,OAAO,GAAG,KAAK,EAAE;+BAIT,CAAC,SAAS,OAAO,eAC1C,OAAO,aACT,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;;EAnCtB;AAGD,qBAAa,iBAAiB,CAAC,CAAC,SAAS,OAAO,CAC9C,SAAQ,MAAM,CAAC,cAAc,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAC1C,YAAW,MAAM,CAAC,kBAAkB,CAAC,OAAO,iBAAiB,CAAC;IAE9D,MAAM,CAAC,4BAA4B,UAAQ;IAK3C,QAAQ,CAAC,YAAY,MAA2B;IAChD,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAGrC;IAEF,MAAM,CAAC,IAAI;;;MAGT;IAEF,MAAM,CAAC,iBAAiB,IAAI,OAAO,EAAE;IAIrC,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,KAAK,EAAE;WAIpC,0BAA0B,CAAC,CAAC,SAAS,OAAO,EACvD,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;IAWrB,iBAAiB,IAAI,EAAE;IAMjB,QAAQ,CACZ,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;IAmCR,KAAK,CACT,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;IA4DR,QAAQ,CACZ,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,CAAC,EACR,EAAE,EAAE,YAAY,GACf,OAAO,CAAC,CAAC,CAAC;IAWU,KAAK,CAAC,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM;CAqE1D;AAED,OAAO,QAAQ,sCAAsC,CAAC;IACpD,UAAiB,gBAAgB,CAAC;QAChC,UAAU,0BAA0B,CAAC,CAAC,EAAE,CAAC;YACvC,YAAY,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;SAClC;QACD,UAAU,yBAAyB;YACjC,YAAY,EAAE,gBAAgB,CAAC,cAAc,CAAC,CAAC;SAChD;KACF;CACF"}
|
|
@@ -2,7 +2,7 @@ import { amount, finality } from "@wormhole-foundation/sdk-base";
|
|
|
2
2
|
import { nativeTokenId, } from "@wormhole-foundation/sdk-definitions";
|
|
3
3
|
import { isAttested, isCompleted, isFailed, isSourceFinalized, isSourceInitiated, routes, TransferState, } from "@wormhole-foundation/sdk-connect";
|
|
4
4
|
import { fetchStatus as fetchTxStatus, getUsdcDestinationAddress, RelayStatus, } from "../utils";
|
|
5
|
-
import { circleV1Domains, isCircleV1Chain } from "../consts";
|
|
5
|
+
import { circleV1Domains, isCircleV1Chain, shimContractsV1Legacy } from "../consts";
|
|
6
6
|
import { fetchExecutorQuote, initiateTransfer, validateFeeConfig } from "./helpers";
|
|
7
7
|
// Use this function to create a new CCTPExecutorRoute with custom config
|
|
8
8
|
export function cctpExecutorRoute(config = {
|
|
@@ -78,7 +78,7 @@ export class CCTPExecutorRoute extends routes.AutomaticRoute {
|
|
|
78
78
|
async quote(request, params) {
|
|
79
79
|
const { fromChain, toChain } = request;
|
|
80
80
|
try {
|
|
81
|
-
const quoteDetails = await fetchExecutorQuote(request, params, this.staticConfig, "ERC1");
|
|
81
|
+
const quoteDetails = await fetchExecutorQuote(request, params, this.staticConfig, "ERC1", this.staticConfig.useLegacyFees ? shimContractsV1Legacy : undefined);
|
|
82
82
|
const { remainingAmount, estimatedCost, gasDropOff, expiryTime } = quoteDetails;
|
|
83
83
|
// https://developers.circle.com/stablecoins/docs/required-block-confirmations
|
|
84
84
|
const eta = fromChain.chain === "Polygon"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cctpV1.js","sourceRoot":"","sources":["../../../src/routes/cctpV1.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAEL,aAAa,GAKd,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,UAAU,EACV,WAAW,EACX,QAAQ,EACR,iBAAiB,EACjB,iBAAiB,EACjB,MAAM,EACN,aAAa,GACd,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,WAAW,IAAI,aAAa,EAC5B,yBAAyB,EACzB,WAAW,GACZ,MAAM,UAAU,CAAC;AAElB,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cctpV1.js","sourceRoot":"","sources":["../../../src/routes/cctpV1.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,9 @@ export declare namespace CCTPv2ExecutorRoute {
|
|
|
16
16
|
transferTokenFee?: bigint | ((amount: bigint, sourceChain: Chain) => bigint);
|
|
17
17
|
nativeTokenFee?: bigint | ((amount: bigint, sourceChain: Chain) => bigint);
|
|
18
18
|
referrerAddresses?: Partial<Record<Network, Partial<Record<Chain, string>>>>;
|
|
19
|
+
useLegacyFees?: boolean;
|
|
20
|
+
referrerFeeDbps?: bigint;
|
|
21
|
+
referrerFeeThreshold?: bigint;
|
|
19
22
|
};
|
|
20
23
|
type Attestation = {
|
|
21
24
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cctpV2Base.d.ts","sourceRoot":"","sources":["../../../src/routes/cctpV2Base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,KAAK,EACL,YAAY,EACZ,gBAAgB,EAMhB,OAAO,EACP,MAAM,EACN,MAAM,EAEN,aAAa,EAGd,MAAM,kCAAkC,CAAC;AAO1C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAG1C,yBAAiB,mBAAmB,CAAC;IACnC,KAAY,OAAO,GAAG;QAEpB,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,KAAY,gBAAgB,GAAG;QAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;KACvB,CAAC;IAEF,UAAiB,eAAgB,SAAQ,MAAM,CAAC,uBAAuB,CAAC,OAAO,CAAC;QAC9E,gBAAgB,EAAE,gBAAgB,CAAC;KACpC;IAED,KAAY,MAAM,GAAG;QAMnB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;QAM7E,cAAc,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,KAAK,KAAK,MAAM,CAAC,CAAC;QAG3E,iBAAiB,CAAC,EAAE,OAAO,CACzB,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAChD,CAAC;
|
|
1
|
+
{"version":3,"file":"cctpV2Base.d.ts","sourceRoot":"","sources":["../../../src/routes/cctpV2Base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cctpV2Base.js","sourceRoot":"","sources":["../../../src/routes/cctpV2Base.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,UAAU,EACV,WAAW,EACX,QAAQ,EACR,iBAAiB,EACjB,iBAAiB,EAEjB,MAAM,EAEN,YAAY,EAEZ,aAAa,EACb,QAAQ,GACT,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,WAAW,EACX,sBAAsB,EACtB,uBAAuB,EACvB,WAAW,GACZ,MAAM,UAAU,CAAC;AAGlB,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cctpV2Base.js","sourceRoot":"","sources":["../../../src/routes/cctpV2Base.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cctpV2Fast.d.ts","sourceRoot":"","sources":["../../../src/routes/cctpV2Fast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EACL,YAAY,EAEZ,OAAO,EACR,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"cctpV2Fast.d.ts","sourceRoot":"","sources":["../../../src/routes/cctpV2Fast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EACL,YAAY,EAEZ,OAAO,EACR,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAc1D,OAAO,EACL,eAAe,EACf,mBAAmB,EAEnB,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACH,MAAM,cAAc,CAAC;AAItB,wBAAgB,uBAAuB,CACrC,MAAM,GAAE,mBAAmB,CAAC,MAAqD;SAK/E,CAAC,SAAS,OAAO;;kEA+CT,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;+DAwCJ,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;;;;;;;;;;;;;;oBAlES,CAAC,SAAS,OAAO,aAC3B,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;+BAO8B,CAAC,SAAS,OAAO,eAC1C,OAAO,aACT,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;;;;;EA/BtB;AAED,qBAAa,uBAAuB,CAAC,CAAC,SAAS,OAAO,CACpD,SAAQ,eAAe,CAAC,CAAC,CACzB,YAAW,MAAM,CAAC,kBAAkB,CAAC,OAAO,uBAAuB,CAAC;IAKpE,QAAQ,CAAC,YAAY,MAA2B;IAChD,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAgD;IAEzF,MAAM,CAAC,IAAI;;;MAGT;IAEF,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EACtC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;WAOG,0BAA0B,CAAC,CAAC,SAAS,OAAO,EACvD,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;IAQf,QAAQ,CACZ,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;IAsCR,KAAK,CACT,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;CAsFf"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { amount } from "@wormhole-foundation/sdk-base";
|
|
2
2
|
import { nativeTokenId, } from "@wormhole-foundation/sdk-definitions";
|
|
3
3
|
import { calculateFastBurnMaxFee, getCircleV2FastBurnAllowance, getCircleV2FastBurnFee, getUsdcDestinationAddress, } from "../utils";
|
|
4
|
-
import { CircleV2FinalityThreshold, fastTransferETAs, isCircleV2Chain, isCircleV2FastChain, } from "../consts";
|
|
4
|
+
import { CircleV2FinalityThreshold, fastTransferETAs, isCircleV2Chain, isCircleV2FastChain, shimContractsV2Legacy, } from "../consts";
|
|
5
5
|
import { CCTPv2BaseRoute, } from "./cctpV2Base";
|
|
6
6
|
import { fetchExecutorQuote, validateFeeConfig } from "./helpers";
|
|
7
7
|
// Use this function to create a new CCTPv2FastExecutorRoute with custom config
|
|
@@ -60,7 +60,7 @@ export class CCTPv2FastExecutorRoute extends CCTPv2BaseRoute {
|
|
|
60
60
|
async quote(request, params) {
|
|
61
61
|
const { fromChain, toChain } = request;
|
|
62
62
|
try {
|
|
63
|
-
const quoteDetails = await fetchExecutorQuote(request, params, this.staticConfig, "ERC2");
|
|
63
|
+
const quoteDetails = await fetchExecutorQuote(request, params, this.staticConfig, "ERC2", this.staticConfig.useLegacyFees ? shimContractsV2Legacy : undefined);
|
|
64
64
|
const { remainingAmount, estimatedCost, gasDropOff, expiryTime } = quoteDetails;
|
|
65
65
|
const allowance = await getCircleV2FastBurnAllowance(fromChain.network);
|
|
66
66
|
if (allowance <= remainingAmount) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cctpV2Fast.js","sourceRoot":"","sources":["../../../src/routes/cctpV2Fast.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACvD,OAAO,EAEL,aAAa,GAEd,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EACL,uBAAuB,EACvB,4BAA4B,EAC5B,sBAAsB,EACtB,yBAAyB,GAC1B,MAAM,UAAU,CAAC;AAClB,OAAO,EACL,yBAAyB,EACzB,gBAAgB,EAChB,eAAe,EACf,mBAAmB,
|
|
1
|
+
{"version":3,"file":"cctpV2Fast.js","sourceRoot":"","sources":["../../../src/routes/cctpV2Fast.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cctpV2Standard.d.ts","sourceRoot":"","sources":["../../../src/routes/cctpV2Standard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EACL,YAAY,EAEZ,OAAO,EACR,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EACL,eAAe,EACf,mBAAmB,EAEnB,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACH,MAAM,cAAc,CAAC;AAKtB,wBAAgB,2BAA2B,CACzC,MAAM,GAAE,mBAAmB,CAAC,MAAqD;SAK/E,CAAC,SAAS,OAAO;;kEAkDT,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;+DAsCJ,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;;;;;;;;;;;;;;oBAnES,CAAC,SAAS,OAAO,aAC3B,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;+BAU8B,CAAC,SAAS,OAAO,eAC1C,OAAO,aACT,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;;;;;EAlCtB;AAED,qBAAa,2BAA2B,CAAC,CAAC,SAAS,OAAO,CACxD,SAAQ,eAAe,CAAC,CAAC,CACzB,YAAW,MAAM,CAAC,kBAAkB,CAAC,OAAO,2BAA2B,CAAC;IAKxE,QAAQ,CAAC,YAAY,MAA2B;IAChD,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAgD;IAEzF,MAAM,CAAC,IAAI;;;MAGT;IAEF,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EACtC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;WAUG,0BAA0B,CAAC,CAAC,SAAS,OAAO,EACvD,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;IAQf,QAAQ,CACZ,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;IAoCR,KAAK,CACT,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"cctpV2Standard.d.ts","sourceRoot":"","sources":["../../../src/routes/cctpV2Standard.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAE7D,OAAO,EACL,YAAY,EAEZ,OAAO,EACR,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAE1D,OAAO,EACL,eAAe,EACf,mBAAmB,EAEnB,EAAE,EACF,EAAE,EACF,EAAE,EACF,EAAE,EACH,MAAM,cAAc,CAAC;AAKtB,wBAAgB,2BAA2B,CACzC,MAAM,GAAE,mBAAmB,CAAC,MAAqD;SAK/E,CAAC,SAAS,OAAO;;kEAkDT,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;+DAsCJ,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;;;;;;;;;;;;;;oBAnES,CAAC,SAAS,OAAO,aAC3B,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;+BAU8B,CAAC,SAAS,OAAO,eAC1C,OAAO,aACT,YAAY,CAAC,CAAC,CAAC,WACjB,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;;;;;EAlCtB;AAED,qBAAa,2BAA2B,CAAC,CAAC,SAAS,OAAO,CACxD,SAAQ,eAAe,CAAC,CAAC,CACzB,YAAW,MAAM,CAAC,kBAAkB,CAAC,OAAO,2BAA2B,CAAC;IAKxE,QAAQ,CAAC,YAAY,MAA2B;IAChD,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,MAAM,CAAgD;IAEzF,MAAM,CAAC,IAAI;;;MAGT;IAEF,MAAM,CAAC,eAAe,CAAC,CAAC,SAAS,OAAO,EACtC,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO;WAUG,0BAA0B,CAAC,CAAC,SAAS,OAAO,EACvD,WAAW,EAAE,OAAO,EACpB,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,EAC1B,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GACvB,OAAO,CAAC,OAAO,EAAE,CAAC;IAQf,QAAQ,CACZ,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;IAoCR,KAAK,CACT,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,EACvC,MAAM,EAAE,EAAE,GACT,OAAO,CAAC,EAAE,CAAC;CA+Df"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { amount, finality } from "@wormhole-foundation/sdk-base";
|
|
2
2
|
import { nativeTokenId, } from "@wormhole-foundation/sdk-definitions";
|
|
3
|
-
import { CircleV2FinalityThreshold, isCircleV2Chain } from "../consts";
|
|
3
|
+
import { CircleV2FinalityThreshold, isCircleV2Chain, shimContractsV2Legacy } from "../consts";
|
|
4
4
|
import { CCTPv2BaseRoute, } from "./cctpV2Base";
|
|
5
5
|
import { fetchExecutorQuote, validateFeeConfig } from "./helpers";
|
|
6
6
|
import { getUsdcDestinationAddress } from "../utils";
|
|
@@ -63,7 +63,7 @@ export class CCTPv2StandardExecutorRoute extends CCTPv2BaseRoute {
|
|
|
63
63
|
async quote(request, params) {
|
|
64
64
|
const { fromChain, toChain } = request;
|
|
65
65
|
try {
|
|
66
|
-
const quoteDetails = await fetchExecutorQuote(request, params, this.staticConfig, "ERC2");
|
|
66
|
+
const quoteDetails = await fetchExecutorQuote(request, params, this.staticConfig, "ERC2", this.staticConfig.useLegacyFees ? shimContractsV2Legacy : undefined);
|
|
67
67
|
const { remainingAmount, estimatedCost, gasDropOff, expiryTime } = quoteDetails;
|
|
68
68
|
// https://developers.circle.com/stablecoins/docs/required-block-confirmations
|
|
69
69
|
const eta = fromChain.chain === "Polygon"
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cctpV2Standard.js","sourceRoot":"","sources":["../../../src/routes/cctpV2Standard.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAEL,aAAa,GAEd,MAAM,sCAAsC,CAAC;AAE9C,OAAO,EAAE,yBAAyB,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cctpV2Standard.js","sourceRoot":"","sources":["../../../src/routes/cctpV2Standard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
-
import { ChainAddress, Network, routes, Signer, SourceInitiatedTransferReceipt } from "@wormhole-foundation/sdk-connect";
|
|
1
|
+
import { Chain, ChainAddress, Network, routes, Signer, SourceInitiatedTransferReceipt } from "@wormhole-foundation/sdk-connect";
|
|
2
2
|
import { CCTPExecutorRoute, QuoteDetails } from "./cctpV1";
|
|
3
3
|
import { CCTPv2ExecutorRoute, CCTPv2QuoteDetails } from "./cctpV2Base";
|
|
4
|
+
export declare function calculateReferrerFee(amount: bigint, dBps: bigint, threshold?: bigint): {
|
|
5
|
+
referrerFee: bigint;
|
|
6
|
+
remainingAmount: bigint;
|
|
7
|
+
};
|
|
4
8
|
export declare function validateFeeConfig(config: CCTPExecutorRoute.Config | CCTPv2ExecutorRoute.Config): void;
|
|
5
|
-
export declare function fetchExecutorQuote(request: routes.RouteTransferRequest<Network>, params: CCTPExecutorRoute.ValidatedParams | CCTPv2ExecutorRoute.ValidatedParams, config: CCTPExecutorRoute.Config | CCTPv2ExecutorRoute.Config, capability: "ERC1" | "ERC2"): Promise<QuoteDetails>;
|
|
9
|
+
export declare function fetchExecutorQuote(request: routes.RouteTransferRequest<Network>, params: CCTPExecutorRoute.ValidatedParams | CCTPv2ExecutorRoute.ValidatedParams, config: CCTPExecutorRoute.Config | CCTPv2ExecutorRoute.Config, capability: "ERC1" | "ERC2", legacyShimContracts?: Partial<Record<Network, Partial<Record<Chain, string>>>>): Promise<QuoteDetails>;
|
|
6
10
|
export declare function initiateTransfer(request: routes.RouteTransferRequest<Network>, signer: Signer, to: ChainAddress, params: {
|
|
7
11
|
protocol: "CCTPExecutor";
|
|
8
12
|
details: QuoteDetails;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/routes/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAIZ,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,8BAA8B,EAK/B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAW3D,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../src/routes/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EACL,YAAY,EAIZ,OAAO,EACP,MAAM,EAEN,MAAM,EAEN,8BAA8B,EAK/B,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAW3D,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAIvE,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,MAAM,GACjB;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,eAAe,EAAE,MAAM,CAAA;CAAE,CAelD;AAED,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,iBAAiB,CAAC,MAAM,GAAG,mBAAmB,CAAC,MAAM,QA4B9D;AAMD,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAC7C,MAAM,EACF,iBAAiB,CAAC,eAAe,GACjC,mBAAmB,CAAC,eAAe,EACvC,MAAM,EAAE,iBAAiB,CAAC,MAAM,GAAG,mBAAmB,CAAC,MAAM,EAC7D,UAAU,EAAE,MAAM,GAAG,MAAM,EAC3B,mBAAmB,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAC7E,OAAO,CAAC,YAAY,CAAC,CA6MvB;AAED,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,CAAC,oBAAoB,CAAC,OAAO,CAAC,EAC7C,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,YAAY,EAChB,MAAM,EACF;IAAE,QAAQ,EAAE,cAAc,CAAC;IAAC,OAAO,EAAE,YAAY,CAAA;CAAE,GACnD;IAAE,QAAQ,EAAE,gBAAgB,CAAC;IAAC,OAAO,EAAE,kBAAkB,CAAA;CAAE,GAC9D,OAAO,CAAC,8BAA8B,CAAC,CAiEzC"}
|