@xyo-network/erc1822-witness 4.1.1 → 4.2.0

package/dist/neutral/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAAE,gBAAgB,EACnC,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAoB,MAAM,mCAAmC,CAAA;AAGxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAGjD,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAC9E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAErG,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;AAEzE,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,kBAAkB,CACjH,OAAO,EACP,UAAU,EACV,aAAa,CACd;IACC,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAuD;IACvG,gBAAyB,mBAAmB,EAAE,MAAM,CAA6B;cAExD,cAAc,CAAC,UAAU,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAiCjG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAA;AAExD,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAAE,gBAAgB,EACnC,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAoB,MAAM,mCAAmC,CAAA;AAGxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAGjD,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAC9E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAErG,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;AAEzE,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,kBAAkB,CACjH,OAAO,EACP,UAAU,EACV,aAAa,CACd;IACC,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAuD;IACvG,gBAAyB,mBAAmB,EAAE,MAAM,CAA6B;cAExD,cAAc,CAAC,UAAU,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAiCjG"}

package/dist/neutral/index.d.ts

@@ -1,40 +1,4 @@
-import { Address } from '@xylabs/hex';
-import { Provider } from 'ethers';
-import { Payload, Schema } from '@xyo-network/payload-model';
-import { EvmWitnessConfig, EvmWitnessParams, AbstractEvmWitness, EvmAddress } from '@xyo-network/witness-evm-abstract';
-
-declare const ERC1822_PROXY_LOGIC_SLOT = "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7";
-interface Erc1822DataSlots {
-    implementation?: Address;
-}
-interface Erc1822SlotStatus {
-    address: string;
-    implementation: string;
-    slots: Erc1822DataSlots;
-}
-declare const getErc1822SlotStatus: (provider: Provider, address: string, block?: number) => Promise<Erc1822SlotStatus>;
-
-declare const Erc1822StatusSchema = "network.xyo.erc1822.status";
-type Erc1822StatusSchema = typeof Erc1822StatusSchema;
-type Erc1822Status = Payload<{
-    address: string;
-    block: number;
-    chainId: number;
-    implementation?: Erc1822SlotStatus['implementation'];
-    slots?: Erc1822SlotStatus['slots'];
-}, Erc1822StatusSchema>;
-
-declare const Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
-type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema;
-type Erc1822WitnessConfig = EvmWitnessConfig<{
-    address?: string;
-}, Erc1822WitnessConfigSchema>;
-type Erc1822WitnessParams = EvmWitnessParams<Erc1822WitnessConfig>;
-declare class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractEvmWitness<TParams, EvmAddress, Erc1822Status> {
-    static readonly configSchemas: Schema[];
-    static readonly defaultConfigSchema: Schema;
-    protected observeHandler(inPayloads?: EvmAddress[]): Promise<Erc1822Status[]>;
-}
-
-export { ERC1822_PROXY_LOGIC_SLOT, Erc1822StatusSchema, Erc1822Witness, Erc1822WitnessConfigSchema, getErc1822SlotStatus };
-export type { Erc1822DataSlots, Erc1822SlotStatus, Erc1822Status, Erc1822WitnessConfig, Erc1822WitnessParams };
+export * from './lib/index.ts';
+export * from './Payload.ts';
+export * from './Witness.ts';
+//# sourceMappingURL=index.d.ts.map

package/dist/neutral/index.mjs

@@ -1,10 +1,14 @@
 // src/lib/getErc1822SlotStatus.ts
-import { hexFromHexString, isHexZero } from "@xylabs/hex";
+import {
+  asEthAddress,
+  hexFromHexString,
+  isHexZero
+} from "@xylabs/hex";
 var ERC1822_PROXY_LOGIC_SLOT = "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7";
 var readAddressFromSlot = async (provider, address, slot, block) => {
   try {
     const slotValue = await provider.getStorage(address, slot, block);
-    return hexFromHexString(slotValue, { prefix: true });
+    return asEthAddress(hexFromHexString(slotValue, { prefix: true }));
   } catch {
     return;
   }
@@ -26,6 +30,7 @@ var Erc1822StatusSchema = "network.xyo.erc1822.status";
 
 // src/Witness.ts
 import { assertEx } from "@xylabs/assert";
+import { asEthAddress as asEthAddress2 } from "@xylabs/hex";
 import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
 import { AbstractEvmWitness, EvmAddressSchema } from "@xyo-network/witness-evm-abstract";
 var Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
@@ -38,7 +43,7 @@ var Erc1822Witness = class extends AbstractEvmWitness {
     try {
       const observations = await Promise.all(
         inPayloads.filter(isPayloadOfSchemaType(EvmAddressSchema)).map(async ({ address }) => {
-          const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address").toLowerCase();
+          const validatedAddress = asEthAddress2(assertEx(address ?? this.config.address, () => "Missing address"), true);
           const provider = await this.getProvider(true, true);
           const block = await provider.getBlockNumber();
           const { implementation, slots } = await getErc1822SlotStatus(provider, validatedAddress, block);

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/getErc1822SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import type { Address } from '@xylabs/hex'\nimport { hexFromHexString, isHexZero } from '@xylabs/hex'\nimport type { Provider } from 'ethers'\n\nexport const ERC1822_PROXY_LOGIC_SLOT = '0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7'\n\nexport interface Erc1822DataSlots {\n  implementation?: Address\n}\n\nexport interface Erc1822SlotStatus {\n  address: string\n  implementation: string\n  slots: Erc1822DataSlots\n}\n\nconst readAddressFromSlot = async (provider: Provider, address: string, slot: string, block?: number) => {\n  try {\n    const slotValue = await provider.getStorage(address, slot, block)\n    return hexFromHexString(slotValue, { prefix: true })\n  } catch {\n    return\n  }\n}\n\nexport const getErc1822SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1822SlotStatus> => {\n  const status: Erc1822SlotStatus = {\n    address,\n    implementation: address,\n    slots: { implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block) },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = status.slots.implementation\n  }\n\n  return status\n}\n","import type { Payload } from '@xyo-network/payload-model'\n\nimport type { Erc1822SlotStatus } from './lib/index.ts'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n  {\n    address: string\n    block: number\n    chainId: number\n    implementation?: Erc1822SlotStatus['implementation']\n    slots?: Erc1822SlotStatus['slots']\n  },\n  Erc1822StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport type { Schema } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport type {\n  EvmAddress,\n  EvmWitnessConfig, EvmWitnessParams,\n} from '@xyo-network/witness-evm-abstract'\nimport { AbstractEvmWitness, EvmAddressSchema } from '@xyo-network/witness-evm-abstract'\n\nimport { getErc1822SlotStatus } from './lib/index.ts'\nimport type { Erc1822Status } from './Payload.ts'\nimport { Erc1822StatusSchema } from './Payload.ts'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = EvmWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = EvmWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractEvmWitness<\n  TParams,\n  EvmAddress,\n  Erc1822Status\n> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, Erc1822WitnessConfigSchema]\n  static override readonly defaultConfigSchema: Schema = Erc1822WitnessConfigSchema\n\n  protected override async observeHandler(inPayloads: EvmAddress[] = []): Promise<Erc1822Status[]> {\n    await this.started('throw')\n    // calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmAddress>(EvmAddressSchema)).map(async ({ address }) => {\n          const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address').toLowerCase()\n\n          const provider = await this.getProvider(true, true)\n\n          const block = await provider.getBlockNumber()\n\n          const { implementation, slots } = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1822Status = {\n            address: validatedAddress,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1822StatusSchema,\n            slots,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n}\n"],"mappings":";AACA,SAAS,kBAAkB,iBAAiB;AAGrC,IAAM,2BAA2B;AAYxC,IAAM,sBAAsB,OAAO,UAAoB,SAAiB,MAAc,UAAmB;AACvG,MAAI;AACF,UAAM,YAAY,MAAM,SAAS,WAAW,SAAS,MAAM,KAAK;AAChE,WAAO,iBAAiB,WAAW,EAAE,QAAQ,KAAK,CAAC;AAAA,EACrD,QAAQ;AACN;AAAA,EACF;AACF;AAEO,IAAM,uBAAuB,OAAO,UAAoB,SAAiB,UAA+C;AAC7H,QAAM,SAA4B;AAAA,IAChC;AAAA,IACA,gBAAgB;AAAA,IAChB,OAAO,EAAE,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK,EAAE;AAAA,EACzG;AAEA,MAAI,OAAO,MAAM,kBAAkB,CAAC,UAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACJnC,SAAS,gBAAgB;AAEzB,SAAS,6BAA6B;AAKtC,SAAS,oBAAoB,wBAAwB;AAM9C,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,mBAI/F;AAAA,EACA,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,0BAA0B;AAAA,EACtG,OAAyB,sBAA8B;AAAA,EAEvD,MAAyB,eAAe,aAA2B,CAAC,GAA6B;AAC/F,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,eAAe,MAAM,QAAQ;AAAA,QACjC,WAAW,OAAO,sBAAkC,gBAAgB,CAAC,EAAE,IAAI,OAAO,EAAE,QAAQ,MAAM;AAChG,gBAAM,mBAAmB,SAAS,WAAW,KAAK,OAAO,SAAS,MAAM,iBAAiB,EAAE,YAAY;AAEvG,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAElD,gBAAM,QAAQ,MAAM,SAAS,eAAe;AAE5C,gBAAM,EAAE,gBAAgB,MAAM,IAAI,MAAM,qBAAqB,UAAU,kBAAkB,KAAK;AAE9F,gBAAM,cAA6B;AAAA,YACjC,SAAS;AAAA,YACT;AAAA,YACA,SAAS,QAAQ,MAAM,SAAS,WAAW,GAAG,OAAO;AAAA,YACrD;AAAA,YACA,QAAQ;AAAA,YACR;AAAA,UACF;AACA,iBAAO;AAAA,QACT,CAAC;AAAA,MACH;AACA,aAAO;AAAA,IACT,SAAS,IAAI;AACX,YAAM,QAAQ;AACd,cAAQ,IAAI,UAAU,KAAK,OAAO,IAAI,MAAM,MAAM,OAAO,EAAE;AAC3D,YAAM;AAAA,IACR;AAAA,EACF;AACF;","names":[]}
+{"version":3,"sources":["../../src/lib/getErc1822SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import type { EthAddress } from '@xylabs/hex'\nimport {\n  asEthAddress, hexFromHexString, isHexZero,\n} from '@xylabs/hex'\nimport type { Provider } from 'ethers'\n\nexport const ERC1822_PROXY_LOGIC_SLOT = '0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7'\n\nexport interface Erc1822DataSlots {\n  implementation?: EthAddress\n}\n\nexport interface Erc1822SlotStatus {\n  address: EthAddress\n  implementation: EthAddress\n  slots: Erc1822DataSlots\n}\n\nconst readAddressFromSlot = async (provider: Provider, address: string, slot: string, block?: number) => {\n  try {\n    const slotValue = await provider.getStorage(address, slot, block)\n    return asEthAddress(hexFromHexString(slotValue, { prefix: true }))\n  } catch {\n    return\n  }\n}\n\nexport const getErc1822SlotStatus = async (provider: Provider, address: EthAddress, block?: number): Promise<Erc1822SlotStatus> => {\n  const status: Erc1822SlotStatus = {\n    address,\n    implementation: address,\n    slots: { implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block) },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = status.slots.implementation\n  }\n\n  return status\n}\n","import type { Payload } from '@xyo-network/payload-model'\n\nimport type { Erc1822SlotStatus } from './lib/index.ts'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n  {\n    address: string\n    block: number\n    chainId: number\n    implementation?: Erc1822SlotStatus['implementation']\n    slots?: Erc1822SlotStatus['slots']\n  },\n  Erc1822StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { asEthAddress } from '@xylabs/hex'\nimport type { Schema } from '@xyo-network/payload-model'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport type {\n  EvmAddress,\n  EvmWitnessConfig, EvmWitnessParams,\n} from '@xyo-network/witness-evm-abstract'\nimport { AbstractEvmWitness, EvmAddressSchema } from '@xyo-network/witness-evm-abstract'\n\nimport { getErc1822SlotStatus } from './lib/index.ts'\nimport type { Erc1822Status } from './Payload.ts'\nimport { Erc1822StatusSchema } from './Payload.ts'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = EvmWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = EvmWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractEvmWitness<\n  TParams,\n  EvmAddress,\n  Erc1822Status\n> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, Erc1822WitnessConfigSchema]\n  static override readonly defaultConfigSchema: Schema = Erc1822WitnessConfigSchema\n\n  protected override async observeHandler(inPayloads: EvmAddress[] = []): Promise<Erc1822Status[]> {\n    await this.started('throw')\n    // calling it here to make sure we rests the cache\n    await this.getProviders()\n    try {\n      const observations = await Promise.all(\n        inPayloads.filter(isPayloadOfSchemaType<EvmAddress>(EvmAddressSchema)).map(async ({ address }) => {\n          const validatedAddress = asEthAddress(assertEx(address ?? this.config.address, () => 'Missing address'), true)\n\n          const provider = await this.getProvider(true, true)\n\n          const block = await provider.getBlockNumber()\n\n          const { implementation, slots } = await getErc1822SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1822Status = {\n            address: validatedAddress,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1822StatusSchema,\n            slots,\n          }\n          return observation\n        }),\n      )\n      return observations\n    } catch (ex) {\n      const error = ex as Error\n      console.log(`Error [${this.config.name}]: ${error.message}`)\n      throw error\n    }\n  }\n}\n"],"mappings":";AACA;AAAA,EACE;AAAA,EAAc;AAAA,EAAkB;AAAA,OAC3B;AAGA,IAAM,2BAA2B;AAYxC,IAAM,sBAAsB,OAAO,UAAoB,SAAiB,MAAc,UAAmB;AACvG,MAAI;AACF,UAAM,YAAY,MAAM,SAAS,WAAW,SAAS,MAAM,KAAK;AAChE,WAAO,aAAa,iBAAiB,WAAW,EAAE,QAAQ,KAAK,CAAC,CAAC;AAAA,EACnE,QAAQ;AACN;AAAA,EACF;AACF;AAEO,IAAM,uBAAuB,OAAO,UAAoB,SAAqB,UAA+C;AACjI,QAAM,SAA4B;AAAA,IAChC;AAAA,IACA,gBAAgB;AAAA,IAChB,OAAO,EAAE,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK,EAAE;AAAA,EACzG;AAEA,MAAI,OAAO,MAAM,kBAAkB,CAAC,UAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACnCO,IAAM,sBAAsB;;;ACJnC,SAAS,gBAAgB;AACzB,SAAS,gBAAAA,qBAAoB;AAE7B,SAAS,6BAA6B;AAKtC,SAAS,oBAAoB,wBAAwB;AAM9C,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,mBAI/F;AAAA,EACA,OAAyB,gBAA0B,CAAC,GAAG,MAAM,eAAe,0BAA0B;AAAA,EACtG,OAAyB,sBAA8B;AAAA,EAEvD,MAAyB,eAAe,aAA2B,CAAC,GAA6B;AAC/F,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,eAAe,MAAM,QAAQ;AAAA,QACjC,WAAW,OAAO,sBAAkC,gBAAgB,CAAC,EAAE,IAAI,OAAO,EAAE,QAAQ,MAAM;AAChG,gBAAM,mBAAmBC,cAAa,SAAS,WAAW,KAAK,OAAO,SAAS,MAAM,iBAAiB,GAAG,IAAI;AAE7G,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAElD,gBAAM,QAAQ,MAAM,SAAS,eAAe;AAE5C,gBAAM,EAAE,gBAAgB,MAAM,IAAI,MAAM,qBAAqB,UAAU,kBAAkB,KAAK;AAE9F,gBAAM,cAA6B;AAAA,YACjC,SAAS;AAAA,YACT;AAAA,YACA,SAAS,QAAQ,MAAM,SAAS,WAAW,GAAG,OAAO;AAAA,YACrD;AAAA,YACA,QAAQ;AAAA,YACR;AAAA,UACF;AACA,iBAAO;AAAA,QACT,CAAC;AAAA,MACH;AACA,aAAO;AAAA,IACT,SAAS,IAAI;AACX,YAAM,QAAQ;AACd,cAAQ,IAAI,UAAU,KAAK,OAAO,IAAI,MAAM,MAAM,OAAO,EAAE;AAC3D,YAAM;AAAA,IACR;AAAA,EACF;AACF;","names":["asEthAddress","asEthAddress"]}

package/dist/neutral/lib/getErc1822SlotStatus.d.ts

@@ -1,13 +1,13 @@
-import type { Address } from '@xylabs/hex';
+import type { EthAddress } from '@xylabs/hex';
 import type { Provider } from 'ethers';
 export declare const ERC1822_PROXY_LOGIC_SLOT = "0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7";
 export interface Erc1822DataSlots {
-    implementation?: Address;
+    implementation?: EthAddress;
 }
 export interface Erc1822SlotStatus {
-    address: string;
-    implementation: string;
+    address: EthAddress;
+    implementation: EthAddress;
     slots: Erc1822DataSlots;
 }
-export declare const getErc1822SlotStatus: (provider: Provider, address: string, block?: number) => Promise<Erc1822SlotStatus>;
+export declare const getErc1822SlotStatus: (provider: Provider, address: EthAddress, block?: number) => Promise<Erc1822SlotStatus>;
 //# sourceMappingURL=getErc1822SlotStatus.d.ts.map

package/dist/neutral/lib/getErc1822SlotStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getErc1822SlotStatus.d.ts","sourceRoot":"","sources":["../../../src/lib/getErc1822SlotStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEtC,eAAO,MAAM,wBAAwB,uEAAuE,CAAA;AAE5G,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,MAAM,CAAA;IACf,cAAc,EAAE,MAAM,CAAA;IACtB,KAAK,EAAE,gBAAgB,CAAA;CACxB;AAWD,eAAO,MAAM,oBAAoB,GAAU,UAAU,QAAQ,EAAE,SAAS,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,iBAAiB,CAYzH,CAAA"}
+{"version":3,"file":"getErc1822SlotStatus.d.ts","sourceRoot":"","sources":["../../../src/lib/getErc1822SlotStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAI7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAEtC,eAAO,MAAM,wBAAwB,uEAAuE,CAAA;AAE5G,MAAM,WAAW,gBAAgB;IAC/B,cAAc,CAAC,EAAE,UAAU,CAAA;CAC5B;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,UAAU,CAAA;IACnB,cAAc,EAAE,UAAU,CAAA;IAC1B,KAAK,EAAE,gBAAgB,CAAA;CACxB;AAWD,eAAO,MAAM,oBAAoB,GAAU,UAAU,QAAQ,EAAE,SAAS,UAAU,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,iBAAiB,CAY7H,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/erc1822-witness",
-  "version": "4.1.1",
+  "version": "4.2.0",
   "description": "Typescript/Javascript Plugins for XYO Platform",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -29,17 +29,16 @@
   "module": "dist/neutral/index.mjs",
   "types": "dist/neutral/index.d.ts",
   "dependencies": {
-    "@xylabs/assert": "^4.13.23",
-    "@xylabs/hex": "^4.13.23",
-    "@xyo-network/payload-model": "^4.1.7",
-    "@xyo-network/witness-evm-abstract": "^4.1.7",
+    "@xylabs/assert": "^4.15.1",
+    "@xylabs/hex": "^4.15.1",
+    "@xyo-network/payload-model": "^4.3.0",
+    "@xyo-network/witness-evm-abstract": "^4.3.0",
     "ethers": "^6.15.0"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^7.0.0-rc.24",
-    "@xylabs/tsconfig": "^7.0.0-rc.24",
-    "@xylabs/vitest-extended": "^4.13.23",
-    "knip": "^5.62.0",
+    "@xylabs/ts-scripts-yarn3": "^7.0.1",
+    "@xylabs/tsconfig": "^7.0.1",
+    "@xylabs/vitest-extended": "^4.15.1",
     "typescript": "^5.8.3",
     "vitest": "^3.2.4"
   },

package/src/Witness.ts

@@ -1,4 +1,5 @@
 import { assertEx } from '@xylabs/assert'
+import { asEthAddress } from '@xylabs/hex'
 import type { Schema } from '@xyo-network/payload-model'
 import { isPayloadOfSchemaType } from '@xyo-network/payload-model'
 import type {
@@ -33,7 +34,7 @@ export class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822Witnes
     try {
       const observations = await Promise.all(
         inPayloads.filter(isPayloadOfSchemaType<EvmAddress>(EvmAddressSchema)).map(async ({ address }) => {
-          const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address').toLowerCase()
+          const validatedAddress = asEthAddress(assertEx(address ?? this.config.address, () => 'Missing address'), true)
 
           const provider = await this.getProvider(true, true)
 

package/src/lib/getErc1822SlotStatus.ts

@@ -1,29 +1,31 @@
-import type { Address } from '@xylabs/hex'
-import { hexFromHexString, isHexZero } from '@xylabs/hex'
+import type { EthAddress } from '@xylabs/hex'
+import {
+  asEthAddress, hexFromHexString, isHexZero,
+} from '@xylabs/hex'
 import type { Provider } from 'ethers'
 
 export const ERC1822_PROXY_LOGIC_SLOT = '0xc5f16f0fcc639fa48a6947836d9850f504798523bf8c9a3a87d5876cf622bcf7'
 
 export interface Erc1822DataSlots {
-  implementation?: Address
+  implementation?: EthAddress
 }
 
 export interface Erc1822SlotStatus {
-  address: string
-  implementation: string
+  address: EthAddress
+  implementation: EthAddress
   slots: Erc1822DataSlots
 }
 
 const readAddressFromSlot = async (provider: Provider, address: string, slot: string, block?: number) => {
   try {
     const slotValue = await provider.getStorage(address, slot, block)
-    return hexFromHexString(slotValue, { prefix: true })
+    return asEthAddress(hexFromHexString(slotValue, { prefix: true }))
   } catch {
     return
   }
 }
 
-export const getErc1822SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1822SlotStatus> => {
+export const getErc1822SlotStatus = async (provider: Provider, address: EthAddress, block?: number): Promise<Erc1822SlotStatus> => {
   const status: Erc1822SlotStatus = {
     address,
     implementation: address,