@rocketh/diamond 0.19.6 → 0.19.8

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 (9) hide show
  1. package/dist/index.d.ts.map +1 -1
  2. package/dist/index.js +13 -2
  3. package/dist/index.js.map +1 -1
  4. package/dist/types.d.ts +6 -1
  5. package/dist/types.d.ts.map +1 -1
  6. package/dist/types.js.map +1 -1
  7. package/package.json +3 -3
  8. package/src/index.ts +15 -2
  9. package/src/types.ts +15 -12
package/dist/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAUhF,OAAO,EAAS,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAC,6BAA6B,EAAE,oBAAoB,EAAkC,MAAM,YAAY,CAAC;AAKhH,YAAY,EAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAC,CAAC;AAqBrD,wBAAgB,OAAO,CACtB,GAAG,EAAE,WAAW,GACd,CAAC,IAAI,SAAS,GAAG,EACnB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,6BAA6B,CAAC,IAAI,CAAC,EAC3C,OAAO,EAAE,oBAAoB,KACzB,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAge/B"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAUhF,OAAO,EAAS,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAC,6BAA6B,EAAE,oBAAoB,EAAkC,MAAM,YAAY,CAAC;AAKhH,YAAY,EAAC,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAC,CAAC;AAqBrD,wBAAgB,OAAO,CACtB,GAAG,EAAE,WAAW,GACd,CAAC,IAAI,SAAS,GAAG,EACnB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,6BAA6B,CAAC,IAAI,CAAC,EAC3C,OAAO,EAAE,oBAAoB,KACzB,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CA6e/B"}
package/dist/index.js CHANGED
@@ -36,6 +36,9 @@ export function diamond(env) {
36
36
  // }
37
37
  const { account, ...viemArgs } = params;
38
38
  const deployerAddress = env.resolveAccount(account);
39
+ const alwaysOverride = options && 'alwaysOverride' in options && options.alwaysOverride;
40
+ const strictBytecodeMatch = !alwaysOverride && options && 'strictBytecodeMatch' in options && options.strictBytecodeMatch;
41
+ const skipIfAlreadyDeployed = alwaysOverride ? false : true;
39
42
  // TODO
40
43
  // if (options.diamondContract) {
41
44
  // diamondArtifact = options.diamondContract;
@@ -125,7 +128,13 @@ export function diamond(env) {
125
128
  account: deployerAddress,
126
129
  artifact,
127
130
  args: facetArgs,
128
- }, { libraries, linkedData, deterministic: deterministicFacet });
131
+ }, {
132
+ libraries,
133
+ linkedData,
134
+ deterministic: deterministicFacet,
135
+ alwaysOverride: deterministicFacet ? false : alwaysOverride,
136
+ strictBytecodeMatch,
137
+ });
129
138
  let facetAddress;
130
139
  // TODO updated, check if it is correct, seem to be trigger if linkedData get updated
131
140
  if (implementation.newlyDeployed) {
@@ -362,7 +371,9 @@ export function diamond(env) {
362
371
  args: diamondConstructorArgs,
363
372
  }, {
364
373
  deterministic: options.deterministicSalt,
365
- skipIfAlreadyDeployed: true,
374
+ alwaysOverride,
375
+ strictBytecodeMatch: false,
376
+ skipIfAlreadyDeployed,
366
377
  });
367
378
  await env.save(name, {
368
379
  ...proxy,
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -4,6 +4,11 @@ import type { Artifact, Deployment, DeploymentConstruction, Libraries, Abi, Link
4
4
  import type { ContractFunctionArgs, ContractFunctionName, WriteContractParameters } from 'viem';
5
5
  export type { Artifact, Deployment, DeploymentConstruction, Libraries, Abi, LinkedDataProvided };
6
6
  export type { ContractFunctionArgs, ContractFunctionName, WriteContractParameters };
7
+ type DeployMutuallyExclusiveOptions = {
8
+ alwaysOverride?: boolean;
9
+ } | {
10
+ strictBytecodeMatch?: boolean;
11
+ };
7
12
  export type Facet = {
8
13
  facetAddress: `0x${string}`;
9
14
  functionSelectors: readonly `0x${string}`[];
@@ -30,7 +35,7 @@ export type ExecuteOptions<TAbi extends Abi, TFunctionName extends ContractFunct
30
35
  type: 'artifact';
31
36
  artifact: Artifact<TAbi>;
32
37
  };
33
- export type DiamondDeployOptions<TAbi extends Abi = Abi, TFunctionName extends ContractFunctionName<TAbi, 'nonpayable' | 'payable'> = ContractFunctionName<TAbi, 'nonpayable' | 'payable'>, TArgs extends ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName> = ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName>> = Omit<DeployOptions, 'skipIfAlreadyDeployed' | 'alwaysOverride' | 'deterministic'> & {
38
+ export type DiamondDeployOptions<TAbi extends Abi = Abi, TFunctionName extends ContractFunctionName<TAbi, 'nonpayable' | 'payable'> = ContractFunctionName<TAbi, 'nonpayable' | 'payable'>, TArgs extends ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName> = ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName>> = Omit<DeployOptions, 'skipIfAlreadyDeployed' | 'alwaysOverride' | 'deterministic' | 'strictBytecodeMatch'> & DeployMutuallyExclusiveOptions & {
34
39
  facets: DiamondFacets;
35
40
  owner?: EIP1193Account;
36
41
  execute?: ExecuteOptions<TAbi, TFunctionName, TArgs> | {
package/dist/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AACnD,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,UAAU,CAAC;AAC7C,OAAO,KAAK,EACX,QAAQ,EACR,UAAU,EACV,sBAAsB,EACtB,SAAS,EACT,GAAG,EACH,kBAAkB,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAC,oBAAoB,EAAE,oBAAoB,EAAE,uBAAuB,EAAC,MAAM,MAAM,CAAC;AAE9F,YAAY,EAAC,QAAQ,EAAE,UAAU,EAAE,sBAAsB,EAAE,SAAS,EAAE,GAAG,EAAE,kBAAkB,EAAC,CAAC;AAC/F,YAAY,EAAC,oBAAoB,EAAE,oBAAoB,EAAE,uBAAuB,EAAC,CAAC;AAElF,MAAM,MAAM,KAAK,GAAG;IACnB,YAAY,EAAE,KAAK,MAAM,EAAE,CAAC;IAC5B,iBAAiB,EAAE,SAAS,KAAK,MAAM,EAAE,EAAE,CAAC;CAC5C,CAAC;AAEF,oBAAY,cAAc;IACzB,GAAG,IAAA;IACH,OAAO,IAAA;IACP,MAAM,IAAA;CACN;AAED,MAAM,MAAM,QAAQ,GAAG,KAAK,GAAG;IAC9B,MAAM,EAAE,cAAc,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb,UAAU,CAAC,EAAE,kBAAkB,CAAC;IAChC,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,aAAa,CAAC,EAAE,OAAO,GAAG,KAAK,MAAM,EAAE,CAAC;CACxC,CAAC;AACF,MAAM,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;AAEhD,MAAM,MAAM,aAAa,CACxB,IAAI,SAAS,GAAG,EAChB,aAAa,SAAS,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,CAAC,EAC1E,KAAK,SAAS,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,EAAE,aAAa,CAAC,GAAG,oBAAoB,CACvG,IAAI,EACJ,YAAY,GAAG,SAAS,EACxB,aAAa,CACb,IACE,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,cAAc,CAAC,CAAC;AAEvF,MAAM,MAAM,cAAc,CACzB,IAAI,SAAS,GAAG,EAChB,aAAa,SAAS,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,CAAC,EAC1E,KAAK,SAAS,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,EAAE,aAAa,CAAC,GAAG,oBAAoB,CACvG,IAAI,EACJ,YAAY,GAAG,SAAS,EACxB,aAAa,CACb,IACE,aAAa,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,GAAG;IAC/C,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC/B,IAAI,SAAS,GAAG,GAAG,GAAG,EACtB,aAAa,SAAS,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,CAAC,GAAG,oBAAoB,CAChG,IAAI,EACJ,YAAY,GAAG,SAAS,CACxB,EACD,KAAK,SAAS,oBAAoB,CAAC,IAAI,EAAE,YAAY,GAAG,SAAS,EAAE,aAAa,CAAC,GAAG,oBAAoB,CACvG,IAAI,EACJ,YAAY,GAAG,SAAS,EACxB,aAAa,CACb,IACE,IAAI,CAAC,aAAa,EAAE,uBAAuB,GAAG,gBAAgB,GAAG,eAAe,CAAC,GAAG;IACvF,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,OAAO,CAAC,EAAE,cAAc,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,CAAC,GAAG;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,GAAG,EAAE,CAAA;KAAC,CAAC;IAC1G,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,mBAAmB,CAAC,EAAE,GAAG,EAAE,CAAC;IAC5B,gBAAgB,CAAC,EAAE;QAClB,CAAC,SAAS,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,EAAE,CAAC;KACrC,CAAC;IACF,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC;IACnB,iBAAiB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CAClC,CAAC;AAGF,MAAM,MAAM,6BAA6B,CAAC,IAAI,SAAS,GAAG,IAAI,IAAI,CACjE,sBAAsB,CAAC,IAAI,CAAC,EAC5B,UAAU,GAAG,MAAM,CACnB,GAAG;IACH,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG,CAAC,IAAI,SAAS,GAAG,EACvD,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,6BAA6B,CAAC,IAAI,CAAC,EAC3C,OAAO,EAAE,oBAAoB,KACzB,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;IAAC,aAAa,EAAE,OAAO,CAAA;CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
package/dist/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACzB,iDAAG,CAAA;IACH,yDAAO,CAAA;IACP,uDAAM,CAAA;AACP,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAsBA,MAAM,CAAN,IAAY,cAIX;AAJD,WAAY,cAAc;IACzB,iDAAG,CAAA;IACH,yDAAO,CAAA;IACP,uDAAM,CAAA;AACP,CAAC,EAJW,cAAc,KAAd,cAAc,QAIzB"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rocketh/diamond",
3
- "version": "0.19.6",
3
+ "version": "0.19.8",
4
4
  "description": "provide diamond support for rocketh/hardhat-deploy",
5
5
  "keywords": [
6
6
  "rocketh",
@@ -49,9 +49,9 @@
49
49
  "eip-1193": "^0.6.5",
50
50
  "named-logs": "^0.4.1",
51
51
  "viem": "^2.48.2",
52
+ "@rocketh/read-execute": "0.19.3",
52
53
  "@rocketh/core": "0.19.3",
53
- "@rocketh/deploy": "0.19.5",
54
- "@rocketh/read-execute": "0.19.3"
54
+ "@rocketh/deploy": "0.19.6"
55
55
  },
56
56
  "devDependencies": {
57
57
  "as-soon": "^0.1.6",
package/src/index.ts CHANGED
@@ -67,6 +67,11 @@ export function diamond(
67
67
  const {account, ...viemArgs} = params;
68
68
  const deployerAddress = env.resolveAccount(account);
69
69
 
70
+ const alwaysOverride = options && 'alwaysOverride' in options && options.alwaysOverride;
71
+ const strictBytecodeMatch =
72
+ !alwaysOverride && options && 'strictBytecodeMatch' in options && options.strictBytecodeMatch;
73
+ const skipIfAlreadyDeployed = alwaysOverride ? false : true;
74
+
70
75
  // TODO
71
76
  // if (options.diamondContract) {
72
77
  // diamondArtifact = options.diamondContract;
@@ -167,7 +172,13 @@ export function diamond(
167
172
  artifact,
168
173
  args: facetArgs,
169
174
  },
170
- {libraries, linkedData, deterministic: deterministicFacet},
175
+ {
176
+ libraries,
177
+ linkedData,
178
+ deterministic: deterministicFacet,
179
+ alwaysOverride: deterministicFacet ? false : alwaysOverride,
180
+ strictBytecodeMatch,
181
+ },
171
182
  );
172
183
 
173
184
  let facetAddress: `0x${string}`;
@@ -431,7 +442,9 @@ export function diamond(
431
442
  },
432
443
  {
433
444
  deterministic: options.deterministicSalt,
434
- skipIfAlreadyDeployed: true,
445
+ alwaysOverride,
446
+ strictBytecodeMatch: false,
447
+ skipIfAlreadyDeployed,
435
448
  },
436
449
  );
437
450
 
package/src/types.ts CHANGED
@@ -13,6 +13,8 @@ import type {ContractFunctionArgs, ContractFunctionName, WriteContractParameters
13
13
  export type {Artifact, Deployment, DeploymentConstruction, Libraries, Abi, LinkedDataProvided};
14
14
  export type {ContractFunctionArgs, ContractFunctionName, WriteContractParameters};
15
15
 
16
+ type DeployMutuallyExclusiveOptions = {alwaysOverride?: boolean} | {strictBytecodeMatch?: boolean};
17
+
16
18
  export type Facet = {
17
19
  facetAddress: `0x${string}`;
18
20
  functionSelectors: readonly `0x${string}`[];
@@ -72,19 +74,20 @@ export type DiamondDeployOptions<
72
74
  'nonpayable' | 'payable',
73
75
  TFunctionName
74
76
  >,
75
- > = Omit<DeployOptions, 'skipIfAlreadyDeployed' | 'alwaysOverride' | 'deterministic'> & {
76
- facets: DiamondFacets;
77
- owner?: EIP1193Account;
78
- execute?: ExecuteOptions<TAbi, TFunctionName, TArgs> | {type: 'facet'; functionName: string; args: any[]};
79
- defaultCutFacet?: boolean;
80
- defaultOwnershipFacet?: boolean;
81
- diamondContractArgs?: any[];
82
- excludeSelectors?: {
83
- [facetName: string]: `0x${string}`[];
77
+ > = Omit<DeployOptions, 'skipIfAlreadyDeployed' | 'alwaysOverride' | 'deterministic' | 'strictBytecodeMatch'> &
78
+ DeployMutuallyExclusiveOptions & {
79
+ facets: DiamondFacets;
80
+ owner?: EIP1193Account;
81
+ execute?: ExecuteOptions<TAbi, TFunctionName, TArgs> | {type: 'facet'; functionName: string; args: any[]};
82
+ defaultCutFacet?: boolean;
83
+ defaultOwnershipFacet?: boolean;
84
+ diamondContractArgs?: any[];
85
+ excludeSelectors?: {
86
+ [facetName: string]: `0x${string}`[];
87
+ };
88
+ facetsArgs?: any[];
89
+ deterministicSalt?: `0x${string}`;
84
90
  };
85
- facetsArgs?: any[];
86
- deterministicSalt?: `0x${string}`;
87
- };
88
91
 
89
92
  // TODO omit nonce ? // TODO omit chain ? same for rocketh-deploy
90
93
  export type DiamondDeploymentConstruction<TAbi extends Abi> = Omit<