Merge branch 'master' into master

Author: ReynardoEW

adapters/api3/index.ts

@@ -17,7 +17,7 @@ const chain: any = "ethereum";
 let res: number;
 
 export async function latest(): Promise<number> {
-  if (!res)
+  if (!res!)
     return fetch(`https://api.llama.fi/emission/api3`)
       .then((r) => r.json())
       .then((r) => JSON.parse(r.body))

adapters/balance/index.ts

@@ -14,7 +14,7 @@ export async function latest(
   backfill: boolean = false
 ): Promise<number> {
   if (backfill) return timestampDeployed
-  if (!res) {
+  if (!res!) {
     let r;
     try {
       r = await fetch(`https://api.llama.fi/emission/${adapter}`).then((r) =>

adapters/conic-finance/index.ts

@@ -7,7 +7,7 @@ import { PromisePool } from "@supercharge/promise-pool";
 let res: number;
 
 export async function latest(): Promise<number> {
-  if (!res)
+  if (!res!)
     return fetch(`https://api.llama.fi/emission/conic-finance`)
       .then((r) => r.json())
       .then((r) => JSON.parse(r.body))

adapters/equilibria/index.ts

@@ -23,7 +23,7 @@ const contracts: { [chain: string]: any } = {
 let res: number;
 
 export async function latest(key: string, backfill: boolean): Promise<number> {
-  if (!res)
+  if (!res!)
     return fetch(`https://api.llama.fi/emission/${key}`)
       .then((r) => r.json())
       .then((r) => {

no-emissions/incentives.ts

@@ -46,6 +46,6 @@ export const protocolsIncentives:string[] = [
     "parent#ramses-exchange", //ramses
     // "parent#spark", //spark is not correct #135
     "parent#blackhole", //blackhole
-    "parent#uniswap"
+    "parent#uniswap",
     "parent#etherex" //etherex
 ]