@ocap/client 1.31.9 → 1.32.1

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/bridge.js CHANGED
@@ -15,10 +15,14 @@
15
15
  */
16
16
  const {
17
17
  BRIDGE_MEMBERSHIP_ACTION,
18
+ bridgeGovDocKey,
19
+ bridgeGovIndexKey,
18
20
  computeBridgeEndpointsHash,
19
21
  computeBridgeMembershipDigest,
20
22
  computeBridgeOwnerAttestationDigest,
21
- signBridgeDigest
23
+ computeEvmGovernanceConfigHash,
24
+ signBridgeDigest,
25
+ signBridgeEvmGovernanceSync
22
26
  } = require('@ocap/mcrypto');
23
27
  const { toRollupAddress: toRollupAddressCbor, toBridgeReserveAddress } = require('@arcblock/did-util/cbor');
24
28
  const { toHex, toBuffer } = require('@ocap/util');
@@ -98,6 +102,7 @@ function buildCreateItx(o) {
98
102
  initialReserve: o.initialReserve || '0'
99
103
  });
100
104
  if (o.pausers) value.pausers = o.pausers;
105
+ if (o.evmGovernance !== undefined) value.evmGovernance = o.evmGovernance;
101
106
 
102
107
  const itx = {
103
108
  address: '',
@@ -195,6 +200,26 @@ function buildUpdateItx(rollup, patch) {
195
200
  return { rollup, data: wrap(patch) };
196
201
  }
197
202
 
203
+ /** Sign a `BridgeEvmGovernanceSync` message (`{ bridge, version, configHash, expiresAt }`) with `wallet`. */
204
+ function signEvmGovernanceSync(wallet, chainId, msg) {
205
+ return signBridgeEvmGovernanceSync(chainId, {
206
+ bridge: msg.bridge,
207
+ version: BigInt(msg.version),
208
+ configHash: msg.configHash,
209
+ expiresAt: BigInt(msg.expiresAt)
210
+ }, secretOf(wallet));
211
+ }
212
+
213
+ /** Build the `update_rollup` itx for a `govProposalVote` governance proposal / co-sign submission (#1880). */
214
+ function buildGovProposalVoteItx(rollup, govProposalVote) {
215
+ return { rollup, data: wrap({ govProposalVote }) };
216
+ }
217
+
218
+ /** Build the `update_rollup` itx for a standalone Path-A `evmGovernance` + `evmGovernanceSync` update (#1880). */
219
+ function buildEvmGovernanceSyncItx(rollup, { evmGovernance, expiresAt, signatures }) {
220
+ return { rollup, data: wrap({ evmGovernance, evmGovernanceSync: { expiresAt, signatures } }) };
221
+ }
222
+
198
223
  function createBridgeGovernance(client, deps = {}) {
199
224
  const sendMulti = async (kind, { wallet, signers = [], itx }, extra) => {
200
225
  const tx = {
@@ -212,13 +237,18 @@ function createBridgeGovernance(client, deps = {}) {
212
237
  };
213
238
 
214
239
  return {
240
+ bridgeGovIndexKey,
241
+ bridgeGovDocKey,
215
242
  buildCreateItx,
216
243
  signMembership,
217
244
  signOwnerAttestation,
245
+ signEvmGovernanceSync,
218
246
  membershipDigest,
219
247
  planMembership,
220
248
  buildMembershipData,
221
249
  buildUpdateItx,
250
+ buildGovProposalVoteItx,
251
+ buildEvmGovernanceSyncItx,
222
252
  toBridgeReserveAddress,
223
253
  toHex,
224
254
 
@@ -232,6 +262,22 @@ function createBridgeGovernance(client, deps = {}) {
232
262
  /** owner + quorum `update_rollup` with a typed patch; use `proposeOwner` / `cancelOwnerProposal` keys for ownership */
233
263
  update: ({ rollup, patch, wallet, signers }, extra) => sendMulti('UpdateRollupTx', { wallet, signers, itx: buildUpdateItx(rollup, patch) }, extra),
234
264
 
265
+ /** single gas-payer `update_rollup(govProposalVote)` submission (never touches `owner` OCAP nonce) */
266
+ voteProposal: ({ rollup, govProposalVote, wallet }, extra) => client.sendUpdateRollupTx({ tx: { itx: buildGovProposalVoteItx(rollup, govProposalVote) }, wallet }, extra),
267
+
268
+ /** Path-A `evmGovernance` roster sync signed by the previous EVM governance roster */
269
+ syncEvmGovernance: async ({ rollup, evmGovernance, expiresAt, signers = [], signatures, wallet }, extra) => {
270
+ let sigs = signatures;
271
+ if (!sigs) {
272
+ const chainId = (await client.getContext()).chainId;
273
+ const configHash = computeEvmGovernanceConfigHash(evmGovernance);
274
+ const msg = { bridge: rollup, version: evmGovernance.version, configHash, expiresAt };
275
+ sigs = signers.map(w => signEvmGovernanceSync(w, chainId, msg));
276
+ }
277
+ const itx = buildEvmGovernanceSyncItx(rollup, { evmGovernance, expiresAt, signatures: sigs });
278
+ return client.sendUpdateRollupTx({ tx: { itx }, wallet }, extra);
279
+ },
280
+
235
281
  /** join: the joiner, the owner and an active-epoch quorum approve BridgeMembership; anyone submits */
236
282
  join: async ({ rollup, body, change, endpoint, approvers, wallet }, extra) => {
237
283
  const chainId = (await client.getContext()).chainId;
@@ -277,12 +323,17 @@ function createBridgeGovernance(client, deps = {}) {
277
323
 
278
324
  module.exports = {
279
325
  BRIDGE_MEMBERSHIP_ACTION,
326
+ bridgeGovDocKey,
327
+ bridgeGovIndexKey,
280
328
  buildCreateItx,
329
+ buildEvmGovernanceSyncItx,
330
+ buildGovProposalVoteItx,
281
331
  buildMembershipData,
282
332
  buildUpdateItx,
283
333
  createBridgeGovernance,
284
334
  membershipDigest,
285
335
  planMembership,
336
+ signEvmGovernanceSync,
286
337
  signMembership,
287
338
  signOwnerAttestation,
288
339
  sortAddresses
package/lib/bridge.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/bridge.js"],"names":["BRIDGE_MEMBERSHIP_ACTION","computeBridgeEndpointsHash","computeBridgeMembershipDigest","computeBridgeOwnerAttestationDigest","signBridgeDigest","require","toRollupAddress","toRollupAddressCbor","toBridgeReserveAddress","toHex","toBuffer","lc","s","String","toLowerCase","sortAddresses","list","Set","map","sort","a","b","BigInt","secretOf","wallet","sk","secretKey","Error","membershipDigest","msg","validators","endpointsHash","endpoints","rest","Object","assign","signMembership","signOwnerAttestation","PARAM_KEYS","buildCreateItx","o","x","address","epoch","activeFrom","threshold","voucherValidity","value","version","ethChainId","gateway","fromEntries","k","params","withdrawFee","epochs","salt","initialReserve","pausers","itx","tokenAddress","vaultAddress","contractAddress","ethToken","seedValidators","pk","owner","publicKey","endpoint","ownerEndpoint","minBlockConfirmation","data","type","attestation","ethOwner","signature","ocapChainId","chainId","ocapToken","consents","bridge","action","CREATE","ethOwnerAttestation","planMembership","body","change","last","length","v","validator","filter","buildMembershipData","approvers","keys","members","forEach","JOIN","LEAVE","signatures","w","wrap","buildUpdateItx","rollup","patch","createBridgeGovernance","client","deps","sendMulti","kind","signers","extra","tx","from","signer","encoded","object","create","opts","getContext","hash","sendCreateRollupTx","reserve","update","join","sendJoinRollupTx","leave","sendLeaveRollupTx","pause","resume","close","message","depositCutoffEthBlock","migrateVault","to","migrateReserve","module","exports"],"mappings":"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","file":"bridge.js","sourcesContent":["/**\n * SDK helpers for the on-chain bridge governance (bridge/docs/ocap-protocols.md §v2.2).\n *\n * A v2 bridge is a `RollupState` whose `data.value.version == 2`. These helpers build, sign and submit the governance\n * transactions of the existing rollup protocols for such a bridge:\n *\n * - pure builders (no network): `buildCreateItx`, `signMembership`, `buildMembershipData`, `buildUpdateData`, ...\n * - flows on a client: `client.bridge.create / update / join / leave / pause / resume / close / migrateVault /\n * migrateReserve`, each building the itx, collecting the signatures of the listed wallets and sending the tx.\n *\n * Wallets are `@ocap/wallet` objects. Governance approvals (BridgeMembership, BridgeOwnerAttestation) are EIP-712\n * signatures made with the wallet's secp256k1 key, so owners, validators and the Ethereum owner must hold such keys.\n */\nconst {\n BRIDGE_MEMBERSHIP_ACTION,\n computeBridgeEndpointsHash,\n computeBridgeMembershipDigest,\n computeBridgeOwnerAttestationDigest,\n signBridgeDigest,\n} = require('@ocap/mcrypto');\nconst { toRollupAddress: toRollupAddressCbor, toBridgeReserveAddress } = require('@arcblock/did-util/cbor');\nconst { toHex, toBuffer } = require('@ocap/util');\n\nconst lc = (s) => String(s).toLowerCase();\nconst sortAddresses = (list) =>\n [...new Set(list.map(lc))].sort((a, b) => (BigInt(a) < BigInt(b) ? -1 : BigInt(a) > BigInt(b) ? 1 : 0));\n\nconst secretOf = (wallet) => {\n const sk = wallet.secretKey;\n if (!sk) throw new Error('A wallet with a secret key is required to sign a bridge approval');\n return typeof sk === 'string' ? toBuffer(sk) : sk;\n};\n\n/** EIP-712 digest of a BridgeMembership message (validators are sorted ascending for you). */\nfunction membershipDigest(msg) {\n const validators = sortAddresses(msg.validators);\n // `endpoints`: { address -> url } of every listed validator; it is bound into the digest\n const endpointsHash = computeBridgeEndpointsHash(validators.map((a) => msg.endpoints[a] || msg.endpoints[lc(a)]));\n const rest = Object.assign({}, msg);\n delete rest.endpoints;\n return computeBridgeMembershipDigest(Object.assign(rest, { validators, endpointsHash }));\n}\n\n/** Sign a BridgeMembership message with the secp256k1 key of `wallet`. */\nfunction signMembership(wallet, msg) {\n return signBridgeDigest(membershipDigest(msg), secretOf(wallet));\n}\n\n/** Sign a BridgeOwnerAttestation message (the Ethereum owner of the token proves it consents to this bridge). */\nfunction signOwnerAttestation(wallet, msg) {\n return signBridgeDigest(computeBridgeOwnerAttestationDigest(msg), secretOf(wallet));\n}\n\nconst PARAM_KEYS = [\n 'minDeposit',\n 'minWithdraw',\n 'maxWithdraw',\n 'releaseDailyCap',\n 'refundDailyCap',\n 'releaseGrace',\n 'refundDelay',\n 'transitionPeriod',\n];\n\n/**\n * Build the itx of a v2 `create_rollup`, address and all approvals included.\n *\n * @param {object} o\n * @param {string} o.chainId - OCAP chain id (part of every signed struct)\n * @param {string} o.tokenAddress - the OCAP token\n * @param {string} o.ethToken - the Ethereum token (contract_address)\n * @param {string} [o.vaultAddress] - the Ethereum vault\n * @param {object} o.owner - wallet of the token owner (authority); becomes the bridge owner\n * @param {string} o.ownerEndpoint - endpoint recorded for the owner seed\n * @param {string} o.ethChainId\n * @param {string} o.gateway\n * @param {object} o.params - minDeposit, minWithdraw, maxWithdraw, releaseDailyCap, refundDailyCap, releaseGrace, refundDelay, transitionPeriod\n * @param {Array<{wallet: object, endpoint: string}>} o.validators - epoch-1 operators, each signs a consent\n * @param {number} o.threshold\n * @param {number} o.voucherValidity\n * @param {object} o.ethOwner - wallet of the Ethereum owner signing the attestation\n * @param {string} o.salt - bytes32 hex\n * @param {string} [o.initialReserve='0']\n * @param {string[]} [o.pausers]\n * @param {number} [o.minBlockConfirmation=12]\n * @param {Function} [o.toRollupAddress] - address function matching the tx encoding (defaults to cbor)\n */\nfunction buildCreateItx(o) {\n const toRollupAddress = o.toRollupAddress || toRollupAddressCbor;\n const validators = sortAddresses(o.validators.map((x) => x.wallet.address));\n const epoch = {\n epoch: 1,\n activeFrom: 0,\n threshold: o.threshold,\n validators,\n voucherValidity: o.voucherValidity,\n };\n const value = Object.assign(\n {\n version: 2,\n ethChainId: String(o.ethChainId),\n gateway: lc(o.gateway),\n },\n Object.fromEntries(PARAM_KEYS.map((k) => [k, o.params[k]])),\n {\n withdrawFee: '0',\n epochs: [epoch],\n salt: lc(o.salt),\n initialReserve: o.initialReserve || '0',\n }\n );\n if (o.pausers) value.pausers = o.pausers;\n\n const itx = {\n address: '',\n tokenAddress: o.tokenAddress,\n vaultAddress: o.vaultAddress || '',\n contractAddress: o.ethToken,\n seedValidators: [{ pk: o.owner.publicKey, address: o.owner.address, endpoint: o.ownerEndpoint }],\n minBlockConfirmation: o.minBlockConfirmation || 12,\n data: { type: 'json', value },\n };\n // The bridge address is computed over the itx WITHOUT the attestation and the consents (they sign over it)\n itx.address = toRollupAddress(itx);\n\n const attestation = {\n address: lc(o.ethOwner.address),\n signature: signOwnerAttestation(o.ethOwner, {\n ocapChainId: o.chainId,\n salt: value.salt,\n ocapToken: o.tokenAddress,\n ethChainId: value.ethChainId,\n gateway: value.gateway,\n ethToken: lc(o.ethToken),\n }),\n };\n const endpoints = Object.fromEntries(o.validators.map((x) => [lc(x.wallet.address), x.endpoint]));\n const consents = o.validators.map(({ wallet, endpoint }) => ({\n address: wallet.address,\n endpoint,\n signature: signMembership(wallet, {\n ocapChainId: o.chainId,\n bridge: itx.address,\n epoch: 1,\n validators,\n threshold: o.threshold,\n activeFrom: 0,\n voucherValidity: o.voucherValidity,\n endpoints,\n action: BRIDGE_MEMBERSHIP_ACTION.CREATE,\n }),\n }));\n\n return Object.assign({}, itx, {\n data: { type: 'json', value: Object.assign({}, value, { ethOwnerAttestation: attestation, consents }) },\n });\n}\n\n/**\n * Next epoch of a join / leave computed from the bridge body. `change` = { validator, threshold, activeFrom,\n * voucherValidity }. Returns the epoch the chain will derive, to be signed by owner + quorum (+ joiner).\n */\nfunction planMembership(body, action, change) {\n const last = body.epochs[body.epochs.length - 1];\n const v = lc(change.validator);\n const validators =\n action === 'join' ? sortAddresses([...last.validators, v]) : sortAddresses(last.validators.filter((x) => x !== v));\n return {\n epoch: last.epoch + 1,\n validators,\n threshold: change.threshold,\n activeFrom: change.activeFrom,\n voucherValidity: change.voucherValidity,\n };\n}\n\n/**\n * Build `itx.data` of a join / leave and sign it with `approvers` (owner, quorum members, and the joiner for a join).\n */\nfunction buildMembershipData({ chainId, bridge, body, action, change, approvers }) {\n const epoch = planMembership(body, action, change);\n // endpoints of the stored members; a joiner brings its own (`change.endpoint`, also sent as itx.endpoint)\n const endpoints = {};\n Object.keys(body.members).forEach((k) => {\n endpoints[lc(k)] = body.members[k].endpoint;\n });\n if (action === 'join') endpoints[lc(change.validator)] = change.endpoint;\n const msg = Object.assign({ ocapChainId: chainId, bridge }, epoch, {\n endpoints,\n action: action === 'join' ? BRIDGE_MEMBERSHIP_ACTION.JOIN : BRIDGE_MEMBERSHIP_ACTION.LEAVE,\n });\n return {\n type: 'json',\n value: {\n validator: change.validator,\n threshold: change.threshold,\n activeFrom: change.activeFrom,\n voucherValidity: change.voucherValidity,\n signatures: approvers.map((w) => signMembership(w, msg)),\n },\n };\n}\n\nconst wrap = (value) => ({ type: 'json', value });\n\n/** Typed `update_rollup` itx. `patch` holds allow-listed keys only (see the design doc). */\nfunction buildUpdateItx(rollup, patch) {\n return { rollup, data: wrap(patch) };\n}\n\nfunction createBridgeGovernance(client, deps = {}) {\n const sendMulti = async (kind, { wallet, signers = [], itx }, extra) => {\n const tx = {\n from: wallet.address,\n pk: wallet.publicKey,\n itx,\n signatures: signers.map((w) => ({ signer: w.address, pk: w.publicKey, signature: '' })),\n };\n let encoded = (await client[`encode${kind}`]({ tx, wallet })).object;\n for (const w of signers) {\n // eslint-disable-next-line no-await-in-loop\n encoded = await client[`multiSign${kind}`]({ tx: encoded, wallet: w });\n }\n return client[`send${kind}`]({ tx: encoded, wallet }, extra);\n };\n\n return {\n buildCreateItx,\n signMembership,\n signOwnerAttestation,\n membershipDigest,\n planMembership,\n buildMembershipData,\n buildUpdateItx,\n toBridgeReserveAddress,\n toHex,\n\n /** create a bridge; `owner` signs (and, for the official token, must be the moderator) */\n create: async (opts, extra) => {\n const itx = buildCreateItx(\n Object.assign({ chainId: (await client.getContext()).chainId, toRollupAddress: deps.toRollupAddress }, opts)\n );\n const hash = await client.sendCreateRollupTx({ tx: { itx }, wallet: opts.owner }, extra);\n return { hash, address: itx.address, reserve: toBridgeReserveAddress(itx.address) };\n },\n\n /** owner + quorum `update_rollup` with a typed patch; use `proposeOwner` / `cancelOwnerProposal` keys for ownership */\n update: ({ rollup, patch, wallet, signers }, extra) =>\n sendMulti('UpdateRollupTx', { wallet, signers, itx: buildUpdateItx(rollup, patch) }, extra),\n\n /** join: the joiner, the owner and an active-epoch quorum approve BridgeMembership; anyone submits */\n join: async ({ rollup, body, change, endpoint, approvers, wallet }, extra) => {\n const chainId = (await client.getContext()).chainId;\n const data = buildMembershipData({\n chainId,\n bridge: rollup,\n body,\n action: 'join',\n change: Object.assign({ endpoint }, change),\n approvers,\n });\n return client.sendJoinRollupTx({ tx: { itx: { rollup, endpoint, data } }, wallet }, extra);\n },\n\n /** leave: the owner and an active-epoch quorum approve BridgeMembership; anyone submits */\n leave: async ({ rollup, body, change, approvers, wallet }, extra) => {\n const chainId = (await client.getContext()).chainId;\n const data = buildMembershipData({ chainId, bridge: rollup, body, action: 'leave', change, approvers });\n return client.sendLeaveRollupTx({ tx: { itx: { rollup, data } }, wallet }, extra);\n },\n\n /** quorum pause (owner + quorum in `signers`) or lone pause (a pauser as `wallet`, no `signers`) */\n pause: ({ rollup, wallet, signers = [] }, extra) =>\n sendMulti('PauseRollupTx', { wallet, signers, itx: { rollup } }, extra),\n\n resume: ({ rollup, wallet, signers = [] }, extra) =>\n sendMulti('ResumeRollupTx', { wallet, signers, itx: { rollup } }, extra),\n\n /** close needs a quorum pause; `depositCutoffEthBlock` is the Ethereum block of the gateway `setParams` tx */\n close: ({ rollup, wallet, signers = [], message = 'close', depositCutoffEthBlock }, extra) =>\n sendMulti(\n 'CloseRollupTx',\n {\n wallet,\n signers,\n itx: { rollup, message, data: wrap({ depositCutoffEthBlock: String(depositCutoffEthBlock) }) },\n },\n extra\n ),\n\n migrateVault: ({ rollup, to, wallet, signers = [], message = 'migrate vault' }, extra) =>\n sendMulti('MigrateRollupTx', { wallet, signers, itx: { rollup, to, type: 'vault', message } }, extra),\n\n /**\n * Reserve migration of a final bridge to `to` (a live v2 bridge): action `announce` and `execute` are signed by\n * the source owner and the TARGET quorum, `cancel` by the token authority alone (no `signers`).\n */\n migrateReserve: ({ rollup, to, action, wallet, signers = [], message = 'migrate reserve' }, extra) =>\n sendMulti(\n 'MigrateRollupTx',\n { wallet, signers, itx: { rollup, to, type: 'reserve', message, data: wrap({ action }) } },\n extra\n ),\n };\n}\n\nmodule.exports = {\n BRIDGE_MEMBERSHIP_ACTION,\n buildCreateItx,\n buildMembershipData,\n buildUpdateItx,\n createBridgeGovernance,\n membershipDigest,\n planMembership,\n signMembership,\n signOwnerAttestation,\n sortAddresses,\n};\n"]}
1
+ {"version":3,"sources":["../src/bridge.js"],"names":["BRIDGE_MEMBERSHIP_ACTION","bridgeGovDocKey","bridgeGovIndexKey","computeBridgeEndpointsHash","computeBridgeMembershipDigest","computeBridgeOwnerAttestationDigest","computeEvmGovernanceConfigHash","signBridgeDigest","signBridgeEvmGovernanceSync","require","toRollupAddress","toRollupAddressCbor","toBridgeReserveAddress","toHex","toBuffer","lc","s","String","toLowerCase","sortAddresses","list","Set","map","sort","a","b","BigInt","secretOf","wallet","sk","secretKey","Error","membershipDigest","msg","validators","endpointsHash","endpoints","rest","Object","assign","signMembership","signOwnerAttestation","PARAM_KEYS","buildCreateItx","o","x","address","epoch","activeFrom","threshold","voucherValidity","value","version","ethChainId","gateway","fromEntries","k","params","withdrawFee","epochs","salt","initialReserve","pausers","evmGovernance","undefined","itx","tokenAddress","vaultAddress","contractAddress","ethToken","seedValidators","pk","owner","publicKey","endpoint","ownerEndpoint","minBlockConfirmation","data","type","attestation","ethOwner","signature","ocapChainId","chainId","ocapToken","consents","bridge","action","CREATE","ethOwnerAttestation","planMembership","body","change","last","length","v","validator","filter","buildMembershipData","approvers","keys","members","forEach","JOIN","LEAVE","signatures","w","wrap","buildUpdateItx","rollup","patch","signEvmGovernanceSync","configHash","expiresAt","buildGovProposalVoteItx","govProposalVote","buildEvmGovernanceSyncItx","evmGovernanceSync","createBridgeGovernance","client","deps","sendMulti","kind","signers","extra","tx","from","signer","encoded","object","create","opts","getContext","hash","sendCreateRollupTx","reserve","update","voteProposal","sendUpdateRollupTx","syncEvmGovernance","sigs","join","sendJoinRollupTx","leave","sendLeaveRollupTx","pause","resume","close","message","depositCutoffEthBlock","migrateVault","to","migrateReserve","module","exports"],"mappings":";;AAAA;;;;;;;;;;;;;AAaA,MAAM;AACJA,0BADI;AAEJC,iBAFI;AAGJC,mBAHI;AAIJC,4BAJI;AAKJC,+BALI;AAMJC,qCANI;AAOJC,gCAPI;AAQJC,kBARI;AASJC;AATI,IAUFC,QAAQ,eAAR,CAVJ;AAWA,MAAM,EAAEC,iBAAiBC,mBAAnB,EAAwCC,sBAAxC,KAAmEH,QAAQ,yBAAR,CAAzE;AACA,MAAM,EAAEI,KAAF,EAASC,QAAT,KAAsBL,QAAQ,YAAR,CAA5B;;AAEA,MAAMM,KAAMC,CAAD,IAAOC,OAAOD,CAAP,EAAUE,WAAV,EAAlB;AACA,MAAMC,gBAAiBC,IAAD,IACpB,CAAC,GAAG,IAAIC,GAAJ,CAAQD,KAAKE,GAAL,CAASP,EAAT,CAAR,CAAJ,EAA2BQ,IAA3B,CAAgC,CAACC,CAAD,EAAIC,CAAJ,KAAWC,OAAOF,CAAP,IAAYE,OAAOD,CAAP,CAAZ,GAAwB,CAAC,CAAzB,GAA6BC,OAAOF,CAAP,IAAYE,OAAOD,CAAP,CAAZ,GAAwB,CAAxB,GAA4B,CAApG,CADF;;AAGA,MAAME,WAAYC,MAAD,IAAY;AAC3B,QAAMC,KAAKD,OAAOE,SAAlB;AACA,MAAI,CAACD,EAAL,EAAS,MAAM,IAAIE,KAAJ,CAAU,kEAAV,CAAN;AACT,SAAO,OAAOF,EAAP,KAAc,QAAd,GAAyBf,SAASe,EAAT,CAAzB,GAAwCA,EAA/C;AACD,CAJD;;AAMA;AACA,SAASG,gBAAT,CAA0BC,GAA1B,EAA+B;AAC7B,QAAMC,aAAaf,cAAcc,IAAIC,UAAlB,CAAnB;AACA;AACA,QAAMC,gBAAgBhC,2BAA2B+B,WAAWZ,GAAX,CAAgBE,CAAD,IAAOS,IAAIG,SAAJ,CAAcZ,CAAd,KAAoBS,IAAIG,SAAJ,CAAcrB,GAAGS,CAAH,CAAd,CAA1C,CAA3B,CAAtB;AACA,QAAMa,OAAOC,OAAOC,MAAP,CAAc,EAAd,EAAkBN,GAAlB,CAAb;AACA,SAAOI,KAAKD,SAAZ;AACA,SAAOhC,8BAA8BkC,OAAOC,MAAP,CAAcF,IAAd,EAAoB,EAAEH,UAAF,EAAcC,aAAd,EAApB,CAA9B,CAAP;AACD;;AAED;AACA,SAASK,cAAT,CAAwBZ,MAAxB,EAAgCK,GAAhC,EAAqC;AACnC,SAAO1B,iBAAiByB,iBAAiBC,GAAjB,CAAjB,EAAwCN,SAASC,MAAT,CAAxC,CAAP;AACD;;AAED;AACA,SAASa,oBAAT,CAA8Bb,MAA9B,EAAsCK,GAAtC,EAA2C;AACzC,SAAO1B,iBAAiBF,oCAAoC4B,GAApC,CAAjB,EAA2DN,SAASC,MAAT,CAA3D,CAAP;AACD;;AAED,MAAMc,aAAa,CACjB,YADiB,EAEjB,aAFiB,EAGjB,aAHiB,EAIjB,iBAJiB,EAKjB,gBALiB,EAMjB,cANiB,EAOjB,aAPiB,EAQjB,kBARiB,CAAnB;;AAWA;;;;;;;;;;;;;;;;;;;;;;;AAuBA,SAASC,cAAT,CAAwBC,CAAxB,EAA2B;AACzB,QAAMlC,kBAAkBkC,EAAElC,eAAF,IAAqBC,mBAA7C;AACA,QAAMuB,aAAaf,cAAcyB,EAAEV,UAAF,CAAaZ,GAAb,CAAkBuB,CAAD,IAAOA,EAAEjB,MAAF,CAASkB,OAAjC,CAAd,CAAnB;AACA,QAAMC,QAAQ;AACZA,WAAO,CADK;AAEZC,gBAAY,CAFA;AAGZC,eAAWL,EAAEK,SAHD;AAIZf,cAJY;AAKZgB,qBAAiBN,EAAEM;AALP,GAAd;AAOA,QAAMC,QAAQb,OAAOC,MAAP,CACZ;AACEa,aAAS,CADX;AAEEC,gBAAYpC,OAAO2B,EAAES,UAAT,CAFd;AAGEC,aAASvC,GAAG6B,EAAEU,OAAL;AAHX,GADY,EAMZhB,OAAOiB,WAAP,CAAmBb,WAAWpB,GAAX,CAAgBkC,CAAD,IAAO,CAACA,CAAD,EAAIZ,EAAEa,MAAF,CAASD,CAAT,CAAJ,CAAtB,CAAnB,CANY,EAOZ;AACEE,iBAAa,GADf;AAEEC,YAAQ,CAACZ,KAAD,CAFV;AAGEa,UAAM7C,GAAG6B,EAAEgB,IAAL,CAHR;AAIEC,oBAAgBjB,EAAEiB,cAAF,IAAoB;AAJtC,GAPY,CAAd;AAcA,MAAIjB,EAAEkB,OAAN,EAAeX,MAAMW,OAAN,GAAgBlB,EAAEkB,OAAlB;AACf,MAAIlB,EAAEmB,aAAF,KAAoBC,SAAxB,EAAmCb,MAAMY,aAAN,GAAsBnB,EAAEmB,aAAxB;;AAEnC,QAAME,MAAM;AACVnB,aAAS,EADC;AAEVoB,kBAActB,EAAEsB,YAFN;AAGVC,kBAAcvB,EAAEuB,YAAF,IAAkB,EAHtB;AAIVC,qBAAiBxB,EAAEyB,QAJT;AAKVC,oBAAgB,CAAC,EAAEC,IAAI3B,EAAE4B,KAAF,CAAQC,SAAd,EAAyB3B,SAASF,EAAE4B,KAAF,CAAQ1B,OAA1C,EAAmD4B,UAAU9B,EAAE+B,aAA/D,EAAD,CALN;AAMVC,0BAAsBhC,EAAEgC,oBAAF,IAA0B,EANtC;AAOVC,UAAM,EAAEC,MAAM,MAAR,EAAgB3B,KAAhB;AAPI,GAAZ;AASA;AACAc,MAAInB,OAAJ,GAAcpC,gBAAgBuD,GAAhB,CAAd;;AAEA,QAAMc,cAAc;AAClBjC,aAAS/B,GAAG6B,EAAEoC,QAAF,CAAWlC,OAAd,CADS;AAElBmC,eAAWxC,qBAAqBG,EAAEoC,QAAvB,EAAiC;AAC1CE,mBAAatC,EAAEuC,OAD2B;AAE1CvB,YAAMT,MAAMS,IAF8B;AAG1CwB,iBAAWxC,EAAEsB,YAH6B;AAI1Cb,kBAAYF,MAAME,UAJwB;AAK1CC,eAASH,MAAMG,OAL2B;AAM1Ce,gBAAUtD,GAAG6B,EAAEyB,QAAL;AANgC,KAAjC;AAFO,GAApB;AAWA,QAAMjC,YAAYE,OAAOiB,WAAP,CAAmBX,EAAEV,UAAF,CAAaZ,GAAb,CAAkBuB,CAAD,IAAO,CAAC9B,GAAG8B,EAAEjB,MAAF,CAASkB,OAAZ,CAAD,EAAuBD,EAAE6B,QAAzB,CAAxB,CAAnB,CAAlB;AACA,QAAMW,WAAWzC,EAAEV,UAAF,CAAaZ,GAAb,CAAiB,CAAC,EAAEM,MAAF,EAAU8C,QAAV,EAAD,MAA2B;AAC3D5B,aAASlB,OAAOkB,OAD2C;AAE3D4B,YAF2D;AAG3DO,eAAWzC,eAAeZ,MAAf,EAAuB;AAChCsD,mBAAatC,EAAEuC,OADiB;AAEhCG,cAAQrB,IAAInB,OAFoB;AAGhCC,aAAO,CAHyB;AAIhCb,gBAJgC;AAKhCe,iBAAWL,EAAEK,SALmB;AAMhCD,kBAAY,CANoB;AAOhCE,uBAAiBN,EAAEM,eAPa;AAQhCd,eARgC;AAShCmD,cAAQvF,yBAAyBwF;AATD,KAAvB;AAHgD,GAA3B,CAAjB,CAAjB;;AAgBA,SAAOlD,OAAOC,MAAP,CAAc,EAAd,EAAkB0B,GAAlB,EAAuB;AAC5BY,UAAM,EAAEC,MAAM,MAAR,EAAgB3B,OAAOb,OAAOC,MAAP,CAAc,EAAd,EAAkBY,KAAlB,EAAyB,EAAEsC,qBAAqBV,WAAvB,EAAoCM,QAApC,EAAzB,CAAvB;AADsB,GAAvB,CAAP;AAGD;;AAED;;;;AAIA,SAASK,cAAT,CAAwBC,IAAxB,EAA8BJ,MAA9B,EAAsCK,MAAtC,EAA8C;AAC5C,QAAMC,OAAOF,KAAKhC,MAAL,CAAYgC,KAAKhC,MAAL,CAAYmC,MAAZ,GAAqB,CAAjC,CAAb;AACA,QAAMC,IAAIhF,GAAG6E,OAAOI,SAAV,CAAV;AACA,QAAM9D,aACJqD,WAAW,MAAX,GAAoBpE,cAAc,CAAC,GAAG0E,KAAK3D,UAAT,EAAqB6D,CAArB,CAAd,CAApB,GAA6D5E,cAAc0E,KAAK3D,UAAL,CAAgB+D,MAAhB,CAAwBpD,CAAD,IAAOA,MAAMkD,CAApC,CAAd,CAD/D;AAEA,SAAO;AACLhD,WAAO8C,KAAK9C,KAAL,GAAa,CADf;AAELb,cAFK;AAGLe,eAAW2C,OAAO3C,SAHb;AAILD,gBAAY4C,OAAO5C,UAJd;AAKLE,qBAAiB0C,OAAO1C;AALnB,GAAP;AAOD;;AAED;;;AAGA,SAASgD,mBAAT,CAA6B,EAAEf,OAAF,EAAWG,MAAX,EAAmBK,IAAnB,EAAyBJ,MAAzB,EAAiCK,MAAjC,EAAyCO,SAAzC,EAA7B,EAAmF;AACjF,QAAMpD,QAAQ2C,eAAeC,IAAf,EAAqBJ,MAArB,EAA6BK,MAA7B,CAAd;AACA;AACA,QAAMxD,YAAY,EAAlB;AACAE,SAAO8D,IAAP,CAAYT,KAAKU,OAAjB,EAA0BC,OAA1B,CAAmC9C,CAAD,IAAO;AACvCpB,cAAUrB,GAAGyC,CAAH,CAAV,IAAmBmC,KAAKU,OAAL,CAAa7C,CAAb,EAAgBkB,QAAnC;AACD,GAFD;AAGA,MAAIa,WAAW,MAAf,EAAuBnD,UAAUrB,GAAG6E,OAAOI,SAAV,CAAV,IAAkCJ,OAAOlB,QAAzC;AACvB,QAAMzC,MAAMK,OAAOC,MAAP,CAAc,EAAE2C,aAAaC,OAAf,EAAwBG,MAAxB,EAAd,EAAgDvC,KAAhD,EAAuD;AACjEX,aADiE;AAEjEmD,YAAQA,WAAW,MAAX,GAAoBvF,yBAAyBuG,IAA7C,GAAoDvG,yBAAyBwG;AAFpB,GAAvD,CAAZ;AAIA,SAAO;AACL1B,UAAM,MADD;AAEL3B,WAAO;AACL6C,iBAAWJ,OAAOI,SADb;AAEL/C,iBAAW2C,OAAO3C,SAFb;AAGLD,kBAAY4C,OAAO5C,UAHd;AAILE,uBAAiB0C,OAAO1C,eAJnB;AAKLuD,kBAAYN,UAAU7E,GAAV,CAAeoF,CAAD,IAAOlE,eAAekE,CAAf,EAAkBzE,GAAlB,CAArB;AALP;AAFF,GAAP;AAUD;;AAED,MAAM0E,OAAQxD,KAAD,KAAY,EAAE2B,MAAM,MAAR,EAAgB3B,KAAhB,EAAZ,CAAb;;AAEA;AACA,SAASyD,cAAT,CAAwBC,MAAxB,EAAgCC,KAAhC,EAAuC;AACrC,SAAO,EAAED,MAAF,EAAUhC,MAAM8B,KAAKG,KAAL,CAAhB,EAAP;AACD;;AAED;AACA,SAASC,qBAAT,CAA+BnF,MAA/B,EAAuCuD,OAAvC,EAAgDlD,GAAhD,EAAqD;AACnD,SAAOzB,4BACL2E,OADK,EAEL;AACEG,YAAQrD,IAAIqD,MADd;AAEElC,aAAS1B,OAAOO,IAAImB,OAAX,CAFX;AAGE4D,gBAAY/E,IAAI+E,UAHlB;AAIEC,eAAWvF,OAAOO,IAAIgF,SAAX;AAJb,GAFK,EAQLtF,SAASC,MAAT,CARK,CAAP;AAUD;;AAED;AACA,SAASsF,uBAAT,CAAiCL,MAAjC,EAAyCM,eAAzC,EAA0D;AACxD,SAAO,EAAEN,MAAF,EAAUhC,MAAM8B,KAAK,EAAEQ,eAAF,EAAL,CAAhB,EAAP;AACD;;AAED;AACA,SAASC,yBAAT,CAAmCP,MAAnC,EAA2C,EAAE9C,aAAF,EAAiBkD,SAAjB,EAA4BR,UAA5B,EAA3C,EAAqF;AACnF,SAAO,EAAEI,MAAF,EAAUhC,MAAM8B,KAAK,EAAE5C,aAAF,EAAiBsD,mBAAmB,EAAEJ,SAAF,EAAaR,UAAb,EAApC,EAAL,CAAhB,EAAP;AACD;;AAED,SAASa,sBAAT,CAAgCC,MAAhC,EAAwCC,OAAO,EAA/C,EAAmD;AACjD,QAAMC,YAAY,OAAOC,IAAP,EAAa,EAAE9F,MAAF,EAAU+F,UAAU,EAApB,EAAwB1D,GAAxB,EAAb,EAA4C2D,KAA5C,KAAsD;AACtE,UAAMC,KAAK;AACTC,YAAMlG,OAAOkB,OADJ;AAETyB,UAAI3C,OAAO6C,SAFF;AAGTR,SAHS;AAITwC,kBAAYkB,QAAQrG,GAAR,CAAaoF,CAAD,KAAQ,EAAEqB,QAAQrB,EAAE5D,OAAZ,EAAqByB,IAAImC,EAAEjC,SAA3B,EAAsCQ,WAAW,EAAjD,EAAR,CAAZ;AAJH,KAAX;AAMA,QAAI+C,UAAU,CAAC,MAAMT,OAAQ,SAAQG,IAAK,EAArB,EAAwB,EAAEG,EAAF,EAAMjG,MAAN,EAAxB,CAAP,EAAgDqG,MAA9D;AACA,SAAK,MAAMvB,CAAX,IAAgBiB,OAAhB,EAAyB;AACvB;AACAK,gBAAU,MAAMT,OAAQ,YAAWG,IAAK,EAAxB,EAA2B,EAAEG,IAAIG,OAAN,EAAepG,QAAQ8E,CAAvB,EAA3B,CAAhB;AACD;AACD,WAAOa,OAAQ,OAAMG,IAAK,EAAnB,EAAsB,EAAEG,IAAIG,OAAN,EAAepG,MAAf,EAAtB,EAA+CgG,KAA/C,CAAP;AACD,GAbD;;AAeA,SAAO;AACL1H,qBADK;AAELD,mBAFK;AAGL0C,kBAHK;AAILH,kBAJK;AAKLC,wBALK;AAMLsE,yBANK;AAOL/E,oBAPK;AAQL0D,kBARK;AASLQ,uBATK;AAULU,kBAVK;AAWLM,2BAXK;AAYLE,6BAZK;AAaLxG,0BAbK;AAcLC,SAdK;;AAgBL;AACAqH,YAAQ,OAAOC,IAAP,EAAaP,KAAb,KAAuB;AAC7B,YAAM3D,MAAMtB,eACVL,OAAOC,MAAP,CAAc,EAAE4C,SAAS,CAAC,MAAMoC,OAAOa,UAAP,EAAP,EAA4BjD,OAAvC,EAAgDzE,iBAAiB8G,KAAK9G,eAAtE,EAAd,EAAuGyH,IAAvG,CADU,CAAZ;AAGA,YAAME,OAAO,MAAMd,OAAOe,kBAAP,CAA0B,EAAET,IAAI,EAAE5D,GAAF,EAAN,EAAerC,QAAQuG,KAAK3D,KAA5B,EAA1B,EAA+DoD,KAA/D,CAAnB;AACA,aAAO,EAAES,IAAF,EAAQvF,SAASmB,IAAInB,OAArB,EAA8ByF,SAAS3H,uBAAuBqD,IAAInB,OAA3B,CAAvC,EAAP;AACD,KAvBI;;AAyBL;AACA0F,YAAQ,CAAC,EAAE3B,MAAF,EAAUC,KAAV,EAAiBlF,MAAjB,EAAyB+F,OAAzB,EAAD,EAAqCC,KAArC,KACNH,UAAU,gBAAV,EAA4B,EAAE7F,MAAF,EAAU+F,OAAV,EAAmB1D,KAAK2C,eAAeC,MAAf,EAAuBC,KAAvB,CAAxB,EAA5B,EAAqFc,KAArF,CA3BG;;AA6BL;AACAa,kBAAc,CAAC,EAAE5B,MAAF,EAAUM,eAAV,EAA2BvF,MAA3B,EAAD,EAAsCgG,KAAtC,KACZL,OAAOmB,kBAAP,CAA0B,EAAEb,IAAI,EAAE5D,KAAKiD,wBAAwBL,MAAxB,EAAgCM,eAAhC,CAAP,EAAN,EAAiEvF,MAAjE,EAA1B,EAAqGgG,KAArG,CA/BG;;AAiCL;AACAe,uBAAmB,OAAO,EAAE9B,MAAF,EAAU9C,aAAV,EAAyBkD,SAAzB,EAAoCU,UAAU,EAA9C,EAAkDlB,UAAlD,EAA8D7E,MAA9D,EAAP,EAA+EgG,KAA/E,KAAyF;AAC1G,UAAIgB,OAAOnC,UAAX;AACA,UAAI,CAACmC,IAAL,EAAW;AACT,cAAMzD,UAAU,CAAC,MAAMoC,OAAOa,UAAP,EAAP,EAA4BjD,OAA5C;AACA,cAAM6B,aAAa1G,+BAA+ByD,aAA/B,CAAnB;AACA,cAAM9B,MAAM,EAAEqD,QAAQuB,MAAV,EAAkBzD,SAASW,cAAcX,OAAzC,EAAkD4D,UAAlD,EAA8DC,SAA9D,EAAZ;AACA2B,eAAOjB,QAAQrG,GAAR,CAAaoF,CAAD,IAAOK,sBAAsBL,CAAtB,EAAyBvB,OAAzB,EAAkClD,GAAlC,CAAnB,CAAP;AACD;AACD,YAAMgC,MAAMmD,0BAA0BP,MAA1B,EAAkC,EAAE9C,aAAF,EAAiBkD,SAAjB,EAA4BR,YAAYmC,IAAxC,EAAlC,CAAZ;AACA,aAAOrB,OAAOmB,kBAAP,CAA0B,EAAEb,IAAI,EAAE5D,GAAF,EAAN,EAAerC,MAAf,EAA1B,EAAmDgG,KAAnD,CAAP;AACD,KA5CI;;AA8CL;AACAiB,UAAM,OAAO,EAAEhC,MAAF,EAAUlB,IAAV,EAAgBC,MAAhB,EAAwBlB,QAAxB,EAAkCyB,SAAlC,EAA6CvE,MAA7C,EAAP,EAA8DgG,KAA9D,KAAwE;AAC5E,YAAMzC,UAAU,CAAC,MAAMoC,OAAOa,UAAP,EAAP,EAA4BjD,OAA5C;AACA,YAAMN,OAAOqB,oBAAoB;AAC/Bf,eAD+B;AAE/BG,gBAAQuB,MAFuB;AAG/BlB,YAH+B;AAI/BJ,gBAAQ,MAJuB;AAK/BK,gBAAQtD,OAAOC,MAAP,CAAc,EAAEmC,QAAF,EAAd,EAA4BkB,MAA5B,CALuB;AAM/BO;AAN+B,OAApB,CAAb;AAQA,aAAOoB,OAAOuB,gBAAP,CAAwB,EAAEjB,IAAI,EAAE5D,KAAK,EAAE4C,MAAF,EAAUnC,QAAV,EAAoBG,IAApB,EAAP,EAAN,EAA2CjD,MAA3C,EAAxB,EAA6EgG,KAA7E,CAAP;AACD,KA1DI;;AA4DL;AACAmB,WAAO,OAAO,EAAElC,MAAF,EAAUlB,IAAV,EAAgBC,MAAhB,EAAwBO,SAAxB,EAAmCvE,MAAnC,EAAP,EAAoDgG,KAApD,KAA8D;AACnE,YAAMzC,UAAU,CAAC,MAAMoC,OAAOa,UAAP,EAAP,EAA4BjD,OAA5C;AACA,YAAMN,OAAOqB,oBAAoB,EAAEf,OAAF,EAAWG,QAAQuB,MAAnB,EAA2BlB,IAA3B,EAAiCJ,QAAQ,OAAzC,EAAkDK,MAAlD,EAA0DO,SAA1D,EAApB,CAAb;AACA,aAAOoB,OAAOyB,iBAAP,CAAyB,EAAEnB,IAAI,EAAE5D,KAAK,EAAE4C,MAAF,EAAUhC,IAAV,EAAP,EAAN,EAAiCjD,MAAjC,EAAzB,EAAoEgG,KAApE,CAAP;AACD,KAjEI;;AAmEL;AACAqB,WAAO,CAAC,EAAEpC,MAAF,EAAUjF,MAAV,EAAkB+F,UAAU,EAA5B,EAAD,EAAmCC,KAAnC,KACLH,UAAU,eAAV,EAA2B,EAAE7F,MAAF,EAAU+F,OAAV,EAAmB1D,KAAK,EAAE4C,MAAF,EAAxB,EAA3B,EAAiEe,KAAjE,CArEG;;AAuELsB,YAAQ,CAAC,EAAErC,MAAF,EAAUjF,MAAV,EAAkB+F,UAAU,EAA5B,EAAD,EAAmCC,KAAnC,KACNH,UAAU,gBAAV,EAA4B,EAAE7F,MAAF,EAAU+F,OAAV,EAAmB1D,KAAK,EAAE4C,MAAF,EAAxB,EAA5B,EAAkEe,KAAlE,CAxEG;;AA0EL;AACAuB,WAAO,CAAC,EAAEtC,MAAF,EAAUjF,MAAV,EAAkB+F,UAAU,EAA5B,EAAgCyB,UAAU,OAA1C,EAAmDC,qBAAnD,EAAD,EAA6EzB,KAA7E,KACLH,UACE,eADF,EAEE;AACE7F,YADF;AAEE+F,aAFF;AAGE1D,WAAK,EAAE4C,MAAF,EAAUuC,OAAV,EAAmBvE,MAAM8B,KAAK,EAAE0C,uBAAuBpI,OAAOoI,qBAAP,CAAzB,EAAL,CAAzB;AAHP,KAFF,EAOEzB,KAPF,CA5EG;;AAsFL0B,kBAAc,CAAC,EAAEzC,MAAF,EAAU0C,EAAV,EAAc3H,MAAd,EAAsB+F,UAAU,EAAhC,EAAoCyB,UAAU,eAA9C,EAAD,EAAkExB,KAAlE,KACZH,UAAU,iBAAV,EAA6B,EAAE7F,MAAF,EAAU+F,OAAV,EAAmB1D,KAAK,EAAE4C,MAAF,EAAU0C,EAAV,EAAczE,MAAM,OAApB,EAA6BsE,OAA7B,EAAxB,EAA7B,EAA+FxB,KAA/F,CAvFG;;AAyFL;;;;AAIA4B,oBAAgB,CAAC,EAAE3C,MAAF,EAAU0C,EAAV,EAAchE,MAAd,EAAsB3D,MAAtB,EAA8B+F,UAAU,EAAxC,EAA4CyB,UAAU,iBAAtD,EAAD,EAA4ExB,KAA5E,KACdH,UACE,iBADF,EAEE,EAAE7F,MAAF,EAAU+F,OAAV,EAAmB1D,KAAK,EAAE4C,MAAF,EAAU0C,EAAV,EAAczE,MAAM,SAApB,EAA+BsE,OAA/B,EAAwCvE,MAAM8B,KAAK,EAAEpB,MAAF,EAAL,CAA9C,EAAxB,EAFF,EAGEqC,KAHF;AA9FG,GAAP;AAoGD;;AAED6B,OAAOC,OAAP,GAAiB;AACf1J,0BADe;AAEfC,iBAFe;AAGfC,mBAHe;AAIfyC,gBAJe;AAKfyE,2BALe;AAMfF,yBANe;AAOfhB,qBAPe;AAQfU,gBARe;AASfU,wBATe;AAUftF,kBAVe;AAWf0D,gBAXe;AAYfqB,uBAZe;AAafvE,gBAbe;AAcfC,sBAde;AAeftB;AAfe,CAAjB","file":"bridge.js","sourcesContent":["/**\n * SDK helpers for the on-chain bridge governance (bridge/docs/ocap-protocols.md §v2.2).\n *\n * A v2 bridge is a `RollupState` whose `data.value.version == 2`. These helpers build, sign and submit the governance\n * transactions of the existing rollup protocols for such a bridge:\n *\n * - pure builders (no network): `buildCreateItx`, `signMembership`, `buildMembershipData`, `buildUpdateData`, ...\n * - flows on a client: `client.bridge.create / update / join / leave / pause / resume / close / migrateVault /\n * migrateReserve`, each building the itx, collecting the signatures of the listed wallets and sending the tx.\n *\n * Wallets are `@ocap/wallet` objects. Governance approvals (BridgeMembership, BridgeOwnerAttestation) are EIP-712\n * signatures made with the wallet's secp256k1 key, so owners, validators and the Ethereum owner must hold such keys.\n */\nconst {\n BRIDGE_MEMBERSHIP_ACTION,\n bridgeGovDocKey,\n bridgeGovIndexKey,\n computeBridgeEndpointsHash,\n computeBridgeMembershipDigest,\n computeBridgeOwnerAttestationDigest,\n computeEvmGovernanceConfigHash,\n signBridgeDigest,\n signBridgeEvmGovernanceSync,\n} = require('@ocap/mcrypto');\nconst { toRollupAddress: toRollupAddressCbor, toBridgeReserveAddress } = require('@arcblock/did-util/cbor');\nconst { toHex, toBuffer } = require('@ocap/util');\n\nconst lc = (s) => String(s).toLowerCase();\nconst sortAddresses = (list) =>\n [...new Set(list.map(lc))].sort((a, b) => (BigInt(a) < BigInt(b) ? -1 : BigInt(a) > BigInt(b) ? 1 : 0));\n\nconst secretOf = (wallet) => {\n const sk = wallet.secretKey;\n if (!sk) throw new Error('A wallet with a secret key is required to sign a bridge approval');\n return typeof sk === 'string' ? toBuffer(sk) : sk;\n};\n\n/** EIP-712 digest of a BridgeMembership message (validators are sorted ascending for you). */\nfunction membershipDigest(msg) {\n const validators = sortAddresses(msg.validators);\n // `endpoints`: { address -> url } of every listed validator; it is bound into the digest\n const endpointsHash = computeBridgeEndpointsHash(validators.map((a) => msg.endpoints[a] || msg.endpoints[lc(a)]));\n const rest = Object.assign({}, msg);\n delete rest.endpoints;\n return computeBridgeMembershipDigest(Object.assign(rest, { validators, endpointsHash }));\n}\n\n/** Sign a BridgeMembership message with the secp256k1 key of `wallet`. */\nfunction signMembership(wallet, msg) {\n return signBridgeDigest(membershipDigest(msg), secretOf(wallet));\n}\n\n/** Sign a BridgeOwnerAttestation message (the Ethereum owner of the token proves it consents to this bridge). */\nfunction signOwnerAttestation(wallet, msg) {\n return signBridgeDigest(computeBridgeOwnerAttestationDigest(msg), secretOf(wallet));\n}\n\nconst PARAM_KEYS = [\n 'minDeposit',\n 'minWithdraw',\n 'maxWithdraw',\n 'releaseDailyCap',\n 'refundDailyCap',\n 'releaseGrace',\n 'refundDelay',\n 'transitionPeriod',\n];\n\n/**\n * Build the itx of a v2 `create_rollup`, address and all approvals included.\n *\n * @param {object} o\n * @param {string} o.chainId - OCAP chain id (part of every signed struct)\n * @param {string} o.tokenAddress - the OCAP token\n * @param {string} o.ethToken - the Ethereum token (contract_address)\n * @param {string} [o.vaultAddress] - the Ethereum vault\n * @param {object} o.owner - wallet of the token owner (authority); becomes the bridge owner\n * @param {string} o.ownerEndpoint - endpoint recorded for the owner seed\n * @param {string} o.ethChainId\n * @param {string} o.gateway\n * @param {object} o.params - minDeposit, minWithdraw, maxWithdraw, releaseDailyCap, refundDailyCap, releaseGrace, refundDelay, transitionPeriod\n * @param {Array<{wallet: object, endpoint: string}>} o.validators - epoch-1 operators, each signs a consent\n * @param {number} o.threshold\n * @param {number} o.voucherValidity\n * @param {object} o.ethOwner - wallet of the Ethereum owner signing the attestation\n * @param {string} o.salt - bytes32 hex\n * @param {string} [o.initialReserve='0']\n * @param {string[]} [o.pausers]\n * @param {number} [o.minBlockConfirmation=12]\n * @param {Function} [o.toRollupAddress] - address function matching the tx encoding (defaults to cbor)\n */\nfunction buildCreateItx(o) {\n const toRollupAddress = o.toRollupAddress || toRollupAddressCbor;\n const validators = sortAddresses(o.validators.map((x) => x.wallet.address));\n const epoch = {\n epoch: 1,\n activeFrom: 0,\n threshold: o.threshold,\n validators,\n voucherValidity: o.voucherValidity,\n };\n const value = Object.assign(\n {\n version: 2,\n ethChainId: String(o.ethChainId),\n gateway: lc(o.gateway),\n },\n Object.fromEntries(PARAM_KEYS.map((k) => [k, o.params[k]])),\n {\n withdrawFee: '0',\n epochs: [epoch],\n salt: lc(o.salt),\n initialReserve: o.initialReserve || '0',\n }\n );\n if (o.pausers) value.pausers = o.pausers;\n if (o.evmGovernance !== undefined) value.evmGovernance = o.evmGovernance;\n\n const itx = {\n address: '',\n tokenAddress: o.tokenAddress,\n vaultAddress: o.vaultAddress || '',\n contractAddress: o.ethToken,\n seedValidators: [{ pk: o.owner.publicKey, address: o.owner.address, endpoint: o.ownerEndpoint }],\n minBlockConfirmation: o.minBlockConfirmation || 12,\n data: { type: 'json', value },\n };\n // The bridge address is computed over the itx WITHOUT the attestation and the consents (they sign over it)\n itx.address = toRollupAddress(itx);\n\n const attestation = {\n address: lc(o.ethOwner.address),\n signature: signOwnerAttestation(o.ethOwner, {\n ocapChainId: o.chainId,\n salt: value.salt,\n ocapToken: o.tokenAddress,\n ethChainId: value.ethChainId,\n gateway: value.gateway,\n ethToken: lc(o.ethToken),\n }),\n };\n const endpoints = Object.fromEntries(o.validators.map((x) => [lc(x.wallet.address), x.endpoint]));\n const consents = o.validators.map(({ wallet, endpoint }) => ({\n address: wallet.address,\n endpoint,\n signature: signMembership(wallet, {\n ocapChainId: o.chainId,\n bridge: itx.address,\n epoch: 1,\n validators,\n threshold: o.threshold,\n activeFrom: 0,\n voucherValidity: o.voucherValidity,\n endpoints,\n action: BRIDGE_MEMBERSHIP_ACTION.CREATE,\n }),\n }));\n\n return Object.assign({}, itx, {\n data: { type: 'json', value: Object.assign({}, value, { ethOwnerAttestation: attestation, consents }) },\n });\n}\n\n/**\n * Next epoch of a join / leave computed from the bridge body. `change` = { validator, threshold, activeFrom,\n * voucherValidity }. Returns the epoch the chain will derive, to be signed by owner + quorum (+ joiner).\n */\nfunction planMembership(body, action, change) {\n const last = body.epochs[body.epochs.length - 1];\n const v = lc(change.validator);\n const validators =\n action === 'join' ? sortAddresses([...last.validators, v]) : sortAddresses(last.validators.filter((x) => x !== v));\n return {\n epoch: last.epoch + 1,\n validators,\n threshold: change.threshold,\n activeFrom: change.activeFrom,\n voucherValidity: change.voucherValidity,\n };\n}\n\n/**\n * Build `itx.data` of a join / leave and sign it with `approvers` (owner, quorum members, and the joiner for a join).\n */\nfunction buildMembershipData({ chainId, bridge, body, action, change, approvers }) {\n const epoch = planMembership(body, action, change);\n // endpoints of the stored members; a joiner brings its own (`change.endpoint`, also sent as itx.endpoint)\n const endpoints = {};\n Object.keys(body.members).forEach((k) => {\n endpoints[lc(k)] = body.members[k].endpoint;\n });\n if (action === 'join') endpoints[lc(change.validator)] = change.endpoint;\n const msg = Object.assign({ ocapChainId: chainId, bridge }, epoch, {\n endpoints,\n action: action === 'join' ? BRIDGE_MEMBERSHIP_ACTION.JOIN : BRIDGE_MEMBERSHIP_ACTION.LEAVE,\n });\n return {\n type: 'json',\n value: {\n validator: change.validator,\n threshold: change.threshold,\n activeFrom: change.activeFrom,\n voucherValidity: change.voucherValidity,\n signatures: approvers.map((w) => signMembership(w, msg)),\n },\n };\n}\n\nconst wrap = (value) => ({ type: 'json', value });\n\n/** Typed `update_rollup` itx. `patch` holds allow-listed keys only (see the design doc). */\nfunction buildUpdateItx(rollup, patch) {\n return { rollup, data: wrap(patch) };\n}\n\n/** Sign a `BridgeEvmGovernanceSync` message (`{ bridge, version, configHash, expiresAt }`) with `wallet`. */\nfunction signEvmGovernanceSync(wallet, chainId, msg) {\n return signBridgeEvmGovernanceSync(\n chainId,\n {\n bridge: msg.bridge,\n version: BigInt(msg.version),\n configHash: msg.configHash,\n expiresAt: BigInt(msg.expiresAt),\n },\n secretOf(wallet)\n );\n}\n\n/** Build the `update_rollup` itx for a `govProposalVote` governance proposal / co-sign submission (#1880). */\nfunction buildGovProposalVoteItx(rollup, govProposalVote) {\n return { rollup, data: wrap({ govProposalVote }) };\n}\n\n/** Build the `update_rollup` itx for a standalone Path-A `evmGovernance` + `evmGovernanceSync` update (#1880). */\nfunction buildEvmGovernanceSyncItx(rollup, { evmGovernance, expiresAt, signatures }) {\n return { rollup, data: wrap({ evmGovernance, evmGovernanceSync: { expiresAt, signatures } }) };\n}\n\nfunction createBridgeGovernance(client, deps = {}) {\n const sendMulti = async (kind, { wallet, signers = [], itx }, extra) => {\n const tx = {\n from: wallet.address,\n pk: wallet.publicKey,\n itx,\n signatures: signers.map((w) => ({ signer: w.address, pk: w.publicKey, signature: '' })),\n };\n let encoded = (await client[`encode${kind}`]({ tx, wallet })).object;\n for (const w of signers) {\n // eslint-disable-next-line no-await-in-loop\n encoded = await client[`multiSign${kind}`]({ tx: encoded, wallet: w });\n }\n return client[`send${kind}`]({ tx: encoded, wallet }, extra);\n };\n\n return {\n bridgeGovIndexKey,\n bridgeGovDocKey,\n buildCreateItx,\n signMembership,\n signOwnerAttestation,\n signEvmGovernanceSync,\n membershipDigest,\n planMembership,\n buildMembershipData,\n buildUpdateItx,\n buildGovProposalVoteItx,\n buildEvmGovernanceSyncItx,\n toBridgeReserveAddress,\n toHex,\n\n /** create a bridge; `owner` signs (and, for the official token, must be the moderator) */\n create: async (opts, extra) => {\n const itx = buildCreateItx(\n Object.assign({ chainId: (await client.getContext()).chainId, toRollupAddress: deps.toRollupAddress }, opts)\n );\n const hash = await client.sendCreateRollupTx({ tx: { itx }, wallet: opts.owner }, extra);\n return { hash, address: itx.address, reserve: toBridgeReserveAddress(itx.address) };\n },\n\n /** owner + quorum `update_rollup` with a typed patch; use `proposeOwner` / `cancelOwnerProposal` keys for ownership */\n update: ({ rollup, patch, wallet, signers }, extra) =>\n sendMulti('UpdateRollupTx', { wallet, signers, itx: buildUpdateItx(rollup, patch) }, extra),\n\n /** single gas-payer `update_rollup(govProposalVote)` submission (never touches `owner` OCAP nonce) */\n voteProposal: ({ rollup, govProposalVote, wallet }, extra) =>\n client.sendUpdateRollupTx({ tx: { itx: buildGovProposalVoteItx(rollup, govProposalVote) }, wallet }, extra),\n\n /** Path-A `evmGovernance` roster sync signed by the previous EVM governance roster */\n syncEvmGovernance: async ({ rollup, evmGovernance, expiresAt, signers = [], signatures, wallet }, extra) => {\n let sigs = signatures;\n if (!sigs) {\n const chainId = (await client.getContext()).chainId;\n const configHash = computeEvmGovernanceConfigHash(evmGovernance);\n const msg = { bridge: rollup, version: evmGovernance.version, configHash, expiresAt };\n sigs = signers.map((w) => signEvmGovernanceSync(w, chainId, msg));\n }\n const itx = buildEvmGovernanceSyncItx(rollup, { evmGovernance, expiresAt, signatures: sigs });\n return client.sendUpdateRollupTx({ tx: { itx }, wallet }, extra);\n },\n\n /** join: the joiner, the owner and an active-epoch quorum approve BridgeMembership; anyone submits */\n join: async ({ rollup, body, change, endpoint, approvers, wallet }, extra) => {\n const chainId = (await client.getContext()).chainId;\n const data = buildMembershipData({\n chainId,\n bridge: rollup,\n body,\n action: 'join',\n change: Object.assign({ endpoint }, change),\n approvers,\n });\n return client.sendJoinRollupTx({ tx: { itx: { rollup, endpoint, data } }, wallet }, extra);\n },\n\n /** leave: the owner and an active-epoch quorum approve BridgeMembership; anyone submits */\n leave: async ({ rollup, body, change, approvers, wallet }, extra) => {\n const chainId = (await client.getContext()).chainId;\n const data = buildMembershipData({ chainId, bridge: rollup, body, action: 'leave', change, approvers });\n return client.sendLeaveRollupTx({ tx: { itx: { rollup, data } }, wallet }, extra);\n },\n\n /** quorum pause (owner + quorum in `signers`) or lone pause (a pauser as `wallet`, no `signers`) */\n pause: ({ rollup, wallet, signers = [] }, extra) =>\n sendMulti('PauseRollupTx', { wallet, signers, itx: { rollup } }, extra),\n\n resume: ({ rollup, wallet, signers = [] }, extra) =>\n sendMulti('ResumeRollupTx', { wallet, signers, itx: { rollup } }, extra),\n\n /** close needs a quorum pause; `depositCutoffEthBlock` is the Ethereum block of the gateway `setParams` tx */\n close: ({ rollup, wallet, signers = [], message = 'close', depositCutoffEthBlock }, extra) =>\n sendMulti(\n 'CloseRollupTx',\n {\n wallet,\n signers,\n itx: { rollup, message, data: wrap({ depositCutoffEthBlock: String(depositCutoffEthBlock) }) },\n },\n extra\n ),\n\n migrateVault: ({ rollup, to, wallet, signers = [], message = 'migrate vault' }, extra) =>\n sendMulti('MigrateRollupTx', { wallet, signers, itx: { rollup, to, type: 'vault', message } }, extra),\n\n /**\n * Reserve migration of a final bridge to `to` (a live v2 bridge): action `announce` and `execute` are signed by\n * the source owner and the TARGET quorum, `cancel` by the token authority alone (no `signers`).\n */\n migrateReserve: ({ rollup, to, action, wallet, signers = [], message = 'migrate reserve' }, extra) =>\n sendMulti(\n 'MigrateRollupTx',\n { wallet, signers, itx: { rollup, to, type: 'reserve', message, data: wrap({ action }) } },\n extra\n ),\n };\n}\n\nmodule.exports = {\n BRIDGE_MEMBERSHIP_ACTION,\n bridgeGovDocKey,\n bridgeGovIndexKey,\n buildCreateItx,\n buildEvmGovernanceSyncItx,\n buildGovProposalVoteItx,\n buildMembershipData,\n buildUpdateItx,\n createBridgeGovernance,\n membershipDigest,\n planMembership,\n signEvmGovernanceSync,\n signMembership,\n signOwnerAttestation,\n sortAddresses,\n};\n"]}
package/lib/extension.js CHANGED
@@ -16,7 +16,8 @@ const { bytesToHex, toBase58, toBase64, toHex, toBuffer, fromTokenToUnit, fromUn
16
16
  const { DEFAULT_TOKEN_DECIMAL } = require('@ocap/util/lib/constant');
17
17
 
18
18
  const { formatFactoryState, preMintFromFactory: preMintFromFactoryCbor } = require('@ocap/asset/mint/client');
19
- const { verifyTxInclusion } = require('./verify');
19
+ const { verifyTxInclusion, parseEntryHashV2From, computeEntryHash } = require('./verify');
20
+ const ENTRY_HASH_V2_FROM_SYM = Symbol.for('@ocap/client.entryHashV2From');
20
21
  const { createBridgeGovernance } = require('./bridge');
21
22
  const {
22
23
  toDelegateAddress,
@@ -1732,6 +1733,66 @@ const createExtensionMethods = (client, deps = defaultDeps) => {
1732
1733
  return get(res, 'getLedgerEntry') || { code: 'ERROR', entry: null };
1733
1734
  };
1734
1735
 
1736
+ const normalizeHexLocal = h => String(h || '').replace(/^0x/i, '').toLowerCase();
1737
+
1738
+ const hasAuthenticatedTrustAnchor = p => {
1739
+ if (!p) return false;
1740
+ if (typeof p.verifier === 'function') return true;
1741
+ if (typeof p.proposerPublicKey === 'string') {
1742
+ const t = p.proposerPublicKey.trim();
1743
+ if (t.length > 0 && !/^0x$/i.test(t)) return true;
1744
+ } else if (p.proposerPublicKey instanceof Uint8Array && p.proposerPublicKey.length > 0) {
1745
+ return true;
1746
+ }
1747
+ const cpHeight = get(p, 'checkpoint.height');
1748
+ const actHeight = p.checkpointSigActivationHeight;
1749
+ if (typeof cpHeight === 'number' && Number.isSafeInteger(cpHeight) && cpHeight >= 1 && typeof actHeight === 'number' && Number.isSafeInteger(actHeight) && actHeight >= 1 && cpHeight < actHeight && typeof p.activationCheckpointHash === 'string' && /^[0-9a-f]{64}$/.test(normalizeHexLocal(p.activationCheckpointHash.trim()))) {
1750
+ return true;
1751
+ }
1752
+ return false;
1753
+ };
1754
+
1755
+ const maybeRatchetPinnedV2From = (p, result) => {
1756
+ if (!result || result.verified !== true) return;
1757
+ if (!hasAuthenticatedTrustAnchor(p)) return;
1758
+ const entry = get(p, 'entry');
1759
+ if (!entry || typeof entry.sequence !== 'number' || !Number.isSafeInteger(entry.sequence) || entry.sequence < 1) {
1760
+ return;
1761
+ }
1762
+ const v2Hash = computeEntryHash(entry.sequence, entry.txRaw, entry.stateCommitHash || '');
1763
+ if (normalizeHexLocal(entry.entryHash) !== normalizeHexLocal(v2Hash)) {
1764
+ return;
1765
+ }
1766
+ if (client._pinnedEntryHashV2From === undefined || entry.sequence < client._pinnedEntryHashV2From) {
1767
+ client._pinnedEntryHashV2From = entry.sequence;
1768
+ }
1769
+ };
1770
+
1771
+ /**
1772
+ * Query active Ledger metadata (`entryHashV2From`, `proposer`, `proposerPublicKey`, `checkpointSigningEnabled`).
1773
+ *
1774
+ * @memberof GraphQLClient
1775
+ * @function
1776
+ * @name GraphQLClient#getLedgerInfo
1777
+ * @returns {Promise<object>}
1778
+ */
1779
+ client.getLedgerInfo = async () => {
1780
+ const res = await client.doRawQuery(`{
1781
+ getLedgerInfo {
1782
+ code
1783
+ info {
1784
+ chainId
1785
+ latestSequence
1786
+ entryHashV2From
1787
+ proposer
1788
+ proposerPublicKey
1789
+ checkpointSigningEnabled
1790
+ }
1791
+ }
1792
+ }`);
1793
+ return get(res, 'getLedgerInfo') || { code: 'ERROR', info: null };
1794
+ };
1795
+
1735
1796
  /**
1736
1797
  * Query a Ledger Merkle inclusion proof and its covering Checkpoint by sequence number.
1737
1798
  *
@@ -1743,9 +1804,10 @@ const createExtensionMethods = (client, deps = defaultDeps) => {
1743
1804
  * @returns {Promise<object>}
1744
1805
  */
1745
1806
  client.getMerkleProof = async ({ sequence } = {}) => {
1746
- const res = await client.doRawQuery(`{
1747
- getMerkleProof(sequence: ${Number(sequence)}) {
1748
- code
1807
+ const seqNum = Number(sequence);
1808
+ const buildQuery = withV2From => `{
1809
+ getMerkleProof(sequence: ${seqNum}) {
1810
+ code${withV2From ? '\n entryHashV2From' : ''}
1749
1811
  proof {
1750
1812
  index
1751
1813
  leaf
@@ -1766,12 +1828,49 @@ const createExtensionMethods = (client, deps = defaultDeps) => {
1766
1828
  signature
1767
1829
  }
1768
1830
  }
1769
- }`);
1770
- return get(res, 'getMerkleProof') || { code: 'ERROR', proof: null, checkpoint: null };
1831
+ }`;
1832
+
1833
+ let res;
1834
+ if (client._supportsMerkleProofV2From === false) {
1835
+ res = await client.doRawQuery(buildQuery(false));
1836
+ } else {
1837
+ try {
1838
+ res = await client.doRawQuery(buildQuery(true));
1839
+ } catch (err) {
1840
+ const msg = String(get(err, 'message') || err);
1841
+ if (msg.indexOf('entryHashV2From') !== -1) {
1842
+ client._supportsMerkleProofV2From = false;
1843
+ res = await client.doRawQuery(buildQuery(false));
1844
+ } else {
1845
+ throw err;
1846
+ }
1847
+ }
1848
+ }
1849
+
1850
+ const payload = get(res, 'getMerkleProof') || { code: 'ERROR', proof: null, checkpoint: null };
1851
+ if (payload && payload.entryHashV2From !== undefined && payload.entryHashV2From !== null) {
1852
+ if (payload.proof && typeof payload.proof === 'object') {
1853
+ Object.defineProperty(payload.proof, ENTRY_HASH_V2_FROM_SYM, {
1854
+ value: payload.entryHashV2From,
1855
+ enumerable: false,
1856
+ configurable: true
1857
+ });
1858
+ }
1859
+ if (payload.checkpoint && typeof payload.checkpoint === 'object') {
1860
+ Object.defineProperty(payload.checkpoint, ENTRY_HASH_V2_FROM_SYM, {
1861
+ value: payload.entryHashV2From,
1862
+ enumerable: false,
1863
+ configurable: true
1864
+ });
1865
+ }
1866
+ }
1867
+ return payload;
1771
1868
  };
1772
1869
 
1773
1870
  /**
1774
- * Cryptographically verify transaction inclusion in a signed Checkpoint (< 1ms, zero network I/O).
1871
+ * Cryptographically verify transaction inclusion in a signed Checkpoint (#1407, #1707).
1872
+ * Enforces the node's advertised `entryHashV2From` per-call and ratchets `client._pinnedEntryHashV2From`
1873
+ * ONLY upon cryptographically authenticated v2 entry proofs (preventing unauthenticated MITM poisoning).
1775
1874
  *
1776
1875
  * @memberof GraphQLClient
1777
1876
  * @function
@@ -1779,7 +1878,51 @@ const createExtensionMethods = (client, deps = defaultDeps) => {
1779
1878
  * @param {object} params
1780
1879
  * @returns {Promise<{ verified: boolean, reason?: string }>}
1781
1880
  */
1782
- client.verifyTxInclusion = params => verifyTxInclusion(params);
1881
+ client.verifyTxInclusion = async params => {
1882
+ if (!params || params.entryHashV2From !== undefined) {
1883
+ const explicitRes = await verifyTxInclusion(params);
1884
+ maybeRatchetPinnedV2From(params, explicitRes);
1885
+ return explicitRes;
1886
+ }
1887
+
1888
+ const entrySeq = params.entry && typeof params.entry.sequence === 'number' && Number.isSafeInteger(params.entry.sequence) ? params.entry.sequence : undefined;
1889
+ const pinnedV2From = client._pinnedEntryHashV2From;
1890
+
1891
+ let rawCandidate;
1892
+ if (params.proof && typeof params.proof === 'object' && params.proof[ENTRY_HASH_V2_FROM_SYM] !== undefined) {
1893
+ rawCandidate = params.proof[ENTRY_HASH_V2_FROM_SYM];
1894
+ } else if (params.checkpoint && typeof params.checkpoint === 'object' && params.checkpoint[ENTRY_HASH_V2_FROM_SYM] !== undefined) {
1895
+ rawCandidate = params.checkpoint[ENTRY_HASH_V2_FROM_SYM];
1896
+ } else if ((pinnedV2From === undefined || entrySeq !== undefined && entrySeq < pinnedV2From) && typeof client.doRawQuery === 'function' && client._supportsGetLedgerInfo !== false) {
1897
+ try {
1898
+ const infoRes = await client.getLedgerInfo();
1899
+ if (infoRes && infoRes.info && infoRes.info.entryHashV2From !== undefined && infoRes.info.entryHashV2From !== null) {
1900
+ rawCandidate = infoRes.info.entryHashV2From;
1901
+ }
1902
+ } catch (err) {
1903
+ const msg = String(get(err, 'message') || err);
1904
+ if (/Cannot query field.*getLedgerInfo|Unknown field.*getLedgerInfo/i.test(msg)) {
1905
+ client._supportsGetLedgerInfo = false;
1906
+ }
1907
+ }
1908
+ }
1909
+
1910
+ let effectiveV2From = pinnedV2From;
1911
+ if (rawCandidate !== undefined) {
1912
+ const parsed = parseEntryHashV2From(rawCandidate);
1913
+ if (!parsed.ok) {
1914
+ return verifyTxInclusion(Object.assign({}, params, { entryHashV2From: rawCandidate }));
1915
+ }
1916
+ if (parsed.value !== undefined) {
1917
+ effectiveV2From = effectiveV2From === undefined ? parsed.value : Math.min(effectiveV2From, parsed.value);
1918
+ }
1919
+ }
1920
+
1921
+ const effectiveParams = effectiveV2From !== undefined ? Object.assign({}, params, { entryHashV2From: effectiveV2From }) : params;
1922
+ const verifyRes = await verifyTxInclusion(effectiveParams);
1923
+ maybeRatchetPinnedV2From(effectiveParams, verifyRes);
1924
+ return verifyRes;
1925
+ };
1783
1926
 
1784
1927
  /**
1785
1928
  * On-chain bridge governance helpers (create, update, join, leave, pause, resume, close, migrate).