From 43da575840764dd494e34f9ec3182fde6b3895b7 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 7 Mar 2025 17:12:16 +0100 Subject: [PATCH 1/5] deps: update bitcoin-core/secp256k1 to v0.6.0 --- erigon-lib/go.mod | 2 +- erigon-lib/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index aa7ca3f8f5a..49ba6b1bb47 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -14,7 +14,7 @@ require ( github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89 github.com/erigontech/interfaces v0.0.0-20250304065538-03fcc1da2237 github.com/erigontech/mdbx-go v0.38.10 - github.com/erigontech/secp256k1 v1.1.0 + github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 ) diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 4b60c2f486a..9c6d1db77e0 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -160,8 +160,8 @@ github.com/erigontech/interfaces v0.0.0-20250304065538-03fcc1da2237 h1:W5Zr2xifo github.com/erigontech/interfaces v0.0.0-20250304065538-03fcc1da2237/go.mod h1:N7OUkhkcagp9+7yb4ycHsG2VWCOmuJ1ONBecJshxtLE= github.com/erigontech/mdbx-go v0.38.10 h1:Nxqxu9QNOU9Bvgs9pq6SKkNYysbjt6b9n929daVNfcU= github.com/erigontech/mdbx-go v0.38.10/go.mod h1:lkqHAZqXtFaIPlvTaGAx3VUDuGYZcuhve1l4JVVN1Z0= -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/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 h1:9Z0LbYq/5j56AAIYjk7i61pwtDlRLF7+K4sGKkR2qS4= +github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U= github.com/erigontech/speedtest v0.0.2/go.mod h1:vulsRNiM51BmSTbVtch4FWxKxx53pS2D35lZTtao0bw= github.com/erigontech/torrent v1.54.3-alpha-1 h1:oyT9YpMr82g566v0STVKW0ZTdX/eun03cW2mKmKuTAQ= diff --git a/go.mod b/go.mod index 94bcbad5b3b..553d818a854 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ replace ( require ( github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116 github.com/erigontech/mdbx-go v0.38.10 - github.com/erigontech/secp256k1 v1.1.0 + github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 github.com/erigontech/silkworm-go v0.24.0 ) diff --git a/go.sum b/go.sum index 1f1fa3b59a3..2240d355ee6 100644 --- a/go.sum +++ b/go.sum @@ -273,8 +273,8 @@ github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86 h1:UKcIbFZU github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86/go.mod h1:JolLjpSff1tCCJKaJx4psrlEdlXuJEC996PL3tTAFks= github.com/erigontech/mdbx-go v0.38.10 h1:Nxqxu9QNOU9Bvgs9pq6SKkNYysbjt6b9n929daVNfcU= github.com/erigontech/mdbx-go v0.38.10/go.mod h1:lkqHAZqXtFaIPlvTaGAx3VUDuGYZcuhve1l4JVVN1Z0= -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/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 h1:9Z0LbYq/5j56AAIYjk7i61pwtDlRLF7+K4sGKkR2qS4= +github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/silkworm-go v0.24.0 h1:fFe74CjQM5LI7ouMYjmqfFaqIFzQTpMrt+ls+a5PxpE= github.com/erigontech/silkworm-go v0.24.0/go.mod h1:O50ux0apICEVEGyRWiE488K8qz8lc3PA/SXbQQAc8SU= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U= From 1ebc50d8c51a5ea969ddf934fd01962981a51570 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 7 Mar 2025 17:47:52 +0100 Subject: [PATCH 2/5] update to latest commit --- erigon-lib/go.mod | 2 +- erigon-lib/go.sum | 2 ++ go.mod | 2 +- go.sum | 4 ++-- hive-local-44732ef7/hive | 1 + hive-local-4b74c975/hive | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) create mode 160000 hive-local-44732ef7/hive create mode 160000 hive-local-4b74c975/hive diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index 49ba6b1bb47..dcaaf9a0894 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -14,7 +14,7 @@ require ( github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89 github.com/erigontech/interfaces v0.0.0-20250304065538-03fcc1da2237 github.com/erigontech/mdbx-go v0.38.10 - github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 + github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 ) diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 9c6d1db77e0..3a57383c5e0 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -162,6 +162,8 @@ github.com/erigontech/mdbx-go v0.38.10 h1:Nxqxu9QNOU9Bvgs9pq6SKkNYysbjt6b9n929da github.com/erigontech/mdbx-go v0.38.10/go.mod h1:lkqHAZqXtFaIPlvTaGAx3VUDuGYZcuhve1l4JVVN1Z0= github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 h1:9Z0LbYq/5j56AAIYjk7i61pwtDlRLF7+K4sGKkR2qS4= github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= +github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb h1:RpGY/i1Um/MuCQKHeh3T9HPw6vm6JDYMGw0LHsBVr90= +github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U= github.com/erigontech/speedtest v0.0.2/go.mod h1:vulsRNiM51BmSTbVtch4FWxKxx53pS2D35lZTtao0bw= github.com/erigontech/torrent v1.54.3-alpha-1 h1:oyT9YpMr82g566v0STVKW0ZTdX/eun03cW2mKmKuTAQ= diff --git a/go.mod b/go.mod index 553d818a854..74b2a7b6f17 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ replace ( require ( github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116 github.com/erigontech/mdbx-go v0.38.10 - github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 + github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb github.com/erigontech/silkworm-go v0.24.0 ) diff --git a/go.sum b/go.sum index 2240d355ee6..46396c80769 100644 --- a/go.sum +++ b/go.sum @@ -273,8 +273,8 @@ github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86 h1:UKcIbFZU github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86/go.mod h1:JolLjpSff1tCCJKaJx4psrlEdlXuJEC996PL3tTAFks= github.com/erigontech/mdbx-go v0.38.10 h1:Nxqxu9QNOU9Bvgs9pq6SKkNYysbjt6b9n929daVNfcU= github.com/erigontech/mdbx-go v0.38.10/go.mod h1:lkqHAZqXtFaIPlvTaGAx3VUDuGYZcuhve1l4JVVN1Z0= -github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 h1:9Z0LbYq/5j56AAIYjk7i61pwtDlRLF7+K4sGKkR2qS4= -github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= +github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb h1:RpGY/i1Um/MuCQKHeh3T9HPw6vm6JDYMGw0LHsBVr90= +github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/silkworm-go v0.24.0 h1:fFe74CjQM5LI7ouMYjmqfFaqIFzQTpMrt+ls+a5PxpE= github.com/erigontech/silkworm-go v0.24.0/go.mod h1:O50ux0apICEVEGyRWiE488K8qz8lc3PA/SXbQQAc8SU= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U= diff --git a/hive-local-44732ef7/hive b/hive-local-44732ef7/hive new file mode 160000 index 00000000000..ff891d39efd --- /dev/null +++ b/hive-local-44732ef7/hive @@ -0,0 +1 @@ +Subproject commit ff891d39efdec7969a451a7837d6902551c142da diff --git a/hive-local-4b74c975/hive b/hive-local-4b74c975/hive new file mode 160000 index 00000000000..ff891d39efd --- /dev/null +++ b/hive-local-4b74c975/hive @@ -0,0 +1 @@ +Subproject commit ff891d39efdec7969a451a7837d6902551c142da From b41e4f54338f9e43a962ffacf8d2f68de06c312a Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 7 Mar 2025 17:52:06 +0100 Subject: [PATCH 3/5] remove hive artifacts --- hive-local-44732ef7/hive | 1 - hive-local-4b74c975/hive | 1 - 2 files changed, 2 deletions(-) delete mode 160000 hive-local-44732ef7/hive delete mode 160000 hive-local-4b74c975/hive diff --git a/hive-local-44732ef7/hive b/hive-local-44732ef7/hive deleted file mode 160000 index ff891d39efd..00000000000 --- a/hive-local-44732ef7/hive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ff891d39efdec7969a451a7837d6902551c142da diff --git a/hive-local-4b74c975/hive b/hive-local-4b74c975/hive deleted file mode 160000 index ff891d39efd..00000000000 --- a/hive-local-4b74c975/hive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ff891d39efdec7969a451a7837d6902551c142da From c4967c272681d541bc93917a58000d4a1dd49389 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Fri, 7 Mar 2025 17:57:25 +0100 Subject: [PATCH 4/5] go mod tidy --- erigon-lib/go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 3a57383c5e0..1055428d393 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -160,8 +160,6 @@ github.com/erigontech/interfaces v0.0.0-20250304065538-03fcc1da2237 h1:W5Zr2xifo github.com/erigontech/interfaces v0.0.0-20250304065538-03fcc1da2237/go.mod h1:N7OUkhkcagp9+7yb4ycHsG2VWCOmuJ1ONBecJshxtLE= github.com/erigontech/mdbx-go v0.38.10 h1:Nxqxu9QNOU9Bvgs9pq6SKkNYysbjt6b9n929daVNfcU= github.com/erigontech/mdbx-go v0.38.10/go.mod h1:lkqHAZqXtFaIPlvTaGAx3VUDuGYZcuhve1l4JVVN1Z0= -github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68 h1:9Z0LbYq/5j56AAIYjk7i61pwtDlRLF7+K4sGKkR2qS4= -github.com/erigontech/secp256k1 v1.1.1-0.20250307160128-4c4d6b693d68/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb h1:RpGY/i1Um/MuCQKHeh3T9HPw6vm6JDYMGw0LHsBVr90= github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U= From 3ad017e85cddccf0cda34f46ffa062bb875ceff9 Mon Sep 17 00:00:00 2001 From: yperbasis Date: Mon, 17 Mar 2025 16:38:14 +0100 Subject: [PATCH 5/5] erigontech/secp256k1 was released --- erigon-lib/go.mod | 2 +- erigon-lib/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index 9faf84139c5..bc225a52457 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -14,7 +14,7 @@ require ( github.com/erigontech/erigon-snapshot v1.3.1-0.20250121111444-6cc4c0c1fb89 github.com/erigontech/interfaces v0.0.0-20250305132916-e79ba495d507 github.com/erigontech/mdbx-go v0.38.10 - github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb + github.com/erigontech/secp256k1 v1.2.0 github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 ) diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 18ad511ab57..faf60543591 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -160,8 +160,8 @@ github.com/erigontech/interfaces v0.0.0-20250305132916-e79ba495d507 h1:hLctwnMpd github.com/erigontech/interfaces v0.0.0-20250305132916-e79ba495d507/go.mod h1:N7OUkhkcagp9+7yb4ycHsG2VWCOmuJ1ONBecJshxtLE= github.com/erigontech/mdbx-go v0.38.10 h1:Nxqxu9QNOU9Bvgs9pq6SKkNYysbjt6b9n929daVNfcU= github.com/erigontech/mdbx-go v0.38.10/go.mod h1:lkqHAZqXtFaIPlvTaGAx3VUDuGYZcuhve1l4JVVN1Z0= -github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb h1:RpGY/i1Um/MuCQKHeh3T9HPw6vm6JDYMGw0LHsBVr90= -github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= +github.com/erigontech/secp256k1 v1.2.0 h1:Q/HCBMdYYT0sh1xPZ9ZYEnU30oNyb/vt715cJhj7n7A= +github.com/erigontech/secp256k1 v1.2.0/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U= github.com/erigontech/speedtest v0.0.2/go.mod h1:vulsRNiM51BmSTbVtch4FWxKxx53pS2D35lZTtao0bw= github.com/erigontech/torrent v1.54.3-alpha-1 h1:oyT9YpMr82g566v0STVKW0ZTdX/eun03cW2mKmKuTAQ= diff --git a/go.mod b/go.mod index 81699ee1172..ca46bdbf196 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ replace ( require ( github.com/erigontech/erigonwatch v0.0.0-20240718131902-b6576bde1116 github.com/erigontech/mdbx-go v0.38.10 - github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb + github.com/erigontech/secp256k1 v1.2.0 github.com/erigontech/silkworm-go v0.24.0 ) diff --git a/go.sum b/go.sum index 46396c80769..51b1366b297 100644 --- a/go.sum +++ b/go.sum @@ -273,8 +273,8 @@ github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86 h1:UKcIbFZU github.com/erigontech/go-kzg-4844 v0.0.0-20250130131058-ce13be60bc86/go.mod h1:JolLjpSff1tCCJKaJx4psrlEdlXuJEC996PL3tTAFks= github.com/erigontech/mdbx-go v0.38.10 h1:Nxqxu9QNOU9Bvgs9pq6SKkNYysbjt6b9n929daVNfcU= github.com/erigontech/mdbx-go v0.38.10/go.mod h1:lkqHAZqXtFaIPlvTaGAx3VUDuGYZcuhve1l4JVVN1Z0= -github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb h1:RpGY/i1Um/MuCQKHeh3T9HPw6vm6JDYMGw0LHsBVr90= -github.com/erigontech/secp256k1 v1.1.1-0.20250307162700-f527151f75eb/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= +github.com/erigontech/secp256k1 v1.2.0 h1:Q/HCBMdYYT0sh1xPZ9ZYEnU30oNyb/vt715cJhj7n7A= +github.com/erigontech/secp256k1 v1.2.0/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/silkworm-go v0.24.0 h1:fFe74CjQM5LI7ouMYjmqfFaqIFzQTpMrt+ls+a5PxpE= github.com/erigontech/silkworm-go v0.24.0/go.mod h1:O50ux0apICEVEGyRWiE488K8qz8lc3PA/SXbQQAc8SU= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U=