@etherisc/gif-next 0.0.2-be8b468-276 → 0.0.2-c15bb6f-257

package/artifacts/contracts/types/Blocknumber.sol/BlocknumberLib.dbg.json

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

package/artifacts/contracts/types/ChainId.sol/ChainIdLib.dbg.json

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

package/artifacts/contracts/types/DistributorType.sol/DistributorTypeLib.dbg.json

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

package/artifacts/contracts/types/Fee.sol/FeeLib.dbg.json

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

package/artifacts/contracts/types/Key32.sol/Key32Lib.dbg.json

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

package/artifacts/contracts/types/NftId.sol/NftIdLib.dbg.json

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

package/artifacts/contracts/types/NftIdSet.sol/LibNftIdSet.dbg.json

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

package/artifacts/contracts/types/NumberId.sol/NumberIdLib.dbg.json

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

package/artifacts/contracts/types/ObjectType.sol/ObjectTypeLib.dbg.json

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

package/artifacts/contracts/types/Referral.sol/ReferralLib.dbg.json

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/contracts/components/Distribution.sol

@@ -127,7 +127,7 @@ contract Distribution is
             TokenHandler(address(_token)),
             _initialDistributionFee,
             _isVerifying,
-            address(0) // TODO: use correct wallet
+            address(this)
         );
     }
 

package/contracts/instance/InstanceService.sol

@@ -16,7 +16,7 @@ import {IService} from "../shared/IService.sol";
 import {ContractDeployerLib} from "../shared/ContractDeployerLib.sol";
 import {NftId, NftIdLib, zeroNftId} from "../../contracts/types/NftId.sol";
 import {VersionLib} from "../types/Version.sol";
-import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE} from "../types/RoleId.sol";
+import {ADMIN_ROLE, INSTANCE_SERVICE_ROLE, DISTRIBUTION_SERVICE_ROLE} from "../types/RoleId.sol";
 
 contract InstanceService is Service, IInstanceService {
 
@@ -44,8 +44,10 @@ contract InstanceService is Service, IInstanceService {
         address registryServiceAddress = registry.getServiceAddress("RegistryService", VersionLib.toVersion(3, 0, 0).toMajorPart());
         RegistryService registryService = RegistryService(registryServiceAddress);
 
+        // initially set the authority of the access managar to this (being the instance service). 
+        // This will allow the instance service to bootstrap the authorizations of the instance
+        // and then transfer the ownership of the access manager to the instance owner once everything is setup
         clonedAccessManager = AccessManagerSimple(Clones.clone(_accessManagerMaster));
-        // initial as this
         clonedAccessManager.initialize(address(this));
 
         clonedInstance = Instance(Clones.clone(_instanceMaster));
@@ -56,28 +58,29 @@ contract InstanceService is Service, IInstanceService {
         clonedInstanceReader = InstanceReader(Clones.clone(address(_instanceReaderMaster)));
         clonedInstanceReader.initialize(_registryAddress, instanceNftId);
 
-        _grantAuthorizations(clonedAccessManager, clonedInstance);
+        _grantInitialAuthorizations(clonedAccessManager, clonedInstance);
 
         clonedInstance.setInstanceReader(clonedInstanceReader);
 
-        // switch instance ownership to instance owner
+        // to complete setup switch instance ownership to the instance owner
+        // TODO: use a role less powerful than admin, maybe INSTANCE_ADMIN (does not exist yet)
         clonedAccessManager.grantRole(ADMIN_ROLE().toInt(), instanceOwner, 0);
         clonedAccessManager.revokeRole(ADMIN_ROLE().toInt(), address(this));
 
         emit LogInstanceCloned(address(clonedAccessManager), address(clonedInstance), address(clonedInstanceReader), instanceNftId);
     }
 
-    function _grantAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance) internal {
-        // grant initial permissions (if any)
-
-        // example
-        // clonedAccessManager.grantRole(INSTANCE_SERVICE_ROLE().toInt(), address(this), 0);
-        // bytes4[] memory instanceSetInstanceReaderSelectors = new bytes4[](1);
-        // instanceSetInstanceReaderSelectors[0] = clonedInstance.setInstanceReader.selector;
-        // clonedAccessManager.setTargetFunctionRole(
-        //     address(clonedInstance),
-        //     instanceSetInstanceReaderSelectors, 
-        //     INSTANCE_SERVICE_ROLE().toInt());
+    function _grantInitialAuthorizations(AccessManagerSimple clonedAccessManager, Instance clonedInstance) internal {
+        address distributionServiceAddress = _registry.getServiceAddress("DistributionService", VersionLib.toVersion(3, 0, 0).toMajorPart());
+        
+        clonedAccessManager.grantRole(DISTRIBUTION_SERVICE_ROLE().toInt(), distributionServiceAddress, 0);
+        bytes4[] memory instanceDistributionServiceSelectors = new bytes4[](2);
+        instanceDistributionServiceSelectors[0] = clonedInstance.createDistributionSetup.selector;
+        instanceDistributionServiceSelectors[1] = clonedInstance.updateDistributionSetup.selector;
+        clonedAccessManager.setTargetFunctionRole(
+            address(clonedInstance),
+            instanceDistributionServiceSelectors, 
+            DISTRIBUTION_SERVICE_ROLE().toInt());
     }
 
     function setAccessManagerMaster(address accessManagerMaster) external {
@@ -145,10 +148,6 @@ contract InstanceService is Service, IInstanceService {
         address initialOwner = address(0);
         (_registryAddress, initialOwner) = abi.decode(data, (address, address));
 
-        // // TODO register instance in registry  
-        IRegistry registry = IRegistry(_registryAddress);
-        NftId registryNftId = registry.getNftId(_registryAddress);
-
         _initializeService(_registryAddress, initialOwner);
         
         _registerInterface(type(IService).interfaceId);

package/contracts/instance/service/DistributionService.sol

@@ -59,12 +59,12 @@ contract DistributionService is
         return NAME;
     }
 
-    function register(address distributionComponentAddress, address componentOwner) 
+    function register(address distributionComponentAddress) 
         external 
-        // TODO restricted 
         returns (NftId distributionNftId)
     {
-        // TODO validate permission of componentOwner
+        address componentOwner = msg.sender;
+        // TODO validate permission of componentOwner. check if componentOwner has correct permission on instance via InstanceService - DISTRIBUTION_OWNER
         Distribution distribution = Distribution(distributionComponentAddress);
         IRegistryService registryService = getRegistryService();
         (IRegistry.ObjectInfo memory distributionObjInfo, ) = registryService.registerDistribution(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-be8b468-276",
+  "version": "0.0.2-c15bb6f-257",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {