amend CropProduct functions

etherisc · Dec 24, 2024 · abf5fc9 · abf5fc9
1 parent 33ce3e4
commit abf5fc9
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 209,598 deletions.
diff --git a/app/abi/AccountingToken.sol/AccountingToken.json b/app/abi/AccountingToken.sol/AccountingToken.json
diff --git a/app/abi/ArcModel.json b/app/abi/ArcModel.json
diff --git a/app/abi/ArcPool.json b/app/abi/ArcPool.json
diff --git a/app/abi/ArcProduct.json b/app/abi/ArcProduct.json
diff --git a/app/abi/CropProduct.sol/CropProduct.json b/app/abi/CropProduct.sol/CropProduct.json
diff --git a/app/abi/EXOF.json b/app/abi/EXOF.json
diff --git a/app/abi/InstanceServiceV2.json b/app/abi/InstanceServiceV2.json
diff --git a/app/abi/Mapper.json b/app/abi/Mapper.json
diff --git a/app/server/model/policy.py b/app/server/model/policy.py
@@ -11,16 +11,16 @@
     "riskId": "t4FcP75uGHHc",
     "externalId": "ABC123",
     "subscriptionDate": "2025-01-01",
-    "sumInsuredAmount": 1000000.0,
-    "premiumAmount": 200000.0,
+    "sumInsuredAmount": 600000.0,
+    "premiumAmount": 40000.0,
 }
 
 EXAMPLE_OUT = deepcopy(EXAMPLE_IN)
 EXAMPLE_OUT["id"] = "cwNCXQfypiTg"
 EXAMPLE_OUT["nft"] = "2689313703"
 
 # https://www.xe.com/currencyconverter/convert/?Amount=300&From=USD&To=UGX
-MAX_MONETARY_AMOUNT = 5000000.0
+MAX_MONETARY_AMOUNT = 5000000.0 # 5 million ugandan shillings
 
 MIN_DATE = Date.create_from("2024-01-01")
 MAX_DATE = Date.create_from("2025-12-31")

diff --git a/app/server/model/risk.py b/app/server/model/risk.py
@@ -9,14 +9,13 @@
 from util.nanoid import is_valid_nanoid
 import time
 
-
 EXAMPLE_IN = {
     "isValid": True,
     "configId": "7Zv4TZoBLxUi",
     "locationId": "kDho7606IRdr",
     "crop": "coffee",
-    "startOfSeason": "2024-08-01",
-    "endOfSeason": "2024-11-30",
+    "startOfSeason": "2025-01-20",
+    "endOfSeason": "2025-06-15",
     "deductible": 0.0,
 }
 

diff --git a/cache/solidity-files-cache.json b/cache/solidity-files-cache.json
diff --git a/src/CropProduct.sol b/src/CropProduct.sol
@@ -1,14 +1,39 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.20;
 
-import {Amount, Location, NftId, RiskId, Str, Timestamp} from "./Types.sol";
+import {Amount, Location, NftId, RiskId, Str, Timestamp, UFixed} from "./Types.sol";
 
 contract CropProduct {
     event LogCropPolicyCreated(NftId policyNftId);
 
     error StringTooLong(string str);
     error InvalidShortString();
 
+    struct Season {
+        uint16 year;
+        Str name;
+        Str seasonStart; // ISO 8601 date
+        Str seasonEnd; // ISO 8601 date
+        uint16 seasonDays;
+    }
+
+    struct CropRisk {
+        Str seasonId;
+        Str locationId;
+        Str crop;
+        Timestamp seasonEndAt;
+        UFixed payoutFactor;
+        bool payoutDefined;
+    }
+
+    // solhint-disable var-name-mixedcase
+    Amount public MIN_PREMIUM;
+    Amount public MAX_PREMIUM;
+    Amount public MIN_SUM_INSURED;
+    Amount public MAX_SUM_INSURED;
+    uint8 public MAX_POLICIES_TO_PROCESS = 1;
+    // solhint-enable var-name-mixedcase
+
     uint256 public riskCounter;
     uint96 public policyNftCounter = 100;
 
@@ -54,6 +79,22 @@ contract CropProduct {
         return _riskId[id];
     }
 
+    function setConstants(
+        Amount minPremium,
+        Amount maxPremium,
+        Amount minSumInsured,
+        Amount maxSumInsured,
+        uint8 maxPoliciesToProcess
+    ) external {}
+
+    //--- view functions ----------------------------------------------------//
+
+    function crops() public view returns (Str[] memory) {}
+    function seasons() public view returns (Str[] memory) {}
+    function getSeason(Str seasonId) public view returns (Season memory season) {}
+    function getLocation(Str locationId) public view returns (Location location) {}
+    function getRisk(RiskId riskId) public view returns (bool exists, CropRisk memory cropRisk) {}
+
     /// @dev converts the provided string into a short string.
     /// code from OZ ShortStrings.toShortString
     function toStr(string memory str) public pure returns (Str) {

diff --git a/src/StrHelper.sol b/src/StrHelper.sol
diff --git a/src/Types.sol b/src/Types.sol
@@ -12,3 +12,5 @@ type RiskId is bytes8;
 type Str is bytes32;
 
 type Timestamp is uint40;
+
+type UFixed is uint160;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,3 +12,5 @@ type RiskId is bytes8;
		type Str is bytes32;

		type Timestamp is uint40;

		type UFixed is uint160;