fix(config): invalid check

.env.example

@@ -1,5 +1,5 @@
 # Enviroment
-ENVIROMENT=(dev | prod)
+ENVIRONMENT=(dev | prod)
 
 # Pactus
 

Makefile

@@ -1,6 +1,7 @@
 PACKAGES=$(shell go list ./... | grep -v 'tests' | grep -v 'grpc/gen')
 
 ifneq (,$(filter $(OS),Windows_NT MINGW64))
+EXE = .exe
 RM = del /q
 else
 RM = rm -rf
@@ -15,7 +16,8 @@ devtools:
 
 ### Building
 
-# TODO 
+build:
+	go build -o build/wrapto$(EXE)  .
 
 ### ABIs (EVM contracts)
 build-abis:

config/config.go

@@ -66,7 +66,7 @@ func LoadConfig() (*Config, error) {
 	}
 
 	cfg := &Config{
-		Environment: os.Getenv("NETWORK"),
+		Environment: os.Getenv("ENVIRONMENT"),
 		Logger: LoggerConfig{
 			Filename:   os.ExpandEnv("LOG_FILENAME"),
 			LogLevel:   os.Getenv("LOG_LEVEL"),
@@ -99,7 +99,7 @@ func LoadConfig() (*Config, error) {
 }
 
 func (c *Config) basicCheck() error {
-	if !(c.Environment == "dev") || !(c.Environment == "prod") {
+	if c.Environment != "dev" && c.Environment != "prod" { //nolint
 		return InvalidEnvironmentError{
 			Environment: c.Environment,
 		}

main.go

@@ -3,10 +3,9 @@ package main
 import (
 	"context"
 	"os"
-	"os/signal"
-	"syscall"
 
 	"github.com/PACZone/wrapto/core"
+	logger "github.com/PACZone/wrapto/log"
 	"github.com/spf13/cobra"
 )
 
@@ -17,11 +16,8 @@ func run(cmd *cobra.Command, _ []string) {
 
 	c.Start()
 
-	sigChan := make(chan os.Signal, 1)
-	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM, os.Interrupt)
-	<-sigChan
-
-	cancel()
+	<-ctx.Done()
+	logger.Info("shutdown")
 }
 
 func main() {

sides/manager/manager.go

@@ -33,12 +33,12 @@ func NewManager(ctx context.Context, cancel context.CancelFunc, cfg *config.Conf
 	pactusCh := make(chan message.Message, 10)
 	polygonCh := make(chan message.Message, 10)
 
-	pactusSide, err := pactus.NewSide(ctx, highway, 0, pactusCh, cfg.Environment, cfg.Pactus, db)
+	pactusSide, err := pactus.NewSide(ctx, highway, 1, pactusCh, cfg.Environment, cfg.Pactus, db)
 	if err != nil {
 		return nil, err
 	}
 
-	polygonSide, err := polygon.NewSide(ctx, highway, 0, polygonCh, cfg.Environment, cfg.Polygon, db)
+	polygonSide, err := polygon.NewSide(ctx, highway, 4, polygonCh, cfg.Environment, cfg.Polygon, db)
 	if err != nil {
 		return nil, err
 	}

sides/pactus/bridge.go

@@ -112,6 +112,8 @@ func (b Bridge) processMsg(msg message.Message) error {
 
 	txID, err := b.wallet.transferTx(payload.Receiver, memo, amt)
 	if err != nil {
+		logger.Error("can't send transaction to pactus network", "actor", b.bypassName, "err", err, "payload", payload)
+
 		dbErr := b.db.AddLog(&database.Log{
 			OrderID:     msg.Payload.ID,
 			Actor:       string(b.bypassName),

sides/pactus/listener.go

@@ -58,6 +58,7 @@ func (l *Listener) Start() error {
 
 				return err
 			}
+			l.nextBlock++
 		}
 	}
 }
@@ -157,8 +158,6 @@ func (l *Listener) processBlocks() error {
 		}
 	}
 
-	l.nextBlock++
-
 	return nil
 }
 
@@ -175,7 +174,7 @@ func (l *Listener) filterValidTxs(txs []*pactus.TransactionInfo) []*pactus.Trans
 	validTxs := make([]*pactus.TransactionInfo, 0)
 
 	for _, tx := range txs {
-		if tx.PayloadType != pactus.PayloadType_TRANSFER_PAYLOAD &&
+		if tx.PayloadType != pactus.PayloadType_TRANSFER_PAYLOAD ||
 			tx.GetTransfer().Receiver != l.lockAddr {
 			continue
 		}

sides/pactus/pactus.go

@@ -27,7 +27,7 @@ func NewSide(ctx context.Context,
 	db *database.DB,
 ) (*Side, error) {
 	if env == "dev" {
-		crypto.AddressHRP = "tpc"
+		crypto.AddressHRP = "pc"
 	}
 
 	client, err := newClient(ctx, cfg.RPCNode)
@@ -69,6 +69,9 @@ func (s *Side) Start() {
 				Payload: nil,
 			}
 		}
+
+		logger.Error("error starting listener", "actor", bypass.PACTUS, "err", err)
+
 		wg.Done()
 	}()
 
@@ -81,6 +84,9 @@ func (s *Side) Start() {
 				Payload: nil,
 			}
 		}
+
+		logger.Error("error starting bridge", "actor", bypass.PACTUS, "err", err)
+
 		wg.Done()
 	}()
 

sides/polygon/listener.go

@@ -50,8 +50,11 @@ func (l *Listener) Start() error {
 			return nil
 		default:
 			if err := l.processOrder(); err != nil {
+				logger.Error("can't process block on listener", "actor", l.bypassName, "err", err)
+
 				return err
 			}
+			l.nextOrder++
 		}
 	}
 }

sides/polygon/polygon.go

@@ -71,6 +71,9 @@ func (s *Side) Start() {
 				Payload: nil,
 			}
 		}
+
+		logger.Error("error starting listener", "actor", bypass.POLYGON, "err", err)
+
 		wg.Done()
 	}()
 
@@ -83,6 +86,9 @@ func (s *Side) Start() {
 				Payload: nil,
 			}
 		}
+
+		logger.Error("error starting bridge", "actor", bypass.POLYGON, "err", err)
+
 		wg.Done()
 	}()