bump solc to 0.6.12, using btc spv fork

Signed-off-by: Gregory Hill <[email protected]>
interlay · Jul 27, 2020 · d3f7e2f · d3f7e2f
1 parent 1cab347
commit d3f7e2f
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 32 deletions.
diff --git a/buidler.config.ts b/buidler.config.ts
@@ -13,7 +13,7 @@ const COINMARKETCAP_API_KEY = process.env.COINMARKETCAP_API_KEY;
 const config = {
   defaultNetwork: "buidlerevm",
   solc: {
-    version: "0.5.15",
+    version: "0.6.12",
     optimizer: { enabled: true, runs: 500 }
   },
 	paths: {

diff --git a/package.json b/package.json
@@ -1,9 +1,10 @@
 {
   "name": "@interlay/btc-relay-sol",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "BTC Relay in Solidity",
   "dependencies": {
-    "@summa-tx/bitcoin-spv-sol": "3.1.0",
+    "@interlay/bitcoin-spv-sol": "3.2.1",
+    "@openzeppelin/contracts": "3.1.0",
     "bitcoinjs-lib": "^5.1.7"
   },
   "devDependencies": {

diff --git a/src/IRelay.sol b/src/IRelay.sol
@@ -1,4 +1,6 @@
-pragma solidity ^0.5.15;
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.6.12;
 
 interface IRelay {
     /**

diff --git a/src/Parser.sol b/src/Parser.sol
@@ -1,8 +1,10 @@
-pragma solidity ^0.5.15;
+// SPDX-License-Identifier: MIT
 
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
-import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
-import {BTCUtils} from "@summa-tx/bitcoin-spv-sol/contracts/BTCUtils.sol";
+pragma solidity ^0.6.12;
+
+import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
+import {BytesLib} from "@interlay/bitcoin-spv-sol/contracts/BytesLib.sol";
+import {BTCUtils} from "@interlay/bitcoin-spv-sol/contracts/BTCUtils.sol";
 
 library Parser {
     using SafeMath for uint256;

diff --git a/src/ParserDelegate.sol b/src/ParserDelegate.sol
@@ -1,6 +1,8 @@
-pragma solidity ^0.5.15;
+// SPDX-License-Identifier: MIT
 
-import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
+pragma solidity ^0.6.12;
+
+import {BytesLib} from "@interlay/bitcoin-spv-sol/contracts/BytesLib.sol";
 
 import {Parser} from "./Parser.sol";
 

diff --git a/src/Relay.sol b/src/Relay.sol
@@ -1,9 +1,11 @@
-pragma solidity ^0.5.15;
+// SPDX-License-Identifier: MIT
 
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
-import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
-import {BTCUtils} from "@summa-tx/bitcoin-spv-sol/contracts/BTCUtils.sol";
-import {ValidateSPV} from "@summa-tx/bitcoin-spv-sol/contracts/ValidateSPV.sol";
+pragma solidity ^0.6.12;
+
+import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
+import {BytesLib} from "@interlay/bitcoin-spv-sol/contracts/BytesLib.sol";
+import {BTCUtils} from "@interlay/bitcoin-spv-sol/contracts/BTCUtils.sol";
+import {ValidateSPV} from "@interlay/bitcoin-spv-sol/contracts/ValidateSPV.sol";
 import {IRelay} from "./IRelay.sol";
 
 /// @title BTC Relay
@@ -107,7 +109,7 @@ contract Relay is IRelay {
     /**
      * @dev Core logic for block header validation
      */
-    function _submitBlockHeader(bytes memory header) internal {
+    function _submitBlockHeader(bytes memory header) internal virtual {
         require(header.length == 80, ERR_INVALID_HEADER_SIZE);
 
         // Fail if block already exists
@@ -189,14 +191,14 @@ contract Relay is IRelay {
     /**
      * @dev See {IRelay-submitBlockHeader}.
      */
-    function submitBlockHeader(bytes calldata header) external {
+    function submitBlockHeader(bytes calldata header) external override {
         _submitBlockHeader(header);
     }
 
     /**
      * @dev See {IRelay-submitBlockHeaderBatch}.
      */
-    function submitBlockHeaderBatch(bytes calldata headers) external {
+    function submitBlockHeaderBatch(bytes calldata headers) external override {
         require(headers.length % 80 == 0, ERR_INVALID_HEADER_BATCH);
 
         for (uint256 i = 0; i < headers.length / 80; i = i.add(1)) {
@@ -314,14 +316,14 @@ contract Relay is IRelay {
     /**
      * @dev See {IRelay-getBlockHeight}.
      */
-    function getBlockHeight(bytes32 digest) external view returns (uint32) {
+    function getBlockHeight(bytes32 digest) external view override returns (uint32) {
         return _headers[digest].height;
     }
 
     /**
      * @dev See {IRelay-getBlockHash}.
      */
-    function getBlockHash(uint32 height) external view returns (bytes32) {
+    function getBlockHash(uint32 height) external view override returns (bytes32) {
         bytes32 digest = _chain[height];
         require(digest > 0, ERR_BLOCK_NOT_FOUND);
         return digest;
@@ -330,7 +332,7 @@ contract Relay is IRelay {
     /**
      * @dev See {IRelay-getBestBlock}.
      */
-    function getBestBlock() external view returns (bytes32 digest, uint32 height) {
+    function getBestBlock() external view override returns (bytes32 digest, uint32 height) {
         return (_bestBlock, _bestHeight);
     }
 
@@ -345,7 +347,7 @@ contract Relay is IRelay {
         bytes calldata proof,
         uint256 confirmations,
         bool insecure
-    ) external view returns (bool) {
+    ) external view override returns (bool) {
         // txid must be little endian
         require(txid != 0, ERR_INVALID_TXID);
 

diff --git a/src/Script.sol b/src/Script.sol
@@ -1,7 +1,9 @@
-pragma solidity ^0.5.15;
+// SPDX-License-Identifier: MIT
 
-import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
-import {BTCUtils} from "@summa-tx/bitcoin-spv-sol/contracts/BTCUtils.sol";
+pragma solidity ^0.6.12;
+
+import {BytesLib} from "@interlay/bitcoin-spv-sol/contracts/BytesLib.sol";
+import {BTCUtils} from "@interlay/bitcoin-spv-sol/contracts/BTCUtils.sol";
 
 library Script {
     using BytesLib for bytes;

diff --git a/src/ScriptDelegate.sol b/src/ScriptDelegate.sol
@@ -1,4 +1,6 @@
-pragma solidity ^0.5.15;
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.6.12;
 
 import {Script} from "./Script.sol";
 

diff --git a/src/TestRelay.sol b/src/TestRelay.sol
@@ -1,9 +1,11 @@
-pragma solidity ^0.5.15;
+// SPDX-License-Identifier: MIT
 
-import {SafeMath} from "@summa-tx/bitcoin-spv-sol/contracts/SafeMath.sol";
-import {BytesLib} from "@summa-tx/bitcoin-spv-sol/contracts/BytesLib.sol";
-import {BTCUtils} from "@summa-tx/bitcoin-spv-sol/contracts/BTCUtils.sol";
-import {ValidateSPV} from "@summa-tx/bitcoin-spv-sol/contracts/ValidateSPV.sol";
+pragma solidity ^0.6.12;
+
+import {SafeMath} from "@openzeppelin/contracts/math/SafeMath.sol";
+import {BytesLib} from "@interlay/bitcoin-spv-sol/contracts/BytesLib.sol";
+import {BTCUtils} from "@interlay/bitcoin-spv-sol/contracts/BTCUtils.sol";
+import {ValidateSPV} from "@interlay/bitcoin-spv-sol/contracts/ValidateSPV.sol";
 import {Relay} from "./Relay.sol";
 
 /// @title Testnet BTC Relay
@@ -25,7 +27,7 @@ contract TestRelay is Relay {
     /**
      * @dev Override to remove the difficulty check
      */
-    function _submitBlockHeader(bytes memory header) internal {
+    function _submitBlockHeader(bytes memory header) internal override {
         require(header.length == 80, ERR_INVALID_HEADER_SIZE);
 
         bytes32 hashPrevBlock = header.extractPrevBlockLE().toBytes32();