Skip to content
Draft
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
3 changes: 3 additions & 0 deletions .github/actions/generate-evm-artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ inputs:
runs:
using: "composite"
steps:
- name: Enable Corepack
shell: bash
run: sudo corepack enable
- name: "Use Node ${{ inputs.node_version }}"
uses: ./.github/actions/setup-node-if-needed
with:
Expand Down
5 changes: 4 additions & 1 deletion .github/actions/generate-svm-artifacts/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ inputs:
runs:
using: "composite"
steps:
- name: Enable Corepack
shell: bash
run: sudo corepack enable
- name: "Use Node ${{ inputs.node_version }}"
uses: ./.github/actions/setup-node-if-needed
with:
Expand All @@ -24,7 +27,7 @@ runs:
uses: Swatinem/rust-cache@v2
- name: Install packages
shell: bash
run: yarn install --frozen-lockfile --ignore-optional
run: yarn install --immutable
- name: Generate SVM IDL artifacts
shell: bash
run: yarn generate-svm-artifacts
Expand Down
20 changes: 15 additions & 5 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ jobs:
steps:
- name: Checkout repo
uses: actions/checkout@v3
- name: Enable Corepack
run: sudo corepack enable
- name: "Use Node ${{ env.NODE_VERSION }}"
uses: actions/setup-node@v3
with:
Expand All @@ -87,7 +89,7 @@ jobs:
- name: Cache Cargo dependencies
uses: Swatinem/rust-cache@v2
- name: Install packages
run: yarn install --frozen-lockfile --ignore-optional
run: yarn install --immutable
- name: Lint js
shell: bash
run: yarn lint-js
Expand All @@ -107,13 +109,15 @@ jobs:
steps:
- name: Checkout repo
uses: actions/checkout@v3
- name: Enable Corepack
run: sudo corepack enable
- name: "Use Node ${{ env.NODE_VERSION }}"
uses: actions/setup-node@v3
with:
node-version: "${{ env.NODE_VERSION }}"
cache: yarn
- name: Install packages
run: yarn install --frozen-lockfile --ignore-optional
run: yarn install --immutable
- name: Download SVM artifacts
uses: actions/download-artifact@v4
with:
Expand All @@ -132,13 +136,15 @@ jobs:
steps:
- name: Checkout repo
uses: actions/checkout@v3
- name: Enable Corepack
run: sudo corepack enable
- name: "Use Node ${{ env.NODE_VERSION }}"
uses: actions/setup-node@v3
with:
node-version: "${{ env.NODE_VERSION }}"
cache: yarn
- name: Install packages
run: yarn install --frozen-lockfile --ignore-optional
run: yarn install --immutable
- name: Setup Anchor & Solana
uses: ./.github/actions/setup-solana-anchor
with:
Expand Down Expand Up @@ -186,13 +192,15 @@ jobs:
steps:
- name: Checkout repo
uses: actions/checkout@v3
- name: Enable Corepack
run: sudo corepack enable
- name: "Use Node ${{ env.NODE_VERSION }}"
uses: actions/setup-node@v3
with:
node-version: "${{ env.NODE_VERSION }}"
cache: yarn
- name: Install packages
run: yarn install --frozen-lockfile --ignore-optional
run: yarn install --immutable
- name: Download SVM artifacts
uses: actions/download-artifact@v4
with:
Expand All @@ -209,13 +217,15 @@ jobs:
steps:
- name: Checkout repo
uses: actions/checkout@v3
- name: Enable Corepack
run: sudo corepack enable
- name: "Use Node ${{ env.NODE_VERSION }}"
uses: actions/setup-node@v3
with:
node-version: "${{ env.NODE_VERSION }}"
cache: yarn
- name: Install packages
run: yarn install --frozen-lockfile --ignore-optional
run: yarn install --immutable
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1
- name: Install forge dependencies
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Enable Corepack
run: sudo corepack enable

# Note we set an `id` called `release`. We'll use that later...
- name: Validate and extract release information
id: release
Expand Down Expand Up @@ -117,6 +120,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Enable Corepack
run: sudo corepack enable

- name: Setup Anchor & Solana
uses: ./.github/actions/setup-solana-anchor
with:
Expand All @@ -140,6 +146,9 @@ jobs:
steps:
- uses: actions/checkout@v2

- name: Enable Corepack
run: sudo corepack enable

- name: Setup Anchor & Solana
uses: ./.github/actions/setup-solana-anchor
with:
Expand Down
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,13 @@ test-ledger
src/svm/assets
src/svm/clients/*
!src/svm/clients/index.ts


# Yarn files
.pnp.*
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
22.18.0
6 changes: 5 additions & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
node_modules
.yarn
artifacts
cache
coverage*
Expand All @@ -9,4 +10,7 @@ artifacts-zk
cache-zk
lib
target
idls
idls
out
zkout
cache-foundry
5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
enableGlobalCache: false

enableHardenedMode: false

nodeLinker: node-modules
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"forge-script-zksync": " FOUNDRY_PROFILE=zksync forge script --zksync --suppress-errors sendtransfer",
"lint": "yarn lint-solidity && yarn lint-js && yarn lint-rust",
"lint-solidity": "yarn solhint ./contracts/**/*.sol",
"lint-js": "yarn prettier --list-different **/*.js **/*.ts",
"lint-js": "yarn prettier --list-different \"**/*.{js,ts}\"",
"lint-rust": "cargo +nightly fmt --all -- --check && cargo clippy",
"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 out zkout; do mv \"${dir}\" \"_${dir}\"; rm -rf \"_${dir}\" &; done",
Expand Down Expand Up @@ -149,9 +149,7 @@
"secp256k1@5.0.0": "5.0.1"
},
"resolutions": {
"**/eccrypto/secp256k1": "3.8.1",
"**/eth-crypto/secp256k1": "5.0.1",
"**/create-hash/sha.js": "2.4.12",
"sha.js": "2.4.12"
}
},
"packageManager": "yarn@4.10.3"
}
Loading
Loading