@etherisc/gif-next 0.0.2-cc253b3 → 0.0.2-cddad6b-504

package/contracts/shared/Versionable.sol

@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
+import {Timestamp, blockTimestamp} from "../types/Timestamp.sol";
+import {Version, VersionPart} from "../types/Version.sol";
+
+import {IVersionable} from "./IVersionable.sol";
+
+abstract contract Versionable is IVersionable {
+
+    mapping(Version version => VersionInfo info) private _versionHistory;
+    Version [] private _versions;
+
+
+    // controlled activation for controller contract
+    constructor() {
+        _activate(address(0), msg.sender);
+    }
+
+    // IMPORTANT this function needs to be implemented by each new version
+    // and needs to call internal function call _activate() 
+    function activate(address implementation, address activatedBy)
+        external
+        virtual override
+    { 
+        _activate(implementation, activatedBy);
+    }
+
+
+    // can only be called once per contract
+    // needs bo be called inside the proxy upgrade tx
+    function _activate(
+        address implementation,
+        address activatedBy
+    )
+        internal
+    {
+        Version thisVersion = getVersion();
+        require(
+            !isActivated(thisVersion),
+            "ERROR:VRN-001:VERSION_ALREADY_ACTIVATED"
+        );
+        
+        // require increasing version number
+        if(_versions.length > 0) {
+            Version lastVersion = _versions[_versions.length - 1];
+            require(
+                thisVersion > lastVersion,
+                "ERROR:VRN-002:VERSION_NOT_INCREASING"
+            );
+        }
+
+        // update version history
+        _versions.push(thisVersion);
+        _versionHistory[thisVersion] = VersionInfo(
+            thisVersion,
+            implementation,
+            activatedBy,
+            blockTimestamp(),
+            blockNumber()
+        );
+
+        emit LogVersionableActivated(thisVersion, implementation, activatedBy);
+    }
+
+
+    function isActivated(Version _version) public override view returns(bool) {
+        return _versionHistory[_version].activatedIn.toInt() > 0;
+    }
+
+
+    function getVersion() public pure virtual returns(Version);
+
+
+    function getVersionCount() external view override returns(uint256) {
+        return _versions.length;
+    }
+
+
+    function getVersion(uint256 idx) external view override returns(Version) {
+        return _versions[idx];
+    }
+
+
+    function getVersionInfo(Version _version) external override view returns(VersionInfo memory) {
+        return _versionHistory[_version];
+    }
+}

package/contracts/shared/VersionableUpgradeable.sol

@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+
+import {Initializable} from "@openzeppelin5/contracts/proxy/utils/Initializable.sol";
+
+import {Blocknumber, blockNumber} from "../types/Blocknumber.sol";
+import {Timestamp, blockTimestamp} from "../types/Timestamp.sol";
+import {Version, VersionPart} from "../types/Version.sol";
+
+import {IVersionable} from "./IVersionable.sol";
+
+abstract contract VersionableUpgradeable is 
+    Initializable,
+    IVersionable 
+{
+    /// @custom:storage-location erc7201:etherisc.storage.Versionable
+    struct VersionableStorage {
+        mapping(Version version => VersionInfo info) _versionHistory;
+        Version [] _versions;
+    }
+
+    // keccak256(abi.encode(uint256(keccak256("etherisc.storage.Versionable")) - 1)) & ~bytes32(uint256(0xff))
+    bytes32 private constant VersionableStorageLocation = 0x4f61291a8ac3d020d0a7d919a76b8592aa88385744dee3f8b4f3873b969ed900;
+    
+    function _getVersionableStorage() private pure returns (VersionableStorage storage $) {
+        assembly {
+            $.slot := VersionableStorageLocation
+        }
+    }
+
+    // controlled activation for controller contract
+    constructor() {
+        _activate(address(0), msg.sender);
+    }
+
+    // IMPORTANT this function needs to be implemented by each new version
+    // and needs to call internal function call _activate() 
+    function activate(address implementation, address activatedBy)
+        external
+        virtual
+        override
+        onlyInitializing
+    { 
+        _activate(implementation, activatedBy);
+    }
+
+
+    // can only be called once per contract
+    // needs to be called inside the proxy upgrade tx
+    function _activate(
+        address implementation,
+        address activatedBy
+    )
+        internal
+    {
+        VersionableStorage storage $ = _getVersionableStorage();
+
+        Version thisVersion = getVersion();
+        require(
+            !isActivated(thisVersion),
+            "ERROR:VRN-001:VERSION_ALREADY_ACTIVATED"
+        );
+        
+        // require increasing version number
+        if($._versions.length > 0) {
+            Version lastVersion = $._versions[$._versions.length - 1];
+            require(
+                thisVersion > lastVersion,
+                "ERROR:VRN-002:VERSION_NOT_INCREASING"
+            );
+        }
+
+        // update version history
+        $._versions.push(thisVersion);
+        $._versionHistory[thisVersion] = VersionInfo(
+            thisVersion,
+            implementation,
+            activatedBy,
+            blockTimestamp(),
+            blockNumber()
+        );
+
+        emit LogVersionableActivated(thisVersion, implementation, activatedBy);
+    }
+
+
+    function isActivated(Version _version) public override view returns(bool) {
+        return _getVersionableStorage()._versionHistory[_version].activatedIn.toInt() > 0;
+    }
+
+
+    function getVersion() public pure virtual returns(Version);
+
+
+    function getVersionCount() external view override returns(uint256) {
+        return _getVersionableStorage()._versions.length;
+    }
+
+
+    function getVersion(uint256 idx) external view override returns(Version) {
+        return _getVersionableStorage()._versions[idx];
+    }
+
+
+    function getVersionInfo(Version _version) external override view returns(VersionInfo memory) {
+        return _getVersionableStorage()._versionHistory[_version];
+    }
+}

package/contracts/test/TestDistribution.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {Fee} from "../../contracts/types/Fee.sol";
+import {NftId} from "../../contracts/types/NftId.sol";
+import {Distribution} from "../../contracts/components/Distribution.sol";
+
+
+contract TestDistribution is Distribution {
+
+    constructor(
+        address registry,
+        NftId instanceNftid,
+        address token,
+        bool isVerifying,
+        Fee memory distributionFee
+    )
+        Distribution(registry, instanceNftid, token, isVerifying, distributionFee)
+    // solhint-disable-next-line no-empty-blocks
+    {}
+}

package/contracts/test/TestFee.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {UFixed, UFixedMathLib} from "../types/UFixed.sol";
+import {Fee, FeeLib} from "../types/Fee.sol";
+
+contract TestFee {
+
+    function createFee(
+        uint256 fractionalValue,
+        int8 exponent,
+        uint256 fixedValue
+    )
+        external 
+        pure 
+        returns(Fee memory fee)
+    {
+        return FeeLib.toFee(UFixedMathLib.toUFixed(fractionalValue, exponent), fixedValue);
+    }
+
+    function getZeroFee() external pure returns(Fee memory fee) {
+        return FeeLib.zeroFee();
+    }
+
+}

package/contracts/test/TestPool.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {NftId} from "../../contracts/types/NftId.sol";
+import {UFixed} from "../../contracts/types/UFixed.sol";
+import {Fee} from "../../contracts/types/Fee.sol";
+import {Pool} from "../../contracts/components/Pool.sol";
+
+
+contract TestPool is Pool {
+
+    constructor(
+        address registry,
+        NftId instanceNftid,
+        address token,
+        bool isVerifying,
+        UFixed collateralizationLevel,
+        Fee memory poolFee,
+        Fee memory stakingFee,
+        Fee memory performanceFee
+    )
+        Pool(registry, instanceNftid, token, isVerifying, collateralizationLevel, poolFee, stakingFee, performanceFee)
+    // solhint-disable-next-line no-empty-blocks
+    {}
+}

package/contracts/test/TestProduct.sol

@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {Product} from "../../contracts/components/Product.sol";
+import {NftId, toNftId} from "../../contracts/types/NftId.sol";
+import {ReferralId} from "../types/ReferralId.sol";
+import {RiskId} from "../../contracts/types/RiskId.sol";
+import {Timestamp, blockTimestamp} from "../../contracts/types/Timestamp.sol";
+import {Fee} from "../../contracts/types/Fee.sol";
+
+contract TestProduct is Product {
+
+    event LogTestProductSender(address sender);
+
+    string public constant DEFAULT_RISK_NAME = "DEFAULT_RISK";
+    bool private defaultRiskCreated;
+
+    constructor(
+        address registry,
+        NftId instanceNftid,
+        address token,
+        address pool,
+        address distribution,
+        Fee memory productFee,
+        Fee memory processingFee
+    )
+        Product(registry, instanceNftid, token, pool, distribution, productFee, processingFee)
+    // solhint-disable-next-line no-empty-blocks
+    {
+    }
+
+    function getDefaultRiskId() public pure returns (RiskId) {
+        return _toRiskId(DEFAULT_RISK_NAME);
+    }
+
+    function applyForPolicy(
+        uint256 sumInsuredAmount,
+        uint256 lifetime,
+        NftId bundleNftId,
+        ReferralId referralId
+    )
+        external
+        returns(NftId nftId)
+    {
+        RiskId riskId = getDefaultRiskId();
+        bytes memory applicationData = "";
+
+        if (!defaultRiskCreated) {
+            _createRisk(riskId, "");
+            defaultRiskCreated = true;
+        }
+
+        nftId = _createApplication(
+            msg.sender, // policy holder
+            riskId,
+            sumInsuredAmount,
+            lifetime,
+            applicationData,
+            bundleNftId,
+            referralId
+        );
+    }
+
+    function underwrite(NftId nftId, bool requirePremiumPayment, Timestamp activateAt) external {
+        emit LogTestProductSender(msg.sender);
+        _underwrite(nftId, requirePremiumPayment, activateAt);
+    }
+
+    function collectPremium(NftId nftId, Timestamp activateAt) external {
+        _collectPremium(nftId, activateAt);
+    }
+}

package/contracts/test/TestRegisterable.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {NftId} from "../../contracts/types/NftId.sol";
+import {ObjectType, TOKEN} from "../../contracts/types/ObjectType.sol";
+import {IRegistry} from "../../contracts/registry/IRegistry.sol";
+import {Registerable} from "../../contracts/shared/Registerable.sol";
+
+contract TestRegisterable is Registerable {
+
+    constructor(address registry, NftId registryNftId)
+        Registerable(registry, registryNftId)
+    // solhint-disable-next-line no-empty-blocks
+    {}
+
+    function getType() external pure override returns (ObjectType) {
+        return TOKEN();
+    }
+}

package/contracts/test/TestRoleId.sol

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {RoleId, RoleIdLib, PRODUCT_OWNER_ROLE_NAME, PRODUCT_OWNER_ROLE, POOL_OWNER_ROLE_NAME, POOL_OWNER_ROLE} from "../../contracts/types/RoleId.sol";
+
+contract TestRoleId {
+    function getRole(string memory roleName) external pure returns (RoleId) { return RoleIdLib.toRoleId(roleName); }
+
+    function getProductOwnerRoleName() external pure returns (string memory) { return PRODUCT_OWNER_ROLE_NAME(); }
+    function getProductOwnerRole() external pure returns (RoleId) { return PRODUCT_OWNER_ROLE(); } 
+
+    function getPoolOwnerRoleName() external pure returns (string memory) { return POOL_OWNER_ROLE_NAME(); }
+    function getPoolOwnerRole() external pure returns (RoleId) { return POOL_OWNER_ROLE(); } 
+}

package/contracts/test/TestService.sol

@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {NftId} from "../../contracts/types/NftId.sol";
+import {Version, VersionLib} from "../../contracts/types/Version.sol";
+import {ServiceBase} from "../../contracts/instance/base/ServiceBase.sol";
+
+import {IVersionable} from "../../contracts/shared/IVersionable.sol";
+import {Versionable} from "../../contracts/shared/Versionable.sol";
+
+contract TestService is ServiceBase {
+
+    string public constant NAME = "TestService";
+
+    constructor(address registry, NftId registryNftId)
+        ServiceBase(registry, registryNftId)
+    // solhint-disable-next-line no-empty-blocks
+    {}
+
+    function getVersion()
+        public 
+        pure 
+        virtual override (IVersionable, Versionable)
+        returns(Version)
+    {
+        return VersionLib.toVersion(3,0,0);
+    }
+
+    function getName() external pure override returns(string memory name) {
+        return NAME;
+    }
+}

package/contracts/test/TestToken.sol

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract TestUsdc is ERC20 {
+
+    // https://etherscan.io/token/0xc719d010b63e5bbf2c0551872cd5316ed26acd83#readContract
+    string public constant NAME = "USDC - Test";
+    string public constant SYMBOL = "USDC";
+    uint8 public constant DECIMALS = 6;
+    uint256 public constant INITIAL_SUPPLY = 10**9 * 10**DECIMALS; // 1 Billion 1'000'000'000
+    // decimals == 18 (openzeppelin erc20 default)
+    constructor()
+        ERC20(NAME, SYMBOL)
+    {
+        _mint(
+            _msgSender(),
+            INITIAL_SUPPLY
+        );   
+    }
+
+    function decimals() public pure override returns(uint8) {
+        return DECIMALS;
+    }
+}

package/contracts/test/TestVersion.sol

@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {Version, VersionPart, VersionLib} from "../types/Version.sol";
+
+contract TestVersion {
+
+    function createVersion(uint major, uint minor, uint patch) external pure returns(Version) {
+        return VersionLib.toVersion(major, minor, patch);
+    }
+
+    function createVersionPart(uint versionPart) external pure returns(VersionPart) {
+        return VersionLib.toVersionPart(uint8(versionPart));
+    }
+
+    function getVersionParts(Version version)
+        external
+        pure
+        returns(
+            VersionPart major,
+            VersionPart minor,
+            VersionPart patch
+        )
+    {
+        return version.toVersionParts();
+    }
+
+    function getMajorPart(Version version) external pure returns(VersionPart major) {
+        return version.toMajorPart();
+    }
+
+    function getZeroVersion() external pure returns(Version) {
+        return VersionLib.zeroVersion();
+    }
+
+    function isSameVersion(Version a, Version b) external pure returns(bool) {
+        return a == b;
+    }
+
+    function isLargerVersion(Version a, Version b) external pure returns(bool) {
+        return a > b;
+    }
+
+}

package/contracts/test/TestVersionable.sol

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import {Version, VersionLib} from "../../contracts/types/Version.sol";
+import {Versionable} from "../../contracts/shared/Versionable.sol";
+
+contract TestVersionable is Versionable {
+
+    function getVersion()
+        public 
+        pure 
+        virtual override
+        returns(Version)
+    {
+        return VersionLib.toVersion(3,0,0);
+    }
+}

package/contracts/test/Usdc.sol

@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+import "@openzeppelin/contracts/token/ERC20/ERC20.sol";
+
+contract USDC is ERC20 {
+
+    // https://etherscan.io/token/0xc719d010b63e5bbf2c0551872cd5316ed26acd83#readContract
+    string public constant NAME = "USDC - DUMMY";
+    string public constant SYMBOL = "USDC";
+    uint8 public constant DECIMALS = 6;
+    uint256 public constant INITIAL_SUPPLY = 10**9 * 10**DECIMALS; // 1 Billion 1'000'000'000
+    // decimals == 18 (openzeppelin erc20 default)
+    constructor()
+        ERC20(NAME, SYMBOL)
+    {
+        _mint(
+            _msgSender(),
+            INITIAL_SUPPLY
+        );   
+    }
+
+    function decimals() public pure override returns(uint8) {
+        return DECIMALS;
+    }
+}

package/contracts/types/AddressSet.sol

@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+
+// based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/structs/EnumerableSet.sol
+library LibAddressSet {
+
+    struct Set {
+        address[] elements;
+        mapping(address element => uint256 index) at;
+    }
+
+    function add(Set storage set, address element) external returns(bool added) {
+        if (set.at[element] == 0) {
+            set.elements.push(element);
+            set.at[element] = set.elements.length;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    function remove(Set storage set, address element) external returns(bool removed) {
+        uint256 elementIndex = set.at[element];
+
+        if (elementIndex > 0) {
+            uint256 toDeleteIndex = elementIndex - 1;
+            uint256 lastIndex = set.elements.length - 1;
+
+            if (lastIndex != toDeleteIndex) {
+                address lastElement = set.elements[lastIndex];
+                set.elements[toDeleteIndex] = lastElement;
+                set.at[lastElement] = elementIndex; // Replace lastValue's index to valueIndex
+            }
+
+            set.elements.pop();
+            delete set.at[element];
+            return true;
+        }
+        
+        return false;
+    }
+
+    function isEmpty(Set storage set) external view returns(bool empty) {
+        return set.elements.length == 0;
+    }
+
+    function contains(Set storage set, address element) external view returns(bool inSet) {
+        return set.at[element] > 0;
+    }
+
+    function getLength(Set storage set) external view returns(uint256 length) {
+        return set.elements.length;
+    }
+
+    function getElementAt(Set storage set, uint256 index) external view returns(address element) {
+        return set.elements[index];
+    }
+}