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

Jump to bottom

[MERGE] dev into feat-scheduled-sc-execution #3341

Merged
merged 271 commits into from
Aug 9, 2021
Merged

[MERGE] dev into feat-scheduled-sc-execution #3341

merged 271 commits into from
Aug 9, 2021

Conversation

SebastianMarian
Copy link
Contributor

  • Merged dev in feat scheduled sc execution

miiu96 and others added 30 commits April 29, 2021 15:08
@miiu96
typo
fe55407
@miiu96
remove unused error
c44dc35
@miiu96
Merge pull request #3053 from ElrondNetwork/merge-dev-in-outport
0744dda 
Merge dev in outport
@miiu96
Merge branch 'development' into merge-last-dev-outport
1b14c45
@miiu96
fix linter issues
f1f96af
@miiu96
Merge pull request #3063 from ElrondNetwork/merge-last-dev-outport
3009744 
Merge last dev outport
@miiu96
Merge branch 'development' into merge-dev-into-outport
2d7a6aa 
# Conflicts:
#	cmd/storer2elastic/dataprocessor/dataProcessor.go
#	cmd/storer2elastic/dataprocessor/dataProcessor_test.go
#	cmd/storer2elastic/dataprocessor/errors.go
#	cmd/storer2elastic/dataprocessor/ratingsProcessor.go
#	cmd/storer2elastic/dataprocessor/ratingsProcessor_test.go
#	cmd/storer2elastic/dataprocessor/tpsBenchmarkUpdater.go
#	cmd/storer2elastic/dataprocessor/tpsBenchmarkUpdater_test.go
#	cmd/storer2elastic/elastic/elasticConnector.go
#	cmd/storer2elastic/main.go
#	node/nodeRunner.go
@miiu96
fix after merge
ef1182e
@miiu96
Merge pull request #3183 from ElrondNetwork/merge-dev-into-outport
ecfe714 
Merge dev into outport
@andrei-diaconescu
added ec benchmark
81bd3a0
@LucianMincu
Merge branch 'master' into ec_benchmark
81a83f5
@miiu96
Merge branch 'development' into merge-dev-in-outport-25-06
ef298e8 
# Conflicts:
#	factory/consensusComponents.go
#	integrationTests/testSyncNode.go
#	node/nodeRunner.go
#	process/sync/argBootstrapper.go
#	process/sync/metablock.go
#	process/sync/shardblock.go
@miiu96
Merge pull request #3216 from ElrondNetwork/merge-dev-in-outport-25-06
7915cdd 
Merge dev in outport 25 06
@0xmtf
small refactor. prepare for event driver factory
b296ac8
@0xmtf
add event driver config section in external config
b885675
@0xmtf
create and subscribe event driver
8548c3e
@0xmtf
create outport args
f704e54
@0xmtf
update go.mod
d65a603
@andrei-diaconescu
added gasCosts
59c3dad
@andrei-diaconescu
added gas costs in V1/V2
6ae3745
@andrei-diaconescu
update benchmark contract
c9f92a7
@andrei-diaconescu
update benchmarks
03679bd
@andrei-diaconescu
merge master
875a4a5
@andrei-diaconescu
fixed benchmark SC
349dea2
@andrei-diaconescu
add gasSchedule
5e443a5
@andrei-diaconescu
fix benchmark SC
799e642
@andrei-diaconescu
add memcpy memset functions for C written SCs to prevent wasmer bug
4b43384
@miiu96
Merge branch 'development' into dev-feat-outport-02-07
d9dc9a1 
# Conflicts:
#	node/nodeRunner.go
#	testscommon/hasherStub.go
@miiu96
fixes after merge
f2f9e5b
@miiu96
Merge pull request #3235 from ElrondNetwork/dev-feat-outport-02-07
4b7d42f 
Dev feat outport 02 07
iulianpascalau and others added 23 commits August 1, 2021 15:56
@iulianpascalau
- new crypto version
a04bab1 
- multisig stubs/mocks cleanup
@iulianpascalau
- referenced new go crypto repo
1d66065
@iulianpascalau
- go mod tidy
efb36d1
@iulianpascalau
Merge pull request #3321 from ElrondNetwork/multisigner-mock-cleanup
2664fa8 
New crypto repo reference & multisigner mocks cleanup
@iulianpascalau
Merge branch 'development' into dev-outport-driver-2021.08.02
948abd7 
# Conflicts:
#	consensus/spos/sposFactory/sposFactory.go
#	go.mod
#	go.sum
@iulianpascalau
- go mod tidy
ccbe16c
@iulianpascalau
Merge pull request #3325 from ElrondNetwork/dev-outport-driver-2021.0…
c63da05 
…8.02

Dev outport driver 2021.08.02
@iulianpascalau
Merge pull request #2497 from ElrondNetwork/feat/outport-driver
f76d5b8 
Feat/outport driver
@iulianpascalau
- fixed formatting in api.toml file
7683dce
@iulianpascalau
- EN-9067 - small refactor in delegation.go
1bf4556 
- EN-9969 - fixed TODOs in factory/containers/vmContainer.go & simplified closing process
- EN-10443 - finalized elrond-go-core integration by dissolving the state/temporary package & mocks/stubs cleanup
@iulianpascalau
Merge pull request #3327 from ElrondNetwork/fix-formatting-in-api-toml
2482154 
Fixed formatting in api.toml
@iulianpascalau
- new arwen v1.3.28
215e789
@iulianpascalau
- fixes after review
5499221
@iulianpascalau
Merge branch 'development' into refactoring-tasks
ad626be
@iulianpascalau
Merge pull request #3333 from ElrondNetwork/arwen-v1.3.28
7d24d6b 
Arwen v1.3.28
@iulianpascalau
Merge branch 'development' into refactoring-tasks
612df30
@iulianpascalau
Merge pull request #3332 from ElrondNetwork/refactoring-tasks
7861085 
Refactoring tasks
@andrei-diaconescu
update gas Schedules
503884d
@miiu96
new indexes
1acfecc
@iulianpascalau
Merge pull request #3335 from ElrondNetwork/fix-gas-costs
54d0d86 
update gas Schedules
@iulianpascalau
Merge branch 'development' into es-new-indexes-config
74fbc92
@miiu96
Merge pull request #3336 from ElrondNetwork/es-new-indexes-config
35ec4ca 
New indexer indexes
@SebastianMarian
Merge branch 'development' into merge-dev-in-feat-scheduled-sc-execution
f9ec336 
# Conflicts:
#	common/constants.go
#	common/statistics/tpsBenchmark.go
#	consensus/mock/mockTestInitializer.go
#	consensus/spos/consensusCoreValidator_test.go
#	consensus/spos/consensusMessageValidator_test.go
#	crypto/signing/mcl/multisig/bls_test.go
#	epochStart/bootstrap/storageEpochStartMetaBlockProcessor.go
#	epochStart/bootstrap/syncValidatorStatus_test.go
#	epochStart/metachain/baseRewards_test.go
#	epochStart/metachain/epochStartData_test.go
#	epochStart/metachain/systemSCs_test.go
#	epochStart/metachain/validators_test.go
#	epochStart/mock/economicsHandlerStub.go
#	epochStart/shardchain/trigger_test.go
#	factory/blockProcessorCreator_test.go
#	factory/consensusComponents.go
#	genesis/process/genesisBlockCreator_test.go
#	go.mod
#	go.sum
#	integrationTests/state/stateTrieClose/stateTrieClose_test.go
#	integrationTests/testProcessorNode.go
#	integrationTests/testProcessorNodeWithMultisigner.go
#	integrationTests/testSyncNode.go
#	integrationTests/vm/arwen/utils.go
#	integrationTests/vm/testInitializer.go
#	mock/hasherMock127.go
#	mock/proto/accountWrapperMock.proto
#	node/nodeBlocks_test.go
#	node/node_test.go
#	process/block/argProcessor.go
#	process/block/baseProcess_test.go
#	process/block/export_test.go
#	process/block/metablock.go
#	process/block/metablock_test.go
#	process/block/preprocess/rewardTxPreProcessor_test.go
#	process/block/preprocess/smartContractResults_test.go
#	process/block/preprocess/transactions_test.go
#	process/block/shardblock_test.go
#	process/coordinator/process_test.go
#	process/coordinator/transactionType_test.go
#	process/factory/interceptorscontainer/shardInterceptorsContainerFactory_test.go
#	process/factory/metachain/intermediateProcessorsContainerFactory_test.go
#	process/factory/metachain/preProcessorsContainerFactory_test.go
#	process/factory/metachain/vmContainerFactory_test.go
#	process/factory/shard/intermediateProcessorsContainerFactory_test.go
#	process/factory/shard/preProcessorsContainerFactory_test.go
#	process/factory/shard/vmContainerFactory_test.go
#	process/headerCheck/headerSignatureVerify_test.go
#	process/interceptors/factory/interceptedMetaHeaderDataFactory_test.go
#	process/peer/process_test.go
#	process/scToProtocol/stakingToPeer_test.go
#	process/smartContract/builtInFunctions/factory_test.go
#	process/smartContract/process_test.go
#	process/sync/argBootstrapper.go
#	process/sync/baseSync.go
#	process/sync/metablock_test.go
#	process/sync/shardblock.go
#	process/sync/shardblock_test.go
#	process/track/baseBlockTrack_test.go
#	process/transaction/metaProcess_test.go
#	process/transaction/shardProcess_test.go
#	state/accountsDB_test.go
#	state/peerAccountsDB_test.go
#	state/storagePruningManager/storagePruningManager_test.go
#	testscommon/economicsmocks/economicsDataHandlerStub.go
#	testscommon/economicsmocks/economicsHandlerMock.go
#	testscommon/economicsmocks/economicsHandlerStub.go
#	testscommon/hasherMock.go
#	testscommon/state/accountWrapperMock.go
#	testscommon/state/accountWrapperMock.proto
#	testscommon/state/proto/accountWrapperMock.proto
#	trie/branchNode_test.go
#	trie/doubleListSync_test.go
#	trie/extensionNode_test.go
#	trie/factory/trieCreator_test.go
#	trie/leafNode_test.go
#	trie/sync_test.go
#	trie/trieStorageManagerWithoutCheckpoints_test.go
#	trie/trieStorageManager_test.go
#	update/genesis/export_test.go
#	update/genesis/import.go
#	update/interface.go
#	update/mock/epochStartTriesSyncHandlerMock.go
#	update/mock/stateSyncStub.go
#	update/process/metaBlock_test.go
#	update/sync/syncAccountsDBs.go
#	vm/systemSmartContracts/esdt_test.go
@SebastianMarian SebastianMarian self-assigned this Aug 9, 2021
@iulianpascalau iulianpascalau self-requested a review August 9, 2021 15:32
iulianpascalau
iulianpascalau approved these changes Aug 9, 2021
View reviewed changes
process/common.go

// CreateShardHeader creates a shard header from the given byte array
func CreateShardHeader(marshalizer marshal.Marshalizer, hdrBuff []byte) (data.ShardHeaderHandler, error) {
hdr, err := CreateHeaderV2(marshalizer, hdrBuff)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An idea to be implemented in the feat branch: what if we specify an epoch (defined in the epoch config file) that states: after this epoch, the node accepts and will decode blocks only with this version. In this way the sub-optimal (try block v2, if it fails, try block v1 and so on) will be temporary.

@AdoAdoAdo AdoAdoAdo merged commit daa23bb into feat/scheduled-sc-execution Aug 9, 2021
@AdoAdoAdo AdoAdoAdo deleted the merge-dev-in-feat-scheduled-sc-execution branch August 9, 2021 15:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AdoAdoAdo AdoAdoAdo AdoAdoAdo approved these changes

@iulianpascalau iulianpascalau iulianpascalau approved these changes

Assignees

@SebastianMarian SebastianMarian

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@SebastianMarian @AdoAdoAdo @iulianpascalau @miiu96 @andrei-diaconescu @LucianMincu @0xmtf @sasurobert @bogdan-rosianu