forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename back imports in rollup packages (#567)

Browse source
This commit is contained in:
HAOYUatHZ 2023-11-20 13:19:16 +08:00 committed by GitHub
parent 401a366b9e
commit ec2054c3ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 77 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rollup/circuitcapacitychecker/impl.go
View file

@ -15,8 +15,8 @@ import (
"sync" "sync"
"unsafe" "unsafe"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
) )
// mutex for concurrent CircuitCapacityChecker creations // mutex for concurrent CircuitCapacityChecker creations

2
rollup/circuitcapacitychecker/mock.go
View file

@ -5,7 +5,7 @@ package circuitcapacitychecker
import ( import (
"math/rand" "math/rand"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
) )
type CircuitCapacityChecker struct { type CircuitCapacityChecker struct {

2
rollup/circuitcapacitychecker/types.go
View file

@ -3,7 +3,7 @@ package circuitcapacitychecker
import ( import (
"errors" "errors"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
) )
var ( var (

10
rollup/fees/rollup_fee.go
View file

@ -6,11 +6,11 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/scroll-tech/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/scroll-tech/go-ethereum/rollup/rcfg" "github.com/ethereum/go-ethereum/rollup/rcfg"
) )
var ( var (

2
rollup/rcfg/config.go
View file

@ -3,7 +3,7 @@ package rcfg
import ( import (
"math/big" "math/big"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
) )
// TODO: // TODO:

8
rollup/rollup_sync_service/abi.go
View file

@ -4,10 +4,10 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/scroll-tech/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
) )
// scrollChainMetaData contains ABI of the ScrollChain contract. // scrollChainMetaData contains ABI of the ScrollChain contract.

6
rollup/rollup_sync_service/abi_test.go
View file

@ -7,9 +7,9 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
) )
func TestEventSignatures(t *testing.T) { func TestEventSignatures(t *testing.T) {

6
rollup/rollup_sync_service/batch_header.go
View file

@ -5,9 +5,9 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
) )
const batchHeaderVersion = 0 const batchHeaderVersion = 0

6
rollup/rollup_sync_service/block.go
View file

@ -7,9 +7,9 @@ import (
"math" "math"
"math/big" "math/big"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/common/hexutil"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
) )
const blockContextByteSize = 60 const blockContextByteSize = 60

8
rollup/rollup_sync_service/chunk.go
View file

@ -7,10 +7,10 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/rawdb"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
) )
// Chunk contains blocks to be encoded // Chunk contains blocks to be encoded

14
rollup/rollup_sync_service/l1client.go
View file

@ -6,14 +6,14 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/scroll-tech/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/scroll-tech/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/scroll-tech/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
"github.com/scroll-tech/go-ethereum/rollup/sync_service" "github.com/ethereum/go-ethereum/rollup/sync_service"
) )
// L1Client is a wrapper around EthClient that adds // L1Client is a wrapper around EthClient that adds

8
rollup/rollup_sync_service/l1client_test.go
View file

@ -8,10 +8,10 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/scroll-tech/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rlp"
) )
func TestL1Client(t *testing.T) { func TestL1Client(t *testing.T) {

22
rollup/rollup_sync_service/rollup_sync_service.go
View file

@ -9,18 +9,18 @@ import (
"syscall" "syscall"
"time" "time"
"github.com/scroll-tech/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/scroll-tech/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/rawdb"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/scroll-tech/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/scroll-tech/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
"github.com/scroll-tech/go-ethereum/rollup/rcfg" "github.com/ethereum/go-ethereum/rollup/rcfg"
"github.com/scroll-tech/go-ethereum/rollup/sync_service" "github.com/ethereum/go-ethereum/rollup/sync_service"
"github.com/scroll-tech/go-ethereum/rollup/withdrawtrie" "github.com/ethereum/go-ethereum/rollup/withdrawtrie"
) )
const ( const (

12
rollup/rollup_sync_service/rollup_sync_service_test.go
View file

@ -12,12 +12,12 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/scroll-tech/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/rawdb"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/ethdb/memorydb" "github.com/ethereum/go-ethereum/ethdb/memorydb"
"github.com/scroll-tech/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
) )
func TestRollupSyncServiceStartAndStop(t *testing.T) { func TestRollupSyncServiceStartAndStop(t *testing.T) {

10
rollup/sync_service/bindings.go
View file

@ -11,11 +11,11 @@ import (
"math/big" "math/big"
"strings" "strings"
ethereum "github.com/scroll-tech/go-ethereum" ethereum "github.com/ethereum/go-ethereum"
"github.com/scroll-tech/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
) )
// L1MessageQueueMetaData contains all meta data concerning the L1MessageQueue contract. // L1MessageQueueMetaData contains all meta data concerning the L1MessageQueue contract.

10
rollup/sync_service/bridge_client.go
View file

@ -6,11 +6,11 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/scroll-tech/go-ethereum/accounts/abi/bind" "github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/scroll-tech/go-ethereum/rpc" "github.com/ethereum/go-ethereum/rpc"
) )
// BridgeClient is a wrapper around EthClient that adds // BridgeClient is a wrapper around EthClient that adds

14
rollup/sync_service/sync_service.go
View file

@ -6,13 +6,13 @@ import (
"reflect" "reflect"
"time" "time"
"github.com/scroll-tech/go-ethereum/core" "github.com/ethereum/go-ethereum/core"
"github.com/scroll-tech/go-ethereum/core/rawdb" "github.com/ethereum/go-ethereum/core/rawdb"
"github.com/scroll-tech/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethdb"
"github.com/scroll-tech/go-ethereum/event" "github.com/ethereum/go-ethereum/event"
"github.com/scroll-tech/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
"github.com/scroll-tech/go-ethereum/node" "github.com/ethereum/go-ethereum/node"
"github.com/scroll-tech/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
) )
const ( const (

6
rollup/sync_service/types.go
View file

@ -4,9 +4,9 @@ import (
"context" "context"
"math/big" "math/big"
"github.com/scroll-tech/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
) )
// We cannot use ethclient.Client directly as that would lead // We cannot use ethclient.Client directly as that would lead

4
rollup/withdrawtrie/withdraw_trie.go
View file

@ -1,8 +1,8 @@
package withdrawtrie package withdrawtrie
import ( import (
"github.com/scroll-tech/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/rollup/rcfg" "github.com/ethereum/go-ethereum/rollup/rcfg"
) )
// StateDB represents the StateDB interface // StateDB represents the StateDB interface