Merge 1e95ba6 into d758fd6

shoyunft · Jan 24, 2023 · 0accd44 · 0accd44
2 parents d758fd6 + 1e95ba6
commit 0accd44
Show file tree

Hide file tree

Showing 27 changed files with 4,472 additions and 2,522 deletions.
diff --git a/abis/TransformationAdapter.json b/abis/TransformationAdapter.json
diff --git a/abis/WETHAdapter.json b/abis/WETHAdapter.json
@@ -0,0 +1,44 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "_weth",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "address payable",
+        "name": "to",
+        "type": "address"
+      }
+    ],
+    "name": "unwrapNativeToken",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "wrapNativeToken",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  }
+]
diff --git a/contracts/shoyu/Shoyu.sol b/contracts/shoyu/Shoyu.sol
@@ -7,7 +7,7 @@ import "@openzeppelin/contracts/security/ReentrancyGuard.sol";
 import "@rari-capital/solmate/src/tokens/ERC20.sol";
 import "@rari-capital/solmate/src/tokens/ERC721.sol";
 import "@rari-capital/solmate/src/tokens/ERC1155.sol";
-import "./lib/AdapterRegistry.sol";
+import "./adapters/AdapterRegistry.sol";
 
 contract Shoyu is Ownable, Pausable, ReentrancyGuard {
     AdapterRegistry public immutable adapterRegistry;

diff --git a/contracts/shoyu/lib/AdapterRegistry.sol → contracts/shoyu/adapters/AdapterRegistry.sol b/contracts/shoyu/lib/AdapterRegistry.sol → contracts/shoyu/adapters/AdapterRegistry.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.11;
 
 import "@openzeppelin/contracts/access/Ownable.sol";
-import { Adapter } from "./LibShoyu.sol";
+import { Adapter } from "../lib/LibShoyu.sol";
 
 contract AdapterRegistry is Ownable {
     Adapter[] public adapters;