incorporate feedback

Author: graham-chainlink

tools/operations-gen/internal/families/evm/codegen.go

@@ -87,16 +87,18 @@ func generateOperationsFile(info *ContractInfo, tmpl *template.Template) error {
 
 func prepareTemplateData(info *ContractInfo) templateData {
 	data := templateData{
-		PackageName:                 info.PackageName,
-		PackageNameHyphen:           toKebabCase(info.PackageName),
-		ContractType:                info.Name,
-		Version:                     info.Version,
-		GobindingsImport:            info.GobindingsPackage,
-		ZkSyncBytecodeSymbol:        info.ZkSyncBytecodeSymbol,
-		ZkSyncBytecodeImport:        info.ZkSyncBytecodePackage,
-		ZkSyncBytecodeUseGobindings: info.ZkSyncBytecodeSymbol != "" && info.ZkSyncBytecodePackage == info.GobindingsPackage,
-		NeedsBigInt:                 ChecksNeedsBigInt(info),
-		OmitDeploy:                  info.OmitDeploy,
+		PackageName:       info.PackageName,
+		PackageNameHyphen: toKebabCase(info.PackageName),
+		ContractType:      info.Name,
+		Version:           info.Version,
+		GobindingsImport:  info.GobindingsPackage,
+		NeedsBigInt:       ChecksNeedsBigInt(info),
+		OmitDeploy:        info.OmitDeploy,
+	}
+	if info.ZkSync != nil {
+		data.ZkSyncBytecodeSymbol = info.ZkSync.BytecodeSymbol
+		data.ZkSyncBytecodeImport = info.ZkSync.BytecodePackage
+		data.ZkSyncBytecodeUseGobindings = info.ZkSync.BytecodePackage == info.GobindingsPackage
 	}
 
 	if info.Constructor != nil {

tools/operations-gen/internal/families/evm/contract.go

@@ -25,18 +25,23 @@ const (
 
 // ContractInfo holds all parsed information about a contract needed for code generation.
 type ContractInfo struct {
-	Name                  string
-	Version               string
-	PackageName           string
-	GobindingsPackage     string
-	ZkSyncBytecodePackage string
-	ZkSyncBytecodeSymbol  string
-	OutputPath            string
-	OmitDeploy            bool
-	Constructor           *FunctionInfo
-	Functions             map[string]*FunctionInfo
-	FunctionOrder         []string
-	StructDefs            map[string]*structDef
+	Name              string
+	Version           string
+	PackageName       string
+	GobindingsPackage string
+	ZkSync            *ZkSyncContractInfo
+	OutputPath        string
+	OmitDeploy        bool
+	Constructor       *FunctionInfo
+	Functions         map[string]*FunctionInfo
+	FunctionOrder     []string
+	StructDefs        map[string]*structDef
+}
+
+// ZkSyncContractInfo holds resolved zkSync VM deploy bytecode for code generation.
+type ZkSyncContractInfo struct {
+	BytecodePackage string
+	BytecodeSymbol  string
 }
 
 type structDef struct {
@@ -115,16 +120,20 @@ func extractContractInfo(cfg EvmContractConfig, input EvmInputConfig, output Evm
 	}
 
 	info := &ContractInfo{
-		Name:                  cfg.Name,
-		Version:               cfg.Version,
-		PackageName:           packageName,
-		GobindingsPackage:     cfg.GobindingsPackage,
-		ZkSyncBytecodePackage: zkSyncPackage,
-		ZkSyncBytecodeSymbol:  zkSyncSymbol,
-		OutputPath:            core.ContractOutputPath(output.BasePath, versionPath, packageName),
-		OmitDeploy:            cfg.OmitDeploy,
-		Functions:             make(map[string]*FunctionInfo),
-		StructDefs:            make(map[string]*structDef),
+		Name:              cfg.Name,
+		Version:           cfg.Version,
+		PackageName:       packageName,
+		GobindingsPackage: cfg.GobindingsPackage,
+		OutputPath:        core.ContractOutputPath(output.BasePath, versionPath, packageName),
+		OmitDeploy:        cfg.OmitDeploy,
+		Functions:         make(map[string]*FunctionInfo),
+		StructDefs:        make(map[string]*structDef),
+	}
+	if zkSyncSymbol != "" {
+		info.ZkSync = &ZkSyncContractInfo{
+			BytecodePackage: zkSyncPackage,
+			BytecodeSymbol:  zkSyncSymbol,
+		}
 	}
 
 	extractConstructor(info, parsedAbi)