Merge branch 'main' into patch-1

index.ts

@@ -152,6 +152,9 @@ new TezosFaucet(
   provider
 )
 
+
+// Oxfordnet
+//
 const oxfordnet_chain = new TezosChain(
   {
     category: protocolCategory,
@@ -186,6 +189,67 @@ new TezosFaucet(
   provider
 )
 
+// Paris network
+const parisneta_chain = new TezosChain(
+  {
+    category: featureCategory,
+    humanName: "Preparisanet",
+    description: "Exploratory Chain for Paris A protocol",
+    activationBucket: activationBucket,
+    helmValuesFile: "networks/preparisanet/values.yaml",
+    bakingPrivateKey: private_teztnets_baking_key,
+    bootstrapPeers: [],
+    rpcUrls: [],
+    indexers: [],
+    chartRepoVersion: "7.1.2",
+  },
+  provider
+)
+new TezosFaucet(
+  parisneta_chain.name,
+  {
+    namespace: parisneta_chain.namespace,
+    humanName: "Preparisanet",
+    helmValuesFile: "networks/preparisanet/faucet_values.yaml",
+    faucetPrivateKey: faucetPrivateKey,
+    faucetRecaptchaSiteKey: faucetRecaptchaSiteKey,
+    faucetRecaptchaSecretKey: faucetRecaptchaSecretKey,
+    chartRepoVersion: "7.1.2",
+  },
+  provider
+)
+
+// Paris network
+const parisnetb_chain = new TezosChain(
+  {
+    category: featureCategory,
+    humanName: "Preparisbnet",
+    description: "Exploratory Chain for Paris B protocol",
+    activationBucket: activationBucket,
+    helmValuesFile: "networks/preparisbnet/values.yaml",
+    bakingPrivateKey: private_teztnets_baking_key,
+//    bootstrapPeers: ["parisnet.tzinit.net"],
+    bootstrapPeers: [],
+    rpcUrls: [],
+    indexers: [],
+    chartRepoVersion: "7.1.2",
+  },
+  provider
+)
+new TezosFaucet(
+  parisnetb_chain.name,
+  {
+    namespace: parisnetb_chain.namespace,
+    humanName: "Preparisbnet",
+    helmValuesFile: "networks/preparisbnet/faucet_values.yaml",
+    faucetPrivateKey: faucetPrivateKey,
+    faucetRecaptchaSiteKey: faucetRecaptchaSiteKey,
+    faucetRecaptchaSecretKey: faucetRecaptchaSecretKey,
+    chartRepoVersion: "7.1.2",
+  },
+  provider
+)
+
 // Paris network
 /*const parisnet_chain = new TezosChain(
   {
@@ -207,7 +271,7 @@ new TezosFaucet(
   parisnet_chain.name,
   {
     namespace: parisnet_chain.namespace,
-    humanName: "PreParisnet",
+    humanName: "Parisnet",
     helmValuesFile: "networks/parisnet/faucet_values.yaml",
     faucetPrivateKey: faucetPrivateKey,
     faucetRecaptchaSiteKey: faucetRecaptchaSiteKey,
@@ -397,7 +461,7 @@ const ghostnetNetwork = {
 }
 
 export const networks = {
-  ...getNetworks([weeklynet_chain, oxfordnet_chain, predalnet_chain]),
+  ...getNetworks([weeklynet_chain, oxfordnet_chain, predalnet_chain, parisneta_chain, parisnetb_chain]),
   ...{ ghostnet: ghostnetNetwork },
 }
 
@@ -463,7 +527,7 @@ const mainnetMetadata = {
 }
 
 export const teztnets = {
-  ...getTeztnets([weeklynet_chain, oxfordnet_chain, predalnet_chain]),
+  ...getTeztnets([weeklynet_chain, oxfordnet_chain, predalnet_chain, parisneta_chain, parisnetb_chain]),
   ...{ ghostnet: ghostnetTeztnet, mainnet: mainnetMetadata },
 }
 

networks/oxfordnet/README.md

@@ -2,4 +2,4 @@ Oxfordnet has 8 second blocks (twice faster than mainnet).
 
 Oxfordnet started on Nairobi protocol then upgraded to Oxford at the end of cycle 1 (the second cycle).
 
-Adaptive Issuance is disabled on Oxfordnet. To test Adaptive Issuance, please use Weeklynet or Dailynet.
+Adaptive Issuance is disabled on Oxfordnet. To test Adaptive Issuance, please use Weeklynet.

networks/oxfordnet/values.yaml

@@ -244,7 +244,7 @@ nodes:
       - baker
       - accuser
       - vdf
-    storage_size: 200Gi
+    storage_size: 250Gi
   # Overwrite default values.yaml rolling-node
   rolling-node: null
 

networks/parisnet/faucet_values.yaml

@@ -27,6 +27,9 @@ minTez: 1
 # The maximum Tez allowed per request.
 maxTez: 12000
 
+# Faucet won't dispense to an address if its balance exceeds this.
+maxBalance: 48000
+
 #disableChallenges: false
 disableChallenges: true
 # Minimum number of challenges required for the minimum Tez request.