@xyo-network/erc1967-witness 6.1.0 → 7.0.0
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.
- package/dist/neutral/Payload.d.ts +139 -7
- package/dist/neutral/Payload.d.ts.map +1 -1
- package/dist/neutral/Witness.d.ts.map +1 -1
- package/dist/neutral/index.mjs +45 -8
- package/dist/neutral/index.mjs.map +3 -3
- package/dist/neutral/lib/getErc1967SlotStatus.d.ts +31 -15
- package/dist/neutral/lib/getErc1967SlotStatus.d.ts.map +1 -1
- package/package.json +16 -16
|
@@ -1,15 +1,147 @@
|
|
|
1
|
-
import
|
|
2
|
-
import type { Erc1967SlotStatus } from './lib/index.ts';
|
|
1
|
+
import * as z from 'zod/mini';
|
|
3
2
|
export declare const Erc1967StatusSchema: "network.xyo.erc1967.status" & {
|
|
4
3
|
readonly __schema: true;
|
|
5
4
|
};
|
|
6
5
|
export type Erc1967StatusSchema = typeof Erc1967StatusSchema;
|
|
7
|
-
export
|
|
6
|
+
export declare const Erc1967StatusZod: z.ZodMiniObject<{
|
|
7
|
+
schema: z.ZodMiniLiteral<"network.xyo.erc1967.status" & {
|
|
8
|
+
readonly __schema: true;
|
|
9
|
+
}>;
|
|
10
|
+
address: z.ZodMiniString<string>;
|
|
11
|
+
beacon: z.ZodMiniOptional<z.ZodMiniObject<{
|
|
12
|
+
implementation: z.ZodMiniOptional<z.ZodMiniCustom<Lowercase<string> & {
|
|
13
|
+
readonly __hex: true;
|
|
14
|
+
} & {
|
|
15
|
+
readonly __address: true;
|
|
16
|
+
}, Lowercase<string> & {
|
|
17
|
+
readonly __hex: true;
|
|
18
|
+
} & {
|
|
19
|
+
readonly __address: true;
|
|
20
|
+
}>>;
|
|
21
|
+
}, z.core.$strip>>;
|
|
22
|
+
block: z.ZodMiniNumber<number>;
|
|
23
|
+
chainId: z.ZodMiniNumber<number>;
|
|
24
|
+
implementation: z.ZodMiniOptional<z.ZodMiniString<string>>;
|
|
25
|
+
slots: z.ZodMiniOptional<z.ZodMiniObject<{
|
|
26
|
+
admin: z.ZodMiniOptional<z.ZodMiniCustom<import("@xylabs/sdk-js").EthAddress, import("@xylabs/sdk-js").EthAddress>>;
|
|
27
|
+
beacon: z.ZodMiniOptional<z.ZodMiniCustom<import("@xylabs/sdk-js").EthAddress, import("@xylabs/sdk-js").EthAddress>>;
|
|
28
|
+
implementation: z.ZodMiniOptional<z.ZodMiniCustom<import("@xylabs/sdk-js").EthAddress, import("@xylabs/sdk-js").EthAddress>>;
|
|
29
|
+
rollback: z.ZodMiniOptional<z.ZodMiniCustom<import("@xylabs/sdk-js").EthAddress, import("@xylabs/sdk-js").EthAddress>>;
|
|
30
|
+
}, z.core.$strip>>;
|
|
31
|
+
}, z.core.$strip>;
|
|
32
|
+
export type Erc1967Status = z.infer<typeof Erc1967StatusZod>;
|
|
33
|
+
export declare const isErc1967Status: <T>(value: T) => value is T & {
|
|
34
|
+
schema: "network.xyo.erc1967.status" & {
|
|
35
|
+
readonly __schema: true;
|
|
36
|
+
};
|
|
8
37
|
address: string;
|
|
9
|
-
beacon?: Erc1967SlotStatus['beacon'];
|
|
10
38
|
block: number;
|
|
11
39
|
chainId: number;
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
40
|
+
beacon?: {
|
|
41
|
+
implementation?: (Lowercase<string> & {
|
|
42
|
+
readonly __hex: true;
|
|
43
|
+
} & {
|
|
44
|
+
readonly __address: true;
|
|
45
|
+
}) | undefined;
|
|
46
|
+
} | undefined;
|
|
47
|
+
implementation?: string | undefined;
|
|
48
|
+
slots?: {
|
|
49
|
+
admin?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
50
|
+
beacon?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
51
|
+
implementation?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
52
|
+
rollback?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
53
|
+
} | undefined;
|
|
54
|
+
};
|
|
55
|
+
export declare const asErc1967Status: {
|
|
56
|
+
<T>(value: T): (T & {
|
|
57
|
+
schema: "network.xyo.erc1967.status" & {
|
|
58
|
+
readonly __schema: true;
|
|
59
|
+
};
|
|
60
|
+
address: string;
|
|
61
|
+
block: number;
|
|
62
|
+
chainId: number;
|
|
63
|
+
beacon?: {
|
|
64
|
+
implementation?: (Lowercase<string> & {
|
|
65
|
+
readonly __hex: true;
|
|
66
|
+
} & {
|
|
67
|
+
readonly __address: true;
|
|
68
|
+
}) | undefined;
|
|
69
|
+
} | undefined;
|
|
70
|
+
implementation?: string | undefined;
|
|
71
|
+
slots?: {
|
|
72
|
+
admin?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
73
|
+
beacon?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
74
|
+
implementation?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
75
|
+
rollback?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
76
|
+
} | undefined;
|
|
77
|
+
}) | undefined;
|
|
78
|
+
<T>(value: T, assert: import("@xylabs/sdk-js").ZodFactoryConfig): T & {
|
|
79
|
+
schema: "network.xyo.erc1967.status" & {
|
|
80
|
+
readonly __schema: true;
|
|
81
|
+
};
|
|
82
|
+
address: string;
|
|
83
|
+
block: number;
|
|
84
|
+
chainId: number;
|
|
85
|
+
beacon?: {
|
|
86
|
+
implementation?: (Lowercase<string> & {
|
|
87
|
+
readonly __hex: true;
|
|
88
|
+
} & {
|
|
89
|
+
readonly __address: true;
|
|
90
|
+
}) | undefined;
|
|
91
|
+
} | undefined;
|
|
92
|
+
implementation?: string | undefined;
|
|
93
|
+
slots?: {
|
|
94
|
+
admin?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
95
|
+
beacon?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
96
|
+
implementation?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
97
|
+
rollback?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
98
|
+
} | undefined;
|
|
99
|
+
};
|
|
100
|
+
};
|
|
101
|
+
export declare const toErc1967Status: {
|
|
102
|
+
<T>(value: T): (T & {
|
|
103
|
+
schema: "network.xyo.erc1967.status" & {
|
|
104
|
+
readonly __schema: true;
|
|
105
|
+
};
|
|
106
|
+
address: string;
|
|
107
|
+
block: number;
|
|
108
|
+
chainId: number;
|
|
109
|
+
beacon?: {
|
|
110
|
+
implementation?: (Lowercase<string> & {
|
|
111
|
+
readonly __hex: true;
|
|
112
|
+
} & {
|
|
113
|
+
readonly __address: true;
|
|
114
|
+
}) | undefined;
|
|
115
|
+
} | undefined;
|
|
116
|
+
implementation?: string | undefined;
|
|
117
|
+
slots?: {
|
|
118
|
+
admin?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
119
|
+
beacon?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
120
|
+
implementation?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
121
|
+
rollback?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
122
|
+
} | undefined;
|
|
123
|
+
}) | undefined;
|
|
124
|
+
<T>(value: T, assert: import("@xylabs/sdk-js").ZodFactoryConfig): T & {
|
|
125
|
+
schema: "network.xyo.erc1967.status" & {
|
|
126
|
+
readonly __schema: true;
|
|
127
|
+
};
|
|
128
|
+
address: string;
|
|
129
|
+
block: number;
|
|
130
|
+
chainId: number;
|
|
131
|
+
beacon?: {
|
|
132
|
+
implementation?: (Lowercase<string> & {
|
|
133
|
+
readonly __hex: true;
|
|
134
|
+
} & {
|
|
135
|
+
readonly __address: true;
|
|
136
|
+
}) | undefined;
|
|
137
|
+
} | undefined;
|
|
138
|
+
implementation?: string | undefined;
|
|
139
|
+
slots?: {
|
|
140
|
+
admin?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
141
|
+
beacon?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
142
|
+
implementation?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
143
|
+
rollback?: import("@xylabs/sdk-js").EthAddress | undefined;
|
|
144
|
+
} | undefined;
|
|
145
|
+
};
|
|
146
|
+
};
|
|
15
147
|
//# sourceMappingURL=Payload.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../src/Payload.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,UAAU,CAAA;AAI7B,eAAO,MAAM,mBAAmB;;CAA+C,CAAA;AAC/E,MAAM,MAAM,mBAAmB,GAAG,OAAO,mBAAmB,CAAA;AAE5D,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;iBAO3B,CAAA;AAEF,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAE5D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;CAAiC,CAAA;AAC7D,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAoD,CAAA;AAChF,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAoD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAAE,gBAAgB,EACnC,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAoB,MAAM,mCAAmC,CAAA;AAGxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAGjD,eAAO,MAAM,0BAA0B;;CAAuD,CAAA;AAC9F,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAErG,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;AAEzE,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,kBAAkB,CACjH,OAAO,EACP,UAAU,EACV,aAAa,CACd;IACC,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAuD;IACvG,gBAAyB,mBAAmB,EAAE,MAAM,CAA6B;cAExD,cAAc,CAAC,UAAU,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAEjD,OAAO,KAAK,EACV,UAAU,EACV,gBAAgB,EAAE,gBAAgB,EACnC,MAAM,mCAAmC,CAAA;AAC1C,OAAO,EAAE,kBAAkB,EAAoB,MAAM,mCAAmC,CAAA;AAGxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAGjD,eAAO,MAAM,0BAA0B;;CAAuD,CAAA;AAC9F,MAAM,MAAM,0BAA0B,GAAG,OAAO,0BAA0B,CAAA;AAE1E,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC;IAAE,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,0BAA0B,CAAC,CAAA;AAErG,MAAM,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;AAEzE,qBAAa,cAAc,CAAC,OAAO,SAAS,oBAAoB,GAAG,oBAAoB,CAAE,SAAQ,kBAAkB,CACjH,OAAO,EACP,UAAU,EACV,aAAa,CACd;IACC,gBAAyB,aAAa,EAAE,MAAM,EAAE,CAAuD;IACvG,gBAAyB,mBAAmB,EAAE,MAAM,CAA6B;cAExD,cAAc,CAAC,UAAU,GAAE,UAAU,EAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;CAsCjG"}
|
package/dist/neutral/index.mjs
CHANGED
|
@@ -5,10 +5,23 @@ import {
|
|
|
5
5
|
isHexZero
|
|
6
6
|
} from "@xylabs/sdk-js";
|
|
7
7
|
import { UpgradeableBeacon__factory } from "@xyo-network/open-zeppelin-typechain";
|
|
8
|
+
import * as z from "zod/mini";
|
|
8
9
|
var ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = "0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc";
|
|
9
10
|
var ERC1967_PROXY_BEACON_STORAGE_SLOT = "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50";
|
|
10
11
|
var ERC1967_PROXY_ADMIN_STORAGE_SLOT = "0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103";
|
|
11
12
|
var ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = "0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143";
|
|
13
|
+
var Erc1967DataSlotsZod = z.object({
|
|
14
|
+
admin: z.optional(z.custom()),
|
|
15
|
+
beacon: z.optional(z.custom()),
|
|
16
|
+
implementation: z.optional(z.custom()),
|
|
17
|
+
rollback: z.optional(z.custom())
|
|
18
|
+
});
|
|
19
|
+
var Erc1967SlotStatusZod = z.object({
|
|
20
|
+
address: z.string(),
|
|
21
|
+
beacon: z.optional(z.object({ implementation: z.optional(z.custom()) })),
|
|
22
|
+
implementation: z.string(),
|
|
23
|
+
slots: Erc1967DataSlotsZod
|
|
24
|
+
});
|
|
12
25
|
var readAddressFromSlot = async (provider, address, slot, block) => {
|
|
13
26
|
try {
|
|
14
27
|
const slotValue = await provider.getStorage(address, slot, block);
|
|
@@ -28,16 +41,16 @@ var getErc1967SlotStatus = async (provider, address, block) => {
|
|
|
28
41
|
rollback: await readAddressFromSlot(provider, address, ERC1967_PROXY_ROLLBACK_STORAGE_SLOT, block)
|
|
29
42
|
}
|
|
30
43
|
};
|
|
31
|
-
if (status.slots.implementation &&
|
|
44
|
+
if (status.slots.implementation != null && isHexZero(status.slots.implementation) === false) {
|
|
32
45
|
status.implementation = `0x${BigInt(status.slots.implementation).toString(16).padStart(40, "0")}`;
|
|
33
46
|
} else {
|
|
34
|
-
if (status.slots.beacon &&
|
|
47
|
+
if (status.slots.beacon != null && isHexZero(status.slots.beacon) === false) {
|
|
35
48
|
const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon, { provider });
|
|
36
49
|
try {
|
|
37
|
-
const implementation = await beacon.implementation(block ? { blockTag: block } : {});
|
|
38
|
-
if (implementation) {
|
|
50
|
+
const implementation = await beacon.implementation(block != null && block !== 0 ? { blockTag: block } : {});
|
|
51
|
+
if (implementation.length > 0) {
|
|
39
52
|
status.beacon = { implementation };
|
|
40
|
-
if (
|
|
53
|
+
if (isHexZero(implementation) === false) {
|
|
41
54
|
status.implementation = implementation;
|
|
42
55
|
}
|
|
43
56
|
}
|
|
@@ -51,8 +64,25 @@ var getErc1967SlotStatus = async (provider, address, block) => {
|
|
|
51
64
|
};
|
|
52
65
|
|
|
53
66
|
// src/Payload.ts
|
|
54
|
-
import {
|
|
67
|
+
import {
|
|
68
|
+
zodAsFactory,
|
|
69
|
+
zodIsFactory,
|
|
70
|
+
zodToFactory
|
|
71
|
+
} from "@xylabs/sdk-js";
|
|
72
|
+
import { asSchema, PayloadZodOfSchema } from "@xyo-network/sdk-js";
|
|
73
|
+
import * as z2 from "zod/mini";
|
|
55
74
|
var Erc1967StatusSchema = asSchema("network.xyo.erc1967.status", true);
|
|
75
|
+
var Erc1967StatusZod = z2.extend(PayloadZodOfSchema(Erc1967StatusSchema), {
|
|
76
|
+
address: z2.string(),
|
|
77
|
+
beacon: Erc1967SlotStatusZod.shape.beacon,
|
|
78
|
+
block: z2.number(),
|
|
79
|
+
chainId: z2.number(),
|
|
80
|
+
implementation: z2.optional(Erc1967SlotStatusZod.shape.implementation),
|
|
81
|
+
slots: z2.optional(Erc1967DataSlotsZod)
|
|
82
|
+
});
|
|
83
|
+
var isErc1967Status = zodIsFactory(Erc1967StatusZod);
|
|
84
|
+
var asErc1967Status = zodAsFactory(Erc1967StatusZod, "asErc1967Status");
|
|
85
|
+
var toErc1967Status = zodToFactory(Erc1967StatusZod, "toErc1967Status");
|
|
56
86
|
|
|
57
87
|
// src/Witness.ts
|
|
58
88
|
import { assertEx } from "@xylabs/sdk-js";
|
|
@@ -76,11 +106,12 @@ var Erc1967Witness = class extends AbstractEvmWitness {
|
|
|
76
106
|
implementation,
|
|
77
107
|
slots
|
|
78
108
|
} = await getErc1967SlotStatus(provider, validatedAddress, block);
|
|
109
|
+
const network = await provider.getNetwork();
|
|
79
110
|
const observation = {
|
|
80
111
|
address: validatedAddress,
|
|
81
112
|
beacon,
|
|
82
113
|
block,
|
|
83
|
-
chainId: Number(
|
|
114
|
+
chainId: Number(network.chainId),
|
|
84
115
|
implementation,
|
|
85
116
|
schema: Erc1967StatusSchema,
|
|
86
117
|
slots
|
|
@@ -101,9 +132,15 @@ export {
|
|
|
101
132
|
ERC1967_PROXY_BEACON_STORAGE_SLOT,
|
|
102
133
|
ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT,
|
|
103
134
|
ERC1967_PROXY_ROLLBACK_STORAGE_SLOT,
|
|
135
|
+
Erc1967DataSlotsZod,
|
|
136
|
+
Erc1967SlotStatusZod,
|
|
104
137
|
Erc1967StatusSchema,
|
|
138
|
+
Erc1967StatusZod,
|
|
105
139
|
Erc1967Witness,
|
|
106
140
|
Erc1967WitnessConfigSchema,
|
|
107
|
-
|
|
141
|
+
asErc1967Status,
|
|
142
|
+
getErc1967SlotStatus,
|
|
143
|
+
isErc1967Status,
|
|
144
|
+
toErc1967Status
|
|
108
145
|
};
|
|
109
146
|
//# sourceMappingURL=index.mjs.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/lib/getErc1967SlotStatus.ts", "../../src/Payload.ts", "../../src/Witness.ts"],
|
|
4
|
-
"sourcesContent": ["import type { Address, EthAddress } from '@xylabs/sdk-js'\nimport {\n asEthAddress, hexFromHexString, isHexZero,\n} from '@xylabs/sdk-js'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport type { Provider } from 'ethers'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc' as EthAddress\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50' as EthAddress\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103' as EthAddress\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143' as EthAddress\n\nexport
|
|
5
|
-
"mappings": ";AACA;AAAA,EACE;AAAA,EAAc;AAAA,EAAkB;AAAA,OAC3B;AACP,SAAS,kCAAkC;
|
|
6
|
-
"names": ["asSchema", "asSchema"]
|
|
4
|
+
"sourcesContent": ["import type { Address, EthAddress } from '@xylabs/sdk-js'\nimport {\n asEthAddress, hexFromHexString, isHexZero,\n} from '@xylabs/sdk-js'\nimport { UpgradeableBeacon__factory } from '@xyo-network/open-zeppelin-typechain'\nimport type { Provider } from 'ethers'\nimport * as z from 'zod/mini'\n\nexport const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT = '0x360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc' as EthAddress\nexport const ERC1967_PROXY_BEACON_STORAGE_SLOT = '0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50' as EthAddress\nexport const ERC1967_PROXY_ADMIN_STORAGE_SLOT = '0xb53127684a568b3173ae13b9f8a6016e243e63b6e8ee1178d6a717850b5d6103' as EthAddress\nexport const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT = '0x4910fdfa16fed3260ed0e7147f7cc6da11a60208b5b9406d12a635614ffd9143' as EthAddress\n\nexport const Erc1967DataSlotsZod = z.object({\n admin: z.optional(z.custom<EthAddress>()),\n beacon: z.optional(z.custom<EthAddress>()),\n implementation: z.optional(z.custom<EthAddress>()),\n rollback: z.optional(z.custom<EthAddress>()),\n})\n\nexport type Erc1967DataSlots = z.infer<typeof Erc1967DataSlotsZod>\n\nexport const Erc1967SlotStatusZod = z.object({\n address: z.string(),\n beacon: z.optional(z.object({ implementation: z.optional(z.custom<Address>()) })),\n implementation: z.string(),\n slots: Erc1967DataSlotsZod,\n})\n\nexport type Erc1967SlotStatus = z.infer<typeof Erc1967SlotStatusZod>\n\nconst readAddressFromSlot = async (provider: Provider, address: string, slot: string, block?: number) => {\n try {\n const slotValue = await provider.getStorage(address, slot, block)\n return asEthAddress(hexFromHexString(slotValue, { prefix: true }))\n } catch {\n return\n }\n}\n\nexport const 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 != null && isHexZero(status.slots.implementation) === false) {\n status.implementation = `0x${BigInt(status.slots.implementation)\n .toString(16)\n .padStart(40, '0')}`\n } else {\n if (status.slots.beacon != null && isHexZero(status.slots.beacon) === false) {\n const beacon = UpgradeableBeacon__factory.connect(status.slots.beacon, { provider })\n try {\n const implementation = (await beacon.implementation(block != null && block !== 0 ? { blockTag: block } : {})) as Address\n if (implementation.length > 0) {\n status.beacon = { implementation }\n if (isHexZero(implementation) === false) {\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 {\n zodAsFactory, zodIsFactory, zodToFactory,\n} from '@xylabs/sdk-js'\nimport { asSchema, PayloadZodOfSchema } from '@xyo-network/sdk-js'\nimport * as z from 'zod/mini'\n\nimport { Erc1967DataSlotsZod, Erc1967SlotStatusZod } from './lib/index.ts'\n\nexport const Erc1967StatusSchema = asSchema('network.xyo.erc1967.status', true)\nexport type Erc1967StatusSchema = typeof Erc1967StatusSchema\n\nexport const Erc1967StatusZod = z.extend(PayloadZodOfSchema(Erc1967StatusSchema), {\n address: z.string(),\n beacon: Erc1967SlotStatusZod.shape.beacon,\n block: z.number(),\n chainId: z.number(),\n implementation: z.optional(Erc1967SlotStatusZod.shape.implementation),\n slots: z.optional(Erc1967DataSlotsZod),\n})\n\nexport type Erc1967Status = z.infer<typeof Erc1967StatusZod>\n\nexport const isErc1967Status = zodIsFactory(Erc1967StatusZod)\nexport const asErc1967Status = zodAsFactory(Erc1967StatusZod, 'asErc1967Status')\nexport const toErc1967Status = zodToFactory(Erc1967StatusZod, 'toErc1967Status')\n", "import { assertEx } from '@xylabs/sdk-js'\nimport type { Schema } from '@xyo-network/sdk-js'\nimport { asSchema, isPayloadOfSchemaType } from '@xyo-network/sdk-js'\nimport type {\n EvmAddress,\n EvmWitnessConfig, EvmWitnessParams,\n} from '@xyo-network/witness-evm-abstract'\nimport { AbstractEvmWitness, EvmAddressSchema } from '@xyo-network/witness-evm-abstract'\n\nimport { getErc1967SlotStatus } from './lib/index.ts'\nimport type { Erc1967Status } from './Payload.ts'\nimport { Erc1967StatusSchema } from './Payload.ts'\n\nexport const Erc1967WitnessConfigSchema = asSchema('network.xyo.erc1967.witness.config', true)\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.startedAsync('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 {\n beacon, implementation, slots,\n } = await getErc1967SlotStatus(provider, validatedAddress, block)\n\n const network = await provider.getNetwork()\n\n const observation: Erc1967Status = {\n address: validatedAddress,\n beacon,\n block,\n chainId: Number(network.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"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["z", "asSchema", "asSchema"]
|
|
7
7
|
}
|
|
@@ -1,22 +1,38 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { EthAddress } from '@xylabs/sdk-js';
|
|
2
2
|
import type { Provider } from 'ethers';
|
|
3
|
+
import * as z from 'zod/mini';
|
|
3
4
|
export declare const ERC1967_PROXY_IMPLEMENTATION_STORAGE_SLOT: EthAddress;
|
|
4
5
|
export declare const ERC1967_PROXY_BEACON_STORAGE_SLOT: EthAddress;
|
|
5
6
|
export declare const ERC1967_PROXY_ADMIN_STORAGE_SLOT: EthAddress;
|
|
6
7
|
export declare const ERC1967_PROXY_ROLLBACK_STORAGE_SLOT: EthAddress;
|
|
7
|
-
export
|
|
8
|
-
admin
|
|
9
|
-
beacon
|
|
10
|
-
implementation
|
|
11
|
-
rollback
|
|
12
|
-
}
|
|
13
|
-
export
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
8
|
+
export declare const Erc1967DataSlotsZod: z.ZodMiniObject<{
|
|
9
|
+
admin: z.ZodMiniOptional<z.ZodMiniCustom<EthAddress, EthAddress>>;
|
|
10
|
+
beacon: z.ZodMiniOptional<z.ZodMiniCustom<EthAddress, EthAddress>>;
|
|
11
|
+
implementation: z.ZodMiniOptional<z.ZodMiniCustom<EthAddress, EthAddress>>;
|
|
12
|
+
rollback: z.ZodMiniOptional<z.ZodMiniCustom<EthAddress, EthAddress>>;
|
|
13
|
+
}, z.core.$strip>;
|
|
14
|
+
export type Erc1967DataSlots = z.infer<typeof Erc1967DataSlotsZod>;
|
|
15
|
+
export declare const Erc1967SlotStatusZod: z.ZodMiniObject<{
|
|
16
|
+
address: z.ZodMiniString<string>;
|
|
17
|
+
beacon: z.ZodMiniOptional<z.ZodMiniObject<{
|
|
18
|
+
implementation: z.ZodMiniOptional<z.ZodMiniCustom<Lowercase<string> & {
|
|
19
|
+
readonly __hex: true;
|
|
20
|
+
} & {
|
|
21
|
+
readonly __address: true;
|
|
22
|
+
}, Lowercase<string> & {
|
|
23
|
+
readonly __hex: true;
|
|
24
|
+
} & {
|
|
25
|
+
readonly __address: true;
|
|
26
|
+
}>>;
|
|
27
|
+
}, z.core.$strip>>;
|
|
28
|
+
implementation: z.ZodMiniString<string>;
|
|
29
|
+
slots: z.ZodMiniObject<{
|
|
30
|
+
admin: z.ZodMiniOptional<z.ZodMiniCustom<EthAddress, EthAddress>>;
|
|
31
|
+
beacon: z.ZodMiniOptional<z.ZodMiniCustom<EthAddress, EthAddress>>;
|
|
32
|
+
implementation: z.ZodMiniOptional<z.ZodMiniCustom<EthAddress, EthAddress>>;
|
|
33
|
+
rollback: z.ZodMiniOptional<z.ZodMiniCustom<EthAddress, EthAddress>>;
|
|
34
|
+
}, z.core.$strip>;
|
|
35
|
+
}, z.core.$strip>;
|
|
36
|
+
export type Erc1967SlotStatus = z.infer<typeof Erc1967SlotStatusZod>;
|
|
21
37
|
export declare const getErc1967SlotStatus: (provider: Provider, address: string, block?: number) => Promise<Erc1967SlotStatus>;
|
|
22
38
|
//# sourceMappingURL=getErc1967SlotStatus.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getErc1967SlotStatus.d.ts","sourceRoot":"","sources":["../../../src/lib/getErc1967SlotStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"getErc1967SlotStatus.d.ts","sourceRoot":"","sources":["../../../src/lib/getErc1967SlotStatus.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAKzD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AACtC,OAAO,KAAK,CAAC,MAAM,UAAU,CAAA;AAE7B,eAAO,MAAM,yCAAyC,EAA2E,UAAU,CAAA;AAC3I,eAAO,MAAM,iCAAiC,EAA2E,UAAU,CAAA;AACnI,eAAO,MAAM,gCAAgC,EAA2E,UAAU,CAAA;AAClI,eAAO,MAAM,mCAAmC,EAA2E,UAAU,CAAA;AAErI,eAAO,MAAM,mBAAmB;;;;;iBAK9B,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC,CAAA;AAElE,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;iBAK/B,CAAA;AAEF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAA;AAWpE,eAAO,MAAM,oBAAoB,GAAU,UAAU,QAAQ,EAAE,SAAS,MAAM,EAAE,QAAQ,MAAM,KAAG,OAAO,CAAC,iBAAiB,CAmCzH,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xyo-network/erc1967-witness",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "7.0.0",
|
|
4
4
|
"description": "Typescript/Javascript Plugins for XYO Platform",
|
|
5
5
|
"homepage": "https://xyo.network",
|
|
6
6
|
"bugs": {
|
|
@@ -35,23 +35,23 @@
|
|
|
35
35
|
"@metamask/providers": "^22.1.1",
|
|
36
36
|
"@noble/post-quantum": "~0.6.1",
|
|
37
37
|
"@opentelemetry/api": "^1.9.1",
|
|
38
|
-
"@opentelemetry/sdk-trace-base": "^2.
|
|
38
|
+
"@opentelemetry/sdk-trace-base": "^2.8.0",
|
|
39
39
|
"@scure/base": "^2.2.0",
|
|
40
40
|
"@scure/bip39": "~2.2.0",
|
|
41
|
-
"@xylabs/geo": "^6.1.
|
|
42
|
-
"@xylabs/sdk-js": "^6.1.
|
|
43
|
-
"@xylabs/threads": "^6.1.
|
|
44
|
-
"@xylabs/toolchain": "~8.
|
|
45
|
-
"@xylabs/tsconfig": "~8.
|
|
46
|
-
"@xylabs/vitest-extended": "^6.1.
|
|
41
|
+
"@xylabs/geo": "^6.1.3",
|
|
42
|
+
"@xylabs/sdk-js": "^6.1.3",
|
|
43
|
+
"@xylabs/threads": "^6.1.3",
|
|
44
|
+
"@xylabs/toolchain": "~8.2.7",
|
|
45
|
+
"@xylabs/tsconfig": "~8.2.7",
|
|
46
|
+
"@xylabs/vitest-extended": "^6.1.3",
|
|
47
47
|
"@xyo-network/open-zeppelin-typechain": "^4.1.3",
|
|
48
|
-
"@xyo-network/sdk-js": "^
|
|
49
|
-
"@xyo-network/sdk-protocol-js": "~
|
|
50
|
-
"@xyo-network/witness-evm-abstract": "
|
|
48
|
+
"@xyo-network/sdk-js": "^7.0.0",
|
|
49
|
+
"@xyo-network/sdk-protocol-js": "~7.0",
|
|
50
|
+
"@xyo-network/witness-evm-abstract": "~7.0",
|
|
51
51
|
"ajv": "^8.20.0",
|
|
52
52
|
"async-mutex": "^0.5.0",
|
|
53
53
|
"debug": "~4.4.3",
|
|
54
|
-
"eslint": "^10.
|
|
54
|
+
"eslint": "^10.5.0",
|
|
55
55
|
"ethers": "^6.16.0",
|
|
56
56
|
"hash-wasm": "^4.12.0",
|
|
57
57
|
"idb": "^8.0.3",
|
|
@@ -59,7 +59,7 @@
|
|
|
59
59
|
"observable-fns": "~0.6.1",
|
|
60
60
|
"typescript": "~6.0.3",
|
|
61
61
|
"vite": "^8.0.16",
|
|
62
|
-
"vitest": "^4.1.
|
|
62
|
+
"vitest": "^4.1.9",
|
|
63
63
|
"webextension-polyfill": "^0.12.0",
|
|
64
64
|
"zod": "^4.4.3"
|
|
65
65
|
},
|
|
@@ -75,9 +75,9 @@
|
|
|
75
75
|
"@xylabs/sdk-js": "^6.0",
|
|
76
76
|
"@xylabs/threads": "^6.0",
|
|
77
77
|
"@xyo-network/open-zeppelin-typechain": "^4.1",
|
|
78
|
-
"@xyo-network/sdk-js": "^
|
|
79
|
-
"@xyo-network/sdk-protocol-js": "
|
|
80
|
-
"@xyo-network/witness-evm-abstract": "^
|
|
78
|
+
"@xyo-network/sdk-js": "^7.0",
|
|
79
|
+
"@xyo-network/sdk-protocol-js": "~7.0",
|
|
80
|
+
"@xyo-network/witness-evm-abstract": "^7.0",
|
|
81
81
|
"ajv": "^8.20",
|
|
82
82
|
"async-mutex": "^0.5",
|
|
83
83
|
"debug": "~4.4",
|