Skip to content

Commit 404afd6

Browse files
committed
max-transaction-size-limit.json correct default if not populated
1 parent 8af6247 commit 404afd6

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

extensions/max-transaction-size-limit.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"replace_text_alt": [
1919
"// Use 0 for default max transaction size limit",
20-
"const uint64_t MAX_TRANSACTION_SIZE_LIMIT = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 125 / 100 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;"
20+
"const uint64_t MAX_TRANSACTION_SIZE_LIMIT = CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 110 / 100 - CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;"
2121
],
2222
"var": "MAX_TRANSACTION_SIZE_LIMIT"
2323
}
@@ -118,4 +118,4 @@
118118
]
119119
}
120120
]
121-
}
121+
}

extensions/multiply/max-transaction-size-limit.json

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"marker": "arg_testnet = { \"testnet\"",
3030
"parameters": {
3131
"text": [
32-
" const command_line::arg_descriptor<uint64_t> arg_MAX_TRANSACTION_SIZE_LIMIT = {\"MAX_TRANSACTION_SIZE_LIMIT\", \"Max transaction limit size\", CryptoNote::parameters::MAX_TRANSACTION_SIZE_LIMIT}; "
32+
" const command_line::arg_descriptor<uint64_t> arg_MAX_TRANSACTION_SIZE_LIMIT = {\"MAX_TRANSACTION_SIZE_LIMIT\", \"Max transaction limit size\", 0}; "
3333
]
3434
}
3535
},
@@ -47,8 +47,14 @@
4747
"marker": "currencyBuilder.testnet(command_line::get_arg(vm, arg_testnet));",
4848
"parameters": {
4949
"text": [
50-
"currencyBuilder.maxTransactionSizeLimit(command_line::get_arg(vm, arg_MAX_TRANSACTION_SIZE_LIMIT));",
51-
"currencyBuilder.fusionTxMaxSize(command_line::get_arg(vm, arg_MAX_TRANSACTION_SIZE_LIMIT) * 30 / 100);"
50+
"if (command_line::get_arg(vm, arg_MAX_TRANSACTION_SIZE_LIMIT) == 0) {",
51+
" uint64_t maxTxSizeLimit = command_line::get_arg(vm, arg_CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE) * 110 / 100 - CryptoNote::parameters::CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;",
52+
" currencyBuilder.maxTransactionSizeLimit(maxTxSizeLimit);",
53+
" currencyBuilder.fusionTxMaxSize(maxTxSizeLimit * 30 / 100);",
54+
"} else {",
55+
" currencyBuilder.maxTransactionSizeLimit(command_line::get_arg(vm, arg_MAX_TRANSACTION_SIZE_LIMIT));",
56+
" currencyBuilder.fusionTxMaxSize(command_line::get_arg(vm, arg_MAX_TRANSACTION_SIZE_LIMIT) * 30 / 100);",
57+
"}"
5258
]
5359
}
5460
}
@@ -85,7 +91,7 @@
8591
"marker": "(\"DIFFICULTY_CUT\", po::value<size_t>()->default_value(CryptoNote::parameters::DIFFICULTY_CUT), \"size_t\")",
8692
"parameters": {
8793
"text": [
88-
"(\"MAX_TRANSACTION_SIZE_LIMIT\", po::value<uint64_t>()->default_value(CryptoNote::parameters::MAX_TRANSACTION_SIZE_LIMIT), \"uint64_t\")"
94+
"(\"MAX_TRANSACTION_SIZE_LIMIT\", po::value<uint64_t>()->default_value(0), \"uint64_t\")"
8995
]
9096
}
9197
},
@@ -110,12 +116,18 @@
110116
"marker": "currencyBuilder.difficultyCut(config.coinBaseConfig.DIFFICULTY_CUT);",
111117
"parameters": {
112118
"text": [
113-
"currencyBuilder.maxTransactionSizeLimit(config.coinBaseConfig.MAX_TRANSACTION_SIZE_LIMIT);",
114-
"currencyBuilder.fusionTxMaxSize(config.coinBaseConfig.MAX_TRANSACTION_SIZE_LIMIT * 30 / 100);"
119+
"if (config.coinBaseConfig.MAX_TRANSACTION_SIZE_LIMIT == 0) {",
120+
" uint64_t maxTxSizeLimit = config.coinBaseConfig.CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE * 110 / 100 - CryptoNote::parameters::CRYPTONOTE_COINBASE_BLOB_RESERVED_SIZE;",
121+
" currencyBuilder.maxTransactionSizeLimit(maxTxSizeLimit);",
122+
" currencyBuilder.fusionTxMaxSize(maxTxSizeLimit * 30 / 100);",
123+
"} else {",
124+
" currencyBuilder.maxTransactionSizeLimit(config.coinBaseConfig.MAX_TRANSACTION_SIZE_LIMIT);",
125+
" currencyBuilder.fusionTxMaxSize(config.coinBaseConfig.MAX_TRANSACTION_SIZE_LIMIT * 30 / 100);",
126+
"}"
115127
]
116128
}
117129
}
118130
]
119131
}
120132
]
121-
}
133+
}

0 commit comments

Comments
 (0)