Merge branch 'ethereum:master' into master

This commit is contained in:
juga1980 2025-07-04 11:25:17 +02:00 committed by GitHub
commit 99eae764b2
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 34 additions and 0 deletions

View file

@ -121,6 +121,35 @@ jobs:
LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }} LINUX_SIGNING_KEY: ${{ secrets.LINUX_SIGNING_KEY }}
AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }} AZURE_BLOBSTORE_TOKEN: ${{ secrets.AZURE_BLOBSTORE_TOKEN }}
windows:
name: Windows Build
runs-on: "win-11"
steps:
- uses: actions/checkout@v4
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version: 1.24
cache: false
# Note: gcc.exe only works properly if the corresponding bin/ directory is
# contained in PATH.
- name: "Build (amd64)"
run: |
go run build/ci.go install -dlgo -arch amd64 -cc %GETH_CC%
env:
PATH: 'C:\msys64\mingw64\bin;C:\Program Files (x86)\NSIS\;%PATH%'
GETH_CC: 'C:\msys64\mingw64\bin\gcc.exe'
- name: "Build (386)"
run: |
go run build/ci.go install -dlgo -arch 386 -cc %GETH_CC%
env:
PATH: 'C:\msys64\mingw32\bin;C:\Program Files (x86)\NSIS\;%PATH%'
GETH_CC: 'C:\msys64\mingw32\bin\gcc.exe'
docker: docker:
name: Docker Image name: Docker Image
runs-on: ubuntu-latest runs-on: ubuntu-latest

View file

@ -44,6 +44,10 @@ var DeprecatedFlags = []cli.Flag{
MinerNewPayloadTimeoutFlag, MinerNewPayloadTimeoutFlag,
MinerEtherbaseFlag, MinerEtherbaseFlag,
MiningEnabledFlag, MiningEnabledFlag,
MetricsEnabledExpensiveFlag,
EnablePersonal,
UnlockedAccountFlag,
InsecureUnlockAllowedFlag,
} }
var ( var (
@ -83,6 +87,7 @@ var (
// Deprecated August 2023 // Deprecated August 2023
TxLookupLimitFlag = &cli.Uint64Flag{ TxLookupLimitFlag = &cli.Uint64Flag{
Name: "txlookuplimit", Name: "txlookuplimit",
Hidden: true,
Usage: "Number of recent blocks to maintain transactions index for (default = about one year, 0 = entire chain) (deprecated, use history.transactions instead)", Usage: "Number of recent blocks to maintain transactions index for (default = about one year, 0 = entire chain) (deprecated, use history.transactions instead)",
Value: ethconfig.Defaults.TransactionHistory, Value: ethconfig.Defaults.TransactionHistory,
Category: flags.DeprecatedCategory, Category: flags.DeprecatedCategory,