Skip to content

Conversation

@ssd04
Copy link
Contributor

@ssd04 ssd04 commented Aug 14, 2024

Reasoning behind the pull request

  • Merge PR

Testing procedure

  • N/A

Pre-requisites

Based on the Contributing Guidelines the PR author and the reviewers must check the following requirements are met:

  • was the PR targeted to the correct branch?
  • if this is a larger feature that probably needs more than one PR, is there a feat branch created?
  • if this is a feat branch merging, do all satellite projects have a proper tag inside go.mod?

sstanculeanu and others added 30 commits May 2, 2024 16:16
…n-go into feat/relayedv3

# Conflicts:
#	common/constants.go
#	common/enablers/enableEpochsHandler.go
#	common/enablers/enableEpochsHandler_test.go
#	config/epochConfig.go
#	config/tomlConfig_test.go
#	go.mod
#	go.sum
#	integrationTests/multiShard/relayedTx/relayedTxV2_test.go
#	integrationTests/multiShard/relayedTx/relayedTx_test.go
#	integrationTests/vm/txsFee/moveBalance_test.go
#	integrationTests/vm/txsFee/relayedBuiltInFunctions_test.go
#	integrationTests/vm/txsFee/relayedScCalls_test.go
#	process/errors.go
…layedv3_2024.05.15

Merge rc17next1 into feat/relayedv3 2024.05.15
…in-go into multiple_inner_transactions

# Conflicts:
#	errors/errors.go
#	factory/interface.go
#	factory/mock/processComponentsStub.go
#	factory/processing/export_test.go
#	factory/processing/processComponents.go
#	factory/processing/processComponentsHandler.go
#	factory/processing/processComponentsHandler_test.go
#	go.mod
#	go.sum
#	integrationTests/mock/processComponentsStub.go
#	integrationTests/multiShard/relayedTx/common.go
#	node/chainSimulator/components/processComponents.go
#	node/chainSimulator/components/processComponents_test.go
…ompletedTxEventIdentifier for completed inner move balance of v3
update tx unmarshaller to support relayed v3 as well
…iversx/mx-chain-go into append_log_events

# Conflicts:
#	factory/processing/processComponents.go
#	go.mod
#	go.sum
#	process/errors.go
miiu96 and others added 24 commits July 31, 2024 11:56
…ifier-chain-simulator

White list data verifier fixes chain simulator
…to rc/v1.7.next1

# Conflicts:
#	.github/workflows/build_and_test.yml
#	.github/workflows/create_release.yml
#	go.mod
#	go.sum
…2024.08.08

Merge master into rc17next1 2024.08.08
@ssd04 ssd04 self-assigned this Aug 14, 2024
@ssd04 ssd04 merged commit 61db306 into feat/consensus-size-changes Aug 14, 2024
@ssd04 ssd04 deleted the merge-rc-1.8.0-into-consensus-size-changes branch August 14, 2024 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.