yarn: build+bindings generation

deployment/package.json

@@ -2,9 +2,9 @@
   "name": "deployment",
   "version": "0.0.1",
   "scripts": {
-    "build:evm:typechain": "typechain --target=ethers-v6 --out-dir=./ethers-contracts ../evm/build-forge/*.sol/!(*.dbg).json --show-stack-traces",
-    "build:evm": "forge build --root=../evm && yarn build:evm:typechain",
-    "clean": "rm -rf ./ts-build && git clean --force -- ./ethers-contracts && git checkout -- ./ethers-contracts",
+    "build:evm:typechain": "mkdir -p evm-build/bindings && yarn tsx ../evm/solc2bindings.ts evm-build/Tbr.output.json evm-build/bindings",
+    "build:evm": "mkdir -p evm-build && docker build --pull --rm  -f ../evm/Dockerfile .. -t tbrv3-evm-rebuild -o type=local,dest=evm-build && yarn build:evm:typechain",
+    "clean": "rm -rf evm-build",
     "deploy:evm:localnet": "ENV=localnet tsx evm/deploy.ts",
     "deploy:evm:testnet": "ENV=testnet tsx evm/deploy.ts",
     "deploy:evm:mainnet": "ENV=mainnet tsx evm/deploy.ts",

evm/Dockerfile

@@ -35,11 +35,7 @@ RUN cd evm; \
     fi
 
 # Generate Typechain bindings
-
-# RUN cd evm; \
-#    yarn && \
-#    yarn tsx solc2bindings Tbr.output.json bindings-output
-
-# # Consolidate all generated output
+
+# Consolidate all generated output
 FROM scratch AS foundry-export     
 COPY --from=builder /app/evm/*.input.json /app/evm/*.output.json ./

evm/package.json

@@ -7,7 +7,7 @@
     "test": "bash -c 'source ../.env.evm-test && forge test --fork-url ${0}'"
   },
   "devDependencies": {
-    "@typechain/ethers-v6": "^0.5.1",
+    "@xlabs-xyz/typechain-ethers-v6": "^0.5.1",
     "@xlabs-xyz/typechain": "^8.3.4",
     "tsx": "^4.19.2"
   }

yarn.lock

@@ -2131,6 +2131,28 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@xlabs-xyz/typechain@npm:^8.3.4":
+  version: 8.3.4
+  resolution: "@xlabs-xyz/typechain@npm:8.3.4"
+  dependencies:
+    "@types/prettier": "npm:^2.1.1"
+    debug: "npm:^4.3.1"
+    fs-extra: "npm:^7.0.0"
+    glob: "npm:7.1.7"
+    js-sha3: "npm:^0.8.0"
+    lodash: "npm:^4.17.15"
+    mkdirp: "npm:^1.0.4"
+    prettier: "npm:^2.3.1"
+    ts-command-line-args: "npm:^2.2.0"
+    ts-essentials: "npm:^7.0.1"
+  peerDependencies:
+    typescript: ">=4.3.0"
+  bin:
+    typechain: dist/cli/cli.js
+  checksum: 10c0/2d554a92ea25982c99b6f6f8272628a5f38f386f4116e3cc4b39c17f12bfbefd26b4f937b3fed00131faa2776336994cdc0a73b42d95e430fc4098635a8cc779
+  languageName: node
+  linkType: hard
+
 "@yarnpkg/types@npm:^4.0.0":
   version: 4.0.0
   resolution: "@yarnpkg/types@npm:4.0.0"
@@ -3388,7 +3410,8 @@ __metadata:
   resolution: "evm@workspace:evm"
   dependencies:
     "@typechain/ethers-v6": "npm:^0.5.1"
-    typechain: "npm:^8.3.2"
+    "@xlabs-xyz/typechain": "npm:^8.3.4"
+    tsx: "npm:^4.19.2"
   languageName: unknown
   linkType: soft