Skip to content

Commit

Permalink
Merge branch 'cosmos/v0.44.x' of https://github.com/forbole/bdjuno in…
Browse files Browse the repository at this point in the history
…to chains/emoney/mainnet
  • Loading branch information
MonikaCat committed Jan 4, 2024
2 parents 85b9ed3 + 0430e8b commit 6685d23
Show file tree
Hide file tree
Showing 164 changed files with 521 additions and 654 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Bug report
about: Create a report to help us improve
title: ''
labels: 'kind/bug'
assignees: 'RiccardoM'
assignees: 'MonikaCat'

---
<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
Expand Down
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ updates:
interval: daily
open-pull-requests-limit: 10
reviewers:
- riccardom
- MonikaCat
labels:
- automerge
- dependencies
4 changes: 2 additions & 2 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
.go
.mod
.sum
- uses: golangci/golangci-lint-action@v3.4.0
- uses: golangci/golangci-lint-action@v3.5.0
with:
version: v1.50.1
version: v1.51.1
args: --timeout 10m
github-token: ${{ secrets.GITHUB_TOKEN }}
if: "env.GIT_DIFF != ''"
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
4 changes: 2 additions & 2 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ queue_rules:
pull_request_rules:
- name: automerge with label automerge and branch protection passing
conditions:
- "#approved-reviews-by>1"
- "#approved-reviews-by>0"
- label=automerge
actions:
queue:
Expand All @@ -17,4 +17,4 @@ pull_request_rules:
commit_message_template: >
{{ title }} (#{{ number }})
{{ body }}
{{ body }}
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
20 changes: 10 additions & 10 deletions cmd/bdjuno/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ package main
import (
"github.com/cosmos/cosmos-sdk/simapp"
"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"
emoneyapp "github.com/e-money/em-ledger"
"github.com/forbole/bdjuno/v4/database"
"github.com/forbole/bdjuno/v4/modules"
)

func main() {
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
14 changes: 7 additions & 7 deletions cmd/migrate/v3/migrate.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@ package v3

import (
"fmt"
"io/ioutil"
"os"

"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 All @@ -39,7 +39,7 @@ func RunMigration(parseConfig *parsecmdtypes.Config) error {
return fmt.Errorf("error while serializing config: %s", err)
}

err = ioutil.WriteFile(config.GetConfigFilePath(), bz, 0600)
err = os.WriteFile(config.GetConfigFilePath(), bz, 0600)
if err != nil {
return fmt.Errorf("error while writing v3 config: %s", 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
5 changes: 2 additions & 3 deletions cmd/migrate/v3/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ package v3

import (
"fmt"
"io/ioutil"
"os"
"path"

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

Expand All @@ -19,7 +18,7 @@ func GetConfig() (Config, error) {
return Config{}, fmt.Errorf("config file does not exist")
}

bz, err := ioutil.ReadFile(file)
bz, err := os.ReadFile(file)
if err != nil {
return Config{}, fmt.Errorf("error while reading config files: %s", err)
}
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
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
22 changes: 11 additions & 11 deletions cmd/parse/parse.go
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
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"
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"
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
Loading

0 comments on commit 6685d23

Please sign in to comment.