Merge pull request #807 from ava-labs/dev

v1.2.4

Author: StephenButtolph

.ci/after_success.sh

@@ -19,18 +19,21 @@ TRAVIS_IMAGE_TAG="$DOCKERHUB_REPO:travis-$TRAVIS_BUILD_NUMBER"
 docker tag "$AVALANCHE_IMAGE" "$TRAVIS_IMAGE_TAG"
 
 if [[ $TRAVIS_BRANCH == "master" ]]; then
+  echo "Tagging $AVALANCHE_IMAGE as $DOCKERHUB_REPO:latest"
   docker tag "$AVALANCHE_IMAGE" "$DOCKERHUB_REPO:latest"
 fi
 
 if [[ $TRAVIS_BRANCH == "dev" ]]; then
+  echo "Tagging $AVALANCHE_IMAGE as $DOCKERHUB_REPO:dev"
   docker tag "$AVALANCHE_IMAGE" "$DOCKERHUB_REPO:dev"
 fi
 
 if [[ $TRAVIS_TAG != "" ]]; then
+  echo "Tagging $AVALANCHE_IMAGE as $DOCKERHUB_REPO:$TRAVIS_TAG"
   docker tag "$AVALANCHE_IMAGE" "$DOCKERHUB_REPO:$TRAVIS_TAG"
 fi
 
 echo "$DOCKER_PASS" | docker login --username "$DOCKER_USERNAME" --password-stdin
 
 # following should push all tags
-docker push $DOCKERHUB_REPO 
+docker push $DOCKERHUB_REPO

.github/workflows/build-linux-release.yml

@@ -29,7 +29,9 @@ jobs:
       run: ./scripts/build.sh 
 
     - name: Install aws cli
-      run: sudo apt-get install awscli
+      run: |
+        sudo apt update
+        sudo apt-get install awscli
 
     - name: Install rpmbuild
       run: sudo apt-get install rpm 

README.md

@@ -8,7 +8,7 @@ a blockchains platform with high throughput, and blazing fast transactions.
 
 Avalanche is an incredibly lightweight protocol, so the minimum computer requirements are quite modest.
 
-- Hardware: 2 GHz or faster CPU, 4 GB RAM, 2 GB hard disk.
+- Hardware: 2 GHz or faster CPU, 4 GB RAM, 20 GB hard disk.
 - OS: Ubuntu >= 18.04 or Mac OS X >= Catalina.
 - Software: [Go](https://golang.org/doc/install) version >= 1.15.5 and set up [`$GOPATH`](https://github.com/golang/go/wiki/SettingGOPATH).
 - Network: IPv4 or IPv6 network connection, with an open public port.

api/health/service.go

@@ -9,14 +9,13 @@ import (
 
 	stdjson "encoding/json"
 
-	"github.com/gorilla/rpc/v2"
-
-	health "github.com/AppsFlyer/go-sundheit"
-
 	"github.com/ava-labs/avalanchego/snow/engine/common"
 	"github.com/ava-labs/avalanchego/utils/json"
 	"github.com/ava-labs/avalanchego/utils/logging"
+	"github.com/gorilla/rpc/v2"
+	"github.com/prometheus/client_golang/prometheus"
 
+	health "github.com/AppsFlyer/go-sundheit"
 	healthlib "github.com/ava-labs/avalanchego/health"
 )
 
@@ -29,11 +28,15 @@ type Service interface {
 	Handler() (*common.HTTPHandler, error)
 }
 
-func NewService(checkFreq time.Duration, log logging.Logger) Service {
+func NewService(checkFreq time.Duration, log logging.Logger, namespace string, registry prometheus.Registerer) (Service, error) {
+	service, err := healthlib.NewService(checkFreq, log, namespace, registry)
+	if err != nil {
+		return nil, err
+	}
 	return &apiServer{
-		Service: healthlib.NewService(checkFreq, log),
+		Service: service,
 		log:     log,
-	}
+	}, nil
 }
 
 // APIServer serves HTTP for a health service

cache/cache.go

@@ -3,30 +3,29 @@
 
 package cache
 
-import (
-	"github.com/ava-labs/avalanchego/ids"
-)
-
-// Cacher acts as a best effort key value store
+// Cacher acts as a best effort key value store. Keys must be comparable, as
+// defined by https://golang.org/ref/spec#Comparison_operators.
 type Cacher interface {
 	// Put inserts an element into the cache. If spaced is required, elements will
 	// be evicted.
-	Put(key ids.ID, value interface{})
+	Put(key, value interface{})
 
 	// Get returns the entry in the cache with the key specified, if no value
 	// exists, false is returned.
-	Get(key ids.ID) (interface{}, bool)
+	Get(key interface{}) (interface{}, bool)
 
 	// Evict removes the specified entry from the cache
-	Evict(key ids.ID)
+	Evict(key interface{})
 
 	// Flush removes all entries from the cache
 	Flush()
 }
 
 // Evictable allows the object to be notified when it is evicted
 type Evictable interface {
-	ID() ids.ID
+	// Key must return a comparable value as defined by
+	// https://golang.org/ref/spec#Comparison_operators.
+	Key() interface{}
 	Evict()
 }
 

cache/lru_cache.go

@@ -6,16 +6,14 @@ package cache
 import (
 	"container/list"
 	"sync"
-
-	"github.com/ava-labs/avalanchego/ids"
 )
 
 const (
 	minCacheSize = 32
 )
 
 type entry struct {
-	Key   ids.ID
+	Key   interface{}
 	Value interface{}
 }
 
@@ -24,29 +22,29 @@ type entry struct {
 // done, based on evicting the least recently used value.
 type LRU struct {
 	lock      sync.Mutex
-	entryMap  map[ids.ID]*list.Element
+	entryMap  map[interface{}]*list.Element
 	entryList *list.List
 	Size      int
 }
 
 // Put implements the cache interface
-func (c *LRU) Put(key ids.ID, value interface{}) {
+func (c *LRU) Put(key, value interface{}) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
 	c.put(key, value)
 }
 
 // Get implements the cache interface
-func (c *LRU) Get(key ids.ID) (interface{}, bool) {
+func (c *LRU) Get(key interface{}) (interface{}, bool) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
 	return c.get(key)
 }
 
 // Evict implements the cache interface
-func (c *LRU) Evict(key ids.ID) {
+func (c *LRU) Evict(key interface{}) {
 	c.lock.Lock()
 	defer c.lock.Unlock()
 
@@ -63,7 +61,7 @@ func (c *LRU) Flush() {
 
 func (c *LRU) init() {
 	if c.entryMap == nil {
-		c.entryMap = make(map[ids.ID]*list.Element, minCacheSize)
+		c.entryMap = make(map[interface{}]*list.Element, minCacheSize)
 	}
 	if c.entryList == nil {
 		c.entryList = list.New()
@@ -83,7 +81,7 @@ func (c *LRU) resize() {
 	}
 }
 
-func (c *LRU) put(key ids.ID, value interface{}) {
+func (c *LRU) put(key, value interface{}) {
 	c.init()
 	c.resize()
 
@@ -111,7 +109,7 @@ func (c *LRU) put(key ids.ID, value interface{}) {
 	}
 }
 
-func (c *LRU) get(key ids.ID) (interface{}, bool) {
+func (c *LRU) get(key interface{}) (interface{}, bool) {
 	c.init()
 	c.resize()
 
@@ -124,7 +122,7 @@ func (c *LRU) get(key ids.ID) (interface{}, bool) {
 	return struct{}{}, false
 }
 
-func (c *LRU) evict(key ids.ID) {
+func (c *LRU) evict(key interface{}) {
 	c.init()
 	c.resize()
 
@@ -137,6 +135,6 @@ func (c *LRU) evict(key ids.ID) {
 func (c *LRU) flush() {
 	c.init()
 
-	c.entryMap = make(map[ids.ID]*list.Element, minCacheSize)
+	c.entryMap = make(map[interface{}]*list.Element, minCacheSize)
 	c.entryList = list.New()
 }

cache/metercacher/cache.go

@@ -7,7 +7,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/ava-labs/avalanchego/cache"
-	"github.com/ava-labs/avalanchego/ids"
 	"github.com/ava-labs/avalanchego/utils/timer"
 )
 
@@ -26,14 +25,14 @@ func New(
 	return meterCache, meterCache.metrics.Initialize(namespace, registerer)
 }
 
-func (c *Cache) Put(key ids.ID, value interface{}) {
+func (c *Cache) Put(key, value interface{}) {
 	start := c.clock.Time()
 	c.cache.Put(key, value)
 	end := c.clock.Time()
 	c.put.Observe(float64(end.Sub(start)))
 }
 
-func (c *Cache) Get(key ids.ID) (interface{}, bool) {
+func (c *Cache) Get(key interface{}) (interface{}, bool) {
 	start := c.clock.Time()
 	value, has := c.cache.Get(key)
 	end := c.clock.Time()
@@ -47,7 +46,7 @@ func (c *Cache) Get(key ids.ID) (interface{}, bool) {
 	return value, has
 }
 
-func (c *Cache) Evict(key ids.ID) {
+func (c *Cache) Evict(key interface{}) {
 	start := c.clock.Time()
 	c.cache.Evict(key)
 	end := c.clock.Time()

cache/metercacher/metrics.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus"
 
-	"github.com/ava-labs/avalanchego/utils/timer"
+	"github.com/ava-labs/avalanchego/utils"
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 )
 
@@ -17,7 +17,7 @@ func newHistogramMetric(namespace, name string) prometheus.Histogram {
 		Namespace: namespace,
 		Name:      name,
 		Help:      fmt.Sprintf("Latency of a %s call in nanoseconds", name),
-		Buckets:   timer.NanosecondsBuckets,
+		Buckets:   utils.NanosecondsBuckets,
 	})
 }
 

cache/unique_cache.go

@@ -6,14 +6,12 @@ package cache
 import (
 	"container/list"
 	"sync"
-
-	"github.com/ava-labs/avalanchego/ids"
 )
 
 // EvictableLRU is an LRU cache that notifies the objects when they are evicted.
 type EvictableLRU struct {
 	lock      sync.Mutex
-	entryMap  map[ids.ID]*list.Element
+	entryMap  map[interface{}]*list.Element
 	entryList *list.List
 	Size      int
 }
@@ -36,7 +34,7 @@ func (c *EvictableLRU) Flush() {
 
 func (c *EvictableLRU) init() {
 	if c.entryMap == nil {
-		c.entryMap = make(map[ids.ID]*list.Element)
+		c.entryMap = make(map[interface{}]*list.Element)
 	}
 	if c.entryList == nil {
 		c.entryList = list.New()
@@ -52,7 +50,7 @@ func (c *EvictableLRU) resize() {
 		c.entryList.Remove(e)
 
 		val := e.Value.(Evictable)
-		delete(c.entryMap, val.ID())
+		delete(c.entryMap, val.Key())
 		val.Evict()
 	}
 }
@@ -61,14 +59,14 @@ func (c *EvictableLRU) deduplicate(value Evictable) Evictable {
 	c.init()
 	c.resize()
 
-	key := value.ID()
+	key := value.Key()
 	if e, ok := c.entryMap[key]; !ok {
 		if c.entryList.Len() >= c.Size {
 			e = c.entryList.Front()
 			c.entryList.MoveToBack(e)
 
 			val := e.Value.(Evictable)
-			delete(c.entryMap, val.ID())
+			delete(c.entryMap, val.Key())
 			val.Evict()
 
 			e.Value = value

cache/unique_cache_test.go

@@ -14,8 +14,8 @@ type evictable struct {
 	evicted int
 }
 
-func (e *evictable) ID() ids.ID { return e.id }
-func (e *evictable) Evict()     { e.evicted++ }
+func (e *evictable) Key() interface{} { return e.id }
+func (e *evictable) Evict()           { e.evicted++ }
 
 func TestEvictableLRU(t *testing.T) {
 	cache := EvictableLRU{}