cleaning up

.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 # [email protected]
         id: get-gh-token

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 \

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 {