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 branch to develop #2434

Merged
merged 58 commits into from
Apr 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
61ae5cf
chore: adds current balances from eth ERC-20 token, staking contracts…
rattrap Feb 6, 2023
ecd746a
chore: change tetsnet timestamp to Tuesday, February 7, 2023 1:20:06 …
justinsnapp Feb 7, 2023
4364c5c
chore: fix possible reason of crash on testnet
MatusKysel Feb 10, 2023
29dfb3b
Merge pull request #2314 from Taraxa-project/graphql-fix-4-testnet
MatusKysel Feb 10, 2023
11756ab
fix: use correct round when checking reward votes
JakubFornadel Feb 13, 2023
a531356
Merge pull request #2316 from Taraxa-project/fix_reward_votes_round
JakubFornadel Feb 13, 2023
b603fc8
Merge pull request #2335 from Taraxa-project/develop
JakubFornadel Feb 20, 2023
7b96e24
chore: change timestamp to Monday 20. February 2023 15:00:00
JakubFornadel Feb 20, 2023
cb437b6
chore: increase net version
MatusKysel Feb 21, 2023
3e7a563
chore: new testnet mirroring genesis file
rattrap Feb 28, 2023
dba9fe1
chore: use old version of conan
MatusKysel Feb 28, 2023
1500374
Merge pull request #2353 from Taraxa-project/testnet_20230228
rattrap Mar 1, 2023
9a2b67f
chore: introduce check on double votes
MatusKysel Mar 17, 2023
25c65e2
Merge pull request #2390 from Taraxa-project/fix-for-double-votes
MatusKysel Mar 17, 2023
5f8a7b7
increase net version
MatusKysel Mar 17, 2023
c7df53b
Merge pull request #2391 from Taraxa-project/increase-net-version
rattrap Mar 17, 2023
9e89f72
remove rpc nodes
rjonczy Mar 17, 2023
6e73eb2
fix: vote bundle processing
mfrankovi Mar 18, 2023
a857564
Merge pull request #2395 from Taraxa-project/rew_votes_sync_fix
rjonczy Mar 18, 2023
08a29de
Merge pull request #2393 from Taraxa-project/chore/remove-rpc-nodes
rjonczy Mar 18, 2023
7ccdd5a
fix:reward votes broadcast
mfrankovi Mar 18, 2023
14dcbd9
Merge pull request #2396 from Taraxa-project/rew_votes_period_chk
justinsnapp Mar 18, 2023
f206828
chore: rebroadcast votes based on period not round
mfrankovi Mar 20, 2023
d5cc15b
chore: check for double PBFT votes in proposed blocks
MatusKysel Mar 20, 2023
4898774
Merge pull request #2398 from Taraxa-project/votes_broadcast_on_period
JakubFornadel Mar 20, 2023
398b1dc
Merge pull request #2402 from Taraxa-project/check-on-double-votes
JakubFornadel Mar 20, 2023
a1136bc
chore: remove taraxa_devs account from mainnet
JakubFornadel Mar 22, 2023
d9db071
Merge pull request #2407 from Taraxa-project/mainnet_remove_taraxa_de…
JakubFornadel Mar 22, 2023
ea8b505
chore: update dpos contract
MatusKysel Mar 23, 2023
0c5ddee
Merge pull request #2416 from Taraxa-project/testnet-dpos-update
MatusKysel Mar 24, 2023
19aaff2
chore: update evm
MatusKysel Mar 28, 2023
04d1e93
Merge pull request #2419 from Taraxa-project/update-testnet-evm
MatusKysel Mar 28, 2023
5777eab
fix: missing tip block on tips selection
mfrankovi Mar 6, 2023
ace58d2
fix: dag missing tip
mfrankovi Mar 28, 2023
f30d4f1
Merge pull request #2420 from Taraxa-project/missing_tip_fix
MatusKysel Mar 28, 2023
1a4a8fc
chore: rebroadcast votes based on period not round
mfrankovi Mar 20, 2023
e6c13d2
chore: check for double PBFT votes in proposed blocks
MatusKysel Mar 20, 2023
5cfad4c
fix: make gas limits smaller for all of our networks
kstdl Mar 29, 2023
e981ba8
chore: move dag lvl mapping update to final chain
MatusKysel Mar 30, 2023
ab882f5
chore: update evm submodule
MatusKysel Mar 30, 2023
bfc4391
chore: remove precommit_ext
MatusKysel Mar 30, 2023
ddd246e
chore: fix typo
MatusKysel Mar 30, 2023
21858f2
Merge pull request #2423 from Taraxa-project/testnet
MatusKysel Mar 30, 2023
4c96577
Merge pull request #2424 from Taraxa-project/adjust_gas_limits
kstdl Mar 30, 2023
20498c7
Merge pull request #2425 from Taraxa-project/final-chain-fix
MatusKysel Mar 30, 2023
0097690
chore: update evm submodule
kstdl Mar 30, 2023
7d3fab3
chore: update evm submodule with added amount to claim logs
kstdl Mar 31, 2023
050b84e
Merge pull request #2426 from Taraxa-project/dpos_claim_amounts
kstdl Mar 31, 2023
539a61a
update IDs of bootnodes
rjonczy Apr 2, 2023
9340084
Merge pull request #2427 from Taraxa-project/fix/keys-change
rattrap Apr 3, 2023
abf6dff
change initial_validator keys
rjonczy Apr 3, 2023
a1cad1a
Merge pull request #2428 from Taraxa-project/chore/initial_validators…
rjonczy Apr 3, 2023
15253ee
chore: mainnet reset genesis block
rattrap Apr 3, 2023
9e482d0
chore: mainnet reset version
rattrap Apr 3, 2023
bc90f17
chore: fix GetDelegations reward value
MatusKysel Apr 4, 2023
0f0f05d
update version to 1.2.1
MatusKysel Apr 4, 2023
8eb5b49
Merge pull request #2430 from Taraxa-project/mainnet-1.2.1
MatusKysel Apr 4, 2023
455347e
Merge branch 'develop' into master-merge
MatusKysel Apr 5, 2023
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
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ cmake_minimum_required(VERSION 3.20)

# Set current version of the project
set(TARAXA_MAJOR_VERSION 1)
set(TARAXA_MINOR_VERSION 1)
set(TARAXA_PATCH_VERSION 0)
set(TARAXA_MINOR_VERSION 2)
set(TARAXA_PATCH_VERSION 1)
set(TARAXA_VERSION ${TARAXA_MAJOR_VERSION}.${TARAXA_MINOR_VERSION}.${TARAXA_PATCH_VERSION})

# Any time a change in the network protocol is introduced this version should be increased
set(TARAXA_NET_VERSION 2)
set(TARAXA_NET_VERSION 1)
# Major version is modified when DAG blocks, pbft blocks and any basic building blocks of our blockchain is modified
# in the db
set(TARAXA_DB_MAJOR_VERSION 1)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,13 @@
"dag_blocks_size": "0x32",
"ghost_path_move_back": "0x0",
"lambda_ms": "0x5DC",
"gas_limit": "0x7d2b7500"
"gas_limit": "0x12C684C0"
},
"dag": {
"block_proposer": {
"shard": 1
},
"gas_limit": "0xc845880"
"gas_limit": "0x1E0A6E0"
},
"sortition": {
"changes_count_for_average": 10,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,47 +36,47 @@
"deep_syncing_threshold": 10,
"boot_nodes": [
{
"id": "d063098ceca0f5ea06f9455debffe6f6d5b2efdeb179215877e356cf8154afad99f058214bd25d8198a3854a4ed8f7ef97af59b0441a7d30bc4b3918c42764ef",
"id": "45949587c9f31f62e802175471c142da1618f4e456a77e51b0fcb3cc14b14bba7f585d44db15417fff96c29967a4778c60584ced00148bc905609a14fa7e538f",
"ip": "boot-node-0.mainnet.taraxa.io",
"port": 10002
},
{
"id": "572778c6636361916acbc596808e1aa4e93ee0b577188f594015ec42125f58b7ec75fd59d78ca2282bc1c8c639dfc4d0eac2e57855b4fcc932c6bc6f530cd8f6",
"id": "7e19406c60135be35bfd9a289044032978aa2fb6e2cda65794be92da8a6915a504eadd845946070393cfa1e57d6279bb33bcfe1571d9d6d9eefa30c733c22a27",
"ip": "boot-node-1.mainnet.taraxa.io",
"port": 10002
},
{
"id": "10a5108d0070559cacbb0ed368d43c98848fbc0397e9bfc1a6e7e33f15532a804d158e405657650d3ea766ed4b0d7cfcbe5867e9261deacb457da332ed1eaf2a",
"id": "ce741b2cae5fa26107b33bff617e249ede5920bfd7294ff66840310726aa853d0d109fe817263044c0002c8e628f58686e69611221fe6fe25eb6164e427259af",
"ip": "boot-node-2.mainnet.taraxa.io",
"port": 10002
},
{
"id": "1dd6ae9674dee4e30f2f2f76036ad01be34bb617095b0513bc3818c8352e040fc3648fd400896fc80a544b3c23118e143928d0d49d4d575b68327f70da342939",
"id": "6cb82c398c2be120d9fca945598a3fa8bbf5ecab7f3a5ccb953c9d8d473a6867b4faf53b0e3dff11bb6dbed78dfab26cfd0fbe4ae0c131aa83bf60e558a7ef8c",
"ip": "boot-node-3.mainnet.taraxa.io",
"port": 10002
},
{
"id": "56b74f83d3e88319cf554c6e43ca6077f7cf9594547e530582ed12196dd891b289dc7b5b4392440bcead5adbdf4e23e184b7f46940efd603c5bf0a25b36d71c6",
"id": "1d356bd6f835c24b5129a822ef9947485e82081b52647c4d8e25de18bea565307b545f6ac2f91d3b4b147fba195a7298cc34d1648294badb58d80462aed5f498",
"ip": "boot-node-4.mainnet.taraxa.io",
"port": 10002
},
{
"id": "833a3a724f5be3654524cb83307628117a668a00808fb2f34c43e5e3cb1a30354536cbdc9355172e5f285e1b4b3dde88d94385fa4df69c89da0638760ed5b0ac",
"id": "6b74ad39c4f8b6ccba42bab45958f884eaad63d0515521b0628ee96009824a12efae7e9840a7421ade9ee1e0c875240b1989d5593b636b8ef4aefc3c033ecace",
"ip": "boot-node-5.mainnet.taraxa.io",
"port": 10002
},
{
"id": "94026c10fce281ede4bae9b54606703eba77cb876ddacb3eba364b7e444618d424641de206f5d5cb39f5c04da48ebad502b76d698ed341e46721c8777a8c3f15",
"id": "f530a0c5d647ceade734537d00050ab51278f64210327b6c973683cfb0ff33f6393cd0b785bd9e33d9cf5474c6a47754ea92c08da60678ac677a0ba409c90cf3",
"ip": "boot-node-6.mainnet.taraxa.io",
"port": 10002
},
{
"id": "03947eaba01564a69d6ea238f4c264ee50b34918838fee164b1b0f0de833b0098f2d4a7c05448a0f3d3aa05d55fe4d150aa3a1553fd940a433433aff8ae57a0e",
"id": "c8a8bef96f04c91a07da3bf7e8b6d1ac81ef4718aa3d216ef8aab535c4015ff17a8dbfb75d726d7113ca58810028b2615d3551521b4564d0cf4db2fa7be91ed8",
"ip": "boot-node-7.mainnet.taraxa.io",
"port": 10002
},
{
"id": "8a3394cccb379d66e6b7b131ef8ea9f195c333020b246135bf5d888443e8b6245cef9c90f2b6466240f38c9cfa4ccaa472b0f204623f09da819068c6d1168242",
"id": "630476958941c5e44960793a4fc420ba5450fed6ff296dc7b51773d12cea49f5b9ad6d5836cfd379b9ffa38e3c72661175acbda28829db3855bb29b7ac804bd0",
"ip": "boot-node-8.mainnet.taraxa.io",
"port": 10002
}
Expand Down
Loading