Skip to content
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
5 changes: 0 additions & 5 deletions .github/workflows/solidity.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,11 +124,6 @@ jobs:
working-directory: ./chainlink/contracts
run: make wrappers-all

- name: Run zksync compile and generate wrappers
if: ${{ needs.tag-check.outputs.is-release == 'true' || needs.tag-check.outputs.is-pre-release == 'true' }}
working-directory: ./chainlink/contracts
run: make wrappers-zksync

- name: Check if Go solidity wrappers are updated
working-directory: chainlink
run: |
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ tmp/
.pnp
.pnp.js
tools/bin/abigen
tools/bin/forge_zksync

/chainlink
core/chainlink
Expand Down
1 change: 0 additions & 1 deletion contracts/FOUNDRY_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ Check out the official [Foundry best practices section](https://book.getfoundry.
- Use `make snapshot` to generate the correct snapshot for the selected Foundry profile.
- Use `make snapshot-diff` to see the diff between the local snapshot and your latest changes.
- use `make wrappers` to generate the gethwrappers for the selected Foundry profile.
- use `make wrappers-zksync` to generate the gethwrappers for ZK Sync deployments.
- Use `vm.recordLogs();` to record all logs emitted
- Use `vm.getRecordedLogs()` to get the logs emitted.
- This way you can assert that a log was *not* emitted.
Expand Down
8 changes: 0 additions & 8 deletions contracts/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ mockery: $(mockery) ## Install mockery.
foundry: ## Install foundry.
foundryup --install v1.7.1

.PHONY: forge-zksync
forge-zksync:
../tools/bin/install_forge_zksync

.PHONY: foundry-refresh
foundry-refresh: foundry
git submodule deinit -f .
Expand Down Expand Up @@ -93,10 +89,6 @@ wrappers-all: pnpmdep mockery abigen ## Recompiles solidity contracts and their
# Since this is used in CI to ensure all wrappers are up to date, we also generate the CRE wrappers here
cd ./cre/gobindings; go generate ./go_generate.go

.PHONY: wrappers-zksync
wrappers-zksync: pnpmdep forge-zksync
go generate ../gethwrappers/zksync/go_generate.go

help:
@echo ""
@echo " .__ .__ .__ .__ __"
Expand Down
4 changes: 0 additions & 4 deletions contracts/cre/GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ wrappers-release: export metadata=true
wrappers-release: ## Generate the gethwrappers for release which includes metadata.
make wrappers

.PHONY: wrappers-zksync
wrappers-zksync: pnpmdep forge-zksync
go generate ../gethwrappers/zksync/go_generate.go

help:
@echo ""
@echo " .__ .__ .__ .__ __"
Expand Down
10 changes: 2 additions & 8 deletions contracts/cre/gobindings/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,14 @@ go 1.25.13

require (
github.com/ethereum/go-ethereum v1.17.3
github.com/smartcontractkit/chainlink-evm/gethwrappers/helpers v0.0.0-20260113095857-e13e0dd04d9f
github.com/smartcontractkit/chainlink-evm/gethwrappers/helpers v0.0.0-20260910153826-57b3ea930843
)

require (
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/ProjectZKM/Ziren/crates/go-runtime/zkvm_runtime v0.0.0-20251001021608-1fe7b43fc4d6 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/bits-and-blooms/bitset v1.20.0 // indirect
github.com/btcsuite/btcd v0.24.2 // indirect
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/consensys/gnark-crypto v0.18.1 // indirect
github.com/crate-crypto/go-eth-kzg v1.5.0 // indirect
Expand All @@ -31,18 +27,16 @@ require (
github.com/holiman/uint256 v1.3.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect
github.com/stephenlacy/go-ethereum-hdwallet v0.0.0-20230913225845-a4fa94429863 // indirect
github.com/supranational/blst v0.3.16 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
github.com/zksync-sdk/zksync2-go v1.1.0 // indirect
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
go.opentelemetry.io/otel v1.41.0 // indirect
go.opentelemetry.io/otel/metric v1.41.0 // indirect
go.opentelemetry.io/otel/trace v1.41.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.52.0 // indirect
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
golang.org/x/sync v0.19.0 // indirect
golang.org/x/sys v0.45.0 // indirect
golang.org/x/tools v0.40.0 // indirect
Expand Down
109 changes: 2 additions & 107 deletions contracts/cre/gobindings/go.sum

Large diffs are not rendered by default.

13 changes: 2 additions & 11 deletions contracts/cre/gobindings/wrap/wrap.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@ package main

import (
"os"
"path/filepath"

"github.com/smartcontractkit/chainlink-evm/gethwrappers/helpers/generate/wrap"
zksyncwrapper "github.com/smartcontractkit/chainlink-evm/gethwrappers/helpers/zksync"
)

func main() {
Expand All @@ -22,13 +20,6 @@ func main() {

abiGenPath := "../../../../tools/bin/abigen"

if os.Getenv("ZKSYNC") == "true" {
zksyncBytecodePath := filepath.Join("..", "zkout", contract+".sol", contract+".json")
zksyncBytecode := zksyncwrapper.ReadBytecodeFromForgeJSON(zksyncBytecodePath)
outPath := filepath.Join(wrap.GetOutDir(outDirSuffix, pkgName), pkgName+"_zksync.go")
zksyncwrapper.WrapZksyncDeploy(zksyncBytecode, contract, pkgName, outPath)
} else {
projectRoot := "../../solc/" + project
wrap.GenWrapper(projectRoot, contract, pkgName, outDirSuffix, abiGenPath)
}
projectRoot := "../../solc/" + project
wrap.GenWrapper(projectRoot, contract, pkgName, outDirSuffix, abiGenPath)
}
27 changes: 0 additions & 27 deletions contracts/scripts/zksync_compile_all

This file was deleted.

This file was deleted.

59 changes: 0 additions & 59 deletions gethwrappers/generation/generate/zksync/template.go

This file was deleted.

26 changes: 0 additions & 26 deletions gethwrappers/generation/generate/zksync/vars.go

This file was deleted.

Loading
Loading