remove dataavailability package

cmd/run.go

@@ -2,13 +2,11 @@ package main
 
 import (
 	"context"
-	"crypto/ecdsa"
 	"fmt"
 	"os"
 	"os/signal"
 	"runtime"
 
-	dataCommitteeClient "github.com/0xPolygon/cdk-data-availability/client"
 	jRPC "github.com/0xPolygon/cdk-rpc/rpc"
 	ethtxman "github.com/0xPolygon/zkevm-ethtx-manager/etherman"
 	"github.com/0xPolygon/zkevm-ethtx-manager/ethtxmanager"
@@ -24,16 +22,13 @@ import (
 	"github.com/agglayer/aggkit/claimsponsor"
 	aggkitcommon "github.com/agglayer/aggkit/common"
 	"github.com/agglayer/aggkit/config"
-	"github.com/agglayer/aggkit/dataavailability"
-	"github.com/agglayer/aggkit/dataavailability/datacommittee"
 	"github.com/agglayer/aggkit/etherman"
 	ethermanconfig "github.com/agglayer/aggkit/etherman/config"
 	"github.com/agglayer/aggkit/l1infotreesync"
 	"github.com/agglayer/aggkit/lastgersync"
 	"github.com/agglayer/aggkit/log"
 	"github.com/agglayer/aggkit/reorgdetector"
 	"github.com/agglayer/aggkit/rpc"
-	"github.com/agglayer/aggkit/translator"
 	"github.com/ethereum/go-ethereum/ethclient"
 	"github.com/urfave/cli/v2"
 )
@@ -254,56 +249,6 @@ func createAggoracle(
 	return aggOracle
 }
 
-func newDataAvailability(c config.Config, etherman *etherman.Client) (*dataavailability.DataAvailability, error) {
-	if !c.Common.IsValidiumMode {
-		return nil, nil
-	}
-	logger := log.WithFields("module", "da-committee")
-	translator := translator.NewTranslatorImpl(logger)
-	logger.Infof("Translator rules: %v", c.Common.Translator)
-	translator.AddConfigRules(c.Common.Translator)
-
-	// Backend specific config
-	daProtocolName, err := etherman.GetDAProtocolName()
-	if err != nil {
-		return nil, fmt.Errorf("error getting data availability protocol name: %w", err)
-	}
-	var daBackend dataavailability.DABackender
-	switch daProtocolName {
-	case string(dataavailability.DataAvailabilityCommittee):
-		var (
-			pk  *ecdsa.PrivateKey
-			err error
-		)
-		// TODO - What should be here?
-		_, pk, err = etherman.LoadAuthFromKeyStore("", "")
-		if err != nil {
-			return nil, err
-		}
-		dacAddr, err := etherman.GetDAProtocolAddr()
-		if err != nil {
-			return nil, fmt.Errorf("error getting trusted sequencer URI. Error: %w", err)
-		}
-
-		// TODO - What should be here?
-		daBackend, err = datacommittee.New(
-			logger,
-			"",
-			dacAddr,
-			pk,
-			dataCommitteeClient.NewFactory(),
-			translator,
-		)
-		if err != nil {
-			return nil, err
-		}
-	default:
-		return nil, fmt.Errorf("unexpected / unsupported DA protocol: %s", daProtocolName)
-	}
-
-	return dataavailability.New(daBackend)
-}
-
 func runAggregatorMigrations(dbPath string) {
 	runMigrations(dbPath, db.AggregatorMigrationName)
 }

config/default.go

@@ -205,8 +205,7 @@ WaitPeriodNextGER="100ms"
 				ForcedGas = 0
 				GasPriceMarginFactor = 1
 				MaxGasPriceLimit = 0
-				// TODO - What should be here?
-				StoragePath = ""
+				StoragePath = "{{PathRWData}}/ethtxmanager-aggoracle.sqlite"
 				ReadPendingL1Txs = false
 				SafeStatusL1NumberOfBlocks = 5
 				FinalizedStatusL1NumberOfBlocks = 10

crates/aggkit/src/config_render.rs

@@ -95,7 +95,6 @@ zkevm.l2-chain-id: {chain_id}
 zkevm.l2-sequencer-rpc-url: {l2_sequencer_rpc_url}
 zkevm.l1-chain-id: {l1_chain_id}
 zkevm.l1-rpc-url: {l1_rpc_url}
-zkevm.address-sequencer: {sequencer_address}
 zkevm.address-zkevm: {zkevm_address}
 zkevm.address-rollup: {rollup_address}
 zkevm.address-ger-manager: {ger_manager_address}
@@ -118,7 +117,6 @@ ws: true
         l2_sequencer_rpc_url = config.aggregator.witness_url.to_string(),
         l1_rpc_url = config.aggregator.eth_tx_manager.etherman.url,
         l1_chain_id = config.network_config.l1.l1_chain_id,
-        sequencer_address = config.sequence_sender.l2_coinbase,
         zkevm_address = res.wrapper.l1_config.zkevm_address,
         rollup_address = res.wrapper.l1_config.rollup_manager_address,
         ger_manager_address = res.wrapper.l1_config.zkevm_global_exit_root_address,

crates/aggkit/src/main.rs

@@ -127,7 +127,8 @@ pub async fn erigon(config_path: PathBuf, genesis_file: PathBuf) -> anyhow::Resu
 
     // Render configuration files
     let chain_id = config.aggregator.chain_id.clone();
-    let rpc_url = Url::parse(&config.sequence_sender.rpc_url).unwrap();
+    // TODO - What should be done here?
+    let rpc_url = Url::parse("").unwrap();
     let timestamp = get_timestamp(rpc_url).await.unwrap();
     let erigon_config_path = config_render::render(&config, genesis_file, timestamp)?;