Merge pull request #96 from harmony-one/vault-incentive-implementation

Vault Incentive Implementation

Author: gupadhyaya

contract/bridge/contracts/OneBtc.sol

@@ -22,12 +22,12 @@ contract OneBtc is ERC20Upgradeable, Issue, Redeem, Replace {
     }
 
     event ReportVaultTheft(address indexed vaultId);
-
     event VaultDoublePayment(
         address indexed vaultId,
         bytes32 leftTxId,
         bytes32 rightTxId
     );
+
     mapping(bytes32 => bool) public theftReports;
 
     function initialize(IRelay _relay, IExchangeRateOracle _oracle)
@@ -158,47 +158,47 @@ contract OneBtc is ERC20Upgradeable, Issue, Redeem, Replace {
         ERC20Upgradeable._mint(receiver, amount);
     }
 
-    function requestReplace(
-        address payable oldVaultId,
-        uint256 btcAmount,
-        uint256 griefingCollateral
-    ) external payable {
-        require(false, "Feature temporarily disabled");
-        // Replace._requestReplace(oldVaultId, btcAmount, griefingCollateral);
-    }
-
-    function acceptReplace(
-        address oldVaultId,
-        address newVaultId,
-        uint256 btcAmount,
-        uint256 collateral,
-        uint256 btcPublicKeyX,
-        uint256 btcPublicKeyY
-    ) external payable {
-        require(false, "Feature temporarily disabled");
-        // Replace._acceptReplace(
-        //     oldVaultId,
-        //     newVaultId,
-        //     btcAmount,
-        //     collateral,
-        //     btcPublicKeyX,
-        //     btcPublicKeyY
-        // );
-    }
-
-    function executeReplace(
-        uint256 replaceId,
-        bytes calldata merkleProof,
-        bytes calldata rawTx, // avoid compiler error: stack too deep
-        //bytes calldata _version, bytes calldata _vin, bytes calldata _vout, bytes calldata _locktime,
-        uint32 height,
-        uint256 index,
-        bytes calldata header
-    ) external {
-        require(false, "Feature temporarily disabled");
-        // bytes memory _vout = verifyTx(height, index, rawTx, header, merkleProof);
-        // Replace._executeReplace(replaceId, _vout);
-    }
+    // function requestReplace(
+    //     address payable oldVaultId,
+    //     uint256 btcAmount,
+    //     uint256 griefingCollateral
+    // ) external payable {
+    //     require(false, "Feature temporarily disabled");
+    //     // Replace._requestReplace(oldVaultId, btcAmount, griefingCollateral);
+    // }
+
+    // function acceptReplace(
+    //     address oldVaultId,
+    //     address newVaultId,
+    //     uint256 btcAmount,
+    //     uint256 collateral,
+    //     uint256 btcPublicKeyX,
+    //     uint256 btcPublicKeyY
+    // ) external payable {
+    //     require(false, "Feature temporarily disabled");
+    //     // Replace._acceptReplace(
+    //     //     oldVaultId,
+    //     //     newVaultId,
+    //     //     btcAmount,
+    //     //     collateral,
+    //     //     btcPublicKeyX,
+    //     //     btcPublicKeyY
+    //     // );
+    // }
+
+    // function executeReplace(
+    //     uint256 replaceId,
+    //     bytes calldata merkleProof,
+    //     bytes calldata rawTx, // avoid compiler error: stack too deep
+    //     //bytes calldata _version, bytes calldata _vin, bytes calldata _vout, bytes calldata _locktime,
+    //     uint32 height,
+    //     uint256 index,
+    //     bytes calldata header
+    // ) external {
+    //     require(false, "Feature temporarily disabled");
+    //     // bytes memory _vout = verifyTx(height, index, rawTx, header, merkleProof);
+    //     // Replace._executeReplace(replaceId, _vout);
+    // }
 
     /**
      * @dev Report vault misbehavior by providing fraud proof (malicious bitcoin transaction and the corresponding transaction inclusion proof). Fully slashes the vault.