Skip to content

Commit

Permalink
Mavryk Protocol integration
Browse files Browse the repository at this point in the history
  • Loading branch information
@TristanAllaire
TristanAllaire committed Nov 27, 2023
1 parent 6a6b548 commit f7b62e6
Show file tree
Hide file tree
Showing 33 changed files with 274 additions and 274 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "dailynet/tezos-k8s"]
path = networks/dailynet/tezos-k8s
url = [email protected]:oxheadalpha/tezos-k8s.git
[submodule "dailynet/mavryk-k8s"]
path = networks/dailynet/mavryk-k8s
url = [email protected]:mavryk-network/mavryk-k8s.git
10 changes: 5 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ See [teztnets.xyz](https://teztnets.xyz) for the list of active Teztnets.

## Features

### Based on tezos-k8s
### Based on mavryk-k8s

[tezos-k8s](https://github.com/oxheadalpha/tezos-k8s) is a framework to deploy Tezos nodes or chains using Kubernetes and Helm.
[mavryk-k8s](https://github.com/mavryk-network/mavryk-k8s) is a framework to deploy Tezos nodes or chains using Kubernetes and Helm.

See the [tezos-k8s documentation](https://github.com/oxheadalpha/tezos-k8s/blob/master/README.md)
See the [mavryk-k8s documentation](https://github.com/mavryk-network/mavryk-k8s/blob/master/README.md)

### Faucet support

Expand Down Expand Up @@ -47,7 +47,7 @@ Each Teztnet is defined within a subdirectory of the `/networks` directory in th

- A Helm chart `values.yaml` file
- Optionally, a Helm chart `faucet_values.yaml` file if deploying a faucet
- Optionally, a submodule of tezos-k8s (in case you need an unreleased or custom version of the tezos-k8s software)
- Optionally, a submodule of mavryk-k8s (in case you need an unreleased or custom version of the mavryk-k8s software)

### Helm chart values.yaml

Expand All @@ -62,7 +62,7 @@ The Helm chart values.yaml lets you customize your chain in many ways:

Look in any Teztnet directory's values.yaml file for reference as to how to configure your own Teztnet.

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.
The [default Helm values.yaml](https://github.com/mavryk-network/mavryk-k8s/blob/master/charts/tezos/values.yaml) has details on every possible way to customize your teztnet.

## Teztnets.xyz website

Expand Down
6 changes: 3 additions & 3 deletions TezosChain.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ export class TezosChainParametersBuilder
}

/**
* Deploy a tezos-k8s topology in a k8s cluster.
* Deploy a mavryk-k8s topology in a k8s cluster.
* Supports either local charts or charts from a repo
*/

Expand Down Expand Up @@ -503,7 +503,7 @@ export class TezosChain extends pulumi.ComponentResource {

let tezosK8sImages
if (params.getChartRepo() == "") {
// assume tezos-k8s submodule present; build custom images, and deploy custom chart from path
// assume mavryk-k8s submodule present; build custom images, and deploy custom chart from path
//make list of images to build in case we are using submodules
const defaultHelmValuesFile = fs.readFileSync(
`${params.getChartPath()}/charts/tezos/values.yaml`,
Expand Down Expand Up @@ -841,7 +841,7 @@ export class TezosChain extends pulumi.ComponentResource {

if (Object.keys(params.helmValues).length) {
if (params.getChartPath()) {
// assume tezos-k8s submodule present; deploy custom chart from path
// assume mavryk-k8s submodule present; deploy custom chart from path

const chain = new k8s.helm.v3.Chart(
name,
Expand Down
2 changes: 1 addition & 1 deletion bootstrap_contracts/evm_bridge.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down
8 changes: 4 additions & 4 deletions bootstrap_contracts/exchanger.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down Expand Up @@ -192,7 +192,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "1"
Expand Down Expand Up @@ -256,7 +256,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "1"
Expand Down Expand Up @@ -345,7 +345,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down
12 changes: 6 additions & 6 deletions bootstrap_contracts/taquito_big_map_contract.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down Expand Up @@ -2118,7 +2118,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down Expand Up @@ -2343,7 +2343,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down Expand Up @@ -2529,7 +2529,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down Expand Up @@ -6256,7 +6256,7 @@
"prim": "Elt",
"args": [
{
"string": "tz1btkXVkVFWLgXa66sbRJa8eeUSwvQFX4kP"
"string": "mv1H9gLamEHPzKir6ekUNgguSFyx5shLEU4x"
},
{
"prim": "Pair",
Expand All @@ -6271,7 +6271,7 @@
}
],
{
"string": "tz1gvF4cD2dDtqitL3ZTraggSR1Mju2BKFEM"
"string": "mv1HS6vteFdLGXCZZWTSttziGaJR4gH5xMUt"
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions bootstrap_contracts/taquito_contract.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"amount": "1000000000",
"delegate": "tz1foXHgRzdYdaLgX6XhpZGxbBv42LZ6ubvE",
"delegate": "mv1UAzbGkMvuCr7ufR6Z4NxykCn2aj5qTUjm",
"script": {
"code": [
{
Expand Down Expand Up @@ -190,7 +190,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down
6 changes: 3 additions & 3 deletions bootstrap_contracts/taquito_sapling_contract.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "1"
Expand Down Expand Up @@ -243,7 +243,7 @@
"prim": "SWAP"
},
{
"prim": "SUB_MUTEZ"
"prim": "SUB_MUMAV"
},
[
{
Expand Down Expand Up @@ -331,7 +331,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down
12 changes: 6 additions & 6 deletions bootstrap_contracts/taquito_tzip_12_16_contract.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"prim": "pair",
"args": [
{
"prim": "mutez",
"prim": "mumav",
"annots": [
"%amount"
]
Expand All @@ -158,7 +158,7 @@
}
],
"annots": [
"%mutez_transfer"
"%mumav_transfer"
]
},
{
Expand Down Expand Up @@ -884,7 +884,7 @@
"prim": "PUSH",
"args": [
{
"prim": "mutez"
"prim": "mumav"
},
{
"int": "0"
Expand Down Expand Up @@ -4279,7 +4279,7 @@
"prim": "Pair",
"args": [
{
"string": "tz1UFQ5kwEsFjC3SqbYzZxK3bZh3tHRoXkK7"
"string": "mv1DiNwzc9ALDNZwvbNFf5CHQSnevwwubdiP"
},
{
"prim": "Pair",
Expand All @@ -4295,7 +4295,7 @@
"prim": "Pair",
"args": [
{
"string": "tz3WxfidtnVPELSwK7rqgN5iFoU9aPSSPzgW"
"string": "mv39LvxA8Ug79bNy6MvXLB6ZZa7p7aTrpzWS"
},
{
"int": "1"
Expand All @@ -4314,7 +4314,7 @@
"prim": "Pair",
"args": [
{
"string": "tz3dbcKYgioy1rcpUAaefm3rPYU72jSuy9NL"
"string": "mv3JyEuXSamMBhfcX3kGd3VStapcSDwa4jzj"
},
{
"int": "0"
Expand Down
6 changes: 3 additions & 3 deletions index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const dailynet_chain = new TezosChain(
"exchanger.json",
],
// chartRepoVersion: "6.18.0",
chartPath: "networks/dailynet/tezos-k8s",
chartPath: "networks/dailynet/mavryk-k8s",
privateBakingKey: private_oxhead_baking_key,
activationBucket: activationBucket,
}),
Expand Down Expand Up @@ -111,7 +111,7 @@ const weeklynet_chain = new TezosChain(
// "evm_bridge.json",
],
// chartRepoVersion: "6.18.0",
chartPath: "networks/dailynet/tezos-k8s", // Using dal node code in dailynet submod
chartPath: "networks/dailynet/mavryk-k8s", // Using dal node code in dailynet submod
privateBakingKey: private_oxhead_baking_key,
activationBucket: activationBucket,
}),
Expand Down Expand Up @@ -194,7 +194,7 @@ function getNetworks(chains: TezosChain[]): object {
delete network["activation_account_name"]
}
if ("genesis" in network && "block" in network["genesis"] === false) {
// If block hash not passed, use tezos-k8s convention:
// If block hash not passed, use mavryk-k8s convention:
// deterministically derive it from chain name.
var input = Buffer.from(network["chain_name"])
var gbk = blake2b(32).update(input).digest("hex")
Expand Down
4 changes: 2 additions & 2 deletions networks/dailynet/faucet_values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ config:
network:
name: # filled in by pulumi
rpcUrl: # filled in by pulumi
faucetAddress: tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
faucetAddress: mv1NRjkhmeavqVVh716ephuXmaXGe7Y6UyzQ
viewer: https://dailynet.tzstats.com

# Value the server sets for the "Access-Control-Allow-Origin" header for CORS.
authorizedHost: "" # filled in by pulumi
# RPC url for the faucet backend. Default value assumes tezos-k8s created an RPC
# RPC url for the faucet backend. Default value assumes mavryk-k8s created an RPC
# service in the same namespace. If not set, defaults to `config.network.rpcUrl`.
backendRpcUrl: http://tezos-node-rpc:8732
# If the backend requires CAPTCHA tokens to be submitted.
Expand Down
1 change: 1 addition & 0 deletions networks/dailynet/mavryk-k8s
Submodule mavryk-k8s added at 34e657
1 change: 0 additions & 1 deletion networks/dailynet/tezos-k8s
Submodule tezos-k8s deleted from 59a1fc
10 changes: 5 additions & 5 deletions networks/dailynet/values.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
tezos_k8s_images:
utils: ghcr.io/oxheadalpha/tezos-k8s-utils:evm_rollup
utils: ghcr.io/mavryk-network/mavryk-k8s-utils:evm_rollup
signers:
tezos-signer-0:
sign_for_accounts:
Expand Down Expand Up @@ -184,7 +184,7 @@ dalNodes:
ingress:
# ingress details filled up by pulumi
dal1:
attesterProfiles: tz1foXHgRzdYdaLgX6XhpZGxbBv42LZ6ubvE
attesterProfiles: mv1UAzbGkMvuCr7ufR6Z4NxykCn2aj5qTUjm

bootstrap_peers: []
full_snapshot_url: null
Expand All @@ -195,7 +195,7 @@ images: {}

accounts:
oxheadbaker:
# tz1foXHgRzdYdaLgX6XhpZGxbBv42LZ6ubvE
# mv1UAzbGkMvuCr7ufR6Z4NxykCn2aj5qTUjm
bootstrap_balance: "7500000000000"
is_bootstrap_baker_account: true
type: secret
Expand Down Expand Up @@ -228,14 +228,14 @@ accounts:
bootstrap_balance: "100000000000"
oxheadfree:
# an account with a lot of money in it
# tz1foxFdz2ieSj8P9YxKYBTEqYbgFXXEeiQY
# mv1UBRZEJQ211zucHsXAn19FzZTeov3DSmbm
key: edpkubSgCoMjB2a6vPWRNRHfGa6HUFfFyEUKoEQhWC8osnav8QzBdJ
bootstrap_balance: "5000000000000000"
is_bootstrap_baker_account: false
type: public
faucet:
# faucet on teztnets.xyz platform
# tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
# mv1NRjkhmeavqVVh716ephuXmaXGe7Y6UyzQ
key: edpkvGYHoY5kwq13Ak6r4fLa1GGSHKJZVe7xJFV6ZgHwdZeaHy3WZj
bootstrap_balance: "200000000000000"
is_bootstrap_baker_account: false
Expand Down
4 changes: 2 additions & 2 deletions networks/ghostnet/faucet_values.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ config:
network:
name: # filled in by pulumi
rpcUrl: # filled in by pulumi
faucetAddress: tz1a4GT7THHaGDiTxgXoatDWcZfJ5j29z5RC
faucetAddress: mv1NRjkhmeavqVVh716ephuXmaXGe7Y6UyzQ
viewer: https://ghost.tzstats.com

# Value the server sets for the "Access-Control-Allow-Origin" header for CORS.
authorizedHost: "" # filled in by pulumi
# RPC url for the faucet backend. Default value assumes tezos-k8s created an RPC
# RPC url for the faucet backend. Default value assumes mavryk-k8s created an RPC
# service in the same namespace. If not set, defaults to `config.network.rpcUrl`.
backendRpcUrl: https://ghostnet.tezosrpc.midl.dev/ak-a9s8i7spjm3usb
# If the backend requires CAPTCHA tokens to be submitted.
Expand Down
Loading

0 comments on commit f7b62e6

Please sign in to comment.