Skip to content

Commit 6bbd722

Browse files
Merge branch 'develop'
2 parents 03db7be + a920410 commit 6bbd722

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

packages/admin-ui/src/pages/rollups/components/Optimism.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ export default function Optimism({ description }: { description: string }) {
172172
</Col>
173173

174174
<Col>
175-
<SubTitle>Legacy Geth</SubTitle>
175+
<SubTitle>Optional Modules</SubTitle>
176176
<LegacyGeth
177177
archive={currentOptimismConfigReq.data.archive}
178178
setNewArchive={setNewArchive}

packages/admin-ui/src/pages/rollups/components/useOptimismConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ function getChanges({
152152
if (
153153
executionClient?.dnpName === newExecClient?.dnpName &&
154154
Boolean(rollup) === Boolean(newRollup) &&
155-
Boolean(archive) === Boolean(newArchive) &&
155+
Boolean(archive?.isSelected) === Boolean(newArchive) &&
156156
rollup?.mainnetRpcUrl === customMainnetRpcUrl
157157
)
158158
return {

packages/dappmanager/src/modules/chains/drivers/ethereum.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ export async function ethereum(
4747
const provider = new ethers.providers.JsonRpcProvider(apiUrl);
4848
const [syncing, peersCount, blockNumber] = await Promise.all([
4949
provider.send("eth_syncing", []).then(parseEthersSyncing),
50-
provider.send("net_peerCount", []).then(parseInt),
50+
// net_peerCount is not always available. OP Erigon does not support it
51+
// Not logging error because it would flood the logs
52+
provider.send("net_peerCount", []).then(parseInt).catch(() => undefined),
5153
provider.getBlockNumber()
5254
]);
5355

@@ -61,7 +63,7 @@ export async function ethereum(
6163
export function parseEthereumState(
6264
syncing: EthSyncing,
6365
blockNumber: number,
64-
peersCount: number
66+
peersCount?: number
6567
): ChainDataResult {
6668
if (syncing) {
6769
const {

0 commit comments

Comments
 (0)