fix conflict #8
Merged
fix conflict #8
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3.2.0 to 3.2.1. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](actions/setup-go@v3.2.0...v3.2.1) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* revert BaseAccount.PubKey fields, Marshal/UnmarshalJSONPB/JSON, and test cases
…inschia#593) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.35.0 to 0.36.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.35.0...v0.36.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [actions/cache](https://github.com/actions/cache) from 3.0.4 to 3.0.5. - [Release notes](https://github.com/actions/cache/releases) - [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md) - [Commits](actions/cache@v3.0.4...v3.0.5) --- updated-dependencies: - dependency-name: actions/cache dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* feat: add `x/wasm` feature to `simapp` Signed-off-by: zemyblue <zemyblue@gmail.com> * fix: apply the changes of NewSimApp. Signed-off-by: zemyblue <zemyblue@gmail.com> * fix lint error Signed-off-by: zemyblue <zemyblue@gmail.com> * fix: error of `TestAppStateDeterminism` unittest Signed-off-by: zemyblue <zemyblue@gmail.com> * fix lint error Signed-off-by: zemyblue <zemyblue@gmail.com> * fix: import cycle error Signed-off-by: zemyblue <zemyblue@gmail.com> * chore: update docs (include changelog) Signed-off-by: zemyblue <zemyblue@gmail.com>
…inschia#598) Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.36.0 to 0.37.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.36.0...v0.37.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix: fix enum * docs: update CHANGELOG.md * chore: deprecate the legacy events * fix: use custom stringer for enum * fix: fix type of the field permission of EventAbandon
* feat: define proto for x/collection * docs: revert proto-docs * feat: update protos * fix: apply feedbacks * fix: use cosmos pagination * fix: remove the interface TokenClass from tx, event and query * feat: add nfts into genesis * feat: add Query/TokenClassTypeName which returns fully qualified message type name of the token class. * docs: deprecate old APIs * docs: update comments * fix: fix naming collision in enums * feat: use custom stringer for Coin * feat: add composition related events * feat: add limits to params * docs: update CHANGELOG.md * fix: swap two fields in genesis state * chore: compile protos * feat: define Coin and Coins
* chore: use handy functions on errors * refactor: call string implicitly * lint: lint * fix: remove legacy amino * docs: fix format of the example * test: add a begin blocker test * fix: change some errors to panic * docs: update CHANGELOG.md
* feat: define x/collection proto * feat: update proto * feat: add event_spent and event_received * feat: add x/collection to simapp * feat: implement send * feat: add getters to classes * feat: implement create * feat: add new msgs and deprecate the old ones * fix: fix the type of the event fields * feat: add new queries and deprecate the old ones * feat: implement msgs * fix: use coins * feat: implement authorization logic * feat: implement grant * feat: implement nft * feat: implement genesis * docs: update documents on proto * docs: update version information in the comments * docs: update ERC777 related comments * test: add tests on genesis * feat: update protos * fix: fix export genesis * feat: return the id of the created entity * feat: add next ids to genesis state * feat: add queries * fix: split EventMinted * feat: update field names and comments in tx proto * feat: update comments in query proto * fix: fix event types and update proto * feat: add query client * feat: add nft to genesis * fix: fix parents iterator * lint: suppress unused for a while * feat: enable servers * refactor: remove ValidateNFTID() of keeper * docs: update CHANGELOG.md * feat: implement mint and burn * test: increase coverage of msgs.go * test: increase coverage of msg_server.go * test: add tests on grpc_query.go * feat: implement attach and detach * refactor: remove validateRoot * feat: implement modify * test: burn tokens * lint: lint * feat: add Msg/CreateFTClass and Msg/CreateNFTClass * fix: remove an interface TokenClass from proto * feat: add Query/TokenClassTypeURL * feat: add tx cli * docs: update deprecated comments * test: add tests for collection types * lint: add a exclude rule for the deprecated collection proto * feat: add mintable logic * feat: limit the number of descendants (NFT) * test: remove redundant test cases * fix: fix naming collision in enums * feat: add legacy events * feat: emit operation events (daphne compat.) * chore: remove the commented logic * docs: add error conditions to tx proto * feat: add depth and width limit on attach * feat: add params for the limits * test: check attribute_key_to * fix: emit legacy event against the original request * chore: put the logics after get_client_context except setting from * fix: revisit creation logics * feat: add tx cli to the module * chore: clean up legacy logic * chore: remove commented routerkey * feat: update genesis validation * docs: add hints to the deprecation message * chore: fix typo * fix: completely remove the rejected spec * refactor: remove duplicate logic * chore: completely remove Query/NFTs * fix: correct event emissions * chore: literal to nil * fix: use returned error * lint: use literal to avoid false negative * chore: remove unimplemented logics * chore: remove unused id logic and deprecate old ones * feat: add a validation on params * feat: add telemetry on account creation * style: use variable name other than 'new'
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Modify conflict and GetSigner() in x/token
Motivation and context
How has this been tested?
Screenshots (if appropriate):
Checklist:
CHANGELOG.mdclient/docs/swagger-ui/swagger.yaml