@openzeppelin/wizard 0.2.2 → 0.3.0

package/src/environments/hardhat/upgradeable/package.json

@@ -9,7 +9,7 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@openzeppelin/contracts-upgradeable": "^4.8.0",
+    "@openzeppelin/contracts-upgradeable": "^4.8.3",
     "@openzeppelin/hardhat-upgrades": "^1.21.0",
     "@ethersproject/abi": "^5.7.0",
     "@ethersproject/providers": "^5.7.2",

package/src/erc721.ts

@@ -143,6 +143,7 @@ function addURIStorage(c: ContractBuilder) {
 
   c.addOverride('ERC721URIStorage', functions._burn);
   c.addOverride('ERC721URIStorage', functions.tokenURI);
+  c.addOverride('ERC721URIStorage', supportsInterface);
 }
 
 function addBurnable(c: ContractBuilder) {

package/src/governor.ts

@@ -117,6 +117,7 @@ function addBase(c: ContractBuilder, { name }: GovernorOptions) {
   c.addOverride('Governor', functions._cancel);
   c.addOverride('Governor', functions._executor);
   c.addOverride('Governor', supportsInterface);
+  c.addOverride('Governor', functions.cancel);
 }
 
 function addSettings(c: ContractBuilder, allOpts: Required<GovernorOptions>) {
@@ -365,6 +366,8 @@ function addBravo(c: ContractBuilder, { bravo, timelock }: GovernorOptions) {
       path: '@openzeppelin/contracts/governance/compatibility/GovernorCompatibilityBravo.sol',
     });
     c.addOverride('IGovernor', functions.state);
+    c.addOverride('IGovernor', functions.cancel);
+    c.addOverride('GovernorCompatibilityBravo', functions.cancel);
     c.addOverride('GovernorCompatibilityBravo', functions.propose);
     c.addOverride('IERC165', supportsInterface);
   }
@@ -433,6 +436,16 @@ const functions = defineFunctions({
     returns: ['uint256'],
     kind: 'internal',
   },
+  cancel: {
+    args: [
+      { name: 'targets', type: 'address[] memory' },
+      { name: 'values', type: 'uint256[] memory' },
+      { name: 'calldatas', type: 'bytes[] memory' },
+      { name: 'descriptionHash', type: 'bytes32' },
+    ],
+    returns: ['uint256'],
+    kind: 'public',
+  },
   state: {
     args: [
       { name: 'proposalId', type: 'uint256' },

package/src/index.ts

@@ -5,7 +5,6 @@ export type { Contract } from './contract';
 export { ContractBuilder } from './contract';
 
 export { printContract } from './print';
-export { printContractVersioned } from './print-versioned';
 
 export type { Access } from './set-access-control';
 export type { Upgradeable } from './set-upgradeable';

package/src/scripts/prepare.ts

@@ -4,12 +4,10 @@ import hre from 'hardhat';
 import type { BuildInfo } from 'hardhat/types';
 import type { SourceUnit } from 'solidity-ast';
 import { findAll } from 'solidity-ast/utils';
-import _rimraf from 'rimraf';
+import { rimraf } from 'rimraf';
 import { promisify } from 'util';
 import { version } from "@openzeppelin/contracts/package.json";
 
-const rimraf = promisify(_rimraf);
-
 import type { OpenZeppelinContracts } from '../../openzeppelin-contracts';
 import { writeGeneratedSources } from '../generate/sources';
 import { mapValues } from '../utils/map-values';