@xyo-network/erc1967-witness 2.84.1 → 2.84.3

package/dist/browser/Witness.d.cts

@@ -1,12 +1,12 @@
 import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
 import { Erc1967Status } from './Payload';
-export declare const BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-export type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema;
-export type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{
+export declare const Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+export type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema;
+export type Erc1967WitnessConfig = BlockchainWitnessConfig<{
     address?: string;
-}, BlockchainErc1967WitnessConfigSchema>;
-export type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>;
-export declare class BlockchainErc1967Witness<TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
+}, Erc1967WitnessConfigSchema>;
+export type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>;
+export declare class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
     static configSchemas: string[];
     protected observeHandler(inPayloads?: BlockchainAddress[]): Promise<Erc1967Status[]>;
 }

package/dist/browser/Witness.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,oCAAoC,kDAAkD,CAAA;AACnG,MAAM,MAAM,oCAAoC,GAAG,OAAO,oCAAoC,CAAA;AAE9F,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,oCAAoC,CAAC,CAAA;AAEhI,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC,8BAA8B,CAAC,CAAA;AAEpG,qBAAa,wBAAwB,CACnC,OAAO,SAAS,8BAA8B,GAAG,8BAA8B,CAC/E,SAAQ,yBAAyB,CAAC,OAAO,EAAE,iBAAiB,EAAE,aAAa,CAAC;IAC5E,OAAgB,aAAa,WAAyC;cAE7C,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAC9E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAE5G,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAEhF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,iBAAiB,EACjB,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;cAEnC,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}

package/dist/browser/Witness.d.mts

@@ -1,12 +1,12 @@
 import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
 import { Erc1967Status } from './Payload';
-export declare const BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-export type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema;
-export type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{
+export declare const Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+export type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema;
+export type Erc1967WitnessConfig = BlockchainWitnessConfig<{
     address?: string;
-}, BlockchainErc1967WitnessConfigSchema>;
-export type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>;
-export declare class BlockchainErc1967Witness<TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
+}, Erc1967WitnessConfigSchema>;
+export type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>;
+export declare class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
     static configSchemas: string[];
     protected observeHandler(inPayloads?: BlockchainAddress[]): Promise<Erc1967Status[]>;
 }

package/dist/browser/Witness.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,oCAAoC,kDAAkD,CAAA;AACnG,MAAM,MAAM,oCAAoC,GAAG,OAAO,oCAAoC,CAAA;AAE9F,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,oCAAoC,CAAC,CAAA;AAEhI,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC,8BAA8B,CAAC,CAAA;AAEpG,qBAAa,wBAAwB,CACnC,OAAO,SAAS,8BAA8B,GAAG,8BAA8B,CAC/E,SAAQ,yBAAyB,CAAC,OAAO,EAAE,iBAAiB,EAAE,aAAa,CAAC;IAC5E,OAAgB,aAAa,WAAyC;cAE7C,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAC9E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAE5G,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAEhF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,iBAAiB,EACjB,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;cAEnC,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}

package/dist/browser/Witness.d.ts

@@ -1,12 +1,12 @@
 import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
 import { Erc1967Status } from './Payload';
-export declare const BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-export type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema;
-export type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{
+export declare const Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+export type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema;
+export type Erc1967WitnessConfig = BlockchainWitnessConfig<{
     address?: string;
-}, BlockchainErc1967WitnessConfigSchema>;
-export type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>;
-export declare class BlockchainErc1967Witness<TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
+}, Erc1967WitnessConfigSchema>;
+export type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>;
+export declare class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
     static configSchemas: string[];
     protected observeHandler(inPayloads?: BlockchainAddress[]): Promise<Erc1967Status[]>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,oCAAoC,kDAAkD,CAAA;AACnG,MAAM,MAAM,oCAAoC,GAAG,OAAO,oCAAoC,CAAA;AAE9F,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,oCAAoC,CAAC,CAAA;AAEhI,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC,8BAA8B,CAAC,CAAA;AAEpG,qBAAa,wBAAwB,CACnC,OAAO,SAAS,8BAA8B,GAAG,8BAA8B,CAC/E,SAAQ,yBAAyB,CAAC,OAAO,EAAE,iBAAiB,EAAE,aAAa,CAAC;IAC5E,OAAgB,aAAa,WAAyC;cAE7C,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAC9E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAE5G,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAEhF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,iBAAiB,EACjB,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;cAEnC,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}

package/dist/browser/index.cjs

@@ -20,13 +20,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  BlockchainErc1967Witness: () => BlockchainErc1967Witness,
-  BlockchainErc1967WitnessConfigSchema: () => BlockchainErc1967WitnessConfigSchema,
   ERC1967_PROXY_ADMIN_STORAGE_SLOT: () => ERC1967_PROXY_ADMIN_STORAGE_SLOT,
   ERC1967_PROXY_BEACON_STORAGE_SLOT: () => ERC1967_PROXY_BEACON_STORAGE_SLOT,
   ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT: () => ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT,
   ERC1967_PROXY_ROLLBACK_STORAGE_SLOT: () => ERC1967_PROXY_ROLLBACK_STORAGE_SLOT,
   Erc1967StatusSchema: () => Erc1967StatusSchema,
+  Erc1967Witness: () => Erc1967Witness,
+  Erc1967WitnessConfigSchema: () => Erc1967WitnessConfigSchema,
   getErc1967SlotStatus: () => getErc1967SlotStatus
 });
 module.exports = __toCommonJS(src_exports);
@@ -86,16 +86,16 @@ var Erc1967StatusSchema = "network.xyo.erc1967.status";
 var import_assert = require("@xylabs/assert");
 var import_payload_model = require("@xyo-network/payload-model");
 var import_witness_blockchain_abstract = require("@xyo-network/witness-blockchain-abstract");
-var BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-var BlockchainErc1967Witness = class extends import_witness_blockchain_abstract.AbstractBlockchainWitness {
-  static configSchemas = [BlockchainErc1967WitnessConfigSchema];
+var Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+var Erc1967Witness = class extends import_witness_blockchain_abstract.AbstractBlockchainWitness {
+  static configSchemas = [Erc1967WitnessConfigSchema];
   async observeHandler(inPayloads = []) {
     await this.started("throw");
     await this.getProviders();
     try {
       const observations = await Promise.all(
         inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(import_witness_blockchain_abstract.BlockchainAddressSchema)).map(async ({ address }) => {
-          const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address");
+          const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address").toLowerCase();
           const provider = await this.getProvider(true, true);
           const block = await provider.getBlockNumber();
           const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block);

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/lib/getErc1967SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './lib'\nexport * from './Payload'\nexport * from './Witness'\n","import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50'\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103'\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143'\n\nexport interface Erc1967DataSlots {\n  admin?: Address\n  beacon?: Address\n  implementation?: Address\n  rollback?: Address\n}\n\nexport interface Erc1967SlotStatus {\n  address: Address\n  beacon?: {\n    implementation?: Address\n  }\n  implementation: Address\n  slots: Erc1967DataSlots\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 (ex) {\n    return undefined\n  }\n}\n\nexport const getErc1967SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1967SlotStatus> => {\n  const status: Erc1967SlotStatus = {\n    address,\n    implementation: address,\n    slots: {\n      admin: await readAddressFromSlot(provider, address, ERC1967_PROXY_ADMIN_STORAGE_SLOT, block),\n      beacon: await readAddressFromSlot(provider, address, ERC1967_PROXY_BEACON_STORAGE_SLOT, block),\n      implementation: await readAddressFromSlot(provider, address, ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT, block),\n      rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block),\n    },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = `0x${BigInt(status.slots.implementation as string)\n      .toString(16)\n      .padStart(40, '0')}`\n  } else {\n    if (status.slots.beacon && !isHexZero(status.slots.beacon)) {\n      const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon as string, { provider })\n      try {\n        const implementation = await beacon.implementation(block ? { blockTag: block } : {})\n        if (implementation) {\n          status.beacon = { implementation }\n          if (!isHexZero(implementation)) {\n            status.implementation = implementation\n          }\n        }\n      } catch (ex) {\n        const error = ex as Error\n        console.log(error.message)\n      }\n    }\n  }\n\n  return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n  {\n    address: Address\n    beacon?: Erc1967SlotStatus['beacon']\n    block: number\n    chainId: number\n    implementation?: Erc1967SlotStatus['implementation']\n    slots?: Erc1967SlotStatus['slots']\n  },\n  Erc1967StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport {\n  AbstractBlockchainWitness,\n  BlockchainAddress,\n  BlockchainAddressSchema,\n  BlockchainWitnessConfig,\n  BlockchainWitnessParams,\n} from '@xyo-network/witness-blockchain-abstract'\n\nimport { getErc1967SlotStatus } from './lib'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload'\n\nexport const BlockchainErc1967WitnessConfigSchema = 'network.xyo.blockchain.Erc1967.witness.config'\nexport type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema\n\nexport type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, BlockchainErc1967WitnessConfigSchema>\n\nexport type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>\n\nexport class BlockchainErc1967Witness<\n  TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams,\n> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {\n  static override configSchemas = [BlockchainErc1967WitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {\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(BlockchainAddressSchema)).map(async ({ address }) => {\n          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')\n\n          const provider = await this.getProvider(true, true)\n\n          const block = await provider.getBlockNumber()\n\n          const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1967Status = {\n            address: validatedAddress,\n            beacon,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1967StatusSchema,\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":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,iBAAqD;AACrD,qCAA2C;AAGpC,IAAM,4CAA4C;AAClD,IAAM,oCAAoC;AAC1C,IAAM,mCAAmC;AACzC,IAAM,sCAAsC;AAkBnD,IAAM,sBAAsB,OAAO,UAAoB,SAAiB,MAAc,UAAmB;AACvG,MAAI;AACF,UAAM,YAAY,MAAM,SAAS,WAAW,SAAS,MAAM,KAAK;AAChE,eAAO,6BAAiB,WAAW,EAAE,QAAQ,KAAK,CAAC;AAAA,EACrD,SAAS,IAAI;AACX,WAAO;AAAA,EACT;AACF;AAEO,IAAM,uBAAuB,OAAO,UAAoB,SAAiB,UAA+C;AAC7H,QAAM,SAA4B;AAAA,IAChC;AAAA,IACA,gBAAgB;AAAA,IAChB,OAAO;AAAA,MACL,OAAO,MAAM,oBAAoB,UAAU,SAAS,kCAAkC,KAAK;AAAA,MAC3F,QAAQ,MAAM,oBAAoB,UAAU,SAAS,mCAAmC,KAAK;AAAA,MAC7F,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,2CAA2C,KAAK;AAAA,MAC7G,UAAU,MAAM,oBAAoB,UAAU,SAAS,qCAAqC,KAAK;AAAA,IACnG;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,KAAC,sBAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,KAAK,OAAO,OAAO,MAAM,cAAwB,EACtE,SAAS,EAAE,EACX,SAAS,IAAI,GAAG,CAAC;AAAA,EACtB,OAAO;AACL,QAAI,OAAO,MAAM,UAAU,KAAC,sBAAU,OAAO,MAAM,MAAM,GAAG;AAC1D,YAAM,SAAS,0DAA2B,QAAQ,OAAO,MAAM,QAAkB,EAAE,SAAS,CAAC;AAC7F,UAAI;AACF,cAAM,iBAAiB,MAAM,OAAO,eAAe,QAAQ,EAAE,UAAU,MAAM,IAAI,CAAC,CAAC;AACnF,YAAI,gBAAgB;AAClB,iBAAO,SAAS,EAAE,eAAe;AACjC,cAAI,KAAC,sBAAU,cAAc,GAAG;AAC9B,mBAAO,iBAAiB;AAAA,UAC1B;AAAA,QACF;AAAA,MACF,SAAS,IAAI;AACX,cAAM,QAAQ;AACd,gBAAQ,IAAI,MAAM,OAAO;AAAA,MAC3B;AAAA,IACF;AAAA,EACF;AAEA,SAAO;AACT;;;AChEO,IAAM,sBAAsB;;;ACLnC,oBAAyB;AACzB,2BAAsC;AACtC,yCAMO;AAKA,IAAM,uCAAuC;AAO7C,IAAM,2BAAN,cAEG,6DAAqE;AAAA,EAC7E,OAAgB,gBAAgB,CAAC,oCAAoC;AAAA,EAErE,MAAyB,eAAe,aAAkC,CAAC,GAA6B;AACtG,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,eAAe,MAAM,QAAQ;AAAA,QACjC,WAAW,WAAO,4CAAsB,0DAAuB,CAAC,EAAE,IAAI,OAAO,EAAE,QAAQ,MAAM;AAC3F,gBAAM,uBAAmB,wBAAS,WAAW,KAAK,OAAO,SAAS,iBAAiB;AAEnF,gBAAM,WAAW,MAAM,KAAK,YAAY,MAAM,IAAI;AAElD,gBAAM,QAAQ,MAAM,SAAS,eAAe;AAE5C,gBAAM,EAAE,QAAQ,gBAAgB,MAAM,IAAI,MAAM,qBAAqB,UAAU,kBAAkB,KAAK;AAEtG,gBAAM,cAA6B;AAAA,YACjC,SAAS;AAAA,YACT;AAAA,YACA;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/index.ts","../../src/lib/getErc1967SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './lib'\nexport * from './Payload'\nexport * from './Witness'\n","import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50'\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103'\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143'\n\nexport interface Erc1967DataSlots {\n  admin?: Address\n  beacon?: Address\n  implementation?: Address\n  rollback?: Address\n}\n\nexport interface Erc1967SlotStatus {\n  address: Address\n  beacon?: {\n    implementation?: Address\n  }\n  implementation: Address\n  slots: Erc1967DataSlots\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 (ex) {\n    return undefined\n  }\n}\n\nexport const getErc1967SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1967SlotStatus> => {\n  const status: Erc1967SlotStatus = {\n    address,\n    implementation: address,\n    slots: {\n      admin: await readAddressFromSlot(provider, address, ERC1967_PROXY_ADMIN_STORAGE_SLOT, block),\n      beacon: await readAddressFromSlot(provider, address, ERC1967_PROXY_BEACON_STORAGE_SLOT, block),\n      implementation: await readAddressFromSlot(provider, address, ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT, block),\n      rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block),\n    },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = `0x${BigInt(status.slots.implementation as string)\n      .toString(16)\n      .padStart(40, '0')}`\n  } else {\n    if (status.slots.beacon && !isHexZero(status.slots.beacon)) {\n      const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon as string, { provider })\n      try {\n        const implementation = await beacon.implementation(block ? { blockTag: block } : {})\n        if (implementation) {\n          status.beacon = { implementation }\n          if (!isHexZero(implementation)) {\n            status.implementation = implementation\n          }\n        }\n      } catch (ex) {\n        const error = ex as Error\n        console.log(error.message)\n      }\n    }\n  }\n\n  return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n  {\n    address: Address\n    beacon?: Erc1967SlotStatus['beacon']\n    block: number\n    chainId: number\n    implementation?: Erc1967SlotStatus['implementation']\n    slots?: Erc1967SlotStatus['slots']\n  },\n  Erc1967StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport {\n  AbstractBlockchainWitness,\n  BlockchainAddress,\n  BlockchainAddressSchema,\n  BlockchainWitnessConfig,\n  BlockchainWitnessParams,\n} from '@xyo-network/witness-blockchain-abstract'\n\nimport { getErc1967SlotStatus } from './lib'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload'\n\nexport const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'\nexport type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema\n\nexport type Erc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>\n\nexport type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>\n\nexport class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<\n  TParams,\n  BlockchainAddress,\n  Erc1967Status\n> {\n  static override configSchemas = [Erc1967WitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {\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<BlockchainAddress>(BlockchainAddressSchema)).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 { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1967Status = {\n            address: validatedAddress,\n            beacon,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1967StatusSchema,\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":"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","names":[]}

package/dist/browser/index.js

@@ -56,16 +56,16 @@ import {
   AbstractBlockchainWitness,
   BlockchainAddressSchema
 } from "@xyo-network/witness-blockchain-abstract";
-var BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-var BlockchainErc1967Witness = class extends AbstractBlockchainWitness {
-  static configSchemas = [BlockchainErc1967WitnessConfigSchema];
+var Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+var Erc1967Witness = class extends AbstractBlockchainWitness {
+  static configSchemas = [Erc1967WitnessConfigSchema];
   async observeHandler(inPayloads = []) {
     await this.started("throw");
     await this.getProviders();
     try {
       const observations = await Promise.all(
         inPayloads.filter(isPayloadOfSchemaType(BlockchainAddressSchema)).map(async ({ address }) => {
-          const validatedAddress = assertEx(address ?? this.config.address, "Missing address");
+          const validatedAddress = assertEx(address ?? this.config.address, "Missing address").toLowerCase();
           const provider = await this.getProvider(true, true);
           const block = await provider.getBlockNumber();
           const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block);
@@ -90,13 +90,13 @@ var BlockchainErc1967Witness = class extends AbstractBlockchainWitness {
   }
 };
 export {
-  BlockchainErc1967Witness,
-  BlockchainErc1967WitnessConfigSchema,
   ERC1967_PROXY_ADMIN_STORAGE_SLOT,
   ERC1967_PROXY_BEACON_STORAGE_SLOT,
   ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT,
   ERC1967_PROXY_ROLLBACK_STORAGE_SLOT,
   Erc1967StatusSchema,
+  Erc1967Witness,
+  Erc1967WitnessConfigSchema,
   getErc1967SlotStatus
 };
 //# sourceMappingURL=index.js.map

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/getErc1967SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50'\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103'\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143'\n\nexport interface Erc1967DataSlots {\n  admin?: Address\n  beacon?: Address\n  implementation?: Address\n  rollback?: Address\n}\n\nexport interface Erc1967SlotStatus {\n  address: Address\n  beacon?: {\n    implementation?: Address\n  }\n  implementation: Address\n  slots: Erc1967DataSlots\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 (ex) {\n    return undefined\n  }\n}\n\nexport const getErc1967SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1967SlotStatus> => {\n  const status: Erc1967SlotStatus = {\n    address,\n    implementation: address,\n    slots: {\n      admin: await readAddressFromSlot(provider, address, ERC1967_PROXY_ADMIN_STORAGE_SLOT, block),\n      beacon: await readAddressFromSlot(provider, address, ERC1967_PROXY_BEACON_STORAGE_SLOT, block),\n      implementation: await readAddressFromSlot(provider, address, ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT, block),\n      rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block),\n    },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = `0x${BigInt(status.slots.implementation as string)\n      .toString(16)\n      .padStart(40, '0')}`\n  } else {\n    if (status.slots.beacon && !isHexZero(status.slots.beacon)) {\n      const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon as string, { provider })\n      try {\n        const implementation = await beacon.implementation(block ? { blockTag: block } : {})\n        if (implementation) {\n          status.beacon = { implementation }\n          if (!isHexZero(implementation)) {\n            status.implementation = implementation\n          }\n        }\n      } catch (ex) {\n        const error = ex as Error\n        console.log(error.message)\n      }\n    }\n  }\n\n  return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n  {\n    address: Address\n    beacon?: Erc1967SlotStatus['beacon']\n    block: number\n    chainId: number\n    implementation?: Erc1967SlotStatus['implementation']\n    slots?: Erc1967SlotStatus['slots']\n  },\n  Erc1967StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport {\n  AbstractBlockchainWitness,\n  BlockchainAddress,\n  BlockchainAddressSchema,\n  BlockchainWitnessConfig,\n  BlockchainWitnessParams,\n} from '@xyo-network/witness-blockchain-abstract'\n\nimport { getErc1967SlotStatus } from './lib'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload'\n\nexport const BlockchainErc1967WitnessConfigSchema = 'network.xyo.blockchain.Erc1967.witness.config'\nexport type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema\n\nexport type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, BlockchainErc1967WitnessConfigSchema>\n\nexport type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>\n\nexport class BlockchainErc1967Witness<\n  TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams,\n> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {\n  static override configSchemas = [BlockchainErc1967WitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {\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(BlockchainAddressSchema)).map(async ({ address }) => {\n          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')\n\n          const provider = await this.getProvider(true, true)\n\n          const block = await provider.getBlockNumber()\n\n          const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1967Status = {\n            address: validatedAddress,\n            beacon,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1967StatusSchema,\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":"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","names":[]}
+{"version":3,"sources":["../../src/lib/getErc1967SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50'\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103'\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143'\n\nexport interface Erc1967DataSlots {\n  admin?: Address\n  beacon?: Address\n  implementation?: Address\n  rollback?: Address\n}\n\nexport interface Erc1967SlotStatus {\n  address: Address\n  beacon?: {\n    implementation?: Address\n  }\n  implementation: Address\n  slots: Erc1967DataSlots\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 (ex) {\n    return undefined\n  }\n}\n\nexport const getErc1967SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1967SlotStatus> => {\n  const status: Erc1967SlotStatus = {\n    address,\n    implementation: address,\n    slots: {\n      admin: await readAddressFromSlot(provider, address, ERC1967_PROXY_ADMIN_STORAGE_SLOT, block),\n      beacon: await readAddressFromSlot(provider, address, ERC1967_PROXY_BEACON_STORAGE_SLOT, block),\n      implementation: await readAddressFromSlot(provider, address, ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT, block),\n      rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block),\n    },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = `0x${BigInt(status.slots.implementation as string)\n      .toString(16)\n      .padStart(40, '0')}`\n  } else {\n    if (status.slots.beacon && !isHexZero(status.slots.beacon)) {\n      const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon as string, { provider })\n      try {\n        const implementation = await beacon.implementation(block ? { blockTag: block } : {})\n        if (implementation) {\n          status.beacon = { implementation }\n          if (!isHexZero(implementation)) {\n            status.implementation = implementation\n          }\n        }\n      } catch (ex) {\n        const error = ex as Error\n        console.log(error.message)\n      }\n    }\n  }\n\n  return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n  {\n    address: Address\n    beacon?: Erc1967SlotStatus['beacon']\n    block: number\n    chainId: number\n    implementation?: Erc1967SlotStatus['implementation']\n    slots?: Erc1967SlotStatus['slots']\n  },\n  Erc1967StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport {\n  AbstractBlockchainWitness,\n  BlockchainAddress,\n  BlockchainAddressSchema,\n  BlockchainWitnessConfig,\n  BlockchainWitnessParams,\n} from '@xyo-network/witness-blockchain-abstract'\n\nimport { getErc1967SlotStatus } from './lib'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload'\n\nexport const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'\nexport type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema\n\nexport type Erc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>\n\nexport type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>\n\nexport class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<\n  TParams,\n  BlockchainAddress,\n  Erc1967Status\n> {\n  static override configSchemas = [Erc1967WitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {\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<BlockchainAddress>(BlockchainAddressSchema)).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 { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1967Status = {\n            address: validatedAddress,\n            beacon,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1967StatusSchema,\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":"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","names":[]}

package/dist/node/Witness.d.cts

@@ -1,12 +1,12 @@
 import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
 import { Erc1967Status } from './Payload';
-export declare const BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-export type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema;
-export type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{
+export declare const Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+export type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema;
+export type Erc1967WitnessConfig = BlockchainWitnessConfig<{
     address?: string;
-}, BlockchainErc1967WitnessConfigSchema>;
-export type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>;
-export declare class BlockchainErc1967Witness<TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
+}, Erc1967WitnessConfigSchema>;
+export type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>;
+export declare class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
     static configSchemas: string[];
     protected observeHandler(inPayloads?: BlockchainAddress[]): Promise<Erc1967Status[]>;
 }

package/dist/node/Witness.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,oCAAoC,kDAAkD,CAAA;AACnG,MAAM,MAAM,oCAAoC,GAAG,OAAO,oCAAoC,CAAA;AAE9F,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,oCAAoC,CAAC,CAAA;AAEhI,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC,8BAA8B,CAAC,CAAA;AAEpG,qBAAa,wBAAwB,CACnC,OAAO,SAAS,8BAA8B,GAAG,8BAA8B,CAC/E,SAAQ,yBAAyB,CAAC,OAAO,EAAE,iBAAiB,EAAE,aAAa,CAAC;IAC5E,OAAgB,aAAa,WAAyC;cAE7C,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAC9E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAE5G,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAEhF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,iBAAiB,EACjB,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;cAEnC,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}

package/dist/node/Witness.d.mts

@@ -1,12 +1,12 @@
 import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
 import { Erc1967Status } from './Payload';
-export declare const BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-export type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema;
-export type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{
+export declare const Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+export type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema;
+export type Erc1967WitnessConfig = BlockchainWitnessConfig<{
     address?: string;
-}, BlockchainErc1967WitnessConfigSchema>;
-export type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>;
-export declare class BlockchainErc1967Witness<TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
+}, Erc1967WitnessConfigSchema>;
+export type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>;
+export declare class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
     static configSchemas: string[];
     protected observeHandler(inPayloads?: BlockchainAddress[]): Promise<Erc1967Status[]>;
 }

package/dist/node/Witness.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,oCAAoC,kDAAkD,CAAA;AACnG,MAAM,MAAM,oCAAoC,GAAG,OAAO,oCAAoC,CAAA;AAE9F,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,oCAAoC,CAAC,CAAA;AAEhI,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC,8BAA8B,CAAC,CAAA;AAEpG,qBAAa,wBAAwB,CACnC,OAAO,SAAS,8BAA8B,GAAG,8BAA8B,CAC/E,SAAQ,yBAAyB,CAAC,OAAO,EAAE,iBAAiB,EAAE,aAAa,CAAC;IAC5E,OAAgB,aAAa,WAAyC;cAE7C,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAC9E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAE5G,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAEhF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,iBAAiB,EACjB,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;cAEnC,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}

package/dist/node/Witness.d.ts

@@ -1,12 +1,12 @@
 import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
 import { Erc1967Status } from './Payload';
-export declare const BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-export type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema;
-export type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{
+export declare const Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+export type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema;
+export type Erc1967WitnessConfig = BlockchainWitnessConfig<{
     address?: string;
-}, BlockchainErc1967WitnessConfigSchema>;
-export type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>;
-export declare class BlockchainErc1967Witness<TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
+}, Erc1967WitnessConfigSchema>;
+export type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>;
+export declare class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
     static configSchemas: string[];
     protected observeHandler(inPayloads?: BlockchainAddress[]): Promise<Erc1967Status[]>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,oCAAoC,kDAAkD,CAAA;AACnG,MAAM,MAAM,oCAAoC,GAAG,OAAO,oCAAoC,CAAA;AAE9F,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,oCAAoC,CAAC,CAAA;AAEhI,MAAM,MAAM,8BAA8B,GAAG,uBAAuB,CAAC,8BAA8B,CAAC,CAAA;AAEpG,qBAAa,wBAAwB,CACnC,OAAO,SAAS,8BAA8B,GAAG,8BAA8B,CAC/E,SAAQ,yBAAyB,CAAC,OAAO,EAAE,iBAAiB,EAAE,aAAa,CAAC;IAC5E,OAAgB,aAAa,WAAyC;cAE7C,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EACzB,iBAAiB,EAEjB,uBAAuB,EACvB,uBAAuB,EACxB,MAAM,0CAA0C,CAAA;AAGjD,OAAO,EAAE,aAAa,EAAuB,MAAM,WAAW,CAAA;AAE9D,eAAO,MAAM,0BAA0B,uCAAuC,CAAA;AAC9E,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAE5G,MAAM,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,oBAAoB,CAAC,CAAA;AAEhF,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,yBAAyB,CACxH,OAAO,EACP,iBAAiB,EACjB,aAAa,CACd;IACC,OAAgB,aAAa,WAA+B;cAEnC,cAAc,CAAC,UAAU,GAAE,iBAAiB,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAkCxG"}

package/dist/node/index.cjs

@@ -20,13 +20,13 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  BlockchainErc1967Witness: () => BlockchainErc1967Witness,
-  BlockchainErc1967WitnessConfigSchema: () => BlockchainErc1967WitnessConfigSchema,
   ERC1967_PROXY_ADMIN_STORAGE_SLOT: () => ERC1967_PROXY_ADMIN_STORAGE_SLOT,
   ERC1967_PROXY_BEACON_STORAGE_SLOT: () => ERC1967_PROXY_BEACON_STORAGE_SLOT,
   ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT: () => ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT,
   ERC1967_PROXY_ROLLBACK_STORAGE_SLOT: () => ERC1967_PROXY_ROLLBACK_STORAGE_SLOT,
   Erc1967StatusSchema: () => Erc1967StatusSchema,
+  Erc1967Witness: () => Erc1967Witness,
+  Erc1967WitnessConfigSchema: () => Erc1967WitnessConfigSchema,
   getErc1967SlotStatus: () => getErc1967SlotStatus
 });
 module.exports = __toCommonJS(src_exports);
@@ -86,16 +86,16 @@ var Erc1967StatusSchema = "network.xyo.erc1967.status";
 var import_assert = require("@xylabs/assert");
 var import_payload_model = require("@xyo-network/payload-model");
 var import_witness_blockchain_abstract = require("@xyo-network/witness-blockchain-abstract");
-var BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-var BlockchainErc1967Witness = class extends import_witness_blockchain_abstract.AbstractBlockchainWitness {
-  static configSchemas = [BlockchainErc1967WitnessConfigSchema];
+var Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+var Erc1967Witness = class extends import_witness_blockchain_abstract.AbstractBlockchainWitness {
+  static configSchemas = [Erc1967WitnessConfigSchema];
   async observeHandler(inPayloads = []) {
     await this.started("throw");
     await this.getProviders();
     try {
       const observations = await Promise.all(
         inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(import_witness_blockchain_abstract.BlockchainAddressSchema)).map(async ({ address }) => {
-          const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address");
+          const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address").toLowerCase();
           const provider = await this.getProvider(true, true);
           const block = await provider.getBlockNumber();
           const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block);
@@ -121,13 +121,13 @@ var BlockchainErc1967Witness = class extends import_witness_blockchain_abstract.
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  BlockchainErc1967Witness,
-  BlockchainErc1967WitnessConfigSchema,
   ERC1967_PROXY_ADMIN_STORAGE_SLOT,
   ERC1967_PROXY_BEACON_STORAGE_SLOT,
   ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT,
   ERC1967_PROXY_ROLLBACK_STORAGE_SLOT,
   Erc1967StatusSchema,
+  Erc1967Witness,
+  Erc1967WitnessConfigSchema,
   getErc1967SlotStatus
 });
 //# sourceMappingURL=index.cjs.map

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/lib/getErc1967SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './lib'\nexport * from './Payload'\nexport * from './Witness'\n","import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50'\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103'\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143'\n\nexport interface Erc1967DataSlots {\n  admin?: Address\n  beacon?: Address\n  implementation?: Address\n  rollback?: Address\n}\n\nexport interface Erc1967SlotStatus {\n  address: Address\n  beacon?: {\n    implementation?: Address\n  }\n  implementation: Address\n  slots: Erc1967DataSlots\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 (ex) {\n    return undefined\n  }\n}\n\nexport const getErc1967SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1967SlotStatus> => {\n  const status: Erc1967SlotStatus = {\n    address,\n    implementation: address,\n    slots: {\n      admin: await readAddressFromSlot(provider, address, ERC1967_PROXY_ADMIN_STORAGE_SLOT, block),\n      beacon: await readAddressFromSlot(provider, address, ERC1967_PROXY_BEACON_STORAGE_SLOT, block),\n      implementation: await readAddressFromSlot(provider, address, ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT, block),\n      rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block),\n    },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = `0x${BigInt(status.slots.implementation as string)\n      .toString(16)\n      .padStart(40, '0')}`\n  } else {\n    if (status.slots.beacon && !isHexZero(status.slots.beacon)) {\n      const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon as string, { provider })\n      try {\n        const implementation = await beacon.implementation(block ? { blockTag: block } : {})\n        if (implementation) {\n          status.beacon = { implementation }\n          if (!isHexZero(implementation)) {\n            status.implementation = implementation\n          }\n        }\n      } catch (ex) {\n        const error = ex as Error\n        console.log(error.message)\n      }\n    }\n  }\n\n  return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n  {\n    address: Address\n    beacon?: Erc1967SlotStatus['beacon']\n    block: number\n    chainId: number\n    implementation?: Erc1967SlotStatus['implementation']\n    slots?: Erc1967SlotStatus['slots']\n  },\n  Erc1967StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport {\n  AbstractBlockchainWitness,\n  BlockchainAddress,\n  BlockchainAddressSchema,\n  BlockchainWitnessConfig,\n  BlockchainWitnessParams,\n} from '@xyo-network/witness-blockchain-abstract'\n\nimport { getErc1967SlotStatus } from './lib'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload'\n\nexport const BlockchainErc1967WitnessConfigSchema = 'network.xyo.blockchain.Erc1967.witness.config'\nexport type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema\n\nexport type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, BlockchainErc1967WitnessConfigSchema>\n\nexport type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>\n\nexport class BlockchainErc1967Witness<\n  TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams,\n> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {\n  static override configSchemas = [BlockchainErc1967WitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {\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(BlockchainAddressSchema)).map(async ({ address }) => {\n          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')\n\n          const provider = await this.getProvider(true, true)\n\n          const block = await provider.getBlockNumber()\n\n          const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1967Status = {\n            address: validatedAddress,\n            beacon,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1967StatusSchema,\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":"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","names":[]}
+{"version":3,"sources":["../../src/index.ts","../../src/lib/getErc1967SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["export * from './lib'\nexport * from './Payload'\nexport * from './Witness'\n","import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50'\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103'\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143'\n\nexport interface Erc1967DataSlots {\n  admin?: Address\n  beacon?: Address\n  implementation?: Address\n  rollback?: Address\n}\n\nexport interface Erc1967SlotStatus {\n  address: Address\n  beacon?: {\n    implementation?: Address\n  }\n  implementation: Address\n  slots: Erc1967DataSlots\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 (ex) {\n    return undefined\n  }\n}\n\nexport const getErc1967SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1967SlotStatus> => {\n  const status: Erc1967SlotStatus = {\n    address,\n    implementation: address,\n    slots: {\n      admin: await readAddressFromSlot(provider, address, ERC1967_PROXY_ADMIN_STORAGE_SLOT, block),\n      beacon: await readAddressFromSlot(provider, address, ERC1967_PROXY_BEACON_STORAGE_SLOT, block),\n      implementation: await readAddressFromSlot(provider, address, ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT, block),\n      rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block),\n    },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = `0x${BigInt(status.slots.implementation as string)\n      .toString(16)\n      .padStart(40, '0')}`\n  } else {\n    if (status.slots.beacon && !isHexZero(status.slots.beacon)) {\n      const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon as string, { provider })\n      try {\n        const implementation = await beacon.implementation(block ? { blockTag: block } : {})\n        if (implementation) {\n          status.beacon = { implementation }\n          if (!isHexZero(implementation)) {\n            status.implementation = implementation\n          }\n        }\n      } catch (ex) {\n        const error = ex as Error\n        console.log(error.message)\n      }\n    }\n  }\n\n  return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n  {\n    address: Address\n    beacon?: Erc1967SlotStatus['beacon']\n    block: number\n    chainId: number\n    implementation?: Erc1967SlotStatus['implementation']\n    slots?: Erc1967SlotStatus['slots']\n  },\n  Erc1967StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport {\n  AbstractBlockchainWitness,\n  BlockchainAddress,\n  BlockchainAddressSchema,\n  BlockchainWitnessConfig,\n  BlockchainWitnessParams,\n} from '@xyo-network/witness-blockchain-abstract'\n\nimport { getErc1967SlotStatus } from './lib'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload'\n\nexport const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'\nexport type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema\n\nexport type Erc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>\n\nexport type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>\n\nexport class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<\n  TParams,\n  BlockchainAddress,\n  Erc1967Status\n> {\n  static override configSchemas = [Erc1967WitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {\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<BlockchainAddress>(BlockchainAddressSchema)).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 { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1967Status = {\n            address: validatedAddress,\n            beacon,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1967StatusSchema,\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":"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","names":[]}

package/dist/node/index.js

@@ -56,16 +56,16 @@ import {
   AbstractBlockchainWitness,
   BlockchainAddressSchema
 } from "@xyo-network/witness-blockchain-abstract";
-var BlockchainErc1967WitnessConfigSchema = "network.xyo.blockchain.Erc1967.witness.config";
-var BlockchainErc1967Witness = class extends AbstractBlockchainWitness {
-  static configSchemas = [BlockchainErc1967WitnessConfigSchema];
+var Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
+var Erc1967Witness = class extends AbstractBlockchainWitness {
+  static configSchemas = [Erc1967WitnessConfigSchema];
   async observeHandler(inPayloads = []) {
     await this.started("throw");
     await this.getProviders();
     try {
       const observations = await Promise.all(
         inPayloads.filter(isPayloadOfSchemaType(BlockchainAddressSchema)).map(async ({ address }) => {
-          const validatedAddress = assertEx(address ?? this.config.address, "Missing address");
+          const validatedAddress = assertEx(address ?? this.config.address, "Missing address").toLowerCase();
           const provider = await this.getProvider(true, true);
           const block = await provider.getBlockNumber();
           const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block);
@@ -90,13 +90,13 @@ var BlockchainErc1967Witness = class extends AbstractBlockchainWitness {
   }
 };
 export {
-  BlockchainErc1967Witness,
-  BlockchainErc1967WitnessConfigSchema,
   ERC1967_PROXY_ADMIN_STORAGE_SLOT,
   ERC1967_PROXY_BEACON_STORAGE_SLOT,
   ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT,
   ERC1967_PROXY_ROLLBACK_STORAGE_SLOT,
   Erc1967StatusSchema,
+  Erc1967Witness,
+  Erc1967WitnessConfigSchema,
   getErc1967SlotStatus
 };
 //# sourceMappingURL=index.js.map

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/lib/getErc1967SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50'\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103'\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143'\n\nexport interface Erc1967DataSlots {\n  admin?: Address\n  beacon?: Address\n  implementation?: Address\n  rollback?: Address\n}\n\nexport interface Erc1967SlotStatus {\n  address: Address\n  beacon?: {\n    implementation?: Address\n  }\n  implementation: Address\n  slots: Erc1967DataSlots\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 (ex) {\n    return undefined\n  }\n}\n\nexport const getErc1967SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1967SlotStatus> => {\n  const status: Erc1967SlotStatus = {\n    address,\n    implementation: address,\n    slots: {\n      admin: await readAddressFromSlot(provider, address, ERC1967_PROXY_ADMIN_STORAGE_SLOT, block),\n      beacon: await readAddressFromSlot(provider, address, ERC1967_PROXY_BEACON_STORAGE_SLOT, block),\n      implementation: await readAddressFromSlot(provider, address, ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT, block),\n      rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block),\n    },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = `0x${BigInt(status.slots.implementation as string)\n      .toString(16)\n      .padStart(40, '0')}`\n  } else {\n    if (status.slots.beacon && !isHexZero(status.slots.beacon)) {\n      const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon as string, { provider })\n      try {\n        const implementation = await beacon.implementation(block ? { blockTag: block } : {})\n        if (implementation) {\n          status.beacon = { implementation }\n          if (!isHexZero(implementation)) {\n            status.implementation = implementation\n          }\n        }\n      } catch (ex) {\n        const error = ex as Error\n        console.log(error.message)\n      }\n    }\n  }\n\n  return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n  {\n    address: Address\n    beacon?: Erc1967SlotStatus['beacon']\n    block: number\n    chainId: number\n    implementation?: Erc1967SlotStatus['implementation']\n    slots?: Erc1967SlotStatus['slots']\n  },\n  Erc1967StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport {\n  AbstractBlockchainWitness,\n  BlockchainAddress,\n  BlockchainAddressSchema,\n  BlockchainWitnessConfig,\n  BlockchainWitnessParams,\n} from '@xyo-network/witness-blockchain-abstract'\n\nimport { getErc1967SlotStatus } from './lib'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload'\n\nexport const BlockchainErc1967WitnessConfigSchema = 'network.xyo.blockchain.Erc1967.witness.config'\nexport type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema\n\nexport type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, BlockchainErc1967WitnessConfigSchema>\n\nexport type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>\n\nexport class BlockchainErc1967Witness<\n  TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams,\n> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {\n  static override configSchemas = [BlockchainErc1967WitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {\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(BlockchainAddressSchema)).map(async ({ address }) => {\n          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')\n\n          const provider = await this.getProvider(true, true)\n\n          const block = await provider.getBlockNumber()\n\n          const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1967Status = {\n            address: validatedAddress,\n            beacon,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1967StatusSchema,\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":"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","names":[]}
+{"version":3,"sources":["../../src/lib/getErc1967SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc'\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50'\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103'\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143'\n\nexport interface Erc1967DataSlots {\n  admin?: Address\n  beacon?: Address\n  implementation?: Address\n  rollback?: Address\n}\n\nexport interface Erc1967SlotStatus {\n  address: Address\n  beacon?: {\n    implementation?: Address\n  }\n  implementation: Address\n  slots: Erc1967DataSlots\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 (ex) {\n    return undefined\n  }\n}\n\nexport const getErc1967SlotStatus = async (provider: Provider, address: string, block?: number): Promise<Erc1967SlotStatus> => {\n  const status: Erc1967SlotStatus = {\n    address,\n    implementation: address,\n    slots: {\n      admin: await readAddressFromSlot(provider, address, ERC1967_PROXY_ADMIN_STORAGE_SLOT, block),\n      beacon: await readAddressFromSlot(provider, address, ERC1967_PROXY_BEACON_STORAGE_SLOT, block),\n      implementation: await readAddressFromSlot(provider, address, ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT, block),\n      rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block),\n    },\n  }\n\n  if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n    status.implementation = `0x${BigInt(status.slots.implementation as string)\n      .toString(16)\n      .padStart(40, '0')}`\n  } else {\n    if (status.slots.beacon && !isHexZero(status.slots.beacon)) {\n      const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon as string, { provider })\n      try {\n        const implementation = await beacon.implementation(block ? { blockTag: block } : {})\n        if (implementation) {\n          status.beacon = { implementation }\n          if (!isHexZero(implementation)) {\n            status.implementation = implementation\n          }\n        }\n      } catch (ex) {\n        const error = ex as Error\n        console.log(error.message)\n      }\n    }\n  }\n\n  return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n  {\n    address: Address\n    beacon?: Erc1967SlotStatus['beacon']\n    block: number\n    chainId: number\n    implementation?: Erc1967SlotStatus['implementation']\n    slots?: Erc1967SlotStatus['slots']\n  },\n  Erc1967StatusSchema\n>\n","import { assertEx } from '@xylabs/assert'\nimport { isPayloadOfSchemaType } from '@xyo-network/payload-model'\nimport {\n  AbstractBlockchainWitness,\n  BlockchainAddress,\n  BlockchainAddressSchema,\n  BlockchainWitnessConfig,\n  BlockchainWitnessParams,\n} from '@xyo-network/witness-blockchain-abstract'\n\nimport { getErc1967SlotStatus } from './lib'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload'\n\nexport const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'\nexport type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema\n\nexport type Erc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>\n\nexport type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>\n\nexport class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<\n  TParams,\n  BlockchainAddress,\n  Erc1967Status\n> {\n  static override configSchemas = [Erc1967WitnessConfigSchema]\n\n  protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {\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<BlockchainAddress>(BlockchainAddressSchema)).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 { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n          const observation: Erc1967Status = {\n            address: validatedAddress,\n            beacon,\n            block,\n            chainId: Number((await provider.getNetwork()).chainId),\n            implementation,\n            schema: Erc1967StatusSchema,\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":"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","names":[]}

package/package.json

@@ -13,13 +13,13 @@
     "@xylabs/assert": "^2.13.20",
     "@xylabs/hex": "^2.13.20",
     "@xyo-network/open-zeppelin-typechain": "^3.0.5",
-    "@xyo-network/payload-model": "^2.84.3",
-    "@xyo-network/witness-blockchain-abstract": "^2.84.3"
+    "@xyo-network/payload-model": "^2.84.8",
+    "@xyo-network/witness-blockchain-abstract": "^2.84.8"
   },
   "devDependencies": {
     "@xylabs/jest-helpers": "^2.13.20",
-    "@xylabs/ts-scripts-yarn3": "^3.2.19",
-    "@xylabs/tsconfig": "^3.2.19",
+    "@xylabs/ts-scripts-yarn3": "^3.2.24",
+    "@xylabs/tsconfig": "^3.2.24",
     "ethers": "^6.9.0",
     "jest": "^29.7.0",
     "typescript": "^5.3.3"
@@ -63,6 +63,6 @@
     "url": "https://github.com/XYOracleNetwork/plugins.git"
   },
   "sideEffects": false,
-  "version": "2.84.1",
+  "version": "2.84.3",
   "type": "module"
 }

package/src/Witness.ts

@@ -11,17 +11,19 @@ import {
 import { getErc1967SlotStatus } from './lib'
 import { Erc1967Status, Erc1967StatusSchema } from './Payload'
 
-export const BlockchainErc1967WitnessConfigSchema = 'network.xyo.blockchain.Erc1967.witness.config'
-export type BlockchainErc1967WitnessConfigSchema = typeof BlockchainErc1967WitnessConfigSchema
+export const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'
+export type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema
 
-export type BlockchainErc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, BlockchainErc1967WitnessConfigSchema>
+export type Erc1967WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>
 
-export type BlockchainErc1967WitnessParams = BlockchainWitnessParams<BlockchainErc1967WitnessConfig>
+export type Erc1967WitnessParams = BlockchainWitnessParams<Erc1967WitnessConfig>
 
-export class BlockchainErc1967Witness<
-  TParams extends BlockchainErc1967WitnessParams = BlockchainErc1967WitnessParams,
-> extends AbstractBlockchainWitness<TParams, BlockchainAddress, Erc1967Status> {
-  static override configSchemas = [BlockchainErc1967WitnessConfigSchema]
+export class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractBlockchainWitness<
+  TParams,
+  BlockchainAddress,
+  Erc1967Status
+> {
+  static override configSchemas = [Erc1967WitnessConfigSchema]
 
   protected override async observeHandler(inPayloads: BlockchainAddress[] = []): Promise<Erc1967Status[]> {
     await this.started('throw')
@@ -29,8 +31,8 @@ export class BlockchainErc1967Witness<
     await this.getProviders()
     try {
       const observations = await Promise.all(
-        inPayloads.filter(isPayloadOfSchemaType(BlockchainAddressSchema)).map(async ({ address }) => {
-          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')
+        inPayloads.filter(isPayloadOfSchemaType<BlockchainAddress>(BlockchainAddressSchema)).map(async ({ address }) => {
+          const validatedAddress = assertEx(address ?? this.config.address, 'Missing address').toLowerCase()
 
           const provider = await this.getProvider(true, true)