move secp256k1 to erigontech (#11209)

erigontech · Jul 17, 2024 · 1b10799 · 1b10799
1 parent eb49fa3
commit 1b10799
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 19 deletions.
diff --git a/cmd/integration/commands/stages.go b/cmd/integration/commands/stages.go
@@ -29,16 +29,13 @@ import (
 	"time"
 
 	"github.com/c2h5oh/datasize"
-	"github.com/erigontech/mdbx-go/mdbx"
 	lru "github.com/hashicorp/golang-lru/arc/v2"
-	"github.com/ledgerwatch/secp256k1"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/errgroup"
 	"golang.org/x/sync/semaphore"
 
-	"github.com/ledgerwatch/erigon-lib/log/v3"
-	"github.com/ledgerwatch/erigon/cl/clparams"
-	"github.com/ledgerwatch/erigon/turbo/logging"
+	"github.com/erigontech/mdbx-go/mdbx"
+	"github.com/erigontech/secp256k1"
 
 	chain2 "github.com/ledgerwatch/erigon-lib/chain"
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
@@ -48,8 +45,11 @@ import (
 	"github.com/ledgerwatch/erigon-lib/downloader"
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon-lib/kv/rawdbv3"
+	"github.com/ledgerwatch/erigon-lib/log/v3"
 	libstate "github.com/ledgerwatch/erigon-lib/state"
 	"github.com/ledgerwatch/erigon-lib/wrap"
+
+	"github.com/ledgerwatch/erigon/cl/clparams"
 	"github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb"
 	"github.com/ledgerwatch/erigon/consensus"
 	"github.com/ledgerwatch/erigon/core"
@@ -74,6 +74,7 @@ import (
 	"github.com/ledgerwatch/erigon/polygon/heimdall"
 	"github.com/ledgerwatch/erigon/turbo/builder"
 	"github.com/ledgerwatch/erigon/turbo/debug"
+	"github.com/ledgerwatch/erigon/turbo/logging"
 	"github.com/ledgerwatch/erigon/turbo/services"
 	"github.com/ledgerwatch/erigon/turbo/shards"
 	"github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks"

diff --git a/consensus/aura/empty_step.go b/consensus/aura/empty_step.go
@@ -21,7 +21,7 @@ import (
 	"sort"
 	"sync"
 
-	"github.com/ledgerwatch/secp256k1"
+	"github.com/erigontech/secp256k1"
 
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
 

diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go
@@ -26,9 +26,11 @@ import (
 	"math/big"
 
 	"github.com/holiman/uint256"
+
+	"github.com/erigontech/secp256k1"
+
 	"github.com/ledgerwatch/erigon-lib/chain"
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
-	"github.com/ledgerwatch/secp256k1"
 
 	"github.com/ledgerwatch/erigon/common/u256"
 	"github.com/ledgerwatch/erigon/crypto"

diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go
@@ -26,8 +26,9 @@ import (
 	"crypto/elliptic"
 	"fmt"
 
+	"github.com/erigontech/secp256k1"
+
 	"github.com/ledgerwatch/erigon/common/math"
-	"github.com/ledgerwatch/secp256k1"
 )
 
 // Ecrecover returns the uncompressed public key that created the given signature.

diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod
@@ -7,8 +7,8 @@ toolchain go1.22.4
 require (
 	github.com/erigontech/interfaces v0.0.0-20240716134413-fc4152088ee6
 	github.com/erigontech/mdbx-go v0.38.4
+	github.com/erigontech/secp256k1 v1.1.0
 	github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240705135436-5d6d882b41f7
-	github.com/ledgerwatch/secp256k1 v1.0.0
 	github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417
 )
 

diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum
@@ -284,8 +284,8 @@ github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240705135436-5d6d882b41f7 h1:N
 github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240705135436-5d6d882b41f7/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo=
 github.com/erigontech/interfaces v0.0.0-20240716134413-fc4152088ee6 h1:R1AYJT2FeMEwvBcAuYw7QTezk8DpXTQjCN1y5o0YBvI=
 github.com/erigontech/interfaces v0.0.0-20240716134413-fc4152088ee6/go.mod h1:N7OUkhkcagp9+7yb4ycHsG2VWCOmuJ1ONBecJshxtLE=
-github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ=
-github.com/ledgerwatch/secp256k1 v1.0.0/go.mod h1:SPmqJFciiF/Q0mPt2jVs2dTr/1TZBTIA+kPMmKgBAak=
+github.com/erigontech/secp256k1 v1.1.0 h1:mO3YJMUSoASE15Ya//SoHiisptUhdXExuMUN1M0X9qY=
+github.com/erigontech/secp256k1 v1.1.0/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
 github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=

diff --git a/erigon-lib/types/txn.go b/erigon-lib/types/txn.go
@@ -28,9 +28,10 @@ import (
 
 	gokzg4844 "github.com/crate-crypto/go-kzg-4844"
 	"github.com/holiman/uint256"
-	"github.com/ledgerwatch/secp256k1"
 	"golang.org/x/crypto/sha3"
 
+	"github.com/erigontech/secp256k1"
+
 	"github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon-lib/common/fixedgas"
 	"github.com/ledgerwatch/erigon-lib/common/length"

diff --git a/eth/stagedsync/stage_senders.go b/eth/stagedsync/stage_senders.go
@@ -25,9 +25,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/ledgerwatch/secp256k1"
-
-	"github.com/ledgerwatch/erigon-lib/log/v3"
+	"github.com/erigontech/secp256k1"
 
 	"github.com/ledgerwatch/erigon-lib/chain"
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
@@ -36,6 +34,7 @@ import (
 	"github.com/ledgerwatch/erigon-lib/etl"
 	"github.com/ledgerwatch/erigon-lib/kv"
 	"github.com/ledgerwatch/erigon-lib/kv/dbutils"
+	"github.com/ledgerwatch/erigon-lib/log/v3"
 
 	"github.com/ledgerwatch/erigon/common/debug"
 	"github.com/ledgerwatch/erigon/consensus"

diff --git a/go.mod b/go.mod
@@ -6,8 +6,8 @@ toolchain go1.22.2
 
 require (
 	github.com/erigontech/mdbx-go v0.38.4
+	github.com/erigontech/secp256k1 v1.1.0
 	github.com/erigontech/silkworm-go v0.18.0
-	github.com/ledgerwatch/secp256k1 v1.0.0
 )
 
 replace github.com/ledgerwatch/erigon-lib => ./erigon-lib

diff --git a/go.sum b/go.sum
@@ -539,8 +539,8 @@ github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240705135436-5d6d882b41f7 h1:N
 github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240705135436-5d6d882b41f7/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo=
 github.com/ledgerwatch/erigonwatch v0.1.0 h1:TrCjklOu9ZI9/uiMigo1Jnknnk1I/dXUxXymA3xHfzo=
 github.com/ledgerwatch/erigonwatch v0.1.0/go.mod h1:uYq4hs3RL1OtIYRXAxYq02tpdGkx6rtXlpzdazDDbWI=
-github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ=
-github.com/ledgerwatch/secp256k1 v1.0.0/go.mod h1:SPmqJFciiF/Q0mPt2jVs2dTr/1TZBTIA+kPMmKgBAak=
+github.com/erigontech/secp256k1 v1.1.0 h1:mO3YJMUSoASE15Ya//SoHiisptUhdXExuMUN1M0X9qY=
+github.com/erigontech/secp256k1 v1.1.0/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls=
 github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
 github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
 github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=

diff --git a/tests/fuzzers/secp256k1/secp_fuzzer.go b/tests/fuzzers/secp256k1/secp_fuzzer.go
@@ -28,7 +28,8 @@ import (
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	fuzz "github.com/google/gofuzz"
-	"github.com/ledgerwatch/secp256k1"
+
+	"github.com/erigontech/secp256k1"
 )
 
 func Fuzz(input []byte) int {
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ import ( @@
     	"sort"
     	"sync"
-    	"github.com/ledgerwatch/secp256k1"
+    	"github.com/erigontech/secp256k1"
     	libcommon "github.com/ledgerwatch/erigon-lib/common"
@@ Expand Down @@