Merge pull request #6 from studydefi/master

Updating master
studydefi · Jun 23, 2020 · ee5ecb0 · ee5ecb0
2 parents e061e10 + 0f2c3a5
commit ee5ecb0
Show file tree

Hide file tree

Showing 24 changed files with 199 additions and 1,120 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules
 dist
 .env
+.temp_*
diff --git a/docs/idle.md b/docs/idle.md
@@ -16,6 +16,9 @@ List of all available contracts
 idle.maxYield.dai.address;
 idle.maxYield.usdc.address;
 idle.maxYield.usdt.address;
+idle.maxYield.susd.address;
+idle.maxYield.tusd.address;
+idle.maxYield.wbtc.address;
 
 idle.riskAdjusted.dai.address;
 idle.riskAdjusted.usdc.address;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studydefi/money-legos",
-  "version": "2.2.1",
+  "version": "2.3.4",
   "main": "index.js",
   "types": "index.d.ts",
   "repository": "[email protected]:studydefi/money-legos.git",

diff --git a/scripts/getAbisFromUMA.js b/scripts/getAbisFromUMA.js
@@ -0,0 +1,47 @@
+const path = require("path");
+const fs = require("fs");
+
+// Usage: node scripts/getAbisFromUMA.js <path-to-uma-protocol>
+
+// only include the following contracts
+const fileFilter = [
+  "Finder",
+  "VotingToken",
+  "IdentifierWhitelist",
+  "Voting",
+  "Registry",
+  "FinancialContractsAdmin",
+  "Store",
+  "Governor",
+  "DesignatedVotingFactory",
+  "WETH9",
+  "ExpiringMultiPartyLib",
+  "ExpiringMultiParty",
+  "TokenFactory",
+  "AddressWhitelist",
+  "ExpiringMultiPartyCreator",
+];
+
+// get all JSON files from their artifacts directory
+const inputPath = process.argv[2];
+const artifactPath = path.join(inputPath, "./core/build/contracts");
+const filenames = fs.readdirSync(artifactPath);
+
+// create a fresh temp folder to hold ABIs
+const outputDir = path.join(process.cwd(), "./src/uma/abi");
+if (fs.existsSync(outputDir)) {
+  fs.rmdirSync(outputDir, { recursive: true });
+}
+fs.mkdirSync(outputDir);
+
+// write ABIs to new files
+filenames.forEach((filename) => {
+  const contents = require(path.join(artifactPath, filename));
+  const name = filename.split(".").slice(0, -1).join(".");
+
+  if (fileFilter.includes(name)) {
+    const outputPath = path.join(outputDir, filename);
+    fs.writeFileSync(outputPath, JSON.stringify(contents.abi, null, 2));
+    console.log("written:", outputPath);
+  }
+});
diff --git a/src/idle/contracts.ts b/src/idle/contracts.ts
@@ -1,14 +1,23 @@
 const contracts = {
   maxYield: {
     dai: {
-      address: "0x78751b12da02728f467a44eac40f5cbc16bd7934",
+      address: "0x78751B12Da02728F467A44eAc40F5cbc16Bd7934",
     },
     usdc: {
       address: "0x12B98C621E8754Ae70d0fDbBC73D6208bC3e3cA6",
     },
     usdt: {
       address: "0x63D27B3DA94A9E871222CB0A32232674B02D2f2D",
     },
+    susd: {
+      address: "0xE79E177d2a5c7085027d7C64c8F271c81430fc9b",
+    },
+    tusd: {
+      address: "0x51C77689A9c2e8cCBEcD4eC9770a1fA5fA83EeF1",
+    },
+    wbtc: {
+      address: "0xD6f279B7ccBCD70F8be439d25B9Df93AEb60eC55",
+    },
   },
   riskAdjusted: {
     dai: {
@@ -18,7 +27,7 @@ const contracts = {
       address: "0xcDdB1Bceb7a1979C6caa0229820707429dd3Ec6C",
     },
     usdt: {
-      address: "0x42740698959761baf1b06baa51efbd88cb1d862b",
+      address: "0x42740698959761BAF1B06baa51EfBD88CB1D862B",
     },
   },
 };

diff --git a/src/uma/abi/AddressWhitelist.json b/src/uma/abi/AddressWhitelist.json
@@ -55,8 +55,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -95,8 +94,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -115,8 +113,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -161,8 +158,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -175,7 +171,6 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   }
 ]
diff --git a/src/uma/abi/DesignatedVotingFactory.json b/src/uma/abi/DesignatedVotingFactory.json
@@ -120,8 +120,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -140,8 +139,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -165,8 +163,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [

diff --git a/src/uma/abi/ExpiringMultiParty.json b/src/uma/abi/ExpiringMultiParty.json
@@ -1281,7 +1281,7 @@
       },
       {
         "internalType": "uint256",
-        "name": "requestPassTimestamp",
+        "name": "withdrawalRequestPassTimestamp",
         "type": "uint256"
       },
       {

diff --git a/src/uma/abi/ExpiringMultiPartyCreator.json b/src/uma/abi/ExpiringMultiPartyCreator.json
@@ -55,8 +55,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -69,8 +68,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -83,8 +81,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -97,8 +94,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -124,8 +120,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -138,8 +133,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -158,8 +152,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [

diff --git a/src/uma/abi/ExpiringMultiPartyLib.json b/src/uma/abi/ExpiringMultiPartyLib.json
@@ -0,0 +1 @@
+[]
diff --git a/src/uma/abi/FinancialContractsAdmin.json b/src/uma/abi/FinancialContractsAdmin.json
@@ -29,8 +29,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],

diff --git a/src/uma/abi/Finder.json b/src/uma/abi/Finder.json
@@ -54,8 +54,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -68,8 +67,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -126,7 +124,6 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   }
 ]
diff --git a/src/uma/abi/Governor.json b/src/uma/abi/Governor.json
@@ -179,8 +179,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -199,8 +198,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -224,8 +222,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -244,8 +241,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -320,8 +316,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -369,8 +364,7 @@
     "name": "executeProposal",
     "outputs": [],
     "stateMutability": "payable",
-    "type": "function",
-    "payable": true
+    "type": "function"
   },
   {
     "inputs": [],
@@ -383,8 +377,7 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   },
   {
     "inputs": [
@@ -432,7 +425,6 @@
       }
     ],
     "stateMutability": "view",
-    "type": "function",
-    "constant": true
+    "type": "function"
   }
 ]