Merge pull request #2436 from OffchainLabs/stylus_pricing

update minInitGas for stylus v2

arbos/arbosState/arbosstate.go

@@ -321,7 +321,7 @@ func (state *ArbosState) UpgradeArbosVersion(
 		case 31:
 			params, err := state.Programs().Params()
 			ensure(err)
-			params.Version = 2
+			ensure(params.UpgradeToVersion(2))
 			ensure(params.Save())
 
 		default:

arbos/programs/params.go

@@ -5,6 +5,7 @@ package programs
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/log"
@@ -29,6 +30,8 @@ const initialExpiryDays = 365       // deactivate after 1 year.
 const initialKeepaliveDays = 31     // wait a month before allowing reactivation.
 const initialRecentCacheSize = 32   // cache the 32 most recent programs.
 
+const v2MinInitGas = 69 // charge 69 * 128 = 8832 gas (minCachedGas will also be charged in v2).
+
 const MinCachedGasUnits = 32 /// 32 gas for each unit
 const MinInitGasUnits = 128  // 128 gas for each unit
 const CostScalarPercent = 2  // 2% for each unit
@@ -137,6 +140,18 @@ func (p *StylusParams) Save() error {
 	return nil
 }
 
+func (p *StylusParams) UpgradeToVersion(version uint16) error {
+	if version != 2 {
+		return fmt.Errorf("dest version not supported for upgrade")
+	}
+	if p.Version != 1 {
+		return fmt.Errorf("existing version not supported for upgrade")
+	}
+	p.Version = 2
+	p.MinInitGas = v2MinInitGas
+	return nil
+}
+
 func initStylusParams(sto *storage.Storage) {
 	params := &StylusParams{
 		backingStorage:   sto,