@etherisc/gif-next 0.0.2-836a512-798 → 0.0.2-83889c4-030

package/contracts/components/Component.sol

@@ -1,77 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-
-import {IRegistry, IRegisterable, IRegistryLinked} from "../registry/IRegistry.sol";
-import {Registerable} from "../registry/Registry.sol";
-import {IInstance} from "../instance/IInstance.sol";
-
-import {IInstanceLinked, IComponent, IComponentContract, IComponentModule, IComponentOwnerService} from "../instance/component/IComponent.sol";
-import {NftId} from "../types/NftId.sol";
-
-contract InstanceLinked is IInstanceLinked {
-    IInstance internal _instance;
-
-    constructor(address instance) {
-        _instance = IInstance(instance);
-    }
-
-    function getInstance() public view override returns(IInstance instance) {
-        return _instance;
-    }
-}
-
-abstract contract Component is
-    Registerable,
-    InstanceLinked,
-    IComponentContract
-{
-    address private _deployer;
-    address private _wallet;
-    IERC20 private _token;
-
-    constructor(
-        address registry,
-        address instance,
-        address token
-
-    )
-        Registerable(registry)
-        InstanceLinked(instance)
-    {
-        _wallet = address(this);
-        _token = IERC20(token);
-    }
-
-    // from registerable
-    function register() public override returns (NftId componentId) {
-        require(msg.sender == getInitialOwner(), "");
-        require(
-            address(_registry) != address(0),
-            "ERROR:PRD-001:REGISTRY_ZERO"
-        );
-        require(
-            _registry.isRegistered(address(_instance)),
-            "ERROR:PRD-002:INSTANCE_NOT_REGISTERED"
-        );
-
-        IComponentOwnerService cos = _instance.getComponentOwnerService();
-        componentId = cos.register(this);
-    }
-
-    // from registerable
-    function getParentNftId() public view override returns (NftId) {
-        return getInstance().getNftId();
-    }
-
-    // from component contract
-    function getWallet() external view override returns(address walletAddress) {
-        return _wallet;
-    }
-
-    function getToken() external view override returns(IERC20 token) {
-        return _token;
-    }
-
-}

package/contracts/components/IPool.sol

@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {Fee} from "../types/Fee.sol";
-import {IComponentContract} from "../instance/component/IComponent.sol";
-
-// just marker interface for now
-interface IPoolComponent is IComponentContract {
-    function getStakingFee() external view returns(Fee memory stakingFee);
-    function getPerformanceFee() external view returns(Fee memory performanceFee);
-}

package/contracts/components/IProduct.sol

@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {NftId} from "../types/NftId.sol";
-import {Fee} from "../types/Fee.sol";
-
-interface IProductComponent {
-    function getPoolNftId() external view returns (NftId poolNftId);
-    function getPolicyFee() external view returns(Fee memory policyFee);
-    function getProcessingFee() external view returns(Fee memory processingFee);
-}

package/contracts/components/Pool.sol

@@ -1,45 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {ObjectType, POOL} from "../types/ObjectType.sol";
-import {Fee} from "../types/Fee.sol";
-import {IPoolComponent} from "./IPool.sol";
-import {Component} from "./Component.sol";
-
-contract Pool is Component, IPoolComponent {
-
-    Fee private _stakingFee;
-    Fee private _performanceFee;
-
-    constructor(
-        address registry,
-        address instance,
-        address token,
-        Fee memory stakingFee,
-        Fee memory performanceFee
-    )
-        Component(registry, instance, token)
-    {
-        _stakingFee = stakingFee;
-        _performanceFee = performanceFee;
-    }
-
-    // from pool component
-    function getStakingFee() external view override returns(Fee memory stakingFee) {
-        return _stakingFee;
-    }
-
-    function getPerformanceFee() external view override returns(Fee memory performanceFee) {
-        return _performanceFee;
-    }
-
-    // from registerable
-    function getType() public pure override returns(ObjectType) {
-        return POOL();
-    }
-
-    // from registerable
-    function getData() external view override returns (bytes memory data) {
-        return bytes(abi.encode(getInstance().getNftId()));
-    }
-}

package/contracts/components/Product.sol

@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IProductService} from "../instance/product/IProductService.sol";
-import {Component} from "./Component.sol";
-import {IProductComponent} from "./IProduct.sol";
-import {NftId} from "../types/NftId.sol";
-import {ObjectType, PRODUCT} from "../types/ObjectType.sol";
-import {Fee} from "../types/Fee.sol";
-import {Component} from "./Component.sol";
-
-contract Product is Component, IProductComponent {
-    IProductService private _productService;
-    address private _pool;
-    Fee private _policyFee;
-    Fee private _processingFee;
-
-    constructor(
-        address registry,
-        address instance,
-        address token,
-        address pool,
-        Fee memory policyFee,
-        Fee memory processingFee
-    )
-        Component(registry, instance, token)
-    {
-        // TODO add validation
-        _productService = _instance.getProductService();
-        _pool = pool;
-        _policyFee = policyFee;
-        _processingFee = processingFee;
-    }
-
-    function _createApplication(
-        address applicationOwner,
-        uint256 sumInsuredAmount,
-        uint256 premiumAmount,
-        uint256 lifetime,
-        NftId bundleNftId
-    ) internal returns (NftId nftId) {
-        nftId = _productService.createApplication(
-            applicationOwner,
-            sumInsuredAmount,
-            premiumAmount,
-            lifetime,
-            bundleNftId
-        );
-    }
-
-    function _underwrite(NftId nftId) internal {
-        _productService.underwrite(nftId);
-    }
-
-    function _collectPremium(NftId nftId) internal {
-        _productService.collectPremium(nftId);
-    }
-
-    function getPoolNftId() external view override returns (NftId poolNftId) {
-        return _registry.getNftId(_pool);
-    }
-
-    // from product component
-    function getPolicyFee() external view override returns(Fee memory policyFee) {
-        return _policyFee;
-    }
-
-    function getProcessingFee() external view override returns(Fee memory processingFee) {
-        return _processingFee;
-    }
-
-    // from registerable
-    function getType() public pure override returns(ObjectType) {
-        return PRODUCT();
-    }
-
-    // from registerable
-    function getData() external view override returns (bytes memory data) {
-        return bytes(abi.encode(getInstance().getNftId()));
-    }
-}

package/contracts/experiment/errors/Require.sol

@@ -1,38 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-contract Require {
-    error AsmallerThanB_S();
-    error AsmallerThanB_M(uint a);
-    error AsmallerThanB_L(uint a, uint b);
-
-    uint256 private _b;
-
-    constructor() {
-        _b = 42;
-    }
-
-    function isAlargerThanBRequire_S(
-        uint a
-    ) external view returns (bool isLarger) {
-        require(a > _b, "ERROR:ABC-001");
-
-        return true;
-    }
-
-    function isAlargerThanBRequire_M(
-        uint a
-    ) external view returns (bool isLarger) {
-        require(a > _b, "ERROR:ABC-002:A_IS_SMALLER");
-
-        return true;
-    }
-
-    function isAlargerThanBRequire_L(
-        uint a
-    ) external view returns (bool isLarger) {
-        require(a > _b, "ERROR:ABC-003:A_IS_SMALLER_THAN_B");
-
-        return true;
-    }
-}

package/contracts/experiment/errors/Revert.sol

@@ -1,44 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-contract Revert {
-    error AsmallerThanB_S();
-    error AsmallerThanB_M(uint a);
-    error AsmallerThanB_L(uint a, uint b);
-
-    uint256 private _b;
-
-    constructor() {
-        _b = 42;
-    }
-
-    function isAlargerThanBRevert_S(
-        uint a
-    ) external view returns (bool isLarger) {
-        if (a <= _b) {
-            revert AsmallerThanB_S();
-        }
-
-        return true;
-    }
-
-    function isAlargerThanBRevert_M(
-        uint a
-    ) external view returns (bool isLarger) {
-        if (a <= _b) {
-            revert AsmallerThanB_M(a);
-        }
-
-        return true;
-    }
-
-    function isAlargerThanBRevert_L(
-        uint a
-    ) external view returns (bool isLarger) {
-        if (a <= _b) {
-            revert AsmallerThanB_L(a, _b);
-        }
-
-        return true;
-    }
-}

package/contracts/experiment/inheritance/A.sol

@@ -1,53 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IA, ISharedA} from "./IA.sol";
-import {B} from "./B.sol";
-import {C} from "./C.sol";
-
-/* 
-
-# dependency graph
-
-   B <...+
-   ^     |
-   |     |
-   A --> C
-
-   - A is the main contract
-   - A provides functionality implemented by modules B and C
-   - B and C rely on functionality shared by A
-   - C accesses functionality of module B
-
-# chisel session
-
-import {A} from "./contracts/experiment/A.sol";
-A a = new A();
-uint(a.getA())
-uint(a.getB()))
-uint(a.getC())
-uint(a.getAfromB())
-uint(a.getAfromC())
-uint(a.getBfromC())
-a.setA(100);
-a.setB(10);
-a.setC(20);
- */
-
-contract AShared is ISharedA {
-    uint256 private _x;
-
-    constructor() {
-        _x = 42;
-    }
-
-    function getA() external view override returns (uint256) {
-        return _x;
-    }
-
-    function setA(uint256 newA) external override {
-        _x = newA;
-    }
-}
-
-contract A is AShared, B, C, IA {}

package/contracts/experiment/inheritance/B.sol

@@ -1,28 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {ISharedA} from "./IA.sol";
-import {IB} from "./IB.sol";
-
-abstract contract B is ISharedA, IB {
-    // names of private variables can be re-used in inheritance
-    uint256 private _x;
-
-    constructor() {
-        _x = 1;
-    }
-
-    // access own state
-    function getB() external view override returns (uint256) {
-        return _x;
-    }
-
-    function setB(uint256 newB) external override {
-        _x = newB;
-    }
-
-    // access state from parent contract A
-    function getAfromB() external view override returns (uint256) {
-        return this.getA();
-    }
-}

package/contracts/experiment/inheritance/C.sol

@@ -1,34 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {ISharedA} from "./IA.sol";
-import {IB} from "./IB.sol";
-import {IC} from "./IC.sol";
-
-abstract contract C is ISharedA, IC {
-    uint256 private _x;
-
-    constructor() {
-        _x = 2;
-    }
-
-    // access own state
-    function getC() external view override returns (uint256) {
-        return _x;
-    }
-
-    function setC(uint256 newC) external override {
-        _x = newC;
-    }
-
-    // access state from parent contract A
-    function getAfromC() external view override returns (uint256) {
-        return this.getA();
-    }
-
-    // access state from other module B
-    function getBfromC() external view override returns (uint256) {
-        IB b = IB(address(this));
-        return b.getB();
-    }
-}

package/contracts/experiment/inheritance/IA.sol

@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {IB} from "./IB.sol";
-import {IC} from "./IC.sol";
-
-interface ISharedA {
-    function getA() external view returns (uint256);
-
-    function setA(uint256 newA) external;
-}
-
-interface IA is ISharedA, IB, IC {}

package/contracts/experiment/inheritance/IB.sol

@@ -1,10 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-interface IB {
-    function getAfromB() external view returns (uint256);
-
-    function getB() external view returns (uint256);
-
-    function setB(uint256 newA) external;
-}

package/contracts/experiment/inheritance/IC.sol

@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-interface IC {
-    function getAfromC() external view returns (uint256);
-
-    function getBfromC() external view returns (uint256);
-
-    function getC() external view returns (uint256);
-
-    function setC(uint256 newA) external;
-}

package/contracts/experiment/statemachine/Dummy.sol

@@ -1,33 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {ObjectType} from "../../types/ObjectType.sol";
-import {StateId, toStateId, zeroStateId} from "../../types/StateId.sol";
-
-
-contract LifeCycleModule {
-
-    mapping(ObjectType objectType => StateId initialState) private _initialState;
-
-    mapping(ObjectType objectType => 
-        mapping(StateId stateFrom => 
-            mapping(StateId stateTo => bool isValid))) private _isValidTransition;
-
-
-    function getInitialState(ObjectType objectType)
-        external
-        view
-        returns(StateId)
-    {
-        return _initialState[objectType];
-    }
-
-
-    function isValidTransition(ObjectType objectType, StateId fromId, StateId toId)
-        external
-        view
-        returns(bool)
-    {
-        return _isValidTransition[objectType][fromId][toId];
-    }
-}

package/contracts/experiment/statemachine/ISM.sol

@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {StateId} from "../../types/StateId.sol";
-
-interface ISMEE {
-    error ErrorInitialStateUndefined();
-    error ErrorStartStateUndefined();
-    error ErrorNextStateUndefined();
-    error ErrorStateChangeInvalid(StateId currentStateId, StateId newStateId);
-
-    event LogInitialStateSet(StateId initialStateId);
-    event LogStateChanged(StateId oldStateId, StateId newStateId);
-}
-
-interface ISM is ISMEE {
-    function changeToState(StateId newStateId) external;
-    function isValidTransition(StateId currentStateId, StateId newStateId) external view returns(bool isValid);
-    function getState() external view returns(StateId currentStateId);
-}

package/contracts/experiment/statemachine/README.md

@@ -1,112 +0,0 @@
-# State Machines
-
-Most GIF objects have a life cycle defined by a state machine.
-
-For each object type the set of possible states is defined together with its initial state and the set of valid state transitions.
-
-## Object Types without States
-
-* Protocol
-* Chains
-* Registries (both chain and main registry)
-
-## Object Types with States
-
-* Tokens
-* Instances
-* Products
-* Oracles
-* Pools
-* Bundles
-* Policies
-* Claim (non-NFT)
-* Payout (non-NFT)
-
-### Simple State Machine
-
-Valid states
-
-* Active (initial state)
-* Paused
-* Archived (final state)
-
-Valid state transitions:
-
-* Active -> Paused
-* Paused -> Active
-* Paused -> Archived
-
-
-Candidate object types for simple state machine
-
-* Token
-* Instance
-* Product
-* Oracle
-* Pool
-
-To discuss: 
-
-* Archived is final state
-* What mechanism should exist to revert an unintended transition to 'Archived' state. Should there be such a mechanism?
-* What mechanism should exist when the NFT of such an object is burned prematurely. Should there be such a mechanism
-
-### Bundle State Machine
-
-Valid states
-
-* Active (initial state)
-* Paused
-* Expired (implicit state)
-* Closed (final state)
-
-Expired is not an explicit state. 
-A bundle is expired for block.timestamp >= expiredAt
-
-### Policy State Machine
-
-Valid states
-
-* Applied (initial state)
-* Revoked (final state)
-* Declined (final state)
-* Active
-* Expired (implicit state)
-* Closed (final state)
-
-Expired is not an explicit state. 
-A policy is expired for block.timestamp >= expiredAt
-
-To discuss: 
-
-* Should 'Closed' be less explicit using a closedAt state variable? 
-* Or even more lighweight? ie. block.timestamp >= expiredAt and no open claims
-
-Valid state transitions:
-
-* Applied -> Revoked
-* Applied -> Declined
-* Applied -> Active
-* Active -> Closed (needs to be expired)
-
-### Claim State Machine
-
-Valid states
-* Applied (initial state)
-* Confirmed
-* Declined (final state)
-* Closed (final state)
-
-Valid state transitions:
-* Applied -> Confirmed
-* Applied -> Declined
-* Confirmed -> Closed
-
-### Payout State Machine
-
-Valid states
-* Expected
-* PaidOut
-
-Valid state transitions:
-* Expected -> PaidOut

package/contracts/experiment/statemachine/SM.sol

@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {StateId, toStateId, zeroStateId} from "../../types/StateId.sol";
-import {ISM} from "./ISM.sol";
-
-contract SM is ISM {
-
-    mapping(StateId currentState => mapping(StateId newState => bool isValid)) private _isValidTransition;
-
-    StateId internal _state;
-
-
-    function setInitialState(StateId initialStateId) internal {
-        if(initialStateId == zeroStateId()) {
-            revert ErrorInitialStateUndefined();
-        }
-
-        _state = initialStateId;
-    }
-
-
-    function addTransition(StateId currentStateId, StateId nextStateId) internal {
-        if(currentStateId == zeroStateId()) {
-            revert ErrorStartStateUndefined();
-        }
-
-        if(nextStateId == zeroStateId()) {
-            revert ErrorNextStateUndefined();
-        }
-
-        _isValidTransition[currentStateId][nextStateId] = true;
-    }
-
-
-    function changeToState(StateId newStateId) external override {
-        if(!_isValidTransition[_state][newStateId]) {
-            revert ErrorStateChangeInvalid(_state, newStateId);
-        }
-
-        StateId stateOld = _state;
-        _state = newStateId;
-
-        emit LogStateChanged(stateOld, _state);
-    }
-
-    function isValidTransition(StateId currentStateId, StateId newStateId) external view override returns(bool isValid) {
-        return _isValidTransition[currentStateId][newStateId];
-    }
-
-    function getState() external view override returns(StateId state) {
-        return _state;
-    }
-}