diff --git a/contracts/hardhat.config.cts b/contracts/hardhat.config.cts
index 85859175..2409755c 100644
--- a/contracts/hardhat.config.cts
+++ b/contracts/hardhat.config.cts
@@ -4,6 +4,8 @@ import "@nomicfoundation/hardhat-chai-matchers";
 import "@nomicfoundation/hardhat-ethers";
 import "@nomicfoundation/hardhat-viem";
 import "@openzeppelin/hardhat-upgrades";
+import '@typechain/hardhat'
+import '@nomicfoundation/hardhat-ethers'
 
 import "@primitivefi/hardhat-dodoc";
 import { config as dotenvConfig } from "dotenv";
diff --git a/contracts/package.json b/contracts/package.json
index 956824b4..707e3cff 100644
--- 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": "2.0.0-alpha.0",
+  "version": "2.0.0-alpha.1",
   "author": {
     "name": "Hypercerts Foundation",
     "url": "https://github.com/hypercerts-org/hypercerts"
@@ -13,13 +13,13 @@
     "url": "https://github.com/hypercerts-org/hypercerts",
     "type": "git"
   },
-  "main": "./dist/cjs/index.js",
+  "main": "./dist/cjs/index.cjs",
   "module": "./dist/esm/index.mjs",
   "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "require": "./dist/cjs/index.js",
+      "require": "./dist/cjs/index.cjs",
       "import": "./dist/esm/index.mjs"
     }
   },
@@ -43,6 +43,7 @@
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@trivago/prettier-plugin-sort-imports": "^3.3.0",
+    "@typechain/hardhat": "^9.1.0",
     "@types/node": "^18.18.1",
     "@typescript-eslint/eslint-plugin": "^7.12.0",
     "@typescript-eslint/parser": "^7.12.0",
@@ -62,9 +63,9 @@
     "prettier-plugin-solidity": "^1.1.3",
     "rimraf": "^5.0.5",
     "rollup": "^4.0.2",
+    "rollup-plugin-swc3": "^0.11.2",
     "rollup-plugin-auto-external": "^2.0.0",
-    "rollup-plugin-copy": "^3.5.0",
-    "rollup-plugin-dts": "^6.1.0",
+    "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-esbuild": "^6.1.0",
     "rollup-plugin-node-polyfills": "^0.2.1",
     "shx": "^0.3.4",
@@ -72,7 +73,7 @@
     "solhint-plugin-prettier": "^0.0.5",
     "solmate": "^6.2.0",
     "ts-node": "^10.9.1",
-    "typechain": "^8.3.1",
+    "typechain": "^8.3.2",
     "typescript": "^5.5.3",
     "viem": "^2.17.4",
     "xdeployer": "^2.1.13"
diff --git a/contracts/rollup.config.mjs b/contracts/rollup.config.mjs
index 766096eb..5c3aaa3c 100644
--- a/contracts/rollup.config.mjs
+++ b/contracts/rollup.config.mjs
@@ -1,43 +1,37 @@
-import commonjs from "@rollup/plugin-commonjs";
-import json from "@rollup/plugin-json";
+import dts from "rollup-plugin-dts";
 import { nodeResolve } from "@rollup/plugin-node-resolve";
+import json from "@rollup/plugin-json";
 import autoExternal from "rollup-plugin-auto-external";
-import dts from "rollup-plugin-dts";
-import esbuild from "rollup-plugin-esbuild";
-import nodePolyfills from "rollup-plugin-node-polyfills";
+import swc from "rollup-plugin-swc3";
 
 export default [
   {
-    input: `build/src/index.js`,
+    input: `src/index.ts`,
     plugins: [
       autoExternal(),
-      nodePolyfills(),
       json(),
-      commonjs(),
-      nodeResolve(),
-      esbuild({ tsconfig: "tsconfig.build.json" }),
+      nodeResolve({ jsnext: true, preferBuiltins: false, browser: true }),
+      swc(),
     ],
     output: [
       {
         format: "esm",
         dir: "dist/esm",
-        sourcemap: true,
-        exports: "named",
         entryFileNames: "index.mjs",
       },
       {
         format: "cjs",
         dir: "dist/cjs",
-        sourcemap: true,
-        exports: "named",
+        entryFileNames: "index.cjs",
       },
     ],
   },
   {
-    input: `build/src/index.d.ts`,
+    input: `src/index.ts`,
     plugins: [json(), dts()],
     output: {
       file: `dist/index.d.ts`,
+      format: "es",
     },
   },
 ];
diff --git a/contracts/src/index.ts b/contracts/src/index.ts
index 61b5f4c9..093539e4 100644
--- a/contracts/src/index.ts
+++ b/contracts/src/index.ts
@@ -5,13 +5,10 @@ import HypercertExchangeAbi from "../abi/src/marketplace/LooksRareProtocol.sol/L
 import OrderValidatorV2AAbi from "../abi/src/marketplace/helpers/OrderValidatorV2A.sol/OrderValidatorV2A.json";
 import StrategyManagerAbi from "../abi/src/marketplace/StrategyManager.sol/StrategyManager.json";
 import TransferManagerAbi from "../abi/src/marketplace/TransferManager.sol/TransferManager.json";
-import StrategyCollectionOfferAbi from "../abi/src/marketplace/executionStrategies/StrategyCollectionOffer.sol/StrategyCollectionOffer.json";
-import StrategyDutchAuctionAbi from "../abi/src/marketplace/executionStrategies/StrategyDutchAuction.sol/StrategyDutchAuction.json";
 import StrategyHypercertFractionOfferAbi from "../abi/src/marketplace/executionStrategies/StrategyHypercertFractionOffer.sol/StrategyHypercertFractionOffer.json";
 import CreatorFeeManagerWithRoyaltiesAbi from "../abi/src/marketplace/CreatorFeeManagerWithRoyalties.sol/CreatorFeeManagerWithRoyalties.json";
 import StrategyHypercertCollectionOfferAbi from "../abi/src/marketplace/executionStrategies/StrategyHypercertCollectionOffer.sol/StrategyHypercertCollectionOffer.json";
 import StrategyHypercertDutchAuctionAbi from "../abi/src/marketplace/executionStrategies/StrategyHypercertDutchAuction.sol/StrategyHypercertDutchAuction.json";
-import StrategyItemIdsRangeAbi from "../abi/src/marketplace/executionStrategies/StrategyItemIdsRange.sol/StrategyItemIdsRange.json";
 import ExecutionManagerAbi from "../abi/src/marketplace/ExecutionManager.sol/ExecutionManager.json";
 
 import {
@@ -96,9 +93,6 @@ export {
   OrderValidatorV2AAbi,
   TransferManagerAbi,
   StrategyManagerAbi,
-  StrategyCollectionOfferAbi,
-  StrategyDutchAuctionAbi,
-  StrategyItemIdsRangeAbi,
   StrategyHypercertFractionOfferAbi,
   StrategyHypercertCollectionOfferAbi,
   StrategyHypercertDutchAuctionAbi,
diff --git a/contracts/tsconfig.build.json b/contracts/tsconfig.build.json
index e9929279..ee3bb128 100644
--- a/contracts/tsconfig.build.json
+++ b/contracts/tsconfig.build.json
@@ -3,36 +3,23 @@
     "baseUrl": ".",
     "allowSyntheticDefaultImports": true,
     "declaration": true,
-    "declarationMap": true,
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,
     "lib": ["es6"],
-    "module": "ESNext",
-    "moduleResolution": "node",
+    "module": "Node16",
     "noImplicitAny": true,
     "noImplicitOverride": false,
     "removeComments": true,
     "resolveJsonModule": true,
-    "sourceMap": true,
     "strict": true,
-    "target": "ESNext",
+    "target": "ES2022",
     "outDir": "build"
   },
-  "include": ["./src"],
-  "files": [
-    "types/src/marketplace/CurrencyManager.ts",
-    "types/src/marketplace/ExecutionManager.ts",
-    "types/src/marketplace/LooksRareProtocol.ts",
-    "types/src/marketplace/NonceManager.ts",
-    "types/src/marketplace/helpers/OrderValidatorV2A.ts",
-    "types/src/marketplace/StrategyManager.ts",
-    "types/src/marketplace/TransferManager.ts",
-    "types/src/protocol/AllowlistMinter.ts",
-    "types/src/protocol/HypercertMinter.ts",
-    "types/src/protocol/interfaces/IAllowlist.ts",
-    "types/src/protocol/interfaces/IHypercertToken.ts",
-    "types/src/protocol/libs/Errors.ts"
-  ]
+  "include": ["./src", "./types"],
+  "ts-node": {
+    "experimentalResolver": true,
+    "files": true
+  }
 }
diff --git a/contracts/tsconfig.json b/contracts/tsconfig.json
index 7c84a083..638bfc4e 100644
--- a/contracts/tsconfig.json
+++ b/contracts/tsconfig.json
@@ -3,7 +3,6 @@
     "baseUrl": ".",
     "allowSyntheticDefaultImports": true,
     "declaration": true,
-    "declarationMap": true,
     "emitDecoratorMetadata": true,
     "esModuleInterop": true,
     "experimentalDecorators": true,
@@ -14,26 +13,11 @@
     "noImplicitOverride": false,
     "removeComments": true,
     "resolveJsonModule": true,
-    "sourceMap": true,
     "strict": true,
     "target": "ES2022",
     "outDir": "dist"
   },
-  "include": ["./tasks", "./test", "./src", "./hardhat.config.cjs"],
-  "files": [
-    "types/src/marketplace/CurrencyManager.ts",
-    "types/src/marketplace/ExecutionManager.ts",
-    "types/src/marketplace/LooksRareProtocol.ts",
-    "types/src/marketplace/NonceManager.ts",
-    "types/src/marketplace/helpers/OrderValidatorV2A.ts",
-    "types/src/marketplace/StrategyManager.ts",
-    "types/src/marketplace/TransferManager.ts",
-    "types/src/protocol/AllowlistMinter.ts",
-    "types/src/protocol/HypercertMinter.ts",
-    "types/src/protocol/interfaces/IAllowlist.ts",
-    "types/src/protocol/interfaces/IHypercertToken.ts",
-    "types/src/protocol/libs/Errors.ts"
-  ],
+  "include": ["./tasks", "./test", "./src", "./hardhat.config.cjs", "./types"],
   "ts-node": {
     "experimentalResolver": true,
     "files": true
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index cfca865b..7d28c647 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -44,7 +44,7 @@ importers:
         version: 3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))
       '@nomicfoundation/hardhat-toolbox':
         specifier: ^5.0.0
-        version: 5.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.7(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ignition-ethers@0.15.4(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ignition@0.15.4(@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10))(@nomicfoundation/ignition-core@0.15.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-network-helpers@1.0.9(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(@typechain/hardhat@8.0.3(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3)))(@types/chai@4.3.11)(@types/mocha@9.1.0)(@types/node@18.18.7)(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat-gas-reporter@1.0.9(bufferutil@4.0.8)(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(solidity-coverage@0.8.5(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3)
+        version: 5.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.7(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ignition-ethers@0.15.4(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ignition@0.15.4(@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10))(@nomicfoundation/ignition-core@0.15.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-network-helpers@1.0.9(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(@typechain/hardhat@9.1.0(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3)))(@types/chai@4.3.11)(@types/mocha@9.1.0)(@types/node@18.18.7)(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat-gas-reporter@1.0.9(bufferutil@4.0.8)(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(solidity-coverage@0.8.5(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3)
       '@nomicfoundation/hardhat-viem':
         specifier: ^2.0.2
         version: 2.0.2(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typescript@5.5.3)(viem@2.17.4(bufferutil@4.0.8)(typescript@5.5.3)(utf-8-validate@5.0.10)(zod@3.23.8))(zod@3.23.8)
@@ -69,6 +69,9 @@ importers:
       '@trivago/prettier-plugin-sort-imports':
         specifier: ^3.3.0
         version: 3.4.0(prettier@2.8.8)
+      '@typechain/hardhat':
+        specifier: ^9.1.0
+        version: 9.1.0(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))
       '@types/node':
         specifier: ^18.18.1
         version: 18.18.7
@@ -129,18 +132,18 @@ importers:
       rollup-plugin-auto-external:
         specifier: ^2.0.0
         version: 2.0.0(rollup@4.6.1)
-      rollup-plugin-copy:
-        specifier: ^3.5.0
-        version: 3.5.0
       rollup-plugin-dts:
-        specifier: ^6.1.0
-        version: 6.1.0(rollup@4.6.1)(typescript@5.5.3)
+        specifier: ^6.1.1
+        version: 6.1.1(rollup@4.6.1)(typescript@5.5.3)
       rollup-plugin-esbuild:
         specifier: ^6.1.0
         version: 6.1.0(esbuild@0.21.5)(rollup@4.6.1)
       rollup-plugin-node-polyfills:
         specifier: ^0.2.1
         version: 0.2.1
+      rollup-plugin-swc3:
+        specifier: ^0.11.2
+        version: 0.11.2(@swc/core@1.6.3)(rollup@4.6.1)
       shx:
         specifier: ^0.3.4
         version: 0.3.4
@@ -157,7 +160,7 @@ importers:
         specifier: ^10.9.1
         version: 10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3)
       typechain:
-        specifier: ^8.3.1
+        specifier: ^8.3.2
         version: 8.3.2(typescript@5.5.3)
       typescript:
         specifier: ^5.5.3
@@ -230,8 +233,8 @@ importers:
         specifier: ^3.2.0
         version: 3.2.0(graphql@16.8.1)
       '@hypercerts-org/contracts':
-        specifier: 2.0.0-alpha.0
-        version: 2.0.0-alpha.0(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@20.14.5)(typescript@5.4.5))(typescript@5.4.5)(utf-8-validate@5.0.10)
+        specifier: 2.0.0-alpha.1
+        version: 2.0.0-alpha.1(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@20.14.5)(typescript@5.4.5))(typescript@5.4.5)(utf-8-validate@5.0.10)
       '@openzeppelin/merkle-tree':
         specifier: ^1.0.5
         version: 1.0.5
@@ -1865,8 +1868,8 @@ packages:
     resolution: {integrity: sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==}
     deprecated: Use @eslint/object-schema instead
 
-  '@hypercerts-org/contracts@2.0.0-alpha.0':
-    resolution: {integrity: sha512-xkvl2goo1Uz39TdALs4ypjxarmxk4Lu0X8JZc5+TdmVw/hsaywjE5WpPgil/AFE5Ccm3qyNGVsY6fz6co5GvVg==}
+  '@hypercerts-org/contracts@2.0.0-alpha.1':
+    resolution: {integrity: sha512-t+2eYorMC7GjFJCmwqIQzqbxBMATG+/zXJL6BFwJQPRCQEAcQhh4tuwcBhIvPz1kQj2capetZyAPO6gKmgtzig==}
 
   '@ibm-cloud/openapi-ruleset-utilities@1.3.2':
     resolution: {integrity: sha512-pDZ+YTawZBAMgxfGG0JeCizh7Brmz8h4WRQaJvfJaRfgfdFmp5xZ64oqvnpJQ16XjCdNMBkTB6NJCZjQzq1gpQ==}
@@ -2840,13 +2843,13 @@ packages:
       typechain: ^8.3.1
       typescript: '>=4.7.0'
 
-  '@typechain/hardhat@8.0.3':
-    resolution: {integrity: sha512-MytSmJJn+gs7Mqrpt/gWkTCOpOQ6ZDfRrRT2gtZL0rfGe4QrU4x9ZdW15fFbVM/XTa+5EsKiOMYXhRABibNeng==}
+  '@typechain/hardhat@9.1.0':
+    resolution: {integrity: sha512-mtaUlzLlkqTlfPwB3FORdejqBskSnh+Jl8AIJGjXNAQfRQ4ofHADPl1+oU7Z3pAJzmZbUXII8MhOLQltcHgKnA==}
     peerDependencies:
-      '@typechain/ethers-v6': ^0.4.3
+      '@typechain/ethers-v6': ^0.5.1
       ethers: ^6.1.0
       hardhat: ^2.9.9
-      typechain: ^8.3.1
+      typechain: ^8.3.2
 
   '@types/acorn@4.0.6':
     resolution: {integrity: sha512-veQTnWP+1D/xbxVrPC3zHnCZRjSrKfhbMUlEA43iMZLu7EsnTtkJklIuwrCPbOi8YkvDQAiW05VQQFvvz9oieQ==}
@@ -2923,9 +2926,6 @@ packages:
   '@types/form-data@0.0.33':
     resolution: {integrity: sha512-8BSvG1kGm83cyJITQMZSulnl6QV8jqAGreJsc5tPu1Jq0vTSOiY/k24Wx82JRpWwZSqrala6sd5rWi6aNXvqcw==}
 
-  '@types/fs-extra@8.1.5':
-    resolution: {integrity: sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==}
-
   '@types/glob@7.2.0':
     resolution: {integrity: sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==}
 
@@ -4011,9 +4011,6 @@ packages:
   colord@2.9.3:
     resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
 
-  colorette@1.4.0:
-    resolution: {integrity: sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==}
-
   colorette@2.0.20:
     resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
 
@@ -5539,10 +5536,6 @@ packages:
     resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==}
     engines: {node: '>= 0.4'}
 
-  globby@10.0.1:
-    resolution: {integrity: sha512-sSs4inE1FB2YQiymcmTv6NWENryABjUNPeWhOvmn4SjtKybglsyPZxFB3U1/+L1bYi0rNZDqCLlHyLYDl1Pq5A==}
-    engines: {node: '>=8'}
-
   globby@10.0.2:
     resolution: {integrity: sha512-7dUi7RvCoT/xast/o/dLN53oqND4yk0nsHkhRgn9w65C4PofCLOoJ39iSOg+qVDdWQPIEj+eszMHQ+aLVwwQSg==}
     engines: {node: '>=8'}
@@ -6113,10 +6106,6 @@ packages:
     resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
     engines: {node: '>=0.10.0'}
 
-  is-plain-object@3.0.1:
-    resolution: {integrity: sha512-Xnpx182SBMrr/aBik8y+GuR4U1L9FqMSojwDQwPMmxyC6bvEqly9UBCxhauBF5vNh2gwWJNX6oDV7O+OM4z34g==}
-    engines: {node: '>=0.10.0'}
-
   is-plain-object@5.0.0:
     resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
     engines: {node: '>=0.10.0'}
@@ -8259,17 +8248,6 @@ packages:
     peerDependencies:
       rollup: '>=0.45.2'
 
-  rollup-plugin-copy@3.5.0:
-    resolution: {integrity: sha512-wI8D5dvYovRMx/YYKtUNt3Yxaw4ORC9xo6Gt9t22kveWz1enG9QrhVlagzwrxSC455xD1dHMKhIJkbsQ7d48BA==}
-    engines: {node: '>=8.3'}
-
-  rollup-plugin-dts@6.1.0:
-    resolution: {integrity: sha512-ijSCPICkRMDKDLBK9torss07+8dl9UpY9z1N/zTeA1cIqdzMlpkV3MOOC7zukyvQfDyxa1s3Dl2+DeiP/G6DOw==}
-    engines: {node: '>=16'}
-    peerDependencies:
-      rollup: ^3.29.4 || ^4
-      typescript: ^4.5 || ^5.0
-
   rollup-plugin-dts@6.1.1:
     resolution: {integrity: sha512-aSHRcJ6KG2IHIioYlvAOcEq6U99sVtqDDKVhnwt70rW6tsz3tv5OSjEiWcgzfsHdLyGXZ/3b/7b/+Za3Y6r1XA==}
     engines: {node: '>=16'}
@@ -12427,7 +12405,7 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.1': {}
 
-  '@hypercerts-org/contracts@2.0.0-alpha.0(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@20.14.5)(typescript@5.4.5))(typescript@5.4.5)(utf-8-validate@5.0.10)':
+  '@hypercerts-org/contracts@2.0.0-alpha.1(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@20.14.5)(typescript@5.4.5))(typescript@5.4.5)(utf-8-validate@5.0.10)':
     dependencies:
       hardhat: 2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@20.14.5)(typescript@5.4.5))(typescript@5.4.5)(utf-8-validate@5.0.10)
     transitivePeerDependencies:
@@ -12686,7 +12664,7 @@ snapshots:
       ethereumjs-util: 7.1.5
       hardhat: 2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)
 
-  ? '@nomicfoundation/hardhat-toolbox@5.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.7(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ignition-ethers@0.15.4(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ignition@0.15.4(@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10))(@nomicfoundation/ignition-core@0.15.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-network-helpers@1.0.9(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(@typechain/hardhat@8.0.3(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3)))(@types/chai@4.3.11)(@types/mocha@9.1.0)(@types/node@18.18.7)(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat-gas-reporter@1.0.9(bufferutil@4.0.8)(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(solidity-coverage@0.8.5(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3)'
+  ? '@nomicfoundation/hardhat-toolbox@5.0.0(@nomicfoundation/hardhat-chai-matchers@2.0.7(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ignition-ethers@0.15.4(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-ignition@0.15.4(@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(bufferutil@4.0.8)(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10))(@nomicfoundation/ignition-core@0.15.4(bufferutil@4.0.8)(utf-8-validate@5.0.10))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-network-helpers@1.0.9(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@nomicfoundation/hardhat-verify@1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(@typechain/hardhat@9.1.0(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3)))(@types/chai@4.3.11)(@types/mocha@9.1.0)(@types/node@18.18.7)(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat-gas-reporter@1.0.9(bufferutil@4.0.8)(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(solidity-coverage@0.8.5(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3)'
   : dependencies:
       '@nomicfoundation/hardhat-chai-matchers': 2.0.7(@nomicfoundation/hardhat-ethers@3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10)))(chai@4.3.10)(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))
       '@nomicfoundation/hardhat-ethers': 3.0.6(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))
@@ -12694,7 +12672,7 @@ snapshots:
       '@nomicfoundation/hardhat-network-helpers': 1.0.9(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))
       '@nomicfoundation/hardhat-verify': 1.1.1(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))
       '@typechain/ethers-v6': 0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3)
-      '@typechain/hardhat': 8.0.3(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))
+      '@typechain/hardhat': 9.1.0(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))
       '@types/chai': 4.3.11
       '@types/mocha': 9.1.0
       '@types/node': 18.18.7
@@ -13103,6 +13081,14 @@ snapshots:
     optionalDependencies:
       rollup: 3.29.4
 
+  '@rollup/pluginutils@5.1.0(rollup@4.6.1)':
+    dependencies:
+      '@types/estree': 1.0.5
+      estree-walker: 2.0.2
+      picomatch: 2.3.1
+    optionalDependencies:
+      rollup: 4.6.1
+
   '@rollup/rollup-android-arm-eabi@4.18.0':
     optional: true
 
@@ -13201,7 +13187,7 @@ snapshots:
     dependencies:
       '@noble/curves': 1.1.0
       '@noble/hashes': 1.3.2
-      '@scure/base': 1.1.3
+      '@scure/base': 1.1.7
 
   '@scure/bip32@1.3.2':
     dependencies:
@@ -13687,7 +13673,7 @@ snapshots:
       typechain: 8.3.2(typescript@5.5.3)
       typescript: 5.5.3
 
-  '@typechain/hardhat@8.0.3(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))':
+  '@typechain/hardhat@9.1.0(@typechain/ethers-v6@0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3))(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(hardhat@2.22.6(bufferutil@4.0.8)(ts-node@10.9.1(@swc/core@1.6.3)(@types/node@18.18.7)(typescript@5.5.3))(typescript@5.5.3)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))':
     dependencies:
       '@typechain/ethers-v6': 0.4.3(ethers@6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10))(typechain@8.3.2(typescript@5.5.3))(typescript@5.5.3)
       ethers: 6.9.0(bufferutil@4.0.8)(utf-8-validate@5.0.10)
@@ -13798,10 +13784,6 @@ snapshots:
     dependencies:
       '@types/node': 20.14.5
 
-  '@types/fs-extra@8.1.5':
-    dependencies:
-      '@types/node': 18.18.7
-
   '@types/glob@7.2.0':
     dependencies:
       '@types/minimatch': 5.1.2
@@ -15040,8 +15022,6 @@ snapshots:
 
   colord@2.9.3: {}
 
-  colorette@1.4.0: {}
-
   colorette@2.0.20: {}
 
   colors@1.4.0: {}
@@ -17052,17 +17032,6 @@ snapshots:
     dependencies:
       define-properties: 1.2.1
 
-  globby@10.0.1:
-    dependencies:
-      '@types/glob': 7.2.0
-      array-union: 2.1.0
-      dir-glob: 3.0.1
-      fast-glob: 3.3.2
-      glob: 7.2.3
-      ignore: 5.3.1
-      merge2: 1.4.1
-      slash: 3.0.0
-
   globby@10.0.2:
     dependencies:
       '@types/glob': 7.2.0
@@ -17853,8 +17822,6 @@ snapshots:
     dependencies:
       isobject: 3.0.1
 
-  is-plain-object@3.0.1: {}
-
   is-plain-object@5.0.0: {}
 
   is-potential-custom-element-name@1.0.1:
@@ -20660,22 +20627,6 @@ snapshots:
       safe-resolve: 1.0.0
       semver: 5.7.2
 
-  rollup-plugin-copy@3.5.0:
-    dependencies:
-      '@types/fs-extra': 8.1.5
-      colorette: 1.4.0
-      fs-extra: 8.1.0
-      globby: 10.0.1
-      is-plain-object: 3.0.1
-
-  rollup-plugin-dts@6.1.0(rollup@4.6.1)(typescript@5.5.3):
-    dependencies:
-      magic-string: 0.30.5
-      rollup: 4.6.1
-      typescript: 5.5.3
-    optionalDependencies:
-      '@babel/code-frame': 7.23.5
-
   rollup-plugin-dts@6.1.1(rollup@3.29.4)(typescript@5.4.5):
     dependencies:
       magic-string: 0.30.10
@@ -20684,6 +20635,14 @@ snapshots:
     optionalDependencies:
       '@babel/code-frame': 7.24.7
 
+  rollup-plugin-dts@6.1.1(rollup@4.6.1)(typescript@5.5.3):
+    dependencies:
+      magic-string: 0.30.10
+      rollup: 4.6.1
+      typescript: 5.5.3
+    optionalDependencies:
+      '@babel/code-frame': 7.24.7
+
   rollup-plugin-esbuild@6.1.0(esbuild@0.19.12)(rollup@3.29.4):
     dependencies:
       '@rollup/pluginutils': 5.0.5(rollup@3.29.4)
@@ -20725,6 +20684,15 @@ snapshots:
       rollup: 3.29.4
       rollup-preserve-directives: 1.1.1(rollup@3.29.4)
 
+  rollup-plugin-swc3@0.11.2(@swc/core@1.6.3)(rollup@4.6.1):
+    dependencies:
+      '@fastify/deepmerge': 1.3.0
+      '@rollup/pluginutils': 5.1.0(rollup@4.6.1)
+      '@swc/core': 1.6.3
+      get-tsconfig: 4.7.5
+      rollup: 4.6.1
+      rollup-preserve-directives: 1.1.1(rollup@4.6.1)
+
   rollup-pluginutils@2.8.2:
     dependencies:
       estree-walker: 0.6.1
@@ -20734,6 +20702,11 @@ snapshots:
       magic-string: 0.30.10
       rollup: 3.29.4
 
+  rollup-preserve-directives@1.1.1(rollup@4.6.1):
+    dependencies:
+      magic-string: 0.30.10
+      rollup: 4.6.1
+
   rollup@3.29.4:
     optionalDependencies:
       fsevents: 2.3.3
diff --git a/sdk/lib/hypercerts-api b/sdk/lib/hypercerts-api
index b706b492..3fa43414 160000
--- a/sdk/lib/hypercerts-api
+++ b/sdk/lib/hypercerts-api
@@ -1 +1 @@
-Subproject commit b706b49242d2e98d3cec9e3bb703c471af3d115e
+Subproject commit 3fa434148d425d8f7a993c5173672d1c55b48f5c
diff --git a/sdk/package.json b/sdk/package.json
index 6b5cf1b2..89aa05d4 100644
--- a/sdk/package.json
+++ b/sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hypercerts-org/sdk",
-  "version": "2.0.0-alpha.29",
+  "version": "2.0.0-alpha.30",
   "description": "SDK for hypercerts protocol",
   "repository": "git@github.com:hypercerts-org/hypercerts.git",
   "author": "Hypercerts team",
@@ -22,7 +22,7 @@
   ],
   "dependencies": {
     "@graphql-typed-document-node/core": "^3.2.0",
-    "@hypercerts-org/contracts": "2.0.0-alpha.0",
+    "@hypercerts-org/contracts": "2.0.0-alpha.1",
     "@openzeppelin/merkle-tree": "^1.0.5",
     "@swc/core": "^1.6.3",
     "ajv": "^8.11.2",
diff --git a/sdk/src/__generated__/api.ts b/sdk/src/__generated__/api.ts
index 3c7adc88..b49c4b05 100644
--- a/sdk/src/__generated__/api.ts
+++ b/sdk/src/__generated__/api.ts
@@ -237,7 +237,7 @@ export interface HypercertMetadata {
   description: string;
   /** An url pointing to the external website of the project */
   external_url?: string;
-  hypercert?: HypercertClaimdata361;
+  hypercert?: HypercertClaimdata;
   /** A URI pointing to a resource with mime type image/* representing the asset to which this token represents. Consider making any images at a width between 320 and 1080 pixels and aspect ratio between 1.91:1 and 4:5 inclusive. */
   image: string;
   /** Identifies the asset to which this token represents */
@@ -252,7 +252,7 @@ export interface HypercertMetadata {
 /**
  * Work time period. The value is UNIX time in seconds from epoch.
  */
-export type HypercertClaimdata361WorkTimeframe = {
+export type HypercertClaimdataWorkTimeframe = {
   display_value?: string;
   name?: string;
   value?: number[];
@@ -262,7 +262,7 @@ export type HypercertClaimdata361WorkTimeframe = {
 /**
  * Scopes of work
  */
-export type HypercertClaimdata361WorkScope = {
+export type HypercertClaimdataWorkScope = {
   display_value?: string;
   excludes?: string[];
   name?: string;
@@ -273,7 +273,7 @@ export type HypercertClaimdata361WorkScope = {
 /**
  * Rights
  */
-export type HypercertClaimdata361Rights = {
+export type HypercertClaimdataRights = {
   display_value?: string;
   excludes?: string[];
   name?: string;
@@ -284,7 +284,7 @@ export type HypercertClaimdata361Rights = {
 /**
  * Impact time period. The value is UNIX time in seconds from epoch.
  */
-export type HypercertClaimdata361ImpactTimeframe = {
+export type HypercertClaimdataImpactTimeframe = {
   display_value?: string;
   name?: string;
   value?: number[];
@@ -294,7 +294,7 @@ export type HypercertClaimdata361ImpactTimeframe = {
 /**
  * Scopes of impact
  */
-export type HypercertClaimdata361ImpactScope = {
+export type HypercertClaimdataImpactScope = {
   display_value?: string;
   excludes?: string[];
   name?: string;
@@ -305,7 +305,7 @@ export type HypercertClaimdata361ImpactScope = {
 /**
  * Contributors
  */
-export type HypercertClaimdata361Contributors = {
+export type HypercertClaimdataContributors = {
   display_value?: string;
   name?: string;
   value?: string[];
@@ -315,19 +315,19 @@ export type HypercertClaimdata361Contributors = {
 /**
  * Properties of an impact claim
  */
-export interface HypercertClaimdata361 {
+export interface HypercertClaimdata {
   /** Contributors */
-  contributors: HypercertClaimdata361Contributors;
+  contributors: HypercertClaimdataContributors;
   /** Scopes of impact */
-  impact_scope: HypercertClaimdata361ImpactScope;
+  impact_scope: HypercertClaimdataImpactScope;
   /** Impact time period. The value is UNIX time in seconds from epoch. */
-  impact_timeframe: HypercertClaimdata361ImpactTimeframe;
+  impact_timeframe: HypercertClaimdataImpactTimeframe;
   /** Rights */
-  rights?: HypercertClaimdata361Rights;
+  rights?: HypercertClaimdataRights;
   /** Scopes of work */
-  work_scope: HypercertClaimdata361WorkScope;
+  work_scope: HypercertClaimdataWorkScope;
   /** Work time period. The value is UNIX time in seconds from epoch. */
-  work_timeframe: HypercertClaimdata361WorkTimeframe;
+  work_timeframe: HypercertClaimdataWorkTimeframe;
   [key: string]: unknown;
 }
 
diff --git a/sdk/src/index.ts b/sdk/src/index.ts
index b5eb5fa2..7ae205c3 100644
--- a/sdk/src/index.ts
+++ b/sdk/src/index.ts
@@ -2,7 +2,6 @@ import {
   HypercertMinterAbi,
   HypercertExchangeAbi,
   OrderValidatorV2AAbi,
-  StrategyCollectionOfferAbi,
   StrategyManagerAbi,
   TransferManagerAbi,
   StrategyHypercertFractionOfferAbi,
@@ -20,7 +19,6 @@ export {
   HypercertMinterAbi,
   HypercertExchangeAbi,
   OrderValidatorV2AAbi,
-  StrategyCollectionOfferAbi,
   StrategyManagerAbi,
   TransferManagerAbi,
   StrategyHypercertFractionOfferAbi,