@etherisc/gif-next 0.0.2-f18fb8b-243 → 0.0.2-f1f3b2c-994

package/contracts/examples/unpermissioned/SimplePool.sol

@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {Amount, AmountLib} from "../../type/Amount.sol";
+import {BasicPool} from "../../pool/BasicPool.sol";
+import {BasicPoolAuthorization} from "../../pool/BasicPoolAuthorization.sol";
+import {Fee} from "../../type/Fee.sol";
+import {IAuthorization} from "../../authorization/IAuthorization.sol";
+import {NftId} from "../../type/NftId.sol";
+import {Seconds} from "../../type/Timestamp.sol";
+import {UFixed} from "../../type/UFixed.sol";
+
+contract SimplePool is
+    BasicPool
+{
+    
+    constructor(
+        address registry,
+        NftId instanceNftId,
+        address token,
+        IAuthorization authorization,
+        address initialOwner
+    ) 
+    {
+        initialize(
+            registry,
+            instanceNftId,
+            token,
+            authorization,
+            initialOwner
+        );
+    }
+
+    function initialize(
+        address registry,
+        NftId instanceNftId,
+        address token,
+        IAuthorization authorization,
+        address initialOwner
+    )
+        public
+        virtual
+        initializer()
+    {
+        _initializeBasicPool(
+            registry,
+            instanceNftId,
+            authorization,
+            token,
+            "SimplePool",
+            initialOwner);
+    }
+
+    function createBundle(
+        Fee memory fee,
+        uint256 initialAmount,
+        Seconds lifetime,
+        bytes calldata filter
+    )
+        external
+        virtual 
+        returns(NftId bundleNftId, uint256 netStakedAmountInt)
+    {
+        address owner = msg.sender;
+        Amount netStakedAmount;
+        bundleNftId = _createBundle(
+            owner,
+            fee,
+            lifetime,
+            filter
+        );
+        netStakedAmount = _stake(bundleNftId, AmountLib.toAmount(initialAmount));
+        netStakedAmountInt = netStakedAmount.toInt();
+    }
+
+}

package/contracts/examples/unpermissioned/SimpleProduct.sol

@@ -0,0 +1,351 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {Amount, AmountLib} from "../../type/Amount.sol";
+import {BasicProduct} from "../../product/BasicProduct.sol";
+import {ClaimId} from "../../type/ClaimId.sol";
+import {IAuthorization} from "../../authorization/IAuthorization.sol";
+import {IOracleService} from "../../oracle/IOracleService.sol";
+import {ORACLE} from "../../type/ObjectType.sol";
+import {NftId} from "../../type/NftId.sol";
+import {PayoutId} from "../../type/PayoutId.sol";
+import {ReferralId} from "../../type/Referral.sol";
+import {RequestId} from "../../type/RequestId.sol";
+import {RiskId} from "../../type/RiskId.sol";
+import {Seconds} from "../../type/Seconds.sol";
+import {SimpleOracle} from "./SimpleOracle.sol";
+import {StateId} from "../../type/StateId.sol";
+import {Timestamp, TimestampLib} from "../../type/Timestamp.sol";
+
+uint64 constant SPECIAL_ROLE_INT = 11111;
+
+contract SimpleProduct is 
+    BasicProduct
+{
+
+    event LogSimpleProductRequestAsyncFulfilled(RequestId requestId, string responseText, uint256 responseDataLength);
+    event LogSimpleProductRequestSyncFulfilled(RequestId requestId, string responseText, uint256 responseDataLength);
+
+    error ErrorSimpleProductRevertedWhileProcessingResponse(RequestId requestId);
+
+    IOracleService private _oracleService;
+
+    constructor(
+        address registry,
+        NftId instanceNftid,
+        IAuthorization authorization,
+        address initialOwner,
+        address token,
+        bool isInterceptor,
+        address pool,
+        address distribution
+    )
+    {
+        initialize(
+            registry,
+            instanceNftid,
+            authorization,
+            initialOwner,
+            "SimpleProduct",
+            token,
+            isInterceptor,
+            pool,
+            distribution); 
+    }
+
+
+    function initialize(
+        address registry,
+        NftId instanceNftid,
+        IAuthorization authorization,
+        address initialOwner,
+        string memory name,
+        address token,
+        bool isInterceptor,
+        address pool,
+        address distribution
+    )
+        public
+        virtual
+        initializer()
+    {
+        _initializeBasicProduct(
+            registry,
+            instanceNftid,
+            authorization,
+            initialOwner,
+            name,
+            token,
+            isInterceptor,
+            pool,
+            distribution); 
+
+        _oracleService = IOracleService(_getServiceAddress(ORACLE()));
+    }
+
+    function createRisk(
+        RiskId id,
+        bytes memory data
+    ) public {
+        _createRisk(
+            id,
+            data
+        );
+    }
+
+    function updateRisk(
+        RiskId id,
+        bytes memory data
+    ) public {
+        _updateRisk(
+            id,
+            data
+        );
+    }
+
+    function updateRiskState(
+        RiskId id,
+        StateId state
+    ) public {
+        _updateRiskState(
+            id,
+            state
+        );
+    }
+
+    function createApplication(
+        address applicationOwner,
+        RiskId riskId,
+        uint256 sumInsured,
+        Seconds lifetime,
+        bytes memory applicationData,
+        NftId bundleNftId,
+        ReferralId referralId
+    )
+        public
+        returns (NftId nftId)
+    {
+        Amount sumInsuredAmount = AmountLib.toAmount(sumInsured);
+        Amount premiumAmount = calculatePremium(
+            sumInsuredAmount,
+            riskId,
+            lifetime,
+            applicationData,
+            bundleNftId,
+            referralId);
+
+        return _createApplication(
+            applicationOwner,
+            riskId,
+            sumInsuredAmount,
+            premiumAmount,
+            lifetime,
+            bundleNftId,
+            referralId,
+            applicationData
+        );
+    }
+
+    function createPolicy(
+        NftId applicationNftId,
+        bool requirePremiumPayment,
+        Timestamp activateAt
+    ) public {
+        _createPolicy(applicationNftId, activateAt);
+        if (requirePremiumPayment == true) {
+            _collectPremium(applicationNftId, activateAt);
+        }
+    }
+
+    function decline(
+        NftId policyNftId
+    ) public {
+        _decline(policyNftId);
+    }
+
+    function expire(
+        NftId policyNftId,
+        Timestamp expireAt
+    ) 
+        public 
+        returns (Timestamp)
+    {
+        return _expire(policyNftId, expireAt);
+    }
+
+    function collectPremium(
+        NftId policyNftId,
+        Timestamp activateAt
+    ) public {
+        _collectPremium(policyNftId, activateAt);
+    }
+
+    function activate(
+        NftId policyNftId,
+        Timestamp activateAt
+    ) public {
+        _activate(policyNftId, activateAt);
+    }
+
+    function close(
+        NftId policyNftId
+    ) public {
+        _close(policyNftId);
+    }
+
+    function submitClaim(
+        NftId policyNftId,
+        Amount claimAmount,
+        bytes memory submissionData
+    ) public returns (ClaimId) {
+        return _submitClaim(policyNftId, claimAmount, submissionData);
+    }
+
+    function confirmClaim(
+        NftId policyNftId,
+        ClaimId claimId,
+        Amount confirmedAmount,
+        bytes memory processData
+    ) public {
+        _confirmClaim(policyNftId, claimId, confirmedAmount, processData);
+    }
+
+    function declineClaim(
+        NftId policyNftId,
+        ClaimId claimId,
+        bytes memory processData
+    ) public {
+        _declineClaim(policyNftId, claimId, processData);
+    }
+
+    function closeClaim(
+        NftId policyNftId,
+        ClaimId claimId
+    ) public {
+        _closeClaim(policyNftId, claimId);
+    }
+
+    function createPayout(
+        NftId policyNftId,
+        ClaimId claimId,
+        Amount amount,
+        bytes memory data
+    ) public returns (PayoutId) {
+        return _createPayout(policyNftId, claimId, amount, data);
+    }
+
+    // TODO add test
+    function createPayoutForBeneficiary(
+        NftId policyNftId,
+        ClaimId claimId,
+        Amount amount,
+        address beneficiary,
+        bytes memory data
+    ) public returns (PayoutId) {
+        return _createPayoutForBeneficiary(policyNftId, claimId, amount, beneficiary, data);
+    }
+
+    function processPayout(
+        NftId policyNftId,
+        PayoutId payoutId
+    ) public {
+        _processPayout(policyNftId, payoutId);
+    }
+
+    function createOracleRequest(
+        NftId oracleNftId,
+        string memory requestText,
+        Timestamp expiryAt,
+        bool synchronous
+    )
+        public
+        // restricted()
+        returns (RequestId)
+    {
+        bytes memory requestData = abi.encode(SimpleOracle.SimpleRequest(
+            synchronous,
+            requestText));
+
+        if (synchronous) {
+            return _oracleService.request(
+                oracleNftId, 
+                requestData, 
+                expiryAt, 
+                "fulfillOracleRequestSync");
+        } else {
+            return _oracleService.request(
+                oracleNftId, 
+                requestData, 
+                expiryAt, 
+                "fulfillOracleRequestAsync");
+        }
+    }
+
+    function cancelOracleRequest(
+        RequestId requestId
+    )
+        public
+        // restricted() // 
+    {
+        _oracleService.cancel(requestId);
+    }
+
+    function fulfillOracleRequestSync(
+        RequestId requestId,
+        bytes memory responseData
+    )
+        public
+        // restricted() // only oracle service
+    {
+        string memory responseText = abi.decode(responseData, (string));
+        emit LogSimpleProductRequestSyncFulfilled(requestId, responseText, bytes(responseText).length);
+    }
+
+    function fulfillOracleRequestAsync(
+        RequestId requestId,
+        bytes memory responseData
+    )
+        public
+        // restricted() // only oracle service
+    {
+        SimpleOracle.SimpleResponse memory response = abi.decode(
+            responseData, (SimpleOracle.SimpleResponse));
+
+        if (response.revertInCall && response.revertUntil >= TimestampLib.blockTimestamp()) {
+            revert ErrorSimpleProductRevertedWhileProcessingResponse(requestId);
+        }
+
+        emit LogSimpleProductRequestAsyncFulfilled(requestId, response.text, bytes(response.text).length);
+    }
+
+
+    function resend(
+        RequestId requestId
+    )
+        public
+        // restricted() // 
+    {
+        _oracleService.resend(requestId);
+    }
+
+
+    function doSomethingSpecial() 
+        public 
+        restricted()
+        returns (bool) 
+    {
+        return true;
+    }
+
+    function doWhenNotLocked() 
+        public 
+        restricted()
+        returns (bool) 
+    {
+        return true;
+    }
+
+    function getOracleService() public view returns (IOracleService) {
+        return _oracleService;
+    }
+}

package/contracts/instance/{BundleManager.sol → BundleSet.sol}

@@ -10,26 +10,26 @@ import {LibNftIdSet} from "../type/NftIdSet.sol";
 import {NftId} from "../type/NftId.sol";
 import {TimestampLib} from "../type/Timestamp.sol";
 
-import {ObjectManager} from "./base/ObjectManager.sol";
+import {ObjectSet} from "./base/ObjectSet.sol";
 
-contract BundleManager is 
-    ObjectManager
+contract BundleSet is 
+    ObjectSet
 {
 
-    event LogBundleManagerPolicyLinked(NftId bundleNftId, NftId policyNftId);
-    event LogBundleManagerPolicyUnlinked(NftId bundleNftId, NftId policyNftId);
+    event LogBundleSetPolicyLinked(NftId bundleNftId, NftId policyNftId);
+    event LogBundleSetPolicyUnlinked(NftId bundleNftId, NftId policyNftId);
 
-    event LogBundleManagerBundleAdded(NftId poolNftId, NftId bundleNftId);
-    event LogBundleManagerBundleUnlocked(NftId poolNftId, NftId bundleNftId);
-    event LogBundleManagerBundleLocked(NftId poolNftId, NftId bundleNftId);
-    event LogBundleManagerBundleClosed(NftId poolNftId, NftId bundleNftId);
+    event LogBundleSetBundleAdded(NftId poolNftId, NftId bundleNftId);
+    event LogBundleSetBundleUnlocked(NftId poolNftId, NftId bundleNftId);
+    event LogBundleSetBundleLocked(NftId poolNftId, NftId bundleNftId);
+    event LogBundleSetBundleClosed(NftId poolNftId, NftId bundleNftId);
 
-    error ErrorBundleManagerPolicyAlreadyActivated(NftId policyNftId);
-    error ErrorBundleManagerBundleLocked(NftId bundleNftId, NftId policyNftId);
-    error ErrorBundleManagerPolicyWithOpenClaims(NftId policyNftId, uint256 openClaimsCount);
-    error ErrorBundleManagerPolicyNotCloseable(NftId policyNftId);
-    error ErrorBundleManagerBundleUnknown(NftId bundleNftId);
-    error ErrorBundleManagerBundleNotRegistered(NftId bundleNftId);
+    error ErrorBundleSetPolicyAlreadyActivated(NftId policyNftId);
+    error ErrorBundleSetBundleLocked(NftId bundleNftId, NftId policyNftId);
+    error ErrorBundleSetPolicyWithOpenClaims(NftId policyNftId, uint256 openClaimsCount);
+    error ErrorBundleSetPolicyNotCloseable(NftId policyNftId);
+    error ErrorBundleSetBundleUnknown(NftId bundleNftId);
+    error ErrorBundleSetBundleNotRegistered(NftId bundleNftId);
 
     mapping(NftId bundleNftId => LibNftIdSet.Set policies) internal _activePolicies;
 
@@ -42,11 +42,11 @@ contract BundleManager is
 
         // ensure bundle is unlocked (in active set) and registered with this instance
         if (!_isActive(poolNftId, bundleNftId)) {
-            revert ErrorBundleManagerBundleLocked(bundleNftId, policyNftId);
+            revert ErrorBundleSetBundleLocked(bundleNftId, policyNftId);
         }
 
         LibNftIdSet.add(_activePolicies[bundleNftId], policyNftId);
-        emit LogBundleManagerPolicyLinked(bundleNftId, policyNftId);
+        emit LogBundleSetPolicyLinked(bundleNftId, policyNftId);
     }
 
 
@@ -63,11 +63,11 @@ contract BundleManager is
 
         // ensure bundle is registered with this instance
         if (!_contains(poolNftId, bundleNftId)) {
-            revert ErrorBundleManagerBundleUnknown(bundleNftId);
+            revert ErrorBundleSetBundleUnknown(bundleNftId);
         }
 
         LibNftIdSet.remove(_activePolicies[bundleNftId], policyNftId);
-        emit LogBundleManagerPolicyUnlinked(policyInfo.bundleNftId, policyNftId);
+        emit LogBundleSetPolicyUnlinked(policyInfo.bundleNftId, policyNftId);
     }
 
 
@@ -78,11 +78,11 @@ contract BundleManager is
 
         // ensure pool is registered with instance
         if(poolNftId.eqz()) {
-            revert ErrorBundleManagerBundleNotRegistered(bundleNftId);
+            revert ErrorBundleSetBundleNotRegistered(bundleNftId);
         }
 
         _add(poolNftId, bundleNftId);
-        emit LogBundleManagerBundleAdded(poolNftId, bundleNftId);
+        emit LogBundleSetBundleAdded(poolNftId, bundleNftId);
     }
 
 
@@ -90,14 +90,14 @@ contract BundleManager is
     function unlock(NftId bundleNftId) external restricted() {
         NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
         _activate(poolNftId, bundleNftId);
-        emit LogBundleManagerBundleUnlocked(poolNftId, bundleNftId);
+        emit LogBundleSetBundleUnlocked(poolNftId, bundleNftId);
     }
 
     /// @dev locked (deactivated) bundles may not collateralize any new policies
     function lock(NftId bundleNftId) external restricted() {
         NftId poolNftId = _instance.getInstanceReader().getBundleInfo(bundleNftId).poolNftId;
         _deactivate(poolNftId, bundleNftId);
-        emit LogBundleManagerBundleLocked(poolNftId, bundleNftId);
+        emit LogBundleSetBundleLocked(poolNftId, bundleNftId);
     }
 
     function bundles(NftId poolNftId) external view returns(uint256) {

package/contracts/instance/IInstance.sol

@@ -4,39 +4,16 @@ pragma solidity ^0.8.20;
 import {IAccessManaged} from "@openzeppelin/contracts/access/manager/IAccessManaged.sol";
 
 import {Amount} from "../type/Amount.sol";
-import {ClaimId} from "../type/ClaimId.sol";
-import {DistributorType} from "../type/DistributorType.sol";
-import {PayoutId} from "../type/PayoutId.sol";
-import {NftId} from "../type/NftId.sol";
-import {StateId} from "../type/StateId.sol";
-import {ReferralId} from "../type/Referral.sol";
-import {RiskId} from "../type/RiskId.sol";
-import {VersionPart} from "../type/Version.sol";
-import {Key32} from "../type/Key32.sol";
-import {RoleId} from "../type/RoleId.sol";
-import {Seconds} from "../type/Seconds.sol";
-import {UFixed} from "../type/UFixed.sol";
-
-import {IRegisterable} from "../shared/IRegisterable.sol";
-
-import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
-
+import {BundleSet} from "./BundleSet.sol";
 import {InstanceAdmin} from "./InstanceAdmin.sol";
-import {BundleManager} from "./BundleManager.sol";
 import {InstanceReader} from "./InstanceReader.sol";
 import {InstanceStore} from "./InstanceStore.sol";
-
-import {IKeyValueStore} from "../shared/IKeyValueStore.sol";
-
-import {IAccess} from "./module/IAccess.sol";
-
-import {IBundleService} from "../pool/IBundleService.sol";
-import {IDistributionService} from "../distribution/IDistributionService.sol";
-import {IPolicyService} from "../product/IPolicyService.sol";
-import {IPoolService} from "../pool/IPoolService.sol";
-import {IProductService} from "../product/IProductService.sol";
-import {IPolicyService} from "../product/IPolicyService.sol";
-import {IBundleService} from "../pool/IBundleService.sol";
+import {IRegisterable} from "../shared/IRegisterable.sol";
+import {ITransferInterceptor} from "../registry/ITransferInterceptor.sol";
+import {RoleId} from "../type/RoleId.sol";
+import {Seconds} from "../type/Seconds.sol";
+import {UFixed} from "../type/UFixed.sol";
+import {VersionPart} from "../type/Version.sol";
 
 
 interface IInstance is 
@@ -48,9 +25,9 @@ interface IInstance is
     error ErrorInstanceInstanceAdminAlreadySet(address InstanceAdmin);
     error ErrorInstanceInstanceAdminAuthorityMismatch(address instanceAuthority);
 
-    error ErrorInstanceBundleManagerAlreadySet(address instanceBundleManager);
-    error ErrorInstanceBundleManagerInstanceMismatch(address instance);
-    error ErrorInstanceBundleManagerAuthorityMismatch(address instanceAuthority);
+    error ErrorInstanceBundleSetAlreadySet(address instanceBundleSet);
+    error ErrorInstanceBundleSetInstanceMismatch(address instance);
+    error ErrorInstanceBundleSetAuthorityMismatch(address instanceAuthority);
 
     error ErrorInstanceInstanceReaderInstanceMismatch(address instanceAuthority);
 
@@ -80,7 +57,7 @@ interface IInstance is
     // get instance release and supporting contracts
     function getMajorVersion() external pure returns (VersionPart majorVersion);
     function getInstanceReader() external view returns (InstanceReader);
-    function getBundleManager() external view returns (BundleManager);
+    function getBundleSet() external view returns (BundleSet);
     function getInstanceAdmin() external view returns (InstanceAdmin);
     function getInstanceStore() external view returns (InstanceStore);
 }

package/contracts/instance/IInstanceService.sol

@@ -2,7 +2,7 @@
 pragma solidity ^0.8.20;
 
 import {Amount} from "../type/Amount.sol";
-import {BundleManager} from "./BundleManager.sol";
+import {BundleSet} from "./BundleSet.sol";
 import {Instance} from "./Instance.sol";
 import {IInstanceLinkedComponent} from "../shared/IInstanceLinkedComponent.sol";
 import {IService} from "../shared/IService.sol";
@@ -24,7 +24,7 @@ interface IInstanceService is IService {
 
     error ErrorInstanceServiceMasterInstanceAlreadySet();
     error ErrorInstanceServiceMasterInstanceAdminAlreadySet();
-    error ErrorInstanceServiceMasterBundleManagerAlreadySet();
+    error ErrorInstanceServiceMasterBundleSetAlreadySet();
     error ErrorInstanceServiceInstanceAddressZero();
 
     error ErrorInstanceServiceMasterInstanceReaderNotSet();
@@ -35,11 +35,11 @@ interface IInstanceService is IService {
     error ErrorInstanceServiceAccessManagerZero();
     error ErrorInstanceServiceInstanceAdminZero();
     error ErrorInstanceServiceInstanceReaderZero();
-    error ErrorInstanceServiceBundleManagerZero();
+    error ErrorInstanceServiceBundleSetZero();
     error ErrorInstanceServiceInstanceStoreZero();
 
     error ErrorInstanceServiceInstanceAuthorityMismatch();
-    error ErrorInstanceServiceBundleManagerAuthorityMismatch();
+    error ErrorInstanceServiceBundleSetAuthorityMismatch();
     error ErrorInstanceServiceInstanceReaderInstanceMismatch2();
     error ErrorInstanceServiceBundleMangerInstanceMismatch();
     error ErrorInstanceServiceInstanceStoreAuthorityMismatch();
@@ -52,7 +52,7 @@ interface IInstanceService is IService {
     
     event LogInstanceCloned(NftId instanceNftId, address instance);
 
-    function createInstanceClone()
+    function createInstance()
         external 
         returns (
             // TODO check if Instance can be changed to IInstance