@etherisc/gif-next 0.0.2-ead1eb0-841 → 0.0.2-eadf4ad-932

package/artifacts/contracts/type/AddressSet.sol/LibAddressSet.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

package/artifacts/contracts/type/Amount.sol/AmountLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

package/artifacts/contracts/type/ClaimId.sol/ClaimIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

package/artifacts/contracts/type/PayoutId.sol/PayoutIdLib.dbg.json

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -131,8 +131,8 @@
       "type": "function"
     }
   ],
-  "bytecode": "0x6102a461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea264697066735822122036b826bd6d7b71a3270149509b52d70dc801f63932e96bd0da858aec97afc7b964736f6c63430008140033",
-  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea264697066735822122036b826bd6d7b71a3270149509b52d70dc801f63932e96bd0da858aec97afc7b964736f6c63430008140033",
+  "bytecode": "0x6102a461003a600b82828239805160001a60731461002d57634e487b7160e01b600052600060045260246000fd5b30600052607381538281f3fe73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea26469706673582212205d7168abf718df24d6d18c611922fe1b9ef1a934aa86b261ecc919a9cbb1f8d064736f6c63430008140033",
+  "deployedBytecode": "0x73000000000000000000000000000000000000000030146080604052600436106100875760003560e01c806368aebf7b1161006557806368aebf7b14610119578063a42e52e914610127578063bc1b392d14610144578063f37f38f01461014b57600080fd5b8063057182b41461008c578063545ce21c146100bd57806367cb8ec1146100e7575b600080fd5b6100a861009a36600461020b565b67ffffffffffffffff161590565b60405190151581526020015b60405180910390f35b6100ce6100cb36600461020b565b90565b60405167ffffffffffffffff90911681526020016100b4565b6101066100f536600461020b565b60081b68ffffffffffffffff001690565b60405160ff1990911681526020016100b4565b6100ce6100cb36600461023c565b6100a861013536600461020b565b67ffffffffffffffff16151590565b60006100ce565b61015e61015936600461020b565b61016c565b6040519081526020016100b4565b600073__$4b9aaffa8d044614668dad578b824b8eee$__63f48016ce6014600885901b68ffffffffffffffff00166040516001600160e01b031960e085901b16815260ff909216600483015260ff19166024820152604401602060405180830381865af41580156101e1573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906102059190610255565b92915050565b60006020828403121561021d57600080fd5b813567ffffffffffffffff8116811461023557600080fd5b9392505050565b60006020828403121561024e57600080fd5b5035919050565b60006020828403121561026757600080fd5b505191905056fea26469706673582212205d7168abf718df24d6d18c611922fe1b9ef1a934aa86b261ecc919a9cbb1f8d064736f6c63430008140033",
   "linkReferences": {
     "contracts/type/Key32.sol": {
       "Key32Lib": [

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

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

@@ -1,4 +1,4 @@
 {
   "_format": "hh-sol-dbg-1",
-  "buildInfo": "../../../build-info/39ed64a6d94bda54f955e31d7771246c.json"
+  "buildInfo": "../../../build-info/071313f55f9ef304da85a07673bd5d7f.json"
 }

package/contracts/distribution/DistributionService.sol

@@ -58,12 +58,13 @@ contract DistributionService is
         initializer
         virtual override
     {
-        address initialOwner;
-        address registryAddress;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
-        // TODO while DistributionService is not deployed in DistributionServiceManager constructor
-        //      owner is DistributionServiceManager deployer
-        initializeService(registryAddress, address(0), owner);
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
+
+        initializeService(registryAddress, authority, owner);
         registerInterface(type(IDistributionService).interfaceId);
     }
 
@@ -284,6 +285,7 @@ contract DistributionService is
     )
         external
         virtual
+        restricted
     {
         bool isReferral = ! referralId.eqz();
         bool referralValid = referralIsValid(distributionNftId, referralId);

package/contracts/distribution/DistributionServiceManager.sol

@@ -14,15 +14,18 @@ contract DistributionServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with distribution service implementation and deploys instance
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        DistributionService distSrv = new DistributionService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        DistributionService distSrv = new DistributionService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(distSrv), 
-            data);
+            data,
+            salt);
 
         _distributionService = DistributionService(address(versionable));
         

package/contracts/instance/InstanceService.sol

@@ -52,15 +52,8 @@ contract InstanceService is
         }
         _;
     }
-    // TODO check service domain?
-    // TODO check release version?
-    modifier onlyRegisteredService() {
-        if (! getRegistry().isRegisteredService(msg.sender)) {
-            revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
-        }
-        _;
-    }
-    // TODO check release version?
+
+    // TODO check component - service - instance version match
     modifier onlyComponent() {
         if (! getRegistry().isRegisteredComponent(msg.sender)) {
             revert ErrorInstanceServiceRequestUnauhorized(msg.sender);
@@ -214,7 +207,7 @@ contract InstanceService is
         RoleId[] memory roles
     )
         external
-        onlyRegisteredService
+        restricted
     {
         (
             IInstance instance, // or instanceInfo
@@ -270,18 +263,18 @@ contract InstanceService is
         virtual override
     {
         (
-            address registryAddress,
-            address initialOwner
-        ) = abi.decode(data, (address, address));
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
+
+        initializeService(registryAddress, authority, owner);
 
         _registryService = IRegistryService(
             IRegistry(registryAddress).getServiceAddress(
                 REGISTRY(), 
                 getVersion().toMajorPart()));
 
-        // TODO while InstanceService is not deployed in InstanceServiceManager constructor
-        //      owner is InstanceServiceManager deployer
-        initializeService(registryAddress, address(0), owner);
         registerInterface(type(IInstanceService).interfaceId);
     }
 

package/contracts/instance/InstanceServiceManager.sol

@@ -13,33 +13,23 @@ contract InstanceServiceManager is ProxyManager {
 
     InstanceService private _instanceService;
 
-    /// @dev initializes proxy manager with instance service implementation and deploys instance
+    /// @dev initializes proxy manager with instance service implementation
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        InstanceService instSrv = new InstanceService();
+        InstanceService instSrv = new InstanceService{salt: salt}();
         // bytes memory initCode = type(InstanceService).creationCode;
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(instSrv), 
-            data);
+            data,
+            salt);
 
         _instanceService = InstanceService(address(versionable));
-
-        // TODO `this` must have a role or own nft to register service
-        //Registry registry = Registry(registryAddress);
-        //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _instanceService.getMajorVersion());
-        //RegistryService registryService = RegistryService(registryServiceAddress);
-        //registryService.registerService(_instanceService);
-        // RegistryService registryService = _instanceService.getRegistryService();
-
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_instanceService));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/BundleService.sol

@@ -53,12 +53,13 @@ contract BundleService is
         initializer
         virtual override
     {
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
-        // TODO while PoolService is not deployed in PoolServiceManager constructor
-        //      owner is PoolServiceManager deployer
-        initializeService(registryAddress, address(0), owner);
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
+
+        initializeService(registryAddress, authority, owner);
         registerInterface(type(IBundleService).interfaceId);
     }
 
@@ -122,7 +123,7 @@ contract BundleService is
     )
         external
         override
-        // TODO add restricted and add authz for pool service
+        restricted
         returns(NftId bundleNftId)
     {
         // register bundle with registry
@@ -192,7 +193,7 @@ contract BundleService is
         Amount premiumAmount // premium part that reaches bundle for this policy
     ) 
         external
-        onlyService // TODO replace with restricted + appropriate granting
+        restricted
     {
         InstanceReader instanceReader = instance.getInstanceReader();
         StateId bundleState = instanceReader.getMetadata(bundleNftId.toKey32(BUNDLE())).state;
@@ -298,7 +299,7 @@ contract BundleService is
     ) 
         external
         virtual
-        // TODO add restricted and autz for pool service
+        restricted
     {
         // udpate bundle state
         instance.getInstanceStore().updateBundleState(bundleNftId, CLOSED());
@@ -321,7 +322,7 @@ contract BundleService is
         Amount premiumAmount
     ) 
         external
-        onlyService 
+        restricted
     {
         InstanceReader instanceReader = instance.getInstanceReader();
         IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
@@ -338,7 +339,7 @@ contract BundleService is
         Amount collateralAmount
     ) 
         external
-        onlyService 
+        restricted 
     {
         InstanceReader instanceReader = instance.getInstanceReader();
         IBundle.BundleInfo memory bundleInfo = instanceReader.getBundleInfo(bundleNftId);
@@ -371,6 +372,7 @@ contract BundleService is
     ) 
         external
         virtual
+        restricted
     {
         // ensure policy is closeable
         if (!instance.getInstanceReader().policyIsCloseable(policyNftId)) {

package/contracts/pool/BundleServiceManager.sol

@@ -14,29 +14,20 @@ contract BundleServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with pool service implementation 
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        BundleService bundleSrv = new BundleService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        BundleService bundleSrv = new BundleService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(bundleSrv), 
-            data);
+            data,
+            salt);
 
         _bundleService = BundleService(address(versionable));
-
-        // TODO `this` must have a role or own nft to register service
-        //Registry registry = Registry(registryAddress);
-        //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _bundleService.getMajorVersion());
-        //RegistryService registryService = RegistryService(registryServiceAddress); 
-        //registryService.registerService(_poolService);
-        
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_poolService));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/pool/PoolService.sol

@@ -56,15 +56,14 @@ contract PoolService is
         initializer
         virtual override
     {
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
-        // TODO while PoolService is not deployed in PoolServiceManager constructor
-        //      owner is PoolServiceManager deployer
-        initializeService(registryAddress, address(0), owner);
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
 
+        initializeService(registryAddress, authority, owner);
         _bundleService = IBundleService(getRegistry().getServiceAddress(BUNDLE(), getVersion().toMajorPart()));
-
         registerInterface(type(IPoolService).interfaceId);
     }
 
@@ -122,6 +121,7 @@ contract PoolService is
         external
         virtual
     {
+        /*
         (NftId poolNftId,, IInstance instance) = _getAndVerifyCallingComponentAndInstance(POOL());
         InstanceReader instanceReader = instance.getInstanceReader();
 
@@ -134,6 +134,7 @@ contract PoolService is
         instance.getInstanceStore().updatePoolSetup(poolNftId, componentInfo, KEEP_STATE());
 
         emit LogPoolServiceMaxCapitalAmountUpdated(poolNftId, previousMaxCapitalAmount, maxCapitalAmount);
+        */
     }
 
     function setBundleOwnerRole(RoleId bundleOwnerRole)
@@ -182,7 +183,6 @@ contract PoolService is
         // TODO add logging
     }
 
-
     function createBundle(
         address owner, // initial bundle owner
         Fee memory fee, // fees deducted from premium that go to bundle owner
@@ -240,6 +240,7 @@ contract PoolService is
     ) 
         external
         virtual
+        restricted
     {
         IRegistry registry = getRegistry();
         IRegistry.ObjectInfo memory bundleObjectInfo = registry.getObjectInfo(bundleNftId);
@@ -275,7 +276,7 @@ contract PoolService is
     )
         external
         virtual
-        // TODO add restricted and granting for policy service
+        restricted
     {
         InstanceReader instanceReader = instance.getInstanceReader();
         NftId poolNftId = instanceReader.getProductSetupInfo(productNftId).poolNftId;
@@ -326,7 +327,7 @@ contract PoolService is
     )
         external
         virtual
-        // TODO add restricted and granting for claim service
+        restricted
     {
         _bundleService.releaseCollateral(
             instance, 
@@ -345,7 +346,7 @@ contract PoolService is
     )
         external
         virtual
-        // TODO add restricted and granting for policy service
+        restricted
     {
         _bundleService.releaseCollateral(
             instance, 

package/contracts/pool/PoolServiceManager.sol

@@ -14,29 +14,20 @@ contract PoolServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with pool service implementation 
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        PoolService poolSrv = new PoolService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        PoolService poolSrv = new PoolService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(poolSrv), 
-            data);
+            data,
+            salt);
 
         _poolService = PoolService(address(versionable));
-
-        // TODO `this` must have a role or own nft to register service
-        //Registry registry = Registry(registryAddress);
-        //address registryServiceAddress = registry.getServiceAddress(REGISTRY(), _poolService.getMajorVersion());
-        //RegistryService registryService = RegistryService(registryServiceAddress);
-        //registryService.registerService(_poolService);
-        
-        // TODO no nft to link yet
-        // link ownership of instance service manager ot nft owner of instance service
-        //_linkToNftOwnable(
-        //    address(registryAddress),
-        //    address(_poolService));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/product/ApplicationService.sol

@@ -64,12 +64,13 @@ contract ApplicationService is
         virtual override
         initializer()
     {
-        // TODO check this, might no longer be the way, refactor if necessary
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, address(0), owner);
+        initializeService(registryAddress, authority, owner);
         registerInterface(type(IApplicationService).interfaceId);
 
         _distributionService = IDistributionService(_getServiceAddress(DISTRIBUTION()));

package/contracts/product/ApplicationServiceManager.sol

@@ -11,15 +11,18 @@ contract ApplicationServiceManager is ProxyManager {
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
-        address registryAddress
-    )
+        address authority, 
+        address registryAddress,
+        bytes32 salt
+    ) 
         ProxyManager(registryAddress)
     {
-        ApplicationService svc = new ApplicationService();
-        bytes memory data = abi.encode(registryAddress, address(this));
-        IVersionable versionable = deploy(
+        ApplicationService svc = new ApplicationService{salt: salt}();
+        bytes memory data = abi.encode(registryAddress, address(this), authority);
+        IVersionable versionable = deployDetermenistic(
             address(svc), 
-            data);
+            data,
+            salt);
 
         _applicationService = ApplicationService(address(versionable));
     }

package/contracts/product/ClaimService.sol

@@ -62,12 +62,13 @@ contract ClaimService is
         virtual override
         initializer()
     {
-        // TODO check this, might no longer be the way, refactor if necessary
-        address registryAddress;
-        address initialOwner;
-        (registryAddress, initialOwner) = abi.decode(data, (address, address));
+        (
+            address registryAddress,, 
+            //address managerAddress
+            address authority
+        ) = abi.decode(data, (address, address, address));
 
-        initializeService(registryAddress, address(0), owner);
+        initializeService(registryAddress, authority, owner);
 
         _poolService = IPoolService(getRegistry().getServiceAddress(POOL(), getVersion().toMajorPart()));