Fix: logging and tezgen type

atomex-protocol · Jan 19, 2022 · 29bb9ab · 29bb9ab
1 parent 16ae320
commit 29bb9ab
Show file tree

Hide file tree

Showing 11 changed files with 89 additions and 71 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -12,7 +12,7 @@
             "program": "${workspaceFolder}/cmd/watch_tower",
             "args": [
                 "-c",
-                "../../configs"
+                "../../configs/test"
             ],
             "envFile": "${workspaceFolder}/.env"
         }, {
@@ -23,7 +23,7 @@
             "program": "${workspaceFolder}/cmd/market_maker",
             "args": [
                 "-c",
-                "../../configs"
+                "../../configs/test"
             ],
             "envFile": "${workspaceFolder}/.env"
         }

diff --git a/Makefile b/Makefile
@@ -5,10 +5,10 @@ tower:
 	cd cmd/watch_tower && go run .
 
 tower-test:
-	cd cmd/watch_tower && go run . -c ../../configs
+	cd cmd/watch_tower && go run . -c ../../configs/test
 
 market-maker:
-	cd cmd/market_maker && go run . -c ../../configs
+	cd cmd/market_maker && go run . -c ../../configs/test
 
 test:
 	go test ./...

diff --git a/cmd/market_maker/main.go b/cmd/market_maker/main.go
@@ -15,6 +15,7 @@ import (
 )
 
 func main() {
+	zerolog.SetGlobalLevel(zerolog.InfoLevel)
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339})
 
 	var configDir string

diff --git a/cmd/watch_tower/main.go b/cmd/watch_tower/main.go
@@ -15,6 +15,7 @@ import (
 )
 
 func main() {
+	zerolog.SetGlobalLevel(zerolog.InfoLevel)
 	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stdout, TimeFormat: time.RFC3339})
 
 	var configDir string

diff --git a/configs/production/market_maker.yml b/configs/production/market_maker.yml
@@ -23,4 +23,4 @@ strategies:
   # - kind: volatility
   #   symbol: ETH_BTC
 
-log_level: trace
+log_level: info
diff --git a/configs/test/chains.yml b/configs/test/chains.yml
@@ -1,6 +1,6 @@
 tezos:
-  node: https://rpc.tzkt.io/granadanet
-  tzkt: https://api.granadanet.tzkt.io
+  node: https://rpc.tzkt.io/hangzhou2net
+  tzkt: https://api.hangzhou2net.tzkt.io
   ttl: 60
   min_payoff: "0"
 

diff --git a/configs/test/market_maker.yml b/configs/test/market_maker.yml
@@ -19,5 +19,5 @@ strategies:
     width: 1.5
     window: 60
 
-log_level: trace
+log_level: info
 restore: true
diff --git a/go.mod b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/btcsuite/btcd v0.22.0-beta // indirect
 	github.com/deckarep/golang-set v1.7.1 // indirect
-	github.com/dipdup-net/go-lib v0.1.41
+	github.com/dipdup-net/go-lib v0.1.52
 	github.com/ebellocchia/go-base58 v0.1.0
 	github.com/ethereum/go-ethereum v1.10.12
 	github.com/go-playground/validator/v10 v10.9.0
@@ -19,17 +19,14 @@ require (
 	github.com/mitchellh/mapstructure v1.4.2 // indirect
 	github.com/pkg/errors v0.9.1
 	github.com/rjeczalik/notify v0.9.2 // indirect
-	github.com/rs/zerolog v1.25.0
+	github.com/rs/zerolog v1.26.0
 	github.com/shirou/gopsutil v3.21.8+incompatible // indirect
-	github.com/shopspring/decimal v1.2.0
-	github.com/sirupsen/logrus v1.8.1 // indirect
+	github.com/shopspring/decimal v1.3.1
 	github.com/stretchr/testify v1.7.0
 	github.com/tklauser/go-sysconf v0.3.9 // indirect
 	github.com/tyler-smith/go-bip39 v1.1.0 // indirect
 	github.com/valyala/fastjson v1.6.3 // indirect
-	golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
-	golang.org/x/net v0.0.0-20210928044308-7d9f5e0b762b // indirect
-	golang.org/x/sys v0.0.0-20211110154304-99a53858aa08 // indirect
+	golang.org/x/crypto v0.0.0-20211202192323-5770296d904e
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	gopkg.in/yaml.v2 v2.4.0
 )
diff --git a/go.sum b/go.sum
diff --git a/internal/chain/tezos/atomex_tez_token/contract_types.go b/internal/chain/tezos/atomex_tez_token/contract_types.go
@@ -10,10 +10,10 @@ import (
 type Initiate struct {
 	HashedSecret tezgen.Bytes     `json:"hashedSecret" validate:"string"`
 	Participant  tezgen.Address   `json:"participant" validate:"string"`
-	PayoffAmount tezgen.Int       `json:"payoffAmount" validate:"string"`
+	PayoffAmount tezgen.Int       `json:"payoffAmount,string" validate:"string"`
 	RefundTime   tezgen.Timestamp `json:"refundTime" validate:"string"`
 	TokenAddress tezgen.Address   `json:"tokenAddress" validate:"string"`
-	TotalAmount  tezgen.Int       `json:"totalAmount" validate:"string"`
+	TotalAmount  tezgen.Int       `json:"totalAmount,string" validate:"string"`
 }
 
 // Redeem
@@ -29,10 +29,10 @@ type Key0 tezgen.Bytes
 type Value0 struct {
 	Initiator    tezgen.Address   `json:"initiator" validate:"string"`
 	Participant  tezgen.Address   `json:"participant" validate:"string"`
-	PayoffAmount tezgen.Int       `json:"payoffAmount" validate:"string"`
+	PayoffAmount tezgen.Int       `json:"payoffAmount,string" validate:"string"`
 	RefundTime   tezgen.Timestamp `json:"refundTime" validate:"string"`
 	TokenAddress tezgen.Address   `json:"tokenAddress" validate:"string"`
-	TotalAmount  tezgen.Int       `json:"totalAmount" validate:"string"`
+	TotalAmount  tezgen.Int       `json:"totalAmount,string" validate:"string"`
 }
 
 // BigMap0

diff --git a/internal/chain/tools/tracker.go b/internal/chain/tools/tracker.go
@@ -40,6 +40,7 @@ func NewTracker(cfg Config, opts ...TrackerOption) (*Tracker, error) {
 		MinPayOff:       cfg.Tezos.MinPayOff,
 		TTL:             cfg.Tezos.TTL,
 		OperaitonParams: cfg.Tezos.OperaitonParams,
+		LogLevel:        zerolog.InfoLevel,
 	})
 	if err != nil {
 		return nil, err
@@ -51,6 +52,7 @@ func NewTracker(cfg Config, opts ...TrackerOption) (*Tracker, error) {
 		NodeURL:       cfg.Ethereum.Node,
 		WssURL:        cfg.Ethereum.Wss,
 		MinPayOff:     cfg.Ethereum.MinPayOff,
+		LogLevel:      zerolog.InfoLevel,
 	})
 	if err != nil {
 		return nil, err