Crypto and some minor ifxes

Author: aopoltorzhicky

config/config.go

@@ -21,14 +21,17 @@ type Config struct {
 
 // Substitute -
 func (c *Config) Substitute() error {
-	c.Hasura.SetSourceName()
+	if c.Hasura != nil {
+		c.Hasura.SetSourceName()
+	}
 	return nil
 }
 
 // DataSource -
 type DataSource struct {
-	Kind string `yaml:"kind"`
-	URL  string `yaml:"url" validate:"required,url"`
+	Kind        string       `yaml:"kind"`
+	URL         string       `yaml:"url" validate:"required,url"`
+	Credentials *Credentials `yaml:"credentials,omitempty" validate:"omitempty"`
 }
 
 // Contracts -
@@ -61,6 +64,9 @@ type Hasura struct {
 }
 
 func (s *Hasura) SetSourceName() {
+	if s == nil {
+		return
+	}
 	if s.Source == "" {
 		s.Source = "default"
 	}

config/credentials.go

@@ -0,0 +1,12 @@
+package config
+
+// Credentials -
+type Credentials struct {
+	User *UserCredentials `yaml:"user,omitempty" validate:"omitempty"`
+}
+
+// UserCredentials -
+type UserCredentials struct {
+	Name     string `yaml:"name" validate:"required"`
+	Password string `yaml:"password" validate:"required"`
+}

hasura/requests.go

@@ -1,6 +1,10 @@
 package hasura
 
-import "github.com/pkg/errors"
+import (
+	"os"
+
+	"github.com/pkg/errors"
+)
 
 type Request struct {
 	Type string      `json:"type"`
@@ -69,7 +73,11 @@ func (d *DatabaseUrl) UnmarshalJSON(data []byte) error {
 		return err
 	}
 
-	*d = DatabaseUrl(fromEnv.FromEnv)
+	fromEnvValue := os.Getenv(fromEnv.FromEnv)
+	if fromEnvValue == "" {
+		return errors.Errorf("you have to set '%s' environment variable due to hasura connection info", fromEnv.FromEnv)
+	}
+	*d = DatabaseUrl(fromEnvValue)
 	return nil
 }
 

tools/ast/ast.go

@@ -261,8 +261,16 @@ func (a *TypedAst) Docs(entrypoint string) ([]Typedef, error) {
 
 	node := a.FindByName(entrypoint, true)
 	if node != nil {
-		docs, _, err := node.Docs(DocsFull)
-		return docs, err
+		docs, typName, err := node.Docs(DocsFull)
+		if docs != nil {
+			return docs, err
+		}
+		return []Typedef{
+			{
+				Name: entrypoint,
+				Type: typName,
+			},
+		}, nil
 	}
 	return nil, nil
 }
@@ -342,7 +350,7 @@ func (a *TypedAst) Diff(b *TypedAst) (*MiguelNode, error) {
 	return nil, nil
 }
 
-// FromParameters - fill(settle) subtree in `a` with `data`. Returned settled subtree and error if occured. If `entrypoint` is empty string it will try to settle main tree.
+// FromParameters - fill(settle) subtree in `a` with `data`. Returned settled subtree and error if occurred. If `entrypoint` is empty string it will try to settle main tree.
 func (a *TypedAst) FromParameters(data *types.Parameters) (*TypedAst, error) {
 	var tree UntypedAST
 	if err := json.Unmarshal(data.Value, &tree); err != nil {
@@ -423,7 +431,7 @@ func (a *TypedAst) GetJSONModel(model JSONModel) {
 	}
 }
 
-// Unwrap - clear paramaters from Left/Right. Tree must be settled.
+// Unwrap - clear parameters from Left/Right. Tree must be settled.
 func (a *TypedAst) UnwrapAndGetEntrypointName() (Node, string) {
 	if !a.IsSettled() || len(a.Nodes) != 1 {
 		return nil, ""

tools/ast/ast_test.go

@@ -167,7 +167,7 @@ func (m *BigMap) ToJSONSchema() (*JSONSchema, error) {
 		Type:    JSONSchemaTypeArray,
 		Title:   m.GetName(),
 		Default: make([]interface{}, 0),
-		Items: &SchemaKey{
+		Items: &JSONSchema{
 			Type:       JSONSchemaTypeObject,
 			Required:   make([]string, 0),
 			Properties: make(map[string]*JSONSchema),
@@ -178,7 +178,13 @@ func (m *BigMap) ToJSONSchema() (*JSONSchema, error) {
 		return nil, err
 	}
 
-	if err := setChildSchemaForMap(m.ValueType, false, s); err != nil {
+	if m.ValueType.IsPrim(consts.PAIR) {
+		child, err := m.ValueType.ToJSONSchema()
+		if err != nil {
+			return nil, err
+		}
+		s.Items.Properties[m.ValueType.GetName()] = child
+	} else if err := setChildSchemaForMap(m.ValueType, false, s); err != nil {
 		return nil, err
 	}
 

tools/ast/big_map.go

@@ -51,8 +51,7 @@ func (b *Bytes) Distinguish(x Distinguishable) (*MiguelNode, error) {
 
 // FromJSONSchema -
 func (b *Bytes) FromJSONSchema(data map[string]interface{}) error {
-	setBytesJSONSchema(&b.Default, data)
-	return nil
+	return setBytesJSONSchema(&b.Default, data)
 }
 
 // FindByName -

tools/ast/bytes.go

@@ -0,0 +1,82 @@
+package ast
+
+import (
+	"encoding/hex"
+	"strings"
+	"unicode/utf8"
+
+	"github.com/dipdup-net/go-lib/tools/consts"
+	"github.com/dipdup-net/go-lib/tools/forge"
+	"github.com/dipdup-net/go-lib/tools/formatter"
+)
+
+// Chest -
+type Chest struct {
+	Default
+}
+
+// NewChest -
+func NewChest(depth int) *Chest {
+	return &Chest{
+		Default: NewDefault(consts.CHEST, 0, depth),
+	}
+}
+
+// ToJSONSchema -
+func (c *Chest) ToJSONSchema() (*JSONSchema, error) {
+	return getStringJSONSchema(c.Default), nil
+}
+
+// Compare -
+func (c *Chest) Compare(second Comparable) (int, error) {
+	s, ok := second.(*Chest)
+	if !ok {
+		return 0, consts.ErrTypeIsNotComparable
+	}
+	return strings.Compare(c.Value.(string), s.Value.(string)), nil
+}
+
+// Distinguish -
+func (c *Chest) Distinguish(x Distinguishable) (*MiguelNode, error) {
+	second, ok := x.(*Chest)
+	if !ok {
+		return nil, nil
+	}
+
+	return c.Default.Distinguish(&second.Default)
+}
+
+// FromJSONSchema -
+func (c *Chest) FromJSONSchema(data map[string]interface{}) error {
+	return setBytesJSONSchema(&c.Default, data)
+}
+
+// FindByName -
+func (c *Chest) FindByName(name string, isEntrypoint bool) Node {
+	if c.GetName() == name {
+		return c
+	}
+	return nil
+}
+
+// ToMiguel -
+func (c *Chest) ToMiguel() (*MiguelNode, error) {
+	node, err := c.Default.ToMiguel()
+	if err != nil {
+		return nil, err
+	}
+
+	if str, ok := node.Value.(string); ok {
+		tree := forge.TryUnpackString(str)
+		if tree != nil {
+			treeJSON, err := json.MarshalToString(tree)
+			if err == nil {
+				node.Value, _ = formatter.MichelineToMichelsonInline(treeJSON)
+			}
+		} else if data, err := hex.DecodeString(str); err == nil && utf8.Valid(data) {
+			node.Value = string(data)
+		}
+	}
+
+	return node, nil
+}

tools/ast/chest.go

@@ -0,0 +1,82 @@
+package ast
+
+import (
+	"encoding/hex"
+	"strings"
+	"unicode/utf8"
+
+	"github.com/dipdup-net/go-lib/tools/consts"
+	"github.com/dipdup-net/go-lib/tools/forge"
+	"github.com/dipdup-net/go-lib/tools/formatter"
+)
+
+// ChestKey -
+type ChestKey struct {
+	Default
+}
+
+// NewChestKey -
+func NewChestKey(depth int) *ChestKey {
+	return &ChestKey{
+		Default: NewDefault(consts.CHESTKEY, 0, depth),
+	}
+}
+
+// ToJSONSchema -
+func (c *ChestKey) ToJSONSchema() (*JSONSchema, error) {
+	return getStringJSONSchema(c.Default), nil
+}
+
+// Compare -
+func (c *ChestKey) Compare(second Comparable) (int, error) {
+	s, ok := second.(*ChestKey)
+	if !ok {
+		return 0, consts.ErrTypeIsNotComparable
+	}
+	return strings.Compare(c.Value.(string), s.Value.(string)), nil
+}
+
+// Distinguish -
+func (c *ChestKey) Distinguish(x Distinguishable) (*MiguelNode, error) {
+	second, ok := x.(*ChestKey)
+	if !ok {
+		return nil, nil
+	}
+
+	return c.Default.Distinguish(&second.Default)
+}
+
+// FromJSONSchema -
+func (c *ChestKey) FromJSONSchema(data map[string]interface{}) error {
+	return setBytesJSONSchema(&c.Default, data)
+}
+
+// FindByName -
+func (c *ChestKey) FindByName(name string, isEntrypoint bool) Node {
+	if c.GetName() == name {
+		return c
+	}
+	return nil
+}
+
+// ToMiguel -
+func (c *ChestKey) ToMiguel() (*MiguelNode, error) {
+	node, err := c.Default.ToMiguel()
+	if err != nil {
+		return nil, err
+	}
+
+	if str, ok := node.Value.(string); ok {
+		tree := forge.TryUnpackString(str)
+		if tree != nil {
+			treeJSON, err := json.MarshalToString(tree)
+			if err == nil {
+				node.Value, _ = formatter.MichelineToMichelsonInline(treeJSON)
+			}
+		} else if data, err := hex.DecodeString(str); err == nil && utf8.Valid(data) {
+			node.Value = string(data)
+		}
+	}
+
+	return node, nil
+}