npm - @etherisc/gif-next - Versions diffs - 0.0.2-e94f4c7-084 → 0.0.2-e964d24-516 - Mend

@etherisc/gif-next 0.0.2-e94f4c7-084 → 0.0.2-e964d24-516

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (406) hide show

package/contracts/staking/StakeingServiceManager.sol ADDED Viewed

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+import {IVersionable} from "../shared/IVersionable.sol";
+import {ProxyManager} from "../shared/ProxyManager.sol";
+import {StakingService} from "./StakingService.sol";
+contract StakingServiceManager is
+    ProxyManager
+{
+    StakingService private _stakingService;
+    /// @dev initializes proxy manager with service implementation
+    constructor(
+        address registryAddress
+    )
+        ProxyManager(registryAddress)
+    {
+        StakingService svc = new StakingService();
+        bytes memory data = abi.encode(registryAddress, address(this));
+        IVersionable versionable = deploy(
+            address(svc),
+            data);
+        _stakingService = StakingService(address(versionable));
+    }
+    //--- view functions ----------------------------------------------------//
+    function getStakingService()
+        external
+        view
+        returns (StakingService)
+    {
+        return _stakingService;
+    }
+}

package/contracts/staking/StakingService.sol ADDED Viewed

@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.19;
+import {Amount} from "../type/Amount.sol";
+import {IPoolService} from "../pool/IPoolService.sol";
+import {IRegistry} from "../registry/IRegistry.sol";
+import {IStakingService} from "./IStakingService.sol";
+import {NftId} from "../type/NftId.sol";
+import {ObjectType, POOL, STAKE} from "../type/ObjectType.sol";
+import {Service} from "../shared/Service.sol";
+import {Timestamp} from "../type/Timestamp.sol";
+contract StakingService is
+    Service,
+    IStakingService
+{
+    // TODO decide and implement string spec for location calculation
+    // keccak256(abi.encode(uint256(keccak256("gif-next.contracts.shared.StakingService.sol")) - 1)) & ~bytes32(uint256(0xff));
+    bytes32 public constant STAKING_SERVICE_LOCATION_V1 = 0x6548005c3f4340f82f348c576c0ff69f7f529cadd5ad41f96aae61abceeaa300;
+    struct StakingServiceStorage {
+        IPoolService _poolService;
+    }
+    function getDomain() public pure override returns(ObjectType) {
+        return STAKE();
+    }
+    function create(
+        NftId targetNftId,
+        Amount amount
+    )
+        external
+        virtual
+        returns (
+            NftId stakeNftId
+        )
+    {
+    }
+    function stake(
+        NftId stakeNftId,
+        Amount amount
+    )
+        external
+        virtual
+    {
+    }
+    function unstake(
+        NftId stakeNftId,
+        Amount amount
+    )
+        external
+        virtual
+    {
+    }
+    function close(
+        NftId stakeNftId
+    )
+        external
+        virtual
+    {
+    }
+    function reStake(
+        NftId stakeNftId,
+        NftId newTargetNftId
+    )
+        external
+        virtual
+        returns (
+            NftId newStakeNftId,
+            Timestamp unlockedAt
+        )
+    {
+    }
+    function increaseTotalValueLocked(
+        NftId targetNftId,
+        address token,
+        Amount amount
+    )
+        external
+        virtual
+        returns (Amount totalValueLocked)
+    {
+    }
+    function decreaseTotalValueLocked(
+        NftId targetNftId,
+        address token,
+        Amount amount
+    )
+        external
+        virtual
+        returns (Amount totalValueLocked)
+    {
+    }
+    function sendTotalValueLockedData(
+        NftId targetNftId,
+        address token
+    )
+        external
+        virtual
+    {
+    }
+    function receiveTotalValueLockedData(
+        NftId targetNftId,
+        address token
+    )
+        external
+        virtual
+    {
+    }
+    function _initialize(
+        address owner,
+        bytes memory data
+    )
+        internal
+        virtual override
+        initializer()
+    {
+        // TODO check this, might no longer be the way, refactor if necessary
+        address registryAddress;
+        (registryAddress,) = abi.decode(data, (address, address));
+        StakingServiceStorage storage $ = _getStakingServiceStorage();
+        $._poolService = IPoolService(_getServiceAddress(POOL()));
+        initializeService(registryAddress, address(0), owner);
+        registerInterface(type(IStakingService).interfaceId);
+    }
+    function _getServiceAddress(ObjectType domain) internal view returns (address) {
+        return getRegistry().getServiceAddress(domain, getVersion().toMajorPart());
+    }
+    function _getStakingServiceStorage() private pure returns (StakingServiceStorage storage $) {
+        assembly {
+            $.slot := STAKING_SERVICE_LOCATION_V1
+        }
+    }
+}

package/contracts/{types → type}/Amount.sol RENAMED Viewed

@@ -6,6 +6,12 @@ import {UFixed, UFixedLib} from "./UFixed.sol";
 type Amount is uint96;
 using {
+    addAmount as +,
+    subAmount as -,
+    eqAmount as ==,
+    ltAmount as <,
+    gtAmount as >,
+    AmountLib.eq,
     AmountLib.eqz,
     AmountLib.gtz,
     AmountLib.toInt,
@@ -13,6 +19,25 @@ using {
     AmountLib.toUFixed
 } for Amount global;
+function addAmount(Amount a, Amount b) pure returns (Amount) {
+    return AmountLib.add(a, b);
+}
+function subAmount(Amount a, Amount b) pure returns (Amount) {
+    return AmountLib.sub(a, b);
+}
+function eqAmount(Amount a, Amount b) pure returns (bool) {
+    return AmountLib.eq(a, b);
+}
+function ltAmount(Amount a, Amount b) pure returns (bool) {
+    return AmountLib.lt(a, b);
+}
+function gtAmount(Amount a, Amount b) pure returns (bool) {
+    return AmountLib.gt(a, b);
+}
 library AmountLib {
@@ -46,6 +71,16 @@ library AmountLib {
         return Amount.unwrap(amount1) == Amount.unwrap(amount2);
     }
+    /// @dev return true if amount a1 is smaller than a2
+    function lt(Amount a1, Amount a2) public pure returns (bool) {
+        return Amount.unwrap(a1) < Amount.unwrap(a2);
+    }
+    /// @dev return true if amount a1 is larger than a2
+    function gt(Amount a1, Amount a2) public pure returns (bool) {
+        return Amount.unwrap(a1) > Amount.unwrap(a2);
+    }
     /// @dev return true if amount is larger than 0
     function gtz(Amount amount) public pure returns (bool) {
         return Amount.unwrap(amount) > 0;
@@ -55,6 +90,10 @@ library AmountLib {
         return Amount.wrap(Amount.unwrap(a1) + Amount.unwrap(a2));
     }
+    function sub(Amount a1, Amount a2) public pure returns (Amount) {
+        return Amount.wrap(Amount.unwrap(a1) - Amount.unwrap(a2));
+    }
     function toInt(Amount amount) public pure returns (uint256) {
         return uint256(uint96(Amount.unwrap(amount)));
     }

package/contracts/{types → type}/Fee.sol RENAMED Viewed

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
+import {Amount, AmountLib} from "./Amount.sol";
 import {UFixed, UFixedLib} from "./UFixed.sol";
 struct Fee {
@@ -12,21 +13,21 @@ library FeeLib {
     function calculateFee(
         Fee memory fee,
-        uint256 amount
+        Amount amount
     )
         public
         pure
         returns (
-            uint256 feeAmount,
-            uint256 netAmount
+            Amount feeAmount,
+            Amount netAmount
         )
     {
         netAmount = amount;
         if(gtz(fee)) {
             UFixed fractionalAmount =
-                UFixedLib.toUFixed(amount) * fee.fractionalFee;
-            feeAmount = fractionalAmount.toInt() + fee.fixedFee;
-            netAmount -= feeAmount;
+                amount.toUFixed() * fee.fractionalFee;
+            feeAmount = AmountLib.toAmount(fractionalAmount.toInt() + fee.fixedFee);
+            netAmount = netAmount - feeAmount;
         }
     }

package/contracts/{types → type}/NftIdSet.sol RENAMED Viewed

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.19;
-import {NftId} from "../types/NftId.sol";
+import {NftId} from "../type/NftId.sol";
 // based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/structs/EnumerableSet.sol
 library LibNftIdSet {

package/contracts/{types → type}/ObjectType.sol RENAMED Viewed

@@ -110,6 +110,10 @@ function PAYOUT() pure returns (ObjectType) {
     return toObjectType(213);
 }
+function PRICE() pure returns (ObjectType) {
+    return toObjectType(230);
+}
 /// @dev Converts the uint8 to a ObjectType.
 function toObjectType(uint256 objectType) pure returns (ObjectType) {
     return ObjectType.wrap(uint8(objectType));
@@ -154,4 +158,4 @@ library ObjectTypeLib {
     function eq(ObjectType a, ObjectType b) public pure returns (bool isSame) {
         return eqObjectType(a, b);
     }
-}
+}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-e94f4c7-084",
+  "version": "0.0.2-e964d24-516",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {