Skip to content

Commit

Permalink
[rename] organization and website rename
Browse files Browse the repository at this point in the history
  • Loading branch information
davidiw committed Mar 7, 2022
1 parent 0510e6f commit 5ab1e3d
Show file tree
Hide file tree
Showing 224 changed files with 630 additions and 630 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: "\U0001F41B Bug report"
about: Create a bug report to help improve Diem Core
about: Create a bug report to help improve Aptos Core
title: "[Bug]"
labels: bug
assignees: ''
Expand All @@ -10,7 +10,7 @@ assignees: ''
# 🐛 Bug

<!-- A clear and concise description of what the bug is.
To report a security issue, please email security@diem.com. -->
To report a security issue, please email security@aptos-labs.com. -->

## To reproduce

Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/documentation_bug_report.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
name: "\U0001F41B Documentation/developers.diem.com Bug report"
name: "\U0001F41B Documentation/developers.aptos-labs.com Bug report"
about: Create a bug report to help improve the Diem Developers' Website
title: "[Bug]"
labels: bug
Expand All @@ -10,7 +10,7 @@ assignees: ''
# 🐛 Bug

<!-- A clear and concise description of your issue with the documentation or website.
To report a security issue, please email security@diem.com. -->
To report a security issue, please email security@aptos-labs.com. -->

## Steps to reproduce

Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: "\U0001F680 Feature request"
about: Suggest a new feature in Diem Core
about: Suggest a new feature in Aptos Core
title: "[Feature Request]"
labels: enhancement
assignees: ''
Expand Down
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The project is undergoing daily changes. Pull Requests will be reviewed and resp

(Write your motivation for proposed changes here.)

### Have you read the [Contributing Guidelines on pull requests](https://github.com/diem/diem/blob/main/CONTRIBUTING.md#pull-requests)?
### Have you read the [Contributing Guidelines on pull requests](https://github.com/aptos-labs/aptos-core/blob/main/CONTRIBUTING.md#pull-requests)?

(Write your answer here.)

Expand All @@ -18,7 +18,7 @@ The project is undergoing daily changes. Pull Requests will be reviewed and resp

## Related PRs

(If this PR adds or changes functionality, please take some time to update the docs at https://github.com/diem/diem/tree/main/developers.diem.com, and link to your PR here.)
(If this PR adds or changes functionality, please take some time to update the docs at https://github.com/aptos-labs/aptos-core/tree/main/developers.aptos-labs.com, and link to your PR here.)

## If targeting a release branch, please fill the below out as well

Expand Down
2 changes: 1 addition & 1 deletion .github/actions/README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# github actions

These actions are custom for Diem Core workflows.
These actions are custom for Aptos Core workflows.
2 changes: 1 addition & 1 deletion .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ jobs:
# Test that building the site is successful
- name: Build Site
run: |
cd developers.diem.com
cd developers.aptos-labs.com
# Only build the straight Docusaurus site now. Do not build rust `-r`
# or python docs `-p` on CI checks until we resolve the best way to
# build them for deployment
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Code of Conduct

The Diem Core project has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://developers.diem.com/docs/policies/code-of-conduct) so that you can understand what actions will and will not be tolerated.
The Aptos Core project has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://developers.aptos-labs.com/docs/policies/code-of-conduct) so that you can understand what actions will and will not be tolerated.
18 changes: 9 additions & 9 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ title: Contributing to Diem

Our goal is to make contributing to the Diem project easy and transparent.

> **Note**: As the Diem Core project is currently an early-stage prototype, it
> **Note**: As the Aptos Core project is currently an early-stage prototype, it
> is undergoing rapid development. While we welcome contributions, before
> making substantial contributions be sure to discuss them in the Discourse
> forum to ensure that they fit into the project roadmap.
## On Contributing

### Diem Core
### Aptos Core

To contribute to the Diem Core implementation, first start with the proper
To contribute to the Aptos Core implementation, first start with the proper
development copy.

To get the development installation with all the necessary dependencies for
Expand All @@ -32,17 +32,17 @@ cargo xtest
#### Code Style, Hints, and Testing

Refer to our [Coding
Guidelines](https://github.com/diem/diem/blob/main/documentation/coding_guidelines.md) for
Guidelines](https://github.com/aptos-labs/aptos-core/blob/main/documentation/coding_guidelines.md) for
detailed guidance about how to contribute to the project.

#### Documentation

Diem's developer website is also open source (the code can be found in this
[repository](https://github.com/diem/diem/developers.diem.com/website/)). It is built using
[repository](https://github.com/aptos-labs/aptos-core/developers.aptos-labs.com/website/)). It is built using
[Docusaurus](https://docusaurus.io/):

If you know Markdown, you can already contribute! How to contribute can be found in the [website
repo](https://github.com/diem/developers.diem.com/website/CONTRIBUTING.md).
repo](https://github.com/diem/developers.aptos-labs.com/website/CONTRIBUTING.md).

## Developer Workflow

Expand Down Expand Up @@ -170,13 +170,13 @@ able to be built and passes all checks performed by CI.
For pull request to be accepted by any Diem projects, a CLA must be signed.
You will only need to do this once to work on any of Diem's open source
projects. Individuals contributing on their own behalf can sign the [Individual
CLA](https://github.com/diem/diem/blob/main/documentation/contributing/individual-cla.pdf).
CLA](https://github.com/aptos-labs/aptos-core/blob/main/documentation/contributing/individual-cla.pdf).
If you are contributing on behalf of your employer, please ask them to sign the
[Corporate
CLA](https://github.com/diem/diem/blob/main/documentation/contributing/corporate-cla.pdf).
CLA](https://github.com/aptos-labs/aptos-core/blob/main/documentation/contributing/corporate-cla.pdf).

## Issues

Diem uses [GitHub issues](https://github.com/diem/diem/issues) to track
Diem uses [GitHub issues](https://github.com/aptos-labs/aptos-core/issues) to track
bugs. Please include necessary information and instructions to reproduce your
issue.
52 changes: 26 additions & 26 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,57 +1,57 @@
> **Note to readers:** On December 1, 2020, the Libra Association was renamed to Diem Association. The project repos are in the process of being migrated. All projects will remain available for use here until the migration to a new GitHub Organization is complete.
> **Note to readers:** On December 1, 2020, the Libra Association was renamed to Aptos Association. The project repos are in the process of being migrated. All projects will remain available for use here until the migration to a new GitHub Organization is complete.
<a href="https://developers.diem.com">
<img width="200" src="./.assets/diem.png" alt="Diem Logo" />
<a href="https://developers.aptos-labs.com">
<img width="200" src="./.assets/aptos.png" alt="Aptos Logo" />
</a>

---

[![Diem Rust Crate Documentation (main)](https://img.shields.io/badge/docs-main-59f)](https://diem.github.io/diem/)
[![Aptos Rust Crate Documentation (main)](https://img.shields.io/badge/docs-main-59f)](https://aptos.github.io/aptos/)
[![License](https://img.shields.io/badge/license-Apache-green.svg)](LICENSE)
[![CircleCI](https://circleci.com/gh/aptos-labs/aptos-core/tree/main.svg?style=shield&circle-token=d248cf1c0580eb69a507a71c0d238e1eaf193767)](https://circleci.com/gh/aptos-labs/aptos-core/tree/main)
[![grcov](https://img.shields.io/badge/Coverage-grcov-green)](https://ci-artifacts.diem.com/coverage/unit-coverage/latest/index.html)
[![test history](https://img.shields.io/badge/Test-History-green)](https://ci-artifacts.diem.com/testhistory/diem/diem/auto/ci-test.yml/index.html)
[![Automated Issues](https://img.shields.io/github/issues-search?color=orange&label=Automated%20Issues&query=repo%3Adiem%2Fdiem%20is%3Aopen%20author%3Aapp%2Fgithub-actions)](https://github.com/diem/diem/issues/created_by/app/github-actions)
[![grcov](https://img.shields.io/badge/Coverage-grcov-green)](https://ci-artifacts.aptos-labs.com/coverage/unit-coverage/latest/index.html)
[![test history](https://img.shields.io/badge/Test-History-green)](https://ci-artifacts.aptos-labs.com/testhistory/aptos/aptos/auto/ci-test.yml/index.html)
[![Automated Issues](https://img.shields.io/github/issues-search?color=orange&label=Automated%20Issues&query=repo%3Aaptos%2Faptos%20is%3Aopen%20author%3Aapp%2Fgithub-actions)](https://github.com/aptos-labs/aptos-core/issues/created_by/app/github-actions)
[![Discord chat](https://img.shields.io/discord/903339070925721652.svg?logo=discord&style=flat-square)](https://discord.gg/epNwRT2wcd)


Diem Core implements a decentralized, programmable database which provides a financial infrastructure that can empower billions of people.
Aptos Core implements a decentralized, programmable database which provides a financial infrastructure that can empower billions of people.

## Note to Developers
* Diem Core is a prototype.
* Aptos Core is a prototype.
* The APIs are constantly evolving and designed to demonstrate types of functionality. Expect substantial changes before the release.
* We’ve launched a testnet that is a live demonstration of an early prototype of the Diem Blockchain software.
* We’ve launched a testnet that is a live demonstration of an early prototype of the Aptos Blockchain software.

## Contributing

To begin contributing, [sign the CLA](https://diem.com/en-US/cla-sign/). You can learn more about contributing to the Diem project by reading our [Contribution Guide](https://developers.diem.com/docs/community/contributing) and by viewing our [Code of Conduct](https://developers.diem.com/docs/policies/code-of-conduct).
To begin contributing, [sign the CLA](https://aptos-labs.com/en-US/cla-sign/). You can learn more about contributing to the Aptos project by reading our [Contribution Guide](https://developers.aptos-labs.com/docs/community/contributing) and by viewing our [Code of Conduct](https://developers.aptos-labs.com/docs/policies/code-of-conduct).

## Getting Started

### Learn About Diem
* [Welcome](https://developers.diem.com/docs/welcome-to-diem)
* [Basic Concepts](https://developers.diem.com/docs/basics/basics-txns-states)
* [Life of a Transaction](https://developers.diem.com/docs/transactions/basics-life-of-txn)
### Learn About Aptos
* [Welcome](https://developers.aptos-labs.com/docs/welcome-to-aptos)
* [Basic Concepts](https://developers.aptos-labs.com/docs/basics/basics-txns-states)
* [Life of a Transaction](https://developers.aptos-labs.com/docs/transactions/basics-life-of-txn)
* [JSON-RPC SPEC](json-rpc/json-rpc-spec.md)

### Try Diem Core
* [My First Transaction](https://developers.diem.com/docs/tutorials/tutorial-my-first-transaction)
* [Getting Started With Move](https://diem.github.io/move/introduction.html)
### Try Aptos Core
* [My First Transaction](https://developers.aptos-labs.com/docs/tutorials/tutorial-my-first-transaction)
* [Getting Started With Move](https://aptos.github.io/move/introduction.html)

### Technical Papers
* [The Diem Blockchain](https://developers.diem.com/docs/technical-papers/the-diem-blockchain-paper)
* [Move: A Language With Programmable Resources](https://developers.diem.com/docs/technical-papers/move-paper)
* [State Machine Replication in the Diem Blockchain](https://developers.diem.com/docs/technical-papers/state-machine-replication-paper)
* [The Aptos Blockchain](https://developers.aptos-labs.com/docs/technical-papers/the-aptos-blockchain-paper)
* [Move: A Language With Programmable Resources](https://developers.aptos-labs.com/docs/technical-papers/move-paper)
* [State Machine Replication in the Aptos Blockchain](https://developers.aptos-labs.com/docs/technical-papers/state-machine-replication-paper)

### Blog
* [Diem: The Path Forward](https://developers.diem.com/blog/2019/06/18/the-path-forward/)
* [Aptos: The Path Forward](https://developers.aptos-labs.com/blog/2019/06/18/the-path-forward/)

## Community

* Join us on the [Diem Discord](https://discord.gg/epNwRT2wcd) or [Discourse](https://community.diem.com).
* Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/diem).
* Get the latest updates to our project by signing up for our [newsletter](https://developers.diem.com/newsletter_form).
* Join us on the [Aptos Discord](https://discord.gg/epNwRT2wcd) or [Discourse](https://community.aptos-labs.com).
* Ask a question on [Stack Overflow](https://stackoverflow.com/questions/tagged/aptos).
* Get the latest updates to our project by signing up for our [newsletter](https://developers.aptos-labs.com/newsletter_form).

## License

Diem Core is licensed as [Apache 2.0](https://github.com/diem/diem/blob/main/LICENSE).
Aptos Core is licensed as [Apache 2.0](https://github.com/aptos-labs/aptos-core/blob/main/LICENSE).
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Security Policies and Procedures

Please see Diem's
[security policies](https://developers.diem.com/docs/reference/security) and
[security policies](https://developers.aptos-labs.com/docs/reference/security) and
procedures for reporting vulnerabilities.
6 changes: 3 additions & 3 deletions api/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "aptos-api"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
authors = ["Diem Association <opensource@aptos-labs.com>"]
description = "Diem REST API"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptos-labs.com"
license = "Apache-2.0"
publish = false
edition = "2018"
Expand Down
10 changes: 5 additions & 5 deletions api/doc/openapi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -225,10 +225,10 @@ paths:
**Submit transaction using signed transaction BCS bytes**
* Generate Diem core types and transaction script functions for the client application langauge
by [Tranaction Builder](https://github.com/diem/diem/tree/main/aptos-move/transaction-builder-generator)
by [Tranaction Builder](https://github.com/aptos-labs/aptos-core/tree/main/aptos-move/transaction-builder-generator)
* Create [RawTransaction](https://diem.github.io/diem/aptos_types/transaction/struct.RawTransaction.html).
* Create transaction signing message: bytes("DIEM::RawTransaction") + BCS bytes of the RawTransaction.
See [Crypto Spec](https://github.com/diem/diem/blob/main/specifications/crypto/README.md) for more details.
See [Crypto Spec](https://github.com/aptos-labs/aptos-core/blob/main/specifications/crypto/README.md) for more details.
* Sign the transaction signing message and create transaction signature.
* Create [SignedTransaction](https://diem.github.io/diem/aptos_types/transaction/struct.SignedTransaction.html).
* Serialize [SignedTransaction](https://diem.github.io/diem/aptos_types/transaction/struct.SignedTransaction.html)
Expand Down Expand Up @@ -1424,7 +1424,7 @@ components:
**Special serialization for Move stdlib types:**
* [0x1::ASCII::String](https://github.com/diem/diem/blob/main/language/move-stdlib/docs/ASCII.md) is serialized into `string`. For example, struct value `0x1::ASCII::String{bytes: b"hello world"}` is serialized as `"hello world"` in JSON.
* [0x1::ASCII::String](https://github.com/aptos-labs/aptos-core/blob/main/language/move-stdlib/docs/ASCII.md) is serialized into `string`. For example, struct value `0x1::ASCII::String{bytes: b"hello world"}` is serialized as `"hello world"` in JSON.
example: "3344000000"
Event:
Expand Down Expand Up @@ -1468,7 +1468,7 @@ components:
title: Ed25519 Signature
type: object
description: |
Please refer to https://github.com/diem/diem/tree/main/specifications/crypto#signature-and-verification for
Please refer to https://github.com/aptos-labs/aptos-core/tree/main/specifications/crypto#signature-and-verification for
more details.
required:
- type
Expand All @@ -1486,7 +1486,7 @@ components:
title: Multi-ed25519 Signature
type: object
description: |
Multi ed25519 signature, please refer to https://github.com/diem/diem/tree/main/specifications/crypto#multi-signatures for more details.
Multi ed25519 signature, please refer to https://github.com/aptos-labs/aptos-core/tree/main/specifications/crypto#multi-signatures for more details.
required:
- type
- public_keys
Expand Down
6 changes: 3 additions & 3 deletions api/types/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "aptos-api-types"
version = "0.0.1"
authors = ["Diem Association <opensource@diem.com>"]
authors = ["Diem Association <opensource@aptos-labs.com>"]
description = "Diem API Types"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptos-labs.com"
license = "Apache-2.0"
publish = false
edition = "2018"
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/aptos-keygen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "aptos-keygen"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
authors = ["Diem Association <opensource@aptos-labs.com>"]
description = "Command line utility to generate Ed25519 key pairs for testing"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptos-labs.com"
license = "Apache-2.0"
publish = false
edition = "2018"
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/aptos-resource-viewer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "aptos-resource-viewer"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
authors = ["Diem Association <opensource@aptos-labs.com>"]
description = "Diem resource viewer"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptos-labs.com"
license = "Apache-2.0"
publish = false
edition = "2018"
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/aptos-transaction-benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "aptos-transaction-benchmarks"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
authors = ["Diem Association <opensource@aptos-labs.com>"]
description = "Diem transaction benchmarks"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptos-labs.com"
license = "Apache-2.0"
publish = false
edition = "2018"
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/aptos-transactional-test-harness/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "aptos-transactional-test-harness"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
authors = ["Diem Association <opensource@aptos-labs.com>"]
description = "Transactional testing framework for Move"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptos-labs.com"
license = "Apache-2.0"
publish = false
edition = "2018"
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/aptos-validator-interface/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "aptos-validator-interface"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
authors = ["Diem Association <opensource@aptos-labs.com>"]
description = "Defines interfaces between the diem nodes and local move infrastructure"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptos-labs.com"
license = "Apache-2.0"
publish = false
edition = "2018"
Expand Down
6 changes: 3 additions & 3 deletions aptos-move/aptos-vm/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
[package]
name = "aptos-vm"
version = "0.1.0"
authors = ["Diem Association <opensource@diem.com>"]
authors = ["Diem Association <opensource@aptos-labs.com>"]
description = "Diem VM runtime"
repository = "https://github.com/diem/diem"
homepage = "https://diem.com"
repository = "https://github.com/aptos-labs/aptos-core"
homepage = "https://aptos-labs.com"
license = "Apache-2.0"
publish = false
edition = "2018"
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-vm/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
id: vm-runtime
title: MoveVM Runtime
custom_edit_url: https://github.com/diem/diem/edit/main/language/move-binary-format/vm-runtime/README.md
custom_edit_url: https://github.com/aptos-labs/aptos-core/edit/main/language/move-binary-format/vm-runtime/README.md
---

# MoveVM Runtime
Expand Down
Loading

0 comments on commit 5ab1e3d

Please sign in to comment.