Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Crypto to Cronos Kaz edits #1078

Merged
merged 22 commits into from
Sep 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ A small fix on top of `v4.0.0` and upgrade to Cosmos SDK v0.46.4.

## v4.0.0

This is the release of Crypto.org Chain's `v4.0.0`. It contains following changes (when compared with `v3`):
This is the release of Cronos.org Chain's `v4.0.0`. It contains following changes (when compared with `v3`):

## Added

Expand Down Expand Up @@ -218,29 +218,29 @@ The upgraded Cosmos SDK version contains a fix for the upgrade non-determinism i
that was discovered during upgrade testing.

*WARNING*: DO NOT upgrade to this binary yet; instructions are going to be published later
on https://crypto.org/docs/getting-started/upgrade_guide.html .
on https://docs.cronos.org/

*September 7, 2021*

## v3.1.1
This version is identical to the v3.1.0, but updated the ibc-go dependency to 1.1.0.
*WARNING*: DO NOT upgrade to this binary yet; instructions are going to be published later
on https://crypto.org/docs/getting-started/upgrade_guide.html .
on https://docs.cronos.org/


*September 2, 2021*

## v3.1.0
This version is identical to the v3.0.1, but updated the Cosmos SDK dependency to 0.44.0 which contains a consensus-breaking security patch.
*WARNING*: DO NOT upgrade to this binary yet; instructions are going to be published later
on https://crypto.org/docs/getting-started/upgrade_guide.html .
on https://docs.cronos.org/

*August 26, 2021*

## v3.0.1
This version is identical to the v3.0.0, but updated the IBC dependency to 1.0.1 which contains a security patch.
*WARNING*: DO NOT upgrade to this binary yet; instructions are going to be published later
on https://crypto.org/docs/getting-started/upgrade_guide.html .
on https://docs.cronos.org/

*August 23, 2021*

Expand All @@ -251,7 +251,7 @@ and breaking changes. For more details, please see the [Cosmos SDK](https://gith
and [ibc-go](https://github.com/cosmos/ibc-go/releases/tag/v1.0.0) release notes.
In addition to that, it also uses Tendermint v0.34.12.
*WARNING*: DO NOT upgrade to this binary yet; instructions are going to be published later
on https://crypto.org/docs/getting-started/upgrade_guide.html .
on https://docs.cronos.org/

*August 6, 2021*

Expand All @@ -277,7 +277,7 @@ This version is based on Cosmos SDK 0.42.6 and Tendermint 0.34.11 which, among o
## v2.0.1
This released version is the same as v2.0.0, but contains an upgrade-critical fix.
NOTE that the upgrade plan name is still expected to be "v2.0.0".
*WARNING*: please follow the upgrade instructions described here: https://crypto.org/docs/getting-started/upgrade_guide.html#the-canis-major-upgrade-guide-v1-to-v2-0-0
*WARNING*: please follow the upgrade instructions described here: https://docs.cronos.org/for-node-hosts/running-nodes/cronos-mainnet

### Bug Fixes
- [552](https://github.com/crypto-org-chain/chain-main/pull/552) NFT module store initialized after upgrade
Expand All @@ -286,7 +286,7 @@ NOTE that the upgrade plan name is still expected to be "v2.0.0".

## v2.0.0
This pre-release version contains the scope of [ADR-003](https://github.com/crypto-org-chain/chain-main/blob/master/doc/architecture/adr-003.md) for the mainnet upgrade. It also upgrades to the latest version of Tendermint (0.34.10).
*WARNING*: please follow the upgrade instructions described here: https://crypto.org/docs/getting-started/upgrade_guide.html#the-canis-major-upgrade-guide-v1-to-v2-0-0
*WARNING*: please follow the upgrade instructions described here: https://docs.cronos.org/for-node-hosts/running-nodes/cronos-mainnet/the-v1.2-upgrade-guide-v1.1.-to-v1.2.0

### Breaking changes
- [516](https://github.com/crypto-org-chain/chain-main/pull/516) NFT module added
Expand Down
4 changes: 2 additions & 2 deletions NOTICE
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Crypto.org Chain
Copyright 2018-present Crypto.org
Cronos.org Chain
Copyright 2018-present Cronos.org

This project contains portions of code derived from the following libraries:

Expand Down
14 changes: 7 additions & 7 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
## Coordinated Vulnerability Disclosure Policy
We ask security researchers to keep vulnerabilities and communications around vulnerability submissions private and confidential until a patch is developed to protect the people using Crypto.org’s protocols. In addition to this, we ask that you:
We ask security researchers to keep vulnerabilities and communications around vulnerability submissions private and confidential until a patch is developed to protect the people using Cronos.org’s protocols. In addition to this, we ask that you:

- Allow us a reasonable amount of time to correct or address security vulnerabilities.
- Avoid exploiting any vulnerabilities that you discover.
- Demonstrate good faith by not disrupting or degrading Crypto.org’s data or services.
- Demonstrate good faith by not disrupting or degrading Cronos.org’s data or services.

## Vulnerability Disclosure Process
Once we receive a vulnerability report, Crypto.org will take these steps to address it:
Once we receive a vulnerability report, Cronos.org will take these steps to address it:

1. Crypto.org will confirm receipt of the vulnerability report within 5 business days. The timing of our response may depend on when a report is submitted. As our daily operations are distributed in time zones across the globe, response times may vary. If you have not received a response to a vulnerability report from us within 5 business days, we encourage you to follow up with us again for a response.
2. Crypto.org will investigate and validate the security issue submitted to us as quickly as we can, usually within 10 business days of receipt. Submitting a thorough report with clear steps to recreate the vulnerability and/or a proof-of-concept will move the process along in a timely manner.
3. Crypto.org will acknowledge the bug, and make the necessary code changes to patch it. Some issues may require more time than others to patch, but we will strive to patch each vulnerability as quickly as our resources and development process allow.
4. Crypto.org will publicly release the security patch for the vulnerability, and acknowledge the security fix in the release notes once the issue has been resolved. Public release notes can reference to the person or people who reported the vulnerability, unless they wish to stay anonymous.
1. Cronos.org will confirm receipt of the vulnerability report within 5 business days. The timing of our response may depend on when a report is submitted. As our daily operations are distributed in time zones across the globe, response times may vary. If you have not received a response to a vulnerability report from us within 5 business days, we encourage you to follow up with us again for a response.
2. Cronos.org will investigate and validate the security issue submitted to us as quickly as we can, usually within 10 business days of receipt. Submitting a thorough report with clear steps to recreate the vulnerability and/or a proof-of-concept will move the process along in a timely manner.
3. Cronos.org will acknowledge the bug, and make the necessary code changes to patch it. Some issues may require more time than others to patch, but we will strive to patch each vulnerability as quickly as our resources and development process allow.
4. Cronos.org will publicly release the security patch for the vulnerability, and acknowledge the security fix in the release notes once the issue has been resolved. Public release notes can reference to the person or people who reported the vulnerability, unless they wish to stay anonymous.

## Contact Us
If you find a security issue, you can report it on the [Crypto.com HackerOne Bug Bounty Program](https://hackerone.com/crypto) or you can contact our team directly at [[email protected]](mailto:[email protected]).
Expand Down
2 changes: 1 addition & 1 deletion app/docs/config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger": "2.0",
"info": {
"title": "Crypto.org Chain - Legacy REST and gRPC Gateway docs",
"title": "Cronos.org Chain - Legacy REST and gRPC Gateway docs",
"description": "A REST interface for state queries, legacy transactions",
"version": "1.0.0"
},
Expand Down
2 changes: 1 addition & 1 deletion app/docs/swagger-ui/swagger.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
swagger: '2.0'
info:
title: Crypto.org Chain - Legacy REST and gRPC Gateway docs
title: Cronos.org Chain - Legacy REST and gRPC Gateway docs
description: A REST interface for state queries, legacy transactions
version: 1.0.0
paths:
Expand Down
2 changes: 1 addition & 1 deletion app/state.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright 2016 All in Bits, Inc (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
package app

import (
Expand Down
2 changes: 1 addition & 1 deletion cmd/chain-maind/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) {

rootCmd := &cobra.Command{
Use: "chain-maind",
Short: "Crypto.org Chain app",
Short: "Cronos.org Chain app",
PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
// set the default command outputs
cmd.SetOut(cmd.OutOrStdout())
Expand Down
4 changes: 2 additions & 2 deletions default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ buildGoApplication rec {

doCheck = false;
meta = with lib; {
description = "Official implementation of the Crypto.org blockchain protocol";
homepage = "https://crypto.org/";
description = "Official implementation of the Cronos.org blockchain protocol";
homepage = "https://cronos.org/";
license = licenses.asl20;
mainProgram = "chain-maind" + stdenv.hostPlatform.extensions.executable;
platforms = platforms.all;
Expand Down
4 changes: 2 additions & 2 deletions doc/architecture/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Architecture Decision Records (ADR)

This is a location to record all high-level architecture decisions in the Crypto.org Chain implementation.
This is a location to record all high-level architecture decisions in the Cronos.org Chain implementation.

You can read more about the ADR concept in this [blog post](https://product.reverb.com/documenting-architecture-decisions-the-reverb-way-a3563bb24bd0#.78xhdix6t).

Expand Down Expand Up @@ -31,4 +31,4 @@ To suggest an ADR, please make use of the [ADR template](./adr-template.md) prov
| [002](./adr-002.md) | Subscriptions in CosmWasm | Accepted |
| [003](./adr-003.md) | Canis Major (1st Network Upgrade Scope of Breaking Changes) | Accepted |
| [004](./adr-004.md) | Transition to Cosmos SDK's NFT module | Proposed |
| [005](./adr-005.md) | Deprecate Crypto.org Chain's custom `x/supply` module | Proposed |
| [005](./adr-005.md) | Deprecate Cronos.org Chain's custom `x/supply` module | Proposed |
6 changes: 3 additions & 3 deletions doc/architecture/adr-001.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

## Context

Crypto.org Chain logic may need to be extended to support new digital asset and financial use cases
Cronos.org Chain logic may need to be extended to support new digital asset and financial use cases
in the near future.
In the initial implementation, Crypto.org Chain logic is extensible through three different mechanisms:
In the initial implementation, Cronos.org Chain logic is extensible through three different mechanisms:

1. Cryptographic commitments and multi-signatures:
through the existing and future (e.g. BIP-340) signature verification mechanisms,
Expand Down Expand Up @@ -93,7 +93,7 @@ Accepted
## Consequences

### Positive
* Any mainstream programming language can be potentially used to extend Crypto.org Chain
* Any mainstream programming language can be potentially used to extend Cronos.org Chain
without "hard fork" upgrades.
* One may leverage Rust verification tooling in development (e.g. MIRAI or Creusot).
* "WASM" as a compilation target is fairly mature and supported across the industry.
Expand Down
4 changes: 2 additions & 2 deletions doc/architecture/adr-003.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Context

At this time, the Crypto.org Chain network has been live for one month and three issues that require a "hardfork" (i.e. a coordinated network upgrade due to consensus state machine-related breaking changes) have been identified:
At this time, the Cronos.org Chain network has been live for one month and three issues that require a "hardfork" (i.e. a coordinated network upgrade due to consensus state machine-related breaking changes) have been identified:

1. Due to a bug in Cosmos SDK v0.42.*, the vesting accounts are restricted to executing one action (e.g. delegation) during their vesting period and their delegations are not tracked. This bug e.g. affects the community participants of the Crossfire incentivized testnet.

Expand Down Expand Up @@ -63,7 +63,7 @@ Accepted
* [fix solo machine merkle prefix casting bug](https://github.com/cosmos/ibc-go/pull/122)
* [Fix solo machine handshake verification bug](https://github.com/cosmos/ibc-go/pull/120)
* [solo machine proof height fix](https://github.com/cosmos/ibc-go/pull/123)
* [Crypto.org Chain Intergalactic Roadmap](https://blog.crypto.com/crypto-org-chain-intergalactic-roadmap/)
* [Cronos.org Chain Intergalactic Roadmap](https://blog.crypto.com/crypto-org-chain-intergalactic-roadmap/)
* [Cosmos SDK v0.43.0-alpha1 release notes](https://github.com/cosmos/cosmos-sdk/releases/tag/v0.43.0-alpha1)
* [NFT module on the Hub](https://github.com/cosmos/cosmos-sdk/discussions/9065)
* [IRISnet NFT module spec](https://github.com/irisnet/irismod/tree/master/modules/nft/spec)
Expand Down
6 changes: 3 additions & 3 deletions doc/architecture/adr-004.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

## Context

Currently, Crypto.org Chain offers support for non-fungible tokens (NFTs) using a custom NFT module in `chain-main`. The
Currently, Cronos.org Chain offers support for non-fungible tokens (NFTs) using a custom NFT module in `chain-main`. The
current implementation of NFT module is based on [Irismod's NFT module](https://github.com/irisnet/irismod/tree/master/modules/nft).
Given that different chains are using their custom implementation of NFT module, it is very difficult to achieve
flawless interportability of NFTs across multiple chains using IBC. At the same time, there are more usecases that need
Expand Down Expand Up @@ -244,7 +244,7 @@ Because current implementation of NFT module specifies `denom_name` as a unique

### Deprecation Plan

On the release of new wrapper NFT module on Crypto.org chain, all the above messages should be considered as deprecated
On the release of new wrapper NFT module on Cronos.org chain, all the above messages should be considered as deprecated
and will be removed in approx. 3 months via an upgrade. After the upgrade, the messages specified by Cosmos SDK's NFT
module will handle all the operations.

Expand Down Expand Up @@ -272,7 +272,7 @@ for free (for example, IBC support, inter-module asset support using [ADR-33](ht
### Neutral

Our current implementation is very similar to Cosmos SDK's NFT module implementation and all the usecases currently
supported by Crypto.org Chain can easily be supported using new module.
supported by Cronos.org Chain can easily be supported using new module.

## References

Expand Down
4 changes: 2 additions & 2 deletions doc/architecture/adr-005.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# ADR 005: Deprecate Crypto.org Chain's custom `x/supply` module
# ADR 005: Deprecate Cronos.org Chain's custom `x/supply` module

## Changelog
* 09-03-2022: Initial draft
Expand Down Expand Up @@ -49,7 +49,7 @@ For the short-term, ability to calculate liquid supply will be added in explorer
1. `x/supply` module will be marked as deprecated (this can be done by adding annotation to `.proto` files
https://github.com/protocolbuffers/protobuf/issues/1734#issuecomment-662623725).
2. Once one of the above mentioned solution for getting liquid supply is implemented, `x/supply` module will be removed
from Crypto.org Chain.
from Cronos.org Chain.

## Status

Expand Down
2 changes: 1 addition & 1 deletion integration_tests/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proto/chainmain/nft/v1/genesis.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
syntax = "proto3";
package chainmain.nft.v1;

Expand Down
2 changes: 1 addition & 1 deletion proto/chainmain/nft/v1/nft.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
syntax = "proto3";
package chainmain.nft.v1;

Expand Down
2 changes: 1 addition & 1 deletion proto/chainmain/nft/v1/query.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
syntax = "proto3";
package chainmain.nft.v1;

Expand Down
2 changes: 1 addition & 1 deletion proto/chainmain/nft/v1/tx.proto
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
syntax = "proto3";
package chainmain.nft.v1;

Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ pystarport supervisorctl stop all
- [Project Website](https://cronos-pos.org/)
- [Technical Documentation](https://docs.cronos-pos.org/)
- Community chatrooms (non-technical): [Discord](https://discord.gg/MkvPzvP5) [Telegram](**Update Telegram Link**)
- Developer community channel (technical): [![Support Server](https://img.shields.io/discord/783264383978569728.svg?color=7289da&label=Crypto.org%20Chain&logo=discord&style=flat-square)](https://discord.gg/pahqHz26q4)
- Developer community channel (technical): [![Support Server](https://img.shields.io/discord/783264383978569728.svg?color=7289da&label=Cronos.org%20Chain&logo=discord&style=flat-square)](https://discord.gg/pahqHz26q4)

- [Cosmos SDK documentation](https://docs.cosmos.network)
- [Cosmos Discord](https://discord.gg/W8trcGV)
Expand Down
2 changes: 1 addition & 1 deletion x/nft/client/cli/cli_test.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
package cli_test

import (
Expand Down
2 changes: 1 addition & 1 deletion x/nft/client/cli/flags.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
package cli

import (
Expand Down
2 changes: 1 addition & 1 deletion x/nft/client/cli/query.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
package cli

import (
Expand Down
2 changes: 1 addition & 1 deletion x/nft/client/cli/tx.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
package cli

import (
Expand Down
2 changes: 1 addition & 1 deletion x/nft/client/testutil/test_helpers.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
package testutil

import (
Expand Down
2 changes: 1 addition & 1 deletion x/nft/exported/nft.go
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Copyright (c) 2016-2021 Shanghai Bianjie AI Technology Inc. (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Crypto.org (licensed under the Apache License, Version 2.0)
// Modifications Copyright (c) 2021-present Cronos.org (licensed under the Apache License, Version 2.0)
package exported

import (
Expand Down
Loading
Loading