mirror of
https://github.com/corda/corda.git
synced 2024-12-29 01:08:57 +00:00
e0d8ea8a58
The configuration objects for specific notary implementations have been replaced by a single untyped "extraConfig" Config object that is left to the notary service itself to parse. * Remove the raft bootstrapping command from node, we'll need a different mechanism for that. * Remove pre-generated identity config value. * Split up obtainIdentity() in AbstractNode to make it easier to read. * A temporary workaround for the bootstrapper tool to support BFT notaries. * Update docs * Add upgrade notes * Fix rebase issue * Add a config diff for the bft notary as well
265 lines
7.9 KiB
Groovy
265 lines
7.9 KiB
Groovy
import net.corda.plugins.Cordform
|
|
|
|
apply plugin: 'java'
|
|
apply plugin: 'kotlin'
|
|
apply plugin: 'idea'
|
|
apply plugin: 'net.corda.plugins.quasar-utils'
|
|
apply plugin: 'net.corda.plugins.cordapp'
|
|
apply plugin: 'net.corda.plugins.cordformation'
|
|
|
|
configurations {
|
|
integrationTestCompile.extendsFrom testCompile
|
|
integrationTestRuntime.extendsFrom testRuntime
|
|
}
|
|
|
|
dependencies {
|
|
compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
|
|
|
|
// Corda integration dependencies
|
|
cordaRuntime project(path: ":node:capsule", configuration: 'runtimeArtifacts')
|
|
cordaRuntime project(path: ":webserver:webcapsule", configuration: 'runtimeArtifacts')
|
|
cordaCompile project(':core')
|
|
cordaCompile project(':client:jfx')
|
|
cordaCompile project(':client:rpc')
|
|
cordaCompile project(':test-utils')
|
|
|
|
// Notary implementations
|
|
cordapp project(':experimental:notary-raft')
|
|
cordapp project(':experimental:notary-bft-smart')
|
|
}
|
|
|
|
def nodeTask = tasks.getByPath(':node:capsule:assemble')
|
|
def webTask = tasks.getByPath(':webserver:webcapsule:assemble')
|
|
|
|
task deployNodes(dependsOn: ['deployNodesSingle', 'deployNodesRaft', 'deployNodesBFT', 'deployNodesCustom'])
|
|
|
|
task deployNodesSingle(type: Cordform, dependsOn: ['jar', nodeTask, webTask]) {
|
|
directory file("$buildDir/nodes/nodesSingle")
|
|
nodeDefaults {
|
|
extraConfig = [h2Settings: [address: "localhost:0"]]
|
|
}
|
|
node {
|
|
name "O=Alice Corp,L=Madrid,C=ES"
|
|
p2pPort 10002
|
|
rpcSettings {
|
|
address "localhost:10003"
|
|
adminAddress "localhost:10103"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Notary Service,L=Zurich,C=CH"
|
|
p2pPort 10009
|
|
rpcSettings {
|
|
address "localhost:10010"
|
|
adminAddress "localhost:10110"
|
|
}
|
|
notary = [validating: true]
|
|
}
|
|
}
|
|
|
|
task deployNodesCustom(type: Cordform, dependsOn: ['jar', nodeTask, webTask]) {
|
|
directory file("$buildDir/nodes/nodesCustom")
|
|
nodeDefaults {
|
|
extraConfig = [h2Settings: [address: "localhost:0"]]
|
|
}
|
|
node {
|
|
name "O=Alice Corp,L=Madrid,C=ES"
|
|
p2pPort 10002
|
|
rpcSettings {
|
|
address "localhost:10003"
|
|
adminAddress "localhost:10103"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Notary Service,L=Zurich,C=CH"
|
|
p2pPort 10009
|
|
rpcSettings {
|
|
address "localhost:10010"
|
|
adminAddress "localhost:10110"
|
|
}
|
|
notary = [
|
|
validating: true,
|
|
className: "net.corda.notarydemo.MyCustomValidatingNotaryService"
|
|
]
|
|
}
|
|
}
|
|
|
|
task deployNodesRaft(type: Cordform, dependsOn: ['jar', nodeTask, webTask]) {
|
|
def className = "net.corda.notary.raft.RaftNotaryService"
|
|
directory file("$buildDir/nodes/nodesRaft")
|
|
nodeDefaults {
|
|
extraConfig = [h2Settings: [address: "localhost:0"]]
|
|
cordapp project(':experimental:notary-raft')
|
|
}
|
|
node {
|
|
name "O=Alice Corp,L=Madrid,C=ES"
|
|
p2pPort 10002
|
|
rpcSettings {
|
|
address "localhost:10003"
|
|
adminAddress "localhost:10103"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Notary Service 0,L=Zurich,C=CH"
|
|
p2pPort 10009
|
|
rpcSettings {
|
|
address "localhost:10010"
|
|
adminAddress "localhost:10110"
|
|
}
|
|
notary = [
|
|
validating: true,
|
|
serviceLegalName: "O=Raft,L=Zurich,C=CH",
|
|
extraConfig: [
|
|
nodeAddress: "localhost:10008"
|
|
],
|
|
className: className
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 1,L=Zurich,C=CH"
|
|
p2pPort 10013
|
|
rpcSettings {
|
|
address "localhost:10014"
|
|
adminAddress "localhost:10114"
|
|
}
|
|
notary = [
|
|
validating: true,
|
|
serviceLegalName: "O=Raft,L=Zurich,C=CH",
|
|
extraConfig: [
|
|
nodeAddress: "localhost:10012",
|
|
clusterAddresses: ["localhost:10008"]
|
|
],
|
|
className: className
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 2,L=Zurich,C=CH"
|
|
p2pPort 10017
|
|
rpcSettings {
|
|
address "localhost:10018"
|
|
adminAddress "localhost:10118"
|
|
}
|
|
notary = [
|
|
validating: true,
|
|
serviceLegalName: "O=Raft,L=Zurich,C=CH",
|
|
extraConfig: [
|
|
nodeAddress: "localhost:10016",
|
|
clusterAddresses: ["localhost:10008"]
|
|
],
|
|
className: className
|
|
]
|
|
}
|
|
}
|
|
|
|
task deployNodesBFT(type: Cordform, dependsOn: ['jar', nodeTask, webTask]) {
|
|
def clusterAddresses = ["localhost:11000", "localhost:11010", "localhost:11020", "localhost:11030"]
|
|
def className = "net.corda.notary.bftsmart.BftSmartNotaryService"
|
|
directory file("$buildDir/nodes/nodesBFT")
|
|
nodeDefaults {
|
|
extraConfig = [h2Settings: [address: "localhost:0"]]
|
|
cordapp project(':experimental:notary-bft-smart')
|
|
}
|
|
node {
|
|
name "O=Alice Corp,L=Madrid,C=ES"
|
|
p2pPort 10002
|
|
rpcSettings {
|
|
address "localhost:10003"
|
|
adminAddress "localhost:10103"
|
|
}
|
|
rpcUsers = [[user: "demou", password: "demop", permissions: ["ALL"]]]
|
|
}
|
|
node {
|
|
name "O=Notary Service 0,L=Zurich,C=CH"
|
|
p2pPort 10009
|
|
rpcSettings {
|
|
address "localhost:10010"
|
|
adminAddress "localhost:10110"
|
|
}
|
|
notary = [
|
|
validating: false,
|
|
serviceLegalName: "O=BFT,L=Zurich,C=CH",
|
|
extraConfig: [
|
|
replicaId: 0,
|
|
clusterAddresses: clusterAddresses
|
|
],
|
|
className: className
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 1,L=Zurich,C=CH"
|
|
p2pPort 10013
|
|
rpcSettings {
|
|
address "localhost:10014"
|
|
adminAddress "localhost:10114"
|
|
}
|
|
notary = [
|
|
validating: false,
|
|
serviceLegalName: "O=BFT,L=Zurich,C=CH",
|
|
extraConfig: [
|
|
replicaId: 1,
|
|
clusterAddresses: clusterAddresses
|
|
],
|
|
className: className
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 2,L=Zurich,C=CH"
|
|
p2pPort 10017
|
|
rpcSettings {
|
|
address "localhost:10018"
|
|
adminAddress "localhost:10118"
|
|
}
|
|
notary = [
|
|
validating: false,
|
|
serviceLegalName: "O=BFT,L=Zurich,C=CH",
|
|
extraConfig: [
|
|
replicaId: 2,
|
|
clusterAddresses: clusterAddresses
|
|
],
|
|
className: className
|
|
]
|
|
}
|
|
node {
|
|
name "O=Notary Service 3,L=Zurich,C=CH"
|
|
p2pPort 10021
|
|
rpcSettings {
|
|
address "localhost:10022"
|
|
adminAddress "localhost:10122"
|
|
}
|
|
notary = [
|
|
validating: false,
|
|
serviceLegalName: "O=BFT,L=Zurich,C=CH",
|
|
extraConfig: [
|
|
replicaId: 3,
|
|
clusterAddresses: clusterAddresses
|
|
],
|
|
className: className
|
|
]
|
|
}
|
|
}
|
|
|
|
task notarise(type: JavaExec) {
|
|
classpath = sourceSets.main.runtimeClasspath
|
|
main = 'net.corda.notarydemo.NotariseKt'
|
|
}
|
|
|
|
jar {
|
|
manifest {
|
|
attributes(
|
|
'Automatic-Module-Name': 'net.corda.samples.demos.notary'
|
|
)
|
|
}
|
|
}
|
|
|
|
cordapp {
|
|
info {
|
|
name "net/corda/samples/notary-demo"
|
|
vendor "Corda Open Source"
|
|
targetPlatformVersion corda_platform_version.toInteger()
|
|
minimumPlatformVersion 1
|
|
}
|
|
}
|