Merge branch 'smart-contract' into 'master'

Smart contract

See merge request open-platform/chain!261

CHANGELOG.md

@@ -5,9 +5,14 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+## Added
+- Smart contract: loading contract to JVM
+- Smart contract: simple contact validation
+
 ## Changed
--Core: chain synchronization improved (request for chain of blocks instead of last block only)
--Core: time synchronization improved (based on time-synchronized nodes)
+- Core: chain synchronization improved (request for chain of blocks instead of last block only)
+- Core: time synchronization improved (based on time-synchronized nodes)
+
 
 ## [1.3.0] - 2018-11-16
 ## Added

build.gradle

@@ -53,6 +53,10 @@ dependencies {
     //JAXB
     compile("javax.xml.bind:jaxb-api:2.3.0")
 
+    // Byte code
+    compile("org.ow2.asm:asm:7.0")
+    compile("org.ow2.asm:asm-commons:7.0")
+
     // Tests
     testCompile('org.springframework.boot:spring-boot-starter-test')
     testCompile('io.projectreactor:reactor-test')
@@ -83,7 +87,7 @@ compileTestKotlin {
 }
 noArg {
     annotations(
-            "javax.persistence.MappedSuperclass", 
+            "javax.persistence.MappedSuperclass",
             "javax.persistence.Entity",
             "io.openfuture.chain.core.annotation.NoArgConstructor"
     )

src/main/kotlin/io/openfuture/chain/smartcontract/annotation/ContractConstruct.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/annotation/ContractConstruct.kt

@@ -1,4 +1,4 @@
-package io.openfuture.chain.smartcontract.annotation
+package io.openfuture.chain.smartcontract.core.annotation
 
 @Target(AnnotationTarget.FUNCTION)
 annotation class ContractConstruct

src/main/kotlin/io/openfuture/chain/smartcontract/annotation/ContractMethod.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/annotation/ContractMethod.kt

@@ -1,4 +1,4 @@
-package io.openfuture.chain.smartcontract.annotation
+package io.openfuture.chain.smartcontract.core.annotation
 
 @Target(AnnotationTarget.FUNCTION)
 annotation class ContractMethod

src/main/kotlin/io/openfuture/chain/smartcontract/exception/RequiredException.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/exception/RequiredException.kt

@@ -1,3 +1,3 @@
-package io.openfuture.chain.smartcontract.exception
+package io.openfuture.chain.smartcontract.core.exception
 
 class RequiredException(message: String?) : SmartContractException(message ?: "Required Exception")

src/main/kotlin/io/openfuture/chain/smartcontract/exception/SmartContractException.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/exception/SmartContractException.kt

@@ -1,3 +1,3 @@
-package io.openfuture.chain.smartcontract.exception
+package io.openfuture.chain.smartcontract.core.exception
 
 abstract class SmartContractException(message: String) : RuntimeException("Smart contract exception: $message")

src/main/kotlin/io/openfuture/chain/smartcontract/model/Address.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/model/Address.kt

@@ -1,4 +1,4 @@
-package io.openfuture.chain.smartcontract.model
+package io.openfuture.chain.smartcontract.core.model
 
 open class Address(private val address: String) {
 

src/main/kotlin/io/openfuture/chain/smartcontract/model/Event.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/model/Event.kt

@@ -1,4 +1,4 @@
-package io.openfuture.chain.smartcontract.model
+package io.openfuture.chain.smartcontract.core.model
 
 abstract class Event {
 

src/main/kotlin/io/openfuture/chain/smartcontract/model/Message.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/model/Message.kt

@@ -1,3 +1,3 @@
-package io.openfuture.chain.smartcontract.model
+package io.openfuture.chain.smartcontract.core.model
 
 class Message(val data: ByteArray, val value: Long, val sender: Address)

src/main/kotlin/io/openfuture/chain/smartcontract/model/SmartContract.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/model/SmartContract.kt

@@ -1,7 +1,7 @@
-package io.openfuture.chain.smartcontract.model
+package io.openfuture.chain.smartcontract.core.model
 
-import io.openfuture.chain.smartcontract.exception.RequiredException
-import io.openfuture.chain.smartcontract.utils.AddressUtils
+import io.openfuture.chain.smartcontract.core.exception.RequiredException
+import io.openfuture.chain.smartcontract.core.utils.AddressUtils
 
 abstract class SmartContract(ownerAddress: String) {
 
@@ -10,14 +10,6 @@ abstract class SmartContract(ownerAddress: String) {
     protected var address: Address = Address(AddressUtils.generateContractAddress(ownerAddress, "0"))
 
 
-    protected fun transfer(address: String, amount: Long) {
-        transfer(Address(address), amount)
-    }
-
-    protected fun transfer(address: Address, amount: Long) {
-        TODO()
-    }
-
     protected fun required(value: Boolean, message: String? = null) {
         if (!value) {
             throw RequiredException(message)

src/main/kotlin/io/openfuture/chain/smartcontract/core/service/Services.kt

@@ -0,0 +1,23 @@
+package io.test.io.openfuture.chain.smartcontract.core.service
+
+import io.openfuture.chain.smartcontract.core.model.SmartContract
+
+interface ContractService {
+
+    fun get(address: String): SmartContract
+
+}
+
+interface TransactionService {
+
+    fun transfer(senderAddress: String, recipientAddress: String, amount: Long)
+
+}
+
+interface BlockService {
+
+    fun blockHash(height: Long): String
+
+    fun blockTimestamp(height: Long): String
+
+}

src/main/kotlin/io/openfuture/chain/smartcontract/utils/AddressUtils.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/utils/AddressUtils.kt

@@ -1,4 +1,4 @@
-package io.openfuture.chain.smartcontract.utils
+package io.openfuture.chain.smartcontract.core.utils
 
 import org.bouncycastle.pqc.math.linearalgebra.ByteUtils
 import kotlin.text.Charsets.UTF_8

src/main/kotlin/io/openfuture/chain/smartcontract/core/utils/ByteUtils.kt

@@ -0,0 +1,11 @@
+package io.openfuture.chain.smartcontract.core.utils
+
+import org.bouncycastle.pqc.math.linearalgebra.ByteUtils
+
+object ByteUtils {
+
+    fun toHexString(bytes: ByteArray): String = ByteUtils.toHexString(bytes)
+
+    fun fromHexString(hex: String): ByteArray = ByteUtils.fromHexString(hex)
+
+}

src/main/kotlin/io/openfuture/chain/smartcontract/utils/HashUtils.kt → src/main/kotlin/io/openfuture/chain/smartcontract/core/utils/HashUtils.kt

@@ -1,4 +1,4 @@
-package io.openfuture.chain.smartcontract.utils
+package io.openfuture.chain.smartcontract.core.utils
 
 import org.bouncycastle.crypto.digests.RIPEMD160Digest
 import org.bouncycastle.jcajce.provider.digest.Keccak

src/main/kotlin/io/openfuture/chain/smartcontract/deploy/domain/ClassSource.kt

@@ -0,0 +1,28 @@
+package io.openfuture.chain.smartcontract.deploy.domain
+
+import io.openfuture.chain.smartcontract.deploy.utils.asPackagePath
+import org.objectweb.asm.ClassReader
+import org.objectweb.asm.ClassWriter
+import org.objectweb.asm.Opcodes.ASM6
+import java.nio.file.Path
+
+
+class ClassSource(
+    val bytes: ByteArray
+) {
+
+    companion object {
+        fun isClass(path: Path): Boolean = path.fileName.toString().endsWith(".class", true)
+    }
+
+    val reader = ClassReader(bytes)
+    val writer = ClassWriter(reader, ASM6)
+
+    /**
+     * Fully qualified class name, e.g. io.openfuture.chain.HelloWorld
+     */
+    val qualifiedName
+        get() = reader.className.asPackagePath
+
+
+}

src/main/kotlin/io/openfuture/chain/smartcontract/deploy/domain/LoadedClass.kt

@@ -0,0 +1,6 @@
+package io.openfuture.chain.smartcontract.deploy.domain
+
+class LoadedClass(
+    val clazz: Class<*>,
+    val byteCode: ByteArray
+)

src/main/kotlin/io/openfuture/chain/smartcontract/deploy/exception/ClassLoadingException.kt

@@ -0,0 +1,6 @@
+package io.openfuture.chain.smartcontract.deploy.exception
+
+class ClassLoadingException(
+    message: String? = "Class loading failed",
+    cause: Throwable? = null
+) : RuntimeException(message, cause)

src/main/kotlin/io/openfuture/chain/smartcontract/deploy/load/SourceClassLoader.kt

@@ -0,0 +1,90 @@
+package io.openfuture.chain.smartcontract.deploy.load
+
+import io.openfuture.chain.smartcontract.deploy.domain.ClassSource.Companion.isClass
+import io.openfuture.chain.smartcontract.deploy.domain.LoadedClass
+import io.openfuture.chain.smartcontract.deploy.exception.ClassLoadingException
+import io.openfuture.chain.smartcontract.deploy.utils.asResourcePath
+import io.openfuture.chain.smartcontract.deploy.utils.toURL
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+import java.io.FileNotFoundException
+import java.io.IOException
+import java.net.URL
+import java.net.URLClassLoader
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+
+
+class SourceClassLoader(
+    paths: List<Path> = emptyList()
+) : URLClassLoader(resolvePaths(paths), getSystemClassLoader()) {
+
+    companion object {
+        private val log: Logger = LoggerFactory.getLogger(SourceClassLoader::class.java)
+    }
+
+    private val classes: MutableMap<String, LoadedClass> = mutableMapOf()
+
+
+    override fun loadClass(name: String): Class<*> = loadClass(name, false)
+
+    override fun loadClass(name: String, resolve: Boolean): Class<*> {
+        try {
+            //todo validate
+            return super.loadClass(name, resolve)
+        } catch (ex: Throwable) {
+            throw ClassLoadingException(ex.message, ex)
+        }
+    }
+
+    override fun findClass(name: String): Class<*> {
+        val loadedClass = classes[name]
+        if (null != loadedClass) {
+            log.trace("Class $name already loaded")
+            return loadedClass.clazz
+        }
+
+        val bytes = readClassBytes(name)
+        val clazz = loadBytes(name, bytes).clazz
+        classes[name] = LoadedClass(clazz, bytes)
+        resolveClass(clazz)
+        return clazz
+    }
+
+    fun loadBytes(className: String, bytes: ByteArray): LoadedClass {
+        try {
+            return LoadedClass(defineClass(className, bytes, 0, bytes.size), bytes)
+        } catch (ex: Throwable) {
+            throw ClassLoadingException(ex.message, ex)
+        }
+    }
+
+    private fun readClassBytes(fullyQualifiedClassName: String): ByteArray {
+        try {
+            return (getResourceAsStream("${fullyQualifiedClassName.asResourcePath}.class")
+                ?: throw ClassLoadingException("Class not found $fullyQualifiedClassName")).readBytes()
+        } catch (e: IOException) {
+            throw ClassLoadingException("Error reading bytecode", e)
+        }
+    }
+
+}
+
+
+private val homeDirectory: Path
+    get() = Paths.get(System.getProperty("user.home"))
+
+
+private fun resolvePaths(paths: List<Path>): Array<URL> = paths.map { expandPath(it) }.flatMap { path ->
+    when {
+        !Files.exists(path) -> throw FileNotFoundException("File not found; $path")
+        isClass(path) || Files.isDirectory(path) -> listOf(path.toURL())
+        else -> throw IllegalArgumentException("Expected a class file, but found $path")
+    }
+}.toTypedArray()
+
+private fun expandPath(path: Path): Path = if (path.toString().startsWith("~/")) {
+    homeDirectory.resolve(path.toString().removePrefix("~/"))
+} else path
+

src/main/kotlin/io/openfuture/chain/smartcontract/deploy/service/DefaultContractService.kt

@@ -0,0 +1,24 @@
+package io.openfuture.chain.smartcontract.deploy.service
+
+import io.openfuture.chain.smartcontract.deploy.domain.ClassSource
+import io.openfuture.chain.smartcontract.deploy.load.SourceClassLoader
+import org.springframework.stereotype.Service
+
+@Service
+class DefaultContractService : ContractService {
+
+    private val classLoader = SourceClassLoader()
+
+
+    override fun deploy(bytes: ByteArray) {
+        // simple deploy method
+        val source = ClassSource(bytes)
+        classLoader.loadBytes(source.qualifiedName, bytes)
+    }
+
+    override fun run(className: String, method: String, vararg params: Any) {
+        //run a method of a contract in separate thread
+        TODO("not implemented")
+    }
+
+}

src/main/kotlin/io/openfuture/chain/smartcontract/deploy/service/Services.kt

@@ -0,0 +1,9 @@
+package io.openfuture.chain.smartcontract.deploy.service
+
+interface ContractService {
+
+    fun deploy(bytes: ByteArray)
+
+    fun run(className: String, method: String, vararg params: Any)
+
+}

src/main/kotlin/io/openfuture/chain/smartcontract/deploy/utils/Extentions.kt

@@ -0,0 +1,9 @@
+package io.openfuture.chain.smartcontract.deploy.utils
+
+import java.net.URL
+import java.nio.file.Path
+
+fun Path.toURL(): URL = this.toUri().toURL()
+
+val String.asPackagePath: String get() = this.replace('/', '.')
+val String.asResourcePath: String get() = this.replace('.', '/')

src/main/kotlin/io/openfuture/chain/smartcontract/deploy/validation/BlackList.kt

@@ -0,0 +1,31 @@
+package io.test.io.openfuture.chain.smartcontract.deploy.validation
+
+object BlackList {
+
+    private val entries = setOf(
+        "java/awt/.*",
+        "java/beans/.*",
+        "java/lang/invoke/.*",
+        "java/lang/.*Thread.*",
+        "java/lang/Shutdown.*",
+        "java/lang/ref/.*",
+        "java/lang/reflect/InvocationHandler.*",
+        "java/lang/reflect/Proxy.*",
+        "java/lang/reflect/Weak.*",
+        "java/io/.*File.*",
+        "java/net/.*Content.*",
+        "java/net/Host.*",
+        "java/net/Inet.*",
+        "java/nio/file/Path.*",
+        "java/nio/file/attribute/.*",
+        "java/util/SplittableRandom.*",
+        "java/util/Random.*",
+        "java/util/WeakHashMap.*",
+        "java/util/concurrent/.*",
+        "java/util/concurrent/locks/.*",
+        "javax/activation/.*"
+    ).map { "[\\(\\)L]?$it".toRegex() }
+
+    fun matches(className: String): Boolean = entries.any { it.matches(className) }
+
+}