copy idl to ts dir

Author: barnjamin

evm/package.json

@@ -3,8 +3,9 @@
   "version": "0.0.1",
   "author": "Wormhole Contributors",
   "license": "Apache-2.0",
-  "main": "./lib/cjs/index.js",
-  "module": "./lib/esm/index.js",
+  "main": "./dist/cjs/index.js",
+  "types":"./dist/cjs/index.d.ts",
+  "module": "./dist/esm/index.js",
   "scripts": {
     "build:esm": "tsc -p tsconfig.esm.json",
     "build:cjs": "tsc -p tsconfig.cjs.json",

solana/.gitignore

@@ -8,4 +8,5 @@
 /node_modules
 target
 /ts/tests/artifacts
-dist
+dist
+*.tsbuildinfo

solana/Anchor.toml

@@ -31,7 +31,7 @@ cluster = "Localnet"
 wallet = "ts/tests/keys/pFCBP4bhqdSsrWUVTgqhPsLrfEdChBK17vgFM7TxjxQ.json"
 
 [scripts]
-test = "npx ts-mocha -p ./tsconfig.json -t 1000000 --exit ts/tests/[0-9]*.ts"
+test = "npx ts-mocha -p ./tsconfig.anchor.json -t 1000000 --exit ts/tests/[0-9]*.ts"
 
 [test]
 startup_wait = 20000

solana/Makefile

@@ -56,16 +56,13 @@ anchor-test-setup: node_modules ts/tests/artifacts $(CLONED_MAINNET_PROGRAMS)
 .PHONY: anchor-build-idl
 anchor-build-idl:
 	anchor build -- --features localnet
-	git diff --exit-code
+#	git diff --exit-code
 
 idl: anchor-build-idl
-	mkdir -p ts/idl/json
-	mkdir -p ts/idl/ts
-	cp -r target/idl/* ts/idl/json/
-	for jsonfile in ts/idl/json/*.json; do \
-	  tsfile=$$(echo $$jsonfile | sed 's/json\/\(.*\)\.json/ts\/\1.ts/'); \
-	  tsx scripts/regenerateIdl.ts $$jsonfile > $$tsfile; \
-	done
+	mkdir -p ts/src/idl/json
+	mkdir -p ts/src/idl/ts
+	cp -r target/idl/* ts/src/idl/json/
+	cp -r target/types/* ts/src/idl/ts/
 
 $(BUILD_$(NETWORK)): cargo-test
 

solana/package.json

@@ -1,6 +1,23 @@
 {
   "name":"@wormhole-foundation/liquidity-layer-solana",
   "version": "0.0.1",
+  "main": "dist/cjs/index.js",
+  "types": "dist/cjs/index.d.ts",
+  "module": "dist/esm/index.js",
+  "files":[
+    "dist/cjs",
+    "dist/esm"
+  ],
+  "exports":{
+    ".":{
+      "import":"./dist/esm/index.js",
+      "require":"./dist/cjs/index.js"
+    },
+    "./*":{
+      "import":"./dist/esm/*/index.js",
+      "require":"./dist/cjs/*/index.js"
+    }
+  },
   "scripts": {
     "lint:fix": "prettier */*.js \"*/**/*{.js,.ts}\" -w",
     "lint": "prettier */*.js \"*/**/*{.js,.ts}\" --check",

solana/ts/auction-participant/utils/config.ts

@@ -2,7 +2,7 @@ import * as wormholeSdk from "@certusone/wormhole-sdk";
 import * as splToken from "@solana/spl-token";
 import { Commitment, Connection, FetchFn, PublicKey, PublicKeyInitData } from "@solana/web3.js";
 import { ethers } from "ethers";
-import { USDC_MINT_ADDRESS } from "../../tests/helpers";
+import { USDC_MINT_ADDRESS } from "../../src/testing";
 import { defaultLogger } from "./logger";
 
 export const EVM_FAST_CONSISTENCY_LEVEL = 200;

solana/ts/auction-participant/utils/settleAuction.ts

@@ -4,7 +4,7 @@ import { derivePostedVaaKey } from "@certusone/wormhole-sdk/lib/cjs/solana/wormh
 import * as splToken from "@solana/spl-token";
 import { PreparedTransaction } from "../../src";
 import { Auction, AuctionStatus, MatchingEngineProgram } from "../../src/matchingEngine";
-import { USDC_MINT_ADDRESS } from "../../tests/helpers";
+import { USDC_MINT_ADDRESS } from "../../src/testing";
 import * as utils from "../utils";
 import * as winston from "winston";
 

solana/ts/scripts/executeFastOrder.ts

@@ -1,6 +1,6 @@
 import { Keypair, Connection, Signer } from "@solana/web3.js";
 import { MatchingEngineProgram } from "../src/matchingEngine";
-import { USDC_MINT_ADDRESS } from "../tests/helpers";
+import { USDC_MINT_ADDRESS } from "../src/testing";
 import {
     ChainId,
     getEmitterAddressEth,

solana/ts/src/idl/index.ts

@@ -0,0 +1,13 @@
+export * from "./ts/matching_engine";
+export * from "./ts/token_router";
+export * from "./ts/upgrade_manager";
+
+import * as _MatchingEngineIdl from "./json/matching_engine.json";
+import * as _TokenRouterIdl from "./json/token_router.json";
+import * as _UpgradeManagerIdl from "./json/upgrade_manager.json";
+const idl = {
+    matchingEngine: _MatchingEngineIdl,
+    tokenRouter: _TokenRouterIdl,
+    upgradeManager: _UpgradeManagerIdl,
+};
+export { idl };