update

.gitmodules

@@ -10,4 +10,7 @@
 	branch = update-cairo-0.9.0
 [submodule "lib/starkgate-contracts-latest"]
 	path = lib/starkgate-contracts-latest
-	url = https://github.com/starknet-io/starkgate-contracts
+	url = https://github.com/starknet-io/starkgate-contracts
+[submodule "lib/starkgate-contracts-82e651f"]
+	path = lib/starkgate-contracts-82e651f
+	url = https://github.com/starknet-io/starkgate-contracts.git

Cargo.toml

@@ -16,15 +16,26 @@ serde_with = { version = "2.3.3", default-features = false }
 url = "2.4.1"
 
 # Zaun Deps
-ethereum-instance = { git = "https://github.com/karnotxyz/zaun", package = "ethereum-instance", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
-starkgate-manager-client = { git = "https://github.com/karnotxyz/zaun", package = "starkgate-manager-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
-starkgate-registry-client = { git = "https://github.com/karnotxyz/zaun", package = "starkgate-registry-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
-starknet-core-contract-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-core-contract-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
-starknet-erc20-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-erc20-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
-starknet-eth-bridge-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-eth-bridge-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
-starknet-proxy-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-proxy-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
-starknet-token-bridge-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-token-bridge-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
-zaun-utils = { git = "https://github.com/karnotxyz/zaun", package = "utils", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#ethereum-instance = { git = "https://github.com/karnotxyz/zaun", package = "ethereum-instance", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#starkgate-manager-client = { git = "https://github.com/karnotxyz/zaun", package = "starkgate-manager-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#starkgate-registry-client = { git = "https://github.com/karnotxyz/zaun", package = "starkgate-registry-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#starknet-core-contract-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-core-contract-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#starknet-erc20-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-erc20-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#starknet-eth-bridge-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-eth-bridge-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#starknet-proxy-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-proxy-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#starknet-token-bridge-client = { git = "https://github.com/karnotxyz/zaun", package = "starknet-token-bridge-client", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+#zaun-utils = { git = "https://github.com/karnotxyz/zaun", package = "utils", rev = "08a0c309c0dcc70c7e22aafdea4cde7ba5390f73" }
+
+ethereum-instance = { path = "../zaun/crates/l2/ethereum-instance" }
+starkgate-manager-client = { path = "../zaun/crates/l2/starkgate-manager-client" }
+starkgate-registry-client = {  path = "../zaun/crates/l2/starkgate-registry-client" }
+starknet-core-contract-client = { path = "../zaun/crates/l2/starknet-core-contract-client" }
+starknet-erc20-client = { path = "../zaun/crates/l2/starknet-erc20-client" }
+starknet-eth-bridge-client = { path = "../zaun/crates/l2/starknet-eth-bridge-client" }
+starknet-proxy-client = { path = "../zaun/crates/l2/starknet-proxy-client" }
+starknet-token-bridge-client = { path = "../zaun/crates/l2/starknet-token-bridge-client" }
+zaun-utils = {  path = "../zaun/crates/l2/utils", package = "utils" }
+
 
 # Starknet Deps
 starknet = "0.11.0"

Makefile

@@ -24,16 +24,26 @@ starkgate-contracts-latest:
  	mkdir -p cairo_contracts && \
 	../../.cairo/cairo/bin/starknet-compile src  --contract-path src::strk::erc20_lockable::ERC20Lockable cairo_contracts/ERC20Lockable.sierra && \
 	../../.cairo/cairo/bin/starknet-compile src  --contract-path src::token_bridge::TokenBridge cairo_contracts/TokenBridge.sierra && \
-	../../.cairo/cairo/bin/starknet-compile src  --contract-path openzeppelin::token::erc20_v070::erc20::ERC20 cairo_contracts/ERC20.sierra
-
+	../../.cairo/cairo/bin/starknet-compile src  --contract-path openzeppelin::token::erc20_v070::erc20::ERC20 cairo_contracts/ERC20.sierra && \
+	../../.cairo/cairo/bin/starknet-compile src  --contract-path src::legacy_bridge_eic::LegacyBridgeUpgradeEIC cairo_contracts/LegacyBridgeUpgradeEIC.sierra
+	# Compiling Casm
 	./.cairo/cairo/bin/starknet-sierra-compile ./lib/starkgate-contracts-latest/cairo_contracts/ERC20Lockable.sierra ./lib/starkgate-contracts-latest/cairo_contracts/ERC20Lockable.casm
 	./.cairo/cairo/bin/starknet-sierra-compile ./lib/starkgate-contracts-latest/cairo_contracts/TokenBridge.sierra ./lib/starkgate-contracts-latest/cairo_contracts/TokenBridge.casm
+	./.cairo/cairo/bin/starknet-sierra-compile ./lib/starkgate-contracts-latest/cairo_contracts/LegacyBridgeUpgradeEIC.sierra ./lib/starkgate-contracts-latest/cairo_contracts/LegacyBridgeUpgradeEIC.casm
 	# Copying Contracts
 	mkdir -p artifacts
 	cp ./lib/starkgate-contracts-latest/cairo_contracts/ERC20Lockable.sierra ./artifacts/erc20.sierra.json
 	cp ./lib/starkgate-contracts-latest/cairo_contracts/ERC20Lockable.casm ./artifacts/erc20.casm.json
 	cp ./lib/starkgate-contracts-latest/cairo_contracts/TokenBridge.sierra ./artifacts/token_bridge.sierra.json
 	cp ./lib/starkgate-contracts-latest/cairo_contracts/TokenBridge.casm ./artifacts/token_bridge.casm.json
+	cp ./lib/starkgate-contracts-latest/cairo_contracts/LegacyBridgeUpgradeEIC.sierra ./artifacts/token_bridge_eic.sierra.json
+	cp ./lib/starkgate-contracts-latest/cairo_contracts/LegacyBridgeUpgradeEIC.casm ./artifacts/token_bridge_eic.casm.json
+
+starkgate-contracts-82e651f:
+	cd lib/starkgate-contracts- && \
+	echo "ENTRYPOINT [ \"sleep\", \"1000000000000\" ]" >> Dockerfile && \
+	docker build -t starkgate-build-82e651f . && \
+
 
 braavos-account-cairo:
 	# Building