fix: move to fhevm to stay compatible

zama-ai · Mar 5, 2024 · 214dc8f · 214dc8f
1 parent 42c283d
commit 214dc8f
Show file tree

Hide file tree

Showing 37 changed files with 23 additions and 23 deletions.
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ build: build-tfhe-rs-capi
 
 .PHONY: test
 test: build-tfhe-rs-capi
-	cd pkg && go test -v ./...
+	cd fhevm && go test -v ./...
 
 .PHONY: build-tfhe-rs-capi
 build-tfhe-rs-capi:

diff --git a/pkg/fhevm/contract.go → fhevm/contract.go b/pkg/fhevm/contract.go → fhevm/contract.go
diff --git a/pkg/fhevm/contracts_test.go → fhevm/contracts_test.go b/pkg/fhevm/contracts_test.go → fhevm/contracts_test.go
@@ -15,7 +15,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 // generate keys if not present

diff --git a/pkg/crypto/crypto.go → fhevm/crypto/crypto.go b/pkg/crypto/crypto.go → fhevm/crypto/crypto.go
diff --git a/pkg/fhevm/errors.go → fhevm/errors.go b/pkg/fhevm/errors.go → fhevm/errors.go
diff --git a/pkg/fhevm/evm.go → fhevm/evm.go b/pkg/fhevm/evm.go → fhevm/evm.go
@@ -7,8 +7,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
-	fhevm_crypto "github.com/zama-ai/fhevm-go/pkg/crypto"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	fhevm_crypto "github.com/zama-ai/fhevm-go/fhevm/crypto"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 var protectedStorageAddrCallerAddr common.Address

diff --git a/pkg/fhevm/fhelib.go → fhevm/fhelib.go b/pkg/fhevm/fhelib.go → fhevm/fhelib.go
diff --git a/pkg/fhevm/instructions.go → fhevm/instructions.go b/pkg/fhevm/instructions.go → fhevm/instructions.go
@@ -8,8 +8,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	crypto "github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
-	fhevm_crypto "github.com/zama-ai/fhevm-go/pkg/crypto"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	fhevm_crypto "github.com/zama-ai/fhevm-go/fhevm/crypto"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 	"go.opentelemetry.io/otel"
 )
 

diff --git a/pkg/fhevm/instructions_test.go → fhevm/instructions_test.go b/pkg/fhevm/instructions_test.go → fhevm/instructions_test.go
@@ -13,8 +13,8 @@ import (
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
-	fhevm_crypto "github.com/zama-ai/fhevm-go/pkg/crypto"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	fhevm_crypto "github.com/zama-ai/fhevm-go/fhevm/crypto"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 func init() {

diff --git a/pkg/fhevm/interface.go → fhevm/interface.go b/pkg/fhevm/interface.go → fhevm/interface.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/holiman/uint256"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 type EVMEnvironment interface {

diff --git a/pkg/fhevm/interpreter.go → fhevm/interpreter.go b/pkg/fhevm/interpreter.go → fhevm/interpreter.go
@@ -2,7 +2,7 @@ package fhevm
 
 import (
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 type ScopeContext interface {

diff --git a/pkg/kms/constants.go → fhevm/kms/constants.go b/pkg/kms/constants.go → fhevm/kms/constants.go
diff --git a/pkg/kms/kms.pb.go → fhevm/kms/kms.pb.go b/pkg/kms/kms.pb.go → fhevm/kms/kms.pb.go
diff --git a/pkg/kms/kms_grpc.pb.go → fhevm/kms/kms_grpc.pb.go b/pkg/kms/kms_grpc.pb.go → fhevm/kms/kms_grpc.pb.go
diff --git a/pkg/fhevm/memory.go → fhevm/memory.go b/pkg/fhevm/memory.go → fhevm/memory.go
diff --git a/pkg/fhevm/operators_arithmetic.go → fhevm/operators_arithmetic.go b/pkg/fhevm/operators_arithmetic.go → fhevm/operators_arithmetic.go
diff --git a/pkg/fhevm/operators_arithmetic_gas.go → fhevm/operators_arithmetic_gas.go b/pkg/fhevm/operators_arithmetic_gas.go → fhevm/operators_arithmetic_gas.go
diff --git a/pkg/fhevm/operators_bit.go → fhevm/operators_bit.go b/pkg/fhevm/operators_bit.go → fhevm/operators_bit.go
diff --git a/pkg/fhevm/operators_bit_gas.go → fhevm/operators_bit_gas.go b/pkg/fhevm/operators_bit_gas.go → fhevm/operators_bit_gas.go
diff --git a/pkg/fhevm/operators_comparison.go → fhevm/operators_comparison.go b/pkg/fhevm/operators_comparison.go → fhevm/operators_comparison.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 	"go.opentelemetry.io/otel/trace"
 )
 

diff --git a/pkg/fhevm/operators_comparison_gas.go → fhevm/operators_comparison_gas.go b/pkg/fhevm/operators_comparison_gas.go → fhevm/operators_comparison_gas.go
@@ -3,7 +3,7 @@ package fhevm
 import (
 	"encoding/hex"
 
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 func fheLeRequiredGas(environment EVMEnvironment, input []byte) uint64 {

diff --git a/pkg/fhevm/operators_crypto.go → fhevm/operators_crypto.go b/pkg/fhevm/operators_crypto.go → fhevm/operators_crypto.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/zama-ai/fhevm-go/pkg/kms"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/kms"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 	"go.opentelemetry.io/otel/trace"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"

diff --git a/pkg/fhevm/operators_crypto_gas.go → fhevm/operators_crypto_gas.go b/pkg/fhevm/operators_crypto_gas.go → fhevm/operators_crypto_gas.go
@@ -4,7 +4,7 @@ import (
 	"encoding/hex"
 
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 func verifyCiphertextRequiredGas(environment EVMEnvironment, input []byte) uint64 {

diff --git a/pkg/fhevm/operators_rand.go → fhevm/operators_rand.go b/pkg/fhevm/operators_rand.go → fhevm/operators_rand.go
@@ -11,8 +11,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
-	fhevm_crypto "github.com/zama-ai/fhevm-go/pkg/crypto"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	fhevm_crypto "github.com/zama-ai/fhevm-go/fhevm/crypto"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/crypto/chacha20"
 )

diff --git a/pkg/fhevm/operators_rand_gas.go → fhevm/operators_rand_gas.go b/pkg/fhevm/operators_rand_gas.go → fhevm/operators_rand_gas.go
@@ -6,7 +6,7 @@ import (
 	"math/bits"
 
 	"github.com/holiman/uint256"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 func fheRandRequiredGas(environment EVMEnvironment, input []byte) uint64 {

diff --git a/pkg/fhevm/otel.go → fhevm/otel.go b/pkg/fhevm/otel.go → fhevm/otel.go
@@ -3,7 +3,7 @@ package fhevm
 import (
 	"math/big"
 
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/trace"
 )

diff --git a/pkg/fhevm/params.go → fhevm/params.go b/pkg/fhevm/params.go → fhevm/params.go
@@ -1,6 +1,6 @@
 package fhevm
 
-import "github.com/zama-ai/fhevm-go/pkg/tfhe"
+import "github.com/zama-ai/fhevm-go/fhevm/tfhe"
 
 // This file contains default gas costs of fhEVM-related operations.
 // Users can change the values based on specific requirements in their blockchain.

diff --git a/pkg/fhevm/precompiles.go → fhevm/precompiles.go b/pkg/fhevm/precompiles.go → fhevm/precompiles.go
diff --git a/pkg/fhevm/protected_storage.go → fhevm/protected_storage.go b/pkg/fhevm/protected_storage.go → fhevm/protected_storage.go
@@ -7,8 +7,8 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	crypto "github.com/ethereum/go-ethereum/crypto"
 	"github.com/holiman/uint256"
-	fhevm_crypto "github.com/zama-ai/fhevm-go/pkg/crypto"
-	"github.com/zama-ai/fhevm-go/pkg/tfhe"
+	fhevm_crypto "github.com/zama-ai/fhevm-go/fhevm/crypto"
+	"github.com/zama-ai/fhevm-go/fhevm/tfhe"
 )
 
 // An arbitrary constant value to flag locations in protected storage.

diff --git a/pkg/fhevm/stack.go → fhevm/stack.go b/pkg/fhevm/stack.go → fhevm/stack.go
diff --git a/pkg/tfhe/tfhe_ciphertext.go → fhevm/tfhe/tfhe_ciphertext.go b/pkg/tfhe/tfhe_ciphertext.go → fhevm/tfhe/tfhe_ciphertext.go
diff --git a/pkg/tfhe/tfhe_key_management.go → fhevm/tfhe/tfhe_key_management.go b/pkg/tfhe/tfhe_key_management.go → fhevm/tfhe/tfhe_key_management.go
diff --git a/pkg/tfhe/tfhe_test.go → fhevm/tfhe/tfhe_test.go b/pkg/tfhe/tfhe_test.go → fhevm/tfhe/tfhe_test.go
diff --git a/pkg/tfhe/tfhe_wrappers.c → fhevm/tfhe/tfhe_wrappers.c b/pkg/tfhe/tfhe_wrappers.c → fhevm/tfhe/tfhe_wrappers.c
diff --git a/pkg/tfhe/tfhe_wrappers.go → fhevm/tfhe/tfhe_wrappers.go b/pkg/tfhe/tfhe_wrappers.go → fhevm/tfhe/tfhe_wrappers.go
diff --git a/pkg/tfhe/tfhe_wrappers.h → fhevm/tfhe/tfhe_wrappers.h b/pkg/tfhe/tfhe_wrappers.h → fhevm/tfhe/tfhe_wrappers.h
diff --git a/proto/kms.proto b/proto/kms.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 package kms;
-option go_package = "github.com/zama-ai/fhevm-go/pkg/kms";
+option go_package = "github.com/zama-ai/fhevm-go/fhevm/kms";
 
 service KmsEndpoint {
   rpc Validate_and_decrypt(DecryptionRequest) returns (DecryptionResponse);