Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions hathor/conf/mainnet.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
features={
Feature.NOP_FEATURE_1: Criteria(
bit=0,
start_height=4_213_440, # N (right now the best block is 4_161_800 on mainnet)
start_height=4_213_440, # N (right now the best block is 4_169_000 on mainnet)
timeout_height=4_253_760, # N + 2 * 20160 (2 weeks after the start)
minimum_activation_height=4_273_920, # N + 3 * 20160 (3 weeks after the start)
lock_in_on_timeout=False,
Expand All @@ -213,7 +213,7 @@
),
Feature.NOP_FEATURE_2: Criteria(
bit=1,
start_height=4_193_280, # N (right now the best block is 4_133_220 on mainnet)
start_height=4_213_440, # N (right now the best block is 4_169_000 on mainnet)
timeout_height=4_253_760, # N + 2 * 20160 (2 weeks after the start)
minimum_activation_height=0,
lock_in_on_timeout=False,
Expand Down
4 changes: 2 additions & 2 deletions hathor/conf/mainnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ FEATURE_ACTIVATION:

NOP_FEATURE_1:
bit: 0
start_height: 4_213_440 # N (right now the best block is 4_161_800 on mainnet)
start_height: 4_213_440 # N (right now the best block is 4_169_000 on mainnet)
timeout_height: 4_253_760 # N + 2 * 20160 (2 weeks after the start)
minimum_activation_height: 4_273_920 # N + 3 * 20160 (3 weeks after the start)
lock_in_on_timeout: false
Expand All @@ -196,7 +196,7 @@ FEATURE_ACTIVATION:

NOP_FEATURE_2:
bit: 1
start_height: 4_193_280 # N (right now the best block is 4_133_220 on mainnet)
start_height: 4_213_440 # N (right now the best block is 4_169_000 on mainnet)
timeout_height: 4_253_760 # N + 2 * 20160 (2 weeks after the start)
minimum_activation_height: 0
lock_in_on_timeout: false
Expand Down