@openzeppelin/wizard 0.4.2 → 0.4.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 (72) hide show
  1. package/dist/contract.d.ts +2 -0
  2. package/dist/contract.d.ts.map +1 -1
  3. package/dist/contract.js +8 -0
  4. package/dist/contract.js.map +1 -1
  5. package/dist/environments/hardhat/package-lock.json +1065 -1149
  6. package/dist/environments/hardhat/package.json +1 -1
  7. package/dist/environments/hardhat/upgradeable/package-lock.json +1427 -1535
  8. package/dist/environments/hardhat/upgradeable/package.json +1 -1
  9. package/dist/erc20.d.ts +6 -1
  10. package/dist/erc20.d.ts.map +1 -1
  11. package/dist/erc20.js +5 -2
  12. package/dist/erc20.js.map +1 -1
  13. package/dist/erc721.d.ts +6 -1
  14. package/dist/erc721.d.ts.map +1 -1
  15. package/dist/erc721.js +6 -3
  16. package/dist/erc721.js.map +1 -1
  17. package/dist/generate/erc20.d.ts.map +1 -1
  18. package/dist/generate/erc20.js +2 -1
  19. package/dist/generate/erc20.js.map +1 -1
  20. package/dist/generate/erc721.d.ts.map +1 -1
  21. package/dist/generate/erc721.js +2 -1
  22. package/dist/generate/erc721.js.map +1 -1
  23. package/dist/generate/governor.d.ts.map +1 -1
  24. package/dist/generate/governor.js +2 -0
  25. package/dist/generate/governor.js.map +1 -1
  26. package/dist/generate/sources.d.ts +5 -4
  27. package/dist/generate/sources.d.ts.map +1 -1
  28. package/dist/generate/sources.js +27 -17
  29. package/dist/generate/sources.js.map +1 -1
  30. package/dist/governor.d.ts +2 -0
  31. package/dist/governor.d.ts.map +1 -1
  32. package/dist/governor.js +41 -8
  33. package/dist/governor.js.map +1 -1
  34. package/dist/index.d.ts +1 -0
  35. package/dist/index.d.ts.map +1 -1
  36. package/dist/index.js +3 -1
  37. package/dist/index.js.map +1 -1
  38. package/dist/print.d.ts.map +1 -1
  39. package/dist/print.js +4 -4
  40. package/dist/print.js.map +1 -1
  41. package/dist/set-clock-mode.d.ts +6 -0
  42. package/dist/set-clock-mode.d.ts.map +1 -0
  43. package/dist/set-clock-mode.js +31 -0
  44. package/dist/set-clock-mode.js.map +1 -0
  45. package/dist/test.js +23 -5
  46. package/dist/test.js.map +1 -1
  47. package/dist/utils/duration.d.ts +1 -0
  48. package/dist/utils/duration.d.ts.map +1 -1
  49. package/dist/utils/duration.js +15 -1
  50. package/dist/utils/duration.js.map +1 -1
  51. package/dist/zip-foundry.d.ts.map +1 -1
  52. package/dist/zip-foundry.js +141 -32
  53. package/dist/zip-foundry.js.map +1 -1
  54. package/package.json +2 -2
  55. package/src/contract.ts +10 -0
  56. package/src/environments/hardhat/package-lock.json +1065 -1149
  57. package/src/environments/hardhat/package.json +1 -1
  58. package/src/environments/hardhat/upgradeable/package-lock.json +1427 -1535
  59. package/src/environments/hardhat/upgradeable/package.json +1 -1
  60. package/src/erc20.ts +11 -3
  61. package/src/erc721.ts +12 -4
  62. package/src/generate/erc20.ts +2 -1
  63. package/src/generate/erc721.ts +2 -1
  64. package/src/generate/governor.ts +2 -0
  65. package/src/generate/sources.ts +30 -18
  66. package/src/governor.ts +40 -10
  67. package/src/index.ts +3 -1
  68. package/src/print.ts +4 -2
  69. package/src/set-clock-mode.ts +33 -0
  70. package/src/test.ts +34 -6
  71. package/src/utils/duration.ts +18 -0
  72. package/src/zip-foundry.ts +141 -34
package/dist/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.custom = exports.governor = exports.erc1155 = exports.erc721 = exports.erc20 = exports.sanitizeKind = exports.OptionsError = exports.infoDefaults = exports.premintPattern = exports.printContract = exports.ContractBuilder = exports.buildGeneric = void 0;
3
+ exports.compatibleContractsSemver = exports.custom = exports.governor = exports.erc1155 = exports.erc721 = exports.erc20 = exports.sanitizeKind = exports.OptionsError = exports.infoDefaults = exports.premintPattern = exports.printContract = exports.ContractBuilder = exports.buildGeneric = void 0;
4
4
  var build_generic_1 = require("./build-generic");
5
5
  Object.defineProperty(exports, "buildGeneric", { enumerable: true, get: function () { return build_generic_1.buildGeneric; } });
6
6
  var contract_1 = require("./contract");
@@ -21,4 +21,6 @@ Object.defineProperty(exports, "erc721", { enumerable: true, get: function () {
21
21
  Object.defineProperty(exports, "erc1155", { enumerable: true, get: function () { return api_1.erc1155; } });
22
22
  Object.defineProperty(exports, "governor", { enumerable: true, get: function () { return api_1.governor; } });
23
23
  Object.defineProperty(exports, "custom", { enumerable: true, get: function () { return api_1.custom; } });
24
+ var version_1 = require("./utils/version");
25
+ Object.defineProperty(exports, "compatibleContractsSemver", { enumerable: true, get: function () { return version_1.compatibleContractsSemver; } });
24
26
  //# sourceMappingURL=index.js.map
package/dist/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AAGrB,uCAA6C;AAApC,2GAAA,eAAe,OAAA;AAExB,iCAAwC;AAA/B,sGAAA,aAAa,OAAA;AAMtB,iCAAyC;AAAhC,uGAAA,cAAc,OAAA;AACvB,uCAAsD;AAA7C,wGAAA,QAAQ,OAAgB;AAGjC,iCAAuC;AAA9B,qGAAA,YAAY,OAAA;AAGrB,+BAAsC;AAA7B,oGAAA,YAAY,OAAA;AAErB,6BAAiE;AAAxD,4FAAA,KAAK,OAAA;AAAE,6FAAA,MAAM,OAAA;AAAE,8FAAA,OAAO,OAAA;AAAE,+FAAA,QAAQ,OAAA;AAAE,6FAAA,MAAM,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,iDAA+C;AAAtC,6GAAA,YAAY,OAAA;AAGrB,uCAA6C;AAApC,2GAAA,eAAe,OAAA;AAExB,iCAAwC;AAA/B,sGAAA,aAAa,OAAA;AAMtB,iCAAyC;AAAhC,uGAAA,cAAc,OAAA;AACvB,uCAAsD;AAA7C,wGAAA,QAAQ,OAAgB;AAGjC,iCAAuC;AAA9B,qGAAA,YAAY,OAAA;AAGrB,+BAAsC;AAA7B,oGAAA,YAAY,OAAA;AAErB,6BAAiE;AAAxD,4FAAA,KAAK,OAAA;AAAE,6FAAA,MAAM,OAAA;AAAE,8FAAA,OAAO,OAAA;AAAE,+FAAA,QAAQ,OAAA;AAAE,6FAAA,MAAM,OAAA;AAEjD,2CAA4D;AAAnD,oHAAA,yBAAyB,OAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,QAAQ,EAA8C,KAAK,EAAc,MAAM,YAAY,CAAC;AAC1G,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAQ1D,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAqCxE;AA+FD,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAkB/C"}
1
+ {"version":3,"file":"print.d.ts","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"AAAA,OAAO,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,QAAQ,EAA8C,KAAK,EAAc,MAAM,YAAY,CAAC;AAC1G,OAAO,EAAE,OAAO,EAAwB,MAAM,WAAW,CAAC;AAQ1D,wBAAgB,aAAa,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,OAAO,GAAG,MAAM,CAqCxE;AAgGD,wBAAgB,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAkB/C"}
package/dist/print.js CHANGED
@@ -48,7 +48,7 @@ function printConstructor(contract, helpers) {
48
48
  ? (0, format_lines_1.spaceBetween)(parents.map(p => p + ';'), contract.constructorCode)
49
49
  : contract.constructorCode;
50
50
  const head = helpers.upgradeable ? 'function initialize' : 'constructor';
51
- const constructor = printFunction2(head, args, modifiers, body);
51
+ const constructor = printFunction2([], head, args, modifiers, body);
52
52
  if (!helpers.upgradeable) {
53
53
  return constructor;
54
54
  }
@@ -155,7 +155,7 @@ function printFunction(fn, helpers) {
155
155
  code.push(((_b = fn.returns) === null || _b === void 0 ? void 0 : _b.length) ? 'return ' + superCall : superCall);
156
156
  }
157
157
  if (modifiers.length + fn.code.length > 1) {
158
- return printFunction2('function ' + fn.name, fn.args.map(a => printArgument(a, helpers)), modifiers, code);
158
+ return printFunction2(fn.comments, 'function ' + fn.name, fn.args.map(a => printArgument(a, helpers)), modifiers, code);
159
159
  }
160
160
  else {
161
161
  return [];
@@ -163,8 +163,8 @@ function printFunction(fn, helpers) {
163
163
  }
164
164
  // generic for functions and constructors
165
165
  // kindedName = 'function foo' or 'constructor'
166
- function printFunction2(kindedName, args, modifiers, code) {
167
- const fn = [];
166
+ function printFunction2(comments, kindedName, args, modifiers, code) {
167
+ const fn = [...comments];
168
168
  const headingLength = [kindedName, ...args, ...modifiers]
169
169
  .map(s => s.length)
170
170
  .reduce((a, b) => a + b);
package/dist/print.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"print.js","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"print.js","sourceRoot":"","sources":["../src/print.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ import type { ContractBuilder, ReferencedContract } from "./contract";
2
+ export declare const clockModeOptions: readonly ["blocknumber", "timestamp"];
3
+ export declare const clockModeDefault: "blocknumber";
4
+ export type ClockMode = typeof clockModeOptions[number];
5
+ export declare function setClockMode(c: ContractBuilder, parent: ReferencedContract, votes: ClockMode): void;
6
+ //# sourceMappingURL=set-clock-mode.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"set-clock-mode.d.ts","sourceRoot":"","sources":["../src/set-clock-mode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAGtE,eAAO,MAAM,gBAAgB,uCAAwC,CAAC;AACtE,eAAO,MAAM,gBAAgB,eAAyB,CAAC;AACvD,MAAM,MAAM,SAAS,GAAG,OAAO,gBAAgB,CAAC,MAAM,CAAC,CAAC;AAkBxD,wBAAgB,YAAY,CAAC,CAAC,EAAE,eAAe,EAAE,MAAM,EAAE,kBAAkB,EAAE,KAAK,EAAE,SAAS,QAS5F"}
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.setClockMode = exports.clockModeDefault = exports.clockModeOptions = void 0;
4
+ const define_functions_1 = require("./utils/define-functions");
5
+ exports.clockModeOptions = ['blocknumber', 'timestamp'];
6
+ exports.clockModeDefault = 'blocknumber';
7
+ const functions = (0, define_functions_1.defineFunctions)({
8
+ clock: {
9
+ kind: 'public',
10
+ args: [],
11
+ returns: ['uint48'],
12
+ mutability: 'view',
13
+ },
14
+ CLOCK_MODE: {
15
+ kind: 'public',
16
+ args: [],
17
+ returns: ['string memory'],
18
+ mutability: 'pure',
19
+ }
20
+ });
21
+ function setClockMode(c, parent, votes) {
22
+ if (votes === 'timestamp') {
23
+ c.addOverride(parent, functions.clock);
24
+ c.setFunctionBody(['return uint48(block.timestamp);'], functions.clock);
25
+ c.setFunctionComments(['// solhint-disable-next-line func-name-mixedcase'], functions.CLOCK_MODE);
26
+ c.addOverride(parent, functions.CLOCK_MODE);
27
+ c.setFunctionBody(['return "mode=timestamp";'], functions.CLOCK_MODE);
28
+ }
29
+ }
30
+ exports.setClockMode = setClockMode;
31
+ //# sourceMappingURL=set-clock-mode.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"set-clock-mode.js","sourceRoot":"","sources":["../src/set-clock-mode.ts"],"names":[],"mappings":";;;AACA,+DAA2D;AAE9C,QAAA,gBAAgB,GAAG,CAAC,aAAa,EAAE,WAAW,CAAU,CAAC;AACzD,QAAA,gBAAgB,GAAG,aAAsB,CAAC;AAGvD,MAAM,SAAS,GAAG,IAAA,kCAAe,EAAC;IAChC,KAAK,EAAE;QACL,IAAI,EAAE,QAAiB;QACvB,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,CAAC,QAAQ,CAAC;QACnB,UAAU,EAAE,MAAe;KAC5B;IAED,UAAU,EAAE;QACV,IAAI,EAAE,QAAiB;QACvB,IAAI,EAAE,EAAE;QACR,OAAO,EAAE,CAAC,eAAe,CAAC;QAC1B,UAAU,EAAE,MAAe;KAC5B;CACF,CAAC,CAAC;AAEH,SAAgB,YAAY,CAAC,CAAkB,EAAE,MAA0B,EAAE,KAAgB;IAC3F,IAAI,KAAK,KAAK,WAAW,EAAE;QACzB,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QACvC,CAAC,CAAC,eAAe,CAAC,CAAC,iCAAiC,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAExE,CAAC,CAAC,mBAAmB,CAAC,CAAC,kDAAkD,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QAClG,CAAC,CAAC,WAAW,CAAC,MAAM,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QAC5C,CAAC,CAAC,eAAe,CAAC,CAAC,0BAA0B,CAAC,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;KACvE;AACH,CAAC;AATD,oCASC"}
package/dist/test.js CHANGED
@@ -3,14 +3,32 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
+ const fs_1 = require("fs");
6
7
  const ava_1 = __importDefault(require("ava"));
7
8
  const hardhat_1 = __importDefault(require("hardhat"));
8
9
  const path_1 = __importDefault(require("path"));
9
10
  const sources_1 = require("./generate/sources");
10
11
  const api_1 = require("./api");
11
- (0, ava_1.default)('result compiles', async (t) => {
12
- const generatedSourcesPath = path_1.default.join(hardhat_1.default.config.paths.sources, 'generated');
13
- await (0, sources_1.writeGeneratedSources)(generatedSourcesPath, 'all');
12
+ const test = ava_1.default;
13
+ test.serial('erc20 result compiles', async (t) => {
14
+ await testCompile(t, 'ERC20');
15
+ });
16
+ test.serial('erc721 result compiles', async (t) => {
17
+ await testCompile(t, 'ERC721');
18
+ });
19
+ test.serial('erc1155 result compiles', async (t) => {
20
+ await testCompile(t, 'ERC1155');
21
+ });
22
+ test.serial('governor result compiles', async (t) => {
23
+ await testCompile(t, 'Governor');
24
+ });
25
+ test.serial('custom result compiles', async (t) => {
26
+ await testCompile(t, 'Custom');
27
+ });
28
+ async function testCompile(t, kind) {
29
+ const generatedSourcesPath = path_1.default.join(hardhat_1.default.config.paths.sources, `generated`);
30
+ await fs_1.promises.rm(generatedSourcesPath, { force: true, recursive: true });
31
+ await (0, sources_1.writeGeneratedSources)(generatedSourcesPath, 'all', kind);
14
32
  // We only want to check that contracts compile and we don't care about any
15
33
  // of the outputs. Setting empty outputSelection causes compilation to go a
16
34
  // lot faster and not run out of memory.
@@ -19,7 +37,7 @@ const api_1 = require("./api");
19
37
  }
20
38
  await hardhat_1.default.run('compile');
21
39
  t.pass();
22
- });
40
+ }
23
41
  function isAccessControlRequired(opts) {
24
42
  switch (opts.kind) {
25
43
  case 'ERC20':
@@ -36,7 +54,7 @@ function isAccessControlRequired(opts) {
36
54
  throw new Error("No such kind");
37
55
  }
38
56
  }
39
- (0, ava_1.default)('is access control required', async (t) => {
57
+ test('is access control required', async (t) => {
40
58
  for (const contract of (0, sources_1.generateSources)('all')) {
41
59
  const regexOwnable = /import.*Ownable(Upgradeable)?.sol.*/gm;
42
60
  if (!contract.options.access) {
package/dist/test.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":";;;;;AAAA,8CAAuB;AACvB,sDAA0B;AAC1B,gDAAwB;AAExB,gDAA4E;AAE5E,+BAAiE;AAEjE,IAAA,aAAI,EAAC,iBAAiB,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAChC,MAAM,oBAAoB,GAAG,cAAI,CAAC,IAAI,CAAC,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAC9E,MAAM,IAAA,+BAAqB,EAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAEzD,2EAA2E;IAC3E,2EAA2E;IAC3E,wCAAwC;IACxC,KAAK,MAAM,EAAE,QAAQ,EAAE,IAAI,iBAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,EAAE;QACxD,QAAQ,CAAC,eAAe,GAAG,EAAE,CAAC;KAC/B;IAED,MAAM,iBAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACzB,CAAC,CAAC,IAAI,EAAE,CAAC;AACX,CAAC,CAAC,CAAC;AAEH,SAAS,uBAAuB,CAAC,IAAoB;IACnD,QAAO,IAAI,CAAC,IAAI,EAAE;QAChB,KAAK,OAAO;YACV,OAAO,WAAK,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC7C,KAAK,QAAQ;YACX,OAAO,YAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC9C,KAAK,SAAS;YACZ,OAAO,aAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC/C,KAAK,UAAU;YACb,OAAO,cAAQ,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAChD,KAAK,QAAQ;YACX,OAAO,YAAM,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAC9C;YACE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;KACnC;AACH,CAAC;AAED,IAAA,aAAI,EAAC,4BAA4B,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;IAC3C,KAAK,MAAM,QAAQ,IAAI,IAAA,yBAAe,EAAC,KAAK,CAAC,EAAE;QAC7C,MAAM,YAAY,GAAG,uCAAuC,CAAC;QAE7D,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;YAC5B,IAAI,uBAAuB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;gBAC7C,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;aAC1E;iBAAM;gBACL,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;aAC7E;SACF;KACF;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"test.js","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,4 @@
1
1
  export declare const durationPattern: RegExp;
2
2
  export declare function durationToBlocks(duration: string, blockTime: number): number;
3
+ export declare function durationToTimestamp(duration: string): string;
3
4
  //# sourceMappingURL=duration.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"duration.d.ts","sourceRoot":"","sources":["../../src/utils/duration.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,QAAqE,CAAC;AAWlG,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAoB5E"}
1
+ {"version":3,"file":"duration.d.ts","sourceRoot":"","sources":["../../src/utils/duration.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,eAAe,QAAqE,CAAC;AAWlG,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAoB5E;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAgB5D"}
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.durationToBlocks = exports.durationPattern = void 0;
3
+ exports.durationToTimestamp = exports.durationToBlocks = exports.durationPattern = void 0;
4
4
  const durationUnits = ['block', 'second', 'minute', 'hour', 'day', 'week', 'month', 'year'];
5
5
  exports.durationPattern = new RegExp(`^(\\d+(?:\\.\\d+)?) +(${durationUnits.join('|')})s?$`);
6
6
  const second = 1;
@@ -28,4 +28,18 @@ function durationToBlocks(duration, blockTime) {
28
28
  return Math.round(durationSeconds / blockTime);
29
29
  }
30
30
  exports.durationToBlocks = durationToBlocks;
31
+ function durationToTimestamp(duration) {
32
+ const match = duration.trim().match(exports.durationPattern);
33
+ if (!match) {
34
+ throw new Error('Bad duration format');
35
+ }
36
+ const value = match[1];
37
+ const unit = match[2];
38
+ // unit must be a Solidity supported time unit
39
+ if (unit === 'block' || unit === 'month' || unit === 'year') {
40
+ throw new Error('Invalid unit for timestamp');
41
+ }
42
+ return `${value} ${unit}s`;
43
+ }
44
+ exports.durationToTimestamp = durationToTimestamp;
31
45
  //# sourceMappingURL=duration.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"duration.js","sourceRoot":"","sources":["../../src/utils/duration.ts"],"names":[],"mappings":";;;AAAA,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAU,CAAC;AAExF,QAAA,eAAe,GAAG,IAAI,MAAM,CAAC,yBAAyB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAElG,MAAM,MAAM,GAAG,CAAC,CAAC;AACjB,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC;AAC3B,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,CAAC;AACzB,MAAM,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;AACtB,MAAM,IAAI,GAAG,CAAC,GAAG,GAAG,CAAC;AACrB,MAAM,KAAK,GAAG,EAAE,GAAG,GAAG,CAAC;AACvB,MAAM,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC;AACvB,MAAM,cAAc,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAExE,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,SAAiB;IAClE,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,uBAAe,CAAC,CAAC;IAErD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;KACxC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAkB,CAAC;IAEvC,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,OAAO,KAAK,CAAC;KACd;IAED,MAAM,eAAe,GAAG,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;AACjD,CAAC;AApBD,4CAoBC"}
1
+ {"version":3,"file":"duration.js","sourceRoot":"","sources":["../../src/utils/duration.ts"],"names":[],"mappings":";;;AAAA,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAU,CAAC;AAExF,QAAA,eAAe,GAAG,IAAI,MAAM,CAAC,yBAAyB,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;AAElG,MAAM,MAAM,GAAG,CAAC,CAAC;AACjB,MAAM,MAAM,GAAG,EAAE,GAAG,MAAM,CAAC;AAC3B,MAAM,IAAI,GAAG,EAAE,GAAG,MAAM,CAAC;AACzB,MAAM,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC;AACtB,MAAM,IAAI,GAAG,CAAC,GAAG,GAAG,CAAC;AACrB,MAAM,KAAK,GAAG,EAAE,GAAG,GAAG,CAAC;AACvB,MAAM,IAAI,GAAG,GAAG,GAAG,GAAG,CAAC;AACvB,MAAM,cAAc,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AAExE,SAAgB,gBAAgB,CAAC,QAAgB,EAAE,SAAiB;IAClE,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,uBAAe,CAAC,CAAC;IAErD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;KACxC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC;IACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAkB,CAAC;IAEvC,IAAI,IAAI,KAAK,OAAO,EAAE;QACpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YAC5B,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;QAED,OAAO,KAAK,CAAC;KACd;IAED,MAAM,eAAe,GAAG,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IACrD,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;AACjD,CAAC;AApBD,4CAoBC;AAED,SAAgB,mBAAmB,CAAC,QAAgB;IAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,uBAAe,CAAC,CAAC;IAErD,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;KACxC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;IACxB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAkB,CAAC;IAEvC,8CAA8C;IAC9C,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,MAAM,EAAE;QAC3D,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;KAC/C;IAED,OAAO,GAAG,KAAK,IAAI,IAAI,GAAG,CAAC;AAC7B,CAAC;AAhBD,kDAgBC"}
@@ -1 +1 @@
1
- {"version":3,"file":"zip-foundry.d.ts","sourceRoot":"","sources":["../src/zip-foundry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAsP3C,wBAAsB,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,cAAc,kBAUlE"}
1
+ {"version":3,"file":"zip-foundry.d.ts","sourceRoot":"","sources":["../src/zip-foundry.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAiW3C,wBAAsB,UAAU,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,cAAc,kBAUlE"}
@@ -18,10 +18,14 @@ function getHeader(c) {
18
18
  const test = (c, opts) => {
19
19
  return (0, format_lines_1.formatLinesWithSpaces)(2, ...(0, format_lines_1.spaceBetween)(getHeader(c), getImports(c), getTestCase(c)));
20
20
  function getImports(c) {
21
- return [
22
- 'import "forge-std/Test.sol";',
23
- `import "../src/${c.name}.sol";`,
21
+ const result = [
22
+ 'import {Test} from "forge-std/Test.sol";',
24
23
  ];
24
+ if (c.upgradeable) {
25
+ result.push('import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";');
26
+ }
27
+ result.push(`import {${c.name}} from "src/${c.name}.sol";`);
28
+ return result;
25
29
  }
26
30
  function getTestCase(c) {
27
31
  const args = getAddressArgs(c);
@@ -31,20 +35,53 @@ const test = (c, opts) => {
31
35
  `${c.name} public instance;`,
32
36
  ], [
33
37
  'function setUp() public {',
34
- getAddressVariables(args),
35
- [
36
- `instance = new ${getDeploymentCall(c, args)};`,
37
- ],
38
+ getAddressVariables(c, args),
39
+ getDeploymentCode(c, args),
38
40
  '}',
39
41
  ], getContractSpecificTestFunction()),
40
42
  '}',
41
43
  ];
42
44
  }
43
- function getAddressVariables(args) {
45
+ function getDeploymentCode(c, args) {
46
+ if (c.upgradeable) {
47
+ if ((opts === null || opts === void 0 ? void 0 : opts.upgradeable) === 'transparent') {
48
+ return [
49
+ `address proxy = Upgrades.deployTransparentProxy(`,
50
+ [
51
+ `"${c.name}.sol",`,
52
+ `initialOwner,`,
53
+ `abi.encodeCall(${c.name}.initialize, (${args.join(', ')}))`
54
+ ],
55
+ ');',
56
+ `instance = ${c.name}(proxy);`,
57
+ ];
58
+ }
59
+ else {
60
+ return [
61
+ `address proxy = Upgrades.deployUUPSProxy(`,
62
+ [
63
+ `"${c.name}.sol",`,
64
+ `abi.encodeCall(${c.name}.initialize, (${args.join(', ')}))`
65
+ ],
66
+ ');',
67
+ `instance = ${c.name}(proxy);`,
68
+ ];
69
+ }
70
+ }
71
+ else {
72
+ return [
73
+ `instance = new ${c.name}(${args.join(', ')});`,
74
+ ];
75
+ }
76
+ }
77
+ function getAddressVariables(c, args) {
44
78
  const vars = [];
45
- for (let i = 0; i < args.length; i++) {
46
- // use i + 1 as the private key since it must be non-zero
47
- vars.push(`address ${args[i]} = vm.addr(${i + 1});`);
79
+ let i = 1; // private key index starts from 1 since it must be non-zero
80
+ if (c.upgradeable && (opts === null || opts === void 0 ? void 0 : opts.upgradeable) === 'transparent' && !args.includes('initialOwner')) {
81
+ vars.push(`address initialOwner = vm.addr(${i++});`);
82
+ }
83
+ for (const arg of args) {
84
+ vars.push(`address ${arg} = vm.addr(${i++});`);
48
85
  }
49
86
  return vars;
50
87
  }
@@ -54,7 +91,7 @@ const test = (c, opts) => {
54
91
  case 'ERC20':
55
92
  case 'ERC721':
56
93
  return [
57
- 'function testName() public {',
94
+ 'function testName() public view {',
58
95
  [
59
96
  `assertEq(instance.name(), "${opts.name}");`
60
97
  ],
@@ -62,7 +99,7 @@ const test = (c, opts) => {
62
99
  ];
63
100
  case 'ERC1155':
64
101
  return [
65
- 'function testUri() public {',
102
+ 'function testUri() public view {',
66
103
  [
67
104
  `assertEq(instance.uri(0), "${opts.uri}");`
68
105
  ],
@@ -93,23 +130,26 @@ function getAddressArgs(c) {
93
130
  }
94
131
  return args;
95
132
  }
96
- function getDeploymentCall(c, args) {
97
- return `${c.name}(${args.join(', ')})`;
98
- }
99
- const script = (c) => {
133
+ const script = (c, opts) => {
100
134
  return (0, format_lines_1.formatLinesWithSpaces)(2, ...(0, format_lines_1.spaceBetween)(getHeader(c), getImports(c), getScript(c)));
101
135
  function getImports(c) {
102
- return [
103
- 'import "forge-std/Script.sol";',
104
- `import "../src/${c.name}.sol";`,
136
+ const result = [
137
+ 'import {Script} from "forge-std/Script.sol";',
138
+ 'import {console} from "forge-std/console.sol";',
105
139
  ];
140
+ if (c.upgradeable) {
141
+ result.push('import {Upgrades} from "openzeppelin-foundry-upgrades/Upgrades.sol";');
142
+ }
143
+ result.push(`import {${c.name}} from "src/${c.name}.sol";`);
144
+ return result;
106
145
  }
107
146
  function getScript(c) {
108
147
  const args = getAddressArgs(c);
109
148
  const deploymentLines = [
110
149
  'vm.startBroadcast();',
111
- `${c.name} instance = new ${getDeploymentCall(c, args)};`,
112
- 'console.log("Contract deployed to %s", address(instance));',
150
+ ...getAddressVariables(c, args),
151
+ ...getDeploymentCode(c, args),
152
+ `console.log("${c.upgradeable ? 'Proxy' : 'Contract'} deployed to %s", address(instance));`,
113
153
  'vm.stopBroadcast();',
114
154
  ];
115
155
  return [
@@ -124,14 +164,58 @@ const script = (c) => {
124
164
  '}',
125
165
  ];
126
166
  }
167
+ function getDeploymentCode(c, args) {
168
+ if (c.upgradeable) {
169
+ if ((opts === null || opts === void 0 ? void 0 : opts.upgradeable) === 'transparent') {
170
+ return [
171
+ `address proxy = Upgrades.deployTransparentProxy(`,
172
+ [
173
+ `"${c.name}.sol",`,
174
+ `initialOwner,`,
175
+ `abi.encodeCall(${c.name}.initialize, (${args.join(', ')}))`
176
+ ],
177
+ ');',
178
+ `${c.name} instance = ${c.name}(proxy);`,
179
+ ];
180
+ }
181
+ else {
182
+ return [
183
+ `address proxy = Upgrades.deployUUPSProxy(`,
184
+ [
185
+ `"${c.name}.sol",`,
186
+ `abi.encodeCall(${c.name}.initialize, (${args.join(', ')}))`
187
+ ],
188
+ ');',
189
+ `${c.name} instance = ${c.name}(proxy);`,
190
+ ];
191
+ }
192
+ }
193
+ else {
194
+ return [
195
+ `${c.name} instance = new ${c.name}(${args.join(', ')});`,
196
+ ];
197
+ }
198
+ }
199
+ function getAddressVariables(c, args) {
200
+ const vars = [];
201
+ if (c.upgradeable && (opts === null || opts === void 0 ? void 0 : opts.upgradeable) === 'transparent' && !args.includes('initialOwner')) {
202
+ vars.push('address initialOwner = <Set initialOwner address here>;');
203
+ }
204
+ for (const arg of args) {
205
+ vars.push(`address ${arg} = <Set ${arg} address here>;`);
206
+ }
207
+ return vars;
208
+ }
127
209
  function addTodoAndCommentOut(lines) {
128
210
  return [
129
- '// TODO: Set addresses for the contract arguments below, then uncomment the following lines',
130
- ...lines.map(l => `// ${l}`),
211
+ '// TODO: Set addresses for the variables below, then uncomment the following section:',
212
+ '/*',
213
+ ...lines,
214
+ '*/',
131
215
  ];
132
216
  }
133
217
  };
134
- const setupSh = `\
218
+ const setupSh = (c) => `\
135
219
  #!/usr/bin/env bash
136
220
 
137
221
  # Check if git is installed
@@ -153,23 +237,48 @@ if ! [ -f "foundry.toml" ]
153
237
  then
154
238
  echo "Initializing Foundry project..."
155
239
 
240
+ # Backup Wizard template readme to avoid it being overwritten
241
+ mv README.md README-oz.md
242
+
156
243
  # Initialize sample Foundry project
157
244
  forge init --force --no-commit --quiet
158
245
 
246
+ ${c.upgradeable ? `\
247
+ # Install OpenZeppelin Contracts and Upgrades
248
+ forge install OpenZeppelin/openzeppelin-contracts-upgradeable@v${openzeppelin_contracts_1.default.version} --no-commit --quiet
249
+ forge install OpenZeppelin/openzeppelin-foundry-upgrades --no-commit --quiet\
250
+ ` : `\
159
251
  # Install OpenZeppelin Contracts
160
- forge install OpenZeppelin/openzeppelin-contracts@v${openzeppelin_contracts_1.default.version} --no-commit --quiet
252
+ forge install OpenZeppelin/openzeppelin-contracts@v${openzeppelin_contracts_1.default.version} --no-commit --quiet\
253
+ `}
161
254
 
162
- # Remove template contracts
255
+ # Remove unneeded Foundry template files
163
256
  rm src/Counter.sol
164
257
  rm script/Counter.s.sol
165
258
  rm test/Counter.t.sol
259
+ rm README.md
260
+
261
+ # Restore Wizard template readme
262
+ mv README-oz.md README.md
166
263
 
167
264
  # Add remappings
168
265
  if [ -f "remappings.txt" ]
169
266
  then
170
267
  echo "" >> remappings.txt
171
268
  fi
172
- echo "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/" >> remappings.txt
269
+ ${c.upgradeable ? `\
270
+ echo "@openzeppelin/contracts/=lib/openzeppelin-contracts-upgradeable/lib/openzeppelin-contracts/contracts/" >> remappings.txt
271
+ echo "@openzeppelin/contracts-upgradeable/=lib/openzeppelin-contracts-upgradeable/contracts/" >> remappings.txt
272
+
273
+ # Add settings in foundry.toml
274
+ echo "" >> foundry.toml
275
+ echo "ffi = true" >> foundry.toml
276
+ echo "ast = true" >> foundry.toml
277
+ echo "build_info = true" >> foundry.toml
278
+ echo "extra_output = [\\"storageLayout\\"]" >> foundry.toml\
279
+ ` : `\
280
+ echo "@openzeppelin/contracts/=lib/openzeppelin-contracts/contracts/" >> remappings.txt\
281
+ `}
173
282
 
174
283
  # Perform initial git commit
175
284
  git add .
@@ -198,7 +307,7 @@ bash setup.sh
198
307
  ## Testing the contract
199
308
 
200
309
  \`\`\`
201
- forge test
310
+ forge test${c.upgradeable ? ' --force' : ''}
202
311
  \`\`\`
203
312
 
204
313
  ## Deploying the contract
@@ -206,7 +315,7 @@ forge test
206
315
  You can simulate a deployment by running the script:
207
316
 
208
317
  \`\`\`
209
- forge script script/${c.name}.s.sol
318
+ forge script script/${c.name}.s.sol${c.upgradeable ? ' --force' : ''}
210
319
  \`\`\`
211
320
 
212
321
  See [Solidity scripting guide](https://book.getfoundry.sh/tutorials/solidity-scripting) for more information.
@@ -215,8 +324,8 @@ async function zipFoundry(c, opts) {
215
324
  const zip = new jszip_1.default();
216
325
  zip.file(`src/${c.name}.sol`, (0, print_1.printContract)(c));
217
326
  zip.file(`test/${c.name}.t.sol`, test(c, opts));
218
- zip.file(`script/${c.name}.s.sol`, script(c));
219
- zip.file('setup.sh', setupSh);
327
+ zip.file(`script/${c.name}.s.sol`, script(c, opts));
328
+ zip.file('setup.sh', setupSh(c));
220
329
  zip.file('README.md', readme(c));
221
330
  return zip;
222
331
  }
@@ -1 +1 @@
1
- {"version":3,"file":"zip-foundry.js","sourceRoot":"","sources":["../src/zip-foundry.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"zip-foundry.js","sourceRoot":"","sources":["../src/zip-foundry.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openzeppelin/wizard",
3
- "version": "0.4.2",
3
+ "version": "0.4.3",
4
4
  "description": "A boilerplate generator to get started with OpenZeppelin Contracts",
5
5
  "license": "MIT",
6
6
  "repository": "github:OpenZeppelin/contracts-wizard",
@@ -25,7 +25,7 @@
25
25
  "@types/node": "^18.0.0",
26
26
  "@types/semver": "^7.5.7",
27
27
  "array.prototype.flat": "^1.2.4",
28
- "ava": "^5.0.0",
28
+ "ava": "^6.0.0",
29
29
  "hardhat": "^2.1.1",
30
30
  "jszip": "^3.6.0",
31
31
  "rimraf": "^5.0.0",
package/src/contract.ts CHANGED
@@ -48,6 +48,7 @@ export interface ContractFunction extends BaseFunction {
48
48
  code: string[];
49
49
  mutability: FunctionMutability;
50
50
  final: boolean;
51
+ comments: string[];
51
52
  }
52
53
 
53
54
  export type FunctionKind = 'internal' | 'public';
@@ -154,6 +155,7 @@ export class ContractBuilder implements Contract {
154
155
  code: [],
155
156
  mutability: 'nonpayable',
156
157
  final: false,
158
+ comments: [],
157
159
  ...baseFn,
158
160
  };
159
161
  this.functionMap.set(signature, fn);
@@ -192,6 +194,14 @@ export class ContractBuilder implements Contract {
192
194
  }
193
195
  }
194
196
 
197
+ setFunctionComments(comments: string[], baseFn: BaseFunction) {
198
+ const fn = this.addFunction(baseFn);
199
+ if (fn.comments.length > 0) {
200
+ throw new Error(`Function ${baseFn.name} already has comments`);
201
+ }
202
+ fn.comments = comments;
203
+ }
204
+
195
205
  /**
196
206
  * Note: The type in the variable is not currently transpiled, even if it refers to a contract
197
207
  */