go.mod: update dependencies (#60)

* go.mod: update dependencies

* stuff

* .golangci: updated ci

* ci: update golang

Author: MariusVanDerWijden

.github/workflows/test-build-push.yaml

@@ -20,7 +20,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.22.7
+        go-version: 1.23.8
     - name: Download golangci-lint
       run: wget -O- -nv https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s latest
     - name: Lint
@@ -36,7 +36,7 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v5
       with:
-        go-version: 1.21.5
+        go-version: 1.23.8
     - name: Test
       run: go test -v ./...
 

.golangci.yml

@@ -1,30 +1,27 @@
 # This file configures github.com/golangci/golangci-lint.
-
+version: '2'
 run:
-  timeout: 20m
   tests: true
-  # default is true. Enables skipping of directories:
-  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-  skip-dirs-use-default: true
-
 linters:
-  disable-all: true
+  default: none
   enable:
-    - goconst
-    - goimports
-    - gosimple
+    - bidichk
+    - copyloopvar
+    - durationcheck
+    - gocheckcompilerdirectives
     - govet
     - ineffassign
+    - mirror
     - misspell
+    - reassign
+    - revive # only certain checks enabled
+    - staticcheck
     - unconvert
-    - typecheck
     - unused
-    - staticcheck
-    - bidichk
-    - durationcheck
-    - exportloopref
+    - usetesting
     - whitespace
-
+    ### linters we tried and will not be using:
+    ###
     # - structcheck # lots of false positives
     # - errcheck #lot of false positives
     # - contextcheck
@@ -33,10 +30,67 @@ linters:
     # - exhaustive # silly check
     # - makezero # false positives
     # - nilerr # several intentional
-
-linters-settings:
-  gofmt:
-    simplify: true
-  goconst:
-    min-len: 3 # minimum length of string constant
-    min-occurrences: 6 # minimum number of occurrences
+  settings:
+    staticcheck:
+      checks:
+        # disable Quickfixes
+        - -QF1*
+    revive:
+      enable-all-rules: false
+      # here we enable specific useful rules
+      # see https://golangci-lint.run/usage/linters/#revive for supported rules
+      rules:
+        - name: receiver-naming
+          severity: warning
+          disabled: false
+          exclude:
+            - ''
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    rules:
+      - linters:
+          - deadcode
+          - staticcheck
+        path: crypto/bn256/cloudflare/optate.go
+      - linters:
+          - revive
+        path: crypto/bn256/
+      - path: cmd/utils/flags.go
+        text: "SA1019: cfg.TxLookupLimit is deprecated: use 'TransactionHistory' instead."
+      - path: cmd/utils/flags.go
+        text: "SA1019: ethconfig.Defaults.TxLookupLimit is deprecated: use 'TransactionHistory' instead."
+      - path: internal/build/pgp.go
+        text: 'SA1019: "golang.org/x/crypto/openpgp" is deprecated: this package is unmaintained except for security fixes.'
+      - path: core/vm/contracts.go
+        text: 'SA1019: "golang.org/x/crypto/ripemd160" is deprecated: RIPEMD-160 is a legacy hash and should not be used for new applications.'
+      - path: (.+)\.go$
+        text: 'SA1019: event.TypeMux is deprecated: use Feed'
+      - path: (.+)\.go$
+        text: 'SA1019: strings.Title is deprecated'
+      - path: (.+)\.go$
+        text: 'SA1019: strings.Title has been deprecated since Go 1.18 and an alternative has been available since Go 1.0: The rule Title uses for word boundaries does not handle Unicode punctuation properly. Use golang.org/x/text/cases instead.'
+      - path: (.+)\.go$
+        text: 'SA1029: should not use built-in type string as key for value'
+    paths:
+      - core/genesis_alloc.go
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - goimports
+  settings:
+    gofmt:
+      simplify: true
+  exclusions:
+    generated: lax
+    paths:
+      - core/genesis_alloc.go
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22.7-alpine3.20 AS builder
+FROM golang:1.23.8-alpine3.20 AS builder
 
 WORKDIR /build
 # Copy and download dependencies using go mod

cmd/london/london.go

@@ -2,8 +2,7 @@ package main
 
 import (
 	"github.com/ethereum/go-ethereum/core/vm"
-	"github.com/holiman/goevmlab/ops"
-	"github.com/holiman/goevmlab/program"
+	"github.com/ethereum/go-ethereum/core/vm/program"
 )
 
 func Selfdestructor() []byte {
@@ -17,36 +16,36 @@ func Selfdestructor() []byte {
 		byte(vm.SELFDESTRUCT),
 	}
 
-	initcode := program.NewProgram()
+	initcode := program.New()
 	initcode.Mstore(selfdestructTo, 0)
-	initcode.Return(0, uint32(len(selfdestructTo)))
+	initcode.Return(0, len(selfdestructTo))
 
-	program := program.NewProgram()
+	program := program.New()
 	Create(program, selfdestructTo, false, true)
-	program.Op(ops.POP)
+	program.Op(vm.POP)
 	Create(program, selfdestructTo, true, false)
-	program.Op(ops.POP)
-	Create(program, initcode.Bytecode(), true, false)
+	program.Op(vm.POP)
+	Create(program, initcode.Bytes(), true, false)
 	//program.CreateAndCall(initcode.Bytecode(), true, ops.STATICCALL)
 	//program.CreateAndCall(initcode.Bytecode(), true, ops.DELEGATECALL)
-	return program.Bytecode()
+	return program.Bytes()
 }
 
 func EfByte() []byte {
 	inner := []byte{
 		0xEF,
 	}
 
-	initcode := program.NewProgram()
+	initcode := program.New()
 	initcode.Mstore(inner, 0)
-	initcode.Return(0, uint32(len(inner)))
+	initcode.Return(0, len(inner))
 
-	program := program.NewProgram()
-	Create(program, initcode.Bytecode(), false, false)
-	program.Op(ops.POP)
-	Create(program, initcode.Bytecode(), true, true)
-	program.Op(ops.POP)
-	return program.Bytecode()
+	program := program.New()
+	Create(program, initcode.Bytes(), false, false)
+	program.Op(vm.POP)
+	Create(program, initcode.Bytes(), true, true)
+	program.Op(vm.POP)
+	return program.Bytes()
 }
 
 func Create(p *program.Program, code []byte, inMemory bool, isCreate2 bool) {
@@ -55,7 +54,7 @@ func Create(p *program.Program, code []byte, inMemory bool, isCreate2 bool) {
 		offset   = 0
 		size     = len(code)
 		salt     = 0
-		createOp = ops.CREATE
+		createOp = vm.CREATE
 	)
 	// Load the code into mem
 	if !inMemory {
@@ -64,7 +63,7 @@ func Create(p *program.Program, code []byte, inMemory bool, isCreate2 bool) {
 	// Create it
 	if isCreate2 {
 		p.Push(salt)
-		createOp = ops.CREATE2
+		createOp = vm.CREATE2
 	}
 	p.Push(size).Push(offset).Push(value).Op(createOp)
 }