thirdweb 5.102.4 → 5.102.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.
- package/dist/cjs/utils/bytecode/resolveImplementation.js +4 -1
- package/dist/cjs/utils/bytecode/resolveImplementation.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/esm/utils/bytecode/resolveImplementation.js +4 -1
- package/dist/esm/utils/bytecode/resolveImplementation.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +3 -3
- package/src/utils/bytecode/handleBeaconProxyPattern.test.ts +52 -0
- package/src/utils/bytecode/resolveImplementation.ts +4 -1
- package/src/version.ts +1 -1
@@ -94,7 +94,10 @@ contract) {
|
|
94
94
|
address: contract.address,
|
95
95
|
position: "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
|
96
96
|
});
|
97
|
-
|
97
|
+
if (proxyStorage.length >= 40) {
|
98
|
+
return `0x${proxyStorage.slice(-40)}`;
|
99
|
+
}
|
100
|
+
return undefined;
|
98
101
|
}
|
99
102
|
catch {
|
100
103
|
return undefined;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"resolveImplementation.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":";;AAyBA,sDAgEC;AAzFD,4EAAqE;AACrE,4DAAgF;AAChF,+EAAyE;AACzE,6CAAgD;AAChD,yEAAkE;AAClE,8CAA0C;AAE1C,+GAAyG;AAEzG,8BAA8B;AAC9B,MAAM,WAAW,GAAG,4CAA4C,CAAC;AACjE,MAAM,YAAY,GAChB,oEAAoE,CAAC;AAEvE;;;;;;;;;;GAUG;AACI,KAAK,UAAU,qBAAqB;AACzC,4DAA4D;AAC5D,QAA+B;IAE/B,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,IAAA,6BAAW,EAAC,QAAQ,CAAC;QACrB,wBAAwB,CAAC,QAAQ,CAAC;KACnC,CAAC,CAAC;IACH,0CAA0C;IAC1C,MAAM,iCAAiC,GACrC,IAAA,sFAAwC,EAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,iCAAiC,EAAE,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,iCAAiC;YAC1C,QAAQ,EAAE,MAAM,IAAA,6BAAW,EACzB,IAAA,yBAAW,EAAC;gBACV,GAAG,QAAQ;gBACX,OAAO,EAAE,iCAAiC;aAC3C,CAAC,CACH;SACF,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,IAAI,qBAAyC,CAAC;IAE9C,IAAI,MAAM,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;QACrC,qFAAqF;QACrF,+FAA+F;QAC/F,6FAA6F;QAC7F,QAAQ,GAAG,IAAA,yBAAW,EAAC;YACrB,GAAG,QAAQ;YACX,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QAEH,qBAAqB,GAAG,MAAM,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,qBAAqB,GAAG,MAAM,gCAAgC,CAAC,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,IACE,qBAAqB;QACrB,IAAA,sBAAS,EAAC,qBAAqB,CAAC;QAChC,qBAAqB,KAAK,WAAW,EACrC,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,IAAA,6BAAW,EAAC;YAC/C,GAAG,QAAQ;YACX,OAAO,EAAE,qBAAqB;SAC/B,CAAC,CAAC;QACH,gFAAgF;QAChF,IAAI,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACpC,OAAO;gBACL,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EAAE,gBAAgB;aAC3B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,qBAAqB;YAC9B,QAAQ,EAAE,sBAAsB;SACjC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,wBAAwB;AACrC,4DAA4D;AAC5D,QAA+B;IAE/B;;;;;OAKG;IACH,MAAM,UAAU,GAAG,IAAA,qBAAY,EAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,IAAA,sCAAgB,EAAC,UAAU,EAAE;YACtD,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EACN,oEAAoE;SACvE,CAAC,CAAC;QACH,OAAO,KAAK,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;
|
1
|
+
{"version":3,"file":"resolveImplementation.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":"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"}
|
package/dist/cjs/version.js
CHANGED
@@ -91,7 +91,10 @@ contract) {
|
|
91
91
|
address: contract.address,
|
92
92
|
position: "0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
|
93
93
|
});
|
94
|
-
|
94
|
+
if (proxyStorage.length >= 40) {
|
95
|
+
return `0x${proxyStorage.slice(-40)}`;
|
96
|
+
}
|
97
|
+
return undefined;
|
95
98
|
}
|
96
99
|
catch {
|
97
100
|
return undefined;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"resolveImplementation.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAyB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,wCAAwC,EAAE,MAAM,+CAA+C,CAAC;AAEzG,8BAA8B;AAC9B,MAAM,WAAW,GAAG,4CAA4C,CAAC;AACjE,MAAM,YAAY,GAChB,oEAAoE,CAAC;AAEvE;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB;AACzC,4DAA4D;AAC5D,QAA+B;IAE/B,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,WAAW,CAAC,QAAQ,CAAC;QACrB,wBAAwB,CAAC,QAAQ,CAAC;KACnC,CAAC,CAAC;IACH,0CAA0C;IAC1C,MAAM,iCAAiC,GACrC,wCAAwC,CAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,iCAAiC,EAAE,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,iCAAiC;YAC1C,QAAQ,EAAE,MAAM,WAAW,CACzB,WAAW,CAAC;gBACV,GAAG,QAAQ;gBACX,OAAO,EAAE,iCAAiC;aAC3C,CAAC,CACH;SACF,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,IAAI,qBAAyC,CAAC;IAE9C,IAAI,MAAM,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;QACrC,qFAAqF;QACrF,+FAA+F;QAC/F,6FAA6F;QAC7F,QAAQ,GAAG,WAAW,CAAC;YACrB,GAAG,QAAQ;YACX,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QAEH,qBAAqB,GAAG,MAAM,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,qBAAqB,GAAG,MAAM,gCAAgC,CAAC,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,IACE,qBAAqB;QACrB,SAAS,CAAC,qBAAqB,CAAC;QAChC,qBAAqB,KAAK,WAAW,EACrC,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,WAAW,CAAC;YAC/C,GAAG,QAAQ;YACX,OAAO,EAAE,qBAAqB;SAC/B,CAAC,CAAC;QACH,gFAAgF;QAChF,IAAI,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACpC,OAAO;gBACL,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EAAE,gBAAgB;aAC3B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,qBAAqB;YAC9B,QAAQ,EAAE,sBAAsB;SACjC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,wBAAwB;AACrC,4DAA4D;AAC5D,QAA+B;IAE/B;;;;;OAKG;IACH,MAAM,UAAU,GAAG,YAAY,CAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE;YACtD,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EACN,oEAAoE;SACvE,CAAC,CAAC;QACH,OAAO,KAAK,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;
|
1
|
+
{"version":3,"file":"resolveImplementation.js","sourceRoot":"","sources":["../../../../src/utils/bytecode/resolveImplementation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAyB,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,wCAAwC,EAAE,MAAM,+CAA+C,CAAC;AAEzG,8BAA8B;AAC9B,MAAM,WAAW,GAAG,4CAA4C,CAAC;AACjE,MAAM,YAAY,GAChB,oEAAoE,CAAC;AAEvE;;;;;;;;;;GAUG;AACH,MAAM,CAAC,KAAK,UAAU,qBAAqB;AACzC,4DAA4D;AAC5D,QAA+B;IAE/B,MAAM,CAAC,gBAAgB,EAAE,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,WAAW,CAAC,QAAQ,CAAC;QACrB,wBAAwB,CAAC,QAAQ,CAAC;KACnC,CAAC,CAAC;IACH,0CAA0C;IAC1C,MAAM,iCAAiC,GACrC,wCAAwC,CAAC,gBAAgB,CAAC,CAAC;IAC7D,IAAI,iCAAiC,EAAE,CAAC;QACtC,OAAO;YACL,OAAO,EAAE,iCAAiC;YAC1C,QAAQ,EAAE,MAAM,WAAW,CACzB,WAAW,CAAC;gBACV,GAAG,QAAQ;gBACX,OAAO,EAAE,iCAAiC;aAC3C,CAAC,CACH;SACF,CAAC;IACJ,CAAC;IAED,0BAA0B;IAC1B,IAAI,qBAAyC,CAAC;IAE9C,IAAI,MAAM,IAAI,MAAM,KAAK,WAAW,EAAE,CAAC;QACrC,qFAAqF;QACrF,+FAA+F;QAC/F,6FAA6F;QAC7F,QAAQ,GAAG,WAAW,CAAC;YACrB,GAAG,QAAQ;YACX,OAAO,EAAE,MAAM;SAChB,CAAC,CAAC;QAEH,qBAAqB,GAAG,MAAM,iCAAiC,CAAC,QAAQ,CAAC,CAAC;IAC5E,CAAC;SAAM,CAAC;QACN,qBAAqB,GAAG,MAAM,gCAAgC,CAAC,QAAQ,CAAC,CAAC;IAC3E,CAAC;IAED,IACE,qBAAqB;QACrB,SAAS,CAAC,qBAAqB,CAAC;QAChC,qBAAqB,KAAK,WAAW,EACrC,CAAC;QACD,MAAM,sBAAsB,GAAG,MAAM,WAAW,CAAC;YAC/C,GAAG,QAAQ;YACX,OAAO,EAAE,qBAAqB;SAC/B,CAAC,CAAC;QACH,gFAAgF;QAChF,IAAI,sBAAsB,KAAK,IAAI,EAAE,CAAC;YACpC,OAAO;gBACL,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EAAE,gBAAgB;aAC3B,CAAC;QACJ,CAAC;QAED,OAAO;YACL,OAAO,EAAE,qBAAqB;YAC9B,QAAQ,EAAE,sBAAsB;SACjC,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,wBAAwB;AACrC,4DAA4D;AAC5D,QAA+B;IAE/B;;;;;OAKG;IACH,MAAM,UAAU,GAAG,YAAY,CAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,YAAY,GAAG,MAAM,gBAAgB,CAAC,UAAU,EAAE;YACtD,OAAO,EAAE,QAAQ,CAAC,OAAO;YACzB,QAAQ,EACN,oEAAoE;SACvE,CAAC,CAAC;QACH,IAAI,YAAY,CAAC,MAAM,IAAI,EAAE,EAAE,CAAC;YAC9B,OAAO,KAAK,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;QACxC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,gCAAgC;AAC7C,4DAA4D;AAC5D,QAA+B;IAE/B,MAAM,UAAU,GAAG,YAAY,CAAC;QAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,KAAK,EAAE,QAAQ,CAAC,KAAK;KACtB,CAAC,CAAC;IAEH,IAAI,CAAC;QACH,MAAM,oBAAoB,GAAG;YAC3B,gBAAgB,CAAC,UAAU,EAAE;gBAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ,EACN,oEAAoE;aACvE,CAAC;YACF,gBAAgB,CAAC,UAAU,EAAE;gBAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ;gBACN,gKAAgK;gBAChK,oEAAoE;aACvE,CAAC;YACF,gBAAgB,CAAC,UAAU,EAAE;gBAC3B,OAAO,EAAE,QAAQ,CAAC,OAAO;gBACzB,QAAQ;gBACN,wJAAwJ;gBACxJ,oEAAoE;aACvE,CAAC;SACH,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;QAC9D,MAAM,YAAY,GAAG,aAAa,CAAC,IAAI,CACrC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,KAAK,YAAY,CACtC,CAAC;QAEF,OAAO,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC;IACrE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,qBAAqB,GAAG;IAC5B,IAAI,EAAE,UAAU;IAChB,IAAI,EAAE,gBAAgB;IACtB,MAAM,EAAE,EAAE;IACV,OAAO,EAAE;QACP;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,EAAE;YACR,YAAY,EAAE,SAAS;SACxB;KACF;IACD,eAAe,EAAE,MAAM;CACf,CAAC;AAEX,KAAK,UAAU,iCAAiC;AAC9C,4DAA4D;AAC5D,QAA+B;IAE/B,IAAI,CAAC;QACH,OAAO,MAAM,YAAY,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,qBAAqB,EAAE,CAAC,CAAC;IACzE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
package/dist/esm/version.js
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export const version = "5.102.
|
1
|
+
export const version = "5.102.5";
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/dist/types/version.d.ts
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "5.102.
|
1
|
+
export declare const version = "5.102.5";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "thirdweb",
|
3
|
-
"version": "5.102.
|
3
|
+
"version": "5.102.5",
|
4
4
|
"repository": {
|
5
5
|
"type": "git",
|
6
6
|
"url": "git+https://github.com/thirdweb-dev/js.git#main"
|
@@ -251,8 +251,8 @@
|
|
251
251
|
"uqr": "0.1.2",
|
252
252
|
"viem": "2.28.1",
|
253
253
|
"zod": "3.25.24",
|
254
|
-
"@thirdweb-dev/
|
255
|
-
"@thirdweb-dev/
|
254
|
+
"@thirdweb-dev/insight": "1.0.2",
|
255
|
+
"@thirdweb-dev/engine": "3.0.3"
|
256
256
|
},
|
257
257
|
"peerDependencies": {
|
258
258
|
"@aws-sdk/client-lambda": "^3",
|
@@ -0,0 +1,52 @@
|
|
1
|
+
import type { EIP1193RequestFn, EIP1474Methods } from "viem";
|
2
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
3
|
+
import { ANVIL_CHAIN } from "../../../test/src/chains.js";
|
4
|
+
import { TEST_CLIENT } from "../../../test/src/test-clients.js";
|
5
|
+
import { getBytecode } from "../../contract/actions/get-bytecode.js";
|
6
|
+
import { eth_getStorageAt } from "../../rpc/actions/eth_getStorageAt.js";
|
7
|
+
import { getRpcClient } from "../../rpc/rpc.js";
|
8
|
+
import { resolveImplementation } from "./resolveImplementation.js";
|
9
|
+
|
10
|
+
// Mock dependencies
|
11
|
+
vi.mock("../../contract/actions/get-bytecode.js");
|
12
|
+
vi.mock("../../rpc/rpc.js");
|
13
|
+
vi.mock("../../rpc/actions/eth_getStorageAt.js");
|
14
|
+
|
15
|
+
describe.runIf(process.env.TW_SECRET_KEY)(
|
16
|
+
"Handle beacon proxy pattern",
|
17
|
+
async () => {
|
18
|
+
beforeEach(() => {
|
19
|
+
vi.resetAllMocks();
|
20
|
+
});
|
21
|
+
it("should handle beacon proxy pattern with short storage values", async () => {
|
22
|
+
// This test verifies that the implementation can handle short storage values
|
23
|
+
// which was the original issue we were trying to fix
|
24
|
+
const mockContract = {
|
25
|
+
address: "0x0000000000000000000000000000000000000001",
|
26
|
+
client: TEST_CLIENT,
|
27
|
+
chain: ANVIL_CHAIN,
|
28
|
+
} as const;
|
29
|
+
|
30
|
+
// Mock getBytecode to return a minimal proxy bytecode that will trigger the beacon check
|
31
|
+
const mockGetBytecode = vi
|
32
|
+
.fn()
|
33
|
+
.mockResolvedValueOnce("") // First call for proxy (empty bytecode triggers beacon check)
|
34
|
+
.mockResolvedValueOnce("0x1234"); // Second call for implementation
|
35
|
+
|
36
|
+
vi.mocked(getBytecode).mockImplementation(mockGetBytecode);
|
37
|
+
|
38
|
+
// Mock eth_getStorageAt to return a short value
|
39
|
+
const mockRpcRequest = { request: vi.fn() };
|
40
|
+
vi.mocked(getRpcClient).mockReturnValue(
|
41
|
+
mockRpcRequest as unknown as EIP1193RequestFn<EIP1474Methods>,
|
42
|
+
);
|
43
|
+
vi.mocked(eth_getStorageAt).mockResolvedValue("0x1234"); // Short storage value
|
44
|
+
|
45
|
+
const result = await resolveImplementation(mockContract);
|
46
|
+
|
47
|
+
// Should not throw and should return some result (even if it's the original address)
|
48
|
+
expect(result).toBeDefined();
|
49
|
+
expect(result.address).toBeDefined();
|
50
|
+
});
|
51
|
+
},
|
52
|
+
);
|
@@ -110,7 +110,10 @@ async function getBeaconFromStorageSlot(
|
|
110
110
|
position:
|
111
111
|
"0xa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d50",
|
112
112
|
});
|
113
|
-
|
113
|
+
if (proxyStorage.length >= 40) {
|
114
|
+
return `0x${proxyStorage.slice(-40)}`;
|
115
|
+
}
|
116
|
+
return undefined;
|
114
117
|
} catch {
|
115
118
|
return undefined;
|
116
119
|
}
|
package/src/version.ts
CHANGED
@@ -1 +1 @@
|
|
1
|
-
export const version = "5.102.
|
1
|
+
export const version = "5.102.5";
|