Merged in fix-irsdemo-json (pull request #168)

Fix irsdemo json

build.gradle

@@ -65,6 +65,7 @@ dependencies {
     // Unit testing helpers.
     testCompile 'junit:junit:4.12'
     testCompile 'org.assertj:assertj-core:3.4.1'
+    testCompile 'com.pholser:junit-quickcheck-core:0.6'
 }
 
 // Package up the demo programs.

node/src/main/kotlin/com/r3corda/node/utilities/JsonSupport.kt

@@ -10,9 +10,13 @@ import com.fasterxml.jackson.databind.deser.std.StringArrayDeserializer
 import com.fasterxml.jackson.databind.module.SimpleModule
 import com.fasterxml.jackson.module.kotlin.KotlinModule
 import com.r3corda.core.contracts.BusinessCalendar
+import com.r3corda.core.crypto.Base58
 import com.r3corda.core.crypto.Party
 import com.r3corda.core.crypto.SecureHash
 import com.r3corda.core.node.services.IdentityService
+import net.i2p.crypto.eddsa.EdDSAPublicKey
+import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable
+import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec
 import java.math.BigDecimal
 import java.time.LocalDate
 import java.time.LocalDateTime
@@ -22,6 +26,7 @@ import java.time.LocalDateTime
  * the java.time API, some core types, and Kotlin data classes.
  */
 object JsonSupport {
+
     fun createDefaultMapper(identities: IdentityService): ObjectMapper {
         val mapper = ServiceHubObjectMapper(identities)
         mapper.enable(SerializationFeature.INDENT_OUTPUT);
@@ -45,6 +50,10 @@ object JsonSupport {
         cordaModule.addDeserializer(SecureHash.SHA256::class.java, SecureHashDeserializer())
         cordaModule.addDeserializer(BusinessCalendar::class.java, CalendarDeserializer)
 
+        // For ed25519 pubkeys
+        cordaModule.addSerializer(EdDSAPublicKey::class.java, PublicKeySerializer)
+        cordaModule.addDeserializer(EdDSAPublicKey::class.java, PublicKeyDeserializer)
+
         mapper.registerModule(timeModule)
         mapper.registerModule(cordaModule)
         mapper.registerModule(KotlinModule())
@@ -126,4 +135,24 @@ object JsonSupport {
             }
         }
     }
-}
+
+    private val ed25519Curve = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512)
+
+    object PublicKeySerializer : JsonSerializer<EdDSAPublicKey>() {
+       override fun serialize(obj: EdDSAPublicKey, generator: JsonGenerator, provider: SerializerProvider) {
+           check(obj.params == ed25519Curve)
+           generator.writeString(Base58.encode(obj.abyte))
+       }
+    }
+
+    object PublicKeyDeserializer : JsonDeserializer<EdDSAPublicKey>() {
+        override fun deserialize(parser: JsonParser, context: DeserializationContext): EdDSAPublicKey {
+            return try {
+                val A = Base58.decode(parser.text)
+                EdDSAPublicKey(EdDSAPublicKeySpec(A, ed25519Curve))
+            } catch (e: Exception) {
+                throw JsonParseException("Invalid public key ${parser.text}: ${e.message}", parser.currentLocation)
+            }
+        }
+    }
+}

src/main/resources/com/r3corda/demos/example-irs-trade.json

@@ -99,6 +99,5 @@
     "dailyInterestAmount": "(CashAmount * InterestRate ) / (fixedLeg.notional.token.currencyCode.equals('GBP')) ? 365 : 360",
     "tradeID": "tradeXXX",
     "hashLegalDocs": "put hash here"
-  },
-  "notary": "Bank A"
+  }
 }

src/test/kotlin/com/r3corda/core/testing/JsonSupportTest.kt

@@ -0,0 +1,50 @@
+package com.r3corda.core.testing
+
+import com.pholser.junit.quickcheck.From
+import com.pholser.junit.quickcheck.Property
+import com.pholser.junit.quickcheck.generator.GenerationStatus
+import com.pholser.junit.quickcheck.generator.Generator
+import com.pholser.junit.quickcheck.random.SourceOfRandomness
+import com.pholser.junit.quickcheck.runner.JUnitQuickcheck
+import com.r3corda.core.node.services.testing.MockIdentityService
+import com.r3corda.node.utilities.JsonSupport
+import net.i2p.crypto.eddsa.EdDSAPrivateKey
+import net.i2p.crypto.eddsa.EdDSAPublicKey
+import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable
+import net.i2p.crypto.eddsa.spec.EdDSAPrivateKeySpec
+import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec
+import org.junit.runner.RunWith
+import kotlin.test.assertEquals
+
+@RunWith(JUnitQuickcheck::class)
+class JsonSupportTest {
+
+    companion object {
+        val mapper = JsonSupport.createDefaultMapper(MockIdentityService(mutableListOf()))
+        val ed25519Curve = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.CURVE_ED25519_SHA512)
+    }
+
+    /** TODO: factor out generators into a ServiceLoader in order to remove @From annotations.
+     * @See <a href="http://pholser.github.io/junit-quickcheck/site/0.6/usage/other-types.html">pholser.github.io</a>
+     */
+    class PrivateKeyGenerator: Generator<EdDSAPrivateKey>(EdDSAPrivateKey::class.java) {
+        override fun generate(random: SourceOfRandomness, status: GenerationStatus): EdDSAPrivateKey {
+            val seed = random.nextBytes(32)
+            val privateKeySpec = EdDSAPrivateKeySpec(seed, ed25519Curve)
+            return EdDSAPrivateKey(privateKeySpec)
+        }
+    }
+
+    class PublicKeyGenerator: Generator<EdDSAPublicKey>(EdDSAPublicKey::class.java) {
+        override fun generate(random: SourceOfRandomness, status: GenerationStatus): EdDSAPublicKey {
+            val privateKey = PrivateKeyGenerator().generate(random, status)
+            return EdDSAPublicKey(EdDSAPublicKeySpec(privateKey.a, ed25519Curve))
+        }
+    }
+
+    @Property fun publicKeySerializingWorks(@From(PublicKeyGenerator::class) publicKey: EdDSAPublicKey) {
+        val serialized = mapper.writeValueAsString(publicKey)
+        val parsedKey = mapper.readValue(serialized, EdDSAPublicKey::class.java)
+        assertEquals(publicKey, parsedKey)
+    }
+}