viem 2.23.1 → 2.23.3
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/CHANGELOG.md +38 -0
- package/_cjs/chains/definitions/b3.js +6 -0
- package/_cjs/chains/definitions/b3.js.map +1 -1
- package/_cjs/chains/definitions/b3Sepolia.js +6 -0
- package/_cjs/chains/definitions/b3Sepolia.js.map +1 -1
- package/_cjs/chains/definitions/berachainTestnet.js +6 -0
- package/_cjs/chains/definitions/berachainTestnet.js.map +1 -1
- package/_cjs/chains/definitions/donatuz.js +1 -1
- package/_cjs/chains/definitions/donatuz.js.map +1 -1
- package/_cjs/chains/definitions/hashkeyChainTestnet.js +1 -0
- package/_cjs/chains/definitions/hashkeyChainTestnet.js.map +1 -1
- package/_cjs/chains/definitions/haustTestnet.js +26 -0
- package/_cjs/chains/definitions/haustTestnet.js.map +1 -0
- package/_cjs/chains/definitions/lumoz.js +26 -0
- package/_cjs/chains/definitions/lumoz.js.map +1 -0
- package/_cjs/chains/definitions/lumozTestnet.js +20 -0
- package/_cjs/chains/definitions/lumozTestnet.js.map +1 -0
- package/_cjs/chains/definitions/newton.js +26 -0
- package/_cjs/chains/definitions/newton.js.map +1 -0
- package/_cjs/chains/definitions/peaq.js +41 -0
- package/_cjs/chains/definitions/peaq.js.map +1 -0
- package/_cjs/chains/definitions/polynomial.js +31 -0
- package/_cjs/chains/definitions/polynomial.js.map +1 -0
- package/_cjs/chains/definitions/polynomialSepolia.js +31 -0
- package/_cjs/chains/definitions/polynomialSepolia.js.map +1 -0
- package/_cjs/chains/definitions/pumpfiTestnet.js +26 -0
- package/_cjs/chains/definitions/pumpfiTestnet.js.map +1 -0
- package/_cjs/chains/definitions/story.js +7 -0
- package/_cjs/chains/definitions/story.js.map +1 -1
- package/_cjs/chains/definitions/storyAeneid.js +31 -0
- package/_cjs/chains/definitions/storyAeneid.js.map +1 -0
- package/_cjs/chains/definitions/unichain.js +21 -1
- package/_cjs/chains/definitions/unichain.js.map +1 -1
- package/_cjs/chains/definitions/worldchain.js +1 -1
- package/_cjs/chains/index.js +25 -7
- package/_cjs/chains/index.js.map +1 -1
- package/_cjs/errors/version.js +1 -1
- package/_cjs/op-stack/abis.js +7 -96
- package/_cjs/op-stack/abis.js.map +1 -1
- package/_cjs/op-stack/actions/getWithdrawalStatus.js +21 -14
- package/_cjs/op-stack/actions/getWithdrawalStatus.js.map +1 -1
- package/_cjs/op-stack/chains.js +3 -1
- package/_cjs/op-stack/chains.js.map +1 -1
- package/_cjs/zksync/actions/finalizeWithdrawal.js +99 -0
- package/_cjs/zksync/actions/finalizeWithdrawal.js.map +1 -0
- package/_cjs/zksync/constants/abis.js +724 -1
- package/_cjs/zksync/constants/abis.js.map +1 -1
- package/_cjs/zksync/constants/address.js +2 -1
- package/_cjs/zksync/constants/address.js.map +1 -1
- package/_cjs/zksync/decorators/walletL1.js +2 -0
- package/_cjs/zksync/decorators/walletL1.js.map +1 -1
- package/_cjs/zksync/errors/bridge.js +11 -1
- package/_cjs/zksync/errors/bridge.js.map +1 -1
- package/_cjs/zksync/index.js +4 -2
- package/_cjs/zksync/index.js.map +1 -1
- package/_cjs/zksync/utils/bridge/getWithdrawalL2ToL1Log.js +19 -0
- package/_cjs/zksync/utils/bridge/getWithdrawalL2ToL1Log.js.map +1 -0
- package/_cjs/zksync/utils/bridge/getWithdrawalLog.js +19 -0
- package/_cjs/zksync/utils/bridge/getWithdrawalLog.js.map +1 -0
- package/_esm/chains/definitions/b3.js +6 -0
- package/_esm/chains/definitions/b3.js.map +1 -1
- package/_esm/chains/definitions/b3Sepolia.js +6 -0
- package/_esm/chains/definitions/b3Sepolia.js.map +1 -1
- package/_esm/chains/definitions/berachainTestnet.js +6 -0
- package/_esm/chains/definitions/berachainTestnet.js.map +1 -1
- package/_esm/chains/definitions/donatuz.js +1 -1
- package/_esm/chains/definitions/donatuz.js.map +1 -1
- package/_esm/chains/definitions/hashkeyChainTestnet.js +1 -0
- package/_esm/chains/definitions/hashkeyChainTestnet.js.map +1 -1
- package/_esm/chains/definitions/haustTestnet.js +23 -0
- package/_esm/chains/definitions/haustTestnet.js.map +1 -0
- package/_esm/chains/definitions/lumoz.js +23 -0
- package/_esm/chains/definitions/lumoz.js.map +1 -0
- package/_esm/chains/definitions/lumozTestnet.js +17 -0
- package/_esm/chains/definitions/lumozTestnet.js.map +1 -0
- package/_esm/chains/definitions/newton.js +23 -0
- package/_esm/chains/definitions/newton.js.map +1 -0
- package/_esm/chains/definitions/peaq.js +38 -0
- package/_esm/chains/definitions/peaq.js.map +1 -0
- package/_esm/chains/definitions/polynomial.js +28 -0
- package/_esm/chains/definitions/polynomial.js.map +1 -0
- package/_esm/chains/definitions/polynomialSepolia.js +28 -0
- package/_esm/chains/definitions/polynomialSepolia.js.map +1 -0
- package/_esm/chains/definitions/pumpfiTestnet.js +23 -0
- package/_esm/chains/definitions/pumpfiTestnet.js.map +1 -0
- package/_esm/chains/definitions/story.js +7 -0
- package/_esm/chains/definitions/story.js.map +1 -1
- package/_esm/chains/definitions/storyAeneid.js +28 -0
- package/_esm/chains/definitions/storyAeneid.js.map +1 -0
- package/_esm/chains/definitions/unichain.js +21 -1
- package/_esm/chains/definitions/unichain.js.map +1 -1
- package/_esm/chains/definitions/worldchain.js +1 -1
- package/_esm/chains/index.js +11 -0
- package/_esm/chains/index.js.map +1 -1
- package/_esm/errors/version.js +1 -1
- package/_esm/op-stack/abis.js +7 -96
- package/_esm/op-stack/abis.js.map +1 -1
- package/_esm/op-stack/actions/getWithdrawalStatus.js +25 -14
- package/_esm/op-stack/actions/getWithdrawalStatus.js.map +1 -1
- package/_esm/op-stack/chains.js +1 -0
- package/_esm/op-stack/chains.js.map +1 -1
- package/_esm/zksync/actions/finalizeWithdrawal.js +147 -0
- package/_esm/zksync/actions/finalizeWithdrawal.js.map +1 -0
- package/_esm/zksync/constants/abis.js +723 -0
- package/_esm/zksync/constants/abis.js.map +1 -1
- package/_esm/zksync/constants/address.js +1 -0
- package/_esm/zksync/constants/address.js.map +1 -1
- package/_esm/zksync/decorators/walletL1.js +2 -0
- package/_esm/zksync/decorators/walletL1.js.map +1 -1
- package/_esm/zksync/errors/bridge.js +9 -0
- package/_esm/zksync/errors/bridge.js.map +1 -1
- package/_esm/zksync/index.js +1 -0
- package/_esm/zksync/index.js.map +1 -1
- package/_esm/zksync/utils/bridge/getWithdrawalL2ToL1Log.js +17 -0
- package/_esm/zksync/utils/bridge/getWithdrawalL2ToL1Log.js.map +1 -0
- package/_esm/zksync/utils/bridge/getWithdrawalLog.js +17 -0
- package/_esm/zksync/utils/bridge/getWithdrawalLog.js.map +1 -0
- package/_types/chains/definitions/b3.d.ts +6 -10
- package/_types/chains/definitions/b3.d.ts.map +1 -1
- package/_types/chains/definitions/b3Sepolia.d.ts +6 -10
- package/_types/chains/definitions/b3Sepolia.d.ts.map +1 -1
- package/_types/chains/definitions/berachainTestnet.d.ts +6 -10
- package/_types/chains/definitions/berachainTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/donatuz.d.ts +1 -1
- package/_types/chains/definitions/hashkeyChainTestnet.d.ts +1 -1
- package/_types/chains/definitions/hashkeyChainTestnet.d.ts.map +1 -1
- package/_types/chains/definitions/haustTestnet.d.ts +37 -0
- package/_types/chains/definitions/haustTestnet.d.ts.map +1 -0
- package/_types/chains/definitions/lumoz.d.ts +37 -0
- package/_types/chains/definitions/lumoz.d.ts.map +1 -0
- package/_types/chains/definitions/lumozTestnet.d.ts +43 -0
- package/_types/chains/definitions/lumozTestnet.d.ts.map +1 -0
- package/_types/chains/definitions/newton.d.ts +37 -0
- package/_types/chains/definitions/newton.d.ts.map +1 -0
- package/_types/chains/definitions/peaq.d.ts +34 -0
- package/_types/chains/definitions/peaq.d.ts.map +1 -0
- package/_types/chains/definitions/polynomial.d.ts +32 -0
- package/_types/chains/definitions/polynomial.d.ts.map +1 -0
- package/_types/chains/definitions/polynomialSepolia.d.ts +32 -0
- package/_types/chains/definitions/polynomialSepolia.d.ts.map +1 -0
- package/_types/chains/definitions/pumpfiTestnet.d.ts +37 -0
- package/_types/chains/definitions/pumpfiTestnet.d.ts.map +1 -0
- package/_types/chains/definitions/story.d.ts +6 -11
- package/_types/chains/definitions/story.d.ts.map +1 -1
- package/_types/chains/definitions/storyAeneid.d.ts +34 -0
- package/_types/chains/definitions/storyAeneid.d.ts.map +1 -0
- package/_types/chains/definitions/unichain.d.ts +269 -4
- package/_types/chains/definitions/unichain.d.ts.map +1 -1
- package/_types/chains/definitions/worldchain.d.ts +1 -1
- package/_types/chains/index.d.ts +11 -0
- package/_types/chains/index.d.ts.map +1 -1
- package/_types/errors/version.d.ts +1 -1
- package/_types/op-stack/abis.d.ts +7 -77
- package/_types/op-stack/abis.d.ts.map +1 -1
- package/_types/op-stack/actions/getWithdrawalStatus.d.ts.map +1 -1
- package/_types/op-stack/chains.d.ts +1 -0
- package/_types/op-stack/chains.d.ts.map +1 -1
- package/_types/zksync/actions/finalizeWithdrawal.d.ts +73 -0
- package/_types/zksync/actions/finalizeWithdrawal.d.ts.map +1 -0
- package/_types/zksync/constants/abis.d.ts +567 -0
- package/_types/zksync/constants/abis.d.ts.map +1 -1
- package/_types/zksync/constants/address.d.ts +1 -0
- package/_types/zksync/constants/address.d.ts.map +1 -1
- package/_types/zksync/decorators/walletL1.d.ts +31 -0
- package/_types/zksync/decorators/walletL1.d.ts.map +1 -1
- package/_types/zksync/errors/bridge.d.ts +9 -0
- package/_types/zksync/errors/bridge.d.ts.map +1 -1
- package/_types/zksync/index.d.ts +1 -0
- package/_types/zksync/index.d.ts.map +1 -1
- package/_types/zksync/utils/bridge/getWithdrawalL2ToL1Log.d.ts +20 -0
- package/_types/zksync/utils/bridge/getWithdrawalL2ToL1Log.d.ts.map +1 -0
- package/_types/zksync/utils/bridge/getWithdrawalLog.d.ts +20 -0
- package/_types/zksync/utils/bridge/getWithdrawalLog.d.ts.map +1 -0
- package/chains/definitions/b3.ts +6 -0
- package/chains/definitions/b3Sepolia.ts +6 -0
- package/chains/definitions/berachainTestnet.ts +6 -0
- package/chains/definitions/donatuz.ts +1 -1
- package/chains/definitions/hashkeyChainTestnet.ts +1 -0
- package/chains/definitions/haustTestnet.ts +23 -0
- package/chains/definitions/lumoz.ts +23 -0
- package/chains/definitions/lumozTestnet.ts +17 -0
- package/chains/definitions/newton.ts +23 -0
- package/chains/definitions/peaq.ts +38 -0
- package/chains/definitions/polynomial.ts +28 -0
- package/chains/definitions/polynomialSepolia.ts +28 -0
- package/chains/definitions/pumpfiTestnet.ts +23 -0
- package/chains/definitions/story.ts +7 -0
- package/chains/definitions/storyAeneid.ts +28 -0
- package/chains/definitions/unichain.ts +22 -1
- package/chains/definitions/worldchain.ts +1 -1
- package/chains/index.ts +11 -0
- package/errors/version.ts +1 -1
- package/op-stack/abis.ts +7 -96
- package/op-stack/actions/getWithdrawalStatus.ts +28 -17
- package/op-stack/chains.ts +1 -0
- package/package.json +1 -1
- package/zksync/actions/finalizeWithdrawal.ts +248 -0
- package/zksync/constants/abis.ts +724 -0
- package/zksync/constants/address.ts +3 -0
- package/zksync/decorators/walletL1.ts +48 -0
- package/zksync/errors/bridge.ts +17 -0
- package/zksync/index.ts +6 -0
- package/zksync/utils/bridge/getWithdrawalL2ToL1Log.ts +47 -0
- package/zksync/utils/bridge/getWithdrawalLog.ts +47 -0
@@ -114,22 +114,29 @@ async function getWithdrawalStatus(client, parameters) {
|
|
114
114
|
if (checkWithdrawalResult.status === 'rejected') {
|
115
115
|
const error = checkWithdrawalResult.reason;
|
116
116
|
if (error.cause instanceof contract_js_1.ContractFunctionRevertedError) {
|
117
|
-
const
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
'OptimismPortal: withdrawal has not been proven by proof submitter address yet'
|
122
|
-
|
123
|
-
'
|
117
|
+
const errorCauses = {
|
118
|
+
'ready-to-prove': [
|
119
|
+
'OptimismPortal: invalid game type',
|
120
|
+
'OptimismPortal: withdrawal has not been proven yet',
|
121
|
+
'OptimismPortal: withdrawal has not been proven by proof submitter address yet',
|
122
|
+
'OptimismPortal: dispute game created before respected game type was updated',
|
123
|
+
'InvalidGameType',
|
124
|
+
'LegacyGame',
|
125
|
+
],
|
126
|
+
'waiting-to-finalize': [
|
127
|
+
'OptimismPortal: proven withdrawal has not matured yet',
|
128
|
+
'OptimismPortal: output proposal has not been finalized yet',
|
129
|
+
'OptimismPortal: output proposal in air-gap',
|
130
|
+
],
|
131
|
+
};
|
132
|
+
const errors = [
|
133
|
+
error.cause.data?.errorName,
|
134
|
+
error.cause.data?.args?.[0],
|
135
|
+
];
|
136
|
+
if (errorCauses['ready-to-prove'].some((cause) => errors.includes(cause)))
|
124
137
|
return 'ready-to-prove';
|
125
|
-
if (
|
126
|
-
'OptimismPortal: proven withdrawal has not matured yet' ||
|
127
|
-
errorMessage ===
|
128
|
-
'OptimismPortal: output proposal has not been finalized yet' ||
|
129
|
-
errorMessage === 'OptimismPortal: output proposal in air-gap')
|
138
|
+
if (errorCauses['waiting-to-finalize'].some((cause) => errors.includes(cause)))
|
130
139
|
return 'waiting-to-finalize';
|
131
|
-
if (error.cause.data?.errorName === 'InvalidGameType')
|
132
|
-
return 'ready-to-prove';
|
133
140
|
}
|
134
141
|
throw checkWithdrawalResult.reason;
|
135
142
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"getWithdrawalStatus.js","sourceRoot":"","sources":["../../../op-stack/actions/getWithdrawalStatus.ts"],"names":[],"mappings":";;AAoHA,
|
1
|
+
{"version":3,"file":"getWithdrawalStatus.js","sourceRoot":"","sources":["../../../op-stack/actions/getWithdrawalStatus.ts"],"names":[],"mappings":"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"}
|
package/_cjs/op-stack/chains.js
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
"use strict";
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
-
exports.zoraTestnet = exports.zoraSepolia = exports.zora = exports.worldchainSepolia = exports.worldchain = exports.unichainSepolia = exports.soneiumMinato = exports.soneium = exports.snaxTestnet = exports.snax = exports.shape = exports.pgnTestnet = exports.pgn = exports.optimismSepolia = exports.optimismGoerli = exports.optimism = exports.metalL2 = exports.inkSepolia = exports.fraxtalTestnet = exports.fraxtal = exports.blast = exports.baseSepolia = exports.baseGoerli = exports.base = exports.ancient8Sepolia = exports.ancient8 = void 0;
|
3
|
+
exports.zoraTestnet = exports.zoraSepolia = exports.zora = exports.worldchainSepolia = exports.worldchain = exports.unichainSepolia = exports.unichain = exports.soneiumMinato = exports.soneium = exports.snaxTestnet = exports.snax = exports.shape = exports.pgnTestnet = exports.pgn = exports.optimismSepolia = exports.optimismGoerli = exports.optimism = exports.metalL2 = exports.inkSepolia = exports.fraxtalTestnet = exports.fraxtal = exports.blast = exports.baseSepolia = exports.baseGoerli = exports.base = exports.ancient8Sepolia = exports.ancient8 = void 0;
|
4
4
|
var ancient8_js_1 = require("../chains/definitions/ancient8.js");
|
5
5
|
Object.defineProperty(exports, "ancient8", { enumerable: true, get: function () { return ancient8_js_1.ancient8; } });
|
6
6
|
var ancient8Sepolia_js_1 = require("../chains/definitions/ancient8Sepolia.js");
|
@@ -41,6 +41,8 @@ var soneium_js_1 = require("../chains/definitions/soneium.js");
|
|
41
41
|
Object.defineProperty(exports, "soneium", { enumerable: true, get: function () { return soneium_js_1.soneium; } });
|
42
42
|
var soneiumMinato_js_1 = require("../chains/definitions/soneiumMinato.js");
|
43
43
|
Object.defineProperty(exports, "soneiumMinato", { enumerable: true, get: function () { return soneiumMinato_js_1.soneiumMinato; } });
|
44
|
+
var unichain_js_1 = require("../chains/definitions/unichain.js");
|
45
|
+
Object.defineProperty(exports, "unichain", { enumerable: true, get: function () { return unichain_js_1.unichain; } });
|
44
46
|
var unichainSepolia_js_1 = require("../chains/definitions/unichainSepolia.js");
|
45
47
|
Object.defineProperty(exports, "unichainSepolia", { enumerable: true, get: function () { return unichainSepolia_js_1.unichainSepolia; } });
|
46
48
|
var worldchain_js_1 = require("../chains/definitions/worldchain.js");
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"chains.js","sourceRoot":"","sources":["../../op-stack/chains.ts"],"names":[],"mappings":";;;AACA,iEAA4D;AAAnD,uGAAA,QAAQ,OAAA;AACjB,+EAA0E;AAAjE,qHAAA,eAAe,OAAA;AACxB,yDAAoD;AAA3C,+FAAA,IAAI,OAAA;AACb,qEAAgE;AAAvD,2GAAA,UAAU,OAAA;AACnB,uEAAkE;AAAzD,6GAAA,WAAW,OAAA;AACpB,2DAAsD;AAA7C,iGAAA,KAAK,OAAA;AACd,+DAA0D;AAAjD,qGAAA,OAAO,OAAA;AAChB,6EAAwE;AAA/D,mHAAA,cAAc,OAAA;AACvB,qEAAgE;AAAvD,2GAAA,UAAU,OAAA;AACnB,+DAA0D;AAAjD,qGAAA,OAAO,OAAA;AAChB,iEAA4D;AAAnD,uGAAA,QAAQ,OAAA;AACjB,6EAAwE;AAA/D,mHAAA,cAAc,OAAA;AACvB,+EAA0E;AAAjE,qHAAA,eAAe,OAAA;AACxB,uDAAkD;AAAzC,6FAAA,GAAG,OAAA;AACZ,qEAAgE;AAAvD,2GAAA,UAAU,OAAA;AACnB,2DAAsD;AAA7C,iGAAA,KAAK,OAAA;AACd,yDAAoD;AAA3C,+FAAA,IAAI,OAAA;AACb,uEAAkE;AAAzD,6GAAA,WAAW,OAAA;AACpB,+DAA0D;AAAjD,qGAAA,OAAO,OAAA;AAChB,2EAAsE;AAA7D,iHAAA,aAAa,OAAA;AACtB,+EAA0E;AAAjE,qHAAA,eAAe,OAAA;AACxB,qEAAgE;AAAvD,2GAAA,UAAU,OAAA;AACnB,mFAA8E;AAArE,yHAAA,iBAAiB,OAAA;AAC1B,yDAAoD;AAA3C,+FAAA,IAAI,OAAA;AACb,uEAAkE;AAAzD,6GAAA,WAAW,OAAA;AACpB,uEAAkE;AAAzD,6GAAA,WAAW,OAAA"}
|
1
|
+
{"version":3,"file":"chains.js","sourceRoot":"","sources":["../../op-stack/chains.ts"],"names":[],"mappings":";;;AACA,iEAA4D;AAAnD,uGAAA,QAAQ,OAAA;AACjB,+EAA0E;AAAjE,qHAAA,eAAe,OAAA;AACxB,yDAAoD;AAA3C,+FAAA,IAAI,OAAA;AACb,qEAAgE;AAAvD,2GAAA,UAAU,OAAA;AACnB,uEAAkE;AAAzD,6GAAA,WAAW,OAAA;AACpB,2DAAsD;AAA7C,iGAAA,KAAK,OAAA;AACd,+DAA0D;AAAjD,qGAAA,OAAO,OAAA;AAChB,6EAAwE;AAA/D,mHAAA,cAAc,OAAA;AACvB,qEAAgE;AAAvD,2GAAA,UAAU,OAAA;AACnB,+DAA0D;AAAjD,qGAAA,OAAO,OAAA;AAChB,iEAA4D;AAAnD,uGAAA,QAAQ,OAAA;AACjB,6EAAwE;AAA/D,mHAAA,cAAc,OAAA;AACvB,+EAA0E;AAAjE,qHAAA,eAAe,OAAA;AACxB,uDAAkD;AAAzC,6FAAA,GAAG,OAAA;AACZ,qEAAgE;AAAvD,2GAAA,UAAU,OAAA;AACnB,2DAAsD;AAA7C,iGAAA,KAAK,OAAA;AACd,yDAAoD;AAA3C,+FAAA,IAAI,OAAA;AACb,uEAAkE;AAAzD,6GAAA,WAAW,OAAA;AACpB,+DAA0D;AAAjD,qGAAA,OAAO,OAAA;AAChB,2EAAsE;AAA7D,iHAAA,aAAa,OAAA;AACtB,iEAA4D;AAAnD,uGAAA,QAAQ,OAAA;AACjB,+EAA0E;AAAjE,qHAAA,eAAe,OAAA;AACxB,qEAAgE;AAAvD,2GAAA,UAAU,OAAA;AACnB,mFAA8E;AAArE,yHAAA,iBAAiB,OAAA;AAC1B,yDAAoD;AAA3C,+FAAA,IAAI,OAAA;AACb,uEAAkE;AAAzD,6GAAA,WAAW,OAAA;AACpB,uEAAkE;AAAzD,6GAAA,WAAW,OAAA"}
|
@@ -0,0 +1,99 @@
|
|
1
|
+
"use strict";
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
3
|
+
exports.finalizeWithdrawal = finalizeWithdrawal;
|
4
|
+
const readContract_js_1 = require("../../actions/public/readContract.js");
|
5
|
+
const sendTransaction_js_1 = require("../../actions/wallet/sendTransaction.js");
|
6
|
+
const account_js_1 = require("../../errors/account.js");
|
7
|
+
const chain_js_1 = require("../../errors/chain.js");
|
8
|
+
const index_js_1 = require("../../utils/index.js");
|
9
|
+
const abis_js_1 = require("../constants/abis.js");
|
10
|
+
const address_js_1 = require("../constants/address.js");
|
11
|
+
const bridge_js_1 = require("../errors/bridge.js");
|
12
|
+
const getWithdrawalL2ToL1Log_js_1 = require("../utils/bridge/getWithdrawalL2ToL1Log.js");
|
13
|
+
const getWithdrawalLog_js_1 = require("../utils/bridge/getWithdrawalLog.js");
|
14
|
+
const getDefaultBridgeAddresses_js_1 = require("./getDefaultBridgeAddresses.js");
|
15
|
+
const getLogProof_js_1 = require("./getLogProof.js");
|
16
|
+
async function finalizeWithdrawal(client, parameters) {
|
17
|
+
const { account: account_ = client.account, client: l2Client, hash, index = 0, ...rest } = parameters;
|
18
|
+
const account = account_ ? (0, index_js_1.parseAccount)(account_) : client.account;
|
19
|
+
if (!account)
|
20
|
+
throw new account_js_1.AccountNotFoundError({
|
21
|
+
docsPath: '/docs/actions/wallet/sendTransaction',
|
22
|
+
});
|
23
|
+
if (!l2Client.chain)
|
24
|
+
throw new chain_js_1.ChainNotFoundError();
|
25
|
+
const { l1BatchNumber, l2MessageIndex, l2TxNumberInBlock, message, sender, proof, } = await getFinalizeWithdrawalParams(l2Client, { hash, index });
|
26
|
+
let l1Bridge;
|
27
|
+
if ((0, index_js_1.isAddressEqual)(sender, address_js_1.l2BaseTokenAddress))
|
28
|
+
l1Bridge = (await (0, getDefaultBridgeAddresses_js_1.getDefaultBridgeAddresses)(l2Client)).sharedL1;
|
29
|
+
else if (!(await isLegacyBridge(l2Client, { address: sender })))
|
30
|
+
l1Bridge = await (0, readContract_js_1.readContract)(l2Client, {
|
31
|
+
address: sender,
|
32
|
+
abi: abis_js_1.l2SharedBridgeAbi,
|
33
|
+
functionName: 'l1SharedBridge',
|
34
|
+
args: [],
|
35
|
+
});
|
36
|
+
else
|
37
|
+
l1Bridge = await (0, readContract_js_1.readContract)(l2Client, {
|
38
|
+
address: sender,
|
39
|
+
abi: abis_js_1.l2SharedBridgeAbi,
|
40
|
+
functionName: 'l1Bridge',
|
41
|
+
args: [],
|
42
|
+
});
|
43
|
+
const data = (0, index_js_1.encodeFunctionData)({
|
44
|
+
abi: abis_js_1.l1SharedBridgeAbi,
|
45
|
+
functionName: 'finalizeWithdrawal',
|
46
|
+
args: [
|
47
|
+
BigInt(l2Client.chain.id),
|
48
|
+
l1BatchNumber,
|
49
|
+
BigInt(l2MessageIndex),
|
50
|
+
Number(l2TxNumberInBlock),
|
51
|
+
message,
|
52
|
+
proof,
|
53
|
+
],
|
54
|
+
});
|
55
|
+
return await (0, sendTransaction_js_1.sendTransaction)(client, {
|
56
|
+
account,
|
57
|
+
to: l1Bridge,
|
58
|
+
data,
|
59
|
+
value: 0n,
|
60
|
+
...rest,
|
61
|
+
});
|
62
|
+
}
|
63
|
+
async function getFinalizeWithdrawalParams(client, parameters) {
|
64
|
+
const { hash } = parameters;
|
65
|
+
const { log, l1BatchTxId } = await (0, getWithdrawalLog_js_1.getWithdrawalLog)(client, parameters);
|
66
|
+
const { l2ToL1LogIndex } = await (0, getWithdrawalL2ToL1Log_js_1.getWithdrawalL2ToL1Log)(client, parameters);
|
67
|
+
const sender = (0, index_js_1.slice)(log.topics[1], 12);
|
68
|
+
const proof = await (0, getLogProof_js_1.getLogProof)(client, {
|
69
|
+
txHash: hash,
|
70
|
+
index: l2ToL1LogIndex,
|
71
|
+
});
|
72
|
+
if (!proof) {
|
73
|
+
throw new bridge_js_1.WithdrawalLogNotFoundError({ hash });
|
74
|
+
}
|
75
|
+
const [message] = (0, index_js_1.decodeAbiParameters)([{ type: 'bytes' }], log.data);
|
76
|
+
return {
|
77
|
+
l1BatchNumber: log.l1BatchNumber,
|
78
|
+
l2MessageIndex: proof.id,
|
79
|
+
l2TxNumberInBlock: l1BatchTxId,
|
80
|
+
message,
|
81
|
+
sender,
|
82
|
+
proof: proof.proof,
|
83
|
+
};
|
84
|
+
}
|
85
|
+
async function isLegacyBridge(client, parameters) {
|
86
|
+
try {
|
87
|
+
await (0, readContract_js_1.readContract)(client, {
|
88
|
+
address: parameters.address,
|
89
|
+
abi: abis_js_1.l2SharedBridgeAbi,
|
90
|
+
functionName: 'l1SharedBridge',
|
91
|
+
args: [],
|
92
|
+
});
|
93
|
+
return false;
|
94
|
+
}
|
95
|
+
catch (_e) {
|
96
|
+
return true;
|
97
|
+
}
|
98
|
+
}
|
99
|
+
//# sourceMappingURL=finalizeWithdrawal.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"finalizeWithdrawal.js","sourceRoot":"","sources":["../../../zksync/actions/finalizeWithdrawal.ts"],"names":[],"mappings":"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"}
|