@diamondslab/diamonds 1.1.2 → 1.2.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.
@@ -1,10 +1,8 @@
1
- import { DeployedDiamondData, DeployConfig, FacetsConfig } from "../schemas";
2
- import { CallbackManager } from "./CallbackManager";
3
- import { JsonRpcProvider, Provider } from "@ethersproject/providers";
4
- import { Signer } from "ethers";
5
- import { DeploymentRepository } from "../repositories/DeploymentRepository";
6
- import { DiamondConfig, FunctionSelectorRegistryEntry, NewDeployedFacets, NewDeployedFacet } from "../types";
7
- import { HardhatEthersProvider } from "@nomicfoundation/hardhat-ethers/internal/hardhat-ethers-provider";
1
+ import { Signer } from 'ethers';
2
+ import { DeploymentRepository } from '../repositories/DeploymentRepository';
3
+ import { DeployConfig, DeployedDiamondData, FacetsConfig } from '../schemas';
4
+ import { DiamondConfig, FunctionSelectorRegistryEntry, NewDeployedFacet, NewDeployedFacets, SupportedProvider } from '../types';
5
+ import { CallbackManager } from './CallbackManager';
8
6
  export declare class Diamond {
9
7
  private static instances;
10
8
  diamondName: string;
@@ -22,14 +20,14 @@ export declare class Diamond {
22
20
  private facetsConfig;
23
21
  private repository;
24
22
  signer: Signer | undefined;
25
- provider: JsonRpcProvider | Provider | HardhatEthersProvider | undefined;
23
+ provider: SupportedProvider | undefined;
26
24
  deployConfig: DeployConfig;
27
25
  newDeployment: boolean;
28
26
  initAddress: string | undefined;
29
27
  constructor(config: DiamondConfig, repository: DeploymentRepository);
30
28
  functionSelectorRegistry: Map<string, FunctionSelectorRegistryEntry>;
31
29
  private _initializeFunctionSelectorRegistry;
32
- registerFunctionSelectors(selectors: Record<string, Omit<FunctionSelectorRegistryEntry, "selector">>): void;
30
+ registerFunctionSelectors(selectors: Record<string, Omit<FunctionSelectorRegistryEntry, 'selector'>>): void;
33
31
  updateFunctionSelectorRegistry(selector: string, entry: FunctionSelectorRegistryEntry): void;
34
32
  isFunctionSelectorRegistered(selector: string): boolean;
35
33
  newDeployedFacets: NewDeployedFacets;
@@ -41,8 +39,8 @@ export declare class Diamond {
41
39
  getDiamondConfig(): DiamondConfig;
42
40
  getDeployConfig(): DeployConfig;
43
41
  getFacetsConfig(): FacetsConfig;
44
- setProvider(provider: JsonRpcProvider | Provider | HardhatEthersProvider): void;
45
- getProvider(): JsonRpcProvider | Provider | HardhatEthersProvider | undefined;
42
+ setProvider(provider: SupportedProvider): void;
43
+ getProvider(): SupportedProvider | undefined;
46
44
  setSigner(signer: Signer): void;
47
45
  getSigner(): Signer | undefined;
48
46
  isUpgradeDeployment(): boolean;
@@ -1 +1 @@
1
- {"version":3,"file":"Diamond.d.ts","sourceRoot":"","sources":["../../src/core/Diamond.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Diamond.d.ts","sourceRoot":"","sources":["../../src/core/Diamond.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EACL,YAAY,EACZ,mBAAmB,EAEnB,YAAY,EACb,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,aAAa,EACb,6BAA6B,EAC7B,gBAAgB,EAChB,iBAAiB,EAEjB,iBAAiB,EAClB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,qBAAa,OAAO;IACnB,OAAO,CAAC,MAAM,CAAC,SAAS,CAAmC;IAEpD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,EAAE,CAAM;IAC9B,eAAe,EAAE,eAAe,CAAC;IACxC,OAAO,CAAC,mBAAmB,CAAsB;IACjD,OAAO,CAAC,MAAM,CAAgB;IAC9B,OAAO,CAAC,YAAY,CAAe;IACnC,OAAO,CAAC,UAAU,CAAuB;IAClC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,QAAQ,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACxC,YAAY,EAAE,YAAY,CAAC;IAC3B,aAAa,EAAE,OAAO,CAAQ;IAC9B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;gBAE3B,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,oBAAoB;IAoC5D,wBAAwB,6CAAoD;IAEnF,OAAO,CAAC,mCAAmC;IA0BpC,yBAAyB,CAC/B,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,6BAA6B,EAAE,UAAU,CAAC,CAAC,GACxE,IAAI;IAMA,8BAA8B,CACpC,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,6BAA6B,GAClC,IAAI;IAIA,4BAA4B,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAIvD,iBAAiB,EAAE,iBAAiB,CAAM;IAE1C,oBAAoB,IAAI,iBAAiB;IAIzC,uBAAuB,CAAC,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,GAAG,IAAI;IAKhF,sBAAsB,IAAI,mBAAmB;IAI7C,sBAAsB,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAIvD,yBAAyB,CAAC,IAAI,EAAE,mBAAmB,GAAG,IAAI;IAKnD,gBAAgB,IAAI,aAAa;IAIjC,eAAe,IAAI,YAAY;IAI/B,eAAe,IAAI,YAAY;IAI/B,WAAW,CAAC,QAAQ,EAAE,iBAAiB,GAAG,IAAI;IAI9C,WAAW,IAAI,iBAAiB,GAAG,SAAS;IAI5C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI;IAI/B,SAAS,IAAI,MAAM,GAAG,SAAS;IAI/B,mBAAmB,IAAI,OAAO;IAI9B,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAErD,oBAAoB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,IAAI;IAInE,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI;IAGzC,cAAc,IAAI,MAAM,GAAG,SAAS;IAIpC,iBAAiB,IAAI,MAAM;IAI3B,qBAAqB,IAAI,MAAM;IAI/B,qBAAqB,IAAI,MAAM;CAGtC;AAED,eAAe,OAAO,CAAC"}
@@ -2,8 +2,8 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.Diamond = void 0;
4
4
  const path_1 = require("path");
5
- const CallbackManager_1 = require("./CallbackManager");
6
5
  const types_1 = require("../types");
6
+ const CallbackManager_1 = require("./CallbackManager");
7
7
  class Diamond {
8
8
  static instances = new Map();
9
9
  diamondName;
@@ -28,11 +28,11 @@ class Diamond {
28
28
  constructor(config, repository) {
29
29
  this.config = config;
30
30
  this.diamondName = config.diamondName;
31
- this.networkName = config.networkName || "hardhat";
32
- this.chainId = config.chainId || 31337;
33
- this.deploymentsPath = config.deploymentsPath || "diamonds";
34
- this.contractsPath = config.contractsPath || "contracts";
35
- this.diamondAbiFileName = config.diamondAbiFileName || config.diamondName;
31
+ this.networkName = config.networkName ?? 'hardhat';
32
+ this.chainId = config.chainId ?? 31337;
33
+ this.deploymentsPath = config.deploymentsPath ?? 'diamonds';
34
+ this.contractsPath = config.contractsPath ?? 'contracts';
35
+ this.diamondAbiFileName = config.diamondAbiFileName ?? config.diamondName;
36
36
  // Set diamond ABI path - default to diamond-abi subdirectory of configFilePath directory
37
37
  if (config.diamondAbiPath) {
38
38
  this.diamondAbiPath = config.diamondAbiPath;
@@ -56,13 +56,18 @@ class Diamond {
56
56
  _initializeFunctionSelectorRegistry(diamond) {
57
57
  const diamondConfig = diamond.getDiamondConfig();
58
58
  const deployedDiamondData = diamond.getDeployedDiamondData();
59
- const deployedFacets = deployedDiamondData.DeployedFacets || {};
60
- for (const [facetName, { address: contractAddress, funcSelectors: selectors }] of Object.entries(deployedFacets)) {
59
+ const deployedFacets = deployedDiamondData.DeployedFacets ?? {};
60
+ for (const [facetName, { address: contractAddress, funcSelectors: selectors },] of Object.entries(deployedFacets)) {
61
61
  console.log(facetName);
62
+ if (!selectors || !contractAddress) {
63
+ continue;
64
+ }
62
65
  for (const selector of selectors) {
66
+ const facetConfig = this.facetsConfig[facetName];
67
+ const priority = facetConfig?.priority ?? 1000;
63
68
  this.functionSelectorRegistry.set(selector, {
64
69
  facetName,
65
- priority: this.facetsConfig[facetName]?.priority || 1000,
70
+ priority,
66
71
  address: contractAddress,
67
72
  action: types_1.RegistryFacetCutAction.Deployed,
68
73
  });
@@ -82,9 +87,10 @@ class Diamond {
82
87
  }
83
88
  newDeployedFacets = {};
84
89
  getNewDeployedFacets() {
85
- return this.newDeployedFacets || {};
90
+ return this.newDeployedFacets ?? {};
86
91
  }
87
92
  updateNewDeployedFacets(facetName, facet) {
93
+ this.newDeployedFacets = this.newDeployedFacets ?? {};
88
94
  this.newDeployedFacets[facetName] = facet;
89
95
  }
90
96
  getDeployedDiamondData() {
@@ -1 +1 @@
1
- {"version":3,"file":"Diamond.js","sourceRoot":"","sources":["../../src/core/Diamond.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Diamond.js","sourceRoot":"","sources":["../../src/core/Diamond.ts"],"names":[],"mappings":"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"}
@@ -1 +1,2 @@
1
+ export {};
1
2
  //# sourceMappingURL=DBDeploymentRepository.d.ts.map
@@ -4,6 +4,7 @@
4
4
  // saveDeploymentInfo,
5
5
  // getDeployConfigData
6
6
  // } from './databaseHandler';
7
+ Object.defineProperty(exports, "__esModule", { value: true });
7
8
  // import { DeploymentRepository } from './DeploymentRepository';
8
9
  // import { DeployedDiamondData, DeployConfig } from '../schemas';
9
10
  // export class DbDeploymentRepository implements DeploymentRepository {
@@ -1 +1 @@
1
- {"version":3,"file":"DBDeploymentRepository.js","sourceRoot":"","sources":["../../src/repositories/DBDeploymentRepository.ts"],"names":[],"mappings":";AAAA,WAAW;AACX,6BAA6B;AAC7B,wBAAwB;AACxB,wBAAwB;AACxB,8BAA8B;AAE9B,iEAAiE;AACjE,kEAAkE;AAElE,wEAAwE;AACxE,oGAAoG;AACpG,sEAAsE;AACtE,MAAM;AAEN,gHAAgH;AAChH,gEAAgE;AAChE,MAAM;AAEN,gFAAgF;AAChF,uDAAuD;AACvD,MAAM;AACN,IAAI"}
1
+ {"version":3,"file":"DBDeploymentRepository.js","sourceRoot":"","sources":["../../src/repositories/DBDeploymentRepository.ts"],"names":[],"mappings":";AAAA,WAAW;AACX,6BAA6B;AAC7B,wBAAwB;AACxB,wBAAwB;AACxB,8BAA8B;;AAE9B,iEAAiE;AACjE,kEAAkE;AAElE,wEAAwE;AACxE,oGAAoG;AACpG,sEAAsE;AACtE,MAAM;AAEN,gHAAgH;AAChH,gEAAgE;AAChE,MAAM;AAEN,gFAAgF;AAChF,uDAAuD;AACvD,MAAM;AACN,IAAI"}
@@ -1 +1,2 @@
1
+ export {};
1
2
  //# sourceMappingURL=databaseHandler.d.ts.map
@@ -1,5 +1,6 @@
1
1
  "use strict";
2
2
  // import { DeployedDiamondData, DeployConfig } from "../schemas";
3
+ Object.defineProperty(exports, "__esModule", { value: true });
3
4
  // // This would internally use your chosen DB driver (e.g. pg, Prisma, TypeORM)
4
5
  // export async function readDeployedDiamondData(network: string, diamond: string): Promise<DeployedDiamondData> {
5
6
  // // SQL or ORM call here
@@ -1 +1 @@
1
- {"version":3,"file":"databaseHandler.js","sourceRoot":"","sources":["../../src/repositories/databaseHandler.ts"],"names":[],"mappings":";AAAA,kEAAkE;AAElE,gFAAgF;AAChF,kHAAkH;AAClH,4BAA4B;AAC5B,IAAI;AAEJ,yHAAyH;AACzH,yBAAyB;AACzB,IAAI;AAEJ,wFAAwF;AACxF,wBAAwB;AACxB,IAAI"}
1
+ {"version":3,"file":"databaseHandler.js","sourceRoot":"","sources":["../../src/repositories/databaseHandler.ts"],"names":[],"mappings":";AAAA,kEAAkE;;AAElE,gFAAgF;AAChF,kHAAkH;AAClH,4BAA4B;AAC5B,IAAI;AAEJ,yHAAyH;AACzH,yBAAyB;AACzB,IAAI;AAEJ,wFAAwF;AACxF,wBAAwB;AACxB,IAAI"}
@@ -1 +1,2 @@
1
+ export {};
1
2
  //# sourceMappingURL=prismaDBHandler.d.ts.map
@@ -2,6 +2,7 @@
2
2
  // // databaseHandler.ts (Prisma example)
3
3
  // import { prisma } from './prisma';
4
4
  // import { DeployedDiamondData, DeployConfig } from '../schemas';
5
+ Object.defineProperty(exports, "__esModule", { value: true });
5
6
  // export async function readDeployedDiamondData(network: string, diamond: string): Promise<DeployedDiamondData> {
6
7
  // const record = await prisma.deployment.findUnique({
7
8
  // where: { network_diamond: { network, diamond } }
@@ -1 +1 @@
1
- {"version":3,"file":"prismaDBHandler.js","sourceRoot":"","sources":["../../src/repositories/prismaDBHandler.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,qCAAqC;AACrC,kEAAkE;AAElE,kHAAkH;AAClH,wDAAwD;AACxD,uDAAuD;AACvD,QAAQ;AACR,gDAAgD;AAChD,IAAI"}
1
+ {"version":3,"file":"prismaDBHandler.js","sourceRoot":"","sources":["../../src/repositories/prismaDBHandler.ts"],"names":[],"mappings":";AAAA,yCAAyC;AACzC,qCAAqC;AACrC,kEAAkE;;AAElE,kHAAkH;AAClH,wDAAwD;AACxD,uDAAuD;AACvD,QAAQ;AACR,gDAAgD;AAChD,IAAI"}
@@ -1,3 +1,12 @@
1
+ import { JsonRpcProvider } from "ethers";
2
+ /**
3
+ * Supported provider types for diamond deployments
4
+ * This union type handles different provider implementations used across the ecosystem
5
+ *
6
+ * Note: We use `any` for HardhatEthersProvider to avoid module resolution issues in monorepo
7
+ * setups where multiple packages may have different versions of @nomicfoundation/hardhat-ethers
8
+ */
9
+ export type SupportedProvider = JsonRpcProvider | any;
1
10
  export interface DiamondPathsConfig {
2
11
  deploymentsPath?: string;
3
12
  contractsPath?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,2BAA2B,CAAC,EAAE,MAAM,CAAA;IACpC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,aAAc,SAAQ,kBAAkB;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAqB,SAAQ,aAAa;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CACzC"}
1
+ {"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,QAAQ,CAAC;AAEzC;;;;;;GAMG;AAEH,MAAM,MAAM,iBAAiB,GAAG,eAAe,GAAG,GAAG,CAAC;AAEtD,MAAM,WAAW,kBAAkB;IACjC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,2BAA2B,CAAC,EAAE,MAAM,CAAA;IACpC,wBAAwB,CAAC,EAAE,OAAO,CAAC;IACnC,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,aAAc,SAAQ,kBAAkB;IACvD,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1B,kBAAkB,CAAC,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,oBAAqB,SAAQ,aAAa;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;CACzC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@diamondslab/diamonds",
3
- "version": "1.1.2",
3
+ "version": "1.2.0",
4
4
  "description": "Tools for deploying and interfacing with ERC-2535 Diamond Proxies",
5
5
  "repository": "github:diamondslab/diamonds",
6
6
  "main": "dist/index.js",