Merge pull request #674 from duckception/type-inconsistency-mass-migr…

…ation Make mass migration tx type consistent with batch type
thehubbleproject · Dec 7, 2021 · 78b7d09 · 78b7d09
2 parents cc3aa97 + 2cb67df
commit 78b7d09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/contracts/libs/Tx.sol b/contracts/libs/Tx.sol
@@ -14,8 +14,8 @@ import { BLS } from "./BLS.sol";
 library Tx {
     // Tx types in uint256
     uint256 private constant TRANSFER = 1;
+    uint256 private constant MASS_MIGRATION = 2;
     uint256 private constant CREATE2TRANSFER = 3;
-    uint256 private constant MASS_MIGRATION = 5;
 
     uint256 public constant MASK_PUBKEY_ID = 0xffffffff;
     uint256 public constant MASK_STATE_ID = 0xffffffff;

diff --git a/ts/tx.ts b/ts/tx.ts
@@ -145,7 +145,7 @@ export class TxTransfer implements SignableTx {
 }
 
 export class TxMassMigration implements SignableTx {
-    private readonly TX_TYPE = "0x05";
+    private readonly TX_TYPE = "0x02";
     public static rand(): TxMassMigration {
         const sender = randomNum(stateIDLen);
         const amount = float16.randInt();