Skip to content

Commit

Permalink
Merge pull request ethereum-optimism#11 from node-real/update_to_for_…
Browse files Browse the repository at this point in the history
…bsc_0.5

update to for_bsc 0.5
  • Loading branch information
keroro520 authored Apr 13, 2023
2 parents f7e1641 + 8fa4ea6 commit 250fbcb
Show file tree
Hide file tree
Showing 191 changed files with 6,196 additions and 1,530 deletions.
5 changes: 5 additions & 0 deletions .changeset/clever-jokes-notice.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/contracts-bedrock': patch
---

Reduce the time that the system dictator deploy scripts wait before checking the chain state.
5 changes: 5 additions & 0 deletions .changeset/cuddly-turkeys-burn.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@eth-optimism/sdk': patch
---

Have SDK automatically create Standard and ETH bridges when L1StandardBridge is provided.
5 changes: 0 additions & 5 deletions .changeset/flat-adults-hope.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/fluffy-geese-yell.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/long-frogs-study.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/metal-apes-taste.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/metal-feet-give.md

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
'@eth-optimism/contracts-bedrock': patch
---

Print tenderly simulation links during deployment
Added a contsructor to the System Dictator
5 changes: 0 additions & 5 deletions .changeset/poor-buses-hug.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/quiet-crews-leave.md

This file was deleted.

6 changes: 6 additions & 0 deletions .changeset/sharp-islands-attend.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
'@eth-optimism/batch-submitter-service': patch
---

fix flag name for MaxStateRootElements in batch-submitter
fix log package for proposer
5 changes: 0 additions & 5 deletions .changeset/sixty-days-explain.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/slimy-mangos-brake.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/three-apes-study.md

This file was deleted.

9 changes: 9 additions & 0 deletions .changeset/tricky-donkeys-lick.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@eth-optimism/chain-mon': patch
'@eth-optimism/data-transport-layer': patch
'@eth-optimism/fault-detector': patch
'@eth-optimism/message-relayer': patch
'@eth-optimism/replica-healthcheck': patch
---

Empty patch release to re-release packages that failed to be released by a bug in the release process.
15 changes: 9 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ jobs:
- "packages/migration-data/node_modules"
- "packages/replica-healthcheck/node_modules"
- "packages/sdk/node_modules"
- "packages/two-step-monitor/node_modules"
- run:
name: print forge version
command: forge --version
Expand Down Expand Up @@ -327,6 +326,8 @@ jobs:
name: Restore Yarn Package Cache
keys:
- yarn-packages-v2-{{ checksum "yarn.lock" }}
- check-changed:
patterns: contracts-bedrock,hardhat-deploy-config
- run:
name: lint
command: yarn lint:check
Expand Down Expand Up @@ -364,6 +365,8 @@ jobs:
name: Restore Yarn Package Cache
keys:
- yarn-packages-v2-{{ checksum "yarn.lock" }}
- check-changed:
patterns: contracts-bedrock,hardhat-deploy-config
- run:
name: validate spacers
command: yarn validate-spacers
Expand Down Expand Up @@ -515,6 +518,10 @@ jobs:
patterns: packages
# Note: The below needs to be manually configured whenever we
# add a new package to CI.
- run:
name: Check common-ts
command: npx depcheck
working_directory: packages/common-ts
- run:
name: Check contracts
command: npx depcheck
Expand All @@ -539,10 +546,6 @@ jobs:
name: Check integration-tests
command: npx depcheck
working_directory: integration-tests
- run:
name: Check two-step-monitor
command: npx depcheck
working_directory: packages/two-step-monitor

go-lint:
parameters:
Expand Down Expand Up @@ -607,7 +610,7 @@ jobs:
command: |
# Note: We don't use circle CI test splits because we need to split by test name, not by package. There is an additional
# constraint that gotestsum does not currently (nor likely will) accept files from different pacakges when building.
OP_TESTLOG_DISABLE_COLOR=true OP_E2E_DISABLE_PARALLEL=false OP_E2E_USE_HTTP=<<parameters.use_http>> gotestsum \
OP_TESTLOG_DISABLE_COLOR=true OP_E2E_DISABLE_PARALLEL=true OP_E2E_USE_HTTP=<<parameters.use_http>> gotestsum \
--format=standard-verbose --junitfile=/tmp/test-results/<<parameters.module>>_http_<<parameters.use_http>>.xml \
-- -timeout=20m ./...
working_directory: <<parameters.module>>
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
(The MIT License)

Copyright 2020-2022 Optimism
Copyright 2020-2023 Optimism

Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ If you want to build Optimism, check out the [Protocol Specs](./specs/).

## Community

General discussion happens most frequently on the [Optimism discord](https://discord.optimism.io).
General discussion happens most frequently on the [Optimism discord](https://discord-gateway.optimism.io).
Governance discussion can also be found on the [Optimism Governance Forum](https://gov.optimism.io/).

## Contributing
Expand Down Expand Up @@ -138,7 +138,7 @@ When merging commits to the `develop` branch you MUST include a changeset file i

To add a changeset, run the command `yarn changeset` in the root of this monorepo.
You will be presented with a small prompt to select the packages to be released, the scope of the release (major, minor, or patch), and the reason for the release.
Comments with in changeset files will be automatically included in the changelog of the package.
Comments within changeset files will be automatically included in the changelog of the package.

### Triggering Releases

Expand Down
2 changes: 1 addition & 1 deletion batch-submitter/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ func NewConfig(ctx *cli.Context) (Config, error) {
MaxL1TxSize: ctx.GlobalUint64(flags.MaxL1TxSizeFlag.Name),
MaxPlaintextBatchSize: ctx.GlobalUint64(flags.MaxPlaintextBatchSizeFlag.Name),
MinStateRootElements: ctx.GlobalUint64(flags.MinStateRootElementsFlag.Name),
MaxStateRootElements: ctx.GlobalUint64(flags.MinStateRootElementsFlag.Name),
MaxStateRootElements: ctx.GlobalUint64(flags.MaxStateRootElementsFlag.Name),
MaxBatchSubmissionTime: ctx.GlobalDuration(flags.MaxBatchSubmissionTimeFlag.Name),
PollInterval: ctx.GlobalDuration(flags.PollIntervalFlag.Name),
NumConfirmations: ctx.GlobalUint64(flags.NumConfirmationsFlag.Name),
Expand Down
2 changes: 1 addition & 1 deletion batch-submitter/drivers/proposer/driver.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ import (
"github.com/ethereum-optimism/optimism/bss-core/metrics"
"github.com/ethereum-optimism/optimism/bss-core/txmgr"
l2ethclient "github.com/ethereum-optimism/optimism/l2geth/ethclient"
"github.com/ethereum-optimism/optimism/l2geth/log"
"github.com/ethereum/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/log"
)

// stateRootSize is the size in bytes of a state root.
Expand Down
17 changes: 9 additions & 8 deletions docs/op-stack/src/.vuepress/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ module.exports = {
offset: -200,
},
algolia: {
appId: '7Q6XITDI0Z',
apiKey: '9d55a31a04b210cd26f97deabd161705',
appId: 'O9WKE9RMCV',
apiKey: '00cf17cba30b374d08d7f7afead974be',
indexName: 'optimism'
},
nav: [
Expand Down Expand Up @@ -117,7 +117,7 @@ module.exports = {
{
title: "OP Stack",
collapsable: false,
children: [
children: [
'/',
[
'/docs/understand/design-principles.md',
Expand All @@ -126,7 +126,7 @@ module.exports = {
'/docs/understand/landscape.md',
'/docs/understand/explainer.md'
]
},
},
{
title: "Releases",
collapsable: false,
Expand All @@ -150,6 +150,7 @@ module.exports = {
'/docs/build/getting-started.md',
'/docs/build/conf.md',
'/docs/build/explorer.md',
'/docs/build/sdk.md',
{
title: "OP Stack Hacks",
collapsable: true,
Expand All @@ -164,10 +165,10 @@ module.exports = {
title: "Sample Hacks",
children: [
"/docs/build/tutorials/add-attr.md",
"/docs/build/tutorials/new-precomp.md",
"/docs/build/tutorials/new-precomp.md",
]
} // End of tutorials
],
} // End of tutorials
],
}, // End of OP Stack hacks
],
}, // End of Building OP Stack Rollups
Expand All @@ -185,7 +186,7 @@ module.exports = {
'/docs/security/faq.md',
'/docs/security/policy.md',
]
},
},
], // end of sidebar
plugins: [
"@vuepress/pwa",
Expand Down
14 changes: 14 additions & 0 deletions docs/op-stack/src/.vuepress/enhanceApp.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
import event from '@vuepress/plugin-pwa/lib/event'

export default ({ router }) => {
registerAutoReload();

router.addRoutes([
{ path: '/docs/', redirect: '/' },
])
}

// When new content is detected by the app, this will automatically
// refresh the page, so that users do not need to manually click
// the refresh button. For more details see:
// https://linear.app/optimism/issue/FE-1003/investigate-archive-issue-on-docs
const registerAutoReload = () => {
event.$on('sw-updated', e => e.skipWaiting().then(() => {
location.reload(true);
}))
}
20 changes: 11 additions & 9 deletions docs/op-stack/src/.vuepress/styles/index.styl
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ aside.sidebar {
p.sidebar-heading {
color: #323A43 !important;
font-family: 'Open Sans', sans-serif;
font-weight: 600;
font-weight: 600 !important;
font-size: 14px !important;
line-height: 24px !important;
min-height: 36px;
margin-left: 32px;
margin-left: 20px;
padding: 8px 16px !important;
width: calc(100% - 64px) !important;
width: calc(100% - 60px) !important;
border-radius: 8px;
}

Expand All @@ -34,18 +34,20 @@ a.sidebar-link {
font-size: 14px !important;
line-height: 24px !important;
min-height: 36px;
margin-left: 32px;
margin-top: 3px;
margin-left: 20px;
padding: 8px 16px !important;
width: calc(100% - 64px) !important;
width: calc(100% - 60px) !important;
border-radius: 8px;
}

section.sidebar-group a.sidebar-link {
margin-left: 44px;
width: calc(100% - 64px) !important;
section.sidebar-group a.sidebar-link,
section.sidebar-group p.sidebar-heading.clickable {
margin-left: 32px;
width: calc(100% - 60px) !important;
}

.sidebar-links:not(.sidebar-group-items) > li > a.sidebar-link {
.sidebar-links:not(.sidebar-group-items) > li > a.sidebar-link {
font-weight: 600 !important;
color: #323A43 !important;
}
Expand Down
5 changes: 5 additions & 0 deletions docs/op-stack/src/.vuepress/theme/components/PageMeta.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@
<i class="fab fa-discord"></i> Discord community
</a>
</li>
<li>
<a href="https://wkf.ms/3XTdpLl" target="_blank" rel="noopener noreferrer">
<i class="far fa-comment-dots"></i> Get support for going live
</a>
</li>
</ul>
</div>
</div>
Expand Down
Binary file modified docs/op-stack/src/assets/docs/understand/superchain-diag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 250fbcb

Please sign in to comment.