ci: update to ci-builder 0.41.0 (#9313)

* ci: update to ci-builder 0.41.0

Updates ci-builder to the latest release

PR to update to latest foundry: https://github.com/ethereum-optimism/optimism/pull/9311
Tag service: https://github.com/ethereum-optimism/optimism/actions/runs/7750682174/job/21137300601
Release in circleci: https://app.circleci.com/pipelines/github/ethereum-optimism/optimism/43501/workflows/b0cedd5b-d439-49b2-b568-b137ca02e23c

* op-chain-ops: hack fix for state serialization

An update to foundry must change the way that the state dump
is serialized as there is a panic with the genesis json parsing.
Adds a simple hack for handling it.

* typo: fix

.circleci/config.yml

@@ -3,7 +3,7 @@ version: 2.1
 parameters:
   ci_builder_image:
     type: string
-    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.40.0
+    default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:v0.41.0
   base_image:
     type: string
     default: ubuntu-2204:2022.07.1

op-chain-ops/genesis/config.go

@@ -733,13 +733,55 @@ func NewStateDump(path string) (*gstate.Dump, error) {
 		return nil, fmt.Errorf("dump at %s not found: %w", path, err)
 	}
 
-	var dump gstate.Dump
-	if err := json.Unmarshal(file, &dump); err != nil {
+	var fdump ForgeDump
+	if err := json.Unmarshal(file, &fdump); err != nil {
 		return nil, fmt.Errorf("cannot unmarshal dump: %w", err)
 	}
+	dump := (gstate.Dump)(fdump)
 	return &dump, nil
 }
 
+// ForgeDump is a simple alias for state.Dump that can read "nonce" as a hex string.
+// It appears as if updates to foundry have changed the serialization of the state dump.
+type ForgeDump gstate.Dump
+
+func (d *ForgeDump) UnmarshalJSON(b []byte) error {
+	type forgeDumpAccount struct {
+		Balance   string                 `json:"balance"`
+		Nonce     hexutil.Uint64         `json:"nonce"`
+		Root      hexutil.Bytes          `json:"root"`
+		CodeHash  hexutil.Bytes          `json:"codeHash"`
+		Code      hexutil.Bytes          `json:"code,omitempty"`
+		Storage   map[common.Hash]string `json:"storage,omitempty"`
+		Address   *common.Address        `json:"address,omitempty"`
+		SecureKey hexutil.Bytes          `json:"key,omitempty"`
+	}
+	type forgeDump struct {
+		Root     string                              `json:"root"`
+		Accounts map[common.Address]forgeDumpAccount `json:"accounts"`
+	}
+	var dump forgeDump
+	if err := json.Unmarshal(b, &dump); err != nil {
+		return err
+	}
+
+	d.Root = dump.Root
+	d.Accounts = make(map[common.Address]gstate.DumpAccount)
+	for addr, acc := range dump.Accounts {
+		d.Accounts[addr] = gstate.DumpAccount{
+			Balance:   acc.Balance,
+			Nonce:     (uint64)(acc.Nonce),
+			Root:      acc.Root,
+			CodeHash:  acc.CodeHash,
+			Code:      acc.Code,
+			Storage:   acc.Storage,
+			Address:   acc.Address,
+			SecureKey: acc.SecureKey,
+		}
+	}
+	return nil
+}
+
 // NewL2ImmutableConfig will create an ImmutableConfig given an instance of a
 // DeployConfig and a block.
 func NewL2ImmutableConfig(config *DeployConfig, block *types.Block) (*immutables.PredeploysImmutableConfig, error) {