Update rc v1.4.0 feat/multisigner 2022.11.08

.github/CONTRIBUTING.md

@@ -1,17 +1,21 @@
 
 # Contributing to elrond-go
 
-If you are unfamiliar with the workflow of contributing to github, you can refer to this [this article](https://github.com/firstcontributions/first-contributions/blob/master/README.md)
+If you are unfamiliar with the workflow of contributing to GitHub, you can refer to [this article](https://github.com/firstcontributions/first-contributions/blob/master/README.md)
 
-## Fork & clone this repository
+## External contributions 
 
-The development should happen in a personal fork, cloned on the local machine.
+If you are not part of the team and want to contribute to this repository, you must fork & clone this repository
 
-## Use development branch
+The development should happen in a personal fork, cloned on the local machine. **Make sure you use signed commits before opening** a pull request.
 
-External contributions should happen against the `development` branch.
+For external contributors, the PRs should be targeted towards the `master` branch. A team responsible will instruct 
+the PR owner to re-target it against another branch, in accordance to internal branches management.
 
-Other branches may be used by the team members in accordance to internal decisions.
+**tl;dr**:
+- fork `elrond-go` and use `master` branch.
+- use signed commits. [docs](https://docs.github.com/en/authentication/managing-commit-signature-verification/signing-commits).
+- open a PR against the `master` branch of `ElrondNetwork/elrond-go`.
 
 ## Use linter
 
@@ -44,3 +48,23 @@ Although the nominal use case looks good, the linter runs without issues, as wel
 Depending on the PR type, there are multiple ways of manual testing the new code:
 - if it only affects an API, a log, or something not critical, one could sync a node with new code on Testnet or Devnet and see if everything works good.
 - if the changes would affect the entire network (consensus, processing, and so on), a local testnet should be started. Also, make sure backwards compatibility is maintained.
+
+## Branches management
+
+Internal Branches/Releases Management (to be checked by both the code owner and the reviewers)
+
+### `elrond-go`
+If the PR is:
+1. a hotfix: it will be targeted towards `master` branch.
+2. a feature:
+   2.1. a small feature (a single PR is needed): targeted towards an `rc` branch.
+   2.2. a big feature (more than one PR is needed): create a feature branch (`feat/...`) that is targeted towards an `rc` branch.
+
+### Satellite projects (`elrond-vm-common`, `elrond-go-core`, and so on)
+If the PR is:
+1. a hotfix: it will be targeted towards `master`/`main` branch.
+2. a feature:
+   2.1. a small feature (a single PR is needed): targeted towards an `rc` branch and create a new tag&release after merging, and reference it in `elrond-go` (if needed).
+   2.2. a big feature:
+   2.2.1. a small satellite PR: targeted towards an `rc` branch. For each change, reference just the commit hash on `elrond-go` and create a tag&pre-release when the `elrond-go` PR is to be merged.
+   2.2.2. a big satellite PR: create a feature branch (`feat/...`) targeted towards an `rc` branch. For each change, reference just the commit hash on `elrond-go` and create a tag&pre-release when the `feat` branch is merged

.github/PULL_REQUEST_TEMPLATE.md

@@ -12,3 +12,10 @@
 - 
 - 
 - 
+
+## Pre-requisites
+
+Based on the [Contributing Guidelines](https://github.com/ElrondNetwork/elrond-go/blob/master/.github/CONTRIBUTING.md#branches-management) 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`?

README.md

@@ -193,7 +193,7 @@ docker run -d -v /absolute/path/to/config/:/data/ elrondnetwork/elrond-go-node:l
 ## Contribution
 Thank you for considering to help out with the source code! We welcome contributions from anyone on the internet, and are grateful for even the smallest of fixes to Elrond!
 
-If you'd like to contribute to Elrond, please fork, fix, commit and send a pull request for the maintainers to review and merge into the main code base. If you wish to submit more complex changes though, please check up with the core developers first here on github, to ensure those changes are in line with the general philosophy of the project and/or get some early feedback which can make both your efforts much lighter as well as our review and merge procedures quick and simple.
+If you'd like to contribute to Elrond, please fork, fix, commit and send a pull request for the maintainers to review and merge into the main code base. If you wish to submit more complex changes though, please check up with the core developers first here on GitHub, to ensure those changes are in line with the general philosophy of the project and/or get some early feedback which can make both your efforts much lighter as well as our review and merge procedures quick and simple.
 
 Please make sure your contributions adhere to our coding guidelines:
 

api/errors/errors.go

@@ -40,7 +40,7 @@ var ErrGetESDTNFTData = errors.New("get esdt nft data for account error")
 // ErrEmptyAddress signals that an empty address was provided
 var ErrEmptyAddress = errors.New("address is empty")
 
-// ErrEmptyKey signals an that empty key was provided
+// ErrEmptyKey signals that an empty key was provided
 var ErrEmptyKey = errors.New("key is empty")
 
 // ErrEmptyTokenIdentifier signals that an empty token identifier was provided

api/gin/httpServer.go

@@ -23,8 +23,8 @@ func NewHttpServer(server *http.Server) (*httpServer, error) {
 	}, nil
 }
 
-// Start will handle the starting of the gin web server. This call is blocking and it should be
-// called on a go routine (different than the main one)
+// Start will handle the starting of the gin web server. This call is blocking, and it should be
+// called on a go routine (different from the main one)
 func (h *httpServer) Start() {
 	err := h.server.ListenAndServe()
 	if err != nil {

api/groups/addressGroup_test.go

@@ -676,7 +676,7 @@ func TestGetESDTNFTData_ShouldWork(t *testing.T) {
 		GetESDTDataCalled: func(_ string, _ string, _ uint64, _ api.AccountQueryOptions) (*esdt.ESDigitalToken, api.BlockInfo, error) {
 			return &esdt.ESDigitalToken{
 				Value:         big.NewInt(100),
-				Properties:    []byte(testProperties),
+				Properties:    testProperties,
 				TokenMetaData: &esdt.MetaData{Nonce: testNonce, Creator: []byte(testAddress)}}, api.BlockInfo{}, nil
 		},
 	}

api/groups/baseGroup.go

@@ -69,7 +69,7 @@ func extractSpecificMiddlewares(middlewares []shared.AdditionalMiddleware) ([]gi
 func getEndpointProperties(ws *gin.RouterGroup, path string, apiConfig config.ApiRoutesConfig) endpointProperties {
 	basePath := ws.BasePath()
 
-	// ws.BasePath will return paths like /group or /v1.0/group so we need the last token after splitting by /
+	// ws.BasePath will return paths like /group or /v1.0/group, so we need the last token after splitting by /
 	splitPath := strings.Split(basePath, "/")
 	basePath = splitPath[len(splitPath)-1]
 

api/groups/transactionGroup.go

@@ -186,7 +186,7 @@ type TxResponse struct {
 	Timestamp   uint64 `json:"timestamp"`
 }
 
-// simulateTransaction will receive a transaction from the client and will simulate it's execution and return the results
+// simulateTransaction will receive a transaction from the client and will simulate its execution and return the results
 func (tg *transactionGroup) simulateTransaction(c *gin.Context) {
 	var gtx = SendTxRequest{}
 	err := c.ShouldBindJSON(&gtx)

api/middleware/responseLogger.go

@@ -33,7 +33,7 @@ func NewResponseLoggerMiddleware(thresholdDurationForLoggingRequest time.Duratio
 	return rlm
 }
 
-// MiddlewareHandlerFunc logs detail about a request if it is not successful or it's duration is higher than a threshold
+// MiddlewareHandlerFunc logs detail about a request if it is not successful, or it's duration is higher than a threshold
 func (rlm *responseLoggerMiddleware) MiddlewareHandlerFunc() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		t := time.Now()

api/shared/interface.go

@@ -48,7 +48,7 @@ type UpgradeableHttpServerHandler interface {
 	IsInterfaceNil() bool
 }
 
-// GroupHandler defines the actions needed to be performed by an gin API group
+// GroupHandler defines the actions needed to be performed by a gin API group
 type GroupHandler interface {
 	UpdateFacade(newFacade interface{}) error
 	RegisterRoutes(

cmd/assessment/benchmarks/arwenBenchmark.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"time"
 
-	arwenConfig "github.com/ElrondNetwork/wasm-vm/config"
 	"github.com/ElrondNetwork/elrond-go-core/core"
 	"github.com/ElrondNetwork/elrond-go/integrationTests/vm/arwen/arwenvm"
 	"github.com/ElrondNetwork/elrond-go/vm/systemSmartContracts/defaults"
+	arwenConfig "github.com/ElrondNetwork/wasm-vm-v1_4/config"
 )
 
 // ArgArwenBenchmark is the Arwen type benchmark argument used in constructor

cmd/logviewer/testing/main.go

@@ -56,7 +56,7 @@ VERSION:
 )
 
 // This application starts a test web socket server, initialize it, opens "/log" route and waits for
-// clients to connect. After the connection is done, it waits for the pattern message and then it sends continuously
+// clients to connect. After the connection is done, it waits for the pattern message, and then it sends continuously
 // log lines-type of messages
 func main() {
 	initCliFlags()

cmd/node/config/config.toml

@@ -802,6 +802,8 @@
         DebuggingLogLevel = "*:DEBUG,p2p:TRACE,debug:DEBUG,process:TRACE,intercept:TRACE"
         GoRoutinesDump = true
         PollingTimeInSeconds = 240 # 4 minutes
+        # setting this to 0 disables the automatic revert of the log level
+        RevertLogLevelTimeInSeconds = 600 # 10 minutes
 
 [Health]
     IntervalVerifyMemoryInSeconds = 30

cmd/node/config/enableEpochs.toml

@@ -118,8 +118,8 @@
     # BackwardCompSaveKeyValueEnableEpoch represents the epoch when the backward compatibility for save key value error is enabled
     BackwardCompSaveKeyValueEnableEpoch = 1
 
-    # ESDTNFTCreateOnMultiShard represents the epoch when esdt nft creation is enabled on multiple shards
-    ESDTNFTCreateOnMultiShard = 1
+    # ESDTNFTCreateOnMultiShardEnableEpoch represents the epoch when esdt nft creation is enabled on multiple shards
+    ESDTNFTCreateOnMultiShardEnableEpoch = 1
 
     # MetaESDTSetEnableEpoch represents the epoch when the backward compatibility for save key value error is enabled
     MetaESDTSetEnableEpoch = 1
@@ -219,7 +219,7 @@
     FixAsyncCallBackArgsListEnableEpoch = 1
 
     # FixOldTokenLiquidityEnableEpoch represents the epoch when the fix for old token liquidity is enabled
-    FixOldTokenLiquidityEnableEpoch = 2
+    FixOldTokenLiquidityEnableEpoch = 1
 
     # SetSenderInEeiOutputTransferEnableEpoch represents the epoch when setting the sender in eei output transfers will be enabled
     SetSenderInEeiOutputTransferEnableEpoch = 4
@@ -244,4 +244,5 @@
     GasScheduleByEpochs = [
         { StartEpoch = 0, FileName = "gasScheduleV1.toml" },
         { StartEpoch = 1, FileName = "gasScheduleV6.toml" },
+        { StartEpoch = 5, FileName = "gasScheduleV7.toml" },
     ]