Skip to content

Commit

Permalink
New Testnet preset (#224)
Browse files Browse the repository at this point in the history
Updated wallet to 1.0.1. Upgraded configuration to latets.
Fixed peer list roles in bootstrap preset
  • Loading branch information
fboucquez authored Apr 5, 2021
1 parent a72c014 commit 2e00379
Show file tree
Hide file tree
Showing 51 changed files with 6,540 additions and 6,291 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,10 @@ The changelog format is based on [Keep a Changelog](https://keepachangelog.com/e
| ---------------- | ------- | ------------------------------------------------------------------ |
| Symbol Bootstrap | v1.0.4 | [symbol-bootstrap](https://www.npmjs.com/package/symbol-bootstrap) |

- New `testnet.symboldev.network` testnet!
- Fixed host override when no custom preset is provided in mainnet.
- Fixed case issue validating keys when creating certificates.
- Updated Wallet to latest 1.0.1 release.

## [1.0.3] - Mar-31-2021

Expand Down
3 changes: 3 additions & 0 deletions cmds/start-testnet-demo.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
set -e
symbol-bootstrap start -p testnet -a demo -t target/testnet-demo --noPassword $1 $2 $3
3 changes: 3 additions & 0 deletions cmds/start-testnet-supernode-demo.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
set -e
symbol-bootstrap start -p testnet -a demo -t target/testnet-supernode -c test/supernode.yml $1 $2 $3
3 changes: 2 additions & 1 deletion config/wallet/app.conf.js.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ var appConfig = {
MAX_SEED_ACCOUNTS_NUMBER: 10,
MIN_PASSWORD_LENGTH: 8,
SEED_ACCOUNT_NAME_PREFIX: 'SeedWallet-',
ANNOUNCE_TRANSACTION_TIMEOUT: 120000,
ANNOUNCE_TRANSACTION_TIMEOUT: 240000,
DECIMAL_SEPARATOR: Number('1.1').toLocaleString().substring(1, 2),
},
languages: [
{ value: 'en-US', label: 'English' },
Expand Down
11 changes: 4 additions & 7 deletions config/wallet/fees.conf.js.mustache
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
var feesConfig = {
median: 1,
highest: 2,
median: 10,
free: 0,
slowest: 5000,
slow: 30000,
normal: 50000,
fast: 100000,
fastest: 1000000,
slow: 5,
slowest: 1,
fast: 20,
}
window.feesConfig = feesConfig
console.log('feesConfig loaded!', feesConfig)
8 changes: 5 additions & 3 deletions config/wallet/network.conf.js.mustache
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
var networkConfig = {
var networkTypeConfig = {
"explorerUrl": "{{{explorerUrl}}}",
"faucetUrl": "{{{faucetUrl}}}",
"defaultNetworkType": {{{networkType}}},
"defaultNodeUrl": "{{{defaultNodeUrl}}}",
"networkConfigurationDefaults": {
"epochAdjustment": {{{toSeconds epochAdjustment}}},
"maxMosaicDivisibility": {{{maxMosaicDivisibility}}},
"namespaceGracePeriodDuration": {{{toSeconds namespaceGracePeriodDuration}}},
"lockedFundsPerAggregate": "{{{lockedFundsPerAggregate}}}",
Expand All @@ -21,14 +20,17 @@ var networkConfig = {
"currencyMosaicId": "{{{toSimpleHex currencyMosaicId}}}",
"harvestingMosaicId": "{{{toSimpleHex harvestingMosaicId}}}",
"defaultDynamicFeeMultiplier": {{{defaultDynamicFeeMultiplier}}},
"epochAdjustment": {{{toSeconds epochAdjustment}}}
"epochAdjustment": {{{toSeconds epochAdjustment}}},
"totalChainImportance": {{totalChainImportance}},
"generationHash": "{{nemesisGenerationHashSeed}}"
},
"nodes": [
{{#restNodes}}
{"friendlyName": "{{{friendlyName}}}", "roles": {{{roles}}}, "url": "{{{url}}}"},
{{/restNodes}}
]
}
var networkConfig = { {{{networkType}}} : networkTypeConfig }
window.networkConfig = networkConfig
console.log('networkConfig loaded!', networkConfig)

Expand Down
7 changes: 0 additions & 7 deletions presets/mainnet/network.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,13 @@ childNamespaceRentalFee: 100000
mosaicRentalFee: 500000
throttlingBurst: 80
throttlingRate: 60
symbolServerToolsImage: symbolplatform/symbol-server:tools-gcc-1.0.0.0
symbolServerImage: symbolplatform/symbol-server:gcc-1.0.0.0
symbolRestImage: symbolplatform/symbol-rest:2.3.5
minPartnerNodeVersion: 1.0.0.0
maxPartnerNodeVersion: 1.0.255.255
serverVersion: 1.0.0.0
fileDatabaseBatchSize: 100
minProofSize: 0
syncTimeout: 5m
maxChildNamespaces: 100
nonVotingUnfinalizedBlocksDuration: 10m
votingUnfinalizedBlocksDuration: 0m
timeSynchronizationMinImportance: 10000000000
#nemesisSeedUrl: 'https://symbol-bootstrap.s3-eu-west-1.amazonaws.com/mainnet/seed.zip'
knownRestGateways:
- 'http://ngl-dual-001.symbolblockchain.io:3000'
- 'http://ngl-dual-002.symbolblockchain.io:3000'
Expand Down
14 changes: 6 additions & 8 deletions presets/shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,11 @@ maxNameSize: 64
maxChildNamespaces: 256
maxNamespaceDepth: 3
batchVerificationRandomSource:
symbolServerToolsImage: symbolplatform/symbol-server:tools-gcc-0.10.0.8
symbolServerImage: symbolplatform/symbol-server:gcc-0.10.0.8
symbolServerToolsImage: symbolplatform/symbol-server:tools-gcc-1.0.0.0
symbolServerImage: symbolplatform/symbol-server:gcc-1.0.0.0
symbolRestImage: symbolplatform/symbol-rest:2.3.5
symbolExplorerImage: symbolplatform/symbol-explorer:0.6.3-alpha
symbolWalletImage: symbolplatform/symbol-desktop-wallet:0.13.6
symbolWalletImage: symbolplatform/symbol-desktop-wallet:1.0.1
symbolFaucetImage: symbolplatform/symbol-faucet:0.5.0-alpha
symbolAgentImage: symbolplatform/symbol-node-rewards-agent:1.0.1
mongoImage: mongo:4.4.3-bionic
Expand Down Expand Up @@ -126,7 +126,6 @@ timeSynchronizationMinImportance: 3750
maxIncomingConnectionsPerIdentity: 6
enableAddressReuse: false
nodeListenInterface: 0.0.0.0
serverVersion: 0.10.0.8
enableTransactionSpamThrottling: true
transactionSpamThrottlingMaxBoostFee: 10000000
maxHashesPerSyncAttempt: 370
Expand Down Expand Up @@ -160,10 +159,9 @@ delegatePrioritizationPolicy: Importance
dockerComposeVersion: '2.4'
dockerComposeServiceRestart: 'on-failure:2'
dockerComposeDebugMode: false

minPartnerNodeVersion: 0.10.0.7
maxPartnerNodeVersion: 0.10.0.8

minPartnerNodeVersion: 1.0.0.0
maxPartnerNodeVersion: 1.0.255.255
serverVersion: 1.0.0.0
outgoing_connections_maxConnections: 10
outgoing_connections_maxConnectionAge: 200
outgoing_connections_maxConnectionBanAge: 20
Expand Down
10 changes: 5 additions & 5 deletions presets/testnet/assembly-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ databases:
nodes:
- harvesting: false
api: true
name: 'api-node'
name: 'node'
databaseHost: 'db'
brokerName: 'api-broker'
brokerName: 'broker'
openPort: true
brokerOpenPort: false
trustedHosts: 127.0.0.1, 172.20.0.25
localNetworks: 127.0.0.1, 172.20.0.25
gateways:
- name: 'rest-gateway'
apiNodeName: 'api-node'
apiNodeHost: 'api-node'
apiNodeBrokerHost: 'api-broker'
apiNodeName: 'node'
apiNodeHost: 'node'
apiNodeBrokerHost: 'broker'
description: 'catapult public test network'
databaseHost: 'db'
openPort: true
Expand Down
61 changes: 61 additions & 0 deletions presets/testnet/assembly-demo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
explorerUrl: http://localhost:90/
faucetUrl: http://localhost:100/
databases:
- name: 'db'
openPort: false
nodes:
- harvesting: true
api: true
name: 'node'
databaseHost: 'db'
brokerName: 'broker'
openPort: true
brokerOpenPort: false
trustedHosts: 127.0.0.1, 172.20.0.25
localNetworks: 127.0.0.1, 172.20.0.25
gateways:
- name: 'rest-gateway'
apiNodeName: 'node'
apiNodeHost: 'node'
apiNodeBrokerHost: 'broker'
description: 'catapult public test network'
databaseHost: 'db'
openPort: true
ipv4_address: 172.20.0.25
wallets:
- name: 'wallet'
title: 'Symbol Bootstrap Wallet'
defaultNodeUrl: 'http://localhost:3000'
namespaceName: '{{baseNamespace}}.{{currencyName}}'
openPort: '80'
restNodes:
- friendlyName: 'Bootstrap Rest'
url: 'http://localhost:3000'
roles: 2
explorers:
- name: 'explorer'
defaultNode: 'http://localhost:3000'
namespaceName: '{{baseNamespace}}.{{currencyName}}'
openPort: '90'
restNodes:
- 'http://localhost:3000'
footer:
link:
- href: https://nemflash.io/
text: NEM News
icon: IconNewspaper
- href: https://forum.nem.io/
text: Forum
icon: IconForum
- href: https://t.me/nemred
text: Telegram
icon: IconTelegram
- href: https://www.reddit.com/r/nem/
text: Reddit
icon: IconReddit
- href: https://github.com/nemtech
text: Github
icon: IconGithub
- href: http://localhost:100/
text: Faucet
icon: IconHomeCurrencyUsd
10 changes: 5 additions & 5 deletions presets/testnet/assembly-dual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ databases:
nodes:
- harvesting: true
api: true
name: 'api-node'
name: 'node'
databaseHost: 'db'
brokerName: 'api-broker'
brokerName: 'broker'
openPort: true
brokerOpenPort: false
trustedHosts: 127.0.0.1, 172.20.0.25
localNetworks: 127.0.0.1, 172.20.0.25
gateways:
- name: 'rest-gateway'
apiNodeName: 'api-node'
apiNodeHost: 'api-node'
apiNodeBrokerHost: 'api-broker'
apiNodeName: 'node'
apiNodeHost: 'node'
apiNodeBrokerHost: 'broker'
description: 'catapult public test network'
databaseHost: 'db'
openPort: true
Expand Down
2 changes: 1 addition & 1 deletion presets/testnet/assembly-peer.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ localNetworks: 127.0.0.1
nodes:
- harvesting: true
api: false
name: 'peer-node'
name: 'node'
openPort: true
Loading

0 comments on commit 2e00379

Please sign in to comment.