Clean up contracts

ethereum/solidity/.gitignore

@@ -0,0 +1,7 @@
+artifacts
+build
+cache
+.coverage_*
+coverage
+**/typechain/**/*
+node_modules

ethereum/solidity/.prettierignore

@@ -0,0 +1,5 @@
+build
+.coverage_*
+coverage
+**/typechain/**/*
+node_modules

ethereum/solidity/.prettierrc.json

@@ -0,0 +1,32 @@
+{
+  "overrides": [
+    {
+      "files": "*.sol",
+      "options": {
+        "printWidth": 120,
+        "tabWidth": 4,
+        "useTabs": false,
+        "singleQuote": false,
+        "bracketSpacing": false,
+        "explicitTypes": "preserve"
+      }
+    },
+    {
+      "files": ["*.js", "*.ts"],
+      "options": {
+        "printWidth": 120,
+        "semi": true,
+        "singleQuote": true,
+        "bracketSpacing": true,
+        "trailingComma": "es5"
+      }
+    },
+    {
+      "files": ["*.js", "*.ts", "*.json"],
+      "options": {
+        "tabWidth": 2,
+        "useTabs": false
+      }
+    }
+  ]
+}

solidity/contracts/@openzeppelin/contracts/utils/ContextUpgradeable.sol → ethereum/solidity/contracts/ContextUpgradeable.sol

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: MIT
 
 pragma solidity ^0.8.0;
-import "./Initializable.sol";
+
+import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 
 /*
  * @dev Provides information about the current execution context, including the
@@ -18,8 +19,8 @@ abstract contract ContextUpgradeable is Initializable {
         __Context_init_unchained();
     }
 
-    function __Context_init_unchained() internal initializer {
-    }
+    function __Context_init_unchained() internal initializer {}
+
     function _msgSender() internal view virtual returns (address) {
         return msg.sender;
     }
@@ -28,5 +29,6 @@ abstract contract ContextUpgradeable is Initializable {
         this; // silence state mutability warning without generating bytecode - see https://github.com/ethereum/solidity/issues/2691
         return msg.data;
     }
+
     uint256[50] private __gap;
-}
+}

solidity/contracts/@openzeppelin/contracts/OwnableUpgradeableWithExpiry.sol → ethereum/solidity/contracts/OwnableUpgradeableWithExpiry.sol

@@ -2,8 +2,9 @@
 
 pragma solidity ^0.8.0;
 
-import "./utils/ContextUpgradeable.sol";
-import "./utils/Initializable.sol";
+import "./ContextUpgradeable.sol";
+import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
+
 /**
  * @dev Contract module which provides a basic access control mechanism, where
  * there is an account (an owner) that can be granted exclusive access to
@@ -63,23 +64,23 @@ abstract contract OwnableUpgradeableWithExpiry is Initializable, ContextUpgradea
         _renounceOwnership();
     }
 
-        /**
+    /**
      * @dev Get the timestamp of ownership expiry.
      * @return The timestamp of ownership expiry.
      */
     function getOwnershipExpiryTimestamp() public view returns (uint256) {
-       return _deployTimestamp + 52 weeks;
+        return _deployTimestamp + 52 weeks;
     }
 
     /**
      * @dev Check if the contract ownership is expired.
      * @return True if the contract ownership is expired.
      */
     function isOwnershipExpired() public view returns (bool) {
-       return block.timestamp > getOwnershipExpiryTimestamp();
+        return block.timestamp > getOwnershipExpiryTimestamp();
     }
 
-     /**
+    /**
      * @dev Leaves the contract without owner. It will not be possible to call
      * `onlyOwner` functions anymore. Can only be called after ownership is expired.
      */
@@ -104,4 +105,4 @@ abstract contract OwnableUpgradeableWithExpiry is Initializable, ContextUpgradea
     }
 
     uint256[49] private __gap;
-}
+}