Move evm ts to evm directory (wormhole-foundation#465)

Author: barnjamin

Makefile

@@ -17,7 +17,7 @@ build-evm-prod: clean-evm
 
 .PHONY: gen-evm-bindings
 gen-evm-bindings: build-evm-prod
-	npm ci && cd sdk/evm && npm run generate
+	npm ci && cd evm/ts && npm run generate
 
 #######################
 ## TESTS

Tiltfile

@@ -51,7 +51,7 @@ docker_build(
 docker_build(
     ref = "ntt-ci",
     context = "./",
-    only=["./sdk", "./package.json", "./package-lock.json", "jest.config.ts", "tsconfig.json", "tsconfig.test.json"],
+    only=["./sdk", "./package.json", "./package-lock.json", "jest.config.ts", "tsconfig.json", "tsconfig.esm.json", "tsconfig.cjs.json", "tsconfig.test.json"],
     dockerfile = "./sdk/Dockerfile",
 )
 k8s_yaml_with_ns("./sdk/ci.yaml") 

evm/Dockerfile

@@ -4,9 +4,11 @@ WORKDIR /app
 COPY foundry.toml foundry.toml
 COPY lib lib
 COPY src src
+COPY ts ts
 
 RUN FOUNDRY_PROFILE=prod forge build
 
 FROM scratch AS foundry-export
 
 COPY --from=builder /app/out .
+COPY --from=builder /app/ts ts

evm/ts/.gitignore

@@ -0,0 +1,3 @@
+dist
+ethers-ci-contracts
+contracts.json

sdk/evm/README.md evm/ts/README.md

@@ -37,8 +37,8 @@
     "build": "npm run build:esm && npm run build:cjs",
     "rebuild": "npm run clean && npm run build",
     "clean": "rm -rf ./dist",
-    "generate:test": "typechain --node16-modules --target ethers-v6 --out-dir ethers-ci-contracts '../../evm/out/**/*.json'",
-    "generate:slim": "ABI_VERSION=`tsx scripts/readVersion.ts` && typechain --node16-modules --target ethers-v6 --out-dir src/ethers-contracts/$ABI_VERSION '../../evm/out/?(WormholeTransceiver.sol|NttManager.sol)/*.json'",
+    "generate:test": "typechain --node16-modules --target ethers-v6 --out-dir ethers-ci-contracts '../out/**/*.json'",
+    "generate:slim": "ABI_VERSION=`tsx scripts/readVersion.ts` && typechain --node16-modules --target ethers-v6 --out-dir src/ethers-contracts/$ABI_VERSION '../out/?(WormholeTransceiver.sol|NttManager.sol)/*.json'",
     "generate": "npm run generate:slim",
     "build:contracts": "cd ../.. && make build-evm-prod",
     "test": "jest --config ./jest.config.ts"

sdk/evm/__tests__/versions.test.ts evm/ts/__tests__/versions.test.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.cjs.json",
+  "extends": "../../tsconfig.cjs.json",
   "include": ["src"],
   "compilerOptions": {
     "outDir": "dist/cjs",

sdk/evm/jest.config.ts evm/ts/jest.config.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.esm.json",
+  "extends": "../../tsconfig.esm.json",
   "include": ["src"],
   "compilerOptions": {
     "outDir": "dist/esm",

sdk/evm/package.json evm/ts/package.json

@@ -30,7 +30,7 @@
   },
   "workspaces": [
     "sdk/definitions",
-    "sdk/evm",
+    "evm/ts",
     "solana",
     "sdk/route",
     "sdk/examples",

sdk/evm/scripts/readVersion.ts evm/ts/scripts/readVersion.ts

@@ -8,8 +8,13 @@ COPY --from=ntt-solana-contract /usr/src/solana/tsconfig.esm.json solana/tsconfi
 COPY --from=ntt-solana-contract /usr/src/solana/tsconfig.cjs.json solana/tsconfig.cjs.json
 COPY --from=ntt-solana-contract /usr/src/solana/target/idl solana/target/idl
 COPY --from=ntt-solana-contract /usr/src/solana/target/types solana/target/types
+
+COPY --from=ntt-evm-contract ts evm/ts
 COPY --from=ntt-evm-contract . evm/out
 
+RUN rm -rf evm/out/ts
+
+
 COPY . ./ 
 RUN --mount=type=cache,uid=1000,gid=1000,target=/home/node/.npm \
   npm ci

sdk/evm/src/bindings.ts evm/ts/src/bindings.ts

@@ -23,19 +23,19 @@ import solana from "@wormhole-foundation/sdk/platforms/solana";
 
 import { ethers } from "ethers";
 
-import { DummyTokenMintAndBurn__factory } from "../evm/ethers-ci-contracts/factories/DummyToken.sol/DummyTokenMintAndBurn__factory.js";
-import { DummyToken__factory } from "../evm/ethers-ci-contracts/factories/DummyToken.sol/DummyToken__factory.js";
-import { ERC1967Proxy__factory } from "../evm/ethers-ci-contracts/factories/ERC1967Proxy__factory.js";
-import { IWormholeRelayer__factory } from "../evm/ethers-ci-contracts/factories/IWormholeRelayer.sol/IWormholeRelayer__factory.js";
-import { NttManager__factory } from "../evm/ethers-ci-contracts/factories/NttManager__factory.js";
-import { TransceiverStructs__factory } from "../evm/ethers-ci-contracts/factories/TransceiverStructs__factory.js";
-import { TrimmedAmountLib__factory } from "../evm/ethers-ci-contracts/factories/TrimmedAmount.sol/TrimmedAmountLib__factory.js";
-import { WormholeTransceiver__factory } from "../evm/ethers-ci-contracts/factories/WormholeTransceiver__factory.js";
+import { DummyTokenMintAndBurn__factory } from "../../evm/ts/ethers-ci-contracts/factories/DummyToken.sol/DummyTokenMintAndBurn__factory.js";
+import { DummyToken__factory } from "../../evm/ts/ethers-ci-contracts/factories/DummyToken.sol/DummyToken__factory.js";
+import { ERC1967Proxy__factory } from "../../evm/ts/ethers-ci-contracts/factories/ERC1967Proxy__factory.js";
+import { IWormholeRelayer__factory } from "../../evm/ts/ethers-ci-contracts/factories/IWormholeRelayer.sol/IWormholeRelayer__factory.js";
+import { NttManager__factory } from "../../evm/ts/ethers-ci-contracts/factories/NttManager__factory.js";
+import { TransceiverStructs__factory } from "../../evm/ts/ethers-ci-contracts/factories/TransceiverStructs__factory.js";
+import { TrimmedAmountLib__factory } from "../../evm/ts/ethers-ci-contracts/factories/TrimmedAmount.sol/TrimmedAmountLib__factory.js";
+import { WormholeTransceiver__factory } from "../../evm/ts/ethers-ci-contracts/factories/WormholeTransceiver__factory.js";
 
 import solanaTiltKey from "./solana-tilt.json"; // from https://github.com/wormhole-foundation/wormhole/blob/main/solana/keys/solana-devnet.json
 
 import { Ntt } from "../definitions/src/index.js";
-import "../evm/src/index.js";
+import "../../evm/ts/src/index.js";
 import "../../solana/ts/sdk/index.js";
 import { SolanaNtt } from "../../solana/ts/sdk/index.js";
 import { submitAccountantVAA } from "./accountant.js";

sdk/evm/src/ethers-contracts/0_1_0/NttManager.ts evm/ts/src/ethers-contracts/0_1_0/NttManager.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.cjs.json",
+  "extends": "../../tsconfig.cjs.json",
   "include": ["src"],
   "compilerOptions": {
     "outDir": "dist/cjs",

sdk/evm/src/ethers-contracts/0_1_0/WormholeTransceiver.ts evm/ts/src/ethers-contracts/0_1_0/WormholeTransceiver.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.esm.json",
+  "extends": "../../tsconfig.esm.json",
   "include": ["src"],
   "compilerOptions": {
     "outDir": "dist/esm",

sdk/evm/src/ethers-contracts/0_1_0/common.ts evm/ts/src/ethers-contracts/0_1_0/common.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.esm.json",
+  "extends": "../../tsconfig.esm.json",
   "include": ["src/**/*.ts", "src/**/*.json"],
   "compilerOptions": {
     "rootDir": "src",

sdk/evm/src/ethers-contracts/0_1_0/factories/NttManager__factory.ts evm/ts/src/ethers-contracts/0_1_0/factories/NttManager__factory.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.cjs.json",
+  "extends": "../../tsconfig.cjs.json",
   "include": ["src"],
   "compilerOptions": {
     "outDir": "dist/cjs",

sdk/evm/src/ethers-contracts/0_1_0/factories/WormholeTransceiver__factory.ts evm/ts/src/ethers-contracts/0_1_0/factories/WormholeTransceiver__factory.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.esm.json",
+  "extends": "../../tsconfig.esm.json",
   "include": ["src"],
   "compilerOptions": {
     "outDir": "dist/esm",

sdk/evm/src/ethers-contracts/0_1_0/factories/index.ts evm/ts/src/ethers-contracts/0_1_0/factories/index.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "CommonJS",
     "moduleResolution": "Node"

sdk/evm/src/ethers-contracts/0_1_0/index.ts evm/ts/src/ethers-contracts/0_1_0/index.ts

@@ -1,5 +1,5 @@
 {
-  "extends": "../tsconfig.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "module": "NodeNext",
     "moduleResolution": "NodeNext"