fix: rename scripts

Signed-off-by: Reinis Martinsons <[email protected]>

Author: Reinis-FRP

.github/actions/generate-svm-artifacts/action.yml

@@ -22,4 +22,4 @@ runs:
       run: yarn install --frozen-lockfile --ignore-optional
     - name: Generate SVM IDL artifacts
       shell: bash
-      run: yarn generate-svm-assets
+      run: yarn generate-svm-artifacts

Anchor.toml

@@ -47,7 +47,7 @@ proposeRebalanceToHubPool = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/p
 executeRebalanceToHubPool = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/executeRebalanceToHubPool.ts"
 bridgeLiabilityToHubPool = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/bridgeLiabilityToHubPool.ts"
 remoteHubPoolPauseDeposits = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/remoteHubPoolPauseDeposits.ts"
-generateExternalTypes = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/generateExternalTypes.ts"
+generateExternalTypes = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/buildHelpers/generateExternalTypes.ts"
 fakeFillWithRandomDistribution = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/fakeFillWithRandomDistribution.ts"
 addressToPublicKey = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/addressToPublicKey.ts"
 publicKeyToAddress = "NODE_NO_WARNINGS=1 yarn run ts-node ./scripts/svm/publicKeyToAddress.ts"

package.json

@@ -26,22 +26,22 @@
     "lint-fix": "yarn prettier --write **/*.js **/*.ts ./programs/**/*.rs ./contracts**/*.sol && cargo +nightly fmt  --all && cargo clippy",
     "clean-fast": "for dir in node_modules cache cache-zk artifacts artifacts-zk dist typechain; do mv \"${dir}\" \"_${dir}\"; rm -rf \"_${dir}\" &; done",
     "clean": "rm -rf node_modules cache cache-zk artifacts artifacts-zk dist typechain",
-    "generate-svm-assets": "bash ./scripts/svm/buildIdl.sh && sh ./scripts/generate-svm-assets.sh && yarn generate-svm-clients",
-    "generate-svm-clients": "yarn ts-node ./scripts/svm/utils/generate-svm-clients.ts && yarn ts-node ./scripts/svm/utils/rename-clients-imports.ts",
+    "generate-svm-artifacts": "bash ./scripts/svm/buildHelpers/buildIdl.sh && sh ./scripts/svm/buildHelpers/generateSvmAssets.sh && yarn generate-svm-clients",
+    "generate-svm-clients": "yarn ts-node ./scripts/svm/buildHelpers/generateSvmClients.ts && yarn ts-node ./scripts/svm/buildHelpers/renameClientsImports.ts",
     "build-evm": "hardhat compile",
-    "build-svm": "bash ./scripts/svm/buildSvmLocalToolchain.sh",
-    "build-svm-solana-verify": "bash ./scripts/svm/buildSolanaVerify.sh",
+    "build-svm": "bash ./scripts/svm/buildHelpers/buildSvmLocalToolchain.sh",
+    "build-svm-solana-verify": "bash ./scripts/svm/buildHelpers/buildSolanaVerify.sh",
     "build-ts": "rm -rf ./dist && tsc && rsync -a --include '*/' --include '*.d.ts' --exclude '*' ./typechain ./dist/ && yarn export-idl",
     "export-idl": "mkdir -p dist/src/svm/assets/idl && cp src/svm/assets/idl/*.json dist/src/svm/assets/idl/",
-    "build": "yarn build-evm && yarn build-svm && yarn generate-svm-assets && yarn build-ts",
-    "build-verified": "yarn build-evm && yarn build-svm-solana-verify && yarn generate-svm-assets && yarn build-ts",
+    "build": "yarn build-evm && yarn build-svm && yarn generate-svm-artifacts && yarn build-ts",
+    "build-verified": "yarn build-evm && yarn build-svm-solana-verify && yarn generate-svm-artifacts && yarn build-ts",
     "test-evm": "IS_TEST=true hardhat test",
-    "test-svm": "IS_TEST=true yarn build-svm && yarn generate-svm-assets && anchor test --skip-build",
-    "test-svm-solana-verify": "IS_TEST=true yarn build-svm-solana-verify && yarn generate-svm-assets && anchor test --skip-build",
+    "test-svm": "IS_TEST=true yarn build-svm && yarn generate-svm-artifacts && anchor test --skip-build",
+    "test-svm-solana-verify": "IS_TEST=true yarn build-svm-solana-verify && yarn generate-svm-artifacts && anchor test --skip-build",
     "test": "yarn test-evm && yarn test-svm",
     "test-verified": "yarn test-evm && yarn test-svm-solana-verify",
     "test:report-gas": "IS_TEST=true REPORT_GAS=true hardhat test",
-    "generate-evm-assets": "rm -rf typechain && TYPECHAIN=ethers yarn hardhat typechain",
+    "generate-evm-artifacts": "rm -rf typechain && TYPECHAIN=ethers yarn hardhat typechain",
     "process-hardhat-export": "hardhat export --export-all ./cache/massExport.json && ts-node ./scripts/processHardhatExport.ts && prettier --write ./deployments/deployments.json",
     "pre-commit-hook": "sh scripts/preCommitHook.sh"
   },

scripts/svm/buildIdl.sh renamed to scripts/svm/buildHelpers/buildIdl.sh

@@ -27,13 +27,13 @@ const fetchIdl = async (programName: string, programId: string) => {
   // CCTP programs have missing metadata.address
   idl.metadata = { address: programId };
 
-  const idlDir = path.resolve(__dirname, "../../target/idl");
+  const idlDir = path.resolve(__dirname, "../../../target/idl");
   const outputFilePath = path.join(idlDir, `${programName}.json`);
   fs.writeFileSync(outputFilePath, JSON.stringify(idl, null, 2));
 };
 
 const convertIdl = async (programName: string): Promise<void> => {
-  const idlDir = path.resolve(__dirname, "../../target/idl");
+  const idlDir = path.resolve(__dirname, "../../../target/idl");
   const idlFilePath = path.join(idlDir, `${programName}.json`);
 
   return new Promise((resolve, reject) => {
@@ -51,9 +51,9 @@ const convertIdl = async (programName: string): Promise<void> => {
 };
 
 const generateType = async (programName: string): Promise<void> => {
-  const idlDir = path.resolve(__dirname, "../../target/idl");
+  const idlDir = path.resolve(__dirname, "../../../target/idl");
   const idlFilePath = path.join(idlDir, `${programName}.json`);
-  const typesDir = path.resolve(__dirname, "../../target/types");
+  const typesDir = path.resolve(__dirname, "../../../target/types");
   const typeFilePath = path.join(typesDir, `${programName}.ts`);
 
   return new Promise((resolve, reject) => {
@@ -71,8 +71,8 @@ const generateType = async (programName: string): Promise<void> => {
 };
 
 const copyIdls = async (programName: string): Promise<void> => {
-  const idlDir = path.resolve(__dirname, "../../target/idl");
-  const idlsDir = path.resolve(__dirname, "../../idls");
+  const idlDir = path.resolve(__dirname, "../../../target/idl");
+  const idlsDir = path.resolve(__dirname, "../../../idls");
   const idlFilePath = path.join(idlDir, `${programName}.json`);
   const idlFilePathCopy = path.join(idlsDir, `${programName}.json`);