mirror of
https://github.com/corda/corda.git
synced 2024-12-18 20:47:57 +00:00
f226ddc4f2
* * CORDA-2876: Migrate DJVM serialization modules into Corda. * Pre-generate Corda classes for DJVM sandbox when node boots in production mode. * Ensure that all DJVM test contract CorDapps are signed. * Test examining attachments within DJVM sandbox. * Test Contract.verify() using cryptographic verify function. * Add test cases for more non-determinism in Contract.verify(). * Update node-driver to support testing nodes with DJVM support. * Modify Node to allow alternative DJVM configurations for testing. * Refactor DeterministicVerifierFactoryService for default use-case. * Small whitespace and code-style refactors. * Create and activate a DJVM execution profile for the Node. * Revert making Verifier implement AutoCloseable. * Allow the node to cache sandboxed Corda byte-code for reuse. * Use updated Quasar agent that knows not to touch DJVM classloaders. * Fix Quasar's package exclusions globs for DJVM. * Deserialise LedgerTransaction into the sandbox for Contract.verify(). * Add the DJVM's serialisation modules to the Corda node. * Update the node for the latest DJVM API, and preserve the ConstructorForDeserialization annotation on user contract classes. * Add corda-dev to repositories while DJVM is SNAPSHOT. * Migrate DJVM specialisation into AbstractNode's ServiceHubInternalImpl. * Exclude sandbox.** and shaded djvm.** classes from Quasar agent. * Add the corda-dev repository to :node for the deterministic runtime. * Turn Verifier into an abstract base class that is specialised by BasicVerifier and DeterministicVerifier. * Add the Corda deterministic libraries to the Node, and split the DJVM sandbox across two SandboxClassLoader instances. * Add DJVM to contract verification path inside Corda Node. * Minor lambda simplifications and removing unused import. * CORDA-2871: Remove @CordaSerializable from LedgerTransaction. * CORDA-2871: Add a callback to ServicesForResolution to allow the Node to modify a LedgerTransaction object. * CORDA-2871: Refactor the contract verification code into a separate class, and allow LedgerTransaction to choose different Verifier objects. * Update DJVM to use Corda 4.4-SNAPSHOT. (#95) * CORDA-3330: Allow DJVM to preload / pregenerate classes from selected jars. (#92) * Add support for SourceClassLoader.getResources() to DJVM. * Allow a SandboxConfiguration to preload sandbox byte-code for all classes inside jars containing META-INF/DJVM-preload. * CORDA-3309: Remove explicit try-catch in favour of UncaughtExceptionHandler. (#91) * CORDA-3309: Install UncaughtExceptionHandler for DJVM tasks. (#88) * Fix tests broken by Windows line endings. (#82) * CORDA-3292: Reimplement ExecutionProfile as a data class. (#80) * CORDA-2877: Refactor how we create child SandboxConfiguration objects. (#76) * CORDA-2877: Load bytecode from a persistent cache to prevent repeated rewriting. (#75) * Refactor byte-code cache to SandboxConfiguration instead of AnalysisConfiguration. We cannot "mix and match" byte-code generated by different sets of rules. * CORDA-3137: Enhance annotation handling so that we can allow some annotations to be mapped into the sandbox without also needing to be stitched. (#72) * CORDA-2871: Minor cosmetic fixes. (#69) * CORDA-3218: Align DJVM with internal Corda Serialisation API. (#68) * Ensure we get the latest SNAPSHOT of the serialisation code. * CORDA-2871: Refactor SourceClassLoader to define source classes. (#66) * Rewrite SourceClassLoader to support parent/child relationships. * Revert catching TypNotPresebtException - it was a symptom of a bigger problem. * Remove AutoCloseable from AnalysisConfiguration and SourceClassLoader. * SourceClassLoader.getResource() must delegate to its parent first. * CORDA-2871: Ensure ClassLoader.loadClass() throws ClassNotFoundException for all cases where the class cannot be found. (#64) * CORDA-2871: Modify sandbox tasks to implement both java.Function and sandbox.Function (#62) * Make TaskExecutors implement BiFunction to make them composable. * Create ImportTask to wrap a java.Function inside a sandbox.Function. * Add createExecutor() and createRawExecutor() APIs to SandboxClassLoader. * Update serialization to use SandboxClassLoader.toSandboxClass(). * Remove a layer of lambdas from the serialisation code. * Update SandboxExecutor and SandboxRawExecutor. * Rename Executor to TaskFactory. * Rename dangling executor -> taskFactory. * CORDA-2871: Sanity fixes! (#63) * Improve message for SandboxClassLoadingException. * Fix serialisation API for using sandboxed environment. * CORDA-3174: Extend serialisation to include InputStream and OpaqueBytesSubSequence. (#60) * Update DJVM Example project for serialisation. * Add serializers for InputStream and OpaqueBytesSubSequence. * Support ZIP Inflater and CRC32 inside the sandbox. * Allow the DJVM to wrap java.io.InputStream as sandbox.java.io.InputStream. * Configure tests also to preserve @DeprecatedConstructorForDeserialization. * CORDA-3174: Implement Corda serialization modules. (#59) * Create DJVM serialization modules. * Create test cases for Array<T>, List<T> and List<Array<T>>. * Refactor SandboxPrimiveSerializer for all primitive types. * Implement SandboxCollectionSerializer to support Collection types. * Implement SandboxMapSerializer to support Map types. * Attempt to fix infinite loop when computing Collection and Map fingerprints. * Apply special handling when deserialising sandbox.java.lang.Character. * Remap Java primitive types to sandbox Java object types to deter evolution. * Use Class.getPackage().getName() to determine sandbox package name. * Implement SandboxEnumSerializer to support Enum types. * Implement SandboxPublicKeySerializer to support Java security keys. * Add serialization projects to the composite example project. * Implement serializers for BigInteger, BigDecimal, Currency and StringBuffer. * Test that deserialising does not instantiate the untrusted user classes. * Implement serializers for java.time.* types. * Add serialiser for BitSet - currently disabled until BitSet itself is supported. * Add serialisers for EnumSet and Class. * Include support for EnumMap in the SandboxMapSerializer. * Ensure the DJVM Example project's tests preserve @CordaSerializable. * Add support for UUID as a primitive type. * Use common abortReadOnly() method for declaring serialization as unsupported. * Streamline the API for deserialising into the sandbox. * Add preliminary support for deserialising X.509 certificates. * Implement serializer for java.util.Optional. * Refactor configuration of the sandbox serialization scheme. * Add tests for deserialising arrays of basic types. * Include method annotations in annotation stitching. This ensures that `@ConstructorForDeserialization` is not dropped. * Enable test for SandboxBitSetSerializer. * Enable tests for X.509 serializers. * Implement serializers for ProtonJ primitive types. * Serialize java.util.Date as a primitive type. * Add the bintray Gradle plugin to the serialisation modules. * Do not publish serialisation modules - they will become part of Corda itself. * CORDA-2876: Only apply DJVM sources to Node Driver when devMode=true. * Resolve DeteKT warnings. * Require Node's JVM to set -Dnet.corda.djvm=true in order to enable DJVM. * Enable DJVM for DemoBench nodes. * Disable Quasar instrumentation verification for DemoBench nodes. * Upgrade to DJVM 1.0-RC01. * Try to modify DriverParameters in a more "ABI friendly" way. * Refactor and simplify sandbox deserialisation of primitive objects. * Review fixes. * Update EvolutionSerializerFactory to handle sandboxed primitive boxed types.
342 lines
12 KiB
Groovy
342 lines
12 KiB
Groovy
// Import private compile time constants
|
|
buildscript {
|
|
def properties = new Properties()
|
|
file("$projectDir/src/main/resources/build.properties").withInputStream { properties.load(it) }
|
|
|
|
|
|
Properties constants = new Properties()
|
|
file("$rootDir/constants.properties").withInputStream { constants.load(it) }
|
|
|
|
|
|
ext.jolokia_version = constants.getProperty('jolokiaAgentVersion')
|
|
|
|
dependencies {
|
|
classpath group: 'com.github.docker-java', name: 'docker-java', version: '3.1.5'
|
|
}
|
|
}
|
|
|
|
|
|
plugins {
|
|
id 'com.google.cloud.tools.jib' version '0.9.4'
|
|
}
|
|
|
|
apply plugin: 'kotlin'
|
|
// Java Persistence API support: create no-arg constructor
|
|
// see: http://stackoverflow.com/questions/32038177/kotlin-with-jpa-default-constructor-hell
|
|
apply plugin: 'kotlin-jpa'
|
|
apply plugin: 'java'
|
|
apply plugin: 'net.corda.plugins.quasar-utils'
|
|
apply plugin: 'net.corda.plugins.publish-utils'
|
|
apply plugin: 'com.jfrog.artifactory'
|
|
|
|
description 'Corda node modules'
|
|
|
|
repositories {
|
|
// Extra repository for the deterministic-rt JAR.
|
|
maven {
|
|
url "$artifactory_contextUrl/corda-dev"
|
|
}
|
|
}
|
|
|
|
//noinspection GroovyAssignabilityCheck
|
|
configurations {
|
|
integrationTestCompile.extendsFrom testCompile
|
|
integrationTestRuntimeOnly.extendsFrom testRuntimeOnly
|
|
|
|
slowIntegrationTestCompile.extendsFrom testCompile
|
|
slowIntegrationTestRuntimeOnly.extendsFrom testRuntimeOnly
|
|
|
|
jdkRt.resolutionStrategy {
|
|
cacheChangingModulesFor 0, 'seconds'
|
|
}
|
|
deterministic
|
|
}
|
|
|
|
sourceSets {
|
|
integrationTest {
|
|
kotlin {
|
|
compileClasspath += main.output + test.output
|
|
runtimeClasspath += main.output + test.output
|
|
srcDir file('src/integration-test/kotlin')
|
|
}
|
|
java {
|
|
compileClasspath += main.output + test.output
|
|
runtimeClasspath += main.output + test.output
|
|
srcDir file('src/integration-test/java')
|
|
}
|
|
resources {
|
|
srcDir file('src/integration-test/resources')
|
|
}
|
|
}
|
|
slowIntegrationTest {
|
|
kotlin {
|
|
compileClasspath += main.output + test.output
|
|
runtimeClasspath += main.output + test.output
|
|
srcDir file('src/integration-test-slow/kotlin')
|
|
}
|
|
java {
|
|
compileClasspath += main.output + test.output
|
|
runtimeClasspath += main.output + test.output
|
|
srcDir file('src/integration-test-slow/java')
|
|
}
|
|
resources {
|
|
srcDir file('src/integration-test-slow/resources')
|
|
}
|
|
}
|
|
}
|
|
|
|
jib.container {
|
|
mainClass = "net.corda.node.Corda"
|
|
args = ['--log-to-console', '--no-local-shell', '--config-file=/config/node.conf']
|
|
// The Groovy string needs to be converted to a `java.lang.String` below.
|
|
jvmFlags = ['-Xmx1g', "-javaagent:/app/libs/quasar-core-${quasar_version}.jar".toString()]
|
|
}
|
|
|
|
// Use manual resource copying of log4j2.xml rather than source sets.
|
|
// This prevents problems in IntelliJ with regard to duplicate source roots.
|
|
processResources {
|
|
from file("$rootDir/config/dev/log4j2.xml")
|
|
from file("$rootDir/config/dev/jolokia-access.xml")
|
|
}
|
|
|
|
processTestResources {
|
|
from file("$rootDir/config/test/jolokia-access.xml")
|
|
}
|
|
|
|
// To find potential version conflicts, run "gradle htmlDependencyReport" and then look in
|
|
// build/reports/project/dependencies/index.html for green highlighted parts of the tree.
|
|
|
|
dependencies {
|
|
compile project(':node-api')
|
|
compile project(':client:rpc')
|
|
compile project(':tools:shell')
|
|
compile project(':tools:cliutils')
|
|
compile project(':common-validation')
|
|
compile project(':common-configuration-parsing')
|
|
compile project(':common-logging')
|
|
|
|
// Backwards compatibility goo: Apps expect confidential-identities to be loaded by default.
|
|
// We could eventually gate this on a target-version check.
|
|
compile project(':confidential-identities')
|
|
|
|
// Log4J: logging framework (with SLF4J bindings)
|
|
compile "org.apache.logging.log4j:log4j-slf4j-impl:${log4j_version}"
|
|
compile "org.apache.logging.log4j:log4j-web:${log4j_version}"
|
|
compile "org.slf4j:jul-to-slf4j:$slf4j_version"
|
|
|
|
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
|
runtimeOnly "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
|
|
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
|
|
testCompile "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
|
|
|
|
// Kryo: object graph serialization.
|
|
compile "com.esotericsoftware:kryo:4.0.2"
|
|
compile "de.javakaffee:kryo-serializers:0.43"
|
|
|
|
compile "com.google.guava:guava:$guava_version"
|
|
|
|
// For caches rather than guava
|
|
compile "com.github.ben-manes.caffeine:caffeine:$caffeine_version"
|
|
|
|
// For async logging
|
|
compile "com.lmax:disruptor:$disruptor_version"
|
|
|
|
// Artemis: for reliable p2p message queues.
|
|
// TODO: remove the forced update of commons-collections and beanutils when artemis updates them
|
|
compile "org.apache.commons:commons-collections4:${commons_collections_version}"
|
|
compile "commons-beanutils:commons-beanutils:${beanutils_version}"
|
|
compile "org.apache.activemq:artemis-server:${artemis_version}"
|
|
compile "org.apache.activemq:artemis-core-client:${artemis_version}"
|
|
runtime("org.apache.activemq:artemis-amqp-protocol:${artemis_version}") {
|
|
// Gains our proton-j version from core module.
|
|
exclude group: 'org.apache.qpid', module: 'proton-j'
|
|
}
|
|
|
|
// Manifests: for reading stuff from the manifest file
|
|
compile "com.jcabi:jcabi-manifests:$jcabi_manifests_version"
|
|
|
|
compile("com.intellij:forms_rt:7.0.3") {
|
|
exclude group: "asm"
|
|
}
|
|
|
|
// Coda Hale's Metrics: for monitoring of key statistics
|
|
compile "io.dropwizard.metrics:metrics-jmx:$metrics_version"
|
|
|
|
// JimFS: in memory java.nio filesystem. Used for test and simulation utilities.
|
|
compile "com.google.jimfs:jimfs:1.1"
|
|
|
|
// TypeSafe Config: for simple and human friendly config files.
|
|
compile "com.typesafe:config:$typesafe_config_version"
|
|
|
|
// Sandbox for deterministic contract verification
|
|
compile "net.corda.djvm:corda-djvm:$djvm_version"
|
|
compile project(':serialization-djvm')
|
|
compile(project(':node:djvm')) {
|
|
transitive = false
|
|
}
|
|
jdkRt "net.corda:deterministic-rt:latest.integration"
|
|
deterministic project(path: ':core-deterministic', configuration: 'deterministicArtifacts')
|
|
deterministic project(path: ':serialization-deterministic', configuration: 'deterministicArtifacts')
|
|
deterministic project(':serialization-djvm:deserializers')
|
|
deterministic project(':node:djvm')
|
|
deterministic "org.slf4j:slf4j-nop:$slf4j_version"
|
|
|
|
testImplementation "org.junit.jupiter:junit-jupiter-api:${junit_jupiter_version}"
|
|
testImplementation "junit:junit:$junit_version"
|
|
|
|
testRuntimeOnly "org.junit.vintage:junit-vintage-engine:${junit_vintage_version}"
|
|
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_jupiter_version}"
|
|
testRuntimeOnly "org.junit.platform:junit-platform-launcher:${junit_platform_version}"
|
|
|
|
// Unit testing helpers.
|
|
testCompile "org.assertj:assertj-core:${assertj_version}"
|
|
testCompile project(':node-driver')
|
|
testCompile project(':test-utils')
|
|
testCompile project(':client:jfx')
|
|
testCompile project(':finance:contracts')
|
|
testCompile project(':finance:workflows')
|
|
|
|
// sample test schemas
|
|
testCompile project(path: ':finance:contracts', configuration: 'testArtifacts')
|
|
|
|
// For H2 database support in persistence
|
|
compile "com.h2database:h2:$h2_version"
|
|
|
|
// For Postgres database support in persistence
|
|
compile "org.postgresql:postgresql:$postgresql_version"
|
|
|
|
// SQL connection pooling library
|
|
compile "com.zaxxer:HikariCP:${hikari_version}"
|
|
|
|
// Hibernate: an object relational mapper for writing state objects to the database automatically.
|
|
compile "org.hibernate:hibernate-core:$hibernate_version"
|
|
compile "org.hibernate:hibernate-java8:$hibernate_version"
|
|
|
|
// OkHTTP: Simple HTTP library.
|
|
compile "com.squareup.okhttp3:okhttp:$okhttp_version"
|
|
|
|
// Apache Shiro: authentication, authorization and session management.
|
|
compile "org.apache.shiro:shiro-core:${shiro_version}"
|
|
|
|
//Picocli for command line interface
|
|
compile "info.picocli:picocli:$picocli_version"
|
|
|
|
// Integration test helpers
|
|
integrationTestCompile "junit:junit:$junit_version"
|
|
integrationTestCompile "org.assertj:assertj-core:${assertj_version}"
|
|
|
|
// BFT-Smart dependencies
|
|
compile 'com.github.bft-smart:library:master-v1.1-beta-g6215ec8-87'
|
|
compile 'commons-codec:commons-codec:1.13'
|
|
|
|
// Java Atomix: RAFT library
|
|
compile 'io.atomix.copycat:copycat-client:1.2.3'
|
|
compile 'io.atomix.copycat:copycat-server:1.2.3'
|
|
compile 'io.atomix.catalyst:catalyst-netty:1.1.2'
|
|
|
|
// Jetty dependencies for NetworkMapClient test.
|
|
// Web stuff: for HTTP[S] servlets
|
|
testCompile "org.eclipse.jetty:jetty-servlet:${jetty_version}"
|
|
testCompile "org.eclipse.jetty:jetty-webapp:${jetty_version}"
|
|
testCompile "javax.servlet:javax.servlet-api:${servlet_version}"
|
|
|
|
// Jersey for JAX-RS implementation for use in Jetty
|
|
testCompile "org.glassfish.jersey.core:jersey-server:${jersey_version}"
|
|
testCompile "org.glassfish.jersey.containers:jersey-container-servlet-core:${jersey_version}"
|
|
testCompile "org.glassfish.jersey.containers:jersey-container-jetty-http:${jersey_version}"
|
|
|
|
// Jolokia JVM monitoring agent, required to push logs through slf4j
|
|
compile "org.jolokia:jolokia-jvm:${jolokia_version}:agent"
|
|
// Optional New Relic JVM reporter, used to push metrics to the configured account associated with a newrelic.yml configuration. See https://mvnrepository.com/artifact/com.palominolabs.metrics/metrics-new-relic
|
|
compile "com.palominolabs.metrics:metrics-new-relic:${metrics_new_relic_version}"
|
|
|
|
// Required by JVMAgentUtil (x-compatible java 8 & 11 agent lookup mechanism)
|
|
compile files("${System.properties['java.home']}/../lib/tools.jar")
|
|
|
|
testCompile(project(':test-cli'))
|
|
testCompile(project(':test-utils'))
|
|
|
|
slowIntegrationTestCompile sourceSets.main.output
|
|
slowIntegrationTestCompile sourceSets.test.output
|
|
slowIntegrationTestCompile configurations.compile
|
|
slowIntegrationTestCompile configurations.testCompile
|
|
slowIntegrationTestRuntime configurations.runtime
|
|
slowIntegrationTestRuntime configurations.testRuntime
|
|
}
|
|
|
|
tasks.withType(JavaCompile) {
|
|
// Resolves a Gradle warning about not scanning for pre-processors.
|
|
options.compilerArgs << '-proc:none'
|
|
}
|
|
|
|
tasks.withType(Test) {
|
|
if (JavaVersion.current() == JavaVersion.VERSION_11) {
|
|
jvmArgs '-Djdk.attach.allowAttachSelf=true'
|
|
}
|
|
systemProperty 'deterministic-rt.path', configurations.jdkRt.asPath
|
|
systemProperty 'deterministic-sources.path', configurations.deterministic.asPath
|
|
}
|
|
|
|
task integrationTest(type: Test) {
|
|
testClassesDirs = sourceSets.integrationTest.output.classesDirs
|
|
classpath = sourceSets.integrationTest.runtimeClasspath
|
|
maxParallelForks = (System.env.CORDA_NODE_INT_TESTING_FORKS == null) ? 1 : "$System.env.CORDA_NODE_INT_TESTING_FORKS".toInteger()
|
|
}
|
|
|
|
task slowIntegrationTest(type: Test) {
|
|
testClassesDirs = sourceSets.slowIntegrationTest.output.classesDirs
|
|
classpath = sourceSets.slowIntegrationTest.runtimeClasspath
|
|
maxParallelForks = 1
|
|
}
|
|
|
|
// quasar exclusions upon agent code instrumentation at run-time
|
|
quasar {
|
|
excludeClassLoaders.addAll(
|
|
'net.corda.djvm.**'
|
|
)
|
|
excludePackages.addAll(
|
|
"antlr**",
|
|
"com.codahale**",
|
|
"com.fasterxml.**",
|
|
"com.github.benmanes.caffeine.**",
|
|
"com.google.**",
|
|
"com.lmax.**",
|
|
"com.zaxxer.**",
|
|
"djvm**",
|
|
"net.bytebuddy**",
|
|
"io.github.classgraph**",
|
|
"io.netty*",
|
|
"liquibase**",
|
|
"net.corda.djvm**",
|
|
"net.i2p.crypto.**",
|
|
"nonapi.io.github.classgraph.**",
|
|
"org.apiguardian.**",
|
|
"org.bouncycastle**",
|
|
"org.codehaus.**",
|
|
"org.h2**",
|
|
"org.hibernate**",
|
|
"org.jboss.**",
|
|
"org.objenesis**",
|
|
"org.w3c.**",
|
|
"org.xml**",
|
|
"org.yaml**",
|
|
"rx**")
|
|
}
|
|
|
|
jar {
|
|
baseName 'corda-node'
|
|
manifest {
|
|
attributes('Corda-Deterministic-Runtime': configurations.jdkRt.singleFile.name)
|
|
attributes('Corda-Deterministic-Classpath': configurations.deterministic.collect { it.name }.join(' '))
|
|
}
|
|
}
|
|
|
|
publish {
|
|
name jar.baseName
|
|
}
|
|
|
|
test {
|
|
maxHeapSize = "3g"
|
|
maxParallelForks = (System.env.CORDA_NODE_TESTING_FORKS == null) ? 1 : "$System.env.CORDA_NODE_TESTING_FORKS".toInteger()
|
|
}
|