@etherisc/gif-next 3.0.0-1b49bd6-565 → 3.0.0-1bd1936-188

package/contracts/staking/Staking.sol

@@ -4,10 +4,11 @@ pragma solidity ^0.8.20;
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
 import {IRegistry} from "../registry/IRegistry.sol";
+import {IRelease} from "../registry/IRelease.sol";
 import {IStaking} from "./IStaking.sol";
 import {IStakingService} from "./IStakingService.sol";
 import {ITargetLimitHandler} from "./ITargetLimitHandler.sol";
-import {IVersionable} from "../shared/IVersionable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {Blocknumber} from "../type/Blocknumber.sol";
@@ -15,7 +16,7 @@ import {ChainId, ChainIdLib} from "../type/ChainId.sol";
 import {Component} from "../shared/Component.sol";
 import {IComponent} from "../shared/IComponent.sol";
 import {NftId} from "../type/NftId.sol";
-import {ObjectType, PROTOCOL, STAKE, STAKING, TARGET} from "../type/ObjectType.sol";
+import {ObjectType, PROTOCOL, INSTANCE, STAKE, STAKING, TARGET} from "../type/ObjectType.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
 import {Registerable} from "../shared/Registerable.sol";
 import {StakingLib} from "./StakingLib.sol";
@@ -27,13 +28,12 @@ import {TokenHandlerDeployerLib} from "../shared/TokenHandlerDeployerLib.sol";
 import {TokenRegistry} from "../registry/TokenRegistry.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
 import {Version, VersionLib, VersionPart, VersionPartLib} from "../type/Version.sol";
-import {Versionable} from "../shared/Versionable.sol";
-import {Upgradeable} from "../upgradeability/Upgradeable.sol";
+import {Versionable} from "../upgradeability/Versionable.sol";
 
 
 contract Staking is 
     Component,
-    Upgradeable,
+    Versionable,
     IStaking
 {
     string public constant CONTRACT_NAME = "Staking";
@@ -75,18 +75,17 @@ contract Staking is
         external
         virtual
     {
-        IRegistry registry = _getRegistry();
-        if (msg.sender != address(registry)) {
+        if (msg.sender != address(getRegistry())) {
             revert ErrorStakingNotRegistry(msg.sender);
         }
 
         StakingStorage storage $ = _getStakingStorage();
         address dipToken = _getStakingStorage()._tokenRegistry.getDipTokenAddress();
         $._tokenHandler = TokenHandlerDeployerLib.deployTokenHandler(
-            address(registry),
+            address(getRegistry()),
             address(this),
             dipToken, 
-            registry.getAuthority());
+            getRegistry().getAuthority());
     }
 
 
@@ -191,7 +190,7 @@ contract Staking is
         // effects
         StakingStorage storage $ = _getStakingStorage();
         address oldStakingService = address($._stakingService);
-        $._stakingService = StakingLib.checkAndGetStakingService(release);
+        $._stakingService = StakingLib.checkAndGetStakingService(getRegistry(), release);
 
         emit LogStakingStakingServiceSet(address($._stakingService), release, oldStakingService);
     }
@@ -278,10 +277,9 @@ contract Staking is
         returns (Amount newBalance)
     {
         address transferTo;
-        IRegistry registry = _getRegistry();
     
         // case 1: protocol target: staking owner is recipient
-        if (targetNftId == registry.getProtocolNftId()) {
+        if (targetNftId == getRegistry().getProtocolNftId()) {
             // verify that the caller is the staking owner
             transferTo = getOwner();
             if (msg.sender != transferTo) {
@@ -291,7 +289,7 @@ contract Staking is
         // case 2: same chain target: target owner is recipient
         } else if (ChainIdLib.isCurrentChain(targetNftId)) {
             // verify that the caller is the target owner
-            transferTo = registry.ownerOf(targetNftId);
+            transferTo = getRegistry().ownerOf(targetNftId);
             if (msg.sender != transferTo) {
                 revert ErrorStakingNotNftOwner(targetNftId);
             }
@@ -325,15 +323,13 @@ contract Staking is
         onlyTarget(targetNftId)
         returns (Amount newBalance)
     {
-        IRegistry registry = _getRegistry();
-
         // check that service does not withdraw from protocol target 
-        if (targetNftId == registry.getProtocolNftId()) {
+        if (targetNftId == getRegistry().getProtocolNftId()) {
             revert ErrorStakingTargetTypeNotSupported(targetNftId, PROTOCOL());
         }
 
         // default: on-chain target owner is recipient
-        address targetOwner = registry.ownerOf(targetNftId);
+        address targetOwner = getRegistry().ownerOf(targetNftId);
         return _withdrawRewardReserves(targetNftId, dipAmount, targetOwner);
     }
 
@@ -435,9 +431,7 @@ contract Staking is
         virtual
         restricted() // only pool service
     {
-        // !!! TODO amount can be 0
         StakingStorage storage $ = _getStakingStorage();
-        // why not StakingBalanceStore instead of StakingStore?
         $._store.increaseTotalValueLocked(targetNftId, token, amount);
     }
 
@@ -534,7 +528,7 @@ contract Staking is
 
         // collect staked DIP token via staking service
         if (stakeAmount.gtz()) {
-            address stakeOwner = _getRegistry().ownerOf(stakeNftId);
+            address stakeOwner = getRegistry().ownerOf(stakeNftId);
             $._stakingService.pullDipToken(stakeAmount, stakeOwner);
         }
     }
@@ -557,7 +551,7 @@ contract Staking is
 
         // transfer unstaked DIP token via staking service
         if (unstakedAmount.gtz()) {
-            address stakeOwner = _getRegistry().ownerOf(stakeNftId);
+            address stakeOwner = getRegistry().ownerOf(stakeNftId);
             $._stakingService.pushDipToken(unstakedAmount, stakeOwner);
         }
     }
@@ -588,7 +582,7 @@ contract Staking is
             AmountLib.max()); // unstake up to this amount
 
         // step 2: create new stake with full unstaked amount
-        address stakeOwner = _getRegistry().ownerOf(stakeNftId);
+        address stakeOwner = getRegistry().ownerOf(stakeNftId);
         newStakeNftId = $._stakingService.createStakeObject(newTargetNftId, stakeOwner);
         $._store.createStake(newStakeNftId, newTargetNftId, stakeOwner, newStakedAmount);
 
@@ -627,7 +621,7 @@ contract Staking is
         // collect staked DIP token by staking service
         if (claimedAmount.gtz()) {
             // interactions
-            address stakeOwner = _getRegistry().ownerOf(stakeNftId);
+            address stakeOwner = getRegistry().ownerOf(stakeNftId);
             $._stakingService.pushDipToken(claimedAmount, stakeOwner);
         }
     }
@@ -655,11 +649,21 @@ contract Staking is
         return _getStakingStorage()._tokenHandler;
     }
 
+    // from IRegisterable
+    function getRelease()
+        public 
+        pure 
+        virtual override (IRelease, Registerable)
+        returns(VersionPart)
+    {
+        return VersionPartLib.toVersionPart(3);
+    }
+
     // from IVersionable
     function getVersion()
         public 
         pure 
-        virtual override (IVersionable, Versionable)
+        virtual override (Component, IVersionable, Versionable)
         returns(Version)
     {
         return VersionLib.toVersion(3,0,0);
@@ -724,13 +728,14 @@ contract Staking is
         onlyInitializing()
     {
         (
+            address registryAddress,
             address targetHandlerAddress,
             address stakingStoreAddress,
             address tokenRegistryAddress
-        ) = abi.decode(data, (address, address, address));
+        ) = abi.decode(data, (address, address, address, address));
 
         // wiring to external contracts
-        IRegistry registry = _getRegistry();
+        IRegistry registry = IRegistry(registryAddress);
         StakingStorage storage $ = _getStakingStorage();
         $._protocolNftId = registry.getProtocolNftId();
         $._targetHandler = TargetHandler(targetHandlerAddress);
@@ -740,9 +745,9 @@ contract Staking is
         // staking service has to be set via setStakingService after deploying the first GIF release
 
         // initialize component
-        // TODO Will read 0 component service address from registry
         __Component_init(
             registry.getAuthority(),
+            address(registry), 
             registry.getNftId(), // parent nft id
             CONTRACT_NAME,
             STAKING(), 
@@ -776,7 +781,7 @@ contract Staking is
         }
 
         if (checkOwner) {
-            address nftOwner = _getRegistry().ownerOf(nftId);
+            address nftOwner = getRegistry().ownerOf(nftId);
             if (msg.sender != nftOwner) {
                 revert ErrorStakingNotOwner(nftId, nftOwner, msg.sender);
             }

package/contracts/staking/StakingLib.sol

@@ -6,7 +6,6 @@ import {IStaking} from "./IStaking.sol";
 import {IStakingService} from "./IStakingService.sol";
 
 import {Amount} from "../type/Amount.sol";
-import {ContractLib} from "../shared/ContractLib.sol";
 import {NftId} from "../type/NftId.sol";
 import {ReleaseRegistry} from "../registry/ReleaseRegistry.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
@@ -112,14 +111,13 @@ library StakingLib {
 
 
     function checkAndGetStakingService(
+        IRegistry registry,
         VersionPart release
     )
         public
         view
         returns (IStakingService stakingService)
     {
-        IRegistry registry = ContractLib.getRegistry();
-
         if (!ReleaseRegistry(registry.getReleaseRegistryAddress()).isActiveRelease(release)) {
             revert IStaking.ErrorStakingReleaseNotActive(release);
         }

package/contracts/staking/StakingManager.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {Staking} from "./Staking.sol";
 
@@ -15,6 +15,7 @@ contract StakingManager is
 
     /// @dev initializes proxy manager with service implementation 
     constructor(
+        address registry,
         address targetHandler,
         address stakingStore,
         address tokenRegistry,
@@ -26,16 +27,18 @@ contract StakingManager is
 
         _initialImplementation = address(stakingImplementation);
         _initializationData = abi.encode(
+            registry,
             targetHandler,
             stakingStore,
             tokenRegistry);
         
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
+            registry,
             _initialImplementation,
             _initializationData,
             salt);
 
-        _staking = Staking(address(upgradeable));
+        _staking = Staking(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/staking/StakingReader.sol

@@ -4,32 +4,36 @@ pragma solidity ^0.8.20;
 import {Initializable} from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; 
 
 import {IRegistry} from "../registry/IRegistry.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
+import {IRegistryLinked} from "../shared/IRegistryLinked.sol";
 import {IStaking} from "../staking/IStaking.sol";
 
-import {Amount} from "../type/Amount.sol";
+import {Amount, AmountLib} from "../type/Amount.sol";
+import {Blocknumber}  from "../type/Blocknumber.sol";
 import {ChainId}  from "../type/ChainId.sol";
 import {NftId} from "../type/NftId.sol";
 import {ObjectType} from "../type/ObjectType.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {Seconds} from "../type/Seconds.sol";
 import {StakingStore} from "./StakingStore.sol";
+import {STAKE, TARGET} from "../type/ObjectType.sol";
+import {Timestamp} from "../type/Timestamp.sol";
 import {UFixed} from "../type/UFixed.sol";
 
 
 contract StakingReader is
-    Initializable,
-    RegistryLinked
+    IRegistryLinked,
+    Initializable
 {
 
     error ErrorStakingReaderUnauthorizedCaler();
 
     address private _initializeOwner;
+    IRegistry private _registry;
     IStaking private _staking;
     StakingStore private _store;
 
-    constructor() {
+    constructor(IRegistry registry) {
         _initializeOwner = msg.sender;
+        _registry = registry;
     }
 
     function initialize(
@@ -47,14 +51,18 @@ contract StakingReader is
         _store = StakingStore(stakingStoreAddress);
     }
 
-    // view functions
+    // view and pure functions 
+
+    function getRegistry() external view returns (IRegistry registry) {
+        return _registry;
+    }
 
     function getStaking() external view returns (IStaking staking) {
         return _staking;
     }
 
     function getProtocolNftId() external view returns (NftId protocolNftId) {
-        return _getRegistry().getProtocolNftId();
+        return _registry.getProtocolNftId();
     }
 
 
@@ -74,7 +82,7 @@ contract StakingReader is
 
 
     function getTargetNftId(NftId stakeNftId) public view returns (NftId targetNftId) {
-        return _getRegistry().getParentNftId(stakeNftId);
+        return _registry.getParentNftId(stakeNftId);
     }
 
 

package/contracts/staking/StakingService.sol

@@ -3,6 +3,7 @@ pragma solidity ^0.8.20;
 
 import {IERC20Metadata} from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 
+import {IRegisterable} from "../shared/IRegisterable.sol";
 import {IRegistry} from "../registry/IRegistry.sol";
 import {IStaking} from "./IStaking.sol";
 import {IStakingService} from "./IStakingService.sol";
@@ -113,7 +114,7 @@ contract StakingService is
 
         // update reward reserve book keeping
         StakingServiceStorage storage $ = _getStakingServiceStorage();
-        address instanceOwner = _getRegistry().ownerOf(instanceNftId);
+        address instanceOwner = getRegistry().ownerOf(instanceNftId);
         newBalance = $._staking.refillRewardReservesByService(instanceNftId, dipAmount, instanceOwner);
 
         emit LogStakingServiceRewardReservesIncreased(instanceNftId, rewardProvider, dipAmount, newBalance);
@@ -130,7 +131,7 @@ contract StakingService is
         _checkNftType(instanceNftId, INSTANCE());
         // update reward reserve book keeping
         StakingServiceStorage storage $ = _getStakingServiceStorage();
-        address instanceOwner = _getRegistry().ownerOf(instanceNftId);
+        address instanceOwner = getRegistry().ownerOf(instanceNftId);
         newBalance = $._staking.withdrawRewardReservesByService(instanceNftId, dipAmount, instanceOwner);
 
         emit LogStakingServiceRewardReservesDecreased(instanceNftId, instanceOwner, dipAmount, newBalance);
@@ -157,12 +158,11 @@ contract StakingService is
                 nftId: NftIdLib.zero(),
                 parentNftId: targetNftId,
                 objectType: STAKE(),
-                release: getRelease(),
                 isInterceptor: false,
-                objectAddress: address(0)}),
-            stakeOwner, // initialOwner
-            "" // data
-        );
+                objectAddress: address(0),
+                initialOwner: stakeOwner,
+                data: ""
+            }));
 
         emit LogStakingServiceStakeObjectCreated(stakeNftId, targetNftId, stakeOwner);
     }
@@ -255,18 +255,18 @@ contract StakingService is
     )
         internal
         virtual override
-        onlyInitializing()
+        initializer()
     {
         (
             address authority,
+            address registry,
             address staking
-        ) = abi.decode(data, (address, address));
+        ) = abi.decode(data, (address, address, address));
 
-        __Service_init(authority, owner);
+        __Service_init(authority, registry, owner);
 
         StakingServiceStorage storage $ = _getStakingServiceStorage();
         $._registryService = RegistryService(_getServiceAddress(REGISTRY()));
-        // TODO staking is registered in registry.initialize(), just check if address is registered staking
         $._staking = _registerStaking(staking);
         $._dip = $._staking.getToken();
         $._tokenHandler = $._staking.getTokenHandler();
@@ -283,7 +283,7 @@ contract StakingService is
     {
         // check if provided staking contract is already registred
         // staking contract may have been already registered by a previous major relase
-        IRegistry.ObjectInfo memory stakingInfo = _getRegistry().getObjectInfo(stakingAddress);
+        IRegistry.ObjectInfo memory stakingInfo = getRegistry().getObjectInfo(stakingAddress);
         if (stakingInfo.nftId.gtz()) {
             // registered object but wrong type
             if (stakingInfo.objectType != STAKING()) {
@@ -294,9 +294,6 @@ contract StakingService is
             return IStaking(stakingAddress);
         }
 
-        // TODO staking is registered in registry.initialize()
-        // consider deleting the rest of the function
-
         // check that contract implements IStaking
         if(!IStaking(stakingAddress).supportsInterface(type(IStaking).interfaceId)) {
             revert ErrorStakingServiceNotSupportingIStaking(stakingAddress);
@@ -304,7 +301,7 @@ contract StakingService is
 
         address owner = msg.sender;
         _getStakingServiceStorage()._registryService.registerStaking(
-            IStaking(stakingAddress),
+            IRegisterable(stakingAddress),
             owner);
 
         return IStaking(stakingAddress);

package/contracts/staking/StakingServiceManager.sol

@@ -2,7 +2,8 @@
 pragma solidity ^0.8.20;
 
 import {IRegistry} from "../registry/IRegistry.sol";
-import {IUpgradeable} from "../upgradeability/IUpgradeable.sol";
+import {IVersionable} from "../upgradeability/IVersionable.sol";
+
 import {ProxyManager} from "../upgradeability/ProxyManager.sol";
 import {StakingService} from "./StakingService.sol";
 
@@ -15,20 +16,23 @@ contract StakingServiceManager is
     /// @dev initializes proxy manager with service implementation 
     constructor(
         address authority,
+        address registry,
         bytes32 salt
     )
     {
         StakingService svc = new StakingService();
         bytes memory data = abi.encode(
             authority, 
-            _getRegistry().getStakingAddress());
+            registry, 
+            IRegistry(registry).getStakingAddress());
 
-        IUpgradeable upgradeable = initialize(
+        IVersionable versionable = initialize(
+            registry,
             address(svc), 
             data,
             salt);
 
-        _stakingService = StakingService(address(upgradeable));
+        _stakingService = StakingService(address(versionable));
     }
 
     //--- view functions ----------------------------------------------------//

package/contracts/staking/StakingStore.sol

@@ -18,7 +18,6 @@ import {PROTOCOL, INSTANCE} from "../type/ObjectType.sol";
 import {Seconds, SecondsLib} from "../type/Seconds.sol";
 import {StakingLib} from "./StakingLib.sol";
 import {StakingReader} from "./StakingReader.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {TargetManagerLib} from "./TargetManagerLib.sol";
 import {Timestamp, TimestampLib} from "../type/Timestamp.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
@@ -26,8 +25,7 @@ import {UFixed, UFixedLib} from "../type/UFixed.sol";
 
 contract StakingStore is 
     Initializable,
-    AccessManaged,
-    RegistryLinked
+    AccessManaged
 {
 
     // token
@@ -55,6 +53,7 @@ contract StakingStore is
     error ErrorStakingStoreTvlBalanceAlreadyInitialized(NftId nftId, address token);
     error ErrorStakingStoreTvlBalanceNotInitialized(NftId nftId, address token);
 
+    IRegistry private _registry;
     ITargetLimitHandler private _targetLimitHandler;
     StakingReader private _reader;
     NftIdSet private _targetNftIdSet;
@@ -76,15 +75,16 @@ contract StakingStore is
 
 
     constructor(
+        IRegistry registry, 
         StakingReader reader
     )
         AccessManaged(msg.sender)
     {
-
         // set final authority
-        setAuthority(_getRegistry().getAuthority());
+        setAuthority(registry.getAuthority());
 
         // set internal variables
+        _registry = registry;
         _reader = reader;
         _targetNftIdSet = new NftIdSet();
 
@@ -495,7 +495,7 @@ contract StakingStore is
         emit IStaking.LogStakingRewardReservesRefilled(
             targetNftId,
             dipAmount,
-            _getRegistry().ownerOf(targetNftId),
+            _registry.ownerOf(targetNftId),
             newReserveBalance,
             lastUpdateIn);
     }
@@ -520,7 +520,7 @@ contract StakingStore is
         emit IStaking.LogStakingRewardReservesWithdrawn(
             targetNftId,
             dipAmount,
-            _getRegistry().ownerOf(targetNftId),
+            _registry.ownerOf(targetNftId),
             newReserveBalance,
             lastUpdateIn);
     }
@@ -929,7 +929,7 @@ contract StakingStore is
         // checks
         if (checkParameters) {
             TargetManagerLib.checkTargetParameters(
-                _getRegistry(), 
+                _registry, 
                 _reader, 
                 targetNftId, 
                 objectType, 

package/contracts/staking/TargetHandler.sol

@@ -10,7 +10,6 @@ import {ITargetLimitHandler} from "./ITargetLimitHandler.sol";
 import {Amount, AmountLib} from "../type/Amount.sol";
 import {Blocknumber, BlocknumberLib} from "../type/Blocknumber.sol";
 import {NftId} from "../type/NftId.sol";
-import {RegistryLinked} from "../shared/RegistryLinked.sol";
 import {StakingStore} from "./StakingStore.sol";
 import {UFixed, UFixedLib} from "../type/UFixed.sol";
 
@@ -18,12 +17,12 @@ import {UFixed, UFixedLib} from "../type/UFixed.sol";
 contract TargetHandler is
     Initializable,
     AccessManaged,
-    ITargetLimitHandler,
-    RegistryLinked
+    ITargetLimitHandler
 {
 
     event LogTargetHandlerUpdateTriggersSet(uint16 tvlUpdatesTrigger, UFixed minTvlRatioTrigger, Blocknumber lastUpdateIn);
 
+    IRegistry private _registry;
     StakingStore private _store;
 
     /// @dev Update trigger value: Number of TVL updates below which limit updates are suppressed
@@ -34,12 +33,14 @@ contract TargetHandler is
 
 
     constructor (
+        IRegistry registry,
         StakingStore stakingStore
     )
         AccessManaged(msg.sender)
     {
         // set final authority and registry
-        setAuthority(_getRegistry().getAuthority());
+        setAuthority(registry.getAuthority());
+        _registry = registry;
         _store = stakingStore;
 
         // set default trigger values

package/contracts/type/Version.sol

@@ -5,9 +5,6 @@ type VersionPart is uint8;
 
 using {
     versionPartGt as >,
-    versionPartGte as >=,
-    versionPartLt as <,
-    versionPartLte as <=,
     versionPartEq as ==,
     versionPartNe as !=,
     VersionPartLib.eqz,
@@ -19,9 +16,6 @@ using {
     for VersionPart global;
 
 function versionPartGt(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) > VersionPart.unwrap(b); }
-function versionPartGte(VersionPart a, VersionPart b) pure returns(bool isGreaterThan) { return VersionPart.unwrap(a) >= VersionPart.unwrap(b); }
-function versionPartLt(VersionPart a, VersionPart b) pure returns(bool isLessThan) { return VersionPart.unwrap(a) < VersionPart.unwrap(b); }
-function versionPartLte(VersionPart a, VersionPart b) pure returns(bool isLessThan) { return VersionPart.unwrap(a) <= VersionPart.unwrap(b); }
 function versionPartEq(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) == VersionPart.unwrap(b); }
 function versionPartNe(VersionPart a, VersionPart b) pure returns(bool isSame) { return VersionPart.unwrap(a) != VersionPart.unwrap(b); }
 
@@ -33,7 +27,8 @@ library VersionPartLib {
     function releaseMax() public pure returns (VersionPart) { return toVersionPart(99); }
 
     function isValidRelease(VersionPart release) external pure returns(bool) { 
-        return releaseMin() <= release && release <= releaseMax(); 
+        uint256 releaseInt = VersionPart.unwrap(release);
+        return 3 <= releaseInt && releaseInt <= 99; 
     } 
 
     function toString(VersionPart a) external pure returns (string memory) {
@@ -71,9 +66,8 @@ library VersionPartLib {
 
     function eqz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) == 0; }
     function gtz(VersionPart a) external pure returns(bool) { return VersionPart.unwrap(a) > 0; }
-    function toInt(VersionPart a) external pure returns(uint8) { return VersionPart.unwrap(a); }
-    function toVersionPart(uint8 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
-    function zero() external pure returns(VersionPart) { return VersionPart.wrap(0); }
+    function toInt(VersionPart a) external pure returns(uint256) { return VersionPart.unwrap(a); }
+    function toVersionPart(uint256 a) public pure returns(VersionPart) { return VersionPart.wrap(uint8(a)); }
 }
 
 type Version is uint24; // contains major,minor,patch version parts
@@ -93,7 +87,7 @@ function versionEq(Version a, Version b) pure returns(bool isSame) { return Vers
 
 library VersionLib {
 
-    function toInt(Version version) external pure returns(uint24) { return Version.unwrap(version); }
+    function toInt(Version version) external pure returns(uint) { return Version.unwrap(version); }
 
     function toUint64(Version version) external pure returns(uint64) { return Version.unwrap(version); }
 
@@ -130,19 +124,26 @@ library VersionLib {
         );
     }
 
+    // function toVersionPart(uint256 versionPart) public pure returns(VersionPart) { 
+    //     return VersionPart.wrap(uint8(versionPart)); 
+    // }
+
     function toVersion(
-        uint8 major,
-        uint8 minor,
-        uint8 patch
+        uint256 major,
+        uint256 minor,
+        uint256 patch
     )
         external
         pure
         returns(Version)
     {
+        require(
+            major < 256 && minor < 256 && patch < 256,
+            "ERROR:VRS-010:VERSION_PART_TOO_BIG");
 
         return Version.wrap(
             uint24(
-                (uint24(major) << 16) + (uint24(minor) << 8) + patch));
+                (major << 16) + (minor << 8) + patch));
     }
 
     // TODO check for overflow?