Skip to content

Commit

Permalink
Merge pull request #550 from onflow/nialexsan/remove-canary
Browse files Browse the repository at this point in the history
remove canary
  • Loading branch information
nialexsan authored Feb 7, 2024
2 parents 09b1726 + 9a809f9 commit 7b86454
Show file tree
Hide file tree
Showing 20 changed files with 25 additions and 65 deletions.
2 changes: 1 addition & 1 deletion docs/build/core-contracts/02-fungible-token.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Source: [FungibleToken.cdc](https://github.com/onflow/flow-ft/blob/master/contra

| Network | Contract Address |
| --------------- | -------------------- |
| Emulator/Canary | `0xee82856bf20e2aa6` |
| Emulator | `0xee82856bf20e2aa6` |
| Testnet | `0x9a0766d93b6608b7` |
| Mainnet | `0xf233dcee88fe0abe` |

2 changes: 1 addition & 1 deletion docs/build/core-contracts/03-flow-token.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Source: [FlowToken.cdc](https://github.com/onflow/flow-core-contracts/blob/maste

| Network | Contract Address |
| --------------- | -------------------- |
| Emulator/Canary | `0x0ae53cb6e3f42a79` |
| Emulator | `0x0ae53cb6e3f42a79` |
| Testnet | `0x7e60df042a9c0868` |
| Mainnet | `0x1654653399040a61` |

Expand Down
2 changes: 1 addition & 1 deletion docs/build/core-contracts/04-service-account.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ Source: [NodeVersionBeacon.cdc](https://github.com/onflow/flow-core-contracts/bl

| Network | Contract Address |
| --------------- | -------------------- |
| Emulator/Canary | `0xf8d6e0586b0a20c7` |
| Emulator | `0xf8d6e0586b0a20c7` |
| Testnet | `0x8c5303eaa26202d6` |
| Mainnet | `0xe467b9dd11fa00df` |
4 changes: 2 additions & 2 deletions docs/build/core-contracts/05-flow-fees.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Source: [FlowFees.cdc](https://github.com/onflow/flow-core-contracts/blob/master

| Network | Contract Address |
| --------------- | -------------------- |
| Emulator/Canary | `0xe5a8b7f23e8b548f` |
| Emulator | `0xe5a8b7f23e8b548f` |
| Testnet | `0x912d5440f7e3769e` |
| Mainnet | `0xf919ee77447b7497` |

Expand All @@ -20,6 +20,6 @@ Source: [FlowFees.cdc](https://github.com/onflow/flow-core-contracts/blob/master

| Network | Contract Address |
| --------------- | -------------------- |
| Emulator/Canary | `0xf8d6e0586b0a20c7` |
| Emulator | `0xf8d6e0586b0a20c7` |
| Testnet | `0x8c5303eaa26202d6` |
| Mainnet | `0xe467b9dd11fa00df` |
2 changes: 1 addition & 1 deletion docs/build/core-contracts/06-staking-contract-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Source: [FlowIDTableStaking.cdc](https://github.com/onflow/flow-core-contracts/b

| Network | Contract Address |
| --------------- | -------------------- |
| Emulator/Canary | `0xf8d6e0586b0a20c7` |
| Emulator | `0xf8d6e0586b0a20c7` |
| Testnet | `0x9eca2b38b18b5dfe` |
| Mainnet | `0x8624b52f9ddcd04a` |

Expand Down
2 changes: 1 addition & 1 deletion docs/build/core-contracts/07-epoch-contract-reference.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Sources:

| Network | Contract Address |
|-----------------|----------------------|
| Emulator/Canary | `0xf8d6e0586b0a20c7` |
| Emulator | `0xf8d6e0586b0a20c7` |
| Testnet | `0x9eca2b38b18b5dfe` |
| Mainnet | `0x8624b52f9ddcd04a` |

Expand Down
2 changes: 1 addition & 1 deletion docs/build/core-contracts/08-non-fungible-token.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@ Source: [NonFungibleToken.cdc](https://github.com/onflow/flow-nft/blob/master/co

| Network | Contract Address |
| --------------- | -------------------- |
| Emulator/Canary | `0xf8d6e0586b0a20c7` |
| Emulator | `0xf8d6e0586b0a20c7` |
| Testnet | `0x631e88ae7f1d7c20` |
| Mainnet | `0x1d7e57aa55817448` |
4 changes: 2 additions & 2 deletions docs/build/guides/flow-app-quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ That's it! You now have Flow app that uses auth, query and mutate the chain. Thi
**More FCL**
- [FCL API Quick Reference](../../tools/clients/fcl-js/api)
- [More on Scripts](../../tools/clients/fcl-js/scripts.mdx)
- [More on Transactions](../../tools/clients/fcl-js/transactions.mdx)
- [More on Scripts](../../tools/clients/fcl-js/scripts.md)
- [More on Transactions](../../tools/clients/fcl-js/transactions.md)
- [User Signatures](../../tools/clients/fcl-js/user-signatures.mdx)
- [Proving Account Ownership](../../tools/clients/fcl-js/proving-authentication.mdx)
Expand Down
2 changes: 1 addition & 1 deletion docs/build/guides/mobile/ios-quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ https://github.com/Outblock/fcl-android

One of the easiest ways to connect to a wallet via a mobile native dApp is through Flow’s new support for Wallet Connect 2.0. This is the pattern that Monster Maker uses to connect to the Dapper Self Custody wallet and Lilico. For more information on FCL Wallet Connect 2.0, check out this page:

[FCL Wallet Connect](../../../tools/clients/fcl-js/wallet-connect.mdx)
[FCL Wallet Connect](../../../tools/clients/fcl-js/wallet-connect.md)


**How to Build a Native iOS Dapp**
Expand Down
4 changes: 2 additions & 2 deletions docs/build/guides/mobile/react-native-quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -621,8 +621,8 @@ That's it! You now have a shippable Flow dapp that can auth, query, init account
**More FCL**
- [FCL API Quick Reference](../../../tools/clients/fcl-js/api)
- [More on Scripts](../../../tools/clients/fcl-js/scripts.mdx)
- [More on Transactions](../../../tools/clients/fcl-js/transactions.mdx)
- [More on Scripts](../../../tools/clients/fcl-js/scripts.md)
- [More on Transactions](../../../tools/clients/fcl-js/transactions.md)
- [User Signatures](../../../tools/clients/fcl-js/user-signatures.mdx)
- [Proving Account Ownership](../../../tools/clients/fcl-js/proving-authentication.mdx)
Expand Down
2 changes: 1 addition & 1 deletion docs/tools/clients/fcl-js/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ addStuff().then((d) => console.log(d)); // 13 (5 + 7 + 1)
| `discovery.wallet` **(required)** | `https://fcl-discovery.onflow.org/testnet/authn` | Points FCL at the Wallet or Wallet Discovery mechanism. |
| `discovery.wallet.method` | `IFRAME/RPC`, `POP/RPC`, `TAB/RPC`, `HTTP/POST`, or `EXT/RPC` | Describes which service strategy a wallet should use. |
| `fcl.limit` | `100` | Specifies fallback compute limit if not provided in transaction. Provided as integer. |
| `flow.network` **(recommended)** | `testnet` | Used in conjunction with stored interactions and provides FCLCryptoContract address for `testnet` and `mainnet`. Possible values: `local`, `canarynet`, `testnet`, `mainnet`. |
| `flow.network` **(recommended)** | `testnet` | Used in conjunction with stored interactions and provides FCLCryptoContract address for `testnet` and `mainnet`. Possible values: `local`, `testnet`, `mainnet`. |

## Using Contracts in Scripts and Transactions

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ addStuff().then(d => console.log(d)) // 13 (5 + 7 + 1)
- `challenge.handshake` -- **(DEPRECATED `@onflow/[email protected]`)** Points FCL at the Wallet or Wallet Discovery mechanism.
- `discovery.wallet` -- **(INTRODUCED `@onflow/[email protected]`)** Points FCL at the Wallet or Wallet Discovery mechanism.
- `discovery.wallet.method` -- Describes which service strategy a wallet should use: `IFRAME/RPC`, `POP/RPC`, `TAB/RPC`, `HTTP/POST`, `EXT/RPC`
- `env` -- **(DEPRECATED `@onflow/[email protected]`)** Used in conjunction with stored interactions. Possible values: `local`, `canarynet`, `testnet`, `mainnet`
- `env` -- **(DEPRECATED `@onflow/[email protected]`)** Used in conjunction with stored interactions. Possible values: `local`, `testnet`, `mainnet`
- `fcl.limit` -- Specifies fallback compute limit if not provided in transaction. Provided as integer.
- `flow.network` (recommended) -- **(INTRODUCED `@onflow/[email protected]`)** Used in conjunction with stored interactions and provides FCLCryptoContract address for `testnet` and `mainnet`. Possible values: `local`, `canarynet`, `testnet`, `mainnet`.
- `flow.network` (recommended) -- **(INTRODUCED `@onflow/[email protected]`)** Used in conjunction with stored interactions and provides FCLCryptoContract address for `testnet` and `mainnet`. Possible values: `local`, `testnet`, `mainnet`.
- `service.OpenID.scopes` - **(INTRODUCED `@onflow/[email protected]`)** Open ID Connect claims for Wallets and OpenID services.

## Using Contracts in Scripts and Transactions
Expand Down Expand Up @@ -138,4 +138,4 @@ import "HelloWorld"

FCL will automatically replace the contract name with the address for the network you are using.

> Note: never put private keys in your `flow.json`. You should use the [key/location syntax](../../../tools/flow-cli/flow.json/security.md) to separate your keys into a separate git ignored file.
> Note: never put private keys in your `flow.json`. You should use the [key/location syntax](../../flow-cli/flow.json/security.md) to separate your keys into a separate git ignored file.
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ In our dapp, we probably have a way of representing these Cadence values interna

FCL enables us to provide custom decoders that we can use to transform the data we receive from the Flow blockchain at the edge, before anything else in our dapp gets a chance to look at it.

We add these custom decoders by [Configuring FCL](./configure-fcl.mdx).
We add these custom decoders by [Configuring FCL](./configure-fcl.md).
This lets us set it once when our dapp starts up and use our normalized data through out the rest of our dapp.

In the below example we will use the concept of a `Point` again, but this time, we will add a custom decoder, that enables `fcl.decode` to transform it into a custom JavaScript `Point` class.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import * as types from "@onflow/types"
```

## Connect
[<img src="https://raw.githubusercontent.com/onflow/sdks/main/templates/documentation/ref.svg" width="130" />](./configure-fcl.mdx)
[<img src="https://raw.githubusercontent.com/onflow/sdks/main/templates/documentation/ref.svg" width="130" />](./configure-fcl.md)

By default, the library uses HTTP to communicate with the access nodes and it must be configured with the correct access node API URL. An error will be returned if the host is unreachable.

Expand Down Expand Up @@ -241,7 +241,7 @@ Result output: [CollectionObject](./api.md#collectionobject)
### Execute Scripts
[<img src="https://raw.githubusercontent.com/onflow/sdks/main/templates/documentation/ref.svg" width="130" />](./api.md#query)

Scripts allow you to write arbitrary non-mutating Cadence code on the Flow blockchain and return data. You can learn more about [Cadence here](https://cadence-lang.org/docs/language) and [scripts here](./scripts.mdx), but we are now only interested in executing the script code and getting back the data.
Scripts allow you to write arbitrary non-mutating Cadence code on the Flow blockchain and return data. You can learn more about [Cadence here](https://cadence-lang.org/docs/language) and [scripts here](./scripts.md), but we are now only interested in executing the script code and getting back the data.

We can execute a script using the latest state of the Flow blockchain or we can choose to execute the script at a specific time in history defined by a block height or block ID.

Expand Down Expand Up @@ -686,4 +686,4 @@ mutate({
})
```

After a transaction has been [built](./sdk-guidelines.mdx#build-transactions) and [signed](./sdk-guidelines.mdx#sign-transactions), it can be sent to the Flow blockchain where it will be executed. If sending was successful you can then [retrieve the transaction result](./sdk-guidelines.mdx#get-transactions).
After a transaction has been [built](./sdk-guidelines.md#build-transactions) and [signed](./sdk-guidelines.md#sign-transactions), it can be sent to the Flow blockchain where it will be executed. If sending was successful you can then [retrieve the transaction result](./sdk-guidelines.md#get-transactions).
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

Transactions let you send Cadence code to the Flow blockchain that permanently alters its state.

We are assuming you have read the [Scripts Documentation](./scripts.mdx) before this, as transactions are sort of scripts with more required things.
We are assuming you have read the [Scripts Documentation](./scripts.md) before this, as transactions are sort of scripts with more required things.

While `query` is used for sending scripts to the chain, `mutate` is used for building and sending transactions. Just like [scripts](./scripts.mdx), `fcl.mutate` is a [JavaScript Tagged Template Literal](https://styled-components.com/docs/advanced#tagged-template-literals) that we can pass Cadence code into.
While `query` is used for sending scripts to the chain, `mutate` is used for building and sending transactions. Just like [scripts](./scripts.md), `fcl.mutate` is a [JavaScript Tagged Template Literal](https://styled-components.com/docs/advanced#tagged-template-literals) that we can pass Cadence code into.

Unlike scripts, they require a little more information, things like a proposer, authorizations and a payer, which may be a little confusing and overwhelming.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ config({
})
```
See [FCL Configuration](./configure-fcl.mdx) for more information.
See [FCL Configuration](./configure-fcl.md) for more information.
Expand Down
2 changes: 1 addition & 1 deletion docs/tools/flow-dev-wallet/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ building a production grade wallet.
This project should only be used in aid of local
development against a locally run instance of the Flow
blockchain like the Flow emulator, and should never be used in
conjunction with Flow Mainnet, Testnet, Canarynet or any
conjunction with Flow Mainnet, Testnet, or any
other instances of Flow.
```

Expand Down
7 changes: 0 additions & 7 deletions src/data/networks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,4 @@ export const networks: Network[] = [
title: "Flow Sandboxnet Access APIs",
urlPath: "flow-sandboxnet-access-apis",
},
// Exclude canarynet for now until we have sporks data.
// {
// componentId: "s4z9n7p9pm3s",
// id: "canarynet",
// title: "Flow Canarynet",
// urlPath: "flow-canarynet",
// },
]
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,6 @@ const args = {
automation_email: "",
start_date: "",
},
{
id: "3",
page_id: "",
group_id: "",
created_at: "",
updated_at: "",
group: true,
name: "Canarynet",
description: "",
position: 0,
status: "",
showcase: true,
only_show_if_degraded: false,
automation_email: "",
start_date: "",
},
],
featuredArticle: {
heading: "Node operator callout",
Expand Down
17 changes: 0 additions & 17 deletions src/ui/design-system/src/lib/Pages/NetworkPage/sample.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,21 +84,4 @@ export default [
"component+c01e3497-6a57-4367-9221-b07f6af215d2@notifications.statuspage.io",
start_date: "2021-07-08",
},
{
id: "s4z9n7p9pm3s",
page_id: "ytw5bdg6zr13",
group_id: null,
created_at: "2021-07-08T01:54:25Z",
updated_at: "2022-05-04T18:28:01Z",
group: false,
name: "Canarynet",
description: null,
position: 6,
status: "operational",
showcase: false,
only_show_if_degraded: false,
automation_email:
"component+e0799252-8f03-4e81-a36e-fae8f2f66ce8@notifications.statuspage.io",
start_date: "2021-07-08",
},
]

0 comments on commit 7b86454

Please sign in to comment.