Skip to content

Commit d62211e

Browse files
authored
Merge pull request #1032 from HathorNetwork/feat/increase-max-merkle-path-mainnet
feat(merged-mining): configure new max merkle path length on mainnet
2 parents e947404 + 70fd351 commit d62211e

File tree

2 files changed

+26
-0
lines changed

2 files changed

+26
-0
lines changed

hathor/conf/mainnet.py

+12
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,18 @@
237237
version='0.59.0',
238238
signal_support_by_default=False,
239239
),
240+
Feature.INCREASE_MAX_MERKLE_PATH_LENGTH: Criteria(
241+
bit=0,
242+
# N = 4_475_520
243+
# Expected to be reached around Monday, 2024-05-13 17:31:03 GMT
244+
# Right now the best block is 4_463_619 at Thursday, 2024-05-09 14:20:33 GMT
245+
start_height=4_475_520,
246+
timeout_height=4_798_080, # N + 16 * 20160 (16 weeks after the start)
247+
minimum_activation_height=4_636_800, # N + 8 * 20160 (8 weeks after the start)
248+
lock_in_on_timeout=False,
249+
version='0.60.0',
250+
signal_support_by_default=True,
251+
),
240252
}
241253
)
242254
)

hathor/conf/mainnet.yml

+14
Original file line numberDiff line numberDiff line change
@@ -221,3 +221,17 @@ FEATURE_ACTIVATION:
221221
lock_in_on_timeout: false
222222
version: 0.59.0
223223
signal_support_by_default: false
224+
225+
#### Actual features ####
226+
227+
INCREASE_MAX_MERKLE_PATH_LENGTH:
228+
bit: 0
229+
# N = 4_475_520
230+
# Expected to be reached around Monday, 2024-05-13 17:31:03 GMT
231+
# Right now the best block is 4_463_619 at Thursday, 2024-05-09 14:20:33 GMT
232+
start_height: 4_475_520
233+
timeout_height: 4_798_080 # N + 16 * 20160 (16 weeks after the start)
234+
minimum_activation_height: 4_636_800 # N + 8 * 20160 (8 weeks after the start)
235+
lock_in_on_timeout: false
236+
version: 0.60.0
237+
signal_support_by_default: true

0 commit comments

Comments
 (0)