@etherisc/gif-next 0.0.2-f36fd21-685 → 0.0.2-f47f21f-178

package/contracts/upgradeability/ProxyManager.sol

@@ -40,57 +40,68 @@ contract ProxyManager is
     mapping(Version version => VersionInfo info) _versionHistory;
     Version [] _versions;
 
-    /// @dev only used to capture proxy owner
-    constructor(address registry)
-    { 
-        initializeProxyManager(registry);
-    }
-
-    function initializeProxyManager(address registry)
+    /// @dev convencience initializer
+    function initialize(
+        address registry,
+        address implementation,
+        bytes memory data,
+        bytes32 salt
+    )
         public
         initializer()
+        returns (IVersionable versionable)
     {
-        initializeNftOwnable(msg.sender, registry);
+        versionable = deployDetermenistic(
+            registry,
+            implementation, 
+            data,
+            salt);
     }
 
     /// @dev deploy initial contract
-    function deploy(address initialImplementation, bytes memory initializationData)
+    function deploy(
+        address registry, 
+        address initialImplementation, 
+        bytes memory initializationData
+    )
         public
         virtual
-        onlyOwner()
+        onlyInitializing()
         returns (IVersionable versionable)
     {
-        if (_versions.length > 0) {
-            revert ErrorProxyManagerAlreadyDeployed();
-        }
+        (
+            address currentProxyOwner, 
+            address initialProxyAdminOwner
+        ) = _preDeployChecksAndSetup(registry);
 
-        address currentProxyOwner = getOwner(); // used by implementation
-        address initialProxyAdminOwner = address(this); // used by proxy
-        
         _proxy = new UpgradableProxyWithAdmin(
             initialImplementation,
             initialProxyAdminOwner,
             getDeployData(currentProxyOwner, initializationData)
         );
 
-        versionable = IVersionable(address(_proxy));
-        _updateVersionHistory(versionable.getVersion(), initialImplementation, currentProxyOwner);
+        versionable = _updateVersionHistory(
+            initialImplementation, 
+            currentProxyOwner);
 
-        emit LogProxyManagerVersionableDeployed(address(_proxy), initialImplementation);
+        emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
     }
 
-    function deployDetermenistic(address initialImplementation, bytes memory initializationData, bytes32 salt)
+    function deployDetermenistic(
+        address registry, 
+        address initialImplementation, 
+        bytes memory initializationData, 
+        bytes32 salt
+    )
         public
         virtual
-        onlyOwner()
+        onlyInitializing()
         returns (IVersionable versionable)
     {
-        if (_versions.length > 0) {
-            revert ErrorProxyManagerAlreadyDeployed();
-        }
-
-        address currentProxyOwner = getOwner();
-        address initialProxyAdminOwner = address(this);
+        (
+            address currentProxyOwner, 
+            address initialProxyAdminOwner
+        ) = _preDeployChecksAndSetup(registry);
 
         _proxy = new UpgradableProxyWithAdmin{salt: salt}(
             initialImplementation,
@@ -98,10 +109,11 @@ contract ProxyManager is
             getDeployData(currentProxyOwner, initializationData)
         );
 
-        versionable = IVersionable(address(_proxy));
-        _updateVersionHistory(versionable.getVersion(), initialImplementation, currentProxyOwner);
+        versionable = _updateVersionHistory(
+            initialImplementation, 
+            currentProxyOwner);
 
-        emit LogProxyManagerVersionableDeployed(address(_proxy), initialImplementation);
+        emit LogProxyManagerVersionableDeployed(address(versionable), initialImplementation);
     }
 
     /// @dev upgrade existing contract
@@ -124,10 +136,11 @@ contract ProxyManager is
             newImplementation, 
             getUpgradeData(upgradeData));
 
-        versionable = IVersionable(address(_proxy));
-        _updateVersionHistory(versionable.getVersion(), newImplementation, currentProxyOwner);
+        versionable = _updateVersionHistory(
+            newImplementation, 
+            currentProxyOwner);
 
-        emit LogProxyManagerVersionableUpgraded(address(_proxy), newImplementation);
+        emit LogProxyManagerVersionableUpgraded(address(versionable), newImplementation);
 
     }
 
@@ -168,13 +181,34 @@ contract ProxyManager is
         return _versionHistory[_version];
     }
 
+    function _preDeployChecksAndSetup(address registry)
+        private
+        returns (
+            address currentProxyOwner,
+            address initialProxyAdminOwner
+        )
+    {
+        if (_versions.length > 0) {
+            revert ErrorProxyManagerAlreadyDeployed();
+        }
+
+        address initialOwner = msg.sender;
+        _initializeNftOwnable(registry, initialOwner);
+
+        currentProxyOwner = getOwner(); // used by implementation
+        initialProxyAdminOwner = address(this); // used by proxy
+    }
+
     function _updateVersionHistory(
-        Version newVersion,
         address implementation,
         address activatedBy
     )
         private
+        returns (IVersionable versionable)
     {
+        versionable = IVersionable(address(_proxy));
+        Version newVersion = versionable.getVersion();
+
         if(newVersion == VersionLib.zeroVersion()) {
             revert ErrorProxyManagerZeroVersion();
         }

package/contracts/upgradeability/Versionable.sol

@@ -20,7 +20,7 @@ abstract contract Versionable is
         bytes memory data
     )
         public
-        initializer
+        initializer()
     {
         _initialize(activatedBy, data);
     }
@@ -41,7 +41,7 @@ abstract contract Versionable is
     // each implementation MUST call intializers of all base contracts...
     function _initialize(address owner, bytes memory data) 
         internal
-        onlyInitializing
+        onlyInitializing()
         virtual 
     {
         revert();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-f36fd21-685",
+  "version": "0.0.2-f47f21f-178",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -49,6 +49,7 @@
     "abi-coder": "^5.0.0",
     "antlr4ng": "^3.0.4",
     "ethers": "^6.7.1",
+    "ethers-decode-error": "^2.1.3",
     "solidity-docgen": "^0.6.0-beta.36",
     "winston": "^3.10.0"
   }

package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/8dd0451613123196cbb8bbbf43a69f7a.json"
-}

package/artifacts/contracts/authorization/IModuleAuthorization.sol/IModuleAuthorization.json

@@ -1,290 +0,0 @@
-{
-  "_format": "hh-sol-artifact-1",
-  "contractName": "IModuleAuthorization",
-  "sourceName": "contracts/authorization/IModuleAuthorization.sol",
-  "abi": [
-    {
-      "inputs": [
-        {
-          "internalType": "Str",
-          "name": "target",
-          "type": "bytes32"
-        },
-        {
-          "internalType": "RoleId",
-          "name": "roleId",
-          "type": "uint64"
-        }
-      ],
-      "name": "getAuthorizedFunctions",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "Str",
-              "name": "name",
-              "type": "bytes32"
-            },
-            {
-              "internalType": "Selector",
-              "name": "selector",
-              "type": "bytes4"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "createdAt",
-              "type": "uint40"
-            }
-          ],
-          "internalType": "struct IAccess.FunctionInfo[]",
-          "name": "authorizatedFunctions",
-          "type": "tuple[]"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Str",
-          "name": "target",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getAuthorizedRoles",
-      "outputs": [
-        {
-          "internalType": "RoleId[]",
-          "name": "roleIds",
-          "type": "uint64[]"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getRelease",
-      "outputs": [
-        {
-          "internalType": "VersionPart",
-          "name": "release",
-          "type": "uint8"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "RoleId",
-          "name": "roleId",
-          "type": "uint64"
-        }
-      ],
-      "name": "getRoleInfo",
-      "outputs": [
-        {
-          "components": [
-            {
-              "internalType": "RoleId",
-              "name": "adminRoleId",
-              "type": "uint64"
-            },
-            {
-              "internalType": "enum IAccess.RoleType",
-              "name": "roleType",
-              "type": "uint8"
-            },
-            {
-              "internalType": "uint32",
-              "name": "maxMemberCount",
-              "type": "uint32"
-            },
-            {
-              "internalType": "Str",
-              "name": "name",
-              "type": "bytes32"
-            },
-            {
-              "internalType": "Timestamp",
-              "name": "createdAt",
-              "type": "uint40"
-            }
-          ],
-          "internalType": "struct IAccess.RoleInfo",
-          "name": "roleInfo",
-          "type": "tuple"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getRoles",
-      "outputs": [
-        {
-          "internalType": "RoleId[]",
-          "name": "roles",
-          "type": "uint64[]"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getServiceDomains",
-      "outputs": [
-        {
-          "internalType": "ObjectType[]",
-          "name": "serviceDomains",
-          "type": "uint8[]"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "ObjectType",
-          "name": "serviceDomain",
-          "type": "uint8"
-        }
-      ],
-      "name": "getServiceRole",
-      "outputs": [
-        {
-          "internalType": "RoleId",
-          "name": "serviceRoleId",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "pure",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "ObjectType",
-          "name": "serviceDomain",
-          "type": "uint8"
-        }
-      ],
-      "name": "getServiceTarget",
-      "outputs": [
-        {
-          "internalType": "Str",
-          "name": "serviceTarget",
-          "type": "bytes32"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getTarget",
-      "outputs": [
-        {
-          "internalType": "Str",
-          "name": "target",
-          "type": "bytes32"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getTargetName",
-      "outputs": [
-        {
-          "internalType": "string",
-          "name": "name",
-          "type": "string"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Str",
-          "name": "target",
-          "type": "bytes32"
-        }
-      ],
-      "name": "getTargetRole",
-      "outputs": [
-        {
-          "internalType": "RoleId",
-          "name": "roleId",
-          "type": "uint64"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [],
-      "name": "getTargets",
-      "outputs": [
-        {
-          "internalType": "Str[]",
-          "name": "targets",
-          "type": "bytes32[]"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "RoleId",
-          "name": "roleId",
-          "type": "uint64"
-        }
-      ],
-      "name": "roleExists",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "exists",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    },
-    {
-      "inputs": [
-        {
-          "internalType": "Str",
-          "name": "target",
-          "type": "bytes32"
-        }
-      ],
-      "name": "targetExists",
-      "outputs": [
-        {
-          "internalType": "bool",
-          "name": "exists",
-          "type": "bool"
-        }
-      ],
-      "stateMutability": "view",
-      "type": "function"
-    }
-  ],
-  "bytecode": "0x",
-  "deployedBytecode": "0x",
-  "linkReferences": {},
-  "deployedLinkReferences": {}
-}

package/artifacts/contracts/authorization/ModuleAuthorization.sol/ModuleAuthorization.dbg.json

@@ -1,4 +0,0 @@
-{
-  "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/8dd0451613123196cbb8bbbf43a69f7a.json"
-}