test fix

ethereum-optimism · Dec 3, 2024 · cb83b92 · cb83b92
1 parent 6de1b2a
commit cb83b92
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -13,7 +13,7 @@ jobs:
       - name: Install Golang
         uses: actions/setup-go@v4
         with:
-          go-version: '1.22.x'
+          go-version: '1.22.7'
       - name: Build rvsol
         run: forge build
         working-directory: rvsol
@@ -40,7 +40,7 @@ jobs:
       - name: Install Golang
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.22.7'
       - name: Build FFI
         run: go build
         working-directory: rvgo/scripts/go-ffi
@@ -68,7 +68,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.22.7'
           cache: false
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4
@@ -85,7 +85,7 @@ jobs:
       - name: Install Golang
         uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.22.7'
       - name: Check if optimism submodule version matches go.mod version
         run: ./.github/scripts/check_versions.sh
 
@@ -98,7 +98,7 @@ jobs:
         run: git submodule update --init
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.22.x'
+          go-version: '1.22.7'
       - name: Build asterisc
         run: make build-rvgo && cp rvgo/bin/asterisc tests/op-program-test/
       - name: Build op-program

diff --git a/rvgo/test/evm_test.go b/rvgo/test/evm_test.go
@@ -94,14 +94,10 @@ type Addresses struct {
 
 func newEVMEnv(t *testing.T, contracts *Contracts, addrs *Addresses) *vm.EVM {
 	// Temporary hack until Cancun is activated on mainnet
-	cpy := *params.MainnetChainConfig
-	chainCfg := &cpy // don't modify the global chain config
-	// Activate Cancun for EIP-4844 KZG point evaluation precompile
-	cancunActivation := *chainCfg.ShanghaiTime + 10
-	chainCfg.CancunTime = &cancunActivation
-	offsetBlocks := uint64(1000) // blocks after cancun fork
+	chainCfg := params.MainnetChainConfig
+	offsetBlocks := uint64(1000)
 	bc := &dummyChain{startTime: *chainCfg.CancunTime + offsetBlocks*12}
-	header := bc.GetHeader(common.Hash{}, 17034870+offsetBlocks)
+	header := bc.GetHeader(common.Hash{}, 19426587+offsetBlocks)
 	db := rawdb.NewMemoryDatabase()
 	statedb, err := state.New(types.EmptyRootHash, state.NewDatabase(triedb.NewDatabase(db, nil), nil))
 	require.NoError(t, err)