From 8c4ecebbfe4c69be93394021594f16fb3966b513 Mon Sep 17 00:00:00 2001 From: James Prestwich <10149425+prestwich@users.noreply.github.com> Date: Mon, 26 Oct 2020 05:45:08 -0700 Subject: [PATCH] cmd/geth: fix dir path in geth attach for yolov2 network (#21749) # Conflicts: # cmd/geth/consolecmd.go --- to-merge.txt | 43 ------------------------------------------- 1 file changed, 43 deletions(-) diff --git a/to-merge.txt b/to-merge.txt index 74f9b067d..3e63e7f8c 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -426,46 +426,3 @@ Author: Martin Holst Swende Date: Fri Oct 23 15:40:48 2020 +0200 utils, params: add yolov2 bootnode - -commit 95f720fffc9cb366b69abc52d1a64834e92f00a4 -Author: Felix Lange -Date: Fri Oct 23 13:34:44 2020 +0200 - - cmd/devp2p/internal/ethtest: update test chain (#21742) - - The old one was wrong in two ways: the first block in chain.rlp was the - genesis block, and the genesis difficulty was below minimum difficulty. - - This also contains some other fixes to the test. - -commit 6487c002f6b47e08cb9814f16712c6789b313a97 -Author: Martin Holst Swende -Date: Fri Oct 23 08:26:57 2020 +0200 - - all: implement EIP-2929 (gas cost increases for state access opcodes) + yolo-v2 (#21509) - - * core/vm, core/state: implement EIP-2929 + YOLOv2 - - * core/state, core/vm: fix some review concerns - - * core/state, core/vm: address review concerns - - * core/vm: address review concerns - - * core/vm: better documentation - - * core/vm: unify sload cost as fully dynamic - - * core/vm: fix typo - - * core/vm/runtime: fix compilation flaw - - * core/vm/runtime: fix renaming-err leftovers - - * core/vm: renaming - - * params/config: use correct yolov2 chainid for config - - * core, params: use a proper new genesis for yolov2 - - * core/state/tests: golinter nitpicks