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

Merge pull request #7642 from corda/shams-db-migration-net-params-bug

Browse Source 
ENT-11340: Uninitialised network parameters during schema migration
This commit is contained in:
Adel El-Beik 2024-01-10 14:34:52 +00:00 committed by GitHub
commit e632a78776
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node/src/main/kotlin/net/corda/node/internal/AbstractNode.kt
View File

@ -483,6 +483,7 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
"Node's platform version is lower than network's required minimumPlatformVersion" "Node's platform version is lower than network's required minimumPlatformVersion"
} }
networkMapCache.start(netParams.notaries) networkMapCache.start(netParams.notaries)
services.networkParameters = netParams
database.transaction { database.transaction {
networkParametersStorage.setCurrentParameters(signedNetParams, trustRoots) networkParametersStorage.setCurrentParameters(signedNetParams, trustRoots)
@ -1205,8 +1206,7 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
override val attachmentsClassLoaderCache: AttachmentsClassLoaderCache get() = this@AbstractNode.attachmentsClassLoaderCache override val attachmentsClassLoaderCache: AttachmentsClassLoaderCache get() = this@AbstractNode.attachmentsClassLoaderCache
@Volatile @Volatile
private lateinit var _networkParameters: NetworkParameters override lateinit var networkParameters: NetworkParameters
override val networkParameters: NetworkParameters get() = _networkParameters
init { init {
this@AbstractNode.attachments.servicesForResolution = this this@AbstractNode.attachments.servicesForResolution = this
@ -1214,7 +1214,7 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
fun start(myInfo: NodeInfo, networkParameters: NetworkParameters) { fun start(myInfo: NodeInfo, networkParameters: NetworkParameters) {
this._myInfo = myInfo this._myInfo = myInfo
this._networkParameters = networkParameters this.networkParameters = networkParameters
} }
override fun <T : SerializeAsToken> cordaService(type: Class<T>): T { override fun <T : SerializeAsToken> cordaService(type: Class<T>): T {
@ -1296,7 +1296,7 @@ abstract class AbstractNode<S>(val configuration: NodeConfiguration,
} }
override fun onNewNetworkParameters(networkParameters: NetworkParameters) { override fun onNewNetworkParameters(networkParameters: NetworkParameters) {
this._networkParameters = networkParameters this.networkParameters = networkParameters
} }
override fun tryExternalVerification(stx: SignedTransaction, checkSufficientSignatures: Boolean): Boolean { override fun tryExternalVerification(stx: SignedTransaction, checkSufficientSignatures: Boolean): Boolean {