Skip to content

Commit

Permalink
meta: rename master -> main in github links
Browse files Browse the repository at this point in the history
  • Loading branch information
bmwill authored and bors-libra committed Mar 10, 2021
1 parent be4811e commit bca377c
Show file tree
Hide file tree
Showing 42 changed files with 101 additions and 101 deletions.
2 changes: 1 addition & 1 deletion .circleci/should_run_lbt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

set -eo pipefail

oldrev="origin/master"
oldrev="origin/main"
newrev="HEAD"

SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
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/master/CONTRIBUTING.md#pull-requests)?
### Have you read the [Contributing Guidelines on pull requests](https://github.com/diem/diem/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/master/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/diem/diem/tree/main/developers.diem.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/changes/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ This actions handles three different case.
Calculates all file changes since the base git revision shared between this pr (which may have many commits)
and the target branch (which may have moved on)

### Case 2: A Push to a long lived branch (main, master, etc...) ###
### Case 2: A Push to a long lived branch (main, etc...) ###

Uses the branch name as supplied by **GITHUB_REF** to find the **BRANCH** name, and then calls the github api to find
the last successfully completed build of this branch, for the supplied **workflow-file**. This is used find a base githash.
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/slack-file/message_file_to_slack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ if [ -e "${PAYLOAD_FILE}" ]; then
curl -X POST -H 'Content-type: application/json' -d @/tmp/payload1234567890 "${WEBHOOK}"
else
echo "Not sending messages as no webhook url is set."
echo "Chances are you are not building on master, or gha is misconfigured."
echo "Chances are you are not building on main, or gha is misconfigured."
echo "webhook is empty"
exit 0
fi
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-publish-base-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish Base CI Image To Dockerhub

on:
push:
branches: [main, master, release-*, gha-test-*]
branches: [main, release-*, gha-test-*]
paths:
[
.github/workflows/ci-publish-base-image.yml,
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches: [auto, canary]
pull_request:
branches: [main, master, release-*, gha-test-*]
branches: [main, release-*, gha-test-*]

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-update-sccache.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: ci-update-sccache

on:
push:
branches: [main, master, release-*, gha-test-*]
branches: [main, release-*, gha-test-*]

defaults:
run:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
#this is a painful solution since it doesn't pick up new branches, other option is lotsa shell in one job....
#to test in canary add in canary here.....
target-branch: [main, master, release-1.1]
target-branch: [main, release-1.1]
env:
MESSAGE_PAYLOAD_FILE: /tmp/message
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/developer-site-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
# paths: [ 'developers.diem.com/**' ]
# but want to build rustdocs on main Diem code changes outside of the website too
pull_request:
branches: [ main, master ]
branches: [ main ]
# would have had
# paths: [ 'developers.diem.com/**' ]
# but want to build rustdocs on main Diem code changes outside of the website too
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: docker-publish.yml

on:
push:
branches: [main, master, release-*]
branches: [main, release-*]

jobs:
build-images:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rustdoc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: rustdoc

on:
push:
branches: [ main, master ]
branches: [ main ]

env:
CARGO_INCREMENTAL: 0
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ cargo xtest
#### Code Style, Hints, and Testing

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

#### Documentation
Expand Down Expand Up @@ -170,10 +170,10 @@ 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/master/documentation/contributing/individual-cla.pdf).
CLA](https://github.com/diem/diem/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/master/documentation/contributing/corporate-cla.pdf).
CLA](https://github.com/diem/diem/blob/main/documentation/contributing/corporate-cla.pdf).

## Issues

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

---

[![Diem Rust Crate Documentation (master)](https://img.shields.io/badge/docs-master-59f)](https://diem.github.io/diem/)
[![Diem Rust Crate Documentation (main)](https://img.shields.io/badge/docs-main-59f)](https://diem.github.io/diem/)
[![License](https://img.shields.io/badge/license-Apache-green.svg)](LICENSE)
[![grcov](https://img.shields.io/badge/Coverage-grcov-green)](https://ci-artifacts.diem.com/coverage/unit-coverage/latest/index.html)

Expand Down Expand Up @@ -49,4 +49,4 @@ To begin contributing, [sign the CLA](https://diem.com/en-US/cla-sign/). You can

## License

Diem Core is licensed as [Apache 2.0](https://github.com/diem/diem/blob/master/LICENSE).
Diem Core is licensed as [Apache 2.0](https://github.com/diem/diem/blob/main/LICENSE).
2 changes: 1 addition & 1 deletion developers.diem.com/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Get the latest updates to our project by signing up to our [newsletter](https://

## License

Diem Core is licensed as [Apache 2.0](https://github.com/diem/diem/blob/master/LICENSE)
Diem Core is licensed as [Apache 2.0](https://github.com/diem/diem/blob/main/LICENSE)

## Docs Directory

Expand Down
8 changes: 4 additions & 4 deletions developers.diem.com/docs/core/accounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ sidebar_label: Accounts

An [account](/reference/glossary.md#accounts) represents a resource on the Diem Blockchain that can send transactions. An account is a collection of Move resources stored at a particular 16-byte account address. Every account on the Diem Payment Network (DPN) is created with at least two resources:

* [RoleId](https://github.com/diem/diem/blob/master/language/diem-framework/modules/doc/Roles.md#resource-roleid), which grants the account a single, immutable [*role*](#account-roles) for [access control](https://github.com/diem/lip/blob/master/lips/lip-2.md).
* [DiemAccount](https://github.com/diem/diem/blob/master/language/diem-framework/modules/doc/DiemAccount.md#resource-diemaccount), which holds the account’s sequence number, authentication key, and event handles.
* [RoleId](https://github.com/diem/diem/blob/main/language/diem-framework/modules/doc/Roles.md#resource-roleid), which grants the account a single, immutable [*role*](#account-roles) for [access control](https://github.com/diem/lip/blob/master/lips/lip-2.md).
* [DiemAccount](https://github.com/diem/diem/blob/main/language/diem-framework/modules/doc/DiemAccount.md#resource-diemaccount), which holds the account’s sequence number, authentication key, and event handles.

The Diem Payment Network (DPN) supports Regulated Virtual Asset Service Provider (Regulated VASP) accounts and Designated Dealer accounts.

Expand Down Expand Up @@ -51,13 +51,13 @@ To generate an authentication key and account address:

## Currencies and balances

The Diem Payment Network supports an account transacting in different currencies. [`Diem<CoinType>`](https://github.com/diem/diem/blob/master/language/diem-framework/modules/doc/Diem.md#resource-diem) is the Diem Blockchain equivalent of [ERC20](https://eips.ethereum.org/EIPS/eip-20) from a standards perspective. At the Move level, these are different generic instantiations of the same Diem resource type (e.g., `Diem<Coin1>`, `Diem<XUS>`).
The Diem Payment Network supports an account transacting in different currencies. [`Diem<CoinType>`](https://github.com/diem/diem/blob/main/language/diem-framework/modules/doc/Diem.md#resource-diem) is the Diem Blockchain equivalent of [ERC20](https://eips.ethereum.org/EIPS/eip-20) from a standards perspective. At the Move level, these are different generic instantiations of the same Diem resource type (e.g., `Diem<Coin1>`, `Diem<XUS>`).

>
>**Note**: `Diem<XUS>` will be available at launch.
>
Each non-administrative account stores one or more [Balance`<CoinType>`](https://github.com/diem/diem/blob/master/language/diem-framework/modules/doc/DiemAccount.md#resource-balance) resources. There is a separate Balance resource for each currency type that the account holds (e.g., Balance`<Diem<Coin1>>`, Balance`<Diem<XUS>>`, …).
Each non-administrative account stores one or more [Balance`<CoinType>`](https://github.com/diem/diem/blob/main/language/diem-framework/modules/doc/DiemAccount.md#resource-balance) resources. There is a separate Balance resource for each currency type that the account holds (e.g., Balance`<Diem<Coin1>>`, Balance`<Diem<XUS>>`, …).

In order to send and receive `Diem<CoinType>`, an account must have a balance in `Diem<CoinType>`. This can be a zero balance of `Diem<CoinType>` that is added whenever `Diem<CoinType>` currency is authorized for an account. A transaction that sends `Diem<CoinType>` to an account without a balance in `Diem<CoinType>` will abort. Thus, before sending funds of type CoinType to an address, clients should first ensure that (a) the address exists, and (b) the address has a balance in CoinType (even if that balance is zero).

Expand Down
2 changes: 1 addition & 1 deletion developers.diem.com/docs/core/clients.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Clients communicate with FullNodes exclusively using a JSON-RPC interface. SDKs

You can interact with the blockchain in a language of your choice using the different Diem SDKs we have available. Learn how you can do this in the [My First Client tutorial](/docs/tutorials/my-first-client). If there is no SDK for the language of your choice and you want to interact directly with the blockchain using your own client implementation, follow the steps in this tutorial.

All SDKs are built on the [JSON-RPC API](https://github.com/diem/diem/blob/master/json-rpc/json-rpc-spec.md). Advanced users may implement their own if an SDK is not available in the preferred language.
All SDKs are built on the [JSON-RPC API](https://github.com/diem/diem/blob/main/json-rpc/json-rpc-spec.md). Advanced users may implement their own if an SDK is not available in the preferred language.


###### tags: `core`
8 changes: 4 additions & 4 deletions developers.diem.com/docs/core/events.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ The details of the event implementation in Move are specified by the Event modul

## Events available in the system

The Diem Framework uses a number of different kinds of events such as for payments, minting/burning, and system operations. A detailed list of the event types accessible from JSON-RPC is available in the [JSON-RPC documentation](https://github.com/diem/diem/blob/master/json-rpc/docs/type_event.md).
The Diem Framework uses a number of different kinds of events such as for payments, minting/burning, and system operations. A detailed list of the event types accessible from JSON-RPC is available in the [JSON-RPC documentation](https://github.com/diem/diem/blob/main/json-rpc/docs/type_event.md).

There are two types of events related to payment transactions. Whenever a payment transaction is committed, it emits the following events:

Expand All @@ -33,7 +33,7 @@ Both `SentPaymentEvent` and `ReceivedPaymentEvent` have the same structure:

| Field Name | Type | Description |
| ---------- | ------------------------------------------------------------ | ------------------------------------------------------------ |
| amount | [Amount](https://github.com/diem/diem/blob/master/json-rpc/docs/type_amount.md) | Amount received from the sender of the transaction |
| amount | [Amount](https://github.com/diem/diem/blob/main/json-rpc/docs/type_amount.md) | Amount received from the sender of the transaction |
| sender | string | Hex-encoded address of the account whose balance was debited to perform this deposit. If the deposited funds came from a mint transaction, the sender address will be 0x0...0. |
| receiver | string | Hex-encoded address of the account whose balance was credited by this deposit.<br /> |
| metadata | string | An optional field that can contain extra metadata for the event. This information can be used by an off-chain API to implement a sub-addressing scheme for a wallet. |
Expand Down Expand Up @@ -62,7 +62,7 @@ There are several JSON-RPC APIs associated with events:

This example demonstrates how to query a `SentPaymentEvent` for an account. In this example, account 0x996b67d has two event streams, with three sent payments and two received payments:![Figure 1.1 Example event streams for a Diem Account](/img/docs/events-fig2.svg)

1. The first step is to find the event key for the account’s `SentPaymentEvent` stream. We can send a [get_account](https://github.com/diem/diem/blob/master/json-rpc/docs/method_get_account.md) query to the JSON-RPC endpoint to get the state of that [account](https://github.com/diem/diem/blob/master/json-rpc/docs/type_account.md), including two event keys: one for the `SentPaymentEvent` stream (the sent_events_key field) and one for the `ReceivedPaymentEvent` stream (the received_events_key field). The response will look like the following:
1. The first step is to find the event key for the account’s `SentPaymentEvent` stream. We can send a [get_account](https://github.com/diem/diem/blob/main/json-rpc/docs/method_get_account.md) query to the JSON-RPC endpoint to get the state of that [account](https://github.com/diem/diem/blob/main/json-rpc/docs/type_account.md), including two event keys: one for the `SentPaymentEvent` stream (the sent_events_key field) and one for the `ReceivedPaymentEvent` stream (the received_events_key field). The response will look like the following:

```
{
Expand All @@ -83,7 +83,7 @@ This example demonstrates how to query a `SentPaymentEvent` for an account. In t
This query is only needed once per account because the event keys for the account’s event streams will never be modified.
2. The next step is to use the [get_events](https://github.com/diem/diem/blob/master/json-rpc/docs/method_get_events.md) API to fetch the event details. We can specify in the JSON-RPC query to fetch one event beginning with sequence number two from the sent_events_key event stream. The response will look like the following:
2. The next step is to use the [get_events](https://github.com/diem/diem/blob/main/json-rpc/docs/method_get_events.md) API to fetch the event details. We can specify in the JSON-RPC query to fetch one event beginning with sequence number two from the sent_events_key event stream. The response will look like the following:
```
{
Expand Down
2 changes: 1 addition & 1 deletion developers.diem.com/docs/core/life-of-a-transaction.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ The raw transaction includes the following fields:
| [Gas price](/docs/reference/glossary#gas-price) (in microdiem/gas units) | The amount in Diem Coins Alice is willing to pay per unit of gas, to execute the transaction. |
| [Expiration time](/docs/reference/glossary#expiration-time) | Expiration time of the transaction. |
| [Sequence number](/docs/reference/glossary#sequence-number) | The sequence number (5 for this example) for an account indicates the number of transactions that have been submitted and commited on chain from that account. In this case, 5 transactions have been submitted from Alice’s account, including T<sub>5</sub>raw). A transaction with sequence number 5 can only be committed on-chain if the account sequence number is 5. |
| [Chain ID](https://github.com/diem/diem/blob/master/types/src/chain_id.rs) | An identifier that distinguishes the Diem Mainnet from networks used for other purposes including test networks. |
| [Chain ID](https://github.com/diem/diem/blob/main/types/src/chain_id.rs) | An identifier that distinguishes the Diem Mainnet from networks used for other purposes including test networks. |



Expand Down
Loading

0 comments on commit bca377c

Please sign in to comment.