ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-04-07 11:27:01 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merging forward updates from release/os/4.11 to release/os/4.12 - 2023-11-02

Browse Source
This commit is contained in:
r3-build 2023-11-02 17:47:59 +00:00
commit bb2c2b62e5
9 changed files with 110 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -124,6 +124,8 @@ buildscript {
ext.commons_configuration2_version = constants.getProperty("commonsConfiguration2Version")
ext.commons_text_version = constants.getProperty("commonsTextVersion")
ext.snake_yaml_version = constants.getProperty("snakeYamlVersion")
ext.javaassist_version = constants.getProperty("javaassistVersion")
if (JavaVersion.current().isJava8()) {
ext.fontawesomefx_commons_version = constants.getProperty("fontawesomefxCommonsJava8Version")
ext.fontawesomefx_fontawesome_version = constants.getProperty("fontawesomefxFontawesomeJava8Version")

1
constants.properties
View File

@ -106,3 +106,4 @@ fontawesomefxFontawesomeJava8Version=4.7.0-5
# FontAwesomeFX for a more recent version of the Java Runtime (class file version 55.0)
fontawesomefxCommonsVersion=11.0
fontawesomefxFontawesomeVersion=4.7.0-11
javaassistVersion=3.27.0-GA

14
core/src/main/kotlin/net/corda/core/flows/FinalityRecoveryFlow.kt
View File

@ -21,6 +21,7 @@ class FinalityRecoveryFlow(
private val matchingCriteria: FlowRecoveryQuery? = null,
private val forceRecover: Boolean = false,
private val recoverAll: Boolean = false,
private val forceRecoverFlowIds: Collection<StateMachineRunId> = emptySet(),
override val progressTracker: ProgressTracker = ProgressTracker()) : FlowLogic<Map<FlowTransactionInfo, Boolean>>() {
@CordaInternal
@ -28,16 +29,17 @@ class FinalityRecoveryFlow(
val flowIds: Collection<StateMachineRunId>,
val matchingCriteria: FlowRecoveryQuery?,
val forceRecover: Boolean,
val recoverAll: Boolean)
val recoverAll: Boolean,
val forceRecoverFlowIds: Collection<StateMachineRunId>)
@CordaInternal
fun getExtraConstructorArgs() = ExtraConstructorArgs(txIds, flowIds, matchingCriteria, forceRecover, recoverAll)
fun getExtraConstructorArgs() = ExtraConstructorArgs(txIds, flowIds, matchingCriteria, forceRecover, recoverAll, forceRecoverFlowIds)
constructor(txId: SecureHash, forceRecover: Boolean = false) : this(setOf(txId), forceRecover)
constructor(txIds: Collection<SecureHash>, forceRecover: Boolean = false, recoverAll: Boolean = false) : this(txIds, emptySet(), null, forceRecover, recoverAll, tracker())
constructor(txIds: Collection<SecureHash>, forceRecover: Boolean = false, recoverAll: Boolean = false) : this(txIds, emptySet(), null, forceRecover, recoverAll, emptySet(), tracker())
constructor(flowId: StateMachineRunId, forceRecover: Boolean = false) : this(emptySet(), setOf(flowId), null, forceRecover)
constructor(flowIds: Collection<StateMachineRunId>, forceRecover: Boolean = false) : this(emptySet(), flowIds, null, forceRecover, false, tracker())
constructor(recoverAll: Boolean, forceRecover: Boolean = false) : this(emptySet(), emptySet(), null, forceRecover, recoverAll, tracker())
constructor(matchingCriteria: FlowRecoveryQuery, forceRecover: Boolean = false) : this(emptySet(), emptySet(), matchingCriteria, forceRecover, false, tracker())
constructor(flowIds: Collection<StateMachineRunId>, forceRecover: Boolean = false) : this(emptySet(), flowIds, null, forceRecover, false, emptySet(), tracker())
constructor(recoverAll: Boolean, forceRecover: Boolean = false) : this(emptySet(), emptySet(), null, forceRecover, recoverAll, emptySet(), tracker())
constructor(matchingCriteria: FlowRecoveryQuery, forceRecover: Boolean = false) : this(emptySet(), emptySet(), matchingCriteria, forceRecover, false, emptySet(), tracker())
@Suspendable
@Throws(FlowRecoveryException::class)

9
core/src/main/kotlin/net/corda/core/internal/ResolveTransactionsFlow.kt
View File

@ -46,6 +46,8 @@ class ResolveTransactionsFlow private constructor(
: this(transaction, transaction.dependencies, otherSide, statesToRecord, deferredAck)
private var fetchNetParamsFromCounterpart = false
// statistics set in DbResolver (Enterprise only) after exiting recordDependencies()
var statistics: ResolveTransactionsFlowStats = ResolveTransactionsFlowStats()
@Suppress("MagicNumber")
@Suspendable
@ -120,3 +122,10 @@ class ResolveTransactionsFlow private constructor(
}
}
}
data class ResolveTransactionsFlowStats(
val resolvableTransactionHashesCount: Long = 0,
val downloadedDependencyCount: Long = 0,
val recordedTransactionCount: Long = 0,
val skippedRecordingTransactionCount: Long = 0
)

6
experimental/quasar-hook/build.gradle
View File

@ -1,7 +1,3 @@
ext {
javaassist_version = "3.12.1.GA"
}
apply plugin: 'kotlin'
apply plugin: 'idea'
@ -10,7 +6,7 @@ description 'A javaagent to allow hooking into the instrumentation by Quasar'
dependencies {
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compile "javassist:javassist:$javaassist_version"
compile "org.javassist:javassist:$javaassist_version"
}
jar {

13
node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/Slf4jLiquibaseLogService.kt Normal file
View File

@ -0,0 +1,13 @@
package net.corda.nodeapi.internal.persistence
import liquibase.logging.core.AbstractLogService
import org.slf4j.LoggerFactory
class Slf4jLiquibaseLogService : AbstractLogService() {
override fun getPriority() = Integer.MAX_VALUE
override fun getLog(clazz: Class<*>?) : liquibase.logging.Logger {
return Slf4jLiquibaseLogger(LoggerFactory.getLogger(clazz))
}
}

74
node-api/src/main/kotlin/net/corda/nodeapi/internal/persistence/Slf4jLiquibaseLogger.kt Normal file
View File

@ -0,0 +1,74 @@
package net.corda.nodeapi.internal.persistence
import org.slf4j.Logger
import java.util.logging.Level
/**
* Slf4j logger for Liquibase
* Captures logging from Liquibase that would otherwise go to stderr.
*/
class Slf4jLiquibaseLogger(private val logger: Logger) : liquibase.logging.core.AbstractLogger() {
companion object {
private val TRACE_THRESHOLD = Level.FINEST.intValue()
private val DEBUG_THRESHOLD = Level.FINE.intValue()
private val INFO_THRESHOLD = Level.INFO.intValue()
private val WARN_THRESHOLD = Level.WARNING.intValue()
}
override fun log(level: Level, message: String?, e: Throwable?) {
val levelValue = level.intValue()
if (levelValue <= TRACE_THRESHOLD) {
logger.trace(message, e)
} else if (levelValue <= DEBUG_THRESHOLD) {
logger.debug(message, e)
} else if (levelValue <= INFO_THRESHOLD) {
logger.info(message, e)
} else if (levelValue <= WARN_THRESHOLD) {
logger.warn(message, e)
} else {
logger.error(message, e)
}
}
override fun severe(message: String?) {
logger.error(message)
}
override fun severe(message: String?, e: Throwable?) {
logger.error(message, e)
}
override fun warning(message: String?) {
logger.warn(message)
}
override fun warning(message: String?, e: Throwable?) {
logger.warn(message, e)
}
override fun info(message: String?) {
logger.info(message)
}
override fun info(message: String?, e: Throwable?) {
logger.info(message, e)
}
override fun config(message: String?) {
logger.info(message)
}
override fun config(message: String?, e: Throwable?) {
logger.info(message, e)
}
override fun fine(message: String?) {
logger.debug(message)
}
override fun fine(message: String?, e: Throwable?) {
logger.debug(message, e)
}
}

1
node-api/src/main/resources/META-INF/services/liquibase.logging.LogService Normal file
View File

@ -0,0 +1 @@
net.corda.nodeapi.internal.persistence.Slf4jLiquibaseLogService

27
tools/checkpoint-agent/build.gradle
View File

@ -1,28 +1,3 @@
buildscript {
// For sharing constants between builds
Properties constants = new Properties()
file("$projectDir/../../constants.properties").withInputStream { constants.load(it) }
ext.kotlin_version = constants.getProperty("kotlinVersion")
ext.javaassist_version = "3.12.1.GA"
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
repositories {
mavenLocal()
mavenCentral()
jcenter()
}
apply plugin: 'kotlin'
apply plugin: 'idea'
apply plugin: 'net.corda.plugins.publish-utils'
@ -33,7 +8,7 @@ description 'A javaagent to allow hooking into Kryo checkpoints'
dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
compileOnly "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
compileOnly "javassist:javassist:$javaassist_version"
compileOnly "org.javassist:javassist:$javaassist_version"
compileOnly "com.esotericsoftware:kryo:$kryo_version"
compileOnly "co.paralleluniverse:quasar-core:$quasar_version"