From 5359428c27de53cdadb1748430c1021930e7a243 Mon Sep 17 00:00:00 2001 From: yashnevatia Date: Wed, 4 Dec 2024 18:23:43 +0530 Subject: [PATCH] cleaning up --- .github/workflows/solidity-wrappers.yml | 10 +--------- contracts/scripts/native_solc_compile_all_ccip | 3 --- core/gethwrappers/abigen.go | 4 ++-- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/solidity-wrappers.yml b/.github/workflows/solidity-wrappers.yml index eb765674882..27392f82465 100644 --- a/.github/workflows/solidity-wrappers.yml +++ b/.github/workflows/solidity-wrappers.yml @@ -52,19 +52,11 @@ jobs: uses: ./.github/actions/setup-nodejs with: prod: "true" - - # - name: Run native compile and generate wrappers - # run: make wrappers - # working-directory: ./contracts - # env: - # FOUNDRY_PROFILE: ccip - name: Run native compile and generate wrappers run: make wrappers-all working-directory: ./contracts - # env: - # FOUNDRY_PROFILE: ccip - + - name: Assume role capable of dispatching action uses: smartcontractkit/.github/actions/setup-github-token@ef78fa97bf3c77de6563db1175422703e9e6674f # setup-github-token@0.2.1 id: get-gh-token diff --git a/contracts/scripts/native_solc_compile_all_ccip b/contracts/scripts/native_solc_compile_all_ccip index 76d45bdee40..21433d80814 100755 --- a/contracts/scripts/native_solc_compile_all_ccip +++ b/contracts/scripts/native_solc_compile_all_ccip @@ -23,7 +23,6 @@ ROOT="$( cd "$(dirname "$0")" >/dev/null 2>&1 ; cd ../../ && pwd -P )" compileContract () { local contract contract=$(basename "$1" ".sol") - echo "compiling $contract" local optimize_runs=$OPTIMIZE_RUNS @@ -41,8 +40,6 @@ compileContract () { --evm-version paris \ "$ROOT"/contracts/src/v0.8/"$1" - echo "compiling $contract zksolc" - zksolc --version zksolc --overwrite -O3 --metadata-hash none \ -o "$ROOT"/contracts/zksolc/v$ZKSOLC_VERSION/"$contract" \ --bin --allow-paths "$ROOT"/contracts/src/v0.8 \ diff --git a/core/gethwrappers/abigen.go b/core/gethwrappers/abigen.go index 9da6f0fd15a..fe26a10a295 100644 --- a/core/gethwrappers/abigen.go +++ b/core/gethwrappers/abigen.go @@ -73,7 +73,7 @@ func Abigen(a AbigenArgs) { ImproveAbigenOutput(a.Out, a.ABI) if a.ZkBinPath != "" { - ImproveAbigenOutput_zks(a.Out, a.ZkBinPath) + ImproveAbigenOutputZks(a.Out, a.ZkBinPath) } } @@ -471,7 +471,7 @@ func addHeader(code []byte) []byte { } // ZK stack logic -func ImproveAbigenOutput_zks(path string, zkBinPath string) { +func ImproveAbigenOutputZks(path string, zkBinPath string) { bs, err := os.ReadFile(path) if err != nil {