Merge pull request #50 from ethstorage/bill/unittest_for_step

fix the unit test of resolve
ethstorage · Aug 9, 2024 · f87be16 · f87be16
2 parents 6afc90f + cf1424b
commit f87be16
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 162 deletions.
diff --git a/packages/contracts-bedrock/src/dispute/FaultDisputeGameN.sol b/packages/contracts-bedrock/src/dispute/FaultDisputeGameN.sol
@@ -367,9 +367,7 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
         Claim _claim,
         uint64 _attackBranch
     )
-        public
-        payable
-        virtual
+        internal
     {
         // For N = 4 (bisec),
         // 1. _attackBranch == 0 (attack)
@@ -1196,8 +1194,9 @@ contract FaultDisputeGame is IFaultDisputeGame, Clone, ISemver {
         }
     }
 
-    function attackV2(Claim _disputed, uint256 _parentIndex, Claim _claim, uint64 _attackBranch) public payable {
-        moveV2(_disputed, _parentIndex, _claim, _attackBranch);
+    function attackV2(Claim _disputed, uint256 _parentIndex, uint64 _attackBranch, uint256 _daType, bytes memory _claims) public payable {
+        Claim claim = Claim.wrap(LibDA.getClaimsHash(_daType, MAX_ATTACK_BRANCH, _claims));
+        moveV2(_disputed, _parentIndex, claim, _attackBranch);
     }
 
     function step(