Merge pull request #43 from Wayonb/master

Update to 9.6.3 release
tech-bureau · Jul 15, 2020 · 2dff3fb · 2dff3fb
2 parents e1cf106 + 3c153b2
commit 2dff3fb
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 [Japanese README](https://github.com/tech-bureau/catapult-service-bootstrap/blob/master/README.ja.md)
 
 
-# Catapult Service Bootstrap for versions 0.9.5.x
+# Catapult Service Bootstrap for versions 0.9.6.x
 
 This repo contains a set of bootstrap and setup scripts to help developers get going quickly with their own working Catapult Service.  The goal is to make it as easy and quick as possible so as a developer you only have to run this setup and within a minute or so you will have a running server ready to start receiving transactions so you can focus on your development work and not setup or configuring servers.
 

diff --git a/cmds/bootstrap/dev-base.yml b/cmds/bootstrap/dev-base.yml
@@ -24,7 +24,7 @@ services:
   ######  dynamic configuration  ###########
 
   generate-raw-addresses:
-    image: techbureau/catapult-tools:gcc-0.9.5.1
+    image: techbureau/catapult-tools:gcc-0.9.6.3
     command: bash -c "/bin-mount/generate-raw-addresses-if-needed 53 /addresses/raw-addresses.txt /addresses/addresses.yaml"
     volumes:
     - ../../bin/bash:/bin-mount

diff --git a/cmds/bootstrap/dockerfiles/catapult-rest/Dockerfile b/cmds/bootstrap/dockerfiles/catapult-rest/Dockerfile
@@ -1 +1 @@
-FROM techbureau/catapult-rest-server-nightly:commit-1aeac3f
+FROM symbolplatform/symbol-rest-nightly:commit-5eb7eac
diff --git a/cmds/bootstrap/dockerfiles/catapult/Dockerfile b/cmds/bootstrap/dockerfiles/catapult/Dockerfile
@@ -1,2 +1,2 @@
-FROM  techbureau/catapult-server:gcc-0.9.5.1
+FROM  techbureau/catapult-server:gcc-0.9.6.3
 ADD ./userconfig /userconfig
diff --git a/cmds/bootstrap/dockerfiles/nemgen/Dockerfile b/cmds/bootstrap/dockerfiles/nemgen/Dockerfile
@@ -1,2 +1,2 @@
-FROM techbureau/catapult-tools:gcc-0.9.5.1
+FROM techbureau/catapult-tools:gcc-0.9.6.3
 ADD ./userconfig /userconfig
diff --git a/common/ruby/Dockerfile-dev b/common/ruby/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM techbureau/catapult-tools:gcc-0.9.5.1
+FROM techbureau/catapult-tools:gcc-0.9.6.3
 RUN apt update
 RUN apt install -y ruby
 # for debug

diff --git a/common/ruby/catapult-templates/api_node/resources/config-network.properties.mt b/common/ruby/catapult-templates/api_node/resources/config-network.properties.mt
@@ -1,7 +1,7 @@
 [network]
 
 identifier = {{network_identifier}}
-publicKey = {{network_public_key}}
+nemesisSignerPublicKey = {{network_public_key}}
 nodeEqualityStrategy = host
 generationHashSeed = {{network_generation_hash}}
 epochAdjustment = 1573430400s
@@ -35,9 +35,14 @@ minHarvesterBalance = 500
 maxHarvesterBalance = 50'000'000'000'000
 minVoterBalance = 50'000
 
+# assuming finalization ~20 minutes
+maxVotingKeysPerAccount = 3
+minVotingKeyLifetime = 72
+maxVotingKeyLifetime = 26280
+
 harvestBeneficiaryPercentage = 10
 harvestNetworkPercentage = 5
-harvestNetworkFeeSinkPublicKey = FF5563F1C5824EE0CD868799FBE8744B46D5549973FDA499939C952D951494E4
+harvestNetworkFeeSinkAddress = TDGY4DD2U4YQQGERFMDQYHPYS6M7LHIF6XUCJ4Q
 
 blockPruneInterval = 360
 maxTransactionsPerBlock = 6'000
@@ -78,7 +83,7 @@ maxMosaicsPerAccount = 1'000
 maxMosaicDuration = 3650d
 maxMosaicDivisibility = 6
 
-mosaicRentalFeeSinkPublicKey = {{mosaic_rental_fee_sink_public_key}}
+mosaicRentalFeeSinkAddress = TDGY4DD2U4YQQGERFMDQYHPYS6M7LHIF6XUCJ4Q
 mosaicRentalFee = 500
 
 [plugin:catapult.plugins.multisig]
@@ -99,7 +104,7 @@ maxNamespaceDuration = 365d
 namespaceGracePeriodDuration = 30d
 reservedRootNamespaceNames = xem, nem, user, account, org, com, biz, net, edu, mil, gov, info
 
-namespaceRentalFeeSinkPublicKey = {{namespace_rental_fee_sink_public_key}}
+namespaceRentalFeeSinkAddress = TDGY4DD2U4YQQGERFMDQYHPYS6M7LHIF6XUCJ4Q
 rootNamespaceRentalFeePerBlock = 1
 childNamespaceRentalFee = 100
 

diff --git a/common/ruby/catapult-templates/peer_node/resources/config-harvesting.properties.mt b/common/ruby/catapult-templates/peer_node/resources/config-harvesting.properties.mt
@@ -1,8 +1,9 @@
 [harvesting]
 
-harvesterVrfPrivateKey = {{harvester_vrf_private_key}}
 harvesterSigningPrivateKey = {{harvester_signing_private_key}}
+harvesterVrfPrivateKey = {{harvester_vrf_private_key}}
+
 enableAutoHarvesting = true
 maxUnlockedAccounts = 5
 delegatePrioritizationPolicy = Importance
-beneficiaryPublicKey = 0000000000000000000000000000000000000000000000000000000000000000 
+beneficiaryAddress =  
diff --git a/common/ruby/catapult-templates/peer_node/resources/config-network.properties.mt b/common/ruby/catapult-templates/peer_node/resources/config-network.properties.mt
@@ -2,7 +2,7 @@
 
 identifier = {{network_identifier}}
 nodeEqualityStrategy = host
-publicKey = {{network_public_key}}
+nemesisSignerPublicKey = {{network_public_key}}
 generationHashSeed = {{network_generation_hash}}
 epochAdjustment = 1573430400s
 
@@ -35,9 +35,14 @@ minHarvesterBalance = 500
 maxHarvesterBalance = 50'000'000'000'000
 minVoterBalance = 50'000
 
+# assuming finalization ~20 minutes
+maxVotingKeysPerAccount = 3
+minVotingKeyLifetime = 72
+maxVotingKeyLifetime = 26280
+
 harvestBeneficiaryPercentage = 10
 harvestNetworkPercentage = 5
-harvestNetworkFeeSinkPublicKey = FF5563F1C5824EE0CD868799FBE8744B46D5549973FDA499939C952D951494E4
+harvestNetworkFeeSinkAddress = TDGY4DD2U4YQQGERFMDQYHPYS6M7LHIF6XUCJ4Q
 
 blockPruneInterval = 360
 maxTransactionsPerBlock = 6'000
@@ -78,7 +83,7 @@ maxMosaicsPerAccount = 1'000
 maxMosaicDuration = 3650d
 maxMosaicDivisibility = 6
 
-mosaicRentalFeeSinkPublicKey = {{mosaic_rental_fee_sink_public_key}}
+mosaicRentalFeeSinkAddress = TDGY4DD2U4YQQGERFMDQYHPYS6M7LHIF6XUCJ4Q
 mosaicRentalFee = 500
 
 [plugin:catapult.plugins.multisig]
@@ -99,7 +104,7 @@ maxNamespaceDuration = 365d
 namespaceGracePeriodDuration = 30d
 reservedRootNamespaceNames = xem, nem, user, account, org, com, biz, net, edu, mil, gov, info
 
-namespaceRentalFeeSinkPublicKey = {{namespace_rental_fee_sink_public_key}}
+namespaceRentalFeeSinkAddress = TDGY4DD2U4YQQGERFMDQYHPYS6M7LHIF6XUCJ4Q
 rootNamespaceRentalFeePerBlock = 1
 childNamespaceRentalFee = 100
 

diff --git a/static-config/mongo/mongoDbPrepare.js b/static-config/mongo/mongoDbPrepare.js
@@ -26,6 +26,11 @@
 	db.blocks.createIndex({ 'block.timestamp': -1 }, { unique: true });
 	db.blocks.createIndex({ 'block.height': -1 }, { unique: true });
 	db.blocks.createIndex({ 'block.signerPublicKey': 1, 'block.height': -1 }, { unique: true });
+	db.blocks.createIndex({ 'block.beneficiaryAddress': 1, 'block.height': -1 }, { unique: true });
+
+	db.createCollection('finalizedBlocks');
+	db.finalizedBlocks.createIndex({ 'block.height': 1 }, { unique: true });
+	db.finalizedBlocks.createIndex({ 'block.finalizationPoint': 1 }, { unique: true });
 
 	db.createCollection('transactions');
 	addCommonTransactionIndexes(db.transactions);

diff --git a/static-config/mongo/mongoLockHashDbPrepare.js b/static-config/mongo/mongoLockHashDbPrepare.js
@@ -1,6 +1,5 @@
 (function prepareHashLockCollections() {
 	db.createCollection('hashLocks');
 	db.hashLocks.createIndex({ 'lock.hash': 1 }, { unique: true });
-	db.hashLocks.createIndex({ 'lock.senderPublicKey': 1 });
-	db.hashLocks.createIndex({ 'lock.senderAddress': 1 });
+	db.hashLocks.createIndex({ 'lock.ownerAddress': 1 });
 })();
diff --git a/static-config/mongo/mongoLockSecretDbPrepare.js b/static-config/mongo/mongoLockSecretDbPrepare.js
@@ -1,6 +1,5 @@
 (function prepareSecretLockCollections() {
 	db.createCollection('secretLocks');
 	db.secretLocks.createIndex({ 'lock.compositeHash': 1 }, { unique: true });
-	db.secretLocks.createIndex({ 'lock.senderPublicKey': 1 });
-	db.secretLocks.createIndex({ 'lock.senderAddress': 1 });
+	db.secretLocks.createIndex({ 'lock.ownerAddress': 1 });
 })();
diff --git a/static-config/mongo/mongoMetadataDbPrepare.js b/static-config/mongo/mongoMetadataDbPrepare.js
@@ -1,6 +1,6 @@
 (function prepareMetadataCollections() {
 	db.createCollection('metadata');
 	db.metadata.createIndex({ 'metadataEntry.compositeHash': 1 }, { unique: true });
-	db.metadata.createIndex({ 'metadataEntry.senderPublicKey': 1, 'metadataEntry.metadataType': 1, 'metadataEntry.scopedMetadataKey': 1 });
-	db.metadata.createIndex({ 'metadataEntry.targetPublicKey': 1, 'metadataEntry.metadataType': 1, 'metadataEntry.scopedMetadataKey': 1 });
+	db.metadata.createIndex({ 'metadataEntry.sourceAddress': 1, 'metadataEntry.metadataType': 1, 'metadataEntry.scopedMetadataKey': 1 });
+	db.metadata.createIndex({ 'metadataEntry.targetAddress': 1, 'metadataEntry.metadataType': 1, 'metadataEntry.scopedMetadataKey': 1 });
 })();
diff --git a/static-config/mongo/mongoMosaicDbPrepare.js b/static-config/mongo/mongoMosaicDbPrepare.js
@@ -1,5 +1,5 @@
 (function prepareMosaicCollections() {
 	db.createCollection('mosaics');
 	db.mosaics.createIndex({ 'mosaic.id': 1 }, { unique: true });
-	db.mosaics.createIndex({ 'mosaic.ownerPublicKey': 1 });
+	db.mosaics.createIndex({ 'mosaic.ownerAddress': 1 });
 })();
diff --git a/static-config/mongo/mongoMultisigDbPrepare.js b/static-config/mongo/mongoMultisigDbPrepare.js
@@ -1,5 +1,4 @@
 (function prepareMultisigCollections() {
 	db.createCollection('multisigs');
-	db.multisigs.createIndex({ 'multisig.accountPublicKey': 1 }, { unique: true });
 	db.multisigs.createIndex({ 'multisig.accountAddress': 1 }, { unique: true });
 })();
diff --git a/static-config/mongo/mongoNamespaceDbPrepare.js b/static-config/mongo/mongoNamespaceDbPrepare.js
@@ -4,6 +4,5 @@
 	db.namespaces.createIndex({ 'meta.active': -1, 'meta.index': 1, 'namespace.level0': 1, 'namespace.depth': 1 });
 	db.namespaces.createIndex({ 'meta.active': -1, 'namespace.level1': 1, 'namespace.depth': 1 });
 	db.namespaces.createIndex({ 'meta.active': -1, 'namespace.level2': 1, 'namespace.depth': 1 });
-	db.namespaces.createIndex({ 'meta.active': -1, 'namespace.ownerPublicKey': 1 });
 	db.namespaces.createIndex({ 'meta.active': -1, 'namespace.ownerAddress': 1 });
 })();
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		FROM techbureau/catapult-rest-server-nightly:commit-1aeac3f
		FROM symbolplatform/symbol-rest-nightly:commit-5eb7eac