Skip to content

Commit e01e1f6

Browse files
authored
Revert "crypto/kzg4844: pull in the C and Go libs for KZG cryptography (ethereum#27155)"
This reverts commit ff65508.
1 parent e3027aa commit e01e1f6

File tree

12 files changed

+39
-8890
lines changed

12 files changed

+39
-8890
lines changed

build/ci.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ func doInstall(cmdline []string) {
207207
csdb := build.MustLoadChecksums("build/checksums.txt")
208208
tc.Root = build.DownloadGo(csdb, dlgoVersion)
209209
}
210-
// Disable CLI markdown doc generation in release builds and enable linking
211-
// the CKZG library since we can make it portable here.
212-
buildTags := []string{"urfave_cli_no_docs", "ckzg"}
210+
211+
// Disable CLI markdown doc generation in release builds.
212+
buildTags := []string{"urfave_cli_no_docs"}
213213

214214
// Configure the build.
215215
env := build.Env()
@@ -221,6 +221,7 @@ func doInstall(cmdline []string) {
221221
if env.CI && runtime.GOARCH == "arm64" {
222222
gobuild.Args = append(gobuild.Args, "-p", "1")
223223
}
224+
224225
// We use -trimpath to avoid leaking local paths into the built executables.
225226
gobuild.Args = append(gobuild.Args, "-trimpath")
226227

@@ -298,7 +299,7 @@ func doTest(cmdline []string) {
298299
csdb := build.MustLoadChecksums("build/checksums.txt")
299300
tc.Root = build.DownloadGo(csdb, dlgoVersion)
300301
}
301-
gotest := tc.Go("test", "-tags=ckzg")
302+
gotest := tc.Go("test")
302303

303304
// Test a single package at a time. CI builders are slow
304305
// and some tests run into timeouts under load.

cmd/geth/main.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,6 @@ var (
107107
utils.CachePreimagesFlag,
108108
utils.CacheLogSizeFlag,
109109
utils.FDLimitFlag,
110-
utils.CryptoKZGFlag,
111110
utils.ListenPortFlag,
112111
utils.DiscoveryPortFlag,
113112
utils.MaxPeersFlag,

cmd/utils/flags.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import (
4545
"github.com/ethereum/go-ethereum/core/types"
4646
"github.com/ethereum/go-ethereum/core/vm"
4747
"github.com/ethereum/go-ethereum/crypto"
48-
"github.com/ethereum/go-ethereum/crypto/kzg4844"
4948
"github.com/ethereum/go-ethereum/eth"
5049
ethcatalyst "github.com/ethereum/go-ethereum/eth/catalyst"
5150
"github.com/ethereum/go-ethereum/eth/downloader"
@@ -455,12 +454,6 @@ var (
455454
Usage: "Raise the open file descriptor resource limit (default = system fd limit)",
456455
Category: flags.PerfCategory,
457456
}
458-
CryptoKZGFlag = &cli.StringFlag{
459-
Name: "crypto.kzg",
460-
Usage: "KZG library implementation to use; gokzg (recommended) or ckzg",
461-
Value: "gokzg",
462-
Category: flags.PerfCategory,
463-
}
464457

465458
// Miner settings
466459
MiningEnabledFlag = &cli.BoolFlag{
@@ -1754,6 +1747,7 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
17541747
cfg.EthDiscoveryURLs = SplitAndTrim(urls)
17551748
}
17561749
}
1750+
17571751
// Override any default configs for hard coded networks.
17581752
switch {
17591753
case ctx.Bool(MainnetFlag.Name):
@@ -1863,14 +1857,6 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
18631857
SetDNSDiscoveryDefaults(cfg, params.MainnetGenesisHash)
18641858
}
18651859
}
1866-
// Set any dangling config values
1867-
if ctx.String(CryptoKZGFlag.Name) != "gokzg" && ctx.String(CryptoKZGFlag.Name) != "ckzg" {
1868-
Fatalf("--%s flag must be 'gokzg' or 'ckzg'", CryptoKZGFlag.Name)
1869-
}
1870-
log.Info("Initializing the KZG library", "backend", ctx.String(CryptoKZGFlag.Name))
1871-
if err := kzg4844.UseCKZG(ctx.String(CryptoKZGFlag.Name) == "ckzg"); err != nil {
1872-
Fatalf("Failed to set KZG library implementation to %s: %v", ctx.String(CryptoKZGFlag.Name), err)
1873-
}
18741860
}
18751861

18761862
// SetDNSDiscoveryDefaults configures DNS discovery with the given URL if

crypto/kzg4844/kzg4844.go

Lines changed: 0 additions & 110 deletions
This file was deleted.

crypto/kzg4844/kzg4844_ckzg_cgo.go

Lines changed: 0 additions & 119 deletions
This file was deleted.

crypto/kzg4844/kzg4844_ckzg_nocgo.go

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)