Merge branch 'beta'

Kredeum · Oct 26, 2024 · 48a0956 · 48a0956
2 parents 5c8ad66 + be27b9b
commit 48a0956
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 94 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -20,7 +20,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/[email protected]
         with:
-          version: 8.5.1
+          version: 9.4.0
 
       - name: Install all packages
         run: pnpm install-all
@@ -33,8 +33,5 @@ jobs:
           DEPLOYER_PRIVATE_KEY: KEY
           INFURA_API_KEY: KEY
           ALCHEMY_API_KEY: KEY
-          ALCHEMY_API_KEY_POLYGON: KEY
-          ALCHEMY_API_KEY_ARBITRUM: KEY
-          ALCHEMY_API_KEY_OPTIMISM: KEY
           COVALENT_API_KEY: KEY
           NFT_STORAGE_KEY: KEY
diff --git a/.github/workflows/deploy-dapp.yml b/.github/workflows/deploy-dapp.yml
@@ -21,18 +21,15 @@ jobs:
       - name: Install pnpm
         uses: pnpm/[email protected]
         with:
-          version: 8.5.1
-          
+          version: 9.4.0
+
       - name: Build dapp
         run: pnpm build-dapp
         env:
           ENVIR: PROD
           NODE_DEBUG: false
           INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
           ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
-          ALCHEMY_API_KEY_POLYGON: ${{ secrets.ALCHEMY_API_KEY_POLYGON }}
-          ALCHEMY_API_KEY_ARBITRUM: ${{ secrets.ALCHEMY_API_KEY_ARBITRUM }}
-          ALCHEMY_API_KEY_OPTIMISM: ${{ secrets.ALCHEMY_API_KEY_OPTIMISM }}
           COVALENT_API_KEY: ${{ secrets.COVALENT_API_KEY }}
           NFT_STORAGE_KEY: ${{ secrets.NFT_STORAGE_KEY }}
 

diff --git a/.github/workflows/deploy-wp-plugin.yml b/.github/workflows/deploy-wp-plugin.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Install pnpm
         uses: pnpm/action-setup@v4
         with:
-          version: 8.15.7
+          version: 9.4.0
 
       - name: Build wp plugin
         run: pnpm deploy:plugin
@@ -36,10 +36,6 @@ jobs:
           GIT_BRANCH: main
           INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
           ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
-          ALCHEMY_API_KEY_POLYGON: ${{ secrets.ALCHEMY_API_KEY_POLYGON }}
-          ALCHEMY_API_KEY_ARBITRUM: ${{ secrets.ALCHEMY_API_KEY_ARBITRUM }}
-          ALCHEMY_API_KEY_OPTIMISM: ${{ secrets.ALCHEMY_API_KEY_OPTIMISM }}
-          ALCHEMY_API_KEY_BASE: ${{ secrets.ALCHEMY_API_KEY_BASE }}
           ANKR_API_KEY: ${{ secrets.ANKR_API_KEY }}
           COVALENT_API_KEY: ${{ secrets.COVALENT_API_KEY }}
           NFT_STORAGE_KEY: ${{ secrets.NFT_STORAGE_KEY }}

diff --git a/common/scripts/alchemy.http b/common/scripts/alchemy.http
@@ -1,6 +1,6 @@
 @method = gasPrice
 @urlEth = https://eth-mainnet.alchemyapi.io/v2/{{$dotenv ALCHEMY_API_KEY}}
-@urlPol = https://polygon-mainnet.g.alchemy.com/v2/{{$dotenv ALCHEMY_API_KEY_POLYGON}}
+@urlPol = https://polygon-mainnet.g.alchemy.com/v2/{{$dotenv ALCHEMY_API_KEY}}
 @address = 0x981ab0D817710d8FFFC5693383C00D985A3BDa38
 
 ### getNFTs on mainnet from address without metadata
@@ -15,11 +15,11 @@ GET {{urlEth}}/getContractMetadata?contractAddress=0xd07dc4262BCDbf85190C01c996b
 ### getContractMetadata on mainnet collection metadata erc721
 GET {{urlEth}}/getContractMetadata?contractAddress=0xa406489360A47Af2C74fc1004316A64e469646A5
 
-### getContractMetadata on polygon collection metadata 
+### getContractMetadata on polygon collection metadata
 GET {{urlPol}}/getContractMetadata?contractAddress=0x875123bc716829Bb83a3eA2Db3AbD8BB8DCc3519
 
 
-### getContractMetadata on polygon collection metadata 
+### getContractMetadata on polygon collection metadata
 GET {{urlPol}}/getContractMetadata?contractAddress=0x76c52b2c4b2D2666663cE3318a5f35f912bd25C3
 
 
@@ -34,4 +34,4 @@ GET {{urlPol}}/getNFTs?owner={{address}}
 https://eth-mainnet.alchemyapi.io/v2/{{$dotenv ALCHEMY_API_KEY}}/getNFTs?owner=0x981ab0D817710d8FFFC5693383C00D985A3BDa38&withMetadata=false
 
 ### getNFTs
-https://polygon-mainnet.g.alchemy.com/v2/{{$dotenv ALCHEMY_API_KEY_POLYGON}}/getNFTs?owner=0x981ab0D817710d8FFFC5693383C00D985A3BDa38&withMetadata=false
+https://polygon-mainnet.g.alchemy.com/v2/{{$dotenv ALCHEMY_API_KEY}}/getNFTs?owner=0x981ab0D817710d8FFFC5693383C00D985A3BDa38&withMetadata=false
diff --git a/config/src/config.handlebars.json b/config/src/config.handlebars.json
@@ -1,7 +1,7 @@
 {
   "version": {
-    "latest": "1.6.7",
-    "stable": "1.6.6",
+    "latest": "1.6.9",
+    "stable": "1.6.9",
     "branch": "{{GIT_BRANCH}}",
     "commit": "{{GIT_COMMIT}}"
   },

diff --git a/config/src/mainnets.handlebars.json b/config/src/mainnets.handlebars.json
@@ -34,7 +34,7 @@
     "chainName": "arbitrum",
     "rpcUrls": [
       "https://rpc.ankr.com/arbitrum/{{ANKR_API_KEY}}",
-      "https://arb-mainnet.g.alchemy.com/v2/{{ALCHEMY_API_KEY_ARBITRUM}}",
+      "https://arb-mainnet.g.alchemy.com/v2/{{ALCHEMY_API_KEY}}",
       "https://arbitrum-mainnet.infura.io/v3/{{INFURA_API_KEY}}"
     ],
     "nativeCurrency": {
@@ -46,9 +46,9 @@
       "https://arbiscan.io",
       "https://explorer.arbitrum.io"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_ARBITRUM}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "alchemy": {
-      "url": "https://arb-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY_ARBITRUM}}",
+      "url": "https://arb-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY}}",
       "active": true
     },
     "create": true,
@@ -77,7 +77,7 @@
     "chainName": "optimism",
     "rpcUrls": [
       "https://rpc.ankr.com/optimism/{{ANKR_API_KEY}}",
-      "https://opt-mainnet.g.alchemy.com/v2/{{ALCHEMY_API_KEY_OPTIMISM}}",
+      "https://opt-mainnet.g.alchemy.com/v2/{{ALCHEMY_API_KEY}}",
       "https://optimism-mainnet.infura.io/v3/{{INFURA_API_KEY}}",
       "https://mainnet.optimism.io"
     ],
@@ -89,9 +89,9 @@
     "blockExplorerUrls": [
       "https://optimistic.etherscan.io"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_OPTIMISM}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "alchemy": {
-      "url": "https://opt-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY_OPTIMISM}}",
+      "url": "https://opt-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY}}",
       "active": true
     },
     "opstack": true,
@@ -114,7 +114,7 @@
       "https://scrollscan.com/",
       "https://blockscout.scroll.io"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_SCROLL}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "linkedLayer1": 1,
     "active": true,
     "create": true
@@ -124,7 +124,7 @@
     "chainName": "base",
     "rpcUrls": [
       "https://rpc.ankr.com/base/{{ANKR_API_KEY}}",
-      "https://base-mainnet.g.alchemy.com/v2/{{ALCHEMY_API_KEY_BASE}}",
+      "https://base-mainnet.g.alchemy.com/v2/{{ALCHEMY_API_KEY}}",
       "https://mainnet.base.org/",
       "https://developer-access-mainnet.base.org/"
     ],
@@ -138,11 +138,11 @@
       "https://base.blockscout.com"
     ],
     "alchemy": {
-      "url": "https://base-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY_BASE}}",
+      "url": "https://base-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY}}",
       "active": false
     },
     "opstack": true,
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_BASE}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "linkedLayer1": 1
   },
@@ -203,7 +203,7 @@
       "https://blastscan.io"
     ],
     "opstack": true,
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_BLAST}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "active": true,
     "linkedLayer1": 1
@@ -224,7 +224,7 @@
     "blockExplorerUrls": [
       "https://zkevm.polygonscan.com/"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_POLYGON_ZKEVM}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "linkedLayer1": 1
   },
@@ -244,7 +244,7 @@
       "https://lineascan.build",
       "https://explorer.linea.build"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_LINEA}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "linkedLayer1": 1,
     "active": true,
     "create": true
@@ -285,7 +285,7 @@
     ],
     "linkedLayer1": 1,
     "active": true,
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_TAIKO}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "covalent": {
       "active": true
     },
@@ -315,7 +315,7 @@
     "chainName": "polygon",
     "rpcUrls": [
       "https://rpc.ankr.com/polygon/{{ANKR_API_KEY}}",
-      "https://polygon-mainnet.g.alchemy.com/v2/{{ALCHEMY_API_KEY_POLYGON}}",
+      "https://polygon-mainnet.g.alchemy.com/v2/{{ALCHEMY_API_KEY}}",
       "https://polygon-mainnet.infura.io/v3/{{INFURA_API_KEY}}",
       "https://polygon-rpc.com/"
     ],
@@ -328,14 +328,14 @@
       "https://polygonscan.com",
       "https://polygon-explorer-mainnet.chainstacklabs.com"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_POLYGON}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "subgraph": {
       "url": "https://api.thegraph.com/subgraphs/name/tranchien2002/eip721-matic",
       "startBlock": 16875648,
       "active": false
     },
     "alchemy": {
-      "url": "https://polygon-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY_POLYGON}}",
+      "url": "https://polygon-mainnet.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY}}",
       "active": true
     },
     "openSea": "https://opensea.io/assets/matic",
@@ -360,7 +360,7 @@
       "https://gnosisscan.io/",
       "https://blockscout.com/xdai/mainnet"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_GNOSIS}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true
   },
   {
@@ -380,7 +380,7 @@
       "https://snowtrace.io",
       "https://cchain.explorer.avax.network"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_AVALANCHE}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true
   },
   {
@@ -419,7 +419,7 @@
     "blockExplorerUrls": [
       "https://ftmscan.com"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_FANTOM}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true
   },
   {
@@ -441,7 +441,7 @@
     "blockExplorerUrls": [
       "https://bscscan.com"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_BINANCE}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true
   },
   {

diff --git a/config/src/testnets.handlebars.json b/config/src/testnets.handlebars.json
@@ -61,7 +61,7 @@
       "https://sepolia.basescan.org",
       "https://base-sepolia.blockscout.com"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_BASE}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "opstack": true,
     "create": true,
     "linkedMainnet": 8453,
@@ -145,7 +145,7 @@
       "active": false
     },
     "alchemy": {
-      "url": "https://eth-goerli.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY_GOERLI}}",
+      "url": "https://eth-goerli.g.alchemy.com/nft/v2/{{ALCHEMY_API_KEY}}",
       "active": false
     },
     "eip1559": true,
@@ -169,7 +169,7 @@
       "https://base-goerli.blockscout.com"
     ],
     "opstack": true,
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_BASE}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "linkedMainnet": 8453,
     "linkedLayer1": 5,
@@ -231,7 +231,7 @@
     "blockExplorerUrls": [
       "https://testnet-zkevm.polygonscan.com"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_POLYGON_ZKEVM}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "linkedMainnet": 1101,
     "linkedLayer1": 11155111,
     "create": true
@@ -251,7 +251,7 @@
       "https://testnet-zkevm.polygonscan.com",
       "https://explorer.public.zkevm-test.net"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_POLYGON_ZKEVM}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "active": false,
     "linkedMainnet": 1101,
     "linkedLayer1": 5,
@@ -349,7 +349,7 @@
     "blockExplorerUrls": [
       "https://amoy.polygonscan.com"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_POLYGON}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "linkedMainnet": 137
   },
@@ -396,7 +396,7 @@
       "active": true
     },
     "active": false,
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_POLYGON}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "linkedMainnet": 137
   },
@@ -437,7 +437,7 @@
       "https://testnet.snowtrace.io",
       "https://cchain.explorer.avax-test.network"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_AVALANCHE}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "linkedMainnet": 43114
   },
@@ -475,7 +475,7 @@
     "blockExplorerUrls": [
       "https://testnet.ftmscan.com"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_FANTOM}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "linkedMainnet": 250
   },
@@ -495,7 +495,7 @@
     "blockExplorerUrls": [
       "https://testnet.bscscan.com/"
     ],
-    "etherscanApiKey": "{{ETHERSCAN_API_KEY_BINANCE}}",
+    "etherscanApiKey": "{{ETHERSCAN_API_KEY}}",
     "create": true,
     "linkedMainnet": 56,
     "nftsFactoryV3": ""

diff --git a/config/turbo.json b/config/turbo.json
@@ -14,26 +14,9 @@
       ],
       "env": [
         "ALCHEMY_API_KEY",
-        "ALCHEMY_API_KEY_ARBITRUM",
-        "ALCHEMY_API_KEY_BASE",
-        "ALCHEMY_API_KEY_OPTIMISM",
-        "ALCHEMY_API_KEY_POLYGON",
         "ANKR_API_KEY",
         "COVALENT_API_KEY",
         "ETHERSCAN_API_KEY",
-        "ETHERSCAN_API_KEY_ARBITRUM",
-        "ETHERSCAN_API_KEY_AVALANCHE",
-        "ETHERSCAN_API_KEY_BASE",
-        "ETHERSCAN_API_KEY_BINANCE",
-        "ETHERSCAN_API_KEY_BLAST",
-        "ETHERSCAN_API_KEY_FANTOM",
-        "ETHERSCAN_API_KEY_GNOSIS",
-        "ETHERSCAN_API_KEY_LINEA",
-        "ETHERSCAN_API_KEY_OPTIMISM",
-        "ETHERSCAN_API_KEY_POLYGON",
-        "ETHERSCAN_API_KEY_POLYGON_ZKEVM",
-        "ETHERSCAN_API_KEY_SCROLL",
-        "ETHERSCAN_API_KEY_TAIKO",
         "INFURA_API_KEY",
         "NFT_STORAGE_KEY",
         "PINATA_API_KEY",