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

xyz -> com #2

Closed
wants to merge 1 commit into from
Closed
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
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Infrastructure-as-code repo to activate and bootstrap Tezos testnets in a repeatable, automated way.

See [teztnets.xyz](https://teztnets.xyz) for the list of active Teztnets.
See [teztnets.com](https://teztnets.com) for the list of active Teztnets.

## Features

Expand All @@ -29,20 +29,20 @@ Rollups can be injected at genesis of your test chain. Teztnets supports extract
Upon deployment of a Teztnet, a genesis baker will run and its p2p and rpc endpoints will be exposed externally.
Example:

- p2p: `ghostnet.teztnets.xyz`
- rpc `rpc.ghostnet.teztnets.xyz`
- p2p: `ghostnet.teztnets.com`
- rpc `rpc.ghostnet.teztnets.com`

### `--network` endpoint for Tezos node

Tezos nodes supports downloading of network specification from a json endpoint: `octez-node config init --network https://teztnets.xyz/<TEZTNET NAME>`
Tezos nodes supports downloading of network specification from a json endpoint: `octez-node config init --network https://teztnets.com/<TEZTNET NAME>`

The Teztnet platform creates and exposes such endpoints.

## Automate on Teztnets

You are encouraged to build automation to ensure your Tezos project keeps running with the future versions of Tezos shell and/or protocol.

This endpoint lists the current active testnets: [https://teztnets.xyz/teztnets.json](https://teztnets.xyz/teztnets.json)
This endpoint lists the current active testnets: [https://teztnets.com/teztnets.json](https://teztnets.com/teztnets.json)

## Add new Teztnets or modify existing Teztnets

Expand All @@ -67,7 +67,7 @@ Look in any Teztnet directory's values.yaml file in [`/networks`](/networks) for

The [default Helm values.yaml](https://github.com/oxheadalpha/tezos-k8s/blob/master/charts/tezos/values.yaml) has details on every possible way to customize your teztnet.

## Teztnets.xyz website
## Teztnets.com website

The website is created with Jekyll from Markdown files generated from Jinja templates based on Pulumi outputs.

Expand Down
28 changes: 14 additions & 14 deletions index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ new gcp.storage.BucketIAMMember("publicRead", {


// Define your domain name and a suitable name for the managed zone
const domainName = "teztnets.xyz";
const domainName = "teztnets.com";
const managedZoneName = "teztnets-zone";

// Create a managed DNS zone
Expand Down Expand Up @@ -160,8 +160,8 @@ const ghostnet_chain = new TezosNodes(
"ghostnet-nodes",
{
chainName: "ghostnet",
rpcFqdn: "rpc.ghostnet.teztnets.xyz",
p2pFqdn: "ghostnet.teztnets.xyz",
rpcFqdn: "rpc.ghostnet.teztnets.com",
p2pFqdn: "ghostnet.teztnets.com",
octezRollingVersion: ghostnetRollingVersion,
octezArchiveVersion: ghostnetArchiveVersion,
chartRepoVersion: "6.25.0",
Expand Down Expand Up @@ -258,7 +258,7 @@ function getNetworks(chains: TezosChain[]): object {

chains.forEach(function(chain) {
const bootstrapPeers: string[] = Object.assign([], chain.params.bootstrapPeers) // clone
bootstrapPeers.splice(0, 0, `${chain.name}.teztnets.xyz`)
bootstrapPeers.splice(0, 0, `${chain.name}.teztnets.com`)

// genesis_pubkey is the public key associated with the $TEZOS_OXHEAD_BAKING_KEY private key in github secrets
// TODO: generate it dynamically based on privkey
Expand Down Expand Up @@ -287,7 +287,7 @@ function getNetworks(chains: TezosChain[]): object {
}
if ("dal_config" in network) {
network["dal_config"]["bootstrap_peers"] = [
`dal.${chain.name}.teztnets.xyz:11732`,
`dal.${chain.name}.teztnets.com:11732`,
]
}

Expand All @@ -301,10 +301,10 @@ function getTeztnets(chains: TezosChain[]): object {
const teztnets: { [name: string]: { [name: string]: Object } } = {}

chains.forEach(function(chain) {
let faucetUrl = `https://faucet.${chain.name}.teztnets.xyz`
let faucetUrl = `https://faucet.${chain.name}.teztnets.com`
teztnets[chain.name] = {
chain_name: chain.tezosHelmValues["node_config_network"]["chain_name"],
network_url: `https://teztnets.xyz/${chain.name}`,
network_url: `https://teztnets.com/${chain.name}`,
human_name: chain.params.humanName,
description: chain.params.description,
docker_build: chain.getDockerBuild(),
Expand Down Expand Up @@ -334,7 +334,7 @@ function getTeztnets(chains: TezosChain[]): object {
const ghostnetNetwork = {
chain_name: "TEZOS_ITHACANET_2022-01-25T15:00:00Z",
default_bootstrap_peers: [
"ghostnet.teztnets.xyz",
"ghostnet.teztnets.com",
"ghostnet.boot.ecadinfra.com",
"ghostnet.stakenow.de:9733",
],
Expand Down Expand Up @@ -385,7 +385,7 @@ const ghostnetTeztnet = {
chain_name: "TEZOS_ITHACANET_2022-01-25T15:00:00Z",
description: "Ghostnet is the long-running testnet for Tezos.",
docker_build: `tezos/tezos:${ghostnetRollingVersion}`,
faucet_url: "https://faucet.ghostnet.teztnets.xyz",
faucet_url: "https://faucet.ghostnet.teztnets.com",
git_ref: ghostnetRollingVersion,
human_name: "Ghostnet",
indexers: [
Expand All @@ -400,10 +400,10 @@ const ghostnetTeztnet = {
],
last_baking_daemon: lastBakingDaemonMainnetGhostnet,
masked_from_main_page: false,
network_url: "https://teztnets.xyz/ghostnet",
rpc_url: "https://rpc.ghostnet.teztnets.xyz",
network_url: "https://teztnets.com/ghostnet",
rpc_url: "https://rpc.ghostnet.teztnets.com",
rpc_urls: [
"https://rpc.ghostnet.teztnets.xyz",
"https://rpc.ghostnet.teztnets.com",
"https://ghostnet.ecadinfra.com",
"https://ghostnet.tezos.marigold.dev",
],
Expand Down Expand Up @@ -447,9 +447,9 @@ export const teztnets = {
deployStatusPage(provider, {
networks: networks,
teztnets: teztnets,
statusPageFqdn: "status.teztnets.xyz",
statusPageFqdn: "status.teztnets.com",
chartRepoVersion: "6.25.0"
});
deployMetricsPage(provider, {
metricsPageFqdn: "metrics.teztnets.xyz",
metricsPageFqdn: "metrics.teztnets.com",
});
2 changes: 1 addition & 1 deletion networks/dailynet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ accounts:
is_bootstrap_baker_account: false
type: public
faucet:
# faucet on teztnets.xyz platform
# faucet on teztnets.com platform
# tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
key: edpkvGYHoY5kwq13Ak6r4fLa1GGSHKJZVe7xJFV6ZgHwdZeaHy3WZj
bootstrap_balance: "200000000000000"
Expand Down
2 changes: 1 addition & 1 deletion networks/hangzhounet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ accounts:
is_bootstrap_baker_account: false
bootstrap_balance: "500000000000000"
oxheadbaker:
# Oxhead Alpha's baker hosted in teztnets.xyz infra
# Oxhead Alpha's baker hosted in teztnets.com infra
# tz1foXHgRzdYdaLgX6XhpZGxbBv42LZ6ubvE
bootstrap_balance: "1000000000000"
is_bootstrap_baker_account: true
Expand Down
2 changes: 1 addition & 1 deletion networks/kathmandunet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ node_config_network:
protocol: Ps9mPmXaRzmzk35gbAYNCAw6UXdE2qoABTHbN2oEEc1qM7CwT9P
timestamp: "2022-07-28T15:00:00Z"
# NEW: the hash is deterministically generated from chain_name
# check https://teztnets.xyz/kathmandunet for its value
# check https://teztnets.com/kathmandunet for its value
user_activated_upgrades:
- level: 8192
replacement_protocol: PtKathmankSpLLDALzWw7CGD2j2MtyveTwboEYokqUCP4a1LxMg
Expand Down
2 changes: 1 addition & 1 deletion networks/weeklynet/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ accounts:
is_bootstrap_baker_account: false
type: public
faucet:
# faucet on teztnets.xyz platform
# faucet on teztnets.com platform
# tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
key: edpkvGYHoY5kwq13Ak6r4fLa1GGSHKJZVe7xJFV6ZgHwdZeaHy3WZj
bootstrap_balance: "200000000000000"
Expand Down
2 changes: 1 addition & 1 deletion scripts/mainnet_param_differ.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def flatten_params(params, parent_key=''):

ghostnet_params = flatten_params(requests.get("https://ghostnet.tezos.marigold.dev/chains/main/blocks/head/context/constants").json())

nairobinet_params = flatten_params(requests.get("https://rpc.nairobinet.teztnets.xyz/chains/main/blocks/head/context/constants").json())
nairobinet_params = flatten_params(requests.get("https://rpc.nairobinet.teztnets.com/chains/main/blocks/head/context/constants").json())

print("Param,oxfordnet,nairobinet,ghostnet,mainnet")
for param in params.keys():
Expand Down
24 changes: 12 additions & 12 deletions tezos/chain.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ export class TezosChain extends pulumi.ComponentResource {


// RPC Ingress
const rpcDomain = `rpc.${name}.teztnets.xyz`
const rpcDomain = `rpc.${name}.teztnets.com`

const rpcIngName = `${rpcDomain}-ingress`
new k8s.networking.v1.Ingress(
Expand Down Expand Up @@ -197,7 +197,7 @@ export class TezosChain extends pulumi.ComponentResource {
this.tezosHelmValues.smartRollupNodes &&
this.tezosHelmValues.smartRollupNodes.length != 0
) {
let rollupFqdn = `evm-rollup-node.${name}.teztnets.xyz`
let rollupFqdn = `evm-rollup-node.${name}.teztnets.com`
let rollupIngressParams = {
enabled: true,
host: rollupFqdn,
Expand All @@ -218,7 +218,7 @@ export class TezosChain extends pulumi.ComponentResource {
],
}
this.tezosHelmValues.smartRollupNodes.evm.ingress = rollupIngressParams
let evmProxyFqdn = `evm.${name}.teztnets.xyz`
let evmProxyFqdn = `evm.${name}.teztnets.com`
let evmProxyIngressParams = {
enabled: true,
host: evmProxyFqdn,
Expand Down Expand Up @@ -252,13 +252,13 @@ export class TezosChain extends pulumi.ComponentResource {
Object.entries({
"dal-bootstrap": {
humanName: 'DAL Bootstrap',
rpcFqdn: `dal-bootstrap-rpc.${name}.teztnets.xyz`,
p2pFqdn: `dal.${name}.teztnets.xyz`,
rpcFqdn: `dal-bootstrap-rpc.${name}.teztnets.com`,
p2pFqdn: `dal.${name}.teztnets.com`,
},
"dal-dal1": {
humanName: 'DAL Teztnets Attester',
rpcFqdn: `dal-attester-rpc.${name}.teztnets.xyz`,
p2pFqdn: `dal1.${name}.teztnets.xyz`,
rpcFqdn: `dal-attester-rpc.${name}.teztnets.com`,
p2pFqdn: `dal1.${name}.teztnets.com`,

}
}).forEach(([dalNodeName, { humanName, rpcFqdn, p2pFqdn }]) => {
Expand Down Expand Up @@ -317,7 +317,7 @@ export class TezosChain extends pulumi.ComponentResource {

// Set bootstrap peers on the network config (specific to testnets)
this.tezosHelmValues.node_config_network.dal_config.bootstrap_peers = [
`dal.${name}.teztnets.xyz:11732`
`dal.${name}.teztnets.com:11732`
];
}

Expand All @@ -340,7 +340,7 @@ export class TezosChain extends pulumi.ComponentResource {
namespace: this.namespace.metadata.name,
name: name,
annotations: {
"external-dns.alpha.kubernetes.io/hostname": `${name}.teztnets.xyz`,
"external-dns.alpha.kubernetes.io/hostname": `${name}.teztnets.com`,
},
},
spec: {
Expand Down Expand Up @@ -377,14 +377,14 @@ export class TezosChain extends pulumi.ComponentResource {
}

getRpcUrl(): string {
return `https://rpc.${this.name}.teztnets.xyz`
return `https://rpc.${this.name}.teztnets.com`
}
getRollupUrls(): string[] {
if (
this.tezosHelmValues.smartRollupNodes &&
this.tezosHelmValues.smartRollupNodes.length != 0
) {
return [`https://evm-rollup-node.${this.name}.teztnets.xyz`]
return [`https://evm-rollup-node.${this.name}.teztnets.com`]
}
return []
}
Expand All @@ -393,7 +393,7 @@ export class TezosChain extends pulumi.ComponentResource {
this.tezosHelmValues.smartRollupNodes &&
this.tezosHelmValues.smartRollupNodes.length != 0
) {
return [`https://evm.${this.name}.teztnets.xyz`]
return [`https://evm.${this.name}.teztnets.com`]
}
return []
}
Expand Down
2 changes: 1 addition & 1 deletion tezos/faucet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export class TezosFaucet extends pulumi.ComponentResource {
)
}

const teztnetsDomain = `${name}.teztnets.xyz`
const teztnetsDomain = `${name}.teztnets.com`
const faucetDomain = `faucet.${teztnetsDomain}`
this.tezosFaucetHelmValues.googleCaptchaSecretKey =
params.faucetRecaptchaSecretKey
Expand Down
2 changes: 1 addition & 1 deletion teztnets_xyz_page/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## teztnets.xyz page
## teztnets.com page

1. Github Action Builds markdown files from jinja templates.
1. Rendered markdown moved to the website folder
Expand Down
2 changes: 1 addition & 1 deletion teztnets_xyz_page/website/CNAME
Original file line number Diff line number Diff line change
@@ -1 +1 @@
teztnets.xyz
teztnets.com
4 changes: 2 additions & 2 deletions teztnets_xyz_page/website/_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
# You can create any custom variable you would like, and they will be accessible
# in the templates via {{ site.myvariable }}.

title: 🌮 Teztnets.xyz 🚧
title: 🌮 Teztnets.com 🚧
baseurl: ""
url: "https://teztnets.xyz" # the base hostname & protocol for your site, e.g. http://example.com
url: "https://teztnets.com" # the base hostname & protocol for your site, e.g. http://example.com
twitter_username: oxheadalpha
github_username: oxheadalpha

Expand Down
2 changes: 1 addition & 1 deletion teztnets_xyz_page/website/_includes/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</span>
</label>
<div class="trigger">
<a class="page-link" href="https://status.teztnets.xyz">Status</a><a class="page-link" href="/about">About</a>
<a class="page-link" href="https://status.teztnets.com">Status</a><a class="page-link" href="/about">About</a>
</div>
</nav>
{%- endif -%}
Expand Down
6 changes: 3 additions & 3 deletions teztnets_xyz_page/website/about.markdown
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
layout: page
title: About Teztnets.xyz
title: About Teztnets.com
permalink: /about/
---

Expand All @@ -16,11 +16,11 @@ We have three kind of testnets:

Teztnets is powered by [tezos-k8s](https://tezos-k8s.xyz), a collection of helm charts for Tezos. It is deployed with [Pulumi](https://pulumi.com).

The [Teztnets Status page](https://status.teztnets.xyz) is powered by [Pyrometer](https://gitlab.com/tezos-kiln/pyrometer), a Tezos monitoring tool.
The [Teztnets Status page](https://status.teztnets.com) is powered by [Pyrometer](https://gitlab.com/tezos-kiln/pyrometer), a Tezos monitoring tool.

The [github repo](https://github.com/oxheadalpha/teztnets) has more information regarding these testnets, how they are configured, and how to deploy new ones.

Relevant Medium articles announcing Teztnets.xyz features:
Relevant Medium articles announcing Teztnets.com features:

* [Intro to Mondaynet and Dailynet](https://medium.com/the-aleph/continuous-tezos-protocol-testing-with-dailynet-and-mondaynet-92d4b084a9f6)
* [Intro to Ghostnet](https://medium.com/the-aleph/introducing-ghostnet-1bf39976e61f)
2 changes: 1 addition & 1 deletion teztnets_xyz_page/website/index.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ layout: home

Current testnets for the [Tezos](https://tezos.com) blockchain are listed here. [Read more](about/).

This list of Teztnets is also available in [json format](https://teztnets.xyz/teztnets.json).
This list of Teztnets is also available in [json format](https://teztnets.com/teztnets.json).
Loading