Skip to content

Commit

Permalink
Merge pull request #2781 from bitshares/update-7
Browse files Browse the repository at this point in the history
Set Mainnet 7.0 HF time to 2023-11-16 14:00:00 UTC
  • Loading branch information
abitmore authored Sep 26, 2023
2 parents 4311a1f + 36b2694 commit 5799660
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 12 deletions.
2 changes: 2 additions & 0 deletions CONTRIBUTORS.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Jose Marcial Vieira Bisneto <[email protected]>
Jozef Knaperek <[email protected]>
Ken Code <[email protected]>
Krzysztof Szumny <[email protected]>
Massimo Paladin <[email protected]>
Paul Brossier <[email protected]>
Roelandp <[email protected]>
Semen Martynov <[email protected]>
Expand All @@ -80,5 +81,6 @@ bitcube <[email protected]>
hammadsherwani <[email protected]>
lafona <[email protected]>
liondani <[email protected]>
litepresence <[email protected]>
lososeg <[email protected]>
sinetek <[email protected]>
2 changes: 1 addition & 1 deletion docs
Submodule docs updated from 6f6ea4 to 8ba173
2 changes: 1 addition & 1 deletion libraries/chain/hardfork.d/CORE_1604.hf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// bitshares-core issue #1604 Operation to modify existing limit order
#ifndef HARDFORK_CORE_1604_TIME
#define HARDFORK_CORE_1604_TIME (fc::time_point_sec(1893456000)) // Jan 1 00:00:00 2030 (Not yet scheduled)
#define HARDFORK_CORE_1604_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC
#define HARDFORK_CORE_1604_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_1604_TIME)
#endif
3 changes: 1 addition & 2 deletions libraries/chain/hardfork.d/CORE_2535.hf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// bitshares-core issue #2535 Simple Order-Sends-Order (OSO)
#ifndef HARDFORK_CORE_2535_TIME
// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled
#define HARDFORK_CORE_2535_TIME (fc::time_point_sec( 1893456000 ))
#define HARDFORK_CORE_2535_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC
#define HARDFORK_CORE_2535_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2535_TIME)
#endif
3 changes: 1 addition & 2 deletions libraries/chain/hardfork.d/CORE_2587.hf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// bitshares-core issue #2587 settle more than total debt in individual settlement fund when no sufficient price feeds
#ifndef HARDFORK_CORE_2587_TIME
// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled
#define HARDFORK_CORE_2587_TIME (fc::time_point_sec( 1893456000 ))
#define HARDFORK_CORE_2587_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC
#define HARDFORK_CORE_2587_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2587_TIME)
#endif
3 changes: 1 addition & 2 deletions libraries/chain/hardfork.d/CORE_2591.hf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// bitshares-core issue #2591 Tighter peg when collateral price rises and settlement fund or settlement order exists
#ifndef HARDFORK_CORE_2591_TIME
// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled
#define HARDFORK_CORE_2591_TIME (fc::time_point_sec( 1893456000 ))
#define HARDFORK_CORE_2591_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC
#define HARDFORK_CORE_2591_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2591_TIME)
#endif
3 changes: 1 addition & 2 deletions libraries/chain/hardfork.d/CORE_2595.hf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// bitshares-core issue #2595 Credit deal auto-repayment
#ifndef HARDFORK_CORE_2595_TIME
// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled
#define HARDFORK_CORE_2595_TIME (fc::time_point_sec( 1893456000 ))
#define HARDFORK_CORE_2595_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC
#define HARDFORK_CORE_2595_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2595_TIME)
#endif
3 changes: 1 addition & 2 deletions libraries/chain/hardfork.d/CORE_2604.hf
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// bitshares-core issue #2604 Allow updating liquidity pool fee rates with certain restrictions
#ifndef HARDFORK_CORE_2604_TIME
// Jan 1 2030, midnight; this is a dummy date until a hardfork date is scheduled
#define HARDFORK_CORE_2604_TIME (fc::time_point_sec( 1893456000 ))
#define HARDFORK_CORE_2604_TIME (fc::time_point_sec( 1700143200 )) // Thursday, November 16, 2023 14:00:00 UTC
#define HARDFORK_CORE_2604_PASSED(head_block_time) (head_block_time >= HARDFORK_CORE_2604_TIME)
#endif

0 comments on commit 5799660

Please sign in to comment.