resolved commnets

Scarb.lock

@@ -1,15 +1,6 @@
 # Code generated by scarb DO NOT EDIT.
 version = 1
 
-[[package]]
-name = "cairo_appchain_bridge"
-version = "0.1.0"
-dependencies = [
- "openzeppelin",
- "piltover",
- "snforge_std",
-]
-
 [[package]]
 name = "openzeppelin"
 version = "0.14.0"
@@ -18,7 +9,7 @@ source = "git+https://github.com/OpenZeppelin/cairo-contracts.git?tag=v0.14.0#f0
 [[package]]
 name = "piltover"
 version = "0.1.0"
-source = "git+https://github.com/byteZorvin/piltover?branch=main#34be166da6ec295f950c65ad231890127da68b5e"
+source = "git+https://github.com/byteZorvin/piltover?branch=bridge-testing#a4021a0bb5e1638e3aebf634f5810ebb17da6a38"
 dependencies = [
  "openzeppelin",
 ]
@@ -27,3 +18,12 @@ dependencies = [
 name = "snforge_std"
 version = "0.26.0"
 source = "git+https://github.com/foundry-rs/starknet-foundry?tag=v0.26.0#50eb589db65e113efe4f09241feb59b574228c7e"
+
+[[package]]
+name = "starknet_bridge"
+version = "0.1.0"
+dependencies = [
+ "openzeppelin",
+ "piltover",
+ "snforge_std",
+]

Scarb.toml

@@ -1,5 +1,5 @@
 [package]
-name = "cairo_appchain_bridge"
+name = "starknet_bridge"
 version = "0.1.0"
 edition = "2023_11"
 
@@ -8,7 +8,7 @@ edition = "2023_11"
 [dependencies]
 openzeppelin = { git = "https://github.com/OpenZeppelin/cairo-contracts.git", tag = "v0.14.0" }
 starknet = "2.6.4"
-piltover = { git = "https://github.com/byteZorvin/piltover", branch="main"}
+piltover = { git = "https://github.com/byteZorvin/piltover", branch="bridge-testing"}
 
 [dev-dependencies]
 snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v0.26.0" }
@@ -17,10 +17,5 @@ snforge_std = { git = "https://github.com/foundry-rs/starknet-foundry", tag = "v
 casm = true
 build-external-contracts = ["piltover::appchain::appchain"]
 
-[[tool.snforge.fork]]
-name = "mainnet"
-url = "https://starknet-mainnet.public.blastapi.io"
-block_id.tag = "Latest"
-
 [scripts]
 test = "snforge test"

src/bridge/interface.cairo

@@ -1,22 +1,5 @@
 use starknet::ContractAddress;
-
-#[derive(Serde, Drop, starknet::Store, PartialEq)]
-pub enum TokenStatus {
-    #[default]
-    Unknown,
-    Pending,
-    Active,
-    Blocked
-}
-
-#[derive(Serde, Drop, starknet::Store)]
-pub struct TokenSettings {
-    pub token_status: TokenStatus,
-    pub deployment_message_hash: felt252,
-    pub pending_deployment_expiration: u64,
-    pub max_total_balance: u256,
-    pub withdrawal_limit_applied: bool
-}
+use starknet_bridge::bridge::types::{TokenStatus, TokenSettings};
 
 #[starknet::interface]
 pub trait ITokenBridgeAdmin<TContractState> {
@@ -34,8 +17,8 @@ pub trait ITokenBridgeAdmin<TContractState> {
 pub trait ITokenBridge<TContractState> {
     fn appchain_bridge(self: @TContractState) -> ContractAddress;
     fn identity(self: @TContractState) -> ByteArray;
-    fn getStatus(self: @TContractState, token: ContractAddress) -> TokenStatus;
-    fn isServicingToken(self: @TContractState, token: ContractAddress) -> bool;
+    fn get_status(self: @TContractState, token: ContractAddress) -> TokenStatus;
+    fn is_servicing_token(self: @TContractState, token: ContractAddress) -> bool;
     fn is_withdrawal_limit_applied(self: @TContractState, token: ContractAddress) -> bool;
 
     fn enroll_token(ref self: TContractState, token: ContractAddress);