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.

Sign up for GitHub

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

Merge master into dev #868

Draft
wants to merge 30 commits into
base: dev
Choose a base branch
from
Draft

Merge master into dev #868

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
b307e89
add bft_sm.py
qizhou Feb 11, 2020
5e313cf
add sha2.py
qizhou Feb 11, 2020
eb4d244
fix a majority mis-calculation in replicated nodes / abstract Connect…
qizhou Feb 12, 2020
76e2032
Only run recent 100k blocks for nightly CI (#822)
ninjaahhh Feb 12, 2020
35b3ea1
add pbft.py
qizhou Feb 13, 2020
65bd6a4
pbft.py add self prepare
qizhou Feb 13, 2020
f1f5716
Only run CI on master branch (#824)
ninjaahhh Feb 13, 2020
e362147
use prepared predicate / apply simple state machine
qizhou Feb 15, 2020
d1ef649
add checkpoint early code
qizhou Feb 18, 2020
ad64a34
add dual_pow_simulator.py
qizhou Feb 21, 2020
0de0921
add dual pow with order stats
qizhou Feb 21, 2020
f2498a7
Create DAPP.MD
qizhou Mar 3, 2020
c361728
Update README.md
qizhou Mar 3, 2020
1dc60a5
add dapp tutorial images
qizhou Mar 4, 2020
5984a76
add --print_addr and # of accounts in query_balance.py (#835)
qizhou Mar 4, 2020
e821bb1
[ci] Run weekly check-db on whole dataset (#838)
ninjaahhh Mar 8, 2020
b86d350
Bump psutil from 5.4.5 to 5.6.6 (#846)
dependabot[bot] Mar 13, 2020
d470e13
Update DAPP.MD
qizhou Mar 14, 2020
76da58a
remove executing_on_head in state.py (#849)
qizhou Mar 18, 2020
0d7f719
remove unused deletes in state.py (#850)
qizhou Mar 18, 2020
f7afb7f
add a few more tests to TokenBalances (#851)
qizhou Mar 19, 2020
68539b5
Migrate chain mask list config to full shard id list (#831)
lyhe18 Mar 24, 2020
946092b
adding tx to queue needs to check gasprice in QKC (#855)
qizhou Mar 25, 2020
52e0d5f
add accumulator.py
qizhou Mar 25, 2020
f37754c
use deduct_value() instead of delta_token_balance() for substracting …
qizhou Mar 25, 2020
c7ccb3f
Update gas for transfer mnt precompiled (#854)
ninjaahhh Mar 26, 2020
31355c7
add uint128_max check for tx gasprice, startgas, token id fields (#861)
qizhou Mar 26, 2020
e7b4a85
Reduce shard staking requirement for PoSW (#864)
ninjaahhh Mar 30, 2020
f1786e0
Update contract bytecode (#862)
qizhou Mar 30, 2020
abd08bf
Merge branch 'dev' into merge-master-to-dev
ninjaahhh Mar 30, 2020
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
16 changes: 8 additions & 8 deletions devnet/singularity/cluster_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,35 +380,35 @@
"HOST": "127.0.0.1",
"PORT": 38000,
"ID": "S0",
"CHAIN_MASK_LIST": [
4
"FULL_SHARD_ID_LIST": [
"0x1", "0x00040001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38001,
"WEBSOCKET_JSON_RPC_PORT": 38591,
"ID": "S1",
"CHAIN_MASK_LIST": [
5
"FULL_SHARD_ID_LIST": [
"0x00010001", "0x00050001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38002,
"WEBSOCKET_JSON_RPC_PORT": 38592,
"ID": "S2",
"CHAIN_MASK_LIST": [
6
"FULL_SHARD_ID_LIST": [
"0x00020001", "0x00060001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38003,
"WEBSOCKET_JSON_RPC_PORT": 38593,
"ID": "S3",
"CHAIN_MASK_LIST": [
7
"FULL_SHARD_ID_LIST": [
"0x00030001", "0x00070001"
]
}
],
Expand Down
2 changes: 1 addition & 1 deletion fixtures/QuarkChainStateTests/stContractCallMnt/contractTransferMntNotEnoughBalance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"post": {
"ConstantinopleFix": [
{
"hash": "0xf5811632e06923cfbbd8b8d2fc8dcd13dd0c583f96d385f203d423fd73bee80c",
"hash": "0x242e94c635c64aee46c426997dd10eef7847579f49e1be79f8464264bcb49960",
"indexes": {
"data": 0,
"gas": 0,
Expand Down
4 changes: 2 additions & 2 deletions fixtures/QuarkChainStateTests/stContractCallMnt/contractTransferMntQKCOnly.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"post": {
"ConstantinopleFix": [
{
"hash": "0x2ac14030368d7ece796fca54b2ed45ae4955923bb9a60f6fd3f489682fc84b21",
"hash": "0x6109d00252c64beeb52ea7e311c4685f9808997e6c5d53d356738e3ae4328a8a",
"indexes": {
"data": 0,
"gas": 0,
Expand All @@ -28,7 +28,7 @@
"logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash": "0x6321f74c801b51fb244d00dd1fa6867a68aff4aa8d35aa7695ac3290ba3cc513",
"hash": "0x26f9ea5e4183796a6b6b15c0c97264e8c12a7c76fc1f0a4d79f2346a48414ace",
"indexes": {
"data": 1,
"gas": 0,
Expand Down
4 changes: 2 additions & 2 deletions fixtures/QuarkChainStateTests/stContractCallMnt/contractTransferMntWithData.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"post": {
"ConstantinopleFix": [
{
"hash": "0x83c78d44edaa4a69fbf68a902aceb201b7e3a44985300dd861b11b09ecf5a056",
"hash": "0x6bfb634605adcbdc3f843980d190c0569674d5265f5a51e90dd67fc6475cf4d1",
"indexes": {
"data": 0,
"gas": 0,
Expand All @@ -28,7 +28,7 @@
"logs": "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
},
{
"hash": "0x20b498c4f7248873c5b5341c3281d5b638946eefd31812fea60281a1b0c3d22c",
"hash": "0x7920ff3aeafb50fd5eb3e18d93c69830ca1dbe494bd1ab949fd709e3973f4e3a",
"indexes": {
"data": 1,
"gas": 0,
Expand Down
16 changes: 8 additions & 8 deletions mainnet/singularity/cluster_config_bootnodes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,32 +456,32 @@
"HOST": "127.0.0.1",
"PORT": 38000,
"ID": "S0",
"CHAIN_MASK_LIST": [
4
"FULL_SHARD_ID_LIST": [
"0x1", "0x00040001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38001,
"ID": "S1",
"CHAIN_MASK_LIST": [
5
"FULL_SHARD_ID_LIST": [
"0x00010001", "0x00050001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38002,
"ID": "S2",
"CHAIN_MASK_LIST": [
6
"FULL_SHARD_ID_LIST": [
"0x00020001", "0x00060001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38003,
"ID": "S3",
"CHAIN_MASK_LIST": [
7
"FULL_SHARD_ID_LIST": [
"0x00030001", "0x00070001"
]
}
],
Expand Down
16 changes: 8 additions & 8 deletions mainnet/singularity/cluster_config_p2p_crawling.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,32 +456,32 @@
"HOST": "127.0.0.1",
"PORT": 38000,
"ID": "S0",
"CHAIN_MASK_LIST": [
4
"FULL_SHARD_ID_LIST": [
"0x1", "0x00040001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38001,
"ID": "S1",
"CHAIN_MASK_LIST": [
5
"FULL_SHARD_ID_LIST": [
"0x00010001", "0x00050001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38002,
"ID": "S2",
"CHAIN_MASK_LIST": [
6
"FULL_SHARD_ID_LIST": [
"0x00020001", "0x00060001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38003,
"ID": "S3",
"CHAIN_MASK_LIST": [
7
"FULL_SHARD_ID_LIST": [
"0x00030001", "0x00070001"
]
}
],
Expand Down
16 changes: 8 additions & 8 deletions mainnet/singularity/cluster_config_template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,32 +461,32 @@
"HOST": "127.0.0.1",
"PORT": 38000,
"ID": "S0",
"CHAIN_MASK_LIST": [
4
"FULL_SHARD_ID_LIST": [
"0x1", "0x00040001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38001,
"ID": "S1",
"CHAIN_MASK_LIST": [
5
"FULL_SHARD_ID_LIST": [
"0x00010001", "0x00050001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38002,
"ID": "S2",
"CHAIN_MASK_LIST": [
6
"FULL_SHARD_ID_LIST": [
"0x00020001", "0x00060001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38003,
"ID": "S3",
"CHAIN_MASK_LIST": [
7
"FULL_SHARD_ID_LIST": [
"0x00030001", "0x00070001"
]
}
],
Expand Down
32 changes: 16 additions & 16 deletions mainnet/singularity/cluster_config_template_8nodes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,64 +461,64 @@
"HOST": "127.0.0.1",
"PORT": 38000,
"ID": "S0",
"CHAIN_MASK_LIST": [
8
"FULL_SHARD_ID_LIST": [
"0x1"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38001,
"ID": "S1",
"CHAIN_MASK_LIST": [
9
"FULL_SHARD_ID_LIST": [
"0x00010001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38002,
"ID": "S2",
"CHAIN_MASK_LIST": [
10
"FULL_SHARD_ID_LIST": [
"0x00020001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38003,
"ID": "S3",
"CHAIN_MASK_LIST": [
11
"FULL_SHARD_ID_LIST": [
"0x00030001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38004,
"ID": "S4",
"CHAIN_MASK_LIST": [
12
"FULL_SHARD_ID_LIST": [
"0x00040001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38005,
"ID": "S5",
"CHAIN_MASK_LIST": [
13
"FULL_SHARD_ID_LIST": [
"0x00050001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38006,
"ID": "S6",
"CHAIN_MASK_LIST": [
14
"FULL_SHARD_ID_LIST": [
"0x00060001"
]
},
{
"HOST": "127.0.0.1",
"PORT": 38007,
"ID": "S7",
"CHAIN_MASK_LIST": [
15
"FULL_SHARD_ID_LIST": [
"0x00070001"
]
}
],
Expand Down
Loading