Merge branch 'master' of github.com:dipdup-net/go-lib

Author: aopoltorzhicky

.github/workflows/release.yml

@@ -1,12 +1,12 @@
-name: Build release
+name: Release
 on:
   push:
     tags:
       - "v*.*.*"
 
 jobs:
-  build:
-    name: Build
+  release:
+    name: Release
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@master

.github/workflows/test_master.yml renamed to .github/workflows/test.yml

@@ -1,8 +1,6 @@
-on:
-  push:
-    branches:
-      - master
-name: build
+name: Tests
+on: push
+
 jobs:
   golangci:
     name: lint

README.md

@@ -1,9 +1,15 @@
-# go-lib
-General instruments for DipDup in golang
+# DipDup Go SDK
+
+[![Tests](https://github.com/dipdup-net/metadata/workflows/Tests/badge.svg?)](https://github.com/dipdup-net/metadata/actions?query=workflow%3ATests)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+This library partially implements DipDup framework features and can be used for building Tezos indexers and dapps when performance and effective resource utilization are important.
 
 ## Packages
 
-* `cmdline` - parser for default dipdup keys
+#### `cmdline`
+
+Command line argument parser, compatible with [DipDup CLI](https://docs.dipdup.net/command-line).
 
 ```go
 import "github.com/dipdup-net/go-lib/cmdline"
@@ -14,7 +20,9 @@ if args.Help {
 }
 ```
 
-* `config`
+#### `config`
+
+DipDup YAML [configuration](https://docs.dipdup.net/config-file-reference) parser.
 
 ```go
 import "github.com/dipdup-net/go-lib/config"
@@ -50,23 +58,27 @@ if err := config.Parse("config.yaml", &cfg); err != nil {
 }
 ```
 
-* `node` - package for accessing to tezos node
+#### `node`
+
+Simple Tezos RPC API wrapper.
 
 ```go
 import "github.com/dipdup-net/go-lib/node"
 
 rpc := node.NewNodeRPC(url, node.WithTimeout(timeout))
 ```
 
-* `state` - package with DipDup state model
+#### `state`
+
+Managing DipDup index state.
 
 ```go
 import "github.com/dipdup-net/go-lib/state"
 
 s := state.State{}
 ```
 
-`State` structure is 
+where `State` structure is:
 ```go
 // State -
 type State struct {
@@ -77,11 +89,10 @@ type State struct {
 }
 ```
 
-* `tzkt` - package with API and Events wrapper for TzKT.
-
-You can find docs on Events wrapper [here](tzkt/events/README.md).
+#### `tzkt`
 
-Example usage of events
+TzKT API and Events wrapper.  
+Read more about events and SignalR in the [doc](https://github.com/dipdup-net/go-lib/blob/master/tzkt/events/README.md)
 
 ```go
 package main
@@ -110,7 +121,7 @@ func main() {
 
 ```
 
-Example usage of API wrapper
+Example usage of the API wrapper:
 
 ```go
 package main

go.sum

@@ -116,6 +116,7 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rs/zerolog v1.13.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
+github.com/rs/zerolog v1.15.0 h1:uPRuwkWF4J6fGsJ2R0Gn2jB1EQiav9k3S6CSdygQJXY=
 github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ=

hasura/hasura.go

@@ -23,9 +23,10 @@ const (
 func Create(hasura config.Hasura, cfg config.Database, views []string, models ...interface{}) error {
 	api := New(hasura.URL, hasura.Secret)
 
-	log.Info("Waiting hasura is up...")
+	log.Info("Waiting hasura is up and running")
 	for err := api.Health(); err != nil; err = api.Health() {
-		time.Sleep(time.Second * 10)
+		log.Warn(err)
+		time.Sleep(time.Second)
 	}
 
 	metadata, err := Generate(hasura, cfg, models...)
@@ -60,7 +61,7 @@ func Create(hasura config.Hasura, cfg config.Database, views []string, models ..
 		return err
 	}
 
-	if hasura.Rest == nil || *hasura.Rest {
+	if len(metadata.QueryCollections) > 0 && (hasura.Rest == nil || *hasura.Rest) {
 		log.Info("Creating REST endpoints...")
 		for _, query := range metadata.QueryCollections[0].Definition.Queries {
 			if err := api.CreateRestEndpoint(query.Name, query.Name, query.Name, allowedQueries); err != nil {

state/db.go

@@ -8,13 +8,28 @@ import (
 
 	"github.com/dipdup-net/go-lib/config"
 	"github.com/pkg/errors"
+	"github.com/sirupsen/logrus"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
 	"gorm.io/driver/sqlite"
 	"gorm.io/gorm"
 	"gorm.io/gorm/logger"
 )
 
+// CheckConnection
+func CheckConnection(db *gorm.DB) error {
+	sql, err := db.DB()
+	if err != nil {
+		return err
+	}
+
+	if err = sql.Ping(); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 // OpenConnection -
 func OpenConnection(cfg config.Database) (*gorm.DB, error) {
 	var dialector gorm.Dialector
@@ -43,7 +58,7 @@ func OpenConnection(cfg config.Database) (*gorm.DB, error) {
 		return nil, errors.Errorf("Unsupported database kind %s", cfg.Kind)
 	}
 
-	return gorm.Open(dialector, &gorm.Config{
+	db, err := gorm.Open(dialector, &gorm.Config{
 		SkipDefaultTransaction: true,
 		PrepareStmt:            true,
 		Logger: logger.New(
@@ -54,4 +69,15 @@ func OpenConnection(cfg config.Database) (*gorm.DB, error) {
 			},
 		),
 	})
+	if err != nil {
+		return nil, err
+	}
+
+	logrus.Info("Waiting database is up and runnning")
+	for err := CheckConnection(db); err != nil; err = CheckConnection(db) {
+		logrus.Warn(err)
+		time.Sleep(time.Second)
+	}
+
+	return db, nil
 }

tzkt/api/api.go

@@ -1,6 +1,7 @@
 package api
 
 import (
+	"fmt"
 	"io/ioutil"
 	"net/http"
 	"net/url"
@@ -59,7 +60,7 @@ func (tzkt *API) json(endpoint string, args map[string]string, output interface{
 		return json.NewDecoder(resp.Body).Decode(output)
 	}
 
-	return errors.New(resp.Status)
+	return errors.New(fmt.Sprintf("%s: %s %v", resp.Status, endpoint, args))
 }
 
 func (tzkt *API) count(endpoint string) (uint64, error) {