ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2024-12-18 20:47:57 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Generic PublicKey.toStringShort() (#641)

Browse Source 
Generic PublicKey.toStringShort() using the hash of the serialised form.
This commit is contained in:
Konstantinos Chalkias 2017-05-09 14:47:58 +01:00 committed by GitHub
parent 9362ad28e8
commit 5188e672eb
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/kotlin/net/corda/core/crypto/CryptoUtils.kt
View File

@ -106,12 +106,8 @@ fun PublicKey.isValid(content: ByteArray, signature: DigitalSignature) : Boolean
return Crypto.isValid(this, signature.bytes, content)
}
/** Render a public key to a string, using a short form if it's an elliptic curve public key */
fun PublicKey.toStringShort(): String {
return (this as? EdDSAPublicKey)?.let { key ->
"DL" + key.abyte.toBase58() // DL -> Distributed Ledger
} ?: toString()
}
/** Render a public key to its hash (in Base58) of its serialised form using the DL prefix. */
fun PublicKey.toStringShort(): String = "DL" + this.toSHA256Bytes().toBase58()
val PublicKey.keys: Set<PublicKey> get() {
return if (this is CompositeKey) this.leafKeys

1
core/src/main/kotlin/net/corda/core/crypto/EncodingUtils.kt
View File

@ -65,3 +65,4 @@ fun String.hexToBase64(): String = hexToByteArray().toBase64()
// structure, e.g. mapping a PublicKey to a condition with the specific feature (ED25519).
fun parsePublicKeyBase58(base58String: String): PublicKey = base58String.base58ToByteArray().deserialize<PublicKey>()
fun PublicKey.toBase58String(): String = this.serialize().bytes.toBase58()
fun PublicKey.toSHA256Bytes(): ByteArray = this.serialize().bytes.sha256().bytes

1
core/src/main/kotlin/net/corda/core/serialization/Kryo.kt
View File

@ -417,6 +417,7 @@ object PrivateKeySerializer : Serializer<PrivateKey>() {
@ThreadSafe
object PublicKeySerializer : Serializer<PublicKey>() {
override fun write(kryo: Kryo, output: Output, obj: PublicKey) {
// TODO: Instead of encoding to the default X509 format, we could have a custom per key type (space-efficient) serialiser.
output.writeBytesWithLength(obj.encoded)
}

3
experimental/src/main/kotlin/net/corda/contracts/universal/PrettyPrint.kt
View File

@ -2,6 +2,7 @@ package net.corda.contracts.universal
import net.corda.core.crypto.Party
import net.corda.core.crypto.commonName
import net.corda.core.crypto.toStringShort
import java.math.BigDecimal
import java.security.PublicKey
import java.time.Instant
@ -65,7 +66,7 @@ private class PrettyPrint(arr : Arrangement) {
init {
parties.forEach {
println( "val ${createPartyName(it)} = Party(\"${it.name.commonName}\", \"${it.owningKey}\")" )
println( "val ${createPartyName(it)} = Party(\"${it.name.commonName}\", \"${it.owningKey.toStringShort()}\")" )
}
}

2
samples/raft-notary-demo/src/main/kotlin/net/corda/notarydemo/NotaryDemo.kt
View File

@ -59,7 +59,7 @@ private class NotaryDemoClientApi(val rpc: CordaRPCOps) {
"Tx [${tx.tx.id.prefixChars()}..] signed by $signer"
}.joinToString("\n")
println("Notary: \"${notary.name}\", with composite key: ${notary.owningKey}\n" +
println("Notary: \"${notary.name}\", with composite key: ${notary.owningKey.toStringShort()}\n" +
"Notarised ${transactions.size} transactions:\n" + transactionSigners)
}