Add EdgelessDB flag + IsSGXEnabled flag

.github/workflows/build-pr.yml

@@ -40,6 +40,7 @@ jobs:
             integration/.build/simulations/sim-log-*.txt
             integration/.build/noderunner/noderunner-*.txt
             integration/.build/wallet_extension/wal-ext-*.txt
+            integration/.build/faucet/*
             integration/.build/eth2/*
           retention-days: 2
 

integration/faucet/faucet_test.go

@@ -63,6 +63,7 @@ func TestFaucet(t *testing.T) {
 	err = fundWallet(faucetConfig.ServerPort, rndWallet)
 	assert.NoError(t, err)
 
+	time.Sleep(2 * time.Second) // make sure the faucet has started
 	obsClient, err := obsclient.DialWithAuth(fmt.Sprintf("http://%s:%d", network.Localhost, startPort+integration.DefaultHostRPCHTTPOffset), rndWallet, testlog.Logger())
 	assert.NoError(t, err)
 

testnet/launcher/cmd/cli.go

@@ -10,6 +10,10 @@ type TestnetConfigCLI struct {
 	validatorEnclaveDebug       bool
 	sequencerEnclaveDockerImage string
 	sequencerEnclaveDebug       bool
+
+	isSGXEnabled bool
+
+	edgelessDBDockerImage string
 }
 
 // ParseConfigCLI returns a NodeConfigCLI based the cli params and defaults.
@@ -21,12 +25,20 @@ func ParseConfigCLI() *TestnetConfigCLI {
 	validatorEnclaveDebug := flag.Bool(validatorEnclaveDebugFlag, false, flagUsageMap[validatorEnclaveDebugFlag])
 	sequencerEnclaveDockerImage := flag.String(sequencerEnclaveDockerImageFlag, "testnetobscuronet.azurecr.io/obscuronet/enclave:latest", flagUsageMap[sequencerEnclaveDockerImageFlag])
 	sequencerEnclaveDebug := flag.Bool(sequencerEnclaveDebugFlag, false, flagUsageMap[sequencerEnclaveDebugFlag])
+
+	edgelessDBDockerImage := flag.String(edgelessDBDockerImageFlag, "ghcr.io/edgelesssys/edgelessdb-sgx-4gb:v0.3.2", flagUsageMap[edgelessDBDockerImageFlag])
+
+	isSGXEnabled := flag.Bool(isSGXEnabledFlag, false, flagUsageMap[isSGXEnabledFlag])
 	flag.Parse()
 
 	cfg.validatorEnclaveDockerImage = *validatorEnclaveDockerImage
 	cfg.sequencerEnclaveDockerImage = *sequencerEnclaveDockerImage
 	cfg.validatorEnclaveDebug = *validatorEnclaveDebug
 	cfg.sequencerEnclaveDebug = *sequencerEnclaveDebug
 
+	cfg.isSGXEnabled = *isSGXEnabled
+
+	cfg.edgelessDBDockerImage = *edgelessDBDockerImage
+
 	return cfg
 }

testnet/launcher/cmd/cli_flags.go

@@ -6,6 +6,10 @@ const (
 	validatorEnclaveDebugFlag       = "validator-enclave-debug"
 	sequencerEnclaveDockerImageFlag = "sequencer-enclave-docker-image"
 	sequencerEnclaveDebugFlag       = "sequencer-enclave-debug"
+
+	edgelessDBDockerImageFlag = "edgelessDB-docker-image"
+
+	isSGXEnabledFlag = "is-sgx-enabled"
 )
 
 // Returns a map of the flag usages.
@@ -16,5 +20,9 @@ func getFlagUsageMap() map[string]string {
 		validatorEnclaveDebugFlag:       "Enables the use of DLV to debug the validator enclave",
 		sequencerEnclaveDockerImageFlag: "The docker image that runs the sequencer enclave",
 		sequencerEnclaveDebugFlag:       "Enables the use of DLV to debug the sequencer enclave",
+
+		edgelessDBDockerImageFlag: "The docker image that runs the edgelessDB",
+
+		isSGXEnabledFlag: "Whether sgx is enabled",
 	}
 }

testnet/launcher/cmd/main.go

@@ -17,6 +17,8 @@ func main() {
 			launcher.WithValidatorEnclaveDebug(cliConfig.validatorEnclaveDebug),
 			launcher.WithSequencerEnclaveDockerImage(cliConfig.sequencerEnclaveDockerImage),
 			launcher.WithSequencerEnclaveDebug(cliConfig.sequencerEnclaveDebug),
+			launcher.WithEdgelessDBDockerImage(cliConfig.edgelessDBDockerImage),
+			launcher.IsSGXEnabled(cliConfig.isSGXEnabled),
 		),
 	)
 	err := testnet.Start()

testnet/launcher/config.go

@@ -10,6 +10,10 @@ type Config struct {
 
 	validatorEnclaveDockerImage string
 	validatorEnclaveDebug       bool
+
+	isSGXEnabled bool
+
+	edgelessDBDockerImage string
 }
 
 func NewTestnetConfig(opts ...Option) *Config {
@@ -45,3 +49,15 @@ func WithValidatorEnclaveDebug(b bool) Option {
 		c.validatorEnclaveDebug = b
 	}
 }
+
+func WithEdgelessDBDockerImage(s string) Option {
+	return func(c *Config) {
+		c.edgelessDBDockerImage = s
+	}
+}
+
+func IsSGXEnabled(b bool) Option {
+	return func(c *Config) {
+		c.isSGXEnabled = b
+	}
+}

testnet/launcher/docker.go

@@ -45,10 +45,11 @@ func (t *Testnet) Start() error {
 		node.WithNodeName("sequencer"),
 		node.WithNodeType("sequencer"),
 		node.WithGenesis(true),
-		node.WithSGXEnabled(false),
+		node.WithSGXEnabled(t.cfg.isSGXEnabled),
 		node.WithEnclaveImage(t.cfg.sequencerEnclaveDockerImage),
 		node.WithEnclaveDebug(t.cfg.sequencerEnclaveDebug),
 		node.WithHostImage("testnetobscuronet.azurecr.io/obscuronet/host:latest"),
+		node.WithEdgelessDBImage(t.cfg.edgelessDBDockerImage),
 		node.WithL1Host("eth2network"),
 		node.WithL1WSPort(9000),
 		node.WithEnclaveWSPort(11000),