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

feat: increase default gas limit to 36M #7304

Merged
merged 2 commits into from
Jan 6, 2025
Merged

feat: increase default gas limit to 36M #7304

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
372c9b4
feat: increase default gas limit to 36M
nflaig Dec 16, 2024
20179d5
Merge branch 'unstable' into nflaig/increase-gas-limit
nflaig Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/pages/run/validator-management/proposer-config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ proposer_config:
strict_fee_recipient_check: false
fee_recipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
builder:
gas_limit: "30000000"
gas_limit: "36000000"
selection: "executionalways"
boost_factor: "0"
"0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d":
Expand All @@ -29,7 +29,7 @@ default_config:
strict_fee_recipient_check: true
fee_recipient: "0xcccccccccccccccccccccccccccccccccccccccc"
builder:
gas_limit: "30000000"
gas_limit: "36000000"
selection: "default"
boost_factor: "90"
```
Expand Down
2 changes: 1 addition & 1 deletion packages/api/test/unit/keymanager/testData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {GenericServerTestCases} from "../../utils/genericServerTest.js";
const pubkeyRand = "0x84105a985058fc8740a48bf1ede9d223ef09e8c6b1735ba0a55cf4a9ff2ff92376b778798365e488dab07a652eb04576";
const ethaddressRand = "0xabcf8e0d4e9587369b2301d0790347320302cc09";
const graffitiRandUtf8 = "636861696e736166652f6c6f64657374";
const gasLimitRand = 30_000_000;
const gasLimitRand = 36_000_000;
const builderBoostFactorRand = BigInt(100);

export const testData: GenericServerTestCases<Endpoints> = {
Expand Down
2 changes: 1 addition & 1 deletion packages/beacon-node/test/sim/electra-interop.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ describe("executionEngine / ExecutionEngineHttp", () => {
256
),
prevRandao: dataToBytes("0x0000000000000000000000000000000000000000000000000000000000000000", 32),
gasLimit: 30000000,
gasLimit: 36000000,
gasUsed: 84714,
timestamp: 16,
extraData: dataToBytes("0x", 0),
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/e2e/propserConfigfromKeymanager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ describe("import keystores from api, test DefaultProposerConfig", () => {

const defaultOptions = {
suggestedFeeRecipient: "0x0000000000000000000000000000000000000000",
gasLimit: 30_000_000,
gasLimit: 36_000_000,
graffiti: "aaaa",
};

const updatedOptions = {
suggestedFeeRecipient: "0xcccccccccccccccccccccccccccccccccccccccc",
gasLimit: 35_000_000,
gasLimit: 40_000_000,
graffiti: "bbbb",
};

Expand Down
4 changes: 2 additions & 2 deletions packages/cli/test/unit/validator/parseProposerConfig.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const testValue = {
strictFeeRecipientCheck: true,
feeRecipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
builder: {
gasLimit: 30000000,
gasLimit: 36000000,
selection: undefined,
boostFactor: undefined,
},
Expand All @@ -35,7 +35,7 @@ const testValue = {
strictFeeRecipientCheck: true,
feeRecipient: "0xcccccccccccccccccccccccccccccccccccccccc",
builder: {
gasLimit: 30000000,
gasLimit: 36000000,
selection: routes.validator.BuilderSelection.MaxProfit,
boostFactor: BigInt(50),
},
Expand Down
16 changes: 8 additions & 8 deletions packages/cli/test/unit/validator/proposerConfigs/invalidData.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
proposer_config:
'0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c':
"0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c":
graffiti: 123
strict_fee_recipient_check: "true"
fee_recipient: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
fee_recipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
builder:
enabled: true
gas_limit: "30000000"
'0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d':
fee_recipient: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
gas_limit: "36000000"
"0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d":
fee_recipient: "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
builder:
enabled: "true"
gas_limit: "35000000"
default_config:
graffiti: 'default graffiti'
graffiti: "default graffiti"
strict_fee_recipient_check: true
fee_recipient: '0xcccccccccccccccccccccccccccccccccccccccc'
fee_recipient: "0xcccccccccccccccccccccccccccccccccccccccc"
builder:
enabled: true
gas_limit: "30000000"
gas_limit: "36000000"
18 changes: 9 additions & 9 deletions packages/cli/test/unit/validator/proposerConfigs/validData.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
proposer_config:
'0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c':
graffiti: 'graffiti'
"0xa99a76ed7796f7be22d5b7e85deeb7c5677e88e511e0b337618f8c4eb61349b4bf2d153f649f7b53359fe8b94a38e44c":
graffiti: "graffiti"
strict_fee_recipient_check: true
fee_recipient: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
fee_recipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
builder:
gas_limit: "30000000"
'0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d':
fee_recipient: '0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'
gas_limit: "36000000"
"0xa4855c83d868f772a579133d9f23818008417b743e8447e235d8eb78b1d8f8a9f63f98c551beb7de254400f89592314d":
fee_recipient: "0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
builder:
gas_limit: "35000000"
selection: "builderalways"
boost_factor: "18446744073709551616"
default_config:
graffiti: 'default graffiti'
graffiti: "default graffiti"
strict_fee_recipient_check: "true"
fee_recipient: '0xcccccccccccccccccccccccccccccccccccccccc'
fee_recipient: "0xcccccccccccccccccccccccccccccccccccccccc"
builder:
gas_limit: "30000000"
gas_limit: "36000000"
selection: "maxprofit"
boost_factor: "50"
2 changes: 1 addition & 1 deletion packages/validator/src/services/validatorStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ type ValidatorData = ProposerConfig & {

export const defaultOptions = {
suggestedFeeRecipient: "0x0000000000000000000000000000000000000000",
defaultGasLimit: 30_000_000,
defaultGasLimit: 36_000_000,
Copy link
Member Author

Choose a reason for hiding this comment

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

this is the relevant change, other changes are just examples or test data

builderSelection: routes.validator.BuilderSelection.ExecutionOnly,
builderAliasSelection: routes.validator.BuilderSelection.Default,
builderBoostFactor: BigInt(100),
Expand Down
2 changes: 1 addition & 1 deletion packages/validator/test/unit/validatorStore.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe("ValidatorStore", () => {
strictFeeRecipientCheck: true,
feeRecipient: "0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
builder: {
gasLimit: 30000000,
gasLimit: 36000000,
selection: routes.validator.BuilderSelection.ExecutionOnly,
},
},
Expand Down
Loading