Addressed remaining PR comments.

ten-protocol · Jul 16, 2024 · aae3128 · aae3128
1 parent 922d31d
commit aae3128
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/go/enclave/rpc/TenStorageRead.go b/go/enclave/rpc/TenStorageRead.go
@@ -9,7 +9,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ten-protocol/go-ten/go/common/gethencoding"
 	"github.com/ten-protocol/go-ten/go/common/log"
-	"github.com/ten-protocol/go-ten/go/common/privacy"
 	"github.com/ten-protocol/go-ten/go/common/syserr"
 	gethrpc "github.com/ten-protocol/go-ten/lib/gethfork/rpc"
 )
@@ -20,7 +19,7 @@ type storageReadWithBlock struct {
 	block       *gethrpc.BlockNumberOrHash
 }
 
-func TenStorageReadValidate(reqParams []any, builder *CallBuilder[storageReadWithBlock, string], _ *EncryptionManager) error {
+func TenStorageReadValidate(reqParams []any, builder *CallBuilder[storageReadWithBlock, string], rpc *EncryptionManager) error {
 	if len(reqParams) < 2 || len(reqParams) > 3 {
 		builder.Err = fmt.Errorf("unexpected number of parameters")
 		return nil
@@ -39,8 +38,7 @@ func TenStorageReadValidate(reqParams []any, builder *CallBuilder[storageReadWit
 	}
 
 	//todo: @siliev - this whitelist creation every time is bugging me
-	whitelist := privacy.NewWhitelist()
-	if !whitelist.AllowedStorageSlots[slot] {
+	if !rpc.whitelist.AllowedStorageSlots[slot] {
 		builder.Err = fmt.Errorf("eth_getStorageAt is not supported on TEN")
 		return nil
 	}

diff --git a/go/enclave/rpc/rpc_encryption_manager.go b/go/enclave/rpc/rpc_encryption_manager.go
@@ -3,6 +3,7 @@ package rpc
 import (
 	"fmt"
 
+	"github.com/ten-protocol/go-ten/go/common/privacy"
 	"github.com/ten-protocol/go-ten/go/config"
 	"github.com/ten-protocol/go-ten/go/enclave/gas"
 
@@ -29,6 +30,7 @@ type EncryptionManager struct {
 	l1BlockProcessor       components.L1BlockProcessor
 	config                 *config.EnclaveConfig
 	logger                 gethlog.Logger
+	whitelist              *privacy.Whitelist
 }
 
 func NewEncryptionManager(enclavePrivateKeyECIES *ecies.PrivateKey, storage storage.Storage, registry components.BatchRegistry, processors *crosschain.Processors, service nodetype.NodeType, config *config.EnclaveConfig, oracle gas.Oracle, blockResolver storage.BlockResolver, l1BlockProcessor components.L1BlockProcessor, chain l2chain.ObscuroChain, logger gethlog.Logger) *EncryptionManager {
@@ -44,6 +46,7 @@ func NewEncryptionManager(enclavePrivateKeyECIES *ecies.PrivateKey, storage stor
 		gasOracle:              oracle,
 		logger:                 logger,
 		enclavePrivateKeyECIES: enclavePrivateKeyECIES,
+		whitelist:              privacy.NewWhitelist(),
 	}
 }