feat: merge release/v1.0.3-base to main

.github/semantic.yml

@@ -0,0 +1,48 @@
+# Config file for Semantic PRs
+# See https://github.com/Ezard/semantic-prs
+
+# Validate the PR title and all commit messages
+titleAndCommits: true
+
+# If commitsOnly or titleAndCommits is set to true, then only a single commit needs to pass validation instead of every commit
+# If neither of those options are set to true then this option is ignored
+anyCommit: true
+
+# The values allowed for the "type" part of the PR title/commit message. e.g. for a PR title/commit message of "feat: add some stuff", the type would be "feat"
+types:
+  - build
+  - chore
+  - ci
+  - docs
+  - feat
+  - fix
+  - perf
+  - refac
+  - test
+
+# The values allowed for the "scope" part of the PR title/commit message. e.g. for a PR title/commit message of "feat(awesome-feature): add some stuff", the type would be "awesome-feature"
+scopes:
+  - batcher
+  - chain-ops
+  - common-ts
+  - contracts
+  - core-utils
+  - e2e
+  - hardhat-deploy-config
+  - monitoring
+  - node
+  - service
+  - sdk
+  - signer
+  - validator
+
+# Allow merge commits (e.g. 'Merge branch "master" into fix/delete-all-tests')
+# If neither of commitsOnly or titleAndCommits is set to true then this option is ignored
+allowMergeCommits: true
+
+# Allow revert commits (e.g. 'Revert "fix: delete all tests"')
+# If neither of commitsOnly or titleAndCommits is set to true then this option is ignored
+allowRevertCommits: true
+
+# Allows a custom URL for the "Details" link (which appears next to the success/failure message from the app) to be specified
+targetUrl: https://github.com/kroma-network/kroma/blob/dev/.gitmessage

FORK.md

@@ -10,6 +10,10 @@
 
 - <https://github.com/ethereum-optimism/optimism/commit/af736c12e36e93fb30efdccd8d663f445b0bc7a8>
 
+### Engine P2P Sync
+
+- <https://github.com/ethereum-optimism/optimism/pull/6243>
+
 ### Others
 
 - <https://github.com/ethereum-optimism/optimism/pull/5106>

bindings/Makefile

@@ -22,7 +22,6 @@ bindings: basefee-vault-bindings \
 		l2-output-oracle-bindings \
 		l2-standard-bridge-bindings \
 		l2-to-l1-message-passer-bindings \
-		proposer-fee-vault-bindings \
 		proxy-admin-bindings \
 		proxy-bindings \
 		security-council-bindings \
@@ -31,6 +30,7 @@ bindings: basefee-vault-bindings \
 		timelock-bindings \
 		upgrade-governor-bindings \
 		validator-pool-bindings \
+		validator-reward-vault-bindings \
 		weth9-bindings \
 		zk-merkle-trie-bindings \
 		zk-verifier-bindings
@@ -113,7 +113,7 @@ l1-erc721-bridge-bindings: compile
 	bash ./gen_bindings.sh contracts/L1/L1ERC721Bridge.sol:L1ERC721Bridge $(pkg)
 
 l1-fee-vault-bindings: compile
-	bash ./gen_bindings.sh contracts/L2/ProposerRewardVault.sol:ProposerRewardVault $(pkg)
+	bash ./gen_bindings.sh contracts/L2/L1FeeVault.sol:L1FeeVault $(pkg)
 
 l1-standard-bridge-bindings: compile
 	bash ./gen_bindings.sh contracts/L1/L1StandardBridge.sol:L1StandardBridge $(pkg)
@@ -133,9 +133,6 @@ l2-standard-bridge-bindings: compile
 l2-to-l1-message-passer-bindings: compile
 	bash ./gen_bindings.sh contracts/L2/L2ToL1MessagePasser.sol:L2ToL1MessagePasser $(pkg)
 
-proposer-fee-vault-bindings: compile
-	bash ./gen_bindings.sh contracts/L2/ValidatorRewardVault.sol:ValidatorRewardVault $(pkg)
-
 proxy-admin-bindings: compile
 	bash ./gen_bindings.sh contracts/universal/ProxyAdmin.sol:ProxyAdmin $(pkg)
 
@@ -160,6 +157,9 @@ upgrade-governor-bindings: compile
 validator-pool-bindings: compile
 	bash ./gen_bindings.sh contracts/L1/ValidatorPool.sol:ValidatorPool $(pkg)
 
+validator-reward-vault-bindings: compile
+	bash ./gen_bindings.sh contracts/L2/ValidatorRewardVault.sol:ValidatorRewardVault $(pkg)
+
 weth9-bindings: compile
 	bash ./gen_bindings.sh contracts/vendor/WETH9.sol:WETH9 $(pkg)