Skip to content

Commit

Permalink
Merge with master (#2671)
Browse files Browse the repository at this point in the history
* Update mainnet version (#2618)

* update mainnet version

* update height

* Bump browserslist from 4.16.3 to 4.16.6 in /docs (#2622)

Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.16.6.
- [Release notes](https://github.com/browserslist/browserslist/releases)
- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
- [Commits](browserslist/browserslist@4.16.3...4.16.6)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump dns-packet from 1.3.1 to 1.3.4 in /docs (#2624)

Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4.
- [Release notes](https://github.com/mafintosh/dns-packet/releases)
- [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md)
- [Commits](mafintosh/dns-packet@v1.3.1...v1.3.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>

* Bump ws from 6.2.1 to 6.2.2 in /docs (#2627)

Bumps [ws](https://github.com/websockets/ws) from 6.2.1 to 6.2.2.
- [Release notes](https://github.com/websockets/ws/releases)
- [Commits](https://github.com/websockets/ws/commits)

---
updated-dependencies:
- dependency-name: ws
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>

* Create codeql-analysis.yml

* Delete dependabot.yml

* Bump postcss from 7.0.35 to 7.0.36 in /docs (#2630)

Bumps [postcss](https://github.com/postcss/postcss) from 7.0.35 to 7.0.36.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@7.0.35...7.0.36)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Implement farm module (#2623)

* add query params api

* Revert "Update mainnet version (#2618)"

This reverts commit 7cf7584.

* revert

* upgrade irismod version

* fix some bugs

* revert

* refund shoule be in endblocker not begin blocker

* revert version

* revert version

* upgrade irismod version

* update irismod version

* fix compling

* upgrade irismod

* upgrade irismod

* merge from master

* upgrade irismod

* add farm api and swagger doc

Co-authored-by: chengwenxi <[email protected]>

* Update irismod version (#2635)

* add query params api

* Revert "Update mainnet version (#2618)"

This reverts commit 7cf7584.

* merge from master

* update farm version

* revert code

* revert docs

* revert docs

* update irismod version

* update irismod version

* add farm proto docs

Co-authored-by: chengwenxi <[email protected]>

* Bump prismjs from 1.23.0 to 1.24.0 in /docs (#2633)

Bumps [prismjs](https://github.com/PrismJS/prism) from 1.23.0 to 1.24.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](PrismJS/prism@v1.23.0...v1.24.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vincent <[email protected]>

* Bump color-string from 1.5.4 to 1.5.5 in /docs (#2632)

Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.4 to 1.5.5.
- [Release notes](https://github.com/Qix-/color-string/releases)
- [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md)
- [Commits](Qix-/color-string@1.5.4...1.5.5)

---
updated-dependencies:
- dependency-name: color-string
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vincent <[email protected]>

* update the irismod version of irishub (#2636)

Co-authored-by: vincent <[email protected]>

* update the irismod version of irishub (#2637)

* fix the staking.md (#2640)

* fix the staking.md

* transaction

* Version bumps, non-breaking (#2645)

* Fix zh/features/governance.md (#2647)

* fix governance

* fix governance

* Update BuildAndPublish.yml

* Fix nft metadata link (#2643)

* fix NFT.md

* fix ch

Co-authored-by: vincent <[email protected]>
Co-authored-by: Yelong Zhang <[email protected]>

* Upgrade coinswap (#2648)

* upgrade coinswap

* init farm moudle params

* apply comment from github

* Fix zh/features/governance.md (#2651)

* Bump url-parse from 1.5.1 to 1.5.3 in /docs (#2650)

Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.1 to 1.5.3.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](unshiftio/url-parse@1.5.1...1.5.3)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vincent <[email protected]>

* Bump path-parse from 1.0.6 to 1.0.7 in /docs (#2649)

Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)

---
updated-dependencies:
- dependency-name: path-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: vincent <[email protected]>

* update coin denom (#2652)

* update irismod version (#2653)

* fix command typo (#2654)

* fix cosmos-sdk v0.42.9 upgrade (#2655)

* Update irismod version (#2657)

* update irismod version

* update irismod version

* update irismod version and proto docs (#2658)

* Fix testnet (#2656)

* fix testnet

* fix testnet detail

Co-authored-by: vincent <[email protected]>

* update swagger doc (#2659)

* fix-large-unit-conversion-bug (#2660)

* update irismod dependecy (#2661)

* Fix nft-transfer bug (#2662)

* fix nft-transfer bug

* solve the problem of if nesting and err

Co-authored-by: vincent <[email protected]>

* Update farm params (#2663)

* update irismod version

* update farm params

* update irismod version

* update irismod version

* Add farm pagination (#2665)

* update irismod version

* add pagination flags

* Add farm module command docs (#2667)

* add command docs

* apply comments from github

Co-authored-by: vincent <[email protected]>

* bump up cosmos-sdk to v0.44.0 (#2668)

* update app

* update simapp

* fix

* fix

* update ConfigureBech32Prefix

* update irismod version

* fix

* fix

* fix

* fix

* add tibc module

* fix NewAccountKeeper

* fix

* bformat

* fix

* bump tibc version

* Fix cli and tibc (#2674)

* fix rootcmd and update app

* fix nft transfer

* reset PersistentPostRun

* revert converter

* upgrade tibc-go version

Co-authored-by: Dreamer <[email protected]>

* fix irishub load tibcnftTransfer bug (#2675)

* fix upgrade (#2678)

* bump cosmos-sdk version to v0.44.1 (#2677)

Co-authored-by: Yelong Zhang <[email protected]>

* fix app (#2676)

* fix app

* fix

Co-authored-by: Yelong Zhang <[email protected]>

* upgrade tibc-go (#2679)

* Fix upgrade failed (#2681)

* add RunMigrations

* update RunMigrations

* fix upgrade failed

* fix docs link error (#2682)

* Update irismod version (#2683)

* fix docs link error

* update irismod version

* Bump axios from 0.21.1 to 0.21.2 in /docs (#2672)

Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](axios/axios@v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>

* Bump prismjs from 1.24.0 to 1.25.0 in /docs (#2670)

Bumps [prismjs](https://github.com/PrismJS/prism) from 1.24.0 to 1.25.0.
- [Release notes](https://github.com/PrismJS/prism/releases)
- [Changelog](https://github.com/PrismJS/prism/blob/master/CHANGELOG.md)
- [Commits](PrismJS/prism@v1.24.0...v1.25.0)

---
updated-dependencies:
- dependency-name: prismjs
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>

* update github action files: update 'runs-on' option from 'ubuntu-16.04' to 'ubuntu-18.04'. (#2684)

* Update default chain name (#2685)

* fix docs link error

* update defalt chain name

* Replace tendermint to support sm2 (#2686)

* fix docs link error

* replace tendermint

* replace tendermint

* Update irismod require (#2687)

* update irismod require

* update tibc-go require

* Bump dep versions (#2688)

* bump irismod version to v1.5.0-alpha

* bump tibc version to v0.2.0-alpha

* Add default light client when upgrading (#2691)

* the light client is initialized by default When upgrading (#2689)

* fix docs link error

* replace tendermint

* replace tendermint

* init clients when upgrade

* register relayers

* fix test error

* Add eth client (#2690)

* fix docs link error

* replace tendermint

* replace tendermint

* init clients when upgrade

* register relayers

* fix test error

* add eth light client

* Cannot create connection after ibc module upgrade (#2692)

* fix docs link error

* fix ibc upgrade error

* Add change log (#2693)

* fix docs link error

* add change log

* add nft change log

* add api breaking changes

* bump golang version

* Update nft user documentation (#2666)

* update user documentation

* update user documentation

* format && update filed

Co-authored-by: Yelong Zhang <[email protected]>

* Add files for initializing the client and relayer (#2695)

* Add files for initializing the client and relayer

* fix: register data

Co-authored-by: sheldon <[email protected]>

* upgrade tibc-go version (#2696)

Co-authored-by: sheldon <[email protected]>

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update CHANGELOG.md

* bump up cosmos-sdk version to 0.44.3 (#2697)

* bump cosmos-sdk to v0.44.3

* bump cosmos-sdk to v0.44.3

* bump cosmos-sdk to v0.44.3

* Update general-concepts.md (#2698)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Yelong Zhang <[email protected]>
Co-authored-by: Zhiqiang Zhang <[email protected]>
Co-authored-by: mindcarver <[email protected]>
Co-authored-by: gnehcein <[email protected]>
Co-authored-by: Jacob Gadikian <[email protected]>
Co-authored-by: Jinbiao Zhang <[email protected]>
Co-authored-by: CoreyCheung <[email protected]>
Co-authored-by: Segue <[email protected]>
Co-authored-by: Pancongwen <[email protected]>
Co-authored-by: jcbert <[email protected]>
Co-authored-by: zyl <[email protected]>
Co-authored-by: zhangxing <[email protected]>
Co-authored-by: aofengli <[email protected]>
Co-authored-by: sheldon <[email protected]>
Co-authored-by: XB <[email protected]>
  • Loading branch information
17 people authored Nov 30, 2021
1 parent 491e52b commit 0f9b92e
Show file tree
Hide file tree
Showing 64 changed files with 5,270 additions and 1,206 deletions.
13 changes: 0 additions & 13 deletions .github/dependabot.yml

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/BuildAndPublish.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: BuildAndPublish
on:
pull_request:
push:
branches:
- master
Expand All @@ -11,7 +10,7 @@ on:
jobs:
build-images:
name: Build Images
runs-on: ubuntu-16.04
runs-on: ubuntu-18.04
steps:
- name: Checkout source code
uses: actions/checkout@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/TestUnit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ jobs:
test-unit:
name: Test Units
# runs-on: self-hosted
runs-on: ubuntu-16.04
runs-on: ubuntu-18.04
steps:
- name: Checkout source code
uses: actions/checkout@v1
- name: Run unit tests
uses: cedrickring/golang-action/go1.15@1.6.0
uses: cedrickring/golang-action/go1.16@1.7.0
env:
GO111MODULE: "on"
with:
Expand Down
71 changes: 71 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ master, develop, documents, hotfix/*, release* ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
schedule:
- cron: '45 3 * * 3'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'go' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
Loading

0 comments on commit 0f9b92e

Please sign in to comment.