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.

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

fix(chain): update ed25519 addresses in dev/gssmr genesis files #2225

Merged
merged 9 commits into from
Jan 25, 2022
Merged
Changes from 1 commit
Commits
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
Next Next commit
add ed25519 key derivation test, update ed25519 keys in dev/gssmr gen…
…esis
noot committed Jan 21, 2022
commit 62443fc7b381b34dd4a8b56705d89523cdc0c908
2 changes: 1 addition & 1 deletion chain/dev/genesis-spec.json
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@
"Grandpa": {
"Authorities": [
[
"5DFNv4Txc4b88qHqQ6GG4D646QcT4fN3jjS2G3r1PyZkfDut",
"5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu",
1
]
]
2 changes: 1 addition & 1 deletion chain/dev/genesis.json

Large diffs are not rendered by default.

18 changes: 9 additions & 9 deletions chain/gssmr/genesis-spec.json
Original file line number Diff line number Diff line change
@@ -50,39 +50,39 @@
"Grandpa": {
"Authorities": [
[
"5DFNv4Txc4b88qHqQ6GG4D646QcT4fN3jjS2G3r1PyZkfDut",
"5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu",
1
],
[
"5FRbF5E5xpBxaCdjuVkCAtoLgvvoL6wJoE7kAVTUdZBwpgi7",
"5GoNkf6WdbxCFnPdAnYYQyCjAKPJgLNxXwPjwTh6DGg6gN3E",
1
],
[
"5DYo8CvjQcBQFdehVhansDiZCPebpgqvNC8PQPi6K9cL9giT",
"5DbKjhNLpqX3zqZdNBc9BGb4fHU1cRBaDhJUskrvkwfraDi6",
1
],
[
"5EtkA16QN4DED9vrxb4LnmytCFBhm6qJ5pw6FkoaiRtsPeuG",
"5ECTwv6cZ5nJQPk6tWfaTrEk8YH2L7X1VT4EL5Tx2ikfFwb7",
1
],
[
"5G64P3LJTK28dDVGNSzSHp4mfZyKqdzxgeZ1cULRoxMdt8m1",
"5Ck2miBfCe1JQ4cY3NDsXyBaD6EcsgiVmEFTWwqNSs25XDEq",
1
],
[
"5D7QrtMByWQpi8EtqkH1sPDBCVZvoH6G1vY5mknQiCC3ZVQM",
"5E2BmpVFzYGd386XRCZ76cDePMB3sfbZp5ZKGUsrG1m6gomN",
1
],
[
"5FdsD3mYg5gzh1Uj4FxyeHqMTpaAVd3gDNmcuKypBzRGGMQH",
"5CGR8FbjxeV31JKaUUuVUgasW79k8xFGdoh8WG5MokEc78qj",
1
],
[
"5DqDws3YxzL8r741gw33jdbohzAESRR9qGCGg6GAZ3Qw5fYX",
"5E9ZP1w5qat63KrWEJLkh7aDr2fPTbu3UhetAjxeyBojKHYH",
1
],
[
"5FYrfAUUzuahCL2swxoPXc846dKrWuD2nwzrKc1oEfWBS6RL",
"5Cjb197EXcHehjxuyKUCF3wJm86owKiuKCzF18DcMhbgMhPX",
1
]
]
2 changes: 1 addition & 1 deletion chain/gssmr/genesis.json

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions lib/crypto/ed25519/ed25519_test.go
Original file line number Diff line number Diff line change
@@ -158,5 +158,23 @@ func TestVerifySignature(t *testing.T) {
require.NoError(t, err)
})
}
}

func TestPublicKeyFromPrivate(t *testing.T) {
// subkey inspect //Alice --scheme ed25519
priv := common.MustHexToBytes("0xabf8e5bdbe30c65656c0a3cbd181ff8a56294a69dfedd27982aace4a76909115")
pub := common.MustHexToBytes("0x88dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee")

sk, err := NewPrivateKey(append(priv, pub...))
require.NoError(t, err)
pk, err := sk.Public()
require.NoError(t, err)
require.Equal(t, pub, pk.(*PublicKey).Encode())

kp, err := NewKeypairFromSeed(priv)
require.NoError(t, err)
require.Equal(t, pub, kp.public.Encode())

addr := crypto.PublicKeyToAddress(kp.Public())
require.Equal(t, "5FA9nQDVg267DEd8m1ZypXLBnvN7SFxYwV7ndqSYGiN9TTpu", string(addr))
}
8 changes: 6 additions & 2 deletions lib/crypto/keypair.go
Original file line number Diff line number Diff line change
@@ -59,16 +59,20 @@ var ss58Prefix = []byte("SS58PRE")
// also see: https://github.com/paritytech/substrate/blob/master/primitives/core/src/crypto.rs#L275
func PublicKeyToAddress(pub PublicKey) common.Address {
enc := append([]byte{42}, pub.Encode()...)
return PublicKeyBytesToAddress(enc)
}

func PublicKeyBytesToAddress(b []byte) common.Address {
hasher, err := blake2b.New(64, nil)
if err != nil {
return ""
}
_, err = hasher.Write(append(ss58Prefix, enc...))
_, err = hasher.Write(append(ss58Prefix, b...))
if err != nil {
return ""
}
checksum := hasher.Sum(nil)
return common.Address(base58.Encode(append(enc, checksum[:2]...)))
return common.Address(base58.Encode(append(b, checksum[:2]...)))
}

// PublicAddressToByteArray returns []byte address for given PublicKey Address