From b65b682e8db4950fc9886dc00f2d76f6239447a8 Mon Sep 17 00:00:00 2001 From: royvardhan Date: Tue, 28 Jan 2025 23:19:06 +0530 Subject: [PATCH] feat: update remappings and remove node modules --- .github/workflows/evm-foundry-ci.yml | 11 ----------- .github/workflows/slither.yml | 2 +- .gitmodules | 3 +++ foundry/lib/balancer-v2-monorepo | 1 + foundry/package.json | 9 --------- foundry/remappings.txt | 2 +- foundry/yarn.lock | 8 -------- 7 files changed, 6 insertions(+), 30 deletions(-) create mode 160000 foundry/lib/balancer-v2-monorepo delete mode 100644 foundry/package.json delete mode 100644 foundry/yarn.lock diff --git a/.github/workflows/evm-foundry-ci.yml b/.github/workflows/evm-foundry-ci.yml index d2bf801..ee56fa0 100644 --- a/.github/workflows/evm-foundry-ci.yml +++ b/.github/workflows/evm-foundry-ci.yml @@ -17,17 +17,6 @@ jobs: with: submodules: recursive - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '18' - cache: 'yarn' - cache-dependency-path: 'foundry/yarn.lock' - - - name: Install Dependencies - working-directory: foundry - run: yarn install --frozen-lockfile - - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 diff --git a/.github/workflows/slither.yml b/.github/workflows/slither.yml index cc92a37..4134b29 100644 --- a/.github/workflows/slither.yml +++ b/.github/workflows/slither.yml @@ -14,4 +14,4 @@ jobs: - uses: crytic/slither-action@v0.4.0 with: target: 'foundry/' - slither-args: '--filter-paths foundry/lib/,foundry/node_modules/' \ No newline at end of file + slither-args: '--filter-paths foundry/lib/' \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index b573165..e830f1a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "foundry/lib/v2-core"] path = foundry/lib/v2-core url = https://github.com/uniswap/v2-core +[submodule "foundry/lib/balancer-v2-monorepo"] + path = foundry/lib/balancer-v2-monorepo + url = https://github.com/balancer/balancer-v2-monorepo diff --git a/foundry/lib/balancer-v2-monorepo b/foundry/lib/balancer-v2-monorepo new file mode 160000 index 0000000..36d2823 --- /dev/null +++ b/foundry/lib/balancer-v2-monorepo @@ -0,0 +1 @@ +Subproject commit 36d282374b457dddea828be7884ee0d185db06ba diff --git a/foundry/package.json b/foundry/package.json deleted file mode 100644 index fd5b6fb..0000000 --- a/foundry/package.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "name": "foundry", - "version": "1.0.0", - "main": "index.js", - "license": "MIT", - "dependencies": { - "@balancer-labs/v2-interfaces": "^0.4.0" - } -} diff --git a/foundry/remappings.txt b/foundry/remappings.txt index 0bc9963..ce5c70e 100644 --- a/foundry/remappings.txt +++ b/foundry/remappings.txt @@ -3,4 +3,4 @@ @permit2/=lib/permit2/ @src/=src/ @uniswap-v2/=lib/v2-core/ -@balancer-labs/v2-interfaces/=node_modules/@balancer-labs/v2-interfaces/ \ No newline at end of file +@balancer-labs/v2-interfaces=lib/balancer-v2-monorepo/pkg/interfaces \ No newline at end of file diff --git a/foundry/yarn.lock b/foundry/yarn.lock deleted file mode 100644 index 867b232..0000000 --- a/foundry/yarn.lock +++ /dev/null @@ -1,8 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@balancer-labs/v2-interfaces@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@balancer-labs/v2-interfaces/-/v2-interfaces-0.4.0.tgz#9bfc2aed7bed4208ebf4b18a14664d8e90d4c141" - integrity sha512-K0ij26m8/UOvdPmrAnuh/C7kT8OQupsgV8KRyIt+aTHW1KbPOi4v8zLMwW2AwSYMSRjPK2A/ttlnNizT0iA4Qg==