updates for e2 release, currently using a temp fix for rest gateway i…

…ssue

README.ja.md

@@ -1,4 +1,4 @@
-# OUT OF DATE, NEEDS UPDATING FOR DRAGON RELEASE
+# OUT OF DATE, NEEDS UPDATING FOR ELEPHANT RELEASE
 
 # Catapultサービスの起動
 

cmds/docker/catapult-api.yml

@@ -19,7 +19,7 @@ services:
   ###### running services ###########
 
   rest-gateway:
-    image: techbureau/catapult-rest-server:1.0.16
+    image: techbureau/catapult-rest-server:1.0.17-temp-fix
     command: ash -c "/bin-mount/wait /state/configs-generated && npm start resources/rest.json /userconfig/rest.json"
     stop_signal: SIGINT
     ports:

cmds/docker/docker-compose-setup-network.yml

@@ -18,7 +18,7 @@ services:
   ######  dynamic configuration  ###########
 
   generate-raw-addresses:
-    image: techbureau/catapult-tools:gcc-0.5.0.1
+    image: techbureau/catapult-tools:gcc-0.6.0.1
     command: bash -c "/bin-mount/generate-raw-addresses-if-needed 50 /addresses/raw-addresses.txt /addresses/addresses.yaml"
     volumes:
     - ../../bin/bash:/bin-mount

cmds/docker/docker-compose.yml

@@ -18,7 +18,7 @@ services:
   ######  dynamic configuration  ###########
 
   generate-raw-addresses:
-    image: techbureau/catapult-tools:gcc-0.5.0.1
+    image: techbureau/catapult-tools:gcc-0.6.0.1
     command: bash -c "/bin-mount/generate-raw-addresses-if-needed 50 /addresses/raw-addresses.txt /addresses/addresses.yaml"
     volumes:
     - ../../bin/bash:/bin-mount
@@ -65,7 +65,7 @@ services:
     - db
 
   rest-gateway:
-    image: techbureau/catapult-rest-server:1.0.16
+    image: techbureau/catapult-rest-server:1.0.17-temp-fix
     command: ash -c "/bin-mount/wait /state/configs-generated && npm start resources/rest.json /userconfig/rest.json"
     stop_signal: SIGINT
     ports:

cmds/docker/dockerfiles/catapult/Dockerfile

@@ -1,2 +1,2 @@
-FROM  techbureau/catapult-server:gcc-0.5.0.1
+FROM  techbureau/catapult-server:gcc-0.6.0.1
 ADD ./userconfig /userconfig

cmds/docker/dockerfiles/nemgen/Dockerfile

@@ -1,2 +1,2 @@
-FROM techbureau/catapult-tools:gcc-0.5.0.1
+FROM techbureau/catapult-tools:gcc-0.6.0.1
 ADD ./userconfig /userconfig

ruby/catapult-templates/api_node/resources/config-database.properties.mt

@@ -10,8 +10,10 @@ catapult.mongo.plugins.accountlink = true
 catapult.mongo.plugins.aggregate = true
 catapult.mongo.plugins.lockhash = true
 catapult.mongo.plugins.locksecret = true
+catapult.mongo.plugins.metadata = true
 catapult.mongo.plugins.mosaic = true
 catapult.mongo.plugins.multisig = true
 catapult.mongo.plugins.namespace = true
 catapult.mongo.plugins.restrictionaccount = true
+catapult.mongo.plugins.restrictionmosaic = true
 catapult.mongo.plugins.transfer = true

ruby/catapult-templates/api_node/resources/config-network.properties.mt

@@ -59,6 +59,10 @@ maxSecretLockDuration = 30d
 minProofSize = 1
 maxProofSize = 1000
 
+[plugin:catapult.plugins.metadata]
+
+maxValueSize = 1024
+
 [plugin:catapult.plugins.mosaic]
 
 maxMosaicsPerAccount = 10'000
@@ -77,22 +81,27 @@ maxCosignedAccountsPerAccount = 5
 [plugin:catapult.plugins.namespace]
 
 maxNameSize = 64
+maxChildNamespaces = 500
+maxNamespaceDepth = 3
 
 # *approximate* days based on blockGenerationTargetTime
+minNamespaceDuration = 1m
 maxNamespaceDuration = 365d
-namespaceGracePeriodDuration = 0d
+namespaceGracePeriodDuration = 2m
 reservedRootNamespaceNames = xem, nem, user, account, org, com, biz, net, edu, mil, gov, info
 
 namespaceRentalFeeSinkPublicKey = {{namespace_rental_fee_sink_public_key}}
 rootNamespaceRentalFeePerBlock = 1'000'000
 childNamespaceRentalFee = 100'000'000
 
-maxChildNamespaces = 500
-
 [plugin:catapult.plugins.restrictionaccount]
 
 maxAccountRestrictionValues = 512
 
+[plugin:catapult.plugins.restrictionmosaic]
+
+maxMosaicRestrictionValues = 20
+
 [plugin:catapult.plugins.transfer]
 
 maxMessageSize = 1024

ruby/catapult-templates/nemesis/block-properties-file.properties.mt

@@ -35,7 +35,7 @@ duration = 0
 supply = 8'998'999'998'000'000
 isTransferable = true
 isSupplyMutable = false
-isLevyMutable = false
+isRestrictable = false
 
 [distribution>cat:currency]
 {{#cat_currency_distribution}}
@@ -49,7 +49,7 @@ duration = 0
 supply = 15'000'000
 isTransferable = true
 isSupplyMutable = true
-isLevyMutable = false
+isRestrictable = false
 
 [distribution>cat:harvest]
 {{#cat_harvest_distribution}}

ruby/catapult-templates/peer_node/resources/config-database.properties.mt

@@ -10,8 +10,10 @@ catapult.mongo.plugins.accountlink = true
 catapult.mongo.plugins.aggregate = true
 catapult.mongo.plugins.lockhash = true
 catapult.mongo.plugins.locksecret = true
+catapult.mongo.plugins.metadata = true
 catapult.mongo.plugins.mosaic = true
 catapult.mongo.plugins.multisig = true
 catapult.mongo.plugins.namespace = true
 catapult.mongo.plugins.restrictionaccount = true
+catapult.mongo.plugins.restrictionmosaic = true
 catapult.mongo.plugins.transfer = true

ruby/catapult-templates/peer_node/resources/config-network.properties.mt

@@ -59,6 +59,10 @@ maxSecretLockDuration = 30d
 minProofSize = 1
 maxProofSize = 1000
 
+[plugin:catapult.plugins.metadata]
+
+maxValueSize = 1024
+
 [plugin:catapult.plugins.mosaic]
 
 maxMosaicsPerAccount = 10'000
@@ -77,22 +81,27 @@ maxCosignedAccountsPerAccount = 5
 [plugin:catapult.plugins.namespace]
 
 maxNameSize = 64
+maxChildNamespaces = 500
+maxNamespaceDepth = 3
 
 # *approximate* days based on blockGenerationTargetTime
+minNamespaceDuration = 1m
 maxNamespaceDuration = 365d
-namespaceGracePeriodDuration = 0d
+namespaceGracePeriodDuration = 2m
 reservedRootNamespaceNames = xem, nem, user, account, org, com, biz, net, edu, mil, gov, info
 
 namespaceRentalFeeSinkPublicKey = {{namespace_rental_fee_sink_public_key}}
 rootNamespaceRentalFeePerBlock = 1'000'000
 childNamespaceRentalFee = 100'000'000
 
-maxChildNamespaces = 500
 
 [plugin:catapult.plugins.restrictionaccount]
 
 maxAccountRestrictionValues = 512
 
+[plugin:catapult.plugins.restrictionmosaic]
+
+maxMosaicRestrictionValues = 20
 
 [plugin:catapult.plugins.transfer]
 

ruby/catapult-templates/rest_gateway/rest.json.mt

@@ -7,7 +7,7 @@
   "port": 3000,
   "crossDomainHttpMethods": ["GET", "POST", "PUT", "OPTIONS"],
   "clientPrivateKey": "{{rest_gateway_private_key}}",
-  "extensions": ["accountLink", "accountProperties", "aggregate", "lock", "mosaic", "multisig", "namespace", "receipts", "transfer"],
+  "extensions": ["accountLink", "accountRestrictions", "aggregate", "lock", "mosaic", "multisig", "namespace", "receipts", "transfer"],
   "db": {
     "url": "mongodb://db:27017/",
     "name": "catapult",

static-config/mongo/mongoDbPrepare.js

@@ -35,6 +35,15 @@
 	db.transactions.createIndex({ 'transaction.mosaicId': 1, 'transaction.type': 1 }, makeSparse('transaction.mosaicId'));
 	db.transactions.createIndex({ 'transaction.namespaceId': 1, 'transaction.type': 1 }, makeSparse('transaction.namespaceId'));
 
+	db.createCollection('transactionStatements');
+	db.transactionStatements.createIndex({ 'height': 1, 'source.primaryId': 1, 'source.secondaryId': 1 }, { unique: true });
+
+	db.createCollection('addressResolutionStatements');
+	db.addressResolutionStatements.createIndex({ 'height': 1, 'unresolved': 1 }, { unique: true });
+
+	db.createCollection('mosaicResolutionStatements');
+	db.mosaicResolutionStatements.createIndex({ 'height': 1, 'unresolved': 1 }, { unique: true });
+
 	db.createCollection('accounts');
 	db.accounts.createIndex({ 'account.publicKey': 1 }); // cannot be unique because zeroed public keys are stored
 	db.accounts.createIndex({ 'account.address': 1 }, { unique: true });
@@ -49,13 +58,19 @@
 
 	db.blocks.getIndexes();
 	db.transactions.getIndexes();
+	db.transactionStatements.getIndexes();
+	db.addressResolutionStatements.getIndexes();
+	db.mosaicResolutionStatements.getIndexes();
 	db.accounts.getIndexes();
 	db.unconfirmedTransactions.getIndexes();
 	db.partialTransactions.getIndexes();
 	db.transactionStatuses.getIndexes();
 })();
 
-load('mongoAccountPropertiesDbPrepare.js')
 load('mongoLockInfoDbPrepare.js')
+load('mongoMetadataDbPrepare.js')
+load('mongoMosaicDbPrepare.js')
 load('mongoMultisigDbPrepare.js')
 load('mongoNamespaceDbPrepare.js')
+load('mongoRestrictionAccountDbPrepare.js')
+load('mongoRestrictionMosaicDbPrepare.js')

static-config/mongo/mongoMetadataDbPrepare.js

@@ -0,0 +1,8 @@
+(function prepareMetadataCollections() {
+	db.createCollection('metadata');
+	db.metadata.createIndex({ 'metadataEntry.compositeHash': 1 }, { unique: true });
+	db.metadata.createIndex({ 'metadataEntry.sourcePublicKey': 1, 'metadataEntry.metadataType': 1, 'metadataEntry.scopedMetadataKey': 1 });
+	db.metadata.createIndex({ 'metadataEntry.targetPublicKey': 1, 'metadataEntry.metadataType': 1, 'metadataEntry.scopedMetadataKey': 1 });
+
+	db.metadata.getIndexes();
+})();

static-config/mongo/mongoRestrictionAccountDbPrepare.js

@@ -0,0 +1,6 @@
+(function prepareRestrictionAccountCollection() {
+	db.createCollection('accountRestrictions');
+	db.accountRestrictions.createIndex({ 'accountRestrictions.address': 1 }, { unique: true });
+
+	db.accountRestrictions.getIndexes();
+})();

static-config/mongo/mongoRestrictionMosaicDbPrepare.js

@@ -0,0 +1,6 @@
+(function prepareRestrictionMosaicCollection() {
+	db.createCollection('mosaicRestrictions');
+	db.mosaicRestrictions.createIndex({ 'mosaicRestrictionEntry.compositeHash': 1 }, { unique: true });
+
+	db.mosaicRestrictions.getIndexes();
+})();