Skip to content

Commit

Permalink
build(deps): bump forbole/juno and forbole/bdjuno to v4 (forbole#542)
Browse files Browse the repository at this point in the history
## Description

Closes: #XXXX

Changes:
- Upgraded BDJuno to `v4`
- Upgraded Juno to `v4.1.0`
- Upgraded Go to `1.19`

<!-- Add a description of the changes that this PR introduces and the
files that
are the most critical to review. -->

---

### Author Checklist

*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
- [x] 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`
- [x] included comments for [documenting Go
code](https://blog.golang.org/godoc)
- [x] updated the relevant documentation or specification
- [x] reviewed "Files changed" and left comments if necessary
- [ ] confirmed all CI checks have passed

### Reviewers Checklist

*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)
  • Loading branch information
MonikaCat authored Mar 20, 2023
1 parent 26aba2e commit 171152c
Show file tree
Hide file tree
Showing 152 changed files with 602 additions and 998 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v4
with:
go-version: 1.17
go-version: 1.19
- name: Test & Create coverage report
run: make install test-unit stop-docker-test
- name: Upload cove coverage
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

### Dependencies
- ([\#462](https://github.com/forbole/bdjuno/pull/462)) Updated Juno to `v3.4.0`
- ([\#542](https://github.com/forbole/bdjuno/pull/542)) Updated Juno to `v4.1.0`, BDJuno to `v4` and Golang version to `1.19`


## Version v3.2.0
### Changes
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ all: lint build test-unit
### Build flags ###
###############################################################################

LD_FLAGS = -X github.com/forbole/juno/v3/cmd.Version=$(VERSION) \
-X github.com/forbole/juno/v3/cmd.Commit=$(COMMIT)
LD_FLAGS = -X github.com/forbole/juno/v4/cmd.Version=$(VERSION) \
-X github.com/forbole/juno/v4/cmd.Commit=$(COMMIT)
BUILD_FLAGS := -ldflags '$(LD_FLAGS)'

ifeq ($(LINK_STATICALLY),true)
Expand Down
25 changes: 12 additions & 13 deletions cmd/bdjuno/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,20 @@ package main

import (
"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"
"github.com/forbole/juno/v4/cmd"
initcmd "github.com/forbole/juno/v4/cmd/init"
parsetypes "github.com/forbole/juno/v4/cmd/parse/types"
startcmd "github.com/forbole/juno/v4/cmd/start"
"github.com/forbole/juno/v4/modules/messages"

migratecmd "github.com/forbole/bdjuno/v3/cmd/migrate"
parsecmd "github.com/forbole/bdjuno/v3/cmd/parse"
migratecmd "github.com/forbole/bdjuno/v4/cmd/migrate"
parsecmd "github.com/forbole/bdjuno/v4/cmd/parse"

"github.com/forbole/bdjuno/v3/types/config"
"github.com/forbole/bdjuno/v4/types/config"

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

gaiaapp "github.com/cosmos/gaia/v7/app"
"github.com/cosmos/cosmos-sdk/simapp"
"github.com/forbole/bdjuno/v4/database"
"github.com/forbole/bdjuno/v4/modules"
)

func main() {
Expand Down Expand Up @@ -55,7 +54,7 @@ func main() {
// This should be edited by custom implementations if needed.
func getBasicManagers() []module.BasicManager {
return []module.BasicManager{
gaiaapp.ModuleBasics,
simapp.ModuleBasics,
}
}

Expand Down
6 changes: 2 additions & 4 deletions cmd/migrate/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ import (
"fmt"
"os"

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

v3 "github.com/forbole/bdjuno/v3/cmd/migrate/v3"
v3 "github.com/forbole/bdjuno/v4/cmd/migrate/v3"
)

type Migrator func(parseCfg *parsecmdtypes.Config) error

var (
migrations = map[string]Migrator{
"v2": v2.RunMigration,
"v3": v3.RunMigration,
}
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/migrate/v3/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@ import (
"fmt"
"io/ioutil"

"github.com/forbole/bdjuno/v3/modules/actions"
"github.com/forbole/bdjuno/v4/modules/actions"

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

"gopkg.in/yaml.v3"

junov3 "github.com/forbole/juno/v3/cmd/migrate/v3"
"github.com/forbole/juno/v3/types/config"
junov4 "github.com/forbole/juno/v4/cmd/migrate/v4"
"github.com/forbole/juno/v4/types/config"
)

// RunMigration runs the migrations from v2 to v3
func RunMigration(parseConfig *parsecmdtypes.Config) error {
// Run Juno migration
err := junov3.RunMigration(parseConfig)
err := junov4.RunMigration(parseConfig)
if err != nil {
return err
}
Expand Down
4 changes: 2 additions & 2 deletions cmd/migrate/v3/types.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package v3

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

"github.com/forbole/bdjuno/v3/modules/actions"
"github.com/forbole/bdjuno/v4/modules/actions"
)

type Config struct {
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 @@ -6,7 +6,7 @@ import (
"os"
"path"

"github.com/forbole/juno/v3/types/config"
"github.com/forbole/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/forbole/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

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

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

"github.com/forbole/bdjuno/v3/database"
authutils "github.com/forbole/bdjuno/v3/modules/auth"
"github.com/forbole/bdjuno/v3/utils"
"github.com/forbole/bdjuno/v4/database"
authutils "github.com/forbole/bdjuno/v4/modules/auth"
"github.com/forbole/bdjuno/v4/utils"
)

// vestingCmd returns a Cobra command that allows to fix the vesting data for the accounts
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/forbole/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

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

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

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

"github.com/forbole/bdjuno/v3/database"
"github.com/forbole/bdjuno/v3/modules/bank"
"github.com/forbole/bdjuno/v4/database"
"github.com/forbole/bdjuno/v4/modules/bank"
)

// supplyCmd returns the Cobra command allowing to refresh x/bank total supply
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/forbole/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

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

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

"github.com/forbole/bdjuno/v3/database"
"github.com/forbole/bdjuno/v3/modules/distribution"
modulestypes "github.com/forbole/bdjuno/v3/modules/types"
"github.com/forbole/bdjuno/v4/database"
"github.com/forbole/bdjuno/v4/modules/distribution"
modulestypes "github.com/forbole/bdjuno/v4/modules/types"
)

// communityPoolCmd returns the Cobra command allowing to refresh community pool
Expand Down
10 changes: 5 additions & 5 deletions cmd/parse/feegrant/allowance.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ import (
"encoding/hex"
"fmt"

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

"github.com/forbole/bdjuno/v3/modules/feegrant"
"github.com/forbole/bdjuno/v3/utils"
"github.com/forbole/bdjuno/v4/modules/feegrant"
"github.com/forbole/bdjuno/v4/utils"

"github.com/spf13/cobra"

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

"sort"

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/forbole/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/forbole/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

Expand Down
22 changes: 11 additions & 11 deletions cmd/parse/gov/proposal.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@ import (
"strconv"
"time"

modulestypes "github.com/forbole/bdjuno/v3/modules/types"
modulestypes "github.com/forbole/bdjuno/v4/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/forbole/juno/v4/cmd/parse/types"
"github.com/forbole/juno/v4/types/config"
"github.com/spf13/cobra"

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

"github.com/forbole/bdjuno/v3/database"
"github.com/forbole/bdjuno/v3/modules/distribution"
"github.com/forbole/bdjuno/v3/modules/gov"
"github.com/forbole/bdjuno/v3/modules/mint"
"github.com/forbole/bdjuno/v3/modules/slashing"
"github.com/forbole/bdjuno/v3/modules/staking"
"github.com/forbole/bdjuno/v3/utils"
"github.com/forbole/bdjuno/v4/database"
"github.com/forbole/bdjuno/v4/modules/distribution"
"github.com/forbole/bdjuno/v4/modules/gov"
"github.com/forbole/bdjuno/v4/modules/mint"
"github.com/forbole/bdjuno/v4/modules/slashing"
"github.com/forbole/bdjuno/v4/modules/staking"
"github.com/forbole/bdjuno/v4/utils"
)

// proposalCmd returns the Cobra command allowing to fix all things related to a proposal
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/forbole/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

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

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

"github.com/forbole/bdjuno/v3/database"
"github.com/forbole/bdjuno/v3/modules/mint"
modulestypes "github.com/forbole/bdjuno/v3/modules/types"
"github.com/forbole/bdjuno/v4/database"
"github.com/forbole/bdjuno/v4/modules/mint"
modulestypes "github.com/forbole/bdjuno/v4/modules/types"
)

// inflationCmd returns the Cobra command allowing to refresh x/mint inflation
Expand Down
24 changes: 12 additions & 12 deletions cmd/parse/parse.go
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
package parse

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

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

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

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"
parsefeegrant "github.com/forbole/bdjuno/v3/cmd/parse/feegrant"
parsegov "github.com/forbole/bdjuno/v3/cmd/parse/gov"
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"
parseauth "github.com/forbole/bdjuno/v4/cmd/parse/auth"
parsebank "github.com/forbole/bdjuno/v4/cmd/parse/bank"
parsedistribution "github.com/forbole/bdjuno/v4/cmd/parse/distribution"
parsefeegrant "github.com/forbole/bdjuno/v4/cmd/parse/feegrant"
parsegov "github.com/forbole/bdjuno/v4/cmd/parse/gov"
parsemint "github.com/forbole/bdjuno/v4/cmd/parse/mint"
parsepricefeed "github.com/forbole/bdjuno/v4/cmd/parse/pricefeed"
parsestaking "github.com/forbole/bdjuno/v4/cmd/parse/staking"
parsetransaction "github.com/forbole/juno/v4/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/forbole/juno/v4/cmd/parse/types"
"github.com/spf13/cobra"
)

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

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

"github.com/forbole/bdjuno/v3/database"
"github.com/forbole/bdjuno/v3/modules/pricefeed"
"github.com/forbole/bdjuno/v4/database"
"github.com/forbole/bdjuno/v4/modules/pricefeed"
)

// priceCmd returns the Cobra command allowing to refresh token price
Expand Down
Loading

0 comments on commit 171152c

Please sign in to comment.