migrate all subgraph.ts queries, making typings generation work

src/@utils/compute.ts

@@ -17,18 +17,19 @@ import { fetchDataForMultipleChains } from './subgraph'
 
 const getComputeOrders = gql`
   query ComputeOrders($user: String!) {
-    tokenOrders(
+    orders(
-      orderBy: timestamp
+      orderBy: createdTimestamp
       orderDirection: desc
       where: { payer: $user }
     ) {
       id
       serviceId
-      datatokenId {
+      token {
         address
+        isDatatoken
       }
       tx
-      timestamp
+      createdTimestamp
     }
   }
 `
@@ -38,18 +39,19 @@ const getComputeOrdersByDatatokenAddress = gql`
     $user: String!
     $datatokenAddress: String!
   ) {
-    tokenOrders(
+    orders(
-      orderBy: timestamp
+      orderBy: createdTimestamp
       orderDirection: desc
-      where: { payer: $user, datatokenId: $datatokenAddress }
+      where: { payer: $user, token: $datatokenAddress }
     ) {
       id
       serviceId
-      datatokenId {
+      token {
         address
+        isDatatoken
       }
       tx
-      timestamp
+      createdTimestamp
     }
   }
 `

src/@utils/subgraph.ts

@@ -49,8 +49,8 @@ interface DidAndDatatokenMap {
 
 const FreeQuery = gql`
   query AssetsFreePrice($datatoken_in: [String!]) {
-    dispensers(orderBy: id, where: { datatoken_in: $datatoken_in }) {
+    dispensers(orderBy: id, where: { token_in: $datatoken_in }) {
-      datatoken {
+      token {
         id
         address
       }
@@ -60,18 +60,16 @@ const FreeQuery = gql`
 
 const AssetFreeQuery = gql`
   query AssetFreePrice($datatoken: String) {
-    dispensers(orderBy: id, where: { datatoken: $datatoken }) {
+    dispensers(orderBy: id, where: { token: $datatoken }) {
       active
-      owner {
+      owner
-        id
+      isMinter
-      }
-      minterApproved
-      isTrueMinter
       maxTokens
       maxBalance
       balance
-      datatoken {
+      token {
         id
+        isDatatoken
       }
     }
   }
@@ -80,9 +78,11 @@ const AssetFreeQuery = gql`
 const FreQuery = gql`
   query AssetsFrePrice($datatoken_in: [String!]) {
     fixedRateExchanges(orderBy: id, where: { datatoken_in: $datatoken_in }) {
-      rate
       id
-      baseTokenSymbol
+      price
+      baseToken {
+        symbol
+      }
       datatoken {
         id
         address
@@ -95,9 +95,11 @@ const FreQuery = gql`
 const AssetFreQuery = gql`
   query AssetFrePrice($datatoken: String) {
     fixedRateExchanges(orderBy: id, where: { datatoken: $datatoken }) {
-      rate
       id
-      baseTokenSymbol
+      price
+      baseToken {
+        symbol
+      }
       datatoken {
         id
         address
@@ -109,46 +111,46 @@ const AssetFreQuery = gql`
 
 const PoolQuery = gql`
   query AssetsPoolPrice($datatokenAddress_in: [String!]) {
-    pools(where: { datatokenAddress_in: $datatokenAddress_in }) {
+    pools(where: { datatoken_in: $datatokenAddress_in }) {
       id
       spotPrice
-      consumePrice
+      datatoken {
-      datatokenAddress
+        address
-      datatokenReserve
-      oceanReserve
-      tokens(where: { isDatatoken: false }) {
-        isDatatoken
         symbol
       }
+      datatokenLiquidity
+      baseTokenLiquidity
     }
   }
 `
 
 const AssetPoolPriceQuery = gql`
   query AssetPoolPrice($datatokenAddress: String) {
-    pools(where: { datatokenAddress: $datatokenAddress }) {
+    pools(where: { datatoken: $datatokenAddress }) {
       id
       spotPrice
-      consumePrice
+      datatoken {
-      datatokenAddress
+        address
-      datatokenReserve
-      oceanReserve
-      tokens(where: { isDatatoken: false }) {
         symbol
       }
+      baseToken {
+        symbol
+      }
+      datatokenLiquidity
+      baseTokenLiquidity
     }
   }
 `
 
 const PreviousOrderQuery = gql`
   query AssetPreviousOrder($id: String!, $account: String!) {
-    tokenOrders(
+    orders(
       first: 1
-      where: { datatokenId: $id, payer: $account }
+      where: { token: $id, payer: $account }
-      orderBy: timestamp
+      orderBy: createdTimestamp
       orderDirection: desc
     ) {
-      timestamp
+      createdTimestamp
       tx
     }
   }
@@ -156,42 +158,43 @@ const PreviousOrderQuery = gql`
 const HighestLiquidityAssets = gql`
   query HighestLiquidityAssets {
     pools(
-      where: { datatokenReserve_gte: 1 }
+      where: { datatokenLiquidity_gte: 1 }
-      orderBy: oceanReserve
+      orderBy: baseTokenLiquidity
       orderDirection: desc
       first: 15
     ) {
       id
-      datatokenAddress
+      datatoken {
-      valueLocked
+        address
-      oceanReserve
+      }
+      baseTokenLiquidity
     }
   }
 `
 
 const UserSharesQuery = gql`
   query UserSharesQuery($user: String, $pools: [String!]) {
-    poolShares(where: { userAddress: $user, poolId_in: $pools }) {
+    poolShares(where: { user: $user, pool_in: $pools }) {
       id
-      balance
+      shares
-      userAddress {
+      user {
         id
       }
-      poolId {
+      pool {
         id
-        datatokenAddress
+        datatoken {
-        valueLocked
+          address
-        tokens {
+          symbol
-          tokenId {
-            symbol
-          }
         }
-        oceanReserve
+        baseToken {
-        datatokenReserve
+          address
+          symbol
+        }
+        datatokenLiquidity
+        baseTokenLiquidity
         totalShares
-        consumePrice
         spotPrice
-        createTime
+        createdTimestamp
       }
     }
   }
@@ -199,27 +202,29 @@ const UserSharesQuery = gql`
 
 const userPoolSharesQuery = gql`
   query PoolShares($user: String) {
-    poolShares(where: { userAddress: $user, balance_gt: 0.001 }, first: 1000) {
+    poolShares(where: { user: $user, shares_gt: 0.001 }, first: 1000) {
       id
-      balance
+      shares
-      userAddress {
+      user {
         id
       }
-      poolId {
+      pool {
         id
-        datatokenAddress
+        datatoken {
-        valueLocked
-        tokens {
           id
-          isDatatoken
+          address
           symbol
         }
-        oceanReserve
+        baseToken {
-        datatokenReserve
+          id
+          address
+          symbol
+        }
+        baseTokenLiquidity
+        datatokenLiquidity
         totalShares
-        consumePrice
         spotPrice
-        createTime
+        createdTimestamp
       }
     }
   }
@@ -227,39 +232,47 @@ const userPoolSharesQuery = gql`
 
 const UserTokenOrders = gql`
   query OrdersData($user: String!) {
-    tokenOrders(
+    orders(
-      orderBy: timestamp
+      orderBy: createdTimestamp
       orderDirection: desc
       where: { consumer: $user }
     ) {
-      datatokenId {
+      token {
         address
         symbol
+        isDatatoken
       }
-      timestamp
+      createdTimestamp
       tx
     }
   }
 `
+
+// TODO: counting orders might be enough here to get sales for a user
 const UserSalesQuery = gql`
   query UserSalesQuery($userSalesId: ID) {
     users(where: { id: $userSalesId }) {
       id
-      nrSales
+      orders(first: 10000) {
+        id
+      }
     }
   }
 `
 
+// TODO: figure out some way to get this
 const TopSalesQuery = gql`
   query TopSalesQuery {
     users(
       first: 20
-      orderBy: nrSales
+      orderBy: tokensOwned
       orderDirection: desc
-      where: { nrSales_not: 0 }
+      where: { tokenBalancesOwned_not: "0" }
     ) {
       id
-      nrSales
+      tokenBalancesOwned {
+        value
+      }
     }
   }
 `