Skip to content

Commit 96d948e

Browse files
bysomeonebysomeone
committed
mod:update package btcec to v2
(cherry picked from commit ef1663b)
1 parent 28cd836 commit 96d948e

14 files changed

Lines changed: 77 additions & 61 deletions

File tree

‎go.mod‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ go 1.19
44

55
replace (
66
github.com/ava-labs/avalanchego => github.com/33cn/avalanchego v1.10.10-0.20240529041529-ada691598153
7-
github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.3
87
github.com/consensys/gnark-crypto => github.com/consensys/gnark-crypto v0.5.3
98
)
109

@@ -13,8 +12,11 @@ require (
1312
github.com/BurntSushi/toml v1.2.1
1413
github.com/NebulousLabs/Sia v1.3.7
1514
github.com/bitly/go-simplejson v0.5.0
16-
github.com/btcsuite/btcd v0.23.4
17-
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
15+
github.com/btcsuite/btcd v0.24.2
16+
github.com/btcsuite/btcd/btcec/v2 v2.3.2
17+
github.com/btcsuite/btcd/btcutil v1.1.5
18+
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
19+
github.com/btcsuite/btcwallet/walletdb v1.3.5
1820
github.com/consensys/gnark v0.5.2
1921
github.com/consensys/gnark-crypto v0.10.0
2022
github.com/coreos/etcd v3.3.15+incompatible
@@ -68,10 +70,8 @@ require (
6870
github.com/benbjohnson/immutable v0.2.1 // indirect
6971
github.com/beorn7/perks v1.0.1 // indirect
7072
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
71-
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
72-
github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
7373
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
74-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
74+
github.com/btcsuite/btcwallet/wtxmgr v1.5.0 // indirect
7575
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
7676
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
7777
github.com/cenkalti/backoff/v4 v4.2.0 // indirect
@@ -90,8 +90,9 @@ require (
9090
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
9191
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
9292
github.com/decred/base58 v1.0.3 // indirect
93-
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
94-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
93+
github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
94+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
95+
github.com/decred/dcrd/lru v1.0.0 // indirect
9596
github.com/dgraph-io/badger v1.6.2 // indirect
9697
github.com/dgraph-io/ristretto v0.0.2 // indirect
9798
github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 // indirect
@@ -232,6 +233,7 @@ require (
232233
github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 // indirect
233234
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
234235
github.com/yusufpapurcu/wmi v1.2.2 // indirect
236+
go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50 // indirect
235237
go.opencensus.io v0.24.0 // indirect
236238
go.opentelemetry.io/otel v1.14.0 // indirect
237239
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect

‎go.sum‎

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -201,23 +201,39 @@ github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx2
201201
github.com/bonitoo-io/go-sql-bigquery v0.3.4-1.4.0 h1:MaVh0h9+KaMnJcoDvvIGp+O3fefdWm+8MBUX6ELTJTM=
202202
github.com/bonitoo-io/go-sql-bigquery v0.3.4-1.4.0/go.mod h1:J4Y6YJm0qTWB9aFziB7cPeSyc6dOZFyJdteSeybVpXQ=
203203
github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
204-
github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg=
205-
github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
204+
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
205+
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
206+
github.com/btcsuite/btcd v0.22.0-beta.0.20220204213055-eaf0459ff879/go.mod h1:osu7EoKiL36UThEgzYPqdRaxeo0NU8VoXqgcnwpey0g=
207+
github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
208+
github.com/btcsuite/btcd v0.24.2 h1:aLmxPguqxza+4ag8R1I2nnJjSu2iFn/kqtHTIImswcY=
209+
github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
210+
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
206211
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
207212
github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
208213
github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
209-
github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ=
210-
github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
214+
github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
215+
github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
216+
github.com/btcsuite/btcd/btcutil v1.1.5 h1:+wER79R5670vs/ZusMTF1yTcRYE5GUsFbdjdisflzM8=
217+
github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00=
211218
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
212-
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
213219
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
220+
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
221+
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
214222
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
215223
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
216-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ=
217-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
224+
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
225+
github.com/btcsuite/btcwallet/wallet/txauthor v1.2.3 h1:M2yr5UlULvpqtxUqpMxTME/pA92Z9cpqeyvAFk9lAg0=
226+
github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 h1:BtEN5Empw62/RVnZ0VcJaVtVlBijnLlJY+dwjAye2Bg=
227+
github.com/btcsuite/btcwallet/wallet/txsizes v1.1.0 h1:wZnOolEAeNOHzHTnznw/wQv+j35ftCIokNrnOTOU5o8=
228+
github.com/btcsuite/btcwallet/walletdb v1.3.5 h1:SoxUPLgJUkyO1XqON6X7x+rjHJoIpRQov8o8X6gNoz8=
229+
github.com/btcsuite/btcwallet/walletdb v1.3.5/go.mod h1:oJDxAEUHVtnmIIBaa22wSBPTVcs6hUp5NKWmI8xDwwU=
230+
github.com/btcsuite/btcwallet/wtxmgr v1.5.0 h1:WO0KyN4l6H3JWnlFxfGR7r3gDnlGT7W2cL8vl6av4SU=
231+
github.com/btcsuite/btcwallet/wtxmgr v1.5.0/go.mod h1:TQVDhFxseiGtZwEPvLgtfyxuNUDsIdaJdshvWzR0HJ4=
218232
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
219233
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
234+
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
220235
github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
236+
github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
221237
github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
222238
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
223239
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
@@ -315,11 +331,13 @@ github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6
315331
github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
316332
github.com/decred/base58 v1.0.3 h1:KGZuh8d1WEMIrK0leQRM47W85KqCAdl2N+uagbctdDI=
317333
github.com/decred/base58 v1.0.3/go.mod h1:pXP9cXCfM2sFLb2viz2FNIdeMWmZDBKG3ZBYbiSM78E=
318-
github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0=
319334
github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
335+
github.com/decred/dcrd/crypto/blake256 v1.1.0 h1:zPMNGQCm0g4QTY27fOCorQW7EryeQ/U0x++OzVrdms8=
336+
github.com/decred/dcrd/crypto/blake256 v1.1.0/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
320337
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
321-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4=
322-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0/go.mod h1:DZGJHZMqrU4JJqFAWUS2UO1+lbSKsdiOoYi9Zzey7Fc=
338+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 h1:NMZiJj8QnKe1LgsbDayM4UoHwbvwDRwnI3hwNaAHRnc=
339+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0/go.mod h1:ZXNYxsqcloTdSy/rNShjYzMhyjf0LaoftYK0p+A3h40=
340+
github.com/decred/dcrd/lru v1.0.0 h1:Kbsb1SFDsIlaupWPwsPp+dkxiBY1frcS07PCPgotKz8=
323341
github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
324342
github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
325343
github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU=
@@ -1547,7 +1565,6 @@ golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPh
15471565
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15481566
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15491567
golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
1550-
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15511568
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15521569
golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15531570
golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

‎plugin/consensus/dpos/types/priv_validator.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package types
66

77
import (
88
"bytes"
9-
"crypto/ecdsa"
109
"encoding/hex"
1110
"encoding/json"
1211
"errors"
@@ -19,7 +18,7 @@ import (
1918
"github.com/33cn/chain33/common/crypto"
2019
vrf "github.com/33cn/chain33/common/vrf/secp256k1"
2120
"github.com/33cn/chain33/types"
22-
secp256k1 "github.com/btcsuite/btcd/btcec"
21+
secp256k1 "github.com/btcsuite/btcd/btcec/v2"
2322
)
2423

2524
// KeyText ...
@@ -334,8 +333,8 @@ func (pv *PrivValidatorImp) VrfEvaluate(input []byte) (hash [32]byte, proof []by
334333
pv.mtx.Lock()
335334
defer pv.mtx.Unlock()
336335

337-
privKey, _ := secp256k1.PrivKeyFromBytes(secp256k1.S256(), pv.PrivKey.Bytes())
338-
vrfPriv := &vrf.PrivateKey{PrivateKey: (*ecdsa.PrivateKey)(privKey)}
336+
privKey, _ := secp256k1.PrivKeyFromBytes(pv.PrivKey.Bytes())
337+
vrfPriv := &vrf.PrivateKey{PrivateKey: privKey.ToECDSA()}
339338
hash, proof = vrfPriv.Evaluate(input)
340339
return hash, proof
341340
}
@@ -345,11 +344,11 @@ func (pv *PrivValidatorImp) VrfProof(pubkey []byte, input []byte, hash [32]byte,
345344
pv.mtx.Lock()
346345
defer pv.mtx.Unlock()
347346

348-
pubKey, err := secp256k1.ParsePubKey(pubkey, secp256k1.S256())
347+
pubKey, err := secp256k1.ParsePubKey(pubkey)
349348
if err != nil {
350349
return false
351350
}
352-
vrfPub := &vrf.PublicKey{PublicKey: (*ecdsa.PublicKey)(pubKey)}
351+
vrfPub := &vrf.PublicKey{PublicKey: pubKey.ToECDSA()}
353352
vrfHash, err := vrfPub.ProofToHash(input, proof)
354353
if err != nil {
355354
return false

‎plugin/consensus/ticket/ticket.go‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package ticket
66

77
import (
88
"bytes"
9-
"crypto/ecdsa"
109
"encoding/hex"
1110
"errors"
1211
"fmt"
@@ -30,7 +29,7 @@ import (
3029
cty "github.com/33cn/chain33/system/dapp/coins/types"
3130
"github.com/33cn/chain33/types"
3231
ty "github.com/33cn/plugin/plugin/dapp/ticket/types"
33-
secp256k1 "github.com/btcsuite/btcd/btcec"
32+
secp256k1 "github.com/btcsuite/btcd/btcec/v2"
3433
"github.com/golang/protobuf/proto"
3534
)
3635

@@ -423,12 +422,12 @@ func (client *Client) CheckBlock(parent *types.Block, current *types.BlockDetail
423422
}
424423

425424
func vrfVerify(pub []byte, input []byte, proof []byte, hash []byte) error {
426-
pubKey, err := secp256k1.ParsePubKey(pub, secp256k1.S256())
425+
pubKey, err := secp256k1.ParsePubKey(pub)
427426
if err != nil {
428427
tlog.Error("vrfVerify", "err", err)
429428
return ty.ErrVrfVerify
430429
}
431-
vrfPub := &vrf.PublicKey{PublicKey: (*ecdsa.PublicKey)(pubKey)}
430+
vrfPub := &vrf.PublicKey{PublicKey: pubKey.ToECDSA()}
432431
vrfHash, err := vrfPub.ProofToHash(input, proof)
433432
if err != nil {
434433
tlog.Error("vrfVerify", "err", err)
@@ -701,8 +700,8 @@ func (client *Client) addMinerTx(parent, block *types.Block, diff *big.Int, priv
701700
if input == nil {
702701
input = miner.PrivHash
703702
}
704-
privKey, _ := secp256k1.PrivKeyFromBytes(secp256k1.S256(), priv.Bytes())
705-
vrfPriv := &vrf.PrivateKey{PrivateKey: (*ecdsa.PrivateKey)(privKey)}
703+
privKey, _ := secp256k1.PrivKeyFromBytes(priv.Bytes())
704+
vrfPriv := &vrf.PrivateKey{PrivateKey: privKey.ToECDSA()}
706705
vrfHash, vrfProof := vrfPriv.Evaluate(input)
707706
miner.VrfHash = vrfHash[:]
708707
miner.VrfProof = vrfProof

‎plugin/consensus/ticket/ticket_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
package ticket
66

77
import (
8-
"crypto/ecdsa"
98
"fmt"
9+
"github.com/btcsuite/btcd/btcec/v2"
1010
"testing"
1111
"time"
1212

@@ -18,7 +18,6 @@ import (
1818
"github.com/33cn/chain33/util"
1919
"github.com/33cn/chain33/util/testnode"
2020
ty "github.com/33cn/plugin/plugin/dapp/ticket/types"
21-
secp256k1 "github.com/btcsuite/btcd/btcec"
2221
"github.com/stretchr/testify/assert"
2322

2423
apimocks "github.com/33cn/chain33/client/mocks"
@@ -204,8 +203,8 @@ func Test_vrfVerify(t *testing.T) {
204203
assert.NoError(t, err)
205204
pub := priv.PubKey().Bytes()
206205

207-
privKey, _ := secp256k1.PrivKeyFromBytes(secp256k1.S256(), priv.Bytes())
208-
vpriv := &vrf.PrivateKey{PrivateKey: (*ecdsa.PrivateKey)(privKey)}
206+
privKey, _ := btcec.PrivKeyFromBytes(priv.Bytes())
207+
vpriv := &vrf.PrivateKey{PrivateKey: privKey.ToECDSA()}
209208

210209
m1 := []byte("data1")
211210
m2 := []byte("data2")

‎plugin/dapp/bridgevmxgo/boss4x/chain33/chain33NewOracleClaim.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/33cn/plugin/plugin/dapp/cross2eth/ebrelayer/utils"
2121
evmAbi "github.com/33cn/plugin/plugin/dapp/evm/executor/abi"
2222
evmtypes "github.com/33cn/plugin/plugin/dapp/evm/types"
23-
btcec_secp256k1 "github.com/btcsuite/btcd/btcec"
23+
btcec_secp256k1 "github.com/btcsuite/btcd/btcec/v2"
2424
"github.com/ethereum/go-ethereum/crypto"
2525
"github.com/golang/protobuf/proto"
2626
"github.com/spf13/cobra"
@@ -80,7 +80,7 @@ func NewOracleClaim(cmd *cobra.Command, args []string) {
8080
return
8181
}
8282

83-
temp, _ := btcec_secp256k1.PrivKeyFromBytes(btcec_secp256k1.S256(), privateKey.Bytes())
83+
temp, _ := btcec_secp256k1.PrivKeyFromBytes(privateKey.Bytes())
8484
privatekey4chain33Ecdsa := temp.ToECDSA()
8585

8686
nonceBytes := big.NewInt(nonce).Bytes()

‎plugin/dapp/bridgevmxgo/boss4x/chain33/offline/multisignTransfer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
relayerutils "github.com/33cn/plugin/plugin/dapp/cross2eth/ebrelayer/utils"
1717
evmAbi "github.com/33cn/plugin/plugin/dapp/evm/executor/abi"
1818
"github.com/33cn/plugin/plugin/dapp/evm/executor/vm/common/math"
19-
btcecsecp256k1 "github.com/btcsuite/btcd/btcec"
19+
btcecsecp256k1 "github.com/btcsuite/btcd/btcec/v2"
2020
ethSecp256k1 "github.com/ethereum/go-ethereum/crypto/secp256k1"
2121
"github.com/spf13/cobra"
2222
)
@@ -179,7 +179,7 @@ func MultisignTransfer(cmd *cobra.Command, _ []string) {
179179
fmt.Println("evmAbi.Pack(parameter, erc20.ERC20ABI, false)", "Failed", err.Error())
180180
return
181181
}
182-
temp, _ := btcecsecp256k1.PrivKeyFromBytes(btcecsecp256k1.S256(), ownerPrivateKey.Bytes())
182+
temp, _ := btcecsecp256k1.PrivKeyFromBytes(ownerPrivateKey.Bytes())
183183
privateKey4chain33Ecdsa := temp.ToECDSA()
184184

185185
sig, err := ethSecp256k1.Sign(contentHash, math.PaddedBigBytes(privateKey4chain33Ecdsa.D, 32))

‎plugin/dapp/cross2eth/boss4x/chain33/offline/multisignTransfer.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
relayerutils "github.com/33cn/plugin/plugin/dapp/cross2eth/ebrelayer/utils"
1515
evmAbi "github.com/33cn/plugin/plugin/dapp/evm/executor/abi"
1616
"github.com/33cn/plugin/plugin/dapp/evm/executor/vm/common/math"
17-
btcecsecp256k1 "github.com/btcsuite/btcd/btcec"
17+
btcecsecp256k1 "github.com/btcsuite/btcd/btcec/v2"
1818
ethSecp256k1 "github.com/ethereum/go-ethereum/crypto/secp256k1"
1919
"github.com/spf13/cobra"
2020
)
@@ -177,7 +177,7 @@ func MultisignTransfer(cmd *cobra.Command, _ []string) {
177177
fmt.Println("evmAbi.Pack(parameter, erc20.ERC20ABI, false)", "Failed", err.Error())
178178
return
179179
}
180-
temp, _ := btcecsecp256k1.PrivKeyFromBytes(btcecsecp256k1.S256(), ownerPrivateKey.Bytes())
180+
temp, _ := btcecsecp256k1.PrivKeyFromBytes(ownerPrivateKey.Bytes())
181181
privateKey4chain33Ecdsa := temp.ToECDSA()
182182

183183
sig, err := ethSecp256k1.Sign(contentHash, math.PaddedBigBytes(privateKey4chain33Ecdsa.D, 32))

‎plugin/dapp/cross2eth/boss4x/keyManager.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/ethereum/go-ethereum/crypto"
1313

1414
chain33Common "github.com/33cn/chain33/common"
15-
"github.com/btcsuite/btcd/btcec"
15+
"github.com/btcsuite/btcd/btcec/v2"
1616
"github.com/ethereum/go-ethereum/common"
1717
"github.com/spf13/cobra"
1818
)
@@ -53,7 +53,7 @@ func generareChain33KeyCmd() *cobra.Command {
5353

5454
func generareChain33Key(cmd *cobra.Command, _ []string) {
5555

56-
privateKey, err := btcec.NewPrivateKey(btcec.S256())
56+
privateKey, err := btcec.NewPrivateKey()
5757
if nil != err {
5858
fmt.Println("Failed to generate private key for chain33" + err.Error())
5959
return
@@ -84,7 +84,7 @@ func showChain33Key(cmd *cobra.Command, _ []string) {
8484
fmt.Println("invalid priv key length", len(privateKeySlice))
8585
return
8686
}
87-
_, pubKey := btcec.PrivKeyFromBytes(btcec.S256(), privateKeySlice)
87+
_, pubKey := btcec.PrivKeyFromBytes(privateKeySlice)
8888

8989
uncompressedKey := pubKey.SerializeUncompressed()
9090
uncompressedKey = uncompressedKey[1:]
@@ -143,7 +143,7 @@ func showEtheremKey(cmd *cobra.Command, _ []string) {
143143
return
144144
}
145145

146-
_, pubKey := btcec.PrivKeyFromBytes(crypto.S256(), privateKeySlice)
146+
_, pubKey := btcec.PrivKeyFromBytes(privateKeySlice)
147147
uncompressedKey := pubKey.SerializeUncompressed()
148148
uncompressedKey = uncompressedKey[1:]
149149
compressedKey := pubKey.SerializeCompressed()

‎plugin/dapp/cross2eth/boss4x/sm2.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ import (
44
"fmt"
55
"math/big"
66

7-
"github.com/btcsuite/btcd/btcec"
8-
"github.com/ethereum/go-ethereum/crypto"
7+
"github.com/btcsuite/btcd/btcec/v2"
98

109
chain33Common "github.com/33cn/chain33/common"
1110
"github.com/33cn/chain33/system/crypto/sm2"
@@ -213,7 +212,7 @@ func encryptWithSm2(cmd *cobra.Command, args []string) {
213212
sm4Key = sm4Key[1:]
214213

215214
//第三步，计算secp256k1对应的公钥，非压缩
216-
_, pubKey := btcec.PrivKeyFromBytes(crypto.S256(), privateKeySlice)
215+
_, pubKey := btcec.PrivKeyFromBytes(privateKeySlice)
217216
uncompressedKey := pubKey.SerializeUncompressed()
218217
uncompressedKey = uncompressedKey[1:]
219218

0 commit comments

Comments
 (0)