@etherisc/gif-next 0.0.2-c68eaf3-087 → 0.0.2-c7609c4-545

package/artifacts/contracts/type/RiskId.sol/RiskIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/RoleId.sol/RoleIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/Seconds.sol/SecondsLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/Selector.sol/SelectorLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/Selector.sol/SelectorSetLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/StateId.sol/StateIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/String.sol/StrLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/Timestamp.sol/TimestampLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/UFixed.sol/MathLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/UFixed.sol/UFixedLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/Version.sol/VersionLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/type/Version.sol/VersionPartLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/upgradeability/IVersionable.sol/IVersionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/upgradeability/ProxyManager.sol/ProxyManager.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/upgradeability/UpgradableProxyWithAdmin.sol/UpgradableProxyWithAdmin.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/artifacts/contracts/upgradeability/Versionable.sol/Versionable.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/acc82443fc6a12a57286b340307ede8d.json"
+  "buildInfo": "../../../build-info/2f62bff0f513c60dba9ae931230f6f93.json"
 }

package/contracts/instance/IInstanceService.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
 import {BundleSet} from "./BundleSet.sol";
-import {Instance} from "./Instance.sol";
+import {IInstance} from "./IInstance.sol";
 import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IService} from "../shared/IService.sol";
 import {NftId} from "../type/NftId.sol";
@@ -55,8 +55,7 @@ interface IInstanceService is IService {
     function createInstance()
         external 
         returns (
-            // TODO check if Instance can be changed to IInstance
-            Instance clonedInstance,
+            IInstance instance,
             NftId instanceNftId
         );
 

package/contracts/instance/InstanceAdmin.sol

@@ -43,11 +43,11 @@ contract InstanceAdmin is
     /// @dev Only used for master instance admin.
     /// Contracts created via constructor come with disabled initializers.
     constructor(
-        IAuthorization instanceAuthorization
+        address instanceAuthorization
     )
         AccessAdmin()
     {
-        _instanceAuthorization = instanceAuthorization;
+        _instanceAuthorization = IAuthorization(instanceAuthorization);
     }
 
     /// @dev Initializes this instance admin with the provided instances authorization specification.
@@ -56,7 +56,7 @@ contract InstanceAdmin is
     /// Important: Initialization of this instance admin is only complete after calling function initializeInstance. 
     function initialize(
         AccessManagerCloneable accessManager,
-        IAuthorization instanceAuthorization
+        address instanceAuthorization
     )
         external
         initializer() 

package/contracts/instance/InstanceService.sol

@@ -96,8 +96,8 @@ contract InstanceService is
     function createInstance()
         external 
         returns (
-            Instance clonedInstance,
-            NftId clonedInstanceNftId
+            IInstance instance,
+            NftId instanceNftId
         )
     {
         // tx sender will become instance owner
@@ -105,24 +105,24 @@ contract InstanceService is
 
         // create instance admin and instance
         InstanceAdmin instanceAdmin = _createInstanceAdmin();
-        clonedInstance = _createInstance(instanceAdmin, instanceOwner);
+        instance = _createInstance(instanceAdmin, instanceOwner);
 
         // register cloned instance with registry
-        clonedInstanceNftId = _registryService.registerInstance(
-            clonedInstance, instanceOwner).nftId;
+        instanceNftId = _registryService.registerInstance(
+            instance, instanceOwner).nftId;
 
         // register cloned instance as staking target
         _stakingService.createInstanceTarget(
-            clonedInstanceNftId,
+            instanceNftId,
             TargetManagerLib.getDefaultLockingPeriod(),
             TargetManagerLib.getDefaultRewardRate());
 
         // MUST be set after instance is set up and registered
-        instanceAdmin.initializeInstanceAuthorization(address(clonedInstance));
+        instanceAdmin.initializeInstanceAuthorization(address(instance));
 
         emit LogInstanceCloned(
-            clonedInstanceNftId,
-            address(clonedInstance));
+            instanceNftId,
+            address(instance));
     }
 
 
@@ -293,9 +293,11 @@ contract InstanceService is
         clonedAccessManager.initialize(
             address(clonedInstanceAdmin)); // grant ADMIN_ROLE to instance admin
 
+        address authorization = address(
+            InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
         clonedInstanceAdmin.initialize(
             clonedAccessManager,
-            InstanceAdmin(_masterInstanceAdmin).getInstanceAuthorization());
+            authorization);
     }
 
 
@@ -307,14 +309,14 @@ contract InstanceService is
     )
         internal
         virtual
-        returns (Instance clonedInstance)
+        returns (IInstance)
     {
         InstanceStore clonedInstanceStore = InstanceStore(Clones.clone(address(_masterInstanceStore)));
         BundleSet clonedBundleSet = BundleSet(Clones.clone(_masterInstanceBundleSet));
         InstanceReader clonedInstanceReader = InstanceReader(Clones.clone(address(_masterInstanceReader)));
 
         // clone instance
-        clonedInstance = Instance(Clones.clone(_masterInstance));
+        Instance clonedInstance = Instance(Clones.clone(_masterInstance));
         clonedInstance.initialize(
             instanceAdmin,
             clonedInstanceStore,
@@ -322,6 +324,7 @@ contract InstanceService is
             clonedInstanceReader,
             getRegistry(),
             instanceOwner);
+        return clonedInstance;
     }
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-c68eaf3-087",
+  "version": "0.0.2-c7609c4-545",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -32,7 +32,7 @@
     "@nomicfoundation/hardhat-foundry": "^1.1.1",
     "@nomicfoundation/hardhat-toolbox": "^5.0.0",
     "@nomicfoundation/hardhat-verify": "^2.0.1",
-    "@typescript-eslint/eslint-plugin": "^7.1.0",
+    "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.1.0",
     "antlr4ng-cli": "^2.0.0",
     "dotenv": "^16.3.1",