v6.12.0

v6.12.0

Author: PaulBernier

.circleci/config.yml

@@ -5,47 +5,35 @@ jobs:
   build:
     working_directory: /go/src/github.com/FactomProject/factomd
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
 
     steps:
       - checkout
 
       - restore_cache:
           keys:
-            - v2-factomd-go-build-cache-{{ checksum "glide.lock" }}
-
-      - run:
-          name: Get glide
-          command: |
-            go get -v github.com/Masterminds/glide
-            cd $GOPATH/src/github.com/Masterminds/glide
-            git checkout tags/v0.13.1
-            go install
+            - v3-factomd-go-build-cache-{{ checksum "go.sum" }}
       - run:
           name: Get goveralls
           command: |
             go get github.com/mattn/goveralls
-      - run:
-          name: Get the dependencies
-          command: |
-            glide install
       - run:
           name: Build and install the executable
-          command: go install -v && cp -r $GOPATH/ /tmp
+          command: make install && cp -r $GOPATH/ /tmp
 
       - persist_to_workspace:
           root: /tmp
           paths: go
 
       - save_cache:
-          key: v2-factomd-go-build-cache-{{ checksum "glide.lock" }}
+          key: v3-factomd-go-build-cache-{{ checksum "go.sum" }}
           paths:
-            - vendor
+            - "/tmp/go/pkg/mod"
 
   test:
     working_directory: /tmp
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
 
     parallelism: 8
 
@@ -65,7 +53,7 @@ jobs:
   test_full:
     working_directory: /tmp
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
 
     parallelism: 8
 
@@ -85,7 +73,7 @@ jobs:
   coveralls:
     working_directory: /tmp
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
 
     steps:
       - attach_workspace:
@@ -98,13 +86,13 @@ jobs:
             export PATH="/tmp/go/bin:$PATH"
             export GOPATH=/tmp/go
             cd /tmp/go/src/github.com/FactomProject/factomd/
-            go test $(glide nv | grep -v Utilities | grep -v longTest | grep -v peerTest | grep -v simTest | grep '...') -vet=off -v -cover -coverprofile=coverage.out
+            go test $(go list ./... | grep -v 'Utilities|longTest|peerTest|simTest') -vet=off -v -cover -coverprofile=coverage.out
             goveralls -coverprofile=coverage.out -service=circle-ci -repotoken=$COVERALLS_TOKEN
 
   gofmt:
     working_directory: /tmp
     docker:
-      - image: circleci/golang:1.12
+      - image: circleci/golang:1.14
 
     steps:
       - attach_workspace:
@@ -133,11 +121,9 @@ jobs:
       - setup_remote_docker:
           version: 18.03.1-ce
 
-      # The main (only) thing we care about is caching the /vendor dir.
-      #   Hence, checksumming glide.lock
       - restore_cache:
           keys:
-            - v6-factomd-cache-{{ checksum "glide.lock" }}
+            - v6-factomd-cache-{{ checksum "go.sum" }}
 
       # Load the images if the cache hit
       - run:
@@ -332,22 +318,19 @@ jobs:
             docker save -o /images/factomd.tar factomd $(docker history -q factomd |grep -v missing | grep -v none)
 
       - save_cache:
-          key: v6-factomd-cache-{{ checksum "glide.lock" }}
+          key: v6-factomd-cache-{{ checksum "go.sum" }}
           paths:
             - /images
 
-# The flow is
-#    build
-#      |
-#      ---------- test
-#                   |
-#                   ---------- gofmt
-#                   |
-#                   ---------- docker_build
-#                   |
-#                   ---------- test_full
-#
-#
+  govet:
+    docker: 
+      - image: circleci/golang:1.14
+
+    steps:
+      - checkout
+      - run:
+          name: "Go vet"
+          command: go vet $(go list ./... | grep -v -e /Utilities -e /ET2)
 
 workflows:
   version: 2
@@ -357,18 +340,24 @@ workflows:
           filters:
             tags:
               only: /.*/
-      - test:
+      - gofmt:
           filters:
             tags:
               only: /.*/
           requires:
             - build
-      - gofmt:
+      - govet:
           filters:
             tags:
               only: /.*/
           requires:
-            - test
+            - build
+      - test:
+          filters:
+            tags:
+              only: /.*/
+          requires:
+            - build
       - docker_build:
           filters:
             branches:
@@ -404,10 +393,13 @@ workflows:
       - gofmt:
           requires:
             - build
+      - govet:
+          requires:
+            - build
       - test_full:
           requires:
             - build
       - docker_build:
           context: org-global
           requires:
-            - test_full
+            - test_full

.dockerignore

@@ -1,3 +1,2 @@
-# Don't copy the glide vendor directory
 vendor
 .sim 

CODE_OF_CONDUCT.md

@@ -0,0 +1,129 @@
+
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders ([members of Core Developers team](https://github.com/orgs/FactomProject/teams/core-developers)) are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces (GitHub org FactomProject and Factom Core Development Discord), and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement on our Discord: https://discord.gg/uGqD53y.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
+

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Contributing to Factomd
+
+:+1::tada: First off, thanks for taking the time to contribute! :tada::+1:
+
+This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md).
+By participating, you are expected to uphold this code. Please report unacceptable
+behavior on [our Discord](https://discord.gg/uGqD53y).
+
+### Contributors License Agreement (CLA)
+
+Before being able to contribute in code to the project you will need to sign the CLA. First [read the CLA](https://github.com/FactomProject/factomd/blob/master/CLA), then open a Pull-Request adding your name and GitHub account at the end of the list. Once merged you will be able to make your first contributions!
+
+#### **Did you find a bug?**
+
+* **Ensure the bug was not already reported** by searching on GitHub under [Issues](https://github.com/FactomProject/factomd/issues). If there is then please add any more information that you have, or give it a :+1:. This will help us prioritize work.
+
+* If you're unable to find an open issue for the problem, [open a new one](https://github.com/FactomProject/factomd/issues/new). Be sure to include a **title and clear description**, as much relevant information as possible (version...), and a **code sample** or event better an **executable test case** demonstrating the expected behavior that is not occurring. 
+
+#### **Did you write a patch that fixes a bug?**
+
+* Open a new pull request with the patch against the `develop` branch.
+
+* Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
+
+#### **Do you intend to add a new feature or change an existing one?**
+
+* Suggest your change in the [developer Discord](https://discord.gg/uGqD53y) then start writing code.
+
+* Do not open an issue on GitHub until you have collected positive feedback about the change. GitHub issues are primarily intended for bug reports and fixes.
+
+#### **Do you have questions about the source code?**
+
+* Ask any question about factomd on the [developer Discord](https://discord.gg/uGqD53y).

Dockerfile

@@ -1,22 +1,13 @@
-FROM golang:1.12
+FROM golang:1.14
 
 # Get git
 RUN apt-get update \
     && apt-get -y install curl git \
     && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
-# Get glide
-RUN go get github.com/Masterminds/glide
-
 # Where factomd sources will live
 WORKDIR $GOPATH/src/github.com/FactomProject/factomd
 
-# Get the dependencies
-COPY glide.yaml glide.lock ./
-
-# Install dependencies
-RUN glide install -v
-
 # Get goveralls for testing/coverage
 RUN go get github.com/mattn/goveralls
 
@@ -26,7 +17,7 @@ COPY . .
 ARG GOOS=linux
 
 # Build and install factomd
-RUN go install -ldflags "-X github.com/FactomProject/factomd/engine.Build=`git rev-parse HEAD` -X github.com/FactomProject/factomd/engine.FactomdVersion=`cat VERSION`"
+RUN make install
 
 # Setup the cache directory
 RUN mkdir -p /root/.factom/m2