Merge main branch (#104)

Author: Cast0001

src/contracts/abis/Erc20Abi.json

@@ -1 +1,94 @@
-[ { "inputs": [ { "internalType": "address", "name": "spender", "type": "address" }, { "internalType": "uint256", "name": "value", "type": "uint256" } ], "name": "approve", "outputs": [ { "internalType": "bool", "name": "", "type": "bool" } ], "stateMutability": "nonpayable", "type": "function" }, { "inputs": [ { "internalType": "address", "name": "account", "type": "address" } ], "name": "balanceOf", "outputs": [ { "internalType": "uint256", "name": "", "type": "uint256" } ], "stateMutability": "view", "type": "function" }, { "anonymous": false, "inputs": [ { "indexed": true, "internalType": "address", "name": "from", "type": "address" }, { "indexed": true, "internalType": "address", "name": "to", "type": "address" }, { "indexed": false, "internalType": "uint256", "name": "value", "type": "uint256" } ], "name": "Transfer", "type": "event" }, { "inputs": [ { "internalType": "address", "name": "owner", "type": "address" }, { "internalType": "address", "name": "spender", "type": "address" } ], "name": "allowance", "outputs": [ { "internalType": "uint256", "name": "", "type": "uint256" } ], "stateMutability": "view", "type": "function" } ]
+[
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      }
+    ],
+    "name": "allowance",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

src/contracts/abis/index.js

@@ -15,7 +15,6 @@ import VaultFactoryAbi from './VaultFactoryAbi.json'
 import PriceOracleAbi from './PriceOracleAbi.json'
 import UniswapPoolAbi from './UniswapPoolAbi.json'
 import MulticallAbi from './MulticallAbi.json'
-import MintTokenAbi from './MintTokenAbi.json'
 import UsdRateAbi from './UsdRateAbi.json'
 import KeeperAbi from './KeeperAbi.json'
 import VaultAbi from './VaultAbi.json'
@@ -44,7 +43,6 @@ export {
   PriceOracleAbi,
   UniswapPoolAbi,
   MulticallAbi,
-  MintTokenAbi,
   UsdRateAbi,
   KeeperAbi,
   VaultAbi,

src/contracts/createContracts.ts

@@ -6,7 +6,6 @@ import {
   VaultAbi,
   KeeperAbi,
   UsdRateAbi,
-  MintTokenAbi,
   MulticallAbi,
   UniswapPoolAbi,
   PriceOracleAbi,
@@ -68,7 +67,7 @@ const getKeeper = (provider: Provider, config: StakeWise.Config) => createContra
 
 const getMintToken = (provider: Provider, config: StakeWise.Config) => createContract<StakeWise.ABI.MintToken>(
   config.addresses.tokens.mintToken,
-  MintTokenAbi,
+  Erc20Abi,
   provider
 )
 

src/index.ts

@@ -3,5 +3,5 @@ import './types/global'
 
 export * from './utils/enums'
 export { createContract } from './contracts'
-export { BigDecimal, configs } from './utils'
 export { default as StakeWiseSDK } from './StakeWiseSDK'
+export { BigDecimal, configs, getGas, createProvider } from './utils'

src/modules/gql-module/abortCallback.ts

@@ -1,13 +1,21 @@
 class AbortCallback {
+  private isAborted: boolean
   callback: Promise<any>
   onAbort: () => void
 
   constructor(callback: Promise<any>, onAbort: () => void) {
+    this.isAborted = false
     this.callback = callback
     this.onAbort = onAbort
   }
 
   then(onSuccess: (data: any) => any, onError?: (error: any) => any) {
+    if (this.isAborted) {
+      const dummyPromise = new Promise(() => {})
+
+      return new AbortCallback(dummyPromise, this.onAbort)
+    }
+
     return new AbortCallback(this.callback.then(onSuccess, onError), this.onAbort)
   }
 
@@ -20,6 +28,7 @@ class AbortCallback {
   }
 
   abort() {
+    this.isAborted = true
     this.onAbort()
   }
 }

src/modules/gql-module/abortPromise.ts

@@ -16,9 +16,12 @@ const dummyPromise = new Promise(() => {})
 class AbortPromise<Data> {
   private promise: Promise<Data>
   private isAborted: boolean
+  private onAbort?: () => void
 
-  constructor(callback: AbortPromiseCallback<Data>) {
+  constructor(callback: AbortPromiseCallback<Data>, onAbort?: () => void) {
     this.isAborted = false
+    this.onAbort = onAbort
+
     this.promise = new Promise(callback)
       .then((data) => {
         try {
@@ -58,6 +61,7 @@ class AbortPromise<Data> {
         }
       })
     }
+
     const allPromises = Promise.all(promises).then((data) => {
       if (isAborted) {
         return dummyPromise as Promise<T[]>
@@ -95,6 +99,10 @@ class AbortPromise<Data> {
 
   abort() {
     this.isAborted = true
+
+    if (typeof this.onAbort === 'function') {
+      this.onAbort()
+    }
   }
 }
 

src/modules/gql-module/abortRequest.ts

@@ -1,4 +1,4 @@
-import AbortCallback from './abortCallback'
+import AbortPromise from './abortPromise'
 
 
 type ModifyCallback<Data, ModifiedData = Data> = (value: Data) => ModifiedData | PromiseLike<ModifiedData>
@@ -7,8 +7,11 @@ type FirstCallback<Data> = (value: Data) => Data | any
 
 type EmptyCallback = () => void
 
+type ErrorCallback<Data, ModifiedData = Data> = (error: Error | any) => Promise<void> | AbortRequest<Data, ModifiedData>
+
 type AbortRequestInit<Data, ModifiedData> = RequestInit & {
   onSuccess: ModifyCallback<Data, ModifiedData>
+  onError?: ErrorCallback<Data, ModifiedData>
 }
 
 type PendingRequest = {
@@ -18,19 +21,17 @@ type PendingRequest = {
 
 const requestsQueue: Record<string, PendingRequest | undefined> = {}
 
-const dummyPromise = new Promise(() => {})
-
 // Returns fetch promise that can be aborted
 // If we create several promises, only one request will be executed
 class AbortRequest<Data, ModifiedData> {
   private controller = new AbortController()
   request: Promise<Data>
-  promise: Promise<ModifiedData>
+  promise: AbortPromise<ModifiedData>
   body: string
   isAborted: boolean
 
   constructor(url: RequestInfo | URL, abortRequestInit: AbortRequestInit<Data, ModifiedData>) {
-    const { onSuccess, ...init } = abortRequestInit
+    const { onSuccess, onError, ...init } = abortRequestInit
 
     this.body = init.body as string
     this.isAborted = false
@@ -46,14 +47,34 @@ class AbortRequest<Data, ModifiedData> {
         ...init,
         signal: this.controller.signal,
       })
-        .then((res) => res.json())
+        .then((response) => {
+          if (response.ok) {
+            return response.json()
+          }
+
+          return response.json().then((json) => Promise.reject(json))
+        })
         .then((json) => {
           requestsQueue[this.body] = undefined
+
+          if (json?.errors) {
+            throw new Error(json.errors[0].message)
+          }
+
+          // Subgraph encountered indexing errors at some past block
+          if (json?.data?._meta?.hasIndexingErrors) {
+            throw new Error('Subgraph indexing error')
+          }
+
           return json?.data as Data
         })
         .catch((error) => {
           requestsQueue[this.body] = undefined
 
+          if (typeof onError === 'function') {
+            onError(error)
+          }
+
           return Promise.reject(error)
         })
 
@@ -63,42 +84,37 @@ class AbortRequest<Data, ModifiedData> {
       }
     }
 
-    this.promise = this.request
-      .then((data) => {
-        try {
-          if (this.isAborted) {
-            return dummyPromise as Promise<ModifiedData>
-          }
-
-          if (typeof onSuccess === 'function') {
-            return onSuccess(data) as Promise<ModifiedData>
-          }
+    this.promise = new AbortPromise<ModifiedData>(async (resolve, reject) => {
+      try {
+        const result = await this.request
 
-          return data as Promise<ModifiedData>
-        }
-        catch (error) {
-          return Promise.reject(error)
+        if (typeof onSuccess === 'function') {
+          return resolve(onSuccess(result) as ModifiedData)
         }
-      })
-      .catch((error) => {
-        if (this.isAborted) {
-          return dummyPromise as Promise<ModifiedData>
+
+        return resolve(result as ModifiedData)
+      }
+      catch (error) {
+        if (typeof onError === 'function') {
+          // ATTN use resolve because onError can return a promise
+          return resolve(onError(error) as ModifiedData)
         }
 
-        return Promise.reject(error)
-      })
+        return reject(error)
+      }
+    }, this.abort.bind(this))
   }
 
   then(onSuccess: FirstCallback<ModifiedData>, onError?: FirstCallback<ModifiedData>) {
-    return new AbortCallback(this.promise.then(onSuccess, onError), this.abort.bind(this))
+    return this.promise.then(onSuccess, onError)
   }
 
   catch(callback: FirstCallback<ModifiedData>) {
-    return new AbortCallback(this.promise.catch(callback), this.abort.bind(this))
+    return this.promise.catch(callback)
   }
 
   finally(callback: EmptyCallback) {
-    return new AbortCallback(this.promise.finally(callback), this.abort.bind(this))
+    return this.promise.finally(callback)
   }
 
   abort() {

src/modules/gql-module/graphqlFetch.ts

@@ -1,19 +1,25 @@
 import AbortRequest from './abortRequest'
 import type { FetchInput } from './types'
+import { getRequestUrl, saveErrorUrlToSessionStorage } from './utils'
 
 
+type ExtendedFetchInput<Data, Variables, ModifiedData> = FetchInput<Data, Variables, ModifiedData> & {
+  retryCount?: number
+}
+
 const graphqlFetch = <Data, Variables, ModifiedData>(
-  options: FetchInput<Data, Variables, ModifiedData>
+  options: ExtendedFetchInput<Data, Variables, ModifiedData>
 ): AbortRequest<Data, ModifiedData> => {
-  const { url, query, variables, modifyResult } = options
+  const { url, query, variables, retryCount = 0, modifyResult } = options
 
   const operationName = query
     .replace(/^(query|mutation)\s/, '')
     .replace(/[({].*/, '')
     .trim()
 
+  const currentUrl = getRequestUrl(url)
   const opName = operationName ? `?opName=${operationName}` : ''
-  const requestUrl = `${url}${opName}`
+  const requestUrl = `${currentUrl}${opName}`
 
   return new AbortRequest<Data, ModifiedData>(requestUrl, {
     method: 'POST',
@@ -28,6 +34,21 @@ const graphqlFetch = <Data, Variables, ModifiedData>(
     onSuccess: (data: Data) => typeof modifyResult === 'function'
       ? modifyResult(data)
       : data as unknown as ModifiedData,
+    onError: (error: Error | any) => {
+      const hasBackupUrl = Array.isArray(url) && url.length > 1
+
+      if (hasBackupUrl && retryCount < 1) {
+        saveErrorUrlToSessionStorage(url[0])
+
+        return graphqlFetch({
+          ...options,
+          url: url[1],
+          retryCount: retryCount + 1,
+        })
+      }
+
+      return Promise.reject(error)
+    },
   })
 }