op-deployer: remove legacy DeployAltDA script (#15722)

* op-deployer: remove legacy DeployAltDA script

* DeployAltDA2: allow input.resolverRefundPercentage to be 0

* DeployAltDA2: remove test revert for resolverRefundPercentage=0

* rename DeployAltDA2 to DeployAltDA

Author: bitwiseguy

op-deployer/pkg/deployer/opcm/alt_da.go

@@ -1,7 +1,6 @@
 package opcm
 
 import (
-	"fmt"
 	"math/big"
 
 	"github.com/ethereum-optimism/optimism/op-chain-ops/script"
@@ -23,41 +22,9 @@ type DeployAltDAOutput struct {
 	DataAvailabilityChallengeImpl  common.Address
 }
 
-type DeployAltDAScript struct {
-	Run func(input, output common.Address) error
-}
-
-func DeployAltDA(
-	host *script.Host,
-	input DeployAltDAInput,
-) (DeployAltDAOutput, error) {
-	var output DeployAltDAOutput
-	inputAddr := host.NewScriptAddress()
-	outputAddr := host.NewScriptAddress()
-
-	cleanupInput, err := script.WithPrecompileAtAddress[*DeployAltDAInput](host, inputAddr, &input)
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployAltDAInput precompile: %w", err)
-	}
-	defer cleanupInput()
-
-	cleanupOutput, err := script.WithPrecompileAtAddress[*DeployAltDAOutput](host, outputAddr, &output,
-		script.WithFieldSetter[*DeployAltDAOutput])
-	if err != nil {
-		return output, fmt.Errorf("failed to insert DeployAltDAOutput precompile: %w", err)
-	}
-	defer cleanupOutput()
-
-	implContract := "DeployAltDA"
-	deployScript, cleanupDeploy, err := script.WithScript[DeployAltDAScript](host, "DeployAltDA.s.sol", implContract)
-	if err != nil {
-		return output, fmt.Errorf("failed to load %s script: %w", implContract, err)
-	}
-	defer cleanupDeploy()
-
-	if err := deployScript.Run(inputAddr, outputAddr); err != nil {
-		return output, fmt.Errorf("failed to run %s script: %w", implContract, err)
-	}
+type DeployAltDAScript script.DeployScriptWithOutput[DeployAltDAInput, DeployAltDAOutput]
 
-	return output, nil
+// NewDeployAltDAScript loads and validates the DeployAltDA script contract
+func NewDeployAltDAScript(host *script.Host) (DeployAltDAScript, error) {
+	return script.NewDeployScriptWithOutputFromFile[DeployAltDAInput, DeployAltDAOutput](host, "DeployAltDA.s.sol", "DeployAltDA")
 }

op-deployer/pkg/deployer/opcm/alt_da2.go

@@ -4,41 +4,34 @@ import (
 	"math/big"
 	"testing"
 
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/testutil"
-	"github.com/ethereum-optimism/optimism/op-deployer/pkg/env"
-	"github.com/ethereum-optimism/optimism/op-service/testlog"
 	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/log"
 	"github.com/stretchr/testify/require"
 )
 
-func TestDeployAltDA(t *testing.T) {
-	t.Parallel()
-
-	_, artifacts := testutil.LocalArtifacts(t)
-
-	host, err := env.DefaultScriptHost(
-		broadcaster.NoopBroadcaster(),
-		testlog.Logger(t, log.LevelInfo),
-		common.Address{'D'},
-		artifacts,
-	)
-	require.NoError(t, err)
-
-	input := DeployAltDAInput{
-		Salt:                     common.HexToHash("0x1234"),
-		ProxyAdmin:               common.Address{'P'},
-		ChallengeContractOwner:   common.Address{'O'},
-		ChallengeWindow:          big.NewInt(100),
-		ResolveWindow:            big.NewInt(200),
-		BondSize:                 big.NewInt(300),
-		ResolverRefundPercentage: big.NewInt(50), // must be < 100
-	}
-
-	output, err := DeployAltDA(host, input)
-	require.NoError(t, err)
-
-	require.NotEmpty(t, output.DataAvailabilityChallengeProxy)
-	require.NotEmpty(t, output.DataAvailabilityChallengeImpl)
+func TestNewDeployAltDAScript(t *testing.T) {
+	t.Run("should not fail with current version of DeployAltDA contract", func(t *testing.T) {
+		// First we grab a test host
+		host1 := createTestHost(t)
+
+		// Then we load the script
+		//
+		// This would raise an error if the Go types didn't match the ABI
+		deploySuperchain, err := NewDeployAltDAScript(host1)
+		require.NoError(t, err)
+
+		// Then we deploy
+		output, err := deploySuperchain.Run(DeployAltDAInput{
+			Salt:                     common.BigToHash(big.NewInt(1)),
+			ProxyAdmin:               common.BigToAddress(big.NewInt(2)),
+			ChallengeContractOwner:   common.BigToAddress(big.NewInt(3)),
+			ChallengeWindow:          big.NewInt(4),
+			ResolveWindow:            big.NewInt(5),
+			BondSize:                 big.NewInt(6),
+			ResolverRefundPercentage: big.NewInt(7),
+		})
+
+		// And do some simple asserts
+		require.NoError(t, err)
+		require.NotNil(t, output)
+	})
 }

op-deployer/pkg/deployer/opcm/alt_da2_test.go

@@ -9,7 +9,7 @@ import (
 // Scripts contains all the deployment scripts for ease of passing them around
 type Scripts struct {
 	DeployAlphabetVM      DeployAlphabetVMScript
-	DeployAltDA           DeployAltDA2Script
+	DeployAltDA           DeployAltDAScript
 	DeployAsterisc        DeployAsteriscScript
 	DeployDisputeGame     DeployDisputeGameScript
 	DeployImplementations DeployImplementations2Script

op-deployer/pkg/deployer/opcm/alt_da_test.go

@@ -28,9 +28,13 @@ func DeployAltDA(env *Env, intent *state.Intent, st *state.State, chainID common
 		return nil
 	}
 
-	var dao opcm.DeployAltDAOutput
 	lgr.Info("deploying alt-da contracts")
-	dao, err = opcm.DeployAltDA(env.L1ScriptHost, opcm.DeployAltDAInput{
+	deployAltDAScript, err := opcm.NewDeployAltDAScript(env.L1ScriptHost)
+	if err != nil {
+		return fmt.Errorf("failed to load DeployAltDA script: %w", err)
+	}
+
+	output, err := deployAltDAScript.Run(opcm.DeployAltDAInput{
 		Salt:                     st.Create2Salt,
 		ProxyAdmin:               chainState.OpChainContracts.OpChainProxyAdminImpl,
 		ChallengeContractOwner:   chainIntent.Roles.L1ProxyAdminOwner,
@@ -43,8 +47,8 @@ func DeployAltDA(env *Env, intent *state.Intent, st *state.State, chainID common
 		return fmt.Errorf("failed to deploy alt-da contracts: %w", err)
 	}
 
-	chainState.OpChainContracts.AltDAChallengeProxy = dao.DataAvailabilityChallengeProxy
-	chainState.OpChainContracts.AltDAChallengeImpl = dao.DataAvailabilityChallengeImpl
+	chainState.OpChainContracts.AltDAChallengeProxy = output.DataAvailabilityChallengeProxy
+	chainState.OpChainContracts.AltDAChallengeImpl = output.DataAvailabilityChallengeImpl
 	return nil
 }
 

op-deployer/pkg/deployer/opcm/scripts.go

@@ -17,7 +17,7 @@ import { ChainAssertions } from "scripts/deploy/ChainAssertions.sol";
 import { DeployUtils } from "scripts/libraries/DeployUtils.sol";
 import { DeploySuperchain2 } from "scripts/deploy/DeploySuperchain2.s.sol";
 import { DeployImplementations2 } from "scripts/deploy/DeployImplementations2.s.sol";
-import { DeployAltDA2 } from "scripts/deploy/DeployAltDA2.s.sol";
+import { DeployAltDA } from "scripts/deploy/DeployAltDA.s.sol";
 import { StandardConstants } from "scripts/deploy/StandardConstants.sol";
 
 // Libraries
@@ -181,8 +181,8 @@ contract Deploy is Deployer {
             if (typeHash == keccakHash) {
                 console.log("Deploying OP AltDA");
 
-                DeployAltDA2 da2 = new DeployAltDA2();
-                DeployAltDA2.Input memory dii = DeployAltDA2.Input({
+                DeployAltDA da = new DeployAltDA();
+                DeployAltDA.Input memory dii = DeployAltDA.Input({
                     salt: _implSalt(),
                     proxyAdmin: IProxyAdmin(artifacts.mustGetAddress("ProxyAdmin")),
                     challengeContractOwner: cfg.finalSystemOwner(),
@@ -192,7 +192,7 @@ contract Deploy is Deployer {
                     resolverRefundPercentage: cfg.daResolverRefundPercentage()
                 });
 
-                DeployAltDA2.Output memory dio = da2.run(dii);
+                DeployAltDA.Output memory dio = da.run(dii);
 
                 artifacts.save("DataAvailabilityChallengeProxy", address(dio.dataAvailabilityChallengeProxy));
                 artifacts.save("DataAvailabilityChallengeImpl", address(dio.dataAvailabilityChallengeImpl));