Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

new pkgs #217

Merged
merged 26 commits into from
Aug 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/afraid-fans-call.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@moonwall/types": patch
"@moonwall/util": patch
"@moonwall/cli": patch
---

Pkg updates
7 changes: 7 additions & 0 deletions .changeset/tame-drinks-lie.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@moonwall/types": patch
"@moonwall/util": patch
"@moonwall/cli": patch
---

Pkg Updates
105 changes: 74 additions & 31 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x
cache: "pnpm"
- run: pnpm install --frozen-lockfile
- run: pnpm install --no-frozen-lockfile
- run: pnpm run lint && pnpm run build

test_basic:
Expand All @@ -31,39 +31,58 @@ jobs:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x
cache: "pnpm"
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Build like before
run: |
pnpm install --frozen-lockfile
pnpm install --no-frozen-lockfile
pnpm run lint && pnpm run build
- name: Run standard dev test
run: pnpm moonwall test basic
run: |
cd test
bun moonwall test basic

test_dev:
runs-on: ubuntu-latest
needs: ["build"]
steps:
- uses: actions/checkout@v3
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- uses: pnpm/action-setup@v2
with:
version: 8
version: "latest"
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x
cache: "pnpm"
- name: Build like before
run: |
pnpm install --frozen-lockfile
pnpm install --no-frozen-lockfile
pnpm run lint && pnpm run build
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Download moonbeam binary
run: pnpm moonwall download moonbeam latest ./tmp
run: |
cd test
bun moonwall download moonbeam latest ./tmp
- name: Run standard dev test
run: pnpm moonwall test dev_test
# - name: Run parallel dev test <--- doesn't work for some reason
# run: pnpm moonwall test dev_multi
run: |
cd test
bun moonwall test dev_test
- name: Run parallel dev test
run: |
cd test
bun moonwall test dev_multi
- name: Run sequential dev test
run: pnpm moonwall test dev_seq
run: |
cd test
bun moonwall test dev_seq

test_chopsticks:
runs-on: ubuntu-latest
Expand All @@ -75,14 +94,19 @@ jobs:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x
cache: "pnpm"
- name: Build like before
run: |
pnpm install --frozen-lockfile
pnpm install --no-frozen-lockfile
pnpm run lint && pnpm run build
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Run standard chopsticks run
run: pnpm moonwall test chopsticks
run: |
cd test
bun moonwall test chopsticks

test_readonly:
runs-on: ubuntu-latest
Expand All @@ -94,19 +118,26 @@ jobs:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x
cache: "pnpm"
- name: Build like before
run: |
pnpm install --frozen-lockfile
pnpm install --no-frozen-lockfile
pnpm run lint && pnpm run build
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Run standard ethers run
run: pnpm moonwall test eth_test
run: |
cd test
bun moonwall test eth_test
- name: Run standard viem run
run: pnpm moonwall test viem_test
run: |
cd test
bun moonwall test viem_test
# disabled until web3.js fix their stuff
# - name: Run standard web3 run
# run: pnpm moonwall test web3_test
# run: bun moonwall test web3_test

test_zombie:
runs-on: ubuntu-latest
Expand All @@ -118,18 +149,24 @@ jobs:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x
cache: "pnpm"
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Build like before
run: |
pnpm install --frozen-lockfile
pnpm install --no-frozen-lockfile
pnpm run lint && pnpm run build
- name: Download binaries
run: |
pnpm moonwall download moonbeam latest ./tmp
pnpm moonwall download polkadot latest ./tmp
cd test
bun moonwall download moonbeam latest ./tmp
bun moonwall download polkadot latest ./tmp
- name: Run standard zombie test
run: pnpm moonwall test zombie_test
run: |
cd test
bun moonwall test zombie_test

test_multi_zombie:
runs-on: ubuntu-latest
Expand All @@ -141,15 +178,21 @@ jobs:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x
cache: "pnpm"
- uses: oven-sh/setup-bun@v1
with:
bun-version: latest
- name: Build like before
run: |
pnpm install --frozen-lockfile
pnpm install --no-frozen-lockfile
pnpm run lint && pnpm run build
- name: Download binaries
run: |
pnpm moonwall download moonbeam latest ./tmp
pnpm moonwall download polkadot latest ./tmp
cd test
bun moonwall download moonbeam latest ./tmp
bun moonwall download polkadot latest ./tmp
- name: Run multi zombie test
run: pnpm moonwall test zombie_multi_para
run: |
cd test
bun moonwall test zombie_multi_para
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
version: 8
- uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x
cache: "pnpm"
- run: pnpm install --frozen-lockfile
- run: pnpm run lint && pnpm run build
Expand Down
11 changes: 5 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
node_modules/
dist/
html/*
**/node_modules/
**/dist/
test/html/*
*.sqlite
**/*.log
downloads/*
Expand All @@ -9,13 +9,12 @@ moonbeam
polkadot
geth
node_modules
.env
coverage
coverage.json
typechain
typechain-types

# Hardhat files
cache
artifacts
contracts/out
**/tmp/*
**/contracts/out/*
3 changes: 1 addition & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
ignore-workspace-root-check=true
strict-peer-dependencies=false
registry=https://registry.npmjs.org/
node-linker = hoisted
registry=https://registry.npmjs.org/
36 changes: 1 addition & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,45 +13,11 @@
"changeset": "changeset",
"changeset:release": "changeset publish",
"changeset:version": "changeset version",
"clean-all": "rimraf node_modules && pnpm rimraf pnpm-lock.yaml && pnpm -r --filter='./packages/**' run clean && pnpm store prune",
"clean-all": "rm -rf node_modules && pnpm -r --filter='./packages/**' run clean && pnpm store prune",
"pristine-build": "pnpm clean-all && pnpm i && pnpm build && pnpm generate-types",
"start": "pnpm exec moonwall",
"display-reports": "pnpm exec vite preview --base __vitest__ --outDir html",
"test": "pnpm exec moonwall test 'basic chopsticks dev_seq chop_state_test'",
"typecheck": "pnpm -r --filter='./packages/**' run typecheck"
},
"devDependencies": {
"@acala-network/chopsticks": "^0.7.3",
"@changesets/cli": "^2.26.1",
"@moonbeam-network/api-augment": "^0.2400.0",
"@moonwall/cli": "workspace:*",
"@moonwall/types": "workspace:*",
"@moonwall/util": "workspace:*",
"@openzeppelin/contracts": "^4.9.2",
"@polkadot/api": "^10.9.1",
"@polkadot/api-augment": "^10.9.1",
"@polkadot/api-derive": "^10.9.1",
"@polkadot/keyring": "^12.3.2",
"@polkadot/rpc-provider": "^10.9.1",
"@polkadot/util-crypto": "^12.3.2",
"@types/node": "^18.16.19",
"@vitest/utils": "^0.29.8",
"debug": "^4.3.4",
"ethers": "^6.6.7",
"pnpm": "8.6.2",
"prettier": "^2.8.8",
"rimraf": "^4.4.1",
"solc": "^0.8.19",
"typescript": "^5.1.6",
"viem": "^1.5.0",
"vitest": "^0.34.1"
},
"pnpm": {
"overrides": {
"@moonwall/cli": "workspace:*",
"@moonwall/types": "workspace:*",
"@moonwall/util": "workspace:*",
"solc": "^0.8.19"
}
}
}
32 changes: 16 additions & 16 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
".": {
"types": "./dist/index.d.ts",
"require": "./dist/index.cjs",
"import": "./dist/index.js"
"import": "./dist/index.js",
"bun": "./src/cmds/entrypoint.ts"
}
},
"module": "./dist/index.js",
Expand All @@ -48,36 +49,34 @@
"*.cjs"
],
"scripts": {
"clean": "pnpm rimraf dist && pnpm rimraf node_modules",
"build": "pnpm exec rimraf dist && tsup src --format cjs,esm --config tsup.config.ts && pnpm generate-types",
"clean": "rm -rf dist && rm -rf node_modules",
"build": "pnpm exec rm -rf dist && tsup src --format cjs,esm --config tsup.config.ts && pnpm generate-types",
"generate-types": "tsup src --format cjs,esm --dts --config tsup.config.ts",
"watch": "tsup src --format cjs,esm --dts --watch",
"typecheck": "pnpm exec tsc --noEmit",
"prepublish": "pnpm run build && pnpm run generate-types && pnpm typecheck",
"prepare": "pnpm build",
"compile": "pnpm build ",
"lint": "tsc"
"prepublish": "pnpm run build && pnpm run generate-types && pnpm typecheck"
},
"dependencies": {
"@moonwall/types": "workspace:*",
"@polkadot/util-crypto": "^12.3.2",
"@types/cli-progress": "^3.11.0",
"@types/debug": "^4.1.8",
"@types/node": "^18.16.19",
"@types/node": "^20.4.8",
"@types/yargs": "^17.0.24",
"@zombienet/orchestrator": "^0.0.50",
"bottleneck": "^2.19.5",
"chalk": "^5.2.0",
"chalk": "^5.3.0",
"clear": "^0.1.0",
"cli-progress": "^3.12.0",
"colors": "^1.4.0",
"debug": "^4.3.4",
"dotenv": "^16.3.1",
"inquirer": "^8.2.5",
"inquirer": "^8.2.6",
"inquirer-press-to-continue": "^1.2.0",
"node-fetch": "^3.3.1",
"node-fetch": "^3.3.2",
"prettier": "^2.8.8",
"semver": "^7.5.4",
"tsup": "^7.1.0",
"tsup": "^7.2.0",
"tsx": "^3.12.7",
"vitest": "^0.34.1",
"ws": "^8.13.0",
Expand All @@ -96,6 +95,7 @@
"@polkadot/types-codec": "^10.9.1",
"@polkadot/util": "^12.3.2",
"ethers": "^6.6.7",
"tsx": "^3.12.7",
"viem": "^1.5.0",
"web3": "4.0.3",
"web3-providers-ws": "4.0.3"
Expand All @@ -107,14 +107,14 @@
"@polkadot/api": "^10.9.1",
"@polkadot/api-augment": "^10.9.1",
"@polkadot/api-derive": "^10.9.1",
"@polkadot/keyring": "^12.3.1",
"@polkadot/keyring": "^12.3.2",
"@polkadot/types": "^10.9.1",
"@polkadot/types-codec": "^10.9.1",
"@polkadot/util": "^12.3.2",
"@vitest/ui": "^0.34.0",
"ethers": "^6.6.7",
"@vitest/ui": "^0.34.1",
"ethers": "^6.7.0",
"typescript": "^5.1.6",
"viem": "^1.5.0",
"viem": "^1.5.3",
"web3": "4.0.3",
"web3-providers-ws": "4.0.3"
},
Expand Down
Loading