Merge pull request #42 from idan-orbs/overnight

Fixed Overnight strategy

Author: degenddy

_test/test-overnight.js

@@ -31,7 +31,7 @@ async function testPayout(network, fromBlock, toBlock) {
 
 }
 
-async function testStrategy(network, strategyName, fromBlock, toBlock) {
+async function testStrategy(network, fromBlock, toBlock) {
 
     const providerUrl = require("./dev-keys.json")[`web3${network}`]
 
@@ -52,7 +52,7 @@ async function testStrategy(network, strategyName, fromBlock, toBlock) {
     const form = await strategyNotification.onSubscribeForm({});
 
     const subscription = {
-        strategy: strategyName,
+        strategy: form.find(o => o.id === 'strategy').values[0].value,
     };
 
     console.log(form);
@@ -74,11 +74,11 @@ async function main() {
     console.log(await testPayout("optimism", 106155876, 106155878));
     // console.log(await testPayout("zksync", 730251, 730253));
 
-    console.log(await testStrategy("polygon", "Balancer USDC", 44512809, 44512809));
-    console.log(await testStrategy("arbitrum", "Sushiswap USDC/USDT", 110392139, 110392141));
-    console.log(await testStrategy("bsc", "Thena USDC/USDT", 29875608, 29875608));
-    console.log(await testStrategy("optimism", "Pika v4", 106777666, 106777666));
-    // console.log(await testStrategy("zksync", "Nexon USDC", 2279899, 2279899));
+    console.log(await testStrategy("polygon", 44512809, 44512809));
+    console.log(await testStrategy("arbitrum", 110392139, 110392141));
+    console.log(await testStrategy("bsc", 29875608, 29875608));
+    console.log(await testStrategy("optimism", 106777666, 106777666));
+    // console.log(await testStrategy("zksync", 2279899, 2279899));
 }
 
 

overnight/project.json

@@ -3,8 +3,8 @@
   "category": "defi",
   "website": "https://overnight.fi",
   "logo": "logo.png",
-  "background": "#418aca",
-  "foreground": "#ffffff",
+  "background": "#15141D",
+  "foreground": "#28A0F0",
   "network": "arbitrum",
   "dev": true
 }

overnight/strategy-base.js

@@ -15,10 +15,9 @@ class StrategyBase {
 
     async _getStrategies() {
         const result = await (await fetch(`https://api.overnight.fi/${this.network}/usd+/dict/strategies`)).json();
-        return result.reduce((acc, curr) => {
-            acc[curr.fullName] = curr.address;
-            return acc;
-        }, {});
+        return result.map(
+            x => {return {value: x.address, label: x.fullName}}
+        )
     }
 
     /**
@@ -38,15 +37,15 @@ class StrategyBase {
                 id: "strategy",
                 label: "Strategy",
                 description: "Select a strategy you wish to get alerts for",
-                values: Object.keys(this.strategies)
+                values: this.strategies
             }
         ];
     }
 
     async onBlocks(args) {
         const notifications = [];
 
-        const selectedStrategy = args.subscription["strategy"]
+        const selectedStrategyAddress = args.subscription["strategy"];
 
         const events = await this.portMgrContract.getPastEvents("StrategyWeightUpdated", {
             fromBlock: args.fromBlock,
@@ -55,10 +54,11 @@ class StrategyBase {
 
         if (events.length > 0) {
             for (const event of events) {
-                if (event.returnValues.strategy === this.strategies[selectedStrategy]) {
+                if (event.returnValues.strategy === selectedStrategyAddress) {
+                    const selectedStrategyName = this.strategies.find(s => s.value === selectedStrategyAddress).label
                     notifications.push({
                         uniqueId: `${event.transactionHash}${event.returnValues.strategy}`,
-                        notification: `Strategy '${selectedStrategy}' has been updated (${this.network.charAt(0).toUpperCase() + this.network.slice(1)})`
+                        notification: `Strategy '${selectedStrategyName}' has been updated (${this.network.charAt(0).toUpperCase() + this.network.slice(1)})`
                     })
                 }
             }