* DOC: AMQP upgrade notes in brief * moving test upgrade notes from release notes to upgrade note * add cordapp/cordformation notes * Added section for network map changes * Updated upgrade notes to reflect changes for SSL (#2569) * Updated upgrade notes to reflect changes for SSL * Removed some blank lines. * AMQP Constructor / property mismatch upgrade note * wip * Note about feasible (but not recommended) tables that can be migrated from Corda 2.0 to 3.0, basic recipe how to do it. * Database schema changes - optional partial vault migration described at the end of the paragraph, focus on the overall changes to tables. * Review Comments * Database schema changes - split Vault and finance module changes, reformatting, improve migration note. * Database schema changes - addressing PR comments. * Database schema changes - move changes to change log, migration to JIRA ticket. * Finalise versions * review comments * CORDA-1171: Add notes on the notary error change * set release version
23 KiB
Upgrading a CorDapp to a new platform version
These notes provide instructions for upgrading your CorDapps from previous versions, starting with the upgrade from our first public Beta (Milestone 12 <changelog_m12>
), to V1.0 <changelog_v1>
.
General rules
Always remember to update the version identifiers in your project gradle file:
ext.corda_release_version = '1.0.0'
ext.corda_gradle_plugins_version = '1.0.0'
It may be necessary to update the version of major dependencies:
ext.kotlin_version = '1.1.4'
ext.quasar_version = '0.7.9'
Please consult the relevant release notes of the release in question. If not specified, you may assume the versions you are currently using are still in force.
We also strongly recommend cross referencing with the changelog
to confirm changes.
V2.0 to V3.0
Gradle Plugin Version
Corda 3.0 uses version 3.0.8 of the gradle plugins and your build.gradle
file should be updated to reflect this.
ext.corda_gradle_plugins_version = '3.0.9'
You will also need to update the corda_release_version
identifier in your project gradle file.
ext.corda_release_version = 'corda-3.0'
Network Map Service
With the re-designed network map service the following changes need to be made:
- The network map is no longer provided by a node and thus the
networkMapService
config is ignored. Instead the network map is either provided by the compatibility zone (CZ) operator (who operates the doorman) and available using thecompatibilityZoneURL
config, or is provided using signed node info files which are copied locally. Seenetwork-map
for more details, andsetting-up-a-corda-network.rst
on how to use the network bootstrapper for deploying a local network. - Configuration for a notary has been simplified.
extraAdvertisedServiceIds
,notaryNodeAddress
,notaryClusterAddresses
andbftSMaRt
configs have been replaced by a singlenotary
config object. Seecorda-configuration-file
for more details. - The advertisement of the notary to the rest of the network, and its validation type, is no longer determined by the
extraAdvertisedServiceIds
config. Instead it has been moved to the control of the network operator via the introduction of network parameters. The network bootstrapper automatically includes the configured notaries when generating the network parameters file for a local deployment. - Any nodes defined in a
deployNodes
gradle task performing the function of the network map can be removed, or theNetworkMap
parameter can be removed for any "controller" node which is both the network map and a notary. - For registering a node with the doorman the
certificateSigningService
config has been replaced bycompatibilityZoneURL
.
Corda Plugins
Corda plugins have been modularised further so the following additional gradle entries are necessary: For example:
apply plugin: 'net.corda.plugins.cordapp'
The plugin needs to be applied in all gradle build files where there is a dependency on Corda using any of: cordaCompile, cordaRuntime, cordapp
For existing contract ORM schemas that extend from
CommonSchemaV1.LinearState
orCommonSchemaV1.FungibleState
, you will need to explicitly map theparticipants
collection to a database table. Previously this mapping was done in the superclass, but that makes it impossible to properly configure the table name. The required changes are to:- Add the
override var participants: MutableSet<AbstractParty>? = null
field to your class, and - Add JPA mappings
For example:
@Entity @Table(name = "cash_states_v2", "ccy_code_idx2", columnList = "ccy_code"))) indexes = arrayOf(Index(name = class PersistentCashState( ElementCollection @Column(name = "participants") @name="cash_states_v2_participants", joinColumns = arrayOf( @CollectionTable("output_index", referencedColumnName = "output_index"), JoinColumn(name = "transaction_id", referencedColumnName = "transaction_id"))) JoinColumn(name = override var participants: MutableSet<AbstractParty>? = null,
- Add the
AMQP
Whilst the enablement of AMQP is a transparent change, as noted in the serialization
documentation the way classes, and states in particular, should be written to work with this new library may require some alteration to your current implementation.
With AMQP enabled Java classes must be compiled with the -parameter flag.
- If they aren't, then the error message will complain about
arg<N>
being an unknown parameter.- If recompilation is not viable, a custom serializer can be written as per
cordapp-custom-serializers
- It is important to bear in mind that with AMQP there must be an implicit mapping between constructor parameters and properties you wish included in the serialized form of a class.
- See
serialization
for more informationError messages of the form
Constructor parameter - "<some parameter of a constructor>" - doesn't refer to a property of "class <some.class.being.serialized>"
indicate that a class, in the above example
some.class.being.serialized
, has a parameter on its primary constructor that doesn't correlate to a property of the class. This is a problem because the Corda AMQP serialization library uses a class's constructor (default, primary, or annotated) as the means by which instances of the serialized form are reconstituted.See the section "Mismatched Class Properties / Constructor Parameters" in the
serialization
documentation
Database schema changes
An H2 database instance (represented on the filesystem as a file called persistence.mv.db) used in Corda 1.0 or 2.0 cannot be directly reused with Corda 3.0 due to minor improvements and additions to stabilise the underlying schemas.
Configuration
Nodes that do not require SSL to be enabled for RPC clients now need an additional port to be specified as part of their configuration. To do this, add a block as follows to the nodes configuraiton:
rpcSettings { adminAddress "localhost:10007" }
to node.conf files.
Also, the property rpcPort is now deprecated, so it would be preferable to substitute properties specified that way e.g., rpcPort=10006 with a block as follows:
rpcSettings { address "localhost:10006" adminAddress "localhost:10007" }
Equivalent changes should be performed on classes extending CordformDefinition.
Testing
The registration mechanism for CorDapps in
MockNetwork
unit tests has changed:- CorDapp registration is now done via the
cordappPackages
constructor parameter of MockNetwork. This parameter is a list ofString
values which should be the package names of the CorDapps containing the contract verification code you wish to load - The
unsetCordappPackages
method is now redundant and has been removed
- CorDapp registration is now done via the
Many classes have been moved between packages, so you will need to update your imports
Tip
We have provided a several scripts (depending upon your operating system of choice) to smooth the upgrade process for existing projects. This can be found at
tools\scripts\update-test-packages.sh
for the Bash shell andtools/scripts/upgrade-test-packages.ps1
for Windows Power Shell users in the source treesetCordappPackages and unsetCordappPackages have been removed from the ledger/transaction DSL and the flow test framework, and are now set via a constructor parameter or automatically when constructing the MockServices or MockNetwork object
Key constants e.g.
ALICE_KEY
have been removed; you can now use TestIdentity to make your ownThe ledger/transaction DSL must now be provided with MockServices as it no longer makes its own
- In transaction blocks, input and output take their arguments as ContractStates rather than lambdas
- Also in transaction blocks, command takes its arguments as CommandDatas rather than lambdas
The MockServices API has changed; please refer to its API documentation
TestDependencyInjectionBase has been retired in favour of a JUnit Rule called SerializationEnvironmentRule
- This replaces the initialiseSerialization parameter of ledger/transaction and verifierDriver
- The withTestSerialization method is obsoleted by SerializationEnvironmentRule and has been retired
- MockNetwork now takes a MockNetworkParameters builder to make it more Java-friendly, like driver's DriverParameters
- Similarly, the MockNetwork.createNode methods now take a MockNodeParameters builder
MockNode constructor parameters are now aggregated in MockNodeArgs for easier subclassing
MockNetwork.Factory has been retired as you can simply use a lambda
testNodeConfiguration has been retired, please use a mock object framework of your choice instead
MockNetwork.createSomeNodes and IntegrationTestCategory have been retired with no replacement
Starting a flow can now be done directly from a node object. Change calls of the form
node.getServices().startFlow(...)
tonode.startFlow(...)
Similarly a tranaction can be executed directly from a node object. Change calls of the form
node.getDatabase().transaction({ it -> ... })
tonode.transaction({() -> ... })
startFlow
now returns aCordaFuture
, there is no need to callstartFlow(...).getResultantFuture()
V1.0 to V2.0
You need to update the
corda_release_version
identifier in your project gradle file. The corda_gradle_plugins_version should remain at 1.0.0:ext.corda_release_version = '2.0.0' ext.corda_gradle_plugins_version = '1.0.0'
Public Beta (M12) to V1.0
From Milestone 14 <changelog_m14>
Build
MockNetwork has moved. To continue using
MockNetwork
for testing, you must add the following dependency to yourbuild.gradle
file:testCompile "net.corda:corda-node-driver:$corda_release_version"
Note
You may only need
testCompile "net.corda:corda-test-utils:$corda_release_version"
if not using the Driver DSL
Configuration
CordaPluginRegistry
has been removed:- The one remaining configuration item
customizeSerialisation
, which defined a optional whitelist of types for use in object serialization, has been replaced with theSerializationWhitelist
interface which should be implemented to define a list of equivalent whitelisted classes - You will need to rename your services resource file. 'resources/META-INF/services/net.corda.core.node.CordaPluginRegistry' becomes 'resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist'
MockNode.testPluginRegistries
was renamed toMockNode.testSerializationWhitelists
- In general, the
@CordaSerializable
annotation is the preferred method for whitelisting, as described inserialization
- The one remaining configuration item
Missing imports
Use IntelliJ's automatic imports feature to intelligently resolve the new imports:
- Missing imports for contract types:
- CommercialPaper and Cash are now contained within the
finance
module, as are associated helpers functions. For example:import net.corda.contracts.ICommercialPaperState
becomesimport net.corda.finance.contracts.ICommercialPaperState
import net.corda.contracts.asset.sumCashBy
becomesimport net.corda.finance.utils.sumCashBy
import net.corda.core.contracts.DOLLARS
becomesimport net.corda.finance.DOLLARS
import net.corda.core.contracts.issued by
becomesimport net.corda.finance.issued by
import net.corda.contracts.asset.Cash
becomesimport net.corda.finance.contracts.asset.Cash
- CommercialPaper and Cash are now contained within the
- Missing imports for utility functions:
- Many common types and helper methods have been consolidated into
net.corda.core.utilities
package. For example:import net.corda.core.crypto.commonName
becomesimport net.corda.core.utilities.commonName
import net.corda.core.crypto.toBase58String
becomesimport net.corda.core.utilities.toBase58String
import net.corda.core.getOrThrow
becomesimport net.corda.core.utilities.getOrThrow
- Many common types and helper methods have been consolidated into
- Missing flow imports:
- In general, all reusable library flows are contained within the core API
net.corda.core.flows
package - Financial domain library flows are contained within the finance module
net.corda.finance.flows
package - Other flows that have moved include
import net.corda.core.flows.ResolveTransactionsFlow
, which becomesimport net.corda.core.internal.ResolveTransactionsFlow
- In general, all reusable library flows are contained within the core API
Core data structures
- Missing
Contract
override:Contract.legalContractReference
has been removed, and replaced by the optional annotation@LegalProseReference(uri = "<URI>")
- Unresolved reference:
AuthenticatedObject
was renamed toCommandWithParties
- Overrides nothing:
LinearState.isRelevant
was removed. Whether a node stores aLinearState
in its vault depends on whether the node is one of the state'sparticipants
txBuilder.toLedgerTransaction
now requires aServiceHub
parameter. This is used by the new Contract Constraints functionality to validate and resolve attachments
Flow framework
FlowLogic
communication has been upgraded to use explicitFlowSession
instances to communicate between nodes:FlowLogic.send
/FlowLogic.receive
/FlowLogic.sendAndReceive
has been replaced byFlowSession.send
/FlowSession.receive
/FlowSession.sendAndReceive
. The replacement functions do not take a destination parameter, as this is defined implictly by the session used- Initiated flows now take in a
FlowSession
instead ofParty
in their constructor. If you need to access the counterparty identity, it is in thecounterparty
property of the flow session
FinalityFlow
now returns a singleSignedTransaction
, instead of aList<SignedTransaction>
TransactionKeyFlow
was renamed toSwapIdentitiesFlow
SwapIdentitiesFlow
must be imported from the confidential-identities packagenet.corda.confidential
Node services (ServiceHub)
- Unresolved reference to
vaultQueryService
:- Replace all references to
<services>.vaultQueryService
with<services>.vaultService
- Previously there were two vault APIs. Now there is a single unified API with the same functions:
VaultService
.
- Replace all references to
FlowLogic.ourIdentity
has been introduced as a shortcut for retrieving our identity in a flowserviceHub.myInfo.legalIdentity
no longer existsgetAnyNotary
has been removed. UseserviceHub.networkMapCache.notaryIdentities[0]
insteadServiceHub.networkMapUpdates
is replaced byServiceHub.networkMapFeed
ServiceHub.partyFromX500Name
is replaced byServiceHub.wellKnownPartyFromX500Name
- A "well known" party is one that isn't anonymous. This change was motivated by the confidential identities work
RPC Client
- Missing API methods on the
CordaRPCOps
interface:verifiedTransactionsFeed
has been replaced byinternalVerifiedTransactionsFeed
verifiedTransactions
has been replaced byinternalVerifiedTransactionsSnapshot
- These changes are in preparation for the planned integration of Intel SGX™, which will encrypt the transactions feed. Apps that use this API will not work on encrypted ledgers. They should generally be modified to use the vault query API instead
- Accessing the
networkMapCache
viaservices.nodeInfo().legalIdentities
returns a list of identities- This change is in preparation for allowing a node to host multiple separate identities in the future
Testing
Please note that Clauses
have been removed completely as of V1.0. We will be revisiting this capability in a future release.
- CorDapps must be explicitly registered in
MockNetwork
unit tests:- This is done by calling
setCordappPackages
, an extension helper function in thenet.corda.testing
package, on the first line of your@Before
method. This takes a variable number ofString
arguments which should be the package names of the CorDapps containing the contract verification code you wish to load - You should unset CorDapp packages in your
@After
method by usingunsetCordappPackages
afterstopNodes
- This is done by calling
- CorDapps must be explicitly registered in
DriverDSL
andRPCDriverDSL
integration tests:- You must register package names of the CorDapps containing the contract verification code you wish to load using the
extraCordappPackagesToScan: List<String>
constructor parameter of the driver DSL
- You must register package names of the CorDapps containing the contract verification code you wish to load using the
Finance
FungibleAsset
interface simplification:- The
Commands
grouping interface that included theMove
,Issue
andExit
interfaces has been removed - The
move
function has been renamed towithNewOwnerAndAmount
- This is for consistency with
OwnableState.withNewOwner
- This is for consistency with
- The
Miscellaneous
args[0].parseNetworkHostAndPort()
becomesNetworkHostAndPort.parse(args[0])
- There is no longer a
NodeInfo.advertisedServices
property- The concept of advertised services has been removed from Corda. This is because it was vaguely defined and real-world apps would not typically select random, unknown counterparties from the network map based on self-declared capabilities
- We will introduce a replacement for this functionality, business networks, in a future release
- For now, services should be retrieved by legal name using
NetworkMapCache.getNodeByLegalName
Gotchas
- Be sure to use the correct identity when issuing cash:
- The third parameter to
CashIssueFlow
should be the notary (and not the node identity)
- The third parameter to
From Milestone 13 <changelog_m13>
Core data structures
TransactionBuilder
changes:- Use convenience class
StateAndContract
instead ofTransactionBuilder.withItems
for passing around a state and its contract.
- Use convenience class
- Transaction builder DSL changes:
- When adding inputs and outputs to a transaction builder, you must also specify
ContractClassName
ContractClassName
is the name of theContract
subclass used to verify the transaction
- When adding inputs and outputs to a transaction builder, you must also specify
- Contract verify method signature change:
override fun verify(tx: TransactionForContract)
becomesoverride fun verify(tx: LedgerTransaction)
- You no longer need to override
ContractState.contract
function
Node services (ServiceHub)
- ServiceHub API method changes:
services.networkMapUpdates().justSnapshot
becomesservices.networkMapSnapshot()
Configuration
- No longer need to define
CordaPluginRegistry
and configurerequiredSchemas
:- Custom contract schemas are automatically detected at startup time by class path scanning
- For testing purposes, use the
SchemaService
method to register new custom schemas (e.g.services.schemaService.registerCustomSchemas(setOf(YoSchemaV1))
)
Identity
- Party names are now
CordaX500Name
, notX500Name
:CordaX500Name
specifies a predefined set of mandatory (organisation, locality, country) and optional fields (common name, organisation unit, state) with validation checking- Use new builder
CordaX500Name.build(X500Name(target))
or explicitly define the X500Name parameters using theCordaX500Name
constructors
Testing
- MockNetwork testing:
- Mock nodes in node tests are now of type
StartedNode<MockNode>
, rather thanMockNode
MockNetwork
now returns aBasketOf(<StartedNode<MockNode>>)
- You must call internals on
StartedNode
to getMockNode
(e.g.a = nodes.partyNodes[0].internals
)
- Mock nodes in node tests are now of type
- Host and port changes:
- Use string helper function
parseNetworkHostAndPort
to parse a URL on startup (e.g.val hostAndPort = args[0].parseNetworkHostAndPort()
)
- Use string helper function
- Node driver parameter changes:
- The node driver parameters for starting a node have been reordered
- The node’s name needs to be given as an
CordaX500Name
, instead of usinggetX509Name
From Milestone 12 (First Public Beta) <changelog_m12>
Core data structures
- Transaction building:
- You no longer need to specify the type of a
TransactionBuilder
asTransactionType.General
TransactionType.General.Builder(notary)
becomesTransactionBuilder(notary)
- You no longer need to specify the type of a
Build
- Gradle dependency reference changes:
- Module names have changed to include
corda
in the artifacts' JAR names:
- Module names have changed to include
compile "net.corda:core:$corda_release_version" -> compile "net.corda:corda-core:$corda_release_version"
compile "net.corda:finance:$corda_release_version" -> compile "net.corda:corda-finance:$corda_release_version"
compile "net.corda:jackson:$corda_release_version" -> compile "net.corda:corda-jackson:$corda_release_version"
compile "net.corda:node:$corda_release_version" -> compile "net.corda:corda-node:$corda_release_version"
compile "net.corda:rpc:$corda_release_version" -> compile "net.corda:corda-rpc:$corda_release_version"
Node services (ServiceHub)
ServiceHub
API changes:services.networkMapUpdates
becomesservices.networkMapFeed
services.getCashBalances
becomes a helper method in the finance module contracts package (net.corda.finance.contracts.getCashBalances
)
Finance
- Financial asset contracts (
Cash
,CommercialPaper
,Obligations
) are now a standalone CorDapp within thefinance
module:- You need to import them from their respective packages within the
finance
module (e.g.net.corda.finance.contracts.asset.Cash
) - You need to import the associated asset flows from their respective packages within
finance
module. For example:net.corda.finance.flows.CashIssueFlow
net.corda.finance.flows.CashIssueAndPaymentFlow
net.corda.finance.flows.CashExitFlow
- You need to import them from their respective packages within the
- The
finance
gradle project files have been moved into anet.corda.finance
package namespace:- Adjust imports of Cash flow references
- Adjust the
StartFlow
permission ingradle.build
files - Adjust imports of the associated flows (
Cash*Flow
,TwoPartyTradeFlow
,TwoPartyDealFlow
)