Skip to content

Switch from forked to upstream go-ethereum#893

Merged
turbolent merged 1 commit into
masterfrom
bastian/replace-geth-fork
Aug 19, 2025
Merged

Switch from forked to upstream go-ethereum#893
turbolent merged 1 commit into
masterfrom
bastian/replace-geth-fork

Conversation

@turbolent
Copy link
Copy Markdown
Member

Description

onflow/flow-go#7676 switched flow-go from our go-ethereum fork to the upstream.

The SDK is still using the fork, which leads to downstream compilation problems:

# github.com/onflow/cadence-tools/languageserver/integration.test
/opt/homebrew/Cellar/go/1.24.2/libexec/pkg/tool/darwin_arm64/link: running cc failed: exit status 1
/usr/bin/cc -arch arm64 -Wl,-S -Wl,-x -o $WORK/b1385/integration.test -Qunused-arguments /var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/go.o
[...] /var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000082.o -lresolv -O2 -g -O2 -g -framework CoreFoundation -framework CoreFoundation -framework Security -O2 -g -O2 -g -O2 -g -O2 -g -O2 -g -O2 -g
duplicate symbol '_secp256k1_ec_pubkey_serialize' in:
    /private/var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000027.o
    /private/var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000033.o
duplicate symbol '_secp256k1_context_set_error_callback' in:
    /private/var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000027.o
    /private/var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000033.o
duplicate symbol '_secp256k1_nonce_function_default' in:
    /private/var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000027.o
    /private/var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000033.o
duplicate symbol '_secp256k1_ec_pubkey_create' in:
    /private/var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000027.o
    /private/var/folders/n6/04ql0mr94nq5qj61wz_lcsx40000gn/T/go-link-1537733619/000033.o
[...]

see e.g. OffchainLabs/go-ethereum#207

Replace the fork with the upstream version.


For contributor use:

  • Targeted PR against master branch
  • Linked to Github issue with discussion and accepted design OR link to spec that describes this work.
  • Code follows the standards mentioned here.
  • Updated relevant documentation
  • Re-reviewed Files changed in the Github PR explorer
  • Added appropriate labels

@turbolent turbolent self-assigned this Aug 18, 2025
@turbolent turbolent added Bugfix Dependencies Pull requests that update a dependency file labels Aug 18, 2025
@turbolent turbolent merged commit 53548d3 into master Aug 19, 2025
1 check passed
@turbolent turbolent deleted the bastian/replace-geth-fork branch August 19, 2025 15:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Bugfix Dependencies Pull requests that update a dependency file

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants