Skip to content

Commit ef1663b

Browse files
committed
mod:update package btcec to v2
1 parent 5ce2ecd commit ef1663b

14 files changed

Lines changed: 57 additions & 65 deletions

File tree

go.mod

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ replace github.com/33cn/chain33 => ../chain33
66

77
replace (
88
github.com/ava-labs/avalanchego => github.com/33cn/avalanchego v1.10.10-0.20240529041529-ada691598153
9-
github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.3
109
github.com/consensys/gnark-crypto => github.com/consensys/gnark-crypto v0.5.3
1110
)
1211

@@ -15,8 +14,10 @@ require (
1514
github.com/BurntSushi/toml v1.2.1
1615
github.com/NebulousLabs/Sia v1.3.7
1716
github.com/bitly/go-simplejson v0.5.0
18-
github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231
19-
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1
17+
github.com/btcsuite/btcd v0.24.2
18+
github.com/btcsuite/btcd/btcec/v2 v2.3.2
19+
github.com/btcsuite/btcd/btcutil v1.1.5
20+
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
2021
github.com/btcsuite/btcwallet/walletdb v1.3.5
2122
github.com/consensys/gnark v0.5.2
2223
github.com/consensys/gnark-crypto v0.10.0
@@ -73,10 +74,7 @@ require (
7374
github.com/benbjohnson/immutable v0.2.1 // indirect
7475
github.com/beorn7/perks v1.0.1 // indirect
7576
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
76-
github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
77-
github.com/btcsuite/btcd/btcutil v1.1.3 // indirect
7877
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
79-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce // indirect
8078
github.com/btcsuite/btcwallet/wtxmgr v1.5.0 // indirect
8179
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect
8280
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect
@@ -96,8 +94,8 @@ require (
9694
github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
9795
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
9896
github.com/decred/base58 v1.0.3 // indirect
99-
github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect
100-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 // indirect
97+
github.com/decred/dcrd/crypto/blake256 v1.1.0 // indirect
98+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
10199
github.com/decred/dcrd/lru v1.0.0 // indirect
102100
github.com/dgraph-io/badger v1.6.2 // indirect
103101
github.com/dgraph-io/ristretto v0.0.2 // indirect
@@ -244,6 +242,7 @@ require (
244242
github.com/xlab/treeprint v0.0.0-20180616005107-d6fb6747feb6 // indirect
245243
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
246244
github.com/yusufpapurcu/wmi v1.2.2 // indirect
245+
go.etcd.io/bbolt v1.3.5-0.20200615073812-232d8fc87f50 // indirect
247246
go.opencensus.io v0.24.0 // indirect
248247
go.opentelemetry.io/otel v1.14.0 // indirect
249248
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.11.2 // indirect

go.sum

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -203,26 +203,24 @@ github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBT
203203
github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
204204
github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
205205
github.com/btcsuite/btcd v0.22.0-beta.0.20220204213055-eaf0459ff879/go.mod h1:osu7EoKiL36UThEgzYPqdRaxeo0NU8VoXqgcnwpey0g=
206-
github.com/btcsuite/btcd v0.22.3 h1:kYNaWFvOw6xvqP0vR20RP1Zq1DVMBxEO8QN5d1/EfNg=
207-
github.com/btcsuite/btcd v0.22.3/go.mod h1:wqgTSL29+50LRkmOVknEdmt8ZojIzhuWvgu/iptuN7Y=
208-
github.com/btcsuite/btcd v0.23.0/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
209-
github.com/btcsuite/btcd v0.23.5-0.20230711222809-7faa9b266231/go.mod h1:0QJIIN1wwIXF/3G/m87gIwGniDMDQqjVn4SZgnFpsYY=
206+
github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
207+
github.com/btcsuite/btcd v0.24.2 h1:aLmxPguqxza+4ag8R1I2nnJjSu2iFn/kqtHTIImswcY=
208+
github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
210209
github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
211210
github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
212211
github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
213212
github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
214213
github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
215214
github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
216-
github.com/btcsuite/btcd/btcutil v1.1.3 h1:xfbtw8lwpp0G6NwSHb+UE67ryTFHJAiNuipusjXSohQ=
217-
github.com/btcsuite/btcd/btcutil v1.1.3/go.mod h1:UR7dsSJzJUfMmFiiLlIrMq1lS9jh9EdCV7FStZSnpi0=
215+
github.com/btcsuite/btcd/btcutil v1.1.5 h1:+wER79R5670vs/ZusMTF1yTcRYE5GUsFbdjdisflzM8=
216+
github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00=
218217
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
219-
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=
220218
github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
219+
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
220+
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
221221
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
222222
github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
223223
github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
224-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce h1:YtWJF7RHm2pYCvA5t0RPmAaLUhREsKuKd+SLhxFbFeQ=
225-
github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce/go.mod h1:0DVlHczLPewLcPGEIeUEzfOJhqGPQ0mJJRDBtD307+o=
226224
github.com/btcsuite/btcwallet/wallet/txauthor v1.2.3 h1:M2yr5UlULvpqtxUqpMxTME/pA92Z9cpqeyvAFk9lAg0=
227225
github.com/btcsuite/btcwallet/wallet/txrules v1.2.0 h1:BtEN5Empw62/RVnZ0VcJaVtVlBijnLlJY+dwjAye2Bg=
228226
github.com/btcsuite/btcwallet/wallet/txsizes v1.1.0 h1:wZnOolEAeNOHzHTnznw/wQv+j35ftCIokNrnOTOU5o8=
@@ -233,10 +231,8 @@ github.com/btcsuite/btcwallet/wtxmgr v1.5.0/go.mod h1:TQVDhFxseiGtZwEPvLgtfyxuNU
233231
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd h1:R/opQEbFEy9JGkIguV40SvRY1uliPX8ifOvi6ICsFCw=
234232
github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
235233
github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
236-
github.com/btcsuite/goleveldb v1.0.0 h1:Tvd0BfvqX9o823q1j2UZ/epQo09eJh6dTcRp79ilIN4=
237234
github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
238235
github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
239-
github.com/btcsuite/snappy-go v1.0.0 h1:ZxaA6lo2EpxGddsA8JwWOcxlzRybb444sgmeJQMJGQE=
240236
github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
241237
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 h1:R8vQdOQdZ9Y3SkEwmHoWBmX1DNXhXZqlTpq6s4tyJGc=
242238
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
@@ -335,11 +331,12 @@ github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6
335331
github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
336332
github.com/decred/base58 v1.0.3 h1:KGZuh8d1WEMIrK0leQRM47W85KqCAdl2N+uagbctdDI=
337333
github.com/decred/base58 v1.0.3/go.mod h1:pXP9cXCfM2sFLb2viz2FNIdeMWmZDBKG3ZBYbiSM78E=
338-
github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0=
339334
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=
340337
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
341-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.1.0 h1:HbphB4TFFXpv7MNrT52FGrrgVXF1owhMVTHFZIlnvd4=
342-
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=
343340
github.com/decred/dcrd/lru v1.0.0 h1:Kbsb1SFDsIlaupWPwsPp+dkxiBY1frcS07PCPgotKz8=
344341
github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
345342
github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
@@ -1585,7 +1582,6 @@ golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e/go.mod h1:LzIPMQfyMNhhGPh
15851582
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15861583
golang.org/x/crypto v0.0.0-20191219195013-becbf705a915/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15871584
golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
1588-
golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15891585
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15901586
golang.org/x/crypto v0.0.0-20200422194213-44a606286825/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
15911587
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)