Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated dependencies into feat/freeze-account #108

Merged
merged 1 commit into from
Dec 19, 2022
Merged

updated dependencies into feat/freeze-account #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions aggregator/notifees/elrondNotifee_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (

"github.com/ElrondNetwork/elrond-go-core/core/check"
"github.com/ElrondNetwork/elrond-go-crypto"
"github.com/ElrondNetwork/elrond-go-crypto/signing"
"github.com/ElrondNetwork/elrond-go-crypto/signing/ed25519"
"github.com/ElrondNetwork/elrond-sdk-erdgo/aggregator"
"github.com/ElrondNetwork/elrond-sdk-erdgo/blockchain"
Expand Down Expand Up @@ -47,7 +46,7 @@ func createMockArgsElrondNotifeeWithSomeRealComponents() ArgsElrondNotifee {
}

txBuilder, _ := builders.NewTxBuilder(blockchain.NewTxSigner())
keyGen := signing.NewKeyGenerator(ed25519.NewEd25519())
keyGen := crypto.NewKeyGenerator(ed25519.NewEd25519())
skBytes, _ := hex.DecodeString("6ae10fed53a84029e53e35afdbe083688eea0917a09a9431951dd42fd4da14c40d248169f4dd7c90537f05be1c49772ddbf8f7948b507ed17fb23284cf218b7d")
sk, _ := keyGen.PrivateKeyFromByteArray(skBytes)

Expand Down
3 changes: 1 addition & 2 deletions blockchain/txSigner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package blockchain

import (
"github.com/ElrondNetwork/elrond-go-crypto"
"github.com/ElrondNetwork/elrond-go-crypto/signing"
"github.com/ElrondNetwork/elrond-go-crypto/signing/ed25519"
"github.com/ElrondNetwork/elrond-go-crypto/signing/ed25519/singlesig"
)
Expand All @@ -18,7 +17,7 @@ type txSigner struct {
// NewTxSigner will create a new instance of txSigner
func NewTxSigner() *txSigner {
return &txSigner{
keyGen: signing.NewKeyGenerator(suite),
keyGen: crypto.NewKeyGenerator(suite),
}
}

Expand Down
4 changes: 2 additions & 2 deletions examples/examplesPriceAggregator/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os/signal"
"time"

"github.com/ElrondNetwork/elrond-go-crypto/signing"
"github.com/ElrondNetwork/elrond-go-crypto"
"github.com/ElrondNetwork/elrond-go-crypto/signing/ed25519"
logger "github.com/ElrondNetwork/elrond-go-logger"
"github.com/ElrondNetwork/elrond-sdk-erdgo/aggregator"
Expand Down Expand Up @@ -35,7 +35,7 @@ const autoSendInterval = time.Second * 10
const networkAddress = "https://testnet-gateway.elrond.com"

var suite = ed25519.NewEd25519()
var keyGen = signing.NewKeyGenerator(suite)
var keyGen = crypto.NewKeyGenerator(suite)

func main() {
_ = logger.SetLogLevel("*:DEBUG")
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/ElrondNetwork/elrond-sdk-erdgo
go 1.17

require (
github.com/ElrondNetwork/elrond-go v1.4.1-0.20221207122053-d632c10fe03e
github.com/ElrondNetwork/elrond-go v1.4.1-0.20221213081522-654f741e054b
github.com/ElrondNetwork/elrond-go-core v1.1.27-0.20221207113027-6add1889c6e8
github.com/ElrondNetwork/elrond-go-crypto v1.2.2
github.com/ElrondNetwork/elrond-go-crypto v1.2.4-0.20221212134904-9faa0161e5dc
github.com/ElrondNetwork/elrond-go-logger v1.0.10
github.com/ElrondNetwork/elrond-vm-common v1.3.29-0.20221207113405-6973ba06dc58
github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792
Expand Down
20 changes: 11 additions & 9 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
filippo.io/edwards25519 v1.0.0/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
Expand All @@ -48,13 +49,14 @@ github.com/ElrondNetwork/concurrent-map v0.1.3 h1:j2LtPrNJuerannC1cQDE79STvi/P04
github.com/ElrondNetwork/concurrent-map v0.1.3/go.mod h1:3XwSwn4JHI0lrKxWLZvtp53Emr8BXYTmNQGwcukHJEE=
github.com/ElrondNetwork/elastic-indexer-go v1.3.3 h1:RgJ043yt92PUWMbSAQHRrC+GiyNnFdwdM/kseHlpLoo=
github.com/ElrondNetwork/elastic-indexer-go v1.3.3/go.mod h1:E3VO5712GkGSGYnOTJ+0wxW74JXgjV6XCRPlcHiTTK0=
github.com/ElrondNetwork/elrond-go v1.4.1-0.20221207122053-d632c10fe03e h1:cej+WXsO9BDC6Swr50a7m6jIg9Mbhxsk74+y0LyfkE8=
github.com/ElrondNetwork/elrond-go v1.4.1-0.20221207122053-d632c10fe03e/go.mod h1:HwIYs/qQBch9Cj6l7kNARL4YM/1/n8F7kdrMYT68CQk=
github.com/ElrondNetwork/elrond-go v1.4.1-0.20221213081522-654f741e054b h1:Prm6Tqq2XKZv33CWehWcv4T7YButZdr4syzAv8bM3JQ=
github.com/ElrondNetwork/elrond-go v1.4.1-0.20221213081522-654f741e054b/go.mod h1:Sn0t8Z18frQjmjJ/+Sf/z0tsIOpUXVvmOi8uR4MOJO4=
github.com/ElrondNetwork/elrond-go-core v1.1.26/go.mod h1:N/RI++YU2M6OlnD1GSZepc1wPhI84ykRDQ1IyD3B0wk=
github.com/ElrondNetwork/elrond-go-core v1.1.27-0.20221207113027-6add1889c6e8 h1:iYFJrSgKmyRDFkDFBXABqs7UwjrGeA0b5Nit9xmogzk=
github.com/ElrondNetwork/elrond-go-core v1.1.27-0.20221207113027-6add1889c6e8/go.mod h1:N/RI++YU2M6OlnD1GSZepc1wPhI84ykRDQ1IyD3B0wk=
github.com/ElrondNetwork/elrond-go-crypto v1.2.2 h1:Q59dZUeyibuskq5vjgk3ng/87ifOcd9YZMTnlYJAuIU=
github.com/ElrondNetwork/elrond-go-crypto v1.2.2/go.mod h1:MyQPKUKti7Axnx/eihhL0F2jLTalvSV/Ytv1mIxvYyM=
github.com/ElrondNetwork/elrond-go-crypto v1.2.4-0.20221212134904-9faa0161e5dc h1:BpKdjLY05fH/Y80s4n5vqIR73hSuZp4zFlL8+TAUWp4=
github.com/ElrondNetwork/elrond-go-crypto v1.2.4-0.20221212134904-9faa0161e5dc/go.mod h1:niLdPSYjcIzucSj2yMy+yq3KEW0jjFCfvTBOMQphmXk=
github.com/ElrondNetwork/elrond-go-logger v1.0.10 h1:2xQOWZErcHW5sl9qSRO+7mGNw+QhFhqiUlLLtOgvuuk=
github.com/ElrondNetwork/elrond-go-logger v1.0.10/go.mod h1:+rMODFw4yQptTi5WuLUBzvl/AE26V+2YJtc52wX30Eg=
github.com/ElrondNetwork/elrond-go-p2p v1.0.5 h1:XzuieXEKrVSQ9gKKO3sq60RRZC29IRYgmn7RsPmgUOA=
Expand All @@ -65,12 +67,12 @@ github.com/ElrondNetwork/elrond-go-storage v1.0.4/go.mod h1:SRsv4hUtL1BCiQe0eADt
github.com/ElrondNetwork/elrond-vm-common v1.3.27/go.mod h1:3GKLv9hUFYEVxoBgtaCmaZo9HMNfKN9mM/O/xX83Rbw=
github.com/ElrondNetwork/elrond-vm-common v1.3.29-0.20221207113405-6973ba06dc58 h1:ZduFPEw1cMjTDpJPLXfxOybidOzJ++FWeH/xMsgRxP4=
github.com/ElrondNetwork/elrond-vm-common v1.3.29-0.20221207113405-6973ba06dc58/go.mod h1:vBVpGtyb7ZerSqX/EOtUIGBGK9VtogmjwAmjAWCnCSw=
github.com/ElrondNetwork/wasm-vm-v1_2 v1.2.49-0.20221207113912-5e51bac72fff h1:o10OzmXIsvUuj2oJx2tOdSeZCBkrcCvRm0Wb6kr+XRk=
github.com/ElrondNetwork/wasm-vm-v1_2 v1.2.49-0.20221207113912-5e51bac72fff/go.mod h1:FT0hOm/rl6tHtD5CxXmX8mpds/ePJu4bkUP5FtaccBA=
github.com/ElrondNetwork/wasm-vm-v1_3 v1.3.49-0.20221207114041-931b5bdf1ded h1:AA/9h/bBpnci8BiIHL45aw6Fj8FmWtqwXA2XOunYr7g=
github.com/ElrondNetwork/wasm-vm-v1_3 v1.3.49-0.20221207114041-931b5bdf1ded/go.mod h1:d1MOr0Pj2fbhEY+s11fymAJ1zh1NIgelPEbb2JYUFeM=
github.com/ElrondNetwork/wasm-vm-v1_4 v1.4.69-0.20221207114657-b4eea3cf49af h1:ZKnMeXgqnMVY72OB4nrg6soOm/YAnOvKq3U7WLK85s4=
github.com/ElrondNetwork/wasm-vm-v1_4 v1.4.69-0.20221207114657-b4eea3cf49af/go.mod h1:ULGc4UkHCZ7s3/6Jl8dncbUYSWmGQ4ey+0/cmjJ4jhU=
github.com/ElrondNetwork/wasm-vm-v1_2 v1.2.49-0.20221213075903-473826256396 h1:f2FK3XFIySd2qhON8Q2IBB47ZCTO4AD+BYMPSKoVg6M=
github.com/ElrondNetwork/wasm-vm-v1_2 v1.2.49-0.20221213075903-473826256396/go.mod h1:VF3fx+63lmKVkINjn2NkY4pb5s47ZcsiqP8U2AnnnZM=
github.com/ElrondNetwork/wasm-vm-v1_3 v1.3.49-0.20221213080744-6f0dfc0d2d8e h1:R8qyNLa9HINdYiUX+MCbJ3xWWqXT3K/lQ8mTQuENz3g=
github.com/ElrondNetwork/wasm-vm-v1_3 v1.3.49-0.20221213080744-6f0dfc0d2d8e/go.mod h1:HSy/wfbfbEqEyxuMNiDBqDzYnKhcKDNhte7HEzYHIbw=
github.com/ElrondNetwork/wasm-vm-v1_4 v1.4.69-0.20221213080907-de31f5655d76 h1:8cLs/YMhQq+uKpEW/rN3W9v65yb3T4G4B/Kls9563UU=
github.com/ElrondNetwork/wasm-vm-v1_4 v1.4.69-0.20221213080907-de31f5655d76/go.mod h1:OUoPdsZVaMbwSnsnBAKKVVzmUeXW1fSsahfgEUdq+Hc=
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
Expand Down
5 changes: 2 additions & 3 deletions headerCheck/factory/cryptoComponents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ package factory

import (
"github.com/ElrondNetwork/elrond-go-core/hashing/blake2b"
crypto "github.com/ElrondNetwork/elrond-go-crypto"
"github.com/ElrondNetwork/elrond-go-crypto/signing"
"github.com/ElrondNetwork/elrond-go-crypto"
disabledSig "github.com/ElrondNetwork/elrond-go-crypto/signing/disabled/singlesig"
"github.com/ElrondNetwork/elrond-go-crypto/signing/mcl"
mclMultiSig "github.com/ElrondNetwork/elrond-go-crypto/signing/mcl/multisig"
Expand All @@ -19,7 +18,7 @@ type cryptoComponents struct {

// CreateCryptoComponents creates crypto components needed for header verification
func CreateCryptoComponents() (*cryptoComponents, error) {
blockSignKeyGen := signing.NewKeyGenerator(mcl.NewSuiteBLS12())
blockSignKeyGen := crypto.NewKeyGenerator(mcl.NewSuiteBLS12())

interceptSingleSigner := &disabledSig.DisabledSingleSig{}

Expand Down
4 changes: 2 additions & 2 deletions interactors/wallet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"io/ioutil"
"os"

"github.com/ElrondNetwork/elrond-go-crypto/signing"
"github.com/ElrondNetwork/elrond-go-crypto"
"github.com/ElrondNetwork/elrond-go-crypto/signing/ed25519"
"github.com/ElrondNetwork/elrond-sdk-erdgo/core"
"github.com/ElrondNetwork/elrond-sdk-erdgo/data"
Expand Down Expand Up @@ -46,7 +46,7 @@ type bip32 struct {
}

var suite = ed25519.NewEd25519()
var keyGenerator = signing.NewKeyGenerator(suite)
var keyGenerator = crypto.NewKeyGenerator(suite)

type encryptedKeyJSONV4 struct {
Address string `json:"address"`
Expand Down