@etherisc/gif-next 0.0.2-a196164-289 → 0.0.2-a38075a-779

package/contracts/shared/VersionableUpgradeable.sol

@@ -1,120 +0,0 @@
-// 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, VersionLib} 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;
-        Version _v1;
-    }
-
-    // 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
-        }
-    }
-
-    constructor() {
-        _disableInitializers();
-    }
-
-    // IMPORTANT this function needs to be implemented by each new version
-    // and needs to call internal function _updateVersionHistory() 
-    // INITIALIZER FUNCTION
-    function initialize(
-        address implementation,
-        address activatedBy,
-        bytes memory activationData
-    )
-        public
-        virtual
-        initializer
-    { 
-        _updateVersionHistory(implementation, activatedBy);
-    }
-
-    // can only be called once per contract
-    // needs to be called inside the proxy upgrade tx
-    // TODO run reinitializer(version().toUint64()) modifier after "version()" is checked, 
-    function _updateVersionHistory(
-        address implementation,
-        address activatedBy
-    )
-        internal
-        onlyInitializing
-    {
-        VersionableStorage storage $ = _getVersionableStorage();
-
-        uint64 version = _getInitializedVersion();
-
-        Version thisVersion = getVersion();
-
-        if(version == 1) {
-            // thisVersion is alias to version "1"
-            $._v1 = thisVersion;
-        }
-        else {
-            Version initializedVersion = VersionLib.toVersion(version);
-            //require(initializedVersion == thisVersion, "");
-            require(thisVersion > $._v1, "");
-        }
-
-        // update version history
-        $._versions.push(thisVersion);
-        $._versionHistory[thisVersion] = VersionInfo(
-            thisVersion,
-            implementation,
-            activatedBy,
-            blockTimestamp(),
-            blockNumber()
-        );
-
-        emit LogVersionableInitialized(thisVersion, implementation, activatedBy);
-    }
-
-    // TODO previous version(s) can not be activated -> check that _version is the current one
-    function isInitialized(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];
-    }
-
-    /*function getInitializedVersion() external view returns(Version)
-    {
-        return VersionLib.toVersion(_getInitializedVersion());
-    }*/
-    function getInitializedVersion() external view returns(uint64)
-    {
-        return _getInitializedVersion();
-    }
-}

package/contracts/test/TestDistribution.sol

@@ -1,21 +0,0 @@
-// 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/TestPool.sol

@@ -1,25 +0,0 @@
-// 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

@@ -1,72 +0,0 @@
-// 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/types/ReferralId.sol

@@ -1,48 +0,0 @@
-// SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
-
-import {Key32, KeyId, Key32Lib} from "./Key32.sol";
-import {REFERRAL} from "./ObjectType.sol";
-
-type ReferralId is bytes8;
-
-// type bindings
-using {
-    eqReferralId as ==, 
-    neReferralId as !=,
-    ReferralIdLib.toKey32
-} for ReferralId global;
-
-// general pure free functions
-
-// @dev Returns true iff risk ids a and b are identical
-function eqReferralId(ReferralId a, ReferralId b) pure returns (bool isSame) {
-    return ReferralId.unwrap(a) == ReferralId.unwrap(b);
-}
-
-// @dev Returns true iff risk ids a and b are different
-function neReferralId(ReferralId a, ReferralId b) pure returns (bool isDifferent) {
-    return ReferralId.unwrap(a) != ReferralId.unwrap(b);
-}
-
-library ReferralIdLib {
-
-    function zeroReferralId() public pure returns (ReferralId) {
-        return ReferralId.wrap(bytes8(0));
-    }
-
-    // @dev Converts a role string into a role id.
-    function toReferralId(string memory referral) public pure returns (ReferralId) {
-        return ReferralId.wrap(bytes8(keccak256(abi.encode(referral))));
-    }
-
-    /// @dev Returns the key32 value for the specified id
-    function toKey32(ReferralId id) public pure returns (Key32 key) {
-        return Key32Lib.toKey32(REFERRAL(), toKeyId(id));
-    }
-
-    /// @dev Returns the key id value for the specified id
-    function toKeyId(ReferralId id) public pure returns (KeyId keyId) {
-        return KeyId.wrap(bytes31(ReferralId.unwrap(id)));
-    }
-}