Mavryk Protocol integration

mavryk-network · Jan 31, 2024 · 296b4b3 · 296b4b3
1 parent 4b5cf0a
commit 296b4b3
Show file tree

Hide file tree

Showing 28 changed files with 249 additions and 249 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "networks/dailynet/tezos-k8s"]
-	path = networks/dailynet/tezos-k8s
-	url = [email protected]:oxheadalpha/tezos-k8s.git
-	branch = bake_remotely
+[submodule "dailynet/mavryk-k8s"]
+	path = networks/dailynet/mavryk-k8s
+	url = [email protected]:mavryk-network/mavryk-k8s.git
+	branch = mavryk-protocol-refactoring
diff --git a/README.md b/README.md
@@ -6,11 +6,11 @@ See [teztnets.com](https://teztnets.com) 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
 
@@ -50,7 +50,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
 
@@ -65,7 +65,7 @@ The Helm chart values.yaml lets you customize your chain in many ways:
 
 Look in any Teztnet directory's values.yaml file in [`/networks`](/networks) 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.com website
 

diff --git a/bootstrap_contracts/evm_bridge.json b/bootstrap_contracts/evm_bridge.json
@@ -187,7 +187,7 @@
                     "prim": "PUSH",
                     "args": [
                       {
-                        "prim": "mutez"
+                        "prim": "mumav"
                       },
                       {
                         "int": "0"

diff --git a/bootstrap_contracts/exchanger.json b/bootstrap_contracts/exchanger.json
@@ -78,7 +78,7 @@
                     "prim": "PUSH",
                     "args": [
                       {
-                        "prim": "mutez"
+                        "prim": "mumav"
                       },
                       {
                         "int": "0"
@@ -192,7 +192,7 @@
                                 "prim": "PUSH",
                                 "args": [
                                   {
-                                    "prim": "mutez"
+                                    "prim": "mumav"
                                   },
                                   {
                                     "int": "1"
@@ -256,7 +256,7 @@
                     "prim": "PUSH",
                     "args": [
                       {
-                        "prim": "mutez"
+                        "prim": "mumav"
                       },
                       {
                         "int": "1"
@@ -345,7 +345,7 @@
                     "prim": "PUSH",
                     "args": [
                       {
-                        "prim": "mutez"
+                        "prim": "mumav"
                       },
                       {
                         "int": "0"

diff --git a/index.ts b/index.ts
@@ -509,4 +509,4 @@ function createDomainRedirectIngress(srcDomain: string, destDomain: string): k8s
 createDomainRedirectIngress("faucet.ghostnet.teztnets.xyz", "faucet.ghostnet.teztnets.com");
 createDomainRedirectIngress("faucet.oxfordnet.teztnets.xyz", "faucet.oxfordnet.teztnets.com");
 createDomainRedirectIngress("faucet.nairobinet.teztnets.xyz", "faucet.nairobinet.teztnets.com");
-createDomainRedirectIngress("status.teztnets.xyz", "status.teztnets.com");
+createDomainRedirectIngress("status.teztnets.xyz", "status.teztnets.com");
diff --git a/networks/dailynet/faucet_values.yaml b/networks/dailynet/faucet_values.yaml
@@ -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.

diff --git a/networks/dailynet/mavryk-k8s b/networks/dailynet/mavryk-k8s
diff --git a/networks/dailynet/tezos-k8s b/networks/dailynet/tezos-k8s
diff --git a/networks/dailynet/values.yaml b/networks/dailynet/values.yaml
@@ -1,5 +1,5 @@
 tezos_k8s_images:
-  utils: ghcr.io/oxheadalpha/tezos-k8s-utils:bake_remotely
+  utils: ghcr.io/mavryk-network/mavryk-k8s-utils:6.25.0
 signers:
   tezos-signer-0:
     sign_for_accounts:
@@ -247,7 +247,7 @@ images: {}
 
 accounts:
   teztnetsbaker:
-    # tz1TnEtqDV9mZyts2pfMy6Jw1BTPs4LMjL8M
+    # mv1UAzbGkMvuCr7ufR6Z4NxykCn2aj5qTUjm
     bootstrap_balance: "7500000000000"
     is_bootstrap_baker_account: true
     type: secret
@@ -280,14 +280,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

diff --git a/networks/ghostnet/faucet_values.yaml b/networks/ghostnet/faucet_values.yaml
@@ -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.

diff --git a/networks/ghostnet/values.yaml b/networks/ghostnet/values.yaml
@@ -103,14 +103,14 @@ images:
 # We give:
 accounts:
   oxheadbaker:
-    # tz1foXHgRzdYdaLgX6XhpZGxbBv42LZ6ubvE
+    # mv1UAzbGkMvuCr7ufR6Z4NxykCn2aj5qTUjm
     # edpkuYLienS3Xdt5c1vfRX1ibMxQuvfM67ByhJ9nmRYYKGAAoTq1UC
     bootstrap_balance: '1000000000000'
     is_bootstrap_baker_account: true
     type: secret
     # key injected by pulumi
   pirbo:
-    # tz1PirbogVqfmBT9XCuYJ1KnDx4bnMSYfGru
+    # mv1C6KuPzs92LTENfXUPXq1oNxvaLjxJ9p8b
     key: edpkvaQpRgsSGPJSY91sjNArLMgpTUHmmfkvuSekwos43uze2H2EFM
     type: public
     is_bootstrap_baker_account: true
@@ -121,13 +121,13 @@ accounts:
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   saroupille:
-    # tz1QXAAasy8TciwfvDC4a7MWo1tm3K37uN9Y
+    # mv1CtdUBCLRpBziu4Xkuow3Xx2kjbhTieU5Z
     key: edpkvMBeXH4h8H97b8qfPkv2mA9TE6McfsffLGgG2Jg5nhUESaVt5J
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   mariano_ceibo:
-    # tz1T7bTfbw1PsDAKFfBN24ediaqgw8FTu3qd
+    # mv1FV4mFvJJkSUwYPykDFtLesbhfVWkicpCT
     key: edpkv9xYGRddWjy9XMVeUq5d7gxWm3eVgYarrpmNW1qVvvRpmJq76G
     type: public
     is_bootstrap_baker_account: true
@@ -138,7 +138,7 @@ accounts:
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   coredump:
-    # tz1Wn7JnLVf7PpTbaLQNzmNaF9z9UudWHGBR
+    # mv1K9acNerxTy6EpieyEEb4bQAr83JABwCJ8
     key: edpkttKzcNNCjanS2De2Nagnpg9Bk1SoNhxDC1hqCFvHHFjfeeBK1m
     type: public
     is_bootstrap_baker_account: true
@@ -149,91 +149,91 @@ accounts:
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   baketzforme:
-    # tz1edUYGqBtteStneTGDBrQWTFmq9cnEELiW
+    # mv1Szwqs9ZCFDig1nmq4Rg6XcGdoi1F4e5SF
     key: edpkuEoVW7HM9ehiec9exPfHrsFkT1f3jV8JxFWQHP23VX6K5EnVtD
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   vincent_xtzmaster:
-    # tz1XMiZwHpHZ8a1AfwRWKfzLskJgZNyV8PHs
+    # mv1KjBsXcBauhqnPpFzMZVgN2mAf7mWCiWhJ
     key: edpkvaZQ6tt9XgJJTonjFpzwaqDV7RWUQMT7TmntBJ5yXmDsPb8T7L
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   daniel_jean:
-    # tz1RBECWBXv4tKcuDbxYmBguvdn8wzjrejHg
+    # mv1DYhW6VuDRTbQ8MvXQ11Nw5ee7WPF7KVaP
     key: edpkucJ7Nccy2wyaU4B2Ch4rxS4reiTfc7349pKtemcd4yLeXmbAwb
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   olivier_blockwatch:
-    # tz1cXeGHP8Urj2pQRwpAkCdPGbCdqFUPsQwU
+    # mv1Qu7ZshVnDJJbdaGP1z2KQRc4cPdwRAFNQ
     key: edpktqRmZsGN2WEyghfqrZvn8c7xmA1xs3vDta71CsCjtHiSRMkG1z
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   ecadlabs:
-    # tz1cjyja1TU6fiyiFav3mFAdnDsCReJ12hPD
+    # mv1R7T3AKpmTEzkwPuUu14rewEjAz2qbT5tw
     key: edpkvP1NXoo8vhYbPSvXdy466EHoYWBpf6zmjghB2p3DwJPjbB5nsf
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   ecadlabs_2:
-    # tz1RuHDSj9P7mNNhfKxsyLGRDahTX5QD1DdP
+    # mv1EGkX33WgULe9voeXjD9xSNbZS5TtrUXgw
     key: edpkthQu5xeKjD9Dxh5tAf3f61z2Nteqk9xRVPVoZekk1CF738zbcJ
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   smartpy:
-    # tz1SMARcpWCydHsGgz4MRoK9NkbpBmmUAfNe
+    # mv1EidjD8sWLCZeVqJdCfd1AXmTnkAEe1dGF
     key: edpkuyuJirNU14hEma1u7f3Qhx7uHZxzuXDyvmjRwaAsFFFqYGkzHx
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   neoktalabs_julien:
-    # tz1RJ74UepJA9tigjoEeUEFajowzVB3QQaVx
+    # mv1DfaN4yBbWjAVut7oVi3wbtpoy3ZUAGDYF
     key: edpktnHv9X4PjoSHqzMGZf7oF6arxZbedxKTmEgcL6xS3XZ3TA1MUE
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   michael_kernaghan:
-    # tz1e42w8ZaGAbM3gucbBy8iRypdbnqUj7oWY
+    # mv1SRWEiswZXAcpv3wA3CxQT8qVaMDuwZNEq
     key: edpkuRkcStobJ569XFxmE6edyRQQzMmtf4ZnmPkTPfSQnt6P3Nym2V
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   mack_baise:
-    # tz1SHw5vBDYNgGdUPJi57kVrEb2kFue4Yxa4
+    # mv1EfQPWVaqjFYQhXdGvMaBsPbtipJBp5cFF
     key: edpkvKJ9voHuSBi8TApVowCu7D8hQneXGWdEHuSEMDjQDyxD9h6PYk
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   richard_ayotte:
-    # tz1ituzNz9MGaMSL9dVDN7jE5SArCEWNmZbS
+    # mv1XGPHyJWed9dDZHx44bwRFET2pkd5hbPBV
     key: edpkuty8oXRwNH5zRLfGkTyL2ukMVhGiht3qG8VNU5beD4NgP8X3gw
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   fredcy:
-    # tz1KkJtLB9pMdLKNpVRNZw9zmysrxKmYcRGU
+    # mv187nBvVX7iCc6bxozDokr1vzjqWiJk13rP
     key: edpkvTUqzRYhotk2YFnemLfBk8apvcSVNwTSxB6F6CaXUA64CRXgHN
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   functori:
-    # tz1funU3PjPsuXvmtXMgnAckY1s4pNT6V7WJ
+    # mv1UHFmdi6hEUoi12qvY1zJmh2j3Nm1Vt9Pg
     key: edpkv2fhuhS4947m64XexZw2vMvr7C4zYTBFweXuWVCLbmaSqpFaT3
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   pierre_chambart:
-    # tz1QvBzVmzN7F37ay4ZX12Tm2VEUmEbXJus7
+    # mv1DHfJ66MfTpJtp7P8NEr9nBW6TKd1sGPgY
     key: edpkvGiC27B2WJRC6AoFS8wwSC4rrhnTULWxq53PkoJjJSRSCvFwJn
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   mystery_baker_6:
-    # tz1dqPQn5HXNJ7yjcqBx2w6sozjPXTV1kpfh
+    # mv1SCriNPepisPkxm9koGknty1bN5qwhgtKs
     key: edpkupKuAv85MDjsfAEFeNMS4jHwkS1dT1dRajVwoYeSs6jEbwcTPm
     type: public
     is_bootstrap_baker_account: true
@@ -255,35 +255,35 @@ accounts:
     bootstrap_balance: "1000000000000"
   oxheadfree:
     # an account with a lot of money in it
-    # tz1foxFdz2ieSj8P9YxKYBTEqYbgFXXEeiQY
+    # mv1UBRZEJQ211zucHsXAn19FzZTeov3DSmbm
     key: edpkubSgCoMjB2a6vPWRNRHfGa6HUFfFyEUKoEQhWC8osnav8QzBdJ
     bootstrap_balance: "5000000000000000"
     is_bootstrap_baker_account: false
     type: public
-  tz1THUNA:
-    # tz1THUNARo58aD5YdNGYPnWNnvd8yHPrMdsF
+  mv1Fewfk:
+    # mv1FewfkkANV9UrmmgqPdcCPwwV7XftdvhLS
     # Romain's faucet
     key: edpkuh3WSwziyd6nXqDXeh48vZHp5ETxFd43EdkbzhmW98BvuLXK81
     type: public
     is_bootstrap_baker_account: false
     bootstrap_balance: "5000000000000000"
   bakingbadfaucet:
     # baking bad maintains a telegram faucet bot
-    # tz1KhnTgwoRRALBX6vRHRnydDGSBFsWtcJxc
+    # mv185FmHGAimjbxkFEz8fcfeNHJ9pFwLquQW
     key: edpkuFRauFAdhipQu9s4xmfNJWmtLxPKpoaoG41gYGq5AgUA43Vxqx
     type: public
     is_bootstrap_baker_account: false
     bootstrap_balance: "5000000000000000"
   julien:
     # [email protected]
     # for stress testing
-    # tz1PicoD6HTZFNkRpN84VFUvdpT7D6xoR2QD
+    # mv1C666oQekupeXexgguj5AwnqK5mVRTKek6
     key: edpktnArvYkSArFUGiBN4cmDmor9qwyTFCbAKEMbeSdT3z563SdTXm
     type: public
     is_bootstrap_baker_account: false
     bootstrap_balance: "50000000000000"
   tf:
-    # tz3Q67aMz7gSMiQRcW729sXSfuMtkyAHYfqc
+    # mv3CTasxJUynvzBekpfsPhDTpvDsKMezU9Hd
     key: p2pk66gP3wq6k9QgNwAgaGLeXc3YFfrxgYdC7cdYuJWAHYBw4hExVHW
     type: public
     is_bootstrap_baker_account: true
@@ -294,7 +294,7 @@ accounts:
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   german:
-    #  tz1TGKSrZrBpND3PELJ43nVdyadoeiM1WMzb
+    #  mv1FdnkStDVAwUpcNeruHcBf8bVnD6rvNSik
     key: edpkvG8RpyhnPi3ugWWvavsKwR79rb7iMvedeFNxBdyCvenTDZeC9n
     type: public
     is_bootstrap_baker_account: true
@@ -310,13 +310,13 @@ accounts:
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   cryptodad:
-    #  tz1cwuYcQi22C2SX9m1z78UyUzYKFztXgX7t
+    #  mv1RKNrCj5KNmJDkJ5aqLxAze1QHpPQ9iotY
     key: edpktk3ywyYujAUpAfWZwtNn9xRpVYDvRCd3EPGNyry9y9txUrnxhp
     type: public
     is_bootstrap_baker_account: true
     bootstrap_balance: "1000000000000"
   sirneb:
-    #  tz1LQ32syCNyGj6FdAuJfko42Wep87iYZk8k
+    #  mv18mWLUHZgKqzsUmVU9uaV5BXWngW844izL
     key: edpkuqjXrnDW2HAGj62ggEAMUp7o4Pv7V2saqTrXomuBQmrwjexViX
     type: public
     is_bootstrap_baker_account: true

diff --git a/networks/hangzhounet/POSTMORTEM.md b/networks/hangzhounet/POSTMORTEM.md
@@ -44,7 +44,7 @@ Baking bad maintains a faucet telegram bot. We should always top it up on every
 
 ```
 Pub edpkuFRauFAdhipQu9s4xmfNJWmtLxPKpoaoG41gYGq5AgUA43Vxqx
-Addr tz1KhnTgwoRRALBX6vRHRnydDGSBFsWtcJxc
+Addr mv185FmHGAimjbxkFEz8fcfeNHJ9pFwLquQW
 ```
 
 Note that the usdtznet fork of hangzhounet has it configured already.