fix: build

package.json

@@ -1,13 +1,14 @@
 {
   "name": "@sushiswap/subgraphs",
-  "private": "true",
+  "private": true,
   "workspaces": [
     "packages/*",
     "subgraphs/*"
   ],
-  "nohoist": [
-    "**subgraphs/@graphprotocol/graph-ts/**"
-  ],
+  "scripts": {
+    "build": "yarn workspaces foreach run build",
+    "codegen": "yarn workspaces foreach run codegen"
+  },
   "devDependencies": {
     "@graphprotocol/graph-cli": "^0.19.0",
     "@graphprotocol/graph-ts": "^0.19.0",
@@ -19,4 +20,4 @@
     "prettier": "^2.0.0",
     "typescript": "^4.0.0"
   }
-}
+}

packages/abis/package.json

@@ -4,9 +4,11 @@
     "description": "Abis",
     "license": "MIT",
     "private": true,
-    "files": ["./*.json"],
+    "files": [
+        "./*.json"
+    ],
     "scripts": {
-      "codegen": ".",
-      "build": "."
+        "codegen": ".",
+        "build": "."
     }
-  }
+}

packages/constants/package.json

@@ -1,12 +1,12 @@
 {
-    "name": "constants",
-    "version": "1.0.0",
-    "description": "Constants",
-    "license": "MIT",
-    "private": true,
-    "main": "constants.ts",
-    "scripts": {
-      "codegen": ".",
-      "build": "."
-    }
-  }
+  "name": "const",
+  "version": "1.0.0",
+  "description": "Constants",
+  "license": "MIT",
+  "private": true,
+  "main": "index.ts",
+  "scripts": {
+    "codegen": ".",
+    "build": "."
+  }
+}

packages/pricing/price.ts → packages/pricing/index.ts

@@ -14,7 +14,7 @@ import {
   UNISWAP_WETH_USDT_PAIR_ADDRESS,
   USDT_ADDRESS,
   WETH_ADDRESS,
-} from 'constants/'
+} from 'const'
 import { Address, BigDecimal, BigInt, ethereum, log } from '@graphprotocol/graph-ts'
 
 import { Factory as FactoryContract } from 'exchange/generated/Factory/Factory'

packages/pricing/package.json

@@ -1,16 +1,16 @@
 {
-    "name": "pricing",
-    "version": "1.0.0",
-    "description": "Common logic and utilities to use throughout the project",
-    "license": "MIT",
-    "private": true,
-    "main": "price.ts",
-    "dependencies": {
-        "constants": "^1.0.0",
-        "exchange": "^1.0.0"
-    },
-    "scripts": {
-        "codegen": ".",
-        "build": "."
-      }
-  }
+  "name": "pricing",
+  "version": "1.0.0",
+  "description": "Common logic and utilities to use throughout the project",
+  "license": "MIT",
+  "private": true,
+  "main": "index.ts",
+  "dependencies": {
+    "const": "^1.0.0",
+    "exchange": "^1.0.0"
+  },
+  "scripts": {
+    "codegen": ".",
+    "build": "."
+  }
+}

subgraphs/bar/package.json

@@ -11,5 +11,4 @@
         "remove-local": "graph remove --node http://localhost:8020/ /sushiswap/sushiswap",
         "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 /sushiswap/sushiswap"
     }
-  }
-
+}

subgraphs/bar/src/bar.ts

@@ -7,7 +7,7 @@ import {
   SUSHI_BAR_ADDRESS,
   SUSHI_TOKEN_ADDRESS,
   SUSHI_USDT_PAIR_ADDRESS,
-} from '../../../packages/constants/constants'
+} from 'const'
 import { Address, BigDecimal, BigInt, dataSource, ethereum, log } from '@graphprotocol/graph-ts'
 import { Bar, History, User } from '../generated/schema'
 import { Bar as BarContract, Transfer as TransferEvent } from '../generated/SushiBar/Bar'
@@ -234,7 +234,7 @@ export function transfer(event: TransferEvent): void {
     user.xSushiAgeDestroyed = user.xSushiAgeDestroyed.plus(xSushiAgeDestroyed)
 
     // remove xSushiAge
-    user.xSushiAge = user.xSushiAge.minus(xSushiAgeDestroyed);
+    user.xSushiAge = user.xSushiAge.minus(xSushiAgeDestroyed)
     // Update xSushi last
     user.xSushi = user.xSushi.minus(value)
 

subgraphs/dexcandles/package.json

@@ -11,5 +11,4 @@
         "remove-local": "graph remove --node http://localhost:8020/ /sushiswap/sushiswap",
         "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 /sushiswap/sushiswap"
     }
-  }
-
+}

subgraphs/exchange/packages/abis/ERC20NameBytes.json

@@ -0,0 +1,17 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

subgraphs/exchange/packages/abis/ERC20SymbolBytes.json

@@ -0,0 +1,17 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  }
+]

subgraphs/exchange/src/exchange/enitites/bundle.ts

@@ -1,4 +1,4 @@
-import { BIG_DECIMAL_ZERO } from 'constants/'
+import { BIG_DECIMAL_ZERO } from 'const'
 import { BigDecimal } from '@graphprotocol/graph-ts'
 import { Bundle } from '../../../generated/schema'
 

subgraphs/exchange/src/exchange/enitites/factory.ts

@@ -1,5 +1,5 @@
 import { Address, ethereum } from '@graphprotocol/graph-ts'
-import { BIG_DECIMAL_ZERO, BIG_INT_ZERO, FACTORY_ADDRESS } from 'constants/'
+import { BIG_DECIMAL_ZERO, BIG_INT_ZERO, FACTORY_ADDRESS } from 'const'
 import { DayData, Factory } from '../../../generated/schema'
 
 export function getFactory(id: Address = FACTORY_ADDRESS): Factory {

subgraphs/exchange/src/exchange/enitites/liquidity-position.ts

@@ -1,5 +1,5 @@
 import { Address, BigDecimal, BigInt, ethereum } from '@graphprotocol/graph-ts'
-import { BIG_DECIMAL_ZERO, BIG_INT_ZERO } from 'constants/'
+import { BIG_DECIMAL_ZERO, BIG_INT_ZERO } from 'const'
 import { LiquidityPosition, Pair } from '../../../generated/schema'
 
 import { Pair as PairContract } from '../../../generated/templates/Pair/Pair'

subgraphs/exchange/src/exchange/enitites/pair-day-data.ts

@@ -1,7 +1,7 @@
 import { BigDecimal, BigInt, ethereum } from '@graphprotocol/graph-ts'
 import { Pair, PairDayData } from '../../../generated/schema'
 
-import { BIG_DECIMAL_ZERO } from 'constants/'
+import { BIG_DECIMAL_ZERO } from 'const'
 
 export function updatePairDayData(event: ethereum.Event): PairDayData {
   const timestamp = event.block.timestamp.toI32()

subgraphs/exchange/src/exchange/enitites/pair-hour-data.ts

@@ -1,7 +1,7 @@
 import { BigDecimal, BigInt, ethereum } from '@graphprotocol/graph-ts'
 import { Pair, PairHourData } from '../../../generated/schema'
 
-import { BIG_DECIMAL_ZERO } from 'constants/'
+import { BIG_DECIMAL_ZERO } from 'const'
 
 export function updatePairHourData(event: ethereum.Event): PairHourData {
   const timestamp = event.block.timestamp.toI32()

subgraphs/exchange/src/exchange/enitites/pair.ts

@@ -1,5 +1,5 @@
 import { Address, ethereum } from '@graphprotocol/graph-ts'
-import { BIG_DECIMAL_ZERO, BIG_INT_ZERO, FACTORY_ADDRESS } from 'constants/'
+import { BIG_DECIMAL_ZERO, BIG_INT_ZERO, FACTORY_ADDRESS } from 'const'
 
 import { Pair } from '../../../generated/schema'
 import { Pair as PairContract } from '../../../generated/templates/Pair/Pair'

subgraphs/exchange/src/exchange/enitites/token-day-data.ts

@@ -1,7 +1,7 @@
 import { BigDecimal, BigInt, ethereum } from '@graphprotocol/graph-ts'
 import { Token, TokenDayData } from '../../../generated/schema'
 
-import { BIG_DECIMAL_ZERO } from 'constants/'
+import { BIG_DECIMAL_ZERO } from 'const'
 import { getBundle } from '.'
 
 export function getTokenDayData(token: Token, event: ethereum.Event): TokenDayData {

subgraphs/exchange/src/exchange/enitites/token.ts

@@ -1,5 +1,5 @@
 import { Address, BigInt, log } from '@graphprotocol/graph-ts'
-import { BIG_DECIMAL_ZERO, BIG_INT_ZERO, NULL_CALL_RESULT_VALUE } from 'constants/'
+import { BIG_DECIMAL_ZERO, BIG_INT_ZERO, NULL_CALL_RESULT_VALUE } from 'const'
 
 import { ERC20 } from '../../../generated/Factory/ERC20'
 import { ERC20NameBytes } from '../../../generated/Factory/ERC20NameBytes'

subgraphs/exchange/src/exchange/mappings/factory.ts

@@ -1,6 +1,6 @@
 import { getFactory, getPair } from '../enitites'
 
-import { BIG_INT_ONE } from 'constants/'
+import { BIG_INT_ONE } from 'const'
 import { PairCreated } from '../../../generated/Factory/Factory'
 import { Pair as PairTemplate } from '../../../generated/templates'
 

subgraphs/exchange/src/exchange/mappings/pair.ts

@@ -1,10 +1,4 @@
-import {
-  ADDRESS_ZERO,
-  BIG_DECIMAL_ZERO,
-  MASTER_CHEF_ADDRESS,
-  MINIMUM_USD_THRESHOLD_NEW_PAIRS,
-  WHITELIST,
-} from 'constants/'
+import { ADDRESS_ZERO, BIG_DECIMAL_ZERO, MASTER_CHEF_ADDRESS, MINIMUM_USD_THRESHOLD_NEW_PAIRS, WHITELIST } from 'const'
 import { Address, BigDecimal, BigInt, log, store } from '@graphprotocol/graph-ts'
 import { Burn, Mint, Pair, Swap, Token, Transaction } from '../../../generated/schema'
 import {
@@ -267,10 +261,7 @@ export function onTransfer(event: TransferEvent): void {
   }
 
   // BURN
-  if (
-    event.params.from != ADDRESS_ZERO &&
-    event.params.from.toHex() != pair.id
-  ) {
+  if (event.params.from != ADDRESS_ZERO && event.params.from.toHex() != pair.id) {
     const fromUserLiquidityPosition = createLiquidityPosition(event.params.from, event.address, event.block)
 
     fromUserLiquidityPosition.liquidityTokenBalance = fromUserLiquidityPosition.liquidityTokenBalance.minus(value)
@@ -281,10 +272,7 @@ export function onTransfer(event: TransferEvent): void {
   }
 
   // MINT
-  if (
-    event.params.to != ADDRESS_ZERO &&
-    event.params.to.toHex() != pair.id
-  ) {
+  if (event.params.to != ADDRESS_ZERO && event.params.to.toHex() != pair.id) {
     const toUserLiquidityPosition = createLiquidityPosition(event.params.to, event.address, event.block)
 
     toUserLiquidityPosition.liquidityTokenBalance = toUserLiquidityPosition.liquidityTokenBalance.plus(value)

subgraphs/exchange/src/exchange/pricing.ts

@@ -11,7 +11,7 @@ import {
   USDT_WETH_PAIR,
   WETH_ADDRESS,
   WHITELIST,
-} from 'constants/'
+} from 'const'
 import { Address, BigDecimal, BigInt, ethereum, log } from '@graphprotocol/graph-ts'
 import { Pair, Token } from '../../generated/schema'
 

subgraphs/lockup/package.json

@@ -1,14 +1,14 @@
 {
-    "name": "lockup",
-    "license": "MIT",
-    "version": "1.0.0",
-    "author": "SushiSwap",
-    "scripts": {
-        "codegen": "graph codegen lockup.yaml",
-        "build": "graph build lockup.yaml",
-        "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ sushiswap/lockup lockup.yaml",
-        "create-local": "graph create --node http://localhost:8020/ /sushiswap/sushiswap",
-        "remove-local": "graph remove --node http://localhost:8020/ /sushiswap/sushiswap",
-        "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 /sushiswap/sushiswap"
-    }
+  "name": "lockup",
+  "license": "MIT",
+  "version": "1.0.0",
+  "author": "SushiSwap",
+  "scripts": {
+    "codegen": "graph codegen lockup.yaml",
+    "build": "graph build lockup.yaml",
+    "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ sushiswap/lockup lockup.yaml",
+    "create-local": "graph create --node http://localhost:8020/ /sushiswap/sushiswap",
+    "remove-local": "graph remove --node http://localhost:8020/ /sushiswap/sushiswap",
+    "deploy-local": "graph deploy --node http://localhost:8020/ --ipfs http://localhost:5001 /sushiswap/sushiswap"
+  }
 }

subgraphs/lockup/src/lockup.ts

@@ -1,5 +1,14 @@
 import { Address, BigInt, ethereum, log } from '@graphprotocol/graph-ts'
-import { BIG_DECIMAL_1E12, BIG_DECIMAL_1E18, BIG_DECIMAL_ZERO, BIG_INT_ONE, BIG_INT_ZERO, LOCKUP_BLOCK_NUMBER, LOCKUP_POOL_NUMBER, MASTER_CHEF_ADDRESS } from 'constants/'
+import {
+  BIG_DECIMAL_1E12,
+  BIG_DECIMAL_1E18,
+  BIG_DECIMAL_ZERO,
+  BIG_INT_ONE,
+  BIG_INT_ZERO,
+  LOCKUP_BLOCK_NUMBER,
+  LOCKUP_POOL_NUMBER,
+  MASTER_CHEF_ADDRESS,
+} from 'const'
 import {
   Deposit,
   MasterChef as MasterChefContract,
@@ -8,7 +17,7 @@ import {
   Withdraw,
 } from '../generated/MasterChef/MasterChef'
 import { Lockup, Pool, User } from '../generated/schema'
-import { getSushiPrice } from 'pricing/'
+import { getSushiPrice } from 'pricing'
 import { Pair as PairContract } from '../generated/MasterChef/Pair'
 
 export function getUser(pid: BigInt, address: Address, block: ethereum.Block): User {

subgraphs/maker/src/maker.ts

@@ -1,11 +1,5 @@
 import { Address, ByteArray, log } from '@graphprotocol/graph-ts'
-import {
-  BIG_DECIMAL_1E18,
-  BIG_DECIMAL_ZERO,
-  FACTORY_ADDRESS,
-  SUSHI_BAR_ADDRESS,
-  SUSHI_MAKER_ADDRESS,
-} from 'constants/'
+import { BIG_DECIMAL_1E18, BIG_DECIMAL_ZERO, FACTORY_ADDRESS, SUSHI_BAR_ADDRESS, SUSHI_MAKER_ADDRESS } from 'const'
 import { Maker, Server, Serving } from '../generated/schema'
 
 import { ERC20 as ERC20Contract } from '../generated/Maker/ERC20'

subgraphs/masterchef/src/masterchef.ts

@@ -22,9 +22,9 @@ import {
   BIG_INT_ZERO,
   MASTER_CHEF_ADDRESS,
   MASTER_CHEF_START_BLOCK,
-} from 'constants/constants'
+} from 'const'
 import { History, MasterChef, Pool, PoolHistory, User } from '../generated/schema'
-import { getSushiPrice, getUSDRate } from 'pricing/price'
+import { getSushiPrice, getUSDRate } from 'pricing'
 
 import { ERC20 as ERC20Contract } from '../generated/MasterChef/ERC20'
 import { Pair as PairContract } from '../generated/MasterChef/Pair'