Multithreaded booking and new data flow with solidification of transactions

.github/workflows/integration-tests.yml

@@ -156,55 +156,6 @@ jobs:
           name: ${{ env.TEST_NAME }}
           path: tools/integration-tests/logs
 
-  drng:
-    name: drng
-    env:
-      TEST_NAME: drng
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Checkout repository
-        uses: actions/checkout@v2
-
-      - name: Cache Go modules for tester container
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/go
-          # make sure concurrent runs (not really supported) do not match the same key but instead fall back to a reasonable cache
-          key: ${{ runner.os }}-it-go-${{ hashFiles('tools/integration-tests/tester/go.sum') }}-${{ github.job }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-it-go-${{ hashFiles('tools/integration-tests/tester/go.sum') }}-
-            ${{ runner.os }}-it-go-
-
-      - name: Build GoShimmer image
-        run: |
-          docker build \
-            --build-arg DOWNLOAD_SNAPSHOT=0 \
-            -t iotaledger/goshimmer .
-
-      - name: Pull additional Docker images
-        run: |
-          docker pull angelocapossele/drand:v1.1.4
-
-      - name: Run integration tests
-        run: |
-          export CURRENT_UID=$(id -u):$(id -g)
-          docker-compose -f tools/integration-tests/tester/docker-compose.ci.yml up --abort-on-container-exit --exit-code-from tester
-
-      - name: Create logs from tester
-        if: always()
-        run: |
-          docker logs tester &> tools/integration-tests/logs/tester.log
-
-      - name: Save logs as artifacts
-        if: always()
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ env.TEST_NAME }}
-          path: tools/integration-tests/logs
-
-
   value:
     name: value
     env:
@@ -349,51 +300,3 @@ jobs:
         with:
           name: ${{ env.TEST_NAME }}
           path: tools/integration-tests/logs
-
-  diagnostics:
-    name: diagnostics
-    env:
-      TEST_NAME: diagnostics
-    runs-on: ubuntu-latest
-    steps:
-
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Cache Go modules for tester container
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/go
-          # make sure concurrent runs (not really supported) do not match the same key but instead fall back to a reasonable cache
-          key: ${{ runner.os }}-it-go-${{ hashFiles('tools/integration-tests/tester/go.sum') }}-${{ github.job }}-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-it-go-${{ hashFiles('tools/integration-tests/tester/go.sum') }}-
-            ${{ runner.os }}-it-go-
-
-      - name: Build GoShimmer image
-        run: |
-          docker build \
-            --build-arg DOWNLOAD_SNAPSHOT=0 \
-            -t iotaledger/goshimmer .
-
-      - name: Pull additional Docker images
-        run: |
-          docker pull alpine/socat:1.7.4.3-r0
-
-      - name: Run integration tests
-        run: |
-          export CURRENT_UID=$(id -u):$(id -g)
-          docker-compose -f tools/integration-tests/tester/docker-compose.ci.yml up --abort-on-container-exit --exit-code-from tester
-
-      - name: Create logs from tester
-        if: always()
-        run: |
-          docker logs tester &> tools/integration-tests/logs/tester.log
-
-      - name: Save logs as artifacts
-        if: always()
-        uses: actions/upload-artifact@v1
-        with:
-          name: ${{ env.TEST_NAME }}
-          path: tools/integration-tests/logs

Dockerfile

@@ -135,7 +135,7 @@ FROM prepare-runtime as debugger-enabled-0
 
 ENTRYPOINT ["/app/goshimmer", "--config=/app/config.json"]
 
-# We execute this stage only if debugging is enabled, i.e REMOTE_DEBUGGIN==1
+# We execute this stage only if debugging is enabled, i.e REMOTE_DEBUGGING==1
 FROM prepare-runtime as debugger-enabled-1
 EXPOSE 40000
 

client/diagnostics.go

@@ -46,7 +46,7 @@ func (api *GoShimmerAPI) GetDiagnosticsMessagesByRank(rank uint64) (*csv.Reader,
 // GetDiagnosticsUtxoDag runs diagnostics over utxo dag.
 // Returns csv with the following fields:
 //
-//	ID,IssuanceTime,SolidTime,AccessManaPledgeID,ConsensusManaPledgeID,Inputs,Outputs,Attachments,
+//	ID,IssuanceTime,BookingTime,AccessManaPledgeID,ConsensusManaPledgeID,Inputs,Outputs,Attachments,
 //	BranchID,Conflicting,LazyBooked,GradeOfFinality,GradeOfFinalityTime
 func (api *GoShimmerAPI) GetDiagnosticsUtxoDag() (*csv.Reader, error) {
 	return api.diagnose(RouteDiagnosticsUtxoDag)
@@ -55,23 +55,23 @@ func (api *GoShimmerAPI) GetDiagnosticsUtxoDag() (*csv.Reader, error) {
 // GetDiagnosticsBranches runs diagnostics over branches.
 // Returns csv with the following fields:
 //
-//	ID,ConflictSet,IssuanceTime,SolidTime,LazyBooked,GradeOfFinality
+//	ID,ConflictSet,IssuanceTime,BookingTime,LazyBooked,GradeOfFinality
 func (api *GoShimmerAPI) GetDiagnosticsBranches() (*csv.Reader, error) {
 	return api.diagnose(RouteDiagnosticsBranches)
 }
 
 // GetDiagnosticsLazyBookedBranches runs diagnostics over lazy booked branches.
 // Returns csv with the following fields:
 //
-//	ID,ConflictSet,IssuanceTime,SolidTime,LazyBooked,GradeOfFinality
+//	ID,ConflictSet,IssuanceTime,BookingTime,LazyBooked,GradeOfFinality
 func (api *GoShimmerAPI) GetDiagnosticsLazyBookedBranches() (*csv.Reader, error) {
 	return api.diagnose(RouteDiagnosticsLazyBookedBranches)
 }
 
 // GetDiagnosticsInvalidBranches runs diagnostics over invalid branches.
 // Returns csv with the following fields:
 //
-//	ID,ConflictSet,IssuanceTime,SolidTime,LazyBooked,GradeOfFinality
+//	ID,ConflictSet,IssuanceTime,BookingTime,LazyBooked,GradeOfFinality
 func (api *GoShimmerAPI) GetDiagnosticsInvalidBranches() (*csv.Reader, error) {
 	return api.diagnose(RouteDiagnosticsInvalidBranches)
 }
@@ -84,7 +84,7 @@ func (api *GoShimmerAPI) GetDiagnosticsTips() (*csv.Reader, error) {
 // GetDiagnosticsDRNG runs diagnostics for DRNG
 // Returns csv with the following fields:
 //
-// 	ID,IssuerID,IssuerPublicKey,IssuanceTime,ArrivalTime,SolidTime,ScheduledTime,BookedTime,
+// 	ID,IssuerID,IssuerPublicKey,IssuanceTime,ArrivalTime,BookingTime,ScheduledTime,BookedTime,
 //	dRNGPayloadType,InstanceID,Round,PreviousSignature,Signature,DistributedPK
 func (api *GoShimmerAPI) GetDiagnosticsDRNG() (*csv.Reader, error) {
 	return api.diagnose(RouteDiagnosticsDRNG)

client/evilspammer/spammer.go

@@ -6,7 +6,9 @@ import (
 	"github.com/cockroachdb/errors"
 
 	"github.com/iotaledger/goshimmer/client/evilwallet"
-	"github.com/iotaledger/goshimmer/packages/ledgerstate"
+	"github.com/iotaledger/goshimmer/packages/ledger/utxo"
+	"github.com/iotaledger/goshimmer/packages/ledger/vm/devnetvm"
+
 	"github.com/iotaledger/hive.go/configuration"
 	"github.com/iotaledger/hive.go/logger"
 	"github.com/iotaledger/hive.go/types"
@@ -184,7 +186,7 @@ func (s *Spammer) StopSpamming() {
 
 // PostTransaction use provided client to issue a transaction. It chooses API method based on Spammer options. Counts errors,
 // counts transactions and provides debug logs.
-func (s *Spammer) PostTransaction(tx *ledgerstate.Transaction, clt evilwallet.Client) {
+func (s *Spammer) PostTransaction(tx *devnetvm.Transaction, clt evilwallet.Client) {
 	if tx == nil {
 		s.log.Debug(ErrTransactionIsNil)
 		s.ErrCounter.CountError(ErrTransactionIsNil)
@@ -197,7 +199,7 @@ func (s *Spammer) PostTransaction(tx *ledgerstate.Transaction, clt evilwallet.Cl
 	}
 
 	var err error
-	var txID ledgerstate.TransactionID
+	var txID utxo.TransactionID
 	txID, err = clt.PostTransaction(tx)
 	if err != nil {
 		s.log.Debug(ErrFailPostTransaction)
@@ -213,7 +215,7 @@ func (s *Spammer) PostTransaction(tx *ledgerstate.Transaction, clt evilwallet.Cl
 	return
 }
 
-func (s *Spammer) handleSolidityForReuseOutputs(clt evilwallet.Client, tx *ledgerstate.Transaction) (ok bool) {
+func (s *Spammer) handleSolidityForReuseOutputs(clt evilwallet.Client, tx *devnetvm.Transaction) (ok bool) {
 	ok = true
 	ok = s.EvilWallet.AwaitInputsSolidity(tx.Essence().Inputs(), clt)
 	if s.EvilScenario.OutputWallet.Type() == evilwallet.Reuse {

client/evilspammer/spamming_functions.go

@@ -5,8 +5,9 @@ import (
 	"sync"
 
 	"github.com/cockroachdb/errors"
+
 	"github.com/iotaledger/goshimmer/client/evilwallet"
-	"github.com/iotaledger/goshimmer/packages/ledgerstate"
+	"github.com/iotaledger/goshimmer/packages/ledger/vm/devnetvm"
 )
 
 func DataSpammingFunction(s *Spammer) {
@@ -41,7 +42,7 @@ func CustomConflictSpammingFunc(s *Spammer) {
 		wg := sync.WaitGroup{}
 		for i, tx := range txs {
 			wg.Add(1)
-			go func(clt evilwallet.Client, tx *ledgerstate.Transaction) {
+			go func(clt evilwallet.Client, tx *devnetvm.Transaction) {
 				defer wg.Done()
 				s.PostTransaction(tx, clt)
 			}(clients[i], tx)

client/evilwallet/aliasmanager.go

@@ -3,18 +3,18 @@ package evilwallet
 import (
 	"sync"
 
+	"github.com/cockroachdb/errors"
 	"go.uber.org/atomic"
 
-	"github.com/cockroachdb/errors"
-	"github.com/iotaledger/goshimmer/packages/ledgerstate"
+	"github.com/iotaledger/goshimmer/packages/ledger/vm/devnetvm"
 )
 
 // region AliasManager /////////////////////////////////////////////////////////////////////////////////////////////////
 
 // AliasManager is the manager for output aliases.
 type AliasManager struct {
-	outputMap map[string]ledgerstate.Output
-	inputMap  map[string]ledgerstate.Input
+	outputMap map[string]devnetvm.Output
+	inputMap  map[string]devnetvm.Input
 
 	outputAliasCount *atomic.Uint64
 	mu               sync.RWMutex
@@ -23,14 +23,14 @@ type AliasManager struct {
 // NewAliasManager creates and returns a new AliasManager.
 func NewAliasManager() *AliasManager {
 	return &AliasManager{
-		outputMap:        make(map[string]ledgerstate.Output),
-		inputMap:         make(map[string]ledgerstate.Input),
+		outputMap:        make(map[string]devnetvm.Output),
+		inputMap:         make(map[string]devnetvm.Input),
 		outputAliasCount: atomic.NewUint64(0),
 	}
 }
 
 // AddOutputAlias maps the given outputAliasName to output, if there's duplicate outputAliasName, it will be overwritten.
-func (a *AliasManager) AddOutputAlias(output ledgerstate.Output, aliasName string) {
+func (a *AliasManager) AddOutputAlias(output devnetvm.Output, aliasName string) {
 	a.mu.Lock()
 	defer a.mu.Unlock()
 
@@ -39,7 +39,7 @@ func (a *AliasManager) AddOutputAlias(output ledgerstate.Output, aliasName strin
 }
 
 // AddInputAlias adds an input alias.
-func (a *AliasManager) AddInputAlias(input ledgerstate.Input, aliasName string) {
+func (a *AliasManager) AddInputAlias(input devnetvm.Input, aliasName string) {
 	a.mu.Lock()
 	defer a.mu.Unlock()
 
@@ -48,15 +48,15 @@ func (a *AliasManager) AddInputAlias(input ledgerstate.Input, aliasName string)
 }
 
 // GetInput returns the input for the alias specified.
-func (a *AliasManager) GetInput(aliasName string) (ledgerstate.Input, bool) {
+func (a *AliasManager) GetInput(aliasName string) (devnetvm.Input, bool) {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
 	in, ok := a.inputMap[aliasName]
 	return in, ok
 }
 
 // GetOutput returns the output for the alias specified.
-func (a *AliasManager) GetOutput(aliasName string) ledgerstate.Output {
+func (a *AliasManager) GetOutput(aliasName string) devnetvm.Output {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
 
@@ -68,8 +68,8 @@ func (a *AliasManager) ClearAllAliases() {
 	a.mu.Lock()
 	defer a.mu.Unlock()
 
-	a.inputMap = make(map[string]ledgerstate.Input)
-	a.outputMap = make(map[string]ledgerstate.Output)
+	a.inputMap = make(map[string]devnetvm.Input)
+	a.outputMap = make(map[string]devnetvm.Output)
 }
 
 // ClearAliases clears provided aliases.
@@ -86,7 +86,7 @@ func (a *AliasManager) ClearAliases(aliases ScenarioAlias) {
 }
 
 // AddOutputAliases batch adds the outputs their respective aliases.
-func (a *AliasManager) AddOutputAliases(outputs []ledgerstate.Output, aliases []string) error {
+func (a *AliasManager) AddOutputAliases(outputs []devnetvm.Output, aliases []string) error {
 	if len(outputs) != len(aliases) {
 		return errors.New("mismatch outputs and aliases length")
 	}
@@ -102,7 +102,7 @@ func (a *AliasManager) AddInputAliases(inputs []*Output, aliases []string) error
 		return errors.New("mismatch outputs and aliases length")
 	}
 	for i, out := range inputs {
-		input := ledgerstate.NewUTXOInput(out.OutputID)
+		input := devnetvm.NewUTXOInput(out.OutputID)
 		a.AddInputAlias(input, aliases[i])
 	}
 	return nil