Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[bootstrap] fix: testnet reset #390

Merged
merged 1 commit into from
Nov 4, 2022
Merged

[bootstrap] fix: testnet reset #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions config/node/resources/config-network.properties.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,16 @@ totalVotingBalanceCalculationFix = {{{toAmount totalVotingBalanceCalculationFix}
treasuryReissuance = {{{toAmount treasuryReissuance}}}
strictAggregateTransactionHash = {{{toAmount strictAggregateTransactionHash}}}

{{#treasuryReissuanceTransactionSignatures_has_items}}
[treasury_reissuance_transaction_signatures]

{{/treasuryReissuanceTransactionSignatures_has_items}}
{{#each treasuryReissuanceTransactionSignatures}}
{{this}} = true
{{/each}}

{{#corruptAggregateTransactionHashes_has_items}}
[corrupt_aggregate_transaction_hashes]

{{/corruptAggregateTransactionHashes_has_items}}
{{#each corruptAggregateTransactionHashes}}
{{this.key}} = {{this.value}}
{{/each}}
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "symbol-bootstrap",
"description": "Symbol tool that allows you creating, configuring and running Symbol's networks",
"version": "1.1.8",
"version": "1.1.9",
"author": "Fernando Boucquez <fboucquez@gmail.com>",
"bin": {
"symbol-bootstrap": "bin/run"
Expand Down
4 changes: 3 additions & 1 deletion presets/mainnet/network.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ minVotingKeyLifetime: 112
maxVotingKeyLifetime: 360
votingKeyDesiredLifetime: 360
votingKeyDesiredFutureLifetime: 60
lastKnownNetworkEpoch: 1190
lastKnownNetworkEpoch: 1194
stepDuration: 5m
maxBlockFutureTime: 300ms
maxAccountRestrictionValues: 100
Expand Down Expand Up @@ -121,6 +121,7 @@ statisticsServiceUrl: https://symbol.services
knownRestGateways: []
knownPeers: []
restUncirculatingAccountPublicKeys: A4739036FD7EFED2750A51EE9D1D3113BA3F9849E0889213CED7F221B2AA1A20,2BF1E1F3072E3BE0CD851E4741E101E33DB19C163895F69AA890E7CF177C878C
treasuryReissuanceTransactionSignatures_has_items: true
treasuryReissuanceTransactionSignatures:
- 0BBEADD37539444D75C09A245102D2B883267925398504623835DCD625290DEE4FA2371341050C49C001DEDD1C9FE241EA4A7DB335B2069FD4DAFF77AF734C03
- 89447704270E8B2F8EED19526587DB58870D90A02ACEF8AE2A54311DEB95C227201CD39662A0229D5746FFB84074EA6C7DD9620A2CE5AA69065C508DC0335201
Expand All @@ -129,6 +130,7 @@ treasuryReissuanceTransactionSignatures:
- C0BAE301EC15B514C5685A661BC3E23A6596CE9DC412A83F67A8C8611A4415B1B0447E8C09D2816CAE0D750C4AB1ED8FE9C85C05D448C2114147A2C935030708
- A317F4EB085C8D3D80435669EF54C6C9C9AD9B57165B14CF051F43879D0112E3A79591DD6D469BFAA850891FA2CB601BA58CD1BAEBFF5D84C49179AC7FE14706
- FDB98C472D0B98FDD766DA177366DEB2DB0E79721BD73DA96A84622A98932DA75BAA327BA9E23D448C6F25344654A6F17F7734C14D1530B327F911A97B4DE30A
corruptAggregateTransactionHashes_has_items: true
corruptAggregateTransactionHashes:
-
key: 97CA49FCE55644FF28248C6EA4DCB6E87E53909811DEE2513F0218DAA394679F
Expand Down
3 changes: 3 additions & 0 deletions presets/shared.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,4 +228,7 @@ statisticsServicePeerLimit: 50
statisticsServiceRestFilter: suggested
statisticsServiceRestLimit: 10

treasuryReissuanceTransactionSignatures_has_items: false
corruptAggregateTransactionHashes_has_items: false
treasuryReissuanceTransactionSignatures: []
corruptAggregateTransactionHashes: []
57 changes: 28 additions & 29 deletions presets/testnet/network.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
networkDescription: Symbol Joeynet Network
networkDescription: Symbol Sainet Network
baseNamespace: symbol
batchVerificationRandomSource: /dev/urandom
currencyMosaicId: 3A8416DB2D53B6C8
currencyMosaicId: 72C0212E67A08BCE
harvestBeneficiaryPercentage: 25
harvestingMosaicId: 3A8416DB2D53B6C8
epochAdjustment: 1637848847s
harvestingMosaicId: 72C0212E67A08BCE
epochAdjustment: 1667250467s
enableRevoteOnBoot: false
maxHarvesterBalance: 50000000000000
maxMosaicAtomicUnits: 8999999999000000
minHarvesterBalance: 10000000000
minVoterBalance: 3000000000000
nemesisGenerationHashSeed: 7FCCD304802016BEBBCD342A332F91FF1F3BB5E902988B352697BE245F48E836
harvestNetworkFeeSinkAddress: TBR3XLCYWLI4AC5CRMBMHOLFROA3WC2IXQGKGTI
namespaceRentalFeeSinkAddress: TANQYMTLDSIQYXDV37IXJBK5HNDCRTIMJDKCKJQ
mosaicRentalFeeSinkAddress: TDFYDFR4V6U3NOU7RELXNVXE2UJDKWNEYSU2ODQ
nemesisSignerPublicKey: FD0A6FAFEF047C5E251F60DBC2A30327AB401E629806A52BB4ED3007EC32C9B7
nemesisGenerationHashSeed: 49D6E1CE276A85B70EAFE52349AACCA389302E7A9754BCF1221E79494FC665A4
harvestNetworkFeeSinkAddress: TBC3AX4TMSYWTCWR6LDHPKWQQL7KPCOMHECN2II
namespaceRentalFeeSinkAddress: TDVFW6NZN3YI6O4ZRYZHGY73KADCW4HX6IDIKZI
mosaicRentalFeeSinkAddress: TA53AVLYMT5HCP5TJ23CGKGTUXQHNPBTJ4Z2LIQ
nemesisSignerPublicKey: 76E94661562762111FF7E592B00398554973396D8A4B922F3E3D139892F7C35C
networkType: 152
totalChainImportance: 7842928625000000
initialCurrencyAtomicUnits: 7842928625000000
importanceGrouping: 180
votingSetGrouping: 720
votingKeyDesiredLifetime: 720
votingKeyDesiredFutureLifetime: 120
lastKnownNetworkEpoch: 1002
lastKnownNetworkEpoch: 7
minVotingKeyLifetime: 28
maxVotingKeyLifetime: 720
stepDuration: 4m
Expand Down Expand Up @@ -52,7 +52,6 @@ timeSynchronizationMinImportance: 10000000000
faucetUrl: https://testnet.symbol.tools
explorerUrl: https://testnet.symbol.fyi
statisticsServiceUrl: https://testnet.symbol.services
treasuryReissuanceTransactionSignatures: []
nemesis:
mosaics:
-
Expand Down Expand Up @@ -489,47 +488,47 @@ inflation:
starting-at-height-110422799: 0
treasuryReissuance: 0
knownRestGateways:
- https://001-joey-dual.symboltest.net:3001
- https://201-joey-dual.symboltest.net:3001
- https://401-joey-dual.symboltest.net:3001
- https://001-sai-dual.symboltest.net:3001
- https://201-sai-dual.symboltest.net:3001
- https://401-sai-dual.symboltest.net:3001
knownPeers:
-
publicKey: AAA1922FA60DB681092CBE70A9A1BAB85745025310AE7567F95EA7FD05B3D3FC
publicKey: 07D38BAE29464C1F54CC1C8202DD83B65AF21C8E5FF1FB01ACEEE2243C55EF2A
endpoint:
host: 001-joey-dual.symboltest.net
host: 001-sai-dual.symboltest.net
port: 7900
metadata:
name: 001-joey-dual
name: 001-sai-dual
roles: Api,Peer,Voting
-
publicKey: 0B366C6ED891D9461DC81F4B85D253669E88D055970527D65353F4D22AE7DAFD
publicKey: E29CD799B119BB28ACEB643F603CAF0558ABF33DD6D95C65ECA7F0E64C2CC47F
endpoint:
host: 101-joey-peer.symboltest.net
host: 101-sai-peer.symboltest.net
port: 7900
metadata:
name: 101-joey-peer
name: 101-sai-peer
roles: Peer,Voting
-
publicKey: 3460D29534CA997D6A74BEBB93F38356833B806E1A35F700EBE08D57FC8D3FED
publicKey: 645E2E56B5F8680B69BC0255F4930169DBC052BB25F8121055DE2072D37E2C30
endpoint:
host: 201-joey-dual.symboltest.net
host: 201-sai-dual.symboltest.net
port: 7900
metadata:
name: 201-joey-dual
name: 201-sai-dual
roles: Api,Peer
-
publicKey: DFD29AD20BFEECBA8999C566226B39A63D5076CBE3C69201632C092D2F2C6373
publicKey: D01EA831B8736A8F97868C261246EA49215A007FE3542426DBA187183D56313B
endpoint:
host: 301-joey-peer.symboltest.net
host: 301-sai-peer.symboltest.net
port: 7900
metadata:
name: 301-joey-peer
name: 301-sai-peer
roles: Peer,Voting
-
publicKey: 3E9C8CCC16DDB1EDFF9F2D0BB92D3F839CCC33D38034E526DC768F7BA3958E00
publicKey: C1773740461C97FF172E966213716E089A93DC43F10BE55DC27CC49CBA67E692
endpoint:
host: 401-joey-dual.symboltest.net
host: 401-sai-dual.symboltest.net
port: 7900
metadata:
name: 401-joey-dual
name: 401-sai-dual
roles: Api,Peer,Voting
Binary file modified presets/testnet/seed/00000/00001.dat
View file
Open in desktop
Binary file not shown.
Binary file modified presets/testnet/seed/00000/00001.proof
View file
Open in desktop
Binary file not shown.
Binary file modified presets/testnet/seed/00000/00001.stmt
View file
Open in desktop
Binary file not shown.
Binary file modified presets/testnet/seed/00000/hashes.dat
View file
Open in desktop
Binary file not shown.
Binary file modified presets/testnet/seed/proof.index.dat
View file
Open in desktop
Binary file not shown.
4 changes: 0 additions & 4 deletions test/reports/bootstrap-voting/api-node-0-config.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,6 @@ totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVoting
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;

treasury_reissuance_transaction_signatures

corrupt_aggregate_transaction_hashes


config-node.properties
node
Expand Down
2 changes: 0 additions & 2 deletions test/reports/bootstrap-voting/api-node-0-config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,6 @@ config-network.properties
totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVotingBalance calculation.
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;
**treasury_reissuance_transaction_signatures**;
**corrupt_aggregate_transaction_hashes**;

config-node.properties
======================
Expand Down
4 changes: 0 additions & 4 deletions test/reports/bootstrap-voting/peer-node-0-config.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@ totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVoting
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;

treasury_reissuance_transaction_signatures

corrupt_aggregate_transaction_hashes


config-node.properties
node
Expand Down
2 changes: 0 additions & 2 deletions test/reports/bootstrap-voting/peer-node-0-config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,6 @@ config-network.properties
totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVotingBalance calculation.
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;
**treasury_reissuance_transaction_signatures**;
**corrupt_aggregate_transaction_hashes**;

config-node.properties
======================
Expand Down
4 changes: 0 additions & 4 deletions test/reports/bootstrap-voting/peer-node-1-config.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,10 +260,6 @@ totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVoting
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;

treasury_reissuance_transaction_signatures

corrupt_aggregate_transaction_hashes


config-node.properties
node
Expand Down
2 changes: 0 additions & 2 deletions test/reports/bootstrap-voting/peer-node-1-config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,6 @@ config-network.properties
totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVotingBalance calculation.
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;
**treasury_reissuance_transaction_signatures**;
**corrupt_aggregate_transaction_hashes**;

config-node.properties
======================
Expand Down
4 changes: 0 additions & 4 deletions test/reports/custom-network-dual/node-config.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,10 +681,6 @@ totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVoting
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;

treasury_reissuance_transaction_signatures

corrupt_aggregate_transaction_hashes


config-node.properties
node
Expand Down
2 changes: 0 additions & 2 deletions test/reports/custom-network-dual/node-config.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,8 +705,6 @@ config-network.properties
totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVotingBalance calculation.
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;
**treasury_reissuance_transaction_signatures**;
**corrupt_aggregate_transaction_hashes**;

config-node.properties
======================
Expand Down
26 changes: 11 additions & 15 deletions test/reports/testnet-api/node-config.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,16 +574,16 @@ listenInterface; 0.0.0.0
config-network.properties
network
identifier; testnet; NetworkIdentifier; Network identifier.
nemesisSignerPublicKey; FD0A6FAFEF047C5E251F60DBC2A30327AB401E629806A52BB4ED3007EC32C9B7; Key; Nemesis public key.
nemesisSignerPublicKey; 76E94661562762111FF7E592B00398554973396D8A4B922F3E3D139892F7C35C; Key; Nemesis public key.
nodeEqualityStrategy; host; NodeIdentityEqualityStrategy; Node equality strategy.
generationHashSeed; 7FCCD304802016BEBBCD342A332F91FF1F3BB5E902988B352697BE245F48E836; ;
epochAdjustment; 1637848847s; utils::TimeSpan; Nemesis epoch time adjustment.
generationHashSeed; 49D6E1CE276A85B70EAFE52349AACCA389302E7A9754BCF1221E79494FC665A4; ;
epochAdjustment; 1667250467s; utils::TimeSpan; Nemesis epoch time adjustment.

chain
enableVerifiableState; true; bool; Set to true if block chain should calculate state hashes so that state is fully verifiable at each block.
enableVerifiableReceipts; true; bool; Set to true if block chain should calculate receipts so that state changes are fully verifiable at each block.
currencyMosaicId; 0x3A84'16DB'2D53'B6C8; MosaicId; Mosaic id used as primary chain currency.
harvestingMosaicId; 0x3A84'16DB'2D53'B6C8; MosaicId; Mosaic id used to provide harvesting ability.
currencyMosaicId; 0x72C0'212E'67A0'8BCE; MosaicId; Mosaic id used as primary chain currency.
harvestingMosaicId; 0x72C0'212E'67A0'8BCE; MosaicId; Mosaic id used to provide harvesting ability.
blockGenerationTargetTime; 30s; utils::TimeSpan; Targeted time between blocks.
blockTimeSmoothingFactor; 3000; uint32_t; Note: A higher value makes the network more biased. Note: This can lower security because it will increase the influence of time relative to importance.
importanceGrouping; 180; uint64_t; Number of blocks that should be treated as a group for importance purposes. Note: Importances will only be calculated at blocks that are multiples of this grouping number.
Expand All @@ -605,8 +605,8 @@ minVotingKeyLifetime; 28; uint32_t; Minimum number of finalization rounds for wh
maxVotingKeyLifetime; 720; uint32_t; Maximum number of finalization rounds for which voting key can be registered.
harvestBeneficiaryPercentage; 25; uint8_t; Percentage of the harvested fee that is collected by the beneficiary account.
harvestNetworkPercentage; 5; uint8_t; Percentage of the harvested fee that is collected by the network.
harvestNetworkFeeSinkAddressV1; TBR3XLCYWLI4AC5CRMBMHOLFROA3WC2IXQGKGTI; ;
harvestNetworkFeeSinkAddress; TBR3XLCYWLI4AC5CRMBMHOLFROA3WC2IXQGKGTI; Address; Address of the harvest network fee sink account.
harvestNetworkFeeSinkAddressV1; TBC3AX4TMSYWTCWR6LDHPKWQQL7KPCOMHECN2II; ;
harvestNetworkFeeSinkAddress; TBC3AX4TMSYWTCWR6LDHPKWQQL7KPCOMHECN2II; Address; Address of the harvest network fee sink account.
maxTransactionsPerBlock; 6'000; uint32_t; Maximum number of transactions per block.

plugin:catapult.plugins.accountlink
Expand Down Expand Up @@ -635,8 +635,8 @@ plugin:catapult.plugins.mosaic
maxMosaicsPerAccount; 1'000; uint16_t; Maximum number of mosaics that an account can own.
maxMosaicDuration; 3650d; utils::BlockSpan; Maximum mosaic duration.
maxMosaicDivisibility; 6; uint8_t; Maximum mosaic divisibility.
mosaicRentalFeeSinkAddressV1; TDFYDFR4V6U3NOU7RELXNVXE2UJDKWNEYSU2ODQ; ;
mosaicRentalFeeSinkAddress; TDFYDFR4V6U3NOU7RELXNVXE2UJDKWNEYSU2ODQ; Address; Address of the mosaic rental fee sink account.
mosaicRentalFeeSinkAddressV1; TA53AVLYMT5HCP5TJ23CGKGTUXQHNPBTJ4Z2LIQ; ;
mosaicRentalFeeSinkAddress; TA53AVLYMT5HCP5TJ23CGKGTUXQHNPBTJ4Z2LIQ; Address; Address of the mosaic rental fee sink account.
mosaicRentalFee; 500000; Amount; Mosaic rental fee.

plugin:catapult.plugins.multisig
Expand All @@ -652,8 +652,8 @@ minNamespaceDuration; 30d; utils::BlockSpan; Minimum namespace duration.
maxNamespaceDuration; 1825d; utils::BlockSpan; Maximum namespace duration.
namespaceGracePeriodDuration; 1d; utils::BlockSpan; Grace period during which time only the previous owner can renew an expired namespace.
reservedRootNamespaceNames; symbol, symbl, xym, xem, nem, user, account, org, com, biz, net, edu, mil, gov, info; unordered_set<string>; Reserved root namespaces that cannot be claimed.
namespaceRentalFeeSinkAddressV1; TANQYMTLDSIQYXDV37IXJBK5HNDCRTIMJDKCKJQ; ;
namespaceRentalFeeSinkAddress; TANQYMTLDSIQYXDV37IXJBK5HNDCRTIMJDKCKJQ; Address; Address of the namespace rental fee sink account.
namespaceRentalFeeSinkAddressV1; TDVFW6NZN3YI6O4ZRYZHGY73KADCW4HX6IDIKZI; ;
namespaceRentalFeeSinkAddress; TDVFW6NZN3YI6O4ZRYZHGY73KADCW4HX6IDIKZI; Address; Address of the namespace rental fee sink account.
rootNamespaceRentalFeePerBlock; 2; Amount; Root namespace rental fee per block.
childNamespaceRentalFee; 100000; Amount; Child namespace rental fee.

Expand All @@ -671,10 +671,6 @@ totalVotingBalanceCalculationFix; 0; uint32_t; Height of fork to fix TotalVoting
treasuryReissuance; 0; ;
strictAggregateTransactionHash; 0; ;

treasury_reissuance_transaction_signatures

corrupt_aggregate_transaction_hashes


config-node.properties
node
Expand Down
Loading