@fhevm/sdk 1.1.0-alpha.4 → 1.1.0-alpha.5

package/_esm/core/host-contracts/getCurrentKmsContextId-p.js

@@ -1,12 +1,12 @@
 import { getCurrentKmsContextIdAbi } from './abi-fragments/fragments.js';
 import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
-import { getVersion, isVersionStrictlyBefore } from './HostContractVersion-p.js';
+import { getHostContractVersion, isVersionStrictlyBefore } from './HostContractVersion-p.js';
 import { assertIsUint256 } from '../base/uint.js';
 import { CACHE_TTL_24H, createCachedFetch } from '../base/cachedFetch.js';
 ////////////////////////////////////////////////////////////////////////////////
 const cachedGetCurrentKmsContextId = createCachedFetch({
     executeFn: _getCurrentKmsContextId,
-    cacheKeyFn: (context, params) => `${context.runtime.uid.toLowerCase()}:${params.address.toLowerCase()}`,
+    cacheKeyFn: (context, params) => `${context.runtime.uid.toLowerCase()}:${params.kmsVerifierAddress.toLowerCase()}`,
     // Host contract versions are immutable per deployment, so a long TTL is safe.
     ttlMs: CACHE_TTL_24H,
 });
@@ -24,15 +24,14 @@ export function getCurrentKmsContextId(context, parameters) {
     return cachedGetCurrentKmsContextId.execute(context, parameters);
 }
 async function _getCurrentKmsContextId(context, parameters) {
-    const version = await getVersion(context, parameters);
-    // getCurrentKmsContextId has been introduced in KMSVerifier.sol v0.2.0
-    if (isVersionStrictlyBefore(version, { major: 0, minor: 2 })) {
+    const kmsVerifierVersion = await getHostContractVersion(context, { address: parameters.kmsVerifierAddress });
+    // getCurrentKmsContextId has been introduced in protocol v0.12.0 (KMSVerifier v0.2.0)
+    if (isVersionStrictlyBefore(kmsVerifierVersion, { major: 0, minor: 2 })) {
         return 0n;
     }
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.kmsVerifierAddress,
         abi: getCurrentKmsContextIdAbi,
         args: [],
         functionName: getCurrentKmsContextIdAbi[0].name,

package/_esm/core/host-contracts/getCurrentKmsContextId-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getCurrentKmsContextId-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getCurrentKmsContextId-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAe1E,gFAAgF;AAEhF,MAAM,4BAA4B,GAAG,iBAAiB,CAAkC;IACtF,SAAS,EAAE,uBAAuB;IAClC,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,EAAE;IACvG,8EAA8E;IAC9E,KAAK,EAAE,aAAa;CACrB,CAAC,CAAC;AAEH;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAAgB,EAChB,UAAwE;IAExE,OAAO,4BAA4B,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,UAAsB;IAC7E,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACtD,uEAAuE;IACvE,IAAI,uBAAuB,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC7D,OAAO,EAAmB,CAAC;IAC7B,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,yBAAyB;QAC9B,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI;KAChD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,eAAe,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,yBAAyB,EAAE;YACzC,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC,GAAG,CAAkB,CAAC;AACtC,CAAC"}
+{"version":3,"file":"getCurrentKmsContextId-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getCurrentKmsContextId-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAe1E,gFAAgF;AAEhF,MAAM,4BAA4B,GAAG,iBAAiB,CAAkC;IACtF,SAAS,EAAE,uBAAuB;IAClC,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC,kBAAkB,CAAC,WAAW,EAAE,EAAE;IAClH,8EAA8E;IAC9E,KAAK,EAAE,aAAa;CACrB,CAAC,CAAC;AAEH;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAAgB,EAChB,UAAwE;IAExE,OAAO,4BAA4B,CAAC,OAAO,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,UAAsB;IAC7E,MAAM,kBAAkB,GAAG,MAAM,sBAAsB,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAE7G,sFAAsF;IACtF,IAAI,uBAAuB,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACxE,OAAO,EAAmB,CAAC;IAC7B,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU,CAAC,kBAAkB;QACtC,GAAG,EAAE,yBAAyB;QAC9B,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI;KAChD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,eAAe,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,yBAAyB,EAAE;YACzC,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,MAAM,CAAC,GAAG,CAAkB,CAAC;AACtC,CAAC"}

package/_esm/core/host-contracts/getFhevmExecutorAddress-p.js

@@ -9,7 +9,7 @@ import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
  */
 export async function getFhevmExecutorAddress(context, parameters) {
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
+    const address = parameters.aclAddress;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
         address: address,
         abi: getFHEVMExecutorAddressAbi,

package/_esm/core/host-contracts/getFhevmExecutorAddress-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getFhevmExecutorAddress-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getFhevmExecutorAddress-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAe7D,gFAAgF;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,UAAsB;IACpF,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAC,IAAI;KACjD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,0BAA0B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,EAAE;YAChD,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"getFhevmExecutorAddress-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getFhevmExecutorAddress-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAe7D,gFAAgF;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,UAAsB;IACpF,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC;IAEtC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAC,IAAI;KACjD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,0BAA0B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,EAAE;YAChD,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/_esm/core/host-contracts/getHandleVersion-p.js

@@ -9,9 +9,8 @@ import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
  */
 export async function getHandleVersion(context, parameters) {
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.fhevmExecutorAddress,
         abi: getHandleVersionAbi,
         args: [],
         functionName: getHandleVersionAbi[0].name,

package/_esm/core/host-contracts/getHandleVersion-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getHandleVersion-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getHandleVersion-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAe7D,gFAAgF;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAgB,EAAE,UAAsB;IAC7E,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI;KAC1C,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,MAAM,CAAC,GAAG,CAAgB,CAAC;AACpC,CAAC"}
+{"version":3,"file":"getHandleVersion-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getHandleVersion-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAe7D,gFAAgF;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,OAAgB,EAAE,UAAsB;IAC7E,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU,CAAC,oBAAoB;QACxC,GAAG,EAAE,mBAAmB;QACxB,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAC,IAAI;KAC1C,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IAED,OAAO,MAAM,CAAC,GAAG,CAAgB,CAAC;AACpC,CAAC"}

package/_esm/core/host-contracts/getHcuLimitAddress-p.js

@@ -9,9 +9,8 @@ import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
  */
 export async function getHcuLimitAddress(context, parameters) {
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.fhevmExecutorAddress,
         abi: getHCULimitAddressAbi,
         args: [],
         functionName: getHCULimitAddressAbi[0].name,

package/_esm/core/host-contracts/getHcuLimitAddress-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getHcuLimitAddress-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getHcuLimitAddress-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAe7D,gFAAgF;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IAC/E,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,qBAAqB;QAC1B,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5C,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,0BAA0B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE;YAC3C,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"getHcuLimitAddress-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getHcuLimitAddress-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAe7D,gFAAgF;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAAgB,EAAE,UAAsB;IAC/E,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU,CAAC,oBAAoB;QACxC,GAAG,EAAE,qBAAqB;QAC1B,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5C,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,0BAA0B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,2BAA2B,EAAE;YAC3C,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/_esm/core/host-contracts/getInputVerifierAddress-p.js

@@ -9,9 +9,8 @@ import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
  */
 export async function getInputVerifierAddress(context, parameters) {
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.fhevmExecutorAddress,
         abi: getInputVerifierAddressAbi,
         args: [],
         functionName: getInputVerifierAddressAbi[0].name,

package/_esm/core/host-contracts/getInputVerifierAddress-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getInputVerifierAddress-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getInputVerifierAddress-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAe7D,gFAAgF;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,UAAsB;IACpF,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAC,IAAI;KACjD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,0BAA0B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,EAAE;YAChD,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"getInputVerifierAddress-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getInputVerifierAddress-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAe7D,gFAAgF;AAEhF;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,UAAsB;IACpF,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU,CAAC,oBAAoB;QACxC,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAC,IAAI;KACjD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,0BAA0B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,EAAE;YAChD,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/_esm/core/host-contracts/getKmsContextSignersAndThreshold-p.js

@@ -1,6 +1,6 @@
 import { assertIsChecksummedAddressArray } from '../base/address.js';
 import { asUint8Number, isUint8 } from '../base/uint.js';
-import { getVersion } from './HostContractVersion-p.js';
+import { getHostContractVersion } from './HostContractVersion-p.js';
 import { isVersionStrictlyBefore } from '../host-contracts/HostContractVersion-p.js';
 import { executeWithBatching } from '../base/promise.js';
 import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
@@ -9,7 +9,7 @@ import { CACHE_TTL_24H, createCachedFetch } from '../base/cachedFetch.js';
 ////////////////////////////////////////////////////////////////////////////////
 const cachedGetKmsContextSignersAndThreshold = createCachedFetch({
     executeFn: _getKmsContextSignersAndThreshold,
-    cacheKeyFn: (context, params) => `${context.runtime.uid.toLowerCase()}:${params.address.toLowerCase()}`,
+    cacheKeyFn: (context, params) => `${context.runtime.uid.toLowerCase()}:${params.kmsVerifierAddress.toLowerCase()}`,
     // Host contract versions are immutable per deployment, so a long TTL is safe.
     ttlMs: CACHE_TTL_24H,
 });
@@ -36,8 +36,8 @@ export function getKmsSignersAndThreshold(context, parameters) {
 }
 ////////////////////////////////////////////////////////////////////////////////
 async function _getKmsContextSignersAndThreshold(context, parameters) {
-    const version = await getVersion(context, { address: parameters.address });
-    if (!isVersionStrictlyBefore(version, { major: 0, minor: 2 })) {
+    const kmsVerifierVersion = await getHostContractVersion(context, { address: parameters.kmsVerifierAddress });
+    if (!isVersionStrictlyBefore(kmsVerifierVersion, { major: 0, minor: 2 })) {
         throw new Error('getContextSignersAndThreshold requires KMSVerifier < v0.2.0');
     }
     ////////////////////////////////////////////////////////////////////////////
@@ -73,9 +73,8 @@ async function _getKmsContextSignersAndThreshold(context, parameters) {
 ////////////////////////////////////////////////////////////////////////////////
 async function _getThreshold(context, parameters) {
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.kmsVerifierAddress,
         abi: getThresholdAbi,
         args: [],
         functionName: getThresholdAbi[0].name,
@@ -88,9 +87,8 @@ async function _getThreshold(context, parameters) {
 ////////////////////////////////////////////////////////////////////////////////
 async function _getKmsSigners(context, parameters) {
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.kmsVerifierAddress,
         abi: getKmsSignersAbi,
         args: [],
         functionName: getKmsSignersAbi[0].name,

package/_esm/core/host-contracts/getKmsContextSignersAndThreshold-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getKmsContextSignersAndThreshold-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getKmsContextSignersAndThreshold-p.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getKmsContextSignersAndThreshold-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getKmsContextSignersAndThreshold-p.ts"],"names":[],"mappings":"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"}

package/_esm/core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.js

@@ -1,4 +1,4 @@
-import { getVersion, isVersionStrictlyBefore } from './HostContractVersion-p.js';
+import { getHostContractVersion, isVersionStrictlyBefore } from './HostContractVersion-p.js';
 import { createCachedFetch } from '../base/cachedFetch.js';
 import { assertIsKmsExtraData, fromKmsExtraData } from '../kms/kmsExtraData.js';
 import { assertIsChecksummedAddressArray } from '../base/address.js';
@@ -11,7 +11,7 @@ const cachedGetKmsContextSignersAndThresholdFromExtraData = createCachedFetch({
     cacheKeyFn: (context, params) => {
         const { kmsContextId } = fromKmsExtraData(params.extraData);
         const contextIdHex = kmsContextId.toString(16).padStart(64, '0');
-        return `${context.runtime.uid.toLowerCase()}:${params.address.toLowerCase()}:${contextIdHex}`;
+        return `${context.runtime.uid.toLowerCase()}:${params.kmsVerifierAddress.toLowerCase()}:${contextIdHex}`;
     },
     // Permanent cache: signers and threshold are immutable per context ID.
 });
@@ -37,14 +37,13 @@ export function getKmsContextSignersAndThresholdFromExtraData(context, parameter
 }
 ////////////////////////////////////////////////////////////////////////////////
 async function _getKmsContextSignersAndThresholdFromExtraData(context, parameters) {
-    const version = await getVersion(context, { address: parameters.address });
-    if (isVersionStrictlyBefore(version, { major: 0, minor: 2 })) {
+    const kmsVerifierVersion = await getHostContractVersion(context, { address: parameters.kmsVerifierAddress });
+    if (isVersionStrictlyBefore(kmsVerifierVersion, { major: 0, minor: 2 })) {
         throw new Error('getContextSignersAndThresholdFromExtraData requires KMSVerifier >= v0.2.0');
     }
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.kmsVerifierAddress,
         abi: getContextSignersAndThresholdFromExtraDataAbi,
         args: [parameters.extraData],
         functionName: getContextSignersAndThresholdFromExtraDataAbi[0].name,

package/_esm/core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getKmsContextSignersAndThresholdFromExtraData-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"getKmsContextSignersAndThresholdFromExtraData-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getKmsContextSignersAndThresholdFromExtraData-p.ts"],"names":[],"mappings":"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"}

package/_esm/core/host-contracts/getSignersForKmsContext-p.js

@@ -1,4 +1,4 @@
-import { getVersion, isVersionStrictlyBefore } from './HostContractVersion-p.js';
+import { getHostContractVersion, isVersionStrictlyBefore } from './HostContractVersion-p.js';
 import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
 import { getKmsSignersAbi, getSignersForKmsContextAbi } from './abi-fragments/fragments.js';
 import { assertIsChecksummedAddressArray } from '../base/address.js';
@@ -12,11 +12,11 @@ import { assertIsChecksummedAddressArray } from '../base/address.js';
  * Returns an empty array for KMSVerifier versions before v0.2.0 (where
  * per-context signers were not yet supported).
  *
- * @param parameters.address - The checksummed address of the KMSVerifier contract.
+ * @param parameters.kmsVerifierAddress - The checksummed address of the KMSVerifier contract.
  * @param parameters.kmsContextId - The context ID to query signers for.
  */
 export async function getSignersForKmsContext(context, parameters) {
-    const version = await getVersion(context, parameters);
+    const version = await getHostContractVersion(context, { address: parameters.kmsVerifierAddress });
     // getCurrentKmsContextId has been introduced in KMSVerifier.sol v0.2.0
     if (isVersionStrictlyBefore(version, { major: 0, minor: 2 })) {
         if (parameters.kmsContextId === 0n) {
@@ -25,9 +25,8 @@ export async function getSignersForKmsContext(context, parameters) {
         throw new Error('Invalid context id');
     }
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.kmsVerifierAddress,
         abi: getSignersForKmsContextAbi,
         args: [parameters.kmsContextId],
         functionName: getSignersForKmsContextAbi[0].name,
@@ -44,9 +43,8 @@ export async function getSignersForKmsContext(context, parameters) {
 }
 export async function getKmsSigners(context, parameters) {
     const trustedClient = getTrustedClient(context);
-    const address = parameters.address;
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: parameters.kmsVerifierAddress,
         abi: getKmsSignersAbi,
         args: [],
         functionName: getKmsSignersAbi[0].name,

package/_esm/core/host-contracts/getSignersForKmsContext-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"getSignersForKmsContext-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getSignersForKmsContext-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAgBrE,gFAAgF;AAEhF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,UAAsB;IACpF,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACtD,uEAAuE;IACvE,IAAI,uBAAuB,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC7D,IAAI,UAAU,CAAC,YAAY,KAAK,EAAE,EAAE,CAAC;YACnC,OAAO,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAC/B,YAAY,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAC,IAAI;KACjD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,+BAA+B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,sCAAsC,UAAU,CAAC,YAAY,GAAG,EAAE;YAChF,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAgB,EAChB,UAA4C;IAE5C,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC;IAEnC,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,gBAAgB;QACrB,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI;KACvC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,+BAA+B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,sBAAsB,EAAE;YACtC,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"getSignersForKmsContext-p.js","sourceRoot":"","sources":["../../../core/host-contracts/getSignersForKmsContext-p.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC5F,OAAO,EAAE,+BAA+B,EAAE,MAAM,oBAAoB,CAAC;AAgBrE,gFAAgF;AAEhF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAAgB,EAAE,UAAsB;IACpF,MAAM,OAAO,GAAG,MAAM,sBAAsB,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAClG,uEAAuE;IACvE,IAAI,uBAAuB,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC7D,IAAI,UAAU,CAAC,YAAY,KAAK,EAAE,EAAE,CAAC;YACnC,OAAO,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU,CAAC,kBAAkB;QACtC,GAAG,EAAE,0BAA0B;QAC/B,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC;QAC/B,YAAY,EAAE,0BAA0B,CAAC,CAAC,CAAC,CAAC,IAAI;KACjD,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,+BAA+B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,sCAAsC,UAAU,CAAC,YAAY,GAAG,EAAE;YAChF,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAAgB,EAChB,UAA4C;IAE5C,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU,CAAC,kBAAkB;QACtC,GAAG,EAAE,gBAAgB;QACrB,IAAI,EAAE,EAAE;QACR,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI;KACvC,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,+BAA+B,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,sBAAsB,EAAE;YACtC,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;IACL,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/_esm/core/host-contracts/isAllowedForDecryption.js

@@ -3,9 +3,9 @@ import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
 import { executeWithBatching } from '../base/promise.js';
 ////////////////////////////////////////////////////////////////////////////////
 export async function isAllowedForDecryption(context, parameters) {
-    const { address, handles } = parameters;
+    const { aclAddress, handles } = parameters;
     const rpcCalls = handles.map((handle) => () => _isAllowedForDecryption(context, {
-        address,
+        aclAddress,
         handle,
     }));
     const results = await executeWithBatching(rpcCalls, context.options.batchRpcCalls);
@@ -13,10 +13,10 @@ export async function isAllowedForDecryption(context, parameters) {
 }
 ////////////////////////////////////////////////////////////////////////////////
 async function _isAllowedForDecryption(context, parameters) {
-    const { address, handle } = parameters;
+    const { aclAddress, handle } = parameters;
     const trustedClient = getTrustedClient(context);
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: aclAddress,
         abi: isAllowedForDecryptionAbi,
         args: [handle.bytes32Hex],
         functionName: isAllowedForDecryptionAbi[0].name,

package/_esm/core/host-contracts/isAllowedForDecryption.js.map

@@ -1 +1 @@
-{"version":3,"file":"isAllowedForDecryption.js","sourceRoot":"","sources":["../../../core/host-contracts/isAllowedForDecryption.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAiBzD,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,OAAgB,EAAE,UAAsB;IACnF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAExC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAC1B,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,CACf,uBAAuB,CAAC,OAAO,EAAE;QAC/B,OAAO;QACP,MAAM;KACP,CAAC,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEnF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gFAAgF;AAEhF,KAAK,UAAU,uBAAuB,CACpC,OAAgB,EAChB,UAGC;IAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IACvC,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,yBAAyB;QAC9B,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC;QACzB,YAAY,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI;KAChD,CAAC,CAAC;IAEH,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"isAllowedForDecryption.js","sourceRoot":"","sources":["../../../core/host-contracts/isAllowedForDecryption.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,yBAAyB,EAAE,MAAM,8BAA8B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAiBzD,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,OAAgB,EAAE,UAAsB;IACnF,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAE3C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAC1B,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,EAAE,CACf,uBAAuB,CAAC,OAAO,EAAE;QAC/B,UAAU;QACV,MAAM;KACP,CAAC,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEnF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gFAAgF;AAEhF,KAAK,UAAU,uBAAuB,CACpC,OAAgB,EAChB,UAGC;IAED,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAC1C,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU;QACnB,GAAG,EAAE,yBAAyB;QAC9B,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC;QACzB,YAAY,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAC,IAAI;KAChD,CAAC,CAAC;IAEH,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/_esm/core/host-contracts/isHandleDelegatedForUserDecryption-p.js

@@ -3,9 +3,9 @@ import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
 import { executeWithBatching } from '../base/promise.js';
 ////////////////////////////////////////////////////////////////////////////////
 export async function isHandleDelegatedForUserDecryption(context, parameters) {
-    const { address, delegate, delegator, pairs } = parameters;
+    const { aclAddress, delegate, delegator, pairs } = parameters;
     const rpcCalls = pairs.map((pair) => () => _isHandleDelegatedForUserDecryption(context, {
-        address,
+        aclAddress,
         delegate,
         delegator,
         handle: pair.handle,
@@ -16,16 +16,16 @@ export async function isHandleDelegatedForUserDecryption(context, parameters) {
 }
 ////////////////////////////////////////////////////////////////////////////////
 async function _isHandleDelegatedForUserDecryption(context, parameters) {
-    const { address, delegator, delegate, contractAddress, handle } = parameters;
+    const { aclAddress, delegator, delegate, contractAddress, handle } = parameters;
     const trustedClient = getTrustedClient(context);
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: aclAddress,
         abi: isHandleDelegatedForUserDecryptionAbi,
         args: [delegator, delegate, contractAddress, handle.bytes32Hex],
         functionName: isHandleDelegatedForUserDecryptionAbi[0].name,
     });
     if (typeof res !== 'boolean') {
-        throw new Error(`Invalid isHandleDelegatedForUserDecryptionAbi result.`);
+        throw new Error(`Invalid isHandleDelegatedForUserDecryption result.`);
     }
     return res;
 }

package/_esm/core/host-contracts/isHandleDelegatedForUserDecryption-p.js.map

@@ -1 +1 @@
-{"version":3,"file":"isHandleDelegatedForUserDecryption-p.js","sourceRoot":"","sources":["../../../core/host-contracts/isHandleDelegatedForUserDecryption-p.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qCAAqC,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAmBzD,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,OAAgB,EAChB,UAAsB;IAEtB,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;IAE3D,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CACxB,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CACb,mCAAmC,CAAC,OAAO,EAAE;QAC3C,OAAO;QACP,QAAQ;QACR,SAAS;QACT,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,eAAe,EAAE,IAAI,CAAC,eAAe;KACtC,CAAC,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEnF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gFAAgF;AAEhF,KAAK,UAAU,mCAAmC,CAChD,OAAgB,EAChB,UAMC;IAED,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAC7E,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,qCAAqC;QAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC;QAC/D,YAAY,EAAE,qCAAqC,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5D,CAAC,CAAC;IAEH,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;IAC3E,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"isHandleDelegatedForUserDecryption-p.js","sourceRoot":"","sources":["../../../core/host-contracts/isHandleDelegatedForUserDecryption-p.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,qCAAqC,EAAE,MAAM,8BAA8B,CAAC;AACrF,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAmBzD,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,OAAgB,EAChB,UAAsB;IAEtB,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;IAE9D,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CACxB,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CACb,mCAAmC,CAAC,OAAO,EAAE;QAC3C,UAAU;QACV,QAAQ;QACR,SAAS;QACT,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,eAAe,EAAE,IAAI,CAAC,eAAe;KACtC,CAAC,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEnF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gFAAgF;AAEhF,KAAK,UAAU,mCAAmC,CAChD,OAAgB,EAChB,UAMC;IAED,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC;IAChF,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU;QACnB,GAAG,EAAE,qCAAqC;QAC1C,IAAI,EAAE,CAAC,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,CAAC,UAAU,CAAC;QAC/D,YAAY,EAAE,qCAAqC,CAAC,CAAC,CAAC,CAAC,IAAI;KAC5D,CAAC,CAAC;IAEH,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}

package/_esm/core/host-contracts/isUserDecryptable.js

@@ -5,7 +5,7 @@ import { persistAllowed } from './persistAllowed.js';
  * See FHE.sol : isUserDecryptable()
  */
 export async function isUserDecryptable(context, parameters) {
-    const { address, userAddress, handleContractPairs } = parameters;
+    const { aclAddress, userAddress, handleContractPairs } = parameters;
     function getKey(addr, handleBytes32Hex) {
         return `${addr}:${handleBytes32Hex}`.toLowerCase();
     }
@@ -30,7 +30,7 @@ export async function isUserDecryptable(context, parameters) {
         }
     }
     const dedupedResults = await persistAllowed(context, {
-        address,
+        aclAddress,
         pairs: dedupedChecks,
     });
     const resultMap = new Map();

package/_esm/core/host-contracts/isUserDecryptable.js.map

@@ -1 +1 @@
-{"version":3,"file":"isUserDecryptable.js","sourceRoot":"","sources":["../../../core/host-contracts/isUserDecryptable.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAwBrD,gFAAgF;AAEhF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAgB,EAAE,UAAsB;IAC9E,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,UAAU,CAAC;IAEjE,SAAS,MAAM,CAAC,IAAY,EAAE,gBAAwB;QACpD,OAAO,GAAG,IAAI,IAAI,gBAAgB,EAAE,CAAC,WAAW,EAAE,CAAC;IACrD,CAAC;IAED,MAAM,aAAa,GAAwB,EAAE,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAEnC,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC1B,aAAa,CAAC,IAAI,CAAC;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,eAAe;aAC9B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE;QACnD,OAAO;QACP,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC7C,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;QACjD,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACtC,MAAM,eAAe,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5F,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAE/E,IAAI,eAAe,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO;YACL,eAAe;YACf,WAAW;SACZ,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"isUserDecryptable.js","sourceRoot":"","sources":["../../../core/host-contracts/isUserDecryptable.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAwBrD,gFAAgF;AAEhF;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,OAAgB,EAAE,UAAsB;IAC9E,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,UAAU,CAAC;IAEpE,SAAS,MAAM,CAAC,IAAY,EAAE,gBAAwB;QACpD,OAAO,GAAG,IAAI,IAAI,gBAAgB,EAAE,CAAC,WAAW,EAAE,CAAC;IACrD,CAAC;IAED,MAAM,aAAa,GAAwB,EAAE,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;IAEnC,KAAK,MAAM,IAAI,IAAI,mBAAmB,EAAE,CAAC;QACvC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACzE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;YAC/B,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC1B,aAAa,CAAC,IAAI,CAAC;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,eAAe;aAC9B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAC5D,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC3B,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtB,aAAa,CAAC,IAAI,CAAC;gBACjB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,WAAW;aACrB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE;QACnD,UAAU;QACV,KAAK,EAAE,aAAa;KACrB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC7C,KAAK,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;QACjD,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,EAAE,CAAC,CAAC;QAClD,CAAC;QACD,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC;IACxE,CAAC;IAED,OAAO,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACtC,MAAM,eAAe,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAC5F,MAAM,WAAW,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;QAE/E,IAAI,eAAe,KAAK,SAAS,IAAI,WAAW,KAAK,SAAS,EAAE,CAAC;YAC/D,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO;YACL,eAAe;YACf,WAAW;SACZ,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}

package/_esm/core/host-contracts/persistAllowed.js

@@ -3,9 +3,9 @@ import { getTrustedClient } from '../runtime/CoreFhevm-p.js';
 import { executeWithBatching } from '../base/promise.js';
 ////////////////////////////////////////////////////////////////////////////////
 export async function persistAllowed(context, parameters) {
-    const { address, pairs } = parameters;
+    const { aclAddress, pairs } = parameters;
     const rpcCalls = pairs.map((pair) => () => _persistAllowed(context, {
-        address,
+        aclAddress,
         handle: pair.handle,
         account: pair.account,
     }));
@@ -14,10 +14,10 @@ export async function persistAllowed(context, parameters) {
 }
 ////////////////////////////////////////////////////////////////////////////////
 async function _persistAllowed(context, parameters) {
-    const { address, handle, account } = parameters;
+    const { aclAddress, handle, account } = parameters;
     const trustedClient = getTrustedClient(context);
     const res = await context.runtime.ethereum.readContract(trustedClient, {
-        address: address,
+        address: aclAddress,
         abi: persistAllowedAbi,
         args: [handle.bytes32Hex, account],
         functionName: persistAllowedAbi[0].name,

package/_esm/core/host-contracts/persistAllowed.js.map

@@ -1 +1 @@
-{"version":3,"file":"persistAllowed.js","sourceRoot":"","sources":["../../../core/host-contracts/persistAllowed.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAiBzD,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAgB,EAAE,UAAsB;IAC3E,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;IAEtC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CACxB,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CACb,eAAe,CAAC,OAAO,EAAE;QACvB,OAAO;QACP,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEnF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gFAAgF;AAEhF,KAAK,UAAU,eAAe,CAC5B,OAAgB,EAChB,UAIC;IAED,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IAChD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,OAAO;QAChB,GAAG,EAAE,iBAAiB;QACtB,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC;QAClC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI;KACxC,CAAC,CAAC;IAEH,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}
+{"version":3,"file":"persistAllowed.js","sourceRoot":"","sources":["../../../core/host-contracts/persistAllowed.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAiBzD,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAgB,EAAE,UAAsB;IAC3E,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,GAAG,UAAU,CAAC;IAEzC,MAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CACxB,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,EAAE,CACb,eAAe,CAAC,OAAO,EAAE;QACvB,UAAU;QACV,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;KACtB,CAAC,CACL,CAAC;IAEF,MAAM,OAAO,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEnF,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gFAAgF;AAEhF,KAAK,UAAU,eAAe,CAC5B,OAAgB,EAChB,UAIC;IAED,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,UAAU,CAAC;IACnD,MAAM,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAEhD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE;QACrE,OAAO,EAAE,UAAU;QACnB,GAAG,EAAE,iBAAiB;QACtB,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC;QAClC,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,IAAI;KACxC,CAAC,CAAC;IAEH,IAAI,OAAO,GAAG,KAAK,SAAS,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC"}