lint

ten-protocol · Dec 10, 2024 · 9eec9f0 · 9eec9f0
1 parent 267505e
commit 9eec9f0
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 21 deletions.
diff --git a/go/common/l1_transaction.go b/go/common/l1_transaction.go
@@ -3,11 +3,12 @@ package common
 import (
 	"crypto/ecdsa"
 	"fmt"
+	"math/big"
+
 	gethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/crypto/kzg4844"
-	"math/big"
 )
 
 // TenTransaction is an abstraction that transforms an Ethereum transaction into a format that can be consumed more
@@ -107,7 +108,7 @@ type L1TxData struct {
 	Transaction *types.Transaction
 	Receipt     *types.Receipt
 	Blobs       []*kzg4844.Blob // Only populated for blob transactions
-	//SequencerEnclaveID *EnclaveID           // Only populated when a new enclave is added as a sequencer
+	// SequencerEnclaveID *EnclaveID           // Only populated when a new enclave is added as a sequencer
 	CrossChainMessages *CrossChainMessages  // Only populated for xchain messages
 	ValueTransfers     *ValueTransferEvents // Only populated for xchain transfers
 	Proof              []byte               // Some merkle proof TBC

diff --git a/go/config/loader.go b/go/config/loader.go
@@ -88,6 +88,6 @@ func load(filePaths []string) (*TenConfig, error) {
 	}
 
 	fmt.Println("Successfully loaded Ten config.")
-	//tenCfg.PrettyPrint()
+	tenCfg.PrettyPrint()
 	return &tenCfg, nil
 }
diff --git a/go/host/l1/publisher.go b/go/host/l1/publisher.go
@@ -311,9 +311,9 @@ func (p *Publisher) PublishCrossChainBundle(bundle *common.ExtCrossChainBundle,
 
 	transactor.Nonce = big.NewInt(0).SetUint64(nonce)
 
-	//println("PublishCrossChainBundle L1 block num: ", bundle.L1BlockNum.Uint64())
-	//println("PublishCrossChainBundle rollupNum: ", rollupNum.Uint64())
-	//println("PublishCrossChainBundle nonce: ", nonce)
+	// println("PublishCrossChainBundle L1 block num: ", bundle.L1BlockNum.Uint64())
+	// println("PublishCrossChainBundle rollupNum: ", rollupNum.Uint64())
+	// println("PublishCrossChainBundle nonce: ", nonce)
 
 	tx, err := managementCtr.AddCrossChainMessagesRoot(transactor, [32]byte(bundle.LastBatchHash.Bytes()), bundle.L1BlockHash, bundle.L1BlockNum, bundle.CrossChainRootHashes, bundle.Signature, rollupNum, forkID)
 	if err != nil {

diff --git a/go/node/docker_node.go b/go/node/docker_node.go
@@ -35,7 +35,7 @@ func NewDockerNode(cfg *config.TenConfig, hostImage, enclaveImage, edgelessDBIma
 
 func (d *DockerNode) Start() error {
 	// todo (@pedro) - this should probably be removed in the future
-	//d.cfg.PrettyPrint() // dump config to stdout
+	// d.cfg.PrettyPrint() // dump config to stdout
 
 	err := d.startEdgelessDB()
 	if err != nil {

diff --git a/integration/simulation/devnetwork/node.go b/integration/simulation/devnetwork/node.go
@@ -180,8 +180,12 @@ func (n *InMemNodeOperator) createHostContainer() *hostcontainer.HostContainer {
 	}
 	rpcServer := node.NewServer(&rpcConfig, n.logger)
 	mgmtContractLib := mgmtcontractlib.NewMgmtContractLib(&hostConfig.ManagementContractAddress, n.logger)
-	l1Repo := l1.NewL1Repository(n.l1Client, []gethcommon.Address{hostConfig.ManagementContractAddress, hostConfig.MessageBusAddress}, n.logger)
+	contractAddresses := map[l1.ContractType][]gethcommon.Address{
+		l1.MgmtContract: {hostConfig.ManagementContractAddress},
+		l1.MsgBus:       {hostConfig.MessageBusAddress},
+	}
 	blobResolver := l1.NewBlobResolver(ethadapter.NewL1BeaconClient(ethadapter.NewBeaconHTTPClient(new(http.Client), fmt.Sprintf("127.0.0.1:%d", n.config.L1BeaconPort))))
+	l1Repo := l1.NewL1Repository(n.l1Client, n.logger, mgmtContractLib, blobResolver, contractAddresses)
 	return hostcontainer.NewHostContainer(hostConfig, svcLocator, nodeP2p, n.l1Client, l1Repo, enclaveClients, mgmtContractLib, n.l1Wallet, rpcServer, hostLogger, metrics.New(false, 0, n.logger), blobResolver)
 }
 

diff --git a/integration/smartcontract/smartcontracts_test.go b/integration/smartcontract/smartcontracts_test.go
@@ -155,7 +155,7 @@ func nonAttestedNodesCannotCreateRollup(t *testing.T, mgmtContractLib *debugMgmt
 	if err != nil {
 		t.Error(err)
 	}
-	txData, err := mgmtContractLib.CreateBlobRollup(&ethadapter.L1RollupTx{Rollup: encodedRollup})
+	txData, err := mgmtContractLib.CreateBlobRollup(&common.L1RollupTx{Rollup: encodedRollup})
 	if err != nil {
 		t.Error(err)
 	}
@@ -170,7 +170,7 @@ func nonAttestedNodesCannotCreateRollup(t *testing.T, mgmtContractLib *debugMgmt
 func secretCannotBeInitializedTwice(t *testing.T, mgmtContractLib *debugMgmtContractLib, w *debugWallet, client ethadapter.EthClient) {
 	aggregatorID := datagenerator.RandomAddress()
 	txData := mgmtContractLib.CreateInitializeSecret(
-		&ethadapter.L1InitializeSecretTx{
+		&common.L1InitializeSecretTx{
 			EnclaveID: &aggregatorID,
 		},
 	)
@@ -196,7 +196,7 @@ func secretCannotBeInitializedTwice(t *testing.T, mgmtContractLib *debugMgmtCont
 	// do the same again
 	aggregatorID = datagenerator.RandomAddress()
 	txData = mgmtContractLib.CreateInitializeSecret(
-		&ethadapter.L1InitializeSecretTx{
+		&common.L1InitializeSecretTx{
 			EnclaveID: &aggregatorID,
 		},
 	)
@@ -225,7 +225,7 @@ func attestedNodesCreateRollup(t *testing.T, mgmtContractLib *debugMgmtContractL
 
 	// the aggregator starts the network
 	txData := mgmtContractLib.CreateInitializeSecret(
-		&ethadapter.L1InitializeSecretTx{
+		&common.L1InitializeSecretTx{
 			EnclaveID: &enclaveID,
 		},
 	)
@@ -256,7 +256,7 @@ func nonAttestedNodesCannotAttest(t *testing.T, mgmtContractLib *debugMgmtContra
 
 	// aggregator A starts the network secret
 	txData := mgmtContractLib.CreateInitializeSecret(
-		&ethadapter.L1InitializeSecretTx{
+		&common.L1InitializeSecretTx{
 			EnclaveID: &aggAID,
 		},
 	)
@@ -277,7 +277,7 @@ func nonAttestedNodesCannotAttest(t *testing.T, mgmtContractLib *debugMgmtContra
 	aggBID := crypto.PubkeyToAddress(aggBPrivateKey.PublicKey)
 
 	txData = mgmtContractLib.CreateRequestSecret(
-		&ethadapter.L1RequestSecretTx{
+		&common.L1RequestSecretTx{
 			Attestation: datagenerator.RandomBytes(10),
 		},
 	)
@@ -300,7 +300,7 @@ func nonAttestedNodesCannotAttest(t *testing.T, mgmtContractLib *debugMgmtContra
 	fakeSecret := []byte{123}
 
 	txData = mgmtContractLib.CreateRespondSecret(
-		(&ethadapter.L1RespondSecretTx{
+		(&common.L1RespondSecretTx{
 			AttesterID:  aggCID,
 			RequesterID: aggBID,
 			Secret:      fakeSecret,
@@ -315,7 +315,7 @@ func nonAttestedNodesCannotAttest(t *testing.T, mgmtContractLib *debugMgmtContra
 
 	// agg c responds to the secret AGAIN, but trying to mimick aggregator A
 	txData = mgmtContractLib.CreateRespondSecret(
-		(&ethadapter.L1RespondSecretTx{
+		(&common.L1RespondSecretTx{
 			Secret:      fakeSecret,
 			RequesterID: aggBID,
 			AttesterID:  aggAID,
@@ -341,7 +341,7 @@ func newlyAttestedNodesCanAttest(t *testing.T, mgmtContractLib *debugMgmtContrac
 
 	// the aggregator starts the network
 	txData := mgmtContractLib.CreateInitializeSecret(
-		&ethadapter.L1InitializeSecretTx{
+		&common.L1InitializeSecretTx{
 			EnclaveID:     &aggAID,
 			InitialSecret: secretBytes,
 		},
@@ -370,7 +370,7 @@ func newlyAttestedNodesCanAttest(t *testing.T, mgmtContractLib *debugMgmtContrac
 	aggBID := crypto.PubkeyToAddress(aggBPrivateKey.PublicKey)
 
 	txData = mgmtContractLib.CreateRequestSecret(
-		&ethadapter.L1RequestSecretTx{
+		&common.L1RequestSecretTx{
 			Attestation: datagenerator.RandomBytes(10),
 		},
 	)
@@ -390,7 +390,7 @@ func newlyAttestedNodesCanAttest(t *testing.T, mgmtContractLib *debugMgmtContrac
 	aggCID := crypto.PubkeyToAddress(aggCPrivateKey.PublicKey)
 
 	txData = mgmtContractLib.CreateRequestSecret(
-		&ethadapter.L1RequestSecretTx{
+		&common.L1RequestSecretTx{
 			Attestation: datagenerator.RandomBytes(10),
 		},
 	)
@@ -405,7 +405,7 @@ func newlyAttestedNodesCanAttest(t *testing.T, mgmtContractLib *debugMgmtContrac
 
 	// Agg A responds to Agg C request
 	txData = mgmtContractLib.CreateRespondSecret(
-		(&ethadapter.L1RespondSecretTx{
+		(&common.L1RespondSecretTx{
 			Secret:      secretBytes,
 			RequesterID: aggCID,
 			AttesterID:  aggAID,
@@ -432,7 +432,7 @@ func newlyAttestedNodesCanAttest(t *testing.T, mgmtContractLib *debugMgmtContrac
 
 	// agg C attests agg B
 	txData = mgmtContractLib.CreateRespondSecret(
-		(&ethadapter.L1RespondSecretTx{
+		(&common.L1RespondSecretTx{
 			Secret:      secretBytes,
 			RequesterID: aggBID,
 			AttesterID:  aggCID,