Merge pull request thehubbleproject#88 from thehubbleproject/rm-burnc…

…onsent-cancel

rm burn consent cancel

contracts/BurnConsent.sol

@@ -112,11 +112,7 @@ contract BurnConsent is FraudProofHelpers {
         Types.BurnConsent memory _tx
     ) public view returns (bytes memory updatedAccount, bytes32 newRoot) {
         Types.UserAccount memory account = _merkle_proof.accountIP.account;
-        if (_tx.cancel) {
-            account.burn -= _tx.amount;
-        } else {
-            account.burn += _tx.amount;
-        }
+        account.burn = _tx.amount;
         account.nonce++;
         newRoot = UpdateAccountWithSiblings(account, _merkle_proof);
         updatedAccount = RollupUtils.BytesFromAccount(account);
@@ -166,14 +162,6 @@ contract BurnConsent is FraudProofHelpers {
                 false
             );
         }
-        if (_tx.cancel && account.burn < _tx.amount) {
-            return (
-                ZERO_BYTES32,
-                "",
-                Types.ErrorCode.InvalidCancelBurnAmount,
-                false
-            );
-        }
 
         if (_tx.nonce != account.nonce.add(1)) {
             return (ZERO_BYTES32, "", Types.ErrorCode.BadNonce, false);

contracts/libs/RollupUtils.sol

@@ -514,17 +514,15 @@ library RollupUtils {
         pure
         returns (bytes memory)
     {
-        return
-            abi.encodePacked(_tx.fromIndex, _tx.amount, _tx.nonce, _tx.cancel);
+        return abi.encodePacked(_tx.fromIndex, _tx.amount, _tx.nonce);
     }
 
     function BytesFromBurnConsentNoStruct(
         uint256 fromIndex,
         uint256 amount,
-        uint256 nonce,
-        bool cancel
+        uint256 nonce
     ) public pure returns (bytes memory) {
-        return abi.encode(fromIndex, amount, nonce, cancel);
+        return abi.encode(fromIndex, amount, nonce);
     }
 
     function BurnConsentFromBytes(bytes memory txBytes)
@@ -533,50 +531,45 @@ library RollupUtils {
         returns (Types.BurnConsent memory)
     {
         Types.BurnConsent memory _tx;
-        (_tx.fromIndex, _tx.amount, _tx.nonce, _tx.cancel) = abi.decode(
+        (_tx.fromIndex, _tx.amount, _tx.nonce) = abi.decode(
             txBytes,
-            (uint256, uint256, uint256, bool)
+            (uint256, uint256, uint256)
         );
         return _tx;
     }
 
     function BurnConsentSignBytes(
         uint256 fromIndex,
         uint256 amount,
-        uint256 nonce,
-        bool cancel
+        uint256 nonce
     ) public pure returns (bytes32) {
         return
-            keccak256(
-                BytesFromBurnConsentNoStruct(fromIndex, amount, nonce, cancel)
-            );
+            keccak256(BytesFromBurnConsentNoStruct(fromIndex, amount, nonce));
     }
 
     function CompressBurnConsent(Types.BurnConsent memory _tx)
         public
         pure
         returns (bytes memory)
     {
-        return abi.encode(_tx.fromIndex, _tx.amount, _tx.cancel, _tx.signature);
+        return abi.encode(_tx.fromIndex, _tx.amount, _tx.signature);
     }
 
     function CompressBurnConsentNoStruct(
         uint256 fromIndex,
         uint256 amount,
         uint256 nonce,
-        bool cancel,
         bytes memory sig
     ) public pure returns (bytes memory) {
-        return abi.encode(fromIndex, amount, nonce, cancel, sig);
+        return abi.encode(fromIndex, amount, nonce, sig);
     }
 
     function CompressBurnConsentWithMessage(
         bytes memory message,
         bytes memory sig
     ) public pure returns (bytes memory) {
         Types.BurnConsent memory _tx = BurnConsentFromBytes(message);
-        return
-            abi.encode(_tx.fromIndex, _tx.amount, _tx.nonce, _tx.cancel, sig);
+        return abi.encode(_tx.fromIndex, _tx.amount, _tx.nonce, sig);
     }
 
     function DecompressBurnConsent(bytes memory txBytes)
@@ -586,11 +579,10 @@ library RollupUtils {
             uint256 fromIndex,
             uint256 amount,
             uint256 nonce,
-            bool cancel,
             bytes memory signature
         )
     {
-        return abi.decode(txBytes, (uint256, uint256, uint256, bool, bytes));
+        return abi.decode(txBytes, (uint256, uint256, uint256, bytes));
     }
 
     function HashFromBurnConsent(Types.BurnConsent memory _tx)

contracts/libs/Types.sol

@@ -66,7 +66,6 @@ library Types {
         uint256 fromIndex;
         uint256 amount;
         uint256 nonce;
-        bool cancel;
         bytes signature;
     }
 
@@ -135,7 +134,6 @@ library Types {
         NotEnoughTokenBalance,
         BadFromTokenType,
         BadToTokenType,
-        InvalidCancelBurnAmount,
         BadFromIndex,
         BurnAlreadyExecuted,
         NotCreatingOnZeroAccount,

scripts/helpers/interfaces.ts

@@ -57,7 +57,6 @@ export enum ErrorCode {
     NotEnoughTokenBalance,
     BadFromTokenType,
     BadToTokenType,
-    InvalidCancelBurnAmount,
     BadFromIndex,
     BurnAlreadyExecuted,
     NotCreatingOnZeroAccount,
@@ -84,7 +83,6 @@ export interface BurnConsentTx {
     fromIndex: number;
     amount: number;
     nonce: number;
-    cancel: boolean;
     signature: string;
 }
 

test/Reddit.spec.ts

@@ -432,21 +432,18 @@ contract("Reddit", async function() {
         const tx = {
             fromIndex: User.AccID,
             amount: 5,
-            nonce: userMP.accountIP.account.nonce + 1,
-            cancel: false
+            nonce: userMP.accountIP.account.nonce + 1
         } as BurnConsentTx;
         const signBytes = await RollupUtilsInstance.BurnConsentSignBytes(
             tx.fromIndex,
             tx.amount,
-            tx.nonce,
-            tx.cancel
+            tx.nonce
         );
         tx.signature = utils.sign(signBytes, User.Wallet);
         const txBytes = await RollupUtilsInstance.BytesFromBurnConsentNoStruct(
             tx.fromIndex,
             tx.amount,
-            tx.nonce,
-            tx.cancel
+            tx.nonce
         );
         await RollupUtilsInstance.BurnConsentFromBytes(txBytes);
 
@@ -480,7 +477,6 @@ contract("Reddit", async function() {
             tx.fromIndex,
             tx.amount,
             tx.nonce,
-            tx.cancel,
             tx.signature
         );
         await RollupUtilsInstance.DecompressBurnConsent(compressedTx);

test/utils/rollup-utils.spec.ts

@@ -186,27 +186,23 @@ contract("RollupUtils", async function(accounts) {
             fromIndex: 1,
             amount: 5,
             nonce: 3,
-            cancel: false,
             signature: "0xabcd"
         };
         const signBytes = await RollupUtilsInstance.BurnConsentSignBytes(
             tx.fromIndex,
             tx.amount,
-            tx.nonce,
-            tx.cancel
+            tx.nonce
         );
         const txBytes = await RollupUtilsInstance.BytesFromBurnConsentNoStruct(
             tx.fromIndex,
             tx.amount,
-            tx.nonce,
-            tx.cancel
+            tx.nonce
         );
         await RollupUtilsInstance.BurnConsentFromBytes(txBytes);
         const compressedTx = await RollupUtilsInstance.CompressBurnConsentNoStruct(
             tx.fromIndex,
             tx.amount,
             tx.nonce,
-            tx.cancel,
             tx.signature
         );
         await RollupUtilsInstance.DecompressBurnConsent(compressedTx);