fix: finalise legacy transfers (#297)

* fix: finalise legacy transfers

* fix test

* Fix formating

* pauseAll method

* Rename role

* Rename role

---------

Co-authored-by: kiseln <3428059+kiseln@users.noreply.github.com>

Author: karim-en

evm/src/eNear/contracts/ENearProxy.sol

@@ -4,28 +4,35 @@ pragma solidity 0.8.24;
 import "../../common/Borsh.sol";
 import {AccessControlUpgradeable} from '@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol';
 import {UUPSUpgradeable} from '@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol';
-import {IENear} from './IENear.sol';
+import {IENear, INearProver} from './IENear.sol';
 import {ICustomMinter} from '../../common/ICustomMinter.sol';
+import "../../omni-bridge/contracts/SelectivePausableUpgradable.sol";
 
-contract ENearProxy is UUPSUpgradeable, AccessControlUpgradeable, ICustomMinter {
+contract ENearProxy is UUPSUpgradeable, AccessControlUpgradeable, ICustomMinter, SelectivePausableUpgradable {
     IENear public eNear;
 
     bytes32 public constant MINTER_ROLE = keccak256("MINTER_ROLE");
+    bytes32 public constant PAUSABLE_ADMIN_ROLE = keccak256("PAUSABLE_ADMIN_ROLE");
     bytes public nearConnector;
     uint256 public currentReceiptId;
+    INearProver public prover;
+
+    uint constant PAUSED_LEGACY_FIN_TRANSFER = 1 << 0;
 
     /// @custom:oz-upgrades-unsafe-allow constructor
     constructor() {
         _disableInitializers();
     }
 
-    function initialize(address _eNear, bytes memory _nearConnector, uint256 _currentReceiptId, address _adminAddress) public initializer {
+    function initialize(address _eNear, address _prover, bytes memory _nearConnector, uint256 _currentReceiptId, address _adminAddress) public initializer {
         __UUPSUpgradeable_init();
         __AccessControl_init();
         eNear = IENear(_eNear);
         nearConnector = _nearConnector;
         currentReceiptId = _currentReceiptId;
+        prover = INearProver(_prover);
         _grantRole(DEFAULT_ADMIN_ROLE, _adminAddress);
+        _grantRole(PAUSABLE_ADMIN_ROLE, _msgSender());
     }
 
     function mint(address token, address to, uint128 amount) public onlyRole(MINTER_ROLE) {
@@ -53,6 +60,26 @@ contract ENearProxy is UUPSUpgradeable, AccessControlUpgradeable, ICustomMinter
         eNear.transferToNear(amount, string(''));
     }
 
+    function finaliseNearToEthTransfer(
+        bytes memory proofData,
+        uint64 proofBlockHeight
+    ) external whenNotPaused(PAUSED_LEGACY_FIN_TRANSFER) {
+        require(
+            prover.proveOutcome(proofData, proofBlockHeight),
+            "Proof should be valid"
+        );
+
+        eNear.finaliseNearToEthTransfer(proofData, proofBlockHeight);
+    }
+
+    function pauseAll() external onlyRole(PAUSABLE_ADMIN_ROLE) {
+        _pause(PAUSED_LEGACY_FIN_TRANSFER);
+    }
+
+    function pause(uint flags) external onlyRole(DEFAULT_ADMIN_ROLE) {
+        _pause(flags);
+    }
+
     function _authorizeUpgrade(
         address newImplementation
     ) internal override onlyRole(DEFAULT_ADMIN_ROLE) {}

evm/src/eNear/contracts/FakeProver.sol

@@ -1,9 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity 0.8.24;
-
-interface INearProver {
-    function proveOutcome(bytes calldata proofData, uint64 blockHeight) external view returns (bool);
-}
+import {INearProver} from './IENear.sol';
 
 contract FakeProver is INearProver {
     function proveOutcome(bytes calldata, uint64) external pure returns (bool) {

evm/src/eNear/contracts/IENear.sol

@@ -14,3 +14,7 @@ interface IENear {
     function admin() external view returns (address);
     function adminPause(uint256 flags) external;
 }
+
+interface INearProver {
+    function proveOutcome(bytes calldata proofData, uint64 blockHeight) external view returns (bool);
+}

evm/src/eNear/scripts.ts

@@ -3,6 +3,7 @@ import type { HardhatRuntimeEnvironment } from "hardhat/types"
 
 task("deploy-e-near-proxy", "Deploys the ENearProxy contract")
   .addParam("enear", "Address of eNear contract")
+  .addParam("prover", "Address of prover contract")
   .setAction(async (taskArgs, hre: HardhatRuntimeEnvironment) => {
     const { ethers, upgrades } = hre
 
@@ -12,7 +13,7 @@ task("deploy-e-near-proxy", "Deploys the ENearProxy contract")
     const eNearProxyContract = await ethers.getContractFactory("ENearProxy")
     const eNearProxy = await upgrades.deployProxy(
       eNearProxyContract,
-      [taskArgs.enear, nearConnector, 0, taskArgs.admin],
+      [taskArgs.enear, taskArgs.prover, nearConnector, 0, taskArgs.admin],
       {
         initializer: "initialize",
         timeout: 0,

evm/tests/eNearProxy.test.ts

@@ -54,6 +54,7 @@ describe("eNearProxy contract", () => {
       eNearProxyFactory,
       [
         await eNear.getAddress(),
+        await nearProver.getAddress(),
         Buffer.from("eNearBridge", "utf-8"),
         0,
         await deployer.getAddress(),