feat: add subgraphs for 0x (#8)

* feat: add subgraphs for 0x * fixup! feat: add subgraphs for 0x * fixup! feat: add subgraphs for 0x Co-authored-by: Jack Ellis <jack.m.ellis@hotmail.co.uk>
NFTX-project · Jan 12, 2023 · 1e65a74 · 1e65a74
1 parent 7ac5619
commit 1e65a74
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 24 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup
         run: yarn install
       - name: Lint
-        run: yarn tsc
+        run: yarn lint
       - name: Tests
         run: yarn test
       - name: Build

diff --git a/packages/constants/src/addresses.ts b/packages/constants/src/addresses.ts
@@ -14,22 +14,19 @@ export const CRYPTOPUNKS = '0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb';
 export const WETH_TOKEN = {
   [Network.Mainnet]: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
   [Network.Arbitrum]: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
-  [Network.Rinkeby]: '0xc778417e063141139fce010982780140aa0cd5ab',
   [Network.Goerli]: '0xB4FBF271143F4FBf7B91A5ded31805e42b2208d6',
 };
 
 /** The address for USDC across networks */
 export const USDC = {
   [Network.Mainnet]: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
   [Network.Arbitrum]: '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-  [Network.Rinkeby]: '0xeb8f08a975Ab53E34D8a0330E0D34de942C95926',
   [Network.Goerli]: '0x2f3a40a3db8a7e3d09b0adfefbce4f6f81927557',
 };
 
 export const OPENSEA_COLLECTION = '0x495f947276749ce646f68ac8c248420045cb7b5e';
 
 export const MULTICALL = {
-  [Network.Rinkeby]: '0x42ad527de7d4e9d9d011ac45b31d8551f8fe9821',
   [Network.Mainnet]: '0xeefba1e63905ef1d7acba5a8513c70307c1ce441',
   [Network.Arbitrum]: '0x8a0bd1773139C6609e861B9ab68082587a3cD581',
   [Network.Goerli]: '0x77dCa2C955b15e9dE4dbBCf1246B4B85b651e50e',
@@ -38,67 +35,59 @@ export const MULTICALL = {
 export const NFTX_LP_STAKING = {
   [Network.Mainnet]: '0x688c3E4658B5367da06fd629E41879beaB538E37',
   [Network.Arbitrum]: '0x5326A720f76CFbDfE9e18fA618C3a3f7AbDF3934',
-  [Network.Rinkeby]: '0xcd0dfb870A60C30D957b0DF1D180a236a55b5740',
   [Network.Goerli]: '0xAfC303423580239653aFB6fb06d37D666ea0f5cA',
 };
 
 export const NFTX_INVENTORY_STAKING = {
   [Network.Mainnet]: '0x3E135c3E981fAe3383A5aE0d323860a34CfAB893',
   [Network.Arbitrum]: '0x1A2C03ABD4Af7C87d8b4d5aD39b56fa98E8C4Cc6',
-  [Network.Rinkeby]: '0x05aD54B40e3be8252CB257f77d9301E9CB1A9470',
   [Network.Goerli]: '0x6e91A3f27cE6753f47C66B76B03E6A7bFdDB605B',
 };
 
 export const NFTX_STAKING_ZAP = {
   [Network.Mainnet]: '0xdc774d5260ec66e5dd4627e1dd800eff3911345c',
   [Network.Arbitrum]: '0xfb8664E4EB4d2F8B0220d358d0d9C4896DC84959',
-  [Network.Rinkeby]: '0xeF5F5491EF04Df94638162Cb8f7CBAd64760e797',
   [Network.Goerli]: '0x775e23b64610dA2806dc5ed3b0862955e122DDc6',
 };
 
 export const NFTX_UNSTAKING_INVENTORY_ZAP = {
   [Network.Mainnet]: '0x51d660Ba5c218b2Cf33FBAcA5e3aBb8aEff3543B',
   [Network.Arbitrum]: '0x009e4110Fd68c603DD1F9189C4BaC3D12Cde8c70',
-  [Network.Rinkeby]: '0x608F0D84657BB876DDEDD8d8d5aB9D12639d5798',
   [Network.Goerli]: '0x8B9D81fF1845375379865c0997bcFf538513Eae1',
 };
 
 export const NFTX_MARKETPLACE_ZAP = {
   [Network.Mainnet]: '0x0fc584529a2AEfA997697FAfAcbA5831faC0c22d',
   [Network.Arbitrum]: '0x66f26E38bD50FD52A50da8E87E435f04f98001B7',
-  [Network.Rinkeby]: '0xF83d27657a6474cB2Ae09a5b39177BBB80E63d81',
   [Network.Goerli]: '0x528bDBe1DB8452bD4643F85695eE0628D900C195',
 };
 
 export const NFTX_MARKETPLACE_0X_ZAP = {
   [Network.Mainnet]: '0x941A6d105802CCCaa06DE58a13a6F49ebDCD481C',
+  [Network.Arbitrum]: '0x3BD7512966CbC3406962f8877edbE80aea8A2904',
   [Network.Goerli]: '0x177246Adb119ed83f982d1e3c4859F354578D5eF',
 };
 
 export const NFTX_VAULT_FACTORY = {
   [Network.Mainnet]: '0xBE86f647b167567525cCAAfcd6f881F1Ee558216',
   [Network.Arbitrum]: '0xE77b89FEc41A7b7dC74eb33602e82F0672FbB33C',
-  [Network.Rinkeby]: '0xbbc53022Af15Bb973AD906577c84784c47C14371',
   [Network.Goerli]: '0x1478bEB5D18B23d2bA90FcEe91d66460AC585e6b',
 };
 
 export const SUSHISWAP_ROUTER = {
   [Network.Mainnet]: '0xd9e1cE17f2641f24aE83637ab66a2cca9C378B9F',
   [Network.Arbitrum]: '0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506',
-  [Network.Rinkeby]: '0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506',
   [Network.Goerli]: '0x1b02dA8Cb0d097eB8D57A175b88c7D8b47997506',
 };
 
 export const UNISWAP_QUOTER = {
   [Network.Mainnet]: '0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6',
-  [Network.Rinkeby]: '0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6',
   [Network.Goerli]: '0xb27308f9f90d607463bb33ea1bebb41c27ce5ab6',
 };
 
 /** ENS Address */
 export const ENS_REGISTRAR = {
   [Network.Mainnet]: '0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85',
   [Network.Arbitrum]: '0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85',
-  [Network.Rinkeby]: '0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85',
   [Network.Goerli]: '0x57f1887a8BF19b14fC0dF6Fd9B2acc9Af147eA85',
 };
diff --git a/packages/constants/src/subgraph.ts b/packages/constants/src/subgraph.ts
@@ -31,7 +31,6 @@ const GATEWAY_CACHE_PROXY_ROOT = `${CACHE_PROXY_HOST}/${GATEWAY_PROXY_NAME}/${GA
 
 export const NON_STANDARD_SUBGRAPH = {
   [Network.Mainnet]: `${SHARED_PROXY_ROOT}/0xorg/non-standard-nfts`,
-  [Network.Rinkeby]: `${SHARED_PROXY_ROOT}/0xorg/non-standard-nfts-rinkeby`,
 };
 
 export const ERC721_SUBGRAPH = {
@@ -50,14 +49,12 @@ export const ERC721_SUBGRAPH = {
     `${SHARED_ROOT}/amxx/eip721-subgraph`,
   ],
   [Network.Arbitrum]: `${SHARED_PROXY_ROOT}/quantumlyy/eip721-subgraph-arbitrum`,
-  [Network.Rinkeby]: `${SHARED_PROXY_ROOT}/0xorg/eip721-subgraph-rinkeby`,
   [Network.Goerli]: `${SHARED_PROXY_ROOT}/nftx-project/eip721-goerli`,
 };
 
 export const ERC1155_SUBGRAPH = {
   [Network.Mainnet]: `${GATEWAY_PROXY_ROOT}/GCQVLurkeZrdMf4t5v5NyeWJY8pHhfE9sinjFMjLYd9C`,
   [Network.Arbitrum]: `${SHARED_PROXY_ROOT}/quantumlyy/eip1155-subgraph-arbitrum`,
-  [Network.Rinkeby]: `${SHARED_PROXY_ROOT}/0xorg/eip1155-subgraph-rinkeby`,
   [Network.Goerli]: `${SHARED_PROXY_ROOT}/odyssy-automaton/erc1155-goerli-subgraph`,
 };
 
@@ -71,7 +68,6 @@ export const SUSHI_SUBGRAPH = {
     `${SHARED_ROOT}/sushiswap/exchange`,
   ],
   [Network.Arbitrum]: `${SHARED_PROXY_ROOT}/sushiswap/arbitrum-exchange`,
-  [Network.Rinkeby]: `${SHARED_PROXY_ROOT}/bilalmir135/sushi-swap-exchange`,
   [Network.Goerli]: `${SHARED_PROXY_ROOT}/sushiswap/exchange-goerli`,
 };
 
@@ -80,8 +76,8 @@ export const NFTX_SUBGRAPH_MAINNET_URLS = {
   GATEWAY: `${GATEWAY_ROOT}/4gZf3atMXjYDh4g48Zr83NFX3rkvZED86VqMNhgEXgLc`,
   INDEXER_PROXY: `${INDEXER_PROXY_ROOT}/QmXa6ChLJzAVu1imQ5YCMTzgPGVCCRdhVgVKWpkXEyKtGQ`,
   INDEXER: `${INDEXER_ROOT}/QmXa6ChLJzAVu1imQ5YCMTzgPGVCCRdhVgVKWpkXEyKtGQ`,
-  SHARED_PROXY: `${SHARED_PROXY_ROOT}/nftx-project/nftx-v2`,
-  SHARED: `${SHARED_ROOT}/nftx-project/nftx-v2`,
+  SHARED_PROXY: `${SHARED_PROXY_ROOT}/nftx-project/nftx-v2-1-mainnet`,
+  SHARED: `${SHARED_ROOT}/nftx-project/nftx-v2-1-mainnet`,
 };
 export const NFTX_SUBGRAPH = {
   [Network.Mainnet]: [
@@ -99,7 +95,6 @@ export const NFTX_SUBGRAPH = {
     NFTX_SUBGRAPH_MAINNET_URLS.SHARED,
   ],
   [Network.Arbitrum]: `${SHARED_ROOT}/nftx-project/nftx-v2-arbitrum`,
-  [Network.Rinkeby]: `${SHARED_ROOT}/nftx-project/nftx-v2-rinkeby`,
   [Network.Goerli]: `${SHARED_ROOT}/nftx-project/nftx-v2-1-goerli`,
 };
 
@@ -119,7 +114,6 @@ export const NFTX_TOKEN_BALANCE_SUBGRAPH = {
     `${SHARED_ROOT}/nftx-project/nftx-vault-tokens-holdings`,
   ],
   [Network.Arbitrum]: `${SHARED_PROXY_ROOT}/nftx-project/nftx-vault-token-holdings-arbitrum?nocache`,
-  [Network.Rinkeby]: `${SHARED_PROXY_ROOT}/quantumlyy/nftx-holdings-subgraph-rinkeby`,
   [Network.Goerli]: `${SHARED_PROXY_ROOT}/nftx-project/nftx-v2-1-token-holdings-goerl?nocache`,
 };
 

diff --git a/packages/core/src/vaults/fetchVaultActivity/mints.ts b/packages/core/src/vaults/fetchVaultActivity/mints.ts
@@ -118,7 +118,7 @@ export const processMints = async (
         vaultAddress: mint.vault.id,
         date: Number(mint.date),
         tokenId: nftId,
-        txId: mint.id,
+        txId: mint.id.split('-')[1] ?? mint.id,
         amount: Number(mint.amounts[i]),
         ethAmount: BigNumber.from(mint?.zapAction?.ethAmount ?? 0),
         feeAmount: receipt.amount.div(mint.nftIds.length),

diff --git a/packages/core/src/vaults/fetchVaultActivity/redeems.ts b/packages/core/src/vaults/fetchVaultActivity/redeems.ts
@@ -99,7 +99,7 @@ export const processRedeems = async (
         vaultId: redeem.vault.vaultId,
         vaultAddress: redeem.vault.id,
         date: Number(redeem.date),
-        txId: redeem.id,
+        txId: redeem.id.split('-')[1] ?? redeem.id,
         random: !target,
         type: isRedeemOrUnstake(redeem, receipt),
         amount: 1,

diff --git a/packages/core/src/vaults/fetchVaultActivity/swaps.ts b/packages/core/src/vaults/fetchVaultActivity/swaps.ts
@@ -91,7 +91,7 @@ export const processSwaps = async (
         date: Number(swap.date),
         tokenId: nftId,
         swapTokenId: swap.mintedIds[i],
-        txId: swap.id,
+        txId: swap.id.split('-')[1] ?? swap.id,
         amount: 1,
         ethAmount: BigNumber.from(swap?.zapAction?.ethAmount ?? 0),
         feeAmount: receipt.amount.div(swap.redeemedIds.length),