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

Jump to bottom

fix: lib/runtime: allow generic keystore type in public_keys ext functions #1450

Merged
merged 5 commits into from
Mar 12, 2021
Merged

fix: lib/runtime: allow generic keystore type in public_keys ext functions #1450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1f9d27c
allow generic keystore type to return public keys
noot Mar 11, 2021
4e5ce7e
update tests
noot Mar 11, 2021
b4a921c
fix log
noot Mar 11, 2021
b517288
Merge branch 'development' into noot/fix-ext-crypto
noot Mar 11, 2021
adb0fa8
Merge branch 'development' into noot/fix-ext-crypto
noot Mar 12, 2021
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
14 changes: 7 additions & 7 deletions lib/runtime/wasmer/imports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ func ext_crypto_ed25519_public_keys_version_1(context unsafe.Pointer, keyTypeID
return C.int64_t(ret)
}

if ks.Type() != crypto.Ed25519Type {
logger.Warn("[ext_crypto_ed25519_public_keys_version_1]", "name", id, "error", "keystore type is not ed25519")
if ks.Type() != crypto.Ed25519Type && ks.Type() != crypto.UnknownType {
logger.Warn("[ext_crypto_ed25519_public_keys_version_1]", "name", id, "error", "keystore type is not ed25519", "type", ks.Type())
ret, _ := toWasmMemory(instanceContext, []byte{0})
return C.int64_t(ret)
}
Expand Down Expand Up @@ -526,8 +526,8 @@ func ext_crypto_sr25519_public_keys_version_1(context unsafe.Pointer, keyTypeID
return C.int64_t(ret)
}

if ks.Type() != crypto.Sr25519Type {
logger.Warn("[ext_crypto_ed25519_public_keys_version_1]", "name", id, "error", "keystore type is not ed25519")
if ks.Type() != crypto.Sr25519Type && ks.Type() != crypto.UnknownType {
logger.Warn("[ext_crypto_sr25519_public_keys_version_1]", "name", id, "error", "keystore type is not sr25519")
ret, _ := toWasmMemory(instanceContext, []byte{0})
return C.int64_t(ret)
}
Expand All @@ -541,14 +541,14 @@ func ext_crypto_sr25519_public_keys_version_1(context unsafe.Pointer, keyTypeID

prefix, err := scale.Encode(big.NewInt(int64(len(keys))))
if err != nil {
logger.Error("[ext_crypto_ed25519_public_keys_version_1] failed to allocate memory", err)
logger.Error("[ext_crypto_sr25519_public_keys_version_1] failed to allocate memory", err)
ret, _ := toWasmMemory(instanceContext, []byte{0})
return C.int64_t(ret)
}

ret, err := toWasmMemory(instanceContext, append(prefix, encodedKeys...))
if err != nil {
logger.Error("[ext_crypto_ed25519_public_keys_version_1] failed to allocate memory", err)
logger.Error("[ext_crypto_sr25519_public_keys_version_1] failed to allocate memory", err)
ret, _ = toWasmMemory(instanceContext, []byte{0})
return C.int64_t(ret)
}
Expand All @@ -569,7 +569,7 @@ func ext_crypto_sr25519_sign_version_1(context unsafe.Pointer, keyTypeID, key C.

ks, err := runtimeCtx.Keystore.GetKeystore(id)
if err != nil {
logger.Warn("[ext_crypto_sr25519_public_keys_version_1]", "name", id, "error", err)
logger.Warn("[ext_crypto_sr25519_sign_version_1]", "name", id, "error", err)
return C.int64_t(emptyRet)
}

Expand Down
4 changes: 2 additions & 2 deletions lib/runtime/wasmer/imports_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ func Test_ext_crypto_ed25519_generate_version_1(t *testing.T) {
func Test_ext_crypto_ed25519_public_keys_version_1(t *testing.T) {
inst := NewTestInstance(t, runtime.HOST_API_TEST_RUNTIME)

idData := []byte(keystore.GranName)
idData := []byte(keystore.DumyName)
ks, _ := inst.ctx.Keystore.GetKeystore(idData)
require.Equal(t, 0, ks.Size())

Expand Down Expand Up @@ -673,7 +673,7 @@ func Test_ext_crypto_secp256k1_ecdsa_recover_compressed_version_1(t *testing.T)
func Test_ext_crypto_sr25519_public_keys_version_1(t *testing.T) {
inst := NewTestInstance(t, runtime.HOST_API_TEST_RUNTIME)

idData := []byte(keystore.BabeName)
idData := []byte(keystore.DumyName)
ks, _ := inst.ctx.Keystore.GetKeystore(idData)
require.Equal(t, 0, ks.Size())

Expand Down