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

Merge in feat #5704

Merged
merged 150 commits into from
Nov 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
8386818
* Improved requesting for missing mini blocks with destination in sel…
SebastianMarian Apr 19, 2023
0fe5f12
* Fixed race condition in unit test
SebastianMarian Apr 19, 2023
e9c70a3
Merge branch 'rc/v1.6.0' into improve-requesting-of-missing-miniblock…
SebastianMarian Apr 19, 2023
6cee2bf
* Changed log level to Debug
SebastianMarian Apr 21, 2023
80506b2
Merge remote-tracking branch 'origin/improve-requesting-of-missing-mi…
SebastianMarian Apr 21, 2023
b6b7a79
* Added requested mini blocks hashes into requestedItemsHandler to be…
SebastianMarian Apr 21, 2023
58471d7
* Refactored and added log in transactionCoordinator.RequestMiniBlock…
SebastianMarian Apr 21, 2023
6a58519
Merge branch 'rc/v1.6.0' into improve-requesting-of-missing-miniblock…
SebastianMarian Apr 24, 2023
25b4247
Merge branch 'rc/v1.6.0' into improve-requesting-of-missing-miniblock…
SebastianMarian Apr 26, 2023
df85f69
* Fixed after review
SebastianMarian Apr 28, 2023
c8d11af
Merge remote-tracking branch 'origin/improve-requesting-of-missing-mi…
SebastianMarian Apr 28, 2023
3be0203
Merge branch 'rc/v1.6.0' into improve-requesting-of-missing-miniblock…
SebastianMarian Apr 28, 2023
1a304eb
MX-14308: extra validators keys
dragos-rebegea Jun 19, 2023
698971b
MX-14308: revert to previous value
dragos-rebegea Jun 19, 2023
a0e57a6
update master's dockerfile
bogdan-rosianu Aug 8, 2023
3fda166
Bump github.com/beevik/ntp from 0.3.0 to 1.3.0
dependabot[bot] Aug 22, 2023
76f7576
change gas cost for migrate data trie built in function
BeniaminDrasovean Sep 13, 2023
cb56dd8
Merge branch 'rc/v1.6.0' into change-gas-cost-for-data-trie-migration
BeniaminDrasovean Sep 13, 2023
2fde00e
add print for num migrated leaves
BeniaminDrasovean Sep 18, 2023
8ab37f0
Merge branch 'rc/v1.6.0' into change-gas-cost-for-data-trie-migration
raduchis Sep 18, 2023
ccbf8a7
update trieLoadPerNode gas cost
BeniaminDrasovean Sep 20, 2023
6a649b5
added fallback on topicRequestSender
sstanculeanu Sep 26, 2023
7dd7c23
Merge branch 'rc/v1.6.0' into topic_request_fallback
sstanculeanu Sep 27, 2023
f313365
if a tx that migrates data is reverted, delete the migrated data from…
BeniaminDrasovean Sep 29, 2023
6e6cc98
fix diff between nil byte slice and zero bite slice on branch node re…
BeniaminDrasovean Oct 2, 2023
5ee9821
fix ineffasign
BeniaminDrasovean Oct 2, 2023
c6bb936
remove hardcoded version
BeniaminDrasovean Oct 2, 2023
0cd4b00
MX-13777: added round in hyperblock transactions
bogdan-rosianu Oct 2, 2023
73bd258
remove the posibility of having an empty byte slice for ChildrenVersion
BeniaminDrasovean Oct 2, 2023
f04828a
adjust account not found error when sending a transaction
bogdan-rosianu Oct 2, 2023
a3cfd08
small refactor
BeniaminDrasovean Oct 2, 2023
731b561
move the logic inside node.go
bogdan-rosianu Oct 2, 2023
fb2d97d
Merge branch 'rc/v1.6.0' into improve-requesting-of-missing-miniblock…
iulianpascalau Oct 3, 2023
a6b1138
Merge branch 'rc/v1.6.0' into dockerfile-master-update
bogdan-rosianu Oct 3, 2023
54431ce
add unit tests
BeniaminDrasovean Oct 3, 2023
8cad9ce
Merge branch 'rc/v1.6.0' into reverted-migration-tx-fix
BeniaminDrasovean Oct 3, 2023
eea3a5c
small tests fix
BeniaminDrasovean Oct 3, 2023
6161c06
fix after review
BeniaminDrasovean Oct 3, 2023
e190b68
Merge branch 'rc/v1.6.0' into topic_request_fallback
sstanculeanu Oct 3, 2023
599d921
Merge pull request #5604 from multiversx/topic_request_fallback
sstanculeanu Oct 3, 2023
c2221e4
Merge branch 'rc/v1.6.0' into improve-requesting-of-missing-miniblock…
iulianpascalau Oct 3, 2023
89e77e4
Merge branch 'rc/v1.6.0' into reverted-migration-tx-fix
iulianpascalau Oct 3, 2023
b4df8fd
Merge pull request #5611 from multiversx/reverted-migration-tx-fix
BeniaminDrasovean Oct 3, 2023
942b1fe
Merge branch 'rc/v1.6.0' into dependabot/go_modules/master/github.com…
iulianpascalau Oct 4, 2023
d1e6846
- merge
iulianpascalau Oct 4, 2023
6e23ae3
fixes after review
bogdan-rosianu Oct 4, 2023
31c9195
fixes after second review
bogdan-rosianu Oct 4, 2023
f2a180a
Merge branch 'rc/v1.6.0' into dockerfile-master-update
miiu96 Oct 4, 2023
e890eaa
Merge branch 'rc/v1.6.0' into adjust-account-not-found-err-tx-api
gabi-vuls Oct 4, 2023
816585e
Merge branch 'rc/v1.6.0' into MX-13777-add-round-in-hyperblock-txs
gabi-vuls Oct 4, 2023
8e00be9
new vm 1.5.12
sasurobert Oct 5, 2023
2730059
new vm 1.5.12
sasurobert Oct 5, 2023
2505909
Fix some tests (C contracts, init / upgrade functions etc.).
andreibancioiu Oct 5, 2023
c7bad02
Merge branch 'vm1.5.12' into fix-contracts-01
andreibancioiu Oct 5, 2023
ac09035
Merge pull request #5634 from multiversx/fix-contracts-01
sasurobert Oct 5, 2023
f03ed94
Fix another set of contracts.
andreibancioiu Oct 5, 2023
fd9a6c8
Fix additional tests.
andreibancioiu Oct 5, 2023
5e3655d
Merge pull request #5636 from multiversx/fix-contracts-01
sasurobert Oct 5, 2023
d574835
Fix a new set of tests.
andreibancioiu Oct 5, 2023
b6cc254
Merge pull request #5637 from multiversx/fix-contracts-01
sasurobert Oct 5, 2023
c903da0
Small fix.
andreibancioiu Oct 5, 2023
d74f310
Fix extra tests.
andreibancioiu Oct 5, 2023
3497cde
Fix extra tests.
andreibancioiu Oct 5, 2023
c0555c0
Merge pull request #5639 from multiversx/fix-contracts-01
sasurobert Oct 5, 2023
b193c39
Fix some long tests.
andreibancioiu Oct 5, 2023
00975f9
Fix extra long tests.
andreibancioiu Oct 5, 2023
578703f
Merge pull request #5641 from multiversx/fix-contracts-01
sasurobert Oct 6, 2023
e490fd6
new vm 1.5.12
sasurobert Oct 6, 2023
fcc7eeb
Merge branch 'vm1.5.12' into fix-contracts-01
andreibancioiu Oct 6, 2023
41cca13
Fix contracts.
andreibancioiu Oct 6, 2023
9a12d9f
Remove file.
andreibancioiu Oct 6, 2023
e7f11c1
Manually edit WAT file.
andreibancioiu Oct 6, 2023
8d1efd4
Merge pull request #5645 from multiversx/fix-contracts-01
sasurobert Oct 6, 2023
d0d5873
Merge pull request #5613 from multiversx/MX-13777-add-round-in-hyperb…
gabi-vuls Oct 6, 2023
1d6f53e
Merge branch 'rc/v1.6.0' into adjust-account-not-found-err-tx-api
gabi-vuls Oct 6, 2023
ae4fc8d
Fix remaining tests.
andreibancioiu Oct 6, 2023
ba52417
Merge pull request #5646 from multiversx/fix-contracts-01
sasurobert Oct 6, 2023
e2fb28b
Merge branch 'rc/v1.6.0' into dockerfile-master-update
bogdan-rosianu Oct 6, 2023
16494b2
Fix remaining test.
andreibancioiu Oct 6, 2023
eeb7c55
Merge pull request #5647 from multiversx/fix-contracts-01
sasurobert Oct 6, 2023
c8422d7
fix integration test
bogdan-rosianu Oct 6, 2023
9fcd471
new vm 1.5.13
sasurobert Oct 6, 2023
0c7d400
Merge branch 'rc/v1.6.0' into vm1.5.12
andreibancioiu Oct 6, 2023
b0a361f
Merge pull request #5469 from multiversx/dockerfile-master-update
bogdan-rosianu Oct 6, 2023
54928b1
Merge branch 'rc/v1.6.0' into adjust-account-not-found-err-tx-api
bogdan-rosianu Oct 6, 2023
2fcbcc5
- changed constant, adapted tests
iulianpascalau Oct 6, 2023
218929c
Merge branch 'rc/v1.6.0' into adjust-max-tx-nonce-delta-constant
iulianpascalau Oct 6, 2023
bc449fa
Merge branch 'rc/v1.6.0' into vm1.5.12
sasurobert Oct 9, 2023
f1cc402
new vm 1.5.13
sasurobert Oct 9, 2023
2d9431a
new vm 1.5.13
sasurobert Oct 9, 2023
788205e
- added integration test
iulianpascalau Oct 9, 2023
4237ea8
new vm 1.5.14
sasurobert Oct 9, 2023
30f0fa2
Merge pull request #5618 from multiversx/adjust-account-not-found-err…
iulianpascalau Oct 10, 2023
ba3a149
Merge branch 'rc/v1.6.0' into adjust-max-tx-nonce-delta-constant
iulianpascalau Oct 10, 2023
fba921b
- fix test
iulianpascalau Oct 10, 2023
ccf7902
Merge remote-tracking branch 'origin/adjust-max-tx-nonce-delta-consta…
iulianpascalau Oct 10, 2023
a4ae65d
tx hash test example with guardian
bogdan-rosianu Oct 10, 2023
2ff8027
Merge pull request #5651 from multiversx/added-tx-hash-with-guardian-…
iulianpascalau Oct 10, 2023
165ac12
Merge branch 'rc/v1.6.0' into adjust-max-tx-nonce-delta-constant
iulianpascalau Oct 10, 2023
1eda4ce
Merge pull request #5648 from multiversx/adjust-max-tx-nonce-delta-co…
iulianpascalau Oct 10, 2023
14820d2
Merge branch 'rc/v1.6.0' into dependabot/go_modules/master/github.com…
iulianpascalau Oct 11, 2023
f7ff788
Merge branch 'rc/v1.6.0' into MX-14308
iulianpascalau Oct 11, 2023
de19299
Merge branch 'rc/v1.6.0' into improve-requesting-of-missing-miniblock…
iulianpascalau Oct 11, 2023
ded414a
Merge branch 'rc/v1.6.0' into change-gas-cost-for-data-trie-migration
BeniaminDrasovean Oct 11, 2023
504799c
Merge pull request #5358 from multiversx/MX-14308
iulianpascalau Oct 11, 2023
37dbc0d
Merge branch 'rc/v1.6.0' into dependabot/go_modules/master/github.com…
iulianpascalau Oct 11, 2023
49f15d1
Merge pull request #5464 from multiversx/dependabot/go_modules/master…
iulianpascalau Oct 11, 2023
fcb9359
Merge branch 'rc/v1.6.0' into improve-requesting-of-missing-miniblock…
iulianpascalau Oct 11, 2023
5cbadc5
new vm 1.5.14
sasurobert Oct 11, 2023
81dad39
new vm 1.5.14
sasurobert Oct 11, 2023
692ed00
Merge pull request #5176 from multiversx/improve-requesting-of-missin…
iulianpascalau Oct 11, 2023
2d7c67e
small governance fix
sasurobert Oct 11, 2023
4c2c45e
Merge branch 'rc/v1.6.0' into vm1.5.12
sasurobert Oct 11, 2023
16f9e3d
small governance test fix
sasurobert Oct 11, 2023
9c5d52b
vm 1.5.16
sasurobert Oct 11, 2023
4581b82
delete comment
sasurobert Oct 11, 2023
d621915
Fix long tests.
andreibancioiu Oct 11, 2023
aa7e3b6
Fix tests.
andreibancioiu Oct 12, 2023
315b007
Merge pull request #5632 from multiversx/vm1.5.12
iulianpascalau Oct 12, 2023
60191ea
- fixed create release workflow
iulianpascalau Oct 12, 2023
7caabe9
Merge branch 'rc/v1.6.0' into change-gas-cost-for-data-trie-migration
BeniaminDrasovean Oct 12, 2023
19a7a43
- fixing workflow file
iulianpascalau Oct 12, 2023
c47d9c0
Merge pull request #5579 from multiversx/change-gas-cost-for-data-tri…
BeniaminDrasovean Oct 12, 2023
42209c2
Merge branch 'rc/v1.6.0' into fix-create-release-workflow
iulianpascalau Oct 12, 2023
3afc232
Merge pull request #5655 from multiversx/fix-create-release-workflow
iulianpascalau Oct 12, 2023
e514d3b
update guardians tx construction example
bogdan-rosianu Oct 13, 2023
f5f3094
Merge pull request #5659 from multiversx/update-guardian-tx-construct…
bogdan-rosianu Oct 13, 2023
dfa3752
change owner from sc
miiu96 Oct 24, 2023
586650f
use latest mx-chain-crypto-go tag
AdoAdoAdo Oct 25, 2023
de6b7b9
new enabled epoch flag and extend semi-integration test
miiu96 Oct 25, 2023
5766b21
update vm go
miiu96 Oct 25, 2023
049809b
fix unit tests
miiu96 Oct 25, 2023
82bac44
fixes after review
miiu96 Oct 26, 2023
1b86927
latest version
miiu96 Oct 26, 2023
906ff28
go mod tidy
miiu96 Oct 27, 2023
529a7b0
Merge pull request #5667 from multiversx/fixes-change-owner-from-sc
miiu96 Oct 27, 2023
64c8e47
Merge branch 'rc/v1.6.0' into update-crypto-lib-version
iulianpascalau Oct 27, 2023
efdf10b
Integrate fix (using go replace).
andreibancioiu Oct 27, 2023
a18b2e6
Merge pull request #5668 from multiversx/update-crypto-lib-version
iulianpascalau Oct 30, 2023
e1d1548
Use proper release.
andreibancioiu Oct 31, 2023
be6b30d
Fix go.sum.
andreibancioiu Oct 31, 2023
0101225
Merge pull request from GHSA-pmr9-45mr-p5q4
iulianpascalau Oct 31, 2023
c2a12bc
reference core version with removed omitempty for guarded api field
bogdan-rosianu Nov 6, 2023
6b401a8
Merge branch 'master' into merge-master-rc-v1.6.0-2023.11.07
iulianpascalau Nov 7, 2023
16b43a0
- fixes after merge & integrated latest VM
iulianpascalau Nov 7, 2023
5b172c1
updated mx-chain-go-core tag to v1.2.18
raduchis Nov 7, 2023
c6b66c8
Merge pull request #5686 from multiversx/reference-core-with-removed-…
iulianpascalau Nov 8, 2023
37c2eda
Merge branch 'rc/v1.6.0' into merge-master-rc-v1.6.0-2023.11.07
iulianpascalau Nov 8, 2023
78dd240
Merge pull request #5687 from multiversx/merge-master-rc-v1.6.0-2023.…
iulianpascalau Nov 8, 2023
ff03418
Merge branch 'rc/v1.6.0' into merge-in-feat
miiu96 Nov 13, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/create_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
hub release create --draft --message="Release draft from Github Actions" vNext
gh release create --draft --notes="Release draft from Github Actions" vNext
sleep 10
for i in $(find ./assets -name '*.tgz' -type f); do
hub release edit --attach=${i} --message="" vNext
gh release upload vNext ${i}
done
Binary file modified cmd/assessment/testdata/fibonacci.wasm
Binary file not shown.
56 changes: 56 additions & 0 deletions cmd/assessment/testdata/fibonacci.wat
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
(module
(type (;0;) (func (param i64) (result i32)))
(type (;1;) (func (param i32)))
(type (;2;) (func (param i32) (result i64)))
(type (;3;) (func (param i64) (result i64)))
(type (;4;) (func))
(import "env" "bigIntNew" (func (;0;) (type 0)))
(import "env" "bigIntGetCallValue" (func (;1;) (type 1)))
(import "env" "bigIntGetInt64" (func (;2;) (type 2)))
(import "env" "bigIntFinishUnsigned" (func (;3;) (type 1)))
(func (;4;) (type 3) (param i64) (result i64)
block ;; label = @1
block ;; label = @2
block ;; label = @3
local.get 0
i64.const 1
i64.gt_u
br_if 0 (;@3;)
local.get 0
i32.wrap_i64
br_table 2 (;@1;) 1 (;@2;) 2 (;@1;)
end
local.get 0
i64.const -1
i64.add
call 4
local.get 0
i64.const -2
i64.add
call 4
i64.add
return
end
i64.const 1
local.set 0
end
local.get 0)
(func (;5;) (type 4)
(local i32)
i64.const 0
call 0
local.tee 0
call 1
local.get 0
call 2
call 4
call 0
call 3)
(func (;6;) (type 4)
return)
(table (;0;) 1 1 funcref)
(memory (;0;) 2)
(global (;0;) (mut i32) (i32.const 66560))
(export "memory" (memory 0))
(export "_main" (func 5))
(export "init" (func 6)))
4 changes: 2 additions & 2 deletions cmd/node/config/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -696,7 +696,7 @@
WasmVMVersions = [
{ StartEpoch = 0, Version = "v1.3" },
{ StartEpoch = 1, Version = "v1.4" },
{ StartEpoch = 2, Version = "v1.5" },
{ StartEpoch = 3, Version = "v1.5" },
]

[VirtualMachine.Querying]
Expand All @@ -706,7 +706,7 @@
WasmVMVersions = [
{ StartEpoch = 0, Version = "v1.3" },
{ StartEpoch = 1, Version = "v1.4" },
{ StartEpoch = 2, Version = "v1.5" },
{ StartEpoch = 3, Version = "v1.5" },
]

[VirtualMachine.GasConfig]
Expand Down
13 changes: 8 additions & 5 deletions cmd/node/config/enableEpochs.toml
Original file line number Diff line number Diff line change
Expand Up @@ -252,22 +252,22 @@
DeterministicSortOnValidatorsInfoEnableEpoch = 1

# SCProcessorV2EnableEpoch represents the epoch when SC processor V2 will be used
SCProcessorV2EnableEpoch = 6
SCProcessorV2EnableEpoch = 3

# AutoBalanceDataTriesEnableEpoch represents the epoch when the data tries are automatically balanced by inserting at the hashed key instead of the normal key
AutoBalanceDataTriesEnableEpoch = 5
AutoBalanceDataTriesEnableEpoch = 3

# KeepExecOrderOnCreatedSCRsEnableEpoch represents the epoch when the execution order of created SCRs is ensured
KeepExecOrderOnCreatedSCRsEnableEpoch = 2
KeepExecOrderOnCreatedSCRsEnableEpoch = 3

# MultiClaimOnDelegationEnableEpoch represents the epoch when the multi claim on delegation is enabled
MultiClaimOnDelegationEnableEpoch = 3

# ChangeUsernameEnableEpoch represents the epoch when changing username is enabled
ChangeUsernameEnableEpoch = 2
ChangeUsernameEnableEpoch = 3

# ConsistentTokensValuesLengthCheckEnableEpoch represents the epoch when the consistent tokens values length check is enabled
ConsistentTokensValuesLengthCheckEnableEpoch = 2
ConsistentTokensValuesLengthCheckEnableEpoch = 3

# FixDelegationChangeOwnerOnAccountEnableEpoch represents the epoch when the fix for the delegation system smart contract is enabled
FixDelegationChangeOwnerOnAccountEnableEpoch = 3
Expand All @@ -281,6 +281,9 @@
# NFTStopCreateEnableEpoch represents the epoch when NFT stop create feature is enabled
NFTStopCreateEnableEpoch = 3

# ChangeOwnerAddressCrossShardThroughSCEnableEpoch represents the epoch when the change owner address built in function will work also through a smart contract call cross shard
ChangeOwnerAddressCrossShardThroughSCEnableEpoch = 3

# BLSMultiSignerEnableEpoch represents the activation epoch for different types of BLS multi-signers
BLSMultiSignerEnableEpoch = [
{ EnableEpoch = 0, Type = "no-KOSK" },
Expand Down
2 changes: 1 addition & 1 deletion cmd/node/config/gasSchedules/gasScheduleV1.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
SetGuardian = 250000
GuardAccount = 250000
UnGuardAccount = 250000
TrieLoadPerNode = 20000
TrieLoadPerNode = 100000
TrieStorePerNode = 50000

[MetaChainSystemSCsCost]
Expand Down
2 changes: 1 addition & 1 deletion cmd/node/config/gasSchedules/gasScheduleV2.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
SetGuardian = 250000
GuardAccount = 250000
UnGuardAccount = 250000
TrieLoadPerNode = 20000
TrieLoadPerNode = 100000
TrieStorePerNode = 50000

[MetaChainSystemSCsCost]
Expand Down
2 changes: 1 addition & 1 deletion cmd/node/config/gasSchedules/gasScheduleV3.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
SetGuardian = 250000
GuardAccount = 250000
UnGuardAccount = 250000
TrieLoadPerNode = 20000
TrieLoadPerNode = 100000
TrieStorePerNode = 50000

[MetaChainSystemSCsCost]
Expand Down
2 changes: 1 addition & 1 deletion cmd/node/config/gasSchedules/gasScheduleV4.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
SetGuardian = 250000
GuardAccount = 250000
UnGuardAccount = 250000
TrieLoadPerNode = 20000
TrieLoadPerNode = 100000
TrieStorePerNode = 50000

[MetaChainSystemSCsCost]
Expand Down
2 changes: 1 addition & 1 deletion cmd/node/config/gasSchedules/gasScheduleV5.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
SetGuardian = 250000
GuardAccount = 250000
UnGuardAccount = 250000
TrieLoadPerNode = 20000
TrieLoadPerNode = 100000
TrieStorePerNode = 50000

[MetaChainSystemSCsCost]
Expand Down
2 changes: 1 addition & 1 deletion cmd/node/config/gasSchedules/gasScheduleV6.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
SetGuardian = 250000
GuardAccount = 250000
UnGuardAccount = 250000
TrieLoadPerNode = 20000
TrieLoadPerNode = 100000
TrieStorePerNode = 50000

[MetaChainSystemSCsCost]
Expand Down
2 changes: 1 addition & 1 deletion cmd/node/config/gasSchedules/gasScheduleV7.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
SetGuardian = 250000
GuardAccount = 250000
UnGuardAccount = 250000
TrieLoadPerNode = 20000
TrieLoadPerNode = 100000
TrieStorePerNode = 50000

[MetaChainSystemSCsCost]
Expand Down
84 changes: 84 additions & 0 deletions cmd/node/config/testKeys/extraValidatorsKeys.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
-----BEGIN PRIVATE KEY for 030f64b325e44c6d1b3aded4e17d8d2e8df130654322634436b60edefbbbe96c28ae8c27411a0bb09d8c9b16bfd3f409139c339e0a01a64c19cb0e5f5d90d36b9eba368908c3cf79358ee710472e60f57ff96450c6c619afcdb64cde28c3120c-----
N2M0ZWQ2ZWU0MTMyNGUwNzI4NmZhZDM0ZmQ2NjdhOGUyYTM2NjcyMjc2YTg2MWYy
ZWIwYzVmYTRkM2VmOWEzOQ==
-----END PRIVATE KEY for 030f64b325e44c6d1b3aded4e17d8d2e8df130654322634436b60edefbbbe96c28ae8c27411a0bb09d8c9b16bfd3f409139c339e0a01a64c19cb0e5f5d90d36b9eba368908c3cf79358ee710472e60f57ff96450c6c619afcdb64cde28c3120c-----
-----BEGIN PRIVATE KEY for 249c62e3b56d8979919c318c00fff9e456b2c79cf7862e8d53376f3d5ad8be731201e038cd32a613954ec31cce1b4e10627a874334d9e50141c8c13dfd9ce079f20fd3602ec9bd6aaec3111e88c82691eabebf2e9dd0cd85b0d2e2dd490cd519-----
ZTEwM2IzZDA4OTJmZTA2Y2ZiYjk3NjY1YWMzNTJkNTcxM2FmZWY4NmI4MmZlYTkz
NDk5N2M4M2ZlNDZjZDI0MA==
-----END PRIVATE KEY for 249c62e3b56d8979919c318c00fff9e456b2c79cf7862e8d53376f3d5ad8be731201e038cd32a613954ec31cce1b4e10627a874334d9e50141c8c13dfd9ce079f20fd3602ec9bd6aaec3111e88c82691eabebf2e9dd0cd85b0d2e2dd490cd519-----
-----BEGIN PRIVATE KEY for 264b6598dd1ebcf0c25be31adc68ce57283f2ece639009ea680256b004856925ec9fafe44c994e2f4def4a07d10c380f79db89681fc805d06f4843f96777a18e41827a7c696272d16447f741cf28306b03bebb10d65236b2a762897c28545b04-----
MGVlYjNmNjIyOGMyZDcxMWEzZGU2ZjRmZDZmZmZiODk3YWExYjcyYTIwY2VlYmEy
MmQyMGMwYjI3NWFhNzQ3MA==
-----END PRIVATE KEY for 264b6598dd1ebcf0c25be31adc68ce57283f2ece639009ea680256b004856925ec9fafe44c994e2f4def4a07d10c380f79db89681fc805d06f4843f96777a18e41827a7c696272d16447f741cf28306b03bebb10d65236b2a762897c28545b04-----
-----BEGIN PRIVATE KEY for 121da32615b6206aeb021f0c6a98cbb136bbe861f828748d6e127d30d510e06ba92fa1d9dec046eb0836080745b6bb0462762c1a9fe136fa3c1bb274db35c5d52b9a84c46395e2556f6e58296f81bd7dd4716e9f3a585f111178c9059ee6628b-----
ZDE5ZmYyMGFlZGI3ZWY3OGIzMzFhMWY3NGRkMmNmZTA4NTBhODUwMDU1ODA5MGNl
MDI4MWE2NDMzYWZiODQ0MA==
-----END PRIVATE KEY for 121da32615b6206aeb021f0c6a98cbb136bbe861f828748d6e127d30d510e06ba92fa1d9dec046eb0836080745b6bb0462762c1a9fe136fa3c1bb274db35c5d52b9a84c46395e2556f6e58296f81bd7dd4716e9f3a585f111178c9059ee6628b-----
-----BEGIN PRIVATE KEY for aecbab700543e1848ea923e3e2b9344d2b3ea6334e95b301d904608cadee932e9af699ecc3b78d5fc107533757528b17c7214754ae781aad76d424ae788c1c8c210d2507cd867013144d8732c88dcefb418c49b6f45d27c7b0d629e95c69808f-----
YmUxZDIzYjg1ZTYwMTE5ZjdlMWYxY2JmYWEyOWZhZGE0NjE5MDc5MzkzNWEwNzkz
YzVhMjFlMGVhZDJjMTg0OQ==
-----END PRIVATE KEY for aecbab700543e1848ea923e3e2b9344d2b3ea6334e95b301d904608cadee932e9af699ecc3b78d5fc107533757528b17c7214754ae781aad76d424ae788c1c8c210d2507cd867013144d8732c88dcefb418c49b6f45d27c7b0d629e95c69808f-----
-----BEGIN PRIVATE KEY for c6dd20674a464b2a1d8492a39238c67ae1d6226445077de73fcc71a9137de1b55d476fdff5845afc6b860673bd5c7f06147dd83c8314e34f28d6ae05e7edf156df713fd5b7d771a955da761fd508c816cdc5a4e0faceff34334cfedc86053a19-----
ZGQ4ZDY1ZjdhMGZmZGYwYTc0MDM1MTNlNGMzZDM1ZmE1N2IzODM4YzA5OWY0NmMz
ZTZiYTgzYjRlNzU0MGM0ZQ==
-----END PRIVATE KEY for c6dd20674a464b2a1d8492a39238c67ae1d6226445077de73fcc71a9137de1b55d476fdff5845afc6b860673bd5c7f06147dd83c8314e34f28d6ae05e7edf156df713fd5b7d771a955da761fd508c816cdc5a4e0faceff34334cfedc86053a19-----
-----BEGIN PRIVATE KEY for 964c9baed3d8b4a9affebf81006ae7ee75c98ac1f2348b6a2e407add61663e2ce5c7994c18dcab6a0ebbce1378c9140c7e6475bd204d9c8773af47c6d1d0764edbaf4abf3052d4a7755442d3c1e51d8c8dd8174ea69dde80f8c21eb2adec3b17-----
Njg0NTE2MTAwZmU5OWVhNDBhYjE5ZDA1OGI2OTk0MDI3NzA2MDVjZDhlNjFmMmU1
M2M3Mzk3MWQ5OTA1OGUxYw==
-----END PRIVATE KEY for 964c9baed3d8b4a9affebf81006ae7ee75c98ac1f2348b6a2e407add61663e2ce5c7994c18dcab6a0ebbce1378c9140c7e6475bd204d9c8773af47c6d1d0764edbaf4abf3052d4a7755442d3c1e51d8c8dd8174ea69dde80f8c21eb2adec3b17-----
-----BEGIN PRIVATE KEY for 168fc4729e416f2dbbe79af7337e5acf8975cc6c24ff49b22902157dfb6376460e6c8fbac4b746df36c87f80f8741f14304a3f76224ff69c5971a40d0019a788d651be12fc21d97f54084aa251c9ad9fb2cdb853c9b9d108aff1efb0f3c25301-----
YjlmY2YzNDc3MTRmNDgxNzhhYjcyNDc4MmYyYTRkZTBjZDVhMDdjYmUxNjU3Mjg2
YzIyZTZkNGJlNmNiZjA2Yg==
-----END PRIVATE KEY for 168fc4729e416f2dbbe79af7337e5acf8975cc6c24ff49b22902157dfb6376460e6c8fbac4b746df36c87f80f8741f14304a3f76224ff69c5971a40d0019a788d651be12fc21d97f54084aa251c9ad9fb2cdb853c9b9d108aff1efb0f3c25301-----
-----BEGIN PRIVATE KEY for 917f49e8302c57d794af44502917502517fe621f5ef8bd49141e587469e1be2005f9600316f00478e07160abd18d341468dd9bc72b46cc8bf7565f06165d7653ab5cd183ab6ef5074b47299484be210fbc9b1ee0a57e15ce9cb872dfaba4cf10-----
YTQyMTJmZWEwOGRkNzcyYmJlMzZiYjgyNjRmMDA1ZTUzOWVjYzQ0ZWY3MTYyOTZm
MTk5ODI2MGEzYWQ3ZDY0MA==
-----END PRIVATE KEY for 917f49e8302c57d794af44502917502517fe621f5ef8bd49141e587469e1be2005f9600316f00478e07160abd18d341468dd9bc72b46cc8bf7565f06165d7653ab5cd183ab6ef5074b47299484be210fbc9b1ee0a57e15ce9cb872dfaba4cf10-----
-----BEGIN PRIVATE KEY for 920c54e87b0b66960800bcfe3837fc54794c5187764313e13781bd7ecddfe72a9aa138faca52b5293b5bd44debcfeb07241c3ce1967d3c0730bedee5c0bff588ed977a482f36f9dfd8a0abf54a812b78ea951739904dc6e74a9f722e6f9aa109-----
NDIxMWY5ZDRmNjJmMjA0MTY1NTkxMjFjYmFjM2ZjOWM5ODgxYzFkZTBjNDU2ZWM2
Y2M0NTA1NGVhNTY4MmM0NQ==
-----END PRIVATE KEY for 920c54e87b0b66960800bcfe3837fc54794c5187764313e13781bd7ecddfe72a9aa138faca52b5293b5bd44debcfeb07241c3ce1967d3c0730bedee5c0bff588ed977a482f36f9dfd8a0abf54a812b78ea951739904dc6e74a9f722e6f9aa109-----
-----BEGIN PRIVATE KEY for 239112057c492a97d5a512da5ab61d0dedbd0fb7066b83f22ad4f1e105e3a67566161d07c252c25e615cbc10dede8c15f3c96430fe0160e4c22b22b3c24114c5ed71a2a29f75c21122797fb83a6b2d58a8ef2cd8b445f6b6fb81c6a2f5739d00-----
M2ViNGQ3YjNmZmQ5NWMxZWU0MTRhYmMxN2I4OGYzYThjOWU3MWIyN2JmYjk3MDhh
M2QzNmNmZWExOWI0OWIyMw==
-----END PRIVATE KEY for 239112057c492a97d5a512da5ab61d0dedbd0fb7066b83f22ad4f1e105e3a67566161d07c252c25e615cbc10dede8c15f3c96430fe0160e4c22b22b3c24114c5ed71a2a29f75c21122797fb83a6b2d58a8ef2cd8b445f6b6fb81c6a2f5739d00-----
-----BEGIN PRIVATE KEY for 71da072e471fc514cc59bd81f33a96c54a8e94a066c03e750dbf8c987b9ed2a56a2160ce956bafa88e00cfec4b7922069129829cd595321ceced47b5ab231a9323be4ee2c7e336734500cb5fd001747545b90803150f2818f53dd6354feb3315-----
MjJmM2ZlMDY1NWM3YmUxODg3ZmQ1MGRmMGFlNTdlZjRiNjZhNzM5MGIyYzQzOTgw
YTkxZDBjMzE4MTZlZTI0OQ==
-----END PRIVATE KEY for 71da072e471fc514cc59bd81f33a96c54a8e94a066c03e750dbf8c987b9ed2a56a2160ce956bafa88e00cfec4b7922069129829cd595321ceced47b5ab231a9323be4ee2c7e336734500cb5fd001747545b90803150f2818f53dd6354feb3315-----
-----BEGIN PRIVATE KEY for 2f2146c08e3e73c44d3eab746f2a950ad0b79185fb0620e8e215ee5499997549e52a37505f593f909e15f3e6b1d0f214d0a787975691733c2c655dc32c4e0e792be3116bafb953c5e0909ed381157089f51574d9fab9bae40d7d2e8cb8defc16-----
MjQ5YWE3MTcwZGMwOGRmNjNkYTkzZDdmNzJhODEyMTE4ZDI1NzE3ZjliZjE1YmZi
NzA1YzZhYTAxYTEyMDc0MQ==
-----END PRIVATE KEY for 2f2146c08e3e73c44d3eab746f2a950ad0b79185fb0620e8e215ee5499997549e52a37505f593f909e15f3e6b1d0f214d0a787975691733c2c655dc32c4e0e792be3116bafb953c5e0909ed381157089f51574d9fab9bae40d7d2e8cb8defc16-----
-----BEGIN PRIVATE KEY for 3a0b17851dd2cc84363e229638aebc2d3354c22b3b891b39e885dcac797f43e6e372b827c368ab3efb636e271cc1a2017e996c2318d6c4a3e3c26f52141496ecfd7c3363599bbd5d715a72c6850b57d9e49057b37c3ae502a6bd244b3e7f8108-----
ZGY4Nzc0NmJhZjI4YzU4ZDViMjYwMzUwNmJkY2RiZjBlYmNiNmVjZDFiNjY4MzY1
YzE1MzU0NzM0ZDAzOGQyZQ==
-----END PRIVATE KEY for 3a0b17851dd2cc84363e229638aebc2d3354c22b3b891b39e885dcac797f43e6e372b827c368ab3efb636e271cc1a2017e996c2318d6c4a3e3c26f52141496ecfd7c3363599bbd5d715a72c6850b57d9e49057b37c3ae502a6bd244b3e7f8108-----
-----BEGIN PRIVATE KEY for 6dc9fee64f63262c7647ea067449656845275c5bcb2d0354afd31486ff32b8022d349054e87578d0359a0d3dc3dbc50ec485840b4029a2f7d2658571ca6d381c5c80ad93ce9cba7c43e89020caee1b19d4848946c4711e06dfeee3f1dc2b3483-----
OWRkY2IyZWRmMGRiMzUwY2FjMDhmYzM1NGRhZGY1NGY4NmU0N2UxNTJjMmNmZDNk
OWQyOTJlMjg2MzJlN2EzZg==
-----END PRIVATE KEY for 6dc9fee64f63262c7647ea067449656845275c5bcb2d0354afd31486ff32b8022d349054e87578d0359a0d3dc3dbc50ec485840b4029a2f7d2658571ca6d381c5c80ad93ce9cba7c43e89020caee1b19d4848946c4711e06dfeee3f1dc2b3483-----
-----BEGIN PRIVATE KEY for 6c9dadc88e601b68b8e421a3742ea37113aeb1eee690acc86b28eb55a7b75eae1657bdebed0477e5aee7eb83df38c00232a151c6ea952ed148c4c34a858caa20dae3e6c33c8b3561f9ba8278b8a1a03d7a934607ff35dbb6d2ecccfd15a33913-----
MDI5ZGVkMGE4YmIyZDYyMTNiOGFhN2Q2ZDY2MTFkYzc2OWIyZDU4MGJkODdlZDNl
MWUwNWVmMjAyNTIxNTA1Yg==
-----END PRIVATE KEY for 6c9dadc88e601b68b8e421a3742ea37113aeb1eee690acc86b28eb55a7b75eae1657bdebed0477e5aee7eb83df38c00232a151c6ea952ed148c4c34a858caa20dae3e6c33c8b3561f9ba8278b8a1a03d7a934607ff35dbb6d2ecccfd15a33913-----
-----BEGIN PRIVATE KEY for 45526548fb3b1e3bd76377e3998b3e6be72a572225d84ed7d6a837bec364172fdacd0cbe0551892c2f527e18ff01470db5ba8151de6f06f8881eed4bd1c4e9dcc59eeb7b62889918eff0180f6bc0ce52a2df25d7f58692e56987e59dee125780-----
NzljYTYxOGViNTZhM2ZmNTNjOTQzMGUwM2YzNTVkMTYzMzYwY2NjMzQwY2M3Mjk5
Y2UyMDJhNWM3NWQ3ZTUxMw==
-----END PRIVATE KEY for 45526548fb3b1e3bd76377e3998b3e6be72a572225d84ed7d6a837bec364172fdacd0cbe0551892c2f527e18ff01470db5ba8151de6f06f8881eed4bd1c4e9dcc59eeb7b62889918eff0180f6bc0ce52a2df25d7f58692e56987e59dee125780-----
-----BEGIN PRIVATE KEY for 2fc71725f7368f068dc52a5ee468fa56a051ee25dbbc486fff169baf46ffa92e386c47a649220d3c238fee1f2f3e1904f87a000d8c1e43ddccfef73f37b7381954c2668d92338f2140c9360d8cbb52857835e698bed51433074c0daa6916e60d-----
Zjg0OTY5ZmYyMTU4NWZhM2UxNmU2YzUwMjNmZmQ2MDljZTE0OTBkMmJjNWQ5ZjJl
NjEwMjgwYzllZTk4ZjU0Yg==
-----END PRIVATE KEY for 2fc71725f7368f068dc52a5ee468fa56a051ee25dbbc486fff169baf46ffa92e386c47a649220d3c238fee1f2f3e1904f87a000d8c1e43ddccfef73f37b7381954c2668d92338f2140c9360d8cbb52857835e698bed51433074c0daa6916e60d-----
-----BEGIN PRIVATE KEY for a4c519bd1f223434a641cd26c6e64cab1c71847a402150e54d9dfe7eab3574adf0ed2fc7a9d782c356aa9ee3ea016809f771d6b53295ecab718d9cdd702a87b811cc2d84864b5b6bb59286254fa07d530bb8f385d8f1f5cf14a1d27afc34d708-----
NmYzMjM4NzhlNDE5OWU1Y2NmYTZkNmNlYTNiMDY3NmM0MDJmNmI3ODVlOTZjOGUz
NWRkMzg5MjI4ZDQxNDAxNA==
-----END PRIVATE KEY for a4c519bd1f223434a641cd26c6e64cab1c71847a402150e54d9dfe7eab3574adf0ed2fc7a9d782c356aa9ee3ea016809f771d6b53295ecab718d9cdd702a87b811cc2d84864b5b6bb59286254fa07d530bb8f385d8f1f5cf14a1d27afc34d708-----
-----BEGIN PRIVATE KEY for 593aad5efc849dc30cb0d2c119c5b310d0c5d1ab9540d37cad7779e0b7209030321a332fde8a548bd61b65fe535a5408157be4d42b0143763cd43ded1ea0c7e24dfcceb444610cae5763d77a7ddd1fbeaac40fcec3e5e3189af12df996fe7317-----
ZDkxZjU2N2MyNWNjMWQ1NzQ4YzRkMWFhMzNlY2NmMWUxZjdlOTAwYjFiN2QxZTFl
MjdjMTg0OGFhNGE2ZDQwNw==
-----END PRIVATE KEY for 593aad5efc849dc30cb0d2c119c5b310d0c5d1ab9540d37cad7779e0b7209030321a332fde8a548bd61b65fe535a5408157be4d42b0143763cd43ded1ea0c7e24dfcceb444610cae5763d77a7ddd1fbeaac40fcec3e5e3189af12df996fe7317-----
-----BEGIN PRIVATE KEY for c0de52d21c284b40b384de4d0c69f59164de3b46e065a78bd2f3b9ff67d106023fae25c628d96e0b10abec84067a3701f80138a341f3fcdd7ebb297db9b29f2da82dbdd797fe44a9b5fcebf27945e90229c850bf8090965aab5e3457c797cb0c-----
ODAxYjIzZGRmOTU5N2QxMGQwZmMyZmE2MjE4OTQ3OGMzZDkyNGRhYWQ1ODA0OTg4
Y2Q3MDhiMTk0M2I3MTQ3Mg==
-----END PRIVATE KEY for c0de52d21c284b40b384de4d0c69f59164de3b46e065a78bd2f3b9ff67d106023fae25c628d96e0b10abec84067a3701f80138a341f3fcdd7ebb297db9b29f2da82dbdd797fe44a9b5fcebf27945e90229c850bf8090965aab5e3457c797cb0c-----
2 changes: 1 addition & 1 deletion common/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ const DisabledShardIDAsObserver = uint32(0xFFFFFFFF) - 7

// MaxTxNonceDeltaAllowed specifies the maximum difference between an account's nonce and a received transaction's nonce
// in order to mark the transaction as valid.
const MaxTxNonceDeltaAllowed = 30000
const MaxTxNonceDeltaAllowed = 100

// MaxBulkTransactionSize specifies the maximum size of one bulk with txs which can be send over the network
// TODO convert this const into a var and read it from config when this code moves to another binary
Expand Down
1 change: 1 addition & 0 deletions common/enablers/enableEpochsHandler.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ func (handler *enableEpochsHandler) EpochConfirmed(epoch uint32, _ uint64) {
handler.setFlagValue(epoch >= handler.enableEpochsConfig.SCProcessorV2EnableEpoch, handler.scProcessorV2Flag, "scProcessorV2Flag", epoch, handler.enableEpochsConfig.SCProcessorV2EnableEpoch)
handler.setFlagValue(epoch >= handler.enableEpochsConfig.DynamicGasCostForDataTrieStorageLoadEnableEpoch, handler.dynamicGasCostForDataTrieStorageLoadFlag, "dynamicGasCostForDataTrieStorageLoadFlag", epoch, handler.enableEpochsConfig.DynamicGasCostForDataTrieStorageLoadEnableEpoch)
handler.setFlagValue(epoch >= handler.enableEpochsConfig.NFTStopCreateEnableEpoch, handler.nftStopCreateFlag, "nftStopCreateFlag", epoch, handler.enableEpochsConfig.NFTStopCreateEnableEpoch)
handler.setFlagValue(epoch >= handler.enableEpochsConfig.ChangeOwnerAddressCrossShardThroughSCEnableEpoch, handler.changeOwnerAddressCrossShardThroughSCFlag, "changeOwnerAddressCrossShardThroughSCFlag", epoch, handler.enableEpochsConfig.ChangeOwnerAddressCrossShardThroughSCEnableEpoch)
}

func (handler *enableEpochsHandler) setFlagValue(value bool, flag *atomic.Flag, flagName string, epoch uint32, flagEpoch uint32) {
Expand Down