@rocketh/diamond 0.17.21 → 0.17.22

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 (5) hide show
  1. package/dist/index.d.ts.map +1 -1
  2. package/dist/index.js +15 -4
  3. package/dist/index.js.map +1 -1
  4. package/package.json +3 -3
  5. package/src/index.ts +14 -5
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,EAAwB,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAWhF,OAAO,EAAS,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAC,6BAA6B,EAAE,oBAAoB,EAAkC,MAAM,YAAY,CAAC;AAwBhH,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,CAsd/B"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAwB,WAAW,EAAC,MAAM,qBAAqB,CAAC;AAWhF,OAAO,EAAS,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAGrD,OAAO,EAAC,6BAA6B,EAAE,oBAAoB,EAAkC,MAAM,YAAY,CAAC;AAwBhH,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,CA+d/B"}
package/dist/index.js CHANGED
@@ -160,7 +160,7 @@ export function diamond(env) {
160
160
  throw new Error(`multiple facet with method named "${options.execute.functionName}"`);
161
161
  }
162
162
  else {
163
- executionFacetFound = facetAddress;
163
+ executionFacetFound = { address: facetAddress, artifact: facet.artifact };
164
164
  }
165
165
  }
166
166
  }
@@ -223,7 +223,6 @@ export function diamond(env) {
223
223
  let executeData = '0x';
224
224
  let executeAddress = '0x0000000000000000000000000000000000000000';
225
225
  if (options.execute) {
226
- let addressSpecified;
227
226
  if (options.execute.type === 'artifact') {
228
227
  const executionDeployment = await _deploy('', // we do not save it as it is deterministic anyway
229
228
  {
@@ -234,14 +233,26 @@ export function diamond(env) {
234
233
  }, {
235
234
  deterministic: true,
236
235
  });
237
- addressSpecified = executionDeployment.address;
236
+ executeAddress = executionDeployment.address;
238
237
  executeData = encodeFunctionData({
239
238
  abi: executionDeployment.abi,
240
239
  functionName: options.execute.functionName,
241
240
  args: options.execute.args,
242
241
  });
243
242
  }
244
- executeAddress = addressSpecified || executionFacetFound || '0x0000000000000000000000000000000000000000';
243
+ else if (options.execute.type === 'facet') {
244
+ if (!executionFacetFound) {
245
+ throw new Error('Facet not found for execute');
246
+ }
247
+ else {
248
+ executeData = encodeFunctionData({
249
+ abi: executionFacetFound.artifact.abi,
250
+ functionName: options.execute.functionName,
251
+ args: options.execute.args,
252
+ });
253
+ executeAddress = executionFacetFound.address;
254
+ }
255
+ }
245
256
  }
246
257
  if (changesDetected) {
247
258
  if (!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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rocketh/diamond",
3
- "version": "0.17.21",
3
+ "version": "0.17.22",
4
4
  "description": "provide diamond support for rocketh/hardhat-deploy",
5
5
  "keywords": [
6
6
  "rocketh",
@@ -48,8 +48,8 @@
48
48
  "named-logs": "^0.4.1",
49
49
  "viem": "^2.45.1",
50
50
  "@rocketh/core": "0.17.17",
51
- "@rocketh/deploy": "0.17.17",
52
- "@rocketh/read-execute": "0.17.17"
51
+ "@rocketh/read-execute": "0.17.17",
52
+ "@rocketh/deploy": "0.17.17"
53
53
  },
54
54
  "devDependencies": {
55
55
  "as-soon": "^0.1.5",
package/src/index.ts CHANGED
@@ -111,7 +111,7 @@ export function diamond(
111
111
  // will be populated
112
112
  let abi: TAbi = artifactPureDiamond.abi.concat([]) as unknown as TAbi;
113
113
  const facetCuts: FacetCut[] = [];
114
- let executionFacetFound: `0x${string}` | undefined;
114
+ let executionFacetFound: {address: `0x${string}`; artifact: Artifact} | undefined;
115
115
  const excludeSelectors: Record<string, `0x${string}`[]> = options?.excludeSelectors || {};
116
116
  let i = 0;
117
117
  for (const facet of facetsSet) {
@@ -200,7 +200,7 @@ export function diamond(
200
200
  if (executionFacetFound) {
201
201
  throw new Error(`multiple facet with method named "${options.execute.functionName}"`);
202
202
  } else {
203
- executionFacetFound = facetAddress;
203
+ executionFacetFound = {address: facetAddress, artifact: facet.artifact};
204
204
  }
205
205
  }
206
206
  }
@@ -272,7 +272,6 @@ export function diamond(
272
272
  let executeAddress: `0x${string}` = '0x0000000000000000000000000000000000000000';
273
273
 
274
274
  if (options.execute) {
275
- let addressSpecified: `0x${string}` | undefined;
276
275
  if (options.execute.type === 'artifact') {
277
276
  const executionDeployment = await _deploy(
278
277
  '', // we do not save it as it is deterministic anyway
@@ -287,15 +286,25 @@ export function diamond(
287
286
  },
288
287
  );
289
288
 
290
- addressSpecified = executionDeployment.address;
289
+ executeAddress = executionDeployment.address;
291
290
 
292
291
  executeData = encodeFunctionData({
293
292
  abi: executionDeployment.abi,
294
293
  functionName: options.execute.functionName,
295
294
  args: options.execute.args,
296
295
  });
296
+ } else if (options.execute.type === 'facet') {
297
+ if (!executionFacetFound) {
298
+ throw new Error('Facet not found for execute');
299
+ } else {
300
+ executeData = encodeFunctionData({
301
+ abi: executionFacetFound.artifact.abi,
302
+ functionName: options.execute.functionName,
303
+ args: options.execute.args,
304
+ });
305
+ executeAddress = executionFacetFound.address;
306
+ }
297
307
  }
298
- executeAddress = addressSpecified || executionFacetFound || '0x0000000000000000000000000000000000000000';
299
308
  }
300
309
 
301
310
  if (changesDetected) {