Merge pull request #6 from unifralabs/unifra/euclid-upgrade

shu-unifra · web-flow · commit 38e94f9a28a4 · 2025-05-01T17:26:43.000+09:00
Shu fix bugs (#7)
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@scroll-tech/scroll-sdk-cli",
-  "description": "A tool for managing and testing Scroll SDK deployments",
-  "version": "0.1.2",
+  "description": "A tool for managing and testing Scroll SDK(Dogeos) deployments",
+  "version": "0.1.3",
   "author": "Daniel Helm",
   "bin": {
     "scrollsdk": "bin/run.js"
@@ -48,7 +48,7 @@
     "eslint-config-prettier": "^9",
     "mocha": "^10",
     "oclif": "^4",
-    "shx": "^0.3.3",
+    "shx": "^0.4.0",
     "sinon": "^18.0.0",
     "ts-node": "^10",
     "typescript": "^5"
diff --git a/src/commands/setup/configs.ts b/src/commands/setup/configs.ts
@@ -14,7 +14,7 @@ export default class SetupConfigs extends Command {
 
   static override examples = [
     '<%= config.bin %> <%= command.id %>',
-    '<%= config.bin %> <%= command.id %> --image-tag gen-configs-9b29d9b6dcea6828118c0ee63d208095265f3a03',
+    '<%= config.bin %> <%= command.id %> --image-tag gen-configs-f961bf3e75c7c3fec63250062e751b0aaf47fefd',
     '<%= config.bin %> <%= command.id %> --configs-dir custom-configs',
   ]
 
@@ -465,7 +465,7 @@ export default class SetupConfigs extends Command {
   }
 
   private async getDockerImageTag(providedTag: string | undefined): Promise<string> {
-    const defaultTag = 'gen-configs-9b29d9b6dcea6828118c0ee63d208095265f3a03'
+    const defaultTag = 'gen-configs-f961bf3e75c7c3fec63250062e751b0aaf47fefd'
 
     if (!providedTag) {
       return defaultTag
diff --git a/src/commands/setup/db-init.ts b/src/commands/setup/db-init.ts
@@ -377,7 +377,7 @@ export default class SetupDbInit extends Command {
     this.log(chalk.blue('First, provide connection information for the database instance. This will only be used for creating users and databases. This information will not be persisted in your configuration repo.'));
     const publicHost = await input({ message: 'Enter public PostgreSQL host:', default: 'localhost' })
     const publicPort = await input({ message: 'Enter public PostgreSQL port:', default: '5432' })
-    const pgUser = await input({ message: 'Enter PostgreSQL admin username:', default: 'admin' })
+    const pgUser = await input({ message: 'Enter PostgreSQL admin username:', default: 'scrolladmin' })
     const pgPassword = await password({ message: 'Enter PostgreSQL admin password:' })
     const pgDatabase = await input({ message: 'Enter PostgreSQL database name:', default: 'postgres' })
 
diff --git a/src/commands/setup/domains.ts b/src/commands/setup/domains.ts
@@ -457,6 +457,23 @@ export default class SetupDomains extends Command {
       delete existingConfig.ingress.L1_EXPLORER_HOST
     }
 
+    /*
+    [contracts.verification]
+    VERIFIER_TYPE_L1 = "blockscout"
+    VERIFIER_TYPE_L2 = "blockscout"
+    EXPLORER_URI_L1 = "http://l1-explorer.scrollsdk"
+    EXPLORER_URI_L2 = "http://blockscout.scrollsdk"
+    RPC_URI_L1 = "http://l1-devnet.scrollsdk"
+    RPC_URI_L2 = "http://l2-rpc.scrollsdk"
+    EXPLORER_API_KEY_L1 = ""
+    EXPLORER_API_KEY_L2 = ""
+    */
+    existingConfig.contracts.verification.EXPLORER_URI_L1 = domainConfig.EXTERNAL_EXPLORER_URI_L1;
+    existingConfig.contracts.verification.EXPLORER_URI_L2 = domainConfig.EXTERNAL_EXPLORER_URI_L2;
+    existingConfig.contracts.verification.RPC_URI_L1 = domainConfig.EXTERNAL_RPC_URI_L1;
+    existingConfig.contracts.verification.RPC_URI_L2 = domainConfig.EXTERNAL_RPC_URI_L2;
+    
+
     // Convert the updated config back to TOML string
     const updatedContent = toml.stringify(existingConfig)
 
diff --git a/src/commands/setup/prep-charts.ts b/src/commands/setup/prep-charts.ts
@@ -113,6 +113,8 @@ export default class SetupPrepCharts extends Command {
   }
 
   private async processProductionYaml(valuesDir: string): Promise<{ updated: number; skipped: number }> {
+
+
     const productionFiles = fs.readdirSync(valuesDir)
       .filter(file => file.endsWith('-production.yaml') || file.match(/-production-\d+\.yaml$/))
 
@@ -141,36 +143,35 @@ export default class SetupPrepCharts extends Command {
               // if (value === '' || value === '[""]' || value === '[]' ||
               //   (Array.isArray(value) && (value.length === 0 || (value.length === 1 && value[0] === ''))) ||
               //   value === null || value === undefined) {
-                const configMapping = this.configMapping[key]
-                if (configMapping) {
-                  let configKey: string
-                  if (typeof configMapping === 'function') {
-                    configKey = configMapping(chartName, productionNumber)
-                  } else {
-                    configKey = configMapping
-                  }
-                  const configValue = this.getConfigValue(configKey)
-                  if (configValue !== undefined && configValue !== null) {
-                    let newValue: string | string[]
-                    if (Array.isArray(configValue)) {
-                      newValue = JSON.stringify(configValue)
-                    } else {
-                      newValue = String(configValue)
-                    }
+              const configMapping = this.configMapping[key]
+              if (configMapping) {
+                let configKey: string
+                if (typeof configMapping === 'function') {
+                  configKey = configMapping(chartName, productionNumber)
+                } else {
+                  configKey = configMapping
+                }
+                if (chartName === "l1-devnet" && key === "CHAIN_ID") {
+                  configKey = "general.CHAIN_ID_L1";
+                }
 
-                    if(chartName === "l1-devnet" && key === "CHAIN_ID"){
-                      continue;
-                    }
-                    if (newValue != value) {
-                      changes.push({ key, oldValue: JSON.stringify(value), newValue: newValue })
-                      envData[key] = newValue
-                      updated = true
-                    }
+                const configValue = this.getConfigValue(configKey)
+                if (configValue !== undefined && configValue !== null) {
+                  let newValue: string | string[]
+                  if (Array.isArray(configValue)) {
+                    newValue = JSON.stringify(configValue)
                   } else {
-                    this.log(chalk.yellow(`${chartName}: No value found for ${configKey}`))
+                    newValue = String(configValue)
                   }
+                  if (newValue != value) {
+                    changes.push({ key, oldValue: JSON.stringify(value), newValue: newValue })
+                    envData[key] = newValue
+                    updated = true
+                  }
+                } else {
+                  this.log(chalk.yellow(`${chartName}: No value found for ${configKey}`))
                 }
-              //}
+              }
             }
           }
         }
@@ -243,6 +244,126 @@ export default class SetupPrepCharts extends Command {
           }
         }
       }
+      /*
+      blockscout-stack.blockscout.ingress.annotations.nginx.ingress.kubernetes.io/cors-allow-origin:https://blockscout.scrollsdk
+      blockscout-stack.blockscout.ingress.hostname:blockscout.scrollsdk
+      blockscout-stack.frontend.env.NEXT_PUBLIC_API_HOST:blockscout.scrollsdk
+      blockscout-stack.frontend.ingress.annotations.nginx.ingress.kubernetes.io/cors-allow-origin: "https://blockscout.scrollsdk"
+      blockscout-stack.frontend.ingress.hostname: "blockscout.scrollsdk"
+      */
+      if (productionYaml["blockscout-stack"]) {
+        let ingressUpdated = false;
+        const blockscout = productionYaml["blockscout-stack"].blockscout;
+        const frontend = productionYaml["blockscout-stack"].frontend;
+        let blockscout_host = this.getConfigValue("ingress.BLOCKSCOUT_HOST");
+        let blockscout_url = this.getConfigValue("frontend.EXTERNAL_EXPLORER_URI_L2");
+
+        if (blockscout?.ingress?.annotations?.["nginx.ingress.kubernetes.io/cors-allow-origin"]) {
+          changes.push({ key: `ingress.blockscout.annotations["nginx.ingress.kubernetes.io/cors-allow-origin"]`, oldValue: blockscout.ingress.annotations["nginx.ingress.kubernetes.io/cors-allow-origin"], newValue: blockscout_url });
+          blockscout.ingress.annotations["nginx.ingress.kubernetes.io/cors-allow-origin"] = blockscout_url;
+          ingressUpdated = true;
+        }
+
+        if (blockscout?.ingress?.hostname) {
+          changes.push({ key: `ingress.blockscout.hostname`, oldValue: blockscout.ingress.hostname, newValue: blockscout_host });
+          blockscout.ingress.hostname = blockscout_host;
+          ingressUpdated = true;
+        }
+        if (frontend?.env?.NEXT_PUBLIC_API_HOST) {
+          changes.push({ key: `frontend.env.NEXT_PUBLIC_API_HOST`, oldValue: frontend.env.NEXT_PUBLIC_API_HOST, newValue: blockscout_host });
+          frontend.env.NEXT_PUBLIC_API_HOST = blockscout_host;
+          ingressUpdated = true;
+        }
+        if (frontend?.ingress?.annotations?.["nginx.ingress.kubernetes.io/cors-allow-origin"]) {
+          changes.push({ key: `frontend.ingress.annotations["nginx.ingress.kubernetes.io/cors-allow-origin"]`, oldValue: frontend.ingress.annotations["nginx.ingress.kubernetes.io/cors-allow-origin"], newValue: blockscout_url });
+          frontend.ingress.annotations["nginx.ingress.kubernetes.io/cors-allow-origin"] = blockscout_url;
+          ingressUpdated = true;
+        }
+        if (frontend?.ingress?.hostname) {
+          changes.push({ key: `frontend.ingress.hostname`, oldValue: frontend.ingress.hostname, newValue: blockscout_host });
+          frontend.ingress.hostname = blockscout_host;
+          ingressUpdated = true;
+        }
+        /*
+        INDEXER_SCROLL_L1_CHAIN_CONTRACT: ""
+        INDEXER_SCROLL_L1_BATCH_START_BLOCK: ""
+        INDEXER_SCROLL_L1_MESSENGER_CONTRACT: ""
+        INDEXER_SCROLL_L1_MESSENGER_START_BLOCK: ""
+        INDEXER_SCROLL_L2_MESSENGER_CONTRACT: ""
+        INDEXER_SCROLL_L2_GAS_ORACLE_CONTRACT: ""
+        INDEXER_SCROLL_L1_RPC: ""
+              INDEXER_SCROLL_L2_MESSENGER_START_BLOCK: 0
+      INDEXER_SCROLL_L1_ETH_GET_LOGS_RANGE_SIZE: 500
+      INDEXER_SCROLL_L2_ETH_GET_LOGS_RANGE_SIZE: 500
+        */
+        interface BlockscoutEnvMapping {
+          key: string;
+          configKey: string;
+          defaultValue?: string;
+        }
+
+        const BLOCKSCOUT_ENV_MAPPINGS: BlockscoutEnvMapping[] = [
+          {
+            key: 'INDEXER_SCROLL_L1_BATCH_START_BLOCK',
+            configKey: '',
+            defaultValue: '0'
+          },
+          {
+            key: 'INDEXER_SCROLL_L1_MESSENGER_START_BLOCK',
+            configKey: '',
+            defaultValue: '0'
+          },
+          {
+            key: 'INDEXER_SCROLL_L1_CHAIN_CONTRACT',
+            configKey: 'contractsFile.L1_SCROLL_CHAIN_PROXY_ADDR'
+          },
+          {
+            key: 'INDEXER_SCROLL_L1_MESSENGER_CONTRACT',
+            configKey: 'L1_SCROLL_MESSENGER_PROXY_ADDR'
+          },
+          {
+            key: 'INDEXER_SCROLL_L2_MESSENGER_CONTRACT',
+            configKey: 'L2_SCROLL_MESSENGER_PROXY_ADDR'
+          },
+          {
+            key: 'INDEXER_SCROLL_L2_GAS_ORACLE_CONTRACT',
+            configKey: 'L1_GAS_PRICE_ORACLE_ADDR'
+          },
+          {
+            key: 'INDEXER_SCROLL_L1_RPC',
+            configKey: 'general.L1_RPC_ENDPOINT'
+          }
+
+
+        ];
+        const benv = productionYaml["blockscout-stack"].blockscout.env;
+
+        BLOCKSCOUT_ENV_MAPPINGS.forEach(mapping => {
+          const { key, configKey, defaultValue } = mapping;
+
+          let newValue = this.getConfigValue(configKey);
+          if (!newValue) {
+            newValue = configKey ? this.contractsConfig[configKey] : defaultValue;
+          }
+
+          if (newValue !== undefined) {
+            changes.push({
+              key: `blockscout.env.${key}`,
+              oldValue: benv[key],
+              newValue: newValue
+            });
+            benv[key] = newValue;
+          } else {
+            this.log(chalk.yellow(`No value found for ${key}`));
+          }
+        });
+
+        updated = true;
+
+        if (ingressUpdated) {
+          updated = true;
+        }
+      }
 
       if (productionYaml.grafana) {
         let ingressUpdated = false;
diff --git a/src/commands/setup/push-secrets.ts b/src/commands/setup/push-secrets.ts
diff --git a/src/commands/setup/verify-contracts.ts b/src/commands/setup/verify-contracts.ts

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ export default class SetupConfigs extends Command {`
`14`	`14`
`15`	`15`	`static override examples = [`
`16`	`16`	`'<%= config.bin %> <%= command.id %>',`
`17`		`- '<%= config.bin %> <%= command.id %> --image-tag gen-configs-9b29d9b6dcea6828118c0ee63d208095265f3a03',`
	`17`	`+ '<%= config.bin %> <%= command.id %> --image-tag gen-configs-f961bf3e75c7c3fec63250062e751b0aaf47fefd',`
`18`	`18`	`'<%= config.bin %> <%= command.id %> --configs-dir custom-configs',`
`19`	`19`	`]`
`20`	`20`
`@@ -465,7 +465,7 @@ export default class SetupConfigs extends Command {`
`465`	`465`	`}`
`466`	`466`
`467`	`467`	`private async getDockerImageTag(providedTag: string \| undefined): Promise<string> {`
`468`		`- const defaultTag = 'gen-configs-9b29d9b6dcea6828118c0ee63d208095265f3a03'`
	`468`	`+ const defaultTag = 'gen-configs-f961bf3e75c7c3fec63250062e751b0aaf47fefd'`
`469`	`469`
`470`	`470`	`if (!providedTag) {`
`471`	`471`	`return defaultTag`