@aztec/ethereum 2.0.0-rc.13 → 2.0.0-rc.14

package/dest/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,kBAAkB,CAAC;AAEjF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;CAqBR,CAAC;AA8B9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAUnE,CAAC;AAYF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;CAU5D,CAAC;AAmBF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAUxD,CAAC;AAkBF,eAAO,MAAM,oBAAoB,GAAI,aAAa,YAAY;;;;;;CAU7D,CAAC;AAmBF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAU5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkH3E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GAAG,IAAI,CAmH3F"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,kBAAkB,EACvB,KAAK,YAAY,EAOlB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,EAAE,KAAK,eAAe,EAA2B,MAAM,kBAAkB,CAAC;AAEjF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;IACtB,yFAAyF;IACzF,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,yCAAyC;IACzC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,uFAAuF;IACvF,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wCAAwC;IACxC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,2CAA2C;IAC3C,wBAAwB,EAAE,MAAM,CAAC;IACjC,+EAA+E;IAC/E,0BAA0B,EAAE,MAAM,CAAC;IACnC,yCAAyC;IACzC,mBAAmB,EAAE,MAAM,CAAC;IAC5B,yCAAyC;IACzC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,wKAAwK;IACxK,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,4EAA4E;IAC5E,yBAAyB,EAAE,MAAM,CAAC;IAClC,gGAAgG;IAChG,wBAAwB,EAAE,MAAM,CAAC;IACjC,yGAAyG;IACzG,8BAA8B,EAAE,MAAM,CAAC;IACvC,yEAAyE;IACzE,cAAc,EAAE,UAAU,CAAC;IAC3B,4IAA4I;IAC5I,sBAAsB,EAAE,MAAM,CAAC;IAC/B,+BAA+B;IAC/B,aAAa,EAAE,QAAQ,GAAG,OAAO,GAAG,MAAM,CAAC;IAC3C,2DAA2D;IAC3D,gBAAgB,EAAE,MAAM,CAAC;IACzB,+CAA+C;IAC/C,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,gBAAgB,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,sCAAsC;IACtC,2BAA2B,EAAE,MAAM,CAAC;IACpC,qCAAqC;IACrC,UAAU,EAAE,MAAM,CAAC;IACnB,gCAAgC;IAChC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;CAC1B,GAAG,eAAe,CAAC;AAEpB,eAAO,MAAM,wBAAwB;;;;;;;;;;;;;;;;;;;;;CAqBR,CAAC;AA2D9B,eAAO,MAAM,0BAA0B,GAAI,aAAa,YAAY;;;;;;;;;;;;CAanE,CAAC;AAsBF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;CAa5D,CAAC;AAaF,eAAO,MAAM,eAAe,GAAI,aAAa,YAAY;;;;;CAUxD,CAAC;AAkCF,eAAO,MAAM,oBAAoB,GAAI,aAAa,YAAY;;;;;;CAa7D,CAAC;AAmCF,eAAO,MAAM,mBAAmB,GAAI,aAAa,YAAY;;;;;;CAa5D,CAAC;AAEF,eAAO,MAAM,yBAAyB,EAAE,kBAAkB,CAAC,iBAAiB,CAkH3E,CAAC;AAEF,eAAO,MAAM,0BAA0B,EAAE,kBAAkB,CAAC,kBAAkB,CAW7E,CAAC;AAEF,wBAAgB,2BAA2B,IAAI,iBAAiB,CAE/D;AAED,wBAAgB,4BAA4B,IAAI,kBAAkB,CAEjE;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,iBAAiB,EAAE,MAAM,eAAe,CAAC,GAAG,IAAI,CAmH3F"}

package/dest/config.js

@@ -36,6 +36,19 @@ const LocalGovernanceConfiguration = {
     requiredYeaMargin: 4n * 10n ** 16n,
     minimumVotes: 400n * 10n ** 18n
 };
+const StagingPublicGovernanceConfiguration = {
+    proposeConfig: {
+        lockDelay: 60n * 60n * 24n * 30n,
+        lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n
+    },
+    votingDelay: 60n,
+    votingDuration: 60n * 60n,
+    executionDelay: 60n,
+    gracePeriod: 60n * 60n * 24n * 7n,
+    quorum: 3n * 10n ** 17n,
+    requiredYeaMargin: 4n * 10n ** 16n,
+    minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n
+};
 const TestnetGovernanceConfiguration = {
     proposeConfig: {
         lockDelay: 60n * 60n * 24n,
@@ -49,46 +62,67 @@ const TestnetGovernanceConfiguration = {
     requiredYeaMargin: 4n * 10n ** 16n,
     minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n
 };
+const StagingIgnitionGovernanceConfiguration = {
+    proposeConfig: {
+        lockDelay: 60n * 60n * 24n * 30n,
+        lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n
+    },
+    votingDelay: 60n,
+    votingDuration: 60n * 60n,
+    executionDelay: 60n,
+    gracePeriod: 60n * 60n * 24n * 7n,
+    quorum: 3n * 10n ** 17n,
+    requiredYeaMargin: 4n * 10n ** 16n,
+    minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n
+};
 export const getGovernanceConfiguration = (networkName)=>{
     switch(networkName){
-        case 'alpha-testnet':
-        case 'testnet':
-            return TestnetGovernanceConfiguration;
         case 'local':
             return LocalGovernanceConfiguration;
+        case 'staging-public':
+            return StagingPublicGovernanceConfiguration;
+        case 'testnet':
+            return TestnetGovernanceConfiguration;
+        case 'staging-ignition':
+            return StagingIgnitionGovernanceConfiguration;
         default:
-            throw new Error('Unrecognized network name: ' + networkName);
+            throw new Error(`Unrecognized network name: ${networkName}`);
     }
 };
-const TestnetGSEConfiguration = {
+const LocalGSEConfiguration = {
     activationThreshold: BigInt(100e18),
     ejectionThreshold: BigInt(50e18)
 };
-const LocalGSEConfiguration = {
+const StagingPublicGSEConfiguration = {
+    activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+    ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold
+};
+const TestnetGSEConfiguration = {
     activationThreshold: BigInt(100e18),
     ejectionThreshold: BigInt(50e18)
 };
+const StagingIgnitionGSEConfiguration = {
+    activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+    ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold
+};
 export const getGSEConfiguration = (networkName)=>{
     switch(networkName){
-        case 'alpha-testnet':
-        case 'testnet':
-            return TestnetGSEConfiguration;
         case 'local':
             return LocalGSEConfiguration;
+        case 'staging-public':
+            return StagingPublicGSEConfiguration;
+        case 'testnet':
+            return TestnetGSEConfiguration;
+        case 'staging-ignition':
+            return StagingIgnitionGSEConfiguration;
         default:
-            throw new Error('Unrecognized network name: ' + networkName);
+            throw new Error(`Unrecognized network name: ${networkName}`);
     }
 };
 // Making a default config here as we are only using it thought the deployment
 // and do not expect to be using different setups, so having environment variables
 // for it seems overkill
-const LocalRewardConfig = {
-    sequencerBps: 5000,
-    rewardDistributor: EthAddress.ZERO.toString(),
-    booster: EthAddress.ZERO.toString(),
-    blockReward: BigInt(50e18)
-};
-const TestnetRewardConfig = {
+const DefaultRewardConfig = {
     sequencerBps: 5000,
     rewardDistributor: EthAddress.ZERO.toString(),
     booster: EthAddress.ZERO.toString(),
@@ -96,13 +130,13 @@ const TestnetRewardConfig = {
 };
 export const getRewardConfig = (networkName)=>{
     switch(networkName){
-        case 'alpha-testnet':
-        case 'testnet':
-            return TestnetRewardConfig;
         case 'local':
-            return LocalRewardConfig;
+        case 'staging-public':
+        case 'testnet':
+        case 'staging-ignition':
+            return DefaultRewardConfig;
         default:
-            throw new Error('Unrecognized network name: ' + networkName);
+            throw new Error(`Unrecognized network name: ${networkName}`);
     }
 };
 const LocalRewardBoostConfig = {
@@ -112,6 +146,13 @@ const LocalRewardBoostConfig = {
     k: 1000000,
     minimum: 100000
 };
+const StagingPublicRewardBoostConfig = {
+    increment: 200000,
+    maxScore: 5000000,
+    a: 5000,
+    k: 1000000,
+    minimum: 100000
+};
 const TestnetRewardBoostConfig = {
     increment: 125000,
     maxScore: 15000000,
@@ -119,15 +160,25 @@ const TestnetRewardBoostConfig = {
     k: 1000000,
     minimum: 100000
 };
+const StagingIgnitionRewardBoostConfig = {
+    increment: 200000,
+    maxScore: 5000000,
+    a: 5000,
+    k: 1000000,
+    minimum: 100000
+};
 export const getRewardBoostConfig = (networkName)=>{
     switch(networkName){
-        case 'alpha-testnet':
-        case 'testnet':
-            return TestnetRewardBoostConfig;
         case 'local':
             return LocalRewardBoostConfig;
+        case 'staging-public':
+            return StagingPublicRewardBoostConfig;
+        case 'testnet':
+            return TestnetRewardBoostConfig;
+        case 'staging-ignition':
+            return StagingIgnitionRewardBoostConfig;
         default:
-            throw new Error('Unrecognized network name: ' + networkName);
+            throw new Error(`Unrecognized network name: ${networkName}`);
     }
 };
 // Similar to the above, no need for environment variables for this.
@@ -136,24 +187,41 @@ const LocalEntryQueueConfig = {
     bootstrapFlushSize: 0n,
     normalFlushSizeMin: 48n,
     normalFlushSizeQuotient: 2n,
-    maxQueueFlushSize: 48n
+    maxQueueFlushSize: 32n
+};
+const StagingPublicEntryQueueConfig = {
+    bootstrapValidatorSetSize: 48n,
+    bootstrapFlushSize: 48n,
+    normalFlushSizeMin: 1n,
+    normalFlushSizeQuotient: 2475n,
+    maxQueueFlushSize: 32n
 };
 const TestnetEntryQueueConfig = {
     bootstrapValidatorSetSize: 750n,
-    bootstrapFlushSize: 75n,
+    bootstrapFlushSize: 48n,
+    normalFlushSizeMin: 1n,
+    normalFlushSizeQuotient: 2475n,
+    maxQueueFlushSize: 32n
+};
+const StagingIgnitionEntryQueueConfig = {
+    bootstrapValidatorSetSize: 750n,
+    bootstrapFlushSize: 48n,
     normalFlushSizeMin: 1n,
     normalFlushSizeQuotient: 2475n,
     maxQueueFlushSize: 32n
 };
 export const getEntryQueueConfig = (networkName)=>{
     switch(networkName){
-        case 'alpha-testnet':
-        case 'testnet':
-            return TestnetEntryQueueConfig;
         case 'local':
             return LocalEntryQueueConfig;
+        case 'staging-public':
+            return StagingPublicEntryQueueConfig;
+        case 'testnet':
+            return TestnetEntryQueueConfig;
+        case 'staging-ignition':
+            return StagingIgnitionEntryQueueConfig;
         default:
-            throw new Error('Unrecognized network name: ' + networkName);
+            throw new Error(`Unrecognized network name: ${networkName}`);
     }
 };
 export const l1ContractsConfigMappings = {

package/dest/deploy_l1_contracts.js

@@ -22,7 +22,7 @@ import { ZK_PASSPORT_DOMAIN, ZK_PASSPORT_SCOPE, ZK_PASSPORT_VERIFIER_ADDRESS } f
 export const DEPLOYER_ADDRESS = '0x4e59b44847b379578588920cA78FbF26c0B4956C';
 const networkName = getActiveNetworkName();
 export const deploySharedContracts = async (l1Client, deployer, args, logger)=>{
-    logger.info(`Deploying shared contracts for network configration: ${networkName}`);
+    logger.info(`Deploying shared contracts for network configuration: ${networkName}`);
     const txHashes = [];
     const feeAssetAddress = await deployer.deploy(FeeAssetArtifact, [
         'FeeJuice',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aztec/ethereum",
-  "version": "2.0.0-rc.13",
+  "version": "2.0.0-rc.14",
   "type": "module",
   "exports": {
     ".": "./dest/index.js",
@@ -31,10 +31,10 @@
     "../package.common.json"
   ],
   "dependencies": {
-    "@aztec/blob-lib": "2.0.0-rc.13",
-    "@aztec/constants": "2.0.0-rc.13",
-    "@aztec/foundation": "2.0.0-rc.13",
-    "@aztec/l1-artifacts": "2.0.0-rc.13",
+    "@aztec/blob-lib": "2.0.0-rc.14",
+    "@aztec/constants": "2.0.0-rc.14",
+    "@aztec/foundation": "2.0.0-rc.14",
+    "@aztec/l1-artifacts": "2.0.0-rc.14",
     "@viem/anvil": "^0.0.10",
     "dotenv": "^16.0.3",
     "lodash.chunk": "^4.2.0",

package/src/config.ts

@@ -103,6 +103,20 @@ const LocalGovernanceConfiguration = {
   minimumVotes: 400n * 10n ** 18n,
 };
 
+const StagingPublicGovernanceConfiguration = {
+  proposeConfig: {
+    lockDelay: 60n * 60n * 24n * 30n,
+    lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n,
+  },
+  votingDelay: 60n,
+  votingDuration: 60n * 60n,
+  executionDelay: 60n,
+  gracePeriod: 60n * 60n * 24n * 7n,
+  quorum: 3n * 10n ** 17n, // 30%
+  requiredYeaMargin: 4n * 10n ** 16n, // 4%
+  minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n, // >= 200 validators must vote
+};
+
 const TestnetGovernanceConfiguration = {
   proposeConfig: {
     lockDelay: 60n * 60n * 24n,
@@ -117,51 +131,76 @@ const TestnetGovernanceConfiguration = {
   minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n,
 };
 
+const StagingIgnitionGovernanceConfiguration = {
+  proposeConfig: {
+    lockDelay: 60n * 60n * 24n * 30n, // 30 days
+    lockAmount: DefaultL1ContractsConfig.activationThreshold * 100n,
+  },
+
+  votingDelay: 60n,
+  votingDuration: 60n * 60n,
+  executionDelay: 60n,
+  gracePeriod: 60n * 60n * 24n * 7n,
+  quorum: 3n * 10n ** 17n, // 30%
+  requiredYeaMargin: 4n * 10n ** 16n, // 4%
+  minimumVotes: DefaultL1ContractsConfig.ejectionThreshold * 200n, // >= 200 validators must vote
+};
+
 export const getGovernanceConfiguration = (networkName: NetworkNames) => {
   switch (networkName) {
-    case 'alpha-testnet':
-    case 'testnet':
-      return TestnetGovernanceConfiguration;
     case 'local':
       return LocalGovernanceConfiguration;
+    case 'staging-public':
+      return StagingPublicGovernanceConfiguration;
+    case 'testnet':
+      return TestnetGovernanceConfiguration;
+    case 'staging-ignition':
+      return StagingIgnitionGovernanceConfiguration;
     default:
-      throw new Error('Unrecognized network name: ' + networkName);
+      throw new Error(`Unrecognized network name: ${networkName}`);
   }
 };
 
-const TestnetGSEConfiguration = {
+const LocalGSEConfiguration = {
   activationThreshold: BigInt(100e18),
   ejectionThreshold: BigInt(50e18),
 };
 
-const LocalGSEConfiguration = {
+const StagingPublicGSEConfiguration = {
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+};
+
+const TestnetGSEConfiguration = {
   activationThreshold: BigInt(100e18),
   ejectionThreshold: BigInt(50e18),
 };
 
+const StagingIgnitionGSEConfiguration = {
+  activationThreshold: DefaultL1ContractsConfig.activationThreshold,
+  ejectionThreshold: DefaultL1ContractsConfig.ejectionThreshold,
+};
+
 export const getGSEConfiguration = (networkName: NetworkNames) => {
   switch (networkName) {
-    case 'alpha-testnet':
-    case 'testnet':
-      return TestnetGSEConfiguration;
     case 'local':
       return LocalGSEConfiguration;
+    case 'staging-public':
+      return StagingPublicGSEConfiguration;
+    case 'testnet':
+      return TestnetGSEConfiguration;
+    case 'staging-ignition':
+      return StagingIgnitionGSEConfiguration;
     default:
-      throw new Error('Unrecognized network name: ' + networkName);
+      throw new Error(`Unrecognized network name: ${networkName}`);
   }
 };
 
 // Making a default config here as we are only using it thought the deployment
 // and do not expect to be using different setups, so having environment variables
 // for it seems overkill
-const LocalRewardConfig = {
-  sequencerBps: 5000,
-  rewardDistributor: EthAddress.ZERO.toString(),
-  booster: EthAddress.ZERO.toString(),
-  blockReward: BigInt(50e18),
-};
 
-const TestnetRewardConfig = {
+const DefaultRewardConfig = {
   sequencerBps: 5000,
   rewardDistributor: EthAddress.ZERO.toString(),
   booster: EthAddress.ZERO.toString(),
@@ -170,13 +209,13 @@ const TestnetRewardConfig = {
 
 export const getRewardConfig = (networkName: NetworkNames) => {
   switch (networkName) {
-    case 'alpha-testnet':
-    case 'testnet':
-      return TestnetRewardConfig;
     case 'local':
-      return LocalRewardConfig;
+    case 'staging-public':
+    case 'testnet':
+    case 'staging-ignition':
+      return DefaultRewardConfig;
     default:
-      throw new Error('Unrecognized network name: ' + networkName);
+      throw new Error(`Unrecognized network name: ${networkName}`);
   }
 };
 
@@ -188,6 +227,14 @@ const LocalRewardBoostConfig = {
   minimum: 100000,
 };
 
+const StagingPublicRewardBoostConfig = {
+  increment: 200000,
+  maxScore: 5000000,
+  a: 5000,
+  k: 1000000,
+  minimum: 100000,
+};
+
 const TestnetRewardBoostConfig = {
   increment: 125000,
   maxScore: 15000000,
@@ -196,15 +243,26 @@ const TestnetRewardBoostConfig = {
   minimum: 100000,
 };
 
+const StagingIgnitionRewardBoostConfig = {
+  increment: 200000,
+  maxScore: 5000000,
+  a: 5000,
+  k: 1000000,
+  minimum: 100000,
+};
+
 export const getRewardBoostConfig = (networkName: NetworkNames) => {
   switch (networkName) {
-    case 'alpha-testnet':
-    case 'testnet':
-      return TestnetRewardBoostConfig;
     case 'local':
       return LocalRewardBoostConfig;
+    case 'staging-public':
+      return StagingPublicRewardBoostConfig;
+    case 'testnet':
+      return TestnetRewardBoostConfig;
+    case 'staging-ignition':
+      return StagingIgnitionRewardBoostConfig;
     default:
-      throw new Error('Unrecognized network name: ' + networkName);
+      throw new Error(`Unrecognized network name: ${networkName}`);
   }
 };
 
@@ -214,12 +272,28 @@ const LocalEntryQueueConfig = {
   bootstrapFlushSize: 0n,
   normalFlushSizeMin: 48n, // will effectively be bounded by maxQueueFlushSize
   normalFlushSizeQuotient: 2n,
-  maxQueueFlushSize: 48n,
+  maxQueueFlushSize: 32n,
+};
+
+const StagingPublicEntryQueueConfig = {
+  bootstrapValidatorSetSize: 48n,
+  bootstrapFlushSize: 48n, // will effectively be bounded by maxQueueFlushSize
+  normalFlushSizeMin: 1n,
+  normalFlushSizeQuotient: 2475n,
+  maxQueueFlushSize: 32n, // Limited to 32 so flush cost are kept below 15M gas.
 };
 
 const TestnetEntryQueueConfig = {
   bootstrapValidatorSetSize: 750n,
-  bootstrapFlushSize: 75n, // will effectively be bounded by maxQueueFlushSize
+  bootstrapFlushSize: 48n, // will effectively be bounded by maxQueueFlushSize
+  normalFlushSizeMin: 1n,
+  normalFlushSizeQuotient: 2475n,
+  maxQueueFlushSize: 32n, // Limited to 32 so flush cost are kept below 15M gas.
+};
+
+const StagingIgnitionEntryQueueConfig = {
+  bootstrapValidatorSetSize: 750n,
+  bootstrapFlushSize: 48n, // will effectively be bounded by maxQueueFlushSize
   normalFlushSizeMin: 1n,
   normalFlushSizeQuotient: 2475n,
   maxQueueFlushSize: 32n, // Limited to 32 so flush cost are kept below 15M gas.
@@ -227,13 +301,16 @@ const TestnetEntryQueueConfig = {
 
 export const getEntryQueueConfig = (networkName: NetworkNames) => {
   switch (networkName) {
-    case 'alpha-testnet':
-    case 'testnet':
-      return TestnetEntryQueueConfig;
     case 'local':
       return LocalEntryQueueConfig;
+    case 'staging-public':
+      return StagingPublicEntryQueueConfig;
+    case 'testnet':
+      return TestnetEntryQueueConfig;
+    case 'staging-ignition':
+      return StagingIgnitionEntryQueueConfig;
     default:
-      throw new Error('Unrecognized network name: ' + networkName);
+      throw new Error(`Unrecognized network name: ${networkName}`);
   }
 };
 

package/src/deploy_l1_contracts.ts

@@ -183,7 +183,7 @@ export const deploySharedContracts = async (
   args: DeployL1ContractsArgs,
   logger: Logger,
 ) => {
-  logger.info(`Deploying shared contracts for network configration: ${networkName}`);
+  logger.info(`Deploying shared contracts for network configuration: ${networkName}`);
 
   const txHashes: Hex[] = [];