resolve conflicts

cosmos · Oct 1, 2020 · 136ca99 · 136ca99
2 parents 9380c12 + 432ba30
commit 136ca99
Show file tree

Hide file tree

Showing 989 changed files with 83,692 additions and 30,883 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,115 @@
+---
+Language:        Proto
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: true
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: false
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:   
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:   
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories: 
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: false
+IndentPPDirectives: None
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+RawStringFormats: 
+  - Delimiter:       pb
+    Language:        TextProto
+    BasedOnStyle:    google
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: false
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        8
+UseTab:          Never
+...
+
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -15,10 +15,18 @@ jobs:
       - name: Get current date
         id: date
         run: echo "::set-output name=date::$(date +'%Y-%m-%d')"
-      - name: Publish to Docker Hub
-        uses: docker/[email protected]
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
         with:
-          repository: interchainio/simapp
           username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          tags: nightly-${{ steps.date.outputs.date }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Publish to Docker Hub
+        uses: docker/build-push-action@v2
+        with:
+          push: true
+          tags: interchainio/simapp:nightly-${{ steps.date.outputs.date }}
diff --git a/.github/workflows/sims.yml b/.github/workflows/sims.yml
@@ -21,17 +21,24 @@ jobs:
     if: "!contains(github.event.head_commit.message, 'skip-sims')"
     steps:
       - uses: actions/checkout@v2
-      - run: |
-          make build
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
+      - name: Display go version
+        run: go version
+      - run: make build
 
   install-runsim:
     runs-on: ubuntu-latest
     needs: build
     steps:
       - uses: actions/[email protected]
-      - name: install runsim
-        run: |
-          export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
+        with:
+          go-version: 1.15
+      - name: Display go version
+        run: go version
+      - name: Install runsim
+        run: export GO111MODULE="on" && go get github.com/cosmos/tools/cmd/[email protected]
       - uses: actions/[email protected]
         with:
           path: ~/go/bin
@@ -42,6 +49,11 @@ jobs:
     needs: [build, install-runsim]
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
+      - name: Display go version
+        run: go version
       - uses: technote-space/get-diff-action@v3
         with:
           SUFFIX_FILTER: |
@@ -65,6 +77,11 @@ jobs:
     needs: [build, install-runsim]
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
+      - name: Display go version
+        run: go version
       - uses: technote-space/get-diff-action@v3
         with:
           SUFFIX_FILTER: |
@@ -88,6 +105,11 @@ jobs:
     needs: [build, install-runsim]
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
+      - name: Display go version
+        run: go version
       - uses: technote-space/get-diff-action@v3
         with:
           SUFFIX_FILTER: |
@@ -111,6 +133,11 @@ jobs:
     needs: [build, install-runsim]
     steps:
       - uses: actions/checkout@v2
+      - uses: actions/[email protected]
+        with:
+          go-version: 1.15
+      - name: Display go version
+        run: go version
       - uses: technote-space/get-diff-action@v3
         with:
           SUFFIX_FILTER: |

diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install Go
         uses: actions/[email protected]
         with:
-          go-version: 1.14
+          go-version: 1.15
       - name: Unshallow
         run: git fetch --prune --unshallow
       - name: Create release