Skip to content

Commit

Permalink
Update go.mod to reflect new GH org (0xPolygonHermez#877)
Browse files Browse the repository at this point in the history
  • Loading branch information
arnaubennassar authored Jul 8, 2022
1 parent cf082e1 commit 8b51dc6
Show file tree
Hide file tree
Showing 180 changed files with 545 additions and 545 deletions.
10 changes: 5 additions & 5 deletions aggregator/aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"math/big"
"time"

"github.com/0xPolygonHermez/zkevm-node/encoding"
"github.com/0xPolygonHermez/zkevm-node/hex"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/0xPolygonHermez/zkevm-node/proverclient/pb"
"github.com/0xPolygonHermez/zkevm-node/state"
"github.com/ethereum/go-ethereum/common"
"github.com/hermeznetwork/hermez-core/encoding"
"github.com/hermeznetwork/hermez-core/hex"
"github.com/hermeznetwork/hermez-core/log"
"github.com/hermeznetwork/hermez-core/proverclient/pb"
"github.com/hermeznetwork/hermez-core/state"
"github.com/iden3/go-iden3-crypto/keccak256"
"google.golang.org/grpc"
)
Expand Down
4 changes: 2 additions & 2 deletions aggregator/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"math/big"

"github.com/hermeznetwork/hermez-core/config/types"
"github.com/hermeznetwork/hermez-core/encoding"
"github.com/0xPolygonHermez/zkevm-node/config/types"
"github.com/0xPolygonHermez/zkevm-node/encoding"
)

// TokenAmountWithDecimals is a wrapper type that parses token amount with decimals to big int
Expand Down
4 changes: 2 additions & 2 deletions aggregator/interfaces.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"math/big"

"github.com/0xPolygonHermez/zkevm-node/proverclient/pb"
"github.com/0xPolygonHermez/zkevm-node/state"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/hermeznetwork/hermez-core/proverclient/pb"
"github.com/hermeznetwork/hermez-core/state"
)

// Consumer interfaces required by the package.
Expand Down
4 changes: 2 additions & 2 deletions cmd/approve.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"math/big"
"strings"

"github.com/hermeznetwork/hermez-core/config"
"github.com/hermeznetwork/hermez-core/log"
"github.com/0xPolygonHermez/zkevm-node/config"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"os"

"github.com/hermeznetwork/hermez-core/config"
"github.com/hermeznetwork/hermez-core/jsonrpc"
"github.com/hermeznetwork/hermez-core/log"
"github.com/0xPolygonHermez/zkevm-node/config"
"github.com/0xPolygonHermez/zkevm-node/jsonrpc"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/urfave/cli/v2"
)

Expand Down
10 changes: 5 additions & 5 deletions cmd/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"fmt"
"strings"

"github.com/hermeznetwork/hermez-core/config"
"github.com/hermeznetwork/hermez-core/db"
"github.com/hermeznetwork/hermez-core/log"
"github.com/hermeznetwork/hermez-core/state"
"github.com/hermeznetwork/hermez-core/state/tree"
"github.com/0xPolygonHermez/zkevm-node/config"
"github.com/0xPolygonHermez/zkevm-node/db"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/0xPolygonHermez/zkevm-node/state"
"github.com/0xPolygonHermez/zkevm-node/state/tree"
"github.com/urfave/cli/v2"
)

Expand Down
40 changes: 20 additions & 20 deletions cmd/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,28 +11,28 @@ import (
"path/filepath"
"sort"

"github.com/0xPolygonHermez/zkevm-node/aggregator"
"github.com/0xPolygonHermez/zkevm-node/config"
"github.com/0xPolygonHermez/zkevm-node/db"
"github.com/0xPolygonHermez/zkevm-node/etherman"
"github.com/0xPolygonHermez/zkevm-node/gasprice"
"github.com/0xPolygonHermez/zkevm-node/jsonrpc"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/0xPolygonHermez/zkevm-node/merkletree"
"github.com/0xPolygonHermez/zkevm-node/pool"
"github.com/0xPolygonHermez/zkevm-node/pool/pgpoolstorage"
"github.com/0xPolygonHermez/zkevm-node/proverclient"
proverclientpb "github.com/0xPolygonHermez/zkevm-node/proverclient/pb"
"github.com/0xPolygonHermez/zkevm-node/sequencer"
"github.com/0xPolygonHermez/zkevm-node/sequencerv2/broadcast"
"github.com/0xPolygonHermez/zkevm-node/sequencerv2/broadcast/pb"
"github.com/0xPolygonHermez/zkevm-node/state"
"github.com/0xPolygonHermez/zkevm-node/state/tree"
"github.com/0xPolygonHermez/zkevm-node/statev2"
"github.com/0xPolygonHermez/zkevm-node/statev2/runtime/executor"
"github.com/0xPolygonHermez/zkevm-node/synchronizer"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/hermeznetwork/hermez-core/aggregator"
"github.com/hermeznetwork/hermez-core/config"
"github.com/hermeznetwork/hermez-core/db"
"github.com/hermeznetwork/hermez-core/etherman"
"github.com/hermeznetwork/hermez-core/gasprice"
"github.com/hermeznetwork/hermez-core/jsonrpc"
"github.com/hermeznetwork/hermez-core/log"
"github.com/hermeznetwork/hermez-core/merkletree"
"github.com/hermeznetwork/hermez-core/pool"
"github.com/hermeznetwork/hermez-core/pool/pgpoolstorage"
"github.com/hermeznetwork/hermez-core/proverclient"
proverclientpb "github.com/hermeznetwork/hermez-core/proverclient/pb"
"github.com/hermeznetwork/hermez-core/sequencer"
"github.com/hermeznetwork/hermez-core/sequencerv2/broadcast"
"github.com/hermeznetwork/hermez-core/sequencerv2/broadcast/pb"
"github.com/hermeznetwork/hermez-core/state"
"github.com/hermeznetwork/hermez-core/state/tree"
"github.com/hermeznetwork/hermez-core/statev2"
"github.com/hermeznetwork/hermez-core/statev2/runtime/executor"
"github.com/hermeznetwork/hermez-core/synchronizer"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/urfave/cli/v2"
"google.golang.org/grpc"
Expand Down
4 changes: 2 additions & 2 deletions cmdv2/approve.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"math/big"
"strings"

"github.com/hermeznetwork/hermez-core/config"
"github.com/hermeznetwork/hermez-core/log"
"github.com/0xPolygonHermez/zkevm-node/config"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/urfave/cli/v2"
)

Expand Down
6 changes: 3 additions & 3 deletions cmdv2/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"os"

"github.com/hermeznetwork/hermez-core/config"
"github.com/hermeznetwork/hermez-core/jsonrpc"
"github.com/hermeznetwork/hermez-core/log"
"github.com/0xPolygonHermez/zkevm-node/config"
"github.com/0xPolygonHermez/zkevm-node/jsonrpc"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/urfave/cli/v2"
)

Expand Down
46 changes: 23 additions & 23 deletions cmdv2/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@ import (
"path/filepath"
"sort"

"github.com/0xPolygonHermez/zkevm-node/aggregator"
"github.com/0xPolygonHermez/zkevm-node/config"
"github.com/0xPolygonHermez/zkevm-node/db"
"github.com/0xPolygonHermez/zkevm-node/etherman"
"github.com/0xPolygonHermez/zkevm-node/ethermanv2"
"github.com/0xPolygonHermez/zkevm-node/ethtxmanager"
"github.com/0xPolygonHermez/zkevm-node/gasprice"
jsonrpc "github.com/0xPolygonHermez/zkevm-node/jsonrpcv2"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/0xPolygonHermez/zkevm-node/merkletree"
"github.com/0xPolygonHermez/zkevm-node/pool"
"github.com/0xPolygonHermez/zkevm-node/pool/pgpoolstorage"
"github.com/0xPolygonHermez/zkevm-node/pricegetter"
"github.com/0xPolygonHermez/zkevm-node/proverclient"
proverclientpb "github.com/0xPolygonHermez/zkevm-node/proverclient/pb"
"github.com/0xPolygonHermez/zkevm-node/sequencerv2"
"github.com/0xPolygonHermez/zkevm-node/sequencerv2/broadcast"
"github.com/0xPolygonHermez/zkevm-node/sequencerv2/broadcast/pb"
"github.com/0xPolygonHermez/zkevm-node/state"
"github.com/0xPolygonHermez/zkevm-node/state/tree"
"github.com/0xPolygonHermez/zkevm-node/statev2"
"github.com/0xPolygonHermez/zkevm-node/statev2/runtime/executor"
synchronizer "github.com/0xPolygonHermez/zkevm-node/synchronizerv2"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/hermeznetwork/hermez-core/aggregator"
"github.com/hermeznetwork/hermez-core/config"
"github.com/hermeznetwork/hermez-core/db"
"github.com/hermeznetwork/hermez-core/etherman"
"github.com/hermeznetwork/hermez-core/ethermanv2"
"github.com/hermeznetwork/hermez-core/ethtxmanager"
"github.com/hermeznetwork/hermez-core/gasprice"
jsonrpc "github.com/hermeznetwork/hermez-core/jsonrpcv2"
"github.com/hermeznetwork/hermez-core/log"
"github.com/hermeznetwork/hermez-core/merkletree"
"github.com/hermeznetwork/hermez-core/pool"
"github.com/hermeznetwork/hermez-core/pool/pgpoolstorage"
"github.com/hermeznetwork/hermez-core/pricegetter"
"github.com/hermeznetwork/hermez-core/proverclient"
proverclientpb "github.com/hermeznetwork/hermez-core/proverclient/pb"
"github.com/hermeznetwork/hermez-core/sequencerv2"
"github.com/hermeznetwork/hermez-core/sequencerv2/broadcast"
"github.com/hermeznetwork/hermez-core/sequencerv2/broadcast/pb"
"github.com/hermeznetwork/hermez-core/state"
"github.com/hermeznetwork/hermez-core/state/tree"
"github.com/hermeznetwork/hermez-core/statev2"
"github.com/hermeznetwork/hermez-core/statev2/runtime/executor"
synchronizer "github.com/hermeznetwork/hermez-core/synchronizerv2"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/urfave/cli/v2"
"google.golang.org/grpc"
Expand Down
36 changes: 18 additions & 18 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,24 +6,24 @@ import (
"path/filepath"
"strings"

"github.com/hermeznetwork/hermez-core/aggregator"
"github.com/hermeznetwork/hermez-core/db"
"github.com/hermeznetwork/hermez-core/etherman"
"github.com/hermeznetwork/hermez-core/ethermanv2"
"github.com/hermeznetwork/hermez-core/ethtxmanager"
"github.com/hermeznetwork/hermez-core/gasprice"
"github.com/hermeznetwork/hermez-core/jsonrpc"
"github.com/hermeznetwork/hermez-core/jsonrpcv2"
"github.com/hermeznetwork/hermez-core/log"
"github.com/hermeznetwork/hermez-core/pricegetter"
"github.com/hermeznetwork/hermez-core/proverclient"
"github.com/hermeznetwork/hermez-core/sequencer"
"github.com/hermeznetwork/hermez-core/sequencerv2"
"github.com/hermeznetwork/hermez-core/sequencerv2/broadcast"
"github.com/hermeznetwork/hermez-core/state/tree"
"github.com/hermeznetwork/hermez-core/statev2/runtime/executor"
"github.com/hermeznetwork/hermez-core/synchronizer"
"github.com/hermeznetwork/hermez-core/synchronizerv2"
"github.com/0xPolygonHermez/zkevm-node/aggregator"
"github.com/0xPolygonHermez/zkevm-node/db"
"github.com/0xPolygonHermez/zkevm-node/etherman"
"github.com/0xPolygonHermez/zkevm-node/ethermanv2"
"github.com/0xPolygonHermez/zkevm-node/ethtxmanager"
"github.com/0xPolygonHermez/zkevm-node/gasprice"
"github.com/0xPolygonHermez/zkevm-node/jsonrpc"
"github.com/0xPolygonHermez/zkevm-node/jsonrpcv2"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/0xPolygonHermez/zkevm-node/pricegetter"
"github.com/0xPolygonHermez/zkevm-node/proverclient"
"github.com/0xPolygonHermez/zkevm-node/sequencer"
"github.com/0xPolygonHermez/zkevm-node/sequencerv2"
"github.com/0xPolygonHermez/zkevm-node/sequencerv2/broadcast"
"github.com/0xPolygonHermez/zkevm-node/state/tree"
"github.com/0xPolygonHermez/zkevm-node/statev2/runtime/executor"
"github.com/0xPolygonHermez/zkevm-node/synchronizer"
"github.com/0xPolygonHermez/zkevm-node/synchronizerv2"
"github.com/mitchellh/mapstructure"
"github.com/spf13/viper"
"github.com/urfave/cli/v2"
Expand Down
10 changes: 5 additions & 5 deletions config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"testing"
"time"

"github.com/hermeznetwork/hermez-core/config"
"github.com/hermeznetwork/hermez-core/config/types"
"github.com/hermeznetwork/hermez-core/pricegetter"
"github.com/hermeznetwork/hermez-core/sequencer"
"github.com/hermeznetwork/hermez-core/state/tree"
"github.com/0xPolygonHermez/zkevm-node/config"
"github.com/0xPolygonHermez/zkevm-node/config/types"
"github.com/0xPolygonHermez/zkevm-node/pricegetter"
"github.com/0xPolygonHermez/zkevm-node/sequencer"
"github.com/0xPolygonHermez/zkevm-node/state/tree"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
)
Expand Down
4 changes: 2 additions & 2 deletions config/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"os"
"reflect"

"github.com/0xPolygonHermez/zkevm-node/encoding"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/ethereum/go-ethereum/common"
"github.com/hermeznetwork/hermez-core/encoding"
"github.com/hermeznetwork/hermez-core/log"
"github.com/imdario/mergo"
"github.com/urfave/cli/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion config/network_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"testing"

"github.com/0xPolygonHermez/zkevm-node/test/testutils"
"github.com/ethereum/go-ethereum/common"
"github.com/hermeznetwork/hermez-core/test/testutils"
"github.com/stretchr/testify/require"
"github.com/urfave/cli/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion db/db.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"fmt"

"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/gobuffalo/packr/v2"
"github.com/hermeznetwork/hermez-core/log"
"github.com/jackc/pgx/v4"
"github.com/jackc/pgx/v4/pgxpool"
"github.com/jackc/pgx/v4/stdlib"
Expand Down
2 changes: 1 addition & 1 deletion db/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/hermeznetwork/hermez-core/log"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/jackc/pgx/v4"
)

Expand Down
2 changes: 1 addition & 1 deletion encoding/encoding.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/hermeznetwork/hermez-core/hex"
"github.com/0xPolygonHermez/zkevm-node/hex"
)

const (
Expand Down
6 changes: 3 additions & 3 deletions etherman/converters.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"math/big"

"github.com/hermeznetwork/hermez-core/encoding"
"github.com/hermeznetwork/hermez-core/hex"
"github.com/hermeznetwork/hermez-core/proverclient/pb"
"github.com/0xPolygonHermez/zkevm-node/encoding"
"github.com/0xPolygonHermez/zkevm-node/hex"
"github.com/0xPolygonHermez/zkevm-node/proverclient/pb"
)

const (
Expand Down
14 changes: 7 additions & 7 deletions etherman/etherman.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,13 @@ import (
"strings"
"time"

"github.com/0xPolygonHermez/zkevm-node/encoding"
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/matic"
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/proofofefficiency"
"github.com/0xPolygonHermez/zkevm-node/hex"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/0xPolygonHermez/zkevm-node/proverclient/pb"
"github.com/0xPolygonHermez/zkevm-node/state"
"github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
Expand All @@ -17,13 +24,6 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/rlp"
"github.com/hermeznetwork/hermez-core/encoding"
"github.com/hermeznetwork/hermez-core/etherman/smartcontracts/matic"
"github.com/hermeznetwork/hermez-core/etherman/smartcontracts/proofofefficiency"
"github.com/hermeznetwork/hermez-core/hex"
"github.com/hermeznetwork/hermez-core/log"
"github.com/hermeznetwork/hermez-core/proverclient/pb"
"github.com/hermeznetwork/hermez-core/state"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions etherman/etherman_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ import (
"strings"
"testing"

"github.com/0xPolygonHermez/zkevm-node/encoding"
"github.com/0xPolygonHermez/zkevm-node/log"
"github.com/0xPolygonHermez/zkevm-node/proverclient/pb"
"github.com/0xPolygonHermez/zkevm-node/test/vectors"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
"github.com/hermeznetwork/hermez-core/encoding"
"github.com/hermeznetwork/hermez-core/log"
"github.com/hermeznetwork/hermez-core/proverclient/pb"
"github.com/hermeznetwork/hermez-core/test/vectors"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Expand Down
8 changes: 4 additions & 4 deletions etherman/simulated.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import (
"fmt"
"math/big"

"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/bridge"
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/globalexitrootmanager"
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/matic"
"github.com/0xPolygonHermez/zkevm-node/etherman/smartcontracts/proofofefficiency"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/crypto"
"github.com/hermeznetwork/hermez-core/etherman/smartcontracts/bridge"
"github.com/hermeznetwork/hermez-core/etherman/smartcontracts/globalexitrootmanager"
"github.com/hermeznetwork/hermez-core/etherman/smartcontracts/matic"
"github.com/hermeznetwork/hermez-core/etherman/smartcontracts/proofofefficiency"
)

// NewSimulatedEtherman creates an etherman that uses a simulated blockchain. It's important to notice that the ChainID of the auth
Expand Down
Loading

0 comments on commit 8b51dc6

Please sign in to comment.