Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream 20230828 #32

Merged
merged 12 commits into from
Aug 29, 2023
Merged

Conversation

jyellick
Copy link

Simple upstream merge, on time finally!

@jyellick jyellick changed the title Jyellick/merge upstream 20230828 Merge upstream 20230828 Aug 28, 2023
@codecov-commenter
Copy link

codecov-commenter commented Aug 28, 2023

Codecov Report

Merging #32 (7bed25c) into boba-develop (4f2f886) will increase coverage by 0.00%.
The diff coverage is 93.33%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files

Impacted file tree graph

@@              Coverage Diff              @@
##           boba-develop      #32   +/-   ##
=============================================
  Coverage         45.73%   45.74%           
=============================================
  Files               388      388           
  Lines             30462    30474   +12     
  Branches           1692     1692           
=============================================
+ Hits              13933    13941    +8     
- Misses            15040    15041    +1     
- Partials           1489     1492    +3     
Flag Coverage Δ
bedrock-go-tests 48.79% <93.33%> (+<0.01%) ⬆️
cannon-go-tests 64.62% <ø> (ø)
chain-mon-tests 26.95% <ø> (ø)
common-ts-tests 26.82% <ø> (ø)
contracts-bedrock-tests ∅ <ø> (∅)
contracts-ts-tests 6.88% <ø> (ø)
core-utils-tests 44.24% <ø> (ø)
sdk-next-tests 41.75% <ø> (ø)
sdk-tests 41.75% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
op-challenger/fault/service.go 20.28% <0.00%> (ø)
op-challenger/challenger.go 44.44% <100.00%> (+44.44%) ⬆️
op-challenger/config/config.go 90.52% <100.00%> (+0.41%) ⬆️
op-challenger/fault/scheduler/scheduler.go 88.46% <100.00%> (ø)
op-challenger/flags/flags.go 94.94% <100.00%> (+0.26%) ⬆️

... and 3 files with indirect coverage changes

@mmontour1306
Copy link

I did a clean checkout from github. "make" was successful.

"make devnet-up" first failed because my system's Python version happens to be 3.8 but there is an undeclared dependency on python 3.9. I made that change in my local copy of the Makefile.

Next failure: "failed to write to "/home/enya/v3-anchorage/packages/contracts-bedrock/deployments/devnetL1/.chainId": No such file or directory (os error 2)". Previously reported, fixed by "mkdir -p /home/enya/v3-anchorage/packages/contracts-bedrock/deployments/devnetL1" and then re-running the command.

Next failure:
Error:
Cannon prestate dump not found, generate it with make cannon-prestate in the monorepo root.

Next failure after running the requested command + another "make devnet-up":
⠿ Container ops-bedrock-l1-1 Starting 0.1s
Error response from daemon: driver failed programming external connectivity on endpoint ops-bedrock-l1-1 (bd4c4c190a875f692f69d92987615fab1f43db3e6a32f2484e2304c7d5c45b3c): Error starting userland proxy: listen tcp4 0.0.0.0:8545: bind: address already in use

One of the previous failures left a 'geth' process running in the background, occupying TCP port 8545. This one can probably be ignored as it won't happen after the previous problems are fixed.

After manually killing the stray 'geth' process, "make devnet-up" is now able to bring up a local stack.

"git status" now shows modifications to packages/contracts-bedrock/deploy-config/devnetL1.json:

diff --git a/packages/contracts-bedrock/deploy-config/devnetL1.json b/packages/contracts-bedrock/deploy-config/devnetL1.json
index 4236e65c7..4a70be074 100644
--- a/packages/contracts-bedrock/deploy-config/devnetL1.json
+++ b/packages/contracts-bedrock/deploy-config/devnetL1.json
@@ -41,10 +41,10 @@
   "governanceTokenOwner": "0xa0Ee7A142d267C1f36714E4a8F75612F20a79720",
   "eip1559Denominator": 50,
   "eip1559Elasticity": 6,
-  "l1GenesisBlockTimestamp": "0x64c811bf",
+  "l1GenesisBlockTimestamp": "0x64ecfe64",
   "l2GenesisRegolithTimeOffset": "0x0",
   "faultGameAbsolutePrestate": "0x41c7ae758795765c6664a5d39bf63841c71ff191e9189522bad8ebff5d4eca98",
   "faultGameMaxDepth": 30,
   "faultGameMaxDuration": 300,
   "systemConfigStartBlock": 0
-}
+}
\ No newline at end of file

@jyellick jyellick merged commit 43b6dcd into boba-develop Aug 29, 2023
@jyellick jyellick deleted the jyellick/merge-upstream-20230828 branch September 1, 2023 13:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants