Commit ef2fd41a authored by mergify[bot]'s avatar mergify[bot] Committed by GitHub

Merge branch 'develop' into fix/yarnlock

parents b0e052fc 24ec5fef
# Legacy codebases # Legacy codebases
/batch-submitter @mslipper @tynes /batch-submitter @ethereum-optimism/legacy-reviewers
/bss-core @mslipper @tynes /bss-core @ethereum-optimism/legacy-reviewers
/gas-oracle @tynes @smartcontracts /gas-oracle @ethereum-optimism/legacy-reviewers
/integration-tests @mslipper @tynes /integration-tests @ethereum-optimism/legacy-reviewers
/l2geth @tynes @smartcontracts /l2geth @ethereum-optimism/legacy-reviewers
/l2geth-exporter @tynes @smartcontracts /l2geth-exporter @ethereum-optimism/legacy-reviewers
/packages/actor-tests @mslipper /packages/actor-tests @ethereum-optimism/legacy-reviewers
/packages/common-ts @tynes @smartcontracts /packages/common-ts @ethereum-optimism/typescript-reviewers
/packages/contracts @tynes @smartcontracts @maurelian /packages/contracts @ethereum-optimism/contract-reviewers
/packages/contracts-bedrock @tynes @smartcontracts @maurelian /packages/contracts-bedrock @ethereum-optimism/contract-reviewers
/packages/contracts-periphery @tynes @smartcontracts @maurelian /packages/contracts-periphery @ethereum-optimism/contract-reviewers
/packages/core-utils @tynes @smartcontracts /packages/core-utils @ethereum-optimism/legacy-reviewers
/packages/data-transport-layer @tynes @smartcontracts /packages/data-transport-layer @ethereum-optimism/legacy-reviewers
/packages/drippie-mon @smartcontracts /packages/drippie-mon @smartcontracts
/packages/fault-detector @tynes @smartcontracts /packages/fault-detector @ethereum-optimism/legacy-reviewers
/packages/hardhat-deploy-config @tynes @smartcontracts @maurelian /packages/hardhat-deploy-config @ethereum-optimism/legacy-reviewers
/packages/message-relayer @tynes @smartcontracts /packages/message-relayer @ethereum-optimism/legacy-reviewers
/packages/migration-data @tynes @smartcontracts @mslipper /packages/migration-data @ethereum-optimism/legacy-reviewers
/packages/replica-healthcheck @tynes @smartcontracts @mslipper /packages/replica-healthcheck @ethereum-optimism/legacy-reviewers
/packages/sdk @smartcontracts @roninjin10 @nickbalestra /packages/sdk @ethereum-optimism/ecopod
# Bedrock codebases # Bedrock codebases
/bedrock-devnet @mslipper /bedrock-devnet @ethereum-optimism/go-reviewers
/op-batcher @protolambda @trianglesphere /op-batcher @ethereum-optimism/go-reviewers
/op-chain-ops @protolambda @trianglesphere @tynes @mslipper /op-chain-ops @ethereum-optimism/go-reviewers
/op-e2e @protolambda @trianglesphere @tynes @mslipper /op-e2e @ethereum-optimism/go-reviewers
/op-node @protolambda @trianglesphere /op-node @ethereum-optimism/go-reviewers
/op-proposer @protolambda @trianglesphere /op-proposer @ethereum-optimism/go-reviewers
/op-service @protolambda @trianglesphere @mslipper /op-service @ethereum-optimism/go-reviewers
# Ops # Ops
/.circleci @mslipper @zhwrd @trianglesphere /.circleci @ethereum-optimism/infra-reviewers
/.github @mslipper @zhwrd /.github @ethereum-optimism/infra-reviewers
/ops @mslipper @zhwrd /ops @ethereum-optimism/infra-reviewers
/ops-bedrock @mslipper @zhwrd /ops-bedrock @ethereum-optimism/infra-reviewers
# Misc # Misc
/proxyd @mslipper @Inphi @tynes /proxyd @ethereum-optimism/infra-reviewers
/indexer @mslipper @nickbalestra @roninjin10 /indexer @ethereum-optimism/infra-reviewers
/infra @mslipper @zhwrd /infra @ethereum-optimism/infra-reviewers
/specs @trianglesphere @tynes @protolambda @smartcontracts @maurelian /specs @ethereum-optimism/contract-reviewers @ethereum-optimism/go-reviewers
/endpoint-monitor @zhwrd /endpoint-monitor @ethereum-optimism/infra-reviewers
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
"devDependencies": { "devDependencies": {
"@types/cors": "^2.8.9", "@types/cors": "^2.8.9",
"@types/levelup": "^4.3.0", "@types/levelup": "^4.3.0",
"@types/level": "^6.0.1",
"bfj": "^7.0.2", "bfj": "^7.0.2",
"chai-as-promised": "^7.1.1", "chai-as-promised": "^7.1.1",
"hardhat": "^2.9.6", "hardhat": "^2.9.6",
......
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
<!-- END doctoc generated TOC please keep comment here to allow auto update --> <!-- END doctoc generated TOC please keep comment here to allow auto update -->
[Deposited transaction](./glossary.md#deposited-transaction) are transactions on L2 that are [Deposited transaction](./glossary.md#deposited-transaction) are transactions on L2 that are
initiated on L1. The gas that they use on L2 is bought on L1 via a gas burn or a direct payment. We initiated on L1. The gas that they use on L2 is bought on L1 via a gas burn (or a direct payment
maintain a fee market and hard cap on the amount of gas provided to all deposits in a single L1 in the future). We maintain a fee market and hard cap on the amount of gas provided to all deposits
block. in a single L1 block.
The gas provided to deposited transactions is sometimes called "guaranteed gas". The gas provided to The gas provided to deposited transactions is sometimes called "guaranteed gas". The gas provided to
deposited transactions is unique in the regard that it is not refundable. It cannot be refunded as deposited transactions is unique in the regard that it is not refundable. It cannot be refunded as
...@@ -56,9 +56,9 @@ at a multiple of the target, we enable deposits to temporarily use more L2 gas a ...@@ -56,9 +56,9 @@ at a multiple of the target, we enable deposits to temporarily use more L2 gas a
# the ability of the account to afford this gas. # the ability of the account to afford this gas.
BASE_FEE_MAX_CHANGE_DENOMINATOR = 8 BASE_FEE_MAX_CHANGE_DENOMINATOR = 8
ELASTICITY_MULTIPLIER = 4 ELASTICITY_MULTIPLIER = 4
MAX_RESOURCE_LIMIT = 8,000,000 MAX_RESOURCE_LIMIT = 8_000_000
TARGET_RESOURCE_LIMIT = MAX_RESOURCE_LIMIT / ELASTICITY_MULTIPLIER TARGET_RESOURCE_LIMIT = MAX_RESOURCE_LIMIT / ELASTICITY_MULTIPLIER
MINIMUM_BASEFEE=10000 MINIMUM_BASEFEE = 10000
# prev_basefee is a u128, prev_bought_gas and prev_num are u64s # prev_basefee is a u128, prev_bought_gas and prev_num are u64s
prev_basefee, prev_bought_gas, prev_num = <values from previous update> prev_basefee, prev_bought_gas, prev_num = <values from previous update>
...@@ -108,6 +108,10 @@ store_values(now_basefee, now_bought_gas, now_num) ...@@ -108,6 +108,10 @@ store_values(now_basefee, now_bought_gas, now_num)
## Rationale for burning L1 Gas ## Rationale for burning L1 Gas
There must be a sybil resistance mechanism for usage of the network. If it is very cheap to get
guaranteed gas on L2, then it would be possible to spam the network. Burning a dynamic amount
of gas on L1 acts as a sybil resistance mechanism as it becomes more expensive with more demand.
If we collect ETH directly to pay for L2 gas, every (indirect) caller of the deposit function will need If we collect ETH directly to pay for L2 gas, every (indirect) caller of the deposit function will need
to be marked with the payable selector. This won't be possible for many existing projects. Unfortunately to be marked with the payable selector. This won't be possible for many existing projects. Unfortunately
this is quite wasteful. As such, we will provide two options to buy L2 gas: this is quite wasteful. As such, we will provide two options to buy L2 gas:
......
...@@ -3703,6 +3703,14 @@ ...@@ -3703,6 +3703,14 @@
resolved "https://registry.yarnpkg.com/@types/dateformat/-/dateformat-5.0.0.tgz#17ce64b0318f3f36d1c830c58a7a915445f1f93d" resolved "https://registry.yarnpkg.com/@types/dateformat/-/dateformat-5.0.0.tgz#17ce64b0318f3f36d1c830c58a7a915445f1f93d"
integrity sha512-SZg4JdHIWHQGEokbYGZSDvo5wA4TLYPXaqhigs/wH+REDOejcJzgH+qyY+HtEUtWOZxEUkbhbdYPqQDiEgrXeA== integrity sha512-SZg4JdHIWHQGEokbYGZSDvo5wA4TLYPXaqhigs/wH+REDOejcJzgH+qyY+HtEUtWOZxEUkbhbdYPqQDiEgrXeA==
"@types/encoding-down@*":
version "5.0.1"
resolved "https://registry.yarnpkg.com/@types/encoding-down/-/encoding-down-5.0.1.tgz#5527b8656395b274bf0100a312c1c620a7880a24"
integrity sha512-1O8CyIC67hMR+VuxLtjlJvXwNn5cNnJ7YiaBR4p+ONGijlmIZjbXzsPuJm146p9eQZwzZRGgmRwWtCqXs5wwSw==
dependencies:
"@types/abstract-leveldown" "*"
"@types/level-codec" "*"
"@types/express-serve-static-core@^4.17.18": "@types/express-serve-static-core@^4.17.18":
version "4.17.24" version "4.17.24"
resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07"
...@@ -3747,11 +3755,34 @@ ...@@ -3747,11 +3755,34 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
"@types/level-codec@*":
version "9.0.1"
resolved "https://registry.yarnpkg.com/@types/level-codec/-/level-codec-9.0.1.tgz#b135e0b3da81185b6f27655334c5f1da89b2b0af"
integrity sha512-6z7DSlBsmbax3I/bV1Q6jT1nKquDjFl95LURVThdKtwILkRawLYtXdINW19xM95N5kqN2detWb2iGrbUlPwNyw==
"@types/level-errors@*": "@types/level-errors@*":
version "3.0.0" version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/level-errors/-/level-errors-3.0.0.tgz#15c1f4915a5ef763b51651b15e90f6dc081b96a8" resolved "https://registry.yarnpkg.com/@types/level-errors/-/level-errors-3.0.0.tgz#15c1f4915a5ef763b51651b15e90f6dc081b96a8"
integrity sha512-/lMtoq/Cf/2DVOm6zE6ORyOM+3ZVm/BvzEZVxUhf6bgh8ZHglXlBqxbxSlJeVp8FCbD3IVvk/VbsaNmDjrQvqQ== integrity sha512-/lMtoq/Cf/2DVOm6zE6ORyOM+3ZVm/BvzEZVxUhf6bgh8ZHglXlBqxbxSlJeVp8FCbD3IVvk/VbsaNmDjrQvqQ==
"@types/level@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/@types/level/-/level-6.0.1.tgz#6642c048dbae4638721105cd5f8255a2829bd5d6"
integrity sha512-4RK6vl9/CNCe5SyDCGaTgTOYEPNh8/wUaUY8UDN8AXon2D7hGPGIlx0t9jCds9wiKBqicsUyeAA0W4rUZeqYBQ==
dependencies:
"@types/abstract-leveldown" "*"
"@types/encoding-down" "*"
"@types/levelup" "*"
"@types/levelup@*":
version "5.1.2"
resolved "https://registry.yarnpkg.com/@types/levelup/-/levelup-5.1.2.tgz#3b987fe66c95871dc97e74f0bce5b2eb91140782"
integrity sha512-JhCKONvFg2rEbsyyCCRkiPF03tMV1NyBXER4iXKBemgjwS4+SF6HGNuL4cfq6ueM6Yc+4ZbwJnU/5v6q3ZziUQ==
dependencies:
"@types/abstract-leveldown" "*"
"@types/level-errors" "*"
"@types/node" "*"
"@types/levelup@^4.3.0": "@types/levelup@^4.3.0":
version "4.3.3" version "4.3.3"
resolved "https://registry.yarnpkg.com/@types/levelup/-/levelup-4.3.3.tgz#4dc2b77db079b1cf855562ad52321aa4241b8ef4" resolved "https://registry.yarnpkg.com/@types/levelup/-/levelup-4.3.3.tgz#4dc2b77db079b1cf855562ad52321aa4241b8ef4"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment