Merge pull request #43 from blocknative/1.1.0

kaseonedge · web-flow · commit 34753051244a · 2023-11-16T13:41:49.000-08:00
Merge v1.1.0
diff --git a/builder/files/genesis-mainnet-v1.json b/builder/files/genesis-mainnet-v1.json
diff --git a/consensus/bor/bor.go b/consensus/bor/bor.go
@@ -172,12 +172,6 @@ func encodeSigHeader(w io.Writer, header *types.Header, c *params.BorConfig) {
 		}
 	}
 
-	if header.WithdrawalsHash != nil {
-		header.WithdrawalsHash = nil
-
-		log.Warn("Bor does not support withdrawals", "number", header.Number)
-	}
-
 	if err := rlp.Encode(w, enc); err != nil {
 		panic("can't encode: " + err.Error())
 	}
@@ -387,11 +381,14 @@ func (c *Bor) verifyHeader(chain consensus.ChainHeaderReader, header *types.Head
 
 	// Verify that the gas limit is <= 2^63-1
 	gasCap := uint64(0x7fffffffffffffff)
-
 	if header.GasLimit > gasCap {
 		return fmt.Errorf("invalid gasLimit: have %v, max %v", header.GasLimit, gasCap)
 	}
 
+	if header.WithdrawalsHash != nil {
+		return consensus.ErrUnexpectedWithdrawals
+	}
+
 	// All basic checks passed, verify cascading fields
 	return c.verifyCascadingFields(chain, header, parents)
 }
@@ -823,10 +820,7 @@ func (c *Bor) Finalize(chain consensus.ChainHeaderReader, header *types.Header,
 	headerNumber := header.Number.Uint64()
 
 	if withdrawals != nil || header.WithdrawalsHash != nil {
-		// withdrawals = nil is not required because withdrawals are not used
-		header.WithdrawalsHash = nil
-
-		log.Warn("Bor does not support withdrawals", "number", headerNumber)
+		return
 	}
 
 	if IsSprintStart(headerNumber, c.config.CalculateSprint(headerNumber)) {
@@ -904,10 +898,7 @@ func (c *Bor) FinalizeAndAssemble(ctx context.Context, chain consensus.ChainHead
 	headerNumber := header.Number.Uint64()
 
 	if withdrawals != nil || header.WithdrawalsHash != nil {
-		// withdrawals != nil not required because withdrawals are not used
-		header.WithdrawalsHash = nil
-
-		log.Warn("Bor does not support withdrawals", "number", headerNumber)
+		return nil, consensus.ErrUnexpectedWithdrawals
 	}
 
 	stateSyncData := []*types.StateSyncData{}
diff --git a/consensus/bor/statefull/processor.go b/consensus/bor/statefull/processor.go
@@ -1,6 +1,7 @@
 package statefull
 
 import (
+	"bytes"
 	"context"
 	"math"
 	"math/big"
@@ -90,7 +91,11 @@ func ApplyMessage(
 
 	success := big.NewInt(5).SetBytes(ret)
 
-	if success.Cmp(big.NewInt(0)) == 0 {
+	validatorContract := common.HexToAddress(chainConfig.Bor.ValidatorContract)
+
+	// if success == 0 and msg.To() != validatorContractAddress, log Error
+	// if msg.To() == validatorContractAddress, its committing a span and we don't get any return value
+	if success.Cmp(big.NewInt(0)) == 0 && !bytes.Equal(msg.To().Bytes(), validatorContract.Bytes()) {
 		log.Error("message execution failed on contract", "msgData", msg.Data)
 	}
 
diff --git a/consensus/errors.go b/consensus/errors.go
@@ -38,4 +38,7 @@ var (
 	// ErrInvalidTerminalBlock is returned if a block is invalid wrt. the terminal
 	// total difficulty.
 	ErrInvalidTerminalBlock = errors.New("invalid terminal block")
+
+	// ErrUnexpectedWithdrawals is returned if a pre-Shanghai block has withdrawals.
+	ErrUnexpectedWithdrawals = errors.New("unexpected withdrawals")
 )
diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go
@@ -90,12 +90,15 @@ func newShanghaiInstructionSet() JumpTable {
 
 func newMergeInstructionSet() JumpTable {
 	instructionSet := newLondonInstructionSet()
-	instructionSet[PREVRANDAO] = &operation{
-		execute:     opRandom,
-		constantGas: GasQuickStep,
-		minStack:    minStack(0, 1),
-		maxStack:    maxStack(0, 1),
-	}
+
+	// disabling in pos due to incompatibility with prevrandao
+
+	// instructionSet[PREVRANDAO] = &operation{
+	// 	execute:     opRandom,
+	// 	constantGas: GasQuickStep,
+	// 	minStack:    minStack(0, 1),
+	// 	maxStack:    maxStack(0, 1),
+	// }
 
 	return validate(instructionSet)
 }
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
@@ -1392,8 +1392,6 @@ func (api *API) traceTx(ctx context.Context, message *core.Message, txctx *Conte
 	// Call Prepare to clear out the statedb access list
 	statedb.SetTxContext(txctx.TxHash, txctx.TxIndex)
 
-	var result *core.ExecutionResult
-
 	if config.BorTx == nil {
 		config.BorTx = newBoolPtr(false)
 	}
@@ -1414,17 +1412,7 @@ func (api *API) traceTx(ctx context.Context, message *core.Message, txctx *Conte
 	// Depending on the tracer type, format and return the output.
 	switch tracer := tracer.(type) {
 	case *logger.StructLogger:
-		// If the result contains a revert reason, return it.
-		returnVal := fmt.Sprintf("%x", result.Return())
-		if len(result.Revert()) > 0 {
-			returnVal = fmt.Sprintf("%x", result.Revert())
-		}
-		return &ethapi.ExecutionResult{
-			Gas:         result.UsedGas,
-			Failed:      result.Failed(),
-			ReturnValue: returnVal,
-			StructLogs:  ethapi.FormatLogs(tracer.StructLogs()),
-		}, nil
+		return tracer.GetResult()
 
 	case Tracer:
 		return tracer.GetResult()
diff --git a/internal/cli/server/chains/mainnet.go b/internal/cli/server/chains/mainnet.go
diff --git a/internal/ethapi/transaction_args_test.go b/internal/ethapi/transaction_args_test.go
@@ -361,6 +361,10 @@ func (b *backendMock) SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent)
 	return nil
 }
 
+func (b *backendMock) SubscribeDropTxsEvent(ch chan<- core.DropTxsEvent) event.Subscription {
+	return nil
+}
+
 func (b *backendMock) Engine() consensus.Engine { return nil }
 
 func (b *backendMock) RPCRpcReturnDataLimit() uint64 {
@@ -380,7 +384,7 @@ func (b *backendMock) GetVoteOnHash(ctx context.Context, starBlockNr uint64, end
 }
 
 func (b *backendMock) GetBorBlockReceipt(ctx context.Context, hash common.Hash) (*types.Receipt, error) {
-	//nolint: nilnil
+	// nolint: nilnil
 	return nil, nil
 }
 
diff --git a/packaging/templates/package_scripts/control b/packaging/templates/package_scripts/control
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.1.0-beta3
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
diff --git a/packaging/templates/package_scripts/control.arm64 b/packaging/templates/package_scripts/control.arm64
@@ -1,5 +1,5 @@
 Source: bor
-Version: 1.1.0-beta3
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
@@ -10,4 +10,3 @@ Architecture: arm64
 Multi-Arch: foreign
 Depends:
 Description: This is the bor package from Polygon Technology.
-
diff --git a/packaging/templates/package_scripts/control.profile.amd64 b/packaging/templates/package_scripts/control.profile.amd64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta3
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
@@ -10,5 +10,3 @@ Architecture: amd64
 Multi-Arch: foreign
 Depends:
 Description: This is the bor package from Polygon Technology.
-
-
diff --git a/packaging/templates/package_scripts/control.profile.arm64 b/packaging/templates/package_scripts/control.profile.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta3
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
diff --git a/packaging/templates/package_scripts/control.validator b/packaging/templates/package_scripts/control.validator
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta3
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
diff --git a/packaging/templates/package_scripts/control.validator.arm64 b/packaging/templates/package_scripts/control.validator.arm64
@@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 1.1.0-beta3
+Version: 1.1.0
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
@@ -10,4 +10,3 @@ Architecture: arm64
 Multi-Arch: foreign
 Depends:
 Description: This is the bor package from Polygon Technology.
-
diff --git a/params/config.go b/params/config.go
diff --git a/params/config_test.go b/params/config_test.go
@@ -22,6 +22,8 @@ import (
 	"testing"
 	"time"
 
+	"gotest.tools/assert"
+
 	"github.com/ethereum/go-ethereum/common/math"
 )
 
@@ -134,3 +136,45 @@ func TestConfigRules(t *testing.T) {
 		t.Errorf("expected %v to be shanghai", 0)
 	}
 }
+
+func TestBorKeyValueConfigHelper(t *testing.T) {
+	t.Parallel()
+
+	backupMultiplier := map[string]uint64{
+		"0":        2,
+		"25275000": 5,
+		"29638656": 2,
+	}
+	assert.Equal(t, borKeyValueConfigHelper(backupMultiplier, 0), uint64(2))
+	assert.Equal(t, borKeyValueConfigHelper(backupMultiplier, 1), uint64(2))
+	assert.Equal(t, borKeyValueConfigHelper(backupMultiplier, 25275000-1), uint64(2))
+	assert.Equal(t, borKeyValueConfigHelper(backupMultiplier, 25275000), uint64(5))
+	assert.Equal(t, borKeyValueConfigHelper(backupMultiplier, 25275000+1), uint64(5))
+	assert.Equal(t, borKeyValueConfigHelper(backupMultiplier, 29638656-1), uint64(5))
+	assert.Equal(t, borKeyValueConfigHelper(backupMultiplier, 29638656), uint64(2))
+	assert.Equal(t, borKeyValueConfigHelper(backupMultiplier, 29638656+1), uint64(2))
+
+	config := map[string]uint64{
+		"0":         1,
+		"90000000":  2,
+		"100000000": 3,
+	}
+	assert.Equal(t, borKeyValueConfigHelper(config, 0), uint64(1))
+	assert.Equal(t, borKeyValueConfigHelper(config, 1), uint64(1))
+	assert.Equal(t, borKeyValueConfigHelper(config, 90000000-1), uint64(1))
+	assert.Equal(t, borKeyValueConfigHelper(config, 90000000), uint64(2))
+	assert.Equal(t, borKeyValueConfigHelper(config, 90000000+1), uint64(2))
+	assert.Equal(t, borKeyValueConfigHelper(config, 100000000-1), uint64(2))
+	assert.Equal(t, borKeyValueConfigHelper(config, 100000000), uint64(3))
+	assert.Equal(t, borKeyValueConfigHelper(config, 100000000+1), uint64(3))
+
+	burntContract := map[string]string{
+		"22640000": "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38",
+		"41824608": "0x617b94CCCC2511808A3C9478ebb96f455CF167aA",
+	}
+	assert.Equal(t, borKeyValueConfigHelper(burntContract, 22640000), "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38")
+	assert.Equal(t, borKeyValueConfigHelper(burntContract, 22640000+1), "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38")
+	assert.Equal(t, borKeyValueConfigHelper(burntContract, 41824608-1), "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38")
+	assert.Equal(t, borKeyValueConfigHelper(burntContract, 41824608), "0x617b94CCCC2511808A3C9478ebb96f455CF167aA")
+	assert.Equal(t, borKeyValueConfigHelper(burntContract, 41824608+1), "0x617b94CCCC2511808A3C9478ebb96f455CF167aA")
+}
diff --git a/params/version.go b/params/version.go
@@ -21,10 +21,10 @@ import (
 )
 
 const (
-	VersionMajor = 1       // Major version component of the current release
-	VersionMinor = 1       // Minor version component of the current release
-	VersionPatch = 0       // Patch version component of the current release
-	VersionMeta  = "beta3" // Version metadata to append to the version string
+	VersionMajor = 1  // Major version component of the current release
+	VersionMinor = 1  // Minor version component of the current release
+	VersionPatch = 0  // Patch version component of the current release
+	VersionMeta  = "" // Version metadata to append to the version string
 )
 
 var GitCommit string
diff --git a/tests/bor/helper.go b/tests/bor/helper.go
@@ -220,7 +220,11 @@ func buildNextBlock(t *testing.T, _bor consensus.Engine, chain *core.BlockChain,
 	ctx := context.Background()
 
 	// Finalize and seal the block
-	block, _ := _bor.FinalizeAndAssemble(ctx, chain, b.header, state, b.txs, nil, b.receipts, []*types.Withdrawal{})
+	block, err := _bor.FinalizeAndAssemble(ctx, chain, b.header, state, b.txs, nil, b.receipts, nil)
+
+	if err != nil {
+		panic(fmt.Sprintf("error finalizing block: %v", err))
+	}
 
 	// Write state changes to db
 	root, err := state.Commit(chain.Config().IsEIP158(b.header.Number))

Original file line number	Diff line number	Diff line change
`@@ -38,4 +38,7 @@ var (`
`38`	`38`	`// ErrInvalidTerminalBlock is returned if a block is invalid wrt. the terminal`
`39`	`39`	`// total difficulty.`
`40`	`40`	`ErrInvalidTerminalBlock = errors.New("invalid terminal block")`
	`41`	`+`
	`42`	`+ // ErrUnexpectedWithdrawals is returned if a pre-Shanghai block has withdrawals.`
	`43`	`+ ErrUnexpectedWithdrawals = errors.New("unexpected withdrawals")`
`41`	`44`	`)`
Original file line number	Diff line number	Diff line change
`@@ -361,6 +361,10 @@ func (b *backendMock) SubscribeRemovedLogsEvent(ch chan<- core.RemovedLogsEvent)`
`361`	`361`	`return nil`
`362`	`362`	`}`
`363`	`363`
	`364`	`+func (b *backendMock) SubscribeDropTxsEvent(ch chan<- core.DropTxsEvent) event.Subscription {`
	`365`	`+ return nil`
	`366`	`+}`
	`367`	`+`
`364`	`368`	`func (b *backendMock) Engine() consensus.Engine { return nil }`
`365`	`369`
`366`	`370`	`func (b *backendMock) RPCRpcReturnDataLimit() uint64 {`
`@@ -380,7 +384,7 @@ func (b *backendMock) GetVoteOnHash(ctx context.Context, starBlockNr uint64, end`
`380`	`384`	`}`
`381`	`385`
`382`	`386`	`func (b backendMock) GetBorBlockReceipt(ctx context.Context, hash common.Hash) (types.Receipt, error) {`
`383`		`- //nolint: nilnil`
	`387`	`+ // nolint: nilnil`
`384`	`388`	`return nil, nil`
`385`	`389`	`}`
`386`	`390`