Skip to content

Commit

Permalink
fix: Importing DIDs and resources from v0.6.x genesis (#487)
Browse files Browse the repository at this point in the history
* Fix for importing DIDs from genesis file

* fix(installer): Backport to v0.6.x release branch (#379)

* dragonberry

* dragonberry

* build: Backport workflow and other fixes to release/0.6.x branch [DEV-1822] (#410)

* feat(installer): Get installer to handle multi-platform binaries [DEV-1667] (#376)
* Add support for determining the correct Github Release asset based on OS type and architecture
* Set recommended Docker image version

Signed-off-by: Andrew Nikitin <andrew.nikitin@evernym.com>
Co-authored-by: Andrew Nikitin <andrew.nikitin@evernym.com>

* fix(release): Bump semantic release package (#377)
Bump semantic release

* ci: Add v0.6.x release branch (#378)
Update .releaserc.json

* chore(deps-dev): Bump semantic-release from 19.0.4 to 19.0.5 (#383)
Bumps [semantic-release](https://github.com/semantic-release/semantic-release) from 19.0.4 to 19.0.5.
- [Release notes](https://github.com/semantic-release/semantic-release/releases)
- [Commits](semantic-release/semantic-release@v19.0.4...v19.0.5)

---
updated-dependencies:
- dependency-name: semantic-release
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

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>

* bump: Proto dependencies (#391)

* chore(deps): Bump bufbuild/buf-setup-action from 1.7.0 to 1.8.0 (#393)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.7.0 to 1.8.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.7.0...v1.8.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  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: Fix installer template for rsyslog [DEV-1815] (#403)

* Remove Debian postinstall/purge scripts
* Fix rsyslog template

* ci: Sync workflow changes to main [DEV-1816] (#407)

* Fix localnet running
* Squashed commit of the following:
* Change dispatch dependencies
* Add persist credentials to CodeQL
* Update .releaserc.json
* Update package-lock.json
* Added Docker metadata step to build
* Add updated caching and tagging in release
* Update test.yml
* Cache go setup
* Deactivate junit action
* Update dispatch.yml
* Bump go mod
* Revert changes in sync
* Reset testify

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Andrew Nikitin <andrew.nikitin@cheqd.io>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexander Kolesov <alexandr.kolesov@dsr-corporation.com>
Co-authored-by: abdulla-ashurov <abdulla.ashurov@dsr-corporation.com>
Co-authored-by: Andrew Nikitin <andrew.nikitin@cheqd.io>

* Merge branch 'dragonberry-fix' into dragonberry

* fix: dragonberry (#409)

Draft of Dragonberry fix (needs to be tested)

* Bump version of cosmos sdk

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

* Go mod tidy

* Switch back to cheqd cosmos fork

* Fix build

* Bump dockerfile go v1.18

* Added recommended patch changes

* Update configure.go

* Woraround for Tendermint's defaut storage config

* Fix dockerfile

* Remove .dockerignore

* Fix cosmos deafult config

* fix(security): Bump version of cosmos sdk (#413)

* Merge branch 'release/0.6.x' into dragonberry-fix

* Create .dockerignore

* Revert copy stage changes

* Bump golang CI linter to 1.18

* Bump CodeQL to 1.18

* ci(docker): Docker build for Dragonberry patch [DEV-1824] (#411)

* ci: Sync tag version format

* Squashed commit of the following:

commit 2fc6ae5
Author: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date:   Tue Aug 16 15:48:13 2022 +0300

    build: Multi-platform AMD64/ARM64 for Linux (#366)

    Signed-off-by: Andrew Nikitin <andrew.nikitin@evernym.com>
    Co-authored-by: Ankur Banerjee <ankurdotb@users.noreply.github.com>

commit 7485eb2
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Aug 15 15:37:31 2022 +0100

    chore(deps): Bump github.com/stretchr/testify from 1.7.1 to 1.8.0 (#362)

    Bumps github.com/stretchr/testify from 1.7.1 to 1.8.0.

    Commits

    181cea6 impr: CallerInfo should print full paths to the terminal (#1201)
    cf1284f Allow mock expectations to be ordered (#1106)
    66eef0e fix: assert.MapSubset (or just support maps in assert.Subset) (#1178)
    2fab6df Add WithinTimeRange method (#1188)
    b5ce165 fixing panic in calls to assertion with nil m.mutex (#1212)
    c206b2e Mock can be deadlocked by a panic (#1157)
    1b73601 suite: correctly set stats on test panic (#1195)
    ba1076d Add .Unset method to mock (#982)
    c31ea03 Support comparing byte slice (#1202)
    48391ba Fix panic in AssertExpectations for mocks without expectations (#1207)
    Additional commits viewable in compare view

    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 commands and options

    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)

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

commit 1e3e807
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Aug 15 15:14:40 2022 +0100

    chore(deps): Bump github.com/lestrrat-go/jwx from 1.2.20 to 1.2.25 (#359)

    Bumps github.com/lestrrat-go/jwx from 1.2.20 to 1.2.25.

    Release notes
    Sourced from github.com/lestrrat-go/jwx's releases.

    v1.2.25
    v1.2.25 23 May 2022
    [Bug Fixes][Security]
      * [jwe] An old bug from at least 7 years ago existed in handling AES-CBC unpadding,
        where the unpad operation might remove more bytes than necessary ([#744](lestrrat-go/jwx#744))
        This affects all jwx code that is available before v2.0.2 and v1.2.25.

    v1.2.24
    v1.2.24 05 May 2022
    [Security]
      * Upgrade golang.org/x/crypto ([#724](lestrrat-go/jwx#724))

    v1.2.23
    v1.2.23 13 Apr 2022
    [Bug fixes]
      * [jwk] jwk.AutoRefresh had a race condition when `Configure()` was
        called concurrently ([#686](lestrrat-go/jwx#686))
        (It has been patched correctly, but we may come back to revisit
         the design choices in the near future)

    v1.2.22
    v1.2.22 08 Apr 2022
    [Bug fixes]
      * [jws] jws.Verify was ignoring the `b64` header when it was present
        in the protected headers ([#681](lestrrat-go/jwx#681)). Now the following should work:
      jws.Sign(..., jws.WithDetachedPayload(payload))
      // previously payload had to be base64 encoded
      jws.Verify(..., jws.WithDetachedPayload(payload))
    (note: v2 branch was not affected)

    v1.2.21
    v1.2.21 30 Mar 2022
    [Bug fixes]
      * [jwk] RSA keys without p and q can now be parsed.

    Changelog
    Sourced from github.com/lestrrat-go/jwx's changelog.

    v1.2.25 23 May 2022
    [Bug Fixes][Security]

    [jwe] An old bug from at least 7 years ago existed in handling AES-CBC unpadding,
    where the unpad operation might remove more bytes than necessary (#744)
    This affects all jwx code that is available before v2.0.2 and v1.2.25.

    v1.2.24 05 May 2022
    [Security]

    Upgrade golang.org/x/crypto (#724)

    v1.2.23 13 Apr 2022
    [Bug fixes]

    [jwk] jwk.AutoRefresh had a race condition when Configure() was
    called concurrently (#686)
    (It has been patched correctly, but we may come back to revisit
    the design choices in the near future)

    v1.2.22 08 Apr 2022
    [Bug fixes]

    [jws] jws.Verify was ignoring the b64 header when it was present
    in the protected headers (#681). Now the following should work:
    jws.Sign(..., jws.WithDetachedPayload(payload))
    // previously payload had to be base64 encoded
    jws.Verify(..., jws.WithDetachedPayload(payload))
    (note: v2 branch was not affected)

    v1.2.21 30 Mar 2022
    [Bug fixes]

    [jwk] RSA keys without p and q can now be parsed.

    Commits

    ad8c29d merge develop/v1 (#747)
    e38f677 Merge develop/v1 (#727)
    baba561 Merge branch 'develop/v1' into v1
    8ff6c75 Update Changes
    ea97e8c Fix race in jwk.AutoRefresh (#686)
    f4701e1 Update Changes
    e831228 Fix jws.Verify not respecting the b64 header in the protected headers (#683)
    b66a2cb backport: Update golangci lint (#679) (#680)
    4899c32 reword error
    dd9e4c4 Bump github.com/lestrrat-go/httpcc from 1.0.0 to 1.0.1 (#675)
    Additional commits viewable in compare view

    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 commands and options

    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)

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

commit a56cfeb
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Mon Aug 15 14:50:56 2022 +0100

    chore(deps): Bump github.com/spf13/viper from 1.10.1 to 1.12.0 (#360)

    Bumps github.com/spf13/viper from 1.10.1 to 1.12.0.

    Release notes
    Sourced from github.com/spf13/viper's releases.

    v1.12.0
    This release makes YAML v3 and TOML v2 the default versions used for encoding.
    You can switch back to the old versions by adding viper_yaml2 and viper_toml1 to the build tags.
    Please note that YAML v2 and TOML v1 are considered deprecated from this release and may be removed in a future release.
    Please provide feedback in discussions and report bugs on the issue tracker. Thanks!

    What's Changed
    Exciting New Features 🎉

    Add etcd3 support to remote by @​sagikazarmark in spf13/viper#1356
    Make YAML 3 the default by @​sagikazarmark in spf13/viper#1357
    Make TOML 2 the default by @​sagikazarmark in spf13/viper#1358

    Enhancements 🚀

    chore: fix Error log calls in mergeMaps by @​wwade in spf13/viper#1341
    Add MustBindEnv by @​meowfaceman in spf13/viper#1301

    Dependency Updates ⬆️

    build(deps): bump github/codeql-action from 1 to 2 by @​dependabot in spf13/viper#1336
    build(deps): bump github.com/pelletier/go-toml/v2 from 2.0.0-beta.8 to 2.0.0 by @​dependabot in spf13/viper#1339
    build(deps): bump github.com/mitchellh/mapstructure from 1.4.3 to 1.5.0 by @​dependabot in spf13/viper#1332
    build(deps): bump github.com/pelletier/go-toml from 1.9.4 to 1.9.5 by @​dependabot in spf13/viper#1335
    build(deps): bump github.com/fsnotify/fsnotify from 1.5.1 to 1.5.4 by @​dependabot in spf13/viper#1338
    build(deps): bump github.com/spf13/cast from 1.4.1 to 1.5.0 by @​dependabot in spf13/viper#1344
    build(deps): bump github.com/pelletier/go-toml/v2 from 2.0.0 to 2.0.1 by @​dependabot in spf13/viper#1343
    build(deps): bump github.com/subosito/gotenv from 1.2.0 to 1.3.0 by @​dependabot in spf13/viper#1349

    New Contributors

    @​meowfaceman made their first contribution in spf13/viper#1301
    @​wwade made their first contribution in spf13/viper#1341

    Full Changelog: spf13/viper@v1.11.0...v1.12.0
    v1.11.0

    What's Changed
    Exciting New Features 🎉

    Experimental yaml v3 library support by @​sagikazarmark in spf13/viper#1273
    Experimental toml v2 support by @​sagikazarmark in spf13/viper#1274
    Experimental logger by @​sagikazarmark in spf13/viper#1275

    Enhancements 🚀

    Remove unnecessary operand by @​steviebps in spf13/viper#1213
    Improve encoding layer by @​sagikazarmark in spf13/viper#1167
    Allow merging configs with different types of leaf values by @​illarion in spf13/viper#1181

    Bug Fixes 🐛

    Disable race detector on windows by @​sagikazarmark in spf13/viper#1269

    ... (truncated)

    Commits

    4322cf2 feat: make toml2 the default
    8d02999 feat: make yaml3 the default
    7c35aa9 chore(deps): update yaml3
    433821f feat: add etcd3 support to remote
    2080d43 chore: update crypt
    da55858 chore: fix Error log calls in mergeMaps
    f50ce90 Add in MustBindEnv.
    3b836e5 build(deps): bump github.com/subosito/gotenv from 1.2.0 to 1.3.0
    5d65186 build(deps): bump github.com/pelletier/go-toml/v2 from 2.0.0 to 2.0.1
    9f85518 build(deps): bump github.com/spf13/cast from 1.4.1 to 1.5.0
    Additional commits viewable in compare view

    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 commands and options

    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)

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

commit a5aef25
Author: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date:   Mon Aug 15 10:44:13 2022 +0100

    build: Optimise Docker build (#365)

commit 4517a19
Author: Andrew Nikitin <andrew.nikitin@cheqd.io>
Date:   Sat Aug 13 03:55:47 2022 +0300

    ci: Add automated semantic release using Goreleaser (#357)

    Co-authored-by: Ankur Banerjee <ankurdotb@users.noreply.github.com>

commit 5a30740
Author: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date:   Sat Aug 13 01:53:06 2022 +0100

    ci: Disable cleanup dry-run

commit 3e8aea4
Author: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date:   Sat Aug 13 01:42:43 2022 +0100

    ci: Fix linting error

commit c335aba
Author: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date:   Sat Aug 13 01:38:00 2022 +0100

    ci: Make workflow cleanup choices easier

commit d89f496
Author: Ankur Banerjee <ankurdotb@users.noreply.github.com>
Date:   Sat Aug 13 01:29:14 2022 +0100

    ci: Cleanup old workflow runs (#364)

* chore(deps): Bump goreleaser/goreleaser-action from 3 to 4 (#486)

Bumps [goreleaser/goreleaser-action](https://github.com/goreleaser/goreleaser-action) from 3 to 4.
- [Release notes](https://github.com/goreleaser/goreleaser-action/releases)
- [Commits](goreleaser/goreleaser-action@v3...v4)

---
updated-dependencies:
- dependency-name: goreleaser/goreleaser-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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 bufbuild/buf-setup-action from 1.8.0 to 1.10.0 (#477)

Bumps [bufbuild/buf-setup-action](https://github.com/bufbuild/buf-setup-action) from 1.8.0 to 1.10.0.
- [Release notes](https://github.com/bufbuild/buf-setup-action/releases)
- [Commits](bufbuild/buf-setup-action@v1.8.0...v1.10.0)

---
updated-dependencies:
- dependency-name: bufbuild/buf-setup-action
  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>

* ci: Update PR title check (#463)

Update pull-request.yml

* fix: Error handling (#425)

* Update go.mod

* Bump package

* Fix broken link

* Fix protobuf breaking reference

* Deactivate protobuf workflows

* Change build runners

* Don't wrap release

* Update Dockerfile

* Remove redundant set DID count

* gofumpt

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: Jacob Gadikian <jacobgadikian@gmail.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Alexander Kolesov <alexandr.kolesov@dsr-corporation.com>
Co-authored-by: abdulla-ashurov <abdulla.ashurov@dsr-corporation.com>
Co-authored-by: Alexandr Kolesov <kolesov.alex.s@gmail.com>
Co-authored-by: Tasos <50984242+Eengineer1@users.noreply.github.com>
Co-authored-by: Alexander Kolesov <alexandr.kolesov@cheqd.io>
  • Loading branch information
9 people authored Dec 20, 2022
1 parent 398bee3 commit a968c3f
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
9 changes: 4 additions & 5 deletions x/cheqd/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,15 @@ import (
// InitGenesis initializes the cheqd module's state from a provided genesis
// state.
func InitGenesis(ctx sdk.Context, k keeper.Keeper, genState types.GenesisState) {
// Set did namespace
ctx.Logger().Info("Setting did namespace to: " + genState.DidNamespace)
k.SetDidNamespace(&ctx, genState.DidNamespace)

for _, elem := range genState.DidList {
if err := k.SetDid(&ctx, elem); err != nil {
panic(fmt.Sprintf("Cannot set did case: %s", err.Error()))
}
}

// Set nym count
k.SetDidCount(&ctx, uint64(len(genState.DidList)))

k.SetDidNamespace(&ctx, genState.DidNamespace)
}

// ExportGenesis returns the cheqd module's exported genesis.
Expand Down
12 changes: 12 additions & 0 deletions x/cheqd/types/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package types

import (
"fmt"

"github.com/cosmos/cosmos-sdk/codec/types"
)

const DefaultDidNamespace = "testnet"
Expand All @@ -14,6 +16,16 @@ func DefaultGenesis() *GenesisState {
}
}

func (gs *GenesisState) UnpackInterfaces(unpacker types.AnyUnpacker) error {
for _, elem := range gs.DidList {
err := elem.UnpackInterfaces(unpacker)
if err != nil {
return err
}
}
return nil
}

// Validate performs basic genesis state validation returning an error upon any
// failure.
func (gs GenesisState) Validate() error {
Expand Down

0 comments on commit a968c3f

Please sign in to comment.