In memory ConflictDAG and transaction and attachment orphanage (#2532)

Co-authored-by: Andrea V <1577639+karimodm@users.noreply.github.com>
Co-authored-by: Piotr Macek <piotr.macek@iota.org>

Author: 3 people

.dockerignore

@@ -15,6 +15,8 @@ tools/
 
 # Database directory
 mainnetdb/
+db/
+retainer/
 
 plugins/dashboard/frontend/node_modules/
 plugins/dagsvisualizer/frontend/node_modules/

client/evilspammer/spammer.go

@@ -6,7 +6,6 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/iotaledger/goshimmer/client/evilwallet"
-	"github.com/iotaledger/goshimmer/packages/protocol/ledger/utxo"
 	"github.com/iotaledger/goshimmer/packages/protocol/ledger/vm/devnetvm"
 
 	"github.com/iotaledger/hive.go/app/configuration"
@@ -208,12 +207,10 @@ func (s *Spammer) PostTransaction(tx *devnetvm.Transaction, clt evilwallet.Clien
 		return
 	}
 
-	var err error
-	var txID utxo.TransactionID
-	if err = evilwallet.RateSetterSleep(clt, s.UseRateSetter); err != nil {
+	if err := evilwallet.RateSetterSleep(clt, s.UseRateSetter); err != nil {
 		return
 	}
-	txID, err = clt.PostTransaction(tx)
+	txID, blockID, err := clt.PostTransaction(tx)
 	if err != nil {
 		s.log.Debug(ErrFailPostTransaction)
 		s.ErrCounter.CountError(errors.WithMessage(ErrFailPostTransaction, err.Error()))
@@ -224,7 +221,7 @@ func (s *Spammer) PostTransaction(tx *devnetvm.Transaction, clt evilwallet.Clien
 	}
 
 	count := s.State.txSent.Add(1)
-	s.log.Debugf("Last transaction sent, ID: %s, txCount: %d", txID.String(), count)
+	s.log.Debugf("%s: Last transaction sent, ID: %s, txCount: %d", blockID.Base58(), txID.Base58(), count)
 }
 
 func (s *Spammer) handleSolidityForReuseOutputs(clt evilwallet.Client, tx *devnetvm.Transaction) (ok bool) {

client/evilwallet/connector.go

@@ -5,13 +5,15 @@ import (
 	"time"
 
 	"github.com/iotaledger/hive.go/core/identity"
-	"github.com/iotaledger/hive.go/core/types/confirmation"
+
+	"github.com/iotaledger/goshimmer/packages/core/confirmation"
 
 	"github.com/iotaledger/goshimmer/client"
 	"github.com/iotaledger/goshimmer/client/wallet"
 	"github.com/iotaledger/goshimmer/packages/app/jsonmodels"
 	"github.com/iotaledger/goshimmer/packages/protocol/ledger/utxo"
 	"github.com/iotaledger/goshimmer/packages/protocol/ledger/vm/devnetvm"
+	"github.com/iotaledger/goshimmer/packages/protocol/models"
 )
 
 type ServersStatus []*wallet.ServerStatus
@@ -172,7 +174,7 @@ type Client interface {
 	// SleepRateSetterEstimate sleeps for rate setter estimate.
 	SleepRateSetterEstimate() (err error)
 	// PostTransaction sends a transaction to the Tangle via a given client.
-	PostTransaction(tx *devnetvm.Transaction) (utxo.TransactionID, error)
+	PostTransaction(tx *devnetvm.Transaction) (utxo.TransactionID, models.BlockID, error)
 	// PostData sends the given data (payload) by creating a block in the backend.
 	PostData(data []byte) (blkID string, err error)
 	// GetUnspentOutputForAddress gets the first unspent outputs of a given address.
@@ -239,7 +241,7 @@ func (c *WebClient) BroadcastFaucetRequest(address string, powTarget int) (err e
 }
 
 // PostTransaction sends a transaction to the Tangle via a given client.
-func (c *WebClient) PostTransaction(tx *devnetvm.Transaction) (txID utxo.TransactionID, err error) {
+func (c *WebClient) PostTransaction(tx *devnetvm.Transaction) (txID utxo.TransactionID, blockID models.BlockID, err error) {
 	txBytes, err := tx.Bytes()
 	if err != nil {
 		return
@@ -253,6 +255,10 @@ func (c *WebClient) PostTransaction(tx *devnetvm.Transaction) (txID utxo.Transac
 	if err != nil {
 		return
 	}
+	err = blockID.FromBase58(resp.BlockID)
+	if err != nil {
+		return
+	}
 	return
 }
 

client/evilwallet/evilwallet.go

@@ -32,7 +32,7 @@ const (
 )
 
 var (
-	defaultClientsURLs = []string{"http://localhost:8080", "http://localhost:8090"}
+	defaultClientsURLs = []string{}
 	faucetBalance      = devnetvm.NewColoredBalances(map[devnetvm.Color]uint64{
 		devnetvm.ColorIOTA: uint64(faucetTokensPerRequest),
 	})
@@ -260,7 +260,7 @@ func (e *EvilWallet) splitOutputs(inputWallet, outputWallet *Wallet, splitNumber
 				if err = RateSetterSleep(clt, true); err != nil {
 					return
 				}
-				txID, err := clt.PostTransaction(tx)
+				txID, _, err := clt.PostTransaction(tx)
 				if err != nil {
 					return
 				}
@@ -345,7 +345,7 @@ func (e *EvilWallet) SendCustomConflicts(conflictsMaps []ConflictSlice) (err err
 				if err = RateSetterSleep(clt, true); err != nil {
 					return
 				}
-				_, _ = clt.PostTransaction(tx)
+				_, _, _ = clt.PostTransaction(tx)
 			}(clients[i], tx)
 		}
 		wg.Wait()

client/wallet/connector.go

@@ -1,7 +1,7 @@
 package wallet
 
 import (
-	"github.com/iotaledger/hive.go/core/types/confirmation"
+	"github.com/iotaledger/goshimmer/packages/core/confirmation"
 
 	"github.com/iotaledger/goshimmer/client/wallet/packages/address"
 	"github.com/iotaledger/goshimmer/packages/protocol/ledger/utxo"

client/wallet/webconnector.go

@@ -2,9 +2,10 @@ package wallet
 
 import (
 	"github.com/iotaledger/hive.go/core/generics/lo"
-	"github.com/iotaledger/hive.go/core/types/confirmation"
 	"github.com/pkg/errors"
 
+	"github.com/iotaledger/goshimmer/packages/core/confirmation"
+
 	"github.com/iotaledger/goshimmer/client"
 	"github.com/iotaledger/goshimmer/client/wallet/packages/address"
 	"github.com/iotaledger/goshimmer/packages/protocol/ledger/utxo"