cosmos · mergify · Sep 24, 2021 · Jul 27, 2021 · Jul 27, 2021 · Jul 27, 2021
diff --git a/client/keys/parse.go b/client/keys/parse.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/tendermint/tendermint/libs/cli"
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/bech32"

diff --git a/client/keys/utils.go b/client/keys/utils.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"path/filepath"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	cryptokeyring "github.com/cosmos/cosmos-sdk/crypto/keyring"
 )

diff --git a/codec/yaml.go b/codec/yaml.go
@@ -1,10 +1,8 @@
 package codec
 
 import (
-	"encoding/json"
-
 	"github.com/gogo/protobuf/proto"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 )
 
 // MarshalYAML marshals toPrint using JSONCodec to leverage specialized MarshalJSON methods
@@ -18,12 +16,5 @@ func MarshalYAML(cdc JSONCodec, toPrint proto.Message) ([]byte, error) {
 		return nil, err
 	}
 
-	// generate YAML by decoding JSON and re-encoding to YAML
-	var j interface{}
-	err = json.Unmarshal(bz, &j)
-	if err != nil {
-		return nil, err
-	}
-
-	return yaml.Marshal(j)
+	return yaml.JSONToYAML(bz)
 }
diff --git a/go.mod b/go.mod
@@ -52,6 +52,7 @@ require (
 	google.golang.org/protobuf v1.27.1
 	gopkg.in/yaml.v2 v2.4.0
 	nhooyr.io/websocket v1.8.6 // indirect
+	sigs.k8s.io/yaml v1.2.0
 )
 
 replace google.golang.org/grpc => google.golang.org/grpc v1.33.2

diff --git a/go.sum b/go.sum
@@ -1240,4 +1240,6 @@ rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
+sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
+sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
 sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU=
diff --git a/server/tm_cmds.go b/server/tm_cmds.go
@@ -10,7 +10,7 @@ import (
 	"github.com/tendermint/tendermint/p2p"
 	pvm "github.com/tendermint/tendermint/privval"
 	tversion "github.com/tendermint/tendermint/version"
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/client"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"

diff --git a/types/address.go b/types/address.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/hashicorp/golang-lru/simplelru"
 	yaml "gopkg.in/yaml.v2"
+	sigsyaml "sigs.k8s.io/yaml"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/internal/conv"
@@ -237,7 +238,7 @@ func (aa *AccAddress) UnmarshalJSON(data []byte) error {
 // UnmarshalYAML unmarshals from JSON assuming Bech32 encoding.
 func (aa *AccAddress) UnmarshalYAML(data []byte) error {
 	var s string
-	err := yaml.Unmarshal(data, &s)
+	err := sigsyaml.Unmarshal(data, &s)
 	if err != nil {
 		return err
 	}
@@ -387,7 +388,7 @@ func (va *ValAddress) UnmarshalJSON(data []byte) error {
 func (va *ValAddress) UnmarshalYAML(data []byte) error {
 	var s string
 
-	err := yaml.Unmarshal(data, &s)
+	err := sigsyaml.Unmarshal(data, &s)
 	if err != nil {
 		return err
 	}
@@ -542,7 +543,7 @@ func (ca *ConsAddress) UnmarshalJSON(data []byte) error {
 func (ca *ConsAddress) UnmarshalYAML(data []byte) error {
 	var s string
 
-	err := yaml.Unmarshal(data, &s)
+	err := sigsyaml.Unmarshal(data, &s)
 	if err != nil {
 		return err
 	}

diff --git a/types/result.go b/types/result.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	abci "github.com/tendermint/tendermint/abci/types"
 	ctypes "github.com/tendermint/tendermint/rpc/core/types"

diff --git a/version/command.go b/version/command.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 	"github.com/tendermint/tendermint/libs/cli"
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 )
 
 const flagLong = "long"

diff --git a/x/auth/migrations/legacytx/stdsig_test.go b/x/auth/migrations/legacytx/stdsig_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	"github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx"

diff --git a/x/auth/types/account.go b/x/auth/types/account.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/gogo/protobuf/proto"
 	"github.com/tendermint/tendermint/crypto"
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@@ -237,12 +237,12 @@ func (ma ModuleAccount) Validate() error {
 }
 
 type moduleAccountPretty struct {
-	Address       sdk.AccAddress `json:"address" yaml:"address"`
-	PubKey        string         `json:"public_key" yaml:"public_key"`
-	AccountNumber uint64         `json:"account_number" yaml:"account_number"`
-	Sequence      uint64         `json:"sequence" yaml:"sequence"`
-	Name          string         `json:"name" yaml:"name"`
-	Permissions   []string       `json:"permissions" yaml:"permissions"`
+	Address       sdk.AccAddress `json:"address"`
+	PubKey        string         `json:"public_key"`
+	AccountNumber uint64         `json:"account_number"`
+	Sequence      uint64         `json:"sequence"`
+	Name          string         `json:"name"`
+	Permissions   []string       `json:"permissions"`
 }
 
 func (ma ModuleAccount) String() string {

diff --git a/x/auth/types/account_test.go b/x/auth/types/account_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"

diff --git a/x/auth/types/params.go b/x/auth/types/params.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 )

diff --git a/x/auth/vesting/types/period.go b/x/auth/vesting/types/period.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 )
 
 // Periods stores all vesting periods passed as part of a PeriodicVestingAccount

diff --git a/x/auth/vesting/types/vesting_account.go b/x/auth/vesting/types/vesting_account.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"time"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -162,18 +162,18 @@ func (bva BaseVestingAccount) Validate() error {
 }
 
 type vestingAccountYAML struct {
-	Address          sdk.AccAddress `json:"address" yaml:"address"`
-	PubKey           string         `json:"public_key" yaml:"public_key"`
-	AccountNumber    uint64         `json:"account_number" yaml:"account_number"`
-	Sequence         uint64         `json:"sequence" yaml:"sequence"`
-	OriginalVesting  sdk.Coins      `json:"original_vesting" yaml:"original_vesting"`
-	DelegatedFree    sdk.Coins      `json:"delegated_free" yaml:"delegated_free"`
-	DelegatedVesting sdk.Coins      `json:"delegated_vesting" yaml:"delegated_vesting"`
-	EndTime          int64          `json:"end_time" yaml:"end_time"`
+	Address          sdk.AccAddress `json:"address"`
+	PubKey           string         `json:"public_key"`
+	AccountNumber    uint64         `json:"account_number"`
+	Sequence         uint64         `json:"sequence"`
+	OriginalVesting  sdk.Coins      `json:"original_vesting"`
+	DelegatedFree    sdk.Coins      `json:"delegated_free"`
+	DelegatedVesting sdk.Coins      `json:"delegated_vesting"`
+	EndTime          int64          `json:"end_time"`
 
 	// custom fields based on concrete vesting type which can be omitted
-	StartTime      int64   `json:"start_time,omitempty" yaml:"start_time,omitempty"`
-	VestingPeriods Periods `json:"vesting_periods,omitempty" yaml:"vesting_periods,omitempty"`
+	StartTime      int64   `json:"start_time,omitempty"`
+	VestingPeriods Periods `json:"vesting_periods,omitempty"`
 }
 
 func (bva BaseVestingAccount) String() string {

diff --git a/x/bank/types/params.go b/x/bank/types/params.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"

diff --git a/x/capability/types/types.go b/x/capability/types/types.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sort"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )

diff --git a/x/distribution/types/params.go b/x/distribution/types/params.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"

diff --git a/x/gov/types/deposit.go b/x/gov/types/deposit.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

diff --git a/x/gov/types/msgs.go b/x/gov/types/msgs.go
@@ -3,7 +3,7 @@ package types
 import (
 	"fmt"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/gogo/protobuf/proto"
 

diff --git a/x/gov/types/params.go b/x/gov/types/params.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"

diff --git a/x/gov/types/proposal.go b/x/gov/types/proposal.go
@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/gogo/protobuf/proto"
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/codec/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/gov/types/tally.go b/x/gov/types/tally.go
@@ -1,7 +1,7 @@
 package types
 
 import (
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

diff --git a/x/gov/types/vote.go b/x/gov/types/vote.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

diff --git a/x/mint/types/params.go b/x/mint/types/params.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"

diff --git a/x/params/types/proposal/proposal.go b/x/params/types/proposal/proposal.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 )

diff --git a/x/staking/migrations/v040/types.go b/x/staking/migrations/v040/types.go
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

diff --git a/x/staking/types/commission.go b/x/staking/types/commission.go
@@ -3,7 +3,7 @@ package types
 import (
 	"time"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )

diff --git a/x/staking/types/delegation.go b/x/staking/types/delegation.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"

diff --git a/x/staking/types/params.go b/x/staking/types/params.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	yaml "gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"