feat: improved release process, fixed a circular-dep, re-released

.gitignore

@@ -204,3 +204,23 @@ veascan-subgraph-inbox/generated/*
 veascan-subgraph-inbox/build/*
 validator-subgraph-inbox/generated/*
 validator-subgraph-inbox/build/*
+
+# Hardhat files
+cache
+artifacts
+coverage.json
+
+## Hardhat typechain bindings/types
+typechain
+typechain/**
+typechain-types
+typechain-types/**
+
+# Hardhat deploy files
+contracts/deployments/localhost
+contracts/deployments/hardhat
+contracts/deployments/*/solcInputs/
+
+# POA solidity flattener output
+out/
+

contracts/.npmignore

@@ -1,4 +1,6 @@
+.env*
 scripts
+deploy
 tsconfig.json
-.env*
-hardhat.config.ts
+test
+hardhat.config.*

contracts/package.json

@@ -1,7 +1,10 @@
 {
   "name": "@kleros/vea-contracts",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "Smart contracts for Vea",
+  "main": "dist/index.js",
+  "module": "dist/index.js",
+  "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
     "url": "git+ssh://[email protected]/kleros/vea.git"
@@ -47,7 +50,7 @@
     "release:patch": "yarn version patch && yarn npm publish",
     "release:minor": "yarn version minor && yarn npm publish",
     "release:major": "yarn version major && yarn npm publish",
-    "prepublish": "ls -la dist/ >foo && yarn tsc || echo"
+    "prepublish": "./scripts/prepublish.sh"
   },
   "devDependencies": {
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.6",
@@ -86,12 +89,17 @@
     "@openzeppelin/contracts": "^4.8.3"
   },
   "files": [
-    "dist",
     "src",
     "deployments",
     "typechain-types",
-    "!src/test/**/*",
-    "!typechain-types/test/**/*",
-    "!typechain-types/factories/test/**/*"
+    "!hardhat.config.*",
+    "!src/test",
+    "!typechain-types/test",
+    "!typechain-types/factories/test",
+    "!test",
+    "!deploy",
+    "!deployments/localhost",
+    "!deployments/hardhat",
+    "!deployments/**/solcInputs"
   ]
 }

contracts/scripts/prepublish.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+
+# Remove the mock contracts from the typechain types
+sed -n -i '' '/test/!p' $SCRIPT_DIR/../typechain-types/index.ts 
+sed -n -i '' '/test/!p' $SCRIPT_DIR/../typechain-types/factories/index.ts
+rm -rf \
+  $SCRIPT_DIR/../typechain-types/test/ \
+  $SCRIPT_DIR/../typechain-types/factories/test/
+
+yarn tsc -p $SCRIPT_DIR/../tsconfig.publish.json

contracts/tsconfig.json

@@ -8,7 +8,8 @@
     "declaration": true,
     "sourceMap": true,
     "noImplicitAny": false,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "skipLibCheck": true
   },
   "include": [
     "./src",
@@ -17,6 +18,10 @@
     "./typechain-types",
     "./deploy"
   ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ],
   "files": [
     "./hardhat.config.ts"
   ]

contracts/tsconfig.publish.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2021",
+    "module": "commonjs",
+    "strict": true,
+    "esModuleInterop": true,
+    "outDir": "typechain-types",
+    "declaration": true,
+    "sourceMap": true,
+    "noImplicitAny": false,
+    "resolveJsonModule": true,
+    "skipLibCheck": true
+  },
+  "include": [
+    "./typechain-types"
+  ],
+  "exclude": [
+    "node_modules",
+    "dist"
+  ]
+}

vea-sdk/package.json

@@ -1,8 +1,9 @@
 {
   "name": "@kleros/vea-sdk",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "SDK for the development of cross-chain apps on Vea",
   "main": "dist/index.js",
+  "module": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": {
     "type": "git",
@@ -32,10 +33,10 @@
     "release:minor": "yarn version minor && yarn npm publish",
     "release:major": "yarn version major && yarn npm publish",
     "clean": "rm -rf dist",
-    "prepublish": "yarn tsc || echo"
+    "prepublish": "yarn tsc"
   },
   "dependencies": {
-    "@kleros/vea-contracts": "workspace:^0.3.0",
+    "@kleros/vea-contracts": "workspace:^0.3.2",
     "@logtail/pino": "^0.4.0",
     "@typechain/ethers-v5": "^10.2.0",
     "dotenv": "^16.0.3",
@@ -52,7 +53,6 @@
   },
   "files": [
     "dist",
-    "src",
     "examples"
   ]
 }

vea-sdk/src/utils/envVar.ts

@@ -1,14 +1,11 @@
 import dotenv from "dotenv";
-import logger from "./logger";
 
 dotenv.config();
 
 function envVar(key: string): string {
   const value = process.env[key];
   if (value === undefined) {
-    const error = new Error(`Environment variable ${key} is undefined`);
-    logger.error(error);
-    throw error;
+    throw new Error(`Environment variable ${key} is undefined`);
   }
   return value;
 }

vea-sdk/tsconfig.json

@@ -9,6 +9,7 @@
     "sourceMap": true,
     "noImplicitAny": false,
     "resolveJsonModule": true,
+    "skipLibCheck": true,
     "paths": {
       "@kleros/vea-contracts": [
         "../contracts"

yarn.lock

@@ -3357,7 +3357,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@kleros/vea-contracts@workspace:^, @kleros/vea-contracts@workspace:^0.3.0, @kleros/vea-contracts@workspace:contracts":
+"@kleros/vea-contracts@workspace:^, @kleros/vea-contracts@workspace:^0.3.2, @kleros/vea-contracts@workspace:contracts":
   version: 0.0.0-use.local
   resolution: "@kleros/vea-contracts@workspace:contracts"
   dependencies:
@@ -3425,7 +3425,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@kleros/vea-sdk@workspace:vea-sdk"
   dependencies:
-    "@kleros/vea-contracts": "workspace:^0.3.0"
+    "@kleros/vea-contracts": "workspace:^0.3.2"
     "@logtail/pino": ^0.4.0
     "@typechain/ethers-v5": ^10.2.0
     dotenv: ^16.0.3