Merge pull request #1328 from hypercerts-org/feat/marketplace_sepolia

feat(marketplace): sepolia release prep sdk v2 alpha
hypercerts-org · Jun 11, 2024 · 762507f · 762507f
2 parents f6a3c81 + 065593d
commit 762507f
Show file tree

Hide file tree

Showing 70 changed files with 23,218 additions and 18,422 deletions.
diff --git a/.github/workflows/ci-default.yml b/.github/workflows/ci-default.yml
@@ -7,16 +7,14 @@ env:
   NEXT_PUBLIC_DEFAULT_CHAIN_ID: ${{ vars.NEXT_PUBLIC_DEFAULT_CHAIN_ID }}
   NEXT_PUBLIC_CONTRACT_ADDRESS: ${{ vars.NEXT_PUBLIC_CONTRACT_ADDRESS }}
   NEXT_PUBLIC_GRAPH_URL: ${{ vars.NEXT_PUBLIC_GRAPH_URL }}
-  NFT_STORAGE_TOKEN: ${{ secrets.NEXT_PUBLIC_NFT_STORAGE_TOKEN }}
-  WEB3_STORAGE_TOKEN: ${{ secrets.NEXT_PUBLIC_NFT_STORAGE_TOKEN }}
   NEXT_PUBLIC_NFT_STORAGE_TOKEN: ${{ secrets.NEXT_PUBLIC_NFT_STORAGE_TOKEN }}
   NEXT_PUBLIC_WEB3_STORAGE_TOKEN: ${{ secrets.NEXT_PUBLIC_NFT_STORAGE_TOKEN }}
   NEXT_PUBLIC_SUPABASE_URL: ${{ vars.NEXT_PUBLIC_SUPABASE_URL }}
   NEXT_PUBLIC_SUPABASE_ANON_KEY: ${{ secrets.NEXT_PUBLIC_SUPABASE_ANON_KEY }}
   NEXT_PUBLIC_SUPABASE_TABLE: ${{ vars.NEXT_PUBLIC_SUPABASE_TABLE }}
   NEXT_PUBLIC_WALLETCONNECT_ID: ${{ secrets.NEXT_PUBLIC_WALLETCONNECT_ID }}
-  INFURA_API_KEY: ${{ vars.INFURA_API_KEY }}
-  ALCHEMY_API_KEY: ${{ vars.ALCHEMY_API_KEY }}
+  INFURA_API_KEY: ${{ secrets.INFURA_API_KEY }}
+  ALCHEMY_API_KEY: ${{ secrets.ALCHEMY_API_KEY }}
   DOCKER_PLATFORM: "amd64"
 
 # Trigger the workflow when:
@@ -39,32 +37,30 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           # Check out pull request's HEAD commit instead of the merge commit to
           # prevent gitlint from failing due to too long commit message titles,
           # e.g. "Merge 3e621938d65caaa67f8e35d145335d889d470fc8 into 19a39b2f66cd7a165082d1486b2f1eb36ec2354a".
           ref: ${{ github.event.pull_request.head.sha }}
           # Fetch all history so gitlint can check the relevant commits.
           fetch-depth: "0"
+      - run: corepack enable
       - name: Set up Python 3
         uses: actions/setup-python@v4
         with:
           python-version: "3.x"
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8.9.0
       - name: Set up Node.js 18
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18.15.0"
+          node-version: "18.18.1"
           cache: "pnpm"
+
       - name: Install Foundry
         uses: foundry-rs/foundry-toolchain@v1
       - name: Install
         run: |
-          pnpm install --frozen-lockfile
+          pnpm install
         # Always run this step so that all linting errors can be seen at once.
         if: always()
       - name: Build

diff --git a/.github/workflows/deploy-cors-proxy.yml b/.github/workflows/deploy-cors-proxy.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Publish

diff --git a/.github/workflows/deploy-defender.yml b/.github/workflows/deploy-defender.yml
diff --git a/.github/workflows/deploy-graph.yml b/.github/workflows/deploy-graph.yml
@@ -5,13 +5,6 @@ env:
 
 # Trigger the workflow when:
 on:
-  # A push occurs to one of the matched branches.
-  push:
-    branches:
-      - main
-      - develop
-    paths:
-      - graph/**
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
@@ -23,18 +16,18 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 1
       - name: Setup pnpm
-        uses: pnpm/action-setup@v2
+        uses: pnpm/action-setup@v4
         with:
-          version: 8.9.0
-      - name: Set up Node.js 18
-        uses: actions/setup-node@v3
+          version: 9.1.1
+      - name: Set up Node.js 18.18.1
+        uses: actions/setup-node@v4
         with:
+          node-version: "18.18.1"
           cache: "pnpm"
-          node-version: "18.x"
       - name: Install
         run: pnpm install --frozen-lockfile
       - name: Build the subgraph

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-yarn format:staged
+pnpm format:staged
diff --git a/contracts/.husky/commit-msg b/contracts/.husky/commit-msg
@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn dlx commitlint --edit $1
+pnpm dlx commitlint --edit $1
diff --git a/contracts/.husky/pre-commit b/contracts/.husky/pre-commit
@@ -1,6 +1,6 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn dlx lint-staged
+pnpm dlx lint-staged
 forge snapshot 
-yarn docs
+pnpm docs
diff --git a/contracts/foundry.toml b/contracts/foundry.toml
@@ -35,7 +35,7 @@ sepolia = { key = "${ETHERSCAN_API_KEY}" }
 celo = { key = "${CELOSCAN_API_KEY}" }
 
 [rpc_endpoints]
-mainnet = "https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
+mainnet = "https://eth-pokt.nodies.app"
 goerli = "https://eth-goerli.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 optimism = "https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_API_KEY}"
 sepolia = "https://sepolia.infura.io/v3/${INFURA_API_KEY}"

diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
@@ -192,9 +192,6 @@ const config: HardhatUserConfig = {
         path: "m/44'/60'/0'/0",
       },
       chainId: chainIds.hardhat,
-      forking: {
-        url: `https://eth-sepolia.g.alchemy.com/v2/${ALCHEMY_API_KEY}`,
-      },
     },
     localhost: {
       accounts: {

diff --git a/contracts/package.json b/contracts/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@hypercerts-org/contracts",
   "description": "EVM compatible protocol for managing impact claims",
-  "version": "1.1.2",
+  "version": "2.0.0-alpha.0",
   "author": {
     "name": "Hypercerts Foundation",
     "url": "https://github.com/hypercerts-org/hypercerts"
@@ -32,24 +32,22 @@
     "@chainlink/contracts": "^0.8.0",
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@dlsl/hardhat-markup": "^1.0.0-rc.7",
     "@looksrare/contracts-libs": "^3.4.0",
-    "@nomicfoundation/hardhat-chai-matchers": "^2.0.2",
-    "@nomicfoundation/hardhat-ethers": "^3.0.4",
-    "@nomicfoundation/hardhat-toolbox": "^3.0.0",
-    "@nomicfoundation/hardhat-viem": "^1.0.0",
+    "@nomicfoundation/hardhat-chai-matchers": "^2.0.7",
+    "@nomicfoundation/hardhat-ethers": "^3.0.6",
+    "@nomicfoundation/hardhat-toolbox": "^5.0.0",
+    "@nomicfoundation/hardhat-viem": "^2.0.2",
     "@openzeppelin/contracts": "^4.9.3",
-    "@openzeppelin/defender-sdk": "^1.4.0",
-    "@openzeppelin/hardhat-upgrades": "2.3.3",
+    "@openzeppelin/defender-sdk": "^1.13.3",
+    "@openzeppelin/hardhat-upgrades": "3.1.1",
     "@primitivefi/hardhat-dodoc": "^0.2.3",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
-    "@tenderly/hardhat-tenderly": "^2.1.0",
     "@trivago/prettier-plugin-sort-imports": "^3.3.0",
-    "@types/node": "^18.11.11",
-    "@typescript-eslint/eslint-plugin": "^5.38.0",
-    "@typescript-eslint/parser": "^5.38.0",
+    "@types/node": "^18.18.1",
+    "@typescript-eslint/eslint-plugin": "^7.12.0",
+    "@typescript-eslint/parser": "^7.12.0",
     "commitizen": "^4.2.5",
     "cross-env": "^7.0.3",
     "cz-conventional-changelog": "^3.3.0",

diff --git a/contracts/src/deployments/deployment-marketplace-sepolia.json b/contracts/src/deployments/deployment-marketplace-sepolia.json
@@ -1,91 +1,56 @@
 {
   "TransferManager": {
-    "address": "0x95d0D2986Ea7acC6c8D56880e6155c950E9B62F9",
+    "address": "0xB4e5fFb878eA75F3Ac65fEe4C3f5552c6D30Aab9",
     "fullNamespace": "TransferManager",
-    "args": ["0xdf2c3dace6f31e650fd03b8ff72bee82cb1c199a"],
-    "encodedArgs": "0xdf2c3dace6f31e650fd03b8ff72bee82cb1c199a",
-    "tx": "0x978640bf72b6f75237f131bb848cb485b1f693454891bef215839c3fcda67d2a"
+    "args": ["0xdc6d6f9ab5fcc398b92b017e8482749ae5afbf35"],
+    "encodedArgs": "0xdc6d6f9ab5fcc398b92b017e8482749ae5afbf35",
+    "tx": "0xa3d8c9e665950a006b6cb700cf09bd18a779a6359d4d0f7ffcd88f79355dbf64"
   },
   "ProtocolFeeRecipient": {
-    "address": "0x0e7b2baA3B5bCB9d851A41Bd8C9f277F92e3da5c",
+    "address": "0xB47BCab2f33c4d7805CB999888E77dD62e2600Da",
     "fullNamespace": "ProtocolFeeRecipient",
-    "args": ["0xdf2c3dace6f31e650fd03b8ff72bee82cb1c199a", "0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"],
-    "encodedArgs": "0xdf2c3dace6f31e650fd03b8ff72bee82cb1c199a7b79995e5f793a07bc00c21412e50ecae098e7f9",
-    "tx": "0x0e3c124a69a49e1bfeff119a02c5336b40cef6c7b91b2cf9ae17443b1611d0f7"
+    "args": ["0x4f37308832c6eFE5A74737955cBa96257d76De17", "0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"],
+    "encodedArgs": "0x4f37308832c6efe5a74737955cba96257d76de177b79995e5f793a07bc00c21412e50ecae098e7f9",
+    "tx": "0x9db81e96b874266392aac8cdd16451770dae7cd0ce00bef72cfe98a44d5ab6b8"
   },
   "HypercertExchange": {
-    "address": "0x4DDe28116255775E6097Aa4edD288355eb74fcf6",
+    "address": "0x9819bbb6980AaA586A8e80dB963a766C6D5711c4",
     "fullNamespace": "LooksRareProtocol",
     "args": [
-      "0xdf2c3dace6f31e650fd03b8ff72bee82cb1c199a",
-      "0x0e7b2baA3B5bCB9d851A41Bd8C9f277F92e3da5c",
-      "0x95d0D2986Ea7acC6c8D56880e6155c950E9B62F9",
+      "0xdc6d6f9ab5fcc398b92b017e8482749ae5afbf35",
+      "0xB47BCab2f33c4d7805CB999888E77dD62e2600Da",
+      "0xB4e5fFb878eA75F3Ac65fEe4C3f5552c6D30Aab9",
       "0x7b79995e5f793A07Bc00c21412e50Ecae098E7f9"
     ],
-    "encodedArgs": "0xdf2c3dace6f31e650fd03b8ff72bee82cb1c199a0e7b2baa3b5bcb9d851a41bd8c9f277f92e3da5c95d0d2986ea7acc6c8d56880e6155c950e9b62f97b79995e5f793a07bc00c21412e50ecae098e7f9",
-    "tx": "0x38b1edc3e6272530ea3e6f80b490225f3fa2eb317c6d3d5b3daac6f272aa06fc"
+    "encodedArgs": "0xdc6d6f9ab5fcc398b92b017e8482749ae5afbf35b47bcab2f33c4d7805cb999888e77dd62e2600dab4e5ffb878ea75f3ac65fee4c3f5552c6d30aab97b79995e5f793a07bc00c21412e50ecae098e7f9",
+    "tx": "0xb0d3b673d67b0878765957762f6b564b3686cbc18265589b19c09ab52ccf5115"
   },
   "RoyaltyFeeRegistry": {
-    "address": "0x81d3fba12f3D1f5A2cC6566b278AdAF8FEEb14e4",
+    "address": "0x08FDa86868E1F058416f63e09a174467F9cC5e08",
     "fullNamespace": "RoyaltyFeeRegistry",
     "args": ["1000"],
     "encodedArgs": "0x00000000000000000000000000000000000000000000000000000000000003e8",
-    "tx": "0x02357415077edb5adf9294d7b998eb37920847b42f1ff08d2d987aaa852b97ea"
+    "tx": "0x93b263e56a7a274e57ef3e6377630643617410bef42f0ba86606664423b64145"
   },
   "OrderValidator": {
-    "address": "0xde42d94e6c5f07731f5e53104e7bc809ff8bc483",
+    "address": "0x1d68a6cc45e57d75b06b6f52dfc2a18d4e0452c4",
     "fullNamespace": "OrderValidatorV2A",
-    "args": ["0x4DDe28116255775E6097Aa4edD288355eb74fcf6"],
-    "encodedArgs": "0x4dde28116255775e6097aa4edd288355eb74fcf6",
-    "tx": "0xbc6ad72a7f61f0b3ae6cb70cd603621b380810171bf3658e266f60f30db3f848"
+    "args": ["0x9819bbb6980AaA586A8e80dB963a766C6D5711c4"],
+    "encodedArgs": "0x9819bbb6980aaa586a8e80db963a766c6d5711c4",
+    "tx": "0x4971c131fb1d9c6118c0f46319c13da652b93e94a4eb9f8c45c85ca6ddb625ce"
   },
   "CreatorFeeManager": {
-    "address": "0x6cca0accb70bb48244feb69da05a8f5269234330",
+    "address": "0x9831c17f5abcfe4c0fdc2f94cdd3ad716f5ba9dd",
     "fullNamespace": "CreatorFeeManagerWithRoyalties",
-    "args": ["0x81d3fba12f3D1f5A2cC6566b278AdAF8FEEb14e4"],
-    "encodedArgs": "0x81d3fba12f3d1f5a2cc6566b278adaf8feeb14e4",
-    "tx": "0xc53a46e1d99e0be9e226da8c3ed232e997160cf0655f8612412044ea3f398a36"
-  },
-  "StrategyCollectionOffer": {
-    "address": "0xa9c539f94212794c3a81d18a54658775b35a8061",
-    "fullNamespace": "StrategyCollectionOffer",
-    "args": [],
-    "encodedArgs": "0x",
-    "tx": "0xaa325bfb22b43e9a4ebe80c4890a5d58b7ed068510328db8f89c69d645d7af7f"
-  },
-  "StrategyDutchAuction": {
-    "address": "0xa4d163baaa46f232538dff90dfb87042caa1a29b",
-    "fullNamespace": "StrategyDutchAuction",
-    "args": [],
-    "encodedArgs": "0x",
-    "tx": "0x95588a5bde437366e2447fb6a734a0f5dd6d362db1f2b7729b5a821051f1019f"
-  },
-  "StrategyItemIdsRange": {
-    "address": "0x04d7ac3a3671a81aed467db9257f45e9c03efa0d",
-    "fullNamespace": "StrategyItemIdsRange",
-    "args": [],
-    "encodedArgs": "0x",
-    "tx": "0xf880c4c3820b8593d7faf5513812d549f4d7819bca379a87258e1985eed4a08f"
-  },
-  "StrategyHypercertCollectionOffer": {
-    "address": "0x62b911d000a2bfe303668dbaa7fc509f1bb9509f",
-    "fullNamespace": "StrategyHypercertCollectionOffer",
-    "args": [],
-    "encodedArgs": "0x",
-    "tx": "0xf6c824975a0785f02da2ce835f016fbd9581635fb601f0c350244dae3d69e647"
-  },
-  "StrategyHypercertDutchAuction": {
-    "address": "0xe1bf35ba5ff0a0cc022f85c8b07c01dc6db01900",
-    "fullNamespace": "StrategyHypercertDutchAuction",
-    "args": [],
-    "encodedArgs": "0x",
-    "tx": "0x7edfcd705c10bb829c147296916be36a2ea44f113c9a923f7dcad9d7bd687fb1"
+    "args": ["0x08FDa86868E1F058416f63e09a174467F9cC5e08"],
+    "encodedArgs": "0x08fda86868e1f058416f63e09a174467f9cc5e08",
+    "tx": "0xbf450e5a0f8a8461db6df9da6f6026aaf0aac7df370cfcb904ef692f76768d5c"
   },
   "StrategyHypercertFractionOffer": {
-    "address": "0x39c3a18bea1d49e4d73a352db0fcf974c23beada",
+    "address": "0x08401da461ee03b82d86e52499fd2eddce603b81",
     "fullNamespace": "StrategyHypercertFractionOffer",
     "args": [],
     "encodedArgs": "0x",
-    "tx": "0xfb83fdebb640e18b1b7558859f61c6cf27505295436509b83850937958ab66fe"
+    "tx": "0x0c0228b8328ef55df5e402e8d604ce72c6190be8c36110a6d259e2937ca85092"
   }
 }
diff --git a/contracts/src/deployments/index.ts b/contracts/src/deployments/index.ts
@@ -7,11 +7,6 @@ const deployments_marketplace = {
     HypercertExchange: deployments_marketplace_sepolia.HypercertExchange.address,
     OrderValidatorV2A: deployments_marketplace_sepolia.OrderValidator.address,
     RoyaltyFeeRegistry: deployments_marketplace_sepolia.RoyaltyFeeRegistry.address,
-    StrategyCollectionOffer: deployments_marketplace_sepolia.StrategyCollectionOffer.address,
-    StrategyDutchAuction: deployments_marketplace_sepolia.StrategyDutchAuction.address,
-    StrategyItemIdsRange: deployments_marketplace_sepolia.StrategyItemIdsRange.address,
-    StrategyHypercertCollectionOffer: deployments_marketplace_sepolia.StrategyHypercertCollectionOffer.address,
-    StrategyHypercertDutchAuction: deployments_marketplace_sepolia.StrategyHypercertDutchAuction.address,
     StrategyHypercertFractionOffer: deployments_marketplace_sepolia.StrategyHypercertFractionOffer.address,
   },
 };