Mirror the private repo

matter-labs · Mar 11, 2024 · 14d15fc · 14d15fc
1 parent 650488b
commit 14d15fc
Show file tree

Hide file tree

Showing 247 changed files with 4,748 additions and 2,472 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,13 +1,11 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/
+# Compiled files and executables
+/target*/
 
 # These are backup files generated by rustfmt
 **/*.rs.bk
 
-# The LLVM framework source and build
+# The LLVM framework source
 /llvm/
-/target-llvm*/
 
 # External compilers
 /solc-bin/*
@@ -25,5 +23,5 @@
 /.idea/
 /.vscode/
 
-# CI
-/.github/
+# MacOS
+/**/.DS_Store
diff --git a/.gitmodules b/.gitmodules
@@ -6,7 +6,7 @@
 	path = solidity
 	url = https://github.com/ethereum/solidity
 	branch = develop
-[submodule "system-contracts"]
-	path = system-contracts
-	url = https://github.com/matter-labs/era-system-contracts
-	branch = main
+[submodule "era-contracts"]
+	path = era-contracts
+	url = https://github.com/matter-labs/era-contracts
+	branch = release-v20-1.4.1-short-term-fee-model