Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prover: switch the go import path to linea-monorepo #20

Merged
merged 4 commits into from
Sep 13, 2024
Merged

Prover: switch the go import path to linea-monorepo #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b585628
switch the go import path to linea-monorepo
AlexandreBelling Sep 11, 2024
0f6c4d6
revert the changes for go.mod
AlexandreBelling Sep 11, 2024
685991e
address every occurence to zkevm-monorepo
AlexandreBelling Sep 13, 2024
1ea5978
fixup
AlexandreBelling Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion prover/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,5 +153,5 @@ cgo-flags:
# Update the prover's testdata in ../testdata/prover
#
make update-testdata-for-coordinator:
go test -timeout 30m -tags amd64,nocorset -run TestSamples github.com/consensys/zkevm-monorepo/prover/backend/testing -v
go test -timeout 30m -tags amd64,nocorset -run TestSamples github.com/consensys/linea-monorepo/prover/backend/testing -v
cp -f backend/testing/**/*-*-zkProof.json ../testdata/prover/output
27 changes: 14 additions & 13 deletions prover/backend/aggregation/craft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,26 @@ import (
"encoding/binary"
"encoding/json"
"fmt"
pi_interconnection "github.com/consensys/zkevm-monorepo/prover/circuits/pi-interconnection"
"path"

"github.com/consensys/zkevm-monorepo/prover/backend/blobsubmission"
pi_interconnection "github.com/consensys/linea-monorepo/prover/circuits/pi-interconnection"

public_input "github.com/consensys/zkevm-monorepo/prover/public-input"
"github.com/consensys/linea-monorepo/prover/backend/blobsubmission"

public_input "github.com/consensys/linea-monorepo/prover/public-input"

"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/gnark/backend/plonk"
"github.com/consensys/zkevm-monorepo/prover/backend/blobdecompression"
"github.com/consensys/zkevm-monorepo/prover/backend/execution"
"github.com/consensys/zkevm-monorepo/prover/backend/execution/bridge"
"github.com/consensys/zkevm-monorepo/prover/backend/files"
"github.com/consensys/zkevm-monorepo/prover/circuits/aggregation"
"github.com/consensys/zkevm-monorepo/prover/config"
"github.com/consensys/zkevm-monorepo/prover/crypto/state-management/hashtypes"
"github.com/consensys/zkevm-monorepo/prover/crypto/state-management/smt"
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/backend/blobdecompression"
"github.com/consensys/linea-monorepo/prover/backend/execution"
"github.com/consensys/linea-monorepo/prover/backend/execution/bridge"
"github.com/consensys/linea-monorepo/prover/backend/files"
"github.com/consensys/linea-monorepo/prover/circuits/aggregation"
"github.com/consensys/linea-monorepo/prover/config"
"github.com/consensys/linea-monorepo/prover/crypto/state-management/hashtypes"
"github.com/consensys/linea-monorepo/prover/crypto/state-management/smt"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion prover/backend/aggregation/craft_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package aggregation
import (
"testing"

"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/stretchr/testify/assert"
)

Expand Down
23 changes: 12 additions & 11 deletions prover/backend/aggregation/prove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,23 @@ package aggregation

import (
"fmt"
"math"
"path/filepath"

frBls12377 "github.com/consensys/gnark-crypto/ecc/bls12-377/fr"
"github.com/consensys/gnark/backend/witness"
"github.com/consensys/gnark/frontend"
pi_interconnection "github.com/consensys/zkevm-monorepo/prover/circuits/pi-interconnection"
public_input "github.com/consensys/zkevm-monorepo/prover/public-input"
"math"
"path/filepath"
pi_interconnection "github.com/consensys/linea-monorepo/prover/circuits/pi-interconnection"
public_input "github.com/consensys/linea-monorepo/prover/public-input"

"github.com/consensys/gnark/backend/plonk"
"github.com/consensys/zkevm-monorepo/prover/circuits"
"github.com/consensys/zkevm-monorepo/prover/circuits/aggregation"
"github.com/consensys/zkevm-monorepo/prover/circuits/dummy"
"github.com/consensys/zkevm-monorepo/prover/circuits/emulation"
"github.com/consensys/zkevm-monorepo/prover/config"
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/circuits"
"github.com/consensys/linea-monorepo/prover/circuits/aggregation"
"github.com/consensys/linea-monorepo/prover/circuits/dummy"
"github.com/consensys/linea-monorepo/prover/circuits/emulation"
"github.com/consensys/linea-monorepo/prover/config"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/ethereum/go-ethereum/common/hexutil"
"github.com/sirupsen/logrus"

Expand Down
8 changes: 4 additions & 4 deletions prover/backend/aggregation/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package aggregation

import (
"github.com/consensys/zkevm-monorepo/prover/backend/blobdecompression"
"github.com/consensys/zkevm-monorepo/prover/circuits/aggregation"
pi_interconnection "github.com/consensys/zkevm-monorepo/prover/circuits/pi-interconnection"
public_input "github.com/consensys/zkevm-monorepo/prover/public-input"
"github.com/consensys/linea-monorepo/prover/backend/blobdecompression"
"github.com/consensys/linea-monorepo/prover/circuits/aggregation"
pi_interconnection "github.com/consensys/linea-monorepo/prover/circuits/pi-interconnection"
public_input "github.com/consensys/linea-monorepo/prover/public-input"
)

// Request collects all the fields used to perform an aggregation request.
Expand Down
16 changes: 8 additions & 8 deletions prover/backend/blobdecompression/prove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ import (
"os"
"path/filepath"

blob_v0 "github.com/consensys/zkevm-monorepo/prover/lib/compressor/blob/v0"
blob_v1 "github.com/consensys/zkevm-monorepo/prover/lib/compressor/blob/v1"
blob_v0 "github.com/consensys/linea-monorepo/prover/lib/compressor/blob/v0"
blob_v1 "github.com/consensys/linea-monorepo/prover/lib/compressor/blob/v1"

"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/gnark-crypto/ecc/bls12-377/fr"
fr381 "github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
"github.com/consensys/zkevm-monorepo/prover/circuits"
"github.com/consensys/zkevm-monorepo/prover/circuits/blobdecompression"
"github.com/consensys/zkevm-monorepo/prover/circuits/dummy"
"github.com/consensys/zkevm-monorepo/prover/config"
"github.com/consensys/zkevm-monorepo/prover/lib/compressor/blob"
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/circuits"
"github.com/consensys/linea-monorepo/prover/circuits/blobdecompression"
"github.com/consensys/linea-monorepo/prover/circuits/dummy"
"github.com/consensys/linea-monorepo/prover/config"
"github.com/consensys/linea-monorepo/prover/lib/compressor/blob"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/sirupsen/logrus"

emPlonk "github.com/consensys/gnark/std/recursion/plonk"
Expand Down
2 changes: 1 addition & 1 deletion prover/backend/blobdecompression/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package blobdecompression

import "github.com/consensys/zkevm-monorepo/prover/backend/blobsubmission"
import "github.com/consensys/linea-monorepo/prover/backend/blobsubmission"

// The decompression proof request is conveniently exactly the same as the
// response of the blobsubmission. Some fields are not used, but it simplifies
Expand Down
4 changes: 2 additions & 2 deletions prover/backend/blobsubmission/blobcompression_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import (
"strings"
"testing"

blob "github.com/consensys/zkevm-monorepo/prover/lib/compressor/blob/v1"
blob "github.com/consensys/linea-monorepo/prover/lib/compressor/blob/v1"

fr381 "github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils"
gokzg4844 "github.com/crate-crypto/go-kzg-4844"
"github.com/ethereum/go-ethereum/crypto/kzg4844"
"github.com/stretchr/testify/assert"
Expand Down
6 changes: 3 additions & 3 deletions prover/backend/blobsubmission/craft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"fmt"
"hash"

"github.com/consensys/zkevm-monorepo/prover/crypto/mimc"
"github.com/consensys/linea-monorepo/prover/crypto/mimc"

fr381 "github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
blob "github.com/consensys/zkevm-monorepo/prover/lib/compressor/blob/v1"
"github.com/consensys/zkevm-monorepo/prover/utils"
blob "github.com/consensys/linea-monorepo/prover/lib/compressor/blob/v1"
"github.com/consensys/linea-monorepo/prover/utils"
"golang.org/x/crypto/sha3"
)

Expand Down
4 changes: 2 additions & 2 deletions prover/backend/blobsubmission/craft_eip4844.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"errors"
"fmt"

blob "github.com/consensys/zkevm-monorepo/prover/lib/compressor/blob/v1"
blob "github.com/consensys/linea-monorepo/prover/lib/compressor/blob/v1"

fr381 "github.com/consensys/gnark-crypto/ecc/bls12-381/fr"
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/ethereum/go-ethereum/crypto/kzg4844"
)

Expand Down
4 changes: 2 additions & 2 deletions prover/backend/ethereum/signature.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"bytes"
"math/big"

"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
ethtypes "github.com/ethereum/go-ethereum/core/types"
Expand Down
2 changes: 1 addition & 1 deletion prover/backend/ethereum/tx_encoding.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"math/big"

"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp"
Expand Down
2 changes: 1 addition & 1 deletion prover/backend/execution/bridge/batch_reception.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package bridge

import (
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
Expand Down
4 changes: 2 additions & 2 deletions prover/backend/execution/bridge/l2l1logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"math/big"
"reflect"

"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
Expand Down
4 changes: 2 additions & 2 deletions prover/backend/execution/bridge/rolling_hash_updated.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package bridge
import (
"math/big"

"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/ethereum/go-ethereum/common"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
Expand Down
24 changes: 12 additions & 12 deletions prover/backend/execution/craft.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,18 @@ import (
"bytes"
"path"

"github.com/consensys/zkevm-monorepo/prover/backend/ethereum"
"github.com/consensys/zkevm-monorepo/prover/backend/execution/bridge"
"github.com/consensys/zkevm-monorepo/prover/backend/execution/statemanager"
"github.com/consensys/zkevm-monorepo/prover/crypto/mimc"

"github.com/consensys/zkevm-monorepo/prover/circuits/execution"
"github.com/consensys/zkevm-monorepo/prover/config"
blob "github.com/consensys/zkevm-monorepo/prover/lib/compressor/blob/v1"
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/gnarkutil"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/zkevm-monorepo/prover/zkevm"
"github.com/consensys/linea-monorepo/prover/backend/ethereum"
"github.com/consensys/linea-monorepo/prover/backend/execution/bridge"
"github.com/consensys/linea-monorepo/prover/backend/execution/statemanager"
"github.com/consensys/linea-monorepo/prover/crypto/mimc"

"github.com/consensys/linea-monorepo/prover/circuits/execution"
"github.com/consensys/linea-monorepo/prover/config"
blob "github.com/consensys/linea-monorepo/prover/lib/compressor/blob/v1"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/gnarkutil"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/zkevm"
)

// Craft prover's functional inputs
Expand Down
14 changes: 7 additions & 7 deletions prover/backend/execution/prove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ package execution

import (
"github.com/consensys/gnark-crypto/ecc"
"github.com/consensys/zkevm-monorepo/prover/circuits"
"github.com/consensys/zkevm-monorepo/prover/circuits/dummy"
"github.com/consensys/zkevm-monorepo/prover/circuits/execution"
"github.com/consensys/zkevm-monorepo/prover/config"
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/profiling"
"github.com/consensys/zkevm-monorepo/prover/zkevm"
"github.com/consensys/linea-monorepo/prover/circuits"
"github.com/consensys/linea-monorepo/prover/circuits/dummy"
"github.com/consensys/linea-monorepo/prover/circuits/execution"
"github.com/consensys/linea-monorepo/prover/config"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/profiling"
"github.com/consensys/linea-monorepo/prover/zkevm"
"github.com/sirupsen/logrus"
)

Expand Down
8 changes: 4 additions & 4 deletions prover/backend/execution/request.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"bytes"
"path"

"github.com/consensys/zkevm-monorepo/prover/backend/ethereum"
"github.com/consensys/zkevm-monorepo/prover/backend/execution/statemanager"
"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/backend/ethereum"
"github.com/consensys/linea-monorepo/prover/backend/execution/statemanager"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/ethereum/go-ethereum/common/hexutil"
ethtypes "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/rlp"
Expand Down
6 changes: 3 additions & 3 deletions prover/backend/execution/response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package execution

import (
"github.com/consensys/zkevm-monorepo/prover/backend/execution/bridge"
"github.com/consensys/zkevm-monorepo/prover/config"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/backend/execution/bridge"
"github.com/consensys/linea-monorepo/prover/config"
"github.com/consensys/linea-monorepo/prover/utils/types"
)

// JSON schema of the message to return as an output of the prover
Expand Down
2 changes: 1 addition & 1 deletion prover/backend/execution/statemanager/access_pattern.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"fmt"

"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/utils/types"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions prover/backend/execution/statemanager/inspection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package statemanager
import (
"fmt"

"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/types"
)

// Inspect the traces and check if they are consistent with what the spec allows
Expand Down
4 changes: 2 additions & 2 deletions prover/backend/execution/statemanager/parsing_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"fmt"
"testing"

"github.com/consensys/zkevm-monorepo/prover/backend/execution/statemanager"
"github.com/consensys/zkevm-monorepo/prover/backend/files"
"github.com/consensys/linea-monorepo/prover/backend/execution/statemanager"
"github.com/consensys/linea-monorepo/prover/backend/files"
"github.com/stretchr/testify/require"
)

Expand Down
4 changes: 2 additions & 2 deletions prover/backend/execution/statemanager/proof_checks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

"github.com/consensys/zkevm-monorepo/prover/utils"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/utils"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/sirupsen/logrus"
)

Expand Down
4 changes: 2 additions & 2 deletions prover/backend/execution/statemanager/test_vectors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"math/big"
"testing"

eth "github.com/consensys/zkevm-monorepo/prover/backend/execution/statemanager"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
eth "github.com/consensys/linea-monorepo/prover/backend/execution/statemanager"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/stretchr/testify/assert"
)

Expand Down
4 changes: 2 additions & 2 deletions prover/backend/execution/statemanager/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"fmt"

"github.com/consensys/zkevm-monorepo/prover/crypto/state-management/accumulator"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/crypto/state-management/accumulator"
"github.com/consensys/linea-monorepo/prover/utils/types"
)

// Handy type aliases
Expand Down
10 changes: 5 additions & 5 deletions prover/backend/execution/statemanager/worldstate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ package statemanager
import (
"math/big"

"github.com/consensys/zkevm-monorepo/prover/crypto/state-management/accumulator"
"github.com/consensys/zkevm-monorepo/prover/crypto/state-management/hashtypes"
"github.com/consensys/zkevm-monorepo/prover/crypto/state-management/smt"
"github.com/consensys/zkevm-monorepo/prover/utils/collection"
"github.com/consensys/zkevm-monorepo/prover/utils/types"
"github.com/consensys/linea-monorepo/prover/crypto/state-management/accumulator"
"github.com/consensys/linea-monorepo/prover/crypto/state-management/hashtypes"
"github.com/consensys/linea-monorepo/prover/crypto/state-management/smt"
"github.com/consensys/linea-monorepo/prover/utils/collection"
"github.com/consensys/linea-monorepo/prover/utils/types"
"github.com/ethereum/go-ethereum/common"
)

Expand Down
Loading
Loading