@0xsequence/catapult 1.3.3 → 1.3.4

package/src/lib/core/resolver.ts

@@ -5,16 +5,17 @@ import {
   AbiEncodeValue,
   AbiPackValue,
   ConstructorEncodeValue,
+  ComputeCreateValue,
   ComputeCreate2Value,
   ReadBalanceValue,
   BasicArithmeticValue,
   CallValue,
-  ContractExistsCondition,
   ContractExistsValue,
   JobCompletedValue,
   ReadJsonValue,
 } from '../types'
 import { ExecutionContext } from './context'
+import { isAddress, isBigNumberish, isBytesLike } from '../utils/assertion'
 
 /**
  * A scope for resolving local variables, such as template arguments.
@@ -154,6 +155,8 @@ export class ValueResolver {
         return this.resolveAbiPack(resolvedArgs as AbiPackValue['arguments'])
       case 'constructor-encode':
         return this.resolveConstructorEncode(resolvedArgs as ConstructorEncodeValue['arguments'])
+      case 'compute-create':
+        return this.resolveComputeCreate(resolvedArgs as ComputeCreateValue['arguments'])
       case 'compute-create2':
         return this.resolveComputeCreate2(resolvedArgs as ComputeCreate2Value['arguments'])
       case 'read-balance':
@@ -260,7 +263,7 @@ export class ValueResolver {
     }
 
     // Validate that creation code is valid bytecode
-    if (!ethers.isBytesLike(creationCode)) {
+    if (!isBytesLike(creationCode)) {
       throw new Error(`Invalid creation code: ${creationCode}`)
     }
 
@@ -280,18 +283,36 @@ export class ValueResolver {
     return '0x' + cleanCreationCode + cleanEncodedArgs
   }
 
+  private resolveComputeCreate(args: ComputeCreateValue['arguments']): string {
+    const { deployerAddress, nonce } = args
+    // Check if the deployer address is a valid address
+    if (!isAddress(deployerAddress)) {
+      throw new Error(`Invalid deployer address: ${deployerAddress}`)
+    }
+    // Check if the nonce is a valid value
+    if (!isBigNumberish(nonce)) {
+      throw new Error(`Invalid nonce: ${nonce}`)
+    }
+    const bnNonce = ethers.toBigInt(nonce)
+    // Create the create address
+    return ethers.getCreateAddress({
+      from: deployerAddress,
+      nonce: bnNonce,
+    })
+  }
+
   private resolveComputeCreate2(args: ComputeCreate2Value['arguments']): string {
     const { deployerAddress, salt, initCode } = args
     // Check if the deployer address is a valid address
-    if (!ethers.isAddress(deployerAddress)) {
+    if (!isAddress(deployerAddress)) {
       throw new Error(`Invalid deployer address: ${deployerAddress}`)
     }
     // Check if the salt is a valid bytes value
-    if (!ethers.isBytesLike(salt)) {
+    if (!isBytesLike(salt)) {
       throw new Error(`Invalid salt: ${salt}`)
     }
     // Check if the init code is a valid bytes value
-    if (!ethers.isBytesLike(initCode)) {
+    if (!isBytesLike(initCode)) {
       throw new Error(`Invalid init code: ${initCode}`)
     }
     // Hash the init code using Keccak256
@@ -304,7 +325,7 @@ export class ValueResolver {
     // Check if the address is a valid address
     const addressValue = args.address as any
 
-    if (!ethers.isAddress(addressValue)) {
+    if (!isAddress(addressValue)) {
       throw new Error(`Invalid address: ${addressValue}`)
     }
 
@@ -349,7 +370,7 @@ export class ValueResolver {
     }
 
     // Validate that the target address is a valid Ethereum address
-    if (!ethers.isAddress(to)) {
+    if (!isAddress(to)) {
       throw new Error(`call: invalid target address: ${to}`)
     }
 
@@ -407,7 +428,7 @@ export class ValueResolver {
   private async resolveContractExists(args: ContractExistsValue['arguments'], context: ExecutionContext): Promise<boolean> {
     const { address } = args
 
-    if (!ethers.isAddress(address)) {
+    if (!isAddress(address)) {
       throw new Error(`contract-exists: invalid address: ${address}`)
     }
 

package/src/lib/deployer.ts

@@ -52,6 +52,9 @@ export interface DeployerOptions {
 
   /** Optional: Show end-of-run summary (default: true). */
   showSummary?: boolean
+
+  /** Optional: Convert verification errors to warnings instead of failing (default: false). */
+  ignoreVerifyErrors?: boolean
 }
 
 /**
@@ -157,7 +160,8 @@ export class Deployer {
       const engine = new ExecutionEngine(this.loader.templates, {
         eventEmitter: this.events,
         verificationRegistry,
-        noPostCheckConditions: this.noPostCheckConditions
+        noPostCheckConditions: this.noPostCheckConditions,
+        ignoreVerifyErrors: this.options.ignoreVerifyErrors ?? false
       })
       
       // Track if any jobs have failed
@@ -312,6 +316,11 @@ export class Deployer {
       // 5. Write results to output files.
       await this.writeOutputFiles()
 
+      // Show verification warnings report if ignoreVerifyErrors is enabled
+      if (this.options.ignoreVerifyErrors) {
+        this.emitVerificationWarningsReport(engine)
+      }
+
       // Emit end-of-run summary before final status
       if (this.showSummary) {
         this.emitRunSummary(hasFailures)
@@ -423,6 +432,24 @@ export class Deployer {
     this.events.emitEvent(summaryEvent)
   }
 
+  /**
+   * Emit verification warnings report when ignoreVerifyErrors is enabled
+   */
+  private emitVerificationWarningsReport(engine: ExecutionEngine): void {
+    const warnings = engine.getVerificationWarnings()
+    
+    if (warnings.length > 0) {
+      this.events.emitEvent({
+        type: 'verification_warnings_report',
+        level: 'warn',
+        data: {
+          totalWarnings: warnings.length,
+          warnings: warnings
+        }
+      })
+    }
+  }
+
   /**
    * Determines the final, ordered list of jobs to execute based on user input.
    * If a user requests specific jobs, this ensures all their dependencies are also included.

package/src/lib/events/cli-adapter.ts

@@ -266,6 +266,30 @@ export class CLIEventAdapter {
         // Keep short to reduce noise
         console.log(chalk.gray(`        Verification retry ${event.data.attempt}/${event.data.maxRetries}: ${event.data.error}`))
         break
+
+      case 'verification_skipped':
+        console.log(chalk.yellow(`        ⚠️  ${event.data.reason}`))
+        break
+
+      case 'verification_warnings_report':
+        // Display detailed verification warnings report
+        console.log(chalk.yellow('\n📋 Verification Warnings Report'))
+        console.log(chalk.yellow(`   Total warnings: ${event.data.totalWarnings}`))
+        console.log('')
+        
+        if (event.data.warnings && event.data.warnings.length > 0) {
+          for (const warning of event.data.warnings) {
+            console.log(chalk.red(`   ❌ ${warning.actionName} (${warning.contractName})`))
+            console.log(chalk.gray(`      Address: ${warning.address}`))
+            console.log(chalk.gray(`      Platform: ${warning.platform}`))
+            if (warning.networkName) {
+              console.log(chalk.gray(`      Network: ${warning.networkName}`))
+            }
+            console.log(chalk.gray(`      Error: ${warning.error}`))
+            console.log('')
+          }
+        }
+        break
       case 'contract_created':
         console.log(chalk.gray(`        contract: ${event.data.contractAddress}`))
         break

package/src/lib/events/types.ts

@@ -429,6 +429,32 @@ export interface VerificationRetryEvent extends BaseEvent {
   }
 }
 
+export interface VerificationSkippedEvent extends BaseEvent {
+  type: 'verification_skipped'
+  level: 'warn'
+  data: {
+    actionName: string
+    reason: string
+  }
+}
+
+export interface VerificationWarningsReportEvent extends BaseEvent {
+  type: 'verification_warnings_report'
+  level: 'warn'
+  data: {
+    totalWarnings: number
+    warnings: Array<{
+      actionName: string
+      address: string
+      contractName: string
+      platform: string
+      error: string
+      jobName?: string
+      networkName?: string
+    }>
+  }
+}
+
 // End-of-run summary
 export interface RunSummaryEvent extends BaseEvent {
   type: 'run_summary'
@@ -488,5 +514,7 @@ export type DeploymentEvent =
   | VerificationSubmittedEvent
   | VerificationCompletedEvent
   | VerificationFailedEvent
-  | VerificationRetryEvent 
+  | VerificationRetryEvent
+  | VerificationSkippedEvent
+  | VerificationWarningsReportEvent
   | RunSummaryEvent

package/src/lib/types/values.ts

@@ -32,6 +32,14 @@ export interface ConstructorEncodeValue {
   };
 }
 
+export interface ComputeCreateValue {
+  type: 'compute-create';
+  arguments: {
+    deployerAddress: AddressValue;
+    nonce: Uint256Value;
+  };
+}
+
 export interface ComputeCreate2Value {
   type: 'compute-create2';
   arguments: {
@@ -94,6 +102,7 @@ export type ValueResolver =
   | AbiEncodeValue
   | AbiPackValue
   | ConstructorEncodeValue
+  | ComputeCreateValue
   | ComputeCreate2Value
   | ReadBalanceValue
   | BasicArithmeticValue
@@ -113,4 +122,4 @@ export type Value<T = string | number | boolean> = T | Reference | ValueResolver
 export type BytesValue = Value<string>;
 export type AddressValue = Value<string>;
 export type Uint256Value = Value<string | number>;
-export type BooleanValue = Value<boolean>;
+export type BooleanValue = Value<boolean>;

package/src/lib/utils/assertion.ts

@@ -0,0 +1,24 @@
+import { ethers } from "ethers";
+
+export function isAddress(value: unknown): value is string {
+  return ethers.isAddress(value)
+}
+
+export function isBytesLike(value: unknown): value is string {
+  return ethers.isBytesLike(value)
+}
+
+export function isBigNumberish(value: unknown): value is string | number | bigint {
+  try {
+    switch (typeof(value)) {
+      case "bigint":
+      case "number":
+      case "string":
+        ethers.toBigInt(value)
+        return true
+    }
+  } catch (error) {
+    // Fail out
+  }
+  return false
+}