Fix SnarkyJS to be compatible with new Berkeley

Makefile

@@ -134,6 +134,12 @@ snarkyjs: ocaml_checks
 	&& bash ./src/lib/snarkyjs/src/bindings/scripts/build-snarkyjs-node.sh
 	$(info Build complete)
 
+snarkyjs_no_types: ocaml_checks
+	$(info Starting Build)
+	((ulimit -s 65532) || true) && (ulimit -n 10240 || true) \
+	&& bash ./src/lib/snarkyjs/src/bindings/scripts/build-snarkyjs-node-artifacts.sh
+	$(info Build complete)
+
 rosetta_lib_encodings: ocaml_checks
 	$(info Starting Build)
 	ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/lib/rosetta_lib/test/test_encodings.exe --profile=mainnet

automation/services/watchdog/Dockerfile

@@ -1,10 +1,10 @@
-FROM python:3.7-slim-stretch
+FROM python:3.9.16-slim-buster
 
 ARG GCLOUDSDK_DOWNLOAD_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-296.0.1-linux-x86_64.tar.gz"
 ARG WATCHMAN_DEB_URL="http://ftp.us.debian.org/debian/pool/main/w/watchman/watchman_4.9.0-5+b1_amd64.deb"
 
 RUN apt update && apt install -y \
-    gnupg2 lsb-core apt-transport-https git curl jq wget \
+    gnupg2 lsb-release apt-transport-https git curl jq wget \
     graphviz dumb-init build-essential python-dev automake autoconf libtool \
     libssl-dev pkg-config
 
@@ -19,14 +19,6 @@ RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && echo "deb http://p
 RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -
 RUN apt update && apt install -y kubectl
 
-# Install Watchman utility
-RUN cd /tmp && git clone https://github.com/facebook/watchman.git -b v4.9.0 --depth 1
-
-WORKDIR /tmp/watchman
-
-RUN ./autogen.sh && ./configure --enable-statedir=/tmp
-RUN make && make install && mv watchman /usr/local/bin/watchman
-
 WORKDIR /root
 
 RUN wget https://golang.org/dl/go1.15.7.linux-amd64.tar.gz
@@ -42,10 +34,6 @@ WORKDIR /code/check_libp2p
 RUN go mod download
 RUN go build
 
-
-# TODO: find better mechanism for sharing files across repo DIRs
-ADD https://raw.githubusercontent.com/MinaProtocol/mina/develop/automation/scripts/random_restart.py /scripts/random_restart.py
-
 COPY ./entrypoints /entrypoint.d
 
 RUN chmod -R 777 /code/ /scripts/

automation/services/watchdog/check_libp2p/check_libp2p.go

@@ -34,7 +34,7 @@ func main() {
 		libp2p.ListenAddrStrings("/ip4/0.0.0.0/tcp/0"),
 		libp2p.Ping(false),
 		libp2p.PrivateNetwork(pnetKey[:]),
-		libp2p.Muxer("/coda/mplex/1.0.0", libp2pmplex.DefaultTransport),
+		libp2p.Muxer("/coda/yamux/1.0.0", libp2pmplex.DefaultTransport),
 	)
 	if err != nil {
 		panic(err)

automation/services/watchdog/make_report.py

@@ -116,7 +116,7 @@ def exec_cmd(command, timeout):
           '-c',
           command,
         ]
-        result = stream.stream(v1.connect_get_namespaced_pod_exec, seed, args.namespace, command=exec_command, container='coda', stderr=True, stdout=True, stdin=False, tty=False, _request_timeout=timeout)
+        result = stream.stream(v1.connect_get_namespaced_pod_exec, seed, args.namespace, command=exec_command, container='mina', stderr=True, stdout=True, stdin=False, tty=False, _request_timeout=timeout)
         return result
 
       print('running command:', command)
@@ -298,7 +298,7 @@ def add_resp(resp):
       seed_daemon_port = [ v['value'] for v in seed_vars_dict if v['name'] == 'DAEMON_CLIENT_PORT'][0]
 
       cmd = "mina advanced node-status -daemon-port " + seed_daemon_port + " -daemon-peers" + " -show-errors"
-      resp = util.exec_on_pod(v1, namespace, seed, 'coda', cmd)
+      resp = util.exec_on_pod(v1, namespace, seed, 'mina', cmd)
 
       add_resp(resp)
 

automation/services/watchdog/node_status_metrics.py

@@ -200,10 +200,10 @@ def add_resp(raw, peers, seed, seed_node_responded, seed_node_queried):
 
     try:
       cmd = "mina advanced get-peers"
-      peers = util.exec_on_pod(v1, namespace, seed, 'coda', cmd).rstrip().split('\n')
+      peers = util.exec_on_pod(v1, namespace, seed, 'mina', cmd).rstrip().split('\n')
 
       cmd = "mina advanced node-status -daemon-port " + seed_daemon_port + " -peers " + ",".join(peers) + " -show-errors"
-      resp = util.exec_on_pod(v1, namespace, seed, 'coda', cmd)
+      resp = util.exec_on_pod(v1, namespace, seed, 'mina', cmd)
 
       if not 'Error: Unable to connect to Mina Daemon.' in resp:
         add_resp(resp, peers, seed, seed_nodes_responded, seed_nodes_queried)

automation/services/watchdog/scripts/random_restart.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+
+import sys
+import argparse
+import time
+import random
+
+from kubernetes import client, config
+
+def main():
+    parser = argparse.ArgumentParser(description="Periodically kill a random node in a testnet")
+    parser.add_argument("-n", "--namespace", help="testnet namespace", required=True, type=str, dest="namespace")
+    parser.add_argument("-i", "--interval", help="how often (in minutes) to kill a pod", required=True, type=int, dest="interval")
+    parser.add_argument("-ic", "--incluster", help="if we're running from inside the cluster", required=False, default=False, type=bool, dest="incluster")
+
+
+    args = parser.parse_args(sys.argv[1:])
+
+    if args.incluster:
+        config.load_incluster_config()
+        assert(args.namespace == '')
+        with open('/var/run/secrets/kubernetes.io/serviceaccount/namespace', 'r') as f:
+            args.namespace = f.read()
+    else:
+        config.load_kube_config()
+    v1 = client.CoreV1Api()
+
+    while True:
+        pods = v1.list_namespaced_pod(args.namespace, watch=False)
+
+        pod_names = [ p.metadata.name for p in pods.items ]
+        nodes = [ n for n in pod_names if 'fish' in n or 'whale' in n ]
+
+        if len(nodes) > 0:
+            random_node = random.choice(nodes)
+            print('restarting', random_node)
+            response = v1.delete_namespaced_pod(random_node, args.namespace)
+
+        time.sleep(60 * args.interval)
+
+if __name__ == "__main__":
+    main()

automation/services/watchdog/version.txt

@@ -1 +1 @@
-0.4.12
+0.4.13

automation/terraform/modules/kubernetes/testnet/kubernetes.tf

@@ -13,4 +13,4 @@ resource "kubernetes_namespace" "testnet_namespace" {
   timeouts {
     delete = "15m"
   }
-}
+}

automation/terraform/modules/kubernetes/testnet/locals.tf

@@ -39,6 +39,8 @@ locals {
       uploadBlocksToGCloud = var.upload_blocks_to_gcloud
       exposeGraphql        = var.expose_graphql
     }
+
+    persist_working_dir = var.enable_working_dir_persitence
 
     seedConfigs = [
       for index, config in var.seed_configs : {
@@ -121,6 +123,7 @@ locals {
         archiveAddress       = config.archiveAddress
       }
     ]
+    persist_working_dir = var.enable_working_dir_persitence
   }
 
   archive_vars = [for item in var.archive_configs : {
@@ -155,6 +158,7 @@ locals {
         }
       }
     }
+    persist_working_dir = var.enable_working_dir_persitence
   }]
 
   snark_vars = [
@@ -171,12 +175,13 @@ locals {
       coordinatorHostName = "${snark.snark_coordinator_name}.${var.testnet_name}"
       coordinatorRpcPort = 8301
       coordinatorHostPort = snark.snark_coordinators_host_port
-      publicKey =snark.snark_worker_public_key
+      publicKey = snark.snark_worker_public_key
       snarkFee = snark.snark_worker_fee
       workSelectionAlgorithm = "seq"
 
-      workerCpuRequest = var.worker_cpu_request
-      workerMemRequest= var.worker_mem_request
+      workerCpuRequest    = var.worker_cpu_request
+      workerMemRequest    = var.worker_mem_request
+      persist_working_dir = var.enable_working_dir_persitence
     }
   ]
 
@@ -186,6 +191,7 @@ locals {
       mina        = local.daemon
       healthcheck = local.healthcheck_vars
       name = node.name
+      persist_working_dir = var.enable_working_dir_persitence
     }
   ]
 

automation/terraform/modules/kubernetes/testnet/variables.tf

@@ -191,6 +191,7 @@ variable "seed_configs" {
       # private_key_secret = string,
       enableArchive      = bool,
       archiveAddress     = string
+      persist_working_dir = bool,
     })
   )
   default = []
@@ -225,12 +226,12 @@ variable "block_producer_configs" {
       run_with_bots          = bool,
       enableArchive          = bool,
       archiveAddress         = string
+      persist_working_dir    = bool,
     })
   )
   default = []
 }
 
-
 variable "plain_node_configs" {
   default = null
 }
@@ -245,6 +246,7 @@ variable "snark_coordinators" {
       snark_worker_fee      = number
       snark_worker_public_key = string
       snark_coordinators_host_port = number
+      persist_working_dir = bool
     }))
   default = []
 }
@@ -347,7 +349,8 @@ variable "archive_configs" {
       persistenceSize         = string
       persistenceStorageClass = string
       persistenceAccessModes  = list(string)
-      spotAllowed     = string
+      spotAllowed             = string
+      persist_working_dir     = bool
     })
   )
   default = []
@@ -367,3 +370,9 @@ variable "zkapps_dashboard_key" {
   type    = string
   default = ""
 }
+
+
+variable "enable_working_dir_persitence" {
+  type    = bool
+  default = false
+}

automation/terraform/modules/o1-integration/inputs.tf

@@ -46,6 +46,11 @@ variable "mina_points_image" {
   type = string
 }
 
+variable "enable_working_dir_persitence" {
+  type = bool
+  default = false
+}
+
 variable "runtime_config" {
   type = string
 }

automation/terraform/modules/o1-integration/locals.tf

@@ -2,6 +2,7 @@ locals {
   graphql_ingress_dns = "${var.testnet_name}.graphql.test.o1test.net"
   snark_worker_host_port            = 10001
   block_producer_starting_host_port = 10010
+
 
   # seed_peer = {
   #   multiaddr = "/dns4/seed.${var.testnet_name}/tcp/10401/p2p/12D3KooWCoGWacXE4FRwAX8VqhnWVKhz5TTEecWEuGmiNrDt2XLf",
@@ -14,14 +15,15 @@ locals {
   seed_external_port = 10001
 
   seed_config = {
-    name               = "seed",
-    class              = "seed",
-    libp2p_secret      = "seed-discovery-keys",
-    libp2p_secret_pw   = "naughty blue worm"
-    external_ip        = null,
+    name                 = "seed",
+    class                = "seed",
+    libp2p_secret        = "seed-discovery-keys",
+    libp2p_secret_pw     = "naughty blue worm"
+    external_ip          = null,
     # private_key_secret = null,
-    enableArchive      = false,
-    archiveAddress     = null
+    enableArchive        = false,
+    archiveAddress       = null
+    persist_working_dir  = var.enable_working_dir_persitence
   }
 
 
@@ -45,6 +47,7 @@ locals {
     persistenceStorageClass = "ssd-delete"
     persistenceAccessModes  = ["ReadWriteOnce"]
     spotAllowed             = "true"
+    persist_working_dir     = var.enable_working_dir_persitence
   }
 
   archive_node_configs = var.archive_configs != null ? [for item in var.archive_configs : merge(local.default_archive_node, item)] : [

automation/terraform/modules/o1-integration/testnet.tf

@@ -19,7 +19,7 @@ module "kubernetes_testnet" {
   mina_agent_image   = var.mina_agent_image
   mina_bots_image    = var.mina_bots_image
   mina_points_image  = var.mina_points_image
-
+  enable_working_dir_persitence = var.enable_working_dir_persitence
   log_level             = "Trace"
   log_snark_work_gossip = true
 
@@ -46,6 +46,7 @@ module "kubernetes_testnet" {
       snark_worker_fee      = var.snark_worker_fee
       snark_worker_public_key = var.snark_coordinator_config.public_key
       snark_coordinators_host_port = local.snark_worker_host_port
+      persist_working_dir = var.enable_working_dir_persitence
     }
   ]
 
@@ -68,6 +69,7 @@ module "kubernetes_testnet" {
       enable_peer_exchange   = true
       enableArchive          = var.archive_node_count > 0
       archiveAddress         = element(local.archive_node_names, index)
+      persist_working_dir    = var.enable_working_dir_persitence
     }
   ]
 

automation/terraform/testnets/berkeley/main.tf

@@ -91,7 +91,7 @@ module "berkeley" {
   mina_agent_image            = "codaprotocol/coda-user-agent:0.1.8"
   mina_bots_image             = "codaprotocol/coda-bots:0.0.13-beta-1"
   mina_points_image           = "codaprotocol/coda-points-hack:32b.4"
-  watchdog_image              = "gcr.io/o1labs-192920/watchdog:0.4.3"
+  watchdog_image              = "gcr.io/o1labs-192920/watchdog:0.4.13"
   use_embedded_runtime_config = true
 
   archive_node_count            = 3

buildkite/scripts/connect-to-mainnet-on-compatible.sh

@@ -2,10 +2,14 @@
 
 set -eo pipefail
 
-if [ ! "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" = "compatible" ]; then
-  echo "Not pulling against compatible, not running the connect test"
-  exit 0
-fi
+case "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" in
+    compatible|release/*)
+      echo "Not pulling against compatible or not in release branch. Therefore, not running the connect test"
+      exit 0
+      ;;
+    *) 
+      ;;
+esac
 
 # Don't prompt for answers during apt-get install
 export DEBIAN_FRONTEND=noninteractive
@@ -32,6 +36,7 @@ mina daemon \
   --peer-list-url "https://storage.googleapis.com/seed-lists/${TESTNET_NAME}_seeds.txt" \
 & # -background
 
+
 # Attempt to connect to the GraphQL client every 10s for up to 4 minutes
 num_status_retries=24
 for ((i=1;i<=$num_status_retries;i++)); do

buildkite/scripts/test-snarkyjs-bindings-minimal.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+export NODE_OPTIONS="--enable-source-maps --stack-trace-limit=1000"
+
+set -eo pipefail
+source ~/.profile
+
+echo "Node version:"
+node --version
+
+echo "Build SnarkyJS (w/o TS)..."
+make snarkyjs_no_types
+
+echo "Run bare minimum SnarkyJS tests..."
+cd src/lib/snarkyjs
+./run-minimal-mina-tests.sh

buildkite/src/Jobs/Lint/Merge.dhall

@@ -43,6 +43,16 @@ Pipeline.build
           , docker = Some Docker::{
               image = (../../Constants/ContainerImages.dhall).toolchainBase
             }
+        },
+      Command.build
+        Command.Config::{
+          commands = [ Cmd.run "buildkite/scripts/merges-cleanly.sh berkeley"]
+          , label = "Check merges cleanly into berkeley"
+          , key = "clean-merge-berkeley"
+          , target = Size.Small
+          , docker = Some Docker::{
+              image = (../../Constants/ContainerImages.dhall).toolchainBase
+            }
         }
     ]
   }