@xyo-network/erc1967-witness 2.99.4 → 2.99.5

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.
Files changed (56) hide show
  1. package/dist/browser/Payload.d.cts +1 -1
  2. package/dist/browser/Payload.d.mts +1 -1
  3. package/dist/browser/Payload.d.ts +1 -1
  4. package/dist/browser/Witness.d.cts +1 -1
  5. package/dist/browser/Witness.d.mts +1 -1
  6. package/dist/browser/Witness.d.ts +1 -1
  7. package/dist/browser/index.cjs +40 -27
  8. package/dist/browser/index.cjs.map +1 -1
  9. package/dist/browser/index.d.cts +3 -3
  10. package/dist/browser/index.d.mts +3 -3
  11. package/dist/browser/index.d.ts +3 -3
  12. package/dist/browser/{index.js → index.mjs} +43 -28
  13. package/dist/browser/index.mjs.map +1 -0
  14. package/dist/browser/lib/index.d.cts +1 -1
  15. package/dist/browser/lib/index.d.mts +1 -1
  16. package/dist/browser/lib/index.d.ts +1 -1
  17. package/dist/neutral/Payload.d.cts +1 -1
  18. package/dist/neutral/Payload.d.mts +1 -1
  19. package/dist/neutral/Payload.d.ts +1 -1
  20. package/dist/neutral/Witness.d.cts +1 -1
  21. package/dist/neutral/Witness.d.mts +1 -1
  22. package/dist/neutral/Witness.d.ts +1 -1
  23. package/dist/neutral/index.cjs +40 -27
  24. package/dist/neutral/index.cjs.map +1 -1
  25. package/dist/neutral/index.d.cts +3 -3
  26. package/dist/neutral/index.d.mts +3 -3
  27. package/dist/neutral/index.d.ts +3 -3
  28. package/dist/{node/index.js → neutral/index.mjs} +43 -28
  29. package/dist/neutral/index.mjs.map +1 -0
  30. package/dist/neutral/lib/index.d.cts +1 -1
  31. package/dist/neutral/lib/index.d.mts +1 -1
  32. package/dist/neutral/lib/index.d.ts +1 -1
  33. package/dist/node/Payload.d.cts +1 -1
  34. package/dist/node/Payload.d.mts +1 -1
  35. package/dist/node/Payload.d.ts +1 -1
  36. package/dist/node/Witness.d.cts +1 -1
  37. package/dist/node/Witness.d.mts +1 -1
  38. package/dist/node/Witness.d.ts +1 -1
  39. package/dist/node/index.cjs +46 -29
  40. package/dist/node/index.cjs.map +1 -1
  41. package/dist/node/index.d.cts +3 -3
  42. package/dist/node/index.d.mts +3 -3
  43. package/dist/node/index.d.ts +3 -3
  44. package/dist/{neutral/index.js → node/index.mjs} +49 -30
  45. package/dist/node/index.mjs.map +1 -0
  46. package/dist/node/lib/index.d.cts +1 -1
  47. package/dist/node/lib/index.d.mts +1 -1
  48. package/dist/node/lib/index.d.ts +1 -1
  49. package/package.json +13 -13
  50. package/src/Payload.ts +1 -1
  51. package/src/Witness.ts +3 -3
  52. package/src/index.ts +3 -3
  53. package/src/lib/index.ts +1 -1
  54. package/dist/browser/index.js.map +0 -1
  55. package/dist/neutral/index.js.map +0 -1
  56. package/dist/node/index.js.map +0 -1
@@ -1,3 +1,11 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __getProtoOf = Object.getPrototypeOf;
3
+ var __reflectGet = Reflect.get;
4
+ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
5
+ var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
6
+ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
7
+ var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
8
+
1
9
  // src/lib/getErc1967SlotStatus.ts
2
10
  import { hexFromHexString, isHexZero } from "@xylabs/hex";
3
11
  import { UpgradeableBeacon__factory } from "@xyo-network/open-zeppelin-typechain";
@@ -5,15 +13,17 @@ var ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = "0x360894a13ba1a3210667c828492db
5
13
  var ERC1967_PROXY_BEACON_STORAGE_SLOT = "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50";
6
14
  var ERC1967_PROXY_ADMIN_STORAGE_SLOT = "0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
7
15
  var ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = "0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143";
8
- var readAddressFromSlot = async (provider, address, slot, block) => {
16
+ var readAddressFromSlot = /* @__PURE__ */ __name(async (provider, address, slot, block) => {
9
17
  try {
10
18
  const slotValue = await provider.getStorage(address, slot, block);
11
- return hexFromHexString(slotValue, { prefix: true });
19
+ return hexFromHexString(slotValue, {
20
+ prefix: true
21
+ });
12
22
  } catch {
13
23
  return;
14
24
  }
15
- };
16
- var getErc1967SlotStatus = async (provider, address, block) => {
25
+ }, "readAddressFromSlot");
26
+ var getErc1967SlotStatus = /* @__PURE__ */ __name(async (provider, address, block) => {
17
27
  const status = {
18
28
  address,
19
29
  implementation: address,
@@ -28,11 +38,17 @@ var getErc1967SlotStatus = async (provider, address, block) => {
28
38
  status.implementation = `0x${BigInt(status.slots.implementation).toString(16).padStart(40, "0")}`;
29
39
  } else {
30
40
  if (status.slots.beacon && !isHexZero(status.slots.beacon)) {
31
- const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon, { provider });
41
+ const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon, {
42
+ provider
43
+ });
32
44
  try {
33
- const implementation = await beacon.implementation(block ? { blockTag: block } : {});
45
+ const implementation = await beacon.implementation(block ? {
46
+ blockTag: block
47
+ } : {});
34
48
  if (implementation) {
35
- status.beacon = { implementation };
49
+ status.beacon = {
50
+ implementation
51
+ };
36
52
  if (!isHexZero(implementation)) {
37
53
  status.implementation = implementation;
38
54
  }
@@ -44,7 +60,7 @@ var getErc1967SlotStatus = async (provider, address, block) => {
44
60
  }
45
61
  }
46
62
  return status;
47
- };
63
+ }, "getErc1967SlotStatus");
48
64
 
49
65
  // src/Payload.ts
50
66
  var Erc1967StatusSchema = "network.xyo.erc1967.status";
@@ -54,31 +70,27 @@ import { assertEx } from "@xylabs/assert";
54
70
  import { isPayloadOfSchemaType } from "@xyo-network/payload-model";
55
71
  import { AbstractEvmWitness, EvmAddressSchema } from "@xyo-network/witness-evm-abstract";
56
72
  var Erc1967WitnessConfigSchema = "network.xyo.erc1967.witness.config";
57
- var Erc1967Witness = class extends AbstractEvmWitness {
58
- static configSchemas = [...super.configSchemas, Erc1967WitnessConfigSchema];
59
- static defaultConfigSchema = Erc1967WitnessConfigSchema;
73
+ var _Erc1967Witness = class _Erc1967Witness extends AbstractEvmWitness {
60
74
  async observeHandler(inPayloads = []) {
61
75
  await this.started("throw");
62
76
  await this.getProviders();
63
77
  try {
64
- const observations = await Promise.all(
65
- inPayloads.filter(isPayloadOfSchemaType(EvmAddressSchema)).map(async ({ address }) => {
66
- const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address").toLowerCase();
67
- const provider = await this.getProvider(true, true);
68
- const block = await provider.getBlockNumber();
69
- const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block);
70
- const observation = {
71
- address: validatedAddress,
72
- beacon,
73
- block,
74
- chainId: Number((await provider.getNetwork()).chainId),
75
- implementation,
76
- schema: Erc1967StatusSchema,
77
- slots
78
- };
79
- return observation;
80
- })
81
- );
78
+ const observations = await Promise.all(inPayloads.filter(isPayloadOfSchemaType(EvmAddressSchema)).map(async ({ address }) => {
79
+ const validatedAddress = assertEx(address ?? this.config.address, () => "Missing address").toLowerCase();
80
+ const provider = await this.getProvider(true, true);
81
+ const block = await provider.getBlockNumber();
82
+ const { beacon, implementation, slots } = await getErc1967SlotStatus(provider, validatedAddress, block);
83
+ const observation = {
84
+ address: validatedAddress,
85
+ beacon,
86
+ block,
87
+ chainId: Number((await provider.getNetwork()).chainId),
88
+ implementation,
89
+ schema: Erc1967StatusSchema,
90
+ slots
91
+ };
92
+ return observation;
93
+ }));
82
94
  return observations;
83
95
  } catch (ex) {
84
96
  const error = ex;
@@ -87,6 +99,13 @@ var Erc1967Witness = class extends AbstractEvmWitness {
87
99
  }
88
100
  }
89
101
  };
102
+ __name(_Erc1967Witness, "Erc1967Witness");
103
+ __publicField(_Erc1967Witness, "configSchemas", [
104
+ ...__superGet(_Erc1967Witness, _Erc1967Witness, "configSchemas"),
105
+ Erc1967WitnessConfigSchema
106
+ ]);
107
+ __publicField(_Erc1967Witness, "defaultConfigSchema", Erc1967WitnessConfigSchema);
108
+ var Erc1967Witness = _Erc1967Witness;
90
109
  export {
91
110
  ERC1967_PROXY_ADMIN_STORAGE_SLOT,
92
111
  ERC1967_PROXY_BEACON_STORAGE_SLOT,
@@ -97,4 +116,4 @@ export {
97
116
  Erc1967WitnessConfigSchema,
98
117
  getErc1967SlotStatus
99
118
  };
100
- //# sourceMappingURL=index.js.map
119
+ //# sourceMappingURL=index.mjs.map
@@ -0,0 +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 type { 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: string\n beacon?: {\n implementation?: Address\n }\n implementation: string\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 {\n return\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')}` as Address\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 } : {})) as Address\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 { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib/index.ts'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n {\n address: string\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, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness, EvmAddress, EvmAddressSchema, EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\n\nimport { getErc1967SlotStatus } from './lib/index.ts'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload.ts'\n\nexport const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'\nexport type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema\n\nexport type Erc1967WitnessConfig = EvmWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>\n\nexport type Erc1967WitnessParams = EvmWitnessParams<Erc1967WitnessConfig>\n\nexport class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractEvmWitness<\n TParams,\n EvmAddress,\n Erc1967Status\n> {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, Erc1967WitnessConfigSchema]\n static override readonly defaultConfigSchema: Schema = Erc1967WitnessConfigSchema\n\n protected override async observeHandler(inPayloads: EvmAddress[] = []): 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<EvmAddress>(EvmAddressSchema)).map(async ({ address }) => {\n const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address').toLowerCase()\n\n const provider = await this.getProvider(true, true)\n\n const block = await provider.getBlockNumber()\n\n const { 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":["hexFromHexString","isHexZero","UpgradeableBeacon__factory","ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT","ERC1967_PROXY_BEACON_STORAGE_SLOT","ERC1967_PROXY_ADMIN_STORAGE_SLOT","ERC1967_PROXY_ROLLBACK_STORAGE_SLOT","readAddressFromSlot","provider","address","slot","block","slotValue","getStorage","hexFromHexString","prefix","getErc1967SlotStatus","status","implementation","slots","admin","beacon","rollback","isHexZero","BigInt","toString","padStart","UpgradeableBeacon__factory","connect","blockTag","ex","error","console","log","message","Erc1967StatusSchema","assertEx","isPayloadOfSchemaType","AbstractEvmWitness","EvmAddressSchema","Erc1967WitnessConfigSchema","Erc1967Witness","AbstractEvmWitness","observeHandler","inPayloads","started","getProviders","observations","Promise","all","filter","isPayloadOfSchemaType","EvmAddressSchema","map","address","validatedAddress","assertEx","config","toLowerCase","provider","getProvider","block","getBlockNumber","beacon","implementation","slots","getErc1967SlotStatus","observation","chainId","Number","getNetwork","schema","Erc1967StatusSchema","ex","error","console","log","name","message","configSchemas","defaultConfigSchema"]}
@@ -1,2 +1,2 @@
1
- export * from './getErc1967SlotStatus.js';
1
+ export * from './getErc1967SlotStatus.ts';
2
2
  //# sourceMappingURL=index.d.ts.map
@@ -1,2 +1,2 @@
1
- export * from './getErc1967SlotStatus.js';
1
+ export * from './getErc1967SlotStatus.ts';
2
2
  //# sourceMappingURL=index.d.ts.map
@@ -1,2 +1,2 @@
1
- export * from './getErc1967SlotStatus.js';
1
+ export * from './getErc1967SlotStatus.ts';
2
2
  //# sourceMappingURL=index.d.ts.map
package/package.json CHANGED
@@ -10,19 +10,19 @@
10
10
  "url": "https://github.com/XYOracleNetwork/plugins/issues"
11
11
  },
12
12
  "dependencies": {
13
- "@xylabs/assert": "^3.6.1",
14
- "@xylabs/hex": "^3.6.1",
13
+ "@xylabs/assert": "^3.6.8",
14
+ "@xylabs/hex": "^3.6.8",
15
15
  "@xyo-network/open-zeppelin-typechain": "^3.0.5",
16
- "@xyo-network/payload-model": "^2.110.6",
17
- "@xyo-network/witness-evm-abstract": "^2.110.6"
16
+ "@xyo-network/payload-model": "^2.111.2",
17
+ "@xyo-network/witness-evm-abstract": "^2.111.2"
18
18
  },
19
19
  "devDependencies": {
20
- "@xylabs/jest-helpers": "^3.6.1",
21
- "@xylabs/ts-scripts-yarn3": "^3.12.2",
22
- "@xylabs/tsconfig": "^3.12.2",
23
- "ethers": "^6.13.1",
20
+ "@xylabs/jest-helpers": "^3.6.8",
21
+ "@xylabs/ts-scripts-yarn3": "^3.15.13",
22
+ "@xylabs/tsconfig": "^3.15.13",
23
+ "ethers": "^6.13.2",
24
24
  "jest": "^29.7.0",
25
- "typescript": "^5.5.3"
25
+ "typescript": "^5.5.4"
26
26
  },
27
27
  "description": "Typescript/Javascript Plugins for XYO Platform",
28
28
  "types": "dist/node/index.d.ts",
@@ -35,7 +35,7 @@
35
35
  },
36
36
  "import": {
37
37
  "types": "./dist/browser/index.d.mts",
38
- "default": "./dist/browser/index.js"
38
+ "default": "./dist/browser/index.mjs"
39
39
  }
40
40
  },
41
41
  "node": {
@@ -45,14 +45,14 @@
45
45
  },
46
46
  "import": {
47
47
  "types": "./dist/node/index.d.mts",
48
- "default": "./dist/node/index.js"
48
+ "default": "./dist/node/index.mjs"
49
49
  }
50
50
  }
51
51
  },
52
52
  "./package.json": "./package.json"
53
53
  },
54
54
  "main": "dist/node/index.cjs",
55
- "module": "dist/node/index.js",
55
+ "module": "dist/node/index.mjs",
56
56
  "homepage": "https://xyo.network",
57
57
  "license": "LGPL-3.0-only",
58
58
  "publishConfig": {
@@ -63,6 +63,6 @@
63
63
  "url": "https://github.com/XYOracleNetwork/plugins.git"
64
64
  },
65
65
  "sideEffects": false,
66
- "version": "2.99.4",
66
+ "version": "2.99.5",
67
67
  "type": "module"
68
68
  }
package/src/Payload.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Payload } from '@xyo-network/payload-model'
2
2
 
3
- import { Erc1967SlotStatus } from './lib/index.js'
3
+ import { Erc1967SlotStatus } from './lib/index.ts'
4
4
 
5
5
  export const Erc1967StatusSchema = 'network.xyo.erc1967.status'
6
6
  export type Erc1967StatusSchema = typeof Erc1967StatusSchema
package/src/Witness.ts CHANGED
@@ -2,8 +2,8 @@ import { assertEx } from '@xylabs/assert'
2
2
  import { isPayloadOfSchemaType, Schema } from '@xyo-network/payload-model'
3
3
  import { AbstractEvmWitness, EvmAddress, EvmAddressSchema, EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'
4
4
 
5
- import { getErc1967SlotStatus } from './lib/index.js'
6
- import { Erc1967Status, Erc1967StatusSchema } from './Payload.js'
5
+ import { getErc1967SlotStatus } from './lib/index.ts'
6
+ import { Erc1967Status, Erc1967StatusSchema } from './Payload.ts'
7
7
 
8
8
  export const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'
9
9
  export type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema
@@ -22,7 +22,7 @@ export class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967Witnes
22
22
 
23
23
  protected override async observeHandler(inPayloads: EvmAddress[] = []): Promise<Erc1967Status[]> {
24
24
  await this.started('throw')
25
- //calling it here to make sure we rests the cache
25
+ // calling it here to make sure we rests the cache
26
26
  await this.getProviders()
27
27
  try {
28
28
  const observations = await Promise.all(
package/src/index.ts CHANGED
@@ -1,3 +1,3 @@
1
- export * from './lib/index.js'
2
- export * from './Payload.js'
3
- export * from './Witness.js'
1
+ export * from './lib/index.ts'
2
+ export * from './Payload.ts'
3
+ export * from './Witness.ts'
package/src/lib/index.ts CHANGED
@@ -1 +1 @@
1
- export * from './getErc1967SlotStatus.js'
1
+ export * from './getErc1967SlotStatus.ts'
@@ -1 +0,0 @@
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 type { 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: string\n beacon?: {\n implementation?: Address\n }\n implementation: string\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 {\n return\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')}` as Address\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 } : {})) as Address\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 { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib/index.js'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n {\n address: string\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, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness, EvmAddress, EvmAddressSchema, EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\n\nimport { getErc1967SlotStatus } from './lib/index.js'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload.js'\n\nexport const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'\nexport type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema\n\nexport type Erc1967WitnessConfig = EvmWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>\n\nexport type Erc1967WitnessParams = EvmWitnessParams<Erc1967WitnessConfig>\n\nexport class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractEvmWitness<\n TParams,\n EvmAddress,\n Erc1967Status\n> {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, Erc1967WitnessConfigSchema]\n static override readonly defaultConfigSchema: Schema = Erc1967WitnessConfigSchema\n\n protected override async observeHandler(inPayloads: EvmAddress[] = []): 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<EvmAddress>(EvmAddressSchema)).map(async ({ address }) => {\n const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address').toLowerCase()\n\n const provider = await this.getProvider(true, true)\n\n const block = await provider.getBlockNumber()\n\n const { 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":[]}
@@ -1 +0,0 @@
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 type { 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: string\n beacon?: {\n implementation?: Address\n }\n implementation: string\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 {\n return\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')}` as Address\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 } : {})) as Address\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 { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib/index.js'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n {\n address: string\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, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness, EvmAddress, EvmAddressSchema, EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\n\nimport { getErc1967SlotStatus } from './lib/index.js'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload.js'\n\nexport const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'\nexport type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema\n\nexport type Erc1967WitnessConfig = EvmWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>\n\nexport type Erc1967WitnessParams = EvmWitnessParams<Erc1967WitnessConfig>\n\nexport class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractEvmWitness<\n TParams,\n EvmAddress,\n Erc1967Status\n> {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, Erc1967WitnessConfigSchema]\n static override readonly defaultConfigSchema: Schema = Erc1967WitnessConfigSchema\n\n protected override async observeHandler(inPayloads: EvmAddress[] = []): 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<EvmAddress>(EvmAddressSchema)).map(async ({ address }) => {\n const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address').toLowerCase()\n\n const provider = await this.getProvider(true, true)\n\n const block = await provider.getBlockNumber()\n\n const { 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":[]}
@@ -1 +0,0 @@
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 type { 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: string\n beacon?: {\n implementation?: Address\n }\n implementation: string\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 {\n return\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')}` as Address\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 } : {})) as Address\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 { Payload } from '@xyo-network/payload-model'\n\nimport { Erc1967SlotStatus } from './lib/index.js'\n\nexport const Erc1967StatusSchema = 'network.xyo.erc1967.status'\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport type Erc1967Status = Payload<\n {\n address: string\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, Schema } from '@xyo-network/payload-model'\nimport { AbstractEvmWitness, EvmAddress, EvmAddressSchema, EvmWitnessConfig, EvmWitnessParams } from '@xyo-network/witness-evm-abstract'\n\nimport { getErc1967SlotStatus } from './lib/index.js'\nimport { Erc1967Status, Erc1967StatusSchema } from './Payload.js'\n\nexport const Erc1967WitnessConfigSchema = 'network.xyo.erc1967.witness.config'\nexport type Erc1967WitnessConfigSchema = typeof Erc1967WitnessConfigSchema\n\nexport type Erc1967WitnessConfig = EvmWitnessConfig<{ address?: string }, Erc1967WitnessConfigSchema>\n\nexport type Erc1967WitnessParams = EvmWitnessParams<Erc1967WitnessConfig>\n\nexport class Erc1967Witness<TParams extends Erc1967WitnessParams = Erc1967WitnessParams> extends AbstractEvmWitness<\n TParams,\n EvmAddress,\n Erc1967Status\n> {\n static override readonly configSchemas: Schema[] = [...super.configSchemas, Erc1967WitnessConfigSchema]\n static override readonly defaultConfigSchema: Schema = Erc1967WitnessConfigSchema\n\n protected override async observeHandler(inPayloads: EvmAddress[] = []): 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<EvmAddress>(EvmAddressSchema)).map(async ({ address }) => {\n const validatedAddress = assertEx(address ?? this.config.address, () => 'Missing address').toLowerCase()\n\n const provider = await this.getProvider(true, true)\n\n const block = await provider.getBlockNumber()\n\n const { 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":[]}