Merge pull request #63 from CMTA/fb-initialize-patch-only

Separate initialization call from the constructor
CMTA · Nov 2, 2022 · 1987be5 · 1987be5
2 parents 863c7b0 + df938f8
commit 1987be5
Show file tree

Hide file tree

Showing 15 changed files with 52 additions and 33 deletions.
diff --git a/contracts/CMTAT.sol b/contracts/CMTAT.sol
@@ -34,14 +34,8 @@ contract CMTAT is
     string constant TEXT_TRANSFER_OK = "No restriction";
 
     constructor(
-        address owner,
-        address forwarder,
-        string memory name,
-        string memory symbol,
-        string memory tokenId,
-        string memory terms
+        address forwarder
     ) MetaTxModule(forwarder) {
-        __CMTAT_init(owner, name, symbol, tokenId, terms);
     }
 
     function initialize(
@@ -66,7 +60,7 @@ contract CMTAT is
         string memory symbol,
         string memory tokenId,
         string memory terms
-    ) internal initializer {
+    ) internal onlyInitializing {
         __Context_init_unchained();
         __Base_init_unchained(0, tokenId, terms);
         __AccessControl_init_unchained();
@@ -77,7 +71,7 @@ contract CMTAT is
         __CMTAT_init_unchained(owner);
     }
 
-    function __CMTAT_init_unchained(address owner) internal initializer {
+    function __CMTAT_init_unchained(address owner) internal onlyInitializing {
         _setupRole(DEFAULT_ADMIN_ROLE, owner);
         _setupRole(ENFORCER_ROLE, owner);
         _setupRole(MINTER_ROLE, owner);

diff --git a/contracts/modules/BaseModule.sol b/contracts/modules/BaseModule.sol
@@ -28,7 +28,7 @@ abstract contract BaseModule is Initializable, ERC20Upgradeable {
         uint8 decimals_,
         string memory tokenId_,
         string memory terms_
-    ) internal initializer {
+    ) internal onlyInitializing {
         __ERC20_init(name_, symbol_);
         _decimals = decimals_;
         tokenId = tokenId_;
@@ -39,7 +39,7 @@ abstract contract BaseModule is Initializable, ERC20Upgradeable {
         uint8 decimals_,
         string memory tokenId_,
         string memory terms_
-    ) internal initializer {
+    ) internal onlyInitializing {
         _decimals = decimals_;
         tokenId = tokenId_;
         terms = terms_;

diff --git a/contracts/modules/EnforcementModule.sol b/contracts/modules/EnforcementModule.sol
@@ -36,12 +36,12 @@ abstract contract EnforcementModule is
     /**
      * @dev Initializes the contract in unpaused state.
      */
-    function __Enforcement_init() internal initializer {
+    function __Enforcement_init() internal onlyInitializing {
         __Context_init_unchained();
         __Enforcement_init_unchained();
     }
 
-    function __Enforcement_init_unchained() internal initializer {}
+    function __Enforcement_init_unchained() internal onlyInitializing {}
 
     /**
      * @dev Returns true if the contract is paused, and false otherwise.

diff --git a/contracts/modules/SnapshotModule.sol b/contracts/modules/SnapshotModule.sol
@@ -36,12 +36,12 @@ abstract contract SnapshotModule is
 
     uint256[] private _scheduledSnapshots;
 
-    function __Snapshot_init() internal initializer {
+    function __Snapshot_init() internal onlyInitializing {
         __Context_init_unchained();
         __Snapshot_init_unchained();
     }
 
-    function __Snapshot_init_unchained() internal initializer {}
+    function __Snapshot_init_unchained() internal onlyInitializing{}
 
     function _scheduleSnapshot(uint256 time) internal returns (uint256) {
         require(block.timestamp < time, "Snapshot scheduled in the past");

diff --git a/contracts/modules/ValidationModule.sol b/contracts/modules/ValidationModule.sol
@@ -22,14 +22,14 @@ abstract contract ValidationModule is Initializable, ContextUpgradeable {
     /**
      * @dev Initializes the contract with rule engine.
      */
-    function __Validation_init(IRuleEngine ruleEngine_) internal initializer {
+    function __Validation_init(IRuleEngine ruleEngine_) internal onlyInitializing {
         __Context_init_unchained();
         __Validation_init_unchained(ruleEngine_);
     }
 
     function __Validation_init_unchained(IRuleEngine ruleEngine_)
         internal
-        initializer
+        onlyInitializing
     {
         if (address(ruleEngine_) != address(0)) {
             ruleEngine = ruleEngine_;

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/modules/AuthorizationModule.test.js b/test/modules/AuthorizationModule.test.js
@@ -9,7 +9,8 @@ contract(
   'AuthorizationModule',
   function ([_, owner, address1, address2, address3, fakeRuleEngine]) {
     beforeEach(async function () {
-      this.cmtat = await CMTAT.new(owner, _, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+      this.cmtat = await CMTAT.new(_, { from: owner })
+      await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
     })
 
     context('Authorization', function () {

diff --git a/test/modules/BaseModule.test.js b/test/modules/BaseModule.test.js
@@ -8,7 +8,8 @@ contract(
   'BaseModule',
   function ([_, owner, address1, address2, address3, fakeRuleEngine]) {
     beforeEach(async function () {
-      this.cmtat = await CMTAT.new(owner, _, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+      this.cmtat = await CMTAT.new(_, { from: owner })
+      await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
     })
 
     context('Token structure', function () {

diff --git a/test/modules/BurnModule.test.js b/test/modules/BurnModule.test.js
@@ -8,7 +8,8 @@ contract(
   'BurnModule',
   function ([_, owner, address1, address2, address3, fakeRuleEngine]) {
     beforeEach(async function () {
-      this.cmtat = await CMTAT.new(owner, _, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+      this.cmtat = await CMTAT.new(_, { from: owner })
+      await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
     })
 
     context('Burn', function () {

diff --git a/test/modules/EnforcementModule.test.js b/test/modules/EnforcementModule.test.js
@@ -8,7 +8,8 @@ contract(
   'EnforcementModule',
   function ([_, owner, address1, address2, address3, fakeRuleEngine]) {
     beforeEach(async function () {
-      this.cmtat = await CMTAT.new(owner, _, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+      this.cmtat = await CMTAT.new(_, { from: owner })
+      await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
     })
 
     context('Freeze', function () {

diff --git a/test/modules/MetaTxModule.test.js b/test/modules/MetaTxModule.test.js
@@ -28,8 +28,9 @@ contract(
   ]) {
     beforeEach(async function () {
       this.trustedForwarder = await MinimalForwarderMock.new()
+      this.cmtat = await CMTAT.new(this.trustedForwarder.address, { from: owner })
       this.trustedForwarder.initialize()
-      this.cmtat = await CMTAT.new(owner, this.trustedForwarder.address, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+      await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
     })
 
     context('Transferring without paying gas', function () {

diff --git a/test/modules/MintModule.test.js b/test/modules/MintModule.test.js
@@ -8,7 +8,8 @@ contract(
   'MintModule',
   function ([_, owner, address1, address2, address3, fakeRuleEngine]) {
     beforeEach(async function () {
-      this.cmtat = await CMTAT.new(owner, _, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+      this.cmtat = await CMTAT.new(_, { from: owner })
+      await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
     })
 
     context('Minting', function () {

diff --git a/test/modules/PauseModule.test.js b/test/modules/PauseModule.test.js
@@ -6,7 +6,8 @@ const CMTAT = artifacts.require('CMTAT')
 
 contract('PauseModule', function ([_, owner, address1, address2, address3]) {
   beforeEach(async function () {
-    this.cmtat = await CMTAT.new(owner, _, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+    this.cmtat = await CMTAT.new(_, { from: owner })
+    await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
   })
 
   context('Pause', function () {

diff --git a/test/modules/SnapshotModule.test.js b/test/modules/SnapshotModule.test.js
@@ -15,7 +15,8 @@ contract(
   'SnapshotModule',
   function ([_, owner, address1, address2, address3, fakeRuleEngine]) {
     beforeEach(async function () {
-      this.cmtat = await CMTAT.new(owner, _, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+      this.cmtat = await CMTAT.new(_, { from: owner })
+      await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
     })
 
     context('Snapshot scheduling', function () {

diff --git a/test/modules/ValidationModule.test.js b/test/modules/ValidationModule.test.js
@@ -9,7 +9,8 @@ contract(
   'ValidationModule',
   function ([_, owner, address1, address2, address3, fakeRuleEngine]) {
     beforeEach(async function () {
-      this.cmtat = await CMTAT.new(owner, _, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
+      this.cmtat = await CMTAT.new(_, { from: owner })
+      await this.cmtat.initialize(owner, 'CMTA Token', 'CMTAT', 'CMTAT_ISIN', 'https://cmta.ch', { from: owner })
     })
 
     context('Rule Engine', function () {