Skip to content

Commit

Permalink
feat: Update cosmos-sdk related dependencies (#83)
Browse files Browse the repository at this point in the history
* ci: Fix syntax error in DOCR push

* ci: Update cache cleaning

* chore(deps): Bump github.com/prometheus/client_golang from 1.13.0 to 1.14.0 (#60)

chore(deps): Bump github.com/prometheus/client_golang

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.14.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.13.0...v1.14.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

* chore(deps): Bump github.com/go-co-op/gocron from 1.17.1 to 1.18.0 (#61)

Bumps [github.com/go-co-op/gocron](https://github.com/go-co-op/gocron) from 1.17.1 to 1.18.0.
- [Release notes](https://github.com/go-co-op/gocron/releases)
- [Commits](go-co-op/gocron@v1.17.1...v1.18.0)

---
updated-dependencies:
- dependency-name: github.com/go-co-op/gocron
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

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

* build(deps): bump github.com/prometheus/client_golang from 1.13.0 to 1.13.1 (forbole#493)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.13.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/prometheus/client_golang/releases">github.com/prometheus/client_golang's releases</a>.</em></p>
<blockquote>
<h2>1.13.1 / 2022-11-02</h2>
<ul>
<li>[BUGFIX] Fix race condition with Exemplar in Counter. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1146">#1146</a></li>
<li>[BUGFIX] Fix <code>CumulativeCount</code> value of <code>+Inf</code> bucket created from exemplar. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1148">#1148</a></li>
<li>[BUGFIX] Fix double-counting bug in <code>promhttp.InstrumentRoundTripperCounter</code>. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1118">#1118</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/prometheus/client_golang/compare/v1.13.0...v1.13.1">https://github.com/prometheus/client_golang/compare/v1.13.0...v1.13.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/prometheus/client_golang/blob/v1.13.1/CHANGELOG.md">github.com/prometheus/client_golang's changelog</a>.</em></p>
<blockquote>
<h2>1.13.1 / 2022-11-01</h2>
<ul>
<li>[BUGFIX] Fix race condition with Exemplar in Counter. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1146">#1146</a></li>
<li>[BUGFIX] Fix <code>CumulativeCount</code> value of <code>+Inf</code> bucket created from exemplar. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1148">#1148</a></li>
<li>[BUGFIX] Fix double-counting bug in <code>promhttp.InstrumentRoundTripperCounter</code>. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1118">#1118</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/prometheus/client_golang/commit/53e51c4f5338f760a766232610e574b00ea720d8"><code>53e51c4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1157">#1157</a> from prometheus/cut-1.13.1</li>
<li><a href="https://github.com/prometheus/client_golang/commit/79ca0eb2ba90a9c1754d29177d0bfe3afb425449"><code>79ca0eb</code></a> Added tip from Björn + Grammarly.</li>
<li><a href="https://github.com/prometheus/client_golang/commit/078f11f85b2cb5d535f5856903e73b758a8f0568"><code>078f11f</code></a> Cut 1.13.1 release (+ documenting release process).</li>
<li><a href="https://github.com/prometheus/client_golang/commit/ddd7f0edcd31dd27b31ee9c54b5c22d44258d5d1"><code>ddd7f0e</code></a> Fix race condition with Exemplar in Counter (<a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1146">#1146</a>)</li>
<li><a href="https://github.com/prometheus/client_golang/commit/1f93f64580770181b19e685e1a243923fb61d476"><code>1f93f64</code></a> Fix <code>CumulativeCount</code> value of <code>+Inf</code> bucket created from exemplar (<a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1148">#1148</a>)</li>
<li><a href="https://github.com/prometheus/client_golang/commit/8cc2b6c472a5d4cfc3d9fe37c5a23f7239faf707"><code>8cc2b6c</code></a> Fix double-counting bug in promhttp.InstrumentRoundTripperCounter (<a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1118">#1118</a>)</li>
<li>See full diff in <a href="https://github.com/prometheus/client_golang/compare/v1.13.0...v1.13.1">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/prometheus/client_golang&package-manager=go_modules&previous-version=1.13.0&new-version=1.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

</details>

* feat: manually trigger periodic task (forbole#492)

Closes: forbole#415

---

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [x] targeted the correct branch
- [x] provided a link to the relevant issue or specification
- [x] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [x] reviewed "Files changed" and left comments if necessary
- [x] confirmed all CI checks have passed

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)

* fix: check if proposal has passed voting end time before marking it as invalid (forbole#499)

Closes: #XXXX

jira: https://forbole.atlassian.net/browse/BDU-693

---

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [x] targeted the correct branch
- [ ] provided a link to the relevant issue or specification
- [x] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [x] reviewed "Files changed" and left comments if necessary
- [x] confirmed all CI checks have passed

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)

* Revert "feat: manually trigger periodic task (forbole#492)"

This reverts commit 88ac193.

* Revert "fix: check if proposal has passed voting end time before marking it as invalid (forbole#499)"

This reverts commit 65d7e76.

* docs: Update README [skip ci]

* feat: Sync upstream `bank` and `staking` features (#63)

* build(deps): bump github.com/prometheus/client_golang from 1.13.0 to 1.13.1 (forbole#493)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.13.0 to 1.13.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/prometheus/client_golang/releases">github.com/prometheus/client_golang's releases</a>.</em></p>
<blockquote>
<h2>1.13.1 / 2022-11-02</h2>
<ul>
<li>[BUGFIX] Fix race condition with Exemplar in Counter. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1146">#1146</a></li>
<li>[BUGFIX] Fix <code>CumulativeCount</code> value of <code>+Inf</code> bucket created from exemplar. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1148">#1148</a></li>
<li>[BUGFIX] Fix double-counting bug in <code>promhttp.InstrumentRoundTripperCounter</code>. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1118">#1118</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a href="https://github.com/prometheus/client_golang/compare/v1.13.0...v1.13.1">https://github.com/prometheus/client_golang/compare/v1.13.0...v1.13.1</a></p>
</blockquote>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a href="https://github.com/prometheus/client_golang/blob/v1.13.1/CHANGELOG.md">github.com/prometheus/client_golang's changelog</a>.</em></p>
<blockquote>
<h2>1.13.1 / 2022-11-01</h2>
<ul>
<li>[BUGFIX] Fix race condition with Exemplar in Counter. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1146">#1146</a></li>
<li>[BUGFIX] Fix <code>CumulativeCount</code> value of <code>+Inf</code> bucket created from exemplar. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1148">#1148</a></li>
<li>[BUGFIX] Fix double-counting bug in <code>promhttp.InstrumentRoundTripperCounter</code>. <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1118">#1118</a></li>
</ul>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/prometheus/client_golang/commit/53e51c4f5338f760a766232610e574b00ea720d8"><code>53e51c4</code></a> Merge pull request <a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1157">#1157</a> from prometheus/cut-1.13.1</li>
<li><a href="https://github.com/prometheus/client_golang/commit/79ca0eb2ba90a9c1754d29177d0bfe3afb425449"><code>79ca0eb</code></a> Added tip from Björn + Grammarly.</li>
<li><a href="https://github.com/prometheus/client_golang/commit/078f11f85b2cb5d535f5856903e73b758a8f0568"><code>078f11f</code></a> Cut 1.13.1 release (+ documenting release process).</li>
<li><a href="https://github.com/prometheus/client_golang/commit/ddd7f0edcd31dd27b31ee9c54b5c22d44258d5d1"><code>ddd7f0e</code></a> Fix race condition with Exemplar in Counter (<a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1146">#1146</a>)</li>
<li><a href="https://github.com/prometheus/client_golang/commit/1f93f64580770181b19e685e1a243923fb61d476"><code>1f93f64</code></a> Fix <code>CumulativeCount</code> value of <code>+Inf</code> bucket created from exemplar (<a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1148">#1148</a>)</li>
<li><a href="https://github.com/prometheus/client_golang/commit/8cc2b6c472a5d4cfc3d9fe37c5a23f7239faf707"><code>8cc2b6c</code></a> Fix double-counting bug in promhttp.InstrumentRoundTripperCounter (<a href="https://github-redirect.dependabot.com/prometheus/client_golang/issues/1118">#1118</a>)</li>
<li>See full diff in <a href="https://github.com/prometheus/client_golang/compare/v1.13.0...v1.13.1">compare view</a></li>
</ul>
</details>
<br />

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=github.com/prometheus/client_golang&package-manager=go_modules&previous-version=1.13.0&new-version=1.13.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
- `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

</details>

* feat: manually trigger periodic task (forbole#492)

Closes: forbole#415

---

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [x] targeted the correct branch
- [x] provided a link to the relevant issue or specification
- [x] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [x] reviewed "Files changed" and left comments if necessary
- [x] confirmed all CI checks have passed

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)

* fix: check if proposal has passed voting end time before marking it as invalid (forbole#499)

Closes: #XXXX

jira: https://forbole.atlassian.net/browse/BDU-693

---

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [x] targeted the correct branch
- [ ] provided a link to the relevant issue or specification
- [x] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [x] reviewed "Files changed" and left comments if necessary
- [x] confirmed all CI checks have passed

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)

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

* Update README.md

* fix: Resolve proposal parsing issues [DEV-1966] (#68)

* Pull upstream changes

* Remove unwanted upstream files

* Fix typo

* Fix proposal parsing issue

* Run gofumpt

* Fix linting issues

* feat: Testnet-5 restart [DEV-1996] (#73)

* build(ci): upgrade golangci version (forbole#508)

Closes: #XXXX

---

*All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.*

I have...

- [x] included the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] added `!` to the type prefix if API or client breaking change
- [x] targeted the correct branch
- [ ] provided a link to the relevant issue or specification
- [ ] added a changelog entry to `CHANGELOG.md`
- [ ] included comments for [documenting Go code](https://blog.golang.org/godoc)
- [ ] updated the relevant documentation or specification
- [x] reviewed "Files changed" and left comments if necessary
- [x] confirmed all CI checks have passed

*All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.*

I have...

- [ ] confirmed the correct [type prefix](https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json) in the PR title
- [ ] confirmed `!` in the type prefix if API or client breaking change
- [ ] confirmed all author checklist items have been addressed
- [ ] reviewed API design and naming
- [ ] reviewed documentation is accurate
- [ ] reviewed tests and test coverage
- [ ] manually tested (if applicable)

* Delete CHANGELOG.md

* go mod tidy

* Replace genesis file with the latest one

* Update pull-request.yml

* Update README.md

* gofumpt

* Bump alpine

* Update config.yaml

* Update README.md

Co-authored-by: Aaron <76254323+huichiaotsou@users.noreply.github.com>
Co-authored-by: Filip Djokic <djokicf@protonmail.com>

* fix: Revert start_height parameter to 1

* chore: Update testnet genesis.json file

* fix: Resolve super-linter issues

* fix: Move to 0.46 cosmos (#82)

* Move to Cosmos sdk 46

Signed-off-by: Andrew Nikitin <andrew.nikitin@cheqd.io>

* Move juno to cheqd dep

Signed-off-by: Andrew Nikitin <andrew.nikitin@cheqd.io>

* Makes linter happy

---------

Signed-off-by: Andrew Nikitin <andrew.nikitin@cheqd.io>

* Update BDJuno configuration file

* Update supply.go file

---------

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@cheqd.io>
Co-authored-by: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Aaron <76254323+huichiaotsou@users.noreply.github.com>
Co-authored-by: Andrew Nikitin <andrew.nikitin@cheqd.io>
  • Loading branch information
5 people committed Feb 3, 2023
1 parent 9d065c5 commit b03c0a2
Show file tree
Hide file tree
Showing 108 changed files with 920 additions and 898 deletions.
12 changes: 6 additions & 6 deletions cmd/bdjuno/cheqd.go
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package main

import (
didMsgs "github.com/cheqd/cheqd-node/x/cheqd/types"
resourceMsgs "github.com/cheqd/cheqd-node/x/resource/types"
didtypes "github.com/cheqd/cheqd-node/x/did/types"
resources "github.com/cheqd/cheqd-node/x/resource/types"
"github.com/cheqd/juno/v4/modules/messages"
"github.com/cosmos/cosmos-sdk/codec"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/forbole/juno/v3/modules/messages"
)

// CheqdAddressesParser func represents a MessageAddressesParser for the my custom module
// here, we're using a DID as the address
func CheqdAddressesParser(_ codec.Codec, cosmosMsg sdk.Msg) ([]string, error) {
switch msg := cosmosMsg.(type) {

case *didMsgs.MsgCreateDid:
case *didtypes.MsgCreateDidDoc:
return []string{msg.GetPayload().GetId()}, nil

case *didMsgs.MsgUpdateDid:
case *didtypes.MsgUpdateDidDoc:
return []string{msg.GetPayload().GetId()}, nil

case *resourceMsgs.MsgCreateResource:
case *resources.MsgCreateResource:
return []string{msg.GetPayload().GetId()}, nil

default:
Expand Down
15 changes: 7 additions & 8 deletions cmd/bdjuno/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ package main

import (
"github.com/cheqd/cheqd-node/app"
"github.com/cheqd/juno/v4/cmd"
initcmd "github.com/cheqd/juno/v4/cmd/init"
parsetypes "github.com/cheqd/juno/v4/cmd/parse/types"
startcmd "github.com/cheqd/juno/v4/cmd/start"
"github.com/cheqd/juno/v4/modules/messages"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/forbole/juno/v3/cmd"
initcmd "github.com/forbole/juno/v3/cmd/init"
parsetypes "github.com/forbole/juno/v3/cmd/parse/types"
startcmd "github.com/forbole/juno/v3/cmd/start"
"github.com/forbole/juno/v3/modules/messages"

migratecmd "github.com/forbole/bdjuno/v3/cmd/migrate"
parsecmd "github.com/forbole/bdjuno/v3/cmd/parse"
Expand All @@ -16,8 +16,7 @@ import (

"github.com/forbole/bdjuno/v3/database"
"github.com/forbole/bdjuno/v3/modules"

gaiaapp "github.com/cosmos/gaia/v7/app"
// gaiaapp "github.com/cosmos/gaia/v7/app"
)

func main() {
Expand Down Expand Up @@ -56,7 +55,7 @@ func main() {
// This should be edited by custom implementations if needed.
func getBasicManagers() []module.BasicManager {
return []module.BasicManager{
gaiaapp.ModuleBasics,
// gaiaapp.ModuleBasics,
app.ModuleBasics,
}
}
Expand Down
4 changes: 1 addition & 3 deletions cmd/migrate/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ import (
"fmt"
"os"

v2 "github.com/forbole/juno/v3/cmd/migrate/v2"
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"

v3 "github.com/forbole/bdjuno/v3/cmd/migrate/v3"
Expand All @@ -14,7 +13,6 @@ import (
type Migrator func(parseCfg *parsecmdtypes.Config) error

var migrations = map[string]Migrator{
"v2": v2.RunMigration,
"v3": v3.RunMigration,
}

Expand Down
11 changes: 7 additions & 4 deletions cmd/migrate/v3/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@ import (
"os"

"github.com/forbole/bdjuno/v3/modules/actions"
junov3 "github.com/forbole/juno/v3/cmd/migrate/v3"
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"

parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"

"gopkg.in/yaml.v3"

junov3 "github.com/cheqd/juno/v4/cmd/migrate/v4"
"github.com/cheqd/juno/v4/types/config"
)

// RunMigration runs the migrations from v2 to v3
Expand Down Expand Up @@ -36,7 +39,7 @@ func RunMigration(parseConfig *parsecmdtypes.Config) error {
return fmt.Errorf("error while serializing config: %s", err)
}

err = os.WriteFile(config.GetConfigFilePath(), bz, 0o600)
err = os.WriteFile(config.GetConfigFilePath(), bz, 0600)
if err != nil {
return fmt.Errorf("error while writing v3 config: %s", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/migrate/v3/types.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v3

import (
v3 "github.com/forbole/juno/v3/cmd/migrate/v3"
v3 "github.com/cheqd/juno/v4/cmd/migrate/v3"

"github.com/forbole/bdjuno/v3/modules/actions"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/migrate/v3/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"path"

"github.com/forbole/juno/v3/types/config"
"github.com/cheqd/juno/v4/types/config"
"gopkg.in/yaml.v3"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/auth/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package auth

import (
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/auth/vesting.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"fmt"

parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/cheqd/juno/v4/types/config"
"github.com/spf13/cobra"

"github.com/forbole/bdjuno/v3/database"
Expand Down Expand Up @@ -38,7 +38,7 @@ func vestingCmd(parseConfig *parsecmdtypes.Config) *cobra.Command {
return fmt.Errorf("error unmarshalling genesis doc: %s", err)
}

vestingAccounts, err := authutils.GetGenesisVestingAccounts(appState, parseCtx.EncodingConfig.Marshaler)
vestingAccounts, err := authutils.GetGenesisVestingAccounts(appState, parseCtx.EncodingConfig.Codec)
if err != nil {
return fmt.Errorf("error while gestting vesting accounts: %s", err)
}
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/bank/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package bank

import (
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/bank/supply.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

modulestypes "github.com/forbole/bdjuno/v3/modules/types"

parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/cheqd/juno/v4/types/config"
"github.com/spf13/cobra"

"github.com/forbole/bdjuno/v3/database"
Expand All @@ -33,7 +33,7 @@ func supplyCmd(parseConfig *parsecmdtypes.Config) *cobra.Command {
db := database.Cast(parseCtx.Database)

// Build bank module
bankModule := bank.NewModule(nil, sources.BankSource, parseCtx.EncodingConfig.Marshaler, db)
bankModule := bank.NewModule(nil, sources.BankSource, parseCtx.EncodingConfig.Codec, db)

err = bankModule.UpdateSupply()
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/distribution/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package distribution

import (
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/distribution/communitypool.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package distribution
import (
"fmt"

parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/cheqd/juno/v4/types/config"
"github.com/spf13/cobra"

"github.com/forbole/bdjuno/v3/database"
Expand Down Expand Up @@ -32,7 +32,7 @@ func communityPoolCmd(parseConfig *parsecmdtypes.Config) *cobra.Command {
db := database.Cast(parseCtx.Database)

// Build distribution module
distrModule := distribution.NewModule(sources.DistrSource, parseCtx.EncodingConfig.Marshaler, db)
distrModule := distribution.NewModule(sources.DistrSource, parseCtx.EncodingConfig.Codec, db)

err = distrModule.GetLatestCommunityPool()
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/feegrant/allowance.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"sort"

parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/cheqd/juno/v4/types/config"

"github.com/forbole/bdjuno/v3/modules/feegrant"
"github.com/forbole/bdjuno/v3/utils"
Expand Down Expand Up @@ -36,7 +36,7 @@ func allowanceCmd(parseConfig *parsecmdtypes.Config) *cobra.Command {
db := database.Cast(parseCtx.Database)

// Build feegrant module
feegrantModule := feegrant.NewModule(parseCtx.EncodingConfig.Marshaler, db)
feegrantModule := feegrant.NewModule(parseCtx.EncodingConfig.Codec, db)

// Get the accounts
// Collect all the transactions
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/feegrant/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package feegrant

import (
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/gov/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gov

import (
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
18 changes: 9 additions & 9 deletions cmd/parse/gov/proposal.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
modulestypes "github.com/forbole/bdjuno/v3/modules/types"
"github.com/rs/zerolog/log"

govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/cheqd/juno/v4/types/config"
govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
"github.com/spf13/cobra"

"github.com/forbole/juno/v3/parser"
"github.com/cheqd/juno/v4/parser"

"github.com/forbole/bdjuno/v3/database"
"github.com/forbole/bdjuno/v3/modules/distribution"
Expand Down Expand Up @@ -50,13 +50,13 @@ func proposalCmd(parseConfig *parsecmdtypes.Config) *cobra.Command {
db := database.Cast(parseCtx.Database)

// Build expected modules of gov modules for handleParamChangeProposal
distrModule := distribution.NewModule(sources.DistrSource, parseCtx.EncodingConfig.Marshaler, db)
mintModule := mint.NewModule(sources.MintSource, parseCtx.EncodingConfig.Marshaler, db)
slashingModule := slashing.NewModule(sources.SlashingSource, parseCtx.EncodingConfig.Marshaler, db)
stakingModule := staking.NewModule(sources.StakingSource, parseCtx.EncodingConfig.Marshaler, db)
distrModule := distribution.NewModule(sources.DistrSource, parseCtx.EncodingConfig.Codec, db)
mintModule := mint.NewModule(sources.MintSource, parseCtx.EncodingConfig.Codec, db)
slashingModule := slashing.NewModule(sources.SlashingSource, parseCtx.EncodingConfig.Codec, db)
stakingModule := staking.NewModule(sources.StakingSource, parseCtx.EncodingConfig.Codec, db)

// Build the gov module
govModule := gov.NewModule(sources.GovSource, nil, distrModule, mintModule, slashingModule, stakingModule, parseCtx.EncodingConfig.Marshaler, db)
govModule := gov.NewModule(sources.GovSource, nil, distrModule, mintModule, slashingModule, stakingModule, parseCtx.EncodingConfig.Codec, db)

err = refreshProposalDetails(parseCtx, proposalID, govModule)
if err != nil {
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/mint/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package mint

import (
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/mint/inflation.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package mint
import (
"fmt"

parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/cheqd/juno/v4/types/config"
"github.com/spf13/cobra"

"github.com/forbole/bdjuno/v3/database"
Expand Down Expand Up @@ -32,7 +32,7 @@ func inflationCmd(parseConfig *parsecmdtypes.Config) *cobra.Command {
db := database.Cast(parseCtx.Database)

// Build mint module
mintModule := mint.NewModule(sources.MintSource, parseCtx.EncodingConfig.Marshaler, db)
mintModule := mint.NewModule(sources.MintSource, parseCtx.EncodingConfig.Codec, db)

err = mintModule.UpdateInflation()
if err != nil {
Expand Down
8 changes: 4 additions & 4 deletions cmd/parse/parse.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package parse

import (
parse "github.com/forbole/juno/v3/cmd/parse/types"
parse "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"

parseblocks "github.com/forbole/juno/v3/cmd/parse/blocks"
parseblocks "github.com/cheqd/juno/v4/cmd/parse/blocks"

parsegenesis "github.com/forbole/juno/v3/cmd/parse/genesis"
parsegenesis "github.com/cheqd/juno/v4/cmd/parse/genesis"

parsetransaction "github.com/cheqd/juno/v4/cmd/parse/transactions"
parseauth "github.com/forbole/bdjuno/v3/cmd/parse/auth"
parsebank "github.com/forbole/bdjuno/v3/cmd/parse/bank"
parsedistribution "github.com/forbole/bdjuno/v3/cmd/parse/distribution"
Expand All @@ -16,7 +17,6 @@ import (
parsemint "github.com/forbole/bdjuno/v3/cmd/parse/mint"
parsepricefeed "github.com/forbole/bdjuno/v3/cmd/parse/pricefeed"
parsestaking "github.com/forbole/bdjuno/v3/cmd/parse/staking"
parsetransaction "github.com/forbole/juno/v3/cmd/parse/transactions"
)

// NewParseCmd returns the Cobra command allowing to parse some chain data without having to re-sync the whole database
Expand Down
2 changes: 1 addition & 1 deletion cmd/parse/pricefeed/cmd.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package pricefeed

import (
parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/pricefeed/price.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package pricefeed
import (
"fmt"

parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/cheqd/juno/v4/types/config"
"github.com/spf13/cobra"

"github.com/forbole/bdjuno/v3/database"
Expand All @@ -26,7 +26,7 @@ func priceCmd(parseConfig *parsecmdtypes.Config) *cobra.Command {
db := database.Cast(parseCtx.Database)

// Build pricefeed module
pricefeedModule := pricefeed.NewModule(config.Cfg, parseCtx.EncodingConfig.Marshaler, db)
pricefeedModule := pricefeed.NewModule(config.Cfg, parseCtx.EncodingConfig.Codec, db)

err = pricefeedModule.RunAdditionalOperations()
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions cmd/parse/pricefeed/pricehistory.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package pricefeed
import (
"fmt"

parsecmdtypes "github.com/forbole/juno/v3/cmd/parse/types"
"github.com/forbole/juno/v3/types/config"
parsecmdtypes "github.com/cheqd/juno/v4/cmd/parse/types"
"github.com/cheqd/juno/v4/types/config"
"github.com/spf13/cobra"

"github.com/forbole/bdjuno/v3/database"
Expand All @@ -26,7 +26,7 @@ func priceHistoryCmd(parseConfig *parsecmdtypes.Config) *cobra.Command {
db := database.Cast(parseCtx.Database)

// Build pricefeed module
pricefeedModule := pricefeed.NewModule(config.Cfg, parseCtx.EncodingConfig.Marshaler, db)
pricefeedModule := pricefeed.NewModule(config.Cfg, parseCtx.EncodingConfig.Codec, db)

err = pricefeedModule.RunAdditionalOperations()
if err != nil {
Expand Down
Loading

0 comments on commit b03c0a2

Please sign in to comment.