@xyo-network/erc1822-witness 2.84.1 → 2.84.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,6 @@
1
1
  import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
2
2
  import { Erc1822Status } from './Payload';
3
- export declare const Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
3
+ export declare const Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
4
4
  export type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema;
5
5
  export type Erc1822WitnessConfig = BlockchainWitnessConfig<{
6
6
  address?: string;
@@ -1 +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,0BAA0B,kDAAkD,CAAA;AACzF,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;CAiCxG"}
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,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;CAiCxG"}
@@ -1,6 +1,6 @@
1
1
  import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
2
2
  import { Erc1822Status } from './Payload';
3
- export declare const Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
3
+ export declare const Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
4
4
  export type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema;
5
5
  export type Erc1822WitnessConfig = BlockchainWitnessConfig<{
6
6
  address?: string;
@@ -1 +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,0BAA0B,kDAAkD,CAAA;AACzF,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;CAiCxG"}
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,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;CAiCxG"}
@@ -1,6 +1,6 @@
1
1
  import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
2
2
  import { Erc1822Status } from './Payload';
3
- export declare const Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
3
+ export declare const Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
4
4
  export type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema;
5
5
  export type Erc1822WitnessConfig = BlockchainWitnessConfig<{
6
6
  address?: string;
@@ -1 +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,0BAA0B,kDAAkD,CAAA;AACzF,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;CAiCxG"}
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,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;CAiCxG"}
@@ -60,7 +60,7 @@ var Erc1822StatusSchema = "network.xyo.erc1822.status";
60
60
  var import_assert = require("@xylabs/assert");
61
61
  var import_payload_model = require("@xyo-network/payload-model");
62
62
  var import_witness_blockchain_abstract = require("@xyo-network/witness-blockchain-abstract");
63
- var Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
63
+ var Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
64
64
  var Erc1822Witness = class extends import_witness_blockchain_abstract.AbstractBlockchainWitness {
65
65
  static configSchemas = [Erc1822WitnessConfigSchema];
66
66
  async observeHandler(inPayloads = []) {
@@ -69,7 +69,7 @@ var Erc1822Witness = class extends import_witness_blockchain_abstract.AbstractBl
69
69
  try {
70
70
  const observations = await Promise.all(
71
71
  inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(import_witness_blockchain_abstract.BlockchainAddressSchema)).map(async ({ address }) => {
72
- const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address");
72
+ const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address").toLowerCase();
73
73
  const provider = await this.getProvider(true, true);
74
74
  const block = await provider.getBlockNumber();
75
75
  const { implementation, slots } = await getErc1822SlotStatus(provider, validatedAddress, block);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/index.ts","../../src/lib/getErc1822SlotStatus.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 { 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: Address\n implementation: Address\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 (ex) {\n return undefined\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: {\n implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block),\n },\n }\n\n if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n status.implementation = status.slots.implementation as string\n }\n\n return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1822SlotStatus } from './lib'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n {\n address: Address\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 { 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 { getErc1822SlotStatus } from './lib'\nimport { Erc1822Status, Erc1822StatusSchema } from './Payload'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.blockchain.Erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = BlockchainWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractBlockchainWitness<\n TParams,\n BlockchainAddress,\n Erc1822Status\n> {\n static override configSchemas = [Erc1822WitnessConfigSchema]\n\n protected override async observeHandler(inPayloads: BlockchainAddress[] = []): 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(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 { 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":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,iBAAqD;AAG9C,IAAM,2BAA2B;AAYxC,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,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK;AAAA,IAC9F;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,KAAC,sBAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACLnC,oBAAyB;AACzB,2BAAsC;AACtC,yCAMO;AAKA,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,6DAI/F;AAAA,EACA,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,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,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":[]}
1
+ {"version":3,"sources":["../../src/index.ts","../../src/lib/getErc1822SlotStatus.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 { 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: Address\n implementation: Address\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 (ex) {\n return undefined\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: {\n implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block),\n },\n }\n\n if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n status.implementation = status.slots.implementation as string\n }\n\n return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1822SlotStatus } from './lib'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n {\n address: Address\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 { 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 { getErc1822SlotStatus } from './lib'\nimport { Erc1822Status, Erc1822StatusSchema } from './Payload'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = BlockchainWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractBlockchainWitness<\n TParams,\n BlockchainAddress,\n Erc1822Status\n> {\n static override configSchemas = [Erc1822WitnessConfigSchema]\n\n protected override async observeHandler(inPayloads: BlockchainAddress[] = []): 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(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 { 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":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,iBAAqD;AAG9C,IAAM,2BAA2B;AAYxC,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,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK;AAAA,IAC9F;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,KAAC,sBAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACLnC,oBAAyB;AACzB,2BAAsC;AACtC,yCAMO;AAKA,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,6DAI/F;AAAA,EACA,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,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,EAAE,YAAY;AAEjG,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":[]}
@@ -33,7 +33,7 @@ import {
33
33
  AbstractBlockchainWitness,
34
34
  BlockchainAddressSchema
35
35
  } from "@xyo-network/witness-blockchain-abstract";
36
- var Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
36
+ var Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
37
37
  var Erc1822Witness = class extends AbstractBlockchainWitness {
38
38
  static configSchemas = [Erc1822WitnessConfigSchema];
39
39
  async observeHandler(inPayloads = []) {
@@ -42,7 +42,7 @@ var Erc1822Witness = class extends AbstractBlockchainWitness {
42
42
  try {
43
43
  const observations = await Promise.all(
44
44
  inPayloads.filter(isPayloadOfSchemaType(BlockchainAddressSchema)).map(async ({ address }) => {
45
- const validatedAddress = assertEx(address ?? this.config.address, "Missing address");
45
+ const validatedAddress = assertEx(address ?? this.config.address, "Missing address").toLowerCase();
46
46
  const provider = await this.getProvider(true, true);
47
47
  const block = await provider.getBlockNumber();
48
48
  const { implementation, slots } = await getErc1822SlotStatus(provider, validatedAddress, block);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/lib/getErc1822SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { 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: Address\n implementation: Address\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 (ex) {\n return undefined\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: {\n implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block),\n },\n }\n\n if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n status.implementation = status.slots.implementation as string\n }\n\n return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1822SlotStatus } from './lib'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n {\n address: Address\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 { 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 { getErc1822SlotStatus } from './lib'\nimport { Erc1822Status, Erc1822StatusSchema } from './Payload'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.blockchain.Erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = BlockchainWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractBlockchainWitness<\n TParams,\n BlockchainAddress,\n Erc1822Status\n> {\n static override configSchemas = [Erc1822WitnessConfigSchema]\n\n protected override async observeHandler(inPayloads: BlockchainAddress[] = []): 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(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 { 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":";AAAA,SAAkB,kBAAkB,iBAAiB;AAG9C,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,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,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK;AAAA,IAC9F;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,CAAC,UAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACLnC,SAAS,gBAAgB;AACzB,SAAS,6BAA6B;AACtC;AAAA,EACE;AAAA,EAEA;AAAA,OAGK;AAKA,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,0BAI/F;AAAA,EACA,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,MAAyB,eAAe,aAAkC,CAAC,GAA6B;AACtG,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,eAAe,MAAM,QAAQ;AAAA,QACjC,WAAW,OAAO,sBAAsB,uBAAuB,CAAC,EAAE,IAAI,OAAO,EAAE,QAAQ,MAAM;AAC3F,gBAAM,mBAAmB,SAAS,WAAW,KAAK,OAAO,SAAS,iBAAiB;AAEnF,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":[]}
1
+ {"version":3,"sources":["../../src/lib/getErc1822SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { 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: Address\n implementation: Address\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 (ex) {\n return undefined\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: {\n implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block),\n },\n }\n\n if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n status.implementation = status.slots.implementation as string\n }\n\n return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1822SlotStatus } from './lib'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n {\n address: Address\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 { 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 { getErc1822SlotStatus } from './lib'\nimport { Erc1822Status, Erc1822StatusSchema } from './Payload'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = BlockchainWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractBlockchainWitness<\n TParams,\n BlockchainAddress,\n Erc1822Status\n> {\n static override configSchemas = [Erc1822WitnessConfigSchema]\n\n protected override async observeHandler(inPayloads: BlockchainAddress[] = []): 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(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 { 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":";AAAA,SAAkB,kBAAkB,iBAAiB;AAG9C,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,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,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK;AAAA,IAC9F;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,CAAC,UAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACLnC,SAAS,gBAAgB;AACzB,SAAS,6BAA6B;AACtC;AAAA,EACE;AAAA,EAEA;AAAA,OAGK;AAKA,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,0BAI/F;AAAA,EACA,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,MAAyB,eAAe,aAAkC,CAAC,GAA6B;AACtG,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,eAAe,MAAM,QAAQ;AAAA,QACjC,WAAW,OAAO,sBAAsB,uBAAuB,CAAC,EAAE,IAAI,OAAO,EAAE,QAAQ,MAAM;AAC3F,gBAAM,mBAAmB,SAAS,WAAW,KAAK,OAAO,SAAS,iBAAiB,EAAE,YAAY;AAEjG,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":[]}
@@ -1,6 +1,6 @@
1
1
  import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
2
2
  import { Erc1822Status } from './Payload';
3
- export declare const Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
3
+ export declare const Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
4
4
  export type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema;
5
5
  export type Erc1822WitnessConfig = BlockchainWitnessConfig<{
6
6
  address?: string;
@@ -1 +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,0BAA0B,kDAAkD,CAAA;AACzF,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;CAiCxG"}
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,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;CAiCxG"}
@@ -1,6 +1,6 @@
1
1
  import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
2
2
  import { Erc1822Status } from './Payload';
3
- export declare const Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
3
+ export declare const Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
4
4
  export type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema;
5
5
  export type Erc1822WitnessConfig = BlockchainWitnessConfig<{
6
6
  address?: string;
@@ -1 +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,0BAA0B,kDAAkD,CAAA;AACzF,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;CAiCxG"}
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,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;CAiCxG"}
@@ -1,6 +1,6 @@
1
1
  import { AbstractBlockchainWitness, BlockchainAddress, BlockchainWitnessConfig, BlockchainWitnessParams } from '@xyo-network/witness-blockchain-abstract';
2
2
  import { Erc1822Status } from './Payload';
3
- export declare const Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
3
+ export declare const Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
4
4
  export type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema;
5
5
  export type Erc1822WitnessConfig = BlockchainWitnessConfig<{
6
6
  address?: string;
@@ -1 +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,0BAA0B,kDAAkD,CAAA;AACzF,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;CAiCxG"}
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,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;CAiCxG"}
@@ -60,7 +60,7 @@ var Erc1822StatusSchema = "network.xyo.erc1822.status";
60
60
  var import_assert = require("@xylabs/assert");
61
61
  var import_payload_model = require("@xyo-network/payload-model");
62
62
  var import_witness_blockchain_abstract = require("@xyo-network/witness-blockchain-abstract");
63
- var Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
63
+ var Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
64
64
  var Erc1822Witness = class extends import_witness_blockchain_abstract.AbstractBlockchainWitness {
65
65
  static configSchemas = [Erc1822WitnessConfigSchema];
66
66
  async observeHandler(inPayloads = []) {
@@ -69,7 +69,7 @@ var Erc1822Witness = class extends import_witness_blockchain_abstract.AbstractBl
69
69
  try {
70
70
  const observations = await Promise.all(
71
71
  inPayloads.filter((0, import_payload_model.isPayloadOfSchemaType)(import_witness_blockchain_abstract.BlockchainAddressSchema)).map(async ({ address }) => {
72
- const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address");
72
+ const validatedAddress = (0, import_assert.assertEx)(address ?? this.config.address, "Missing address").toLowerCase();
73
73
  const provider = await this.getProvider(true, true);
74
74
  const block = await provider.getBlockNumber();
75
75
  const { implementation, slots } = await getErc1822SlotStatus(provider, validatedAddress, block);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/index.ts","../../src/lib/getErc1822SlotStatus.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 { 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: Address\n implementation: Address\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 (ex) {\n return undefined\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: {\n implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block),\n },\n }\n\n if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n status.implementation = status.slots.implementation as string\n }\n\n return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1822SlotStatus } from './lib'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n {\n address: Address\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 { 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 { getErc1822SlotStatus } from './lib'\nimport { Erc1822Status, Erc1822StatusSchema } from './Payload'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.blockchain.Erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = BlockchainWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractBlockchainWitness<\n TParams,\n BlockchainAddress,\n Erc1822Status\n> {\n static override configSchemas = [Erc1822WitnessConfigSchema]\n\n protected override async observeHandler(inPayloads: BlockchainAddress[] = []): 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(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 { 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":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,iBAAqD;AAG9C,IAAM,2BAA2B;AAYxC,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,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK;AAAA,IAC9F;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,KAAC,sBAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACLnC,oBAAyB;AACzB,2BAAsC;AACtC,yCAMO;AAKA,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,6DAI/F;AAAA,EACA,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,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,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":[]}
1
+ {"version":3,"sources":["../../src/index.ts","../../src/lib/getErc1822SlotStatus.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 { 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: Address\n implementation: Address\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 (ex) {\n return undefined\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: {\n implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block),\n },\n }\n\n if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n status.implementation = status.slots.implementation as string\n }\n\n return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1822SlotStatus } from './lib'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n {\n address: Address\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 { 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 { getErc1822SlotStatus } from './lib'\nimport { Erc1822Status, Erc1822StatusSchema } from './Payload'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = BlockchainWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractBlockchainWitness<\n TParams,\n BlockchainAddress,\n Erc1822Status\n> {\n static override configSchemas = [Erc1822WitnessConfigSchema]\n\n protected override async observeHandler(inPayloads: BlockchainAddress[] = []): 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(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 { 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":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAA,iBAAqD;AAG9C,IAAM,2BAA2B;AAYxC,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,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK;AAAA,IAC9F;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,KAAC,sBAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACLnC,oBAAyB;AACzB,2BAAsC;AACtC,yCAMO;AAKA,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,6DAI/F;AAAA,EACA,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,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,EAAE,YAAY;AAEjG,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":[]}
@@ -33,7 +33,7 @@ import {
33
33
  AbstractBlockchainWitness,
34
34
  BlockchainAddressSchema
35
35
  } from "@xyo-network/witness-blockchain-abstract";
36
- var Erc1822WitnessConfigSchema = "network.xyo.blockchain.Erc1822.witness.config";
36
+ var Erc1822WitnessConfigSchema = "network.xyo.erc1822.witness.config";
37
37
  var Erc1822Witness = class extends AbstractBlockchainWitness {
38
38
  static configSchemas = [Erc1822WitnessConfigSchema];
39
39
  async observeHandler(inPayloads = []) {
@@ -42,7 +42,7 @@ var Erc1822Witness = class extends AbstractBlockchainWitness {
42
42
  try {
43
43
  const observations = await Promise.all(
44
44
  inPayloads.filter(isPayloadOfSchemaType(BlockchainAddressSchema)).map(async ({ address }) => {
45
- const validatedAddress = assertEx(address ?? this.config.address, "Missing address");
45
+ const validatedAddress = assertEx(address ?? this.config.address, "Missing address").toLowerCase();
46
46
  const provider = await this.getProvider(true, true);
47
47
  const block = await provider.getBlockNumber();
48
48
  const { implementation, slots } = await getErc1822SlotStatus(provider, validatedAddress, block);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/lib/getErc1822SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { 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: Address\n implementation: Address\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 (ex) {\n return undefined\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: {\n implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block),\n },\n }\n\n if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n status.implementation = status.slots.implementation as string\n }\n\n return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1822SlotStatus } from './lib'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n {\n address: Address\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 { 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 { getErc1822SlotStatus } from './lib'\nimport { Erc1822Status, Erc1822StatusSchema } from './Payload'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.blockchain.Erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = BlockchainWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractBlockchainWitness<\n TParams,\n BlockchainAddress,\n Erc1822Status\n> {\n static override configSchemas = [Erc1822WitnessConfigSchema]\n\n protected override async observeHandler(inPayloads: BlockchainAddress[] = []): 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(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 { 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":";AAAA,SAAkB,kBAAkB,iBAAiB;AAG9C,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,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,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK;AAAA,IAC9F;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,CAAC,UAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACLnC,SAAS,gBAAgB;AACzB,SAAS,6BAA6B;AACtC;AAAA,EACE;AAAA,EAEA;AAAA,OAGK;AAKA,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,0BAI/F;AAAA,EACA,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,MAAyB,eAAe,aAAkC,CAAC,GAA6B;AACtG,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,eAAe,MAAM,QAAQ;AAAA,QACjC,WAAW,OAAO,sBAAsB,uBAAuB,CAAC,EAAE,IAAI,OAAO,EAAE,QAAQ,MAAM;AAC3F,gBAAM,mBAAmB,SAAS,WAAW,KAAK,OAAO,SAAS,iBAAiB;AAEnF,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":[]}
1
+ {"version":3,"sources":["../../src/lib/getErc1822SlotStatus.ts","../../src/Payload.ts","../../src/Witness.ts"],"sourcesContent":["import { Address, hexFromHexString, isHexZero } from '@xylabs/hex'\nimport { 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: Address\n implementation: Address\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 (ex) {\n return undefined\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: {\n implementation: await readAddressFromSlot(provider, address, ERC1822_PROXY_LOGIC_SLOT, block),\n },\n }\n\n if (status.slots.implementation && !isHexZero(status.slots.implementation)) {\n status.implementation = status.slots.implementation as string\n }\n\n return status\n}\n","import { Address } from '@xylabs/hex'\nimport { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1822SlotStatus } from './lib'\n\nexport const Erc1822StatusSchema = 'network.xyo.erc1822.status'\nexport type Erc1822StatusSchema = typeof Erc1822StatusSchema\n\nexport type Erc1822Status = Payload<\n {\n address: Address\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 { 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 { getErc1822SlotStatus } from './lib'\nimport { Erc1822Status, Erc1822StatusSchema } from './Payload'\n\nexport const Erc1822WitnessConfigSchema = 'network.xyo.erc1822.witness.config'\nexport type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema\n\nexport type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>\n\nexport type Erc1822WitnessParams = BlockchainWitnessParams<Erc1822WitnessConfig>\n\nexport class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822WitnessParams> extends AbstractBlockchainWitness<\n TParams,\n BlockchainAddress,\n Erc1822Status\n> {\n static override configSchemas = [Erc1822WitnessConfigSchema]\n\n protected override async observeHandler(inPayloads: BlockchainAddress[] = []): 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(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 { 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":";AAAA,SAAkB,kBAAkB,iBAAiB;AAG9C,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,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,gBAAgB,MAAM,oBAAoB,UAAU,SAAS,0BAA0B,KAAK;AAAA,IAC9F;AAAA,EACF;AAEA,MAAI,OAAO,MAAM,kBAAkB,CAAC,UAAU,OAAO,MAAM,cAAc,GAAG;AAC1E,WAAO,iBAAiB,OAAO,MAAM;AAAA,EACvC;AAEA,SAAO;AACT;;;ACjCO,IAAM,sBAAsB;;;ACLnC,SAAS,gBAAgB;AACzB,SAAS,6BAA6B;AACtC;AAAA,EACE;AAAA,EAEA;AAAA,OAGK;AAKA,IAAM,6BAA6B;AAOnC,IAAM,iBAAN,cAA0F,0BAI/F;AAAA,EACA,OAAgB,gBAAgB,CAAC,0BAA0B;AAAA,EAE3D,MAAyB,eAAe,aAAkC,CAAC,GAA6B;AACtG,UAAM,KAAK,QAAQ,OAAO;AAE1B,UAAM,KAAK,aAAa;AACxB,QAAI;AACF,YAAM,eAAe,MAAM,QAAQ;AAAA,QACjC,WAAW,OAAO,sBAAsB,uBAAuB,CAAC,EAAE,IAAI,OAAO,EAAE,QAAQ,MAAM;AAC3F,gBAAM,mBAAmB,SAAS,WAAW,KAAK,OAAO,SAAS,iBAAiB,EAAE,YAAY;AAEjG,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":[]}
package/package.json CHANGED
@@ -12,13 +12,13 @@
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.13.20",
14
14
  "@xylabs/hex": "^2.13.20",
15
- "@xyo-network/payload-model": "^2.84.3",
16
- "@xyo-network/witness-blockchain-abstract": "^2.84.3"
15
+ "@xyo-network/payload-model": "^2.84.8",
16
+ "@xyo-network/witness-blockchain-abstract": "^2.84.8"
17
17
  },
18
18
  "devDependencies": {
19
19
  "@xylabs/jest-helpers": "^2.13.20",
20
- "@xylabs/ts-scripts-yarn3": "^3.2.19",
21
- "@xylabs/tsconfig": "^3.2.19",
20
+ "@xylabs/ts-scripts-yarn3": "^3.2.24",
21
+ "@xylabs/tsconfig": "^3.2.24",
22
22
  "ethers": "^6.9.0",
23
23
  "jest": "^29.7.0",
24
24
  "typescript": "^5.3.3"
@@ -62,6 +62,6 @@
62
62
  "url": "https://github.com/XYOracleNetwork/plugins.git"
63
63
  },
64
64
  "sideEffects": false,
65
- "version": "2.84.1",
65
+ "version": "2.84.3",
66
66
  "type": "module"
67
67
  }
package/src/Witness.ts CHANGED
@@ -11,7 +11,7 @@ import {
11
11
  import { getErc1822SlotStatus } from './lib'
12
12
  import { Erc1822Status, Erc1822StatusSchema } from './Payload'
13
13
 
14
- export const Erc1822WitnessConfigSchema = 'network.xyo.blockchain.Erc1822.witness.config'
14
+ export const Erc1822WitnessConfigSchema = 'network.xyo.erc1822.witness.config'
15
15
  export type Erc1822WitnessConfigSchema = typeof Erc1822WitnessConfigSchema
16
16
 
17
17
  export type Erc1822WitnessConfig = BlockchainWitnessConfig<{ address?: string }, Erc1822WitnessConfigSchema>
@@ -32,7 +32,7 @@ export class Erc1822Witness<TParams extends Erc1822WitnessParams = Erc1822Witnes
32
32
  try {
33
33
  const observations = await Promise.all(
34
34
  inPayloads.filter(isPayloadOfSchemaType(BlockchainAddressSchema)).map(async ({ address }) => {
35
- const validatedAddress = assertEx(address ?? this.config.address, 'Missing address')
35
+ const validatedAddress = assertEx(address ?? this.config.address, 'Missing address').toLowerCase()
36
36
 
37
37
  const provider = await this.getProvider(true, true)
38
38