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.

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

Release/v1.12.1 #2915

Merged
merged 166 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
166 commits
Select commit Hold shift + click to select a range
81aa459
Merge pull request #2820 from Taraxa-project/master
JakubFornadel Jul 31, 2024
193a846
improve pillar block unit tests
JakubFornadel Jul 27, 2024
fc44927
save the minimum amount of pillar votes into db
JakubFornadel Jul 29, 2024
11cf86f
improve proposed pbft blocks cleanup test
JakubFornadel Aug 6, 2024
153ae46
chore: dag block proposal limit
mfrankovi Aug 12, 2024
4e82fcb
Merge pull request #2827 from Taraxa-project/dag_prod
MatusKysel Aug 13, 2024
10f4c28
Merge pull request #2831 from Taraxa-project/master
MatusKysel Aug 15, 2024
7afb545
first try of optimization
MatusKysel Aug 19, 2024
7f4d7ab
Merge pull request #2834 from Taraxa-project/master
MatusKysel Aug 20, 2024
cec4060
Merge branch 'develop' into db-opt
MatusKysel Aug 20, 2024
cb49ed8
add more funcions to fully sync on mainnet
MatusKysel Aug 20, 2024
f76821d
cppcheck improvements
MatusKysel Aug 20, 2024
c91c17d
chore: add rpc for retrieving nodes versions
mfrankovi Aug 12, 2024
6a94d03
Merge pull request #2830 from Taraxa-project/node_versions
mfrankovi Aug 23, 2024
6829fdb
Merge pull request #2838 from Taraxa-project/master
MatusKysel Aug 23, 2024
a52a6d2
refactor FinalChain class
JakubFornadel Aug 6, 2024
a02be02
Merge pull request #2823 from Taraxa-project/final_chain_refactor
kstdl Aug 23, 2024
8bdefad
chore: use values from config for classes constructing
kstdl Aug 19, 2024
9becf1f
chore: optimize includes and usings
kstdl Aug 20, 2024
9ebb5cd
Merge pull request #2835 from Taraxa-project/refactor
kstdl Aug 26, 2024
e9ed4bf
add support of ranges
MatusKysel Aug 26, 2024
c0a10c8
fix storage
MatusKysel Aug 26, 2024
b53b5d9
refactor blocking dependencies processing so it is not possible to fo…
JakubFornadel Aug 29, 2024
e3767eb
Revert "add support of ranges"
MatusKysel Aug 30, 2024
4c683ba
Merge branch 'develop' into db-opt
MatusKysel Aug 30, 2024
8f088da
change to batches
MatusKysel Aug 30, 2024
9373f56
add new handlers
MatusKysel Aug 30, 2024
954ccd1
fix tests and formating
MatusKysel Aug 30, 2024
d5e77b1
fix tarcap version
MatusKysel Aug 30, 2024
f51810c
fixed tests
MatusKysel Aug 30, 2024
c269e7d
fix final chain tests
MatusKysel Aug 30, 2024
9b93865
chore: handle transactions with no account
mfrankovi Sep 1, 2024
972930c
Merge pull request #2843 from Taraxa-project/trx_na_ins
mfrankovi Sep 3, 2024
25eea9d
chore:queue limit improvements
mfrankovi Aug 28, 2024
8e6194b
Merge branch 'develop' into issue-2769/refactor_blocking_dependencies
JakubFornadel Sep 4, 2024
3799637
Merge pull request #2841 from Taraxa-project/ddos_impr
mfrankovi Sep 5, 2024
0e1480d
review comments
MatusKysel Sep 5, 2024
611dcfb
fix review comments
MatusKysel Sep 5, 2024
7303d2e
Merge branch 'develop' into db-opt
MatusKysel Sep 5, 2024
f6ea9a0
Merge pull request #2839 from Taraxa-project/db-opt
MatusKysel Sep 5, 2024
a0b3c43
chore: dont save duplicate data in finalChainHeader
kstdl Aug 27, 2024
1378445
chore: optimize migration
kstdl Aug 29, 2024
cf8d0a1
Merge pull request #2844 from Taraxa-project/final_chain_header
kstdl Sep 5, 2024
92d8def
support multiple undelegagtions
JakubFornadel Jun 16, 2024
d63083b
update evm
JakubFornadel Aug 27, 2024
d2937cf
check if dag transactions senders exist
JakubFornadel Aug 27, 2024
b9fdfed
check old proposed blocks presence
JakubFornadel Aug 27, 2024
16d306a
Revert "check if dag transactions senders exist"
JakubFornadel Aug 29, 2024
a1ecbdc
Merge branch 'develop' into issue-2769/refactor_blocking_dependencies
JakubFornadel Sep 5, 2024
fefa5ab
Merge pull request #2842 from Taraxa-project/issue-2769/refactor_bloc…
JakubFornadel Sep 5, 2024
9c9c25d
Merge branch 'develop' into pillar_tests
JakubFornadel Sep 6, 2024
2e3dd01
use named constants in test
JakubFornadel Sep 6, 2024
9e5f4a9
fix votes_count_changes pillar test
JakubFornadel Sep 6, 2024
b212294
Merge pull request #2814 from Taraxa-project/pillar_tests
JakubFornadel Sep 6, 2024
492dcb4
fix undelegate compatibility
JakubFornadel Sep 12, 2024
f4ddc2b
Merge branch 'develop' into cornus_hf
JakubFornadel Sep 12, 2024
59a1913
Merge pull request #2788 from Taraxa-project/cornus_hf
JakubFornadel Sep 12, 2024
473a820
fix: gossip votes to all capability version
mfrankovi Sep 12, 2024
57f15cb
Merge pull request #2849 from Taraxa-project/vote_gossip_cap_ver
kstdl Sep 13, 2024
80120be
chore: rename pbft_block prev_state_root to final_chain_hash
kstdl Aug 27, 2024
dc7c17b
feat: use final chain block hash instead of state root after cornus hf
kstdl Sep 6, 2024
19cc948
fix: period dags migration memory consumption
kstdl Sep 10, 2024
bbe761d
chore: rename period dags migration
kstdl Sep 10, 2024
9491cee
update taraxa-evm submodule with latest develop
kstdl Sep 13, 2024
0f95193
Merge pull request #2848 from Taraxa-project/change_final_chain_hash
mfrankovi Sep 13, 2024
64beae6
chore: update to rocksdb9
kstdl Sep 17, 2024
31a2e01
Merge pull request #2851 from Taraxa-project/conan_rocksdb
kstdl Sep 23, 2024
08ca49a
fix: dag block bundle
mfrankovi Sep 18, 2024
009531f
Merge pull request #2852 from Taraxa-project/dag_encode_uint
mfrankovi Sep 23, 2024
dc7ce5c
fix: remove undelegations v2
mfrankovi Sep 20, 2024
ea420d6
Merge pull request #2853 from Taraxa-project/fix_remove_undel
mfrankovi Sep 23, 2024
5c33303
bugfix: split pillar vote packet to serverl ones
MatusKysel Sep 23, 2024
2d66b0c
chore: increase version and add cornus_hf block to testnet genesis
kstdl Sep 25, 2024
f530b50
chore: update testnet cornus block number
kstdl Sep 26, 2024
2fbcedb
Merge pull request #2856 from Taraxa-project/testnet-release
kstdl Sep 26, 2024
42560c0
chore: dag block proposal limit
mfrankovi Aug 12, 2024
d69a25b
Merge remote-tracking branch 'origin/develop' into testnet
kstdl Sep 26, 2024
43be8be
chore: update to latest dependecies
MatusKysel Sep 26, 2024
7667f49
update cpp-check
MatusKysel Sep 27, 2024
b81ba77
chore: add period to error output
MatusKysel Sep 27, 2024
58ecf15
revert change of dpos bytecode
MatusKysel Sep 29, 2024
3c1d6c1
update evm
MatusKysel Sep 29, 2024
2646f52
fix the tests
MatusKysel Sep 30, 2024
d3167b9
update evm
MatusKysel Sep 30, 2024
1bb8a52
Merge pull request #2860 from Taraxa-project/fix-cornus
MatusKysel Sep 30, 2024
8fb0014
chore: additional check on ws
MatusKysel Sep 30, 2024
69ec027
update HF number
MatusKysel Sep 30, 2024
9db9cc3
Merge pull request #2858 from Taraxa-project/cornus_testnet
rattrap Sep 30, 2024
f3beac2
Merge pull request #2861 from Taraxa-project/add-check-on-ws
MatusKysel Oct 1, 2024
6294470
fix cpp check
MatusKysel Oct 2, 2024
9e64480
Merge branch 'develop' into update-dependencies
MatusKysel Oct 2, 2024
05b9990
chore: rpc requests limit
mfrankovi Oct 3, 2024
fc874b6
Merge pull request #2863 from Taraxa-project/rpc_limit
mfrankovi Oct 9, 2024
29b3b8f
Merge branch 'develop' into update-dependencies
MatusKysel Oct 14, 2024
a38518c
Merge pull request #2859 from Taraxa-project/update-dependencies
MatusKysel Oct 14, 2024
94878bf
fix: tracing execution block number
kstdl Oct 11, 2024
aaa7f70
Merge pull request #2864 from Taraxa-project/fix_trace
kstdl Oct 14, 2024
d8e2f09
chore: fix log lvl
MatusKysel Oct 16, 2024
fef9c9d
feat: add function to check disk size on startup
MatusKysel Oct 16, 2024
db9a9cf
clang format
MatusKysel Oct 16, 2024
bb22fd5
removed old file
MatusKysel Oct 16, 2024
409359c
Merge pull request #2872 from Taraxa-project/fix-log-lvl
MatusKysel Oct 18, 2024
75aec2e
Merge branch 'develop' into testnet
kstdl Oct 21, 2024
409ac0b
Merge pull request #2874 from Taraxa-project/testnet
kstdl Oct 21, 2024
e1511c3
rework move semantics little bit
MatusKysel Oct 29, 2024
1a8277c
fix locks
MatusKysel Oct 30, 2024
bfa3f7e
Merge pull request #2877 from Taraxa-project/fix-potencial-issue-with…
MatusKysel Oct 30, 2024
13fa82b
fix: pillar block save
mfrankovi Oct 31, 2024
dbba04e
Merge pull request #2882 from Taraxa-project/pillar_sav
mfrankovi Nov 4, 2024
4dcc45b
dag proposal improvement
mfrankovi Oct 25, 2024
469560e
Merge pull request #2876 from Taraxa-project/dag_lmt_tst
mfrankovi Nov 7, 2024
359bf3b
Merge branch 'develop' into filesyste-size-check
MatusKysel Nov 7, 2024
fabe5ad
Merge pull request #2873 from Taraxa-project/filesyste-size-check
MatusKysel Nov 7, 2024
663766d
separate packets parsing from handlers
JakubFornadel Sep 26, 2024
5e4eec7
implement NET VERSION 5 tarcap
JakubFornadel Oct 14, 2024
dd79d79
fix statusPacket rlp parsing
JakubFornadel Oct 15, 2024
a09eef6
fix packets rlp encoding/decoding
JakubFornadel Oct 16, 2024
31696f9
simplify new packets handlers code
JakubFornadel Oct 18, 2024
6558e33
fix tarcap threadpool test
JakubFornadel Oct 21, 2024
b8b3acc
use optimized rlp format for votes bundles
JakubFornadel Oct 29, 2024
c289cfb
refactor periodData getter + fix votes_bundle processing
JakubFornadel Oct 30, 2024
a186423
adjust pillar votes bundle packet
JakubFornadel Nov 2, 2024
1f6ce14
refactor dag blocks processing to work with shared pointers to avoid …
JakubFornadel Nov 2, 2024
18f1967
remove unused constants
JakubFornadel Nov 5, 2024
a9f9cf2
fix dag block packet double sending of txs, optimize packets ctors
JakubFornadel Nov 11, 2024
82cb70b
fix transaction packet
JakubFornadel Nov 8, 2024
846610c
mark received tx as known for the peer
JakubFornadel Nov 11, 2024
1cd58bb
fix transacion packet sending
JakubFornadel Nov 13, 2024
b9a1069
post merge fixes
JakubFornadel Nov 13, 2024
ed975e0
Merge pull request #2862 from Taraxa-project/issue-1830/packets-encoding
JakubFornadel Nov 13, 2024
ed13008
chore: trusted nodes
mfrankovi Nov 22, 2024
154cda3
Merge pull request #2892 from Taraxa-project/trusted_nodes
mfrankovi Nov 25, 2024
980df69
chore: update to latest develop
MatusKysel Nov 26, 2024
ce7c720
Merge pull request #2895 from Taraxa-project/update-evm
MatusKysel Nov 26, 2024
7453615
update evm
MatusKysel Nov 26, 2024
2c4008b
Merge pull request #2897 from Taraxa-project/new-evm
MatusKysel Nov 26, 2024
b1c4ab2
Update version to 1.12.1
mfrankovi Nov 14, 2024
5c8c0f4
fix: state during the tracing
kstdl Nov 22, 2024
010d990
Merge pull request #2899 from Taraxa-project/testnet_dev
kstdl Nov 28, 2024
5da06fb
implement sequoia hardfork
JakubFornadel Nov 26, 2024
0f36f1a
make locking period change part of cornus hardfork
JakubFornadel Nov 28, 2024
1db415f
adjust configs
JakubFornadel Nov 28, 2024
04d8d20
update evm
JakubFornadel Dec 2, 2024
c430fee
Merge remote-tracking branch 'origin/master' into master_develop
kstdl Dec 2, 2024
9cbf49a
Merge pull request #2902 from Taraxa-project/delegation_locking_perio…
JakubFornadel Dec 2, 2024
785b873
Merge branch 'develop' into master_develop
kstdl Dec 2, 2024
2bc913f
chore: increase gas limit
mfrankovi Nov 28, 2024
0855c6e
fix: bug after the merge
kstdl Dec 2, 2024
b4a09bc
Merge pull request #2901 from Taraxa-project/propose_gas_limit
mfrankovi Dec 2, 2024
dec30a8
Merge branch 'develop' into master_develop
kstdl Dec 2, 2024
3ebcd12
Merge pull request #2903 from Taraxa-project/master_develop
MatusKysel Dec 2, 2024
871609d
fix multiple tarcaps
JakubFornadel Dec 3, 2024
94c6ee8
Merge pull request #2906 from Taraxa-project/multiple_tarcaps_support
JakubFornadel Dec 3, 2024
69a4484
fix: propose gas limit validation
mfrankovi Dec 3, 2024
6ac9d82
Merge pull request #2907 from Taraxa-project/propose_gas_limit_fix
mfrankovi Dec 4, 2024
478fc88
chore: new testnet
MatusKysel Dec 4, 2024
5673b76
fix: no balance duplicate transaction
mfrankovi Dec 12, 2024
4fef314
Merge pull request #2912 from Taraxa-project/no_balance_nonce
mfrankovi Dec 16, 2024
825d844
chore: update evm
MatusKysel Dec 17, 2024
a5b8fa6
update block number
MatusKysel Dec 17, 2024
92005e1
chore: merge v4 and v5 network version to same version
mfrankovi Dec 18, 2024
b3be723
Merge pull request #2916 from Taraxa-project/net_v3_to_v4
MatusKysel Dec 18, 2024
23be179
chore: update bulding instructions
MatusKysel Dec 18, 2024
c3e1b11
Merge pull request #2917 from Taraxa-project/update-building
MatusKysel Dec 18, 2024
a041af7
remove testnet branch from building instructions
MatusKysel Dec 18, 2024
1bdb67d
fix building instructions
MatusKysel Dec 19, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@
"pillar_blocks_interval": 10,
"bridge_contract_address": "0xcAF2b453FE8382a4B8110356DF0508f6d71F22BF"
},
"cornus_hf_block_num": 100
"cornus_hf": {
"block_num": 100,
"delegation_locking_period": 5
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,9 @@
"pillar_blocks_interval": 10,
"bridge_contract_address": "0xcAF2b453FE8382a4B8110356DF0508f6d71F22BF"
},
"cornus_hf_block_num": 0
"cornus_hf": {
"block_num": 0,
"delegation_locking_period": 5
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -1654,6 +1654,9 @@
"pillar_blocks_interval": 4000,
"bridge_contract_address": "0xe126E0BaeAE904b8Cfd619Be1A8667A173b763a1"
},
"cornus_hf_block_num": -1
"cornus_hf": {
"block_num": -1,
"delegation_locking_period": 163459
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,9 @@
"pillar_blocks_interval": 1000,
"bridge_contract_address": "0xcAF2b453FE8382a4B8110356DF0508f6d71F22BF"
},
"cornus_hf_block_num": 1668000
"cornus_hf": {
"block_num": -1,
"delegation_locking_period": 5
}
}
}
14 changes: 12 additions & 2 deletions libraries/config/include/config/hardfork.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,15 @@ void dec_json(const Json::Value& json, FicusHardforkConfig& obj);
// Json::Value enc_json(const BambooHardfork& obj);
// void dec_json(const Json::Value& json, BambooHardfork& obj);

struct CornusHardforkConfig {
uint64_t block_num = -1;
uint32_t delegation_locking_period = 5; // number of blocks

HAS_RLP_FIELDS
};
Json::Value enc_json(const CornusHardforkConfig& obj);
void dec_json(const Json::Value& json, CornusHardforkConfig& obj);

struct HardforksConfig {
// disable it by default (set to max uint64)
uint64_t fix_redelegate_block_num = -1;
Expand Down Expand Up @@ -131,9 +140,10 @@ struct HardforksConfig {
FicusHardforkConfig ficus_hf;

// Cornus hf - support multiple undelegations from the same validator at the same time
uint64_t cornus_hf_block_num{0};
// - change of delegation locking period
CornusHardforkConfig cornus_hf;

bool isCornusHardfork(uint64_t block_number) const { return block_number >= cornus_hf_block_num; }
bool isCornusHardfork(uint64_t block_number) const { return block_number >= cornus_hf.block_num; }

HAS_RLP_FIELDS
};
Expand Down
21 changes: 17 additions & 4 deletions libraries/config/src/hardfork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,20 @@ RLP_FIELDS_DEFINE(FicusHardforkConfig, block_num, pillar_blocks_interval, bridge
// }
// RLP_FIELDS_DEFINE(BambooHardfork, block_num, redelegations)

Json::Value enc_json(const CornusHardforkConfig& obj) {
Json::Value json(Json::objectValue);
json["block_num"] = dev::toJS(obj.block_num);
json["delegation_locking_period"] = dev::toJS(obj.delegation_locking_period);
return json;
}

void dec_json(const Json::Value& json, CornusHardforkConfig& obj) {
obj.block_num = json["block_num"].isUInt64() ? dev::getUInt(json["block_num"]) : uint64_t(-1);
obj.delegation_locking_period = dev::getUInt(json["delegation_locking_period"]);
}

RLP_FIELDS_DEFINE(CornusHardforkConfig, block_num, delegation_locking_period)

Json::Value enc_json(const HardforksConfig& obj) {
Json::Value json(Json::objectValue);
json["fix_redelegate_block_num"] = dev::toJS(obj.fix_redelegate_block_num);
Expand All @@ -158,7 +172,7 @@ Json::Value enc_json(const HardforksConfig& obj) {
json["aspen_hf"] = enc_json(obj.aspen_hf);
json["ficus_hf"] = enc_json(obj.ficus_hf);
// json["bamboo_hf"] = enc_json(obj.bamboo_hf);
json["cornus_hf_block_num"] = dev::toJS(obj.cornus_hf_block_num);
json["cornus_hf"] = enc_json(obj.cornus_hf);

return json;
}
Expand Down Expand Up @@ -190,10 +204,9 @@ void dec_json(const Json::Value& json, HardforksConfig& obj) {
dec_json(json["aspen_hf"], obj.aspen_hf);
dec_json(json["ficus_hf"], obj.ficus_hf);
// dec_json(json["bamboo_hf"], obj.bamboo_hf);
obj.cornus_hf_block_num =
json["cornus_hf_block_num"].isUInt64() ? dev::getUInt(json["cornus_hf_block_num"]) : uint64_t(-1);
dec_json(json["cornus_hf"], obj.cornus_hf);
}

RLP_FIELDS_DEFINE(HardforksConfig, fix_redelegate_block_num, redelegations, rewards_distribution_frequency, magnolia_hf,
phalaenopsis_hf_block_num, fix_claim_all_block_num, aspen_hf, ficus_hf, cornus_hf_block_num)
phalaenopsis_hf_block_num, fix_claim_all_block_num, aspen_hf, ficus_hf, cornus_hf)
} // namespace taraxa
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class TaraxaCapability final : public dev::p2p::CapabilityFace {
*/
static const InitPacketsHandlers kInitLatestVersionHandlers;

// TODO: remove this once we pass next hf after cornus hf
// TODO: remove this once we pass cornus hf
static const InitPacketsHandlers kInitV4Handlers;

public:
Expand Down
46 changes: 33 additions & 13 deletions tests/rewards_stats_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,17 @@ struct RewardsStatsTest : NodesTest {};
class TestableRewardsStats : public rewards::Stats {
public:
TestableRewardsStats(const HardforksConfig::RewardsDistributionMap& rdm, std::shared_ptr<DbStorage> db)
: rewards::Stats(
100,
HardforksConfig{
0, {}, rdm, MagnoliaHardfork{0, 0}, 0, 0, AspenHardfork{0, 0}, FicusHardforkConfig{0, 0, {}}},
db, [](auto) { return 100; }) {}
: rewards::Stats(100,
HardforksConfig{0,
{},
rdm,
MagnoliaHardfork{0, 0},
0,
0,
AspenHardfork{0, 0},
FicusHardforkConfig{0, 0, {}},
CornusHardforkConfig{0, 0}},
db, [](auto) { return 100; }) {}
auto getStats() { return blocks_stats_; }
};

Expand Down Expand Up @@ -242,14 +248,28 @@ TEST_F(RewardsStatsTest, dagBlockRewards) {
hfc.aspen_hf.block_num_part_two = 4;

// Create two reward stats to test before and after aspen hardfork part 1
rewards::Stats pre_aspen_reward_stats(
100,
HardforksConfig{0, {}, {}, MagnoliaHardfork{0, 0}, 0, 0, AspenHardfork{6, 999}, FicusHardforkConfig{0, 0, {}}},
db, [](auto) { return 100; });
rewards::Stats post_aspen_reward_stats(
100,
HardforksConfig{0, {}, {}, MagnoliaHardfork{0, 0}, 0, 0, AspenHardfork{4, 999}, FicusHardforkConfig{0, 0, {}}},
db, [](auto) { return 100; });
rewards::Stats pre_aspen_reward_stats(100,
HardforksConfig{0,
{},
{},
MagnoliaHardfork{0, 0},
0,
0,
AspenHardfork{6, 999},
FicusHardforkConfig{0, 0, {}},
CornusHardforkConfig{0, 0}},
db, [](auto) { return 100; });
rewards::Stats post_aspen_reward_stats(100,
HardforksConfig{0,
{},
{},
MagnoliaHardfork{0, 0},
0,
0,
AspenHardfork{4, 999},
FicusHardforkConfig{0, 0, {}},
CornusHardforkConfig{0, 0}},
db, [](auto) { return 100; });

// Create pbft block with 5 dag blocks
auto dag_key1 = dev::KeyPair::create();
Expand Down