Merge branch 'master-v3' of github.com:Buffer-Finance/Buffer-Protocol-v2.5

Author: CurieBuffer

contracts/core/AccountRegistrar.sol

@@ -47,9 +47,10 @@ contract AccountRegistrar is IAccountRegistrar, AccessControl {
             Validator.verifyUserDeregistration(user, nonce, signature),
             "AccountRegistrar: Invalid signature"
         );
-        accountMapping[msg.sender] = AccountMapping({
+        accountMapping[user] = AccountMapping({
             nonce: nonce + 1,
             oneCT: address(0)
         });
+        emit DeregisterAccount(user, nonce + 1);
     }
 }

contracts/core/BufferRouter.sol

@@ -100,6 +100,7 @@ contract BufferRouter is AccessControl, IBufferRouter {
             emit FailResolve(queueId, "Router: Permit did not succeed");
             return false;
         }
+        emit ApproveRouter(user, nonceBefore, permit.value, permit.deadline);
         return true;
     }
 
@@ -510,4 +511,8 @@ contract BufferRouter is AccessControl, IBufferRouter {
 
         emit OpenTrade(user, params.queueId, optionId, params.targetContract);
     }
+
+    function getId() external view returns (uint256) {
+        return block.chainid;
+    }
 }

contracts/core/Validator.sol

@@ -30,7 +30,7 @@ library Validator {
                     ),
                     keccak256(bytes("Validator")),
                     keccak256(bytes("1")),
-                    1,
+                    block.chainid,
                     address(this)
                 )
             );

contracts/interfaces/Interfaces.sol

@@ -38,6 +38,7 @@ interface IAccountRegistrar {
         address indexed oneCT,
         uint256 nonce
     );
+    event DeregisterAccount(address indexed account, uint256 nonce);
 
     function accountMapping(
         address
@@ -153,7 +154,12 @@ interface IBufferRouter {
     event FailUnlock(uint256 optionId, address targetContract, string reason);
     event FailResolve(uint256 queueId, string reason);
     event ContractRegistryUpdated(address targetContract, bool register);
-    event DeregisterAccount(address indexed account);
+    event ApproveRouter(
+        address user,
+        uint256 nonce,
+        uint256 value,
+        uint256 deadline
+    );
 }
 
 interface IBufferBinaryOptions {

scripts/deploy_v2.py

@@ -159,7 +159,7 @@ def main():
         decimals = 6
         is_testnet_token = True
         nft_base_contract_address = ""
-        account_registrar_address = "0x9CAE1958dCBe6d22Ca37D2a3a544400f0e976240"
+        # account_registrar_address = "0x9CAE1958dCBe6d22Ca37D2a3a544400f0e976240"
         booster = "0x58E66d360d65Da8d7907768f826D86F411d0f849"
         nft_contract_address = "0xf494F435cb2068559406C77b7271DD7d6aF5B860"
         token_contract_address = "0x50E345c95a3c1E5085AE886FF4AF05Efa2403c90"
@@ -332,7 +332,7 @@ def main():
                 sfd,
                 sender=admin,
             )
-            save_flat(BufferRouter, "BufferRouter")
+            # save_flat(BufferRouter, "BufferRouter")
 
     else:
         router_contract = BufferRouter.at(router_contract_address)
@@ -463,7 +463,7 @@ def main():
                 BufferBinaryOptions,
                 [],
             )
-            save_flat(BufferBinaryOptions, "BufferBinaryOptions")
+            # save_flat(BufferBinaryOptions, "BufferBinaryOptions")
             if is_testnet_token:
                 transact(
                     token_contract.address,
@@ -524,7 +524,7 @@ def main():
             account_registrar.abi,
             "grantRole",
             ADMIN_ROLE,
-            open_keeper,
+            admin.address,
             sender=admin,
         )
         transact(

tests/utility.py

@@ -421,7 +421,6 @@ def get_user_signature_for_close(self, params, user, key):
     def get_register_signature(self, one_ct, user):
         web3 = brownie.network.web3
         key = user.private_key
-
         domain = {
             "name": "Validator",
             "version": "1",
@@ -519,9 +518,12 @@ def reregister(self, user, one_ct):
             {"from": self.accounts[0]},
         )
 
+        nonce = self.registrar.accountMapping(user.address)[1]
         self.registrar.deregisterAccount(
             user.address, self.get_deregister_signature(user), {"from": self.owner}
         )
+        assert self.registrar.accountMapping(user.address)[0] == ADDRESS_0
+        assert self.registrar.accountMapping(user.address)[1] == nonce + 1
         txn = self.registrar.registerAccount(
             one_ct.address,
             user.address,