Packer validate

.github/packer/roles/public-ami/defaults/main.yml

@@ -5,6 +5,5 @@ network: mainnet
 db_dir: /data/avalanchego
 log_dir: /var/log/avalanchego
 config_dir: /etc/avalanchego
-plugin_dir: /usr/local/lib/avalanchego/plugins
 repo_url: https://github.com/ava-labs/avalanchego
 repo_folder: /tmp/avalanchego

.github/packer/roles/public-ami/tasks/main.yml

@@ -67,14 +67,6 @@
     group: "{{ ava_group }}"
     state: directory
 
-- name: Create avalanche plugins directory
-  file:
-    path: "{{ plugin_dir }}"
-    owner: "{{ ava_user }}"
-    group: "{{ ava_group }}"
-    state: directory
-    recurse: yes
-
 - name: Build avalanchego
   command: ./scripts/build.sh
   args:
@@ -85,12 +77,6 @@
   args:
     chdir: "{{ repo_folder }}"
 
-- name: Copy evm binaries to the correct location
-  command: cp build/plugins/evm {{ plugin_dir }}
-  args:
-    chdir: "{{ repo_folder }}"
-
-
 - name: Configure avalanche 
   template:
     src: templates/conf.json.j2

.github/packer/ubuntu-focal-x86_64-public-ami.json

@@ -45,6 +45,7 @@
       "type": "ansible",
       "playbook_file": ".github/packer/create_public_ami.yml",
       "roles_path": ".github/packer/roles/",
+      "use_proxy": false,
       "extra_arguments": ["-e", "component=public-ami build=packer os_release=focal tag={{user `tag`}}"]
     },
     {

.github/workflows/build-tgz-pkg.sh

@@ -8,10 +8,6 @@ OK=`cp ./build/avalanchego $AVALANCHE_ROOT`
 if [[ $OK -ne 0 ]]; then
   exit $OK;
 fi
-OK=`cp -r ./build/plugins $AVALANCHE_ROOT`
-if [[ $OK -ne 0 ]]; then
-  exit $OK;
-fi
 
 
 echo "Build tgz package..."

.github/workflows/update-ami.py

@@ -10,6 +10,7 @@
 file = '.github/workflows/amichange.json'
 packerfile = ".github/packer/ubuntu-focal-x86_64-public-ami.json"
 
+update_marketplace = True
 product_id = os.getenv('PRODUCT_ID')
 role_arn = os.getenv('ROLE_ARN')
 vtag = os.getenv('TAG')
@@ -18,14 +19,12 @@
 
 for var in variables:
   if var is None:
-    print("A Variable is not set correctly or this is not the right repo.  Exiting.")
-    exit(0)
+    print("A Variable is not set correctly or this is not the right repo.  Only validating packer.")
+    update_marketplace = False
 
 if 'rc' in tag:
-  print("This is a release candidate.  Nothing to do.")
-  exit(0)
-
-client = boto3.client('marketplace-catalog',region_name='us-east-1')
+  print("This is a release candidate.  Only validating packer.")
+  update_marketplace = False
 
 def packer_build(packerfile):
   p = packer.Packer(packerfile)
@@ -44,24 +43,28 @@ def parse_amichange(object):
 
 amiid=packer_build(packerfile)
 
-try:
-  response = client.start_change_set(
-    Catalog='AWSMarketplace',
-    ChangeSet=[
-      {
-        'ChangeType': 'AddDeliveryOptions',
-        'Entity': {
-          'Type': 'AmiProduct@1.0',
-          'Identifier': product_id
-        },
-          'Details': parse_amichange(file),
-          'ChangeName': 'Update'
-        },
-      ],
-      ChangeSetName='AvalancheGo Update ' + tag,
-      ClientRequestToken=uid
-  )
-  print(response)
-except client.exceptions.ResourceInUseException:
-  print("The product is currently blocked by Amazon.  Please check the product site for more details")
+if update_marketplace:
+
+  client = boto3.client('marketplace-catalog',region_name='us-east-1')
+
+  try:
+    response = client.start_change_set(
+      Catalog='AWSMarketplace',
+      ChangeSet=[
+        {
+          'ChangeType': 'AddDeliveryOptions',
+          'Entity': {
+            'Type': 'AmiProduct@1.0',
+            'Identifier': product_id
+          },
+            'Details': parse_amichange(file),
+            'ChangeName': 'Update'
+          },
+        ],
+        ChangeSetName='AvalancheGo Update ' + tag,
+        ClientRequestToken=uid
+    )
+    print(response)
+  except client.exceptions.ResourceInUseException:
+    print("The product is currently blocked by Amazon.  Please check the product site for more details")
 

api/health/health_test.go

@@ -192,9 +192,9 @@ func TestPassingChecks(t *testing.T) {
 func TestPassingThenFailingChecks(t *testing.T) {
 	require := require.New(t)
 
-	var shouldCheckErr utils.AtomicBool
+	var shouldCheckErr utils.Atomic[bool]
 	check := CheckerFunc(func(context.Context) (interface{}, error) {
-		if shouldCheckErr.GetValue() {
+		if shouldCheckErr.Get() {
 			return errUnhealthy.Error(), errUnhealthy
 		}
 		return "", nil
@@ -228,7 +228,7 @@ func TestPassingThenFailingChecks(t *testing.T) {
 		require.True(liveness)
 	}
 
-	shouldCheckErr.SetValue(true)
+	shouldCheckErr.Set(true)
 
 	awaitHealthy(h, false)
 	awaitLiveness(h, false)

api/health/worker.go

@@ -60,16 +60,16 @@ func (w *worker) RegisterCheck(name string, checker Checker) error {
 }
 
 func (w *worker) RegisterMonotonicCheck(name string, checker Checker) error {
-	var result utils.AtomicInterface
-	return w.RegisterCheck(name, CheckerFunc(func(ctx context.Context) (interface{}, error) {
-		details := result.GetValue()
+	var result utils.Atomic[any]
+	return w.RegisterCheck(name, CheckerFunc(func(ctx context.Context) (any, error) {
+		details := result.Get()
 		if details != nil {
 			return details, nil
 		}
 
 		details, err := checker.HealthCheck(ctx)
 		if err == nil {
-			result.SetValue(details)
+			result.Set(details)
 		}
 		return details, err
 	}))

api/server/server.go

@@ -71,14 +71,10 @@ type Server interface {
 	Dispatch() error
 	// DispatchTLS starts the API server with the provided TLS certificate
 	DispatchTLS(certBytes, keyBytes []byte) error
-	// RegisterChain registers the API endpoints associated with this chain. That is,
-	// add <route, handler> pairs to server so that API calls can be made to the VM.
-	// This method runs in a goroutine to avoid a deadlock in the event that the caller
-	// holds the engine's context lock. Namely, this could happen when the P-Chain is
-	// creating a new chain and holds the P-Chain's lock when this function is held,
-	// and at the same time the server's lock is held due to an API call and is trying
-	// to grab the P-Chain's lock.
-	RegisterChain(chainName string, engine common.Engine)
+	// RegisterChain registers the API endpoints associated with this chain.
+	// That is, add <route, handler> pairs to server so that API calls can be
+	// made to the VM.
+	RegisterChain(chainName string, ctx *snow.ConsensusContext, vm common.VM)
 	// Shutdown this server
 	Shutdown() error
 }
@@ -217,19 +213,14 @@ func (s *server) DispatchTLS(certBytes, keyBytes []byte) error {
 	return s.srv.Serve(listener)
 }
 
-func (s *server) RegisterChain(chainName string, engine common.Engine) {
-	go s.registerChain(chainName, engine)
-}
-
-func (s *server) registerChain(chainName string, engine common.Engine) {
+func (s *server) RegisterChain(chainName string, ctx *snow.ConsensusContext, vm common.VM) {
 	var (
 		handlers map[string]*common.HTTPHandler
 		err      error
 	)
 
-	ctx := engine.Context()
 	ctx.Lock.Lock()
-	handlers, err = engine.GetVM().CreateHandlers(context.TODO())
+	handlers, err = vm.CreateHandlers(context.TODO())
 	ctx.Lock.Unlock()
 	if err != nil {
 		s.log.Error("failed to create handlers",
@@ -377,7 +368,7 @@ func lockMiddleware(
 // not done state-syncing/bootstrapping, writes back an error.
 func rejectMiddleware(handler http.Handler, ctx *snow.ConsensusContext) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { // If chain isn't done bootstrapping, ignore API calls
-		if ctx.GetState() != snow.NormalOp {
+		if ctx.State.Get().State != snow.NormalOp {
 			w.WriteHeader(http.StatusServiceUnavailable)
 			// Doesn't matter if there's an error while writing. They'll get the StatusServiceUnavailable code.
 			_, _ = w.Write([]byte("API call rejected because chain is not done bootstrapping"))

cache/cache.go

@@ -3,37 +3,34 @@
 
 package cache
 
-// 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
+// Cacher acts as a best effort key value store.
+type Cacher[K comparable, V any] interface {
+	// Put inserts an element into the cache. If space is required, elements will
 	// be evicted.
-	Put(key, value interface{})
+	Put(key K, value V)
 
 	// Get returns the entry in the cache with the key specified, if no value
 	// exists, false is returned.
-	Get(key interface{}) (interface{}, bool)
+	Get(key K) (V, bool)
 
 	// Evict removes the specified entry from the cache
-	Evict(key interface{})
+	Evict(key K)
 
 	// Flush removes all entries from the cache
 	Flush()
 }
 
 // Evictable allows the object to be notified when it is evicted
-type Evictable interface {
-	// Key must return a comparable value as defined by
-	// https://golang.org/ref/spec#Comparison_operators.
-	Key() interface{}
+type Evictable[K comparable] interface {
+	Key() K
 	Evict()
 }
 
 // Deduplicator acts as a best effort deduplication service
-type Deduplicator interface {
+type Deduplicator[K comparable, V Evictable[K]] interface {
 	// Deduplicate returns either the provided value, or a previously provided
 	// value with the same ID that hasn't yet been evicted
-	Deduplicate(Evictable) Evictable
+	Deduplicate(V) V
 
 	// Flush removes all entries from the cache
 	Flush()