dev: remove succinct contracts (#115)

* remove succinct contracts * fmt * update imports for succinct * update syntax tests
keep-starknet-strange · Mar 13, 2024 · 9ddde78 · 9ddde78
1 parent 84060c2
commit 9ddde78
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 1,259 deletions.
diff --git a/Scarb.lock b/Scarb.lock
@@ -4,7 +4,7 @@ version = 1
 [[package]]
 name = "alexandria_bytes"
 version = "0.1.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=8ddf0243#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
 dependencies = [
  "alexandria_data_structures",
  "alexandria_math",
@@ -13,15 +13,15 @@ dependencies = [
 [[package]]
 name = "alexandria_data_structures"
 version = "0.2.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=8ddf0243#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
 dependencies = [
  "alexandria_encoding",
 ]
 
 [[package]]
 name = "alexandria_encoding"
 version = "0.1.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=8ddf0243#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
 dependencies = [
  "alexandria_math",
  "alexandria_numeric",
@@ -30,15 +30,15 @@ dependencies = [
 [[package]]
 name = "alexandria_math"
 version = "0.2.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=8ddf0243#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
 dependencies = [
  "alexandria_data_structures",
 ]
 
 [[package]]
 name = "alexandria_numeric"
 version = "0.1.0"
-source = "git+https://github.com/keep-starknet-strange/alexandria.git#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
+source = "git+https://github.com/keep-starknet-strange/alexandria.git?rev=8ddf0243#8ddf02430dfe04656ed5bf1b99de7024da1aef41"
 dependencies = [
  "alexandria_math",
 ]
@@ -51,6 +51,7 @@ dependencies = [
  "alexandria_math",
  "openzeppelin",
  "snforge_std",
+ "succinct_sn",
 ]
 
 [[package]]
@@ -62,3 +63,13 @@ source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?rev=2815498#28
 name = "snforge_std"
 version = "0.17.0"
 source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.17.0#63f7f0b533a3d852e2b60214e0f40b99c9dcbb26"
+
+[[package]]
+name = "succinct_sn"
+version = "0.1.0"
+source = "git+https://github.com/keep-starknet-strange/succinct-starknet.git#33bfd3d3d31a136a36fa9432439de31808b9424c"
+dependencies = [
+ "alexandria_bytes",
+ "openzeppelin",
+ "snforge_std",
+]
diff --git a/Scarb.toml b/Scarb.toml
@@ -9,12 +9,18 @@ test = "snforge test"
 snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.17.0" }
 starknet = ">=2.5.3"
 openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", rev = "2815498" }
-alexandria_bytes = { git = "https://github.com/keep-starknet-strange/alexandria.git" }
-alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git" }
+alexandria_bytes = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "8ddf0243" }
+alexandria_math = { git = "https://github.com/keep-starknet-strange/alexandria.git", rev = "8ddf0243" }
+succinct_sn = { git = "https://github.com/keep-starknet-strange/succinct-starknet.git" }
 
 [[target.starknet-contract]]
 casm = true
 sierra = true
+build-external-contracts = [
+    "succinct_sn::fee_vault::succinct_fee_vault",
+    "succinct_sn::gateway::succinct_gateway",
+    "succinct_sn::mocks::erc20_mock::SnakeERC20Mock",
+]
 
 [cairo]
 sierra-replace-ids = true

diff --git a/src/blobstreamx.cairo b/src/blobstreamx.cairo
@@ -4,16 +4,14 @@ mod blobstreamx {
     use blobstream_sn::interfaces::{
         DataRoot, TendermintXErrors, IBlobstreamX, IDAOracle, ITendermintX
     };
-    use blobstream_sn::succinctx::interfaces::{
-        ISuccinctGatewayDispatcher, ISuccinctGatewayDispatcherTrait
-    };
     use blobstream_sn::tree::binary::merkle_proof::BinaryMerkleProof;
     use core::starknet::event::EventEmitter;
     use core::traits::Into;
     use openzeppelin::access::ownable::OwnableComponent;
     use openzeppelin::upgrades::{interface::IUpgradeable, upgradeable::UpgradeableComponent};
     use starknet::info::get_block_number;
     use starknet::{ClassHash, ContractAddress, get_contract_address};
+    use succinct_sn::interfaces::{ISuccinctGatewayDispatcher, ISuccinctGatewayDispatcherTrait};
 
     component!(path: OwnableComponent, storage: ownable, event: OwnableEvent);
     component!(path: UpgradeableComponent, storage: upgradeable, event: UpgradeableEvent);

diff --git a/src/lib.cairo b/src/lib.cairo
@@ -6,22 +6,6 @@ mod mocks {
     mod upgradeable;
 }
 
-mod succinctx {
-    mod fee_vault;
-    mod gateway;
-    mod interfaces;
-    mod function_registry {
-        mod component;
-        mod erc20_mock;
-        mod interfaces;
-        mod mock;
-    }
-    #[cfg(test)]
-    mod tests {
-        mod test_fee_vault;
-    }
-}
-
 #[cfg(test)]
 mod tests {
     mod common;

diff --git a/src/mocks/function_verifier.cairo b/src/mocks/function_verifier.cairo
@@ -1,7 +1,7 @@
 #[starknet::contract]
 mod function_verifier_mock {
     use alexandria_bytes::Bytes;
-    use blobstream_sn::succinctx::interfaces::IFunctionVerifier;
+    use succinct_sn::interfaces::IFunctionVerifier;
 
     #[storage]
     struct Storage {

diff --git a/src/succinctx/fee_vault.cairo b/src/succinctx/fee_vault.cairo