add proof record map for pdp

Author: smallyunet

contracts/PDP.sol

@@ -7,6 +7,10 @@ import "./type.sol";
 import "./interface.sol";
 
 contract PDP is Initializable, IPDP, IFsEvent {
+
+    using IterableMapping for ProofsPool;
+    ProofsPool proofsPool;
+
     function initialize() public initializer {}
 
     function GenChallenge(GenChallengeParams memory gParams)
@@ -114,7 +118,7 @@ contract PDP is Initializable, IPDP, IFsEvent {
     }
 
     function VerifyProofWithMerklePathForFile(
-        VerifyProofWithMerklePathForFileParams memory vParams
+        ProofParams memory vParams
     ) public view virtual override returns (bool) {
         // TODO
         console.log(vParams.Version);
@@ -133,3 +137,93 @@ contract PDP is Initializable, IPDP, IFsEvent {
         return true;
     }
 }
+
+// map
+struct IndexValue {
+    uint256 keyIndex;
+    ProofsRecord value;
+}
+struct KeyFlag {
+    bytes key;
+    bool deleted;
+}
+struct ProofsPool {
+    mapping(bytes => IndexValue) data;
+    KeyFlag[] keys;
+    uint256 size;
+}
+library IterableMapping {
+    function insert(
+        ProofsPool storage self,
+        bytes memory key,
+        ProofsRecord memory value
+    ) internal returns (bool replaced) {
+        uint256 keyIndex = self.data[key].keyIndex;
+        self.data[key].value = value;
+        if (keyIndex > 0) return true;
+        else {
+            keyIndex = self.keys.length;
+            self.keys.push();
+            self.data[key].keyIndex = keyIndex + 1;
+            self.keys[keyIndex].key = key;
+            self.size++;
+            return false;
+        }
+    }
+
+    function remove(ProofsPool storage self, bytes memory key)
+        internal
+        returns (bool success)
+    {
+        uint256 keyIndex = self.data[key].keyIndex;
+        if (keyIndex == 0) return false;
+        delete self.data[key];
+        self.keys[keyIndex - 1].deleted = true;
+        self.size--;
+    }
+
+    function contains(ProofsPool storage self, bytes memory key)
+        internal
+        view
+        returns (bool)
+    {
+        return self.data[key].keyIndex > 0;
+    }
+
+    function iterate_start(ProofsPool storage self)
+        internal
+        view
+        returns (uint256 keyIndex)
+    {
+        uint256 index = iterate_next(self, type(uint256).min);
+        return index - 1;
+    }
+
+    function iterate_valid(ProofsPool storage self, uint256 keyIndex)
+        internal
+        view
+        returns (bool)
+    {
+        return keyIndex < self.keys.length;
+    }
+
+    function iterate_next(ProofsPool storage self, uint256 keyIndex)
+        internal
+        view
+        returns (uint256 r_keyIndex)
+    {
+        keyIndex++;
+        while (keyIndex < self.keys.length && self.keys[keyIndex].deleted)
+            keyIndex++;
+        return keyIndex;
+    }
+
+    function iterate_get(ProofsPool storage self, uint256 keyIndex)
+        internal
+        view
+        returns (bytes memory key, ProofsRecord memory value)
+    {
+        key = self.keys[keyIndex].key;
+        value = self.data[key].value;
+    }
+}

contracts/Prove.sol

@@ -436,7 +436,7 @@ contract Prove is Initializable, IProve, IFsEvent {
             return false;
         }
         // verify
-        VerifyProofWithMerklePathForFileParams memory vParams;
+        ProofParams memory vParams;
         vParams.Version = 0;
         vParams.Proofs = sectorProveData.Proofs;
         vParams.FileIds = pReturns.FileIDs;

contracts/ProveExtra.sol

@@ -139,7 +139,7 @@ contract ProveExtra {
         gParams.ProveNum = fileInfo.ProveBlockNum;
         Challenge[] memory challenges = pdp.GenChallenge(gParams);
         // verify
-        VerifyProofWithMerklePathForFileParams memory vParams;
+        ProofParams memory vParams;
         vParams.Version = 0;
         vParams.Proofs = proveData.Proofs;
         vParams.FileIds = proveParam.FileID;

contracts/Type.sol

@@ -244,7 +244,8 @@ struct GenChallengeParams {
     uint64 ProveNum;
 }
 
-struct VerifyProofWithMerklePathForFileParams {
+// VerifyProofWithMerklePathForFileParams
+struct ProofParams {
     uint64 Version;
     bytes Proofs;
     bytes[] FileIds;
@@ -254,6 +255,12 @@ struct VerifyProofWithMerklePathForFileParams {
     bytes RootHashes;
 }
 
+struct ProofsRecord {
+    ProofParams Proof;
+    bool State;
+    uint LastUpdateHeight;
+}
+
 struct VerifyPlotDataParams {
     PlotInfo PlotInfo_;
     bytes PlotData;

contracts/interface.sol

@@ -276,7 +276,7 @@ interface IPDP {
         returns (Challenge[] memory);
 
     function VerifyProofWithMerklePathForFile(
-        VerifyProofWithMerklePathForFileParams memory vParams
+        ProofParams memory vParams
     ) external view returns (bool);
 
     function PrepareForPdpVerification(