chore: restructure for monorepo

pyth-network · Jul 28, 2020 · d4fab11 · d4fab11
1 parent 82d07db
commit d4fab11
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 25 deletions.
diff --git a/contracts/WrappedSPL.sol b/contracts/WrappedSPL.sol
diff --git a/.openzeppelin/project.json → ethereum/.openzeppelin/project.json b/.openzeppelin/project.json → ethereum/.openzeppelin/project.json
diff --git a/contracts/.gitkeep → ethereum/contracts/.gitkeep b/contracts/.gitkeep → ethereum/contracts/.gitkeep
diff --git a/contracts/Wormhole.sol → ethereum/contracts/Wormhole.sol b/contracts/Wormhole.sol → ethereum/contracts/Wormhole.sol
@@ -58,10 +58,6 @@ contract Wormhole {
         }
     }
 
-    function() public payable  {
-        revert("please use lockETH to transfer ETH to Solana");
-    }
-
     function changeGuardianAdmin(address newAddress) public {
         require(guardians.contains(msg.sender), "sender is not a guardian");
 
@@ -175,6 +171,7 @@ contract Wormhole {
     ) public {
         require(amount != 0, "amount must not be 0");
 
+        // TODO handle tokens that subtract fees
         IERC20(asset).safeTransferFrom(msg.sender, address(this), amount);
         emit LogTokensLocked(asset, recipient, amount);
     }
@@ -184,14 +181,21 @@ contract Wormhole {
     ) public payable {
         require(msg.value != 0, "amount must not be 0");
 
-        WETH(WETHAddress).deposit(msg.value);
+        // Wrap tx value in WETH
+        WETH(WETHAddress).deposit{value : msg.value}();
+
+        // Log deposit of WETH
         emit LogTokensLocked(WETHAddress, recipient, msg.value);
     }
+
+
+    fallback() external payable {revert("please use lockETH to transfer ETH to Solana");}
+    receive() external payable {revert("please use lockETH to transfer ETH to Solana");}
 }
 
 
-contract WETH is IERC20 {
-    function deposit() public payable {}
+interface WETH is IERC20 {
+    function deposit() external payable;
 
-    function withdraw(uint256 amount) public {}
+    function withdraw(uint256 amount) external;
 }
diff --git a/networks.js → ethereum/networks.js b/networks.js → ethereum/networks.js
diff --git a/package-lock.json → ethereum/package-lock.json b/package-lock.json → ethereum/package-lock.json
diff --git a/package.json → ethereum/package.json b/package.json → ethereum/package.json
@@ -9,6 +9,7 @@
     "@openzeppelin/contracts": "^3.1.0"
   },
   "scripts": {
+    "build": "openzeppelin compile",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "author": "",