@diamondslab/diamonds 1.3.2 → 1.4.1

package/dist/utils/common.d.ts

@@ -1,6 +1,6 @@
 import "@nomicfoundation/hardhat-ethers";
 import { Interface } from "ethers";
-import { CreateProposalRequest } from "@openzeppelin/defender-sdk-proposal-client";
+import type { CreateProposalRequest } from "@openzeppelin/defender-sdk-proposal-client";
 import { DeployedDiamondData } from "../schemas";
 declare global {
     export var debuglog: debug.Debugger;

package/dist/utils/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"AACA,OAAO,iCAAiC,CAAC;AAEzC,OAAO,EAAsB,SAAS,EAAoD,MAAM,QAAQ,CAAC;AACzG,OAAO,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAGnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,CAAC,MAAM,CAAC;IACb,MAAM,CAAC,IAAI,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;CACrC;AAKD,eAAO,MAAM,QAAQ,0BAAkB,CAAC;AAExC,eAAO,MAAM,IAAI,GAAI,OAAO,MAAM,GAAG,MAAM,GAAG,MAAM,WAAkB,CAAC;AACvE,eAAO,MAAM,aAAa,QAAU,CAAC;AACrC,eAAO,MAAM,aAAa,QAAmB,CAAC;AAE9C,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;CAC3C;AAED,wBAAgB,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAGxF;AAED,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,mBAAmB,GAAG,SAAS,EAAE,CAazF"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"AACA,OAAO,iCAAiC,CAAC;AAEzC,OAAO,EAAsB,SAAS,EAAoD,MAAM,QAAQ,CAAC;AACzG,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4CAA4C,CAAC;AAGxF,OAAO,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,CAAC,MAAM,CAAC;IACb,MAAM,CAAC,IAAI,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC;CACrC;AAKD,eAAO,MAAM,QAAQ,0BAAkB,CAAC;AAExC,eAAO,MAAM,IAAI,GAAI,OAAO,MAAM,GAAG,MAAM,GAAG,MAAM,WAAkB,CAAC;AACvE,eAAO,MAAM,aAAa,QAAU,CAAC;AACrC,eAAO,MAAM,aAAa,QAAmB,CAAC;AAE9C,wBAAgB,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,UAAU,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,MAAM,WAAW,gBAAgB;IAC/B,GAAG,EAAE,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,EAAE,qBAAqB,CAAC,SAAS,CAAC,CAAC;CAC3C;AAED,wBAAgB,MAAM,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAGxF;AAED,wBAAgB,0BAA0B,CAAC,YAAY,EAAE,mBAAmB,GAAG,SAAS,EAAE,CAazF"}

package/dist/utils/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":";;;;;;AAsBA,sBAEC;AAED,gCAEC;AAOD,wBAGC;AAED,gEAaC;AArDD,sDAA0B;AAC1B,2CAAyC;AACzC,iCAA8B;AAC9B,mCAAyG;AAUzG,MAAM,CAAC,QAAQ,GAAG,IAAA,aAAK,EAAC,cAAc,CAAC,CAAC;AACxC,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;AAEjB,QAAA,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;AAEjC,MAAM,IAAI,GAAG,CAAC,KAA+B,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAA1D,QAAA,IAAI,QAAsD;AAC1D,QAAA,aAAa,GAAG,IAAA,YAAI,EAAC,CAAC,CAAC,CAAC;AACxB,QAAA,aAAa,GAAG,IAAA,YAAI,EAAC,UAAU,CAAC,CAAC;AAE9C,SAAgB,KAAK,CAAC,KAAsB;IAC1C,OAAO,iBAAG,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,SAAgB,UAAU,CAAC,OAAe;IACxC,OAAO,IAAI,kBAAS,CAAC,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC;AACnG,CAAC;AAOD,SAAgB,MAAM,CAAC,WAAmB,EAAE,WAAmB,EAAE,OAAe;IAC9E,MAAM,GAAG,GAAG,GAAG,WAAW,CAAC,WAAW,EAAE,IAAI,WAAW,IAAI,OAAO,EAAE,CAAC;IACrE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAiC;IAC1E,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,CAAC;QACvE,IAAI,CAAC;YACH,MAAM,QAAQ,GAAa,iBAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACrE,UAAU,CAAC,IAAI,CAAC,IAAI,kBAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,wCAAwC,SAAS,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import hre from 'hardhat';\nimport \"@nomicfoundation/hardhat-ethers\";\nimport { debug } from 'debug';\nimport { TransactionReceipt, Interface, Fragment, ContractInterface, ContractTransaction } from \"ethers\";\nimport { CreateProposalRequest } from \"@openzeppelin/defender-sdk-proposal-client\";\nimport chalk from 'chalk';\nimport { Artifact } from \"hardhat/types\";\nimport { DeployedDiamondData } from \"../schemas\";\n\ndeclare global {\n  export var debuglog: debug.Debugger;\n}\n\nglobal.debuglog = debug('UnitTest:log');\nglobal.debuglog.color = '158';\n\nexport const debuglog = global.debuglog;\n\nexport const toBN = (value: string | number | bigint) => BigInt(value);\nexport const GNUS_TOKEN_ID = toBN(0);\nexport const XMPL_TOKEN_ID = toBN(1234567890);\n\nexport function toWei(value: number | string): bigint {\n  return hre.ethers.parseEther(value.toString());\n}\n\nexport function getSighash(funcSig: string): string {\n  return new Interface([`function ${funcSig}`]).getFunction(funcSig.split('(')[0])?.selector || '';\n}\n\nexport interface IDefenderViaInfo {\n  via: CreateProposalRequest['via'],\n  viaType: CreateProposalRequest['viaType'];\n}\n\nexport function cutKey(diamondName: string, networkName: string, chainId: string): string {\n  const key = `${diamondName.toLowerCase()}-${networkName}-${chainId}`;\n  return key;\n}\n\nexport function getDeployedFacetInterfaces(deployedInfo: DeployedDiamondData): Interface[] {\n  const interfaces: Interface[] = [];\n\n  for (const facetName of Object.keys(deployedInfo.DeployedFacets || {})) {\n    try {\n      const artifact: Artifact = hre.artifacts.readArtifactSync(facetName);\n      interfaces.push(new Interface(artifact.abi));\n    } catch (err) {\n      console.warn(`⚠️ Could not load artifact for facet ${facetName}:`, (err as Error).message);\n    }\n  }\n\n  return interfaces;\n}\n"]}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":";;;;;;AAsBA,sBAEC;AAED,gCAEC;AAOD,wBAGC;AAED,gEAaC;AArDD,sDAA0B;AAC1B,2CAAyC;AACzC,iCAA8B;AAC9B,mCAAyG;AAUzG,MAAM,CAAC,QAAQ,GAAG,IAAA,aAAK,EAAC,cAAc,CAAC,CAAC;AACxC,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC;AAEjB,QAAA,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;AAEjC,MAAM,IAAI,GAAG,CAAC,KAA+B,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;AAA1D,QAAA,IAAI,QAAsD;AAC1D,QAAA,aAAa,GAAG,IAAA,YAAI,EAAC,CAAC,CAAC,CAAC;AACxB,QAAA,aAAa,GAAG,IAAA,YAAI,EAAC,UAAU,CAAC,CAAC;AAE9C,SAAgB,KAAK,CAAC,KAAsB;IAC1C,OAAO,iBAAG,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,SAAgB,UAAU,CAAC,OAAe;IACxC,OAAO,IAAI,kBAAS,CAAC,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,QAAQ,IAAI,EAAE,CAAC;AACnG,CAAC;AAOD,SAAgB,MAAM,CAAC,WAAmB,EAAE,WAAmB,EAAE,OAAe;IAC9E,MAAM,GAAG,GAAG,GAAG,WAAW,CAAC,WAAW,EAAE,IAAI,WAAW,IAAI,OAAO,EAAE,CAAC;IACrE,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAgB,0BAA0B,CAAC,YAAiC;IAC1E,MAAM,UAAU,GAAgB,EAAE,CAAC;IAEnC,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,CAAC;QACvE,IAAI,CAAC;YACH,MAAM,QAAQ,GAAa,iBAAG,CAAC,SAAS,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAC;YACrE,UAAU,CAAC,IAAI,CAAC,IAAI,kBAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,wCAAwC,SAAS,GAAG,EAAG,GAAa,CAAC,OAAO,CAAC,CAAC;QAC7F,CAAC;IACH,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC","sourcesContent":["import hre from 'hardhat';\nimport \"@nomicfoundation/hardhat-ethers\";\nimport { debug } from 'debug';\nimport { TransactionReceipt, Interface, Fragment, ContractInterface, ContractTransaction } from \"ethers\";\nimport type { CreateProposalRequest } from \"@openzeppelin/defender-sdk-proposal-client\";\nimport chalk from 'chalk';\nimport { Artifact } from \"hardhat/types\";\nimport { DeployedDiamondData } from \"../schemas\";\n\ndeclare global {\n  export var debuglog: debug.Debugger;\n}\n\nglobal.debuglog = debug('UnitTest:log');\nglobal.debuglog.color = '158';\n\nexport const debuglog = global.debuglog;\n\nexport const toBN = (value: string | number | bigint) => BigInt(value);\nexport const GNUS_TOKEN_ID = toBN(0);\nexport const XMPL_TOKEN_ID = toBN(1234567890);\n\nexport function toWei(value: number | string): bigint {\n  return hre.ethers.parseEther(value.toString());\n}\n\nexport function getSighash(funcSig: string): string {\n  return new Interface([`function ${funcSig}`]).getFunction(funcSig.split('(')[0])?.selector || '';\n}\n\nexport interface IDefenderViaInfo {\n  via: CreateProposalRequest['via'],\n  viaType: CreateProposalRequest['viaType'];\n}\n\nexport function cutKey(diamondName: string, networkName: string, chainId: string): string {\n  const key = `${diamondName.toLowerCase()}-${networkName}-${chainId}`;\n  return key;\n}\n\nexport function getDeployedFacetInterfaces(deployedInfo: DeployedDiamondData): Interface[] {\n  const interfaces: Interface[] = [];\n\n  for (const facetName of Object.keys(deployedInfo.DeployedFacets || {})) {\n    try {\n      const artifact: Artifact = hre.artifacts.readArtifactSync(facetName);\n      interfaces.push(new Interface(artifact.abi));\n    } catch (err) {\n      console.warn(`⚠️ Could not load artifact for facet ${facetName}:`, (err as Error).message);\n    }\n  }\n\n  return interfaces;\n}\n"]}

package/dist/utils/defenderClients.d.ts

@@ -1,5 +1,3 @@
-import { Defender } from '@openzeppelin/defender-sdk';
-import { DeployClient } from '@openzeppelin/defender-sdk-deploy-client';
-export declare const adminClient: Defender | null;
-export declare const deployClient: DeployClient | null;
+declare const adminClient: unknown, deployClient: unknown;
+export { adminClient, deployClient };
 //# sourceMappingURL=defenderClients.d.ts.map

package/dist/utils/defenderClients.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defenderClients.d.ts","sourceRoot":"","sources":["../../src/utils/defenderClients.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,0CAA0C,CAAC;AAWxE,eAAO,MAAM,WAAW,iBAGf,CAAC;AAEV,eAAO,MAAM,YAAY,qBAGhB,CAAC"}
+{"version":3,"file":"defenderClients.d.ts","sourceRoot":"","sources":["../../src/utils/defenderClients.ts"],"names":[],"mappings":"AAwCA,QAAA,MAAQ,WAAW,WAAE,YAAY,SAA4B,CAAC;AAE9D,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC"}

package/dist/utils/defenderClients.js

@@ -1,21 +1,42 @@
 "use strict";
+// src/utils/defenderClients.ts
+//
+// Client singletons for the (deprecated) OpenZeppelin Defender deployment path.
+// This module is re-exported by the package barrel (utils/index), so importing ANY
+// part of @diamondslab/diamonds loads it. It must therefore never crash a consumer
+// that doesn't use Defender:
+//   - the .env load is guarded (a consumer need not have a .env file), and
+//   - the @openzeppelin/defender-sdk packages are lazily required only when Defender
+//     credentials are actually present (they are optional/dev-only, not a hard
+//     runtime dependency of this package).
+// Without credentials the clients are null, exactly as before.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployClient = exports.adminClient = void 0;
-// src/utils/defenderClients.ts
-const defender_sdk_1 = require("@openzeppelin/defender-sdk");
-const defender_sdk_deploy_client_1 = require("@openzeppelin/defender-sdk-deploy-client");
-// Load environment variables from .env file
-process.loadEnvFile('.env');
+// Optional: load environment variables from a local .env if one exists. Never throw.
+try {
+    process.loadEnvFile('.env');
+}
+catch {
+    /* .env is optional — absent in library consumers and CI */
+}
 const { DEFENDER_API_KEY, DEFENDER_API_SECRET } = process.env;
-if (!DEFENDER_API_KEY || !DEFENDER_API_SECRET) {
-    console.warn("Warning: Missing Defender credentials in environment. Some functionality will be limited.");
+function createDefenderClients() {
+    if (!DEFENDER_API_KEY || !DEFENDER_API_SECRET) {
+        console.warn('Warning: Missing Defender credentials in environment. Some functionality will be limited.');
+        return { adminClient: null, deployClient: null };
+    }
+    // Lazily require the deprecated Defender SDK so it is not a hard dependency for
+    // consumers that never use the OZDefender strategy.
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const { Defender } = require('@openzeppelin/defender-sdk');
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const { DeployClient } = require('@openzeppelin/defender-sdk-deploy-client');
+    return {
+        adminClient: new Defender({ apiKey: DEFENDER_API_KEY, apiSecret: DEFENDER_API_SECRET }),
+        deployClient: new DeployClient({ apiKey: DEFENDER_API_KEY, apiSecret: DEFENDER_API_SECRET }),
+    };
 }
-exports.adminClient = DEFENDER_API_KEY && DEFENDER_API_SECRET ? new defender_sdk_1.Defender({
-    apiKey: DEFENDER_API_KEY,
-    apiSecret: DEFENDER_API_SECRET,
-}) : null;
-exports.deployClient = DEFENDER_API_KEY && DEFENDER_API_SECRET ? new defender_sdk_deploy_client_1.DeployClient({
-    apiKey: DEFENDER_API_KEY,
-    apiSecret: DEFENDER_API_SECRET,
-}) : null;
+const { adminClient, deployClient } = createDefenderClients();
+exports.adminClient = adminClient;
+exports.deployClient = deployClient;
 //# sourceMappingURL=defenderClients.js.map

package/dist/utils/defenderClients.js.map

@@ -1 +1 @@
-{"version":3,"file":"defenderClients.js","sourceRoot":"","sources":["../../src/utils/defenderClients.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,6DAAsD;AACtD,yFAAwE;AAExE,4CAA4C;AAC5C,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;AAE5B,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE9D,IAAI,CAAC,gBAAgB,IAAI,CAAC,mBAAmB,EAAE,CAAC;IAC9C,OAAO,CAAC,IAAI,CAAC,2FAA2F,CAAC,CAAC;AAC5G,CAAC;AAEY,QAAA,WAAW,GAAG,gBAAgB,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAI,uBAAQ,CAAC;IAChF,MAAM,EAAE,gBAAgB;IACxB,SAAS,EAAE,mBAAmB;CAC/B,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAEG,QAAA,YAAY,GAAG,gBAAgB,IAAI,mBAAmB,CAAC,CAAC,CAAC,IAAI,yCAAY,CAAC;IACrF,MAAM,EAAE,gBAAgB;IACxB,SAAS,EAAE,mBAAmB;CAC/B,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC","sourcesContent":["// src/utils/defenderClients.ts\nimport { Defender } from '@openzeppelin/defender-sdk';\nimport { DeployClient } from '@openzeppelin/defender-sdk-deploy-client';\n\n// Load environment variables from .env file\nprocess.loadEnvFile('.env');\n\nconst { DEFENDER_API_KEY, DEFENDER_API_SECRET } = process.env;\n\nif (!DEFENDER_API_KEY || !DEFENDER_API_SECRET) {\n  console.warn(\"Warning: Missing Defender credentials in environment. Some functionality will be limited.\");\n}\n\nexport const adminClient = DEFENDER_API_KEY && DEFENDER_API_SECRET ? new Defender({\n  apiKey: DEFENDER_API_KEY,\n  apiSecret: DEFENDER_API_SECRET,\n}) : null;\n\nexport const deployClient = DEFENDER_API_KEY && DEFENDER_API_SECRET ? new DeployClient({\n  apiKey: DEFENDER_API_KEY,\n  apiSecret: DEFENDER_API_SECRET,\n}) : null;"]}
+{"version":3,"file":"defenderClients.js","sourceRoot":"","sources":["../../src/utils/defenderClients.ts"],"names":[],"mappings":";AAAA,+BAA+B;AAC/B,EAAE;AACF,gFAAgF;AAChF,mFAAmF;AACnF,mFAAmF;AACnF,6BAA6B;AAC7B,2EAA2E;AAC3E,qFAAqF;AACrF,+EAA+E;AAC/E,2CAA2C;AAC3C,+DAA+D;;;AAE/D,qFAAqF;AACrF,IAAI,CAAC;IACH,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;AAC9B,CAAC;AAAC,MAAM,CAAC;IACP,2DAA2D;AAC7D,CAAC;AAED,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;AAE9D,SAAS,qBAAqB;IAC5B,IAAI,CAAC,gBAAgB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9C,OAAO,CAAC,IAAI,CACV,2FAA2F,CAC5F,CAAC;QACF,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;IACnD,CAAC;IACD,gFAAgF;IAChF,oDAAoD;IACpD,8DAA8D;IAC9D,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAC3D,8DAA8D;IAC9D,MAAM,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,0CAA0C,CAAC,CAAC;IAC7E,OAAO;QACL,WAAW,EAAE,IAAI,QAAQ,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,mBAAmB,EAAE,CAAC;QACvF,YAAY,EAAE,IAAI,YAAY,CAAC,EAAE,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,mBAAmB,EAAE,CAAC;KAC7F,CAAC;AACJ,CAAC;AAED,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,qBAAqB,EAAE,CAAC;AAErD,kCAAW;AAAE,oCAAY","sourcesContent":["// src/utils/defenderClients.ts\n//\n// Client singletons for the (deprecated) OpenZeppelin Defender deployment path.\n// This module is re-exported by the package barrel (utils/index), so importing ANY\n// part of @diamondslab/diamonds loads it. It must therefore never crash a consumer\n// that doesn't use Defender:\n//   - the .env load is guarded (a consumer need not have a .env file), and\n//   - the @openzeppelin/defender-sdk packages are lazily required only when Defender\n//     credentials are actually present (they are optional/dev-only, not a hard\n//     runtime dependency of this package).\n// Without credentials the clients are null, exactly as before.\n\n// Optional: load environment variables from a local .env if one exists. Never throw.\ntry {\n  process.loadEnvFile('.env');\n} catch {\n  /* .env is optional — absent in library consumers and CI */\n}\n\nconst { DEFENDER_API_KEY, DEFENDER_API_SECRET } = process.env;\n\nfunction createDefenderClients(): { adminClient: unknown; deployClient: unknown } {\n  if (!DEFENDER_API_KEY || !DEFENDER_API_SECRET) {\n    console.warn(\n      'Warning: Missing Defender credentials in environment. Some functionality will be limited.',\n    );\n    return { adminClient: null, deployClient: null };\n  }\n  // Lazily require the deprecated Defender SDK so it is not a hard dependency for\n  // consumers that never use the OZDefender strategy.\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const { Defender } = require('@openzeppelin/defender-sdk');\n  // eslint-disable-next-line @typescript-eslint/no-var-requires\n  const { DeployClient } = require('@openzeppelin/defender-sdk-deploy-client');\n  return {\n    adminClient: new Defender({ apiKey: DEFENDER_API_KEY, apiSecret: DEFENDER_API_SECRET }),\n    deployClient: new DeployClient({ apiKey: DEFENDER_API_KEY, apiSecret: DEFENDER_API_SECRET }),\n  };\n}\n\nconst { adminClient, deployClient } = createDefenderClients();\n\nexport { adminClient, deployClient };\n"]}

package/dist/utils/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/utils/signer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,iCAAiC,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kEAAkE,CAAC;AAEzG;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAIzG;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,iBAK/F;AAED;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAgB1I;AAGD;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAAU,aAAa,MAAM,EAAE,UAAU,eAAe,iBA0BtF,CAAC"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../../src/utils/signer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAiB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,iCAAiC,CAAC;AACzC,OAAO,EAAE,qBAAqB,EAAE,MAAM,kEAAkE,CAAC;AAEzG;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,CAOzG;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,iBAK/F;AAED;;;;;;GAMG;AACH,wBAAsB,wBAAwB,CAAC,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,GAAG,qBAAqB,GAAG,OAAO,CAAC,MAAM,CAAC,CAsB1I;AAGD;;;;;;GAMG;AACH,eAAO,MAAM,kBAAkB,GAAU,aAAa,MAAM,EAAE,UAAU,eAAe,iBA0BtF,CAAC"}

package/dist/utils/signer.js

@@ -9,6 +9,7 @@ exports.setEtherBalance = setEtherBalance;
 exports.impersonateAndFundSigner = impersonateAndFundSigner;
 const hardhat_1 = __importDefault(require("hardhat"));
 const common_1 = require("./common");
+const ethers_1 = require("ethers");
 require("@nomicfoundation/hardhat-ethers");
 /**
  * Impersonates a signer account. This is primarily used in Hardhat's testing environment
@@ -20,7 +21,10 @@ require("@nomicfoundation/hardhat-ethers");
 async function impersonateSigner(signerAddress, provider) {
     // Request Hardhat to impersonate the account at the specified address
     await provider.send("hardhat_impersonateAccount", [signerAddress]);
-    return provider.getSigner(signerAddress); // Return the impersonated signer
+    // Construct the signer directly. ethers v6 `provider.getSigner(addr)` validates the
+    // address against `eth_accounts` and throws "invalid account" for impersonated accounts
+    // (impersonation does NOT add the account to `eth_accounts`).
+    return new ethers_1.JsonRpcSigner(provider, signerAddress); // Return the impersonated signer
 }
 /**
  * Sets the Ether balance for a specified address in the Hardhat testing environment.
@@ -45,7 +49,12 @@ async function setEtherBalance(address, amount, provider) {
 async function impersonateAndFundSigner(deployerAddress, provider) {
     try {
         await provider.send('hardhat_impersonateAccount', [deployerAddress]);
-        const signer = provider.getSigner(deployerAddress);
+        // For an ethers JsonRpcProvider, construct the signer directly: ethers v6
+        // `getSigner(addr)` validates against `eth_accounts` and throws "invalid account"
+        // for impersonated accounts. HardhatEthersProvider has no such issue, so keep its path.
+        const signer = provider instanceof ethers_1.JsonRpcProvider
+            ? new ethers_1.JsonRpcSigner(provider, deployerAddress)
+            : await provider.getSigner(deployerAddress);
         // Fund the account
         await provider.send('hardhat_setBalance', [deployerAddress, '0x56BC75E2D63100000']);
         return signer;

package/dist/utils/signer.js.map

@@ -1 +1 @@
-{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/utils/signer.ts"],"names":[],"mappings":";;;;;;AAaA,8CAIC;AASD,0CAKC;AASD,4DAgBC;AAxDD,sDAA0B;AAC1B,qCAAiC;AAEjC,2CAAyC;AAGzC;;;;;;GAMG;AACI,KAAK,UAAU,iBAAiB,CAAC,aAAqB,EAAE,QAAyB;IACtF,sEAAsE;IACtE,MAAM,QAAQ,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC;IACnE,OAAO,QAAQ,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,iCAAiC;AAC7E,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,eAAe,CAAC,OAAe,EAAE,MAAc,EAAE,QAAyB;IAC9F,MAAM,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE;QACxC,OAAO,EAAE,mCAAmC;QAC5C,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,2CAA2C;KACxE,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,wBAAwB,CAAC,eAAuB,EAAE,QAAiD;IACvH,IAAI,CAAC;QACH,MAAM,QAAQ,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;QACrE,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;QAEnD,mBAAmB;QACnB,MAAM,QAAQ,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,eAAe,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACpF,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,EAAE,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,wCAAwC,eAAe,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;QAC7F,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CAAC,wCAAwC,eAAe,KAAK,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QAC7F,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAGD;;;;;;GAMG;AACI,MAAM,kBAAkB,GAAG,KAAK,EAAE,WAAmB,EAAE,QAAyB,EAAE,EAAE;IACzF,yDAAyD;IACzD,MAAM,QAAQ,GAAG,CAAC,MAAM,iBAAG,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAEpD,qFAAqF;IACrF,MAAM,SAAS,GAAG,MAAM,iBAAG,CAAC,MAAM,CAAC,aAAa,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;IAEtF,6CAA6C;IAC7C,MAAM,eAAe,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,CAAC;IAEhD,4BAA4B;IAC5B,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAEpE,uFAAuF;IACvF,IAAI,eAAe,KAAK,QAAQ,CAAC,OAAO,EAAE,CAAC;QACzC,QAAQ,CAAC,+BAA+B,eAAe,EAAE,CAAC,CAAC;QAE3D,0EAA0E;QAC1E,MAAM,eAAe,CAAC,eAAe,EAAE,IAAA,cAAK,EAAC,EAAE,CAAC,EAAE,QAAQ,CAAC,CAAC;QAE5D,MAAO,SAAiB,CAAC,OAAO,CAAC,MAAM,QAAQ,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACrF,MAAO,SAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IACjF,CAAC;IAED,sCAAsC;IACtC,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AA1BW,QAAA,kBAAkB,sBA0B7B","sourcesContent":["import hre from 'hardhat';\nimport { toWei } from './common';\nimport { JsonRpcProvider, Signer } from 'ethers';\nimport '@nomicfoundation/hardhat-ethers';\nimport { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider';\n\n/**\n * Impersonates a signer account. This is primarily used in Hardhat's testing environment\n * to simulate actions from accounts that are not part of the default test accounts.\n *\n * @param signerAddress - The address of the account to impersonate.\n * @returns The impersonated signer object.\n */\nexport async function impersonateSigner(signerAddress: string, provider: JsonRpcProvider): Promise<Signer> {\n  // Request Hardhat to impersonate the account at the specified address\n  await provider.send(\"hardhat_impersonateAccount\", [signerAddress]);\n  return provider.getSigner(signerAddress); // Return the impersonated signer\n}\n\n/**\n * Sets the Ether balance for a specified address in the Hardhat testing environment.\n * This is useful for ensuring test accounts have sufficient funds for transactions.\n *\n * @param address - The address to set the Ether balance for.\n * @param amount - The desired balance as a `BigNumber`.\n */\nexport async function setEtherBalance(address: string, amount: bigint, provider: JsonRpcProvider) {\n  await provider.send('hardhat_setBalance', [\n    address, // Address to modify the balance of\n    '0x' + amount.toString(16), // Amount to set, formatted as a hex string\n  ]);\n}\n\n/**        \n * Impersonates the deployer account and funds it to a balance that is rounded to the next highest 100 ETH.\n * \n * @param provider - The ethers provider instance.\n * @param deployerAddress - The address of the deployer account.\n * @param balance - The balance to set for the deployer account (in hex format).\n */\nexport async function impersonateAndFundSigner(deployerAddress: string, provider: JsonRpcProvider | HardhatEthersProvider): Promise<Signer> {\n  try {\n    await provider.send('hardhat_impersonateAccount', [deployerAddress]);\n    const signer = provider.getSigner(deployerAddress);\n\n    // Fund the account\n    await provider.send('hardhat_setBalance', [deployerAddress, '0x56BC75E2D63100000']);\n    return signer;\n  } catch (error) {\n    if (error instanceof Error) {\n      console.error(`Impersonation and funding failed for ${deployerAddress}: ${error.message}`);\n    } else {\n      console.error(`Impersonation and funding failed for ${deployerAddress}: ${String(error)}`);\n    }\n    throw error;\n  }\n}\n\n\n/**\n * Updates the owner of the contract at the specified root address for testing purposes.\n * This involves transferring ownership from the current owner to the default signer in the Hardhat environment.\n *\n * @param rootAddress - The address of the root contract (e.g., GeniusOwnershipFacet).\n * @returns The address of the old owner.\n */\nexport const updateOwnerForTest = async (rootAddress: string, provider: JsonRpcProvider) => {\n  // Retrieve the current signer in the Hardhat environment\n  const curOwner = (await hre.ethers.getSigners())[0];\n\n  // Get a reference to the GeniusOwnershipFacet contract at the specified root address\n  const ownership = await hre.ethers.getContractAt('GeniusOwnershipFacet', rootAddress);\n\n  // Retrieve the current owner of the contract\n  const oldOwnerAddress = await ownership.owner();\n\n  // Impersonate the old owner\n  const oldOwner = await impersonateSigner(oldOwnerAddress, provider);\n\n  // If the old owner is not the current signer, transfer ownership to the current signer\n  if (oldOwnerAddress !== curOwner.address) {\n    debuglog(`Transferring ownership from ${oldOwnerAddress}`);\n\n    // Ensure the old owner has enough Ether to perform the ownership transfer\n    await setEtherBalance(oldOwnerAddress, toWei(10), provider);\n\n    await (ownership as any).connect(await oldOwner).transferOwnership(curOwner.address);\n    await (ownership as any).connect(oldOwner).transferOwnership(curOwner.address);\n  }\n\n  // Return the address of the old owner\n  return oldOwnerAddress;\n};\n"]}
+{"version":3,"file":"signer.js","sourceRoot":"","sources":["../../src/utils/signer.ts"],"names":[],"mappings":"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","sourcesContent":["import hre from 'hardhat';\nimport { toWei } from './common';\nimport { JsonRpcProvider, JsonRpcSigner, Signer } from 'ethers';\nimport '@nomicfoundation/hardhat-ethers';\nimport { HardhatEthersProvider } from '@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider';\n\n/**\n * Impersonates a signer account. This is primarily used in Hardhat's testing environment\n * to simulate actions from accounts that are not part of the default test accounts.\n *\n * @param signerAddress - The address of the account to impersonate.\n * @returns The impersonated signer object.\n */\nexport async function impersonateSigner(signerAddress: string, provider: JsonRpcProvider): Promise<Signer> {\n  // Request Hardhat to impersonate the account at the specified address\n  await provider.send(\"hardhat_impersonateAccount\", [signerAddress]);\n  // Construct the signer directly. ethers v6 `provider.getSigner(addr)` validates the\n  // address against `eth_accounts` and throws \"invalid account\" for impersonated accounts\n  // (impersonation does NOT add the account to `eth_accounts`).\n  return new JsonRpcSigner(provider, signerAddress); // Return the impersonated signer\n}\n\n/**\n * Sets the Ether balance for a specified address in the Hardhat testing environment.\n * This is useful for ensuring test accounts have sufficient funds for transactions.\n *\n * @param address - The address to set the Ether balance for.\n * @param amount - The desired balance as a `BigNumber`.\n */\nexport async function setEtherBalance(address: string, amount: bigint, provider: JsonRpcProvider) {\n  await provider.send('hardhat_setBalance', [\n    address, // Address to modify the balance of\n    '0x' + amount.toString(16), // Amount to set, formatted as a hex string\n  ]);\n}\n\n/**        \n * Impersonates the deployer account and funds it to a balance that is rounded to the next highest 100 ETH.\n * \n * @param provider - The ethers provider instance.\n * @param deployerAddress - The address of the deployer account.\n * @param balance - The balance to set for the deployer account (in hex format).\n */\nexport async function impersonateAndFundSigner(deployerAddress: string, provider: JsonRpcProvider | HardhatEthersProvider): Promise<Signer> {\n  try {\n    await provider.send('hardhat_impersonateAccount', [deployerAddress]);\n    // For an ethers JsonRpcProvider, construct the signer directly: ethers v6\n    // `getSigner(addr)` validates against `eth_accounts` and throws \"invalid account\"\n    // for impersonated accounts. HardhatEthersProvider has no such issue, so keep its path.\n    const signer =\n      provider instanceof JsonRpcProvider\n        ? new JsonRpcSigner(provider, deployerAddress)\n        : await provider.getSigner(deployerAddress);\n\n    // Fund the account\n    await provider.send('hardhat_setBalance', [deployerAddress, '0x56BC75E2D63100000']);\n    return signer;\n  } catch (error) {\n    if (error instanceof Error) {\n      console.error(`Impersonation and funding failed for ${deployerAddress}: ${error.message}`);\n    } else {\n      console.error(`Impersonation and funding failed for ${deployerAddress}: ${String(error)}`);\n    }\n    throw error;\n  }\n}\n\n\n/**\n * Updates the owner of the contract at the specified root address for testing purposes.\n * This involves transferring ownership from the current owner to the default signer in the Hardhat environment.\n *\n * @param rootAddress - The address of the root contract (e.g., GeniusOwnershipFacet).\n * @returns The address of the old owner.\n */\nexport const updateOwnerForTest = async (rootAddress: string, provider: JsonRpcProvider) => {\n  // Retrieve the current signer in the Hardhat environment\n  const curOwner = (await hre.ethers.getSigners())[0];\n\n  // Get a reference to the GeniusOwnershipFacet contract at the specified root address\n  const ownership = await hre.ethers.getContractAt('GeniusOwnershipFacet', rootAddress);\n\n  // Retrieve the current owner of the contract\n  const oldOwnerAddress = await ownership.owner();\n\n  // Impersonate the old owner\n  const oldOwner = await impersonateSigner(oldOwnerAddress, provider);\n\n  // If the old owner is not the current signer, transfer ownership to the current signer\n  if (oldOwnerAddress !== curOwner.address) {\n    debuglog(`Transferring ownership from ${oldOwnerAddress}`);\n\n    // Ensure the old owner has enough Ether to perform the ownership transfer\n    await setEtherBalance(oldOwnerAddress, toWei(10), provider);\n\n    await (ownership as any).connect(await oldOwner).transferOwnership(curOwner.address);\n    await (ownership as any).connect(oldOwner).transferOwnership(curOwner.address);\n  }\n\n  // Return the address of the old owner\n  return oldOwnerAddress;\n};\n"]}

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@diamondslab/diamonds",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "description": "Tools for deploying and interfacing with ERC-2535 Diamond Proxies",
   "repository": "github:diamondslab/diamonds",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "module": "dist/index.js",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -29,7 +33,9 @@
     "diamond",
     "diamond-proxy",
     "diamond-upgradeable",
-    "blockchain"
+    "blockchain",
+    "erc-2535",
+    "eip-2535"
   ],
   "bugs": {
     "url": "https://github.com/diamondslab/diamonds/issues"
@@ -40,7 +46,7 @@
     "test:integration": "hardhat test test/integration/**/*.test.ts --config hardhat.config.ts",
     "test:coverage": "hardhat coverage --config hardhat.config.ts",
     "test:performance": "hardhat test test/integration/performance/**/*.test.ts --config hardhat.config.ts",
-    "build": "npx tsc",
+    "build": "rimraf dist tsconfig.tsbuildinfo && tsc",
     "clean": "rimraf artifacts/* cache/* diamond-abi/* typechain-types/* diamond-typechain-types/*",
     "compile": "npx hardhat compile --config hardhat.config.ts && yarn diamond:generate-abi-typechain",
     "clean-compile": "yarn clean && yarn compile",
@@ -124,7 +130,7 @@
     "perf:compare": "bash scripts/devops/devcontainer-performance-benchmark.sh compare"
   },
   "bin": {
-    "diamond-abi": "dist/scripts/diamond-abi-cli.js"
+    "diamond-abi": "dist/cli/diamond-abi-cli.js"
   },
   "files": [
     "dist/",
@@ -134,13 +140,13 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@diamondslab/hardhat-diamonds": "^1.0.0",
+    "@diamondslab/hardhat-diamonds": "^1.2.0",
     "@ethersproject/abi": "^5.8.0",
     "@ethersproject/bytes": "^5.8.0",
     "@ethersproject/providers": "^5.8.0",
     "@gnus.ai/contracts-upgradeable-diamond": "=4.5.0",
     "@nomicfoundation/hardhat-chai-matchers": "^2.0.0",
-    "@nomicfoundation/hardhat-ethers": "*",
+    "@nomicfoundation/hardhat-ethers": "^3.1.2",
     "@nomicfoundation/hardhat-ignition": "^0.15.0",
     "@nomicfoundation/hardhat-ignition-ethers": "^0.15.0",
     "@nomicfoundation/hardhat-network-helpers": "^1.0.0",
@@ -208,8 +214,7 @@
     "web3": "^4.16.0",
     "web3-core": "^4.7.1",
     "web3-utils": "^4.3.3",
-    "winston": "^3.17.0",
-    "zod": "^4.0.2"
+    "winston": "^3.17.0"
   },
   "peerDependencies": {
     "ethers": "^6.0.0",
@@ -223,6 +228,7 @@
     "axios": "^1.12.0",
     "debug": "^4.4.1",
     "fs-extra": "^11.3.0",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "zod": "^4.0.2"
   }
 }