Merge pull request #41 from Aryan9592/patch-1

@Aryan9592 Merged 🎉
feature-sh · Nov 6, 2023 · 20b618c · 20b618c
2 parents cc9e98c + 32ace64
commit 20b618c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/contracts/CentralizedAppealableArbitrator.sol b/contracts/CentralizedAppealableArbitrator.sol
@@ -177,12 +177,12 @@ contract CentralizedAppealableArbitrator is Arbitrator {
     uint256 public rulingTime;
 
     struct DisputeStruct {
-        IArbitrable arbitrated;
         uint256 choices;
         uint256 fee;
-        bool isAppealed;
         uint256 rulingAppealTimeOut;
         uint256 ruling;
+        IArbitrable arbitrated;
+        bool isAppealed;
         DisputeStatus status;
     }
 

diff --git a/contracts/Feature.sol b/contracts/Feature.sol
@@ -478,6 +478,7 @@ contract Feature is Initializable, NativeMetaTransaction, ChainConstants, Contex
     }
 
     struct Transaction {
+        bool isExecuted;
         address sender;
         Arbitrator arbitrator; // The arbitrator of the contract.
         bytes arbitratorExtraData; // Extra data for the arbitrator.
@@ -487,7 +488,6 @@ contract Feature is Initializable, NativeMetaTransaction, ChainConstants, Contex
         uint256 delayClaim; // Time of the challenge period.
         string metaEvidence; // Link to the meta-evidence.
         uint256 runningClaimCount; // Count of running claims.
-        bool isExecuted;
     }
 
     struct Claim {

diff --git a/contracts/FeatureERC20.sol b/contracts/FeatureERC20.sol
@@ -458,6 +458,7 @@ contract FeatureERC20 is Initializable, NativeMetaTransaction, ChainConstants, C
     }
 
     struct Transaction {
+        bool isExecuted;
         address sender;
         Arbitrator arbitrator; // The arbitrator of the contract.
         bytes arbitratorExtraData; // Extra data for the arbitrator.
@@ -468,7 +469,6 @@ contract FeatureERC20 is Initializable, NativeMetaTransaction, ChainConstants, C
         uint256 delayClaim; // Time of the challenge period.
         string metaEvidence; // Link to the meta-evidence.
         uint256 runningClaimCount; // Count of running claims.
-        bool isExecuted;
     }
 
     struct Claim {