From 887c79d9a3ccf7664b0a10ca22c2c0b8e552d9e3 Mon Sep 17 00:00:00 2001 From: npty Date: Fri, 19 May 2023 15:18:16 +0700 Subject: [PATCH] chore: Fix build --- .github/workflows/tests.yml | 7 ++++--- lerna.json | 2 +- package-lock.json | 10 +++++----- package.json | 4 +++- .../axelar-local-dev-aptos/__tests__/utils.spec.ts | 10 ++++++++-- packages/axelar-local-dev-aptos/package.json | 5 ++--- packages/axelar-local-dev-aptos/src/AptosNetwork.ts | 1 - packages/axelar-local-dev-aptos/src/utils.ts | 2 +- packages/axelar-local-dev-near/package.json | 5 ++--- packages/axelar-local-dev/package-lock.json | 4 ++-- packages/axelar-local-dev/package.json | 3 +-- 11 files changed, 29 insertions(+), 24 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 93d74078..95316f05 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -16,11 +16,12 @@ jobs: unzip aptos-cli-1.0.4-Ubuntu-22.04-x86_64.zip chmod +x aptos cp aptos /usr/local/bin - - name: Checkout code - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - name: Setup Node + uses: actions/setup-node@v3 with: node-version: 16 + - name: Checkout code + uses: actions/checkout@v3 - name: Cache node_modules uses: actions/cache@v2 with: diff --git a/lerna.json b/lerna.json index 9f6e1f4f..50a3b19d 100644 --- a/lerna.json +++ b/lerna.json @@ -1,7 +1,7 @@ { "$schema": "node_modules/lerna/schemas/lerna-schema.json", "useWorkspaces": true, - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "packages": [ "packages/*" ] diff --git a/package-lock.json b/package-lock.json index d9b42b86..3b043ec6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -29032,7 +29032,7 @@ }, "packages/axelar-local-dev": { "name": "@axelar-network/axelar-local-dev", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "license": "ISC", "dependencies": { "@axelar-network/axelar-cgp-solidity": "github:axelarnetwork/axelar-cgp-solidity#feat/forecaller-service", @@ -29079,21 +29079,21 @@ }, "packages/axelar-local-dev-aptos": { "name": "@axelar-network/axelar-local-dev-aptos", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "license": "ISC", "dependencies": { "@axelar-network/axelar-cgp-aptos": "^1.0.5", - "@axelar-network/axelar-local-dev": "2.0.0-alpha.7", + "@axelar-network/axelar-local-dev": "2.0.0-alpha.12", "aptos": "1.3.16" } }, "packages/axelar-local-dev-near": { "name": "@axelar-network/axelar-local-dev-near", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "license": "ISC", "dependencies": { "@axelar-network/axelar-cgp-near": "^1.0.0", - "@axelar-network/axelar-local-dev": "2.0.0-alpha.7" + "@axelar-network/axelar-local-dev": "2.0.0-alpha.12" } } } diff --git a/package.json b/package.json index ef1d0ed9..2041413b 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,11 @@ { "name": "axelar-local-dev", - "private": true, "workspaces": [ "packages/*" ], + "publishConfig": { + "access": "public" + }, "scripts": { "publish": "lerna publish from-package --yes --dist-tag alpha", "bootstrap": "lerna bootstrap", diff --git a/packages/axelar-local-dev-aptos/__tests__/utils.spec.ts b/packages/axelar-local-dev-aptos/__tests__/utils.spec.ts index ac3b460d..65c1b726 100644 --- a/packages/axelar-local-dev-aptos/__tests__/utils.spec.ts +++ b/packages/axelar-local-dev-aptos/__tests__/utils.spec.ts @@ -1,8 +1,14 @@ import { findNodeModulesPath } from '..'; +import path from 'path'; describe('utils', () => { - it('should be able to find node_modules path', () => { + it('should be able to find base `node_modules` path when the current dir is deep inside the node_modules folder', () => { + const dir = findNodeModulesPath(path.join(__dirname, '..', '..', '..', '/node_modules/@axelar-network/axelar-local-dev/dist')); + expect(dir.endsWith('node_modules')).toBeTruthy(); + }); + + it('should be able to find base `node_modules` path when the current dir is deeper, but it does not inside the node_modules folder', () => { const path = findNodeModulesPath(__dirname); - expect(path).toContain('node_modules'); + expect(path.endsWith('node_modules')).toBeTruthy(); }); }); diff --git a/packages/axelar-local-dev-aptos/package.json b/packages/axelar-local-dev-aptos/package.json index 35028d85..004e5361 100644 --- a/packages/axelar-local-dev-aptos/package.json +++ b/packages/axelar-local-dev-aptos/package.json @@ -1,6 +1,6 @@ { "name": "@axelar-network/axelar-local-dev-aptos", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "main": "dist/index.js", "files": [ "dist/", @@ -15,12 +15,11 @@ "build-contract": "hardhat compile", "build": "run-s clean build-ts build-contract build-aptos", "clean": "rm -rf src/types dist artifacts", - "prepare": "run-s build", "prettier": "prettier --write 'src/**/*.ts'" }, "dependencies": { "@axelar-network/axelar-cgp-aptos": "^1.0.5", - "@axelar-network/axelar-local-dev": "2.0.0-alpha.7", + "@axelar-network/axelar-local-dev": "2.0.0-alpha.12", "aptos": "1.3.16" }, "author": "", diff --git a/packages/axelar-local-dev-aptos/src/AptosNetwork.ts b/packages/axelar-local-dev-aptos/src/AptosNetwork.ts index e96236d4..e4cc9792 100644 --- a/packages/axelar-local-dev-aptos/src/AptosNetwork.ts +++ b/packages/axelar-local-dev-aptos/src/AptosNetwork.ts @@ -98,7 +98,6 @@ export class AptosNetwork extends AptosClient { deployAxelarFrameworkModules() { const nodeModulesPath = findNodeModulesPath(__dirname); const modulePath = path.join(nodeModulesPath, '@axelar-network/axelar-cgp-aptos/aptos/modules/axelar/build/AxelarFramework'); - return this.deploy(modulePath, ['axelar_gas_service.mv', 'address_utils.mv', 'gateway.mv'], '0x1234'); } diff --git a/packages/axelar-local-dev-aptos/src/utils.ts b/packages/axelar-local-dev-aptos/src/utils.ts index e932df60..7bf1ddd9 100644 --- a/packages/axelar-local-dev-aptos/src/utils.ts +++ b/packages/axelar-local-dev-aptos/src/utils.ts @@ -10,7 +10,7 @@ export const getAptosLogID = (chain: string, event: any) => { export const findNodeModulesPath = (currentDir: string) => { let pathfinder: string = currentDir; - while (!pathfinder.includes('node_modules')) { + while (!pathfinder.endsWith('node_modules')) { pathfinder = path.join(pathfinder, '..'); const dirs = fs.readdirSync(pathfinder); if (dirs.indexOf('node_modules') > -1) { diff --git a/packages/axelar-local-dev-near/package.json b/packages/axelar-local-dev-near/package.json index 090e5478..01458617 100644 --- a/packages/axelar-local-dev-near/package.json +++ b/packages/axelar-local-dev-near/package.json @@ -1,6 +1,6 @@ { "name": "@axelar-network/axelar-local-dev-near", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "description": "", "main": "dist/index.js", "files": [ @@ -16,13 +16,12 @@ "build-contract": "rm -rf artifacts && hardhat clean && hardhat compile", "copy-near-wasm": "cp ../../node_modules/@axelar-network/axelar-cgp-near/dist/axelar_cgp_near.wasm src/contracts/ && mkdir -p dist/contracts && cp -r src/contracts/axelar_cgp_near.wasm dist/contracts", "build": "run-s build-near build-contract build-ts copy-near-wasm", - "prepare": "run-s build", "lint": "solhint 'src/contracts/**/*.sol' && eslint 'test/**/*.js'", "prettier": "prettier --write 'src/contracts/**/*.sol' 'test/**/*.js' 'src/**/*.ts'" }, "dependencies": { "@axelar-network/axelar-cgp-near": "^1.0.0", - "@axelar-network/axelar-local-dev": "2.0.0-alpha.7" + "@axelar-network/axelar-local-dev": "2.0.0-alpha.12" }, "author": "", "license": "ISC" diff --git a/packages/axelar-local-dev/package-lock.json b/packages/axelar-local-dev/package-lock.json index fdedd9fa..fc9b1878 100644 --- a/packages/axelar-local-dev/package-lock.json +++ b/packages/axelar-local-dev/package-lock.json @@ -1,12 +1,12 @@ { "name": "@axelar-network/axelar-local-dev", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@axelar-network/axelar-local-dev", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "license": "ISC", "dependencies": { "@axelar-network/axelar-cgp-solidity": "github:axelarnetwork/axelar-cgp-solidity#feat/forecaller-service", diff --git a/packages/axelar-local-dev/package.json b/packages/axelar-local-dev/package.json index f08cd56b..ed4d5b49 100644 --- a/packages/axelar-local-dev/package.json +++ b/packages/axelar-local-dev/package.json @@ -1,6 +1,6 @@ { "name": "@axelar-network/axelar-local-dev", - "version": "2.0.0-alpha.7", + "version": "2.0.0-alpha.12", "description": "", "main": "dist/index.js", "files": [ @@ -15,7 +15,6 @@ "build-ts": "rm -rf dist && tsc", "build-contract": "rm -rf src/artifacts artifacts && hardhat clean && hardhat compile && mv artifacts src/artifacts", "build": "run-s build-contract build-ts", - "prepare": "run-s build", "lint": "solhint 'src/contracts/**/*.sol' && eslint 'test/**/*.js'", "prettier": "prettier --write 'src/contracts/**/*.sol' 'test/**/*.js' 'src/**/*.ts'" },