Skip to content

Commit b99bd81

Browse files
JonathanOppenheimerJonathanOppenheimer
authored
sync: coreth PR #1145: remove EIP-4844 package in favor of libevm version (#1709)
1 parent 0a1e735 commit b99bd81

File tree

13 files changed

+11
-245
lines changed

13 files changed

+11
-245
lines changed

‎cmd/evm/internal/t8ntool/execution.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333

3434
"github.com/ava-labs/libevm/common"
3535
"github.com/ava-labs/libevm/common/math"
36+
"github.com/ava-labs/libevm/consensus/misc/eip4844"
3637
"github.com/ava-labs/libevm/core/rawdb"
3738
"github.com/ava-labs/libevm/core/state"
3839
"github.com/ava-labs/libevm/core/types"
@@ -44,7 +45,6 @@ import (
4445
"github.com/ava-labs/libevm/rlp"
4546
"github.com/ava-labs/libevm/trie"
4647
"github.com/ava-labs/libevm/triedb"
47-
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
4848
"github.com/ava-labs/subnet-evm/core"
4949
"github.com/ava-labs/subnet-evm/params"
5050
"github.com/holiman/uint256"

‎consensus/dummy/consensus.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111

1212
"github.com/ava-labs/avalanchego/utils/timer/mockable"
1313
"github.com/ava-labs/libevm/common"
14+
"github.com/ava-labs/libevm/consensus/misc/eip4844"
1415
"github.com/ava-labs/libevm/core/state"
1516
"github.com/ava-labs/libevm/core/types"
1617
"github.com/ava-labs/libevm/trie"
1718

1819
"github.com/ava-labs/subnet-evm/consensus"
19-
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
2020
"github.com/ava-labs/subnet-evm/params"
2121
"github.com/ava-labs/subnet-evm/params/extras"
2222
"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"

‎consensus/misc/eip4844/eip4844.go‎

Lines changed: 0 additions & 109 deletions
This file was deleted.

‎consensus/misc/eip4844/eip4844_test.go‎

Lines changed: 0 additions & 125 deletions
This file was deleted.

‎core/blockchain.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import (
4343

4444
"github.com/ava-labs/libevm/common"
4545
"github.com/ava-labs/libevm/common/lru"
46+
"github.com/ava-labs/libevm/consensus/misc/eip4844"
4647
"github.com/ava-labs/libevm/core/rawdb"
4748
"github.com/ava-labs/libevm/core/state"
4849
"github.com/ava-labs/libevm/core/types"
@@ -55,7 +56,6 @@ import (
5556
"github.com/ava-labs/libevm/triedb"
5657
"github.com/ava-labs/subnet-evm/commontype"
5758
"github.com/ava-labs/subnet-evm/consensus"
58-
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
5959
"github.com/ava-labs/subnet-evm/core/extstate"
6060
"github.com/ava-labs/subnet-evm/core/state/snapshot"
6161
"github.com/ava-labs/subnet-evm/internal/version"

‎core/chain_makers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
"math/big"
3333

3434
"github.com/ava-labs/libevm/common"
35+
"github.com/ava-labs/libevm/consensus/misc/eip4844"
3536
"github.com/ava-labs/libevm/core/rawdb"
3637
"github.com/ava-labs/libevm/core/state"
3738
"github.com/ava-labs/libevm/core/types"
@@ -40,7 +41,6 @@ import (
4041
"github.com/ava-labs/libevm/triedb"
4142
"github.com/ava-labs/subnet-evm/commontype"
4243
"github.com/ava-labs/subnet-evm/consensus"
43-
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
4444
"github.com/ava-labs/subnet-evm/constants"
4545
"github.com/ava-labs/subnet-evm/core/extstate"
4646
"github.com/ava-labs/subnet-evm/params"

‎core/evm.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ import (
3232
"math/big"
3333

3434
"github.com/ava-labs/libevm/common"
35+
"github.com/ava-labs/libevm/consensus/misc/eip4844"
3536
"github.com/ava-labs/libevm/core/state"
3637
"github.com/ava-labs/libevm/core/types"
3738
"github.com/ava-labs/libevm/core/vm"
3839
"github.com/ava-labs/libevm/log"
3940
"github.com/ava-labs/subnet-evm/consensus"
40-
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
4141
"github.com/ava-labs/subnet-evm/core/extstate"
4242
"github.com/ava-labs/subnet-evm/params"
4343

‎core/state_processor_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434

3535
"github.com/ava-labs/avalanchego/upgrade"
3636
"github.com/ava-labs/libevm/common"
37+
"github.com/ava-labs/libevm/consensus/misc/eip4844"
3738
"github.com/ava-labs/libevm/core/rawdb"
3839
"github.com/ava-labs/libevm/core/types"
3940
"github.com/ava-labs/libevm/core/vm"
@@ -42,7 +43,6 @@ import (
4243
"github.com/ava-labs/libevm/trie"
4344
"github.com/ava-labs/subnet-evm/consensus"
4445
"github.com/ava-labs/subnet-evm/consensus/dummy"
45-
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
4646
"github.com/ava-labs/subnet-evm/params"
4747
"github.com/ava-labs/subnet-evm/params/extras"
4848
"github.com/ava-labs/subnet-evm/plugin/evm/customtypes"

‎core/txpool/blobpool/blobpool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ import (
4141
"time"
4242

4343
"github.com/ava-labs/libevm/common"
44+
"github.com/ava-labs/libevm/consensus/misc/eip4844"
4445
"github.com/ava-labs/libevm/core/state"
4546
"github.com/ava-labs/libevm/core/types"
4647
"github.com/ava-labs/libevm/event"
4748
"github.com/ava-labs/libevm/log"
4849
"github.com/ava-labs/libevm/metrics"
4950
ethparams "github.com/ava-labs/libevm/params"
5051
"github.com/ava-labs/libevm/rlp"
51-
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
5252
"github.com/ava-labs/subnet-evm/core"
5353
"github.com/ava-labs/subnet-evm/core/txpool"
5454
"github.com/ava-labs/subnet-evm/params"

‎core/txpool/blobpool/blobpool_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import (
4141
"time"
4242

4343
"github.com/ava-labs/libevm/common"
44+
"github.com/ava-labs/libevm/consensus/misc/eip4844"
4445
"github.com/ava-labs/libevm/core/rawdb"
4546
"github.com/ava-labs/libevm/core/state"
4647
"github.com/ava-labs/libevm/core/types"
@@ -51,7 +52,6 @@ import (
5152
ethparams "github.com/ava-labs/libevm/params"
5253
"github.com/ava-labs/libevm/rlp"
5354
"github.com/ava-labs/subnet-evm/commontype"
54-
"github.com/ava-labs/subnet-evm/consensus/misc/eip4844"
5555
"github.com/ava-labs/subnet-evm/core"
5656
"github.com/ava-labs/subnet-evm/core/txpool"
5757
"github.com/ava-labs/subnet-evm/params"

0 commit comments

Comments
 (0)