Merge branch 'updates/garaga-cairo'

OilerNetwork · Jan 7, 2025 · 194cd1d · 194cd1d
2 parents a91d075 + c29324e
commit 194cd1d
Show file tree

Hide file tree

Showing 47 changed files with 1,968 additions and 2,168 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,44 +1,2 @@
-# [source.crates-io]
-# replace-with = "vendored-sources"
-
-# [source."git+https://github.com/ametel01/eth-rlp-verify.git"]
-# git = "https://github.com/ametel01/eth-rlp-verify.git"
-# replace-with = "vendored-sources"
-
-# [source."git+https://github.com/ametel01/garaga.git"]
-# git = "https://github.com/ametel01/garaga.git"
-# replace-with = "vendored-sources"
-
-# [source."git+https://github.com/ametel01/rust-accumulators.git?branch=feat/sha2-hasher"]
-# git = "https://github.com/ametel01/rust-accumulators.git"
-# branch = "feat/sha2-hasher"
-# replace-with = "vendored-sources"
-
-# [source."git+https://github.com/lambdaclass/lambdaworks.git"]
-# git = "https://github.com/lambdaclass/lambdaworks.git"
-# replace-with = "vendored-sources"
-
-# [source."git+https://github.com/risc0/RustCrypto-hashes.git?tag=sha2-v0.10.8-risczero.0"]
-# git = "https://github.com/risc0/RustCrypto-hashes.git"
-# tag = "sha2-v0.10.8-risczero.0"
-# replace-with = "vendored-sources"
-
-# [source."git+https://github.com/risc0/risc0-ethereum?tag=v1.1.4"]
-# git = "https://github.com/risc0/risc0-ethereum"
-# tag = "v1.1.4"
-# replace-with = "vendored-sources"
-
-# [source."git+https://github.com/xJonathanLEI/starknet-rs.git?branch=master"]
-# git = "https://github.com/xJonathanLEI/starknet-rs.git"
-# branch = "master"
-# replace-with = "vendored-sources"
-
-# [source."git+https://github.com/OpenZeppelin/openzeppelin-contracts.git"]
-# git = "https://github.com/OpenZeppelin/openzeppelin-contracts.git"
-# replace-with = "vendored-sources"
-
-# [source.vendored-sources]
-# directory = "vendor"
-
-# [net]
-# git-fetch-with-cli = true
+[net]
+git-fetch-with-cli = true
diff --git a/.dockerignore b/.dockerignore
@@ -26,7 +26,7 @@ docker/
 debug/
 
 # Development configs
-.env*
+# .env*
 *.local
 .editorconfig
 .eslintrc*

diff --git a/.gitignore b/.gitignore
@@ -28,8 +28,14 @@ scripts/katana/katana.log
 vendor/
 .env.*
 
+.env.local
+.env.sepolia
+.env.mainnet
+.env.docker
 docker/rebuild-all.sh
 
 contracts/starknet/account-sepolia
 
 contracts/starknet/keystore
+
+terminal
diff --git a/.gitmodules b/.gitmodules
@@ -2,6 +2,3 @@
 	path = contracts/ethereum/lib/forge-std
 	url = https://github.com/foundry-rs/forge-std.git
 	shallow = true
-[submodule "contracts/starknet/garaga"]
-	path = contracts/starknet/garaga
-	url = [email protected]:ametel01/garaga.git
diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,3 @@
-scarb 2.8.5
-starknet-foundry 0.34.0
+scarb 2.9.1
+starknet-foundry 0.35.1
+starkli 0.3.6
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,7 @@ docker/ @@
     debug/
     # Development configs
-    .env*
+    # .env*
     *.local
     .editorconfig
     .eslintrc*
@@ Expand Down @@