chore(bump): sdk uses contracts 2.0.0-alpha.1

hypercerts-org · Jul 17, 2024 · cb3c996 · cb3c996
1 parent 1c8a4ee
commit cb3c996
Show file tree

Hide file tree

Showing 11 changed files with 96 additions and 163 deletions.
diff --git 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
@@ -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,17 +63,17 @@
     "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",
     "solhint": "^3.6.2",
     "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
@@ -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
@@ -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
@@ -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
@@ -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