From c3c9be373ebc205abbe92f13138f0a0d2d6d17b7 Mon Sep 17 00:00:00 2001 From: Paul Lange Date: Tue, 13 Jun 2023 15:49:36 +0200 Subject: [PATCH 1/4] Rename gfork to gingerbread --- cmd/mycelo/genesis_commands.go | 14 ++++----- consensus/istanbul/backend/pos.go | 2 +- core/genesis.go | 2 +- core/state_processor.go | 2 +- core/state_processor_test.go | 2 +- core/tx_pool.go | 14 ++++----- core/tx_pool_test.go | 8 ++--- core/vm/celo_contracts.go | 6 ++-- core/vm/celo_contracts_test.go | 8 ++--- core/vm/interpreter.go | 4 +-- core/vm/jump_table.go | 8 ++--- core/vm/runtime/runtime.go | 2 +- core/vm/vmcontext/context.go | 4 +-- e2e_test/e2e_test.go | 20 ++++++------- e2e_test/e2e_transfer_test.go | 2 +- internal/ethapi/api.go | 10 +++---- internal/ethapi/transaction_args.go | 6 ++-- les/api.go | 14 ++++----- les/api_backend.go | 2 +- light/txpool.go | 14 ++++----- miner/block.go | 2 +- mycelo/genesis/config.go | 16 +++++----- mycelo/genesis/genesis.go | 8 ++--- params/config.go | 46 ++++++++++++++--------------- tests/init.go | 4 +-- 25 files changed, 110 insertions(+), 110 deletions(-) diff --git a/cmd/mycelo/genesis_commands.go b/cmd/mycelo/genesis_commands.go index 37b7cbe436..8a9d3f6c57 100644 --- a/cmd/mycelo/genesis_commands.go +++ b/cmd/mycelo/genesis_commands.go @@ -55,8 +55,8 @@ var templateFlags = []cli.Flag{ Usage: "Optional flag to allow espresso fork overwritting (default: 0, disable: -1)", }, cli.Int64Flag{ - Name: "forks.gfork", - Usage: "Optional flag to allow gfork fork overwritting (default: 0, disable: -1)", + Name: "forks.gingerbread", + Usage: "Optional flag to allow gingerbread fork overwritting (default: 0, disable: -1)", }, } @@ -171,12 +171,12 @@ func envFromTemplate(ctx *cli.Context, workdir string) (*env.Environment, *genes } } - if ctx.IsSet("forks.gFork") { - gForkBlockNumber := ctx.Int64("forks.gFork") - if gForkBlockNumber < 0 { - genesisConfig.Hardforks.GForkBlock = nil + if ctx.IsSet("forks.gingerbread") { + gingerbreadBlockNumber := ctx.Int64("forks.gingerbread") + if gingerbreadBlockNumber < 0 { + genesisConfig.Hardforks.GingerbreadBlock = nil } else { - genesisConfig.Hardforks.GForkBlock = big.NewInt(gForkBlockNumber) + genesisConfig.Hardforks.GingerbreadBlock = big.NewInt(gingerbreadBlockNumber) } } diff --git a/consensus/istanbul/backend/pos.go b/consensus/istanbul/backend/pos.go index 46716e0326..a2b49f6543 100644 --- a/consensus/istanbul/backend/pos.go +++ b/consensus/istanbul/backend/pos.go @@ -119,7 +119,7 @@ func (sb *Backend) distributeEpochRewards(header *types.Header, state *state.Sta return err } - if sb.ChainConfig().IsGFork(header.Number) { + if sb.ChainConfig().IsGingerbread(header.Number) { if err := sb.distributeCommunityRewards(vmRunner, communityReward); err != nil { return err } diff --git a/core/genesis.go b/core/genesis.go index cec77ed4a0..ab82761f76 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -278,7 +278,7 @@ func (g *Genesis) ToBlock(db ethdb.Database) *types.Block { Coinbase: g.Coinbase, Root: root, } - if g.Config != nil && g.Config.IsGFork(common.Big0) { + if g.Config != nil && g.Config.IsGingerbread(common.Big0) { head.Nonce = types.EncodeNonce(0) head.GasLimit = params.GenesisGasLimit head.Difficulty = common.Big0 diff --git a/core/state_processor.go b/core/state_processor.go index 1e15826acc..1307cf0ebc 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -126,7 +126,7 @@ func applyTransaction(msg types.Message, config *params.ChainConfig, gp *GasPool // CIP 57 deprecates full node incentives // Check that neither `GatewayFeeRecipient` nor `GatewayFee` are set, otherwise reject the transaction - if config.IsGFork(blockNumber) { + if config.IsGingerbread(blockNumber) { gatewayFeeSet := !(msg.GatewayFee() == nil || msg.GatewayFee().Cmp(common.Big0) == 0) if msg.GatewayFeeRecipient() != nil || gatewayFeeSet { return nil, ErrGatewayFeeDeprecated diff --git a/core/state_processor_test.go b/core/state_processor_test.go index 75897ea5cb..ad9598a745 100644 --- a/core/state_processor_test.go +++ b/core/state_processor_test.go @@ -51,7 +51,7 @@ func TestStateProcessorErrors(t *testing.T) { ChurritoBlock: big.NewInt(0), DonutBlock: big.NewInt(0), EspressoBlock: big.NewInt(0), - GForkBlock: big.NewInt(0), + GingerbreadBlock: big.NewInt(0), Faker: true, FakeBaseFee: common.Big3, } diff --git a/core/tx_pool.go b/core/tx_pool.go index 4c722c3fee..c782ad13cf 100644 --- a/core/tx_pool.go +++ b/core/tx_pool.go @@ -272,11 +272,11 @@ type TxPool struct { signer types.Signer mu sync.RWMutex - homestead bool // Fork indicator for the homstead fork - istanbul bool // Fork indicator whether we are in the istanbul stage. - donut bool // Fork indicator for the Donut fork. - espresso bool // Fork indicator for the Espresso fork. - gfork bool // Fork indicator for the G fork. + homestead bool // Fork indicator for the homstead fork + istanbul bool // Fork indicator whether we are in the istanbul stage. + donut bool // Fork indicator for the Donut fork. + espresso bool // Fork indicator for the Espresso fork. + gingerbread bool // Fork indicator for the G fork. currentState *state.StateDB // Current state in the blockchain head currentVMRunner vm.EVMRunner // Current EVMRunner @@ -662,7 +662,7 @@ func (pool *TxPool) validateTx(tx *types.Transaction, local bool) error { // CIP 57 deprecates full node incentives gatewayFeeSet := !(tx.GatewayFee() == nil || tx.GatewayFee().Cmp(common.Big0) == 0) - if pool.gfork && (tx.GatewayFeeRecipient() != nil || gatewayFeeSet) { + if pool.gingerbread && (tx.GatewayFeeRecipient() != nil || gatewayFeeSet) { return ErrGatewayFeeDeprecated } @@ -1419,7 +1419,7 @@ func (pool *TxPool) reset(oldHead, newHead *types.Header) { pool.istanbul = pool.chainconfig.IsIstanbul(next) pool.donut = pool.chainconfig.IsDonut(next) pool.espresso = pool.chainconfig.IsEspresso(next) - pool.gfork = pool.chainconfig.IsGFork(next) + pool.gingerbread = pool.chainconfig.IsGingerbread(next) } // promoteExecutables moves transactions that have become processable from the diff --git a/core/tx_pool_test.go b/core/tx_pool_test.go index 25204d095d..eadcb16f0e 100644 --- a/core/tx_pool_test.go +++ b/core/tx_pool_test.go @@ -376,7 +376,7 @@ func TestInvalidTransactionsPreGFork(t *testing.T) { pool, key := setupTxPool() defer pool.Stop() - pool.gfork = false + pool.gingerbread = false tx := transaction(0, 100, key) from, _ := deriveSender(tx) @@ -944,7 +944,7 @@ func TestTransactionGapFilling(t *testing.T) { // (a) to set pool.donut = false at its start (so we can add unprotected transactions) // (b) different functions to generate protected vs unprotected transactions, since we will // need to update transaction() and the others to use replay protection -func TestPoolReAcceptingUnprotectedTxsFromEFork(t *testing.T) { +func TestPoolReAcceptingUnprotectedTxsFromEspresso(t *testing.T) { t.Parallel() pool, key := setupTxPool() @@ -993,8 +993,8 @@ func TestPoolReAcceptingUnprotectedTxsFromEFork(t *testing.T) { t.Fatalf("after donut, queued transactions mismatched: have %d, want %d", queued, 3) } - // In E fork - // flag it as E hard fork + // In Espresso + // flag it as Espresso fork pool.espresso = true pool.AddRemotesSync([]*types.Transaction{ transaction(3, 100000, key), diff --git a/core/vm/celo_contracts.go b/core/vm/celo_contracts.go index 5e075f4354..205ccf4dc5 100644 --- a/core/vm/celo_contracts.go +++ b/core/vm/celo_contracts.go @@ -83,7 +83,7 @@ func (c *transfer) Run(input []byte, ctx *celoPrecompileContext) ([]byte, error) // to: 32 bytes representing the address of the recipient // value: 32 bytes, a 256 bit integer representing the amount of Celo Gold to transfer // 3 arguments x 32 bytes each = 96 bytes total input - if (ctx.IsGFork && len(input) != 96) || len(input) < 96 { + if (ctx.IsGingerbread && len(input) != 96) || len(input) < 96 { return nil, ErrInputLength } @@ -163,7 +163,7 @@ func (c *fractionMulExp) Run(input []byte, ctx *celoPrecompileContext) ([]byte, // decimals: 32 bytes, 256 bit integer, places of precision // // 6 args x 32 bytes each = 192 bytes total input length - if (ctx.IsGFork && len(input) != 192) || len(input) < 192 { + if (ctx.IsGingerbread && len(input) != 192) || len(input) < 192 { return nil, ErrInputLength } @@ -310,7 +310,7 @@ func (c *getValidator) Run(input []byte, ctx *celoPrecompileContext) ([]byte, er // input is comprised of two arguments: // index: 32 byte integer representing the index of the validator to get // blockNumber: 32 byte integer representing the block number to access - if (ctx.IsGFork && len(input) != 64) || len(input) < 64 { + if (ctx.IsGingerbread && len(input) != 64) || len(input) < 64 { return nil, ErrInputLength } diff --git a/core/vm/celo_contracts_test.go b/core/vm/celo_contracts_test.go index 128ca9e83b..abac1df579 100644 --- a/core/vm/celo_contracts_test.go +++ b/core/vm/celo_contracts_test.go @@ -145,11 +145,11 @@ func BenchmarkPrecompiledEd25519Verify(b *testing.B) { benchJson("ed25519Verify" // Tests sample inputs for fractionMulExp // NOTE: This currently only verifies that inputs of invalid length are rejected func TestPrecompiledFractionMulExp(t *testing.T) { - // Post GFork behaviour - mockEVM.chainRules.IsGFork = true + // Post Gingerbread behaviour + mockEVM.chainRules.IsGingerbread = true testJson("fractionMulExp", "fc", t) - // Pre GFork behaviour - mockEVM.chainRules.IsGFork = false + // Pre Gingerbread behaviour + mockEVM.chainRules.IsGingerbread = false testJson("fractionMulExpOld", "fc", t) } diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index c5c6cbb09c..982072a50e 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -74,8 +74,8 @@ func NewEVMInterpreter(evm *EVM, cfg Config) *EVMInterpreter { if cfg.JumpTable[STOP] == nil { var jt JumpTable switch { - case evm.chainRules.IsGFork: - jt = gforkInstructionSet + case evm.chainRules.IsGingerbread: + jt = gingerbreadInstructionSet case evm.chainRules.IsEspresso: jt = espressoInstructionSet case evm.chainRules.IsIstanbul: diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 75829559f8..29700f3ef5 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -57,15 +57,15 @@ var ( constantinopleInstructionSet = newConstantinopleInstructionSet() istanbulInstructionSet = newIstanbulInstructionSet() espressoInstructionSet = newEspressoInstructionSet() - gforkInstructionSet = newGforkInstructionSet() + gingerbreadInstructionSet = newGingerbreadInstructionSet() ) // JumpTable contains the EVM opcodes supported at a given fork. type JumpTable [256]*operation -// newGforkInstructionSet returns the frontier, homestead, byzantium, -// constantinople, istanbul, petersburg, espresso and g-fork instructions. -func newGforkInstructionSet() JumpTable { +// newGingerbreadInstructionSet returns the frontier, homestead, byzantium, +// constantinople, istanbul, petersburg, espresso and gingerbread instructions. +func newGingerbreadInstructionSet() JumpTable { instructionSet := newEspressoInstructionSet() instructionSet[GASLIMIT] = &operation{ execute: opGasLimit, diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 0c1a21a3b3..1780c60115 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -67,7 +67,7 @@ func setDefaults(cfg *Config) { ChurritoBlock: new(big.Int), DonutBlock: new(big.Int), EspressoBlock: new(big.Int), - GForkBlock: new(big.Int), + GingerbreadBlock: new(big.Int), } } if cfg.Time == nil { diff --git a/core/vm/vmcontext/context.go b/core/vm/vmcontext/context.go index 128ba3619d..987ae9e727 100644 --- a/core/vm/vmcontext/context.go +++ b/core/vm/vmcontext/context.go @@ -154,8 +154,8 @@ func TobinTransfer(evm *vm.EVM, sender, recipient common.Address, amount *big.In defer func() { evm.SetDebug(true) }() } - // Only deduct tobin tax before the g hardfork - if evm.ChainConfig().IsGFork(evm.Context.BlockNumber) { + // Only deduct tobin tax before gingerbread fork + if evm.ChainConfig().IsGingerbread(evm.Context.BlockNumber) { Transfer(evm.StateDB, sender, recipient, amount) } else { if amount.Cmp(big.NewInt(0)) != 0 { diff --git a/e2e_test/e2e_test.go b/e2e_test/e2e_test.go index 2190b2abfa..2a3c6cea9a 100644 --- a/e2e_test/e2e_test.go +++ b/e2e_test/e2e_test.go @@ -604,7 +604,7 @@ func TestEthersJSCompatibilityDisableAfterGingerbread(t *testing.T) { for _, field := range []string{"gasLimit", "baseFeePerGas", "sha3Uncles", "uncles", "nonce", "mixHash", "difficulty"} { _, ok := result[field] - assert.Truef(t, ok, "%s field should be present on RPC block after GFork", field) + assert.Truef(t, ok, "%s field should be present on RPC block after Gingerbread", field) } require.Equal(t, result["sha3Uncles"], "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347") @@ -621,21 +621,21 @@ func TestEthersJSCompatibilityDisableAfterGingerbread(t *testing.T) { err = network[0].WsClient.GetRPCClient().CallContext(ctx, &result, "eth_getBlockByNumber", "latest", true) require.NoError(t, err) - // After GFork, gasLimit should be returned directly from the header, even if + // After Gingerbread, gasLimit should be returned directly from the header, even if // RPCEthCompatibility is off, since it is now part of the header hash. _, ok := result["gasLimit"] - assert.True(t, ok, "gasLimit field must be present on RPC block after GFork") + assert.True(t, ok, "gasLimit field must be present on RPC block after Gingerbread") _, ok = result["baseFeePerGas"] assert.False(t, ok, "baseFeePerGas field must be present on RPC block") } // This test checks the functionality of the configuration to enable/disable -// returning the 'gasLimit' and 'baseFeePerGas' fields on RPC blocks before the GFork happened. -// GFork is relevant because it added the gasLimit to the header. -func TestEthersJSCompatibilityDisableBeforeGFork(t *testing.T) { +// returning the 'gasLimit' and 'baseFeePerGas' fields on RPC blocks before the Gingerbread happened. +// Gingerbread is relevant because it added the gasLimit to the header. +func TestEthersJSCompatibilityDisableBeforeGingerbread(t *testing.T) { ac := test.AccountConfig(1, 1) gc, ec, err := test.BuildConfig(ac) - gc.Hardforks.GForkBlock = nil + gc.Hardforks.GingerbreadBlock = nil require.NoError(t, err) // Check fields present (compatibility set by default) @@ -652,11 +652,11 @@ func TestEthersJSCompatibilityDisableBeforeGFork(t *testing.T) { for _, field := range []string{"gasLimit", "baseFeePerGas", "difficulty"} { _, ok := result[field] - assert.Truef(t, ok, "%s field should be present on RPC block before GFork", field) + assert.Truef(t, ok, "%s field should be present on RPC block before Gingerbread", field) } for _, field := range []string{"sha3Uncles", "uncles", "nonce", "mixHash"} { _, ok := result[field] - assert.Falsef(t, ok, "%s field should not be present on RPC block before GFork", field) + assert.Falsef(t, ok, "%s field should not be present on RPC block before Gingerbread", field) } // Turn off compatibility and check fields are not present @@ -674,6 +674,6 @@ func TestEthersJSCompatibilityDisableBeforeGFork(t *testing.T) { for _, field := range []string{"gasLimit", "baseFeePerGas", "sha3Uncles", "uncles", "nonce", "mixHash", "difficulty"} { _, ok := result[field] - assert.Falsef(t, ok, "%s field should not be present on RPC block before GFork", field) + assert.Falsef(t, ok, "%s field should not be present on RPC block before Gingerbread", field) } } diff --git a/e2e_test/e2e_transfer_test.go b/e2e_test/e2e_transfer_test.go index 40f30c7e95..7f5174c253 100644 --- a/e2e_test/e2e_transfer_test.go +++ b/e2e_test/e2e_transfer_test.go @@ -215,7 +215,7 @@ func TestTransferCELO(t *testing.T) { func TestTransferCELOPreGFork(t *testing.T) { ac := test.AccountConfig(1, 3) gc, ec, err := test.BuildConfig(ac) - gc.Hardforks.GForkBlock = nil + gc.Hardforks.GingerbreadBlock = nil require.NoError(t, err) network, shutdown, err := test.NewNetwork(ac, gc, ec) diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 933c0ffd05..9761ac6740 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -743,17 +743,17 @@ func (s *PublicBlockChainAPI) GetBlockByHash(ctx context.Context, hash common.Ha // rpc response that ethers.js depends upon. // See https://github.com/celo-org/celo-blockchain/issues/1945 func addEthCompatibilityFields(ctx context.Context, response map[string]interface{}, b Backend, block *types.Block) { - isGFork := b.ChainConfig().IsGFork(block.Number()) + isGingerbread := b.ChainConfig().IsGingerbread(block.Number()) if !b.RPCEthCompatibility() { - if !isGFork { + if !isGingerbread { delete(response, "gasLimit") } return } header := block.Header() - if !isGFork { - // Before GFork, the header did not include the gasLimit, so we have to manually add it for eth-compatible RPC responses. + if !isGingerbread { + // Before Gingerbread, the header did not include the gasLimit, so we have to manually add it for eth-compatible RPC responses. hash := header.Hash() numhash := rpc.BlockNumberOrHash{ BlockHash: &hash, @@ -1150,7 +1150,7 @@ func RPCMarshalHeader(head *types.Header) map[string]interface{} { "receiptsRoot": head.ReceiptHash, } // Former proof-of-work fields, now constants, see https://eips.ethereum.org/EIPS/eip-3675#block-structure - // Set after GFork + // Set after Gingerbread if head.Difficulty != nil { result["difficulty"] = (*hexutil.Big)(head.Difficulty) result["nonce"] = head.Nonce diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go index 201ccccd06..b700c4d118 100644 --- a/internal/ethapi/transaction_args.go +++ b/internal/ethapi/transaction_args.go @@ -87,7 +87,7 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend) error { } // After london, default to 1559 unless gasPrice is set currentBlockNumber := b.CurrentHeader().Number - isGFork := b.ChainConfig().IsGFork(currentBlockNumber) + isGingerbread := b.ChainConfig().IsGingerbread(currentBlockNumber) // If user specifies both maxPriorityfee and maxFee, then we do not // need to consult the chain for defaults. It's definitely a London tx. @@ -151,7 +151,7 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend) error { if args.To == nil && len(args.data()) == 0 { return errors.New(`contract creation without any data provided`) } - if args.GatewayFeeRecipient == nil && !args.EthCompatible && !isGFork { + if args.GatewayFeeRecipient == nil && !args.EthCompatible && !isGingerbread { recipient := b.GatewayFeeRecipient() if (recipient != common.Address{}) { args.GatewayFeeRecipient = &recipient @@ -183,7 +183,7 @@ func (args *TransactionArgs) setDefaults(ctx context.Context, b Backend) error { args.Gas = &estimated log.Trace("Estimate gas usage automatically", "gas", args.Gas) } - if args.GatewayFeeRecipient != nil && args.GatewayFee == nil && !isGFork { + if args.GatewayFeeRecipient != nil && args.GatewayFee == nil && !isGingerbread { args.GatewayFee = (*hexutil.Big)(b.GatewayFee()) } if args.ChainID == nil { diff --git a/les/api.go b/les/api.go index 19f1a94536..c1837d535c 100644 --- a/les/api.go +++ b/les/api.go @@ -67,7 +67,7 @@ func parseNode(node string) (enode.ID, error) { //GatewayFee returns the current gateway fee of this light server func (api *PrivateLightServerAPI) GatewayFee() (gf *big.Int, err error) { - if api.server.handler.blockchain.Config().IsGFork(api.server.handler.blockchain.CurrentHeader().Number) { + if api.server.handler.blockchain.Config().IsGingerbread(api.server.handler.blockchain.CurrentHeader().Number) { return nil, core.ErrGatewayFeeDeprecated } return api.server.handler.gatewayFee, nil @@ -75,7 +75,7 @@ func (api *PrivateLightServerAPI) GatewayFee() (gf *big.Int, err error) { //SetGatewayFee allows this light server node to set a gateway fee func (api *PrivateLightServerAPI) SetGatewayFee(gf *big.Int) error { - if api.server.handler.blockchain.Config().IsGFork(api.server.handler.blockchain.CurrentHeader().Number) { + if api.server.handler.blockchain.Config().IsGingerbread(api.server.handler.blockchain.CurrentHeader().Number) { return core.ErrGatewayFeeDeprecated } @@ -93,7 +93,7 @@ func (api *PrivateLightServerAPI) SetGatewayFee(gf *big.Int) error { // SetGatewayFeeRecipient sets the etherbase of the gateway fee recipient func (api *PrivateLightServerAPI) SetGatewayFeeRecipient(etherbase common.Address) error { - if api.server.handler.blockchain.Config().IsGFork(api.server.handler.blockchain.CurrentHeader().Number) { + if api.server.handler.blockchain.Config().IsGingerbread(api.server.handler.blockchain.CurrentHeader().Number) { return core.ErrGatewayFeeDeprecated } @@ -107,7 +107,7 @@ func (api *PrivateLightServerAPI) SetGatewayFeeRecipient(etherbase common.Addres } func (api *PrivateLightServerAPI) GatewayFeeRecipient() (eb common.Address, err error) { - if api.server.handler.blockchain.Config().IsGFork(api.server.handler.blockchain.CurrentHeader().Number) { + if api.server.handler.blockchain.Config().IsGingerbread(api.server.handler.blockchain.CurrentHeader().Number) { return common.Address{}, core.ErrGatewayFeeDeprecated } return api.server.handler.etherbase, nil @@ -468,7 +468,7 @@ func NewPrivateLightClientAPI(le *LightEthereum) *PrivateLightClientAPI { } func (api *PrivateLightClientAPI) GatewayFeeCache() map[string]*GatewayFeeInformation { - if api.le.blockchain.Config().IsGFork(api.le.handler.backend.blockchain.CurrentHeader().Number) { + if api.le.blockchain.Config().IsGingerbread(api.le.handler.backend.blockchain.CurrentHeader().Number) { return nil } return api.le.handler.gatewayFeeCache.getMap() @@ -476,7 +476,7 @@ func (api *PrivateLightClientAPI) GatewayFeeCache() map[string]*GatewayFeeInform // RequestPeerGatewayFees updates cache by pulling gateway fee peer nodes func (api *PrivateLightClientAPI) RequestPeerGatewayFees() error { - if api.le.blockchain.Config().IsGFork(api.le.handler.backend.blockchain.CurrentHeader().Number) { + if api.le.blockchain.Config().IsGingerbread(api.le.handler.backend.blockchain.CurrentHeader().Number) { return core.ErrGatewayFeeDeprecated } peerNodes := api.le.peers.allPeers() @@ -492,7 +492,7 @@ func (api *PrivateLightClientAPI) RequestPeerGatewayFees() error { // SuggestGatewayFee suggests the best light server to choose based on different factors. Currently only minPeerGatewayFee. func (api *PrivateLightClientAPI) SuggestGatewayFee() (*GatewayFeeInformation, error) { - if api.le.blockchain.Config().IsGFork(api.le.handler.backend.blockchain.CurrentHeader().Number) { + if api.le.blockchain.Config().IsGingerbread(api.le.handler.backend.blockchain.CurrentHeader().Number) { return nil, core.ErrGatewayFeeDeprecated } bestGatewayFeeInfo, err := api.le.handler.gatewayFeeCache.MinPeerGatewayFee() diff --git a/les/api_backend.go b/les/api_backend.go index f30ad61a84..a80bd72af9 100644 --- a/les/api_backend.go +++ b/les/api_backend.go @@ -390,7 +390,7 @@ func (b *LesApiBackend) ServiceFilter(ctx context.Context, session *bloombits.Ma } func (b *LesApiBackend) GatewayFeeRecipient() common.Address { - if b.ChainConfig().IsGFork(b.CurrentHeader().Number) { + if b.ChainConfig().IsGingerbread(b.CurrentHeader().Number) { return common.Address{} } return b.eth.GetRandomPeerEtherbase() diff --git a/light/txpool.go b/light/txpool.go index 47f286d091..33aa6edc22 100644 --- a/light/txpool.go +++ b/light/txpool.go @@ -69,11 +69,11 @@ type TxPool struct { mined map[common.Hash][]*types.Transaction // mined transactions by block hash clearIdx uint64 // earliest block nr that can contain mined tx info - homestead bool // Fork indicator whether homestead has been activated - istanbul bool // Fork indicator whether we are in the istanbul stage - donut bool // Fork indicator whether Donut has been activated - espresso bool // Fork indicator whether Espresso has been activated - gfork bool // Fork indicator for the G fork. + homestead bool // Fork indicator whether homestead has been activated + istanbul bool // Fork indicator whether we are in the istanbul stage + donut bool // Fork indicator whether Donut has been activated + espresso bool // Fork indicator whether Espresso has been activated + gingerbread bool // Fork indicator for the G fork. } // TxRelayBackend provides an interface to the mechanism that forwards transacions @@ -330,7 +330,7 @@ func (pool *TxPool) setNewHead(head *types.Header) { pool.istanbul = pool.config.IsIstanbul(next) pool.donut = pool.config.IsDonut(next) pool.espresso = pool.config.IsEspresso(next) - pool.gfork = pool.config.IsGFork(next) + pool.gingerbread = pool.config.IsGingerbread(next) } // Stop stops the light transaction pool @@ -378,7 +378,7 @@ func (pool *TxPool) validateTx(ctx context.Context, tx *types.Transaction) error // CIP 57 deprecates full node incentives gatewayFeeSet := !(tx.GatewayFee() == nil || tx.GatewayFee().Cmp(common.Big0) == 0) - if pool.gfork && (tx.GatewayFeeRecipient() != nil || gatewayFeeSet) { + if pool.gingerbread && (tx.GatewayFeeRecipient() != nil || gatewayFeeSet) { return core.ErrGatewayFeeDeprecated } diff --git a/miner/block.go b/miner/block.go index ae7c3e52aa..4bf25a548c 100644 --- a/miner/block.go +++ b/miner/block.go @@ -111,7 +111,7 @@ func prepareBlock(w *worker) (*blockState, error) { sysCtx: core.NewSysContractCallCtx(header, state.Copy(), w.chain), } b.gasPool = new(core.GasPool).AddGas(b.gasLimit) - if w.chainConfig.IsGFork(header.Number) { + if w.chainConfig.IsGingerbread(header.Number) { header.GasLimit = b.gasLimit header.Difficulty = big.NewInt(0) header.Nonce = types.EncodeNonce(0) diff --git a/mycelo/genesis/config.go b/mycelo/genesis/config.go index 5b12d9725f..a54334aced 100644 --- a/mycelo/genesis/config.go +++ b/mycelo/genesis/config.go @@ -81,10 +81,10 @@ func (cfg *Config) ChainConfig() *params.ChainConfig { PetersburgBlock: common.Big0, IstanbulBlock: common.Big0, - ChurritoBlock: cfg.Hardforks.ChurritoBlock, - DonutBlock: cfg.Hardforks.DonutBlock, - EspressoBlock: cfg.Hardforks.EspressoBlock, - GForkBlock: cfg.Hardforks.GForkBlock, + ChurritoBlock: cfg.Hardforks.ChurritoBlock, + DonutBlock: cfg.Hardforks.DonutBlock, + EspressoBlock: cfg.Hardforks.EspressoBlock, + GingerbreadBlock: cfg.Hardforks.GingerbreadBlock, Istanbul: ¶ms.IstanbulConfig{ Epoch: cfg.Istanbul.Epoch, @@ -98,10 +98,10 @@ func (cfg *Config) ChainConfig() *params.ChainConfig { // HardforkConfig contains celo hardforks activation blocks type HardforkConfig struct { - ChurritoBlock *big.Int `json:"churritoBlock"` - DonutBlock *big.Int `json:"donutBlock"` - EspressoBlock *big.Int `json:"espressoBlock"` - GForkBlock *big.Int `json:"gForkBlock"` + ChurritoBlock *big.Int `json:"churritoBlock"` + DonutBlock *big.Int `json:"donutBlock"` + EspressoBlock *big.Int `json:"espressoBlock"` + GingerbreadBlock *big.Int `json:"gingerbreadBlock"` } // MultiSigParameters are the initial configuration parameters for a MultiSig contract diff --git a/mycelo/genesis/genesis.go b/mycelo/genesis/genesis.go index d2f68e62d1..c4a281e4f5 100644 --- a/mycelo/genesis/genesis.go +++ b/mycelo/genesis/genesis.go @@ -25,10 +25,10 @@ func CreateCommonGenesisConfig(chainID *big.Int, adminAccountAddress common.Addr genesisConfig.GenesisTimestamp = uint64(time.Now().Unix()) genesisConfig.Istanbul = istanbulConfig genesisConfig.Hardforks = HardforkConfig{ - ChurritoBlock: common.Big0, - DonutBlock: common.Big0, - EspressoBlock: common.Big0, - GForkBlock: common.Big0, + ChurritoBlock: common.Big0, + DonutBlock: common.Big0, + EspressoBlock: common.Big0, + GingerbreadBlock: common.Big0, } // Make admin account manager of Governance & Reserve diff --git a/params/config.go b/params/config.go index 956febd020..2dcb7d672c 100644 --- a/params/config.go +++ b/params/config.go @@ -65,7 +65,7 @@ var ( ChurritoBlock: big.NewInt(6774000), DonutBlock: big.NewInt(6774000), EspressoBlock: big.NewInt(11838440), - GForkBlock: nil, + GingerbreadBlock: nil, Istanbul: &IstanbulConfig{ Epoch: 17280, ProposerPolicy: 2, @@ -91,7 +91,7 @@ var ( ChurritoBlock: big.NewInt(2719099), DonutBlock: big.NewInt(5002000), EspressoBlock: big.NewInt(9195000), - GForkBlock: nil, + GingerbreadBlock: nil, Istanbul: &IstanbulConfig{ Epoch: 17280, ProposerPolicy: 2, @@ -117,7 +117,7 @@ var ( ChurritoBlock: big.NewInt(4960000), DonutBlock: big.NewInt(4960000), EspressoBlock: big.NewInt(9472000), - GForkBlock: nil, + GingerbreadBlock: nil, Istanbul: &IstanbulConfig{ Epoch: 17280, ProposerPolicy: 2, @@ -145,10 +145,10 @@ var ( PetersburgBlock: big.NewInt(0), IstanbulBlock: big.NewInt(0), - ChurritoBlock: big.NewInt(0), - DonutBlock: big.NewInt(0), - EspressoBlock: big.NewInt(0), - GForkBlock: big.NewInt(0), + ChurritoBlock: big.NewInt(0), + DonutBlock: big.NewInt(0), + EspressoBlock: big.NewInt(0), + GingerbreadBlock: big.NewInt(0), Istanbul: &IstanbulConfig{ Epoch: 30000, @@ -251,10 +251,10 @@ type ChainConfig struct { // MuirGlacierBlock *big.Int `json:"muirGlacierBlock,omitempty"` // Eip-2384 (bomb delay) switch block (nil = no fork, 0 = already activated) // BerlinBlock *big.Int `json:"berlinBlock,omitempty"` // Berlin switch block (nil = no fork, 0 = already on berlin) // LondonBlock *big.Int `json:"londonBlock,omitempty"` // London switch block (nil = no fork, 0 = already on london) - ChurritoBlock *big.Int `json:"churritoBlock,omitempty"` // Churrito switch block (nil = no fork, 0 = already activated) - DonutBlock *big.Int `json:"donutBlock,omitempty"` // Donut switch block (nil = no fork, 0 = already activated) - EspressoBlock *big.Int `json:"espressoBlock,omitempty"` // Espresso switch block (nil = no fork, 0 = already activated) - GForkBlock *big.Int `json:"gForkBlock,omitempty"` // G Fork switch block (nil = no fork, 0 = already activated) + ChurritoBlock *big.Int `json:"churritoBlock,omitempty"` // Churrito switch block (nil = no fork, 0 = already activated) + DonutBlock *big.Int `json:"donutBlock,omitempty"` // Donut switch block (nil = no fork, 0 = already activated) + EspressoBlock *big.Int `json:"espressoBlock,omitempty"` // Espresso switch block (nil = no fork, 0 = already activated) + GingerbreadBlock *big.Int `json:"gingerbreadBlock,omitempty"` // Gingerbread switch block (nil = no fork, 0 = already activated) Istanbul *IstanbulConfig `json:"istanbul,omitempty"` // This does not belong here but passing it to every function is not possible since that breaks @@ -297,7 +297,7 @@ func (c *ChainConfig) String() string { } else { engine = "MockEngine" } - return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v Churrito: %v, Donut: %v, Espresso: %v, GFork: %v, Engine: %v}", + return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v Churrito: %v, Donut: %v, Espresso: %v, Gingerbread: %v, Engine: %v}", c.ChainID, c.HomesteadBlock, c.DAOForkBlock, @@ -315,7 +315,7 @@ func (c *ChainConfig) String() string { c.ChurritoBlock, c.DonutBlock, c.EspressoBlock, - c.GForkBlock, + c.GingerbreadBlock, engine, ) } @@ -394,9 +394,9 @@ func (c *ChainConfig) IsEspresso(num *big.Int) bool { return isForked(c.EspressoBlock, num) } -// IsGFork returns whether num represents a block number after the G fork -func (c *ChainConfig) IsGFork(num *big.Int) bool { - return isForked(c.GForkBlock, num) +// IsGingerbread returns whether num represents a block number after the Gingerbread fork +func (c *ChainConfig) IsGingerbread(num *big.Int) bool { + return isForked(c.GingerbreadBlock, num) } // CheckCompatible checks whether scheduled fork transitions have been imported @@ -438,7 +438,7 @@ func (c *ChainConfig) CheckConfigForkOrder() error { {name: "churritoBlock", block: c.ChurritoBlock}, {name: "donutBlock", block: c.DonutBlock}, {name: "espressoBlock", block: c.EspressoBlock}, - {name: "gForkBlock", block: c.GForkBlock}, + {name: "gingerbreadBlock", block: c.GingerbreadBlock}, } { if lastFork.name != "" { // Next one must be higher number @@ -513,8 +513,8 @@ func (c *ChainConfig) checkCeloCompatible(newcfg *ChainConfig, head *big.Int) *C if isForkIncompatible(c.EspressoBlock, newcfg.EspressoBlock, head) { return newCompatError("Espresso fork block", c.EspressoBlock, newcfg.EspressoBlock) } - if isForkIncompatible(c.GForkBlock, newcfg.GForkBlock, head) { - return newCompatError("G fork block", c.GForkBlock, newcfg.GForkBlock) + if isForkIncompatible(c.GingerbreadBlock, newcfg.GingerbreadBlock, head) { + return newCompatError("Gingerbread fork block", c.GingerbreadBlock, newcfg.GingerbreadBlock) } return nil } @@ -584,7 +584,7 @@ type Rules struct { IsHomestead, IsEIP150, IsEIP155, IsEIP158 bool IsByzantium, IsConstantinople, IsPetersburg, IsIstanbul bool IsBerlin, IsLondon bool - IsChurrito, IsDonut, IsEspresso, IsGFork bool + IsChurrito, IsDonut, IsEspresso, IsGingerbread bool } // Rules ensures c's ChainID is not nil. @@ -608,7 +608,7 @@ func (c *ChainConfig) Rules(num *big.Int) Rules { IsChurrito: c.IsChurrito(num), IsDonut: c.IsDonut(num), IsEspresso: c.IsEspresso(num), - IsGFork: c.IsGFork(num), + IsGingerbread: c.IsGingerbread(num), } } @@ -628,7 +628,7 @@ func (c *ChainConfig) OverrideChainIdConfig(chainId *big.Int) *ChainConfig { } func (c *ChainConfig) DisableGFork() *ChainConfig { - c.GForkBlock = nil + c.GingerbreadBlock = nil return c } @@ -649,7 +649,7 @@ func (c *ChainConfig) DeepCopy() *ChainConfig { ChurritoBlock: copyBigIntOrNil(c.ChurritoBlock), DonutBlock: copyBigIntOrNil(c.DonutBlock), EspressoBlock: copyBigIntOrNil(c.EspressoBlock), - GForkBlock: copyBigIntOrNil(c.GForkBlock), + GingerbreadBlock: copyBigIntOrNil(c.GingerbreadBlock), Istanbul: &IstanbulConfig{ Epoch: c.Istanbul.Epoch, diff --git a/tests/init.go b/tests/init.go index 2d39da424b..1c0b2f8925 100644 --- a/tests/init.go +++ b/tests/init.go @@ -170,7 +170,7 @@ var Forks = map[string]*params.ChainConfig{ DonutBlock: big.NewInt(0), EspressoBlock: big.NewInt(5), }, - "GFork": { + "Gingerbread": { ChainID: big.NewInt(1), HomesteadBlock: big.NewInt(0), EIP150Block: big.NewInt(0), @@ -183,7 +183,7 @@ var Forks = map[string]*params.ChainConfig{ ChurritoBlock: big.NewInt(0), DonutBlock: big.NewInt(0), EspressoBlock: big.NewInt(0), - GForkBlock: big.NewInt(0), + GingerbreadBlock: big.NewInt(0), }, } From a3a82973329e3d7594dc763183771631c3069c86 Mon Sep 17 00:00:00 2001 From: Paul Lange Date: Tue, 13 Jun 2023 15:58:31 +0200 Subject: [PATCH 2/4] Add `override.gingerbread` flag This one existed for espresso as well and was just adapted to gingerbread. --- cmd/geth/config.go | 4 ++-- cmd/geth/main.go | 2 +- cmd/utils/flags.go | 6 +++--- core/genesis.go | 6 +++--- eth/backend.go | 2 +- eth/ethconfig/config.go | 4 ++-- eth/ethconfig/gen_config.go | 10 +++++----- les/client.go | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 2a7e4ef473..616daac214 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -158,8 +158,8 @@ func makeConfigNode(ctx *cli.Context) (*node.Node, gethConfig) { // makeFullNode loads geth configuration and creates the Ethereum backend. func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) { stack, cfg := makeConfigNode(ctx) - if ctx.GlobalIsSet(utils.OverrideEHardforkFlag.Name) { - cfg.Eth.OverrideEHardfork = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideEHardforkFlag.Name)) + if ctx.GlobalIsSet(utils.OverrideGingerbreadFlag.Name) { + cfg.Eth.OverrideGingerbread = new(big.Int).SetUint64(ctx.GlobalUint64(utils.OverrideGingerbreadFlag.Name)) } backend, _ := utils.RegisterEthService(stack, &cfg.Eth) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 199314f1f6..b033b90c43 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -68,7 +68,7 @@ var ( utils.NoUSBFlag, utils.USBFlag, // utils.SmartCardDaemonPathFlag, - utils.OverrideEHardforkFlag, + utils.OverrideGingerbreadFlag, utils.TxPoolLocalsFlag, utils.TxPoolNoLocalsFlag, utils.TxPoolJournalFlag, diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 6c2013a61e..4f2dd789d2 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -237,9 +237,9 @@ var ( } // Hard fork activation overrides - OverrideEHardforkFlag = cli.Uint64Flag{ - Name: "override.espresso", - Usage: "Manually specify the espresso fork block, overriding the bundled setting", + OverrideGingerbreadFlag = cli.Uint64Flag{ + Name: "override.gingerbread", + Usage: "Manually specify the gingerbread fork block, overriding the bundled setting", } BloomFilterSizeFlag = cli.Uint64Flag{ diff --git a/core/genesis.go b/core/genesis.go index ab82761f76..20695f8c80 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -149,7 +149,7 @@ func SetupGenesisBlock(db ethdb.Database, genesis *Genesis) (*params.ChainConfig return SetupGenesisBlockWithOverride(db, genesis, nil) } -func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, overrideEHardfork *big.Int) (*params.ChainConfig, common.Hash, error) { +func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, overrideGingerbread *big.Int) (*params.ChainConfig, common.Hash, error) { if genesis != nil && (genesis.Config == nil || genesis.Config.Istanbul == nil) { return params.MainnetChainConfig, common.Hash{}, errGenesisNoConfig } @@ -202,8 +202,8 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, genesis *Genesis, override // Get the existing chain configuration. newcfg := genesis.configOrDefault(stored) - if overrideEHardfork != nil { - newcfg.EspressoBlock = overrideEHardfork + if overrideGingerbread != nil { + newcfg.GingerbreadBlock = overrideGingerbread } if err := newcfg.CheckConfigForkOrder(); err != nil { diff --git a/eth/backend.go b/eth/backend.go index 0aa5924502..9b1d466b31 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -131,7 +131,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) { if err != nil { return nil, err } - chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideEHardfork) + chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, config.OverrideGingerbread) if _, ok := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !ok { return nil, genesisErr } diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index 4793c0dabf..25a7c29d57 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -157,8 +157,8 @@ type Config struct { // CheckpointOracle is the configuration for checkpoint oracle. CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"` - // E block override (TODO: remove after the fork) - OverrideEHardfork *big.Int `toml:",omitempty"` + // Gingerbread block override (TODO: remove after the fork) + OverrideGingerbread *big.Int `toml:",omitempty"` // The minimum required peers in order for syncing to be initiated, if left // at 0 then the default will be used. diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index b79a743a09..c2974ee0bc 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -62,7 +62,7 @@ func (c Config) MarshalTOML() (interface{}, error) { RPCEthCompatibility bool Checkpoint *params.TrustedCheckpoint `toml:",omitempty"` CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"` - OverrideEHardfork *big.Int `toml:",omitempty"` + OverrideGingerbread *big.Int `toml:",omitempty"` MinSyncPeers int `toml:",omitempty"` } var enc Config @@ -111,7 +111,7 @@ func (c Config) MarshalTOML() (interface{}, error) { enc.RPCEthCompatibility = c.RPCEthCompatibility enc.Checkpoint = c.Checkpoint enc.CheckpointOracle = c.CheckpointOracle - enc.OverrideEHardfork = c.OverrideEHardfork + enc.OverrideGingerbread = c.OverrideGingerbread enc.MinSyncPeers = c.MinSyncPeers return &enc, nil } @@ -164,7 +164,7 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { RPCEthCompatibility *bool Checkpoint *params.TrustedCheckpoint `toml:",omitempty"` CheckpointOracle *params.CheckpointOracleConfig `toml:",omitempty"` - OverrideEHardfork *big.Int `toml:",omitempty"` + OverrideGingerbread *big.Int `toml:",omitempty"` MinSyncPeers *int `toml:",omitempty"` } var dec Config @@ -306,8 +306,8 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error { if dec.CheckpointOracle != nil { c.CheckpointOracle = dec.CheckpointOracle } - if dec.OverrideEHardfork != nil { - c.OverrideEHardfork = dec.OverrideEHardfork + if dec.OverrideGingerbread != nil { + c.OverrideGingerbread = dec.OverrideGingerbread } if dec.MinSyncPeers != nil { c.MinSyncPeers = *dec.MinSyncPeers diff --git a/les/client.go b/les/client.go index c3fcfcfcd2..756155479f 100644 --- a/les/client.go +++ b/les/client.go @@ -104,7 +104,7 @@ func New(stack *node.Node, config *ethconfig.Config) (*LightEthereum, error) { return nil, err } chainConfig, genesisHash, genesisErr := core.SetupGenesisBlockWithOverride(chainDb, config.Genesis, - config.OverrideEHardfork) + config.OverrideGingerbread) if _, isCompat := genesisErr.(*params.ConfigCompatError); genesisErr != nil && !isCompat { return nil, genesisErr } From 1327c5abf6ec801f663a13bc3d9dc81ba6966479 Mon Sep 17 00:00:00 2001 From: Paul Lange Date: Tue, 13 Jun 2023 16:35:06 +0200 Subject: [PATCH 3/4] Update monorepo commit --- monorepo_commit | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monorepo_commit b/monorepo_commit index 5e9ff6c10b..e59e85f438 100644 --- a/monorepo_commit +++ b/monorepo_commit @@ -1 +1 @@ -bcf7c31f5a8ffe2994f5543ad166d933aedbcb53 +73744116dd0bf817854d5bd57da36d838373ff92 From a148e2583dce940cbd2cf66c94907daea3fd9883 Mon Sep 17 00:00:00 2001 From: Paul Lange Date: Tue, 20 Jun 2023 12:37:57 +0200 Subject: [PATCH 4/4] Use Python 3.9 Use updated version of the monorepo, which includes an update to `node-gyp` which in turn allows us to use python 3.9 --- .github/workflows/config.yml | 2 +- monorepo_commit | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml index 0c462df1c7..b8a09e8583 100644 --- a/.github/workflows/config.yml +++ b/.github/workflows/config.yml @@ -28,7 +28,7 @@ jobs: runs-on: [self-hosted, blockchain, 8-cpu] env: NODE_VERSION: 12 - PYTHON_VERSION: '2.7' + PYTHON_VERSION: '3.9' CONTRACTS_BUILD_PATH: packages/protocol/build/contracts steps: diff --git a/monorepo_commit b/monorepo_commit index e59e85f438..634fff437d 100644 --- a/monorepo_commit +++ b/monorepo_commit @@ -1 +1 @@ -73744116dd0bf817854d5bd57da36d838373ff92 +3c90f67bad2d3aa50d6168c98008a57a49443893