Merge pull request #267 from kroma-network/dev

feat: merge dev into main
kroma-network · Mar 4, 2024 · 0b56892 · 0b56892
2 parents f4acf90 + 8bd1b36
commit 0b56892
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.3
 	github.com/ethereum-optimism/optimism v1.4.0
 	github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20231212175319-52e98f4ad4d5
-	github.com/ethereum/go-ethereum v1.13.1
+	github.com/ethereum/go-ethereum v1.13.8
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb
 	github.com/google/go-cmp v0.6.0
@@ -198,4 +198,4 @@ require (
 
 replace github.com/ethereum-optimism/optimism v1.4.0 => ./
 
-replace github.com/ethereum/go-ethereum v1.13.1 => github.com/kroma-network/go-ethereum v0.4.3
+replace github.com/ethereum/go-ethereum v1.13.8 => github.com/kroma-network/go-ethereum v0.4.4
diff --git a/go.sum b/go.sum
@@ -398,8 +398,8 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kroma-network/go-ethereum v0.4.3 h1:/6m/4XK9kc/OcCegx1FrvNfkcb62b+UGPYdUFnEfhr0=
-github.com/kroma-network/go-ethereum v0.4.3/go.mod h1:SsK2EAbCigQsKUmhnHSe9KXrUEg2RKJcKFT2+/f2Q+M=
+github.com/kroma-network/go-ethereum v0.4.4 h1:7GvW/4Hj7N73BrL+k0MYav+kCI2aEpr7BPOrOkxyJLI=
+github.com/kroma-network/go-ethereum v0.4.4/go.mod h1:SsK2EAbCigQsKUmhnHSe9KXrUEg2RKJcKFT2+/f2Q+M=
 github.com/kroma-network/zktrie v0.5.1-0.20230420142222-950ce7a8ce84 h1:VpLCQx+tFV6Nk0hbs3Noyxma/q9wIDdyacKpGQWUMI8=
 github.com/kroma-network/zktrie v0.5.1-0.20230420142222-950ce7a8ce84/go.mod h1:w54LrYo5rJEV503BgMPRNONsLTOEQv5V87q+uYaw9sM=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=

diff --git a/kroma-validator/challenger.go b/kroma-validator/challenger.go
@@ -606,13 +606,13 @@ func (c *Challenger) HasEnoughDeposit(ctx context.Context) (bool, error) {
 	if err != nil {
 		return false, fmt.Errorf("failed to fetch deposit amount: %w", err)
 	}
+	c.metr.RecordDepositAmount(balance)
 
 	if balance.Cmp(c.requiredBondAmount) == -1 {
 		c.log.Warn("deposit is less than bond amount", "required", c.requiredBondAmount, "deposit", balance)
 		return false, nil
 	}
 	c.log.Info("deposit amount and bond amount", "deposit", balance, "bond", c.requiredBondAmount)
-	c.metr.RecordDepositAmount(balance)
 
 	return true, nil
 }

diff --git a/kroma-validator/l2_output_submitter.go b/kroma-validator/l2_output_submitter.go
@@ -277,6 +277,7 @@ func (l *L2OutputSubmitter) HasEnoughDeposit(ctx context.Context) (bool, error)
 	if err != nil {
 		return false, fmt.Errorf("failed to fetch deposit amount: %w", err)
 	}
+	l.metr.RecordDepositAmount(balance)
 
 	if balance.Cmp(l.requiredBondAmount) == -1 {
 		l.log.Warn(
@@ -287,7 +288,6 @@ func (l *L2OutputSubmitter) HasEnoughDeposit(ctx context.Context) (bool, error)
 		return false, nil
 	}
 	l.log.Info("deposit amount", "deposit", balance)
-	l.metr.RecordDepositAmount(balance)
 
 	return true, nil
 }

diff --git a/ops-devnet/docker-compose.yml b/ops-devnet/docker-compose.yml
@@ -31,7 +31,7 @@ services:
 
   l2:
     pid: host # allow debugging
-    image: kromanetwork/geth:v0.4.3
+    image: kromanetwork/geth:v0.4.4
     ports:
       - "9545:8545"
       - "9546:8546"

diff --git a/specs/span-batches.md b/specs/span-batches.md
@@ -126,7 +126,7 @@ Where:
     - `1`: ([EIP-2930]): `gasLimit`
     - `2`: ([EIP-1559]): `gas_limit`
   - `protected_bits`: standard bitlist of length of number of legacy transactions:
-    1 bit per L2 legacy transactions, indicating if transacion is protected([EIP-155]) or not.
+    1 bit per L2 legacy transactions, indicating if transaction is protected([EIP-155]) or not.
 
 Introduce version `2` to the [batch-format](./derivation.md#batch-format) table: