@rocketh/diamond 0.11.1 → 0.11.3

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 (14) hide show
  1. package/README.md +1 -1
  2. package/dist/index.d.ts +16 -6
  3. package/dist/index.d.ts.map +1 -1
  4. package/dist/index.js +69 -66
  5. package/dist/index.js.map +1 -1
  6. package/dist/utils.d.ts +1 -1
  7. package/dist/utils.d.ts.map +1 -1
  8. package/package.json +9 -8
  9. package/solc_0_8/UsingDiamondOwner.sol +12 -0
  10. package/solc_0_8/interfaces/IDiamondCut.sol +32 -0
  11. package/solc_0_8/interfaces/IDiamondLoupe.sol +38 -0
  12. package/solc_0_8/interfaces/IERC165.sol +12 -0
  13. package/solc_0_8/interfaces/IERC173.sol +19 -0
  14. package/solc_0_8/libraries/LibDiamond.sol +207 -0
package/README.md CHANGED
@@ -1 +1 @@
1
- # @rocketh/deploy-proxy
1
+ # @rocketh/proxy
package/dist/index.d.ts CHANGED
@@ -3,10 +3,11 @@ import type { Artifact, DeploymentConstruction, Deployment, Libraries } from 'ro
3
3
  import '@rocketh/deploy';
4
4
  import '@rocketh/read-execute';
5
5
  import type { EIP1193Account } from 'eip-1193';
6
+ import { ContractFunctionArgs, ContractFunctionName, WriteContractParameters } from 'viem';
6
7
  import { DeployOptions } from '@rocketh/deploy';
7
8
  export type Facet = {
8
- facetAddress: string;
9
- functionSelectors: string[];
9
+ facetAddress: `0x${string}`;
10
+ functionSelectors: readonly `0x${string}`[];
10
11
  };
11
12
  export declare enum FacetCutAction {
12
13
  Add = 0,
@@ -17,18 +18,27 @@ export type FacetCut = Facet & {
17
18
  action: FacetCutAction;
18
19
  };
19
20
  export type FacetOptions = {
20
- name: string;
21
- contract: Artifact;
21
+ name?: string;
22
+ artifact: Artifact;
22
23
  args?: any[];
23
24
  linkedData?: any;
24
25
  libraries?: Libraries;
25
26
  deterministic?: boolean | `0x${string}`;
26
27
  };
27
28
  export type DiamondFacets = Array<FacetOptions>;
28
- export type DiamondDeployOptions = Omit<DeployOptions, 'skipIfAlreadyDeployed' | 'alwaysOverride' | 'deterministic'> & {
29
+ export type ExecutionArgs<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, 'nonpayable' | 'payable'>, TArgs extends ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName> = ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName>> = Pick<WriteContractParameters<TAbi, TFunctionName, TArgs>, 'args' | 'functionName'>;
30
+ export type ExecuteOptions<TAbi extends Abi, TFunctionName extends ContractFunctionName<TAbi, 'nonpayable' | 'payable'>, TArgs extends ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName> = ContractFunctionArgs<TAbi, 'nonpayable' | 'payable', TFunctionName>> = ExecutionArgs<TAbi, TFunctionName, TArgs> & {
31
+ type: 'artifact';
32
+ artifact: Artifact<TAbi>;
33
+ };
34
+ 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'> & {
29
35
  facets: DiamondFacets;
30
36
  owner?: EIP1193Account;
31
- execute?: string;
37
+ execute?: ExecuteOptions<TAbi, TFunctionName, TArgs> | {
38
+ type: 'facet';
39
+ functionName: string;
40
+ args: any[];
41
+ };
32
42
  defaultCutFacet?: boolean;
33
43
  defaultOwnershipFacet?: boolean;
34
44
  diamondContractArgs?: any[];
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,EAAC,GAAG,EAAc,MAAM,SAAS,CAAC;AACzC,OAAO,KAAK,EAAC,QAAQ,EAAE,sBAAsB,EAAE,UAAU,EAAe,SAAS,EAAC,MAAM,SAAS,CAAC;AAClG,OAAO,iBAAiB,CAAC;AACzB,OAAO,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,UAAU,CAAC;AAU7C,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAC;AAM9C,MAAM,MAAM,KAAK,GAAG;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC5B,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,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,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,oBAAoB,GAAG,IAAI,CAAC,aAAa,EAAE,uBAAuB,GAAG,gBAAgB,GAAG,eAAe,CAAC,GAAG;IACtH,MAAM,EAAE,aAAa,CAAC;IACtB,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,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;AAE1D,OAAO,QAAQ,SAAS,CAAC;IACxB,UAAU,WAAW;QACpB,OAAO,EAAE,wBAAwB,CAAC;KAClC;CACD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/dist/index.js CHANGED
@@ -1,15 +1,23 @@
1
1
  import '@rocketh/deploy';
2
2
  import '@rocketh/read-execute';
3
3
  import { extendEnvironment } from 'rocketh';
4
- import { encodeFunctionData, zeroAddress } from 'viem';
4
+ import { encodeFunctionData, zeroAddress, } from 'viem';
5
5
  import { logs } from 'named-logs';
6
- import artifactDiamond from './hardhat-deploy-v1-artifacts/Diamond.js';
6
+ import artifactPureDiamond from './hardhat-deploy-v1-artifacts/Diamond.js';
7
7
  import artifactDiamondLoupeFact from './hardhat-deploy-v1-artifacts/DiamondLoupeFacet.js';
8
8
  import artifactDiamondCutFact from './hardhat-deploy-v1-artifacts/DiamondCutFacet.js';
9
9
  import artifactOwnershipFacet from './hardhat-deploy-v1-artifacts/OwnershipFacet.js';
10
10
  import artifactDiamondERC165Init from './hardhat-deploy-v1-artifacts/DiamondERC165Init.js';
11
11
  import { filterABI, mergeABIs, sigsFromABI } from './utils.js';
12
12
  const logger = logs('@rocketh/diamond');
13
+ const diamondAbi = mergeABIs([artifactPureDiamond.abi, artifactOwnershipFacet.abi, artifactDiamondLoupeFact.abi, artifactDiamondCutFact.abi], {
14
+ check: true,
15
+ skipSupportsInterface: true,
16
+ });
17
+ const artifactDiamond = {
18
+ ...artifactPureDiamond,
19
+ abi: diamondAbi,
20
+ };
13
21
  export var FacetCutAction;
14
22
  (function (FacetCutAction) {
15
23
  FacetCutAction[FacetCutAction["Add"] = 0] = "Add";
@@ -53,14 +61,16 @@ extendEnvironment((env) => {
53
61
  const facetSnapshot = [];
54
62
  let oldFacets = [];
55
63
  if (proxy) {
56
- oldFacets = await env.read(proxy, { functionName: 'facets' });
64
+ oldFacets = await env.read(proxy, {
65
+ functionName: 'facets',
66
+ });
57
67
  }
58
68
  // console.log({ oldFacets: JSON.stringify(oldFacets, null, " ") });
59
69
  const facetsSet = options.facets;
60
70
  if (options?.defaultCutFacet === undefined || options.defaultCutFacet) {
61
71
  facetsSet.push({
62
72
  name: '_DefaultDiamondCutFacet',
63
- contract: artifactDiamondCutFact,
73
+ artifact: artifactDiamondCutFact,
64
74
  args: [],
65
75
  deterministic: true,
66
76
  });
@@ -68,23 +78,24 @@ extendEnvironment((env) => {
68
78
  if (options?.defaultOwnershipFacet === undefined || options.defaultOwnershipFacet) {
69
79
  facetsSet.push({
70
80
  name: '_DefaultDiamondOwnershipFacet',
71
- contract: artifactOwnershipFacet,
81
+ artifact: artifactOwnershipFacet,
72
82
  args: [],
73
83
  deterministic: true,
74
84
  });
75
85
  }
76
86
  facetsSet.push({
77
87
  name: '_DefaultDiamondLoupeFacet',
78
- contract: artifactDiamondLoupeFact,
88
+ artifact: artifactDiamondLoupeFact,
79
89
  args: [],
80
90
  deterministic: true,
81
91
  });
82
92
  let changesDetected = !oldDeployment;
83
93
  // will be populated
84
- let abi = artifactDiamond.abi.concat([]);
94
+ let abi = artifactPureDiamond.abi.concat([]);
85
95
  const facetCuts = [];
86
- let facetFound;
96
+ let executionFacetFound;
87
97
  const excludeSelectors = options?.excludeSelectors || {};
98
+ let i = 0;
88
99
  for (const facet of facetsSet) {
89
100
  let deterministicFacet = true;
90
101
  let linkedData = options?.linkedData;
@@ -107,8 +118,11 @@ extendEnvironment((env) => {
107
118
  facetArgs = facet.args;
108
119
  argsSpecific = true;
109
120
  }
110
- const artifact = facet.contract;
111
- const facetName = facet.name;
121
+ const artifact = facet.artifact;
122
+ const facetName = facet.name || artifact.contractName;
123
+ if (!facetName) {
124
+ throw new Error(`artifact for facet at index: ${i} has no name, specify a name for the facet`);
125
+ }
112
126
  const constructor = artifact.abi.find((fragment) => fragment.type === 'constructor');
113
127
  if (!argsSpecific && (!constructor || constructor.inputs.length === 0)) {
114
128
  // reset args for case where facet do not expect any and there was no specific args set on it
@@ -150,21 +164,23 @@ extendEnvironment((env) => {
150
164
  facetSnapshot.push(newFacet);
151
165
  newSelectors.push(...newFacet.functionSelectors);
152
166
  }
153
- // TODO
154
- // if (options.execute && !options.execute.contract) {
155
- // const methods = artifact.abi.filter((v) => v.name === options.execute?.methodName);
156
- // if (methods.length > 0) {
157
- // if (methods.length > 1) {
158
- // throw new Error(`multiple method named "${options.execute.methodName}" found in facet`);
159
- // } else {
160
- // if (facetFound) {
161
- // throw new Error(`multiple facet with method named "${options.execute.methodName}"`);
162
- // } else {
163
- // facetFound = facetAddress;
164
- // }
165
- // }
166
- // }
167
- // }
167
+ if (options.execute && options.execute.type == 'facet') {
168
+ const methods = artifact.abi.filter((v) => v.name === options.execute?.functionName);
169
+ if (methods.length > 0) {
170
+ if (methods.length > 1) {
171
+ throw new Error(`multiple method named "${options.execute.functionName}" found in facet`);
172
+ }
173
+ else {
174
+ if (executionFacetFound) {
175
+ throw new Error(`multiple facet with method named "${options.execute.functionName}"`);
176
+ }
177
+ else {
178
+ executionFacetFound = facetAddress;
179
+ }
180
+ }
181
+ }
182
+ }
183
+ i++;
168
184
  }
169
185
  const oldSelectors = [];
170
186
  const oldSelectorsFacetAddress = {};
@@ -221,46 +237,27 @@ extendEnvironment((env) => {
221
237
  }
222
238
  let executeData = '0x';
223
239
  let executeAddress = '0x0000000000000000000000000000000000000000';
224
- // TODO
225
- // if (options.execute) {
226
- // let addressSpecified: string | undefined;
227
- // let executionContract = new Contract('0x0000000000000000000000000000000000000001', abi);
228
- // if (options.execute.contract) {
229
- // if (typeof options.execute.contract === 'string') {
230
- // const executionDeployment = await _deployOne(options.execute.contract, {
231
- // from: options.from,
232
- // autoMine: options.autoMine,
233
- // estimateGasExtra: options.estimateGasExtra,
234
- // estimatedGasLimit: options.estimatedGasLimit,
235
- // gasPrice: options.gasPrice,
236
- // maxFeePerGas: options.maxFeePerGas,
237
- // maxPriorityFeePerGas: options.maxPriorityFeePerGas,
238
- // log: options.log,
239
- // deterministicDeployment: true,
240
- // });
241
- // executionContract = new Contract(executionDeployment.address, executionDeployment.abi);
242
- // addressSpecified = executionContract.address;
243
- // } else {
244
- // const executionDeployment = await _deployOne(options.execute.contract.name, {
245
- // from: options.from,
246
- // contract: options.execute.contract.artifact,
247
- // args: options.execute.contract.args,
248
- // autoMine: options.autoMine,
249
- // estimateGasExtra: options.estimateGasExtra,
250
- // estimatedGasLimit: options.estimatedGasLimit,
251
- // gasPrice: options.gasPrice,
252
- // maxFeePerGas: options.maxFeePerGas,
253
- // maxPriorityFeePerGas: options.maxPriorityFeePerGas,
254
- // log: options.log,
255
- // deterministicDeployment: true,
256
- // });
257
- // executionContract = new Contract(executionDeployment.address, executionDeployment.abi);
258
- // }
259
- // }
260
- // const txData = await executionContract.populateTransaction[options.execute.methodName](...options.execute.args);
261
- // executeData = txData.data || '0x';
262
- // executeAddress = addressSpecified || facetFound || '0x0000000000000000000000000000000000000000';
263
- // }
240
+ if (options.execute) {
241
+ let addressSpecified;
242
+ if (options.execute.type === 'artifact') {
243
+ const executionDeployment = await env.deploy('', // we do not save it as it is deterministic anyway
244
+ {
245
+ ...params,
246
+ artifact: options.execute.artifact,
247
+ args: [], // we expect artifact use for execute to have no contructor args
248
+ // TODO support these with constructor arguments ?
249
+ }, {
250
+ deterministic: true,
251
+ });
252
+ addressSpecified = executionDeployment.address;
253
+ executeData = encodeFunctionData({
254
+ abi: executionDeployment.abi,
255
+ functionName: options.execute.functionName,
256
+ args: options.execute.args,
257
+ });
258
+ }
259
+ executeAddress = addressSpecified || executionFacetFound || '0x0000000000000000000000000000000000000000';
260
+ }
264
261
  if (changesDetected) {
265
262
  if (!proxy) {
266
263
  const diamondConstructorArgs = options?.diamondContractArgs || ['{owner}', '{facetCuts}', '{initializations}'];
@@ -374,9 +371,12 @@ extendEnvironment((env) => {
374
371
  });
375
372
  await env.save(name, {
376
373
  ...proxy,
374
+ abi,
377
375
  linkedData: options.linkedData,
378
376
  facets: facetSnapshot,
379
377
  execute: options.execute,
378
+ }, {
379
+ doNotCountAsNewDeployment: proxy.newlyDeployed ? false : true,
380
380
  });
381
381
  }
382
382
  else {
@@ -397,9 +397,12 @@ extendEnvironment((env) => {
397
397
  functionName: 'diamondCut',
398
398
  args: [
399
399
  facetCuts,
400
- executeData === '0x' ? '0x0000000000000000000000000000000000000000' : executeAddress || proxy.address, // TODO || proxy.address should not be required, the facet should have been found
400
+ executeData === '0x'
401
+ ? '0x0000000000000000000000000000000000000000'
402
+ : executeAddress || proxy.address, // TODO || proxy.address should not be required, the facet should have been found
401
403
  executeData,
402
404
  ],
405
+ value: undefined,
403
406
  });
404
407
  const diamondDeployment = {
405
408
  ...oldDeployment,
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/utils.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Abi } from 'abitype';
2
- export declare function sigsFromABI(abi: Abi): string[];
2
+ export declare function sigsFromABI(abi: Abi): `0x${string}`[];
3
3
  export declare function filterABI(abi: Abi, excludeSighashes: Set<string>): any[];
4
4
  export declare function mergeABIs<TAbi extends Abi = Abi>(abis: Abi[], options: {
5
5
  check: boolean;
package/dist/utils.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAwB,MAAM,SAAS,CAAC;AAGnD,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,MAAM,EAAE,CAE9C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,EAAE,CAExE;AAED,wBAAgB,SAAS,CAAC,IAAI,SAAS,GAAG,GAAG,GAAG,EAC/C,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAC,GACvD,IAAI,CAiDN"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAwB,MAAM,SAAS,CAAC;AAGnD,wBAAgB,WAAW,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK,MAAM,EAAE,EAAE,CAErD;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,EAAE,CAExE;AAED,wBAAgB,SAAS,CAAC,IAAI,SAAS,GAAG,GAAG,GAAG,EAC/C,IAAI,EAAE,GAAG,EAAE,EACX,OAAO,EAAE;IAAC,KAAK,EAAE,OAAO,CAAC;IAAC,qBAAqB,EAAE,OAAO,CAAA;CAAC,GACvD,IAAI,CAiDN"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rocketh/diamond",
3
- "version": "0.11.1",
3
+ "version": "0.11.3",
4
4
  "description": "provide diamond support for rocketh/hardhat-deploy",
5
5
  "publishConfig": {
6
6
  "access": "public"
@@ -16,7 +16,8 @@
16
16
  }
17
17
  },
18
18
  "files": [
19
- "dist"
19
+ "dist",
20
+ "solc_0_8"
20
21
  ],
21
22
  "devDependencies": {
22
23
  "abitype": "^1.0.8",
@@ -24,14 +25,14 @@
24
25
  "eip-1193": "^0.6.2",
25
26
  "rimraf": "^6.0.1",
26
27
  "typescript": "^5.8.2",
27
- "@rocketh/deploy": "0.11.1",
28
- "@rocketh/read-execute": "0.11.1",
29
- "rocketh": "0.11.1"
28
+ "@rocketh/deploy": "0.11.2",
29
+ "@rocketh/read-execute": "0.11.2",
30
+ "rocketh": "0.11.2"
30
31
  },
31
32
  "peerDependencies": {
32
- "@rocketh/deploy": "0.11.1",
33
- "rocketh": "0.11.1",
34
- "@rocketh/read-execute": "0.11.1"
33
+ "@rocketh/deploy": "0.11.2",
34
+ "@rocketh/read-execute": "0.11.2",
35
+ "rocketh": "0.11.2"
35
36
  },
36
37
  "dependencies": {
37
38
  "named-logs": "^0.3.2",
package/solc_0_8/UsingDiamondOwner.sol ADDED
@@ -0,0 +1,12 @@
1
+ // SPDX-License-Identifier: MIT
2
+ pragma solidity ^0.8.0;
3
+
4
+ import "./libraries/LibDiamond.sol";
5
+
6
+ contract UsingDiamondOwner {
7
+ modifier onlyOwner() {
8
+ LibDiamond.DiamondStorage storage ds = LibDiamond.diamondStorage();
9
+ require(msg.sender == ds.contractOwner, "Only owner is allowed to perform this action");
10
+ _;
11
+ }
12
+ }
package/solc_0_8/interfaces/IDiamondCut.sol ADDED
@@ -0,0 +1,32 @@
1
+ // SPDX-License-Identifier: MIT
2
+ pragma solidity ^0.8.0;
3
+
4
+ /******************************************************************************\
5
+ * Author: Nick Mudge <nick@perfectabstractions.com> (https://twitter.com/mudgen)
6
+ * EIP-2535 Diamonds: https://eips.ethereum.org/EIPS/eip-2535
7
+ /******************************************************************************/
8
+
9
+ interface IDiamondCut {
10
+ enum FacetCutAction {Add, Replace, Remove}
11
+ // Add=0, Replace=1, Remove=2
12
+
13
+ struct FacetCut {
14
+ address facetAddress;
15
+ FacetCutAction action;
16
+ bytes4[] functionSelectors;
17
+ }
18
+
19
+ /// @notice Add/replace/remove any number of functions and optionally execute
20
+ /// a function with delegatecall
21
+ /// @param _diamondCut Contains the facet addresses and function selectors
22
+ /// @param _init The address of the contract or facet to execute _calldata
23
+ /// @param _calldata A function call, including function selector and arguments
24
+ /// _calldata is executed with delegatecall on _init
25
+ function diamondCut(
26
+ FacetCut[] calldata _diamondCut,
27
+ address _init,
28
+ bytes calldata _calldata
29
+ ) external;
30
+
31
+ event DiamondCut(FacetCut[] _diamondCut, address _init, bytes _calldata);
32
+ }
package/solc_0_8/interfaces/IDiamondLoupe.sol ADDED
@@ -0,0 +1,38 @@
1
+ // SPDX-License-Identifier: MIT
2
+ pragma solidity ^0.8.0;
3
+
4
+ /******************************************************************************\
5
+ * Author: Nick Mudge <nick@perfectabstractions.com> (https://twitter.com/mudgen)
6
+ * EIP-2535 Diamonds: https://eips.ethereum.org/EIPS/eip-2535
7
+ /******************************************************************************/
8
+
9
+ // A loupe is a small magnifying glass used to look at diamonds.
10
+ // These functions look at diamonds
11
+ interface IDiamondLoupe {
12
+ /// These functions are expected to be called frequently
13
+ /// by tools.
14
+
15
+ struct Facet {
16
+ address facetAddress;
17
+ bytes4[] functionSelectors;
18
+ }
19
+
20
+ /// @notice Gets all facet addresses and their four byte function selectors.
21
+ /// @return facets_ Facet
22
+ function facets() external view returns (Facet[] memory facets_);
23
+
24
+ /// @notice Gets all the function selectors supported by a specific facet.
25
+ /// @param _facet The facet address.
26
+ /// @return facetFunctionSelectors_
27
+ function facetFunctionSelectors(address _facet) external view returns (bytes4[] memory facetFunctionSelectors_);
28
+
29
+ /// @notice Get all the facet addresses used by a diamond.
30
+ /// @return facetAddresses_
31
+ function facetAddresses() external view returns (address[] memory facetAddresses_);
32
+
33
+ /// @notice Gets the facet that supports the given selector.
34
+ /// @dev If facet is not found return address(0).
35
+ /// @param _functionSelector The function selector.
36
+ /// @return facetAddress_ The facet address.
37
+ function facetAddress(bytes4 _functionSelector) external view returns (address facetAddress_);
38
+ }
package/solc_0_8/interfaces/IERC165.sol ADDED
@@ -0,0 +1,12 @@
1
+ // SPDX-License-Identifier: MIT
2
+ pragma solidity ^0.8.0;
3
+
4
+ interface IERC165 {
5
+ /// @notice Query if a contract implements an interface
6
+ /// @param interfaceId The interface identifier, as specified in ERC-165
7
+ /// @dev Interface identification is specified in ERC-165. This function
8
+ /// uses less than 30,000 gas.
9
+ /// @return `true` if the contract implements `interfaceID` and
10
+ /// `interfaceID` is not 0xffffffff, `false` otherwise
11
+ function supportsInterface(bytes4 interfaceId) external view returns (bool);
12
+ }
package/solc_0_8/interfaces/IERC173.sol ADDED
@@ -0,0 +1,19 @@
1
+ // SPDX-License-Identifier: MIT
2
+ pragma solidity ^0.8.0;
3
+
4
+ /// @title ERC-173 Contract Ownership Standard
5
+ /// Note: the ERC-165 identifier for this interface is 0x7f5828d0
6
+ /* is ERC165 */
7
+ interface IERC173 {
8
+ /// @dev This emits when ownership of a contract changes.
9
+ event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
10
+
11
+ /// @notice Get the address of the owner
12
+ /// @return owner_ The address of the owner.
13
+ function owner() external view returns (address owner_);
14
+
15
+ /// @notice Set the address of the new owner of the contract
16
+ /// @dev Set _newOwner to address(0) to renounce any ownership.
17
+ /// @param _newOwner The address of the new owner of the contract
18
+ function transferOwnership(address _newOwner) external;
19
+ }
package/solc_0_8/libraries/LibDiamond.sol ADDED
@@ -0,0 +1,207 @@
1
+ // SPDX-License-Identifier: MIT
2
+ pragma solidity ^0.8.0;
3
+
4
+ /******************************************************************************\
5
+ * Author: Nick Mudge <nick@perfectabstractions.com> (https://twitter.com/mudgen)
6
+ * EIP-2535 Diamonds: https://eips.ethereum.org/EIPS/eip-2535
7
+ /******************************************************************************/
8
+ import { IDiamondCut } from "../interfaces/IDiamondCut.sol";
9
+
10
+ library LibDiamond {
11
+ bytes32 constant DIAMOND_STORAGE_POSITION = keccak256("diamond.standard.diamond.storage");
12
+
13
+ struct FacetAddressAndPosition {
14
+ address facetAddress;
15
+ uint96 functionSelectorPosition; // position in facetFunctionSelectors.functionSelectors array
16
+ }
17
+
18
+ struct FacetFunctionSelectors {
19
+ bytes4[] functionSelectors;
20
+ uint256 facetAddressPosition; // position of facetAddress in facetAddresses array
21
+ }
22
+
23
+ struct DiamondStorage {
24
+ // maps function selector to the facet address and
25
+ // the position of the selector in the facetFunctionSelectors.selectors array
26
+ mapping(bytes4 => FacetAddressAndPosition) selectorToFacetAndPosition;
27
+ // maps facet addresses to function selectors
28
+ mapping(address => FacetFunctionSelectors) facetFunctionSelectors;
29
+ // facet addresses
30
+ address[] facetAddresses;
31
+ // Used to query if a contract implements an interface.
32
+ // Used to implement ERC-165.
33
+ mapping(bytes4 => bool) supportedInterfaces;
34
+ // owner of the contract
35
+ address contractOwner;
36
+ }
37
+
38
+ function diamondStorage() internal pure returns (DiamondStorage storage ds) {
39
+ bytes32 position = DIAMOND_STORAGE_POSITION;
40
+ assembly {
41
+ ds.slot := position
42
+ }
43
+ }
44
+
45
+ event OwnershipTransferred(address indexed previousOwner, address indexed newOwner);
46
+
47
+ function setContractOwner(address _newOwner) internal {
48
+ DiamondStorage storage ds = diamondStorage();
49
+ address previousOwner = ds.contractOwner;
50
+ ds.contractOwner = _newOwner;
51
+ emit OwnershipTransferred(previousOwner, _newOwner);
52
+ }
53
+
54
+ function contractOwner() internal view returns (address contractOwner_) {
55
+ contractOwner_ = diamondStorage().contractOwner;
56
+ }
57
+
58
+ function enforceIsContractOwner() internal view {
59
+ require(msg.sender == diamondStorage().contractOwner, "LibDiamond: Must be contract owner");
60
+ }
61
+
62
+ event DiamondCut(IDiamondCut.FacetCut[] _diamondCut, address _init, bytes _calldata);
63
+
64
+ // Internal function version of diamondCut
65
+ function diamondCut(
66
+ IDiamondCut.FacetCut[] memory _diamondCut,
67
+ address _init,
68
+ bytes memory _calldata
69
+ ) internal {
70
+ for (uint256 facetIndex; facetIndex < _diamondCut.length; facetIndex++) {
71
+ IDiamondCut.FacetCutAction action = _diamondCut[facetIndex].action;
72
+ if (action == IDiamondCut.FacetCutAction.Add) {
73
+ addFunctions(_diamondCut[facetIndex].facetAddress, _diamondCut[facetIndex].functionSelectors);
74
+ } else if (action == IDiamondCut.FacetCutAction.Replace) {
75
+ replaceFunctions(_diamondCut[facetIndex].facetAddress, _diamondCut[facetIndex].functionSelectors);
76
+ } else if (action == IDiamondCut.FacetCutAction.Remove) {
77
+ removeFunctions(_diamondCut[facetIndex].facetAddress, _diamondCut[facetIndex].functionSelectors);
78
+ } else {
79
+ revert("LibDiamondCut: Incorrect FacetCutAction");
80
+ }
81
+ }
82
+ emit DiamondCut(_diamondCut, _init, _calldata);
83
+ initializeDiamondCut(_init, _calldata);
84
+ }
85
+
86
+ function addFunctions(address _facetAddress, bytes4[] memory _functionSelectors) internal {
87
+ require(_functionSelectors.length > 0, "LibDiamondCut: No selectors in facet to cut");
88
+ DiamondStorage storage ds = diamondStorage();
89
+ require(_facetAddress != address(0), "LibDiamondCut: Add facet can't be address(0)");
90
+ uint96 selectorPosition = uint96(ds.facetFunctionSelectors[_facetAddress].functionSelectors.length);
91
+ // add new facet address if it does not exist
92
+ if (selectorPosition == 0) {
93
+ addFacet(ds, _facetAddress);
94
+ }
95
+ for (uint256 selectorIndex; selectorIndex < _functionSelectors.length; selectorIndex++) {
96
+ bytes4 selector = _functionSelectors[selectorIndex];
97
+ address oldFacetAddress = ds.selectorToFacetAndPosition[selector].facetAddress;
98
+ require(oldFacetAddress == address(0), "LibDiamondCut: Can't add function that already exists");
99
+ addFunction(ds, selector, selectorPosition, _facetAddress);
100
+ selectorPosition++;
101
+ }
102
+ }
103
+
104
+ function replaceFunctions(address _facetAddress, bytes4[] memory _functionSelectors) internal {
105
+ require(_functionSelectors.length > 0, "LibDiamondCut: No selectors in facet to cut");
106
+ DiamondStorage storage ds = diamondStorage();
107
+ require(_facetAddress != address(0), "LibDiamondCut: Add facet can't be address(0)");
108
+ uint96 selectorPosition = uint96(ds.facetFunctionSelectors[_facetAddress].functionSelectors.length);
109
+ // add new facet address if it does not exist
110
+ if (selectorPosition == 0) {
111
+ addFacet(ds, _facetAddress);
112
+ }
113
+ for (uint256 selectorIndex; selectorIndex < _functionSelectors.length; selectorIndex++) {
114
+ bytes4 selector = _functionSelectors[selectorIndex];
115
+ address oldFacetAddress = ds.selectorToFacetAndPosition[selector].facetAddress;
116
+ require(oldFacetAddress != _facetAddress, "LibDiamondCut: Can't replace function with same function");
117
+ removeFunction(ds, oldFacetAddress, selector);
118
+ addFunction(ds, selector, selectorPosition, _facetAddress);
119
+ selectorPosition++;
120
+ }
121
+ }
122
+
123
+ function removeFunctions(address _facetAddress, bytes4[] memory _functionSelectors) internal {
124
+ require(_functionSelectors.length > 0, "LibDiamondCut: No selectors in facet to cut");
125
+ DiamondStorage storage ds = diamondStorage();
126
+ // if function does not exist then do nothing and return
127
+ require(_facetAddress == address(0), "LibDiamondCut: Remove facet address must be address(0)");
128
+ for (uint256 selectorIndex; selectorIndex < _functionSelectors.length; selectorIndex++) {
129
+ bytes4 selector = _functionSelectors[selectorIndex];
130
+ address oldFacetAddress = ds.selectorToFacetAndPosition[selector].facetAddress;
131
+ removeFunction(ds, oldFacetAddress, selector);
132
+ }
133
+ }
134
+
135
+ function addFacet(DiamondStorage storage ds, address _facetAddress) internal {
136
+ enforceHasContractCode(_facetAddress, "LibDiamondCut: New facet has no code");
137
+ ds.facetFunctionSelectors[_facetAddress].facetAddressPosition = ds.facetAddresses.length;
138
+ ds.facetAddresses.push(_facetAddress);
139
+ }
140
+
141
+
142
+ function addFunction(DiamondStorage storage ds, bytes4 _selector, uint96 _selectorPosition, address _facetAddress) internal {
143
+ ds.selectorToFacetAndPosition[_selector].functionSelectorPosition = _selectorPosition;
144
+ ds.facetFunctionSelectors[_facetAddress].functionSelectors.push(_selector);
145
+ ds.selectorToFacetAndPosition[_selector].facetAddress = _facetAddress;
146
+ }
147
+
148
+ function removeFunction(DiamondStorage storage ds, address _facetAddress, bytes4 _selector) internal {
149
+ require(_facetAddress != address(0), "LibDiamondCut: Can't remove function that doesn't exist");
150
+ // an immutable function is a function defined directly in a diamond
151
+ require(_facetAddress != address(this), "LibDiamondCut: Can't remove immutable function");
152
+ // replace selector with last selector, then delete last selector
153
+ uint256 selectorPosition = ds.selectorToFacetAndPosition[_selector].functionSelectorPosition;
154
+ uint256 lastSelectorPosition = ds.facetFunctionSelectors[_facetAddress].functionSelectors.length - 1;
155
+ // if not the same then replace _selector with lastSelector
156
+ if (selectorPosition != lastSelectorPosition) {
157
+ bytes4 lastSelector = ds.facetFunctionSelectors[_facetAddress].functionSelectors[lastSelectorPosition];
158
+ ds.facetFunctionSelectors[_facetAddress].functionSelectors[selectorPosition] = lastSelector;
159
+ ds.selectorToFacetAndPosition[lastSelector].functionSelectorPosition = uint96(selectorPosition);
160
+ }
161
+ // delete the last selector
162
+ ds.facetFunctionSelectors[_facetAddress].functionSelectors.pop();
163
+ delete ds.selectorToFacetAndPosition[_selector];
164
+
165
+ // if no more selectors for facet address then delete the facet address
166
+ if (lastSelectorPosition == 0) {
167
+ // replace facet address with last facet address and delete last facet address
168
+ uint256 lastFacetAddressPosition = ds.facetAddresses.length - 1;
169
+ uint256 facetAddressPosition = ds.facetFunctionSelectors[_facetAddress].facetAddressPosition;
170
+ if (facetAddressPosition != lastFacetAddressPosition) {
171
+ address lastFacetAddress = ds.facetAddresses[lastFacetAddressPosition];
172
+ ds.facetAddresses[facetAddressPosition] = lastFacetAddress;
173
+ ds.facetFunctionSelectors[lastFacetAddress].facetAddressPosition = facetAddressPosition;
174
+ }
175
+ ds.facetAddresses.pop();
176
+ delete ds.facetFunctionSelectors[_facetAddress].facetAddressPosition;
177
+ }
178
+ }
179
+
180
+ function initializeDiamondCut(address _init, bytes memory _calldata) internal {
181
+ if (_init == address(0)) {
182
+ require(_calldata.length == 0, "LibDiamondCut: _init is address(0) but_calldata is not empty");
183
+ } else {
184
+ require(_calldata.length > 0, "LibDiamondCut: _calldata is empty but _init is not address(0)");
185
+ if (_init != address(this)) {
186
+ enforceHasContractCode(_init, "LibDiamondCut: _init address has no code");
187
+ }
188
+ (bool success, bytes memory error) = _init.delegatecall(_calldata);
189
+ if (!success) {
190
+ if (error.length > 0) {
191
+ // bubble up the error
192
+ revert(string(error));
193
+ } else {
194
+ revert("LibDiamondCut: _init function reverted");
195
+ }
196
+ }
197
+ }
198
+ }
199
+
200
+ function enforceHasContractCode(address _contract, string memory _errorMessage) internal view {
201
+ uint256 contractSize;
202
+ assembly {
203
+ contractSize := extcodesize(_contract)
204
+ }
205
+ require(contractSize > 0, _errorMessage);
206
+ }
207
+ }