npm - @etherisc/gif-next - Versions diffs - 0.0.2-edc084c-558 → 0.0.2-edd8f00-238 - Mend

@etherisc/gif-next 0.0.2-edc084c-558 → 0.0.2-edd8f00-238

Files changed (582) hide show

package/contracts/type/Selector.sol ADDED Viewed

@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+type Selector is bytes4;
+// type bindings
+using {
+    eqSelector as ==,
+    neSelector as !=,
+    SelectorLib.toBytes4,
+    SelectorLib.eqz
+} for Selector global;
+// pure free functions for operators
+function eqSelector(Selector s1, Selector s2) pure returns (bool isSame) {
+    return SelectorLib.eq(s1, s2);
+}
+function neSelector(Selector s1, Selector s2) pure returns (bool isDifferent) {
+    return SelectorLib.ne(s1, s2);
+}
+// library functions that operate on user defined type
+library SelectorLib {
+    function zero() public pure returns (Selector) {
+        return Selector.wrap("");
+    }
+    function eqz(Selector s) public pure returns (bool) {
+        return Selector.unwrap(s) == "";
+    }
+    function eq(Selector s1, Selector s2) public pure returns (bool isSame) {
+        return Selector.unwrap(s1) == Selector.unwrap(s2);
+    }
+    function ne(Selector s1, Selector s2) public pure returns (bool isDifferent) {
+        return Selector.unwrap(s1) != Selector.unwrap(s2);
+    }
+    function toSelector(bytes4 selector) public pure returns (Selector) {
+        return Selector.wrap(selector);
+    }
+    function toBytes4(Selector s) public pure returns (bytes4) {
+        return Selector.unwrap(s);
+    }
+}
+// selector specific set library
+// based on https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/utils/structs/EnumerableSet.sol
+library SelectorSetLib {
+    struct Set {
+        Selector[] selectors;
+        mapping(Selector selector => uint256 index) at;
+    }
+    function add(Set storage set, Selector selector) external {
+        // selector already in set
+        if (set.at[selector] > 0) { return; }
+        set.selectors.push(selector);
+        set.at[selector] = set.selectors.length;
+    }
+    function remove(Set storage set, Selector selector) external {
+        uint256 selectorIndex = set.at[selector];
+        // selector not in set
+        if (selectorIndex == 0) {return; }
+        uint256 toDeleteIndex = selectorIndex - 1;
+        uint256 lastIndex = set.selectors.length - 1;
+        if (lastIndex != toDeleteIndex) {
+            Selector lastSelector = set.selectors[lastIndex];
+            set.selectors[toDeleteIndex] = lastSelector;
+            set.at[lastSelector] = selectorIndex; // Replace lastValue's index to valueIndex
+        }
+        set.selectors.pop();
+        delete set.at[selector];
+    }
+    function isEmpty(Set storage set) external view returns(bool empty) {
+        return set.selectors.length == 0;
+    }
+    function contains(Set storage set, Selector selector) external view returns(bool inSet) {
+        return set.at[selector] > 0;
+    }
+    function size(Set storage set) external view returns(uint256 length) {
+        return set.selectors.length;
+    }
+    function at(Set storage set, uint256 index) external view returns(Selector selector) {
+        return set.selectors[index];
+    }
+}

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

@@ -14,6 +14,23 @@ using {
 } for StateId global;
 // general pure free functions
+function INITIAL() pure returns (StateId) {
+    return toStateId(1);
+}
+function SCHEDULED() pure returns (StateId) {
+    return toStateId(2);
+}
+function DEPLOYING() pure returns (StateId) {
+    return toStateId(3);
+}
+function ACTIVE() pure returns (StateId) {
+    return toStateId(4);
+}
 function APPLIED() pure returns (StateId) {
     return toStateId(10);
 }
@@ -26,20 +43,32 @@ function DECLINED() pure returns (StateId) {
     return toStateId(30);
 }
-function UNDERWRITTEN() pure returns (StateId) {
+function COLLATERALIZED() pure returns (StateId) {
     return toStateId(40);
 }
-function CONFIRMED() pure returns (StateId) {
+function SUBMITTED() pure returns (StateId) {
     return toStateId(50);
 }
+function CONFIRMED() pure returns (StateId) {
+    return toStateId(51);
+}
 function EXPECTED() pure returns (StateId) {
     return toStateId(60);
 }
-function ACTIVE() pure returns (StateId) {
-    return toStateId(100);
+function FULFILLED() pure returns (StateId) {
+    return toStateId(70);
+}
+function FAILED() pure returns (StateId) {
+    return toStateId(7);
+}
+function CANCELLED() pure returns (StateId) {
+    return toStateId(72);
 }
 function PAUSED() pure returns (StateId) {

package/contracts/type/String.sol ADDED Viewed

@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.20;
+import {ShortString, ShortStrings} from "@openzeppelin/contracts/utils/ShortStrings.sol";
+type Str is bytes32;
+using {
+    StrEq as ==,
+    StrNe as !=,
+    StrLib.toString,
+    StrLib.length
+} for Str global;
+function StrEq(Str s1, Str s2) pure returns (bool) {
+    return StrLib.eq(s1, s2);
+}
+function StrNe(Str s1, Str s2) pure returns (bool) {
+    return StrLib.ne(s1, s2);
+}
+library StrLib {
+    /// @dev converts the provided string into a short string.
+    /// uses ShortStrings.toShortString
+    function toStr(string memory str) public pure returns (Str) {
+        return Str.wrap(ShortString.unwrap(ShortStrings.toShortString(str)));
+    }
+    /// @dev return true iff s1 equals s2
+    function eq(Str s1, Str s2) public pure returns (bool) {
+        return Str.unwrap(s1) == Str.unwrap(s2);
+    }
+    /// @dev return true iff s1 differs from s2
+    function ne(Str s1, Str s2) public pure returns (bool) {
+        return Str.unwrap(s1) != Str.unwrap(s2);
+    }
+    /// @dev converts the provided short string into a string.
+    /// uses ShortStrings.toString
+    function toString(Str str) public pure returns (string memory) {
+        return ShortStrings.toString(ShortString.wrap(Str.unwrap(str)));
+    }
+    /// @dev converts the provided short string into a string.
+    /// uses ShortStrings.byteLength
+    function length(Str str) public pure returns (uint256 byteLength) {
+        return ShortStrings.byteLength(ShortString.wrap(Str.unwrap(str)));
+    }
+}

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

@@ -56,10 +56,19 @@ function toTimestamp(uint256 timestamp) pure returns (Timestamp) {
 // TODO move to TimestampLib and rename to zero()
 /// @dev Return the Timestamp zero (0)
 function zeroTimestamp() pure returns (Timestamp) {
-    return toTimestamp(0);
+    return Timestamp.wrap(0);
 }
 library TimestampLib {
+    function zero() public pure returns (Timestamp) {
+        return Timestamp.wrap(0);
+    }
+    function max() public pure returns (Timestamp) {
+        return Timestamp.wrap(type(uint40).max);
+    }
     function blockTimestamp() public view returns (Timestamp) {
         return Timestamp.wrap(uint40(block.timestamp));
     }

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

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0
-pragma solidity ^0.8.19;
+pragma solidity ^0.8.20;
 type VersionPart is uint8;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@etherisc/gif-next",
-  "version": "0.0.2-edc084c-558",
+  "version": "0.0.2-edd8f00-238",
   "description": "This is the repository for the next version of the Generic Insurance Framework (GIF) smart contracts. ",
   "main": "index.js",
   "scripts": {
@@ -30,8 +30,8 @@
   "homepage": "https://github.com/etherisc/gif-next#readme",
   "devDependencies": {
     "@nomicfoundation/hardhat-foundry": "^1.1.1",
-    "@nomicfoundation/hardhat-toolbox": "^3.0.0",
-    "@nomicfoundation/hardhat-verify": "^1.1.1",
+    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
+    "@nomicfoundation/hardhat-verify": "^2.0.1",
     "@typescript-eslint/eslint-plugin": "^7.1.0",
     "@typescript-eslint/parser": "^7.1.0",
     "dotenv": "^16.3.1",
@@ -44,6 +44,7 @@
   "dependencies": {
     "@openzeppelin/contracts": "5.0.0",
     "@openzeppelin/contracts-upgradeable": "5.0.0",
+    "@openzeppelin/upgrades-core": "^1.34.1",
     "abi-coder": "^5.0.0",
     "ethers": "^6.7.1",
     "solidity-docgen": "^0.6.0-beta.36",