SDK: Upgrade Cosmos SDK to 0.40.0 (shentufoundation#184)

.circleci/config.yml

@@ -6,14 +6,14 @@ version: 2.1
 executors:
   golang:
     docker:
-      - image: circleci/golang:1.14.7
+      - image: circleci/golang:1.15.5
     working_directory: /go/src/github.com/certikfoundation/shentu
   mac:
     macos:
       xcode: "10.3.0"
     working_directory: /Users/distiller/project/src/github.com/certikfoundation/shentu
     environment:
-      GO_VERSION: "1.14.7"
+      GO_VERSION: "1.15.5"
 commands:
   make:
     parameters:
@@ -159,7 +159,7 @@ jobs:
 
   release:
     docker:
-      - image: circleci/golang:1.14.7
+      - image: circleci/golang:1.15.5
     steps:
       - checkout
       - run:
@@ -197,12 +197,12 @@ jobs:
       GOPATH: /home/circleci/.go_workspace/
       GOOS: linux
       GOARCH: amd64
-      GO_VERSION: "1.13.1"
+      GO_VERSION: "1.15.5"
     parallelism: 1
     steps:
       - checkout
       - run:
-          name: run localnet and exit on failure
+          name: Run a localnet and test liveness
           command: |
             pushd /tmp
             wget https://dl.google.com/go/go$GO_VERSION.linux-amd64.tar.gz
@@ -211,9 +211,8 @@ jobs:
             sudo mv go /usr/local
             popd
             set -x
-            make clean image image.update localnet
-            sudo chmod 777 ./devtools/localnet/localnet-blocks-test.sh
-            ./devtools/localnet/localnet-blocks-test.sh 40 5 10 localhost
+            make clean build-docker-certiknode localnet-start
+            ./devtools/localnet/localnet-blocks-test.sh 100 5 50 localhost
 
   macos-ci:
     executor: mac
@@ -299,6 +298,19 @@ workflows:
   version: 2.1
   test-suite:
     jobs:
+      - docker-image:
+          requires:
+           - setup-dependencies
+      - docker-tagged:
+          filters:
+            tags:
+              only:
+               - /^v.*/
+            branches:
+              ignore:
+               - /.*/
+          requires:
+           - setup-dependencies
       - macos-ci:
           filters:
             branches:
@@ -341,16 +353,3 @@ workflows:
           requires:
             - test-cover
       - lint
-#      - docker-image:
-#          requires:
-#            - setup-dependencies
-#      - docker-tagged:
-#          filters:
-#            tags:
-#              only:
-#                - /^v.*/
-#            branches:
-#              ignore:
-#                - /.*/
-#          requires:
-#            - setup-dependencies

.dockerignore

@@ -1,2 +1 @@
-vendor
-launch/localnet
+vendor

.gitignore

@@ -11,10 +11,8 @@ __pycache__
 *.pyc
 
 # Generated binaries & files
-certikcli
-certikd
-!cmd/certikd
-!cmd/certikcli
+certik
+!app/certik
 
 # Test
 coverage.out

.golangci.yml

@@ -10,12 +10,11 @@ linters-settings:
           - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
     disable:
       - shadow
+      - composites
   golint:
     min-confidence: 0.3
   gocyclo:
     min-complexity: 15
-  maligned:
-    suggest-new: true
   dupl:
     threshold: 100
   goconst:
@@ -66,7 +65,6 @@ linters:
     - goimports
     - gosimple
     - ineffassign
-    - maligned
     - misspell
     - nakedret
     - prealloc
@@ -83,7 +81,7 @@ linters:
     # - gochecknoglobals
     # - godox
     # - golint
-    # - govet
+    - govet
     # - interfacer
     # - stylecheck
     # - funlen
@@ -119,6 +117,8 @@ issues:
         - gochecknoinits
         - gocyclo
         - funlen
+  exclude:
+    - Using the variable on range scope .* in function literal
 
 # golangci.com configuration
 # https://github.com/golangci/golangci/wiki/Configuration

.goreleaser.yml

@@ -5,47 +5,15 @@ before:
     - go mod tidy
 builds:
   -
-    id: "certikcli"
+    id: "certik"
 
-    main: ./cmd/certikcli
+    main: ./app/certik
 
-    binary: certikcli
+    binary: certik
 
     ldflags: |
       -X github.com/cosmos/cosmos-sdk/version.Name=certik
-      -X github.com/cosmos/cosmos-sdk/version.ServerName=certikd
-      -X github.com/cosmos/cosmos-sdk/version.ClientName=certikcli
-      -X github.com/certikfoundation/shentu/version.Version={{ .Version }}
-      -X github.com/certikfoundation/shentu/version.Commit={{ .FullCommit }}
-      -X github.com/certikfoundation/shentu/version.BuildTags={{ .Tag }}
-
-    goos:
-      - linux
-      - windows
-      - darwin
-
-    goarch:
-      - amd64
-      # - 386
-
-    ignore:
-      # - goos: windows
-      #   goarch: 386
-      # - goos: darwin
-      #   goarch: 386
-
-
-  -
-    id: "certikd"
-
-    main: ./cmd/certikd
-
-    binary: certikd
-
-    ldflags: |
-      -X github.com/cosmos/cosmos-sdk/version.Name=certik
-      -X github.com/cosmos/cosmos-sdk/version.ServerName=certikd
-      -X github.com/cosmos/cosmos-sdk/version.ClientName=certikcli
+      -X github.com/cosmos/cosmos-sdk/version.AppName=certik
       -X github.com/certikfoundation/shentu/version.Version={{ .Version }}
       -X github.com/certikfoundation/shentu/version.Commit={{ .FullCommit }}
       -X github.com/certikfoundation/shentu/version.BuildTags={{ .Tag }}
@@ -66,11 +34,10 @@ builds:
       #   goarch: 386
 archives:
   - 
-    id: certikcli-archives
+    id: certik-archives
 
-    builds: 
-      - certikcli
-      - certikd
+    builds:
+      - certik
 
     name_template: "{{ .Binary }}-{{ .Os }}"
     replacements:

CHANGELOG.md

@@ -35,10 +35,14 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 # Changelog
 
-## [Unreleased] - TBD
+## [2.0.0] - TBD
 
 ### Client Breaking Changes
+* (APP) [\#231](https://github.com/certikfoundation/shentu/pull/231) rename default binary name to `certik`
+
 ### API Breaking Changes
+* (CVM) [\#231](https://github.com/certikfoundation/shentu/pull/231) Remove direct solidity file deployment.
+
 ### State Machine Breaking Changes
 ### Features
 ### Improvements

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14
+FROM golang:1.15
 
 LABEL name="CertiK Chain"
 LABEL maintainer="CertiK"
@@ -11,4 +11,4 @@ WORKDIR /shentu
 
 RUN make install
 
-CMD ["certikd"]
+CMD ["certik"]

Dockerfile.update

@@ -6,4 +6,4 @@ WORKDIR /shentu
 
 RUN make install
 
-CMD ["certikd"]
+CMD ["certik"]